Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

RED-5918 - Help mode links overlay the filter menu in file editor

Browse Source
This commit is contained in:
Valentin Mihai 2023-01-05 17:54:34 +02:00
parent e47f736efe
commit 898ad51b03
21 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html
View File

@ -41,7 +41,7 @@
(action)="openEditColorDialog($event, entity)"
*allow="roles.colors.write; if: currentUser.isAdmin"
[iqserHelpMode]="'default_colors'"
[overlappingElement]="'USER_MENU'"
[overlappingElements]="['USER_MENU']"
[tooltip]="'default-colors-screen.action.edit' | translate"
[type]="circleButtonTypes.dark"
icon="iqser:edit"

4
apps/red-ui/src/app/modules/admin/screens/dossier-attributes-listing/dossier-attributes-listing-screen.component.html
View File

@ -59,7 +59,7 @@
(action)="openAddEditAttributeDialog($event)"
*ngIf="canEditDossierAttributes"
[iqserHelpMode]="'create_new_dossier_attribute'"
[overlappingElement]="'USER_MENU'"
[overlappingElements]="['USER_MENU']"
[label]="'dossier-attributes-listing.add-new' | translate"
[type]="iconButtonTypes.primary"
icon="iqser:plus"
@ -89,7 +89,7 @@
<div class="cell">
<div *ngIf="canEditDossierAttributes" class="action-buttons">
<div [iqserHelpMode]="'edit_delete_dossier_attributes'" [overlappingElement]="'USER_MENU'">
<div [iqserHelpMode]="'edit_delete_dossier_attributes'" [overlappingElements]="['USER_MENU']">
<iqser-circle-button
(action)="openAddEditAttributeDialog($event, attribute)"
[tooltip]="'dossier-attributes-listing.action.edit' | translate"

4
apps/red-ui/src/app/modules/admin/screens/entities-listing/entities-listing-screen.component.html
View File

@ -59,7 +59,7 @@
(action)="openAddEntityDialog()"
*ngIf="permissionsService.canEditEntities()"
[iqserHelpMode]="'create_new_entity'"
[overlappingElement]="'USER_MENU'"
[overlappingElements]="['USER_MENU']"
[label]="'entities-listing.add-new' | translate"
[type]="iconButtonTypes.primary"
icon="iqser:plus"
@ -100,7 +100,7 @@
</div>
<div class="action-buttons">
<div [iqserHelpMode]="'edit_delete_entities'" [overlappingElement]="'USER_MENU'">
<div [iqserHelpMode]="'edit_delete_entities'" [overlappingElements]="['USER_MENU']">
<iqser-circle-button
(action)="openDeleteEntitiesDialog($event, [dict])"
*ngIf="permissionsService.canDeleteEntities(dict)"

6
apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html
View File

@ -76,7 +76,7 @@
(action)="openConfigurationsDialog($event)"
*allow="roles.fileAttributes.writeConfig; if: currentUser.isAdmin"
[iqserHelpMode]="'upload_file_attribute'"
[overlappingElement]="'USER_MENU'"
[overlappingElements]="['USER_MENU']"
[tooltip]="'file-attributes-listing.configurations' | translate"
[type]="circleButtonTypes.dark"
icon="iqser:settings"
@ -87,7 +87,7 @@
(action)="openAddEditAttributeDialog($event)"
*ngIf="permissionsService.canEditGlobalFileAttributes()"
[iqserHelpMode]="'create_new_file_attribute'"
[overlappingElement]="'USER_MENU'"
[overlappingElements]="['USER_MENU']"
[label]="'file-attributes-listing.add-new' | translate"
[type]="iconButtonTypes.primary"
icon="iqser:plus"
@ -132,7 +132,7 @@
<div class="cell">
<div *ngIf="permissionsService.canEditGlobalFileAttributes()" class="action-buttons">
<div [iqserHelpMode]="'edit_delete_file_attribute'" [overlappingElement]="'USER_MENU'">
<div [iqserHelpMode]="'edit_delete_file_attribute'" [overlappingElements]="['USER_MENU']">
<iqser-circle-button
(action)="openAddEditAttributeDialog($event, attribute)"
[tooltip]="'file-attributes-listing.action.edit' | translate"

2
apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.ts
View File

@ -31,7 +31,7 @@ export class LicenseScreenComponent implements OnInit {
type: IconButtonTypes.primary,
helpModeKey: 'license_information',
hide: !this.permissionsService.has(ROLES.license.readReport),
overlappingElement: OverlappingElements.USER_MENU,
overlappingElements: [OverlappingElements.USER_MENU],
},
];

2
apps/red-ui/src/app/modules/admin/screens/permissions/permissions-screen/permissions-screen.component.html
View File

@ -14,7 +14,7 @@
(toggleChange)="togglePermission(config.searchKey, permission)"
[checked]="config.getValue(permission)"
[iqserHelpMode]="'dossier_permissions'"
[overlappingElement]="'USER_MENU'"
[overlappingElements]="['USER_MENU']"
color="primary"
></mat-slide-toggle>
</div>

4
apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.html
View File

@ -10,7 +10,7 @@
<ng-container *ngFor="let placeholder of placeholders">
<div class="placeholder">{{ placeholder.placeholder }}</div>
<div
[innerHTML]="placeholder.descriptionTranslation | translate: { attribute: placeholder.attributeName }"
[innerHTML]="placeholder.descriptionTranslation | translate : { attribute: placeholder.attributeName }"
class="description"
></div>
</ng-container>
@ -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"
></iqser-circle-button>

2
apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts
View File

@ -63,7 +63,7 @@ export class UserListingScreenComponent extends ListingComponent<User> 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;

8
apps/red-ui/src/app/modules/admin/screens/watermark/watermarks-listing/watermarks-listing-screen.component.html
View File

