@hmcts/ccd-case-ui-toolkit 7.1.57 → 7.1.59

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

@@ -20847,11 +20847,12 @@ class QueryManagementUtils {
     static caseLevelCaseFieldId = 'CaseQueriesCollection';
     static FIELD_TYPE_COLLECTION = 'Collection';
     static FIELD_TYPE_COMPLEX = 'Complex';
+    static DISPLAY_CONTEXT_READONLY = 'READONLY';
     static extractCaseQueriesFromCaseField(caseField) {
-        const { field_type, value } = caseField;
+        const { field_type, value, display_context } = caseField;
         // Handle Complex type fields
         if (field_type.type === QueryManagementUtils.FIELD_TYPE_COMPLEX) {
-            if (field_type.id === QueryManagementUtils.caseLevelCaseFieldId && QueryManagementUtils.isNonEmptyObject(value)) {
+            if (field_type.id === QueryManagementUtils.caseLevelCaseFieldId && display_context !== QueryManagementUtils.DISPLAY_CONTEXT_READONLY && QueryManagementUtils.isNonEmptyObject(value)) {
                 return value;
             }
             return null;
@@ -21123,6 +21124,9 @@ class QueryCheckYourAnswersComponent {
     CASE_QUERIES_COLLECTION_ID = 'CaseQueriesCollection';
     FIELD_TYPE_COMPLEX = 'Complex';
     DISPLAY_CONTEXT_READONLY = 'READONLY';
+    QM_SELECT_FIRST_COLLECTION = 'selectFirstCollection';
+    QM_COLLECTION_PROMPT = 'promptQmCollection';
+    CIVIL_JURISDICTION = 'CIVIL';
     formGroup;
     queryItem;
     queryCreateContext;
@@ -21135,6 +21139,8 @@ class QueryCheckYourAnswersComponent {
     tid;
     createEventSubscription;
     searchTasksSubscription;
+    firstCollectionPicked = false; // Track whether the first collection has been picked
+    firstCollectionOrder;
     queryCreateContextEnum = QueryCreateContext;
     eventCompletionParams;
     caseQueriesCollections;
@@ -21171,11 +21177,13 @@ class QueryCheckYourAnswersComponent {
                 .subscribe({
                 next: (response) => {
                     // Filter task by query id
-                    if (this.tid && response.tasks?.length > 1) {
-                        this.filteredTasks = response.tasks?.filter((task) => task.id === this.tid);
-                    }
-                    else {
-                        this.filteredTasks = response.tasks;
+                    if (this.tid) {
+                        if (response.tasks?.length > 1) {
+                            this.filteredTasks = response.tasks?.filter((task) => task.id === this.tid);
+                        }
+                        else {
+                            this.filteredTasks = response.tasks;
+                        }
                     }
                 },
                 error: (error) => {
@@ -21214,7 +21222,14 @@ class QueryCheckYourAnswersComponent {
                 });
             }
             else {
-                console.error('Error: No task to complete found');
+                console.error('Error: No task to complete was found');
+                this.errorMessages = [
+                    {
+                        title: 'Error',
+                        description: 'No task to complete was found',
+                        fieldId: 'field-id'
+                    }
+                ];
             }
         }
         else {
@@ -21329,10 +21344,17 @@ class QueryCheckYourAnswersComponent {
         const messageId = this.route.snapshot.params.dataid;
         // Check if the field_type matches CaseQueriesCollection and type is Complex
         if (data.field_type.id === this.CASE_QUERIES_COLLECTION_ID && data.field_type.type === this.FIELD_TYPE_COMPLEX) {
-            if (this.queryCreateContext === QueryCreateContext.NEW_QUERY && data.display_context !== this.DISPLAY_CONTEXT_READONLY) {
-                this.fieldId = id;
-                // TODO
-                //if number qmCaseQueriesCollection is more then filter out the right qmCaseQueriesCollection
+            if (this.isNewQueryContext(data)) {
+                // If there is more than one qmCaseQueriesCollection, pick the one with the lowest order
+                if (count > 1) {
+                    if (!this.handleMultipleCollections()) {
+                        return;
+                    }
+                }
+                else {
+                    // Set the field ID dynamically based on the extracted data
+                    this.fieldId = id; // Store the ID for use in generating newQueryData
+                }
             }
             // If messageId is present, find the corresponding case message
             this.setMessageFieldId(messageId, value, id);
@@ -21347,6 +21369,45 @@ class QueryCheckYourAnswersComponent {
             }
         }
     }
+    isNewQueryContext(data) {
+        return this.queryCreateContext === QueryCreateContext.NEW_QUERY && data.display_context !== this.DISPLAY_CONTEXT_READONLY;
+    }
+    handleMultipleCollections() {
+        const jurisdictionId = this.caseDetails?.case_type?.jurisdiction?.id;
+        if (!jurisdictionId) {
+            console.error('Jurisdiction ID is missing.');
+            return false;
+        }
+        if (this.getCollectionSelectionMethod(jurisdictionId) === this.QM_SELECT_FIRST_COLLECTION) {
+            // Pick the collection with the lowest order
+            this.fieldId = this.getCaseQueriesCollectionFieldOrderFromWizardPages()?.id;
+        }
+        else {
+            // Display Error, for now, until EXUI-2644 is implemented
+            console.error(`Error: Multiple CaseQueriesCollections are not supported yet for the ${jurisdictionId} jurisdiction`);
+            return false;
+        }
+        return true;
+    }
+    getCaseQueriesCollectionFieldOrderFromWizardPages() {
+        const candidateFields = this.eventData?.case_fields?.filter((field) => field.field_type.id === this.CASE_QUERIES_COLLECTION_ID &&
+            field.field_type.type === this.FIELD_TYPE_COMPLEX &&
+            field.display_context !== this.DISPLAY_CONTEXT_READONLY);
+        if (!candidateFields?.length)
+            return undefined;
+        const firstPageFields = this.eventData?.wizard_pages?.[0]?.wizard_page_fields;
+        if (!firstPageFields)
+            return undefined;
+        return candidateFields
+            .map((field) => {
+            const wizardField = firstPageFields.find(f => f.case_field_id === field.id);
+            return { field, order: wizardField?.order ?? Number.MAX_SAFE_INTEGER };
+        })
+            .sort((a, b) => a.order - b.order)[0]?.field;
+    }
+    getCollectionSelectionMethod(jurisdiction) {
+        return jurisdiction.toUpperCase() === this.CIVIL_JURISDICTION ? this.QM_SELECT_FIRST_COLLECTION : this.QM_COLLECTION_PROMPT;
+    }
     getDocumentAttachments() {
         const attachmentsValue = this.formGroup.get('attachments').value;
         if (attachmentsValue && attachmentsValue.length > 0) {
@@ -21439,7 +21500,7 @@ class QueryCheckYourAnswersComponent {
         }], querySubmitted: [{
             type: Output
         }] }); })();
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(QueryCheckYourAnswersComponent, { className: "QueryCheckYourAnswersComponent", filePath: "lib/shared/components/palette/query-management/components/query-check-your-answers/query-check-your-answers.component.ts", lineNumber: 27 }); })();
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(QueryCheckYourAnswersComponent, { className: "QueryCheckYourAnswersComponent", filePath: "lib/shared/components/palette/query-management/components/query-check-your-answers/query-check-your-answers.component.ts", lineNumber: 26 }); })();
 
 function QueryDetailsComponent_ng_container_0_cut_alert_1_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "cut-alert", 11);
@@ -33489,6 +33550,7 @@ class CaseResolver {
     static EVENT_REGEX = new RegExp('\/trigger\/.*?\/submit$');
     static PARAM_CASE_ID = 'cid';
     static CASE_CREATED_MSG = 'The case has been created successfully';
+    static EVENT_ID_QM_RESPOND_TO_QUERY = 'eventId=queryManagementRespondQuery';
     static defaultWAPage = '/work/my-work/list';
     static defaultPage = '/cases';
     // we need to run the CaseResolver on every child route of 'case/:jid/:ctid/:cid'
@@ -33509,6 +33571,12 @@ class CaseResolver {
     }
     resolve(route) {
         const cid = route.paramMap.get(CaseResolver.PARAM_CASE_ID);
+        const currentUrl = this.router.url ?? '';
+        // Prevent resolving if eventId=queryManagementRespondQuery is in the URL
+        if (currentUrl.includes(CaseResolver.EVENT_ID_QM_RESPOND_TO_QUERY)) {
+            console.info('Skipping resolve for event queryManagementRespondQuery.');
+            this.goToDefaultPage();
+        }
         if (!cid) {
             console.info('No case ID available in the route. Will navigate to case list.');
             // when redirected to case view after a case created, and the user has no READ access,