From e43c4f18caf70f33fa73fa9617f03ee8882979c2 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Wed, 27 Jul 2022 17:52:30 +0300 Subject: [PATCH] RED-4718: update common-ui & help mode binding --- .../base-screen/base-screen.component.html | 6 +++-- .../breadcrumbs/breadcrumbs.component.html | 2 +- .../table-item/table-item.component.html | 2 +- .../dossier-details-stats.component.html | 4 ++-- .../dossier-details.component.html | 18 +++++++++------ ...sier-overview-screen-header.component.html | 22 +++++++++---------- .../dossier-overview.module.ts | 12 ++++++++-- .../dossiers-listing-actions.component.html | 4 ++-- .../file-workload.component.html | 4 ++-- .../highlights-separator.component.html | 10 ++++----- .../user-management.component.html | 20 ++++++++--------- .../view-switch/view-switch.component.html | 8 +++---- .../edit-dossier-general-info.component.html | 10 ++++----- .../user-button/user-button.component.html | 2 +- .../team-members/team-members.component.html | 4 ++-- libs/common-ui | 2 +- 16 files changed, 72 insertions(+), 58 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 187f411d6..0acbea573 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 @@ -19,11 +19,13 @@ + - + + 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 f6f6417a7..4aac57f95 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 @@ - diff --git 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 index 5fa898534..3b4b80a5e 100644 --- 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 @@ {{ dossierTemplateName }} - @@ -39,12 +39,12 @@
@@ -56,7 +56,11 @@ > -
+
diff --git 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 index 0a6121cce..3aeac614a 100644 --- 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'" > diff --git 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 index 7454dd399..80ff560ea 100644 --- 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 {} 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 68a0473cf..8b8d80850 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 @@ -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" >
diff --git 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 index 013e33e8a..65e00eb9a 100644 --- 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 @@
diff --git 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 index 9e6b01ed2..bb3f17b9f 100644 --- 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 @@ -
+
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 2acb04c9c..11f62950e 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 @@ -8,18 +8,18 @@
diff --git 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 index d581379e8..3e92697a8 100644 --- 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 @@ @@ -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 }} @@ -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 }} @@ -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 }} diff --git 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 index f32417966..d5a8432e8 100644 --- 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" > 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 ef9b7a360..54858bced 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/team-members/team-members.component.html b/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html index 4dcd9d300..4db9aa123 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 @@ -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" > diff --git a/libs/common-ui b/libs/common-ui index 0fe38910b..62654db49 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 0fe38910bef08aaaf7afc4b58b6a89b3e8af73ac +Subproject commit 62654db49d0ca9416045cf096a869ef4cbfc8938