From 9ed4a683488c227b3938f2e1bf0a06d4de67db5f Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Sat, 12 Feb 2022 00:22:17 +0200 Subject: [PATCH 1/8] WIP on refactoring help mode logic --- .../app/components/base-screen/base-screen.component.html | 8 ++------ .../dossier-details/dossier-details.component.html | 7 +------ .../annotation-actions/annotation-actions.component.html | 5 ----- .../components/file-workload/file-workload.component.html | 3 +-- .../user-management/user-management.component.html | 1 - .../components/view-switch/view-switch.component.html | 3 --- .../components/file-actions/file-actions.component.html | 2 +- .../buttons/user-button/user-button.component.html | 2 +- .../simple-doughnut-chart.component.html | 2 +- .../components/team-members/team-members.component.html | 1 - libs/common-ui | 2 +- 11 files changed, 8 insertions(+), 28 deletions(-) diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.html b/apps/red-ui/src/app/components/base-screen/base-screen.component.html index 969a9a4ca..49901094f 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.html +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.html @@ -4,7 +4,7 @@
- +
- + diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html index 71ffaaf40..56cea7f15 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html @@ -23,7 +23,6 @@ [tooltip]="'dossier-details.edit-owner' | translate" class="ml-14" icon="iqser:edit" - iqserHelpMode="edit-dossier-owner" tooltipPosition="below" > @@ -46,11 +45,7 @@ > -
+
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 176f71a18..68d115abd 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 @@ -16,7 +16,6 @@ (click)="multiSelectService.activate()" *ngIf="(multiSelectService.enabled$ | async) && (multiSelectInactive$ | async)" class="all-caps-label primary pointer" - iqserHelpMode="bulk-select-annotations" translate="file-preview.tabs.annotations.select" >
@@ -24,7 +23,7 @@ [actionsTemplate]="annotationFilterActionTemplate" [primaryFiltersSlug]="'primaryFilters'" [secondaryFiltersSlug]="'secondaryFilters'" - iqserHelpMode="workload-filter" + xw >
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.html index 53669e553..7466ecbd9 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.html @@ -34,7 +34,6 @@ *ngIf="(canAssignOrUnassign$ | async) && !!file.assignee" [tooltip]="assignTooltip$ | async" icon="iqser:edit" - iqserHelpMode="assign-reviewer" tooltipPosition="below" > diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/view-switch/view-switch.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/view-switch/view-switch.component.html index c3836a11a..8d230bc9f 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/view-switch/view-switch.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/view-switch/view-switch.component.html @@ -4,7 +4,6 @@ [class.active]="viewModeService.isStandard" [matTooltip]="'file-preview.standard-tooltip' | translate" class="red-tab" - iqserHelpMode="standard-view" > {{ 'file-preview.standard' | translate }} @@ -15,7 +14,6 @@ [disabled]="(canSwitchToDeltaView$ | async) === false" [matTooltip]="'file-preview.delta-tooltip' | translate" class="red-tab" - iqserHelpMode="delta-view" > {{ 'file-preview.delta' | translate }} @@ -26,7 +24,6 @@ [disabled]="(canSwitchToRedactedView$ | async) === false" [matTooltip]="'file-preview.redacted-tooltip' | translate" class="red-tab" - iqserHelpMode="preview-view" > {{ 'file-preview.redacted' | translate }} diff --git a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.html b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.html index a65863042..15dca9eca 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.html +++ b/apps/red-ui/src/app/modules/dossier/shared/components/file-actions/file-actions.component.html @@ -16,7 +16,7 @@ -
+
+ diff --git a/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.html b/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.html index 8c5a1381e..fb0477d48 100644 --- a/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.html +++ b/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.html @@ -23,7 +23,7 @@
-
+
diff --git a/libs/common-ui b/libs/common-ui index 0bab45847..24fbe8de3 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 0bab4584767b868f9d72a4de7ae23d0dd19daad3 +Subproject commit 24fbe8de35943e3cf8308093721ee4fd1044c00d From b55aff23073bfce1dd70495f4692d5b86c52f19f Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Sat, 12 Feb 2022 01:04:33 +0200 Subject: [PATCH 2/8] added back remained keys for dossiers list screen --- .../src/app/components/base-screen/base-screen.component.html | 2 +- .../components/file-workload/file-workload.component.html | 1 - libs/common-ui | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.html b/apps/red-ui/src/app/components/base-screen/base-screen.component.html index 49901094f..a46191b8f 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.html +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.html @@ -4,7 +4,7 @@
- +
diff --git a/libs/common-ui b/libs/common-ui index 24fbe8de3..6bc8881a8 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 24fbe8de35943e3cf8308093721ee4fd1044c00d +Subproject commit 6bc8881a8f44672b6419ed2bf3e9d8b940bed26f From d10fd304081dbfc641058ba4debf8022a41d77fa Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Mon, 14 Feb 2022 11:13:48 +0200 Subject: [PATCH 3/8] added more help mode keys --- .../dossier-details.component.html | 7 +- .../annotation-actions.component.html | 5 ++ .../file-workload.component.html | 2 + .../user-management.component.html | 1 + .../view-switch/view-switch.component.html | 3 + .../file-actions/file-actions.component.ts | 16 ++++ .../expandable-file-actions.component.html | 3 + .../simple-doughnut-chart.component.html | 2 +- .../simple-doughnut-chart.component.scss | 2 +- .../team-members/team-members.component.html | 1 + apps/red-ui/src/assets/help-mode/links.json | 84 +++++++++++++++++++ libs/common-ui | 2 +- .../src/lib/shared/expandable-file-actions.ts | 1 + 13 files changed, 125 insertions(+), 4 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html index 56cea7f15..68f96f7f0 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html @@ -24,6 +24,7 @@ class="ml-14" icon="iqser:edit" tooltipPosition="below" + iqserHelpMode="edit-dossier-owner" >
@@ -45,7 +46,11 @@ >
-
+
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 2f6b455bc..f14b19fd8 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 @@ -17,12 +17,14 @@ *ngIf="(multiSelectService.enabled$ | async) && (multiSelectInactive$ | async)" class="all-caps-label primary pointer" translate="file-preview.tabs.annotations.select" + iqserHelpMode="bulk-select-annotations" >
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.html index 7466ecbd9..8523191f3 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.html @@ -35,6 +35,7 @@ [tooltip]="assignTooltip$ | async" icon="iqser:edit" tooltipPosition="below" + iqserHelpMode="assign-reviewer" > {{ 'file-preview.standard' | translate }} @@ -14,6 +15,7 @@ [disabled]="(canSwitchToDeltaView$ | async) === false" [matTooltip]="'file-preview.delta-tooltip' | translate" class="red-tab" + iqserHelpMode="delta-view" > {{ 'file-preview.delta' | translate }} @@ -24,6 +26,7 @@ [disabled]="(canSwitchToRedactedView$ | async) === false" [matTooltip]="'file-preview.redacted-tooltip' | translate" class="red-tab" + iqserHelpMode="preview-view" > {{ 'file-preview.redacted' | translate }} 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 e084f178c..5b95617d6 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 @@ -124,6 +124,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, tooltip: _('dossier-overview.delete.action'), icon: 'iqser:trash', show: this.showDelete, + helpModeKey: 'delete-file-action', }, { type: ActionTypes.circleBtn, @@ -131,6 +132,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, tooltip: this.assignTooltip, icon: 'red:assign', show: this.showAssign, + helpModeKey: 'assign-action', }, { type: ActionTypes.circleBtn, @@ -138,12 +140,14 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, tooltip: _('dossier-overview.assign-me'), icon: 'red:assign-me', show: this.showAssignToSelf, + helpModeKey: 'assign-to-me-action', }, { type: ActionTypes.downloadBtn, show: true, files: [this.file], tooltipClass: 'small', + helpModeKey: 'download-action', }, { type: ActionTypes.circleBtn, @@ -152,6 +156,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, ariaExpanded: this._documentInfoService?.shown$, icon: 'red:status-info', show: !!this._documentInfoService, + helpModeKey: 'document-info-action', }, { type: ActionTypes.circleBtn, @@ -161,6 +166,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, showDot: !!this.file.excludedPages?.length, icon: 'red:exclude-pages', show: !!this._excludedPagesService && !this.file.excluded, + helpModeKey: 'exclude-pages-action', }, { type: ActionTypes.circleBtn, @@ -168,6 +174,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, tooltip: _('dossier-overview.under-approval'), icon: 'red:ready-for-approval', show: this.showUnderApproval, + helpModeKey: 'under-approval-action', }, { type: ActionTypes.circleBtn, @@ -175,6 +182,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, tooltip: _('dossier-overview.under-review'), icon: 'red:undo', show: this.showUnderReview, + helpModeKey: 'under-review-action', }, { type: ActionTypes.circleBtn, @@ -183,6 +191,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, icon: 'red:approved', disabled: !this.file.canBeApproved, show: this.showApprove, + helpModeKey: 'approve-action', }, { type: ActionTypes.circleBtn, @@ -190,6 +199,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, tooltip: _('dossier-overview.disable-auto-analysis'), icon: 'red:stop', show: this.canDisableAutoAnalysis, + helpModeKey: 'disable-automatic-analysis-action', }, { type: ActionTypes.circleBtn, @@ -197,6 +207,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, tooltip: _('dossier-overview.enable-auto-analysis'), icon: 'red:play', show: this.canEnableAutoAnalysis, + helpModeKey: 'enable-automatic-analysis-action', }, { type: ActionTypes.circleBtn, @@ -204,6 +215,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, tooltip: _('dossier-overview.under-approval'), icon: 'red:undo', show: this.showUndoApproval, + helpModeKey: 'under-approval-action', }, { type: ActionTypes.circleBtn, @@ -211,6 +223,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, tooltip: _('dossier-overview.ocr-file'), icon: 'iqser:ocr', show: this.showOCR, + helpModeKey: 'ocr-action', }, { type: ActionTypes.circleBtn, @@ -220,6 +233,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, tooltipClass: 'warn small', icon: 'iqser:refresh', show: this.showReanalyseFilePreview, + helpModeKey: 'reanalyse-action', }, { type: ActionTypes.circleBtn, @@ -227,6 +241,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, tooltip: _('dossier-overview.reanalyse.action'), icon: 'iqser:refresh', show: this.showReanalyseDossierOverview, + helpModeKey: 'reanalyse-action', }, { type: ActionTypes.toggle, @@ -236,6 +251,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, class: { 'mr-24': this.isDossierOverviewList }, checked: !this.file.excluded, show: true, + helpModeKey: 'toggle-analysis-action', }, ].filter(btn => btn.show); } 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 5dda8405a..4534046ce 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 @@ -10,6 +10,7 @@ [tooltipPosition]="tooltipPosition" [tooltip]="btn.tooltip | translate" [type]="btn.buttonType || buttonType" + [iqserHelpMode]="btn.helpModeKey" > @@ -19,6 +20,7 @@ [tooltipClass]="btn.tooltipClass" [tooltipPosition]="tooltipPosition" [type]="buttonType" + [iqserHelpMode]="btn.helpModeKey" > @@ -31,6 +33,7 @@ [matTooltipPosition]="tooltipPosition" [matTooltip]="btn.tooltip | translate" [ngClass]="btn.class" + [iqserHelpMode]="btn.helpModeKey" color="primary" > diff --git a/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.html b/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.html index fb0477d48..8c5a1381e 100644 --- a/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.html +++ b/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.html @@ -23,7 +23,7 @@
-
+
div { width: fit-content; - > div:not(.help-mode-on-mouse-over) { + > div { border-radius: 4px; padding: 3px 8px; diff --git a/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html b/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html index 634c061e4..8750487ff 100644 --- a/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html +++ b/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html @@ -26,6 +26,7 @@ [type]="circleButtonTypes.primary" class="member" icon="iqser:plus" + iqserHelpMode="edit-dossier-member" >
diff --git a/apps/red-ui/src/assets/help-mode/links.json b/apps/red-ui/src/assets/help-mode/links.json index 6389ff674..84707e326 100644 --- a/apps/red-ui/src/assets/help-mode/links.json +++ b/apps/red-ui/src/assets/help-mode/links.json @@ -1,34 +1,76 @@ { + "approve-action": { + "en": "", + "de": "", + "it": "", + "fr": "" + }, + "assign-action": { + "en": "", + "de": "", + "it": "", + "fr": "" + }, "assign-reviewer": { "en": "", "de": "", "it": "", "fr": "" }, + "assign-to-me-action": { + "en": "", + "de": "", + "it": "", + "fr": "" + }, "bulk-select-annotations": { "en": "", "de": "", "it": "", "fr": "" }, + "delete-file-action": { + "en": "", + "de": "", + "it": "", + "fr": "" + }, "delta-view": { "en": "/en/editing-documents-in-the-editor/views-in-the-editor/delta-view.html", "de": "", "it": "", "fr": "" }, + "disable-automatic-analysis-action": { + "en": "", + "de": "", + "it": "", + "fr": "" + }, "document-features": { "en": "", "de": "", "it": "", "fr": "" }, + "document-info-action": { + "en": "", + "de": "", + "it": "", + "fr": "" + }, "dossiers-quickfilter-my-dossiers": { "en": "/en/create-and-manage-dossier/dossier-overview/dossier-list.html", "de": "", "it": "", "fr": "" }, + "download-action": { + "en": "", + "de": "", + "it": "", + "fr": "" + }, "edit-dossier-attributes": { "en": "", "de": "", @@ -59,6 +101,18 @@ "it": "", "fr": "" }, + "enable-automatic-analysis-action": { + "en": "", + "de": "", + "it": "", + "fr": "" + }, + "exclude-pages-action": { + "en": "", + "de": "", + "it": "", + "fr": "" + }, "filter-document-list": { "en": "/en/create-and-manage-dossier/dossier-overview/dossier-list.html", "de": "", @@ -95,6 +149,12 @@ "it": "", "fr": "" }, + "ocr-action": { + "en": "", + "de": "", + "it": "", + "fr": "" + }, "open-notifications": { "en": "/en/15471-notifications.html", "de": "", @@ -113,6 +173,12 @@ "it": "", "fr": "" }, + "reanalyse-action": { + "en": "", + "de": "", + "it": "", + "fr": "" + }, "recommendation-accept-or-reject": { "en": "", "de": "", @@ -155,6 +221,24 @@ "it": "", "fr": "" }, + "toggle-analysis-action": { + "en": "", + "de": "", + "it": "", + "fr": "" + }, + "under-approval-action": { + "en": "", + "de": "", + "it": "", + "fr": "" + }, + "under-review-action": { + "en": "", + "de": "", + "it": "", + "fr": "" + }, "workload-filter": { "en": "", "de": "", diff --git a/libs/common-ui b/libs/common-ui index 6bc8881a8..d9d8dcc7f 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 6bc8881a8f44672b6419ed2bf3e9d8b940bed26f +Subproject commit d9d8dcc7f419dbcecef062110dc41b57899056f7 diff --git a/libs/red-domain/src/lib/shared/expandable-file-actions.ts b/libs/red-domain/src/lib/shared/expandable-file-actions.ts index f53c95fe0..dfa2bbffc 100644 --- a/libs/red-domain/src/lib/shared/expandable-file-actions.ts +++ b/libs/red-domain/src/lib/shared/expandable-file-actions.ts @@ -24,4 +24,5 @@ export interface Action { class?: { [key: string]: boolean }; files?: File[]; type: ActionType; + readonly helpModeKey?: string; } From ba6691f84249a20b41ce824c9ec07135178a70f4 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Mon, 14 Feb 2022 15:56:44 +0200 Subject: [PATCH 4/8] helpmode update for breadcrumbs and filter for status --- .../base-screen/base-screen.component.html | 2 +- .../breadcrumbs/breadcrumbs.component.html | 4 +- .../dossier-details.component.html | 1 + .../simple-doughnut-chart.component.html | 38 +++++++++---------- .../simple-doughnut-chart.component.scss | 32 +++++++--------- .../simple-doughnut-chart.component.ts | 1 + libs/common-ui | 2 +- 7 files changed, 38 insertions(+), 42 deletions(-) diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.html b/apps/red-ui/src/app/components/base-screen/base-screen.component.html index a46191b8f..49901094f 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.html +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.html @@ -4,7 +4,7 @@
- +
diff --git a/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.html b/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.html index 8c5a1381e..b9687a5ad 100644 --- a/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.html +++ b/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.html @@ -22,27 +22,25 @@
{{ subtitle }}
-
-
-
+
+ - - -
+
diff --git a/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.scss b/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.scss index 321b18b7c..50f6f089a 100644 --- a/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.scss +++ b/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.scss @@ -41,31 +41,27 @@ .breakdown-container { display: flex; flex-direction: column; - align-items: center; + align-items: flex-start; margin-left: -8px; > div { - width: fit-content; + border-radius: 4px; + padding: 3px 8px; - > div { - border-radius: 4px; - padding: 3px 8px; + &:not(:last-child) { + margin-bottom: 8px; + } - &:not(:last-child) { - margin-bottom: 8px; - } + &:not(.filter-disabled) { + cursor: pointer; + } - &:not(.filter-disabled) { - cursor: pointer; - } + &:hover:not(.active):not(.filter-disabled) { + background-color: variables.$grey-6; + } - &:hover:not(.active):not(.filter-disabled) { - background-color: variables.$grey-6; - } - - &.active { - background-color: rgba(variables.$primary, 0.1); - } + &.active { + background-color: rgba(variables.$primary, 0.1); } } } 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 ec11bf6e7..36bdf09ff 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,6 +26,7 @@ export class SimpleDoughnutChartComponent implements OnChanges, OnInit { @Input() totalType: 'sum' | 'count' = 'sum'; @Input() counterText: string; @Input() filterKey = 'statusFilters'; + @Input() helpModeKey: 'filter-for-status'; filtersEnabled: boolean; chartData: any[] = []; diff --git a/libs/common-ui b/libs/common-ui index 333bd0991..53c3a6b30 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 333bd099140f20deab75278bd02d20d3fdddae88 +Subproject commit 53c3a6b30494f063ca323cb21ffff072c3204db2 From 3836ed3814803bac7da92902ec1c55ad99e83a11 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Wed, 16 Feb 2022 00:38:58 +0200 Subject: [PATCH 5/8] WIP RED-2657 -> fixing more keys --- .../base-screen/base-screen.component.html | 4 +- .../breadcrumbs/breadcrumbs.component.html | 2 +- .../dossier-details.component.html | 6 +- .../screen-header.component.html | 4 +- .../dossier-overview/config.service.ts | 5 +- .../dossiers-listing-actions.component.html | 8 +- .../dossiers-listing/config.service.ts | 2 + .../dossiers-listing-screen.component.html | 2 +- .../annotation-actions.component.html | 10 +- .../file-workload.component.html | 4 +- .../user-management.component.html | 2 +- .../view-switch/view-switch.component.html | 6 +- .../file-actions/file-actions.component.ts | 16 -- .../user-button/user-button.component.html | 2 +- .../expandable-file-actions.component.html | 6 +- .../expandable-file-actions.component.ts | 1 + .../simple-doughnut-chart.component.ts | 2 +- .../team-members/team-members.component.html | 2 +- apps/red-ui/src/assets/help-mode/links.json | 178 ++++++------------ libs/common-ui | 2 +- 20 files changed, 103 insertions(+), 161 deletions(-) diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.html b/apps/red-ui/src/app/components/base-screen/base-screen.component.html index 49901094f..106f8e0d7 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.html +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.html @@ -20,10 +20,10 @@ *ngIf="(isSearchScreen$ | async) === false && (currentUser.isUser || currentUser.isManager)" [actions]="searchActions" [placeholder]="'search.placeholder' | translate" - iqserHelpMode="search-in-entire-application" + iqserHelpMode="search_in_entire_application" > - +
diff --git a/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html b/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html index a048482f3..ddc8502a3 100644 --- a/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html +++ b/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html @@ -1,4 +1,4 @@ -
+
{{ 'top-bar.navigation-items.back' | translate }} diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html index 09a171637..62fdd4772 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html @@ -24,7 +24,7 @@ class="ml-14" icon="iqser:edit" tooltipPosition="below" - iqserHelpMode="edit-dossier-owner" + iqserHelpMode="edit_dossier_owner" >
@@ -43,14 +43,14 @@ [strokeWidth]="15" [subtitle]="'dossier-overview.dossier-details.charts.documents-in-dossier' | translate" direction="row" - helpModeKey="filter-for-status" + helpModeKey="filter_for_status" >
@@ -9,6 +9,7 @@ [disabled]="listingService.areSomeSelected$ | async" [files]="entitiesService.all$ | async" tooltipPosition="below" + iqserHelpMode="edit_dossier_in_dossier" > diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts index df9941b39..ffaffba8e 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts @@ -109,7 +109,7 @@ export class ConfigService { action: $event => this._openEditDossierDialog($event, dossierId), icon: 'iqser:edit', hide: !this._userService.currentUser.isManager, - helpModeKey: 'edit-dossier-attributes', + helpModeKey: 'edit_dossier_in_dossier', disabled$, }, ]; @@ -353,18 +353,21 @@ export class ConfigService { label: this._translateService.instant('dossier-overview.quick-filters.assigned-to-me'), checker: this._assignedToMeChecker, disabled: entities.filter(this._assignedToMeChecker).length === 0, + helpModeKey: 'documents_quickfilter', }, { id: 'unassigned', label: this._translateService.instant('dossier-overview.quick-filters.unassigned'), checker: this._unassignedChecker, disabled: entities.filter(this._unassignedChecker).length === 0, + helpModeKey: 'documents_quickfilter', }, { id: 'assigned-to-others', label: this._translateService.instant('dossier-overview.quick-filters.assigned-to-others'), checker: this._assignedToOthersChecker, disabled: entities.filter(this._assignedToOthersChecker).length === 0, + helpModeKey: 'documents_quickfilter', }, ].map(filter => new NestedFilter(filter)); } 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 2b521e11f..50c92fc4b 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 @@ -7,7 +7,7 @@ [tooltip]="(currentUser.isManager ? 'dossier-listing.edit.action' : 'dossier-listing.dossier-info.action') | translate" [type]="circleButtonTypes.dark" [icon]="currentUser.isManager ? 'iqser:edit' : 'red:info'" - iqserHelpMode="edit-dossier-from-list" + iqserHelpMode="edit_dossier" > - +
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts index ce0711162..db45899c2 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts @@ -155,6 +155,7 @@ export class ConfigService { checker: dossierTemplateChecker, }); + console.log(this._quickFilters(entities)); filterGroups.push({ slug: 'quickFilters', filters: this._quickFilters(entities), @@ -188,6 +189,7 @@ export class ConfigService { label: myDossiersLabel, checker: this._myDossiersChecker, disabled: entities.filter(this._myDossiersChecker).length === 0, + helpModeKey: 'dossiers_quickfilter_my_dossiers', }, { id: 'to-approve', diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.html index 0cb9ad5a2..23835ba78 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.html @@ -1,5 +1,5 @@
- +
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 27bdb3ffd..aed158712 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 @@ -42,7 +42,7 @@ [tooltip]="'annotation-actions.edit-reason.label' | translate" [type]="buttonType" icon="iqser:edit" - iqserHelpMode="redaction-edit-reason" + iqserHelpMode="redaction_edit_reason" >
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 f14b19fd8..6517b62ee 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 @@ -17,14 +17,14 @@ *ngIf="(multiSelectService.enabled$ | async) && (multiSelectInactive$ | async)" class="all-caps-label primary pointer" translate="file-preview.tabs.annotations.select" - iqserHelpMode="bulk-select-annotations" + iqserHelpMode="bulk_select_annotations" >
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.html index 8523191f3..e42a8a9c1 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/user-management/user-management.component.html @@ -35,7 +35,7 @@ [tooltip]="assignTooltip$ | async" icon="iqser:edit" tooltipPosition="below" - iqserHelpMode="assign-reviewer" + iqserHelpMode="assign_reviewer" > {{ '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="delta_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="preview_view" > {{ 'file-preview.redacted' | translate }} 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 5b95617d6..e084f178c 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 @@ -124,7 +124,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, tooltip: _('dossier-overview.delete.action'), icon: 'iqser:trash', show: this.showDelete, - helpModeKey: 'delete-file-action', }, { type: ActionTypes.circleBtn, @@ -132,7 +131,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, tooltip: this.assignTooltip, icon: 'red:assign', show: this.showAssign, - helpModeKey: 'assign-action', }, { type: ActionTypes.circleBtn, @@ -140,14 +138,12 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, tooltip: _('dossier-overview.assign-me'), icon: 'red:assign-me', show: this.showAssignToSelf, - helpModeKey: 'assign-to-me-action', }, { type: ActionTypes.downloadBtn, show: true, files: [this.file], tooltipClass: 'small', - helpModeKey: 'download-action', }, { type: ActionTypes.circleBtn, @@ -156,7 +152,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, ariaExpanded: this._documentInfoService?.shown$, icon: 'red:status-info', show: !!this._documentInfoService, - helpModeKey: 'document-info-action', }, { type: ActionTypes.circleBtn, @@ -166,7 +161,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, showDot: !!this.file.excludedPages?.length, icon: 'red:exclude-pages', show: !!this._excludedPagesService && !this.file.excluded, - helpModeKey: 'exclude-pages-action', }, { type: ActionTypes.circleBtn, @@ -174,7 +168,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, tooltip: _('dossier-overview.under-approval'), icon: 'red:ready-for-approval', show: this.showUnderApproval, - helpModeKey: 'under-approval-action', }, { type: ActionTypes.circleBtn, @@ -182,7 +175,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, tooltip: _('dossier-overview.under-review'), icon: 'red:undo', show: this.showUnderReview, - helpModeKey: 'under-review-action', }, { type: ActionTypes.circleBtn, @@ -191,7 +183,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, icon: 'red:approved', disabled: !this.file.canBeApproved, show: this.showApprove, - helpModeKey: 'approve-action', }, { type: ActionTypes.circleBtn, @@ -199,7 +190,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, tooltip: _('dossier-overview.disable-auto-analysis'), icon: 'red:stop', show: this.canDisableAutoAnalysis, - helpModeKey: 'disable-automatic-analysis-action', }, { type: ActionTypes.circleBtn, @@ -207,7 +197,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, tooltip: _('dossier-overview.enable-auto-analysis'), icon: 'red:play', show: this.canEnableAutoAnalysis, - helpModeKey: 'enable-automatic-analysis-action', }, { type: ActionTypes.circleBtn, @@ -215,7 +204,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, tooltip: _('dossier-overview.under-approval'), icon: 'red:undo', show: this.showUndoApproval, - helpModeKey: 'under-approval-action', }, { type: ActionTypes.circleBtn, @@ -223,7 +211,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, tooltip: _('dossier-overview.ocr-file'), icon: 'iqser:ocr', show: this.showOCR, - helpModeKey: 'ocr-action', }, { type: ActionTypes.circleBtn, @@ -233,7 +220,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, tooltipClass: 'warn small', icon: 'iqser:refresh', show: this.showReanalyseFilePreview, - helpModeKey: 'reanalyse-action', }, { type: ActionTypes.circleBtn, @@ -241,7 +227,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, tooltip: _('dossier-overview.reanalyse.action'), icon: 'iqser:refresh', show: this.showReanalyseDossierOverview, - helpModeKey: 'reanalyse-action', }, { type: ActionTypes.toggle, @@ -251,7 +236,6 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, class: { 'mr-24': this.isDossierOverviewList }, checked: !this.file.excluded, show: true, - helpModeKey: 'toggle-analysis-action', }, ].filter(btn => btn.show); } diff --git a/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.html b/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.html index 961e85f48..ef9b7a360 100644 --- a/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.html +++ b/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.html @@ -1,4 +1,4 @@ - 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 4534046ce..dc41698da 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 @@ -10,7 +10,7 @@ [tooltipPosition]="tooltipPosition" [tooltip]="btn.tooltip | translate" [type]="btn.buttonType || buttonType" - [iqserHelpMode]="btn.helpModeKey" + [iqserHelpMode]="helpModeKey" > @@ -20,7 +20,7 @@ [tooltipClass]="btn.tooltipClass" [tooltipPosition]="tooltipPosition" [type]="buttonType" - [iqserHelpMode]="btn.helpModeKey" + [iqserHelpMode]="helpModeKey" > @@ -33,7 +33,7 @@ [matTooltipPosition]="tooltipPosition" [matTooltip]="btn.tooltip | translate" [ngClass]="btn.class" - [iqserHelpMode]="btn.helpModeKey" + [iqserHelpMode]="helpModeKey" 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 8f37afc08..3a8e1b4b3 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 @@ -21,6 +21,7 @@ export class ExpandableFileActionsComponent implements OnChanges { displayedButtons: Action[]; hiddenButtons: Action[]; expanded = false; + helpModeKey: string = 'document_features'; constructor( private readonly _fileDownloadService: FileDownloadService, 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 36bdf09ff..bd5230711 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' = 'sum'; @Input() counterText: string; @Input() filterKey = 'statusFilters'; - @Input() helpModeKey: 'filter-for-status'; + @Input() helpModeKey: 'filter_for_status'; filtersEnabled: boolean; chartData: any[] = []; diff --git a/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html b/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html index 8750487ff..4dcd9d300 100644 --- a/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html +++ b/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html @@ -26,7 +26,7 @@ [type]="circleButtonTypes.primary" class="member" icon="iqser:plus" - iqserHelpMode="edit-dossier-member" + iqserHelpMode="add_dossier_members" > diff --git a/apps/red-ui/src/assets/help-mode/links.json b/apps/red-ui/src/assets/help-mode/links.json index 84707e326..30d258c38 100644 --- a/apps/red-ui/src/assets/help-mode/links.json +++ b/apps/red-ui/src/assets/help-mode/links.json @@ -1,245 +1,191 @@ { - "approve-action": { + "assign_reviewer": { "en": "", "de": "", "it": "", "fr": "" }, - "assign-action": { + "bulk_select_annotations": { "en": "", "de": "", "it": "", "fr": "" }, - "assign-reviewer": { - "en": "", - "de": "", - "it": "", - "fr": "" - }, - "assign-to-me-action": { - "en": "", - "de": "", - "it": "", - "fr": "" - }, - "bulk-select-annotations": { - "en": "", - "de": "", - "it": "", - "fr": "" - }, - "delete-file-action": { - "en": "", - "de": "", - "it": "", - "fr": "" - }, - "delta-view": { + "delta_view": { "en": "/en/editing-documents-in-the-editor/views-in-the-editor/delta-view.html", "de": "", "it": "", "fr": "" }, - "disable-automatic-analysis-action": { + "document_features": { "en": "", "de": "", "it": "", "fr": "" }, - "document-features": { + "edit_dossier": { "en": "", "de": "", "it": "", "fr": "" }, - "document-info-action": { + "download_dossier": { "en": "", "de": "", "it": "", "fr": "" }, - "dossiers-quickfilter-my-dossiers": { + "add_dossier_members": { + "en": "", + "de": "", + "it": "", + "fr": "" + }, + "edit_dossier_owner": { + "en": "", + "de": "", + "it": "", + "fr": "" + }, + "edit_reason": { + "en": "", + "de": "", + "it": "", + "fr": "" + }, + "filter_document_list": { "en": "/en/create-and-manage-dossier/dossier-overview/dossier-list.html", "de": "", "it": "", "fr": "" }, - "download-action": { - "en": "", - "de": "", - "it": "", - "fr": "" - }, - "edit-dossier-attributes": { - "en": "", - "de": "", - "it": "", - "fr": "" - }, - "edit-dossier-from-list": { - "en": "", - "de": "", - "it": "", - "fr": "" - }, - "edit-dossier-member": { - "en": "", - "de": "", - "it": "", - "fr": "" - }, - "edit-dossier-owner": { - "en": "", - "de": "", - "it": "", - "fr": "" - }, - "edit-reason": { - "en": "", - "de": "", - "it": "", - "fr": "" - }, - "enable-automatic-analysis-action": { - "en": "", - "de": "", - "it": "", - "fr": "" - }, - "exclude-pages-action": { - "en": "", - "de": "", - "it": "", - "fr": "" - }, - "filter-document-list": { - "en": "/en/create-and-manage-dossier/dossier-overview/dossier-list.html", - "de": "", - "it": "", - "fr": "" - }, - "filter-dossier-list": { + "filter_dossier_list": { "en": "/en/26024-features-and-actions-in-the-dossier-overview.html", "de": "", "it": "", "fr": "" }, - "filter-for-editing-notes": { + "filter_for_editing_notes": { "en": "", "de": "", "it": "", "fr": "" }, - "filter-for-status": { + "filter_for_status": { "en": "", "de": "", "it": "", "fr": "" }, - "navigate-in-breadcrumbs": { + "navigate_in_breadcrumbs": { "en": "", "de": "", "it": "", "fr": "" }, - "new-dossier-button": { + "new_dossier_button": { "en": "/en/creating-and-managing-dossiers/dossier-overview/creating-a-new-dossier.html", "de": "", "it": "", "fr": "" }, - "ocr-action": { - "en": "", - "de": "", - "it": "", - "fr": "" - }, - "open-notifications": { + "open_notifications": { "en": "/en/15471-notifications.html", "de": "", "it": "", "fr": "" }, - "open-usermenu": { + "open_usermenu": { "en": "/en/23200-user-menu-and-account.html", "de": "", "it": "", "fr": "" }, - "preview-view": { + "preview_view": { "en": "/en/editing-documents-in-the-editor/views-in-the-editor/preview.html", "de": "", "it": "", "fr": "" }, - "reanalyse-action": { + "recommendation_accept_or_reject": { "en": "", "de": "", "it": "", "fr": "" }, - "recommendation-accept-or-reject": { + "redaction_false_positive": { "en": "", "de": "", "it": "", "fr": "" }, - "redaction-false-positive": { + "redaction_remove_from_dictionary": { "en": "", "de": "", "it": "", "fr": "" }, - "redaction-remove-from-dictionary": { + "redaction_remove_only_here": { "en": "", "de": "", "it": "", "fr": "" }, - "redaction-remove-only-here": { + "reset_filters": { "en": "", "de": "", "it": "", "fr": "" }, - "reset-filters": { - "en": "", - "de": "", - "it": "", - "fr": "" - }, - "search-in-entire-application": { + "search_in_entire_application": { "en": "/en/15632-searching-the-application.html", "de": "", "it": "", "fr": "" }, - "standard-view": { + "standard_view": { "en": "/en/editing-documents-in-the-editor/views-in-the-editor/standard-view.html", "de": "", "it": "", "fr": "" }, - "toggle-analysis-action": { + "workload_filter": { "en": "", "de": "", "it": "", "fr": "" }, - "under-approval-action": { + "dossiers_quickfilter_my_dossiers": { "en": "", "de": "", "it": "", "fr": "" }, - "under-review-action": { + "scroll_up_and_down": { "en": "", "de": "", "it": "", "fr": "" }, - "workload-filter": { + "delete_document_filter": { + "en": "", + "de": "", + "it": "", + "fr": "" + }, + "delete_dossier_filter": { + "en": "", + "de": "", + "it": "", + "fr": "" + }, + "document_features": { + "en": "", + "de": "", + "it": "", + "fr": "" + }, + "edit_dossier_in_dossier": { "en": "", "de": "", "it": "", diff --git a/libs/common-ui b/libs/common-ui index 53c3a6b30..77d0a4bb1 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 53c3a6b30494f063ca323cb21ffff072c3204db2 +Subproject commit 77d0a4bb1b575d4ebb0dea2b55cfb538794ad66b From 5aee1e91aa6dc448e1722233f42df201ca0f8391 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Wed, 16 Feb 2022 13:06:50 +0200 Subject: [PATCH 6/8] WIP RED-2657 -> added more keys --- .../annotation-actions.component.html | 4 +++- .../file-preview-screen.component.html | 6 +++++- .../file-actions/file-actions.component.html | 1 + .../file-actions/file-actions.component.ts | 1 + .../expandable-file-actions.component.ts | 2 +- apps/red-ui/src/assets/help-mode/links.json | 20 +++++++++++++++---- 6 files changed, 27 insertions(+), 7 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.html index aed158712..06bd99625 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.html @@ -33,6 +33,7 @@ [tooltip]="'annotation-actions.resize.label' | translate" [type]="buttonType" icon="red:resize" + iqserHelpMode="redaction_resize_redaction" > - + 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 8b4d73884..8abe2382d 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 @@ -51,6 +51,7 @@ export class FileActionsComponent extends AutoUnsubscribe implements OnDestroy, @Input() file: File; @Input() type: 'file-preview' | 'dossier-overview-list' | 'dossier-overview-workflow'; @Input() maxWidth: number; + @Input() fileActionsHelpModeKey: 'document_features' | 'editor_document_features' = 'document_features'; toggleTooltip?: string; assignTooltip?: string; 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 3a8e1b4b3..e9de1e723 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,11 +17,11 @@ export class ExpandableFileActionsComponent implements OnChanges { @Input() actions: Action[]; @Input() buttonType: CircleButtonType; @Input() tooltipPosition: IqserTooltipPosition; + @Input() helpModeKey: 'document_features' | 'editor_document_features'; displayedButtons: Action[]; hiddenButtons: Action[]; expanded = false; - helpModeKey: string = 'document_features'; constructor( private readonly _fileDownloadService: FileDownloadService, diff --git a/apps/red-ui/src/assets/help-mode/links.json b/apps/red-ui/src/assets/help-mode/links.json index 30d258c38..ee8f1c837 100644 --- a/apps/red-ui/src/assets/help-mode/links.json +++ b/apps/red-ui/src/assets/help-mode/links.json @@ -47,7 +47,7 @@ "it": "", "fr": "" }, - "edit_reason": { + "redaction_edit_reason": { "en": "", "de": "", "it": "", @@ -119,7 +119,7 @@ "it": "", "fr": "" }, - "redaction_remove_from_dictionary": { + "skipped_remove_from_dictionary": { "en": "", "de": "", "it": "", @@ -179,13 +179,25 @@ "it": "", "fr": "" }, - "document_features": { + "edit_dossier_in_dossier": { "en": "", "de": "", "it": "", "fr": "" }, - "edit_dossier_in_dossier": { + "redaction_resize_redaction": { + "en": "", + "de": "", + "it": "", + "fr": "" + }, + "skipped_force_redaction": { + "en": "", + "de": "", + "it": "", + "fr": "" + }, + "editor_document_features": { "en": "", "de": "", "it": "", From 11d09cf090a09cffad31648d80342e9651efd749 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Thu, 17 Feb 2022 09:05:58 +0200 Subject: [PATCH 7/8] fix to display helpers only when the elements are visible --- .../dossiers-listing-actions.component.html | 2 ++ .../dossier/screens/dossiers-listing/config.service.ts | 1 - .../expandable-file-actions.component.html | 3 +++ .../expandable-file-actions.component.ts | 4 ++++ libs/common-ui | 2 +- 5 files changed, 10 insertions(+), 2 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 ef389d4e0..c78fbb3ae 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 @@ -6,6 +6,7 @@ [type]="circleButtonTypes.dark" [icon]="currentUser.isManager ? 'iqser:edit' : 'red:info'" iqserHelpMode="edit_dossier" + [isVirtualScrollElement]="true" > diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts index d46135b13..b83129f47 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts @@ -156,7 +156,6 @@ export class ConfigService { checker: dossierTemplateChecker, }); - console.log(this._quickFilters(entities)); filterGroups.push({ slug: 'quickFilters', filters: this._quickFilters(entities), 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 dc41698da..e99a143e4 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 @@ -11,6 +11,7 @@ [tooltip]="btn.tooltip | translate" [type]="btn.buttonType || buttonType" [iqserHelpMode]="helpModeKey" + [isVirtualScrollElement]="isVirtualScrolElement" > @@ -21,6 +22,7 @@ [tooltipPosition]="tooltipPosition" [type]="buttonType" [iqserHelpMode]="helpModeKey" + [isVirtualScrollElement]="isVirtualScrolElement" > @@ -34,6 +36,7 @@ [matTooltip]="btn.tooltip | translate" [ngClass]="btn.class" [iqserHelpMode]="helpModeKey" + [isVirtualScrollElement]="isVirtualScrolElement" 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 e9de1e723..d9ac332d6 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 @@ -63,4 +63,8 @@ export class ExpandableFileActionsComponent implements OnChanges { await firstValueFrom(this._fileDownloadService.downloadFiles(filesIds, dossierId)); this._toaster.info(_('download-status.queued')); } + + get isVirtualScrolElement(): boolean { + return this.helpModeKey === 'document_features'; + } } diff --git a/libs/common-ui b/libs/common-ui index 77d0a4bb1..a3a090162 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 77d0a4bb1b575d4ebb0dea2b55cfb538794ad66b +Subproject commit a3a090162cf50221004026886d437b1626c49e2f From 6672b6b513420699d0dfbc6b83416e6a958c3494 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Fri, 18 Feb 2022 10:15:19 +0200 Subject: [PATCH 8/8] added doc links for helper elements --- .../screen-header.component.html | 1 + .../dossiers-listing/config.service.ts | 2 +- .../team-members/team-members.component.html | 2 +- apps/red-ui/src/assets/config/config.json | 2 +- apps/red-ui/src/assets/help-mode/links.json | 72 ++++++++++--------- libs/common-ui | 2 +- 6 files changed, 44 insertions(+), 37 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/screen-header.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/screen-header.component.html index 833478531..9ca29d0ab 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/screen-header.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/screen-header/screen-header.component.html @@ -18,6 +18,7 @@ [tooltip]="'dossier-overview.header-actions.download-csv' | translate" icon="iqser:csv" tooltipPosition="below" + iqserHelpMode="edit_dossier_in_dossier" > diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index dcda72e72..4b275311e 100644 --- a/apps/red-ui/src/assets/config/config.json +++ b/apps/red-ui/src/assets/config/config.json @@ -20,5 +20,5 @@ "OAUTH_URL": "https://dev-04.iqser.cloud/auth/realms/redaction", "RECENT_PERIOD_IN_HOURS": 24, "SELECTION_MODE": "structural", - "MANUAL_BASE_URL": "https://docs.redactmanager.com/3.0" + "MANUAL_BASE_URL": "https://docs.redactmanager.com" } diff --git a/apps/red-ui/src/assets/help-mode/links.json b/apps/red-ui/src/assets/help-mode/links.json index ee8f1c837..a3e6c6d04 100644 --- a/apps/red-ui/src/assets/help-mode/links.json +++ b/apps/red-ui/src/assets/help-mode/links.json @@ -1,162 +1,162 @@ { "assign_reviewer": { - "en": "", + "en": "/preview/en/index-en.html?contextId=assign_reviewer", "de": "", "it": "", "fr": "" }, "bulk_select_annotations": { - "en": "", + "en": "/preview/en/index-en.html?contextId=bulk_select_annotations", "de": "", "it": "", "fr": "" }, "delta_view": { - "en": "/en/editing-documents-in-the-editor/views-in-the-editor/delta-view.html", + "en": "/preview/en/index-en.html?contextId=delta_view", "de": "", "it": "", "fr": "" }, "document_features": { - "en": "", + "en": "/preview/en/index-en.html?contextId=document_features", "de": "", "it": "", "fr": "" }, "edit_dossier": { - "en": "", + "en": "/preview/en/index-en.html?contextId=edit_dossier", "de": "", "it": "", "fr": "" }, "download_dossier": { - "en": "", + "en": "/preview/en/index-en.html?contextId=download_dossier", "de": "", "it": "", "fr": "" }, - "add_dossier_members": { - "en": "", + "edit_dossier_member": { + "en": "/preview/en/index-en.html?contextId=edit_dossier_member", "de": "", "it": "", "fr": "" }, "edit_dossier_owner": { - "en": "", + "en": "/preview/en/index-en.html?contextId=edit_dossier_owner", "de": "", "it": "", "fr": "" }, "redaction_edit_reason": { - "en": "", + "en": "/preview/en/index-en.html?contextId=redaction_edit_reason", "de": "", "it": "", "fr": "" }, "filter_document_list": { - "en": "/en/create-and-manage-dossier/dossier-overview/dossier-list.html", + "en": "/preview/en/index-en.html?contextId=filter_document_list", "de": "", "it": "", "fr": "" }, "filter_dossier_list": { - "en": "/en/26024-features-and-actions-in-the-dossier-overview.html", + "en": "/preview/en/index-en.html?contextId=filter_dossier_list", "de": "", "it": "", "fr": "" }, "filter_for_editing_notes": { - "en": "", + "en": "/preview/en/index-en.html?contextId=filter_for_editing_notes", "de": "", "it": "", "fr": "" }, "filter_for_status": { - "en": "", + "en": "/preview/en/index-en.html?contextId=filter_for_status", "de": "", "it": "", "fr": "" }, "navigate_in_breadcrumbs": { - "en": "", + "en": "/preview/en/index-en.html?contextId=navigate_in_breadcrumbs", "de": "", "it": "", "fr": "" }, "new_dossier_button": { - "en": "/en/creating-and-managing-dossiers/dossier-overview/creating-a-new-dossier.html", + "en": "/preview/en/index-en.html?contextId=new_dossier_button", "de": "", "it": "", "fr": "" }, "open_notifications": { - "en": "/en/15471-notifications.html", + "en": "/preview/en/index-en.html?contextId=open_notifications", "de": "", "it": "", "fr": "" }, "open_usermenu": { - "en": "/en/23200-user-menu-and-account.html", + "en": "/preview/en/index-en.html?contextId=open_usermenu", "de": "", "it": "", "fr": "" }, "preview_view": { - "en": "/en/editing-documents-in-the-editor/views-in-the-editor/preview.html", + "en": "/preview/en/index-en.html?contextId=delta_view", "de": "", "it": "", "fr": "" }, "recommendation_accept_or_reject": { - "en": "", + "en": "/preview/en/index-en.html?contextId=recommendation_accept_or_reject", "de": "", "it": "", "fr": "" }, "redaction_false_positive": { - "en": "", + "en": "/preview/en/index-en.html?contextId=redaction_false_positive", "de": "", "it": "", "fr": "" }, "skipped_remove_from_dictionary": { - "en": "", + "en": "/preview/en/index-en.html?contextId=skipped_remove_from_dictionary", "de": "", "it": "", "fr": "" }, "redaction_remove_only_here": { - "en": "", + "en": "/preview/en/index-en.html?contextId=redaction_remove_only_here", "de": "", "it": "", "fr": "" }, "reset_filters": { - "en": "", + "en": "/preview/en/index-en.html?contextId=reset_filters", "de": "", "it": "", "fr": "" }, "search_in_entire_application": { - "en": "/en/15632-searching-the-application.html", + "en": "/preview/en/index-en.html?contextId=search_in_entire_application", "de": "", "it": "", "fr": "" }, "standard_view": { - "en": "/en/editing-documents-in-the-editor/views-in-the-editor/standard-view.html", + "en": "/preview/en/index-en.html?contextId=standard_view", "de": "", "it": "", "fr": "" }, "workload_filter": { - "en": "", + "en": "/preview/en/index-en.html?contextId=workload_filter", "de": "", "it": "", "fr": "" }, "dossiers_quickfilter_my_dossiers": { - "en": "", + "en": "/preview/en/index-en.html?contextId=dossiers_quickfilter_my_dossiers", "de": "", "it": "", "fr": "" @@ -168,7 +168,7 @@ "fr": "" }, "delete_document_filter": { - "en": "", + "en": "/preview/en/index-en.html?contextId=delete_document_filter", "de": "", "it": "", "fr": "" @@ -180,25 +180,31 @@ "fr": "" }, "edit_dossier_in_dossier": { - "en": "", + "en": "/preview/en/index-en.html?contextId=edit_dossier_in_dossier", "de": "", "it": "", "fr": "" }, "redaction_resize_redaction": { - "en": "", + "en": "/preview/en/index-en.html?contextId=redaction_resize_redaction", "de": "", "it": "", "fr": "" }, "skipped_force_redaction": { - "en": "", + "en": "/preview/en/index-en.html?contextId=skipped_force_redaction", "de": "", "it": "", "fr": "" }, "editor_document_features": { - "en": "", + "en": "/preview/en/index-en.html?contextId=editor_document_features", + "de": "", + "it": "", + "fr": "" + }, + "documents_quickfilter": { + "en": "/preview/en/index-en.html?contextId=documents_quickfilter", "de": "", "it": "", "fr": "" diff --git a/libs/common-ui b/libs/common-ui index a3a090162..39c089ec8 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit a3a090162cf50221004026886d437b1626c49e2f +Subproject commit 39c089ec87d11c48e3ef2186aaafe59d17085b98