From 9922526fc6262eb87220b556eedd43d690a2d959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Wed, 29 May 2024 15:04:12 +0300 Subject: [PATCH] RED-6143: Updates according to comment --- .../admin/screens/info/dossier-template-info.module.ts | 9 ++++++++- .../dossier-template-actions.component.html | 1 + .../dossier-template-actions.component.ts | 1 + apps/red-ui/src/assets/i18n/redact/en.json | 4 ++-- apps/red-ui/src/assets/i18n/scm/en.json | 4 ++-- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info.module.ts b/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info.module.ts index adb906247..b7d6deb4e 100644 --- a/apps/red-ui/src/app/modules/admin/screens/info/dossier-template-info.module.ts +++ b/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], diff --git a/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.html b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.html index c20f6e637..77b4d562d 100644 --- a/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.html +++ b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.html @@ -15,6 +15,7 @@ > (); + readonly enableEdit = this._route.routeConfig?.path !== 'info'; dossierTemplate: DossierTemplate; constructor( diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json index 860fd294f..9829f211f 100644 --- a/apps/red-ui/src/assets/i18n/redact/en.json +++ b/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" -} \ No newline at end of file +} diff --git a/apps/red-ui/src/assets/i18n/scm/en.json b/apps/red-ui/src/assets/i18n/scm/en.json index b005ac747..ea0dbb2f0 100644 --- a/apps/red-ui/src/assets/i18n/scm/en.json +++ b/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" -} \ No newline at end of file +}