RED-4718: update common-ui & help mode binding

2022-07-27 17:52:30 +03:00 · 2022-07-27 17:52:30 +03:00 · e43c4f18ca
commit e43c4f18ca
parent 59a2ff1136
16 changed files with 72 additions and 58 deletions
--- 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
@ -19,11 +19,13 @@
            <redaction-spotlight-search
                *ngIf="(isSearchScreen$ | async) === false && (currentUser.isUser || currentUser.isManager)"
                [actions]="searchActions"
+                [iqserHelpMode]="'search_in_entire_application'"
                [placeholder]="'search.placeholder' | translate"
-                iqserHelpMode="search_in_entire_application"
            ></redaction-spotlight-search>
+
            <iqser-help-button></iqser-help-button>
-            <redaction-notifications iqserHelpMode="open_notifications"></redaction-notifications>
+
+            <redaction-notifications [iqserHelpMode]="'open_notifications'"></redaction-notifications>
        </div>

        <redaction-user-button [matMenuTriggerFor]="userMenu" [userId]="currentUser.id" id="userMenu"></redaction-user-button>
--- 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 @@
-<div *ngIf="breadcrumbsService.breadcrumbs$ | async as breadcrumbs" class="breadcrumbs" iqserHelpMode="navigate_in_breadcrumbs">
+<div *ngIf="breadcrumbsService.breadcrumbs$ | async as breadcrumbs" [iqserHelpMode]="'navigate_in_breadcrumbs'" class="breadcrumbs">
    <a *ngIf="breadcrumbs.length === 0; else items" class="breadcrumb back" redactionNavigateLastDossiersScreen>
        <mat-icon svgIcon="iqser:expand"></mat-icon>
        {{ 'top-bar.navigation-items.back' | translate }}
--- a/apps/red-ui/src/app/modules/archive/components/table-item/table-item.component.html
+++ b/apps/red-ui/src/app/modules/archive/components/table-item/table-item.component.html
@ -18,10 +18,10 @@
            (action)="openEditDossierDialog($event, dossier.id)"
            *ngIf="currentUser.isUser"
            [icon]="currentUser.isManager ? 'iqser:edit' : 'red:info'"
+            [iqserHelpMode]="'edit_dossier_dossier_info'"
            [scrollableParentView]="scrollableParentView"
            [tooltip]="(currentUser.isManager ? 'dossier-listing.edit.action' : 'dossier-listing.dossier-info.action') | translate"
            [type]="circleButtonTypes.dark"
-            iqserHelpMode="edit_dossier_dossier_info"
        ></iqser-circle-button>
    </div>
 </div>
--- a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html
+++ b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html
@ -36,7 +36,7 @@
        <span>{{ dossierTemplateName }} </span>
    </div>

-    <div (click)="openEditDossierDialog('dossierDictionary')" class="link-property" iqserHelpMode="edit_dossier_dossier_dictionary">
+    <div (click)="openEditDossierDialog('dossierDictionary')" [iqserHelpMode]="'edit_dossier_dossier_dictionary'" class="link-property">
        <mat-icon svgIcon="red:dictionary"></mat-icon>
        <span>{{ 'dossier-overview.dossier-details.dictionary' | translate }} </span>
    </div>
@ -52,8 +52,8 @@
    <div
        (click)="attributesExpanded = true"
        *ngIf="!attributesExpanded"
+        [iqserHelpMode]="'edit_dossier_dossier_attributes'"
        class="all-caps-label show-attributes"
-        iqserHelpMode="edit_dossier_dossier_attributes"
    >
        {{ 'dossier-overview.dossier-details.attributes.expand' | translate: { count: dossierAttributes.length } }}
    </div>
--- 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
@ -20,11 +20,11 @@
                <iqser-circle-button
                    (action)="editingOwner = true"
                    *ngIf="currentUser.isManager"
+                    [icon]="'iqser:edit'"
+                    [iqserHelpMode]="'dashboard_in_dossier'"
+                    [tooltipPosition]="'below'"
                    [tooltip]="'dossier-details.edit-owner' | translate"
                    class="ml-14"
-                    icon="iqser:edit"
-                    iqserHelpMode="dashboard_in_dossier"
-                    tooltipPosition="below"
                ></iqser-circle-button>
            </ng-container>
        </div>
@ -39,12 +39,12 @@
        <div *ngIf="stats.hasFiles" class="mt-24">
            <redaction-donut-chart
                [config]="chartConfig$ | async"
+                [filterKey]="'statusFilters'"
+                [helpModeKey]="'dashboard_in_dossier'"
                [radius]="63"
                [strokeWidth]="15"
                [subtitle]="'dossier-overview.dossier-details.charts.documents-in-dossier' | translate"
                direction="row"
