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 70f517d2e..b7994d106 100644
--- a/apps/red-ui/src/app/models/file/annotation.wrapper.ts
+++ b/apps/red-ui/src/app/models/file/annotation.wrapper.ts
@@ -130,7 +130,17 @@ export class AnnotationWrapper {
}
get isSuggestion() {
- return this.isSuggestionAdd || this.isSuggestionRemove || this.isSuggestionChangeLegalBasis || this.isSuggestionRecategorizeImage;
+ return (
+ this.isSuggestionAdd ||
+ this.isSuggestionRemove ||
+ this.isSuggestionChangeLegalBasis ||
+ this.isSuggestionRecategorizeImage ||
+ this.isSuggestionResize
+ );
+ }
+
+ get isSuggestionResize() {
+ return this.superType === 'suggestion-resize';
}
get isSuggestionRecategorizeImage() {
diff --git a/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.ts b/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.ts
index c4bf59a16..454d090e4 100644
--- a/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.ts
@@ -48,6 +48,7 @@ export class CommentsComponent {
this.annotation.comments.push({
text: value,
id: commentId,
+ annotationId: this.annotation.id,
user: this._userService.currentUser.id,
});
this._input.reset();
diff --git a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html
index 525c16586..caa8253a7 100644
--- a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html
+++ b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html
@@ -5,11 +5,13 @@
*ngIf="!multiSelectActive && !isReadOnly"
class="all-caps-label primary pointer"
translate="file-preview.tabs.annotations.select"
+ iqserHelpMode="bulk-select-annotations"
>
@@ -190,6 +192,7 @@
[canMultiSelect]="!isReadOnly"
[file]="file"
[selectedAnnotations]="selectedAnnotations"
+ iqserHelpMode="workload-annotations-list"
>
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.html
index fd39b4108..b1a173353 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.html
@@ -7,24 +7,29 @@
[class.active]="viewMode === 'STANDARD'"
[matTooltip]="'file-preview.standard-tooltip' | translate"
class="red-tab"
+ iqserHelpMode="standard-view"
>
{{ 'file-preview.standard' | translate }}
+
{{ 'file-preview.delta' | translate }}
+
{{ 'file-preview.redacted' | translate }}
@@ -104,6 +109,7 @@
[icon]="fullScreen ? 'red:exit-fullscreen' : 'red:fullscreen'"
[tooltip]="'file-preview.fullscreen' | translate"
class="ml-2"
+ iqserHelpMode="assign-reviewer"
tooltipPosition="below"
>
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 97941b9ce..3f87b91ae 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
@@ -246,6 +246,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
ngOnDetach(): void {
this.displayPDFViewer = false;
+ this._changeDetectorRef.markForCheck();
super.ngOnDestroy();
}
diff --git a/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts b/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts
index 7c280878c..56e34e4d7 100644
--- a/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts
+++ b/apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts
@@ -406,6 +406,7 @@ export class AnnotationActionsService {
const annotationManager = viewer.Core.annotationManager;
const viewerAnnotation = annotationManager.getAnnotationById(annotationWrapper.id);
viewerAnnotation.ReadOnly = false;
+ viewerAnnotation.Hidden = false;
viewerAnnotation.setRotationControlEnabled(false);
annotationManager.redrawAnnotation(viewerAnnotation);
annotationManager.selectAnnotation(viewerAnnotation);
@@ -430,8 +431,6 @@ export class AnnotationActionsService {
value: text,
};
- console.log(resizeRequest);
-
this._processObsAndEmit(
this._manualAnnotationService.resizeOrSuggestToResize(annotationWrapper, dossier, resizeRequest),
annotationWrapper,
diff --git a/apps/red-ui/src/assets/help-mode/links.json b/apps/red-ui/src/assets/help-mode/links.json
index 026f646b0..73181a882 100644
--- a/apps/red-ui/src/assets/help-mode/links.json
+++ b/apps/red-ui/src/assets/help-mode/links.json
@@ -76,5 +76,47 @@
"de": "",
"it": "",
"fr": ""
+ },
+ "standard-view": {
+ "en": "https://docs.redactmanager.com/2.2/en/editing-documents-in-the-editor/views-in-the-editor/standard-view.html",
+ "de": "",
+ "it": "",
+ "fr": ""
+ },
+ "delta-view": {
+ "en": "https://docs.redactmanager.com/2.2/en/editing-documents-in-the-editor/views-in-the-editor/delta-view.html",
+ "de": "",
+ "it": "",
+ "fr": ""
+ },
+ "preview-view": {
+ "en": "https://docs.redactmanager.com/2.2/en/editing-documents-in-the-editor/views-in-the-editor/preview.html",
+ "de": "",
+ "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": ""
}
}
diff --git a/libs/common-ui b/libs/common-ui
index 17c65675b..813170555 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 17c65675b934698a61a2c80435f532e5a77f0c97
+Subproject commit 813170555884c193e3eb8d4c06ae55540d266827
diff --git a/package.json b/package.json
index e6f19fcf6..ad9832d86 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "redaction",
- "version": "3.30.0",
+ "version": "3.32.0",
"private": true,
"license": "MIT",
"scripts": {
diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz
index bc51f6cd9..6845f8327 100644
Binary files a/paligo-theme.tar.gz and b/paligo-theme.tar.gz differ