From 4f31a38578bf814e0463455ff5b82f9eaaceb0b4 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Thu, 6 Apr 2023 15:00:09 +0300 Subject: [PATCH 1/6] RED-6510 - WIP on "Lazy load help mode elements" --- apps/red-ui/src/app/app.module.ts | 4 +- .../base-screen/base-screen.component.html | 10 +- .../breadcrumbs/breadcrumbs.component.html | 2 +- .../account-side-nav.component.html | 2 +- .../default-colors-screen.component.html | 3 +- ...r-attributes-listing-screen.component.html | 5 +- ...ssier-states-listing-screen.component.html | 2 +- .../dossier-states-table-item.component.html | 2 +- .../table-item/table-item.component.html | 2 +- .../entities-listing-screen.component.html | 7 +- ...e-attributes-listing-screen.component.html | 10 +- .../general-config-form.component.html | 2 +- .../smtp-form/smtp-form.component.html | 2 +- .../system-preferences-form.component.html | 2 +- .../license-select.component.html | 2 +- .../permissions-screen.component.html | 3 +- .../reports-screen.component.html | 3 +- .../user-listing-screen.component.html | 4 +- .../watermarks-listing-screen.component.html | 7 +- .../admin-side-nav.component.html | 2 +- .../dossier-template-actions.component.html | 2 +- .../template-stats.component.html | 4 +- .../dossier-details-stats.component.html | 10 +- .../dossier-details.component.html | 11 +- ...sier-overview-screen-header.component.html | 9 +- .../view-mode-selection.component.html | 4 +- .../annotation-wrapper.component.html | 4 +- .../file-workload.component.html | 6 +- .../highlights-separator.component.html | 2 +- .../user-management.component.html | 3 +- .../view-switch/view-switch.component.html | 8 +- .../dossiers-listing-actions.component.html | 6 +- .../file-actions/file-actions.component.html | 7 +- .../edit-dossier-dialog.component.html | 3 +- .../edit-dossier-dialog.component.ts | 10 +- .../edit-dossier-general-info.component.html | 6 +- .../dictionary-manager.component.html | 2 +- .../donut-chart/donut-chart.component.html | 2 +- .../dossier-name-column.component.html | 12 +- .../dossiers-type-switch.component.html | 4 +- .../file-name-column.component.html | 3 +- .../team-members/team-members.component.html | 3 +- apps/red-ui/src/assets/help-mode/keys.json | 290 ++++++++++ apps/red-ui/src/assets/help-mode/links.json | 530 ------------------ libs/common-ui | 2 +- 45 files changed, 376 insertions(+), 643 deletions(-) create mode 100644 apps/red-ui/src/assets/help-mode/keys.json delete mode 100644 apps/red-ui/src/assets/help-mode/links.json diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index d296b2e47..917190308 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -54,7 +54,7 @@ import { configurationInitializer } from '@utils/configuration.initializer'; import { ConfigService } from '@services/config.service'; import { SpotlightSearchComponent } from '@components/spotlight-search/spotlight-search.component'; import { DatePipe } from '@shared/pipes/date.pipe'; -import * as links from '../assets/help-mode/links.json'; +import * as helpDocs from '../assets/help-mode/keys.json'; import { KeycloakService } from 'keycloak-angular'; import { GeneralSettingsService } from '@services/general-settings.service'; import { BreadcrumbsComponent } from '@components/breadcrumbs/breadcrumbs.component'; @@ -112,7 +112,7 @@ export const appModuleFactory = (config: AppConfig) => { existingRoleGuard: RedRoleGuard, }), CachingModule.forRoot(UI_CACHES), - IqserHelpModeModule.forRoot(links), + IqserHelpModeModule.forRoot(helpDocs as any), PdfViewerModule, ToastrModule.forRoot({ closeButton: true, 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 c88743c2d..da73bc2a6 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 @@ -10,7 +10,7 @@
{{ 'top-bar.navigation-items.back' | translate }} diff --git a/apps/red-ui/src/app/modules/account/account-side-nav/account-side-nav.component.html b/apps/red-ui/src/app/modules/account/account-side-nav/account-side-nav.component.html index b4ab4e40d..b72fd75dd 100644 --- a/apps/red-ui/src/app/modules/account/account-side-nav/account-side-nav.component.html +++ b/apps/red-ui/src/app/modules/account/account-side-nav/account-side-nav.component.html @@ -2,9 +2,9 @@
diff --git a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html index 533f1ec38..fd4b94174 100644 --- a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html @@ -40,8 +40,7 @@
@@ -67,7 +66,7 @@
-
+
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-table-item/dossier-states-table-item.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-table-item/dossier-states-table-item.component.html index 570097587..2db45f02b 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-table-item/dossier-states-table-item.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-table-item/dossier-states-table-item.component.html @@ -15,7 +15,7 @@
-
+
-
+
{{ dossierTemplate.name }}
diff --git a/apps/red-ui/src/app/modules/admin/screens/entities-listing/entities-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/entities-listing/entities-listing-screen.component.html index 1f613032f..15e5344ad 100644 --- a/apps/red-ui/src/app/modules/admin/screens/entities-listing/entities-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/entities-listing/entities-listing-screen.component.html @@ -57,10 +57,9 @@
@@ -71,7 +70,7 @@
-
+
@@ -99,7 +98,7 @@
-
+
@@ -53,10 +53,9 @@ @@ -64,9 +63,8 @@ @@ -111,7 +109,7 @@
-
+
diff --git a/apps/red-ui/src/app/modules/admin/screens/general-config/smtp-form/smtp-form.component.html b/apps/red-ui/src/app/modules/admin/screens/general-config/smtp-form/smtp-form.component.html index 229c32e5b..05510392a 100644 --- a/apps/red-ui/src/app/modules/admin/screens/general-config/smtp-form/smtp-form.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/general-config/smtp-form/smtp-form.component.html @@ -100,10 +100,10 @@
diff --git a/apps/red-ui/src/app/modules/admin/screens/license/license-select/license-select.component.html b/apps/red-ui/src/app/modules/admin/screens/license/license-select/license-select.component.html index 06bd9b457..27c4dc26a 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license/license-select/license-select.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/license/license-select/license-select.component.html @@ -1,6 +1,6 @@
- + diff --git a/apps/red-ui/src/app/modules/admin/screens/permissions/permissions-screen/permissions-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/permissions/permissions-screen/permissions-screen.component.html index 53a8ea3f6..f84bb0473 100644 --- a/apps/red-ui/src/app/modules/admin/screens/permissions/permissions-screen/permissions-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/permissions/permissions-screen/permissions-screen.component.html @@ -14,8 +14,7 @@ (toggleChange)="togglePermission(config.searchKey, permission)" [disabled]="config.isDisabled(permission)" [checked]="config.isChecked(permission)" - [iqserHelpMode]="'dossier_permissions'" - [overlappingElements]="['USER_MENU']" + [attr.help-mode-key]="'dossier_permissions'" color="primary" >
diff --git a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.html index 994ca955a..46cddeabe 100644 --- a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.html @@ -24,9 +24,8 @@
diff --git a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html index f6cd676c9..f49bdb00c 100644 --- a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html @@ -57,7 +57,7 @@ [checked]="user.active" [disabled]="!canDeactivate(user)" [id]="'toggle-active-' + user.id" - [iqserHelpMode]="'activate_deactivate_user'" + [attr.help-mode-key]="'activate_deactivate_user'" color="primary" >
@@ -69,7 +69,7 @@
-
+
@@ -34,7 +33,7 @@ (toggleChange)="toggleStatus(entity)" [checked]="entity.enabled" [disabled]="!currentUser.isAdmin || (permissionsService.has$(roles.watermarks.write) | async) === false" - [iqserHelpMode]="'enable_disable_watermark'" + [attr.help-mode-key]="'enable_disable_watermark'" color="primary" >
@@ -57,7 +56,7 @@
-
+
diff --git a/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.html b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.html index 4b8099c03..4dde7c2ff 100644 --- a/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.html +++ b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.html @@ -1,5 +1,5 @@
-
+
@@ -74,9 +74,9 @@ 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 bcd15950e..7b0ccd4ab 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,11 @@ {{ dossierTemplateName }}
-
+
{{ 'dossier-overview.dossier-details.dictionary' | translate }}
@@ -52,13 +56,13 @@
{{ 'dossier-overview.dossier-details.attributes.expand' | translate : { count: dossierAttributes.length } }}
-
+
{{ attr.label + ': -' }} diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.html index bf4d3b642..0d2a2d4f8 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.html +++ b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.html @@ -21,9 +21,8 @@ (action)="editingOwner = true" *allow="roles.dossiers.edit; if: currentUser.isManager" [icon]="'iqser:edit'" - [iqserHelpMode]="'dashboard_in_dossier'" - [overlappingElements]="['USER_MENU']" [tooltip]="'dossier-details.edit-owner' | translate" + [attr.help-mode-key]="'dashboard_in_dossier'" class="ml-14" > @@ -61,12 +60,16 @@
-
+
diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/view-mode-selection/view-mode-selection.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/view-mode-selection/view-mode-selection.component.html index 98e516f59..ac63dbe0a 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/view-mode-selection/view-mode-selection.component.html +++ b/apps/red-ui/src/app/modules/dossier-overview/components/view-mode-selection/view-mode-selection.component.html @@ -6,7 +6,7 @@ [attr.aria-expanded]="mode === listingModes.table" [tooltip]="'view-mode.list' | translate" [greySelected]="true" - [iqserHelpMode]="'document_features_in_dossier'" + [attr.help-mode-key]="'document_features_in_dossier'" icon="iqser:list" > @@ -15,7 +15,7 @@ [attr.aria-expanded]="mode === listingModes.workflow" [tooltip]="'view-mode.workflow' | translate" [greySelected]="true" - [iqserHelpMode]="'workflow_view'" + [attr.help-mode-key]="'workflow_view'" icon="iqser:lanes" >
diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.html b/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.html index 186a88e92..8a7f4a909 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.html @@ -24,9 +24,7 @@
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 eb3cbb197..14e19e98a 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,18 +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 6decfe8c6..e40f5d240 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,7 +3,7 @@
-
+
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 2ced8dc13..0236cd2fb 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,7 +2,7 @@
diff --git a/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.html b/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.html index a31bbe1b3..b413965aa 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.html +++ b/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.html @@ -11,12 +11,7 @@ -
+
{{ item.sideNavTitle || item.title | translate }} diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts index 5049f12e9..7074da45a 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts @@ -165,34 +165,34 @@ export class EditDossierDialogComponent extends BaseDialogComponent implements A title: _('edit-dossier-dialog.nav-items.general-info'), sideNavTitle: _('edit-dossier-dialog.nav-items.dossier-info'), readonly: !this._dossier.isActive || !this._permissionsService.canEditDossier(this._dossier), - helpModeKey: 'edit_dossier_dossier_info', + helpModeKey: 'edit_dossier_dossier_info_dialog', }, { key: 'downloadPackage', title: _('edit-dossier-dialog.nav-items.choose-download'), sideNavTitle: _('edit-dossier-dialog.nav-items.download-package'), readonly: !this._permissionsService.canEditDossier(this._dossier), - helpModeKey: 'edit_dossier_download_package', + helpModeKey: 'edit_dossier_download_package_dialog', }, { key: 'dossierDictionary', sideNavTitle: _('edit-dossier-dialog.nav-items.dictionary'), title: _('edit-dossier-dialog.nav-items.dossier-dictionary'), readonly: !this._permissionsService.canEditDossierDictionary(this._dossier), - helpModeKey: 'edit_dossier_dossier_dictionary', + helpModeKey: 'edit_dossier_dossier_dictionary_dialog', }, { key: 'members', title: _('edit-dossier-dialog.nav-items.team-members'), sideNavTitle: _('edit-dossier-dialog.nav-items.members'), readonly: !this._permissionsService.canEditTeamMembers(), - helpModeKey: 'edit_dossier_members', + helpModeKey: 'edit_dossier_members_dialog', }, { key: 'dossierAttributes', title: _('edit-dossier-dialog.nav-items.dossier-attributes'), readonly: !this._permissionsService.canEditDossierAttributes(this._dossier), - helpModeKey: 'edit_dossier_dossier_attributes', + helpModeKey: 'edit_dossier_dossier_attributes_dialog', }, ]; } 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 716387c8b..69a0eef3d 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 @@ -82,21 +82,19 @@ (action)="deleteDossier()" *ngIf="permissionsService.canDeleteDossier(dossier)" [buttonId]="'deleteDossier'" - [dialogElement]="true" [icon]="'iqser:trash'" - [iqserHelpMode]="'edit_dossier_delete_dossier'" [label]="'dossier-listing.delete.action' | translate" [type]="iconButtonTypes.dark" + [attr.help-mode-key]="'edit_dossier_delete_dossier'" >
diff --git a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html index 2d2e5c915..ed75d8633 100644 --- a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html +++ b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html @@ -27,8 +27,8 @@ diff --git a/apps/red-ui/src/app/modules/shared/components/donut-chart/donut-chart.component.html b/apps/red-ui/src/app/modules/shared/components/donut-chart/donut-chart.component.html index 0ae3e26ed..5d08fd33b 100644 --- a/apps/red-ui/src/app/modules/shared/components/donut-chart/donut-chart.component.html +++ b/apps/red-ui/src/app/modules/shared/components/donut-chart/donut-chart.component.html @@ -31,7 +31,7 @@
-
+
+
{{ dossier.dossierName }}
@@ -33,11 +27,11 @@
- {{ dossier.date | date: 'mediumDate' }} + {{ dossier.date | date : 'mediumDate' }}
- {{ dossier.dueDate | date: 'mediumDate' }} + {{ dossier.dueDate | date : 'mediumDate' }}
diff --git a/apps/red-ui/src/app/modules/shared/components/dossiers-type-switch/dossiers-type-switch.component.html b/apps/red-ui/src/app/modules/shared/components/dossiers-type-switch/dossiers-type-switch.component.html index 7726bd0f6..47b264762 100644 --- a/apps/red-ui/src/app/modules/shared/components/dossiers-type-switch/dossiers-type-switch.component.html +++ b/apps/red-ui/src/app/modules/shared/components/dossiers-type-switch/dossiers-type-switch.component.html @@ -2,7 +2,7 @@
diff --git a/apps/red-ui/src/assets/help-mode/keys.json b/apps/red-ui/src/assets/help-mode/keys.json new file mode 100644 index 000000000..fe574133e --- /dev/null +++ b/apps/red-ui/src/assets/help-mode/keys.json @@ -0,0 +1,290 @@ +[ + { + "key": "document_features_in_dossier", + "scrollableParentView": "VIRTUAL_SCROLL" + }, + { + "key": "download_dossier", + "scrollableParentView": "VIRTUAL_SCROLL" + }, + { + "key": "dashboard_in_dossier", + "overlappingElements": ["USER_MENU"] + }, + { + "key": "filter_document_list" + }, + { + "key": "filter_dossier_list" + }, + { + "key": "navigate_in_breadcrumbs" + }, + { + "key": "new_dossier_button", + "overlappingElements": ["USER_MENU"] + }, + { + "key": "open_notifications" + }, + { + "key": "open_usermenu" + }, + { + "key": "views" + }, + { + "key": "search_in_entire_application" + }, + { + "key": "edit_dossier_in_dossier", + "overlappingElements": ["USER_MENU"] + }, + { + "key": "document_features_in_editor", + "overlappingElements": ["USER_MENU"] + }, + { + "key": "edit_dossier_dossier_attributes", + "dialog": true + }, + { + "key": "document_list" + }, + { + "key": "edit_dossier_dossier_info", + "scrollableParentView": "VIRTUAL_SCROLL", + "dialog": true + }, + { + "key": "edit_dossier_delete_dossier", + "dialog": true + }, + { + "key": "edit_dossier_archive_dossier", + "dialog": true + }, + { + "key": "edit_dossier_download_package", + "dialog": true + }, + { + "key": "edit_dossier_members", + "overlappingElements": ["USER_MENU"], + "dialog": true + }, + { + "key": "highlights" + }, + { + "key": "redaction", + "scrollableParentView": "ANNOTATIONS_LIST", + "overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"] + }, + { + "key": "recommendation", + "scrollableParentView": "ANNOTATIONS_LIST", + "overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"] + }, + { + "key": "skipped", + "scrollableParentView": "ANNOTATIONS_LIST", + "overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"] + }, + { + "key": "hint_text", + "scrollableParentView": "ANNOTATIONS_LIST", + "overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"] + }, + { + "key": "hint_picture", + "scrollableParentView": "ANNOTATIONS_LIST", + "overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"] + }, + { + "key": "picture", + "scrollableParentView": "ANNOTATIONS_LIST", + "overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"] + }, + { + "key": "hint_images", + "scrollableParentView": "ANNOTATIONS_LIST", + "overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"] + }, + { + "key": "workload_in_editor", + "overlappingElements": ["USER_MENU", "DOCUMENT_INFO"] + }, + { + "key": "user_account" + }, + { + "key": "my_downloads" + }, + { + "key": "trash" + }, + { + "key": "dossier_overview" + }, + { + "key": "home" + }, + { + "key": "workflow_view" + }, + { + "key": "document_upload" + }, + { + "key": "edit_dossier_dossier_dictionary", + "dialog": true + }, + { + "key": "help_mode" + }, + { + "key": "dossier", + "scrollableParentView": "VIRTUAL_SCROLL" + }, + { + "key": "document_in_editor", + "scrollableParentView": "VIRTUAL_SCROLL" + }, + { + "key": "dossier_list" + }, + { + "key": "dossier_templates" + }, + { + "key": "edit_clone_delete_dossier_templates", + "overlappingElements": ["USER_MENU"] + }, + { + "key": "dossier_templates_info" + }, + { + "key": "entities" + }, + { + "key": "edit_delete_entities", + "overlappingElements": ["USER_MENU"] + }, + { + "key": "create_new_entity", + "overlappingElements": ["USER_MENU"] + }, + { + "key": "default_colors", + "overlappingElements": ["USER_MENU"] + }, + { + "key": "watermarks" + }, + { + "key": "create_new_watermark", + "overlappingElements": ["USER_MENU"] + }, + { + "key": "edit_delete_watermark", + "overlappingElements": ["USER_MENU"] + }, + { + "key": "file_attributes" + }, + { + "key": "create_new_file_attribute", + "overlappingElements": ["USER_MENU"] + }, + { + "key": "edit_delete_file_attribute", + "overlappingElements": ["USER_MENU"] + }, + { + "key": "upload_file_attribute", + "overlappingElements": ["USER_MENU"] + }, + { + "key": "dossier_attributes" + }, + { + "key": "create_new_dossier_attribute", + "overlappingElements": ["USER_MENU"] + }, + { + "key": "edit_delete_dossier_attributes", + "overlappingElements": ["USER_MENU"] + }, + { + "key": "dossier_states" + }, + { + "key": "create_new_dossier_state" + }, + { + "key": "edit_delete_dossier_state" + }, + { + "key": "reports", + "overlappingElements": ["USER_MENU"] + }, + { + "key": "justifications" + }, + { + "key": "digital_signature" + }, + { + "key": "license_information", + "overlappingElements": ["USER_MENU"] + }, + { + "key": "audit" + }, + { + "key": "user_management" + }, + { + "key": "create_user", + "overlappingElements": ["USER_MENU"] + }, + { + "key": "edit_delete_user" + }, + { + "key": "activate_deactivate_user" + }, + { + "key": "dossier_permissions", + "overlappingElements": ["USER_MENU"] + }, + { + "key": "configurations" + }, + { + "key": "general_configurations" + }, + { + "key": "system_configurations" + }, + { + "key": "smtp_configurations" + }, + { + "key": "dictionary_entity" + }, + { + "key": "false_recommendations_entity" + }, + { + "key": "enable_disable_watermark" + }, + { + "key": "editor_document_features", + "overlappingElements": ["USER_MENU"] + }, + { + "key": "pdf_features" + } +] diff --git a/apps/red-ui/src/assets/help-mode/links.json b/apps/red-ui/src/assets/help-mode/links.json deleted file mode 100644 index b093fc869..000000000 --- a/apps/red-ui/src/assets/help-mode/links.json +++ /dev/null @@ -1,530 +0,0 @@ -{ - "document_features_in_dossier": { - "en": "/en/index-en.html?contextId=document_features_in_dossier", - "de": "", - "it": "", - "fr": "" - }, - "download_dossier": { - "en": "/en/index-en.html?contextId=download_dossier", - "de": "", - "it": "", - "fr": "" - }, - "edit_dossier_member": { - "en": "/en/index-en.html?contextId=edit_dossier_member", - "de": "", - "it": "", - "fr": "" - }, - "dashboard_in_dossier": { - "en": "/en/index-en.html?contextId=dashboard_in_dossier", - "de": "", - "it": "", - "fr": "" - }, - "filter_document_list": { - "en": "/en/index-en.html?contextId=filter_document_list", - "de": "", - "it": "", - "fr": "" - }, - "filter_dossier_list": { - "en": "/en/index-en.html?contextId=filter_dossier_list", - "de": "", - "it": "", - "fr": "" - }, - "filter_for_status": { - "en": "/en/index-en.html?contextId=filter_for_status", - "de": "", - "it": "", - "fr": "" - }, - "navigate_in_breadcrumbs": { - "en": "/en/index-en.html?contextId=navigate_in_breadcrumbs", - "de": "", - "it": "", - "fr": "" - }, - "new_dossier_button": { - "en": "/en/index-en.html?contextId=new_dossier_button", - "de": "", - "it": "", - "fr": "" - }, - "open_notifications": { - "en": "/en/index-en.html?contextId=open_notifications", - "de": "", - "it": "", - "fr": "" - }, - "open_usermenu": { - "en": "/en/index-en.html?contextId=open_usermenu", - "de": "", - "it": "", - "fr": "" - }, - "views": { - "en": "/en/index-en.html?contextId=views", - "de": "", - "it": "", - "fr": "" - }, - "reset_filters": { - "en": "/en/index-en.html?contextId=reset_filters", - "de": "", - "it": "", - "fr": "" - }, - "search_in_entire_application": { - "en": "/en/index-en.html?contextId=search_in_entire_application", - "de": "", - "it": "", - "fr": "" - }, - "edit_dossier_in_dossier": { - "en": "/en/index-en.html?contextId=edit_dossier_in_dossier", - "de": "", - "it": "", - "fr": "" - }, - "redaction_resize": { - "en": "/en/index-en.html?contextId=redaction_resize", - "de": "", - "it": "", - "fr": "" - }, - "document_features_in_editor": { - "en": "/en/index-en.html?contextId=document_features_in_editor", - "de": "", - "it": "", - "fr": "" - }, - "edit_dossier_dossier_attributes": { - "en": "/en/index-en.html?contextId=edit_dossier_dossier_attributes", - "de": "", - "it": "", - "fr": "" - }, - "document_list": { - "en": "/en/index-en.html?contextId=document_list", - "de": "", - "it": "", - "fr": "" - }, - "edit_dossier_dossier_info": { - "en": "/en/index-en.html?contextId=edit_dossier_dossier_info", - "de": "", - "it": "", - "fr": "" - }, - "edit_dossier_delete_dossier": { - "en": "/en/index-en.html?contextId=edit_dossier_delete_dossier", - "de": "", - "it": "", - "fr": "" - }, - "edit_dossier_archive_dossier": { - "en": "/en/index-en.html?contextId=edit_dossier_archive_dossier", - "de": "", - "it": "", - "fr": "" - }, - "edit_dossier_download_package": { - "en": "/en/index-en.html?contextId=edit_dossier_download_package", - "de": "", - "it": "", - "fr": "" - }, - "edit_dossier_members": { - "en": "/en/index-en.html?contextId=edit_dossier_members", - "de": "", - "it": "", - "fr": "" - }, - "highlights": { - "en": "/en/index-en.html?contextId=highlights", - "de": "", - "it": "", - "fr": "" - }, - "image_resize": { - "en": "/en/index-en.html?contextId=image_resize", - "de": "", - "it": "", - "fr": "" - }, - "image_recategorize": { - "en": "/en/index-en.html?contextId=image_recategorize", - "de": "", - "it": "", - "fr": "" - }, - "image_hide": { - "en": "/en/index-en.html?contextId=image_hide", - "de": "", - "it": "", - "fr": "" - }, - "image_remove_only_here": { - "en": "/en/index-en.html?contextId=image_remove_only_here", - "de": "", - "it": "", - "fr": "" - }, - "redaction": { - "en": "/en/index-en.html?contextId=redaction", - "de": "", - "it": "", - "fr": "" - }, - "recommendation": { - "en": "/en/index-en.html?contextId=recommendation", - "de": "", - "it": "", - "fr": "" - }, - "skipped": { - "en": "/en/index-en.html?contextId=skipped", - "de": "", - "it": "", - "fr": "" - }, - "hint_text": { - "en": "/en/index-en.html?contextId=hint_text", - "de": "", - "it": "", - "fr": "" - }, - "hint_picture": { - "en": "/en/index-en.html?contextId=hint_picture", - "de": "", - "it": "", - "fr": "" - }, - "picture": { - "en": "/en/index-en.html?contextId=picture", - "de": "", - "it": "", - "fr": "" - }, - "hint_images": { - "en": "/en/index-en.html?contextId=hint_images", - "de": "", - "it": "", - "fr": "" - }, - "workload_in_editor": { - "en": "/en/index-en.html?contextId=workload_in_editor", - "de": "", - "it": "", - "fr": "" - }, - "user_account": { - "en": "/en/index-en.html?contextId=user_account", - "de": "", - "it": "", - "fr": "" - }, - "my_downloads": { - "en": "/en/index-en.html?contextId=my_downloads", - "de": "", - "it": "", - "fr": "" - }, - "trash": { - "en": "/en/index-en.html?contextId=trash", - "de": "", - "it": "", - "fr": "" - }, - "dossier_overview": { - "en": "/en/index-en.html?contextId=dossier_overview", - "de": "", - "it": "", - "fr": "" - }, - "home": { - "en": "/en/index-en.html?contextId=home", - "de": "", - "it": "", - "fr": "" - }, - "workflow_view": { - "en": "/en/index-en.html?contextId=workflow_view", - "de": "", - "it": "", - "fr": "" - }, - "document_upload": { - "en": "/en/index-en.html?contextId=document_upload", - "de": "", - "it": "", - "fr": "" - }, - "edit_dossier_dossier_dictionary": { - "en": "/en/index-en.html?contextId=edit_dossier_dossier_dictionary", - "de": "", - "it": "", - "fr": "" - }, - "help_mode": { - "en": "/en/index-en.html?contextId=help_mode", - "de": "", - "it": "", - "fr": "" - }, - "dossier": { - "en": "/en/index-en.html?contextId=dossier", - "de": "", - "it": "", - "fr": "" - }, - "document_in_editor": { - "en": "/en/index-en.html?contextId=document_in_editor", - "de": "", - "it": "", - "fr": "" - }, - "dossier_list": { - "en": "/en/index-en.html?contextId=dossier_list", - "de": "", - "it": "", - "fr": "" - }, - "dossier_templates": { - "en": "/en/index-en.html?contextId=dossier_templates", - "de": "", - "it": "", - "fr": "" - }, - "edit_clone_delete_dossier_templates": { - "en": "/en/index-en.html?contextId=edit_clone_delete_dossier_templates", - "de": "", - "it": "", - "fr": "" - }, - "dossier_templates_info": { - "en": "/en/index-en.html?contextId=dossier_templates_info", - "de": "", - "it": "", - "fr": "" - }, - "entities": { - "en": "/en/index-en.html?contextId=entities", - "de": "", - "it": "", - "fr": "" - }, - "edit_delete_entities": { - "en": "/en/index-en.html?contextId=edit_delete_entities", - "de": "", - "it": "", - "fr": "" - }, - "create_new_entity": { - "en": "/en/index-en.html?contextId=create_new_entity", - "de": "", - "it": "", - "fr": "" - }, - "default_colors": { - "en": "/en/index-en.html?contextId=default_colors", - "de": "", - "it": "", - "fr": "" - }, - "watermarks": { - "en": "/en/index-en.html?contextId=watermarks", - "de": "", - "it": "", - "fr": "" - }, - "create_new_watermark": { - "en": "/en/index-en.html?contextId=create_new_watermark", - "de": "", - "it": "", - "fr": "" - }, - "edit_delete_watermark": { - "en": "/en/index-en.html?contextId=edit_delete_watermark", - "de": "", - "it": "", - "fr": "" - }, - "file_attributes": { - "en": "/en/index-en.html?contextId=file_attributes", - "de": "", - "it": "", - "fr": "" - }, - "create_new_file_attribute": { - "en": "/en/index-en.html?contextId=create_new_file_attribute", - "de": "", - "it": "", - "fr": "" - }, - "edit_delete_file_attribute": { - "en": "/en/index-en.html?contextId=edit_delete_file_attribute", - "de": "", - "it": "", - "fr": "" - }, - "upload_file_attribute": { - "en": "/en/index-en.html?contextId=upload_file_attribute", - "de": "", - "it": "", - "fr": "" - }, - "dossier_attributes": { - "en": "/en/index-en.html?contextId=dossier_attributes", - "de": "", - "it": "", - "fr": "" - }, - "create_new_dossier_attribute": { - "en": "/en/index-en.html?contextId=create_new_dossier_attribute", - "de": "", - "it": "", - "fr": "" - }, - "edit_delete_dossier_attributes": { - "en": "/en/index-en.html?contextId=edit_delete_dossier_attributes", - "de": "", - "it": "", - "fr": "" - }, - "dossier_states": { - "en": "/en/index-en.html?contextId=dossier_states", - "de": "", - "it": "", - "fr": "" - }, - "create_new_dossier_state": { - "en": "/en/index-en.html?contextId=create_new_dossier_state", - "de": "", - "it": "", - "fr": "" - }, - "edit_delete_dossier_state": { - "en": "/en/index-en.html?contextId=edit_delete_dossier_state", - "de": "", - "it": "", - "fr": "" - }, - "reports": { - "en": "/en/index-en.html?contextId=reports", - "de": "", - "it": "", - "fr": "" - }, - "justifications": { - "en": "/en/index-en.html?contextId=justifications", - "de": "", - "it": "", - "fr": "" - }, - "digital_signature": { - "en": "/en/index-en.html?contextId=digital_signature", - "de": "", - "it": "", - "fr": "" - }, - "license_information": { - "en": "/en/index-en.html?contextId=license_information", - "de": "", - "it": "", - "fr": "" - }, - "audit": { - "en": "/en/index-en.html?contextId=audit", - "de": "", - "it": "", - "fr": "" - }, - "user_management": { - "en": "/en/index-en.html?contextId=user_management", - "de": "", - "it": "", - "fr": "" - }, - "create_user": { - "en": "/en/index-en.html?contextId=create_user", - "de": "", - "it": "", - "fr": "" - }, - "edit_delete_user": { - "en": "/en/index-en.html?contextId=edit_delete_user", - "de": "", - "it": "", - "fr": "" - }, - "activate_deactivate_user": { - "en": "/en/index-en.html?contextId=activate_deactivate_user", - "de": "", - "it": "", - "fr": "" - }, - "dossier_permissions": { - "en": "/en/index-en.html?contextId=dossier_permissions", - "de": "", - "it": "", - "fr": "" - }, - "configurations": { - "en": "/en/index-en.html?contextId=configurations", - "de": "", - "it": "", - "fr": "" - }, - "general_configurations": { - "en": "/en/index-en.html?contextId=general_configurations", - "de": "", - "it": "", - "fr": "" - }, - "system_configurations": { - "en": "/en/index-en.html?contextId=system_configurations", - "de": "", - "it": "", - "fr": "" - }, - "smtp_configurations": { - "en": "/en/index-en.html?contextId=smtp_configurations", - "de": "", - "it": "", - "fr": "" - }, - "dictionary_entity": { - "en": "/en/index-en.html?contextId=dictionary_entity", - "de": "", - "it": "", - "fr": "" - }, - "false_recommendations_entity": { - "en": "/en/index-en.html?contextId=false_recommendations_entity", - "de": "", - "it": "", - "fr": "" - }, - "enable_disable_watermark": { - "en": "/en/index-en.html?contextId=enable_disable_watermark", - "de": "", - "it": "", - "fr": "" - }, - "editor_document_features": { - "en": "/en/index-en.html?contextId=editor_document_features", - "de": "", - "it": "", - "fr": "" - }, - "pdf_features": { - "en": "/en/index-en.html?contextId=pdf_features", - "de": "", - "it": "", - "fr": "" - } -} diff --git a/libs/common-ui b/libs/common-ui index 6c63f851c..8a61630a3 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 6c63f851cf09496d425e9af75f18902557021c8e +Subproject commit 8a61630a37f83c68474922bd049037e0010f13e7 From 85394e190271fcf7f1ed30bbeaf1412e73bb9b96 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Sat, 8 Apr 2023 22:49:11 +0300 Subject: [PATCH 2/6] RED-6510 - WIP on "Lazy load help mode elements" --- .../view-mode-selection.component.html | 2 +- .../edit-dossier-dialog.component.ts | 10 +- .../edit-dossier-general-info.component.html | 4 +- apps/red-ui/src/assets/help-mode/keys.json | 267 ++++++++++++------ libs/common-ui | 2 +- 5 files changed, 183 insertions(+), 102 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/view-mode-selection/view-mode-selection.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/view-mode-selection/view-mode-selection.component.html index ac63dbe0a..7088f86b9 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/view-mode-selection/view-mode-selection.component.html +++ b/apps/red-ui/src/app/modules/dossier-overview/components/view-mode-selection/view-mode-selection.component.html @@ -6,7 +6,7 @@ [attr.aria-expanded]="mode === listingModes.table" [tooltip]="'view-mode.list' | translate" [greySelected]="true" - [attr.help-mode-key]="'document_features_in_dossier'" + [attr.help-mode-key]="'document_features_in_dossier_view'" icon="iqser:list" > diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts index 7074da45a..cfdb4a1ac 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts @@ -165,34 +165,34 @@ export class EditDossierDialogComponent extends BaseDialogComponent implements A title: _('edit-dossier-dialog.nav-items.general-info'), sideNavTitle: _('edit-dossier-dialog.nav-items.dossier-info'), readonly: !this._dossier.isActive || !this._permissionsService.canEditDossier(this._dossier), - helpModeKey: 'edit_dossier_dossier_info_dialog', + helpModeKey: 'edit_dossier_dossier_info_DIALOG', }, { key: 'downloadPackage', title: _('edit-dossier-dialog.nav-items.choose-download'), sideNavTitle: _('edit-dossier-dialog.nav-items.download-package'), readonly: !this._permissionsService.canEditDossier(this._dossier), - helpModeKey: 'edit_dossier_download_package_dialog', + helpModeKey: 'edit_dossier_download_package_DIALOG', }, { key: 'dossierDictionary', sideNavTitle: _('edit-dossier-dialog.nav-items.dictionary'), title: _('edit-dossier-dialog.nav-items.dossier-dictionary'), readonly: !this._permissionsService.canEditDossierDictionary(this._dossier), - helpModeKey: 'edit_dossier_dossier_dictionary_dialog', + helpModeKey: 'edit_dossier_dossier_dictionary_DIALOG', }, { key: 'members', title: _('edit-dossier-dialog.nav-items.team-members'), sideNavTitle: _('edit-dossier-dialog.nav-items.members'), readonly: !this._permissionsService.canEditTeamMembers(), - helpModeKey: 'edit_dossier_members_dialog', + helpModeKey: 'edit_dossier_members_DIALOG', }, { key: 'dossierAttributes', title: _('edit-dossier-dialog.nav-items.dossier-attributes'), readonly: !this._permissionsService.canEditDossierAttributes(this._dossier), - helpModeKey: 'edit_dossier_dossier_attributes_dialog', + helpModeKey: 'edit_dossier_dossier_attributes_DIALOG', }, ]; } 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 69a0eef3d..bda829798 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 @@ -85,7 +85,7 @@ [icon]="'iqser:trash'" [label]="'dossier-listing.delete.action' | translate" [type]="iconButtonTypes.dark" - [attr.help-mode-key]="'edit_dossier_delete_dossier'" + [attr.help-mode-key]="'edit_dossier_delete_dossier_DIALOG'" >
diff --git a/apps/red-ui/src/assets/help-mode/keys.json b/apps/red-ui/src/assets/help-mode/keys.json index fe574133e..4890d4925 100644 --- a/apps/red-ui/src/assets/help-mode/keys.json +++ b/apps/red-ui/src/assets/help-mode/keys.json @@ -1,290 +1,371 @@ [ { - "key": "document_features_in_dossier", + "elementKey": "document_features_in_dossier_view", + "documentKey": "document_features_in_dossier" + }, + { + "elementKey": "document_features_in_dossier", + "documentKey": "document_features_in_dossier", "scrollableParentView": "VIRTUAL_SCROLL" }, { - "key": "download_dossier", + "elementKey": "download_dossier", + "documentKey": "download_dossier", "scrollableParentView": "VIRTUAL_SCROLL" }, { - "key": "dashboard_in_dossier", + "elementKey": "dashboard_in_dossier", + "documentKey": "dashboard_in_dossier", "overlappingElements": ["USER_MENU"] }, { - "key": "filter_document_list" + "elementKey": "filter_document_list", + "documentKey": "filter_document_list" }, { - "key": "filter_dossier_list" + "elementKey": "filter_dossier_list", + "documentKey": "filter_dossier_list" }, { - "key": "navigate_in_breadcrumbs" + "elementKey": "navigate_in_breadcrumbs", + "documentKey": "navigate_in_breadcrumbs" }, { - "key": "new_dossier_button", + "elementKey": "new_dossier_button", + "documentKey": "new_dossier_button", "overlappingElements": ["USER_MENU"] }, { - "key": "open_notifications" + "elementKey": "open_notifications", + "documentKey": "open_notifications" }, { - "key": "open_usermenu" + "elementKey": "open_usermenu", + "documentKey": "open_usermenu" }, { - "key": "views" + "elementKey": "views", + "documentKey": "views" }, { - "key": "search_in_entire_application" + "elementKey": "search_in_entire_application", + "documentKey": "search_in_entire_application" }, { - "key": "edit_dossier_in_dossier", + "elementKey": "edit_dossier_in_dossier", + "documentKey": "edit_dossier_in_dossier", "overlappingElements": ["USER_MENU"] }, { - "key": "document_features_in_editor", + "elementKey": "document_features_in_editor", + "documentKey": "document_features_in_editor", "overlappingElements": ["USER_MENU"] }, { - "key": "edit_dossier_dossier_attributes", - "dialog": true + "elementKey": "document_list", + "documentKey": "document_list" }, { - "key": "document_list" + "elementKey": "edit_dossier_dossier_info", + "documentKey": "edit_dossier_dossier_info", + "scrollableParentView": "VIRTUAL_SCROLL" }, { - "key": "edit_dossier_dossier_info", - "scrollableParentView": "VIRTUAL_SCROLL", - "dialog": true + "elementKey": "edit_dossier_dossier_info_DIALOG", + "documentKey": "edit_dossier_dossier_info" }, { - "key": "edit_dossier_delete_dossier", - "dialog": true + "elementKey": "edit_dossier_download_package_DIALOG", + "documentKey": "edit_dossier_download_package" }, { - "key": "edit_dossier_archive_dossier", - "dialog": true + "elementKey": "edit_dossier_dossier_dictionary_DIALOG", + "documentKey": "edit_dossier_dossier_dictionary" }, { - "key": "edit_dossier_download_package", - "dialog": true + "elementKey": "edit_dossier_members", + "documentKey": "edit_dossier_members", + "overlappingElements": ["USER_MENU"] }, { - "key": "edit_dossier_members", - "overlappingElements": ["USER_MENU"], - "dialog": true + "elementKey": "edit_dossier_members_DIALOG", + "documentKey": "edit_dossier_members" }, { - "key": "highlights" + "elementKey": "edit_dossier_dossier_attributes_DIALOG", + "documentKey": "edit_dossier_dossier_attributes" }, { - "key": "redaction", + "elementKey": "edit_dossier_delete_dossier_DIALOG", + "documentKey": "edit_dossier_delete_dossier" + }, + { + "elementKey": "edit_dossier_archive_dossier_DIALOG", + "documentKey": "edit_dossier_archive_dossier" + }, + { + "elementKey": "highlights", + "documentKey": "highlights" + }, + { + "elementKey": "redaction", + "documentKey": "redaction", "scrollableParentView": "ANNOTATIONS_LIST", "overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"] }, { - "key": "recommendation", + "elementKey": "recommendation", + "documentKey": "recommendation", "scrollableParentView": "ANNOTATIONS_LIST", "overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"] }, { - "key": "skipped", + "elementKey": "skipped", + "documentKey": "skipped", "scrollableParentView": "ANNOTATIONS_LIST", "overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"] }, { - "key": "hint_text", + "elementKey": "hint_text", + "documentKey": "hint_text", "scrollableParentView": "ANNOTATIONS_LIST", "overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"] }, { - "key": "hint_picture", + "elementKey": "hint_picture", + "documentKey": "hint_picture", "scrollableParentView": "ANNOTATIONS_LIST", "overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"] }, { - "key": "picture", + "elementKey": "picture", + "documentKey": "picture", "scrollableParentView": "ANNOTATIONS_LIST", "overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"] }, { - "key": "hint_images", + "elementKey": "hint_images", + "documentKey": "hint_images", "scrollableParentView": "ANNOTATIONS_LIST", "overlappingElements": ["USER_MENU", "WORKLOAD_FILTER", "DOCUMENT_INFO"] }, { - "key": "workload_in_editor", + "elementKey": "workload_in_editor", + "documentKey": "workload_in_editor", "overlappingElements": ["USER_MENU", "DOCUMENT_INFO"] }, { - "key": "user_account" + "elementKey": "user_account", + "documentKey": "user_account" }, { - "key": "my_downloads" + "elementKey": "my_downloads", + "documentKey": "my_downloads" }, { - "key": "trash" + "elementKey": "trash", + "documentKey": "trash" }, { - "key": "dossier_overview" + "elementKey": "dossier_overview", + "documentKey": "dossier_overview" }, { - "key": "home" + "elementKey": "home", + "documentKey": "home" }, { - "key": "workflow_view" + "elementKey": "workflow_view", + "documentKey": "workflow_view" }, { - "key": "document_upload" + "elementKey": "document_upload", + "documentKey": "document_upload" }, { - "key": "edit_dossier_dossier_dictionary", - "dialog": true + "elementKey": "help_mode", + "documentKey": "help_mode" }, { - "key": "help_mode" - }, - { - "key": "dossier", + "elementKey": "dossier", + "documentKey": "dossier", "scrollableParentView": "VIRTUAL_SCROLL" }, { - "key": "document_in_editor", + "elementKey": "document_in_editor", + "documentKey": "document_in_editor", "scrollableParentView": "VIRTUAL_SCROLL" }, { - "key": "dossier_list" + "elementKey": "dossier_list", + "documentKey": "dossier_list" }, { - "key": "dossier_templates" + "elementKey": "dossier_templates", + "documentKey": "dossier_templates" }, { - "key": "edit_clone_delete_dossier_templates", + "elementKey": "edit_clone_delete_dossier_templates", + "documentKey": "edit_clone_delete_dossier_templates", "overlappingElements": ["USER_MENU"] }, { - "key": "dossier_templates_info" + "elementKey": "dossier_templates_info", + "documentKey": "dossier_templates_info" }, { - "key": "entities" + "elementKey": "entities", + "documentKey": "entities" }, { - "key": "edit_delete_entities", + "elementKey": "edit_delete_entities", + "documentKey": "edit_delete_entities", "overlappingElements": ["USER_MENU"] }, { - "key": "create_new_entity", + "elementKey": "create_new_entity", + "documentKey": "create_new_entity", "overlappingElements": ["USER_MENU"] }, { - "key": "default_colors", + "elementKey": "default_colors", + "documentKey": "default_colors", "overlappingElements": ["USER_MENU"] }, { - "key": "watermarks" + "elementKey": "watermarks", + "documentKey": "watermarks" }, { - "key": "create_new_watermark", + "elementKey": "create_new_watermark", + "documentKey": "create_new_watermark", "overlappingElements": ["USER_MENU"] }, { - "key": "edit_delete_watermark", + "elementKey": "edit_delete_watermark", + "documentKey": "edit_delete_watermark", "overlappingElements": ["USER_MENU"] }, { - "key": "file_attributes" + "elementKey": "file_attributes", + "documentKey": "file_attributes" }, { - "key": "create_new_file_attribute", + "elementKey": "create_new_file_attribute", + "documentKey": "create_new_file_attribute", "overlappingElements": ["USER_MENU"] }, { - "key": "edit_delete_file_attribute", + "elementKey": "edit_delete_file_attribute", + "documentKey": "edit_delete_file_attribute", "overlappingElements": ["USER_MENU"] }, { - "key": "upload_file_attribute", + "elementKey": "upload_file_attribute", + "documentKey": "upload_file_attribute", "overlappingElements": ["USER_MENU"] }, { - "key": "dossier_attributes" + "elementKey": "dossier_attributes", + "documentKey": "dossier_attributes" }, { - "key": "create_new_dossier_attribute", + "elementKey": "create_new_dossier_attribute", + "documentKey": "create_new_dossier_attribute", "overlappingElements": ["USER_MENU"] }, { - "key": "edit_delete_dossier_attributes", + "elementKey": "edit_delete_dossier_attributes", + "documentKey": "edit_delete_dossier_attributes", "overlappingElements": ["USER_MENU"] }, { - "key": "dossier_states" + "elementKey": "dossier_states", + "documentKey": "dossier_states" }, { - "key": "create_new_dossier_state" + "elementKey": "create_new_dossier_state", + "documentKey": "create_new_dossier_state" }, { - "key": "edit_delete_dossier_state" + "elementKey": "edit_delete_dossier_state", + "documentKey": "edit_delete_dossier_state" }, { - "key": "reports", + "elementKey": "reports", + "documentKey": "reports", "overlappingElements": ["USER_MENU"] }, { - "key": "justifications" + "elementKey": "justifications", + "documentKey": "justifications" }, { - "key": "digital_signature" + "elementKey": "digital_signature", + "documentKey": "digital_signature" }, { - "key": "license_information", + "elementKey": "license_information", + "documentKey": "license_information", "overlappingElements": ["USER_MENU"] }, { - "key": "audit" + "elementKey": "audit", + "documentKey": "audit" }, { - "key": "user_management" + "elementKey": "user_management", + "documentKey": "user_management" }, { - "key": "create_user", + "elementKey": "create_user", + "documentKey": "create_user", "overlappingElements": ["USER_MENU"] }, { - "key": "edit_delete_user" + "elementKey": "edit_delete_user", + "documentKey": "edit_delete_user" }, { - "key": "activate_deactivate_user" + "elementKey": "activate_deactivate_user", + "documentKey": "activate_deactivate_user" }, { - "key": "dossier_permissions", + "elementKey": "dossier_permissions", + "documentKey": "dossier_permissions", "overlappingElements": ["USER_MENU"] }, { - "key": "configurations" + "elementKey": "configurations", + "documentKey": "configurations" }, { - "key": "general_configurations" + "elementKey": "general_configurations", + "documentKey": "general_configurations" }, { - "key": "system_configurations" + "elementKey": "system_configurations", + "documentKey": "system_configurations" }, { - "key": "smtp_configurations" + "elementKey": "smtp_configurations", + "documentKey": "smtp_configurations" }, { - "key": "dictionary_entity" + "elementKey": "dictionary_entity", + "documentKey": "dictionary_entity" }, { - "key": "false_recommendations_entity" + "elementKey": "false_recommendations_entity", + "documentKey": "false_recommendations_entity" }, { - "key": "enable_disable_watermark" + "elementKey": "enable_disable_watermark", + "documentKey": "enable_disable_watermark" }, { - "key": "editor_document_features", + "elementKey": "editor_document_features", + "documentKey": "editor_document_features", "overlappingElements": ["USER_MENU"] - }, - { - "key": "pdf_features" } ] diff --git a/libs/common-ui b/libs/common-ui index 8a61630a3..6deb24dc4 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 8a61630a37f83c68474922bd049037e0010f13e7 +Subproject commit 6deb24dc4171290b9145eb266abe127449fb9a48 From ba5a11c22614e014ad6d36594e58b61cb04cb5d9 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Sat, 8 Apr 2023 22:50:13 +0300 Subject: [PATCH 3/6] RED-6510 - update common ui --- libs/common-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/common-ui b/libs/common-ui index 6deb24dc4..4aef8c608 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 6deb24dc4171290b9145eb266abe127449fb9a48 +Subproject commit 4aef8c608d1566adf63255e21e706a86802b30c8 From 8810f62eba88b7615a8445c805797eaaca029733 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Mon, 10 Apr 2023 18:01:37 +0300 Subject: [PATCH 4/6] RED-6510 - WIP on "Lazy load help mode elements" --- apps/red-ui/src/app/app.module.ts | 5 +++-- ...edit-clone-dossier-template-dialog.component.html | 2 +- .../add-entity-dialog.component.html | 2 +- .../screens/entity-info/entity-info.component.html | 2 +- .../license-screen/license-screen.component.ts | 1 - .../user-listing/user-listing-screen.component.ts | 1 - .../app/modules/dossier-overview/config.service.ts | 1 - .../app/modules/dossiers-listing/config.service.ts | 1 - .../annotation-wrapper.component.ts | 2 -- .../file-actions/file-actions.component.ts | 12 +----------- .../dossier-name-column.component.ts | 4 ---- .../file-name-column/file-name-column.component.ts | 4 ---- apps/red-ui/src/assets/config/config.json | 4 ++-- .../help-mode/{keys.json => help-mode-keys.json} | 0 libs/common-ui | 2 +- 15 files changed, 10 insertions(+), 33 deletions(-) rename apps/red-ui/src/assets/help-mode/{keys.json => help-mode-keys.json} (100%) diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index 7f89bf514..6be71a305 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -10,6 +10,7 @@ import { CircleButtonComponent, CommonUiModule, EmptyStateComponent, + HelpModeKey, HiddenActionDirective, IconButtonComponent, InputWithActionComponent, @@ -50,7 +51,7 @@ import { REDMissingTranslationHandler } from '@utils/missing-translations-handle import { ConfigService } from '@services/config.service'; import { SpotlightSearchComponent } from '@components/spotlight-search/spotlight-search.component'; import { DatePipe } from '@shared/pipes/date.pipe'; -import * as helpDocs from '../assets/help-mode/keys.json'; +import * as helpModeKeys from '../assets/help-mode/help-mode-keys.json'; import { BreadcrumbsComponent } from '@components/breadcrumbs/breadcrumbs.component'; import { UserPreferenceService } from '@users/user-preference.service'; import { UserService } from '@users/user.service'; @@ -99,7 +100,7 @@ export const appModuleFactory = (config: AppConfig) => { existingRoleGuard: RedRoleGuard, }), CachingModule.forRoot(UI_CACHES), - IqserHelpModeModule.forRoot(helpDocs as any), + IqserHelpModeModule.forRoot(helpModeKeys as HelpModeKey[]), PdfViewerModule, ToastrModule.forRoot({ closeButton: true, diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.html index 701c80841..19512f435 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.html @@ -93,7 +93,7 @@ >
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.html index 873e1b90d..4e720c2a1 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.html @@ -20,7 +20,7 @@ [submit]="true" [type]="iconButtonTypes.primary" > - +
diff --git a/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.html b/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.html index 6e4bd9417..d7830e0dd 100644 --- a/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.html @@ -27,7 +27,7 @@
- +
diff --git a/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.ts index b38bf630e..8cac134c2 100644 --- a/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.ts @@ -31,7 +31,6 @@ export class LicenseScreenComponent { type: IconButtonTypes.primary, helpModeKey: 'license_information', hide: !this.permissionsService.has(ROLES.license.readReport), - overlappingElements: [OverlappingElements.USER_MENU], }, ]; diff --git a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts index 802670144..f44870d34 100644 --- a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts @@ -63,7 +63,6 @@ export class UserListingScreenComponent extends ListingComponent implement icon: 'iqser:plus', disabled$: this._userService.currentUser$.pipe(map(user => !user.isAdmin)), helpModeKey: 'create_user', - overlappingElements: [OverlappingElements.USER_MENU], }, ]; collapsedDetails = false; diff --git a/apps/red-ui/src/app/modules/dossier-overview/config.service.ts b/apps/red-ui/src/app/modules/dossier-overview/config.service.ts index 7bd2317da..8e086002d 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/config.service.ts +++ b/apps/red-ui/src/app/modules/dossier-overview/config.service.ts @@ -162,7 +162,6 @@ export class ConfigService { icon: 'iqser:edit', hide: !this.#currentUser.isManager && !this._iqserPermissionsService.has(ROLES.dossiers.edit), helpModeKey: 'edit_dossier_in_dossier', - overlappingElements: [OverlappingElements.USER_MENU], disabled$, }, ]; diff --git a/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts b/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts index c6a87dbc2..a71840a67 100644 --- a/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts +++ b/apps/red-ui/src/app/modules/dossiers-listing/config.service.ts @@ -73,7 +73,6 @@ export class ConfigService { icon: 'iqser:plus', type: 'primary', helpModeKey: 'new_dossier_button', - overlappingElements: [OverlappingElements.USER_MENU], }, ]; } diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.ts b/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.ts index ed7a6845f..2a7475b9e 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-wrapper/annotation-wrapper.component.ts @@ -1,7 +1,6 @@ import { Component, HostBinding, Input, OnChanges } from '@angular/core'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { PdfProxyService } from '../../services/pdf-proxy.service'; -import { ScrollableParentViews } from '@iqser/common-ui'; import { ActionsHelpModeKeys } from '../../utils/constants'; import { ListItem } from '@models/file/list-item'; @@ -15,7 +14,6 @@ export class AnnotationWrapperComponent implements OnChanges { @HostBinding('attr.annotation-id') annotationId: string; @HostBinding('class.active') active = false; - readonly scrollableParentView = ScrollableParentViews.ANNOTATIONS_LIST; actionsHelpModeKey?: string; constructor(readonly pdfProxyService: PdfProxyService) {} diff --git a/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts index 893ec3c36..f49458d9c 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts @@ -10,9 +10,7 @@ import { IqserPermissionsService, IqserTooltipPositions, LoadingService, - OverlappingElements, ScrollableParentView, - ScrollableParentViews, TenantContextHolder, Toaster, } from '@iqser/common-ui'; @@ -109,10 +107,6 @@ export class FileActionsComponent implements OnChanges { return !!this._expandableActionsComponent?.expanded; } - get overlappingElements() { - return this.fileActionsHelpModeKey === 'editor_document_features' ? [OverlappingElements.USER_MENU] : []; - } - private get _toggleTooltip(): string { if (!this.canToggleAnalysis) { return _('file-preview.toggle-analysis.only-managers'); @@ -285,12 +279,8 @@ export class FileActionsComponent implements OnChanges { return actions.filter(btn => btn.show); } - ngOnChanges(changes: SimpleChanges) { + ngOnChanges() { this._setup(); - if (changes.fileActionsHelpModeKey) { - this.scrollableParentView = - this.fileActionsHelpModeKey === 'document_features_in_dossier' ? ScrollableParentViews.VIRTUAL_SCROLL : undefined; - } } async setFileApproved() { diff --git a/apps/red-ui/src/app/modules/shared/components/dossier-name-column/dossier-name-column.component.ts b/apps/red-ui/src/app/modules/shared/components/dossier-name-column/dossier-name-column.component.ts index b9cd8ef6f..0d0028068 100644 --- a/apps/red-ui/src/app/modules/shared/components/dossier-name-column/dossier-name-column.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/dossier-name-column/dossier-name-column.component.ts @@ -35,10 +35,6 @@ export class DossierNameColumnComponent { return this._dueDateDaysDiff < 0; } - get scrollableParentView(): ScrollableParentView { - return ScrollableParentViews.VIRTUAL_SCROLL; - } - private get _dueDateDaysDiff(): number { return dayjs(this.dossier.dueDate).diff(dateWithoutTime(dayjs()), 'day'); } diff --git a/apps/red-ui/src/app/modules/shared/components/file-name-column/file-name-column.component.ts b/apps/red-ui/src/app/modules/shared/components/file-name-column/file-name-column.component.ts index dc1910e01..921389b32 100644 --- a/apps/red-ui/src/app/modules/shared/components/file-name-column/file-name-column.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/file-name-column/file-name-column.component.ts @@ -61,8 +61,4 @@ export class FileNameColumnComponent extends ContextComponent Date: Mon, 10 Apr 2023 18:02:31 +0300 Subject: [PATCH 5/6] RED-6150 - update common ui --- libs/common-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/common-ui b/libs/common-ui index 5c442ced9..d8eff726c 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 5c442ced9f37bb50778371c6e01a352f52a2f0a5 +Subproject commit d8eff726c967d43c59032add46eef7d318308fc9 From 9259ebaedfb734cbda51ca0f794eccbe5a8fd1ea Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Mon, 10 Apr 2023 18:08:11 +0300 Subject: [PATCH 6/6] RED-6150 - update common ui --- libs/common-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/common-ui b/libs/common-ui index d8eff726c..8158e2299 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit d8eff726c967d43c59032add46eef7d318308fc9 +Subproject commit 8158e22991dca5f7e55e1280dd20ff746dd5b3c8