@hmcts/ccd-case-ui-toolkit 6.13.10-show-condition-fix → 6.13.10-show-condition-code-fix-2

package/bundles/hmcts-ccd-case-ui-toolkit.umd.js

@@ -11231,28 +11231,29 @@
                 || !ReadFieldsFilterPipe.isEmpty(value[field.id]);
         };
         ReadFieldsFilterPipe.getValue = function (field, values, index) {
-            var value;
-            if (index >= 0) {
-                value = values[index].value[field.id];
-            }
-            else {
-                value = values[field.id];
+            if (ReadFieldsFilterPipe.isEmpty(field.value)) {
+                var value = void 0;
+                if (index >= 0) {
+                    value = values[index].value[field.id];
+                }
+                else {
+                    value = values[field.id];
+                }
+                return value;
             }
-            return ReadFieldsFilterPipe.isEmpty(field.value) ? value : field.value;
+            return field.value;
         };
-        ReadFieldsFilterPipe.evaluateConditionalShow = function (field, formValue, path, formGroupAvaliable, fieldId) {
+        ReadFieldsFilterPipe.evaluateConditionalShow = function (field, formValue, path, formGroupAvailable, fieldId) {
             if (field.display_context === 'HIDDEN') {
                 field.hidden = true;
             }
             else if (field.show_condition) {
                 var cond = void 0;
-                if (fieldId && field.show_condition.indexOf(fieldId) > -1 && !formGroupAvaliable && !!Object.keys(formValue).length) {
-                    var search = fieldId + '.';
+                if (fieldId && field.show_condition.indexOf(fieldId + ".") > -1 && !formGroupAvailable && !!Object.keys(formValue).length) {
+                    var search = fieldId + ".";
                     var searchRegExp = new RegExp(search, 'g');
                     var replaceWith = '';
-                    var condition = field.show_condition.replace(searchRegExp, replaceWith);
-                    var isValidCondition = condition.split('"').length % 2 === 0;
-                    cond = ShowCondition.getInstance(isValidCondition ? field.show_condition : condition);
+                    cond = ShowCondition.getInstance(field.show_condition.replace(searchRegExp, replaceWith));
                 }
                 else {
                     cond = ShowCondition.getInstance(field.show_condition);