@hmcts/ccd-case-ui-toolkit 6.14.4-hotfix-110 → 6.14.4-hotfix-110-rc1

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

@@ -30844,18 +30844,16 @@
                 .subscribe(function (event) {
                 var url = event && event.url;
                 if (url) {
-                    if (url.includes('hearings')) {
-                        _this.selectedTabIndex = _this.getTabIndexByTabLabel(_this.tabGroup, 'hearings');
-                    }
-                    else {
-                        var urlFragment = _this.getUrlFragment(url);
-                        var tabLabel = decodeURIComponent(urlFragment);
-                        var tabIndex = _this.getTabIndexByTabLabel(_this.tabGroup, tabLabel);
-                        _this.selectedTabIndex = tabIndex;
+                    var tabUrl = url ? url.split('#') : null;
+                    var tab_1 = tabUrl && tabUrl.length > 1 ? tabUrl[tabUrl.length - 1].replaceAll('%20', ' ') : '';
+                    var matTab = _this.tabGroup._tabs.find(function (x) { return x.textLabel.toLowerCase() === tab_1.toLowerCase(); });
+                    if (matTab && matTab.position) {
+                        _this.tabGroup.selectedIndex = matTab.position;
                     }
                 }
             }));
         };
+        ;
         CaseFullAccessViewComponent.prototype.postViewActivity = function () {
             return this.activityPollingService.postViewActivity(this.caseDetails.case_id);
         };
@@ -30978,17 +30976,23 @@
                 }
             }
         };
+        // Refactored under EXUI-110 to address infinite tab loop to use tabIndexChanged instead
         CaseFullAccessViewComponent.prototype.tabChanged = function (tabIndexChanged) {
-            // Refactored under EXUI-110 to address infinite tab loop
             var matTab = this.tabGroup._tabs.find(function (tab) { return tab.isActive; });
             var tabLabel = matTab.textLabel;
-            // if hearings tab don't use fragment for navigation
+            // 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)) {
+                // 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;
                 // cases/case-details/:caseId/hearings
-                this.router.navigate([tabLabel.toLowerCase()], { relativeTo: this.route });
+                // cases/case-details/:caseId/roles-and-access
+                this.router.navigate([id], { relativeTo: this.route });
             }
             else {
+                // Routing here is based on tab label, not ideal
                 // cases/case-details/:caseId#tabLabel
                 this.router.navigate(['cases', 'case-details', this.caseDetails.case_id], { fragment: tabLabel });
             }