public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Checks for dependencies during deletion.

Browse source
This commit is contained in:
Tomas Bures 2018-09-29 20:08:49 +02:00
parent 0a08088893
commit efbfa2b366
20 changed files with 246 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

25
client/src/namespaces/CUD.js
View file

@ -25,7 +25,6 @@ export default class CUD extends Component {
this.state = {};
this.initForm();
this.hasChildren = false;
}
static propTypes = {
@ -42,10 +41,6 @@ export default class CUD extends Component {
const entry = data[idx];
if (entry.key === this.props.entity.id) {
if (entry.children.length > 0) {
this.hasChildren = true;
}
data.splice(idx, 1);
return true;
}
@ -158,25 +153,10 @@ export default class CUD extends Component {
}
}
async onDeleteError(error) {
if (error instanceof interoperableErrors.ChildDetectedError) {
this.disableForm();
this.setFormStatusMessage('danger',
<span>
<strong>{t('The namespace cannot be deleted.')}</strong>{' '}
{t('There has been a child namespace found. This is most likely because someone else has changed the parent of some namespace in the meantime. Refresh your page to start anew with fresh data.')}
</span>
);
return;
}
throw error;
}
render() {
const t = this.props.t;
const isEdit = !!this.props.entity;
const canDelete = isEdit && !this.isEditGlobal() && !this.hasChildren && this.props.entity.permissions.includes('delete');
const canDelete = isEdit && !this.isEditGlobal() && this.props.entity.permissions.includes('delete');
return (
<div>
@ -188,8 +168,7 @@ export default class CUD extends Component {
backUrl={`/namespaces/${this.props.entity.id}/edit`}
successUrl="/namespaces"
deletingMsg={t('Deleting namespace ...')}
deletedMsg={t('Namespace deleted')}
onErrorAsync={::this.onDeleteError}/>
deletedMsg={t('Namespace deleted')} />
}
<Title>{isEdit ? t('Edit Namespace') : t('Create Namespace')}</Title>

6
client/src/namespaces/List.js
View file

@ -13,6 +13,7 @@ import {
tableDeleteDialogInit,
tableDeleteDialogRender
} from "../lib/modals";
import {getGlobalNamespaceId} from "../../../shared/namespaces";
@translate()
@withErrorHandling
@ -50,7 +51,6 @@ export default class List extends Component {
const actions = node => {
const actions = [];
console.log(node);
if (node.data.permissions.includes('edit')) {
actions.push({
@ -66,7 +66,9 @@ export default class List extends Component {
});
}
tableDeleteDialogAddDeleteButton(actions, this, node.data.permissions, node.key, node.key);
if (Number.parseInt(node.key) !== getGlobalNamespaceId()) {
tableDeleteDialogAddDeleteButton(actions, this, node.data.permissions, node.key, node.data.unsanitizedTitle);
}
return actions;
};