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 20eb64e45..d26b35bc0 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 @@ -1,4 +1,4 @@ - +
@@ -21,11 +21,11 @@ - + + @@ -21,20 +21,18 @@
- +
@@ -44,7 +42,7 @@ [config]="translateChartService.translateDossierStates(dossierTemplate.dossiersChartConfig, dossierTemplate.id)" [radius]="63" [strokeWidth]="15" - [subtitles]="['dossier-template-stats.active-dossiers' | translate : { count: dossierTemplate.numberOfActiveDossiers }]" + [subtitles]="['dossier-template-stats.active-dossiers' | translate: { count: dossierTemplate.numberOfActiveDossiers }]" direction="row" totalType="sum" > @@ -76,7 +74,7 @@ *ngIf="permissionsService.canCreateDossier(dossierTemplate)" [label]="'dashboard.empty-template.new-dossier' | translate" [type]="iconButtonTypes.primary" - [attr.help-mode-key]="'new_dossier_button'" + [attr.help-mode-key]="'new_dossier'" icon="iqser:plus" > 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 9db020284..1a46d08ff 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 @@ -7,7 +7,7 @@ > this.#openEditDossierDialog(dossierId), icon: 'iqser:edit', hide: !this.#currentUser.isManager && !this._iqserPermissionsService.has(Roles.dossiers.edit), - helpModeKey: 'edit_dossier_in_dossier', + helpModeKey: 'edit_dossier', disabled$, }, ]; @@ -446,28 +446,28 @@ export class ConfigService { required: true, checker: this._recentlyModifiedChecker, disabled: entities.filter(this._recentlyModifiedChecker).length === 0, - helpModeKey: 'filter_document_list', + helpModeKey: 'quick_filters_documents', }, { id: 'assigned-to-me', label: this._translateService.instant('dossier-overview.quick-filters.assigned-to-me'), checker: this._assignedToMeChecker, disabled: entities.filter(this._assignedToMeChecker).length === 0, - helpModeKey: 'filter_document_list', + helpModeKey: 'quick_filters_documents', }, { id: 'unassigned', label: this._translateService.instant('dossier-overview.quick-filters.unassigned'), checker: this._unassignedChecker, disabled: entities.filter(this._unassignedChecker).length === 0, - helpModeKey: 'filter_document_list', + helpModeKey: 'quick_filters_documents', }, { id: 'assigned-to-others', label: this._translateService.instant('dossier-overview.quick-filters.assigned-to-others'), checker: this._assignedToOthersChecker, disabled: entities.filter(this._assignedToOthersChecker).length === 0, - helpModeKey: 'filter_document_list', + helpModeKey: 'quick_filters_documents', }, ].map(filter => new NestedFilter(filter)); } diff --git a/apps/red-ui/src/app/modules/dossier-overview/screen/dossier-overview-screen.component.html b/apps/red-ui/src/app/modules/dossier-overview/screen/dossier-overview-screen.component.html index 5f60630ae..774daaa1e 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/screen/dossier-overview-screen.component.html +++ b/apps/red-ui/src/app/modules/dossier-overview/screen/dossier-overview-screen.component.html @@ -41,6 +41,7 @@ [noDataIcon]="'iqser:document'" [noDataText]="'dossier-overview.no-data.title' | translate" [showNoDataButton]="true" + [id]="'workflow-view'" addElementColumn="NEW" > 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 5245afec3..5f6490ad0 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 @@ -69,7 +69,7 @@ export class ConfigService { hide: !this._permissionsService.canCreateDossier(dossierTemplate), icon: 'iqser:plus', type: 'primary', - helpModeKey: 'new_dossier_button', + helpModeKey: 'new_dossier', }, ]; } @@ -226,14 +226,14 @@ export class ConfigService { label: this._translateService.instant('dossier-listing.quick-filters.owner'), checker: dossierOwnerQuickChecker(userId), disabled: entities.filter(dossierOwnerQuickChecker(userId)).length === 0, - helpModeKey: 'filter_dossier_list', + helpModeKey: 'quick_filter_dossiers', }, { id: 'member', label: this._translateService.instant('dossier-listing.quick-filters.member'), checker: dossierMemberQuickChecker(userId), disabled: entities.filter(dossierMemberQuickChecker(userId)).length === 0, - helpModeKey: 'filter_dossier_list', + helpModeKey: 'quick_filter_dossiers', }, ].map(filter => new NestedFilter(filter)); } diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.html b/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.html index f7e608aaf..87e5bc85d 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.html @@ -30,6 +30,7 @@ [tooltipPosition]="tooltipPosition" [tooltip]="'annotation-actions.resize.label' | translate" [type]="buttonType" + [attr.help-mode-key]="helpModeKey('resize')" icon="red:resize" > @@ -39,6 +40,7 @@ [tooltipPosition]="tooltipPosition" [tooltip]="'annotation-actions.edit-redaction.label' | translate" [type]="buttonType" + [attr.help-mode-key]="helpModeKey('edit')" icon="iqser:edit" > @@ -138,6 +140,7 @@ [tooltipPosition]="tooltipPosition" [tooltip]="'annotation-actions.remove-annotation.remove-redaction' | translate" [type]="buttonType" + [attr.help-mode-key]="helpModeKey('remove')" icon="iqser:trash" > diff --git a/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.ts b/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.ts index f2e806e3e..b908a9a20 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/annotation-actions/annotation-actions.component.ts @@ -123,4 +123,8 @@ export class AnnotationActionsComponent implements OnChanges { this._iqserPermissionsService, ); } + + helpModeKey(action: string) { + return this.#isDocumine ? `${action}_annotation` : ''; + } } 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 a8046088a..5ec1cb170 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 @@ -4,6 +4,7 @@ import { PdfProxyService } from '../../services/pdf-proxy.service'; import { ActionsHelpModeKeys } from '../../utils/constants'; import { ListItem } from '@models/file/list-item'; import { MultiSelectService } from '../../services/multi-select.service'; +import { getConfig } from '@iqser/common-ui'; @Component({ selector: 'redaction-annotation-wrapper', @@ -16,6 +17,7 @@ export class AnnotationWrapperComponent implements OnChanges { @HostBinding('attr.annotation-id') annotationId: string; @HostBinding('class.active') active = false; actionsHelpModeKey?: string; + readonly #isDocumine = getConfig().IS_DOCUMINE; protected readonly _pdfProxyService = inject(PdfProxyService); protected readonly _multiSelectService = inject(MultiSelectService); @@ -26,11 +28,14 @@ export class AnnotationWrapperComponent implements OnChanges { } #getActionsHelpModeKey(): string { - const type = this.annotation.item.typeLabel?.split('.')[1]; - const typeValue = this.annotation.item.typeValue; - if (type === 'hint' && (typeValue === 'ocr' || typeValue === 'formula' || typeValue === 'image')) { - return ActionsHelpModeKeys[`${type}-${typeValue}`]; + if (!this.#isDocumine) { + const type = this.annotation.item.typeLabel?.split('.')[1]; + const typeValue = this.annotation.item.typeValue; + if (type === 'hint' && (typeValue === 'ocr' || typeValue === 'formula' || typeValue === 'image')) { + return ActionsHelpModeKeys[`${type}-${typeValue}`]; + } + return ActionsHelpModeKeys[type]; } - return ActionsHelpModeKeys[type]; + return ''; } } 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 4b6a9beba..ab5ab8c6b 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 @@ -20,7 +20,7 @@
@@ -28,7 +28,7 @@ +

