From 3da59a800152ee19456142be1e06c611ea519c6c Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Mon, 9 May 2022 20:36:06 +0300 Subject: [PATCH] RED-3760 - new help mode keys --- .../dossier-details.component.html | 10 +- .../dossier-overview/config.service.ts | 6 +- .../edit-dossier-general-info.component.html | 4 + .../file-actions/file-actions.component.ts | 3 +- .../dossiers-listing-actions.component.html | 2 +- .../annotation-actions.component.html | 17 -- .../annotation-actions.component.ts | 16 -- .../highlights-separator.component.html | 4 +- .../user-management.component.html | 2 +- .../view-switch/view-switch.component.html | 8 +- .../file-preview-screen.component.html | 4 +- .../file-preview-screen.component.ts | 26 ++ .../expandable-file-actions.component.html | 10 +- .../expandable-file-actions.component.ts | 4 +- .../simple-doughnut-chart.component.ts | 2 +- apps/red-ui/src/assets/help-mode/links.json | 240 ++++-------------- libs/common-ui | 2 +- 17 files changed, 104 insertions(+), 256 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.html index d9c5384a8..e7f72dec8 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.html +++ b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.html @@ -23,7 +23,7 @@ [tooltip]="'dossier-details.edit-owner' | translate" class="ml-14" icon="iqser:edit" - iqserHelpMode="edit_dossier_owner" + iqserHelpMode="dashboard_in_dossier" tooltipPosition="below" > @@ -43,7 +43,7 @@ [strokeWidth]="15" [subtitle]="'dossier-overview.dossier-details.charts.documents-in-dossier' | translate" direction="row" - helpModeKey="filter_for_status" + helpModeKey="dashboard_in_dossier" > @@ -51,11 +51,7 @@ -
+
new NestedFilter(filter)); } diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html index f2305bd2a..8fd005da3 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html @@ -83,6 +83,8 @@ [type]="iconButtonTypes.dark" icon="iqser:trash" id="deleteDossier" + iqserHelpMode="edit_dossier_delete_dossier" + [dialogElement]="true" >
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 51b7578b3..406183cad 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 @@ -41,8 +41,7 @@ export class FileActionsComponent implements OnChanges { @Input() dossier: Dossier; @Input() type: 'file-preview' | 'dossier-overview-list' | 'dossier-overview-workflow'; @Input() maxWidth: number; - @Input() fileActionsHelpModeKey: 'document_features' | 'editor_document_features' = 'document_features'; - + @Input() fileActionsHelpModeKey: 'document_features_in_dossier' | 'document_features_in_editor' = 'document_features_in_dossier'; toggleTooltip?: string; assignTooltip?: string; buttonType?: CircleButtonType; diff --git a/apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html b/apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html index 8e84ed10d..8ea5f9bc5 100644 --- a/apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html +++ b/apps/red-ui/src/app/modules/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html @@ -6,7 +6,7 @@ [scrollableParentView]="scrollableParentView" [tooltip]="(currentUser.isManager ? 'dossier-listing.edit.action' : 'dossier-listing.dossier-info.action') | translate" [type]="circleButtonTypes.dark" - iqserHelpMode="edit_dossier" + iqserHelpMode="edit_dossier_dossier_info" >
-
+
@@ -21,7 +20,6 @@ [tooltip]="'file-preview.highlights.remove' | translate" [type]="circleButtonTypes.dark" icon="iqser:trash" - iqserHelpMode="remove_highlights" tooltipPosition="above" >
diff --git a/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html b/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html index e42a8a9c1..1d761a465 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html @@ -35,7 +35,7 @@ [tooltip]="assignTooltip$ | async" icon="iqser:edit" tooltipPosition="below" - iqserHelpMode="assign_reviewer" + iqserHelpMode="document_features_in_editor" > {{ 'file-preview.standard' | translate }} @@ -15,7 +15,7 @@ [disabled]="(canSwitchToDeltaView$ | async) === false" [matTooltip]="'file-preview.delta-tooltip' | translate" class="red-tab" - iqserHelpMode="delta_view" + iqserHelpMode="view" > {{ 'file-preview.delta' | translate }} @@ -26,7 +26,7 @@ [disabled]="(canSwitchToRedactedView$ | async) === false" [matTooltip]="'file-preview.redacted-tooltip' | translate" class="red-tab" - iqserHelpMode="preview_view" + iqserHelpMode="view" > {{ 'file-preview.redacted' | translate }} @@ -37,7 +37,7 @@ [disabled]="(canSwitchToHighlightsView$ | async) === false" [matTooltip]="'file-preview.text-highlights-tooltip' | translate" class="red-tab" - iqserHelpMode="highlights_view" + iqserHelpMode="view" > {{ 'file-preview.text-highlights' | translate }} diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html index 355e6d228..4f2586b60 100644 --- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html +++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html @@ -23,7 +23,7 @@ @@ -103,6 +103,8 @@ diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts index 5a9595bff..d8f9bbe6f 100644 --- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts @@ -14,6 +14,8 @@ import { OnAttach, OnDetach, processFilters, + ScrollableParentView, + ScrollableParentViews, shareDistinctLast, } from '@iqser/common-ui'; import { MatDialogRef, MatDialogState } from '@angular/material/dialog'; @@ -52,6 +54,17 @@ import { NGXLogger } from 'ngx-logger'; import { StampService } from './services/stamp.service'; import Annotation = Core.Annotations.Annotation; +const HelpModeKeys = { + redaction: 'redaction_text', + 'manual-redaction': 'redaction_text', + recommendation: 'recommendation', + skipped: 'skipped', + hint: 'hint_text', + 'hint-ocr': 'hint_picture', + 'hint-formula': 'picture', + 'hint-image': 'image', +}; + @Component({ templateUrl: './file-preview-screen.component.html', styleUrls: ['./file-preview-screen.component.scss'], @@ -486,6 +499,19 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni this.handleAnnotationSelected([]); } + get scrollableParentView(): ScrollableParentView { + return ScrollableParentViews.ANNOTATIONS_LIST; + } + + getActionsHelpModeKey(annotation: AnnotationWrapper): string { + const type = annotation?.typeLabel?.split('.')[1]; + const typeValue = annotation?.typeValue; + if (type === 'hint' && (typeValue === 'ocr' || typeValue === 'formula' || typeValue === 'image')) { + return HelpModeKeys[`${type}-${typeValue}`]; + } + return HelpModeKeys[type]; + } + private _setExcludedPageStyles() { const file = this._filesMapService.get(this.dossierId, this.fileId); setTimeout(() => { diff --git a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html index 3ad717745..f9b9c24fb 100644 --- a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html +++ b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html @@ -5,13 +5,13 @@ [attr.aria-expanded]="btn.ariaExpanded && btn.ariaExpanded | async" [disabled]="btn.disabled" [icon]="btn.icon" - [iqserHelpMode]="helpModeKey" - [scrollableParentView]="scrollableParentView" [showDot]="btn.showDot" [tooltipClass]="btn.tooltipClass" [tooltipPosition]="tooltipPosition" [tooltip]="btn.tooltip | translate" [type]="btn.buttonType || buttonType" + [iqserHelpMode]="helpModeKey" + [scrollableParentView]="scrollableParentView" > @@ -19,11 +19,11 @@ *ngIf="btn.type === 'downloadBtn'" [dossier]="btn.dossier" [files]="btn.files" - [iqserHelpMode]="helpModeKey" - [scrollableParentView]="scrollableParentView" [tooltipClass]="btn.tooltipClass" [tooltipPosition]="tooltipPosition" [type]="buttonType" + [iqserHelpMode]="helpModeKey" + [scrollableParentView]="scrollableParentView" > @@ -33,10 +33,10 @@ (click)="$event.stopPropagation()" [checked]="btn.checked" [disabled]="btn.disabled" - [iqserHelpMode]="helpModeKey" [matTooltipPosition]="tooltipPosition" [matTooltip]="btn.tooltip | translate" [ngClass]="btn.class" + [iqserHelpMode]="helpModeKey" [scrollableParentView]="scrollableParentView" color="primary" > 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 9e59249c4..07ae9c81c 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 @@ -17,7 +17,7 @@ export class ExpandableFileActionsComponent implements OnChanges { @Input() actions: Action[]; @Input() buttonType: CircleButtonType; @Input() tooltipPosition: IqserTooltipPosition; - @Input() helpModeKey: 'document_features' | 'editor_document_features'; + @Input() helpModeKey: 'document_features_in_dossier' | 'document_features_in_editor'; displayedButtons: Action[]; hiddenButtons: Action[]; @@ -30,7 +30,7 @@ export class ExpandableFileActionsComponent implements OnChanges { ) {} get scrollableParentView(): ScrollableParentView { - return this.helpModeKey === 'document_features' ? ScrollableParentViews.VIRTUAL_SCROLL : undefined; + return this.helpModeKey === 'document_features_in_dossier' ? ScrollableParentViews.VIRTUAL_SCROLL : undefined; } ngOnChanges(changes: SimpleChanges) { diff --git a/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.ts b/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.ts index d91417945..b7bf8c3a2 100644 --- a/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.ts @@ -26,7 +26,7 @@ export class SimpleDoughnutChartComponent implements OnChanges, OnInit { @Input() totalType: 'sum' | 'count' | 'simpleLabel' = 'sum'; @Input() counterText: string; @Input() filterKey = 'statusFilters'; - @Input() helpModeKey: 'filter_for_status'; + @Input() helpModeKey: 'dashboard_in_dossier'; filtersEnabled: boolean; chartData: any[] = []; diff --git a/apps/red-ui/src/assets/help-mode/links.json b/apps/red-ui/src/assets/help-mode/links.json index 6cd868047..b77c4b8c3 100644 --- a/apps/red-ui/src/assets/help-mode/links.json +++ b/apps/red-ui/src/assets/help-mode/links.json @@ -1,30 +1,12 @@ { - "assign_reviewer": { - "en": "/en/index-en.html?contextId=assign_reviewer", - "de": "", - "it": "", - "fr": "" - }, "bulk_select_annotations": { "en": "/en/index-en.html?contextId=bulk_select_annotations", "de": "", "it": "", "fr": "" }, - "delta_view": { - "en": "/en/index-en.html?contextId=delta_view", - "de": "", - "it": "", - "fr": "" - }, - "document_features": { - "en": "/en/index-en.html?contextId=document_features", - "de": "", - "it": "", - "fr": "" - }, - "edit_dossier": { - "en": "/en/index-en.html?contextId=edit_dossier", + "document_features_in_dossier": { + "en": "/en/index-en.html?contextId=document_features_in_dossier", "de": "", "it": "", "fr": "" @@ -41,14 +23,8 @@ "it": "", "fr": "" }, - "edit_dossier_owner": { - "en": "/en/index-en.html?contextId=edit_dossier_owner", - "de": "", - "it": "", - "fr": "" - }, - "redaction_edit_reason": { - "en": "/en/index-en.html?contextId=redaction_edit_reason", + "dashboard_in_dossier": { + "en": "/en/index-en.html?contextId=dashboard_in_dossier", "de": "", "it": "", "fr": "" @@ -65,12 +41,6 @@ "it": "", "fr": "" }, - "filter_for_editing_notes": { - "en": "/en/index-en.html?contextId=filter_for_editing_notes", - "de": "", - "it": "", - "fr": "" - }, "filter_for_status": { "en": "/en/index-en.html?contextId=filter_for_status", "de": "", @@ -101,104 +71,8 @@ "it": "", "fr": "" }, - "preview_view": { - "en": "/en/index-en.html?contextId=delta_view", - "de": "", - "it": "", - "fr": "" - }, - "highlights_view": { - "en": "/en/index-en.html?contextId=highlights_view", - "de": "", - "it": "", - "fr": "" - }, - "convert_highlights": { - "en": "/en/index-en.html?contextId=convert_highlights", - "de": "", - "it": "", - "fr": "" - }, - "remove_highlights": { - "en": "/en/index-en.html?contextId=remove_highlights", - "de": "", - "it": "", - "fr": "" - }, - "recommendation_accept_or_reject": { - "en": "/en/index-en.html?contextId=recommendation_accept_or_reject", - "de": "", - "it": "", - "fr": "" - }, - "redaction_false_positive": { - "en": "/en/index-en.html?contextId=redaction_false_positive", - "de": "", - "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": "" - }, - "hint_remove_from_dictionary": { - "en": "/en/index-en.html?contextId=hint_remove_from_dictionary", - "de": "", - "it": "", - "fr": "" - }, - "recommendation_remove_from_dictionary": { - "en": "/en/index-en.html?contextId=recommendation_remove_from_dictionary", - "de": "", - "it": "", - "fr": "" - }, - "redaction_remove_only_here": { - "en": "/en/index-en.html?contextId=redaction_remove_only_here", - "de": "", - "it": "", - "fr": "" - }, - "hint_remove_only_here": { - "en": "/en/index-en.html?contextId=hint_remove_only_here", - "de": "", - "it": "", - "fr": "" - }, - "hint_recategorize": { - "en": "/en/index-en.html?contextId=hint_recategorize", - "de": "", - "it": "", - "fr": "" - }, - "hint_hide": { - "en": "/en/index-en.html?contextId=hint_hide", - "de": "", - "it": "", - "fr": "" - }, - "hint_force_hint": { - "en": "/en/index-en.html?contextId=hint_force_hint", - "de": "", - "it": "", - "fr": "" - }, - "redaction_recategorize": { - "en": "/en/index-en.html?contextId=redaction_recategorize", - "de": "", - "it": "", - "fr": "" - }, - "redaction_hide": { - "en": "/en/index-en.html?contextId=redaction_hide", + "view": { + "en": "/en/index-en.html?contextId=view", "de": "", "it": "", "fr": "" @@ -215,12 +89,6 @@ "it": "", "fr": "" }, - "standard_view": { - "en": "/en/index-en.html?contextId=standard_view", - "de": "", - "it": "", - "fr": "" - }, "workload_filter": { "en": "/en/index-en.html?contextId=workload_filter", "de": "", @@ -233,18 +101,6 @@ "it": "", "fr": "" }, - "delete_document_filter": { - "en": "/en/index-en.html?contextId=delete_document_filter", - "de": "", - "it": "", - "fr": "" - }, - "delete_dossier_filter": { - "en": "", - "de": "", - "it": "", - "fr": "" - }, "edit_dossier_in_dossier": { "en": "/en/index-en.html?contextId=edit_dossier_in_dossier", "de": "", @@ -257,32 +113,8 @@ "it": "", "fr": "" }, - "recommendation_resize": { - "en": "/en/index-en.html?contextId=recommendation_resize", - "de": "", - "it": "", - "fr": "" - }, - "hint_resize": { - "en": "/en/index-en.html?contextId=hint_resize", - "de": "", - "it": "", - "fr": "" - }, - "skipped_force_redaction": { - "en": "/en/index-en.html?contextId=skipped_force_redaction", - "de": "", - "it": "", - "fr": "" - }, - "editor_document_features": { - "en": "/en/index-en.html?contextId=editor_document_features", - "de": "", - "it": "", - "fr": "" - }, - "documents_quickfilter": { - "en": "/en/index-en.html?contextId=documents_quickfilter", + "document_features_in_editor": { + "en": "/en/index-en.html?contextId=document_features_in_editor", "de": "", "it": "", "fr": "" @@ -305,14 +137,8 @@ "it": "", "fr": "" }, - "dossiers_scroll_up_button": { - "en": "/en/index-en.html?contextId=dossiers_scroll_up_and_down", - "de": "", - "it": "", - "fr": "" - }, - "dossiers_scroll_down_button": { - "en": "/en/index-en.html?contextId=dossiers_scroll_up_and_down", + "scroll_dossier_list": { + "en": "/en/index-en.html?contextId=scroll_dossier_list", "de": "", "it": "", "fr": "" @@ -335,6 +161,18 @@ "it": "", "fr": "" }, + "edit_dossier_delete_dossier": { + "en": "/en/index-en.html?contextId=edit_dossier_delete_dossier", + "de": "", + "it": "", + "fr": "" + }, + "edit_dossier_archive_dossier": { + "en": "/en/index-en.html?contextId=edit_dossier_archive_dossier", + "de": "", + "it": "", + "fr": "" + }, "edit_dossier_download_package": { "en": "/en/index-en.html?contextId=edit_dossier_download_package", "de": "", @@ -389,26 +227,44 @@ "it": "", "fr": "" }, - "redaction_remove_from_dictionary": { - "en": "/en/index-en.html?contextId=redaction_remove_from_dictionary", + "redaction_text": { + "en": "/en/index-en.html?contextId=redaction_text", "de": "", "it": "", "fr": "" }, - "skipped_resize": { - "en": "/en/index-en.html?contextId=skipped_resize_redaction", + "recommendation": { + "en": "/en/index-en.html?contextId=recommendation", "de": "", "it": "", "fr": "" }, - "skipped_recategorize": { - "en": "/en/index-en.html?contextId=skipped_recategorize_redaction", + "skipped": { + "en": "/en/index-en.html?contextId=skipped", "de": "", "it": "", "fr": "" }, - "skipped_hide": { - "en": "/en/index-en.html?contextId=skipped_hide", + "hint_text": { + "en": "/en/index-en.html?contextId=hint_text", + "de": "", + "it": "", + "fr": "" + }, + "hint_picture": { + "en": "/en/index-en.html?contextId=hint_picture", + "de": "", + "it": "", + "fr": "" + }, + "picture": { + "en": "/en/index-en.html?contextId=picture", + "de": "", + "it": "", + "fr": "" + }, + "image": { + "en": "/en/index-en.html?contextId=image", "de": "", "it": "", "fr": "" diff --git a/libs/common-ui b/libs/common-ui index 83f2fbd88..46f19f216 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 83f2fbd88feb455d27397f470b9cadf72aa3471e +Subproject commit 46f19f216fb158d90439cfaa0dcd94f7d9f71f72