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