diff --git a/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.ts b/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.ts index 97d23d6be..fc39331e1 100644 --- a/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.ts +++ b/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.ts @@ -56,7 +56,6 @@ export class DownloadsListScreenComponent extends ListingComponent d.storageId); await this.fileDownloadService.delete({ storageIds }).toPromise(); - this.listingService.setSelected([]); await this._loadData(); } diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.ts index 59c20c095..098cd2db2 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.ts @@ -52,7 +52,6 @@ export class ActiveFieldsListingComponent extends ListingComponent implem ngOnChanges(changes: SimpleChanges): void { if (changes.entities) { this.entitiesService.setEntities(this.entities); - this.listingService.updateSelection(); } } diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts index dfdfdf0e5..7abebddcc 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts @@ -144,7 +144,7 @@ export class FileAttributesCsvImportDialogComponent extends ListingComponent f.id === field.id); } toggleFieldActive(field: Field) { diff --git a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts index f0f50b86c..9e1335baa 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts @@ -72,7 +72,6 @@ export class DictionaryListingScreenComponent extends ListingComponent item.id); await this._dossierAttributesService.delete(ids).toPromise(); - this.listingService.setSelected([]); await this._loadData(); }); } diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts index 5a338ccfb..e20f3877d 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts @@ -95,7 +95,6 @@ export class DossierTemplatesListingScreenComponent extends ListingComponent { const justificationIds = justifications.map(j => j.id); await this._justificationService.delete(justificationIds, dossierTemplateId).toPromise(); await this._justificationService.loadAll(dossierTemplateId).toPromise(); - listingService.updateSelection(); this._loadingService.stop(); }); } diff --git a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts index 28e3683d2..1d129b295 100644 --- a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts @@ -142,6 +142,5 @@ export class TrashScreenComponent extends ListingComponent impl private _removeFromList(ids: string[]): void { const entities = this.entitiesService.all.filter(e => !ids.includes(e.id)); this.entitiesService.setEntities(entities); - this.listingService.setSelected([]); } } diff --git a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts index c91681979..f77aba954 100644 --- a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts @@ -80,7 +80,6 @@ export class UserListingScreenComponent extends ListingComponent implement openDeleteUsersDialog(userIds: string[], $event?: MouseEvent) { this._dialogService.openDialog('deleteUsers', $event, userIds, async () => { await this._loadData(); - this.listingService.updateSelection(); }); } diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.ts index b0756b69c..d9d3b8d88 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.ts +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.ts @@ -129,7 +129,6 @@ export class EditDossierDeletedDocumentsComponent extends ListingComponent !ids.includes(e.fileId)); this.entitiesService.setEntities(entities); - this.listingService.setSelected([]); } private _toListItems(files: IFile[]): FileListItem[] { diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts index 49999c1d6..101d03029 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts @@ -142,7 +142,6 @@ export class DossierOverviewBulkActionsComponent { .toPromise(); await this._appStateService.reloadActiveDossierFiles(); this.reload.emit(); - this._listingService.setSelected([]); this._loadingService.stop(); }, ); diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts index c2eda5e78..907fdd45b 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts @@ -245,7 +245,6 @@ export class DossierOverviewScreenComponent extends ListingComponent imple } async bulkActionPerformed(): Promise { - this.listingService.setSelected([]); await this.reloadDossiers(); } diff --git a/apps/red-ui/src/app/modules/shared/services/controller-wrappers/dossier-attributes.service.ts b/apps/red-ui/src/app/modules/shared/services/controller-wrappers/dossier-attributes.service.ts index b7ce87bc1..76440e51d 100644 --- a/apps/red-ui/src/app/modules/shared/services/controller-wrappers/dossier-attributes.service.ts +++ b/apps/red-ui/src/app/modules/shared/services/controller-wrappers/dossier-attributes.service.ts @@ -36,7 +36,8 @@ export class DossierAttributesService extends EntitiesService { - return this._post(ids, `${this._defaultModelPath}/config/delete/${dossierTemplateId}`); + const queryParams = ids.map(id => ({ key: 'dossierAttributeIds', value: id })); + return this._post(null, `${this._defaultModelPath}/config/delete/${dossierTemplateId}`, queryParams); } loadAll(dossierTemplateId = this._dossierTemplatesService.activeDossierTemplateId): Observable { diff --git a/libs/common-ui b/libs/common-ui index 019072dfd..260d7e44f 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 019072dfd24f37f0a4692a5a99e32f5ab6457108 +Subproject commit 260d7e44ff91967bea89b51c360e470ebc9b7300