Merge branch 'RED-6143' into 'master'

RED-6143: Updates according to comment

Closes RED-6143

See merge request redactmanager/red-ui!436

apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info.module.ts

@@ -8,8 +8,15 @@ import { TranslateModule } from '@ngx-translate/core';
 import { IqserUsersModule } from '@iqser/common-ui/lib/users';
 import { SelectComponent } from '@shared/components/select/select.component';
 import { DossierTemplateDetailsComponent } from './dossier-template-details/dossier-template-details.component';
+import { PendingChangesGuard } from '@guards/can-deactivate.guard';
 
-const routes = [{ path: '', component: DossierTemplateInfoScreenComponent }];
+const routes = [
+    {
+        path: '',
+        component: DossierTemplateInfoScreenComponent,
+        canDeactivate: [PendingChangesGuard],
+    },
+];
 
 @NgModule({
     declarations: [DossierTemplateInfoScreenComponent, DossierTemplateDetailsComponent],

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

@@ -15,6 +15,7 @@
         ></iqser-circle-button>
 
         <iqser-circle-button
+            *ngIf="enableEdit"
             [buttonId]="'edit-dossier-template-btn'"
             [routerLink]="dossierTemplate.routerLink"
             [tooltip]="'dossier-templates-listing.action.edit' | translate"

apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.ts

@@ -20,6 +20,7 @@ export class DossierTemplateActionsComponent implements OnInit {
     @Input() dossierTemplateId: string;
 
     readonly currentUser = getCurrentUser<User>();
+    readonly enableEdit = this._route.routeConfig?.path !== 'info';
     dossierTemplate: DossierTemplate;
 
     constructor(

apps/red-ui/src/assets/i18n/redact/en.json

@@ -28,7 +28,7 @@
   },
   "add-clone-dossier-template": {
     "save": "{type, select, clone{Clone} other{Save}}",
-    "save-and-edit": "{type, select, clone{Clone} other{Save}} and edit",
+    "save-and-edit": "{type, select, clone{Clone} other{Clone}} and edit",
     "title": "{type, select, clone{Clone {dossierTemplateName}} other{Create dossier template}}"
   },
   "add-dossier-dialog": {
@@ -2502,4 +2502,4 @@
     }
   },
   "yesterday": "Yesterday"
-}
+}

apps/red-ui/src/assets/i18n/scm/en.json

@@ -28,7 +28,7 @@
   },
   "add-clone-dossier-template": {
     "save": "{type, select, clone{Clone} other{Save}}",
-    "save-and-edit": "{type, select, clone{Clone} other{Save}} and edit",
+    "save-and-edit": "{type, select, clone{Clone} other{Clone}} and edit",
     "title": "{type, select, clone{Clone {dossierTemplateName}} other{Create dossier template}}"
   },
   "add-dossier-dialog": {
@@ -2502,4 +2502,4 @@
     }
   },
   "yesterday": "Yesterday"
-}
+}