Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Some fixes

Browse Source
This commit is contained in:
Adina Țeudan 2021-10-13 23:30:32 +03:00
parent fb8c68987e
commit eef34df5ae
14 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.ts
View File

@ -56,7 +56,6 @@ export class DownloadsListScreenComponent extends ListingComponent<DownloadStatu
private async _deleteItems(downloads?: DownloadStatus[]) {
const storageIds = (downloads || this.listingService.selected).map(d => d.storageId);
await this.fileDownloadService.delete({ storageIds }).toPromise();
this.listingService.setSelected([]);
await this._loadData();
}

1
apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.ts
View File

@ -52,7 +52,6 @@ export class ActiveFieldsListingComponent extends ListingComponent<Field> implem
ngOnChanges(changes: SimpleChanges): void {
if (changes.entities) {
this.entitiesService.setEntities(this.entities);
this.listingService.updateSelection();
}
}

2
apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts
View File

@ -144,7 +144,7 @@ export class FileAttributesCsvImportDialogComponent extends ListingComponent<Fie
}
isActive(field: Field): boolean {
return this.activeFields.indexOf(field) !== -1;
return !!this.activeFields.find(f => f.id === field.id);
}
toggleFieldActive(field: Field) {

1
apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.ts
View File

@ -72,7 +72,6 @@ export class DictionaryListingScreenComponent extends ListingComponent<TypeValue
this._dossierTemplatesService.activeDossierTemplateId,
)
.toPromise();
this.listingService.setSelected([]);
await this._appStateService.loadDictionaryData();
this._loadDictionaryData(false);
this._calculateData();

1
apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.ts
View File

@ -62,7 +62,6 @@ export class DossierAttributesListingScreenComponent extends ListingComponent<Do
this._loadingService.start();
const ids = dossierAttribute ? [dossierAttribute.id] : this.listingService.selected.map(item => item.id);
await this._dossierAttributesService.delete(ids).toPromise();
this.listingService.setSelected([]);
await this._loadData();
});
}

1
apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts
View File

@ -95,7 +95,6 @@ export class DossierTemplatesListingScreenComponent extends ListingComponent<Dos
this._toaster.error(_('dossier-templates-listing.error.generic'));
}
});
this.listingService.setSelected([]);
await this._dossierTemplatesService.loadAll().toPromise();
await this._appStateService.loadDictionaryData();
this.loadDossierTemplateStats();

1
apps/red-ui/src/app/modules/admin/screens/justifications/justifications-dialog.service.ts
View File

@ -54,7 +54,6 @@ export class JustificationsDialogService extends DialogService<DialogType> {
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();
});
}

1
apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts
View File

@ -142,6 +142,5 @@ export class TrashScreenComponent extends ListingComponent<DossierListItem> impl
private _removeFromList(ids: string[]): void {
const entities = this.entitiesService.all.filter(e => !ids.includes(e.id));
this.entitiesService.setEntities(entities);
this.listingService.setSelected([]);
}
}

1
apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts
View File

@ -80,7 +80,6 @@ export class UserListingScreenComponent extends ListingComponent<User> implement
openDeleteUsersDialog(userIds: string[], $event?: MouseEvent) {
this._dialogService.openDialog('deleteUsers', $event, userIds, async () => {
await this._loadData();
this.listingService.updateSelection();
});
}

1
apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.ts
View File

@ -129,7 +129,6 @@ export class EditDossierDeletedDocumentsComponent extends ListingComponent<FileL
private _removeFromList(ids: string[]): void {
const entities = this.entitiesService.all.filter(e => !ids.includes(e.fileId));
this.entitiesService.setEntities(entities);
this.listingService.setSelected([]);
}
private _toListItems(files: IFile[]): FileListItem[] {

1
apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts
View File

@ -142,7 +142,6 @@ export class DossierOverviewBulkActionsComponent {
.toPromise();
await this._appStateService.reloadActiveDossierFiles();
this.reload.emit();
this._listingService.setSelected([]);
this._loadingService.stop();
},
);

1
apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts
View File

@ -245,7 +245,6 @@ export class DossierOverviewScreenComponent extends ListingComponent<File> imple
}
async bulkActionPerformed(): Promise<void> {
this.listingService.setSelected([]);
await this.reloadDossiers();
}

3
apps/red-ui/src/app/modules/shared/services/controller-wrappers/dossier-attributes.service.ts
View File

@ -36,7 +36,8 @@ export class DossierAttributesService extends EntitiesService<DossierAttributeCo
@Validate()
delete(@RequiredParam() ids: List, dossierTemplateId = this._dossierTemplatesService.activeDossierTemplateId): Observable<unknown> {
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<DossierAttributeConfig[]> {

2
libs/common-ui

@ -1 +1 @@
Subproject commit 019072dfd24f37f0a4692a5a99e32f5ab6457108
Subproject commit 260d7e44ff91967bea89b51c360e470ebc9b7300