-
+
{{ 'rss-dialog.table-header.component' | translate }}
{{ 'rss-dialog.table-header.value' | translate }}
{{ 'rss-dialog.table-header.transformation-rule' | translate }}
{{ 'rss-dialog.table-header.annotation-references' | translate }}
- +
{{ entry.key }}
@@ -65,12 +67,14 @@ [label]="'rss-dialog.actions.export-json' | translate" [submit]="true" [type]="iconButtonTypes.primary" + [attr.help-mode-key]="'scm_export_DIALOG'" > @@ -73,6 +75,7 @@ [tooltip]="'common.close' | translate" class="ml-8" icon="iqser:close" + [attr.help-mode-key]="'editor_close'" >
diff --git a/apps/red-ui/src/app/modules/pdf-viewer/services/viewer-header.service.ts b/apps/red-ui/src/app/modules/pdf-viewer/services/viewer-header.service.ts index 53d356531..aaeab41d8 100644 --- a/apps/red-ui/src/app/modules/pdf-viewer/services/viewer-header.service.ts +++ b/apps/red-ui/src/app/modules/pdf-viewer/services/viewer-header.service.ts @@ -1,11 +1,11 @@ import { inject, Injectable, NgZone } from '@angular/core'; -import { getConfig, IqserPermissionsService, isIqserDevMode } from '@iqser/common-ui'; +import { getConfig, HelpModeService, IqserPermissionsService, isIqserDevMode } from '@iqser/common-ui'; import { BASE_HREF_FN } from '@iqser/common-ui/lib/utils'; import { TranslateService } from '@ngx-translate/core'; import { IHeaderElement, RotationTypes } from '@red/domain'; import { FilesMapService } from '@services/files/files-map.service'; import { Roles } from '@users/roles'; -import { fromEvent, Observable, Subject } from 'rxjs'; +import { fromEvent, merge, Observable, Subject } from 'rxjs'; import { filter, map, tap } from 'rxjs/operators'; import { HeaderElements, HeaderElementType } from '../../file-preview/utils/constants'; import { ROTATION_ACTION_BUTTONS, ROTATION_BUTTONS, ViewerEvents } from '../utils/constants'; @@ -56,6 +56,7 @@ export class ViewerHeaderService { private readonly _layersService: LayersService, private readonly _readableRedactionsService: ReadableRedactionsService, private readonly _ngZone: NgZone, + private readonly _helpModeService: HelpModeService, ) { this.events$ = this.#events$.asObservable(); } @@ -224,9 +225,9 @@ export class ViewerHeaderService { } get #toggleLoadAnnotations$() { - return this.expandedPanelEvent$.pipe( - tap(isVisible => - isVisible ? this.enable([HeaderElements.LOAD_ALL_ANNOTATIONS]) : this.disable([HeaderElements.LOAD_ALL_ANNOTATIONS]), + return merge(this.expandedPanelEvent$, this._helpModeService.isHelpModeActive$).pipe( + tap(enable => + enable ? this.enable([HeaderElements.LOAD_ALL_ANNOTATIONS]) : this.disable([HeaderElements.LOAD_ALL_ANNOTATIONS]), ), ); } diff --git a/apps/red-ui/src/app/modules/shared-dossiers/components/dossiers-listing-actions/dossiers-listing-actions.component.html b/apps/red-ui/src/app/modules/shared-dossiers/components/dossiers-listing-actions/dossiers-listing-actions.component.html index 7ca821014..47276c23b 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/components/dossiers-listing-actions/dossiers-listing-actions.component.html +++ b/apps/red-ui/src/app/modules/shared-dossiers/components/dossiers-listing-actions/dossiers-listing-actions.component.html @@ -2,7 +2,7 @@ -
+
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 9ddd0cbd2..435ad2955 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 @@ -41,7 +41,7 @@ export class FileActionsComponent implements OnChanges { @Input({ required: true }) type: 'file-preview' | 'dossier-overview-list' | 'dossier-overview-workflow'; @Input() maxWidth: number; @Input() minWidth: number; - @Input() fileActionsHelpModeKey: 'document_features_in_dossier' | 'editor_document_features' = 'document_features_in_dossier'; + @Input() helpModeKeyPrefix: 'dossier' | 'editor' = 'dossier'; readonly currentUser = getCurrentUser(); toggleTooltip?: string; assignTooltip?: string; @@ -112,6 +112,7 @@ export class FileActionsComponent implements OnChanges { tooltip: _('dossier-overview.delete.action'), icon: 'iqser:trash', show: this.showDelete, + helpModeKey: 'delete_file', }, { id: 'assign-btn', @@ -120,6 +121,7 @@ export class FileActionsComponent implements OnChanges { tooltip: this.assignTooltip, icon: 'red:assign', show: this.showAssign, + helpModeKey: 'assign_user', }, { id: 'assign-to-me-btn', @@ -128,6 +130,7 @@ export class FileActionsComponent implements OnChanges { tooltip: _('dossier-overview.assign-me'), icon: 'red:assign-me', show: this.showAssignToSelf, + helpModeKey: 'assign_user', }, { id: 'open-import-redactions-dialog-btn', @@ -145,6 +148,7 @@ export class FileActionsComponent implements OnChanges { tooltipClass: 'small', show: this._permissionsService.canDownloadRedactedFile() && !!this.file.lastProcessed, disabled: this.file.processingStatus === ProcessingFileStatuses.ERROR, + helpModeKey: 'download', }, { id: 'toggle-document-info-btn', @@ -154,6 +158,7 @@ export class FileActionsComponent implements OnChanges { ariaExpanded: toObservable(this._documentInfoService?.shown, { injector: this._injector }), icon: 'red:status-info', show: !!this._documentInfoService, + helpModeKey: 'document_info', }, { id: 'toggle-exclude-pages-btn', @@ -172,6 +177,7 @@ export class FileActionsComponent implements OnChanges { tooltip: _('dossier-overview.back-to-new'), icon: 'red:undo', show: this.showSetToNew, + helpModeKey: 'change_status', }, { id: 'set-file-under-approval-btn', @@ -180,6 +186,7 @@ export class FileActionsComponent implements OnChanges { tooltip: _('dossier-overview.under-approval'), icon: 'red:ready-for-approval', show: this.showUnderApproval, + helpModeKey: 'change_status', }, { id: 'set-file-under-review-btn', @@ -188,6 +195,7 @@ export class FileActionsComponent implements OnChanges { tooltip: _('dossier-overview.under-review'), icon: 'red:undo', show: this.showUnderReview, + helpModeKey: 'change_status', }, { id: 'set-file-approved-btn', @@ -197,6 +205,7 @@ export class FileActionsComponent implements OnChanges { icon: 'red:approved', disabled: !this.file.canBeApproved, show: this.showApprove, + helpModeKey: 'change_status', }, { id: 'toggle-automatic-analysis-btn', @@ -205,6 +214,7 @@ export class FileActionsComponent implements OnChanges { tooltip: _('dossier-overview.stop-auto-analysis'), icon: 'red:disable-analysis', show: this.canDisableAutoAnalysis, + helpModeKey: 'stop_analysis', }, { id: 'reanalyse-file-preview-btn', @@ -215,6 +225,7 @@ export class FileActionsComponent implements OnChanges { icon: 'iqser:refresh', show: this.showReanalyseFilePreview, disabled: this.file.isProcessing, + helpModeKey: 'stop_analysis', }, { id: 'toggle-automatic-analysis-btn', @@ -224,6 +235,7 @@ export class FileActionsComponent implements OnChanges { buttonType: this.isFilePreview ? CircleButtonTypes.warn : CircleButtonTypes.default, icon: 'red:enable-analysis', show: this.canEnableAutoAnalysis, + helpModeKey: 'stop_analysis', }, { id: 'set-under-approval-btn', @@ -232,6 +244,7 @@ export class FileActionsComponent implements OnChanges { tooltip: _('dossier-overview.under-approval'), icon: 'red:undo', show: this.showUndoApproval, + helpModeKey: 'change_status', }, { id: 'ocr-file-btn', @@ -248,6 +261,7 @@ export class FileActionsComponent implements OnChanges { tooltip: _('dossier-overview.reanalyse.action'), icon: 'iqser:refresh', show: this.showReanalyseDossierOverview, + helpModeKey: 'stop_analysis', }, { id: 'toggle-analysis-btn', @@ -258,6 +272,7 @@ export class FileActionsComponent implements OnChanges { class: { 'mr-24': this.isDossierOverviewList }, checked: !this.file.excluded, show: this.showToggleAnalysis, + helpModeKey: 'disable_extraction', }, ]; 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 47b264762..e261eb0a3 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 @@