Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix[BB-458]: Showing error conflict page on deleting entity twice #718

Merged
merged 5 commits into from
Dec 1, 2021
Merged

Fix[BB-458]: Showing error conflict page on deleting entity twice #718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5565326
fix(BB-458):showing conflict error after deleting entity twice
tr1ten Nov 26, 2021
ea71e1d
fix(BB-458):showing conflict error after deleting entity twice
tr1ten Nov 26, 2021
5bac973
Fix code style issues with ESLint
lint-action Nov 26, 2021
f35a516
fix linting errors
tr1ten Nov 29, 2021
c7e81d0
Merge branch 'fix#BB-458' of https://github.com/tr1ten/bookbrainz-sit…
tr1ten Nov 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/server/routes/entity/author.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import {
makeEntityCreateOrEditHandler
} from '../../helpers/entityRouteUtils';

import {ConflictError} from '../../../common/helpers/error';
import _ from 'lodash';
import {escapeProps} from '../../helpers/props';
import express from 'express';
Expand Down Expand Up @@ -141,9 +142,12 @@ router.get('/:bbid', middleware.loadEntityRelationships, (req, res) => {
entityRoutes.displayEntity(req, res);
});

router.get('/:bbid/delete', auth.isAuthenticated, (req, res) => {
router.get('/:bbid/delete', auth.isAuthenticated, (req, res, next) => {
if (!res.locals.entity.dataId) {
return next(new ConflictError('This entity has already been deleted'));
}
_setAuthorTitle(res);
entityRoutes.displayDeleteEntity(req, res);
return entityRoutes.displayDeleteEntity(req, res);
});

router.post(
Expand Down
8 changes: 6 additions & 2 deletions src/server/routes/entity/edition-group.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import {
makeEntityCreateOrEditHandler
} from '../../helpers/entityRouteUtils';

import {ConflictError} from '../../../common/helpers/error';
import _ from 'lodash';
import {escapeProps} from '../../helpers/props';
import express from 'express';
Expand Down Expand Up @@ -133,9 +134,12 @@ router.get('/:bbid', middleware.loadEntityRelationships, (req, res) => {
entityRoutes.displayEntity(req, res);
});

router.get('/:bbid/delete', auth.isAuthenticated, (req, res) => {
router.get('/:bbid/delete', auth.isAuthenticated, (req, res, next) => {
if (!res.locals.entity.dataId) {
return next(new ConflictError('This entity has already been deleted'));
}
_setEditionGroupTitle(res);
entityRoutes.displayDeleteEntity(req, res);
return entityRoutes.displayDeleteEntity(req, res);
});

router.post(
Expand Down
8 changes: 6 additions & 2 deletions src/server/routes/entity/edition.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import {
makeEntityCreateOrEditHandler
} from '../../helpers/entityRouteUtils';

import {ConflictError} from '../../../common/helpers/error';
import {RelationshipTypes} from '../../../client/entity-editor/relationship-editor/types';
import _ from 'lodash';
import {escapeProps} from '../../helpers/props';
Expand Down Expand Up @@ -254,9 +255,12 @@ router.get('/:bbid/revisions/revisions', (req, res, next) => {
});


router.get('/:bbid/delete', auth.isAuthenticated, (req, res) => {
router.get('/:bbid/delete', auth.isAuthenticated, (req, res, next) => {
if (!res.locals.entity.dataId) {
return next(new ConflictError('This entity has already been deleted'));
}
_setEditionTitle(res);
entityRoutes.displayDeleteEntity(req, res);
return entityRoutes.displayDeleteEntity(req, res);
});

router.post(
Expand Down
10 changes: 8 additions & 2 deletions src/server/routes/entity/publisher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,14 @@ import * as auth from '../../helpers/auth';
import * as entityRoutes from './entity';
import * as middleware from '../../helpers/middleware';
import * as utils from '../../helpers/utils';

import {
entityEditorMarkup,
generateEntityProps,
makeEntityCreateOrEditHandler
} from '../../helpers/entityRouteUtils';

import {ConflictError} from '../../../common/helpers/error';
import _ from 'lodash';
import {escapeProps} from '../../helpers/props';
import express from 'express';
Expand Down Expand Up @@ -154,9 +157,12 @@ router.get('/:bbid', middleware.loadEntityRelationships, (req, res, next) => {
.catch(next);
});

router.get('/:bbid/delete', auth.isAuthenticated, (req, res) => {
router.get('/:bbid/delete', auth.isAuthenticated, (req, res, next) => {
if (!res.locals.entity.dataId) {
return next(new ConflictError('This entity has already been deleted'));
}
_setPublisherTitle(res);
entityRoutes.displayDeleteEntity(req, res);
return entityRoutes.displayDeleteEntity(req, res);
});

router.post(
Expand Down
9 changes: 6 additions & 3 deletions src/server/routes/entity/series.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ import {
makeEntityCreateOrEditHandler
} from '../../helpers/entityRouteUtils';

import {ConflictError} from '../../../common/helpers/error';
import _ from 'lodash';
import {escapeProps} from '../../helpers/props';
import express from 'express';
import {sortRelationshipOrdinal} from '../../../common/helpers/utils';
import target from '../../templates/target';

/** ****************************
Expand Down Expand Up @@ -140,9 +140,12 @@ router.get('/:bbid', middleware.loadEntityRelationships, middleware.loadSeriesIt
entityRoutes.displayEntity(req, res);
});

router.get('/:bbid/delete', auth.isAuthenticated, (req, res) => {
router.get('/:bbid/delete', auth.isAuthenticated, (req, res, next) => {
if (!res.locals.entity.dataId) {
return next(new ConflictError('This entity has already been deleted'));
}
_setSeriesTitle(res);
entityRoutes.displayDeleteEntity(req, res);
return entityRoutes.displayDeleteEntity(req, res);
});

router.post(
Expand Down
8 changes: 6 additions & 2 deletions src/server/routes/entity/work.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import {
makeEntityCreateOrEditHandler
} from '../../helpers/entityRouteUtils';

import {ConflictError} from '../../../common/helpers/error';
import {RelationshipTypes} from '../../../client/entity-editor/relationship-editor/types';
import _ from 'lodash';
import {escapeProps} from '../../helpers/props';
Expand Down Expand Up @@ -172,9 +173,12 @@ router.get('/:bbid', middleware.loadEntityRelationships, (req, res) => {
entityRoutes.displayEntity(req, res);
});

router.get('/:bbid/delete', auth.isAuthenticated, (req, res) => {
router.get('/:bbid/delete', auth.isAuthenticated, (req, res, next) => {
if (!res.locals.entity.dataId) {
return next(new ConflictError('This entity has already been deleted'));
}
_setWorkTitle(res);
entityRoutes.displayDeleteEntity(req, res);
return entityRoutes.displayDeleteEntity(req, res);
});

router.post(
Expand Down