@hmcts/ccd-case-ui-toolkit 7.3.43-exui-3229 → 7.3.43-exui-4368-2916

package/fesm2022/hmcts-ccd-case-ui-toolkit.mjs

@@ -6624,6 +6624,7 @@ class LabelSubstitutorDirective {
     contextFields = [];
     formGroup;
     elementsToSubstitute = ['label', 'hint_text'];
+    initialLabel;
     initialHintText;
     languageSubscription;
     constructor(fieldsUtils, placeholderService, rpxTranslationPipe, rpxTranslationService) {
@@ -6633,9 +6634,10 @@ class LabelSubstitutorDirective {
         this.rpxTranslationService = rpxTranslationService;
     }
     ngOnInit() {
+        this.initialLabel = this.caseField.label;
         this.initialHintText = this.caseField.hint_text;
-        this.caseField.originalLabel = this.caseField.label;
         this.noCacheProcessing();
+        this.caseField.originalLabel = this.caseField.originalLabel || this.caseField.label;
         this.formGroup = this.formGroup || new FormGroup({});
         this.languageSubscription = this.rpxTranslationService.language$.pipe(skip(1)).subscribe(() => {
             this.onLanguageChange();
@@ -6658,22 +6660,56 @@ class LabelSubstitutorDirective {
             }
         }
     }
-    applySubstitutions() {
+    applySubstitutions(isLanguageChange = false) {
         const fields = this.getReadOnlyAndFormFields();
         if (this.shouldSubstitute('label')) {
-            const oldLabel = this.caseField.label;
-            const substitutedLabel = this.resolvePlaceholders(fields, this.caseField.label);
-            if (oldLabel && oldLabel !== substitutedLabel) {
-                // we need to translate the uninterpolated data then substitute the values in translated string
-                this.caseField.originalLabel = substitutedLabel;
-                const translated = this.rpxTranslationPipe.transform(oldLabel);
-                const transSubstitutedLabel = this.resolvePlaceholders(fields, translated);
-                this.caseField.label = transSubstitutedLabel;
-                this.caseField.isTranslated = this.rpxTranslationService.language === 'cy' && translated !== oldLabel;
+            const currentLabel = this.caseField.label;
+            // `originalLabel` stores the label exactly as it came from the server, before any
+            // placeholder values were inserted. That gives us a clean starting point when the user
+            // changes language or returns to the page later.
+            const originalLabel = this.caseField.originalLabel || currentLabel;
+            const substitutedCurrentLabel = this.resolvePlaceholders(fields, currentLabel);
+            const substitutedOriginalLabel = originalLabel === currentLabel
+                ? substitutedCurrentLabel
+                : this.resolvePlaceholders(fields, originalLabel);
+            const substitutedLabel = substitutedCurrentLabel || substitutedOriginalLabel;
+            const languageIsWelsh = this.rpxTranslationService.language === 'cy';
+            const hasAnyLabelSubstitution = (currentLabel && currentLabel !== substitutedCurrentLabel)
+                || (originalLabel && originalLabel !== substitutedOriginalLabel);
+            if (hasAnyLabelSubstitution) {
+                // Preserve the original template the first time we successfully interpolate it.
+                this.caseField.originalLabel = this.caseField.originalLabel || originalLabel;
+                // Some labels only translate correctly if we translate the template first and then
+                // substitute the helper values into the translated sentence.
+                const translatedTemplateLabel = this.resolvePlaceholders(fields, this.translateLabel(originalLabel, isLanguageChange));
+                // Other labels only translate correctly if we first resolve the English phrase and let
+                // the render layer translate that final resolved string.
+                const translatedResolvedLabel = this.translateLabel(substitutedLabel, isLanguageChange);
+                const hasResolvedWelshTranslation = languageIsWelsh
+                    && translatedResolvedLabel
+                    && translatedResolvedLabel !== substitutedLabel;
+                const hasTemplateWelshTranslation = languageIsWelsh
+                    && translatedTemplateLabel
+                    && translatedTemplateLabel !== substitutedLabel;
+                if (hasResolvedWelshTranslation) {
+                    // Keep the resolved English label and mark it as not yet translated so the field
+                    // template can run `rpxTranslate` on the full phrase at render time.
+                    this.setLabelState(substitutedLabel);
+                }
+                else if (hasTemplateWelshTranslation) {
+                    // Use the template-translated result when translating the fully resolved label does
+                    // not improve the Welsh output.
+                    this.setLabelState(translatedTemplateLabel, true);
+                }
+                else {
+                    // English, untranslated Welsh, or labels whose translation is handled elsewhere.
+                    this.setLabelState(substitutedLabel);
+                }
             }
             else {
-                this.caseField.label = substitutedLabel;
-                this.caseField.isTranslated = false;
+                // No placeholders were resolved, so keep the current label and allow the render layer
+                // to translate it normally if needed.
+                this.setLabelState(substitutedLabel);
             }
         }
         if (this.shouldSubstitute('hint_text')) {
@@ -6683,14 +6719,26 @@ class LabelSubstitutorDirective {
             this.caseField.value = this.resolvePlaceholders(fields, this.caseField.value);
         }
     }
+    translateLabel(label, isLanguageChange) {
+        return isLanguageChange && this.rpxTranslationService.language === 'en'
+            ? label
+            : this.rpxTranslationPipe.transform(label);
+    }
+    setLabelState(label, isTranslated = false) {
+        this.caseField.label = label;
+        this.caseField.isTranslated = isTranslated;
+    }
     onLanguageChange() {
-        this.resetToInitialValues();
-        this.applySubstitutions();
+        this.resetToInitialValues(true);
+        this.applySubstitutions(true);
     }
-    resetToInitialValues() {
-        if (this.caseField?.originalLabel) {
+    resetToInitialValues(isLanguageChange = false) {
+        if (isLanguageChange && this.caseField?.originalLabel) {
             this.caseField.label = this.caseField.originalLabel;
         }
+        if (!isLanguageChange && this.initialLabel) {
+            this.caseField.label = this.initialLabel;
+        }
         if (this.initialHintText) {
             this.caseField.hint_text = this.initialHintText;
         }
@@ -8748,14 +8796,9 @@ class CaseEditWizardGuard {
     }
     goToFirst(wizard, canShowPredicate, route) {
         const firstPage = wizard.firstPage(canShowPredicate);
-        // This route transition is an internal wizard redirect used to append the first page id to the URL.
-        // Mark it in navigation state so EventStartGuard can skip duplicate work allocation checks.
-        return this.router.navigate([...this.parentUrlSegments(route), firstPage ? firstPage.id : 'submit'], {
-            queryParams: route.queryParams,
-            state: {
-                [EVENT_START_FIRST_PAGE_REDIRECT]: true
-            }
-        });
+        // If there’s no specific wizard page called, it makes another navigation to either the first page available or to the submit page
+        // TODO should find a way to navigate to target page without going through the whole loop (and make a second call to BE) again
+        return this.router.navigate([...this.parentUrlSegments(route), firstPage ? firstPage.id : 'submit'], { queryParams: route.queryParams });
     }
     goToSubmit(route) {
         return this.router.navigate([...this.parentUrlSegments(route), 'submit'], { queryParams: route.queryParams });
@@ -9977,7 +10020,6 @@ class CaseEditComponent {
         }] }); })();
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(CaseEditComponent, { className: "CaseEditComponent", filePath: "lib/shared/components/case-editor/case-edit/case-edit.component.ts", lineNumber: 38 }); })();
 
-const EVENT_START_FIRST_PAGE_REDIRECT = 'eventStartFirstPageRedirect';
 function convertNonASCIICharacter(character) {
     if (character === '£') {
         // pound sign will be frequently used and works for btoa despite being non-ASCII
@@ -37464,10 +37506,6 @@ class EventStartGuard {
             }
         }
         return caseDataObservable.pipe(switchMap(() => {
-            if (this.shouldSkipDuplicateWorkAllocationCall()) {
-                this.abstractConfig.logMessage(`EventStartGuard: skipping duplicate work allocation call for caseId ${caseId} and eventId ${eventId}`);
-                return of(true);
-            }
             if (this.jurisdiction && this.caseType) {
                 if (this.caseId === caseId) {
                     return this.workAllocationService.getTasksByCaseIdAndEventId(eventId, caseId, this.caseType, this.jurisdiction)
@@ -37481,9 +37519,6 @@ class EventStartGuard {
             return of(false);
         }));
     }
-    shouldSkipDuplicateWorkAllocationCall() {
-        return this.router.getCurrentNavigation()?.extras?.state?.[EVENT_START_FIRST_PAGE_REDIRECT] === true;
-    }
     checkTaskInEventNotRequired(payload, caseId, taskId, eventId, userId) {
         if (!payload || !payload.tasks) {
             return true;