@hmcts/ccd-case-ui-toolkit 7.2.54-3455-rc3 → 7.2.54-3759-rc1

package/fesm2022/hmcts-ccd-case-ui-toolkit.mjs

@@ -3932,6 +3932,9 @@ class FieldsUtils {
     static SERVER_RESPONSE_FIELD_TYPE_COLLECTION = 'Collection';
     static SERVER_RESPONSE_FIELD_TYPE_COMPLEX = 'Complex';
     static SERVER_RESPONSE_FIELD_TYPE_DYNAMIC_LIST_TYPE = ['DynamicList', 'DynamicRadioList'];
+    static defaultTabList = {
+        "PRLAPPS": "Summary"
+    };
     static isValidDisplayContext(ctx) {
         return (ctx === 'MANDATORY' || ctx === 'READONLY'
             || ctx === 'OPTIONAL' || ctx === 'HIDDEN'
@@ -9301,17 +9304,6 @@ class CaseEditComponent {
             this.router.navigate([this.initialUrl], { relativeTo: this.route });
             return true;
         }
-        // if the url contains /submit there is the potential that the user has gone straight to the submit page
-        // we should try and work out if they have been through the journey or not and prevent them submitting directly
-        if (this.router.url.indexOf('/submit') !== -1 && !this.initialUrl) {
-            // we only want to check if the user has done this if there is a multi-page journey
-            if (this.eventTrigger.wizard_pages && this.eventTrigger.wizard_pages.length > 0) {
-                console.log('User has navigated to the end of an event journey directly, reset their journey');
-                const firstPage = this.eventTrigger.wizard_pages.reduce((min, page) => page.order < min.order ? page : min, this.eventTrigger.wizard_pages[0]);
-                this.windowsService.alert(CaseEditComponent.ALERT_MESSAGE);
-                this.router.navigate([firstPage ? firstPage.id : 'submit'], { relativeTo: this.route });
-            }
-        }
         return false;
     }
     getPage(pageId) {
@@ -35861,8 +35853,24 @@ class CaseFullAccessViewComponent {
             else {
                 // sort with the order of CCD predefined tabs
                 this.caseDetails.tabs.sort((aTab, bTab) => aTab.order > bTab.order ? 1 : (bTab.order > aTab.order ? -1 : 0));
-                // select the first tab checking if the tab is visible
-                const preSelectTab = this.findPreSelectedActiveTab();
+                // Prefer tab from FieldsUtils.defaultTabList (e.g. PRLAPPS -> Summary) if present
+                const preferredLabel = FieldsUtils.defaultTabList?.[this.caseDetails?.case_type?.id];
+                let preSelectTab = null;
+                if (preferredLabel) {
+                    preSelectTab = this.caseDetails.tabs.find(t => (t.label === preferredLabel) || (t.id === preferredLabel)) ?? null;
+                }
+                // Fallback to first visible tab if no preferred label found
+                if (!preSelectTab) {
+                    preSelectTab = this.findPreSelectedActiveTab();
+                }
+                // If the preferred tab exists in caseDetails but is hidden (not rendered in tabGroup), fallback again
+                const renderedTabs = this.tabGroup?._tabs?.toArray?.() ?? [];
+                const preferredRendered = preSelectTab &&
+                    renderedTabs.some(mt => mt.textLabel === preSelectTab.label || mt.textLabel?.toLowerCase() === preSelectTab.label?.toLowerCase());
+                if (!preferredRendered) {
+                    // Default focus: keep natural first visible tab (do not change selectedIndex explicitly)
+                    preSelectTab = this.findPreSelectedActiveTab();
+                }
                 this.router.navigate(['cases', 'case-details', this.caseDetails.case_type.jurisdiction.id, this.caseDetails.case_type.id, this.caseDetails.case_id], { fragment: preSelectTab.label }).then(() => {
                     matTab = this.tabGroup._tabs.find((x) => x.textLabel === preSelectTab.label);
                     // Update selectedIndex only if matTab.position is a non-zero number (positive or negative); this means the