@hmcts/ccd-case-ui-toolkit 4.12.0 → 4.12.1

package/dist/index.umd.js

@@ -1,6 +1,6 @@
 /**
  * @hmcts/ccd-case-ui-toolkit - Case UI Toolkit
- * @version v4.12.0
+ * @version v4.12.1
  * @link undefined
  * @license MIT
  */
@@ -23584,16 +23584,33 @@ var CaseFullAccessViewComponent = /** @class */ (function () {
         var matTab;
         var url = this.location.path(true);
         var hashValue = url.substring(url.indexOf('#') + 1);
-        // if we have prepended tabs route to one of the prepended tabs
-        if (!url.includes('#') && this.prependedTabs && this.prependedTabs.length) {
+        if (!url.includes('#')) {
             var paths = url.split('/');
-            var tabName_1 = decodeURIComponent(paths[paths.length - 1]);
-            var selectedTab_1 = this.prependedTabs.find(function (caseTab) { return caseTab.id.toLowerCase() === tabName_1.toLowerCase(); });
-            var tab = selectedTab_1 ? selectedTab_1.id : 'tasks';
-            this.router.navigate(['cases', 'case-details', this.caseDetails.case_id, tab]).then(function () {
-                matTab = _this.tabGroup._tabs.find(function (x) { return x.textLabel === selectedTab_1.label; });
-                _this.tabGroup.selectedIndex = matTab.position;
-            });
+            // lastPath can be /caseId, or the tabs /tasks, /hearings etc.
+            var lastPath_1 = decodeURIComponent(paths[paths.length - 1]);
+            var foundTab_1 = null;
+            var additionalTabs = this.prependedTabs.concat(this.appendedTabs);
+            if (additionalTabs && additionalTabs.length) {
+                foundTab_1 = additionalTabs.find(function (caseTab) { return caseTab.id.toLowerCase() === lastPath_1.toLowerCase(); });
+            }
+            // found tasks or hearing tab
+            if (foundTab_1) {
+                this.router.navigate(['cases', 'case-details', this.caseDetails.case_id, foundTab_1.id]).then(function () {
+                    matTab = _this.tabGroup._tabs.find(function (x) { return x.textLabel === foundTab_1.label; });
+                    _this.tabGroup.selectedIndex = matTab.position;
+                });
+                // last path is caseId
+            }
+            else {
+                // sort with the order of CCD predefined tabs
+                this.caseDetails.tabs.sort(function (aTab, bTab) { return aTab.order > bTab.order ? 1 : (bTab.order > aTab.order ? -1 : 0); });
+                // preselect the 1st order of CCD predefined tabs
+                var preSelectTab_1 = this.caseDetails.tabs[0];
+                this.router.navigate(['cases', 'case-details', this.caseDetails.case_id]).then(function () {
+                    matTab = _this.tabGroup._tabs.find(function (x) { return x.textLabel === preSelectTab_1.label; });
+                    _this.tabGroup.selectedIndex = matTab.position;
+                });
+            }
         }
         else {
             var regExp = new RegExp(CaseFullAccessViewComponent_1.UNICODE_SPACE, 'g');