From d6d3dabc216135cb81007c5fbd0246a98b1d3251 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Tue, 10 Jan 2023 12:51:16 +0200 Subject: [PATCH] RED-5908: remove primary key property --- .../permissions-configuration-map.service.ts | 11 ++--------- .../entity-permissions/permissions-map.service.ts | 4 +--- .../entity-services/dictionaries-map.service.ts | 6 ++---- .../dossier-dictionaries-map.service.ts | 6 ++---- .../entity-services/dossier-states-map.service.ts | 4 +--- .../entity-services/watermarks-map.service.ts | 6 ++---- .../src/app/services/files/files-map.service.ts | 4 +--- .../app/services/files/viewed-pages-map.service.ts | 4 +--- 8 files changed, 12 insertions(+), 33 deletions(-) diff --git a/apps/red-ui/src/app/services/entity-permissions/permissions-configuration-map.service.ts b/apps/red-ui/src/app/services/entity-permissions/permissions-configuration-map.service.ts index b5ab88bee..ee80daa7f 100644 --- a/apps/red-ui/src/app/services/entity-permissions/permissions-configuration-map.service.ts +++ b/apps/red-ui/src/app/services/entity-permissions/permissions-configuration-map.service.ts @@ -4,15 +4,8 @@ import { EntitiesMapService } from '@iqser/common-ui'; @Injectable({ providedIn: 'root' }) export class PermissionsConfigurationMapService extends EntitiesMapService { - protected readonly _primaryKey = 'name'; - getMappedPermissions(targetObject: string): string[] { - return Array.from( - new Set( - this.get(targetObject) - .flatMap(p => p.mappedPermissions) - .map(p => p.name), - ), - ); + const mappedPermissions = this.get(targetObject).flatMap(p => p.mappedPermissions); + return Array.from(new Set(mappedPermissions.map(p => p.name))); } } diff --git a/apps/red-ui/src/app/services/entity-permissions/permissions-map.service.ts b/apps/red-ui/src/app/services/entity-permissions/permissions-map.service.ts index ff4d6534b..b75795fe2 100644 --- a/apps/red-ui/src/app/services/entity-permissions/permissions-map.service.ts +++ b/apps/red-ui/src/app/services/entity-permissions/permissions-map.service.ts @@ -3,6 +3,4 @@ import { IPermissionsMapping, PermissionsMapping } from '@red/domain'; import { EntitiesMapService } from '@iqser/common-ui'; @Injectable({ providedIn: 'root' }) -export class PermissionsMapService extends EntitiesMapService { - protected readonly _primaryKey = 'name'; -} +export class PermissionsMapService extends EntitiesMapService {} diff --git a/apps/red-ui/src/app/services/entity-services/dictionaries-map.service.ts b/apps/red-ui/src/app/services/entity-services/dictionaries-map.service.ts index fdb91a221..186cfdb8f 100644 --- a/apps/red-ui/src/app/services/entity-services/dictionaries-map.service.ts +++ b/apps/red-ui/src/app/services/entity-services/dictionaries-map.service.ts @@ -1,8 +1,6 @@ import { Injectable } from '@angular/core'; -import { Dictionary, DOSSIER_TEMPLATE_ID, IDictionary } from '@red/domain'; +import { Dictionary, IDictionary } from '@red/domain'; import { EntitiesMapService } from '@iqser/common-ui'; @Injectable({ providedIn: 'root' }) -export class DictionariesMapService extends EntitiesMapService { - protected readonly _primaryKey = DOSSIER_TEMPLATE_ID; -} +export class DictionariesMapService extends EntitiesMapService {} diff --git a/apps/red-ui/src/app/services/entity-services/dossier-dictionaries-map.service.ts b/apps/red-ui/src/app/services/entity-services/dossier-dictionaries-map.service.ts index 8a8852a95..823ae5072 100644 --- a/apps/red-ui/src/app/services/entity-services/dossier-dictionaries-map.service.ts +++ b/apps/red-ui/src/app/services/entity-services/dossier-dictionaries-map.service.ts @@ -1,8 +1,6 @@ import { Injectable } from '@angular/core'; -import { Dictionary, DOSSIER_ID, IDictionary } from '@red/domain'; +import { Dictionary, IDictionary } from '@red/domain'; import { EntitiesMapService } from '@iqser/common-ui'; @Injectable({ providedIn: 'root' }) -export class DossierDictionariesMapService extends EntitiesMapService { - protected readonly _primaryKey = DOSSIER_ID; -} +export class DossierDictionariesMapService extends EntitiesMapService {} diff --git a/apps/red-ui/src/app/services/entity-services/dossier-states-map.service.ts b/apps/red-ui/src/app/services/entity-services/dossier-states-map.service.ts index 48532161e..95498e656 100644 --- a/apps/red-ui/src/app/services/entity-services/dossier-states-map.service.ts +++ b/apps/red-ui/src/app/services/entity-services/dossier-states-map.service.ts @@ -1,12 +1,10 @@ import { Injectable } from '@angular/core'; -import { DonutChartConfig, DOSSIER_TEMPLATE_ID, DossierState, IDossierState } from '@red/domain'; +import { DonutChartConfig, DossierState, IDossierState } from '@red/domain'; import { EntitiesMapService } from '@iqser/common-ui'; import { flatMap } from 'lodash-es'; @Injectable({ providedIn: 'root' }) export class DossierStatesMapService extends EntitiesMapService { - protected readonly _primaryKey = DOSSIER_TEMPLATE_ID; - get stats(): DonutChartConfig[] { const allStates = flatMap(Array.from(this._map.values()).map(obs => obs.value)); return Array.from( diff --git a/apps/red-ui/src/app/services/entity-services/watermarks-map.service.ts b/apps/red-ui/src/app/services/entity-services/watermarks-map.service.ts index 928c5a9e0..80fbe4831 100644 --- a/apps/red-ui/src/app/services/entity-services/watermarks-map.service.ts +++ b/apps/red-ui/src/app/services/entity-services/watermarks-map.service.ts @@ -1,8 +1,6 @@ import { Injectable } from '@angular/core'; -import { DOSSIER_TEMPLATE_ID, IWatermark, Watermark } from '@red/domain'; +import { IWatermark, Watermark } from '@red/domain'; import { EntitiesMapService } from '@iqser/common-ui'; @Injectable({ providedIn: 'root' }) -export class WatermarksMapService extends EntitiesMapService { - protected readonly _primaryKey = DOSSIER_TEMPLATE_ID; -} +export class WatermarksMapService extends EntitiesMapService {} diff --git a/apps/red-ui/src/app/services/files/files-map.service.ts b/apps/red-ui/src/app/services/files/files-map.service.ts index 1eb98daf7..4d7ff84e0 100644 --- a/apps/red-ui/src/app/services/files/files-map.service.ts +++ b/apps/red-ui/src/app/services/files/files-map.service.ts @@ -1,11 +1,9 @@ import { Injectable } from '@angular/core'; -import { DOSSIER_ID, File, IFile } from '@red/domain'; +import { File, IFile } from '@red/domain'; import { EntitiesMapService, NonFunctionKeys } from '@iqser/common-ui'; @Injectable({ providedIn: 'root' }) export class FilesMapService extends EntitiesMapService { - protected readonly _primaryKey = DOSSIER_ID; - replaceFiles, T2 extends File[T]>(files: File[], property: T, generateValue: (value: T2) => T2) { const newFiles = files.map( file => diff --git a/apps/red-ui/src/app/services/files/viewed-pages-map.service.ts b/apps/red-ui/src/app/services/files/viewed-pages-map.service.ts index 76713e0a2..3a74459b6 100644 --- a/apps/red-ui/src/app/services/files/viewed-pages-map.service.ts +++ b/apps/red-ui/src/app/services/files/viewed-pages-map.service.ts @@ -3,6 +3,4 @@ import { IViewedPage, ViewedPage } from '@red/domain'; import { EntitiesMapService } from '@iqser/common-ui'; @Injectable({ providedIn: 'root' }) -export class ViewedPagesMapService extends EntitiesMapService { - protected readonly _primaryKey = 'id'; -} +export class ViewedPagesMapService extends EntitiesMapService {}