@hmcts/ccd-case-ui-toolkit 6.19.11 → 6.19.12-rc2

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

@@ -26523,10 +26523,16 @@
             if (formGroup) {
                 checkConditionalShowAgainst = formGroup.parent.getRawValue().data;
                 formGroupAvailable = true;
-                if (idPrefix) {
-                    var fieldId = idPrefix.substring(0, idPrefix.indexOf('_'));
-                    if (checkConditionalShowAgainst[fieldId]) {
-                        checkConditionalShowAgainst = values;
+                if (idPrefix !== undefined) {
+                    if (idPrefix !== '') {
+                        var fieldId = idPrefix.substring(0, idPrefix.indexOf('_'));
+                        if (checkConditionalShowAgainst[fieldId]) {
+                            checkConditionalShowAgainst = values;
+                            formGroupAvailable = false;
+                        }
+                    }
+                    else {
+                        checkConditionalShowAgainst = Object.assign(checkConditionalShowAgainst, values);
                         formGroupAvailable = false;
                     }
                 }
@@ -32395,12 +32401,13 @@
         };
         // Refactored under EXUI-110 to address infinite tab loop to use tabIndexChanged instead
         CaseFullAccessViewComponent.prototype.tabChanged = function (tabIndexChanged) {
+            var _a;
             var matTab = this.tabGroup._tabs.find(function (tab) { return tab.isActive; });
             var tabLabel = matTab.textLabel;
             // sortedTabs are fragments
             // appended/prepepended tabs use router navigation
             if ((tabIndexChanged <= 1 && this.prependedTabs && this.prependedTabs.length) ||
-                (this.appendedTabs && this.appendedTabs.length && tabLabel === this.HEARINGS_TAB_LABEL)) {
+                (((_a = this.appendedTabs) === null || _a === void 0 ? void 0 : _a.length) && tabLabel === this.HEARINGS_TAB_LABEL)) {
                 // Hack to get ID from tab as it's not easily achieved through Angular Material Tabs
                 var tab = matTab['_viewContainerRef'];
                 var id = tab.element.nativeElement.id;
@@ -32420,6 +32427,7 @@
             var targetTabIndex = this.tabGroup._tabs.toArray().findIndex(function (tab) { return tab.textLabel === triggerOutputEventText; });
             if (targetTabIndex > -1) {
                 this.selectedTabIndex = targetTabIndex;
+                this.tabGroup.selectedIndex = targetTabIndex;
             }
         };
         CaseFullAccessViewComponent.prototype.hasActiveCaseFlags = function () {
@@ -32498,8 +32506,8 @@
             var value = {};
             if (caseFields) {
                 caseFields.forEach(function (caseField) {
-                    var _a;
-                    value = Object.assign(Object.assign({}, value), (_a = {}, _a[caseField.id] = caseField.value, _a));
+                    var _b;
+                    value = Object.assign(Object.assign({}, value), (_b = {}, _b[caseField.id] = caseField.value, _b));
                 });
             }
             return new i2$1.FormGroup({ data: new i2$1.FormControl(value) });