-
+
-
+
-
+
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 3000b9078..994ca955a 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
@@ -10,7 +10,7 @@
@@ -25,7 +25,7 @@
(action)="fileInput.click()"
*allow="roles.reportTemplates.upload; if: currentUser.isAdmin"
[iqserHelpMode]="'reports'"
- [overlappingElement]="'USER_MENU'"
+ [overlappingElements]="['USER_MENU']"
[tooltip]="'reports-screen.upload-document' | translate"
icon="iqser:upload"
>
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 afcc8d5ce..06b311c55 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,7 @@ export class UserListingScreenComponent extends ListingComponent implement
icon: 'iqser:plus',
disabled$: this._userService.currentUser$.pipe(map(user => !user.isAdmin)),
helpModeKey: 'create_user',
- overlappingElement: OverlappingElements.USER_MENU,
+ overlappingElements: [OverlappingElements.USER_MENU],
},
];
collapsedDetails = false;
diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermarks-listing/watermarks-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/watermark/watermarks-listing/watermarks-listing-screen.component.html
index 81f615ff2..92e1acfd9 100644
--- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermarks-listing/watermarks-listing-screen.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermarks-listing/watermarks-listing-screen.component.html
@@ -14,7 +14,7 @@
{{ placeholder.placeholder }}
- {{ entity.dateAdded | date: 'd MMM yyyy' }}
+ {{ entity.dateAdded | date : 'd MMM yyyy' }}
- {{ entity.dateModified | date: 'd MMM yyyy' }}
+ {{ entity.dateModified | date : 'd MMM yyyy' }}
-
+
-
+
@@ -21,7 +21,7 @@
[disabled]="listingService.areSomeSelected$ | async"
[icon]="'iqser:csv'"
[iqserHelpMode]="'edit_dossier_in_dossier'"
- [overlappingElement]="'USER_MENU'"
+ [overlappingElements]="['USER_MENU']"
[tooltipPosition]="'below'"
[tooltip]="'dossier-overview.header-actions.download-csv' | translate"
>
@@ -43,7 +43,7 @@
[icon]="'iqser:upload'"
[id]="'upload-document-btn'"
[iqserHelpMode]="'edit_dossier_in_dossier'"
- [overlappingElement]="'USER_MENU'"
+ [overlappingElements]="['USER_MENU']"
[tooltipPosition]="'below'"
[tooltip]="'dossier-overview.header-actions.upload-document' | translate"
[type]="circleButtonTypes.primary"
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 503d5655b..a28454e4c 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
@@ -161,7 +161,7 @@ export class ConfigService {
icon: 'iqser:edit',
hide: !this.currentUser.isManager && !this._iqserPermissionsService.has(ROLES.dossiers.edit),
helpModeKey: 'edit_dossier_in_dossier',
- overlappingElement: OverlappingElements.USER_MENU,
+ 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 f4f5c4d3f..11880d5c6 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,7 @@ export class ConfigService {
icon: 'iqser:plus',
type: 'primary',
helpModeKey: 'new_dossier_button',
- overlappingElement: OverlappingElements.USER_MENU,
+ overlappingElements: [OverlappingElements.USER_MENU],
},
];
}
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 0ff06f0a2..edf2e4659 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
@@ -17,7 +17,7 @@
(click)="multiSelectService.activate()"
*ngIf="(multiSelectService.enabled$ | async) && (multiSelectInactive$ | async)"
[iqserHelpMode]="'workload_in_editor'"
- [overlappingElement]="'USER_MENU'"
+ [overlappingElements]="['USER_MENU']"
class="all-caps-label primary pointer"
translate="file-preview.tabs.annotations.select"
>
@@ -25,7 +25,7 @@
diff --git a/apps/red-ui/src/app/modules/file-preview/components/right-container/file-preview-right-container.component.html b/apps/red-ui/src/app/modules/file-preview/components/right-container/file-preview-right-container.component.html
index 4e20fe5af..6ed919169 100644
--- a/apps/red-ui/src/app/modules/file-preview/components/right-container/file-preview-right-container.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/components/right-container/file-preview-right-container.component.html
@@ -21,7 +21,7 @@
[annotations]="[annotation]"
[canPerformAnnotationActions]="pdfProxyService.canPerformAnnotationActions$ | async"
[iqserHelpMode]="getActionsHelpModeKey(annotation)"
- [overlappingElement]="'USER_MENU'"
+ [overlappingElements]="['USER_MENU', 'WORKLOAD_FILTER']"
[scrollableParentView]="scrollableParentView"
>
diff --git a/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html b/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html
index 04857832d..206850858 100644
--- a/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html
@@ -37,7 +37,7 @@
[icon]="'iqser:edit'"
[id]="'change-assignee'"
[iqserHelpMode]="'document_features_in_editor'"
- [overlappingElement]="'USER_MENU'"
+ [overlappingElements]="['USER_MENU']"
[tooltipPosition]="'below'"
[tooltip]="assignTooltip$ | async"
>
diff --git a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html
index bc0959a85..dbd91cf62 100644
--- a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html
@@ -13,7 +13,7 @@
[type]="btn.buttonType || buttonType"
[iqserHelpMode]="helpModeKey"
[scrollableParentView]="scrollableParentView"
- [overlappingElement]="overlappingElement"
+ [overlappingElements]="overlappingElements"
>
@@ -26,7 +26,7 @@
[type]="buttonType"
[iqserHelpMode]="helpModeKey"
[scrollableParentView]="scrollableParentView"
- [overlappingElement]="overlappingElement"
+ [overlappingElements]="overlappingElements"
>
@@ -41,7 +41,7 @@
[ngClass]="btn.class"
[iqserHelpMode]="helpModeKey"
[scrollableParentView]="scrollableParentView"
- [overlappingElement]="overlappingElement"
+ [overlappingElements]="overlappingElements"
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 a177fc30c..9f14152d2 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
@@ -49,8 +49,8 @@ export class ExpandableFileActionsComponent implements OnChanges {
private readonly _dialog: MatDialog,
) {}
- get overlappingElement() {
- return this.helpModeKey === 'document_features_in_editor' ? OverlappingElements.USER_MENU : undefined;
+ get overlappingElements() {
+ return this.helpModeKey === 'document_features_in_editor' ? [OverlappingElements.USER_MENU] : [];
}
ngOnChanges(changes: SimpleChanges) {
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 50284ec6f..e2d93bea1 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
@@ -23,7 +23,7 @@
[class.large-spacing]="largeSpacing"
[icon]="'iqser:plus'"
[iqserHelpMode]="'edit_dossier_members'"
- [overlappingElement]="'USER_MENU'"
+ [overlappingElements]="['USER_MENU']"
[size]="32"
[tooltip]="'dossier-details.assign-members' | translate"
[type]="circleButtonTypes.primary"
diff --git a/libs/common-ui b/libs/common-ui
index 59a71e7ab..8ac8cc782 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 59a71e7ab14c5fa0a276a0c94749b4c2353df4b5
+Subproject commit 8ac8cc78288dfcf9cb3ed05c1600ed2bc9cf8308