From 7b7a4cff81563f292ef57deea3b476bd49259dee Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Thu, 17 Feb 2022 13:42:02 +0200 Subject: [PATCH 01/15] load only open dossier's stats --- .../services/entity-services/dossiers.service.ts | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts b/apps/red-ui/src/app/services/entity-services/dossiers.service.ts index 4787fdb30..4a680ef1e 100644 --- a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts +++ b/apps/red-ui/src/app/services/entity-services/dossiers.service.ts @@ -2,7 +2,7 @@ import { Injectable, Injector } from '@angular/core'; import { EntitiesService, List, mapEach, QueryParam, RequiredParam, shareLast, Toaster, Validate } from '@iqser/common-ui'; import { Dossier, IDossier, IDossierRequest } from '@red/domain'; import { catchError, filter, map, mapTo, switchMap, tap } from 'rxjs/operators'; -import { combineLatest, firstValueFrom, Observable, of, Subject, throwError, timer } from 'rxjs'; +import { combineLatest, firstValueFrom, forkJoin, Observable, of, Subject, throwError, timer } from 'rxjs'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { HttpErrorResponse, HttpStatusCode } from '@angular/common/http'; import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; @@ -62,13 +62,16 @@ export class DossiersService extends EntitiesService { } loadAllIfChanged(): Observable { - return this.hasChangesDetails$().pipe(switchMap(changes => this.loadAll().pipe(mapTo(changes)))); + return this.hasChangesDetails$().pipe( + switchMap(changes => forkJoin(changes.dossierChanges.map(change => this.load(change.dossierId))).pipe(mapTo(changes))), + ); } hasChangesDetails$(): Observable { const body = { value: this._lastCheckedForChanges.get('root') ?? '0' }; return this._post(body, `${this._defaultModelPath}/changes/details`).pipe( filter(changes => changes.dossierChanges.length > 0), + tap(() => this._updateLastChanged()), ); } @@ -115,6 +118,14 @@ export class DossiersService extends EntitiesService { return this.all.filter(dossier => dossier.dossierStatusId === dossierStatusId).length; } + load(id: string, queryParams?: List): Observable { + return super._getOne([id], this._defaultModelPath, queryParams).pipe( + map(entity => new Dossier(entity)), + switchMap(dossier => this._dossierStatsService.getFor([dossier.dossierId]).pipe(mapTo(dossier))), + tap(dossier => this.replace(dossier)), + ); + } + private _emitFileChanges(changes: ChangesDetails): void { changes.dossierChanges.filter(change => change.fileChanges).forEach(change => this.dossierFileChanges$.next(change.dossierId)); } From 51b3d38d28bb9700772cfac72385fb9709789b1a Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Thu, 17 Feb 2022 12:46:19 +0100 Subject: [PATCH 02/15] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3215 -> 3214 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c2f6e6561..01cdfda2e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.236.0", + "version": "3.237.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 8b823f63ce3602f6fa0f626ca9ffbf20656da871..6a97aa814f463d65866f6f75c830ecc6566d1447 100644 GIT binary patch delta 1014 zcmVyk7soVhQ?R1TY=h-!H4? z_6yhln<&LqO&GfT>(^gctINBKH*{MT6+=yxU0tS(mG%1OCVwe%R?jy@vB?N7X+4jM z?F|@&`?~~hY4-HVpG%Ve_A8v%Yszpod)TDxjXm>h`_7*E;%^}SF2vuZ_`8C?j+o~8&>e&Wl>W`3+Smxh8cZJ4&$D;pMO?DNfwKh3vC70KD1k^iWvYTi{AG-sqT*n-WiLHuVQ$HF=--b#5J3@DEMI1rdF z-fT%sF)H%x3Dr?WNRDtGqbp^LEct%B7P!p&TGOEKwsJ7$AskIx&->tCBi!Q9b>-`3 zW&oTkKP(zelA`LVLnpbdr61clMMrmJy;sx>riY%>JeT&-IX$ z<$qD9HEAGhozSXgR+LidY=jtE`M|n2U_v=^C&5wb?<|;6mXX=SL~v`7=wU_F&K$;4 zcXebe^%i=lvrixo;S&hNMn`|bTCMv!Wkto|jU6l_kIafmR8+Wi>7aX3aoJ2$)nwz{ z(Hr6($z@c7^LIYmJbPqF>ZW$>JtoM3Ghu9k9cM%nlIWQ7lw%J?%Nsyu|Xd@ z^dF*+)JJ?zP1yvx=THTed8 kd~-1eWEMz(WR_#}q?i9l+~xAKQ3N&!2owu$j{r~r0Ce5?_W%F@ delta 1015 zcmV%2n24?@kLH8sN(LO;e*KgTxL^)G+a>?tGl z_hk*I>)-R7;H>{2qwUpyMPeK=IW~{#`oq@X3SRhA`u7}Ax77aZiVXZFjF5b{>SyT))Rd#imGFH~>n}3_6$XPw#6vZYZxTN(w zDz-OZ5bp01yrtRGCx0$U{@br`Uau*`+3aDHvN!h3v+X;3=8M09_`48)m*VdV{yJig zBjz|_jw9wcVvfV-{3fP#nc=5T>IYn2Uf*5JIej>@Qi5Yrp?_T<^vBk-PF--xUaZ6q3XKWl=kC>4Zk z@uT%XW0nFg+g6dS5pGz)f0so~87-ivA{l1%Ejf&P-hX~t2_;!9R+6hYw*704G%PAE zN92@`s4g-ZqmN=Q4r06;v??6arUuSix(sqolH^2M)@v|?h@?f^e_|JTphU?9OAus&E#3m_e@dc!tH~LcI5}(}Ojs331 zy#B0hc|Yxj65BZ1e1qA*q|%wfC4H2V%~!33i+jO;D;Us&hAbL|zyovb%3<2*d_` z?9hLRK2jg?JvC($APd#Kj03@k1v-<%+~*YAU?vb8<1_|tqsu*cIK257eNOX?P}bxd l^zqHb9FSQc0g_pc(UV^OBY{frvrq&!2nbo61xf%=005y{>z4ok From b33f68733dc322d76911e3c05af365323a070b7f Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Thu, 17 Feb 2022 13:53:37 +0200 Subject: [PATCH 03/15] rename and refactor loading only changed dossiers --- .../entity-services/dossiers.service.ts | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts b/apps/red-ui/src/app/services/entity-services/dossiers.service.ts index 4a680ef1e..6869264b0 100644 --- a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts +++ b/apps/red-ui/src/app/services/entity-services/dossiers.service.ts @@ -14,14 +14,16 @@ export interface IDossiersStats { totalAnalyzedPages: number; } +interface DossierChange { + readonly dossierChanges: boolean; + readonly dossierId: string; + readonly fileChanges: boolean; +} + +type DossierChanges = readonly DossierChange[]; + interface ChangesDetails { - dossierChanges: [ - { - dossierChanges: boolean; - dossierId: string; - fileChanges: boolean; - }, - ]; + readonly dossierChanges: DossierChanges; } const DOSSIER_EXISTS_MSG = _('add-dossier-dialog.errors.dossier-already-exists'); @@ -44,7 +46,7 @@ export class DossiersService extends EntitiesService { timer(CHANGED_CHECK_INTERVAL, CHANGED_CHECK_INTERVAL) .pipe( - switchMap(() => this.loadAllIfChanged()), + switchMap(() => this.loadOnlyChanged()), tap(changes => this._emitFileChanges(changes)), ) .subscribe(); @@ -61,9 +63,12 @@ export class DossiersService extends EntitiesService { ); } - loadAllIfChanged(): Observable { + loadOnlyChanged(): Observable { + const load = (changes: DossierChanges) => forkJoin(changes.map(change => this.load(change.dossierId))); + return this.hasChangesDetails$().pipe( - switchMap(changes => forkJoin(changes.dossierChanges.map(change => this.load(change.dossierId))).pipe(mapTo(changes))), + switchMap(changes => load(changes.dossierChanges).pipe(mapTo(changes))), + tap(() => this._updateLastChanged()), ); } @@ -71,7 +76,6 @@ export class DossiersService extends EntitiesService { const body = { value: this._lastCheckedForChanges.get('root') ?? '0' }; return this._post(body, `${this._defaultModelPath}/changes/details`).pipe( filter(changes => changes.dossierChanges.length > 0), - tap(() => this._updateLastChanged()), ); } From a4458184f1b3c05bac16c732959ff6be2659d96a Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Thu, 17 Feb 2022 12:57:53 +0100 Subject: [PATCH 04/15] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3214 -> 3215 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 01cdfda2e..4132d5b49 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.237.0", + "version": "3.238.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 6a97aa814f463d65866f6f75c830ecc6566d1447..c7e70d3081378e81a1ea81325b8c91e4143ae8be 100644 GIT binary patch delta 3126 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 Date: Thu, 17 Feb 2022 14:03:01 +0200 Subject: [PATCH 05/15] refactor private methods in dossiers service --- .../services/entity-services/dossiers.service.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts b/apps/red-ui/src/app/services/entity-services/dossiers.service.ts index 6869264b0..5d7a7174b 100644 --- a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts +++ b/apps/red-ui/src/app/services/entity-services/dossiers.service.ts @@ -33,7 +33,7 @@ const GENERIC_MSG = _('add-dossier-dialog.errors.generic'); providedIn: 'root', }) export class DossiersService extends EntitiesService { - readonly generalStats$ = this.all$.pipe(switchMap(entities => this._generalStats$(entities))); + readonly generalStats$ = this.all$.pipe(switchMap(entities => this.#generalStats$(entities))); readonly dossierFileChanges$ = new Subject(); constructor( @@ -47,7 +47,7 @@ export class DossiersService extends EntitiesService { timer(CHANGED_CHECK_INTERVAL, CHANGED_CHECK_INTERVAL) .pipe( switchMap(() => this.loadOnlyChanged()), - tap(changes => this._emitFileChanges(changes)), + tap(changes => this.#emitFileChanges(changes)), ) .subscribe(); } @@ -64,7 +64,7 @@ export class DossiersService extends EntitiesService { } loadOnlyChanged(): Observable { - const load = (changes: DossierChanges) => forkJoin(changes.map(change => this.load(change.dossierId))); + const load = (changes: DossierChanges) => forkJoin(changes.map(change => this._load(change.dossierId))); return this.hasChangesDetails$().pipe( switchMap(changes => load(changes.dossierChanges).pipe(mapTo(changes))), @@ -122,7 +122,7 @@ export class DossiersService extends EntitiesService { return this.all.filter(dossier => dossier.dossierStatusId === dossierStatusId).length; } - load(id: string, queryParams?: List): Observable { + private _load(id: string, queryParams?: List): Observable { return super._getOne([id], this._defaultModelPath, queryParams).pipe( map(entity => new Dossier(entity)), switchMap(dossier => this._dossierStatsService.getFor([dossier.dossierId]).pipe(mapTo(dossier))), @@ -130,11 +130,11 @@ export class DossiersService extends EntitiesService { ); } - private _emitFileChanges(changes: ChangesDetails): void { + #emitFileChanges(changes: ChangesDetails): void { changes.dossierChanges.filter(change => change.fileChanges).forEach(change => this.dossierFileChanges$.next(change.dossierId)); } - private _computeStats(entities: List): IDossiersStats { + #computeStats(entities: List): IDossiersStats { let totalAnalyzedPages = 0; const totalPeople = new Set(); @@ -149,11 +149,11 @@ export class DossiersService extends EntitiesService { }; } - private _generalStats$(entities: List): Observable { + #generalStats$(entities: List): Observable { const stats$ = entities.map(entity => this._dossierStatsService.watch$(entity.dossierId)); return combineLatest(stats$).pipe( filter(stats => stats.every(s => !!s)), - map(() => this._computeStats(entities)), + map(() => this.#computeStats(entities)), shareLast(), ); } From 7c1347bc24808bb439bb6d487f583e5ef706ab0c Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Thu, 17 Feb 2022 13:15:23 +0100 Subject: [PATCH 06/15] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3215 -> 3215 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4132d5b49..9af209bd4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.238.0", + "version": "3.239.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index c7e70d3081378e81a1ea81325b8c91e4143ae8be..e9d19de813ddc7a08d24a12e0ca4f1e65a89293c 100644 GIT binary patch delta 3097 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 From 8b1d63a6757b13a3acd2adfeb5df2808bf79181e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Thu, 17 Feb 2022 19:55:18 +0200 Subject: [PATCH 07/15] RED-3411: list indicator --- ...rm-delete-dossier-state-dialog.component.ts | 3 ++- .../file-name-column.component.html | 8 +++++++- .../file-name-column.component.scss | 8 ++++++++ .../table-item/table-item.component.html | 8 +++----- .../workflow-item/workflow-item.component.html | 9 +-------- .../file-preview-screen.component.html | 9 +-------- .../file-preview-screen.component.ts | 2 +- .../file-actions/file-actions.component.html | 9 +-------- .../file-actions/file-actions.component.ts | 2 +- .../translations/file-status-translations.ts | 2 ++ .../processing-indicator.component.html | 3 +++ .../processing-indicator.component.scss | 3 +++ .../processing-indicator.component.ts | 18 ++++++++++++++++++ .../src/app/modules/shared/shared.module.ts | 2 ++ apps/red-ui/src/assets/i18n/en.json | 10 +++++++--- libs/red-domain/src/lib/files/file.model.ts | 8 +++++--- libs/red-domain/src/lib/files/types.ts | 6 +++++- 17 files changed, 70 insertions(+), 40 deletions(-) create mode 100644 apps/red-ui/src/app/modules/shared/components/processing-indicator/processing-indicator.component.html create mode 100644 apps/red-ui/src/app/modules/shared/components/processing-indicator/processing-indicator.component.scss create mode 100644 apps/red-ui/src/app/modules/shared/components/processing-indicator/processing-indicator.component.ts diff --git a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts index 6088cb114..387160092 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component.ts @@ -2,6 +2,7 @@ import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; import { IDossierState } from '@red/domain'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { FormBuilder, FormGroup } from '@angular/forms'; +import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; interface DialogData { readonly toBeDeletedState: IDossierState; @@ -38,7 +39,7 @@ export class ConfirmDeleteDossierStateDialogComponent { } get label(): string { - return this.replaceDossierStatusId ? 'confirm-delete-dossier-state.delete-replace' : 'confirm-delete-dossier-state.delete'; + return this.replaceDossierStatusId ? _('confirm-delete-dossier-state.delete-replace') : _('confirm-delete-dossier-state.delete'); } get afterCloseValue(): string | true { diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-name-column/file-name-column.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-name-column/file-name-column.component.html index 3c6f12950..f6b15ff1b 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-name-column/file-name-column.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-name-column/file-name-column.component.html @@ -1,5 +1,11 @@
-
+
{{ file.filename }}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-name-column/file-name-column.component.scss b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-name-column/file-name-column.component.scss index bcbf74f08..6d6ea372d 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-name-column/file-name-column.component.scss +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-name-column/file-name-column.component.scss @@ -2,6 +2,14 @@ .table-item-title { max-width: 25vw; + + &.error { + color: var(--iqser-red-1); + } + + &.initial-processing { + color: var(--iqser-disabled); + } } .primary-attribute { diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/table-item.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/table-item.component.html index 23d443a1f..ac30d92cd 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/table-item.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/table-item.component.html @@ -40,15 +40,13 @@
-
+
-
- -
+
-
- -
+
-
- -
+ diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts index ff7186de9..6fdff7a0d 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts @@ -566,7 +566,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni return this._router.navigate([this._dossiersService.find(this.dossierId).routerLink]); } - if (file.isPending) { + if (file.isUnprocessed) { return; } diff --git a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.html b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.html index a65863042..94b795272 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.html +++ b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.html @@ -1,13 +1,6 @@
-
- -
+
diff --git a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts index 8b4d73884..cf73d8661 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.ts @@ -373,7 +373,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, this.canDisableAutoAnalysis = this._permissionsService.canDisableAutoAnalysis([this.file]); this.canEnableAutoAnalysis = this._permissionsService.canEnableAutoAnalysis([this.file]); - this.showStatusBar = !this.file.isError && !this.file.isPending && this.isDossierOverviewList; + this.showStatusBar = !this.file.isError && !this.file.isUnprocessed && this.isDossierOverviewList; this.showAssignToSelf = this._permissionsService.canAssignToSelf(this.file) && this.isDossierOverview; this.showAssign = diff --git a/apps/red-ui/src/app/modules/dossier/translations/file-status-translations.ts b/apps/red-ui/src/app/modules/dossier/translations/file-status-translations.ts index 4649a8f47..1e413fccd 100644 --- a/apps/red-ui/src/app/modules/dossier/translations/file-status-translations.ts +++ b/apps/red-ui/src/app/modules/dossier/translations/file-status-translations.ts @@ -10,6 +10,8 @@ export const workflowFileStatusTranslations: { [key in WorkflowFileStatus]: stri }; export const processingFileStatusTranslations: { [key in ProcessingFileStatus]: string } = { + ANALYSE: _('file-status.analyse'), + NER_ANALYZING: _('file-status.ner-analyzing'), PROCESSED: _('file-status.processed'), DELETED: _('file-status.deleted'), ERROR: _('file-status.error'), diff --git a/apps/red-ui/src/app/modules/shared/components/processing-indicator/processing-indicator.component.html b/apps/red-ui/src/app/modules/shared/components/processing-indicator/processing-indicator.component.html new file mode 100644 index 000000000..b7f2967c8 --- /dev/null +++ b/apps/red-ui/src/app/modules/shared/components/processing-indicator/processing-indicator.component.html @@ -0,0 +1,3 @@ +
+ +
diff --git a/apps/red-ui/src/app/modules/shared/components/processing-indicator/processing-indicator.component.scss b/apps/red-ui/src/app/modules/shared/components/processing-indicator/processing-indicator.component.scss new file mode 100644 index 000000000..7f26ddcb5 --- /dev/null +++ b/apps/red-ui/src/app/modules/shared/components/processing-indicator/processing-indicator.component.scss @@ -0,0 +1,3 @@ +:host { + display: block; +} diff --git a/apps/red-ui/src/app/modules/shared/components/processing-indicator/processing-indicator.component.ts b/apps/red-ui/src/app/modules/shared/components/processing-indicator/processing-indicator.component.ts new file mode 100644 index 000000000..c70b5a778 --- /dev/null +++ b/apps/red-ui/src/app/modules/shared/components/processing-indicator/processing-indicator.component.ts @@ -0,0 +1,18 @@ +import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core'; +import { File } from '@red/domain'; +import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; + +@Component({ + selector: 'redaction-processing-indicator [file]', + templateUrl: './processing-indicator.component.html', + styleUrls: ['./processing-indicator.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class ProcessingIndicatorComponent implements OnChanges { + tooltip: string; + @Input() file: File; + + ngOnChanges() { + this.tooltip = this.file.isInitialProcessing ? _('file-status.initial-processing') : _('file-status.re-processing'); + } +} diff --git a/apps/red-ui/src/app/modules/shared/shared.module.ts b/apps/red-ui/src/app/modules/shared/shared.module.ts index 4f606ceb9..939fd0eb7 100644 --- a/apps/red-ui/src/app/modules/shared/shared.module.ts +++ b/apps/red-ui/src/app/modules/shared/shared.module.ts @@ -26,6 +26,7 @@ import { TypeFilterComponent } from './components/type-filter/type-filter.compon import { TeamMembersComponent } from './components/team-members/team-members.component'; import { EditorComponent } from './components/editor/editor.component'; import { ExpandableFileActionsComponent } from './components/expandable-file-actions/expandable-file-actions.component'; +import { ProcessingIndicatorComponent } from '@shared/components/processing-indicator/processing-indicator.component'; const buttons = [FileDownloadBtnComponent, UserButtonComponent]; @@ -41,6 +42,7 @@ const components = [ TypeFilterComponent, TeamMembersComponent, ExpandableFileActionsComponent, + ProcessingIndicatorComponent, ...buttons, ]; diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index df128effe..735fca3da 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -410,8 +410,8 @@ "configurations": "Configurations", "confirm-delete-dossier-state": { "cancel": "Cancel", - "delete-replace": "Delete and Replace", "delete": "Delete only", + "delete-replace": "Delete and Replace", "form": { "status": "Replace Status", "status-placeholder": "Choose another status" @@ -910,12 +910,12 @@ }, "download-type": { "annotated": "Annotated PDF", + "delta-preview": "Delta PDF", "flatten": "Flatten PDF", "label": "{length} document {length, plural, one{version} other{versions}}", "original": "Optimized PDF", "preview": "Preview PDF", - "redacted": "Redacted PDF", - "delta-preview": "Delta PDF" + "redacted": "Redacted PDF" }, "downloads-list": { "actions": { @@ -1248,16 +1248,20 @@ } }, "file-status": { + "analyse": "Analyzing", "approved": "Approved", "deleted": "Deleted", "error": "Re-processing required", "full-reprocess": "Processing", "image-analyzing": "Image Analyzing", "indexing": "Processing", + "initial-processing": "Initial processing...", + "ner-analyzing": "NER Analyzing", "new": "New", "ocr-processing": "OCR Processing", "processed": "Processed", "processing": "Processing...", + "re-processing": "Re-processing...", "reprocess": "Processing", "unassigned": "Unassigned", "under-approval": "Under Approval", diff --git a/libs/red-domain/src/lib/files/file.model.ts b/libs/red-domain/src/lib/files/file.model.ts index d1168ffa2..2c4f19da3 100644 --- a/libs/red-domain/src/lib/files/file.model.ts +++ b/libs/red-domain/src/lib/files/file.model.ts @@ -48,8 +48,9 @@ export class File extends Entity implements IFile { readonly isNew: boolean; readonly isError: boolean; readonly isProcessing: boolean; + readonly isInitialProcessing: boolean; readonly isApproved: boolean; - readonly isPending: boolean; + readonly isUnprocessed: boolean; readonly isUnderReview: boolean; readonly isUnderApproval: boolean; readonly canBeApproved: boolean; @@ -89,6 +90,7 @@ export class File extends Entity implements IFile { this.processingStatus = file.processingStatus; this.workflowStatus = file.workflowStatus; this.isError = this.processingStatus === ProcessingFileStatuses.ERROR; + this.isUnprocessed = this.processingStatus === ProcessingFileStatuses.UNPROCESSED; this.numberOfPages = this.isError ? 0 : file.numberOfPages ?? 0; this.rulesVersion = file.rulesVersion; this.uploader = file.uploader; @@ -99,14 +101,14 @@ export class File extends Entity implements IFile { this.cacheIdentifier = btoa((this.lastUploaded ?? '') + (this.lastOCRTime ?? '')); this.hintsOnly = this.hasHints && !this.hasRedactions; this.hasNone = !this.hasRedactions && !this.hasHints && !this.hasSuggestions; - this.isPending = this.processingStatus === ProcessingFileStatuses.UNPROCESSED; this.isProcessing = isProcessingStatuses.includes(this.processingStatus); + this.isInitialProcessing = this.isProcessing && this.numberOfAnalyses === 0; this.isApproved = this.workflowStatus === WorkflowFileStatuses.APPROVED; this.isNew = this.workflowStatus === WorkflowFileStatuses.NEW; this.isUnderReview = this.workflowStatus === WorkflowFileStatuses.UNDER_REVIEW; this.isUnderApproval = this.workflowStatus === WorkflowFileStatuses.UNDER_APPROVAL; this.canBeApproved = !this.analysisRequired && !this.hasSuggestions && !this.isProcessing && !this.isError; - this.canBeOpened = !this.isError && !this.isPending && this.numberOfAnalyses > 0; + this.canBeOpened = !this.isError && !this.isUnprocessed && this.numberOfAnalyses > 0; this.canBeOCRed = !this.excluded && !this.lastOCRTime && (this.isNew || this.isUnderReview || this.isUnderApproval); if (!this.fileAttributes || !this.fileAttributes.attributeIdToValue) { diff --git a/libs/red-domain/src/lib/files/types.ts b/libs/red-domain/src/lib/files/types.ts index 70155c11f..bce6a1566 100644 --- a/libs/red-domain/src/lib/files/types.ts +++ b/libs/red-domain/src/lib/files/types.ts @@ -11,16 +11,18 @@ export const WorkflowFileStatuses = { export type WorkflowFileStatus = keyof typeof WorkflowFileStatuses; export const ProcessingFileStatuses = { + ANALYSE: 'ANALYSE', DELETED: 'DELETED', ERROR: 'ERROR', FULLREPROCESS: 'FULLREPROCESS', IMAGE_ANALYZING: 'IMAGE_ANALYZING', - SURROUNDING_TEXT_PROCESSING: 'SURROUNDING_TEXT_PROCESSING', INDEXING: 'INDEXING', + NER_ANALYZING: 'NER_ANALYZING', OCR_PROCESSING: 'OCR_PROCESSING', PROCESSED: 'PROCESSED', PROCESSING: 'PROCESSING', REPROCESS: 'REPROCESS', + SURROUNDING_TEXT_PROCESSING: 'SURROUNDING_TEXT_PROCESSING', UNPROCESSED: 'UNPROCESSED', } as const; @@ -32,8 +34,10 @@ export const isProcessingStatuses: List = [ ProcessingFileStatuses.SURROUNDING_TEXT_PROCESSING, ProcessingFileStatuses.OCR_PROCESSING, ProcessingFileStatuses.IMAGE_ANALYZING, + ProcessingFileStatuses.NER_ANALYZING, ProcessingFileStatuses.INDEXING, ProcessingFileStatuses.PROCESSING, + ProcessingFileStatuses.ANALYSE, ] as const; export interface StatusBarConfig { From a5b7e46fad90600acec7c8ebd02ceca0dc598fec Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Thu, 17 Feb 2022 19:02:36 +0100 Subject: [PATCH 08/15] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3215 -> 3214 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9af209bd4..b4ca07d4c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.239.0", + "version": "3.240.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index e9d19de813ddc7a08d24a12e0ca4f1e65a89293c..5eb856afa2d86a5bc9e94500f0ffac385c23d705 100644 GIT binary patch delta 3015 zcmV;&3pn(T8IBo{b_*BS3(xak*^V99&XIv3DR&v1_5WkEz51_6j3Xw;=22aL*cx2H z3x7)gp5u64um45hfc_T&m;sT@R)6N%_MJWR#os{uU5LL+@plD(9Wloda~v_p5px_d z$Ki8+6VtlP@Y5&t11>MG?=I$?KAc%8!7-`Ozb+7ZXVE++k89-I!LO81SbvTDz%C!} zE}jPv>vc$yq9Ot^#L@kxDw;gDq9QA*HTuY1d9Lq_;ZW)b5H1X>rtioaEq{Ezfb4pZ z%W{sOFQYlJI#O24cH$OS8=70JC;@n-^@Rmv#TKYG5{}{l%c7=?7SL0X3^V$c9L7CwKdpq4EEX%tRUF&?HAfm26_+D&%12Ze8I93L zu@?t1-VIt6j%iZ^=Pg|ZIe#Zfaw0A3H5fuf(jw~=Uz9ka>}iec`SL_$vzM(rv=+@S z9BCJt4LGY~6gw7viQ|~&8$jTKyq)DySVES!z`g!)2&!rr;dE6kMZ!*Z=(#$bNqw;j zws(mulCwJ_|4~!bysIo|&PZjj1)E!g_|HC$g>_oImGU+iP#pVlAb&7jyxEeNVpQbW z6RM+%kR0JWMpw!fS@QjMEpVClwWdMeZRKFz+XKx8a(6#-rV@f#1ECYh1Tg??hC`Bx z6{IIyqrAw)J{-@Un%Bt&G?fvnY{HC2m@9TdIGVPe_rbqLxW%FC%Gb@z0615ESTvd> zMb%S>PI6mIKels4e!FC(0=W(%t}2*kl+qjAFQT@4>_i3N|B1jX1~$+0@BSJeJOE?Pj2tVeplmh%A-ze(m>cc zp;gVSD5cWb2r;zsfpu@dgmUCgf}_;mSumq4BeRK#;MOA1!+(mXojHu9?&`=`>Mit8 zXP-bG!Y2@jjgJ0=wOaRe%8H7^8#`D=9+?%BsHkx3(n0s6;#N?qc_AolFO(D z=kI*BdG^SV)J^T$drXi6XV?Tg&WI)`)fLsb8$BW~3=!Ggw>1P}gFbfXKSUp?kNBRN zvI&rd>R!fy;D5scoylSDbBb*+69|rR8Uwe{<(@no-h7Ncr+G#wYw`{H_~v2`$SjZm z$t=g{NiYAAxXb0G;1;0&UR3uc*a(dXmfo7T-%A0qvI7muI;Z31%?Asp2 zXC!afJ5p^){{B0zU}Tk5kqFT~ib`s?>Qc&JEpjJju2pMMx zCd#FrCzg+u0f77gFQ( z`|m(gHMgN5p6NZ|;U3Q)GN2KU*qhu8wj1wg`1CLT`}copbd|pUwn^xQpf4&gkNkRw zZF)BZk|RCYw<=OM8JkKVlK}oLTQ~{8kz(5UGJhG-`iLR3$i3_IQE+AR;Ku(6h$fS3 zv~z1EIiASUPRqpf(CE1>p`%qhMpFn?84p)VzQm8`cuc6aI1@ByRD%Xf-s)jruG3T0 z3(CY#FBuMmR-Gh=D?mpE84RR5#W$7c71HB+!|t(dBT9u zscLJtlf*_^_?_&I&%X?dLt*-{nE)8jcd$Vw-Q0OpluzQg!;EV;t{!v+yxs!6tt*%; z1}uwyQ-g-eiURMDk%>JSW{o&c8H`%hCVvF(TziIGPyF#sv)na;1O+0ZI*6l4ILjgG zw!g*fxSl{dLyqI9lOSKjVMb!GzFY5hg>7{(FIYdpV*JD6o0WU3+XN?}IyYpHes3(1 z{jOCz)F*IQJ8=??y$4+7d>{^ETO;5hh4t1*d}z2ba21?m_)z<^)=Eb6YXVLLGk?Cx zKpgnWbr&EGcg1A_g0bhf*Xs0d8XDbOkg_r1_*zG<99VYqHWhh-oK&s2v>}%><+qV& zFyz4y#yASS(U5NxpBM_J$ygXAD~6Uv<%*$|QI{KDB?!iBJ4x&z7>sewf`|mS+GLJ%y>=*jrp(?Xj3^Z9;1g*E%BUJ6K9{J^=aB*AM!5zhM zg6&nZtu@+?TH3LY%Zz5uVVp+b`ty4&vv0wimgG^o?w^*LXI-++&~jmZe`-YXnjdL(7&;kdBvCW5DWE3X z2i{dNM}Y4~g?mU$rVm2HURa1IUkbf?p#e zs?;?gvz7RCF^4>5L#(%yJcw5n>csY#^m#OgZa3pvw3`fN4nL3^nUiO}HtV_vf{{qt zZ8+0@iW?uZjt#arHh;UJecrYcg?)$vfTXB^um(!*D#A4xQg`&h!EU#j4iYpDclR(l zpNd8Av)>bL!_}If*FnG)EDMzvzZmP2xEVhzYxp|wjnQ(fP1meVcc4vS8p3+Tx5a^M zr5BZSwo3lfD|zDbP%dRug|rw_I#D5xOa3$}Vio{}1CAl7Fk^Rx6xD+eGe*%-!myhbC&d2UMpzYj|k{>`p z#`hW*3K&*<`rz9$NCjqS5%8l2$G;ve2AV51;Ts&O*|^o?UjDF-Mg#Ihh{?GP3`GEr z4PqtEI;2fr6Sj+_MK)`{3@?ba=%w6H|16#`DD<50a(_YP!t`K49sj}KDeNUi1mgqb zOr~xJF!w?55dN3EK~QlY@$^8QKKbH6pLEDADFMBjtftw-YIzV@grRveU)ipF@1pkh*^(XRMI= z8LttGM}NUl+<)03&LG45kp#P1Rz9!n-DpA|`973Irz~RH5RKLh79*_3y#IBXh>zx- zx#!+gGT*+{UZYF?S{w1#+Ltp_!-rLqiVDB`6CaBT_EKkt#FsgIlU;7#<#t_O-{o~( ze&6MHT|wU!bX|+SYazSJ?z19emvx-zTH231jDMY&dfFN6B$5w4dL2oB82V0p?*2Sh z-VkH=%=RG0K*Ol$eu&XK7NhT}7!}ibVZeVLTiz(?JFRGt7{|HezThK3%n_^`Ji7dy zM359wGj-|xQ~$3m=XP%Ac5df(Zs&Gx=XP%Ac5df(Zs&Gx=XP%Ac5df(Zok;}f9-H1 J@dN-+005sJ%JTpK delta 3016 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 Date: Thu, 17 Feb 2022 20:17:45 +0200 Subject: [PATCH 09/15] Supertype after recategorization --- .../src/app/models/file/annotation.wrapper.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/models/file/annotation.wrapper.ts b/apps/red-ui/src/app/models/file/annotation.wrapper.ts index aaac10fa3..e16705469 100644 --- a/apps/red-ui/src/app/models/file/annotation.wrapper.ts +++ b/apps/red-ui/src/app/models/file/annotation.wrapper.ts @@ -426,8 +426,17 @@ export class AnnotationWrapper { case ManualRedactionType.RECATEGORIZE: switch (lastManualChange.annotationStatus) { case LogEntryStatus.APPROVED: - case LogEntryStatus.DECLINED: - return redactionLogEntry.redacted ? 'redaction' : 'hint'; + case LogEntryStatus.DECLINED: { + if (redactionLogEntry.recommendation) { + return 'recommendation'; + } else if (redactionLogEntry.redacted) { + return 'redaction'; + } else if (redactionLogEntry.hint) { + return 'hint'; + } else { + return 'skipped'; + } + } case LogEntryStatus.REQUESTED: return 'suggestion-recategorize-image'; } From 6565c2da20a1fd2c3f73602d042a6cb7b167acf1 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Thu, 17 Feb 2022 19:31:53 +0100 Subject: [PATCH 10/15] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3214 -> 3216 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b4ca07d4c..a1779d19e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.240.0", + "version": "3.241.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 5eb856afa2d86a5bc9e94500f0ffac385c23d705..78b89124d4db1238f9e97365e2657f8d0d6fa6e1 100644 GIT binary patch delta 3128 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 delta 3126 zcmV-649WA58IBo{cYoLm&+}i|jvd&}D-`@7)C^ivGh89`V=VP^Y;#@z@<+{{GE#qE z)^NK1J$D(L_5WkEz51_6j3Xw;=22aL*cx2H3x7)gp5u64um45hfc_T&m;tiCUslcS z7q0&|QHraYFm(CXufMQXmvhMFq7x=a}>>-Eh|Qh(&Eo^Og`lM!6fdL9+q z8!!m>cM0Co?CFy~mn8q~S2(ZNl;Ldluu0h)d*<2pojvo#-$49bh`&qmcLjePF~<>e z95Kfca~v_p;d6cy)4I&?(vc$yq9Ot^#L@kxDw;gDq9QA*HTuY1d9Lq_;ZW)b5H1X>rtioa zEquO!?0S&Pa*m)cqdBoUQdY}$;ucpMnp>_oImGU+iP#pVlATV9L z*^-!IROHzcs-udK9N|1hSIQPy^8I!#aGCeDra|9rMb%S>PI6mIKelsccp;gVSD5cWb2r;zsfpu@dgmUCgf}_;mSumq4BeRK#;MOA1!-}Y#IgF+5 z>d08?E%Z=lpFkeMClH8@j{bzTTK9Fzii*P1P}gFbfX zKSUp?kNBRNvI&rd>R!fy;KKr)$zkquifu3x2##?Y1GmxTo;)1he2hM)c}6H}@(ud< z=3)-WERX=nEXU|cFaMFa%jKou7NGxLRQE|%JPcsnDOfvldf2~#W||txn|H7{NPkL4 z;Z31%?Asp2XC!afJ5p^){{B0zU}Tk5ku zYR+Hv>wH;c8LY!)_8FqFT~ib`s?>Qc&JE zpjJju2pMMxCd#FS155(^J$7%EV7E84iS2oqr^UD?mpE84RR5#+<8=#Pk-XL!;EV;t{!v+ zyxs!6tt*%;1}uwyQ-g-eiURMDk%>JSW{o&c8H`%hCIs$Wdxl(3{P9h*+%{^ETO;5hh4t1*d}z2ba21?m_)z<^)=Eb6 zYXVLLGrq|{9Qew07a$II#bpA5vFEqf>hy0K8r@rvvN7TKT1T!NSa$O^6?uZ3RIRwQ zA(u1dw~=Ttsew zf`|mS+GT+9~nLY+v3gK`sHj|9Uid3&VcJ6)`I81YYP2fbU1-_jMa9A~fG*Pi5L)EeIP3R!*Q`xj5fRR!D=6WSg&YVM*D3=j^(67_x1R9!rzE=l!8Mb5qoW3W zBTV{V<5|Z@r7K;&sO+dKHR4Kzwo;PTntzSH$V5m|{a2|w7q|C$b8&cUcycmn7sIXi z+~H_HfXVo2u;MOf>rw_I#2RF9CGVMv#9~h+xgKYc{n4bj6f44i0+Z91kLsk($L>3z z?c9-)A3#CI_Zk-p7*>1w;M+4u1!iaw@S_LEzaA|HnkzNo8yuF zh{?GP3`GEr4PqtEI;2fr6Sj+_MK)`{3@?ba=%w6H|16#`DD<50azW+7^k6|9|H0oW z>?KA7;{)VOrfvr?_d)Ow{+GN#P;npe^gx|H`QkvIblgLO0nCx_3kKx8_*uaa-%B!R zUAx^Qf&rg<-wvE2$i6^7NszriE`O^cA~9H>DADFMBjtftw-YIzV@grRveU)ipF@1p zkh*^(XRMI=8LttGN5N6tf7v3=AjABT1iM;RKCkTEXhI+PK9ohLEMnRajn)hnBdo`~ z|8<#&kLI1Z=iXE@-@eseqf7o;8}ZlLmorquhgFk`3cvdkABzh1QfG$5mw!2YlU;7# z<#t_O-{o~(e&6MHT|wU!bX|+SYazSJ?z19emvx-zTH231jGdTz+8OL5k`F$59Z7!} z`c8cA{ybLR5M%eu_8`VU!>H(fh|xP1qwlF071McPz<(ZF-YDrit!R)K$GPLa;3GiH z5v&_Ly8N9)kQ7lfb?N<6|1YmC=XP%Ac5df(Zs&Gx=XP%Ac5df(Zs&Gx=XP%Ac5df( QZok;}f9-H1@c>W&0L6X=fdBvi From c1a342e6ee807ff7b58d3a649542606129d2286f Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Thu, 17 Feb 2022 20:36:10 +0200 Subject: [PATCH 11/15] Import Redactions work in progress / fix for missing dossier templates, annotation debug --- .../dossier-details-stats.component.ts | 2 +- ...dossiers-listing-dossier-name.component.ts | 2 +- .../dossiers-listing-status.component.html | 4 +-- .../dossiers-listing/config.service.ts | 2 +- .../annotations-list.component.ts | 6 ++++ .../pdf-viewer/pdf-viewer.component.html | 2 +- .../file-actions/file-actions.component.html | 8 +++++ .../file-actions/file-actions.component.scss | 4 +++ .../file-actions/file-actions.component.ts | 36 +++++++++++++++++++ .../services/redaction-import.service.ts | 25 +++++++++++++ .../dossier/shared/shared-dossiers.module.ts | 3 +- .../dictionaries-map.service.ts | 2 +- .../entity-services/dossier-state.service.ts | 4 +-- .../dossier-templates.service.ts | 20 ++++++----- .../src/app/services/permissions.service.ts | 4 +++ apps/red-ui/src/assets/config/config.json | 4 +-- apps/red-ui/src/assets/i18n/en.json | 1 + 17 files changed, 109 insertions(+), 20 deletions(-) create mode 100644 apps/red-ui/src/app/modules/dossier/shared/services/redaction-import.service.ts diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts index 87f035344..bc8ef922a 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts @@ -37,7 +37,7 @@ export class DossierDetailsStatsComponent implements OnInit { switchMap(() => this._filesService.getDeletedFilesFor(this.dossier.id)), map(files => files.length), ); - this.dossierTemplateName = this._dossierTemplatesService.find(this.dossier.dossierTemplateId).name; + this.dossierTemplateName = this._dossierTemplatesService.find(this.dossier.dossierTemplateId)?.name || '-'; } openEditDossierDialog(section: string): void { diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.ts index bbc7be107..30a26f8b5 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.ts @@ -36,6 +36,6 @@ export class DossiersListingDossierNameComponent { } getDossierTemplateNameFor(dossierTemplateId: string): string { - return this._dossierTemplatesService.find(dossierTemplateId).name; + return this._dossierTemplatesService.find(dossierTemplateId)?.name || '-'; } } diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.html index 1ec18fba9..3df7ebc04 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.html @@ -1,11 +1,11 @@ - +
{{ currentState.name }}
 - +
{{ 'edit-dossier-dialog.general-info.form.dossier-status.placeholder' | translate }}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts index 66fdedebd..290cb5253 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts @@ -143,7 +143,7 @@ export class ConfigService { id => new NestedFilter({ id: id, - label: this._dossierTemplatesService.find(id).name, + label: this._dossierTemplatesService.find(id)?.name || '-', }), ); diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.ts index 062d28b62..cb29ddd3a 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.ts @@ -5,6 +5,7 @@ import { MultiSelectService } from '../../services/multi-select.service'; import { AnnotationReferencesService } from '../../services/annotation-references.service'; import { ViewModeService } from '../../services/view-mode.service'; import { FilePreviewStateService } from '../../services/file-preview-state.service'; +import { UserPreferenceService } from '../../../../../../services/user-preference.service'; @Component({ selector: 'redaction-annotations-list', @@ -28,6 +29,7 @@ export class AnnotationsListComponent implements OnChanges { readonly annotationReferencesService: AnnotationReferencesService, private readonly _filterService: FilterService, private readonly _state: FilePreviewStateService, + private readonly _userPreferenceService: UserPreferenceService, ) {} ngOnChanges(changes: SimpleChanges): void { @@ -37,6 +39,10 @@ export class AnnotationsListComponent implements OnChanges { } annotationClicked(annotation: AnnotationWrapper, $event: MouseEvent): void { + if (this._userPreferenceService.areDevFeaturesEnabled) { + console.log('Selected Annotation:', annotation); + } + if (($event?.target as IqserEventTarget)?.localName === 'input') { return; } diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.html index 97eab9b6a..68d38d51c 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.html @@ -2,7 +2,7 @@
- +