From 39a0e8915b80433a9859824f4eb372d05b14e5f9 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Sat, 29 Apr 2023 12:08:16 +0300 Subject: [PATCH 01/13] RED-5912 - Suggestions make redactions disappear in PREVIEW mode --- .../src/app/models/file/annotation.wrapper.ts | 4 ++ .../file-workload/file-workload.component.ts | 2 +- .../services/file-data.service.ts | 3 +- .../services/suggestions.service.ts | 62 ++++++++++--------- .../services/annotation-draw.service.ts | 2 + 5 files changed, 42 insertions(+), 31 deletions(-) diff --git a/apps/red-ui/src/app/models/file/annotation.wrapper.ts b/apps/red-ui/src/app/models/file/annotation.wrapper.ts index eb1104ca8..418cdc46f 100644 --- a/apps/red-ui/src/app/models/file/annotation.wrapper.ts +++ b/apps/red-ui/src/app/models/file/annotation.wrapper.ts @@ -134,6 +134,10 @@ export class AnnotationWrapper implements IListable, Record { return this.type?.toLowerCase() === 'false_positive' && !!FalsePositiveSuperTypes[this.superType]; } + get isSuggestionAddToFalsePositive() { + return this.typeLabel === annotationTypesTranslations[SuggestionAddFalsePositive]; + } + get isDeclinedSuggestion() { return this.superType === SuperTypes.DeclinedSuggestion; } diff --git a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts index 5b34c0aa6..522a373ce 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts @@ -375,7 +375,7 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnDestroy if (this._viewModeService.isRedacted) { annotations = annotations.filter(a => !bool(a.isChangeLogRemoved)); - annotations = this._suggestionsService.convertWorkloadRemoveSuggestionsToRedactions(annotations); + annotations = this._suggestionsService.filterWorkloadSuggestionsInPreview(annotations); } this.displayedAnnotations = this._annotationProcessingService.filterAndGroupAnnotations(annotations, primary, secondary); diff --git a/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts b/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts index 0374026eb..d9698192d 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts @@ -215,7 +215,8 @@ export class FileDataService extends EntitiesService !a.isSkipped); } } diff --git a/apps/red-ui/src/app/modules/file-preview/services/suggestions.service.ts b/apps/red-ui/src/app/modules/file-preview/services/suggestions.service.ts index 9d81f0a65..0ac907e01 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/suggestions.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/suggestions.service.ts @@ -24,39 +24,43 @@ export class SuggestionsService { } hideSuggestionsInPreview(annotations: Annotation[]): void { - if (!this._userPreferenceService.getDisplaySuggestionsInPreview()) { - const suggestions = annotations.filter(a => bool(a.getCustomData('suggestion'))); - this._annotationManager.hide(suggestions); - this.#convertSuggestionsToRedactions(suggestions); + if (this._readableRedactionsService.active) { + if (this._userPreferenceService.getDisplaySuggestionsInPreview()) { + const suggestionsRemove = annotations.filter(a => bool(a.getCustomData('suggestionRemove'))); + this._annotationManager.hide(suggestionsRemove); + return; + } } + const suggestionsToHide = annotations.filter( + a => bool(a.getCustomData('suggestionAdd')) && !bool(a.getCustomData('suggestionAddToFalsePositive')), + ); + annotations.forEach(a => { + if (bool(a.getCustomData('suggestionRemove'))) { + const foundRedaction = this.#removedRedactions.find(r => r.id === a.Id); + if (!foundRedaction) { + suggestionsToHide.push(a); + } + } + }); + this._annotationManager.hide(suggestionsToHide); } - convertWorkloadRemoveSuggestionsToRedactions(annotations: AnnotationWrapper[]): AnnotationWrapper[] { - if (!this._userPreferenceService.getDisplaySuggestionsInPreview()) { - annotations = annotations.filter(a => !a.isSuggestion); - annotations = [...annotations, ...this.#removedRedactions]; + filterWorkloadSuggestionsInPreview(annotations: AnnotationWrapper[]): AnnotationWrapper[] { + if (this._readableRedactionsService.active) { + if (this._userPreferenceService.getDisplaySuggestionsInPreview()) { + return annotations.filter(a => !a.isSuggestionRemove); + } + } + + annotations = annotations.filter(a => !a.isSuggestionAdd || a.isSuggestionAddToFalsePositive); + for (let i = annotations.length - 1; i >= 0; i--) { + const foundRemovedRedaction = this.#removedRedactions.find(r => r.id === annotations[i].id); + if (foundRemovedRedaction) { + annotations[i] = foundRemovedRedaction; + } else if (annotations[i].isSuggestionRemove) { + annotations.splice(i, 1); + } } return annotations; } - - #convertSuggestionsToRedactions(suggestions: Annotation[]): void { - suggestions = this.#filterSuggestions(suggestions); - suggestions.forEach(s => s.setCustomData('suggestion', 'false')); - this._readableRedactionsService.setAnnotationsColor(suggestions, 'redactionColor'); - this._readableRedactionsService.setAnnotationsOpacity(suggestions); - this._annotationManager.show(suggestions); - } - - #filterSuggestions(suggestions: Annotation[]): Annotation[] { - const filteredSuggestions = []; - - this.#removedRedactions.forEach(r => { - const found = suggestions.find(s => s.Id === r.annotationId); - if (found) { - filteredSuggestions.push(found); - } - }); - - return filteredSuggestions; - } } diff --git a/apps/red-ui/src/app/modules/pdf-viewer/services/annotation-draw.service.ts b/apps/red-ui/src/app/modules/pdf-viewer/services/annotation-draw.service.ts index bd3baf584..2d642d896 100644 --- a/apps/red-ui/src/app/modules/pdf-viewer/services/annotation-draw.service.ts +++ b/apps/red-ui/src/app/modules/pdf-viewer/services/annotation-draw.service.ts @@ -156,6 +156,8 @@ export class AnnotationDrawService { annotation.setCustomData('redact-manager', 'true'); annotation.setCustomData('redaction', String(annotationWrapper.previewAnnotation)); annotation.setCustomData('suggestion', String(annotationWrapper.isSuggestion)); + annotation.setCustomData('suggestionAdd', String(annotationWrapper.isSuggestionAdd)); + annotation.setCustomData('suggestionAddToFalsePositive', String(annotationWrapper.isSuggestionAddToFalsePositive)); annotation.setCustomData('suggestionRemove', String(annotationWrapper.isSuggestionRemove)); annotation.setCustomData('skipped', String(annotationWrapper.isSkipped)); annotation.setCustomData('changeLog', String(annotationWrapper.isChangeLogEntry)); From 4a2160199d3e562d449948b1872c30fe326fdadf Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Sat, 29 Apr 2023 11:10:01 +0200 Subject: [PATCH 02/13] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3445 -> 3444 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cee904e9d..475c47627 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.72.0", + "version": "4.73.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 3c76baa40bbbff0527c209d8c22fac1feb75e2b3..af2e8f9b9a04e7a86047c54c84abc51a25574a67 100644 GIT binary patch delta 3331 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 O+J69Q?l~#|PyhgdYjKPK From 42bb0707d2ba8b41c05c8f89dda5a281af266fb2 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Sat, 29 Apr 2023 18:24:39 +0300 Subject: [PATCH 03/13] RED-6550 - Recommendations editing options help mode link leads to False Positive topic --- apps/red-ui/src/assets/help-mode/help-mode-keys.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/red-ui/src/assets/help-mode/help-mode-keys.json b/apps/red-ui/src/assets/help-mode/help-mode-keys.json index fb262e6b5..e6765529b 100644 --- a/apps/red-ui/src/assets/help-mode/help-mode-keys.json +++ b/apps/red-ui/src/assets/help-mode/help-mode-keys.json @@ -355,6 +355,10 @@ "elementKey": "dictionary_entity", "documentKey": "dictionary_entity" }, + { + "elementKey": "recommendation", + "documentKey": "recommendation" + }, { "elementKey": "false_recommendations_entity", "documentKey": "false_recommendations_entity" From b39133e4fc829a8ab06ad40b6450320112951b1b Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Sat, 29 Apr 2023 17:26:06 +0200 Subject: [PATCH 04/13] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3444 -> 3444 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 475c47627..d4f880a69 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.73.0", + "version": "4.74.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index af2e8f9b9a04e7a86047c54c84abc51a25574a67..552bc8064e7b6fbdba02ec1988c19079c6ffd031 100644 GIT binary patch delta 105 zcmV-v0G9vs8uS{FcU8Hb=h@B^+p+z%{{#g;2{wb))C^Y${TxgEH@2lNfBBKWq&y;FUimf6rUFZZCfybisC3f#*K4%%BVi Lpc*sn08jt`Y<)A< delta 105 zcmV-v0G9vs8uS{FcU3vT+I3b>Y{w4l)e{u_B-jjEQ!`v4^m8or-`JMA{N<0D-Djl! zSlaM#`Fo!2p5^~@w4?H`NQ@&U`<78%f7lvaz$<@B{+_pT-Cq8l=YsrKf$u%B%%BVi L53g`$08jt`4skf; From 49dabc711b8343b361b70f665d0488ae169c69e3 Mon Sep 17 00:00:00 2001 From: Nicoleta Panaghiu Date: Tue, 2 May 2023 14:10:59 +0300 Subject: [PATCH 05/13] RED-6643: Removed HTML escape entity in dialogs. --- .../reset-password.component.html | 2 +- .../smtp-auth-dialog.component.html | 2 +- .../upload-dictionary-dialog.component.html | 2 +- ...d-edit-justification-dialog.component.html | 8 +++---- .../change-legal-basis-dialog.component.html | 12 +++++----- .../document-info-dialog.component.html | 2 +- .../false-positive-dialog.component.html | 4 ++-- .../force-annotation-dialog.component.html | 10 ++++----- .../import-redactions-dialog.html | 6 ++--- .../manual-annotation-dialog.component.html | 18 +++++++-------- .../recategorize-image-dialog.component.html | 8 +++---- .../remove-annotations-dialog.component.html | 22 ++++++++++--------- .../resize-annotation-dialog.component.html | 6 ++--- .../rss-dialog/rss-dialog.component.html | 4 ++-- ...gn-reviewer-approver-dialog.component.html | 2 +- 15 files changed, 54 insertions(+), 54 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/reset-password/reset-password.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/reset-password/reset-password.component.html index 000d010a8..03274a20f 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/reset-password/reset-password.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/reset-password/reset-password.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/smtp-auth-dialog/smtp-auth-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/smtp-auth-dialog/smtp-auth-dialog.component.html index 710555526..f31714aa6 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/smtp-auth-dialog/smtp-auth-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/smtp-auth-dialog/smtp-auth-dialog.component.html @@ -1,5 +1,5 @@
-
+
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/upload-dictionary-dialog/upload-dictionary-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/upload-dictionary-dialog/upload-dictionary-dialog.component.html index 52b167834..6650e41d5 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/upload-dictionary-dialog/upload-dictionary-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/upload-dictionary-dialog/upload-dictionary-dialog.component.html @@ -1,5 +1,5 @@
-
+

diff --git a/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.html b/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.html index a236f7090..922e222e0 100644 --- a/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/justifications/add-edit-justification-dialog/add-edit-justification-dialog.component.html @@ -1,10 +1,8 @@
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.html index e4a06f8b3..50005eae3 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.html +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component.html @@ -1,10 +1,10 @@
-
+
- +
- +
- +
- +
- +
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/document-info-dialog/document-info-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/document-info-dialog/document-info-dialog.component.html index 9848ee289..53e13af49 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/document-info-dialog/document-info-dialog.component.html +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/document-info-dialog/document-info-dialog.component.html @@ -1,5 +1,5 @@
-
+
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/false-positive-dialog/false-positive-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/false-positive-dialog/false-positive-dialog.component.html index 4655e7d22..c6c0af2b3 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/false-positive-dialog/false-positive-dialog.component.html +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/false-positive-dialog/false-positive-dialog.component.html @@ -1,6 +1,6 @@
-
+
    @@ -10,7 +10,7 @@ >
- +
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/force-redaction-dialog/force-annotation-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/force-redaction-dialog/force-annotation-dialog.component.html index 1503a79fc..30c8a7e1e 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/force-redaction-dialog/force-annotation-dialog.component.html +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/force-redaction-dialog/force-annotation-dialog.component.html @@ -1,11 +1,11 @@
-
-
+
+
- +
- +
- +
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/import-redactions-dialog/import-redactions-dialog.html b/apps/red-ui/src/app/modules/file-preview/dialogs/import-redactions-dialog/import-redactions-dialog.html index cc5368a00..e38cdbcdd 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/import-redactions-dialog/import-redactions-dialog.html +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/import-redactions-dialog/import-redactions-dialog.html @@ -1,8 +1,8 @@
-
+
-
+
@@ -29,7 +29,7 @@ [type]="iconButtonTypes.primary" > -
+
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html index 53092c156..7e5fa9e0c 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html @@ -4,7 +4,7 @@
- +
{{ form.get('selectedText').value }}
- +
- - + + @@ -54,7 +54,7 @@
- +
- +
- +
- +
- +
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.html index d4058b6a7..b50d6fab3 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.html +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/recategorize-image-dialog/recategorize-image-dialog.component.html @@ -1,10 +1,10 @@
-
+
- +
- +
@@ -32,7 +32,7 @@ [type]="iconButtonTypes.primary" > -
+
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.html index f8d244a0f..72e3a0349 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.html +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.html @@ -1,21 +1,23 @@
-
- {{ +
-
- {{ +
@@ -40,7 +42,7 @@
- +
@@ -53,7 +55,7 @@ [type]="iconButtonTypes.primary" > -
+
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.html index 4503b0349..3a1285473 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.html +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/resize-annotation-dialog/resize-annotation-dialog.component.html @@ -1,10 +1,10 @@
-
+
- +
@@ -26,7 +26,7 @@ [type]="iconButtonTypes.primary" > -
+
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/rss-dialog/rss-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/rss-dialog/rss-dialog.component.html index 6856874d6..1542fe247 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/rss-dialog/rss-dialog.component.html +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/rss-dialog/rss-dialog.component.html @@ -1,5 +1,5 @@
-
+
@@ -79,7 +79,7 @@ label="Export All" > -
+
diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.html index 43eeefe73..b104af22a 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.html +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/assign-reviewer-approver-dialog/assign-reviewer-approver-dialog.component.html @@ -1,5 +1,5 @@
-
+
From a43c1a36c8b352f88e38fa81a8c4dc434f59a300 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Tue, 2 May 2023 13:14:18 +0200 Subject: [PATCH 06/13] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3444 -> 3443 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d4f880a69..64ba1d9aa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.74.0", + "version": "4.75.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 552bc8064e7b6fbdba02ec1988c19079c6ffd031..7dc35047aa90ec092a37e085e7f59a7dd21447bf 100644 GIT binary patch delta 3357 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 From 789a9db9b8d08033384694b4b9915ab880ea0601 Mon Sep 17 00:00:00 2001 From: Nicoleta Panaghiu Date: Tue, 2 May 2023 14:56:43 +0300 Subject: [PATCH 07/13] RED-6245: Added landscape page orientation. --- .../watermark-screen/watermark-screen.component.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts index 194a20c28..f12e67ff5 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts @@ -1,4 +1,4 @@ -import { Component, ElementRef, Inject, OnInit, ViewChild } from '@angular/core'; +import { ChangeDetectorRef, Component, ElementRef, Inject, OnInit, ViewChild } from '@angular/core'; import WebViewer, { WebViewerInstance } from '@pdftron/webviewer'; import { HttpClient } from '@angular/common/http'; import { FormBuilder, FormGroup } from '@angular/forms'; @@ -64,7 +64,8 @@ export class WatermarkScreenComponent implements OnInit { ]; readonly orientationOptions = ['DIAGONAL', 'HORIZONTAL', 'VERTICAL']; instance: WebViewerInstance; - readonly loaded$ = new BehaviorSubject(false); + readonly #loaded$ = new BehaviorSubject(false); + readonly loaded$ = this.#loaded$.asObservable().pipe(tap(() => setTimeout(() => this._changeDetectorRef.detectChanges()))); @ViewChild('viewer', { static: true }) private readonly _viewer: ElementRef; readonly #dossierTemplateId = getParam(DOSSIER_TEMPLATE_ID); readonly #watermarkId = Number(getParam(WATERMARK_ID)); @@ -82,6 +83,7 @@ export class WatermarkScreenComponent implements OnInit { private readonly _watermarkService: WatermarkService, private readonly _userPreferenceService: UserPreferenceService, private readonly _router: Router, + private readonly _changeDetectorRef: ChangeDetectorRef, watermarksMapService: WatermarksMapService, ) { const watermark$ = watermarksMapService.watch$(this.#dossierTemplateId, this.#watermarkId); @@ -200,9 +202,9 @@ export class WatermarkScreenComponent implements OnInit { this.instance.UI.setTheme(this._userPreferenceService.getTheme()); this.instance.Core.documentViewer.addEventListener('documentLoaded', async () => { - this.loaded$.next(true); - this._loadingService.stop(); await this.#drawWatermark(); + this.#loaded$.next(true); + this._loadingService.stop(); }); if (environment.production) { From d595c3e0a5dd92aae031243c36769457bbc8b7d1 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Tue, 2 May 2023 13:58:20 +0200 Subject: [PATCH 08/13] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3443 -> 3442 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 64ba1d9aa..be790050c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.75.0", + "version": "4.76.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 7dc35047aa90ec092a37e085e7f59a7dd21447bf..659677538126035c6c44b7a6093a776471e877d7 100644 GIT binary patch delta 3185 zcmV-%436{j8uA*DP=Ap`;&O0qI2Qm~UY9tdyTW2A*^}!hKSi;jtOJ|>I)mS?JaK&A z^`X{vq293r+kJw9p9GshX=;Wmgno{x{u|3um%n_e*?mUpkEIO{m%rz(S7-VE9ObC| zD-z>~$+l%w*B>?q7x2oTlE3GzT(_6M=L8`CRp19tko|E znc@2{>N{LsUNJqtSaSSuW~Btjq(XncKyTOR< zHY7<=5iv58fB_VLIFveK2xo>>)3;=cRz9CVR^7>IIYm&H(VSQvDw}oNagVDV%`H}x zFnFWYg#}~99sHsSX8GTJo z!(O((RzgV@i<#ssj%|O&frdrJ`G}nI4XTTb#^`AjMI`or4vkiYW7^a}d5f2U&q*Uj8@)Q8kQkys8!>p{ED%T%69NyjTUxyTldA*>fZPQB&2tsw`;ENM+Ck zn`?vk*z-t}lL8?ZSt4t`-mU~J^Sag~=({Z+%xilf*+8z7%K{~TaH+glG@3+B#B7Q*kf=QTZV&Yklo;tfXl++CSnFpWG+{>};im)sz)9%kVH!UgTufs_e8U z7`Ou)IRPO1i`Kb+W8Qf_BU1m+lTntD#q6PA%_335il`ks6xAcpK=@IJV51#>6h5uJ zdK^}Y%^TZTv8rMc6%}r+I;aAvxG{PN<`Ys;%%8iN8Q6F$X>Dds-DKmn+Ap#PsY6CJ zNPh2CW{=+{w5pjErBr%a%?#NOBMiW0*aU49*UhI-*U-*?80(S7$`EO|{==s-sNG@0 zkE3>}kHA#r^OpzkRE^bTBG8$`4`8LjIGU%VqHM&wz8;*__2=jn%`-w-lkd>y*B48G zYyk-*vm6z(-pgG6EwSzOWjFe-MRl8G#ob`6J2`d}^ke@5%x-GP&ECS~5YOl!yeSZl zeba;ZlH?74drPW4$>0CTWrnP>DiWFvfcbN10bn>vD;lMY?o22JlTZ?`hw@DmrAd?D zia10cznaFv?Z>|gNe(m99P!AlBd`cbm1OUKh*AReHTqiYT>Js&ct@&wFwc5w9@pRW z^L$-o8O+0Z_9dyvB+;8`QTjcw-xhUE0bRg_ksdC8EVnzHu@T6dNs#ME0eRc(c}Rmo z2$w@pQO=b;dKFVvR6||0C$%MrMp#0k5TzL<@Bbwcg$2>@;3

d5Ekty$+m%B7P+$ zUcdhlBvo@A8p4@g6CUp2{4N6=@rb<1#bCSf0f*oG>EHkOXN{hv?|*0#x+CbT3e+RN z8bX_YUJZeyNY7NPiquWUref&CPl9CKj*|m8P)xhHRl2|4Q8>2r6i4RiT_#TxAiA?# z-*?eua*nodt>gz2;p#&}Qq@O#Zj0z>){f8=Y-+~ss$zZl-Xb^Q)gEU8=ZtEjL6i4- zj3DRfG3ps*qNnE!AA~j?CxP;KZPc4=X!9H|_Q|Mi zZRDhA@}LQ09EIMfDc}afi-Q=CntUTSMbpa2P0{2kesj>YG0JbpxBLXrww)w@_7Hn$ z;~;~G1UK4jtqzNUNwTpWjevWI)rvdW7;e1K(C8W^FB{vX6o8DJ&CLR7U3k{wXi1jZ zBEUK;XXWdP)3mtyoArP2s6uuyKgW$2Lz;;7YDUL=jHCtDfR*v`N z6HF#~veAj|`$*S5GCSZ)!T44^*H(@W0Md-c(*3TXgZbD;>(T|f0?4s{4qbrf`X)?h zKJdYV4&2CFhv1R>bv+d1jdb;K4`6#9}E#w@0B4#5h(H_0;tc zxE(@3Q{SKY6!jzuGY(Hr!dQIJJdZdkoyXW-Bx`2(V|$FHr?V%H2=w|PD4xrBBa zK}43{YB_p4Od7~h;_fKP-AU?{TuX*dClEP)7}^DNMj$xiC;yOtdkpFNU_koTwA?Y! zvRZzP!wBRB-;eDebUe&RqUKangPQEv@NPe1#_;2S{C)?96%ktQvimaa&q;+21acp`MTs%*s0BsJ+KksiqS|r%2bc3hq?WQJZ&4? z$58L%^j)|X@qMEb?}&WVwk)Kp?{;`#wkeRM%tqePE&W&<$ zLG1P=MFog8Wl5?C*JOy@>|H|T{NAu@s8QG-AP?wNl>V5CKj7Yuy1^HvB)ZLL&G@b$ z0X9{b6Fu_+k&vo{#P>pgKR`fUFn&*<4@MV!kGEZ zghoBnrDZ>V1X~AnnYchBiIK+vlBUC3PuihMQh2BULiN*xp{8~hHl+6ViH$vdiw5*o zah8(*5zeA#f&Ce>#7&PYl>n4_68ZM2N4$NNNVhLsGO0J(q12buq_H<{k&Z;V(fNzY z4!crAu2gU$wzXK89;sc9VKBT-5J6810WGc3t%u4*_Bq zpBP7Mfd|jzorEH>*nLT^#vyB;#)=znMfe>MIemFS?bKQ8W9K@ZVN-$;NG$nU<4oaK zh{O)0Z!aM3SfEwFw;vtxC=f3ZIky4BMj|6d1FcMH1Ar{V9b*y3^9LS!9-~2 zm;#b9?{xO}TO8jvr0#PIWAfGac!5|va)siM+!kI18TyYn*rmxb{_BlqLf`OpF7sKL zAGHn{Z5d2PSP$8Fy`mH0;nZ@x@{e4uki_@f?fm~Ji2onua)E02v1(FLVP!x4ey*S} zbr$WzvVTh5zN&lTA(^b|o>G6muj-!Cps(tl(p6v8J(b;WHF64bxhHY|c)Q3P+|146 ziLM{EXFLh)L$-=X@*Fyu2mVXw-B=xl5W9aToP-!?5EX42LiFZB^gR`#qKuDrts`9? z#f=ZkJ0!$$_<78ui6LgU*fq}1#U}wIMbu1PxB1ln2t1c_IhS)emvbFCmvcFnb2*oD XIhS)emvcFn|E2OD%Ha2G08jt`M}IW+ delta 3200 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 Date: Wed, 3 May 2023 00:25:06 +0300 Subject: [PATCH 09/13] RED-6693 - Allow editing file attributes during reprocessing/queuing --- .../table-item/file-attribute/file-attribute.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.html index fdeb8e0ed..8e295b8c2 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.html +++ b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.html @@ -4,7 +4,7 @@ {{ fileAttributeValue ? (fileAttributeValue | date : 'd MMM yyyy') : '-' }} - +

Date: Tue, 2 May 2023 23:26:52 +0200 Subject: [PATCH 10/13] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3442 -> 3445 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index be790050c..a726d5639 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.76.0", + "version": "4.77.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 659677538126035c6c44b7a6093a776471e877d7..b026178a7129a3f78bdf26589bce59edec0ab7a9 100644 GIT binary patch delta 3290 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 Y+|KRX&h6aJ?SHBL2i9^qVE|A707E@$DF6Tf delta 3286 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 UIhS)em;a^mAIjkOYyeOI0Mox|fB*mh From 1af8807874ae95388a689e6d91c74cce9d4620fb Mon Sep 17 00:00:00 2001 From: Nicoleta Panaghiu Date: Wed, 3 May 2023 09:54:11 +0300 Subject: [PATCH 11/13] RED-3800: Fixed search error on refresh. --- .../search-screen/search-screen.component.ts | 48 ++++++++++--------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts b/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts index 5c360fbef..5610feadb 100644 --- a/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts +++ b/apps/red-ui/src/app/modules/search/search-screen/search-screen.component.ts @@ -52,27 +52,7 @@ export class SearchScreenComponent extends ListingComponent imp { label: _('search-screen.cols.pages'), width: 'auto' }, ]; - readonly searchResults$ = combineLatest([this._queryChanged, this._filtersChanged$]).pipe( - tap(() => this._loadingService.start()), - tap(([query, [dossierIds, workflowStatus, assignee, dossierTemplateIds, onlyActive]]) => - this._updateNavigation(query, dossierIds, workflowStatus, assignee, dossierTemplateIds, onlyActive), - ), - switchMap(([query, [dossierIds, workflowStatus, assignee, dossierTemplateIds, onlyActive]]) => - this._platformSearchService.search({ - query, - dossierIds, - dossierTemplateIds, - workflowStatus, - assignee, - includeDeletedDossiers: false, - includeArchivedDossiers: !onlyActive, - }), - ), - map(searchResult => this._toMatchedDocuments(searchResult)), - map(docs => this._toListItems(docs)), - tap(result => this.entitiesService.setEntities(result)), - tap(() => this._loadingService.stop()), - ); + readonly searchResults$ = new Observable(); readonly dossierTemplates$ = this._dossierTemplateService.loadAll().pipe(tap(templates => this._addTemplateFilter(templates))); @@ -90,6 +70,30 @@ export class SearchScreenComponent extends ListingComponent imp private readonly _userService: UserService, ) { super(); + if (!Object.keys(this._activatedRoute.snapshot.queryParams).length) { + this._router.navigate(['main']).then(); + } + this.searchResults$ = combineLatest([this._queryChanged$, this._filtersChanged$]).pipe( + tap(() => this._loadingService.start()), + tap(([query, [dossierIds, workflowStatus, assignee, dossierTemplateIds, onlyActive]]) => + this._updateNavigation(query, dossierIds, workflowStatus, assignee, dossierTemplateIds, onlyActive), + ), + switchMap(([query, [dossierIds, workflowStatus, assignee, dossierTemplateIds, onlyActive]]) => + this._platformSearchService.search({ + query, + dossierIds, + dossierTemplateIds, + workflowStatus, + assignee, + includeDeletedDossiers: false, + includeArchivedDossiers: !onlyActive, + }), + ), + map(searchResult => this._toMatchedDocuments(searchResult)), + map(docs => this._toListItems(docs)), + tap(result => this.entitiesService.setEntities(result)), + tap(() => this._loadingService.stop()), + ); this.searchService.skip = true; this.sortingService.setSortingOption({ column: 'searchKey', order: SortingOrders.desc }); this._initFilters(); @@ -119,7 +123,7 @@ export class SearchScreenComponent extends ListingComponent imp return this._activatedRoute.snapshot.queryParamMap.get('query'); } - private get _queryChanged(): Observable { + private get _queryChanged$(): Observable { return this.searchService.valueChanges$.pipe( startWith(this._routeQuery), tap(query => (this.searchService.searchValue = query)), From 0cad739a4e6f78597e6b09f260b40d936ca8d831 Mon Sep 17 00:00:00 2001 From: Atlassian Bamboo Date: Wed, 3 May 2023 08:55:55 +0200 Subject: [PATCH 12/13] chore(release) --- package.json | 2 +- paligo-theme.tar.gz | Bin 3445 -> 3444 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a726d5639..de4069cc3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "4.77.0", + "version": "4.78.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index b026178a7129a3f78bdf26589bce59edec0ab7a9..41a96c6c79a1abfa4d62e2f4dfc3c4db15922e0b 100644 GIT binary patch delta 3358 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 From ecccd4bdaa75c672cccf3bca1dca4a08980a416d Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Wed, 3 May 2023 22:49:20 +0300 Subject: [PATCH 13/13] RED-6410 - File attributes in-place editing look & feel changes in file list --- .../file-attribute.component.html | 38 +++++++----- .../file-attribute.component.scss | 62 ++++++++++++++----- .../file-attribute.component.ts | 6 +- 3 files changed, 75 insertions(+), 31 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.html index 8e295b8c2..9cd1b42bd 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.html +++ b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.html @@ -1,20 +1,28 @@
- {{ fileAttributeValue || '-' }} - - {{ fileAttributeValue ? (fileAttributeValue | date : 'd MMM yyyy') : '-' }} - +
+ {{ fileAttributeValue || '-' }} + + {{ fileAttributeValue ? (fileAttributeValue | date : 'd MMM yyyy') : '-' }} + +
- -
- + +
+
+ +
diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.scss b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.scss index 5d0d3d2a4..2abd763a1 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.scss +++ b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.scss @@ -4,29 +4,32 @@ display: flex; align-items: center; - .edit-button { - position: absolute; - height: 100%; - right: 10%; - width: 90%; - background: linear-gradient(to left, var(--iqser-side-nav) 20%, rgba(244, 245, 247, 0) 60%); + .value { + z-index: 1; + } - iqser-circle-button { - position: absolute; - top: 50%; - left: 80%; - transform: translate(-50%, -50%); - } + .edit-icon { + display: none; + } + + .help-mode-button { + background-color: var(--iqser-grey-6); + width: 90%; + height: 50%; + border-radius: 4px; + position: absolute; + margin-left: -10px; } .edit-input { cursor: default; display: flex; - z-index: 1; - border: solid var(--iqser-grey-4); + z-index: 2; + border: solid var(--iqser-grey-6); border-radius: 10px; background: var(--iqser-background); box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.15); + margin-left: -10px; form { margin: 5px; @@ -43,3 +46,34 @@ } } } + +.file-attribute:hover { + .edit-button { + background-color: var(--iqser-grey-6); + width: 100%; + height: 50%; + border-radius: 4px; + position: absolute; + margin-left: -10px; + } + + .edit-icon { + z-index: 1; + background: white; + width: 23px; + height: 23px; + display: flex; + align-items: center; + justify-content: center; + position: absolute; + right: 0; + border-radius: 50%; + margin-top: -8px; + margin-right: -8px; + + mat-icon { + width: 13px; + height: 13px; + } + } +} diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.ts b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.ts index 26b116ae5..982983b49 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/components/table-item/file-attribute/file-attribute.component.ts @@ -1,6 +1,6 @@ import { Component, HostListener, Input, OnDestroy, OnInit } from '@angular/core'; import { Dossier, File, FileAttributeConfigTypes, IFileAttributeConfig } from '@red/domain'; -import { BaseFormComponent, ListingService, Toaster } from '@iqser/common-ui'; +import { BaseFormComponent, HelpModeService, ListingService, Toaster } from '@iqser/common-ui'; import { PermissionsService } from '@services/permissions.service'; import { FormBuilder, UntypedFormGroup } from '@angular/forms'; import { FileAttributesService } from '@services/entity-services/file-attributes.service'; @@ -33,6 +33,7 @@ export class FileAttributeComponent extends BaseFormComponent implements OnDestr readonly permissionsService: PermissionsService, private readonly _listingService: ListingService, readonly fileAttributesService: FileAttributesService, + readonly helpModeService: HelpModeService, ) { super(); const sub = router.events.pipe(filter(event => event instanceof NavigationEnd)).subscribe(() => this.close()); @@ -57,7 +58,8 @@ export class FileAttributeComponent extends BaseFormComponent implements OnDestr this.#subscriptions.unsubscribe(); } - async editFileAttribute(): Promise { + async editFileAttribute($event: MouseEvent): Promise { + $event.stopPropagation(); this.#toggleEdit(); }