From 184fb428359fcc6dd0d1e5d8a4b71582e9418ddd Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 9 Feb 2022 11:53:40 +0100 Subject: [PATCH 01/15] 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 07be69ed3..247ef5e95 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.218.0", + "version": "3.219.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 65870650a25859121570b5a4b69a923f9b16f343..ae0f575771864e9408493050498185d7399beb93 100644 GIT binary patch delta 3126 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 Date: Wed, 9 Feb 2022 14:57:18 +0200 Subject: [PATCH 02/15] Correctly set redaction color --- .../table-item/file-workload/file-workload.component.ts | 2 +- .../dossier-workload-column.component.ts | 2 +- apps/red-ui/src/app/state/app-state.service.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts index ab3b664e1..cd7ceaddc 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.ts @@ -40,7 +40,7 @@ export class FileWorkloadComponent { } get redactionColor() { - return this._getDictionaryColor('dossier_redaction'); + return this._getDictionaryColor('redaction'); } private _getDictionaryColor(type: string) { diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-workload-column/dossier-workload-column.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-workload-column/dossier-workload-column.component.ts index a78074fe6..4989a0a84 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-workload-column/dossier-workload-column.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossier-workload-column/dossier-workload-column.component.ts @@ -23,6 +23,6 @@ export class DossierWorkloadColumnComponent { } get redactionColor() { - return this._appStateService.getDictionaryColor('dossier_redaction', this.dossier.dossierTemplateId); + return this._appStateService.getDictionaryColor('redaction', this.dossier.dossierTemplateId); } } diff --git a/apps/red-ui/src/app/state/app-state.service.ts b/apps/red-ui/src/app/state/app-state.service.ts index 8a313372b..98c5a8dc8 100644 --- a/apps/red-ui/src/app/state/app-state.service.ts +++ b/apps/red-ui/src/app/state/app-state.service.ts @@ -350,7 +350,7 @@ export class AppStateService { dictionaryData['redaction'] = new Dictionary( { - hexColor: colors.previewColor || FALLBACK_COLOR, + hexColor: colors.manualRedactionColor || FALLBACK_COLOR, type: 'redaction', }, true, From c3f00137d03d802c53a3b03f564ea7493fd37126 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 9 Feb 2022 14:01:41 +0100 Subject: [PATCH 03/15] 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 247ef5e95..6f8a7210a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.219.0", + "version": "3.220.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index ae0f575771864e9408493050498185d7399beb93..ee4a054aa5113c6065d8c806691c6da47da58ead 100644 GIT binary patch literal 3213 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 literal 3214 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 Date: Wed, 9 Feb 2022 15:05:01 +0200 Subject: [PATCH 04/15] removed help mode for elements that overlap other elements --- .../dossiers-listing-actions.component.html | 8 +- .../dossiers-listing-screen.component.html | 1 - .../annotation-actions.component.html | 6 +- .../annotation-actions.component.ts | 8 +- .../annotations-list.component.html | 1 - .../annotations-list.component.ts | 3 +- .../file-workload.component.html | 1 - apps/red-ui/src/assets/help-mode/links.json | 154 ++++++++---------- libs/common-ui | 2 +- 9 files changed, 81 insertions(+), 103 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html index c37bd2a84..2b521e11f 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html @@ -1,12 +1,6 @@ -
+
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 265b7d4cf..27bdb3ffd 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 @@ -1,4 +1,8 @@ -
+
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.ts index aab5aa212..c6ce92cb5 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, Output, SimpleChanges, TemplateRef } from '@angular/core'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; -import { FilterService, HelpModeService, IqserEventTarget } from '@iqser/common-ui'; +import { FilterService, IqserEventTarget } from '@iqser/common-ui'; import { MultiSelectService } from '../../services/multi-select.service'; import { AnnotationReferencesService } from '../../services/annotation-references.service'; import { ViewModeService } from '../../services/view-mode.service'; @@ -26,7 +26,6 @@ export class AnnotationsListComponent implements OnChanges { constructor( readonly multiSelectService: MultiSelectService, readonly viewModeService: ViewModeService, - readonly helpModeService: HelpModeService, readonly annotationReferencesService: AnnotationReferencesService, private readonly _filterService: FilterService, private readonly _state: FilePreviewStateService, 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 86877bcc9..f80299b25 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 @@ -207,7 +207,6 @@ [annotationActionsTemplate]="annotationActionsTemplate" [annotations]="(displayedAnnotations$ | async)?.get(activeViewerPage)" [selectedAnnotations]="selectedAnnotations" - iqserHelpMode="workload-annotations-list" >
diff --git a/apps/red-ui/src/assets/help-mode/links.json b/apps/red-ui/src/assets/help-mode/links.json index 01003c465..6389ff674 100644 --- a/apps/red-ui/src/assets/help-mode/links.json +++ b/apps/red-ui/src/assets/help-mode/links.json @@ -1,18 +1,24 @@ { - "open-usermenu": { - "en": "/en/23200-user-menu-and-account.html", + "assign-reviewer": { + "en": "", "de": "", "it": "", "fr": "" }, - "filter-dossier-list": { - "en": "/en/26024-features-and-actions-in-the-dossier-overview.html", + "bulk-select-annotations": { + "en": "", "de": "", "it": "", "fr": "" }, - "filter-document-list": { - "en": "/en/create-and-manage-dossier/dossier-overview/dossier-list.html", + "delta-view": { + "en": "/en/editing-documents-in-the-editor/views-in-the-editor/delta-view.html", + "de": "", + "it": "", + "fr": "" + }, + "document-features": { + "en": "", "de": "", "it": "", "fr": "" @@ -23,32 +29,20 @@ "it": "", "fr": "" }, - "search-in-entire-application": { - "en": "/en/15632-searching-the-application.html", - "de": "", - "it": "", - "fr": "" - }, - "open-notifications": { - "en": "/en/15471-notifications.html", - "de": "", - "it": "", - "fr": "" - }, - "dossier-list": { - "en": "/en/20941-dossier-liste.html", - "de": "", - "it": "", - "fr": "" - }, - "document-list": { + "edit-dossier-attributes": { "en": "", "de": "", "it": "", "fr": "" }, - "new-dossier-button": { - "en": "/en/creating-and-managing-dossiers/dossier-overview/creating-a-new-dossier.html", + "edit-dossier-from-list": { + "en": "", + "de": "", + "it": "", + "fr": "" + }, + "edit-dossier-member": { + "en": "", "de": "", "it": "", "fr": "" @@ -59,12 +53,24 @@ "it": "", "fr": "" }, - "edit-dossier-member": { + "edit-reason": { "en": "", "de": "", "it": "", "fr": "" }, + "filter-document-list": { + "en": "/en/create-and-manage-dossier/dossier-overview/dossier-list.html", + "de": "", + "it": "", + "fr": "" + }, + "filter-dossier-list": { + "en": "/en/26024-features-and-actions-in-the-dossier-overview.html", + "de": "", + "it": "", + "fr": "" + }, "filter-for-editing-notes": { "en": "", "de": "", @@ -77,26 +83,26 @@ "it": "", "fr": "" }, - "edit-dossier": { + "navigate-in-breadcrumbs": { "en": "", "de": "", "it": "", "fr": "" }, - "edit-dossier-from-list": { - "en": "", + "new-dossier-button": { + "en": "/en/creating-and-managing-dossiers/dossier-overview/creating-a-new-dossier.html", "de": "", "it": "", "fr": "" }, - "standard-view": { - "en": "/en/editing-documents-in-the-editor/views-in-the-editor/standard-view.html", + "open-notifications": { + "en": "/en/15471-notifications.html", "de": "", "it": "", "fr": "" }, - "delta-view": { - "en": "/en/editing-documents-in-the-editor/views-in-the-editor/delta-view.html", + "open-usermenu": { + "en": "/en/23200-user-menu-and-account.html", "de": "", "it": "", "fr": "" @@ -107,55 +113,7 @@ "it": "", "fr": "" }, - "bulk-select-annotations": { - "en": "", - "de": "", - "it": "", - "fr": "" - }, - "workload-filter": { - "en": "", - "de": "", - "it": "", - "fr": "" - }, - "workload-annotations-list": { - "en": "", - "de": "", - "it": "", - "fr": "" - }, - "assign-reviewer": { - "en": "", - "de": "", - "it": "", - "fr": "" - }, - "navigate-in-breadcrumbs": { - "en": "", - "de": "", - "it": "", - "fr": "" - }, - "reset-filters": { - "en": "", - "de": "", - "it": "", - "fr": "" - }, - "edit-reason": { - "en": "", - "de": "", - "it": "", - "fr": "" - }, - "redaction-remove-only-here": { - "en": "", - "de": "", - "it": "", - "fr": "" - }, - "redaction-remove-from-dictionary": { + "recommendation-accept-or-reject": { "en": "", "de": "", "it": "", @@ -167,13 +125,37 @@ "it": "", "fr": "" }, - "recommendation-accept-or-reject": { + "redaction-remove-from-dictionary": { "en": "", "de": "", "it": "", "fr": "" }, - "document-features": { + "redaction-remove-only-here": { + "en": "", + "de": "", + "it": "", + "fr": "" + }, + "reset-filters": { + "en": "", + "de": "", + "it": "", + "fr": "" + }, + "search-in-entire-application": { + "en": "/en/15632-searching-the-application.html", + "de": "", + "it": "", + "fr": "" + }, + "standard-view": { + "en": "/en/editing-documents-in-the-editor/views-in-the-editor/standard-view.html", + "de": "", + "it": "", + "fr": "" + }, + "workload-filter": { "en": "", "de": "", "it": "", diff --git a/libs/common-ui b/libs/common-ui index 6b4fe281c..0bab45847 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 6b4fe281cb6e23fb541ce75ead740a5678c968b8 +Subproject commit 0bab4584767b868f9d72a4de7ae23d0dd19daad3 From 15a5b5c339be2263f86c8324e10a58e40d247550 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 9 Feb 2022 14:09:46 +0100 Subject: [PATCH 05/15] 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 6f8a7210a..e5bff4d22 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.220.0", + "version": "3.221.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index ee4a054aa5113c6065d8c806691c6da47da58ead..2c51ccf6a651bc5630332bb754e3f2cb87a2a6c7 100644 GIT binary patch literal 3214 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 AqyPW_ literal 3213 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 From 772bf52e29f30fcb56c6b10d194e5fc610f44cba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Wed, 9 Feb 2022 15:31:30 +0200 Subject: [PATCH 06/15] Improved error handling for missing types --- .../src/app/models/file/file-data.model.ts | 11 +++----- .../services/pdf-viewer-data.service.ts | 26 +++++++++---------- apps/red-ui/src/app/utils/constants.ts | 1 - apps/red-ui/src/assets/i18n/en.json | 2 +- 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/apps/red-ui/src/app/models/file/file-data.model.ts b/apps/red-ui/src/app/models/file/file-data.model.ts index 581289732..dea3703f0 100644 --- a/apps/red-ui/src/app/models/file/file-data.model.ts +++ b/apps/red-ui/src/app/models/file/file-data.model.ts @@ -13,12 +13,12 @@ import { AnnotationWrapper } from './annotation.wrapper'; import * as moment from 'moment'; import { BehaviorSubject } from 'rxjs'; import { RedactionLogEntry } from './redaction-log.entry'; -import { MISSING_TYPES_ERROR } from '@utils/constants'; export class FileDataModel { static readonly DELTA_VIEW_TIME = 10 * 60 * 1000; // 10 minutes; allAnnotations: AnnotationWrapper[] = []; readonly hasChangeLog$ = new BehaviorSubject(false); + missingTypes = new Set(); constructor( private readonly _file: File, @@ -77,7 +77,6 @@ export class FileDataModel { private _convertData(): RedactionLogEntry[] { let result: RedactionLogEntry[] = []; - const missingTypes = new Set(); const reasonAnnotationIds: { [key: string]: RedactionLogEntry[] } = {}; this.redactionLog.redactionLogEntry?.forEach(redactionLogEntry => { @@ -85,7 +84,7 @@ export class FileDataModel { const changeLogValues = this.#getChangeLogValues(redactionLogEntry); if (!this._dictionaryData[redactionLogEntry.type]) { - missingTypes.add(redactionLogEntry.type); + this.missingTypes.add(redactionLogEntry.type); return; } @@ -95,7 +94,7 @@ export class FileDataModel { changeLogValues.isChangeLogEntry, changeLogValues.hidden, this.redactionLog.legalBasis, - this._dictionaryData[redactionLogEntry.type].hint, + !!this._dictionaryData[redactionLogEntry.type]?.hint, ); if ( @@ -130,10 +129,6 @@ export class FileDataModel { result = result.filter(r => !r.hidden); - if (missingTypes.size > 0) { - throw new Error(MISSING_TYPES_ERROR); - } - return result; } diff --git a/apps/red-ui/src/app/modules/dossier/services/pdf-viewer-data.service.ts b/apps/red-ui/src/app/modules/dossier/services/pdf-viewer-data.service.ts index 70a8b48f2..ec3ec2a65 100644 --- a/apps/red-ui/src/app/modules/dossier/services/pdf-viewer-data.service.ts +++ b/apps/red-ui/src/app/modules/dossier/services/pdf-viewer-data.service.ts @@ -10,7 +10,6 @@ import { AppStateService } from '@state/app-state.service'; import { UserPreferenceService } from '@services/user-preference.service'; import { FilePreviewStateService } from '../screens/file-preview-screen/services/file-preview-state.service'; import { Toaster } from '@iqser/common-ui'; -import { MISSING_TYPES_ERROR } from '@utils/constants'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; @Injectable() @@ -38,20 +37,19 @@ export class PdfViewerDataService { return forkJoin([redactionLog$, viewedPages$]).pipe( map((data: [redactionLog: IRedactionLog, viewedPages: IViewedPage[]]) => { - try { - return new FileDataModel( - newFile, - ...data, - this._appStateService.dictionaryData[this._stateService.dossierTemplateId], - this._userPreferenceService.areDevFeaturesEnabled, - ); - } catch (error) { - if (error.message === MISSING_TYPES_ERROR) { - this._toaster.error(_('error.missing-types'), { disableTimeOut: true }); - } else { - throw error; - } + const fileDataModel = new FileDataModel( + newFile, + ...data, + this._appStateService.dictionaryData[this._stateService.dossierTemplateId], + this._userPreferenceService.areDevFeaturesEnabled, + ); + if (fileDataModel.missingTypes.size > 0) { + this._toaster.error(_('error.missing-types'), { + disableTimeOut: true, + params: { missingTypes: Array.from(fileDataModel.missingTypes).join(', ') }, + }); } + return fileDataModel; }), ); } diff --git a/apps/red-ui/src/app/utils/constants.ts b/apps/red-ui/src/app/utils/constants.ts index 5b70b1f9f..63ba0e493 100644 --- a/apps/red-ui/src/app/utils/constants.ts +++ b/apps/red-ui/src/app/utils/constants.ts @@ -1,2 +1 @@ export const CHANGED_CHECK_INTERVAL = 5000; -export const MISSING_TYPES_ERROR = 'MISSING_TYPES_ERROR'; diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index b62b6d63e..0e5a869f2 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -1000,7 +1000,7 @@ "http": { "generic": "Action failed with code {status}" }, - "missing-types": "The dossier template has missing types. Data might not be displayed correctly.", + "missing-types": "The dossier template has missing types ({missingTypes}). Data might not be displayed correctly.", "offline": "Disconnected", "online": "Reconnected", "reload": "Reload", From 0b71dab1db79375d0a089c4845306ea0f5e8190d Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 9 Feb 2022 14:36:18 +0100 Subject: [PATCH 07/15] 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 e5bff4d22..c718026c1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.221.0", + "version": "3.222.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 2c51ccf6a651bc5630332bb754e3f2cb87a2a6c7..a7c1dafd6527b961703d68af7a955120271d3619 100644 GIT binary patch delta 3125 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 Pzu5MF0!bI%08jt`yh;j8 delta 3126 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 Q?HAkr56x5trvOj@0AjHfeE Date: Wed, 9 Feb 2022 18:31:37 +0200 Subject: [PATCH 08/15] RED-3367: Disable action for pages of the file uploaded for comparison --- .../components/pdf-viewer/pdf-viewer.component.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 ef8e78f10..ab1997a5f 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 @@ -289,11 +289,18 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha } }); - this.documentViewer.addEventListener('textSelected', async (quads, selectedText) => { + this.documentViewer.addEventListener('textSelected', async (quads, selectedText, pageNumber: number) => { this._selectedText = selectedText; const textActions = [dataElements.ADD_DICTIONARY, dataElements.ADD_FALSE_POSITIVE]; const file = await this.stateService.file; + + if (this.viewModeService.isCompare && pageNumber % 2 === 0) { + this.instance.UI.disableElements(['textPopup']); + } else { + this.instance.UI.enableElements(['textPopup']); + } + if (selectedText.length > 2 && this.canPerformActions && !this.utils.isCurrentPageExcluded(file)) { this.instance.UI.enableElements(textActions); } else { From 5677f5c8998b1cbb7562cb664ca72feffff24b89 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 9 Feb 2022 17:35:56 +0100 Subject: [PATCH 09/15] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3213 -> 3212 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c718026c1..d0c4ea60a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.222.0", + "version": "3.223.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index a7c1dafd6527b961703d68af7a955120271d3619..344f9da3383cd2b9ff21019ec131b60cad5e7a30 100644 GIT binary patch delta 104 zcmV-u0GI!b8H^c_c2sGxaGk{~+pz;Xc!h!=gqlHXYKAL>evGAlj%}{%U;e1sQ%36V z%NkDCzvtP`S^qyq+pGVI#5iJdY#!D1hpoXCyzr;=?>V6EUjKmy{SJJ<{+@*ik|Buo3>c1i}j+h*qM|J&SYj6cG{3-o=j^lZ~{{3YD`d Date: Wed, 9 Feb 2022 18:46:58 +0200 Subject: [PATCH 10/15] RED-3367: Disable redaction with rectangle tool --- .../pdf-viewer/pdf-viewer.component.ts | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 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 ab1997a5f..fe7bd739d 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 @@ -457,7 +457,7 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha this.instance.UI.annotationPopup.update([]); if (annotationWrappers.length === 0) { - this._configureRectangleAnnotationPopup(); + this._configureRectangleAnnotationPopup(viewerAnnotations[0]); return; } @@ -497,16 +497,18 @@ export class PdfViewerComponent extends AutoUnsubscribe implements OnInit, OnCha this.instance.UI.annotationPopup.add(actions); } - private _configureRectangleAnnotationPopup() { - this.instance.UI.annotationPopup.add([ - { - type: 'actionButton', - dataElement: dataElements.ADD_RECTANGLE, - img: this._convertPath('/assets/icons/general/pdftron-action-add-redaction.svg'), - title: this._translateService.instant(this._manualAnnotationService.getTitle('REDACTION', this.dossier)), - onClick: () => this._addRectangleManualRedaction(), - }, - ]); + private _configureRectangleAnnotationPopup(annotation: Annotation) { + if (!this.viewModeService.isCompare || annotation.getPageNumber() % 2 === 1) { + this.instance.UI.annotationPopup.add([ + { + type: 'actionButton', + dataElement: dataElements.ADD_RECTANGLE, + img: this._convertPath('/assets/icons/general/pdftron-action-add-redaction.svg'), + title: this._translateService.instant(this._manualAnnotationService.getTitle('REDACTION', this.dossier)), + onClick: () => this._addRectangleManualRedaction(), + }, + ]); + } } private _addRectangleManualRedaction() { From da8369173f0d1273b3d369ef960282564127347e Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 9 Feb 2022 17:51:46 +0100 Subject: [PATCH 11/15] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3212 -> 3211 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d0c4ea60a..48d68dab7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.223.0", + "version": "3.224.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 344f9da3383cd2b9ff21019ec131b60cad5e7a30..58dcdbca59f328158a4b29872306da899bb4e909 100644 GIT binary patch literal 3211 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 literal 3212 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 From 4672c587031306e7e36e53bf738b3d9bcb8aa8f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Thu, 10 Feb 2022 12:58:07 +0200 Subject: [PATCH 12/15] RED-3394: Dossier hard delete permissions --- .../admin/screens/trash/trash-screen.component.html | 3 ++- .../admin/screens/trash/trash-screen.component.ts | 12 ++++++++++++ apps/red-ui/src/app/services/permissions.service.ts | 4 ++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.html index 2d69a12d1..35c955de3 100644 --- a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.html @@ -34,7 +34,7 @@ impl readonly circleButtonTypes = CircleButtonTypes; readonly tableHeaderLabel = _('trash.table-header.title'); readonly canRestoreSelected$ = this._canRestoreSelected$; + readonly canHardDeleteSelected$ = this._canHardDeleteSelected$; readonly tableColumnConfigs: TableColumnConfig[] = [ { label: _('trash.table-col-names.name'), sortByKey: 'searchKey' }, { label: _('trash.table-col-names.owner'), class: 'user-column' }, @@ -46,6 +49,7 @@ export class TrashScreenComponent extends ListingComponent impl constructor( protected readonly _injector: Injector, private readonly _loadingService: LoadingService, + private readonly _permissionsService: PermissionsService, private readonly _dossiersService: DossiersService, readonly routerHistoryService: RouterHistoryService, private readonly _configService: ConfigService, @@ -61,6 +65,13 @@ export class TrashScreenComponent extends ListingComponent impl ); } + private get _canHardDeleteSelected$(): Observable { + return this.listingService.selectedEntities$.pipe( + map(entities => entities.length && !entities.find(dossier => !dossier.canHardDelete)), + distinctUntilChanged(), + ); + } + disabledFn = (dossier: DossierListItem) => !dossier.canRestore; async ngOnInit(): Promise { @@ -118,6 +129,7 @@ export class TrashScreenComponent extends ListingComponent impl searchKey: dossier.dossierName, restoreDate, canRestore: this._canRestoreDossier(restoreDate), + canHardDelete: this._permissionsService.canDeleteDossier(dossier), // Because of migrations, for some this is not set softDeletedTime: dossier.softDeletedTime || '-', }; diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index b476bd189..c1242d5c4 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { UserService } from './user.service'; -import { Dossier, File, IComment } from '@red/domain'; +import { Dossier, File, IComment, IDossier } from '@red/domain'; import { DossiersService } from './entity-services/dossiers.service'; @Injectable({ @@ -127,7 +127,7 @@ export class PermissionsService { return this.isApprover(dossier) && files.reduce((prev, file) => prev && file.isApproved, true); } - canDeleteDossier(dossier: Dossier): boolean { + canDeleteDossier(dossier: IDossier): boolean { return dossier.ownerId === this._userService.currentUser.id; } From c87b641de703a54b415678327f601b2e293710f7 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Thu, 10 Feb 2022 12:04:09 +0100 Subject: [PATCH 13/15] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3211 -> 3215 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 48d68dab7..972f7fb85 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.224.0", + "version": "3.225.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 58dcdbca59f328158a4b29872306da899bb4e909..a7e9d74cfc4cbdb9be0db514f6a9cfa64266fc02 100644 GIT binary patch literal 3215 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 From 9b330a1f7da007367269fe9c67247dba48f93f1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Thu, 10 Feb 2022 17:36:53 +0200 Subject: [PATCH 14/15] Disable multi select in delta & preview --- .../annotations-list.component.ts | 10 +++----- .../file-workload.component.html | 2 +- .../pdf-viewer/pdf-viewer.component.ts | 6 ++++- .../file-preview-screen.component.ts | 7 ++++++ .../services/multi-select.service.ts | 25 +++++++++++++------ 5 files changed, 35 insertions(+), 15 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.ts index c6ce92cb5..3cda27f73 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.ts @@ -5,7 +5,6 @@ import { MultiSelectService } from '../../services/multi-select.service'; import { AnnotationReferencesService } from '../../services/annotation-references.service'; import { ViewModeService } from '../../services/view-mode.service'; import { FilePreviewStateService } from '../../services/file-preview-state.service'; -import { firstValueFrom } from 'rxjs'; @Component({ selector: 'redaction-annotations-list', @@ -37,8 +36,7 @@ export class AnnotationsListComponent implements OnChanges { } } - async annotationClicked(annotation: AnnotationWrapper, $event: MouseEvent): Promise { - console.log(annotation); + annotationClicked(annotation: AnnotationWrapper, $event: MouseEvent): void { if (($event?.target as IqserEventTarget)?.localName === 'input') { return; } @@ -52,7 +50,7 @@ export class AnnotationsListComponent implements OnChanges { if (this.isSelected(annotation.annotationId)) { this.deselectAnnotations.emit([annotation]); } else { - const canMultiSelect = await firstValueFrom(this._state.isWritable$); + const canMultiSelect = this.multiSelectService.isEnabled; if (canMultiSelect && ($event?.ctrlKey || $event?.metaKey) && this.selectedAnnotations.length > 0) { this.multiSelectService.activate(); } @@ -60,8 +58,8 @@ export class AnnotationsListComponent implements OnChanges { } } - async referenceClicked(annotation: AnnotationWrapper): Promise { - await this.annotationClicked(annotation, null); + referenceClicked(annotation: AnnotationWrapper): void { + this.annotationClicked(annotation, null); if (this._filterService.filtersEnabled('primaryFilters')) { this._filterService.toggleFilter('primaryFilters', annotation.superType, true); } 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 f80299b25..176f71a18 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 @@ -14,7 +14,7 @@
{ - this.annotationSelected.emit(this.annotationManager.getSelectedAnnotations().map(ann => ann.Id)); + const nextAnnotations = this.multiSelectService.isEnabled ? this.annotationManager.getSelectedAnnotations() : annotations; + this.annotationSelected.emit(nextAnnotations.map(ann => ann.Id)); if (action === 'deselected') { this._toggleRectangleAnnotationAction(true); } else { + if (!this.multiSelectService.isEnabled) { + this.utils.deselectAnnotations(this.annotations.filter(wrapper => !nextAnnotations.find(ann => ann.Id === wrapper.id))); + } this._configureAnnotationSpecificActions(annotations); this._toggleRectangleAnnotationAction(annotations.length === 1 && annotations[0].ReadOnly); } diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts index c01c905ed..ef453c240 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts @@ -206,6 +206,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni this._loadingService.start(); await this.userPreferenceService.saveLastOpenedFileForDossier(this.dossierId, this.fileId); this._subscribeToFileUpdates(); + this.viewModeService.viewMode$.pipe(tap(() => this.#deactivateMultiSelect())).subscribe(); const file = await this.stateService.file; if (file?.analysisRequired) { @@ -427,6 +428,12 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni download(data, file.filename); } + #deactivateMultiSelect(): void { + this.multiSelectService.deactivate(); + this.viewerComponent?.utils?.deselectAllAnnotations(); + this.handleAnnotationSelected([]); + } + private _setActiveViewerPage() { const currentPage = this._instance?.Core.documentViewer?.getCurrentPage(); if (!currentPage) { diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/multi-select.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/multi-select.service.ts index 71455608d..59db5bc89 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/multi-select.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/multi-select.service.ts @@ -1,15 +1,28 @@ import { Injectable } from '@angular/core'; -import { BehaviorSubject, Observable } from 'rxjs'; +import { BehaviorSubject, combineLatest, Observable } from 'rxjs'; import { boolFactory } from '@iqser/common-ui'; +import { ViewModeService } from './view-mode.service'; +import { map, tap } from 'rxjs/operators'; +import { FilePreviewStateService } from './file-preview-state.service'; @Injectable() export class MultiSelectService { + readonly enabled$: Observable; readonly active$: Observable; readonly inactive$: Observable; readonly #active$ = new BehaviorSubject(false); + readonly #enabled$ = new BehaviorSubject(true); - constructor() { + constructor(private readonly _viewModeService: ViewModeService, private readonly _state: FilePreviewStateService) { [this.active$, this.inactive$] = boolFactory(this.#active$.asObservable()); + this.enabled$ = combineLatest([this._viewModeService.isStandard$, _state.isWritable$]).pipe( + map((result: boolean[]) => !result.some(res => !res)), + tap(enabled => this.#enabled$.next(enabled)), + ); + } + + get isEnabled() { + return this.#enabled$.value; } get isActive() { @@ -17,14 +30,12 @@ export class MultiSelectService { } activate() { - this.#active$.next(true); + if (this.isEnabled) { + this.#active$.next(true); + } } deactivate() { this.#active$.next(false); } - - toggle() { - this.#active$.next(!this.#active$.value); - } } From 1c239abdb1a30f9f4c20d883c56c1d87cdc2ff45 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Thu, 10 Feb 2022 16:43:57 +0100 Subject: [PATCH 15/15] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3215 -> 3216 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 972f7fb85..884ddc66f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.225.0", + "version": "3.226.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index a7e9d74cfc4cbdb9be0db514f6a9cfa64266fc02..60249afd165ed0f8b72c1a5d21703c3bfc3cb681 100644 GIT binary patch delta 3128 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 delta 3127 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