From e7a23221132661e1d3cafcd7338e0efb18593b62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Fri, 4 Mar 2022 18:13:06 +0200 Subject: [PATCH 01/43] OCR processing indicator in file preview --- .../components/file-workload/file-workload.component.html | 5 +++++ .../components/file-workload/file-workload.component.scss | 6 ++++-- apps/red-ui/src/app/services/permissions.service.ts | 2 +- libs/common-ui | 2 +- libs/red-domain/src/lib/files/file.model.ts | 2 ++ 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html index 25e934cfe..ba8892922 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html @@ -33,6 +33,11 @@
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.scss b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.scss index 9f97ddf1b..190cce31c 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.scss +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.scss @@ -46,4 +46,33 @@ top: 9px; right: 10px; } + + .rotated { + position: absolute; + border-radius: 50%; + width: 20px; + height: 20px; + line-height: 20px; + right: 8px; + top: 8px; + display: flex; + justify-content: center; + background-color: var(--iqser-white); + color: var(--iqser-accent); + + mat-icon { + width: 12px; + height: 10px; + opacity: 50%; + } + + &.not-applied { + background-color: var(--iqser-primary); + color: var(--iqser-white); + + mat-icon { + opacity: 100%; + } + } + } } diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.ts index 2e06a8c49..60ac5e23c 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.ts @@ -5,7 +5,8 @@ import { ViewedPagesService } from '@services/entity-services/viewed-pages.servi import { IViewedPage } from '@red/domain'; import { AutoUnsubscribe } from '@iqser/common-ui'; import { FilePreviewStateService } from '../../services/file-preview-state.service'; -import { firstValueFrom } from 'rxjs'; +import { BehaviorSubject, firstValueFrom } from 'rxjs'; +import { PageRotationService } from '../../services/page-rotation.service'; @Component({ selector: 'redaction-page-indicator', @@ -25,12 +26,16 @@ export class PageIndicatorComponent extends AutoUnsubscribe implements OnDestroy pageReadTimeout: number = null; read = false; + rotation$ = new BehaviorSubject(true); + notAppliedRotation$ = new BehaviorSubject(true); + constructor( private readonly _viewedPagesService: ViewedPagesService, private readonly _configService: ConfigService, private readonly _changeDetectorRef: ChangeDetectorRef, private readonly _permissionService: PermissionsService, private readonly _stateService: FilePreviewStateService, + private readonly _pageRotationService: PageRotationService, ) { super(); } diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/page-rotation.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/page-rotation.service.ts index fe226363b..f6d1cbb7c 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/page-rotation.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/page-rotation.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject, firstValueFrom } from 'rxjs'; -import { PermissionsService } from '../../../../../services/permissions.service'; -import { RotationType } from '../../../../../../../../../libs/red-domain/src'; -import { FileManagementService } from '../../../../../services/entity-services/file-management.service'; +import { PermissionsService } from '@services/permissions.service'; +import { RotationType } from '@red/domain'; +import { FileManagementService } from '@services/entity-services/file-management.service'; import { FilePreviewStateService } from './file-preview-state.service'; @Injectable() @@ -26,6 +26,11 @@ export class PageRotationService { setRotation(value: boolean): void { this._isRotated$.next(value); + console.log(value); + } + + isPageRotated(page: number): boolean { + return this.rotations.has(page); } applyRotation() { diff --git a/apps/red-ui/src/app/modules/icons/icons.module.ts b/apps/red-ui/src/app/modules/icons/icons.module.ts index 4834f495e..af50170a6 100644 --- a/apps/red-ui/src/app/modules/icons/icons.module.ts +++ b/apps/red-ui/src/app/modules/icons/icons.module.ts @@ -59,6 +59,7 @@ export class IconsModule { 'remove-from-dict', 'report', 'resize', + 'rotation', 'rule', 'secret', 'status', diff --git a/apps/red-ui/src/assets/icons/general/rotation.svg b/apps/red-ui/src/assets/icons/general/rotation.svg new file mode 100644 index 000000000..9f6c17e2b --- /dev/null +++ b/apps/red-ui/src/assets/icons/general/rotation.svg @@ -0,0 +1,10 @@ + + + + + + + + From 8c5276fc1dcb42e1379a636a66ddb1d447297fd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Fri, 4 Mar 2022 18:47:34 +0200 Subject: [PATCH 11/43] Cleanup --- .../file-preview-screen/services/page-rotation.service.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/page-rotation.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/page-rotation.service.ts index f6d1cbb7c..77d44ad56 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/page-rotation.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/page-rotation.service.ts @@ -26,11 +26,6 @@ export class PageRotationService { setRotation(value: boolean): void { this._isRotated$.next(value); - console.log(value); - } - - isPageRotated(page: number): boolean { - return this.rotations.has(page); } applyRotation() { From a80f54cdbbba3299a98bff6d39437f42b48e09c5 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Fri, 4 Mar 2022 20:16:27 +0200 Subject: [PATCH 12/43] make page rotate --- .../page-indicator.component.html | 9 +++--- .../page-indicator.component.scss | 15 ++------- .../page-indicator.component.ts | 24 ++++++++++---- .../pdf-viewer/pdf-viewer.component.ts | 22 ++++++------- .../services/file-preview-state.service.ts | 11 ++++--- .../services/page-rotation.service.ts | 31 ++++++++++++------- libs/red-cache/src/lib/caches/cache-utils.ts | 4 +++ 7 files changed, 67 insertions(+), 49 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.html index 0881cf43d..b323ebfd2 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.html @@ -7,11 +7,12 @@ class="page-wrapper" > -
- {{ number }} -
+ +
{{ number }}
+
-
+ +
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.scss b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.scss index 190cce31c..a6cc77d4e 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.scss +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.scss @@ -57,22 +57,13 @@ top: 8px; display: flex; justify-content: center; - background-color: var(--iqser-white); - color: var(--iqser-accent); + background-color: var(--iqser-primary); + color: var(--iqser-white); mat-icon { width: 12px; height: 10px; - opacity: 50%; - } - - &.not-applied { - background-color: var(--iqser-primary); - color: var(--iqser-white); - - mat-icon { - opacity: 100%; - } + opacity: 100%; } } } diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.ts index 60ac5e23c..65c30d7e0 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.ts @@ -1,11 +1,21 @@ -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, OnDestroy, Output } from '@angular/core'; +import { + ChangeDetectionStrategy, + ChangeDetectorRef, + Component, + EventEmitter, + Input, + OnChanges, + OnDestroy, + OnInit, + Output, +} from '@angular/core'; import { PermissionsService } from '@services/permissions.service'; import { ConfigService } from '@services/config.service'; import { ViewedPagesService } from '@services/entity-services/viewed-pages.service'; import { IViewedPage } from '@red/domain'; import { AutoUnsubscribe } from '@iqser/common-ui'; import { FilePreviewStateService } from '../../services/file-preview-state.service'; -import { BehaviorSubject, firstValueFrom } from 'rxjs'; +import { firstValueFrom, Observable } from 'rxjs'; import { PageRotationService } from '../../services/page-rotation.service'; @Component({ @@ -14,7 +24,7 @@ import { PageRotationService } from '../../services/page-rotation.service'; styleUrls: ['./page-indicator.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class PageIndicatorComponent extends AutoUnsubscribe implements OnDestroy, OnChanges { +export class PageIndicatorComponent extends AutoUnsubscribe implements OnDestroy, OnChanges, OnInit { @Input() active = false; @Input() showDottedIcon = false; @Input() number: number; @@ -25,9 +35,7 @@ export class PageIndicatorComponent extends AutoUnsubscribe implements OnDestroy pageReadTimeout: number = null; read = false; - - rotation$ = new BehaviorSubject(true); - notAppliedRotation$ = new BehaviorSubject(true); + isRotated$: Observable; constructor( private readonly _viewedPagesService: ViewedPagesService, @@ -52,6 +60,10 @@ export class PageIndicatorComponent extends AutoUnsubscribe implements OnDestroy return this._stateService.fileId; } + ngOnInit() { + this.isRotated$ = this._pageRotationService.isRotated(this.number); + } + ngOnChanges() { this._setReadState(); return this.handlePageRead(); diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.ts index 6ec2139d2..ba4ee0ed4 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.ts @@ -27,7 +27,7 @@ import { AnnotationActionsService } from '../../services/annotation-actions.serv import { UserPreferenceService } from '@services/user-preference.service'; import { BASE_HREF } from '../../../../../../tokens'; import { ConfigService } from '@services/config.service'; -import { AutoUnsubscribe, ConfirmationDialogInput, LoadingService } from '@iqser/common-ui'; +import { AutoUnsubscribe, ConfirmationDialogInput, LoadingService, log } from '@iqser/common-ui'; import { DossiersDialogService } from '../../../../services/dossiers-dialog.service'; import { loadCompareDocumentWrapper } from '../../../../utils/compare-mode.utils'; import { PdfViewerUtils } from '../../../../utils/pdf-viewer.utils'; @@ -393,7 +393,10 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha cursor: pointer; margin: 0 12px; `; - paragraph.addEventListener('click', () => this._pageRotationService.applyRotation()); + paragraph.addEventListener('click', () => { + this._pageRotationService.applyRotation(); + this._showRotationConfirmationButtons(); + }); return paragraph; }, }; @@ -411,7 +414,7 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha opacity: 0.7; `; paragraph.addEventListener('click', () => { - this._pageRotationService.rotations.clear(); + this._pageRotationService.clearRotations(); this._showRotationConfirmationButtons(); }); return paragraph; @@ -452,6 +455,7 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha img: this._convertPath('/assets/icons/general/rotate-left.svg'), onClick: () => { this._pageRotationService.addRotation(this.utils.currentPage, RotationTypes.LEFT); + this.documentViewer.rotateCounterClockwise(this.utils.currentPage); this._showRotationConfirmationButtons(); }, }, @@ -462,6 +466,7 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha img: this._convertPath('/assets/icons/general/rotate-right.svg'), onClick: () => { this._pageRotationService.addRotation(this.utils.currentPage, RotationTypes.RIGHT); + this.documentViewer.rotateClockwise(this.utils.currentPage); this._showRotationConfirmationButtons(); }, }, @@ -514,17 +519,12 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha } private _showRotationConfirmationButtons() { - const rotationValues = Array.from(this._pageRotationService.rotations.values()); - const rotationElements = [elements.APPLY_ROTATION, elements.DISCARD_ROTATION]; - if (rotationValues.length > 0 && rotationValues.find(v => v !== 0)) { - if (!this._pageRotationService.isRotated) { - this.instance.UI.enableElements(rotationElements); - this._pageRotationService.setRotation(true); - } + + if (this._pageRotationService.hasRotations()) { + this.instance.UI.enableElements(rotationElements); } else { this.instance.UI.disableElements(rotationElements); - this._pageRotationService.setRotation(false); } } diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts index 961597d46..5c43e1fc6 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts @@ -1,15 +1,16 @@ import { Injectable } from '@angular/core'; -import { BehaviorSubject, firstValueFrom, Observable, pairwise, switchMap } from 'rxjs'; +import { BehaviorSubject, firstValueFrom, from, Observable, pairwise, switchMap } from 'rxjs'; import { FileDataModel } from '@models/file/file-data.model'; import { Dossier, File } from '@red/domain'; import { DossiersService } from '@services/entity-services/dossiers.service'; import { ActivatedRoute } from '@angular/router'; import { FilesMapService } from '@services/entity-services/files-map.service'; import { PermissionsService } from '../../../../../services/permissions.service'; -import { boolFactory, shareLast } from '@iqser/common-ui'; +import { boolFactory } from '@iqser/common-ui'; import { filter, startWith } from 'rxjs/operators'; import { FileManagementService } from '@services/entity-services/file-management.service'; import { DOSSIER_ID, FILE_ID } from '@utils/constants'; +import { wipeFilesCache } from '../../../../../../../../../libs/red-cache/src'; @Injectable() export class FilePreviewStateService { @@ -71,11 +72,11 @@ export class FilePreviewStateService { pairwise(), filter(([oldFile, newFile]) => oldFile?.cacheIdentifier !== newFile.cacheIdentifier), switchMap(([, newFile]) => this.#downloadOriginalFile(newFile.cacheIdentifier)), - shareLast(), ); } - #downloadOriginalFile(cacheIdentifier: string): Observable { - return this._fileManagementService.downloadOriginalFile(this.dossierId, this.fileId, 'body', cacheIdentifier); + #downloadOriginalFile(cacheIdentifier?: string): Observable { + const downloadFile = this._fileManagementService.downloadOriginalFile(this.dossierId, this.fileId, 'body', cacheIdentifier); + return from(wipeFilesCache()).pipe(switchMap(() => downloadFile)); } } diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/page-rotation.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/page-rotation.service.ts index 77d44ad56..57c745236 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/page-rotation.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/page-rotation.service.ts @@ -4,11 +4,12 @@ import { PermissionsService } from '@services/permissions.service'; import { RotationType } from '@red/domain'; import { FileManagementService } from '@services/entity-services/file-management.service'; import { FilePreviewStateService } from './file-preview-state.service'; +import { distinctUntilChanged, map } from 'rxjs/operators'; +import { log } from '@iqser/common-ui'; @Injectable() export class PageRotationService { - readonly rotations = new Map(); - private readonly _isRotated$ = new BehaviorSubject(false); + readonly rotations$ = new BehaviorSubject>({}); constructor( private readonly _permissionsService: PermissionsService, @@ -16,30 +17,38 @@ export class PageRotationService { private readonly _screenState: FilePreviewStateService, ) {} - get isRotated(): boolean { - return this._isRotated$.value; - } - get canRotate() { return this._screenState.file.then(file => this._permissionsService.isFileAssignee(file)); } - setRotation(value: boolean): void { - this._isRotated$.next(value); + isRotated(page: number) { + return this.rotations$.pipe( + map(rotations => !!rotations[page]), + distinctUntilChanged(), + ); + } + + hasRotations() { + return Object.values(this.rotations$.value).filter(v => !!v).length > 0; } applyRotation() { - const pages = Object.fromEntries(this.rotations); + const pages = this.rotations$.value; const { dossierId, fileId } = this._screenState; const request = this._fileManagementService.rotatePage({ pages }, dossierId, fileId); + this.clearRotations(); return firstValueFrom(request); } addRotation(pageNumber: number, rotation: RotationType): void { - const pageRotation = this.rotations.get(pageNumber); + const pageRotation = this.rotations$.value[pageNumber]; const rotationValue = pageRotation ? (pageRotation + Number(rotation)) % 360 : rotation; - this.rotations.set(pageNumber, rotationValue); + this.rotations$.next({ ...this.rotations$.value, [pageNumber]: rotationValue }); + } + + clearRotations() { + this.rotations$.next({}); } } diff --git a/libs/red-cache/src/lib/caches/cache-utils.ts b/libs/red-cache/src/lib/caches/cache-utils.ts index 9539093c2..35422e063 100644 --- a/libs/red-cache/src/lib/caches/cache-utils.ts +++ b/libs/red-cache/src/lib/caches/cache-utils.ts @@ -31,6 +31,10 @@ export async function wipeCaches(logoutDependant: boolean = false) { } } +export function wipeFilesCache() { + return caches.delete('files'); +} + export async function wipeCacheEntry(cacheName: string, entry: string) { caches.open(cacheName).then(cache => { cache.delete(entry, { ignoreSearch: false }); From e7806dda94fa847c8ae4f9ef8d3923e68f33eb87 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Fri, 4 Mar 2022 21:25:05 +0200 Subject: [PATCH 13/43] little cleanup --- .../pdf-viewer/pdf-viewer.component.ts | 148 +++++++++--------- 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.ts index ba4ee0ed4..650c363fe 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.ts @@ -27,7 +27,7 @@ import { AnnotationActionsService } from '../../services/annotation-actions.serv import { UserPreferenceService } from '@services/user-preference.service'; import { BASE_HREF } from '../../../../../../tokens'; import { ConfigService } from '@services/config.service'; -import { AutoUnsubscribe, ConfirmationDialogInput, LoadingService, log } from '@iqser/common-ui'; +import { AutoUnsubscribe, ConfirmationDialogInput, LoadingService } from '@iqser/common-ui'; import { DossiersDialogService } from '../../../../services/dossiers-dialog.service'; import { loadCompareDocumentWrapper } from '../../../../utils/compare-mode.utils'; import { PdfViewerUtils } from '../../../../utils/pdf-viewer.utils'; @@ -45,11 +45,7 @@ import TextTool = Tools.TextTool; import Annotation = Core.Annotations.Annotation; const ALLOWED_KEYBOARD_SHORTCUTS: readonly string[] = ['+', '-', 'p', 'r', 'Escape'] as const; -const elements = { - ADD_REDACTION: 'add-redaction', - ADD_DICTIONARY: 'add-dictionary', - ADD_RECTANGLE: 'add-rectangle', - ADD_FALSE_POSITIVE: 'add-false-positive', +const headerElements = { SHAPE_TOOL_GROUP_BUTTON: 'shapeToolGroupButton', ROTATE_LEFT_BUTTON: 'rotateLeftButton', ROTATE_RIGHT_BUTTON: 'rotateRightButton', @@ -61,6 +57,13 @@ const elements = { CLOSE_COMPARE_BUTTON: 'closeCompareButton', } as const; +const textPopups = { + ADD_REDACTION: 'add-redaction', + ADD_DICTIONARY: 'add-dictionary', + ADD_RECTANGLE: 'add-rectangle', + ADD_FALSE_POSITIVE: 'add-false-positive', +} as const; + function getDivider(hiddenOn?: readonly ('desktop' | 'mobile' | 'tablet')[]) { return { type: 'divider', @@ -226,8 +229,8 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha const filename = (await this.stateService.file).filename ?? 'document.pdf'; this.instance.UI.loadDocument(currentDocument, { filename }); - this.instance.UI.disableElements([elements.CLOSE_COMPARE_BUTTON]); - this.instance.UI.enableElements([elements.COMPARE_BUTTON]); + this.instance.UI.disableElements([headerElements.CLOSE_COMPARE_BUTTON]); + this.instance.UI.enableElements([headerElements.COMPARE_BUTTON]); this.utils.navigateToPage(1); } @@ -248,7 +251,7 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha this.utils = new PdfViewerUtils(this.instance, this.viewModeService); this._setSelectionMode(); - await this._configureElements(); + this._configureElements(); this.utils.disableHotkeys(); await this._configureTextPopup(); @@ -302,7 +305,7 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha this.documentViewer.addEventListener('textSelected', async (quads, selectedText, pageNumber: number) => { this._selectedText = selectedText; - const textActions = [elements.ADD_DICTIONARY, elements.ADD_FALSE_POSITIVE]; + const textActions = [textPopups.ADD_DICTIONARY, textPopups.ADD_FALSE_POSITIVE]; const file = await this.stateService.file; @@ -350,13 +353,13 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha private _toggleRectangleAnnotationAction(readonly = false) { if (!readonly) { - this.instance.UI.enableElements([elements.ADD_RECTANGLE]); + this.instance.UI.enableElements([textPopups.ADD_RECTANGLE]); } else { - this.instance.UI.disableElements([elements.ADD_RECTANGLE]); + this.instance.UI.disableElements([textPopups.ADD_RECTANGLE]); } } - private async _configureElements() { + private _configureElements() { this.instance.UI.disableElements([ 'pageNavOverlay', 'menuButton', @@ -382,7 +385,7 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha const applyRotation: IHeaderElement = { type: 'customElement', - dataElement: elements.APPLY_ROTATION, + dataElement: headerElements.APPLY_ROTATION, render: () => { const paragraph = document.createElement('p'); paragraph.innerText = 'APPLY'; @@ -402,7 +405,7 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha }; const discardRotation: IHeaderElement = { type: 'customElement', - dataElement: elements.DISCARD_ROTATION, + dataElement: headerElements.DISCARD_ROTATION, render: () => { const paragraph = document.createElement('p'); paragraph.innerText = 'DISCARD'; @@ -423,17 +426,38 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha const divider = getDivider(); const headerItems: IHeaderElement[] = [ + divider, + { + type: 'actionButton', + element: 'compare', + dataElement: headerElements.COMPARE_BUTTON, + img: this._convertPath('/assets/icons/general/pdftron-action-compare.svg'), + title: 'Compare', + onClick: () => { + this.compareFileInput.nativeElement.click(); + }, + }, + { + type: 'actionButton', + element: 'closeCompare', + dataElement: headerElements.CLOSE_COMPARE_BUTTON, + img: this._convertPath('/assets/icons/general/pdftron-action-close-compare.svg'), + title: 'Leave Compare Mode', + onClick: async () => { + await this.closeCompareMode(); + }, + }, divider, { type: 'actionButton', element: 'tooltips', - dataElement: elements.TOGGLE_TOOLTIPS, + dataElement: headerElements.TOGGLE_TOOLTIPS, img: this._toggleTooltipsIcon, title: this._toggleTooltipsBtnTitle, onClick: async () => { await this._userPreferenceService.toggleFilePreviewTooltipsPreference(); this._updateTooltipsVisibility(); - this.instance.UI.updateElement(elements.TOGGLE_TOOLTIPS, { + this.instance.UI.updateElement(headerElements.TOGGLE_TOOLTIPS, { title: this._toggleTooltipsBtnTitle, img: this._toggleTooltipsIcon, }); @@ -443,7 +467,7 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha { type: 'toolGroupButton', toolGroup: 'rectangleTools', - dataElement: elements.SHAPE_TOOL_GROUP_BUTTON, + dataElement: headerElements.SHAPE_TOOL_GROUP_BUTTON, img: this._convertPath('/assets/icons/general/rectangle.svg'), title: 'annotation.rectangle', }, @@ -451,7 +475,7 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha { type: 'actionButton', element: 'tooltips', - dataElement: elements.ROTATE_LEFT_BUTTON, + dataElement: headerElements.ROTATE_LEFT_BUTTON, img: this._convertPath('/assets/icons/general/rotate-left.svg'), onClick: () => { this._pageRotationService.addRotation(this.utils.currentPage, RotationTypes.LEFT); @@ -462,7 +486,7 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha { type: 'actionButton', element: 'tooltips', - dataElement: elements.ROTATE_RIGHT_BUTTON, + dataElement: headerElements.ROTATE_RIGHT_BUTTON, img: this._convertPath('/assets/icons/general/rotate-right.svg'), onClick: () => { this._pageRotationService.addRotation(this.utils.currentPage, RotationTypes.RIGHT); @@ -476,37 +500,14 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha ]; this.instance.UI.setHeaderItems(header => { - const originalHeaderItems = header.getItems() as IHeaderElement[]; - originalHeaderItems.splice(8, 0, ...headerItems); - - const compareHeaderItems: IHeaderElement[] = [ - { - type: 'actionButton', - element: 'compare', - dataElement: elements.COMPARE_BUTTON, - img: this._convertPath('/assets/icons/general/pdftron-action-compare.svg'), - title: 'Compare', - onClick: () => { - this.compareFileInput.nativeElement.click(); - }, - }, - { - type: 'actionButton', - element: 'closeCompare', - dataElement: elements.CLOSE_COMPARE_BUTTON, - img: this._convertPath('/assets/icons/general/pdftron-action-close-compare.svg'), - title: 'Leave Compare Mode', - onClick: async () => { - await this.closeCompareMode(); - }, - }, - divider, - ]; - - originalHeaderItems.splice(9, 0, ...compareHeaderItems); + header.getItems().splice(8, 0, ...headerItems); }); - this.instance.UI.disableElements([elements.CLOSE_COMPARE_BUTTON, elements.APPLY_ROTATION, elements.DISCARD_ROTATION]); + this.instance.UI.disableElements([ + headerElements.CLOSE_COMPARE_BUTTON, + headerElements.APPLY_ROTATION, + headerElements.DISCARD_ROTATION, + ]); const dossierTemplateId = this.dossier.dossierTemplateId; @@ -519,7 +520,7 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha } private _showRotationConfirmationButtons() { - const rotationElements = [elements.APPLY_ROTATION, elements.DISCARD_ROTATION]; + const rotationElements = [headerElements.APPLY_ROTATION, headerElements.DISCARD_ROTATION]; if (this._pageRotationService.hasRotations()) { this.instance.UI.enableElements(rotationElements); @@ -582,7 +583,7 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha this.instance.UI.annotationPopup.add([ { type: 'actionButton', - dataElement: elements.ADD_RECTANGLE, + dataElement: textPopups.ADD_RECTANGLE, img: this._convertPath('/assets/icons/general/pdftron-action-add-redaction.svg'), title: this.#getTitle(ManualRedactionEntryTypes.REDACTION), onClick: () => this._addRectangleManualRedaction(), @@ -602,7 +603,7 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha } private _cleanUpSelectionAndButtonState() { - const rectangleElements = [elements.SHAPE_TOOL_GROUP_BUTTON]; + const rectangleElements = [headerElements.SHAPE_TOOL_GROUP_BUTTON]; this.utils.deselectAllAnnotations(); this.instance.UI.disableElements(rectangleElements); this.instance.UI.enableElements(rectangleElements); @@ -627,35 +628,35 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha setTimeout(() => this.instance.UI.searchTextFull(text, searchOptions), 250); }, }; - const textPopups: IHeaderElement[] = [searchButton]; + const popups: IHeaderElement[] = [searchButton]; // Adding directly to the false-positive dict is only available in dev-mode if (this._userPreferenceService.areDevFeaturesEnabled) { - textPopups.push({ + popups.push({ type: 'actionButton', - dataElement: 'add-false-positive', + dataElement: textPopups.ADD_FALSE_POSITIVE, img: this._convertPath('/assets/icons/general/pdftron-action-false-positive.svg'), title: this.#getTitle(ManualRedactionEntryTypes.FALSE_POSITIVE), onClick: () => this._addManualRedactionOfType(ManualRedactionEntryTypes.FALSE_POSITIVE), }); } - textPopups.push({ + popups.push({ type: 'actionButton', - dataElement: elements.ADD_REDACTION, + dataElement: textPopups.ADD_REDACTION, img: this._convertPath('/assets/icons/general/pdftron-action-add-redaction.svg'), title: this.#getTitle(ManualRedactionEntryTypes.REDACTION), onClick: () => this._addManualRedactionOfType(ManualRedactionEntryTypes.REDACTION), }); - textPopups.push({ + popups.push({ type: 'actionButton', - dataElement: elements.ADD_DICTIONARY, + dataElement: textPopups.ADD_DICTIONARY, img: this._convertPath('/assets/icons/general/pdftron-action-add-dict.svg'), title: this.#getTitle(ManualRedactionEntryTypes.DICTIONARY), onClick: () => this._addManualRedactionOfType(ManualRedactionEntryTypes.DICTIONARY), }); - this.instance.UI.textPopup.add(textPopups); + this.instance.UI.textPopup.add(popups); return this._handleCustomActions(); } @@ -674,14 +675,13 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha private async _handleCustomActions() { this.instance.UI.setToolMode('AnnotationEdit'); const elementsToToggle = [ - elements.ADD_REDACTION, - elements.ADD_RECTANGLE, - 'add-false-positive', - elements.SHAPE_TOOL_GROUP_BUTTON, - 'rectangleToolDivider', - elements.ANNOTATION_POPUP, - elements.ROTATE_LEFT_BUTTON, - elements.ROTATE_RIGHT_BUTTON, + textPopups.ADD_REDACTION, + textPopups.ADD_RECTANGLE, + textPopups.ADD_FALSE_POSITIVE, + headerElements.SHAPE_TOOL_GROUP_BUTTON, + headerElements.ANNOTATION_POPUP, + headerElements.ROTATE_LEFT_BUTTON, + headerElements.ROTATE_RIGHT_BUTTON, ]; const isCurrentPageExcluded = this.utils.isCurrentPageExcluded(await this.stateService.file); @@ -695,20 +695,20 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha this.instance.UI.enableElements(elementsToToggle); if (this._selectedText.length > 2) { - this.instance.UI.enableElements([elements.ADD_DICTIONARY, elements.ADD_FALSE_POSITIVE]); + this.instance.UI.enableElements([textPopups.ADD_DICTIONARY, textPopups.ADD_FALSE_POSITIVE]); } return; } - let elementsToDisable = [...elementsToToggle, elements.ADD_RECTANGLE]; + let elementsToDisable = [...elementsToToggle, textPopups.ADD_RECTANGLE]; if (isCurrentPageExcluded) { const allowedActionsWhenPageExcluded: string[] = [ - elements.ANNOTATION_POPUP, - elements.ADD_RECTANGLE, - elements.ADD_REDACTION, - elements.SHAPE_TOOL_GROUP_BUTTON, + headerElements.ANNOTATION_POPUP, + textPopups.ADD_RECTANGLE, + textPopups.ADD_REDACTION, + headerElements.SHAPE_TOOL_GROUP_BUTTON, ]; elementsToDisable = elementsToDisable.filter(element => !allowedActionsWhenPageExcluded.includes(element)); } else { From 90a6f81c8f1699b363c59497c3a37833c81b8225 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Fri, 4 Mar 2022 21:26:02 +0200 Subject: [PATCH 14/43] update common UI --- libs/common-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/common-ui b/libs/common-ui index 8d823ad67..f7f0bb86a 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 8d823ad6737857ce74e143350470bc705bad1eb5 +Subproject commit f7f0bb86a6ccf3b6e1970c8749b83e828578e673 From c48772503f9b534650adacf05d1961410b9fc1dd Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Fri, 4 Mar 2022 20:31:00 +0100 Subject: [PATCH 15/43] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3213 -> 3215 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f091759fa..e20eea021 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.282.0", + "version": "3.283.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index f93bd3a408efc2681419cb95daef4a380f2c4106..cf0cbd32a54c9fe7278a7aad11041a14e6cc32c2 100644 GIT binary patch literal 3215 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 BDDMCO literal 3213 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 Date: Mon, 31 Jan 2022 10:50:38 +0200 Subject: [PATCH 16/43] mock annotationLastModified on dossier && moved date column in shared --- .../screens/dossier-overview/dossier-overview.module.ts | 2 -- .../components/table-item/table-item.component.html | 4 ++++ .../dossier/screens/dossiers-listing/config.service.ts | 1 + .../components}/date-column/date-column.component.html | 2 +- .../components}/date-column/date-column.component.scss | 0 .../components}/date-column/date-column.component.ts | 4 ++-- .../src/app/modules/dossier/shared/shared-dossiers.module.ts | 3 ++- apps/red-ui/src/assets/i18n/de.json | 1 + apps/red-ui/src/assets/i18n/en.json | 1 + libs/red-domain/src/lib/dossier-stats/dossier-stats.model.ts | 2 ++ libs/red-domain/src/lib/dossier-stats/dossier-stats.ts | 1 + 11 files changed, 15 insertions(+), 6 deletions(-) rename apps/red-ui/src/app/modules/dossier/{screens/dossier-overview/components/table-item => shared/components}/date-column/date-column.component.html (55%) rename apps/red-ui/src/app/modules/dossier/{screens/dossier-overview/components/table-item => shared/components}/date-column/date-column.component.scss (100%) rename apps/red-ui/src/app/modules/dossier/{screens/dossier-overview/components/table-item => shared/components}/date-column/date-column.component.ts (80%) diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/dossier-overview.module.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/dossier-overview.module.ts index 0b9582d02..ea69fa71e 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/dossier-overview.module.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/dossier-overview.module.ts @@ -17,7 +17,6 @@ import { WorkflowItemComponent } from './components/workflow-item/workflow-item. import { ScreenHeaderComponent } from './components/screen-header/screen-header.component'; import { ViewModeSelectionComponent } from './components/view-mode-selection/view-mode-selection.component'; import { FileNameColumnComponent } from './components/table-item/file-name-column/file-name-column.component'; -import { DateColumnComponent } from './components/table-item/date-column/date-column.component'; import { BulkActionsService } from './services/bulk-actions.service'; const routes: Routes = [ @@ -44,7 +43,6 @@ const routes: Routes = [ ScreenHeaderComponent, ViewModeSelectionComponent, FileNameColumnComponent, - DateColumnComponent, ], providers: [ConfigService, BulkActionsService], imports: [RouterModule.forChild(routes), CommonModule, SharedModule, SharedDossiersModule, IqserIconsModule, TranslateModule], diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.html index 7ad67122e..7ada1bb64 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.html @@ -3,6 +3,10 @@
+
+ +
+
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 10a207470..98f52a70a 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 @@ -26,6 +26,7 @@ export class ConfigService { get tableConfig(): TableColumnConfig[] { return [ { label: _('dossier-listing.table-col-names.name'), sortByKey: 'searchKey', width: '2fr' }, + { label: _('dossier-listing.table-col-names.last-modified') }, { label: _('dossier-listing.table-col-names.needs-work') }, { label: _('dossier-listing.table-col-names.owner'), class: 'user-column' }, { label: _('dossier-listing.table-col-names.documents-status'), class: 'flex-end', width: 'auto' }, diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/date-column/date-column.component.html b/apps/red-ui/src/app/modules/dossier/shared/components/date-column/date-column.component.html similarity index 55% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/date-column/date-column.component.html rename to apps/red-ui/src/app/modules/dossier/shared/components/date-column/date-column.component.html index e534759a1..3de0431fa 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/date-column/date-column.component.html +++ b/apps/red-ui/src/app/modules/dossier/shared/components/date-column/date-column.component.html @@ -1,3 +1,3 @@
- {{ date | date: 'd MMM. yyyy, hh:mm a' }} + {{ date | date: 'd MMM. yyyy' }}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/date-column/date-column.component.scss b/apps/red-ui/src/app/modules/dossier/shared/components/date-column/date-column.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/date-column/date-column.component.scss rename to apps/red-ui/src/app/modules/dossier/shared/components/date-column/date-column.component.scss diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/date-column/date-column.component.ts b/apps/red-ui/src/app/modules/dossier/shared/components/date-column/date-column.component.ts similarity index 80% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/date-column/date-column.component.ts rename to apps/red-ui/src/app/modules/dossier/shared/components/date-column/date-column.component.ts index d36317fb8..75b421297 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/date-column/date-column.component.ts +++ b/apps/red-ui/src/app/modules/dossier/shared/components/date-column/date-column.component.ts @@ -1,12 +1,12 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; @Component({ - selector: 'redaction-date-column', + selector: 'redaction-date-column [date]', templateUrl: './date-column.component.html', styleUrls: ['./date-column.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, }) export class DateColumnComponent { - @Input() isError: boolean; + @Input() isError = false; @Input() date: string; } diff --git a/apps/red-ui/src/app/modules/dossier/shared/shared-dossiers.module.ts b/apps/red-ui/src/app/modules/dossier/shared/shared-dossiers.module.ts index 085e242e1..b7cded317 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/shared-dossiers.module.ts +++ b/apps/red-ui/src/app/modules/dossier/shared/shared-dossiers.module.ts @@ -5,8 +5,9 @@ import { FileActionsComponent } from './components/file-actions/file-actions.com import { IqserIconsModule } from '@iqser/common-ui'; import { SharedModule } from '@shared/shared.module'; import { RedactionImportService } from './services/redaction-import.service'; +import { DateColumnComponent } from './components/date-column/date-column.component'; -const components = [FileActionsComponent]; +const components = [FileActionsComponent, DateColumnComponent]; @NgModule({ declarations: [...components], diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json index 13d247c4f..bae39df99 100644 --- a/apps/red-ui/src/assets/i18n/de.json +++ b/apps/red-ui/src/assets/i18n/de.json @@ -733,6 +733,7 @@ "documents-status": "", "dossier-status": "", "name": "Name", + "last-modified": "", "needs-work": "Arbeitsvorrat", "owner": "Besitzer" }, diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 64b9b6b74..9e18757a8 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -733,6 +733,7 @@ "documents-status": "Documents Status", "dossier-status": "Dossier Status", "name": "Name", + "last-modified": "Last modified", "needs-work": "Workload", "owner": "Owner" }, diff --git a/libs/red-domain/src/lib/dossier-stats/dossier-stats.model.ts b/libs/red-domain/src/lib/dossier-stats/dossier-stats.model.ts index 10899e1ca..9b70b00f3 100644 --- a/libs/red-domain/src/lib/dossier-stats/dossier-stats.model.ts +++ b/libs/red-domain/src/lib/dossier-stats/dossier-stats.model.ts @@ -42,6 +42,7 @@ export class DossierStats implements IDossierStats { readonly numberOfFiles: number; readonly numberOfProcessingFiles: number; readonly processingStats: ProcessingStats; + readonly annotationLastModified: string; readonly hasFiles: boolean; @@ -54,6 +55,7 @@ export class DossierStats implements IDossierStats { this.hasRedactionsFilePresent = stats.hasRedactionsFilePresent; this.hasSuggestionsFilePresent = stats.hasSuggestionsFilePresent; this.hasUpdatesFilePresent = stats.hasUpdatesFilePresent; + this.annotationLastModified = /*stats.annotationLastModified;*/ new Date().toDateString(); this.numberOfPages = stats.numberOfPages; this.numberOfFiles = stats.numberOfFiles; this.numberOfProcessingFiles = Object.entries(this.fileCountPerProcessingStatus) diff --git a/libs/red-domain/src/lib/dossier-stats/dossier-stats.ts b/libs/red-domain/src/lib/dossier-stats/dossier-stats.ts index 022673a00..23f8b3a88 100644 --- a/libs/red-domain/src/lib/dossier-stats/dossier-stats.ts +++ b/libs/red-domain/src/lib/dossier-stats/dossier-stats.ts @@ -11,4 +11,5 @@ export interface IDossierStats { hasUpdatesFilePresent: boolean; numberOfPages: number; numberOfFiles: number; + annotationLastModified: string; } From c321209c321c8d3222e5b10f8185208444d4ca17 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Sat, 5 Mar 2022 20:51:36 +0200 Subject: [PATCH 17/43] show last redaction modification date --- .../components/table-item/table-item.component.html | 2 +- .../components/table-item/table-item.component.html | 7 ++++--- .../dossier/screens/dossiers-listing/config.service.ts | 2 +- apps/red-ui/src/assets/i18n/en.json | 2 +- .../src/lib/dossier-stats/dossier-stats.model.ts | 6 ++---- libs/red-domain/src/lib/dossier-stats/dossier-stats.ts | 1 - libs/red-domain/src/lib/files/file.model.ts | 6 +++--- libs/red-domain/src/lib/files/file.ts | 4 ++-- 8 files changed, 14 insertions(+), 16 deletions(-) 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 ac30d92cd..57dd7229a 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 @@ -7,7 +7,7 @@
- +
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.html index 7ada1bb64..606997852 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.html @@ -3,9 +3,10 @@
-
- -
+ + + +
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 98f52a70a..19ad1c220 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 @@ -26,7 +26,7 @@ export class ConfigService { get tableConfig(): TableColumnConfig[] { return [ { label: _('dossier-listing.table-col-names.name'), sortByKey: 'searchKey', width: '2fr' }, - { label: _('dossier-listing.table-col-names.last-modified') }, + // { label: _('dossier-listing.table-col-names.last-modified') }, { label: _('dossier-listing.table-col-names.needs-work') }, { label: _('dossier-listing.table-col-names.owner'), class: 'user-column' }, { label: _('dossier-listing.table-col-names.documents-status'), class: 'flex-end', width: 'auto' }, diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 9e18757a8..a729e9227 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -827,7 +827,7 @@ "table-col-names": { "added-on": "Added", "assigned-to": "Assigned to", - "last-modified": "Last modified on", + "last-modified": "Last modified", "name": "Name", "needs-work": "Workload", "pages": "Pages", diff --git a/libs/red-domain/src/lib/dossier-stats/dossier-stats.model.ts b/libs/red-domain/src/lib/dossier-stats/dossier-stats.model.ts index 9b70b00f3..da29c0042 100644 --- a/libs/red-domain/src/lib/dossier-stats/dossier-stats.model.ts +++ b/libs/red-domain/src/lib/dossier-stats/dossier-stats.model.ts @@ -42,7 +42,6 @@ export class DossierStats implements IDossierStats { readonly numberOfFiles: number; readonly numberOfProcessingFiles: number; readonly processingStats: ProcessingStats; - readonly annotationLastModified: string; readonly hasFiles: boolean; @@ -55,12 +54,11 @@ export class DossierStats implements IDossierStats { this.hasRedactionsFilePresent = stats.hasRedactionsFilePresent; this.hasSuggestionsFilePresent = stats.hasSuggestionsFilePresent; this.hasUpdatesFilePresent = stats.hasUpdatesFilePresent; - this.annotationLastModified = /*stats.annotationLastModified;*/ new Date().toDateString(); this.numberOfPages = stats.numberOfPages; this.numberOfFiles = stats.numberOfFiles; this.numberOfProcessingFiles = Object.entries(this.fileCountPerProcessingStatus) - .filter(([key, _]) => isProcessingStatuses.includes(key as ProcessingFileStatus)) - .reduce((count, [_, value]) => count + value, 0); + .filter(([key]) => isProcessingStatuses.includes(key as ProcessingFileStatus)) + .reduce((count, [, value]) => count + value, 0); this.processingStats = this.#processingStats; this.hasFiles = this.numberOfFiles > 0; } diff --git a/libs/red-domain/src/lib/dossier-stats/dossier-stats.ts b/libs/red-domain/src/lib/dossier-stats/dossier-stats.ts index 23f8b3a88..022673a00 100644 --- a/libs/red-domain/src/lib/dossier-stats/dossier-stats.ts +++ b/libs/red-domain/src/lib/dossier-stats/dossier-stats.ts @@ -11,5 +11,4 @@ export interface IDossierStats { hasUpdatesFilePresent: boolean; numberOfPages: number; numberOfFiles: number; - annotationLastModified: string; } diff --git a/libs/red-domain/src/lib/files/file.model.ts b/libs/red-domain/src/lib/files/file.model.ts index 9e040d999..ef369ad6f 100644 --- a/libs/red-domain/src/lib/files/file.model.ts +++ b/libs/red-domain/src/lib/files/file.model.ts @@ -9,7 +9,6 @@ export class File extends Entity implements IFile { readonly allManualRedactionsApplied: boolean; readonly analysisDuration?: number; readonly analysisRequired: boolean; - readonly annotationModificationDate?: string; readonly approvalDate?: string; readonly assignee?: string; readonly dictionaryVersion?: number; @@ -41,6 +40,7 @@ export class File extends Entity implements IFile { readonly processingStatus: ProcessingFileStatus; readonly workflowStatus: WorkflowFileStatus; readonly fileManipulationDate: string; + readonly redactionModificationDate: string; readonly statusSort: number; readonly cacheIdentifier?: string; @@ -65,7 +65,6 @@ export class File extends Entity implements IFile { this.allManualRedactionsApplied = !!file.allManualRedactionsApplied; this.analysisDuration = file.analysisDuration; this.analysisRequired = !!file.analysisRequired && !file.excluded; - this.annotationModificationDate = file.annotationModificationDate; this.approvalDate = file.approvalDate; this.assignee = file.assignee; this.dictionaryVersion = file.dictionaryVersion; @@ -98,7 +97,8 @@ export class File extends Entity implements IFile { this.uploader = file.uploader; this.excludedPages = file.excludedPages || []; this.hasSuggestions = !!file.hasSuggestions; - this.fileManipulationDate = file.fileManipulationDate; + this.fileManipulationDate = file.fileManipulationDate ?? ''; + this.redactionModificationDate = file.redactionModificationDate ?? ''; this.statusSort = StatusSorter[this.workflowStatus]; this.cacheIdentifier = btoa(this.fileManipulationDate ?? ''); diff --git a/libs/red-domain/src/lib/files/file.ts b/libs/red-domain/src/lib/files/file.ts index 8f8c29446..26dac2ec5 100644 --- a/libs/red-domain/src/lib/files/file.ts +++ b/libs/red-domain/src/lib/files/file.ts @@ -32,7 +32,6 @@ export interface IFile { /** * Shows which dictionary versions was used during the analysis. */ - readonly annotationModificationDate?: string; readonly dictionaryVersion?: number; /** * Shows which dossier dictionary versions was used during the analysis. @@ -151,5 +150,6 @@ export interface IFile { /** * Last time the actual file was touched */ - readonly fileManipulationDate: string; + readonly fileManipulationDate: string | null; + readonly redactionModificationDate: string | null; } From 9b12523aa50077f05c78c04552da96c6a4fef456 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Sat, 5 Mar 2022 19:56:14 +0100 Subject: [PATCH 18/43] 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 e20eea021..57f3ec228 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.283.0", + "version": "3.284.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index cf0cbd32a54c9fe7278a7aad11041a14e6cc32c2..de183c65c828b07d208d731793d6dbd0a636b23b 100644 GIT binary patch literal 3215 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 BDDMCO From 6357845ebdb31f0bb8f65946199ff54c350dfa4d Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Sat, 5 Mar 2022 21:57:23 +0200 Subject: [PATCH 19/43] fix RED-3521 skip imported annotations from non existing pages --- .../services/annotation-draw.service.ts | 116 +++++++++--------- apps/red-ui/src/assets/config/config.json | 4 +- 2 files changed, 63 insertions(+), 57 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts index b7cfc0435..5f3a32f1f 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/annotation-draw.service.ts @@ -98,7 +98,9 @@ export class AnnotationDrawService { dossierId: string, compareMode: boolean, ) { - const annotations = annotationWrappers.map(annotation => this._computeAnnotation(activeViewer, annotation, dossierId, compareMode)); + const annotations = annotationWrappers + .map(annotation => this._computeAnnotation(activeViewer, annotation, dossierId, compareMode)) + .filter(a => !!a); const annotationManager = activeViewer.Core.annotationManager; annotationManager.addAnnotations(annotations, { imported: true }); await annotationManager.drawAnnotationsFromList(annotations); @@ -156,6 +158,10 @@ export class AnnotationDrawService { compareMode: boolean, ) { const pageNumber = compareMode ? annotationWrapper.pageNumber * 2 - 1 : annotationWrapper.pageNumber; + if (pageNumber > activeViewer.Core.documentViewer.getPageCount()) { + // skip imported annotations from files that have more pages than the current one + return; + } if (annotationWrapper.superType === 'text-highlight') { const rectangleAnnot = new activeViewer.Core.Annotations.RectangleAnnotation(); @@ -172,68 +178,68 @@ export class AnnotationDrawService { rectangleAnnot.Id = annotationWrapper.id; return rectangleAnnot; - } else { - const dossierTemplateId = this._dossiersService.find(dossierId).dossierTemplateId; + } - let annotation: Core.Annotations.RectangleAnnotation | Core.Annotations.TextHighlightAnnotation; - if (annotationWrapper.rectangle || annotationWrapper.isImage) { - annotation = new activeViewer.Core.Annotations.RectangleAnnotation(); - const pageHeight = activeViewer.Core.documentViewer.getPageHeight(pageNumber); - const firstPosition = annotationWrapper.positions[0]; - annotation.X = firstPosition.topLeft.x; - annotation.Y = pageHeight - (firstPosition.topLeft.y + firstPosition.height); - annotation.Width = firstPosition.width; - annotation.FillColor = this.getAndConvertColor( - activeViewer, - dossierTemplateId, - annotationWrapper.superType, - annotationWrapper.type, - ); - annotation.Opacity = annotationWrapper.isChangeLogRemoved - ? AnnotationDrawService.DEFAULT_REMOVED_ANNOTATION_OPACITY - : AnnotationDrawService.DEFAULT_RECTANGLE_ANNOTATION_OPACITY; - annotation.Height = firstPosition.height; - annotation.Intensity = 100; - } else { - annotation = new activeViewer.Core.Annotations.TextHighlightAnnotation(); - annotation.Quads = this._rectanglesToQuads(annotationWrapper.positions, activeViewer, pageNumber); - annotation.Opacity = annotationWrapper.isChangeLogRemoved - ? AnnotationDrawService.DEFAULT_REMOVED_ANNOTATION_OPACITY - : AnnotationDrawService.DEFAULT_TEXT_ANNOTATION_OPACITY; - } + const dossierTemplateId = this._dossiersService.find(dossierId).dossierTemplateId; - annotation.setContents(annotationWrapper.content); - - annotation.PageNumber = pageNumber; - annotation.StrokeColor = this.getAndConvertColor( + let annotation: Core.Annotations.RectangleAnnotation | Core.Annotations.TextHighlightAnnotation; + if (annotationWrapper.rectangle || annotationWrapper.isImage) { + annotation = new activeViewer.Core.Annotations.RectangleAnnotation(); + const pageHeight = activeViewer.Core.documentViewer.getPageHeight(pageNumber); + const firstPosition = annotationWrapper.positions[0]; + annotation.X = firstPosition.topLeft.x; + annotation.Y = pageHeight - (firstPosition.topLeft.y + firstPosition.height); + annotation.Width = firstPosition.width; + annotation.FillColor = this.getAndConvertColor( activeViewer, dossierTemplateId, annotationWrapper.superType, annotationWrapper.type, ); - annotation.Id = annotationWrapper.id; - annotation.ReadOnly = true; - // change log entries are drawn lighter - - annotation.Hidden = - annotationWrapper.isChangeLogRemoved || - (this._skippedService.hideSkipped && annotationWrapper.isSkipped) || - annotationWrapper.isOCR || - annotationWrapper.hidden; - annotation.setCustomData('redact-manager', 'true'); - annotation.setCustomData('redaction', String(annotationWrapper.previewAnnotation)); - annotation.setCustomData('skipped', String(annotationWrapper.isSkipped)); - annotation.setCustomData('changeLog', String(annotationWrapper.isChangeLogEntry)); - annotation.setCustomData('changeLogRemoved', String(annotationWrapper.isChangeLogRemoved)); - annotation.setCustomData('opacity', String(annotation.Opacity)); - annotation.setCustomData('redactionColor', String(this.getColor(activeViewer, dossierTemplateId, 'redaction', 'redaction'))); - annotation.setCustomData( - 'annotationColor', - String(this.getColor(activeViewer, dossierTemplateId, annotationWrapper.superType, annotationWrapper.type)), - ); - - return annotation; + annotation.Opacity = annotationWrapper.isChangeLogRemoved + ? AnnotationDrawService.DEFAULT_REMOVED_ANNOTATION_OPACITY + : AnnotationDrawService.DEFAULT_RECTANGLE_ANNOTATION_OPACITY; + annotation.Height = firstPosition.height; + annotation.Intensity = 100; + } else { + annotation = new activeViewer.Core.Annotations.TextHighlightAnnotation(); + annotation.Quads = this._rectanglesToQuads(annotationWrapper.positions, activeViewer, pageNumber); + annotation.Opacity = annotationWrapper.isChangeLogRemoved + ? AnnotationDrawService.DEFAULT_REMOVED_ANNOTATION_OPACITY + : AnnotationDrawService.DEFAULT_TEXT_ANNOTATION_OPACITY; } + + annotation.setContents(annotationWrapper.content); + + annotation.PageNumber = pageNumber; + annotation.StrokeColor = this.getAndConvertColor( + activeViewer, + dossierTemplateId, + annotationWrapper.superType, + annotationWrapper.type, + ); + annotation.Id = annotationWrapper.id; + annotation.ReadOnly = true; + // change log entries are drawn lighter + + annotation.Hidden = + annotationWrapper.isChangeLogRemoved || + (this._skippedService.hideSkipped && annotationWrapper.isSkipped) || + annotationWrapper.isOCR || + annotationWrapper.hidden; + annotation.setCustomData('redact-manager', 'true'); + annotation.setCustomData('redaction', String(annotationWrapper.previewAnnotation)); + annotation.setCustomData('skipped', String(annotationWrapper.isSkipped)); + annotation.setCustomData('changeLog', String(annotationWrapper.isChangeLogEntry)); + annotation.setCustomData('changeLogRemoved', String(annotationWrapper.isChangeLogRemoved)); + annotation.setCustomData('opacity', String(annotation.Opacity)); + annotation.setCustomData('redactionColor', String(this.getColor(activeViewer, dossierTemplateId, 'redaction', 'redaction'))); + annotation.setCustomData( + 'annotationColor', + String(this.getColor(activeViewer, dossierTemplateId, annotationWrapper.superType, annotationWrapper.type)), + ); + + return annotation; } private _rectanglesToQuads(positions: IRectangle[], activeViewer: WebViewerInstance, pageNumber: number): any[] { diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index 9ee85116b..78d1498b2 100644 --- a/apps/red-ui/src/assets/config/config.json +++ b/apps/red-ui/src/assets/config/config.json @@ -1,7 +1,7 @@ { "ADMIN_CONTACT_NAME": null, "ADMIN_CONTACT_URL": null, - "API_URL": "https://dev-05.iqser.cloud/redaction-gateway-v1", + "API_URL": "https://dev-04.iqser.cloud/redaction-gateway-v1", "APP_NAME": "RedactManager", "AUTO_READ_TIME": 3, "BACKEND_APP_VERSION": "4.4.40", @@ -17,7 +17,7 @@ "MAX_RETRIES_ON_SERVER_ERROR": 3, "OAUTH_CLIENT_ID": "redaction", "OAUTH_IDP_HINT": null, - "OAUTH_URL": "https://dev-05.iqser.cloud/auth/realms/redaction", + "OAUTH_URL": "https://dev-04.iqser.cloud/auth/realms/redaction", "RECENT_PERIOD_IN_HOURS": 24, "SELECTION_MODE": "structural", "MANUAL_BASE_URL": "https://docs.redactmanager.com/preview" From 8a1d612c9f9ad4656a81b3d0311440b8b5b00be4 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Sat, 5 Mar 2022 21:01:41 +0100 Subject: [PATCH 20/43] 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 57f3ec228..224333d9a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.284.0", + "version": "3.285.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index de183c65c828b07d208d731793d6dbd0a636b23b..a0546c061d36394b6d6581df0d511b51e8899c27 100644 GIT binary patch delta 2871 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 Vc5df(4Q{{K_J0Q<@^1i8000Yyo$det delta 2845 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 Date: Sat, 5 Mar 2022 22:29:05 +0200 Subject: [PATCH 21/43] hide analysis button is file is approved --- .../file-actions/file-actions.component.ts | 14 +++++++------- .../expandable-file-actions.component.ts | 10 +++++----- .../red-ui/src/app/services/permissions.service.ts | 4 ++-- .../src/lib/shared/expandable-file-actions.ts | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) 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 9f9621126..24daa5fde 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 @@ -293,11 +293,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, ); } - private _triggerImportRedactions($event: MouseEvent) { - $event.stopPropagation(); - this.importRedactionsInput.nativeElement.click(); - } - async importRedactions(files: FileList) { const fileToImport = files[0]; @@ -319,6 +314,11 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, this._setup(); } + private _triggerImportRedactions($event: MouseEvent) { + $event.stopPropagation(); + this.importRedactionsInput.nativeElement.click(); + } + private _openDeleteFileDialog($event: MouseEvent) { this._dialogService.openDialog( 'confirm', @@ -427,8 +427,8 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, const showReanalyse = this.canReanalyse || this.file.excludedFromAutomaticAnalysis || this.analysisForced; - this.showReanalyseFilePreview = showReanalyse && this.isFilePreview; - this.showReanalyseDossierOverview = showReanalyse && this.isDossierOverview; + this.showReanalyseFilePreview = showReanalyse && this.isFilePreview && !this.file.isApproved; + this.showReanalyseDossierOverview = showReanalyse && this.isDossierOverview && !this.file.isApproved; this.buttons = this._buttons; diff --git a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts index df9d6396a..b2f3ae75c 100644 --- a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts @@ -29,6 +29,10 @@ export class ExpandableFileActionsComponent implements OnChanges { private readonly _permissionsService: PermissionsService, ) {} + get scrollableParentView(): ScrollableParentView { + return this.helpModeKey === 'document_features' ? ScrollableParentViews.VIRTUAL_SCROLL : undefined; + } + ngOnChanges(changes: SimpleChanges) { if (changes.actions || changes.maxWidth) { if (this.maxWidth) { @@ -50,7 +54,7 @@ export class ExpandableFileActionsComponent implements OnChanges { // Patch download button const downloadBtn = this.actions.find(btn => btn.type === ActionTypes.downloadBtn); if (downloadBtn) { - downloadBtn.action = $event => this._downloadFiles($event, downloadBtn.files); + downloadBtn.action = ($event: MouseEvent) => this._downloadFiles($event, downloadBtn.files); downloadBtn.disabled = !this._permissionsService.canDownloadFiles(downloadBtn.files); } } @@ -63,8 +67,4 @@ export class ExpandableFileActionsComponent implements OnChanges { await firstValueFrom(this._fileDownloadService.downloadFiles(filesIds, dossierId)); this._toaster.info(_('download-status.queued')); } - - get scrollableParentView(): ScrollableParentView { - return this.helpModeKey === 'document_features' ? ScrollableParentViews.VIRTUAL_SCROLL : undefined; - } } diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index f1a0581b5..366aaf617 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -182,11 +182,11 @@ export class PermissionsService { } private _canEnableAutoAnalysis(file: File): boolean { - return file.excludedFromAutomaticAnalysis && file.assignee === this._userService.currentUser.id; + return file.excludedFromAutomaticAnalysis && file.assignee === this._userService.currentUser.id && !file.isApproved; } private _canDisableAutoAnalysis(file: File): boolean { - return !file.excludedFromAutomaticAnalysis && file.assignee === this._userService.currentUser.id; + return !file.excludedFromAutomaticAnalysis && file.assignee === this._userService.currentUser.id && !file.isApproved; } private _canAssignToSelf(file: File, dossier: Dossier): boolean { diff --git a/libs/red-domain/src/lib/shared/expandable-file-actions.ts b/libs/red-domain/src/lib/shared/expandable-file-actions.ts index dfa2bbffc..3fd17d5e8 100644 --- a/libs/red-domain/src/lib/shared/expandable-file-actions.ts +++ b/libs/red-domain/src/lib/shared/expandable-file-actions.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; import { CircleButtonType } from '@iqser/common-ui'; -import { File } from '@red/domain'; +import { File } from '../files'; export type ActionType = 'circleBtn' | 'downloadBtn' | 'toggle'; @@ -11,7 +11,7 @@ export const ActionTypes = { }; export interface Action { - action?: (...args: any[]) => void; + action?: (...args: unknown[]) => void; tooltip?: string; icon?: string; show?: boolean; From 252ce6e6f507c037de9d45b345132a02a5d2d35a Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Sat, 5 Mar 2022 21:33:20 +0100 Subject: [PATCH 22/43] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3214 -> 3213 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 224333d9a..0c6eb9b94 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.285.0", + "version": "3.286.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index a0546c061d36394b6d6581df0d511b51e8899c27..f29e2ba852a4be6551d9e17ef5b3eff26b70e322 100644 GIT binary patch literal 3213 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 Ao&W#< From d1ec5b1e944ae49f78d969bffccaf40e5684b37c Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Mon, 7 Mar 2022 05:48:34 +0200 Subject: [PATCH 23/43] RED-3478 -> updated description --- .../reports/reports-screen/reports-screen.component.html | 1 + apps/red-ui/src/assets/i18n/de.json | 1 + apps/red-ui/src/assets/i18n/en.json | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.html index 40f257440..f9370fbb8 100644 --- a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.html @@ -1,6 +1,7 @@
+
diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json index bae39df99..42995e3ba 100644 --- a/apps/red-ui/src/assets/i18n/de.json +++ b/apps/red-ui/src/assets/i18n/de.json @@ -1658,6 +1658,7 @@ "invalid-upload": "Ungültiges Upload-Format ausgewählt! Unterstützt werden Dokumente im .xlsx- und im .docx-Format", "multi-file-report": "(Mehrere Dateien)", "report-documents": "Dokumente für den Bericht", + "setup": "", "table-header": { "description": "Beschreibung", "placeholders": "Platzhalter" diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index a729e9227..c8ec8e2d2 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -1626,7 +1626,7 @@ }, "reports": "Reports", "reports-screen": { - "description": "Click the upload button on the right to upload your redaction report templates.", + "description": "Below, you will find a list of placeholders for dossier and document-specific information. You can include these placeholders in your report templates.", "descriptions": { "dossier-attributes": "This placeholder gets replaced with the value of the dossier attribute {attribute}.", "file-attributes": "This placeholder gets replaced with the value of the file attribute {attribute}.", @@ -1658,6 +1658,7 @@ "invalid-upload": "Invalid format selected for Upload! Supported formats are XLSX and DOCX", "multi-file-report": "(Multi-file)", "report-documents": "Report Documents", + "setup": "Click the upload button on the right to upload your redaction report templates.", "table-header": { "description": "Description", "placeholders": "Placeholders" From ff2ab18117d44e95cd14f238915d4e482ace342b Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Mon, 7 Mar 2022 04:53:14 +0100 Subject: [PATCH 24/43] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3213 -> 3214 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0c6eb9b94..344d02521 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.286.0", + "version": "3.287.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index f29e2ba852a4be6551d9e17ef5b3eff26b70e322..94e2b81e5a90795e4896a52a1f03b7abbf6662f0 100644 GIT binary patch literal 3214 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 Date: Mon, 7 Mar 2022 06:22:16 +0200 Subject: [PATCH 25/43] renamed start/stop auto analysis labels --- .../bulk-actions/dossier-overview-bulk-actions.component.ts | 4 ++-- .../shared/components/file-actions/file-actions.component.ts | 4 ++-- apps/red-ui/src/assets/i18n/de.json | 4 ++-- apps/red-ui/src/assets/i18n/en.json | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts index 72d1e1ae3..8271fd949 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts @@ -121,14 +121,14 @@ export class DossierOverviewBulkActionsComponent implements OnChanges { { type: ActionTypes.circleBtn, action: () => this._bulkActionsService.toggleAutomaticAnalysis(this.selectedFiles), - tooltip: _('dossier-overview.disable-auto-analysis'), + tooltip: _('dossier-overview.stop-auto-analysis'), icon: 'red:stop', show: this.#canDisableAutoAnalysis, }, { type: ActionTypes.circleBtn, action: () => this._bulkActionsService.toggleAutomaticAnalysis(this.selectedFiles), - tooltip: _('dossier-overview.enable-auto-analysis'), + tooltip: _('dossier-overview.start-auto-analysis'), icon: 'red:play', show: this.#canEnableAutoAnalysis, }, 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 24daa5fde..aab882408 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 @@ -201,7 +201,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, { type: ActionTypes.circleBtn, action: $event => this.toggleAutomaticAnalysis($event), - tooltip: _('dossier-overview.disable-auto-analysis'), + tooltip: _('dossier-overview.stop-auto-analysis'), icon: 'red:stop', show: this.canDisableAutoAnalysis, }, @@ -216,7 +216,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, { type: ActionTypes.circleBtn, action: $event => this.toggleAutomaticAnalysis($event), - tooltip: _('dossier-overview.enable-auto-analysis'), + tooltip: _('dossier-overview.start-auto-analysis'), buttonType: this.isFilePreview ? CircleButtonTypes.warn : CircleButtonTypes.default, icon: 'red:play', show: this.canEnableAutoAnalysis, diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json index 42995e3ba..579a0d666 100644 --- a/apps/red-ui/src/assets/i18n/de.json +++ b/apps/red-ui/src/assets/i18n/de.json @@ -754,7 +754,7 @@ "delete": { "action": "Datei löschen" }, - "disable-auto-analysis": "", + "stop-auto-analysis": "", "dossier-details": { "attributes": { "expand": "{count} {count, plural, one{benutzerdefiniertes Attribut} other{benutzerdefinierte Attribute}}", @@ -778,7 +778,7 @@ }, "download-file": "Herunterladen", "download-file-disabled": "Nur genehmigte Dateien können heruntergeladen werden", - "enable-auto-analysis": "", + "start-auto-analysis": "", "file-listing": { "file-entry": { "file-error": "Reanalyse erforderlich", diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index c8ec8e2d2..4443a9bb0 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -754,7 +754,7 @@ "delete": { "action": "Delete File" }, - "disable-auto-analysis": "Disable auto-analysis", + "stop-auto-analysis": "Stop auto-analysis", "dossier-details": { "attributes": { "expand": "{count} custom {count, plural, one{attribute} other{attributes}}", @@ -778,7 +778,7 @@ }, "download-file": "Download", "download-file-disabled": "You need to be approver in the dossier and the {count, plural, one{file needs} other{files need}} to be approved in order to download.", - "enable-auto-analysis": "Enable auto-analysis", + "start-auto-analysis": "Start auto-analysis", "file-listing": { "file-entry": { "file-error": "Re-processing required", From 28adfc61b8b4179c7e637b671e585fc6839be83a Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Mon, 7 Mar 2022 05:26:32 +0100 Subject: [PATCH 26/43] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3214 -> 3214 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 344d02521..d9b67c1f0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.287.0", + "version": "3.288.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 94e2b81e5a90795e4896a52a1f03b7abbf6662f0..19ec1ec67a25bc87f416e821ddc1ae8bc93d1939 100644 GIT binary patch delta 3098 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 delta 3099 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 From aa34d8a32c50efaedfde515e764677a469617efd Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Mon, 7 Mar 2022 10:03:13 +0200 Subject: [PATCH 27/43] RED-3518 -> updated icons --- .../dossier-overview-bulk-actions.component.ts | 4 ++-- .../components/file-actions/file-actions.component.ts | 4 ++-- apps/red-ui/src/app/modules/icons/icons.module.ts | 4 ++-- .../red-ui/src/assets/icons/general/disable-analysis.svg | 9 +++++++++ apps/red-ui/src/assets/icons/general/enable-analysis.svg | 9 +++++++++ apps/red-ui/src/assets/icons/general/play.svg | 7 ------- apps/red-ui/src/assets/icons/general/stop.svg | 5 ----- 7 files changed, 24 insertions(+), 18 deletions(-) create mode 100644 apps/red-ui/src/assets/icons/general/disable-analysis.svg create mode 100644 apps/red-ui/src/assets/icons/general/enable-analysis.svg delete mode 100644 apps/red-ui/src/assets/icons/general/play.svg delete mode 100644 apps/red-ui/src/assets/icons/general/stop.svg diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts index 8271fd949..7ec6cd340 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/bulk-actions/dossier-overview-bulk-actions.component.ts @@ -122,14 +122,14 @@ export class DossierOverviewBulkActionsComponent implements OnChanges { type: ActionTypes.circleBtn, action: () => this._bulkActionsService.toggleAutomaticAnalysis(this.selectedFiles), tooltip: _('dossier-overview.stop-auto-analysis'), - icon: 'red:stop', + icon: 'red:disable-analysis', show: this.#canDisableAutoAnalysis, }, { type: ActionTypes.circleBtn, action: () => this._bulkActionsService.toggleAutomaticAnalysis(this.selectedFiles), tooltip: _('dossier-overview.start-auto-analysis'), - icon: 'red:play', + icon: 'red:enable-analysis', show: this.#canEnableAutoAnalysis, }, 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 aab882408..227422d94 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 @@ -202,7 +202,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, type: ActionTypes.circleBtn, action: $event => this.toggleAutomaticAnalysis($event), tooltip: _('dossier-overview.stop-auto-analysis'), - icon: 'red:stop', + icon: 'red:disable-analysis', show: this.canDisableAutoAnalysis, }, { @@ -218,7 +218,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, action: $event => this.toggleAutomaticAnalysis($event), tooltip: _('dossier-overview.start-auto-analysis'), buttonType: this.isFilePreview ? CircleButtonTypes.warn : CircleButtonTypes.default, - icon: 'red:play', + icon: 'red:enable-analysis', show: this.canEnableAutoAnalysis, }, { diff --git a/apps/red-ui/src/app/modules/icons/icons.module.ts b/apps/red-ui/src/app/modules/icons/icons.module.ts index af50170a6..3513cf42d 100644 --- a/apps/red-ui/src/app/modules/icons/icons.module.ts +++ b/apps/red-ui/src/app/modules/icons/icons.module.ts @@ -26,7 +26,9 @@ export class IconsModule { 'csv', 'dictionary', 'denied', + 'disable-analysis', 'double-chevron-right', + 'enable-analysis', 'enter', 'entries', 'exclude-pages', @@ -47,7 +49,6 @@ export class IconsModule { 'new-tab', 'notification', 'page', - 'play', 'preview', 'put-back', 'read-only', @@ -64,7 +65,6 @@ export class IconsModule { 'secret', 'status', 'status-info', - 'stop', 'template', 'thumb-down', 'thumb-up', diff --git a/apps/red-ui/src/assets/icons/general/disable-analysis.svg b/apps/red-ui/src/assets/icons/general/disable-analysis.svg new file mode 100644 index 000000000..820f3267d --- /dev/null +++ b/apps/red-ui/src/assets/icons/general/disable-analysis.svg @@ -0,0 +1,9 @@ + + + disable analysis + + + + + + diff --git a/apps/red-ui/src/assets/icons/general/enable-analysis.svg b/apps/red-ui/src/assets/icons/general/enable-analysis.svg new file mode 100644 index 000000000..f058e0525 --- /dev/null +++ b/apps/red-ui/src/assets/icons/general/enable-analysis.svg @@ -0,0 +1,9 @@ + + + enable analysis + + + + + + diff --git a/apps/red-ui/src/assets/icons/general/play.svg b/apps/red-ui/src/assets/icons/general/play.svg deleted file mode 100644 index 1b37e3874..000000000 --- a/apps/red-ui/src/assets/icons/general/play.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - Svg Vector Icons : http://www.onlinewebfonts.com/icon - - \ No newline at end of file diff --git a/apps/red-ui/src/assets/icons/general/stop.svg b/apps/red-ui/src/assets/icons/general/stop.svg deleted file mode 100644 index db10a7bb9..000000000 --- a/apps/red-ui/src/assets/icons/general/stop.svg +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file From dcf317a5aaf5bc840a24147ebb48cadb8dab1c00 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Mon, 7 Mar 2022 09:07:29 +0100 Subject: [PATCH 28/43] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3214 -> 3213 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d9b67c1f0..7c28bbd67 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.288.0", + "version": "3.289.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 19ec1ec67a25bc87f416e821ddc1ae8bc93d1939..d183aeb69d251b67417d62cbcad20dfaac21125a 100644 GIT binary patch delta 103 zcmV-t0GR)d8I2i`cT;%_$A^B$_Lu%E6#O963|dn&Tp{#hEcJ72b6x-PN6nrxQh#68 zaJv3IcWIyX|6{bh`macgBPPe@QC)x78eG8(e@g!z*L$yjKL|koi@;mFLb1!c3kWWR J@HhZa004fBGEM*h delta 104 zcmV-u0GI!b8IBo{cU0NF>n>i|j_oh~S19;Fs2Q}TX1GG=$5`s;*yg(a<&T;@Wu*ST ztl@P1d+yRc>;K1Sd-Y$D7)MNw&7->hur;`X7ygv~Jp$>)(ElRvK>xAIy9)?9 K=$tA5PyhhEGCZ~b From 18c7df52ca49fbfea7b77943fd6f5dd48cb72e5f Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Mon, 7 Mar 2022 11:23:33 +0200 Subject: [PATCH 29/43] fix page rotation discard --- .../components/pdf-viewer/pdf-viewer.component.ts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.ts index 650c363fe..be1b75513 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/pdf-viewer/pdf-viewer.component.ts @@ -396,8 +396,8 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha cursor: pointer; margin: 0 12px; `; - paragraph.addEventListener('click', () => { - this._pageRotationService.applyRotation(); + paragraph.addEventListener('click', async () => { + await this._pageRotationService.applyRotation(); this._showRotationConfirmationButtons(); }); return paragraph; @@ -417,6 +417,14 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha opacity: 0.7; `; paragraph.addEventListener('click', () => { + const rotations = this._pageRotationService.rotations$.value; + const oneRotationDegree = 90; + for (const page of Object.keys(rotations)) { + const times = rotations[page] / oneRotationDegree; + for (let i = 1; i <= times; i++) { + this.documentViewer.rotateCounterClockwise(Number(page)); + } + } this._pageRotationService.clearRotations(); this._showRotationConfirmationButtons(); }); From 5129c0628a4a80e3ebb21ed0d0ef28474386cfda Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Mon, 7 Mar 2022 10:27:48 +0100 Subject: [PATCH 30/43] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3213 -> 3215 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7c28bbd67..02b159754 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.289.0", + "version": "3.290.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index d183aeb69d251b67417d62cbcad20dfaac21125a..8a0c0f37e2d1d1e88ae5e5455e0c6e204bc54040 100644 GIT binary patch delta 3127 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 Rx&30>{{g(YdDZ|>002X1B)R|q delta 3125 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 P7u)_1E`;zn08jt`K9CSW From 3382f4fa095f90f38f65e2c10448ee940a979e2e Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Mon, 7 Mar 2022 11:56:32 +0200 Subject: [PATCH 31/43] change detector is stupid --- .../page-indicator/page-indicator.component.html | 2 +- .../page-indicator/page-indicator.component.ts | 11 +++++++---- libs/common-ui | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.html index b323ebfd2..38c94bf0b 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.html @@ -12,7 +12,7 @@
-
+
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.ts index 65c30d7e0..ff26797e7 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/page-indicator/page-indicator.component.ts @@ -15,7 +15,7 @@ import { ViewedPagesService } from '@services/entity-services/viewed-pages.servi import { IViewedPage } from '@red/domain'; import { AutoUnsubscribe } from '@iqser/common-ui'; import { FilePreviewStateService } from '../../services/file-preview-state.service'; -import { firstValueFrom, Observable } from 'rxjs'; +import { firstValueFrom } from 'rxjs'; import { PageRotationService } from '../../services/page-rotation.service'; @Component({ @@ -35,7 +35,7 @@ export class PageIndicatorComponent extends AutoUnsubscribe implements OnDestroy pageReadTimeout: number = null; read = false; - isRotated$: Observable; + isRotated = false; constructor( private readonly _viewedPagesService: ViewedPagesService, @@ -43,7 +43,7 @@ export class PageIndicatorComponent extends AutoUnsubscribe implements OnDestroy private readonly _changeDetectorRef: ChangeDetectorRef, private readonly _permissionService: PermissionsService, private readonly _stateService: FilePreviewStateService, - private readonly _pageRotationService: PageRotationService, + readonly pageRotationService: PageRotationService, ) { super(); } @@ -61,7 +61,10 @@ export class PageIndicatorComponent extends AutoUnsubscribe implements OnDestroy } ngOnInit() { - this.isRotated$ = this._pageRotationService.isRotated(this.number); + this.addSubscription = this.pageRotationService.isRotated(this.number).subscribe(value => { + this.isRotated = value; + this._changeDetectorRef.detectChanges(); + }); } ngOnChanges() { diff --git a/libs/common-ui b/libs/common-ui index f7f0bb86a..2bae4da2b 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit f7f0bb86a6ccf3b6e1970c8749b83e828578e673 +Subproject commit 2bae4da2b991ad300b893f6b73797b6c1b90448c From 12e55d7095568f9e793586f493cb757262b77bc0 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Mon, 7 Mar 2022 11:01:07 +0100 Subject: [PATCH 32/43] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3215 -> 3213 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 02b159754..0862272df 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.290.0", + "version": "3.291.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 8a0c0f37e2d1d1e88ae5e5455e0c6e204bc54040..d861b1997a8ef99681fccb409dd923837f056910 100644 GIT binary patch delta 3125 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 Pi*5f0Z=MLw08jt`MPd~y delta 3127 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 Rx&30>{{g(YdDZ|>002X1B)R|q From 1b44c77ba4e50dbb9eea4fdb4751052d4840f50b Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Mon, 7 Mar 2022 21:00:13 +0200 Subject: [PATCH 33/43] RED-3528 -> Adjust Links for 'Remove from Dictionary' in Help Mode --- .../annotation-actions.component.html | 2 +- .../annotation-actions.component.ts | 11 +++++++++++ apps/red-ui/src/assets/help-mode/links.json | 16 ++++++++++++++-- apps/red-ui/src/assets/i18n/en.json | 2 +- 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.html index 0ec4827e0..5ce02dac9 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.html @@ -149,7 +149,7 @@ [tooltip]="'annotation-actions.remove-annotation.remove-from-dict' | translate" [type]="buttonType" icon="red:remove-from-dict" - iqserHelpMode="remove_from_dictionary" + [iqserHelpMode]="removeFromDictionaryHelpModeKey" [scrollableParentView]="scrollableParentView" > diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.ts index fb5dff0c2..4a2d881cc 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.ts @@ -17,6 +17,12 @@ export const AnnotationButtonTypes = { export type AnnotationButtonType = keyof typeof AnnotationButtonTypes; +const helpModeKey = { + hint: 'hints_remove_from_dictionary', + recommendation: 'recommendation_remove_from_dictionary', + skipped: 'skipped_remove_from_dictionary', +}; + @Component({ selector: 'redaction-annotation-actions', templateUrl: './annotation-actions.component.html', @@ -127,4 +133,9 @@ export class AnnotationActionsComponent implements OnChanges { this.annotations, ); } + + get removeFromDictionaryHelpModeKey() { + const type = this.annotations[0]?.typeLabel?.split('.')[1]; + return helpModeKey[type]; + } } diff --git a/apps/red-ui/src/assets/help-mode/links.json b/apps/red-ui/src/assets/help-mode/links.json index ae6cc5c82..901b0bf0b 100644 --- a/apps/red-ui/src/assets/help-mode/links.json +++ b/apps/red-ui/src/assets/help-mode/links.json @@ -119,8 +119,20 @@ "it": "", "fr": "" }, - "remove_from_dictionary": { - "en": "/en/index-en.html?contextId=remove_from_dictionary", + "skipped_remove_from_dictionary": { + "en": "/en/index-en.html?contextId=skipped_remove_from_dictionary", + "de": "", + "it": "", + "fr": "" + }, + "hints_remove_from_dictionary": { + "en": "/en/index-en.html?contextId=hints_remove_from_dictionary", + "de": "", + "it": "", + "fr": "" + }, + "recommendation_remove_from_dictionary": { + "en": "/en/index-en.html?contextId=recommendation_remove_from_dictionary", "de": "", "it": "", "fr": "" diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 4443a9bb0..b6be5b8c1 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -1626,7 +1626,7 @@ }, "reports": "Reports", "reports-screen": { - "description": "Below, you will find a list of placeholders for dossier and document-specific information. You can include these placeholders in your report templates.", + "description": "Below, you will find a list of placeholders for dossier- and document-specific information. You can include these placeholders in your report templates.", "descriptions": { "dossier-attributes": "This placeholder gets replaced with the value of the dossier attribute {attribute}.", "file-attributes": "This placeholder gets replaced with the value of the file attribute {attribute}.", From b90e81f521228ee8acb7c09c7c1ada486b208c8b Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Mon, 7 Mar 2022 20:04:32 +0100 Subject: [PATCH 34/43] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3213 -> 3214 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0862272df..42e328351 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.291.0", + "version": "3.292.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index d861b1997a8ef99681fccb409dd923837f056910..ac32d183a239f5df0f97f87eae41ab64e26ca1d6 100644 GIT binary patch literal 3214 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 Date: Tue, 8 Mar 2022 11:40:11 +0200 Subject: [PATCH 35/43] RED-3579 -> enabled help mode, not only for dev mode --- .../src/app/components/base-screen/base-screen.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.html b/apps/red-ui/src/app/components/base-screen/base-screen.component.html index 106f8e0d7..b54d99c37 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.html +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.html @@ -1,4 +1,4 @@ - +
From 207e2e09fe1d907a32e63875f9edfbdaef3153eb Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Tue, 8 Mar 2022 10:44:43 +0100 Subject: [PATCH 36/43] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3214 -> 3213 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 42e328351..8bac55ced 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.292.0", + "version": "3.293.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index ac32d183a239f5df0f97f87eae41ab64e26ca1d6..56c9f57401c9c2d754cbb48a95eb258eaceadd96 100644 GIT binary patch literal 3213 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 literal 3214 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 Date: Tue, 8 Mar 2022 12:46:39 +0200 Subject: [PATCH 37/43] RED-3571 --- .../components/screen-header/screen-header.component.ts | 2 +- apps/red-ui/src/app/services/user.service.ts | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/screen-header.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/screen-header.component.ts index 7637b5574..c4b737133 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/screen-header.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/screen-header.component.ts @@ -69,7 +69,7 @@ export class ScreenHeaderComponent implements OnInit { const fileName = this.dossier.dossierName + '.export.csv'; const mapper = (file?: IFile) => ({ ...file, - assignee: this._userService.getNameForId(file.assignee), + assignee: this._userService.getNameForId(file.assignee) || '-', primaryAttribute: this._primaryFileAttributeService.getPrimaryFileAttributeValue(file, this.dossier.dossierTemplateId), }); const fileFields = [ diff --git a/apps/red-ui/src/app/services/user.service.ts b/apps/red-ui/src/app/services/user.service.ts index c610856bc..7a0417975 100644 --- a/apps/red-ui/src/app/services/user.service.ts +++ b/apps/red-ui/src/app/services/user.service.ts @@ -125,6 +125,9 @@ export class UserService extends EntitiesService { if (id?.toLowerCase() === 'system') { return new User({ username: 'System' }, [], 'system'); } + if (!id) { + return undefined; + } return super.find(id) || new User({ username: 'Deleted User' }, [], 'deleted'); } } From 938605c18e135bb71628e3e92676fa39e58c7a57 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Tue, 8 Mar 2022 11:50:51 +0100 Subject: [PATCH 38/43] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3213 -> 3215 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8bac55ced..9c1cb67b2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.293.0", + "version": "3.294.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 56c9f57401c9c2d754cbb48a95eb258eaceadd96..c9ea472e88c463e0d6a1a7d4520fe4bda11fc14b 100644 GIT binary patch delta 3127 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 PezEQU`e;C;08jt`LuMCU From dd60b49348d562579599fd4914cd4228ddd2b3a5 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Tue, 8 Mar 2022 14:13:41 +0200 Subject: [PATCH 39/43] RED-3540, RED-3541 -> adjust links in HelpMode --- .../annotation-actions.component.html | 8 +++---- .../annotation-actions.component.ts | 11 ++-------- apps/red-ui/src/assets/help-mode/links.json | 22 +++++++++++++++++-- 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.html index 5ce02dac9..bb81fe0b1 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.html @@ -33,7 +33,7 @@ [tooltip]="'annotation-actions.resize.label' | translate" [type]="buttonType" icon="red:resize" - iqserHelpMode="redaction_resize_redaction" + [iqserHelpMode]="helpModeKey + '_resize'" [scrollableParentView]="scrollableParentView" > @@ -149,7 +149,7 @@ [tooltip]="'annotation-actions.remove-annotation.remove-from-dict' | translate" [type]="buttonType" icon="red:remove-from-dict" - [iqserHelpMode]="removeFromDictionaryHelpModeKey" + [iqserHelpMode]="helpModeKey + '_remove_from_dictionary'" [scrollableParentView]="scrollableParentView" > @@ -160,7 +160,7 @@ [tooltip]="'annotation-actions.remove-annotation.false-positive' | translate" [type]="buttonType" icon="red:thumb-down" - iqserHelpMode="redaction_false_positive" + [iqserHelpMode]="helpModeKey + '_false_positive'" [scrollableParentView]="scrollableParentView" > @@ -171,7 +171,7 @@ [tooltip]="'annotation-actions.remove-annotation.only-here' | translate" [type]="buttonType" icon="iqser:trash" - iqserHelpMode="redaction_remove_only_here" + [iqserHelpMode]="helpModeKey + '_remove_only_here'" [scrollableParentView]="scrollableParentView" > diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.ts index 4a2d881cc..6e257a003 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.ts @@ -17,12 +17,6 @@ export const AnnotationButtonTypes = { export type AnnotationButtonType = keyof typeof AnnotationButtonTypes; -const helpModeKey = { - hint: 'hints_remove_from_dictionary', - recommendation: 'recommendation_remove_from_dictionary', - skipped: 'skipped_remove_from_dictionary', -}; - @Component({ selector: 'redaction-annotation-actions', templateUrl: './annotation-actions.component.html', @@ -134,8 +128,7 @@ export class AnnotationActionsComponent implements OnChanges { ); } - get removeFromDictionaryHelpModeKey() { - const type = this.annotations[0]?.typeLabel?.split('.')[1]; - return helpModeKey[type]; + get helpModeKey() { + return this.annotations[0]?.typeLabel?.split('.')[1]; } } diff --git a/apps/red-ui/src/assets/help-mode/links.json b/apps/red-ui/src/assets/help-mode/links.json index 901b0bf0b..9786ee578 100644 --- a/apps/red-ui/src/assets/help-mode/links.json +++ b/apps/red-ui/src/assets/help-mode/links.json @@ -119,13 +119,19 @@ "it": "", "fr": "" }, + "recommendation_false_positive": { + "en": "/en/index-en.html?contextId=recommendation_false_positive", + "de": "", + "it": "", + "fr": "" + }, "skipped_remove_from_dictionary": { "en": "/en/index-en.html?contextId=skipped_remove_from_dictionary", "de": "", "it": "", "fr": "" }, - "hints_remove_from_dictionary": { + "hint_remove_from_dictionary": { "en": "/en/index-en.html?contextId=hints_remove_from_dictionary", "de": "", "it": "", @@ -143,6 +149,12 @@ "it": "", "fr": "" }, + "hint_remove_only_here": { + "en": "/en/index-en.html?contextId=hint_remove_only_here", + "de": "", + "it": "", + "fr": "" + }, "reset_filters": { "en": "/en/index-en.html?contextId=reset_filters", "de": "", @@ -191,12 +203,18 @@ "it": "", "fr": "" }, - "redaction_resize_redaction": { + "redaction_resize": { "en": "/en/index-en.html?contextId=redaction_resize_redaction", "de": "", "it": "", "fr": "" }, + "recommendation_resize": { + "en": "/en/index-en.html?contextId=recommendation_resize", + "de": "", + "it": "", + "fr": "" + }, "skipped_force_redaction": { "en": "/en/index-en.html?contextId=skipped_force_redaction", "de": "", From 98a25abd27e5ba186fa340ed26d4e57f578d6286 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Tue, 8 Mar 2022 13:20:58 +0100 Subject: [PATCH 40/43] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3215 -> 3213 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9c1cb67b2..1e6ef7c1b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.294.0", + "version": "3.295.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index c9ea472e88c463e0d6a1a7d4520fe4bda11fc14b..8c195fca20515dc43c531ccdf79407fac850fdb7 100644 GIT binary patch literal 3213 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 Date: Tue, 8 Mar 2022 12:36:25 +0200 Subject: [PATCH 41/43] extract web viewer instance into a service --- .../pdf-viewer/pdf-viewer.component.html | 16 +- .../pdf-viewer/pdf-viewer.component.ts | 170 ++++++------------ .../file-preview-providers.ts | 2 + .../file-preview-screen.component.ts | 10 +- .../services/page-rotation.service.ts | 46 ++++- .../services/pdf-viewer.service.ts} | 47 ++++- .../file-preview-screen/shared/constants.ts | 19 ++ 7 files changed, 174 insertions(+), 136 deletions(-) rename apps/red-ui/src/app/modules/dossier/{utils/pdf-viewer.utils.ts => screens/file-preview-screen/services/pdf-viewer.service.ts} (70%) create mode 100644 apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/shared/constants.ts 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 68d38d51c..c670ce353 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,18 +2,18 @@
- + -