-                filterKey="statusFilters"
-                helpModeKey="dashboard_in_dossier"
            ></redaction-donut-chart>
        </div>

@ -56,7 +56,11 @@
            ></iqser-progress-bar>
        </div>

-        <div *ngIf="stats.hasFiles && needsWorkFilters$ | async as filters" class="mt-32 legend pb-32" iqserHelpMode="dashboard_in_dossier">
+        <div
+            *ngIf="stats.hasFiles && needsWorkFilters$ | async as filters"
+            [iqserHelpMode]="'dashboard_in_dossier'"
+            class="mt-32 legend pb-32"
+        >
            <div
                (click)="filterService.toggleFilter('needsWorkFilters', filter.id)"
                *ngFor="let filter of filters"
@ -90,7 +94,7 @@
    <iqser-circle-button
        (action)="toggleCollapse.emit()"
        [icon]="'iqser:' + action"
+        [tooltipPosition]="'before'"
        [tooltip]="tooltip"
-        tooltipPosition="before"
    ></iqser-circle-button>
 </ng-template>
--- a/apps/red-ui/src/app/modules/dossier-overview/components/screen-header/dossier-overview-screen-header.component.html
+++ b/apps/red-ui/src/app/modules/dossier-overview/components/screen-header/dossier-overview-screen-header.component.html
@ -10,41 +10,41 @@
            [disabled]="listingService.areSomeSelected$ | async"
            [dossier]="dossier"
            [files]="entitiesService.all$ | async"
-            iqserHelpMode="edit_dossier_in_dossier"
-            tooltipPosition="below"
+            [iqserHelpMode]="'edit_dossier_in_dossier'"
+            [tooltipPosition]="'below'"
        ></redaction-file-download-btn>

        <iqser-circle-button
            (action)="downloadDossierAsCSV()"
            *ngIf="permissionsService.canDownloadCsvReport(dossier)"
            [disabled]="listingService.areSomeSelected$ | async"
+            [icon]="'iqser:csv'"
+            [iqserHelpMode]="'edit_dossier_in_dossier'"
+            [tooltipPosition]="'below'"
            [tooltip]="'dossier-overview.header-actions.download-csv' | translate"
-            icon="iqser:csv"
-            iqserHelpMode="edit_dossier_in_dossier"
-            tooltipPosition="below"
        ></iqser-circle-button>

        <iqser-circle-button
            (action)="reanalyseDossier()"
            *ngIf="permissionsService.displayReanalyseBtn(dossier)"
            [disabled]="listingService.areSomeSelected$ | async"
+            [icon]="'iqser:refresh'"
            [tooltipClass]="'small warn'"
+            [tooltipPosition]="'below'"
            [tooltip]="'dossier-overview.new-rule.toast.actions.reanalyse-all' | translate"
            [type]="circleButtonTypes.warn"
-            icon="iqser:refresh"
-            tooltipPosition="below"
        ></iqser-circle-button>

        <iqser-circle-button
            (action)="upload.emit()"
            *ngIf="permissionsService.canUploadFiles(dossier)"
+            [icon]="'iqser:upload'"
+            [id]="'upload-document-btn'"
+            [iqserHelpMode]="'edit_dossier_in_dossier'"
+            [tooltipPosition]="'below'"
            [tooltip]="'dossier-overview.header-actions.upload-document' | translate"
            [type]="circleButtonTypes.primary"
            class="ml-14"
-            icon="iqser:upload"
-            id="upload-document-btn"
-            iqserHelpMode="edit_dossier_in_dossier"
-            tooltipPosition="below"
        ></iqser-circle-button>
    </ng-container>
 </iqser-page-header>
--- a/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts
+++ b/apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts
@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { RouterModule, Routes } from '@angular/router';
 import { SharedModule } from '@shared/shared.module';
-import { IqserIconsModule } from '@iqser/common-ui';
+import { IqserHelpModeModule, IqserIconsModule } from '@iqser/common-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { DossierOverviewScreenComponent } from './screen/dossier-overview-screen.component';
 import { DossierOverviewBulkActionsComponent } from './components/bulk-actions/dossier-overview-bulk-actions.component';
@ -38,6 +38,14 @@ const routes: Routes = [
        DossierOverviewScreenHeaderComponent,
        ViewModeSelectionComponent,
    ],
-    imports: [RouterModule.forChild(routes), CommonModule, SharedModule, SharedDossiersModule, IqserIconsModule, TranslateModule],
+    imports: [
+        RouterModule.forChild(routes),
+        CommonModule,
+        SharedModule,
+        SharedDossiersModule,
+        IqserIconsModule,
+        TranslateModule,
+        IqserHelpModeModule,
+    ],
 })
 export class DossierOverviewModule {}
