From 55f7dff342d7102adba178cf04234c311b035cbb Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Mon, 21 Feb 2022 22:35:30 +0200 Subject: [PATCH] added more help mode keys --- .../dossier-details-stats.component.html | 11 ++++-- .../dossiers-listing-actions.component.html | 4 +-- .../dossiers-listing-actions.component.ts | 6 +++- .../annotation-actions.component.html | 7 ++++ .../annotation-actions.component.ts | 6 +++- .../file-workload.component.html | 1 + .../expandable-file-actions.component.html | 6 ++-- .../expandable-file-actions.component.ts | 6 ++-- .../team-members/team-members.component.html | 2 +- apps/red-ui/src/assets/help-mode/links.json | 36 +++++++++++++++---- libs/common-ui | 2 +- 11 files changed, 66 insertions(+), 21 deletions(-) diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html index 9a656cc49..ce35f1ea8 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html @@ -8,7 +8,7 @@ {{ 'dossier-overview.dossier-details.stats.processing-documents' | translate: { count: stats.numberOfProcessingFiles } - }} + }}
@@ -37,7 +37,7 @@ {{ dossierTemplateName }}
-
+
{{ 'dossier-overview.dossier-details.dictionary' | translate }}
@@ -48,7 +48,12 @@
-
+
{{ 'dossier-overview.dossier-details.attributes.expand' | translate: { count: dossierAttributes.length } }}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html index c78fbb3ae..4001358a5 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html @@ -6,7 +6,7 @@ [type]="circleButtonTypes.dark" [icon]="currentUser.isManager ? 'iqser:edit' : 'red:info'" iqserHelpMode="edit_dossier" - [isVirtualScrollElement]="true" + [scrollableParentView]="scrollableParentView" >
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts index c76b3e68c..80b56d553 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core'; import { PermissionsService } from '@services/permissions.service'; -import { CircleButtonTypes, List, StatusBarConfig } from '@iqser/common-ui'; +import { CircleButtonTypes, List, ScrollableParentView, ScrollableParentViews, StatusBarConfig } from '@iqser/common-ui'; import { UserService } from '@services/user.service'; import { Dossier, DossierStats, File } from '@red/domain'; import { DossiersDialogService } from '../../../../services/dossiers-dialog.service'; @@ -56,4 +56,8 @@ export class DossiersListingActionsComponent implements OnChanges { $event.stopPropagation(); await firstValueFrom(this._reanalysisService.reanalyzeDossier(id)); } + + get scrollableParentView(): ScrollableParentView { + return ScrollableParentViews.VIRTUAL_SCROLL; + } } diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.html index 06bd99625..cb6148826 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.html @@ -34,6 +34,7 @@ [type]="buttonType" icon="red:resize" iqserHelpMode="redaction_resize_redaction" + [scrollableParentView]="scrollableParentView" > diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.ts index 04742c1b4..fb5dff0c2 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotation-actions/annotation-actions.component.ts @@ -8,7 +8,7 @@ import { UserService } from '@services/user.service'; import { AnnotationReferencesService } from '../../services/annotation-references.service'; import { MultiSelectService } from '../../services/multi-select.service'; import { FilePreviewStateService } from '../../services/file-preview-state.service'; -import { HelpModeService } from '../../../../../../../../../../libs/common-ui/src'; +import { HelpModeService, ScrollableParentView, ScrollableParentViews } from '../../../../../../../../../../libs/common-ui/src'; export const AnnotationButtonTypes = { dark: 'dark', @@ -115,6 +115,10 @@ export class AnnotationActionsComponent implements OnChanges { this.annotationActionsService.cancelResize($event, this.viewer, this.annotations[0], this.annotationsChanged); } + get scrollableParentView(): ScrollableParentView { + return ScrollableParentViews.ANNOTATIONS_LIST; + } + private async _setPermissions() { const dossier = await this._state.dossier; this.annotationPermissions = AnnotationPermissions.forUser( diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html index 74c0f571b..cd75fe63c 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/file-workload/file-workload.component.html @@ -161,6 +161,7 @@ class="annotations" iqserHasScrollbar tabindex="1" + id="annotations-list" > @@ -22,7 +22,7 @@ [tooltipPosition]="tooltipPosition" [type]="buttonType" [iqserHelpMode]="helpModeKey" - [isVirtualScrollElement]="isVirtualScrolElement" + [scrollableParentView]="scrollableParentView" > @@ -36,7 +36,7 @@ [matTooltip]="btn.tooltip | translate" [ngClass]="btn.class" [iqserHelpMode]="helpModeKey" - [isVirtualScrollElement]="isVirtualScrolElement" + [scrollableParentView]="scrollableParentView" color="primary" > diff --git a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts index d9ac332d6..df9d6396a 100644 --- a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, Input, OnChanges, SimpleChanges } from '@angular/core'; import { Action, ActionTypes, File } from '@red/domain'; -import { CircleButtonType, IqserTooltipPosition, Toaster } from '@iqser/common-ui'; +import { CircleButtonType, IqserTooltipPosition, ScrollableParentView, ScrollableParentViews, Toaster } from '@iqser/common-ui'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { FileDownloadService } from '@upload-download/services/file-download.service'; import { PermissionsService } from '@services/permissions.service'; @@ -64,7 +64,7 @@ export class ExpandableFileActionsComponent implements OnChanges { this._toaster.info(_('download-status.queued')); } - get isVirtualScrolElement(): boolean { - return this.helpModeKey === 'document_features'; + get scrollableParentView(): ScrollableParentView { + return this.helpModeKey === 'document_features' ? ScrollableParentViews.VIRTUAL_SCROLL : undefined; } } 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 eafb4b9df..4dcd9d300 100644 --- a/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html +++ b/apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html @@ -26,7 +26,7 @@ [type]="circleButtonTypes.primary" class="member" icon="iqser:plus" - iqserHelpMode="edit_dossier_member" + iqserHelpMode="add_dossier_members" > diff --git a/apps/red-ui/src/assets/help-mode/links.json b/apps/red-ui/src/assets/help-mode/links.json index 7a99ce254..5062488e9 100644 --- a/apps/red-ui/src/assets/help-mode/links.json +++ b/apps/red-ui/src/assets/help-mode/links.json @@ -161,12 +161,6 @@ "it": "", "fr": "" }, - "scroll_up_and_down": { - "en": "", - "de": "", - "it": "", - "fr": "" - }, "delete_document_filter": { "en": "/en/index-en.html?contextId=delete_document_filter", "de": "", @@ -208,5 +202,35 @@ "de": "", "it": "", "fr": "" + }, + "open_dictionary": { + "en": "/en/index-en.html?contextId=open_dictionary", + "de": "", + "it": "", + "fr": "" + }, + "edit_dossier_attributes": { + "en": "/en/index-en.html?contextId=edit_dossier_attributes", + "de": "", + "it": "", + "fr": "" + }, + "add_dossier_members": { + "en": "/en/index-en.html?contextId=add_dossier_members", + "de": "", + "it": "", + "fr": "" + }, + "dossiers_scroll_up_and_down": { + "en": "/en/index-en.html?contextId=dossiers_scroll_up_and_down", + "de": "", + "it": "", + "fr": "" + }, + "documents_scroll_up_and_down": { + "en": "/en/index-en.html?contextId=documents_scroll_up_and_down", + "de": "", + "it": "", + "fr": "" } } diff --git a/libs/common-ui b/libs/common-ui index 9b6a1b79d..b4460732f 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 9b6a1b79db607bf4cb679fb1139414985c2f0b6d +Subproject commit b4460732f80c3c7036ffca6aa5a876a3a91b56eb