Merge remote-tracking branch 'origin/master' into refactor-fp/state

apps/red-ui/src/app/modules/admin/screens/justifications/justifications-screen/justifications-screen.component.html

@@ -11,7 +11,7 @@
 <ng-template #bulkActions>
     <iqser-circle-button
         (action)="openConfirmDeleteDialog()"
-        *ngIf="userService.currentUser.isAdmin && listingService.areSomeSelected$ | async"
+        *ngIf="userPreferenceService.areDevFeaturesEnabled && userService.currentUser.isAdmin && listingService.areSomeSelected$ | async"
         [tooltip]="'justifications-listing.bulk.delete' | translate"
         [type]="circleButtonTypes.dark"
         icon="iqser:trash"
@@ -26,7 +26,7 @@
     <div class="table-header-actions">
         <iqser-icon-button
             (action)="openAddJustificationDialog()"
-            *ngIf="userService.currentUser.isAdmin"
+            *ngIf="userPreferenceService.areDevFeaturesEnabled && userService.currentUser.isAdmin"
             [label]="'justifications-listing.add-new' | translate"
             [type]="iconButtonTypes.primary"
             icon="iqser:plus"

apps/red-ui/src/app/modules/admin/screens/justifications/justifications-screen/justifications-screen.component.ts

@@ -14,6 +14,7 @@ import { JustificationsService } from '@services/entity-services/justifications.
 import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service';
 import { JustificationsDialogService } from '../justifications-dialog.service';
 import { UserService } from '@services/user.service';
+import { UserPreferenceService } from '@services/user-preference.service';
 
 @Component({
     selector: 'redaction-justifications-screen',
@@ -43,6 +44,7 @@ export class JustificationsScreenComponent extends ListingComponent<Justificatio
         private readonly _loadingService: LoadingService,
         private readonly _dossierTemplatesService: DossierTemplatesService,
         private readonly _dialogService: JustificationsDialogService,
+        readonly userPreferenceService: UserPreferenceService,
         readonly userService: UserService,
     ) {
         super(_injector);

apps/red-ui/src/app/modules/admin/screens/justifications/table-item/table-item.component.html

@@ -24,7 +24,7 @@
 
         <iqser-circle-button
             (action)="openConfirmDeleteDialog()"
-            *ngIf="userService.currentUser.isAdmin"
+            *ngIf="userPreferenceService.areDevFeaturesEnabled && userService.currentUser.isAdmin"
             [tooltip]="'justifications-listing.actions.delete' | translate"
             [type]="circleButtonTypes.dark"
             icon="iqser:trash"

apps/red-ui/src/app/modules/admin/screens/justifications/table-item/table-item.component.ts

@@ -3,6 +3,7 @@ import { Justification } from '@red/domain';
 import { CircleButtonTypes, ListingService, LoadingService } from '@iqser/common-ui';
 import { JustificationsDialogService } from '../justifications-dialog.service';
 import { UserService } from '@services/user.service';
+import { UserPreferenceService } from '@services/user-preference.service';
 
 @Component({
     selector: 'redaction-table-item',
@@ -18,6 +19,7 @@ export class TableItemComponent {
         private readonly _dialogService: JustificationsDialogService,
         private readonly _loadingService: LoadingService,
         private readonly _listingService: ListingService<Justification>,
+        readonly userPreferenceService: UserPreferenceService,
         readonly userService: UserService,
     ) {}
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "redaction",
-  "version": "3.168.0",
+  "version": "3.169.0",
   "private": true,
   "license": "MIT",
   "scripts": {