@ -14,7 +14,7 @@
<iqser-icon-button
*allow="roles.watermarks.write; if: currentUser.isAdmin"
[iqserHelpMode]="'create_new_watermark'"
[overlappingElement]="'USER_MENU'"
[overlappingElements]="['USER_MENU']"
[label]="'watermarks-listing.add-new' | translate"
[routerLink]="getRouterLink()"
[type]="iconButtonTypes.primary"
@ -45,19 +45,19 @@
<div class="cell">
<div class="small-label">
{{ entity.dateAdded | date: 'd MMM yyyy' }}
{{ entity.dateAdded | date : 'd MMM yyyy' }}
</div>
</div>
<div class="cell">
<div class="small-label">
{{ entity.dateModified | date: 'd MMM yyyy' }}
{{ entity.dateModified | date : 'd MMM yyyy' }}
</div>
</div>
<div class="cell">
<div class="action-buttons">
<div [iqserHelpMode]="'edit_delete_watermark'" [overlappingElement]="'USER_MENU'">
<div [iqserHelpMode]="'edit_delete_watermark'" [overlappingElements]="['USER_MENU']">
<iqser-circle-button
[routerLink]="getRouterLink(entity)"
[tooltip]="'watermarks-listing.action.edit' | translate"

2
apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.html
View File

@ -1,5 +1,5 @@
<div class="action-buttons" *ngIf="currentUser.isAdmin">
<div [iqserHelpMode]="'edit_clone_delete_dossier_templates'" [overlappingElement]="'USER_MENU'">
<div [iqserHelpMode]="'edit_clone_delete_dossier_templates'" [overlappingElements]="['USER_MENU']">
<iqser-circle-button
(action)="openDeleteDossierTemplateDialog($event)"
[tooltip]="'dossier-templates-listing.action.delete' | translate"

2
apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.html
View File

@ -22,7 +22,7 @@
*allow="roles.dossiers.edit; if: currentUser.isManager"
[icon]="'iqser:edit'"
[iqserHelpMode]="'dashboard_in_dossier'"
[overlappingElement]="'USER_MENU'"
[overlappingElements]="['USER_MENU']"
[tooltipPosition]="'below'"
[tooltip]="'dossier-details.edit-owner' | translate"
class="ml-14"

6
apps/red-ui/src/app/modules/dossier-overview/components/screen-header/dossier-overview-screen-header.component.html
View File

@ -11,7 +11,7 @@
[dossier]="dossier"
[files]="entitiesService.all$ | async"
[iqserHelpMode]="'edit_dossier_in_dossier'"
[overlappingElement]="'USER_MENU'"
[overlappingElements]="['USER_MENU']"
[tooltipPosition]="'below'"
></redaction-file-download-btn>
@ -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"
></iqser-circle-button>
@ -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"

2
apps/red-ui/src/app/modules/dossier-overview/config.service.ts
View File

@ -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$,
},
];

2
apps/red-ui/src/app/modules/dossiers-listing/config.service.ts
View File

@ -73,7 +73,7 @@ export class ConfigService {
icon: 'iqser:plus',
type: 'primary',
helpModeKey: 'new_dossier_button',
overlappingElement: OverlappingElements.USER_MENU,
overlappingElements: [OverlappingElements.USER_MENU],
},
];
}

4
apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html
View File

@ -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"
></div>
@ -25,7 +25,7 @@
<iqser-popup-filter
[actionsTemplate]="annotationFilterActionTemplate"
[iqserHelpMode]="'workload_in_editor'"
[overlappingElement]="'USER_MENU'"
[overlappingElements]="['USER_MENU']"
[primaryFiltersSlug]="'primaryFilters'"
[secondaryFiltersSlug]="'secondaryFilters'"
></iqser-popup-filter>

2
apps/red-ui/src/app/modules/file-preview/components/right-container/file-preview-right-container.component.html
View File

@ -21,7 +21,7 @@
[annotations]="[annotation]"
[canPerformAnnotationActions]="pdfProxyService.canPerformAnnotationActions$ | async"
[iqserHelpMode]="getActionsHelpModeKey(annotation)"
[overlappingElement]="'USER_MENU'"
[overlappingElements]="['USER_MENU', 'WORKLOAD_FILTER']"
[scrollableParentView]="scrollableParentView"
></redaction-annotation-actions>
</ng-template>

2
apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html
View File

@ -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"
></iqser-circle-button>

6
apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.html
View File

@ -13,7 +13,7 @@
[type]="btn.buttonType || buttonType"
[iqserHelpMode]="helpModeKey"
[scrollableParentView]="scrollableParentView"
[overlappingElement]="overlappingElement"
[overlappingElements]="overlappingElements"
></iqser-circle-button>
<!-- download redacted file-->
@ -26,7 +26,7 @@
[type]="buttonType"
[iqserHelpMode]="helpModeKey"
[scrollableParentView]="scrollableParentView"
[overlappingElement]="overlappingElement"
[overlappingElements]="overlappingElements"
></redaction-file-download-btn>
<!-- exclude from redaction -->
@ -41,7 +41,7 @@
[ngClass]="btn.class"
[iqserHelpMode]="helpModeKey"
[scrollableParentView]="scrollableParentView"
[overlappingElement]="overlappingElement"
[overlappingElements]="overlappingElements"
color="primary"
></mat-slide-toggle>
</div>

4
apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts
View File

@ -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) {

2
apps/red-ui/src/app/modules/shared/components/team-members/team-members.component.html
View File

@ -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"

2
libs/common-ui

@ -1 +1 @@
Subproject commit 59a71e7ab14c5fa0a276a0c94749b4c2353df4b5
Subproject commit 8ac8cc78288dfcf9cb3ed05c1600ed2bc9cf8308