@hmcts/ccd-case-ui-toolkit 4.18.13 → 4.18.14-rc1

package/dist/index.umd.js

@@ -1,6 +1,6 @@
 /**
  * @hmcts/ccd-case-ui-toolkit - Case UI Toolkit
- * @version v4.18.13
+ * @version v4.18.14-rc1
  * @link undefined
  * @license MIT
  */
@@ -29603,12 +29603,21 @@ var ReadFieldsFilterPipe = /** @class */ (function () {
         }
         return ReadFieldsFilterPipe_1.isEmpty(field.value) ? value : field.value;
     };
-    ReadFieldsFilterPipe.evaluateConditionalShow = function (field, formValue, path) {
+    ReadFieldsFilterPipe.evaluateConditionalShow = function (field, formValue, path, formGroupAvaliable, fieldId) {
         if (field.display_context === 'HIDDEN') {
             field.hidden = true;
         }
         else if (field.show_condition) {
-            var cond = directives_1.ShowCondition.getInstance(field.show_condition);
+            var cond = void 0;
+            if (fieldId && field.show_condition.indexOf(fieldId) > -1 && !formGroupAvaliable && !!Object.keys(formValue).length) {
+                var search = fieldId + '.';
+                var searchRegExp = new RegExp(search, 'g');
+                var replaceWith = '';
+                cond = directives_1.ShowCondition.getInstance(field.show_condition.replace(searchRegExp, replaceWith));
+            }
+            else {
+                cond = directives_1.ShowCondition.getInstance(field.show_condition);
+            }
             field.hidden = !cond.match(formValue, path);
         }
         else {
@@ -29635,8 +29644,10 @@ var ReadFieldsFilterPipe = /** @class */ (function () {
         var fields = complexField.field_type.complex_fields || [];
         var values = complexField.value || {};
         var checkConditionalShowAgainst = values;
+        var formGroupAvailable = false;
         if (formGroup) {
             checkConditionalShowAgainst = formGroup.value;
+            formGroupAvailable = true;
         }
         return fields
             .map(function (f) {
@@ -29652,7 +29663,7 @@ var ReadFieldsFilterPipe = /** @class */ (function () {
                 f.display_context = complexField.display_context;
             }
             if (setupHidden) {
-                ReadFieldsFilterPipe_1.evaluateConditionalShow(f, checkConditionalShowAgainst, path);
+                ReadFieldsFilterPipe_1.evaluateConditionalShow(f, checkConditionalShowAgainst, path, formGroupAvailable, complexField.id);
             }
             return f;
         })
@@ -30401,9 +30412,11 @@ var ReadComplexFieldComponent = /** @class */ (function (_super) {
         if (this.caseField.display_context_parameter) {
             this.context = palette_context_enum_1.PaletteContext.TABLE_VIEW;
         }
-        else if (!this.caseField.display_context_parameter && this.context && this.context !== palette_context_enum_1.PaletteContext.CHECK_YOUR_ANSWER) {
+        else {
             // default to default views
-            this.context = palette_context_enum_1.PaletteContext.DEFAULT;
+            if (!this.caseField.display_context_parameter && this.context) {
+                this.context = palette_context_enum_1.PaletteContext.DEFAULT;
+            }
         }
         if (this.caseField.field_type) {
             this.caseField.field_type.complex_fields.map(function (field) {