diff --git a/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.ts b/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.ts index 75f3775bc..899cd8eef 100644 --- a/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.ts +++ b/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.ts @@ -199,7 +199,7 @@ export class DescriptionTemplateEditorComponent extends BaseEditor onSuccess ? onSuccess(complete) : this.onCallbackSuccess(complete), @@ -267,7 +267,7 @@ export class DescriptionTemplateEditorComponent extends BaseEditor this.onCallbackSuccess(), + complete => this.onCallbackDeleteSuccess(), error => this.onCallbackError(error) ); } diff --git a/dmp-frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.ts b/dmp-frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.ts index 54003d566..b11ae5877 100644 --- a/dmp-frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.ts +++ b/dmp-frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.ts @@ -163,7 +163,7 @@ export class DescriptionTemplateTypeEditorComponent extends BaseEditor this.onCallbackSuccess(), + complete => this.onCallbackDeleteSuccess(), error => this.onCallbackError(error) ); } diff --git a/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.component.ts b/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.component.ts index d89dd527f..28753a26e 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.component.ts +++ b/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.component.ts @@ -261,7 +261,7 @@ export class DmpBlueprintEditorComponent extends BaseEditor this.cancel(), + complete => this.onCallbackDeleteSuccess(), error => this.onCallbackError(error) ); } diff --git a/dmp-frontend/src/app/ui/admin/language/editor/language-editor.component.ts b/dmp-frontend/src/app/ui/admin/language/editor/language-editor.component.ts index 40bd16c1a..10afbf9b6 100644 --- a/dmp-frontend/src/app/ui/admin/language/editor/language-editor.component.ts +++ b/dmp-frontend/src/app/ui/admin/language/editor/language-editor.component.ts @@ -183,7 +183,7 @@ export class LanguageEditorComponent extends BaseEditor this.onCallbackSuccess(), + complete => this.onCallbackDeleteSuccess(), error => this.onCallbackError(error) ); } diff --git a/dmp-frontend/src/app/ui/admin/notification-template/editor/notification-template-editor.component.ts b/dmp-frontend/src/app/ui/admin/notification-template/editor/notification-template-editor.component.ts index 3b3c9785b..76abf2eb2 100644 --- a/dmp-frontend/src/app/ui/admin/notification-template/editor/notification-template-editor.component.ts +++ b/dmp-frontend/src/app/ui/admin/notification-template/editor/notification-template-editor.component.ts @@ -217,7 +217,7 @@ export class NotificationTemplateEditorComponent extends BaseEditor this.onCallbackSuccess(), + complete => this.onCallbackDeleteSuccess(), error => this.onCallbackError(error) ); } @@ -285,24 +285,24 @@ export class NotificationTemplateEditorComponent extends BaseEditor= 0) values.splice(index, 1); return values; } - + edit(field: string, values: string[], event: MatChipEditedEvent) { const value = event.value.trim(); - + if (!value) { values = this.remove(field, values); return values; } - + const index = values.indexOf(field); if (index >= 0) values[index] = value diff --git a/dmp-frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.ts b/dmp-frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.ts index 1d2ae2f52..8f2310bf2 100644 --- a/dmp-frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.ts +++ b/dmp-frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.ts @@ -169,7 +169,7 @@ export class PrefillingSourceEditorComponent extends BaseEditor this.onCallbackSuccess(), + complete => this.onCallbackDeleteSuccess(), error => this.onCallbackError(error) ); } diff --git a/dmp-frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.ts b/dmp-frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.ts index 4ea892d15..ebefd566f 100644 --- a/dmp-frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.ts +++ b/dmp-frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.ts @@ -182,7 +182,7 @@ export class ReferenceTypeEditorComponent extends BaseEditor this.onCallbackSuccess(), + complete => this.onCallbackDeleteSuccess(), error => this.onCallbackError(error) ); } diff --git a/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.component.ts b/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.component.ts index c86208733..fd151de11 100644 --- a/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.component.ts +++ b/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.component.ts @@ -176,7 +176,7 @@ export class ReferenceEditorComponent extends BaseEditor this.onCallbackSuccess(), + complete => this.onCallbackDeleteSuccess(), error => this.onCallbackError(error) ); } diff --git a/dmp-frontend/src/app/ui/admin/tenant/editor/tenant-editor.component.ts b/dmp-frontend/src/app/ui/admin/tenant/editor/tenant-editor.component.ts index f527c26ab..8af96b8c1 100644 --- a/dmp-frontend/src/app/ui/admin/tenant/editor/tenant-editor.component.ts +++ b/dmp-frontend/src/app/ui/admin/tenant/editor/tenant-editor.component.ts @@ -179,7 +179,7 @@ export class TenantEditorComponent extends BaseEditor if (result) { this.tenantService.delete(value.id).pipe(takeUntil(this._destroyed)) .subscribe( - complete => this.onCallbackSuccess(), + complete => this.onCallbackDeleteSuccess(), error => this.onCallbackError(error) ); } diff --git a/dmp-frontend/src/app/ui/description/editor/description-editor.component.ts b/dmp-frontend/src/app/ui/description/editor/description-editor.component.ts index f75c42077..bc6f32c6a 100644 --- a/dmp-frontend/src/app/ui/description/editor/description-editor.component.ts +++ b/dmp-frontend/src/app/ui/description/editor/description-editor.component.ts @@ -663,7 +663,7 @@ export class DescriptionEditorComponent extends BaseEditor this.onCallbackSuccess(), + complete => this.onCallbackDeleteSuccess(), error => this.onCallbackError(error) ); } diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts index b12b15522..7bc0d3bd1 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts +++ b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts @@ -181,9 +181,9 @@ export class DmpEditorComponent extends BaseEditor implemen } } if(data.dmpDescriptionTemplates){ - data.dmpDescriptionTemplates = data.dmpDescriptionTemplates.filter(x => x.isActive === IsActive.Active); + data.dmpDescriptionTemplates = data.dmpDescriptionTemplates.filter(x => x.isActive === IsActive.Active); } - + } this.item = data; @@ -290,7 +290,7 @@ export class DmpEditorComponent extends BaseEditor implemen if (result) { this.dmpService.delete(value.id).pipe(takeUntil(this._destroyed)) .subscribe( - complete => this.onCallbackSuccess(), + complete => this.onCallbackDeleteSuccess(), error => this.onCallbackError(error) ); } @@ -345,7 +345,7 @@ export class DmpEditorComponent extends BaseEditor implemen this.selectedBlueprint = data; this.formGroup.get('blueprint').setValue(this.selectedBlueprint.id); - const goToNextStep: boolean = this.formGroup.get('label').valid && this.formGroup.get('description').valid; + const goToNextStep: boolean = this.formGroup.get('label').valid && this.formGroup.get('description').valid; this.buildFormAfterBlueprintSelection(goToNextStep); }); } @@ -357,7 +357,7 @@ export class DmpEditorComponent extends BaseEditor implemen blueprint: this.selectedBlueprint, status: DmpStatus.Draft } - + this.prepareForm(dmp); this.goToNextStep = true; //reset } @@ -476,7 +476,7 @@ export class DmpEditorComponent extends BaseEditor implemen multiplicityValidResults.push(true); } }) - + if(multiplicityValidResults.includes(true)) return true else return false; }else{ diff --git a/dmp-frontend/src/app/ui/inapp-notification/editor/inapp-notification-editor.component.ts b/dmp-frontend/src/app/ui/inapp-notification/editor/inapp-notification-editor.component.ts index 20eb79d16..9ea9d0b15 100644 --- a/dmp-frontend/src/app/ui/inapp-notification/editor/inapp-notification-editor.component.ts +++ b/dmp-frontend/src/app/ui/inapp-notification/editor/inapp-notification-editor.component.ts @@ -108,7 +108,7 @@ export class InAppNotificationEditorComponent extends BaseComponent implements O if (result) { this.inappNotificationService.delete(value.id).pipe(takeUntil(this._destroyed)) .subscribe( - complete => this.onCallbackSuccess(), + complete => this.cancel(), error => this.onCallbackError(error) ); } diff --git a/dmp-frontend/src/app/ui/supportive-material-editor/supportive-material-editor.component.ts b/dmp-frontend/src/app/ui/supportive-material-editor/supportive-material-editor.component.ts index 2f2341518..494ffa222 100644 --- a/dmp-frontend/src/app/ui/supportive-material-editor/supportive-material-editor.component.ts +++ b/dmp-frontend/src/app/ui/supportive-material-editor/supportive-material-editor.component.ts @@ -168,7 +168,7 @@ export class SupportiveMaterialEditorComponent extends BaseEditor this.onCallbackSuccess(), + complete => this.onCallbackDeleteSuccess(), error => this.onCallbackError(error) ); } @@ -185,7 +185,7 @@ export class SupportiveMaterialEditorComponent extends BaseEditor= 0 && this.formGroup.get('languageCode').value){ const lookup = SupportiveMaterialService.DefaultSupportiveMaterialLookup(); lookup.types = [this.formGroup.get('type').value]; @@ -197,7 +197,7 @@ export class SupportiveMaterialEditorComponent extends BaseEditor