From 0222d01e5db8a196e67a0c3171ffc6f138873b51 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Sun, 26 Sep 2021 11:57:14 +0300 Subject: [PATCH] remove _primaryKey & fix filters --- .../active-fields-listing.component.ts | 1 - ...-attributes-csv-import-dialog.component.ts | 6 ++--- .../screens/trash/trash-screen.component.ts | 1 + .../dossier-listing-screen.component.ts | 24 +++++++------------ .../dossier-overview-screen.component.ts | 12 +++++----- .../services/annotation-processing.service.ts | 5 ++-- 6 files changed, 20 insertions(+), 29 deletions(-) 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 410709c35..b267c26a1 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 @@ -37,7 +37,6 @@ export class ActiveFieldsListingComponent extends ListingComponent implem @Output() readonly entitiesChange = new EventEmitter(); @Output() readonly setHoveredColumn = new EventEmitter(); @Output() readonly toggleFieldActive = new EventEmitter(); - protected readonly _primaryKey = 'csvColumn'; constructor(protected readonly _injector: Injector) { super(_injector); 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 ca74c341d..48ec927cc 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 @@ -41,7 +41,6 @@ export class FileAttributesCsvImportDialogComponent extends ListingComponent ({ ...item, searchKey: item.csvColumn }))]; } deactivateAll() { @@ -232,6 +231,7 @@ export class FileAttributesCsvImportDialogComponent extends ListingComponent impl return { id: dossier.dossierId, ...dossier, + searchKey: dossier.dossierName, restoreDate, canRestore: this._canRestoreDossier(restoreDate), // Because of migrations, for some this is not set diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-listing-screen/dossier-listing-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-listing-screen/dossier-listing-screen.component.ts index 65262d6c5..cc4aef97d 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-listing-screen/dossier-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-listing-screen/dossier-listing-screen.component.ts @@ -16,15 +16,7 @@ import { DossiersDialogService } from '../../services/dossiers-dialog.service'; import { OnAttach, OnDetach } from '@utils/custom-route-reuse.strategy'; import { UserPreferenceService } from '@services/user-preference.service'; import { ButtonConfig } from '@shared/components/page-header/models/button-config.model'; -import { - DefaultListingServices, - INestedFilter, - keyChecker, - ListingComponent, - NestedFilter, - TableColumnConfig, - TableComponent -} from '@iqser/common-ui'; +import { DefaultListingServices, keyChecker, ListingComponent, NestedFilter, TableColumnConfig, TableComponent } from '@iqser/common-ui'; import { workloadTranslations } from '../../translations/workload-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { fileStatusTranslations } from '../../translations/file-status-translations'; @@ -225,7 +217,7 @@ export class DossierListingScreenComponent allDistinctDossierTemplates.add(entry.dossierTemplateId); }); - const statusFilters = [...allDistinctFileStatus].map( + const statusFilters = [...allDistinctFileStatus].map( status => new NestedFilter({ id: status, @@ -241,7 +233,7 @@ export class DossierListingScreenComponent checker: dossierStatusChecker }); - const peopleFilters = [...allDistinctPeople].map( + const peopleFilters = [...allDistinctPeople].map( userId => new NestedFilter({ id: userId, @@ -257,7 +249,7 @@ export class DossierListingScreenComponent checker: dossierMemberChecker }); - const needsWorkFilters = [...allDistinctNeedsWork].map( + const needsWorkFilters = [...allDistinctNeedsWork].map( type => new NestedFilter({ id: type, @@ -275,7 +267,7 @@ export class DossierListingScreenComponent matchAll: true }); - const dossierTemplateFilters = [...allDistinctDossierTemplates].map( + const dossierTemplateFilters = [...allDistinctDossierTemplates].map( id => new NestedFilter({ id: id, @@ -299,7 +291,7 @@ export class DossierListingScreenComponent checker: (dw: Dossier) => quickFilters.reduce((acc, f) => acc || (f.checked && f.checker(dw)), false) }); - const dossierFilters = this.entitiesService.all.map( + const dossierFilters = this.entitiesService.all.map( dossier => new NestedFilter({ id: dossier.dossierName, @@ -316,9 +308,9 @@ export class DossierListingScreenComponent }); } - private _createQuickFilters(): INestedFilter[] { + private _createQuickFilters(): NestedFilter[] { const myDossiersLabel = this._translateService.instant('dossier-listing.quick-filters.my-dossiers'); - const filters: INestedFilter[] = [ + const filters: NestedFilter[] = [ { id: 'my-dossiers', label: myDossiersLabel, 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 fb80d35b1..800c3060d 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 @@ -459,7 +459,7 @@ export class DossierOverviewScreenComponent extends ListingComponent( + const statusFilters = [...allDistinctFileStatusWrapper].map( item => new NestedFilter({ id: item, @@ -475,7 +475,7 @@ export class DossierOverviewScreenComponent extends ListingComponent( + const needsWorkFilters = [...allDistinctNeedsWork].map( item => new NestedFilter({ id: item, @@ -527,7 +527,7 @@ export class DossierOverviewScreenComponent extends ListingComponent( + filters: [...filterValue].map( (value: string) => new NestedFilter({ id: value, @@ -547,7 +547,7 @@ export class DossierOverviewScreenComponent extends ListingComponent acc || f.checker(file), false)) }); - const filesNamesFilters = this.entitiesService.all.map( + const filesNamesFilters = this.entitiesService.all.map( file => new NestedFilter({ id: file.filename, @@ -565,7 +565,7 @@ export class DossierOverviewScreenComponent extends ListingComponent 0) { const recentPeriod = this._configService.values.RECENT_PERIOD_IN_HOURS; diff --git a/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts b/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts index 17f9830db..66eb5f2c5 100644 --- a/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts +++ b/apps/red-ui/src/app/modules/dossier/services/annotation-processing.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { SuperTypeSorter } from '@utils/sorters/super-type-sorter'; -import { handleCheckedValue, IFilter, INestedFilter, NestedFilter } from '@iqser/common-ui'; +import { Filter, handleCheckedValue, IFilter, INestedFilter, NestedFilter } from '@iqser/common-ui'; import { annotationTypesTranslations } from '../../../translations/annotation-types-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; @@ -50,12 +50,11 @@ export class AnnotationProcessingService { const childFilter: IFilter = { id: a.type, label: a.type, - searchKey: a.type, checked: false, matches: 1 }; filterMap.set(key, childFilter); - parentFilter.children.push(childFilter); + parentFilter.children.push(new Filter(childFilter)); } } });