--- 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
@ -3,10 +3,10 @@
        (action)="openEditDossierDialog($event, dossier.id)"
        *ngIf="currentUser.isUser"
        [icon]="currentUser.isManager ? 'iqser:edit' : 'red:info'"
+        [iqserHelpMode]="'edit_dossier_dossier_info'"
        [scrollableParentView]="scrollableParentView"
        [tooltip]="(currentUser.isManager ? 'dossier-listing.edit.action' : 'dossier-listing.dossier-info.action') | translate"
        [type]="circleButtonTypes.dark"
-        iqserHelpMode="edit_dossier_dossier_info"
    ></iqser-circle-button>

    <iqser-circle-button
@ -20,8 +20,8 @@
    <redaction-file-download-btn
        [dossier]="dossier"
        [files]="files"
+        [iqserHelpMode]="'download_dossier'"
        [scrollableParentView]="scrollableParentView"
        [type]="circleButtonTypes.dark"
-        iqserHelpMode="download_dossier"
    ></redaction-file-download-btn>
 </div>
--- a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html
@ -16,16 +16,16 @@
            <div
                (click)="multiSelectService.activate()"
                *ngIf="(multiSelectService.enabled$ | async) && (multiSelectInactive$ | async)"
+                [iqserHelpMode]="'workload_in_editor'"
                class="all-caps-label primary pointer"
-                iqserHelpMode="workload_in_editor"
                translate="file-preview.tabs.annotations.select"
            ></div>

            <iqser-popup-filter
                [actionsTemplate]="annotationFilterActionTemplate"
+                [iqserHelpMode]="'workload_in_editor'"
                [primaryFiltersSlug]="'primaryFilters'"
                [secondaryFiltersSlug]="'secondaryFilters'"
-                iqserHelpMode="workload_in_editor"
            ></iqser-popup-filter>
        </div>
    </div>
--- a/apps/red-ui/src/app/modules/file-preview/components/highlights-separator/highlights-separator.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/components/highlights-separator/highlights-separator.component.html
@ -3,23 +3,23 @@
    <span [translateParams]="highlightGroup" [translate]="'highlights'" class="all-caps-label"></span>
 </div>

-<div *ngIf="(isWritable$ | async) && (multiSelectInactive$ | async)" iqserHelpMode="highlights">
+<div *ngIf="(isWritable$ | async) && (multiSelectInactive$ | async)" [iqserHelpMode]="'highlights'">
    <iqser-circle-button
        (action)="convertHighlights(highlightGroup)"
+        [icon]="'red:convert'"
        [size]="28"
+        [tooltipPosition]="'above'"
        [tooltip]="'file-preview.highlights.convert' | translate"
        [type]="circleButtonTypes.dark"
        class="mr-2"
-        icon="red:convert"
-        tooltipPosition="above"
    ></iqser-circle-button>

    <iqser-circle-button
        (action)="removeHighlights(highlightGroup)"
+        [icon]="'iqser:trash'"
        [size]="28"
+        [tooltipPosition]="'above'"
        [tooltip]="'file-preview.highlights.remove' | translate"
        [type]="circleButtonTypes.dark"
-        icon="iqser:trash"
-        tooltipPosition="above"
    ></iqser-circle-button>
 </div>
--- 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
@ -8,18 +8,18 @@

    <redaction-initials-avatar
        *ngIf="(editingReviewer$ | async) === false"
+        [id]="'assignee'"
+        [tooltipPosition]="'below'"
        [user]="file.assignee"
        [withName]="!!file.assignee"
-        id="assignee"
-        tooltipPosition="below"
    ></redaction-initials-avatar>

    <div
        (click)="editingReviewer$.next(true)"
        *ngIf="(editingReviewer$ | async) === false && (canAssignReviewer$ | async)"
+        [id]="'assign-reviewer'"
+        [translate]="'file-preview.assign-reviewer'"
        class="assign-reviewer pointer"
-        id="assign-reviewer"
-        translate="file-preview.assign-reviewer"
    ></div>

    <redaction-assign-user-dropdown
@ -34,19 +34,19 @@
        <iqser-circle-button
            (action)="editingReviewer$.next(true)"
            *ngIf="(canAssignOrUnassign$ | async) && !!file.assignee"
+            [icon]="'iqser:edit'"
+            [id]="'change-assignee'"
+            [iqserHelpMode]="'document_features_in_editor'"
+            [tooltipPosition]="'below'"
            [tooltip]="assignTooltip$ | async"
