diff --git a/apps/red-ui/src/app/modules/dossier-overview/config.service.ts b/apps/red-ui/src/app/modules/dossier-overview/config.service.ts index a28454e4c..d5ad67d43 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/config.service.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/config.service.ts @@ -285,12 +285,12 @@ export class ConfigService { label: this._translateService.instant(workflowFileStatusTranslations[status]), }), ); - + statusFilters.sort((a, b) => StatusSorter[a.id] - StatusSorter[b.id]); filterGroups.push({ slug: 'statusFilters', label: this._translateService.instant('filters.documents-status'), icon: 'red:status', - filters: statusFilters.sort((a, b) => StatusSorter[a.id] - StatusSorter[b.id]), + filters: statusFilters, checker: keyChecker('workflowStatus'), }); } @@ -336,13 +336,13 @@ export class ConfigService { }, }), ); - + needsWorkFilters.sort(RedactionFilterSorter.byKey); filterGroups.push({ slug: 'needsWorkFilters', label: this._translateService.instant('filters.needs-work'), icon: 'red:needs-work', filterTemplate: needsWorkFilterTemplate, - filters: needsWorkFilters.sort(RedactionFilterSorter.byKey), + filters: needsWorkFilters, checker: (file: File, filter: INestedFilter) => annotationFilterChecker(file, filter, this._userService.currentUser.id), matchAll: true, }); diff --git a/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts b/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts index 11880d5c6..e50a6e8ef 100644 --- a/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts +++ b/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts @@ -144,12 +144,12 @@ export class ConfigService { label: this._translateService.instant(workflowFileStatusTranslations[status]), }), ); - + statusFilters.sort((a, b) => StatusSorter[a.id] - StatusSorter[b.id]); filterGroups.push({ slug: 'statusFilters', label: this._translateService.instant('filters.documents-status'), icon: 'red:status', - filters: statusFilters.sort((a, b) => StatusSorter[a.id] - StatusSorter[b.id]), + filters: statusFilters, checker: (dossier: Dossier, filter: INestedFilter) => this._dossierStatusChecker(dossier, filter), }); @@ -180,13 +180,13 @@ export class ConfigService { }, }), ); - + needsWorkFilters.sort((a, b) => RedactionFilterSorter[a.id] - RedactionFilterSorter[b.id]); filterGroups.push({ slug: 'needsWorkFilters', label: this._translateService.instant('filters.needs-work'), icon: 'red:needs-work', filterTemplate: needsWorkFilterTemplate, - filters: needsWorkFilters.sort((a, b) => RedactionFilterSorter[a.id] - RedactionFilterSorter[b.id]), + filters: needsWorkFilters, checker: (dossier: Dossier, filter: INestedFilter) => this._annotationFilterChecker(dossier, filter), matchAll: true, });