@hmcts/ccd-case-ui-toolkit 4.7.6-hearings-tab → 4.7.6-tab-not-defined

package/RELEASE-NOTES.md

@@ -1,7 +1,11 @@
 ## RELEASE NOTES
 
+### Version 4.7.6-tab-not-defined-error"
+**EUI-4562** Case details Active tasks tab on success not returning to active tasks page
+
 ### Version 4.7.6-hearings-tab
 **EUI-4441** Add hearings tab in case details
+**EUI-4627** Can't access /hearings tab from URL
 
 ### Version 4.7.0-EUI-4412-order-fields-CYA-page
 **EUI-4414** Field order on the CYA page changes

package/dist/index.umd.js

@@ -1,6 +1,6 @@
 /**
  * @hmcts/ccd-case-ui-toolkit - Case UI Toolkit
- * @version v4.7.6-hearings-tab
+ * @version v4.7.6-tab-not-defined
  * @link undefined
  * @license MIT
  */
@@ -15219,6 +15219,7 @@ var CaseHeaderComponent = /** @class */ (function () {
         this.caseTitle = new domain_1.CaseField();
         if (!this.isDraft() && this.caseDetails.state.title_display) {
             this.caseTitle.label = this.caseDetails.state.title_display;
+            this.label = this.caseTitle.label;
             this.caseFields = this.getCaseFields();
         }
     };
@@ -16761,16 +16762,35 @@ 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; });
+                    if (matTab && matTab.position) {
+                        _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');
@@ -28970,16 +28990,18 @@ var WorkbasketFiltersComponent = /** @class */ (function () {
         var formGroupLS = JSON.parse(this.windowService.getLocalStorage(FORM_GROUP_VAL_LOC_STORAGE));
         // Form group local storage is available and contains regionList property
         if (util_1.isDefined(formGroupLS) && formGroupLS.hasOwnProperty(REGION_LIST_AND_FRC_FILTER)) {
-            // If regionList value does not match between local storage and form group
-            // then the filter value has been changed and we need to clear the old filter values
-            if (formGroupLS[REGION_LIST_AND_FRC_FILTER] !== this.formGroup.get(REGION_LIST_AND_FRC_FILTER).value) {
-                for (var key in formGroupLS) {
-                    if (formGroupLS.hasOwnProperty(key)) {
-                        var value = formGroupLS[key];
-                        // Clear the filter form group control values if it has a value in local storage
-                        // The regionList form group control value should be ignored as it always contain the latest value
-                        if (key !== REGION_LIST_AND_FRC_FILTER && value != null) {
-                            this.formGroup.get(key).setValue(null);
+            if (this.formGroup.get(REGION_LIST_AND_FRC_FILTER)) {
+                // If regionList value does not match between local storage and form group
+                // then the filter value has been changed and we need to clear the old filter values
+                if (formGroupLS[REGION_LIST_AND_FRC_FILTER] !== this.formGroup.get(REGION_LIST_AND_FRC_FILTER).value) {
+                    for (var key in formGroupLS) {
+                        if (formGroupLS.hasOwnProperty(key)) {
+                            var value = formGroupLS[key];
+                            // Clear the filter form group control values if it has a value in local storage
+                            // The regionList form group control value should be ignored as it always contain the latest value
+                            if (key !== REGION_LIST_AND_FRC_FILTER && value != null) {
+                                this.formGroup.get(key).setValue(null);
+                            }
                         }
                     }
                 }
@@ -64171,7 +64193,7 @@ module.exports = "<div *ngIf=\"isDataLoaded()\">\n    <ccd-case-edit [submit]=\"
 /***/ 59541:
 /***/ ((module) => {
 
-module.exports = "<h1 *ngIf=\"!caseTitle.label\" class=\"heading-h1\">#{{ caseDetails.case_id | ccdCaseReference}}</h1>\n\n<div *ngIf=\"caseTitle.label\" class=\"case-title\">\n  <ccd-label-field [caseField]=\"caseTitle\" [caseFields]=\"caseFields\"></ccd-label-field>\n</div>\n"
+module.exports = "<h1 *ngIf=\"!label\" class=\"heading-h1\">#{{ caseDetails.case_id | ccdCaseReference}}</h1>\n\n<div *ngIf=\"label\" class=\"case-title\">\n  <ccd-label-field [caseField]=\"caseTitle\" [caseFields]=\"caseFields\"></ccd-label-field>\n</div>\n"
 
 /***/ }),
 
@@ -64269,7 +64291,7 @@ module.exports = "<div *ngIf=\"isDataLoaded()\">\n    <ccd-case-viewer [hasPrint
 /***/ 67025:
 /***/ ((module) => {
 
-module.exports = "<div *ngIf=\"isDataLoaded()\">\n  <ccd-case-basic-access-view *ngIf=\"!hasStandardAccess()\" [accessType]=\"userAccessType\" [caseDetails]=\"caseDetails\"></ccd-case-basic-access-view>\n  <ccd-case-full-access-view *ngIf=\"hasStandardAccess()\" [caseDetails]=\"caseDetails\" [hasPrint]=\"hasPrint\" [hasEventSelector]=\"hasEventSelector\" [prependedTabs]=\"prependedTabs\" [appendedTabs]=\"appendedTabs\"></ccd-case-full-access-view>\n</div>\n"
+module.exports = "<div *ngIf=\"isDataLoaded()\">\n  <ccd-case-basic-access-view *ngIf=\"!hasStandardAccess()\"\n                              [accessType]=\"userAccessType\"\n                              [caseDetails]=\"caseDetails\">\n  </ccd-case-basic-access-view>\n  <ccd-case-full-access-view *ngIf=\"hasStandardAccess()\"\n                             [caseDetails]=\"caseDetails\"\n                             [hasPrint]=\"hasPrint\"\n                             [hasEventSelector]=\"hasEventSelector\"\n                             [prependedTabs]=\"prependedTabs\"\n                             [appendedTabs]=\"appendedTabs\">\n  </ccd-case-full-access-view>\n</div>\n"
 
 /***/ }),