-            icon="iqser:edit"
-            id="change-assignee"
-            iqserHelpMode="document_features_in_editor"
-            tooltipPosition="below"
        ></iqser-circle-button>

        <iqser-circle-button
            (action)="fileAssignService.assignToMe([file])"
            *ngIf="canAssignToSelf$ | async"
+            [icon]="'red:assign-me'"
+            [tooltipPosition]="'below'"
            [tooltip]="'file-preview.assign-me' | translate"
-            icon="red:assign-me"
-            tooltipPosition="below"
        ></iqser-circle-button>
    </div>
 </ng-container>
--- a/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.html
@ -2,9 +2,9 @@
    <button
        (click)="switchView.emit('STANDARD')"
        [class.active]="viewModeService.isStandard"
+        [iqserHelpMode]="'views'"
        [matTooltip]="'file-preview.standard-tooltip' | translate"
        class="red-tab"
-        iqserHelpMode="views"
    >
        {{ 'file-preview.standard' | translate }}
    </button>
@ -13,9 +13,9 @@
        (click)="switchView.emit('DELTA')"
        [class.active]="viewModeService.isDelta"
        [disabled]="(canSwitchToDeltaView$ | async) === false"
+        [iqserHelpMode]="'views'"
        [matTooltip]="'file-preview.delta-tooltip' | translate"
        class="red-tab"
-        iqserHelpMode="views"
    >
        {{ 'file-preview.delta' | translate }}
    </button>
@ -24,9 +24,9 @@
        (click)="switchView.emit('REDACTED')"
        [class.active]="viewModeService.isRedacted"
        [disabled]="(canSwitchToRedactedView$ | async) === false"
+        [iqserHelpMode]="'views'"
        [matTooltip]="'file-preview.redacted-tooltip' | translate"
        class="red-tab"
-        iqserHelpMode="views"
    >
        {{ 'file-preview.redacted' | translate }}
    </button>
@ -35,9 +35,9 @@
        (click)="switchView.emit('TEXT_HIGHLIGHTS')"
        [class.active]="viewModeService.isTextHighlights"
        [disabled]="(canSwitchToHighlightsView$ | async) === false"
+        [iqserHelpMode]="'views'"
        [matTooltip]="'file-preview.text-highlights-tooltip' | translate"
        class="red-tab"
-        iqserHelpMode="views"
    >
        {{ 'file-preview.text-highlights' | translate }}
    </button>
--- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html
+++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.html
@ -80,21 +80,21 @@
            (action)="deleteDossier()"
            *ngIf="permissionsService.canSoftDeleteDossier(dossier)"
            [dialogElement]="true"
+            [icon]="'iqser:trash'"
+            [id]="'deleteDossier'"
+            [iqserHelpMode]="'edit_dossier_delete_dossier'"
            [label]="'dossier-listing.delete.action' | translate"
            [type]="iconButtonTypes.dark"
-            icon="iqser:trash"
-            id="deleteDossier"
-            iqserHelpMode="edit_dossier_delete_dossier"
        ></iqser-icon-button>

        <iqser-icon-button
            (action)="archiveDossier()"
            *ngIf="permissionsService.canArchiveDossier(dossier)"
            [dialogElement]="true"
+            [icon]="'red:archive'"
+            [iqserHelpMode]="'edit_dossier_archive_dossier'"
            [label]="'dossier-listing.archive.action' | translate"
            [type]="iconButtonTypes.dark"
-            icon="red:archive"
-            iqserHelpMode="edit_dossier_archive_dossier"
        ></iqser-icon-button>
    </div>
 </form>
--- 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 @@
-<button [class.overlay]="showDot" mat-button iqserHelpMode="open_usermenu">
+<button [class.overlay]="showDot" [iqserHelpMode]="'open_usermenu'" mat-button>
    <redaction-initials-avatar [user]="userService.currentUser$ | async" [withName]="true"></redaction-initials-avatar>
    <mat-icon svgIcon="iqser:arrow-down"></mat-icon>
 </button>
--- 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
@ -21,12 +21,12 @@
        (action)="openEditDossierDialog()"
        *ngIf="currentUser.isManager && canAdd"
        [class.large-spacing]="largeSpacing"
+        [icon]="'iqser:plus'"
+        [iqserHelpMode]="'add_dossier_members'"
        [size]="32"
        [tooltip]="'dossier-details.assign-members' | translate"
        [type]="circleButtonTypes.primary"
        class="member"
-        icon="iqser:plus"
-        iqserHelpMode="add_dossier_members"
    ></iqser-circle-button>
 </div>

--- a/libs/common-ui
+++ b/libs/common-ui
@ -1 +1 @@
-Subproject commit 0fe38910bef08aaaf7afc4b58b6a89b3e8af73ac
+Subproject commit 62654db49d0ca9416045cf096a869ef4cbfc8938