@hmcts/ccd-case-ui-toolkit 7.1.14 → 7.1.15

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

@@ -9535,42 +9535,48 @@ class CaseEditComponent {
             if (caseField && caseField.retain_hidden_value &&
                 (caseField.hidden || (caseField.hidden !== false && parentField && parentField.hidden))) {
                 if (caseField.field_type.type === 'Complex') {
-                    // Note: Deliberate use of equality (==) and non-equality (!=) operators for null checks throughout, to
-                    // handle both null and undefined values
-                    if (caseField.value != null) {
-                        // Call this function recursively to replace the Complex field's sub-fields as necessary, passing the
-                        // CaseField itself (the sub-fields do not contain any values, so these need to be obtained from the
-                        // parent)
-                        // Update rawFormValueData for this field
-                        // creating form group and adding control into it in case caseField is of complext type and and part of formGroup
-                        const form = new FormGroup({});
-                        if (formGroup.controls[key].value) {
-                            Object.keys(formGroup.controls[key].value).forEach((item) => {
-                                form.addControl(item, new FormControl(formGroup.controls[key].value[item]));
-                            });
-                        }
-                        rawFormValueData[key] = this.replaceHiddenFormValuesWithOriginalCaseData(form, caseField.field_type.complex_fields, caseField);
-                    }
+                    this.handleComplexField(caseField, formGroup, key, rawFormValueData);
                 }
                 else {
-                    // Default case also handles collections of *all* types; the entire collection in rawFormValueData will be
-                    // replaced with the original from formatted_value
-                    // Use the CaseField's existing *formatted_value* from the parent, if available. (This is necessary for
-                    // Complex fields, whose sub-fields do not hold any values in the model.) Otherwise, use formatted_value
-                    // from the CaseField itself.
-                    if (parentField && parentField.formatted_value) {
-                        rawFormValueData[key] = parentField.formatted_value[caseField.id];
-                    }
-                    else {
-                        if (!(caseField.hidden && caseField.retain_hidden_value)) {
-                            rawFormValueData[key] = caseField.formatted_value;
-                        }
-                    }
+                    this.handleNonComplexField(parentField, rawFormValueData, key, caseField);
                 }
             }
         });
         return rawFormValueData;
     }
+    handleNonComplexField(parentField, rawFormValueData, key, caseField) {
+        // Default case also handles collections of *all* types; the entire collection in rawFormValueData will be
+        // replaced with the original from formatted_value
+        // Use the CaseField's existing *formatted_value* from the parent, if available. (This is necessary for
+        // Complex fields, whose sub-fields do not hold any values in the model.) Otherwise, use formatted_value
+        // from the CaseField itself.
+        if (parentField && parentField.formatted_value) {
+            rawFormValueData[key] = parentField.formatted_value[caseField.id];
+        }
+        else {
+            if (!(caseField.hidden && caseField.retain_hidden_value)) {
+                rawFormValueData[key] = caseField.formatted_value;
+            }
+        }
+    }
+    handleComplexField(caseField, formGroup, key, rawFormValueData) {
+        // Note: Deliberate use of equality (==) and non-equality (!=) operators for null checks throughout, to
+        // handle both null and undefined values
+        if (caseField.value != null) {
+            // Call this function recursively to replace the Complex field's sub-fields as necessary, passing the
+            // CaseField itself (the sub-fields do not contain any values, so these need to be obtained from the
+            // parent)
+            // Update rawFormValueData for this field
+            // creating form group and adding control into it in case caseField is of complext type and and part of formGroup
+            const form = new FormGroup({});
+            if (formGroup.controls[key].value) {
+                Object.keys(formGroup.controls[key].value).forEach((item) => {
+                    form.addControl(item, new FormControl(formGroup.controls[key].value[item]));
+                });
+            }
+            rawFormValueData[key] = this.replaceHiddenFormValuesWithOriginalCaseData(form, caseField.field_type.complex_fields, caseField);
+        }
+    }
     caseSubmit({ form, caseEventData, submit }) {
         const loadingSpinnerToken = this.loadingService.register();
         // keep the initial event response to finalise process after task completion
@@ -20338,26 +20344,32 @@ class QueryCheckYourAnswersComponent {
         if (data.field_type.id === this.CASE_QUERIES_COLLECTION_ID && data.field_type.type === this.FIELD_TYPE_COMPLEX) {
             if (this.queryCreateContext === QueryCreateContext.NEW_QUERY) {
                 //if number qmCaseQueriesCollection is more then filter out the right qmCaseQueriesCollection
-                if (count > 1) {
-                    const matchingRole = acls?.find((acl) => acl.role === this.roleName);
-                    if (matchingRole) {
-                        this.fieldId = id;
-                    }
-                }
-                else {
-                    // Set the field ID dynamically based on the extracted data
-                    this.fieldId = id; // Store the ID for use in generating newQueryData
-                }
+                this.setFieldId(count, acls, id);
             }
             // If messageId is present, find the corresponding case message
-            if (messageId && value?.caseMessages) {
-                // If a matching message is found, set the fieldId to the corresponding id
-                const matchedMessage = value?.caseMessages?.find((message) => message.value.id === messageId);
-                if (matchedMessage) {
-                    this.fieldId = id;
-                }
+            this.setMessageFieldId(messageId, value, id);
+        }
+    }
+    setMessageFieldId(messageId, value, id) {
+        if (messageId && value?.caseMessages) {
+            // If a matching message is found, set the fieldId to the corresponding id
+            const matchedMessage = value?.caseMessages?.find((message) => message.value.id === messageId);
+            if (matchedMessage) {
+                this.fieldId = id;
+            }
+        }
+    }
+    setFieldId(count, acls, id) {
+        if (count > 1) {
+            const matchingRole = acls?.find((acl) => acl.role === this.roleName);
+            if (matchingRole) {
+                this.fieldId = id;
             }
         }
+        else {
+            // Set the field ID dynamically based on the extracted data
+            this.fieldId = id; // Store the ID for use in generating newQueryData
+        }
     }
     getDocumentAttachments() {
         const attachmentsValue = this.formGroup.get('attachments').value;
@@ -20453,7 +20465,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: 26 }); })();
+(() => { (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 }); })();
 
 function QueryDetailsComponent_ng_container_0_tr_46_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "tr", 11)(1, "th", 7);