@hmcts/ccd-case-ui-toolkit 6.13.0-rc4 → 6.13.0-rc6

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

@@ -4419,7 +4419,7 @@
             }], null, null);
     })();
 
-    var conditionSource = "{\n    function flat(arr, depth = 1) {\n      var flatten = function (arr, depth = 1) {\n        if (depth) return arr;\n\n      // Otherwise, concatenate into the parent array\n      return arr.reduce(function (acc, val) {\n        return acc.concat(Array.isArray(val) ? flatten(val, depth - 1) : val);\n      }, []);\n\n      };\n\n    return flatten(arr, depth - 1);\n    }\n  }\n\n  Start\n    = Formula\n\n  Formula\n    = EnclosedFormula\n    / OpenFormula\n\n  EnclosedFormula\n    = bracket formula:OpenFormula bracket join:(JoinComparator)*\n      { return flat([ [formula], join[0] ], 1) }\n\n  OpenFormula\n    = eq:OpenEqualityCheck joins:(JoinComparator)*\n      { return flat([ eq, flat(joins) ]) }\n\n  JoinComparator\n    = comp:Comparator eq:OpenEqualityCheck\n      { return [comp, eq]; }\n      / CompoundJoinComparator\n\n  CompoundJoinComparator\n    = comp:Comparator bracket f:OpenFormula bracket\n      { return [comp, f ] }\n\n  OpenEqualityCheck\n    = fr:FieldReference _? op:operator _? val:Value\n     { return { fieldReference: fr, comparator: op, value: val } }\n\n  Comparator\n   = _? c:'AND' _?\n   { return c; }\n   / _? c:'OR' _?\n   { return c; }\n\n  Word\n   = l:Letter+\n   { return l.join(\"\"); }\n\n  Letter\n   = [a-zA-Z]\n\n  Value\n   = v:quotedValue / v:Word\n   { return v.join(\"\") }\n   / v:number\n   { return parseInt(v.join(\"\")) }\n\n  FieldReference\n    = characters:[A-Za-z0-9._]+ { return characters.join(\"\"); }\n\n  number\n   = [0-9]+\n\n  quotedValue\n   = '\"'val:[A-Za-z0-9.,* _/-]*'\"'\n   { return val.join(\"\"); }\n\n  bracket\n   = (_? \"(\"+ _? / _? \")\"+ _? )\n\n  operator\n   = \"=\" / \"!=\" / \"CONTAINS\"\n\n  ws \"Whitespace\"\n   = [ \t]\n\n  _ \"One or more whitespaces\"\n   = ws+\n\n  nl \"New line\"\n   = \"\\n\"";
+    var conditionSource = "{\n    function flat(arr, depth = 1) {\n      var flatten = function (arr, depth = 1) {\n        if (depth) return arr;\n\n      // Otherwise, concatenate into the parent array\n      return arr.reduce(function (acc, val) {\n        return acc.concat(Array.isArray(val) ? flatten(val, depth - 1) : val);\n      }, []);\n\n      };\n\n    return flatten(arr, depth - 1);\n    }\n  }\n\n  Start\n    = Formula\n\n  Formula\n    = EnclosedFormula\n    / OpenFormula\n\n  EnclosedFormula\n    = bracket formula:OpenFormula bracket join:(JoinComparator)*\n      { return flat([ [formula], join[0] ], 1) }\n\n  OpenFormula\n    = eq:OpenEqualityCheck joins:(JoinComparator)*\n      { return flat([ eq, flat(joins) ]) }\n\n  JoinComparator\n    = comp:Comparator eq:OpenEqualityCheck\n      { return [comp, eq]; }\n      / CompoundJoinComparator\n\n  CompoundJoinComparator\n    = comp:Comparator bracket f:OpenFormula bracket\n      { return [comp, f ] }\n\n  OpenEqualityCheck\n    = fr:FieldRef _? op:operator _? val:Value\n     { return { fieldReference: fr, comparator: op, value: val } }\n\n  Comparator\n   = _? c:'AND' _?\n   { return c; }\n   / _? c:'OR' _?\n   { return c; }\n\n  Word\n   = l:Letter+\n   { return l.join(\"\"); }\n\n  Letter\n   = [a-zA-Z]\n\n  Value\n   = v:quotedValue / v:Word\n   { return v.join(\"\") }\n   / v:number\n   { return parseInt(v.join(\"\")) }\n\n  FieldRef\n   = FieldReference / MetadataFieldReference\n\n  MetadataFieldReference\n    = s1:openSquare fr:FieldReference s2:closeSquare\n    { return s1 + fr + s2 }\n\n  FieldReference\n    = characters:[A-Za-z0-9._]+ { return characters.join(\"\"); }\n\n  openSquare\n   = \"[\"\n\n  closeSquare\n   = \"]\"\n\n  number\n   = [0-9]+\n\n  quotedValue\n   = '\"'val:[A-Za-z0-9.,* _/-]*'\"'\n   { return val.join(\"\"); }\n\n  bracket\n   = (_? \"(\"+ _? / _? \")\"+ _? )\n\n  operator\n   = \"=\" / \"!=\" / \"CONTAINS\"\n\n  ws \"Whitespace\"\n   = [ \t]\n\n  _ \"One or more whitespaces\"\n   = ws+\n\n  nl \"New line\"\n   = \"\\n\"";
     var peg = pegjs.generate(conditionSource);
 
     var ConditionParser = /** @class */ (function () {
@@ -4435,7 +4435,6 @@
                 return null;
             }
             ;
-            condition = condition.replace(/[[\]]/g, '');
             condition = condition.replace(/CONTAINS/g, ' CONTAINS');
             return peg.parse(condition.trim(), {});
         };
@@ -4465,11 +4464,6 @@
                     }
                 }
                 if (condition.comparator) {
-                    if (condition.fieldReference == condition.fieldReference.toUpperCase()) {
-                        if (!(condition.fieldReference.startsWith('[') && condition.fieldReference.endsWith(']'))) {
-                            condition.fieldReference = '[' + condition.fieldReference + ']';
-                        }
-                    }
                     var formula = condition.fieldReference + condition.comparator + condition.value;
                     currentConditionResult = _this.matchEqualityCondition(fields, formula, path);
                 }
@@ -27765,7 +27759,7 @@
             this.activeCaseFlags = this.hasActiveCaseFlags();
         };
         CaseFullAccessViewComponent.prototype.ngOnChanges = function (changes) {
-            if (!changes.prependedTabs.firstChange) {
+            if (changes && changes.prependedTabs && !changes.prependedTabs.firstChange) {
                 this.init();
                 this.crf.detectChanges();
                 this.organiseTabPosition();
@@ -27792,8 +27786,10 @@
         };
         CaseFullAccessViewComponent.prototype.checkRouteAndSetCaseViewTab = function () {
             var _this = this;
-            this.router.events.subscribe(function (val) {
-                var url = val && val.url;
+            this.router.events
+                .pipe(operators.filter(function (event) { return event instanceof i1$1.NavigationEnd; }))
+                .subscribe(function (event) {
+                var url = event && event.url;
                 if (url) {
                     var tabUrl = url ? url.split('#') : null;
                     var tab_1 = tabUrl && tabUrl.length > 1 ? tabUrl[tabUrl.length - 1].replaceAll('%20', ' ') : '';