@hmcts/ccd-case-ui-toolkit 4.7.0-EUI-4412-order-fields-CYA-page → 4.7.0-EUI-4567-nested-fields-collection

package/RELEASE-NOTES.md

@@ -1,8 +1,5 @@
 ## RELEASE NOTES
 
-### Version 4.7.0-EUI-4412-order-fields-CYA-page
-**EUI-4414** Field order on the CYA page changes
-
 ### Version 3.1.5-complex-type-showing-in-tab
 **EUI-3798** 'Empty' complex type showing in tab (due to Label)
 

package/dist/index.umd.js

@@ -1,6 +1,6 @@
 /**
  * @hmcts/ccd-case-ui-toolkit - Case UI Toolkit
- * @version v4.7.0-EUI-4412-order-fields-CYA-page
+ * @version v4.7.0-EUI-4567-nested-fields-collection
  * @link undefined
  * @license MIT
  */
@@ -20900,7 +20900,7 @@ var CcdPageFieldsPipe = /** @class */ (function () {
             return control['caseField'];
         }).filter(function (field) {
             return !!page.case_fields.find(function (pcf) { return pcf.id === field.id; });
-        }).sort(function (a, b) { return a.order - b.order; });
+        });
         var rawValue = dataFormGroup.value;
         var value = page.case_fields.reduce(function (acc, field) {
             var _a;
@@ -29198,7 +29198,27 @@ var ShowCondition = /** @class */ (function () {
         if (!this.condition) {
             return true;
         }
-        return this.matchAndConditions(fields, path);
+        return this.matchAndConditions(fields, this.updatePathName(path));
+    };
+    /**
+     * Path Name gets updated for complex sub fields
+     * @param path Path name.
+     */
+    ShowCondition.prototype.updatePathName = function (path) {
+        if (path && path.split(/[_]+/g).length > 0) {
+            var _a = path.split(/[_]+/g), pathName_1 = _a[0], pathTail = _a.slice(1);
+            var pathFinalIndex_1 = pathTail.pop();
+            var pathTailString = pathTail.toString();
+            pathTail = pathTail.map(function (value) {
+                return Number(pathFinalIndex_1) === Number(value) ? pathName_1 : value;
+            });
+            return pathTailString !== pathTail.toString()
+                ? pathName_1 + "_" + pathTail.join('_') + "_" + pathFinalIndex_1
+                : path;
+        }
+        else {
+            return path;
+        }
     };
     ShowCondition.prototype.matchByContextFields = function (contextFields) {
         return this.match(fields_utils_1.FieldsUtils.toValuesMap(contextFields));