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

RED-5763: Fixed help mode links overlay overlapping with the user menu.

Browse Source
This commit is contained in:
Nicoleta Panaghiu 2022-12-13 15:04:57 +02:00
parent dfefd1b512
commit 613834b5b7
10 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

@ -1,7 +1,14 @@
import { Component, OnInit } from '@angular/core';
import { ConfigService } from '@services/config.service';
import { TranslateService } from '@ngx-translate/core';
import { ButtonConfig, getCurrentUser, IconButtonTypes, IqserPermissionsService, LoadingService } from '@iqser/common-ui';
import {
ButtonConfig,
getCurrentUser,
IconButtonTypes,
IqserPermissionsService,
LoadingService,
OverlappingElements,
} from '@iqser/common-ui';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { RouterHistoryService } from '@services/router-history.service';
import { LicenseService } from '@services/license.service';
@ -24,6 +31,7 @@ export class LicenseScreenComponent implements OnInit {
type: IconButtonTypes.primary,
helpModeKey: 'license_information',
hide: !this.permissionsService.has(ROLES.license.readReport),
overlappingElement: OverlappingElements.USER_MENU,
},
];

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

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

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

@ -25,6 +25,7 @@
(action)="fileInput.click()"
*allow="roles.reportTemplates.upload; if: currentUser.isAdmin"
[iqserHelpMode]="'reports'"
[overlappingElement]="'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

@ -12,6 +12,7 @@ import {
listingProvidersFactory,
LoadingService,
NestedFilter,
OverlappingElements,
SearchPositions,
TableColumnConfig,
} from '@iqser/common-ui';
@ -62,6 +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,
},
];
collapsedDetails = false;

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

@ -14,6 +14,7 @@
<iqser-icon-button
*allow="roles.watermarks.write; if: currentUser.isAdmin"
[iqserHelpMode]="'create_new_watermark'"
[overlappingElement]="'USER_MENU'"
[label]="'watermarks-listing.add-new' | translate"
[routerLink]="getRouterLink()"
[type]="iconButtonTypes.primary"
@ -56,7 +57,7 @@
<div class="cell">
<div class="action-buttons">
<div [iqserHelpMode]="'edit_delete_watermark'">
<div [iqserHelpMode]="'edit_delete_watermark'" [overlappingElement]="'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'">
<div [iqserHelpMode]="'edit_clone_delete_dossier_templates'" [overlappingElement]="'USER_MENU'">
<iqser-circle-button
(action)="openDeleteDossierTemplateDialog($event)"
[tooltip]="'dossier-templates-listing.action.delete' | translate"