@hmcts/ccd-case-ui-toolkit 7.3.54-exui-3229 → 7.3.54-exui-2837-1

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

@@ -3985,6 +3985,7 @@ class WorkbasketInputModel {
     label;
     order;
     field;
+    dataType;
     metadata;
     display_context_parameter;
 }
@@ -4033,6 +4034,16 @@ class FieldsUtils {
         }
         return obj;
     }
+    static buildFieldId(fieldId, elementPath, dataType) {
+        if (!fieldId || !elementPath) {
+            return fieldId;
+        }
+        const normalizedType = typeof dataType === 'string' ? dataType.toLowerCase() : '';
+        if (normalizedType === 'collection') {
+            return `${fieldId}.value.${elementPath}`;
+        }
+        return `${fieldId}.${elementPath}`;
+    }
     static toValuesMap(caseFields) {
         const valueMap = {};
         caseFields.forEach(field => {
@@ -8876,14 +8887,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 });
@@ -10106,7 +10112,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: 39 }); })();
 
-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
@@ -34502,9 +34507,7 @@ class WorkbasketFiltersComponent {
                         .sort(this.orderService.sortAsc);
                     const formValue = this.windowService.getLocalStorage(FORM_GROUP_VAL_LOC_STORAGE);
                     workbasketInputs.forEach(item => {
-                        if (item.field.elementPath) {
-                            item.field.id = `${item.field.id}.${item.field.elementPath}`;
-                        }
+                        item.field.id = FieldsUtils.buildFieldId(item.field.id, item.field.elementPath, item.dataType);
                         item.field.label = item.label;
                         if (formValue) {
                             const searchFormValueObject = JSON.parse(formValue);
@@ -37878,10 +37881,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)
@@ -37895,9 +37894,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;
@@ -40074,12 +40070,14 @@ class SearchInput {
     field;
     metadata;
     display_context_parameter;
-    constructor(label, order, field, metadata, display_context_parameter) {
+    dataType;
+    constructor(label, order, field, metadata, display_context_parameter, dataType) {
         this.label = label;
         this.order = order;
         this.field = field;
         this.metadata = metadata;
         this.display_context_parameter = display_context_parameter;
+        this.dataType = dataType;
     }
 }
 
@@ -40277,9 +40275,7 @@ class SearchFiltersComponent {
                 formValueObject = JSON.parse(formValue);
             }
             searchInputs.forEach(item => {
-                if (item.field.elementPath) {
-                    item.field.id = `${item.field.id}.${item.field.elementPath}`;
-                }
+                item.field.id = FieldsUtils.buildFieldId(item.field.id, item.field.elementPath, item.dataType);
                 item.field.label = item.label;
                 if (formValueObject) {
                     item.field.value = formValueObject[item.field.id];