@sapui5/sap.fe.templates 1.147.0 → 1.148.1

package/src/sap/fe/templates/ObjectPage/overrides/CollaborationManager.ts

@@ -15,28 +15,35 @@ const CollaborationManagerOverride = {
 		const controller = view.getController();
 		const appComponent = controller.getOwnerComponent().getAppComponent();
 		const isEditable = CommonUtils.getIsEditable(view);
-	    await controller.pageReady.waitPageReady();
-		const card = !isEditable
-			? await appComponent.getCollaborationManagerService().getDesignTimeCard(RetrieveCardTypes.INTEGRATION)
-			: undefined;
-		if (card) {
-			const onAddCardToCollaborationManagerCallback = (): void => {
-				try {
-					if (card) {
-						appComponent.getCollaborationManagerService().publishCard(card as CardManifest);
-						return;
-					}
-				} catch (e) {
-					showGenericErrorMessage(view);
-					Log.error(e as string);
+		if (!isEditable) {
+			// Start card retrieval immediately and register it with pageReady so it runs in
+			// parallel with the OData page load instead of sequentially after it.
+			// _getPageTitleInformation uses requestProperty() which is an OData V4 async API
+			// that safely queues data requests and resolves when entity data arrives.
+			const cardRetrievalPromise = (async (): Promise<void> => {
+				const card = await appComponent.getCollaborationManagerService().getDesignTimeCard(RetrieveCardTypes.INTEGRATION);
+				if (card) {
+					const onAddCardToCollaborationManagerCallback = (): void => {
+						try {
+							if (card) {
+								appComponent.getCollaborationManagerService().publishCard(card as CardManifest);
+								return;
+							}
+						} catch (e) {
+							showGenericErrorMessage(view);
+							Log.error(e as string);
+						}
+					};
+					const pageTitleInformation = await controller._getPageTitleInformation();
+					cards.push({
+						card: card,
+						title: pageTitleInformation.subtitle || "",
+						callback: onAddCardToCollaborationManagerCallback
+					});
 				}
-			};
-			const pageTitleInformation = await controller._getPageTitleInformation();
-			cards.push({
-				card: card,
-				title: pageTitleInformation.subtitle || "",
-				callback: onAddCardToCollaborationManagerCallback
-			});
+			})();
+			controller.pageReady.waitFor(cardRetrievalPromise);
+			await cardRetrievalPromise;
 		}
 	}
 };

package/src/sap/fe/templates/ObjectPage/overrides/IntentBasedNavigation.js

@@ -14,9 +14,10 @@ sap.ui.define(["sap/fe/core/CommonUtils", "sap/fe/navigation/SelectionVariant"],
       const oAppComponent = CommonUtils.getAppComponent(oView);
       const oMetaModel = oAppComponent.getModel().getMetaModel();
       const oPageContext = oView.getBindingContext();
+
       //If the link context is same as page context merging of context should not happen
-      const mergeLinkContext = oTargetInfo?.linkContextPath ? oPageContext.getPath() !== oTargetInfo?.linkContextPath : true;
-      if (oExternalNavigationContext?.page && mergeLinkContext) {
+      const mergeLinkContext = oTargetInfo?.linkContextPath ? oPageContext?.getPath() !== oTargetInfo?.linkContextPath : true;
+      if (oExternalNavigationContext?.page && mergeLinkContext && oPageContext) {
         const sMetaPath = oMetaModel.getMetaPath(oPageContext.getPath());
         let pageAttributes = oPageContext.getObject();
         pageAttributes = oController._intentBasedNavigation.processSemanticAttributes(oPageContext, oPageContext.getObject());
@@ -55,4 +56,4 @@ sap.ui.define(["sap/fe/core/CommonUtils", "sap/fe/navigation/SelectionVariant"],
   };
   return IntentBasedNavigationOverride;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["IntentBasedNavigationOverride","adaptNavigationContext","oSelectionVariant","oTargetInfo","oView","getView","oController","getController","oInternalModelContext","getBindingContext","oExternalNavigationContext","getProperty","oAppComponent","CommonUtils","getAppComponent","oMetaModel","getModel","getMetaModel","oPageContext","mergeLinkContext","linkContextPath","getPath","page","sMetaPath","getMetaPath","pageAttributes","getObject","_intentBasedNavigation","processSemanticAttributes","oPageContextData","removeSensitiveData","oPageData","prepareContextForExternalNavigation","oPagePropertiesWithoutConflict","propertiesWithoutConflict","oPageSV","addPageContextToSelectionVariant","SelectionVariant","semanticAttributes","oPropertiesWithoutConflict","aSelectOptionPropertyNames","getSelectOptionsPropertyNames","forEach","sPropertyName","getSelectOption","massAddSelectOption","linkContext","setProperty"],"sourceRoot":".","sources":["IntentBasedNavigation.ts"],"sourcesContent":["import CommonUtils from \"sap/fe/core/CommonUtils\";\nimport type IntentBasedNavigation from \"sap/fe/core/controllerextensions/IntentBasedNavigation\";\nimport type { InternalModelContext } from \"sap/fe/core/helpers/ModelHelper\";\nimport type PageController from \"sap/fe/core/PageController\";\nimport SelectionVariant from \"sap/fe/navigation/SelectionVariant\";\nimport type Context from \"sap/ui/model/Context\";\n\nconst IntentBasedNavigationOverride = {\n\tadaptNavigationContext: function (\n\t\tthis: IntentBasedNavigation,\n\t\toSelectionVariant: SelectionVariant,\n\t\toTargetInfo?: { linkContextPath: string; linkContext?: unknown; propertiesWithoutConflict?: Record<string, string> }\n\t): void {\n\t\tconst oView = this.getView(),\n\t\t\toController = oView.getController() as PageController,\n\t\t\toInternalModelContext = this.getView().getBindingContext(\"internal\") as InternalModelContext,\n\t\t\toExternalNavigationContext = oInternalModelContext.getProperty(\"externalNavigationContext\");\n\t\tconst oAppComponent = CommonUtils.getAppComponent(oView);\n\t\tconst oMetaModel = oAppComponent.getModel().getMetaModel();\n\t\tconst oPageContext = oView.getBindingContext() as Context;\n\t\t//If the link context is same as page context merging of context should not happen\n\t\tconst mergeLinkContext = oTargetInfo?.linkContextPath ? oPageContext.getPath() !== oTargetInfo?.linkContextPath : true;\n\t\tif (oExternalNavigationContext?.page && mergeLinkContext) {\n\t\t\tconst sMetaPath = oMetaModel.getMetaPath(oPageContext.getPath());\n\t\t\tlet pageAttributes = oPageContext.getObject();\n\t\t\tpageAttributes = oController._intentBasedNavigation.processSemanticAttributes(oPageContext, oPageContext.getObject());\n\t\t\tconst oPageContextData = oController._intentBasedNavigation.removeSensitiveData(pageAttributes, sMetaPath),\n\t\t\t\toPageData = oController._intentBasedNavigation.prepareContextForExternalNavigation(oPageContextData, oPageContext),\n\t\t\t\toPagePropertiesWithoutConflict = oPageData.propertiesWithoutConflict,\n\t\t\t\t// TODO: move this also into the intent based navigation controller extension\n\t\t\t\toPageSV = CommonUtils.addPageContextToSelectionVariant(\n\t\t\t\t\tnew SelectionVariant(),\n\t\t\t\t\toPageData.semanticAttributes as unknown[],\n\t\t\t\t\toView\n\t\t\t\t),\n\t\t\t\toPropertiesWithoutConflict = oTargetInfo?.propertiesWithoutConflict;\n\t\t\tconst aSelectOptionPropertyNames = oPageSV.getSelectOptionsPropertyNames();\n\t\t\taSelectOptionPropertyNames.forEach(function (sPropertyName: string) {\n\t\t\t\tif (!oSelectionVariant.getSelectOption(sPropertyName)) {\n\t\t\t\t\toSelectionVariant.massAddSelectOption(sPropertyName, oPageSV.getSelectOption(sPropertyName)!);\n\t\t\t\t} else {\n\t\t\t\t\t// Only when there is no conflict do we need to add something\n\t\t\t\t\t// in all other case the conflicted paths are already added in prepareContextForExternalNavigation\n\t\t\t\t\t// if property was without conflict in incoming context then add path from incoming context to SV\n\t\t\t\t\t// TO-DO. Remove the check for oPropertiesWithoutConflict once semantic links functionality is covered\n\t\t\t\t\tif (oPropertiesWithoutConflict && sPropertyName in oPropertiesWithoutConflict) {\n\t\t\t\t\t\toSelectionVariant.massAddSelectOption(\n\t\t\t\t\t\t\toPropertiesWithoutConflict[sPropertyName],\n\t\t\t\t\t\t\toSelectionVariant.getSelectOption(sPropertyName)!\n\t\t\t\t\t\t);\n\t\t\t\t\t}\n\t\t\t\t\t// if property was without conflict in page context then add path from page context to SV\n\t\t\t\t\tif (sPropertyName in oPagePropertiesWithoutConflict) {\n\t\t\t\t\t\toSelectionVariant.massAddSelectOption(\n\t\t\t\t\t\t\toPagePropertiesWithoutConflict[sPropertyName],\n\t\t\t\t\t\t\toPageSV.getSelectOption(sPropertyName)!\n\t\t\t\t\t\t);\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t});\n\t\t}\n\t\t// remove non public properties from targetInfo\n\t\tdelete oTargetInfo?.propertiesWithoutConflict;\n\t\tdelete oTargetInfo?.linkContext;\n\t\toInternalModelContext.setProperty(\"externalNavigationContext\", { page: true });\n\t}\n};\n\nexport default IntentBasedNavigationOverride;\n"],"mappings":"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","ignoreList":[]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["IntentBasedNavigationOverride","adaptNavigationContext","oSelectionVariant","oTargetInfo","oView","getView","oController","getController","oInternalModelContext","getBindingContext","oExternalNavigationContext","getProperty","oAppComponent","CommonUtils","getAppComponent","oMetaModel","getModel","getMetaModel","oPageContext","mergeLinkContext","linkContextPath","getPath","page","sMetaPath","getMetaPath","pageAttributes","getObject","_intentBasedNavigation","processSemanticAttributes","oPageContextData","removeSensitiveData","oPageData","prepareContextForExternalNavigation","oPagePropertiesWithoutConflict","propertiesWithoutConflict","oPageSV","addPageContextToSelectionVariant","SelectionVariant","semanticAttributes","oPropertiesWithoutConflict","aSelectOptionPropertyNames","getSelectOptionsPropertyNames","forEach","sPropertyName","getSelectOption","massAddSelectOption","linkContext","setProperty"],"sourceRoot":".","sources":["IntentBasedNavigation.ts"],"sourcesContent":["import CommonUtils from \"sap/fe/core/CommonUtils\";\nimport type IntentBasedNavigation from \"sap/fe/core/controllerextensions/IntentBasedNavigation\";\nimport type { InternalModelContext } from \"sap/fe/core/helpers/ModelHelper\";\nimport type PageController from \"sap/fe/core/PageController\";\nimport SelectionVariant from \"sap/fe/navigation/SelectionVariant\";\n\nconst IntentBasedNavigationOverride = {\n\tadaptNavigationContext: function (\n\t\tthis: IntentBasedNavigation,\n\t\toSelectionVariant: SelectionVariant,\n\t\toTargetInfo?: { linkContextPath: string; linkContext?: unknown; propertiesWithoutConflict?: Record<string, string> }\n\t): void {\n\t\tconst oView = this.getView(),\n\t\t\toController = oView.getController() as PageController,\n\t\t\toInternalModelContext = this.getView().getBindingContext(\"internal\") as InternalModelContext,\n\t\t\toExternalNavigationContext = oInternalModelContext.getProperty(\"externalNavigationContext\");\n\t\tconst oAppComponent = CommonUtils.getAppComponent(oView);\n\t\tconst oMetaModel = oAppComponent.getModel().getMetaModel();\n\t\tconst oPageContext = oView.getBindingContext();\n\n\t\t//If the link context is same as page context merging of context should not happen\n\t\tconst mergeLinkContext = oTargetInfo?.linkContextPath ? oPageContext?.getPath() !== oTargetInfo?.linkContextPath : true;\n\t\tif (oExternalNavigationContext?.page && mergeLinkContext && oPageContext) {\n\t\t\tconst sMetaPath = oMetaModel.getMetaPath(oPageContext.getPath());\n\t\t\tlet pageAttributes = oPageContext.getObject();\n\t\t\tpageAttributes = oController._intentBasedNavigation.processSemanticAttributes(oPageContext, oPageContext.getObject());\n\t\t\tconst oPageContextData = oController._intentBasedNavigation.removeSensitiveData(pageAttributes, sMetaPath),\n\t\t\t\toPageData = oController._intentBasedNavigation.prepareContextForExternalNavigation(oPageContextData, oPageContext),\n\t\t\t\toPagePropertiesWithoutConflict = oPageData.propertiesWithoutConflict,\n\t\t\t\t// TODO: move this also into the intent based navigation controller extension\n\t\t\t\toPageSV = CommonUtils.addPageContextToSelectionVariant(\n\t\t\t\t\tnew SelectionVariant(),\n\t\t\t\t\toPageData.semanticAttributes as unknown[],\n\t\t\t\t\toView\n\t\t\t\t),\n\t\t\t\toPropertiesWithoutConflict = oTargetInfo?.propertiesWithoutConflict;\n\t\t\tconst aSelectOptionPropertyNames = oPageSV.getSelectOptionsPropertyNames();\n\t\t\taSelectOptionPropertyNames.forEach(function (sPropertyName: string) {\n\t\t\t\tif (!oSelectionVariant.getSelectOption(sPropertyName)) {\n\t\t\t\t\toSelectionVariant.massAddSelectOption(sPropertyName, oPageSV.getSelectOption(sPropertyName)!);\n\t\t\t\t} else {\n\t\t\t\t\t// Only when there is no conflict do we need to add something\n\t\t\t\t\t// in all other case the conflicted paths are already added in prepareContextForExternalNavigation\n\t\t\t\t\t// if property was without conflict in incoming context then add path from incoming context to SV\n\t\t\t\t\t// TO-DO. Remove the check for oPropertiesWithoutConflict once semantic links functionality is covered\n\t\t\t\t\tif (oPropertiesWithoutConflict && sPropertyName in oPropertiesWithoutConflict) {\n\t\t\t\t\t\toSelectionVariant.massAddSelectOption(\n\t\t\t\t\t\t\toPropertiesWithoutConflict[sPropertyName],\n\t\t\t\t\t\t\toSelectionVariant.getSelectOption(sPropertyName)!\n\t\t\t\t\t\t);\n\t\t\t\t\t}\n\t\t\t\t\t// if property was without conflict in page context then add path from page context to SV\n\t\t\t\t\tif (sPropertyName in oPagePropertiesWithoutConflict) {\n\t\t\t\t\t\toSelectionVariant.massAddSelectOption(\n\t\t\t\t\t\t\toPagePropertiesWithoutConflict[sPropertyName],\n\t\t\t\t\t\t\toPageSV.getSelectOption(sPropertyName)!\n\t\t\t\t\t\t);\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t});\n\t\t}\n\t\t// remove non public properties from targetInfo\n\t\tdelete oTargetInfo?.propertiesWithoutConflict;\n\t\tdelete oTargetInfo?.linkContext;\n\t\toInternalModelContext.setProperty(\"externalNavigationContext\", { page: true });\n\t}\n};\n\nexport default IntentBasedNavigationOverride;\n"],"mappings":"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","ignoreList":[]}

package/src/sap/fe/templates/ObjectPage/overrides/IntentBasedNavigation.ts

@@ -3,7 +3,6 @@ import type IntentBasedNavigation from "sap/fe/core/controllerextensions/IntentB
 import type { InternalModelContext } from "sap/fe/core/helpers/ModelHelper";
 import type PageController from "sap/fe/core/PageController";
 import SelectionVariant from "sap/fe/navigation/SelectionVariant";
-import type Context from "sap/ui/model/Context";
 
 const IntentBasedNavigationOverride = {
 	adaptNavigationContext: function (
@@ -17,10 +16,11 @@ const IntentBasedNavigationOverride = {
 			oExternalNavigationContext = oInternalModelContext.getProperty("externalNavigationContext");
 		const oAppComponent = CommonUtils.getAppComponent(oView);
 		const oMetaModel = oAppComponent.getModel().getMetaModel();
-		const oPageContext = oView.getBindingContext() as Context;
+		const oPageContext = oView.getBindingContext();
+
 		//If the link context is same as page context merging of context should not happen
-		const mergeLinkContext = oTargetInfo?.linkContextPath ? oPageContext.getPath() !== oTargetInfo?.linkContextPath : true;
-		if (oExternalNavigationContext?.page && mergeLinkContext) {
+		const mergeLinkContext = oTargetInfo?.linkContextPath ? oPageContext?.getPath() !== oTargetInfo?.linkContextPath : true;
+		if (oExternalNavigationContext?.page && mergeLinkContext && oPageContext) {
 			const sMetaPath = oMetaModel.getMetaPath(oPageContext.getPath());
 			let pageAttributes = oPageContext.getObject();
 			pageAttributes = oController._intentBasedNavigation.processSemanticAttributes(oPageContext, oPageContext.getObject());

package/src/sap/fe/templates/ObjectPage/overrides/ViewState.js

@@ -2,33 +2,109 @@
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *      (c) Copyright 2009-2026 SAP SE. All rights reserved
  */
-sap.ui.define(["sap/base/Log", "sap/fe/core/CommonUtils", "sap/fe/core/helpers/KeepAliveHelper", "sap/fe/core/helpers/ModelHelper", "sap/fe/core/library"], function (Log, CommonUtils, KeepAliveHelper, ModelHelper, CoreLibrary) {
+sap.ui.define(["sap/base/Log", "sap/fe/core/CommonUtils", "sap/fe/core/helpers/KeepAliveHelper", "sap/fe/core/helpers/ModelHelper", "sap/fe/core/library", "sap/fe/templates/ObjectPage/helpers/SectionNavigationHelper"], function (Log, CommonUtils, KeepAliveHelper, ModelHelper, CoreLibrary, SectionNavigationHelper) {
   "use strict";
 
+  var pollForSectionStability = SectionNavigationHelper.pollForSectionStability;
   const VariantManagement = CoreLibrary.VariantManagement;
   const opControlHandlers = {
     retrieve: function (oOPLayout) {
+      const controller = this.getView().getController();
+      // Get subsection from controller's stored target subsection (set by onNavigateChange or targetControlId navigation)
+      const targetSubSection = controller.targetSubSection;
+      const selectedSection = oOPLayout.getSelectedSection();
+      const selectedSubSection = targetSubSection?.getId() ?? null;
       return {
-        selectedSection: oOPLayout.getSelectedSection()
+        selectedSection,
+        selectedSubSection
       };
     },
     apply: function (opLayout, controlState) {
       const selectedSection = controlState?.selectedSection;
-      if (selectedSection) {
-        const opSectionToSelect = opLayout.getSections().find(section => section.getId() === selectedSection);
-        if (opSectionToSelect?.getVisible() === false) {
-          const controller = this.getView().getController();
-          controller.pageReady.waitPageReady().then(function () {
-            opLayout.setSelectedSection(selectedSection);
-            return undefined;
-          }).catch(err => {
-            const message = err instanceof Error ? err.message : String(err);
-            Log.error(`FE V4 : OP : ViewState : ObjectPageLayout state couldn't be applied : ${message}`);
-          });
-        } else {
-          opLayout.setSelectedSection(selectedSection);
-        }
+      const selectedSubSection = controlState?.selectedSubSection;
+      if (!selectedSection) {
+        return;
       }
+
+      // Check if the selected section is a section or subsection
+      const opSectionToSelect = opLayout.getSections().find(section => section.getId() === selectedSection);
+      const isSubSectionId = !opSectionToSelect && this.getView().byId(selectedSection)?.isA("sap.uxap.ObjectPageSubSection");
+      const controller = this.getView().getController();
+
+      // Determine the target to navigate to: prefer subsection if available
+      const navigationTarget = selectedSubSection ?? selectedSection;
+      const isNavigatingToSubSection = !!selectedSubSection || isSubSectionId;
+
+      // Determine target section ID for comparison  (needed before pageReady)
+      const getTargetSectionId = () => {
+        if (isSubSectionId) {
+          return opLayout.getSections().find(s => s.getSubSections().some(ss => ss.getId() === navigationTarget))?.getId();
+        }
+        return selectedSection;
+      };
+
+      // Wait for pageReady, then navigate and poll for UX rules reset
+      controller.pageReady.waitPageReady().then(async () => {
+        const targetSectionId = getTargetSectionId();
+
+        // Skip if no valid target section (e.g., subsection's parent no longer exists)
+        // or already on target section - no navigation or polling needed
+        if (!targetSectionId || opLayout.getSelectedSection() === targetSectionId) {
+          return;
+        }
+        const performNavigation = () => {
+          // Guard: don't navigate if ObjectPageLayout has been destroyed
+          if (!opLayout.getDomRef()) {
+            return;
+          }
+
+          // Guard: don't navigate if already on target section
+          const currentSection = opLayout.getSelectedSection();
+          if (currentSection === targetSectionId) {
+            return;
+          }
+          if (isNavigatingToSubSection) {
+            // For subsection navigation, use navigateToSubSection which handles parent section activation
+            const localId = controller.getView().getLocalId(navigationTarget);
+            if (localId) {
+              controller.getExtensionAPI().navigateToSubSection(localId);
+            } else {
+              opLayout.scrollToSection(navigationTarget, 0);
+            }
+          } else if (opSectionToSelect && opSectionToSelect.getVisible() === true) {
+            // For section IDs, navigate if section is visible
+            opLayout.scrollToSection(selectedSection, 0);
+          }
+        };
+
+        // Skip navigation and polling on subsequent loads - only restore section during initial load
+        // This prevents overriding user's manual tab selection when state is restored later
+        const controllerWithFlag = controller;
+        if (controllerWithFlag.skipViewStateSectionRestore === true) {
+          return;
+        }
+
+        // Navigate immediately
+        performNavigation();
+
+        // Skip polling if already on target section
+        if (opLayout.getSelectedSection() === targetSectionId) {
+          return;
+        }
+
+        // Poll to detect UX rules reset during initial load
+        // Uses shared utility from helpers/SectionNavigationHelper.ts
+        await pollForSectionStability({
+          getSelectedSection: () => opLayout.getSelectedSection(),
+          targetSectionId,
+          onResetDetected: performNavigation,
+          guardCheck: () => !!opLayout.getDomRef()
+        });
+        return; // Required by linter rule promise/always-return
+      }).catch(() => {
+        // ViewState: ObjectPageLayout section state couldn't be applied
+        // Don't re-throw - allow page to continue even if navigation fails
+      });
     },
     refreshBinding: function (oOPLayout) {
       const oBindingContext = oOPLayout.getBindingContext();
@@ -160,4 +236,4 @@ sap.ui.define(["sap/base/Log", "sap/fe/core/CommonUtils", "sap/fe/core/helpers/K
   };
   return ViewStateExtensionOverride;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["VariantManagement","CoreLibrary","opControlHandlers","retrieve","oOPLayout","selectedSection","getSelectedSection","apply","opLayout","controlState","opSectionToSelect","getSections","find","section","getId","getVisible","controller","getView","getController","pageReady","waitPageReady","then","setSelectedSection","undefined","catch","err","message","Error","String","Log","error","refreshBinding","oBindingContext","getBindingContext","oBinding","getBinding","sMetaPath","ModelHelper","getMetaPathForContext","sStrategy","KeepAliveHelper","getControlRefreshStrategyForContextPath","oModel","getModel","oMetaModel","getMetaModel","oNavigationProperties","CommonUtils","getContextPathProperties","$kind","aNavPropertiesToRequest","Object","keys","reduce","aPrev","sNavProp","$isCollection","push","$NavigationPropertyPath","aProperties","$PropertyPath","sGroupId","getGroupId","requestSideEffects","concat","refresh","info","ViewStateExtensionOverride","_getObjectPageLayout","view","_getObjectPageLayoutControl","_getOPStateHandler","control","viewOP","call","_getOPRefreshHandler","adaptControlStateHandler","controlStateHandlers","opStateHandler","adaptBindingRefreshHandler","controlRefreshHandlers","applyInitialStateOnly","adaptStateControls","aStateControls","oView","base","oViewData","getViewData","variantManagement","Control","Page","None","byId","adaptBindingRefreshControls","aControls","sRefreshStrategy","getViewRefreshInfo","oController","aControlsToRefresh","oObjectPageControl","aViewControls","_findTables","getControlsForRefresh","aPrevControls","oControl","includes"],"sourceRoot":".","sources":["ViewState.ts"],"sourcesContent":["import Log from \"sap/base/Log\";\nimport CommonUtils from \"sap/fe/core/CommonUtils\";\nimport type ViewState from \"sap/fe/core/controllerextensions/ViewState\";\nimport { type ControlStateHandler } from \"sap/fe/core/controllerextensions/ViewState\";\nimport KeepAliveHelper from \"sap/fe/core/helpers/KeepAliveHelper\";\nimport ModelHelper from \"sap/fe/core/helpers/ModelHelper\";\nimport CoreLibrary from \"sap/fe/core/library\";\nimport type ObjectPageController from \"sap/fe/templates/ObjectPage/ObjectPageController.controller\";\nimport type ManagedObject from \"sap/ui/base/ManagedObject\";\nimport type Control from \"sap/ui/core/Control\";\nimport type ODataV4Context from \"sap/ui/model/odata/v4/Context\";\nimport type ObjectPageLayout from \"sap/uxap/ObjectPageLayout\";\nimport type ObjectPageSection from \"sap/uxap/ObjectPageSection\";\nimport type { MetaModelNavProperty } from \"types/metamodel_types\";\n\nconst VariantManagement = CoreLibrary.VariantManagement;\nexport type ObjectPageState = { selectedSection: string | null };\n\nconst opControlHandlers = {\n\tretrieve: function (oOPLayout: ObjectPageLayout): ObjectPageState {\n\t\treturn {\n\t\t\tselectedSection: oOPLayout.getSelectedSection()\n\t\t};\n\t},\n\tapply: function (this: ViewState, opLayout: ObjectPageLayout, controlState?: { selectedSection: string | null }): void {\n\t\tconst selectedSection = controlState?.selectedSection;\n\t\tif (selectedSection) {\n\t\t\tconst opSectionToSelect = opLayout.getSections().find((section: ObjectPageSection) => section.getId() === selectedSection);\n\t\t\tif (opSectionToSelect?.getVisible() === false) {\n\t\t\t\tconst controller = this.getView().getController() as ObjectPageController;\n\t\t\t\tcontroller.pageReady\n\t\t\t\t\t.waitPageReady()\n\t\t\t\t\t.then(function (): void {\n\t\t\t\t\t\topLayout.setSelectedSection(selectedSection);\n\t\t\t\t\t\treturn undefined;\n\t\t\t\t\t})\n\t\t\t\t\t.catch((err: unknown): void => {\n\t\t\t\t\t\tconst message = err instanceof Error ? err.message : String(err);\n\t\t\t\t\t\tLog.error(`FE V4 : OP : ViewState : ObjectPageLayout state couldn't be applied : ${message}`);\n\t\t\t\t\t});\n\t\t\t} else {\n\t\t\t\topLayout.setSelectedSection(selectedSection);\n\t\t\t}\n\t\t}\n\t},\n\trefreshBinding: function (oOPLayout: ObjectPageLayout): void {\n\t\tconst oBindingContext = oOPLayout.getBindingContext() as ODataV4Context | undefined;\n\t\tconst oBinding = oBindingContext && oBindingContext.getBinding();\n\t\tif (oBinding) {\n\t\t\tconst sMetaPath = ModelHelper.getMetaPathForContext(oBindingContext);\n\t\t\tconst sStrategy = KeepAliveHelper.getControlRefreshStrategyForContextPath(oOPLayout, sMetaPath);\n\t\t\tif (sStrategy === \"self\") {\n\t\t\t\t// Refresh main context and 1-1 navigation properties or OP\n\t\t\t\tconst oModel = oBindingContext.getModel(),\n\t\t\t\t\toMetaModel = oModel.getMetaModel(),\n\t\t\t\t\toNavigationProperties: Record<string, MetaModelNavProperty> =\n\t\t\t\t\t\t(CommonUtils.getContextPathProperties(oMetaModel, sMetaPath, {\n\t\t\t\t\t\t\t$kind: \"NavigationProperty\"\n\t\t\t\t\t\t}) as Record<string, MetaModelNavProperty>) || {},\n\t\t\t\t\taNavPropertiesToRequest = Object.keys(oNavigationProperties).reduce(function (\n\t\t\t\t\t\taPrev: { $NavigationPropertyPath: string }[],\n\t\t\t\t\t\tsNavProp: string\n\t\t\t\t\t) {\n\t\t\t\t\t\tif (oNavigationProperties[sNavProp].$isCollection !== true) {\n\t\t\t\t\t\t\taPrev.push({ $NavigationPropertyPath: sNavProp });\n\t\t\t\t\t\t}\n\t\t\t\t\t\treturn aPrev;\n\t\t\t\t\t}, []),\n\t\t\t\t\taProperties: ({ $NavigationPropertyPath: string } | { $PropertyPath: string })[] = [{ $PropertyPath: \"*\" }],\n\t\t\t\t\tsGroupId = oBinding.getGroupId();\n\n\t\t\t\toBindingContext.requestSideEffects(aProperties.concat(aNavPropertiesToRequest), sGroupId);\n\t\t\t} else if (sStrategy === \"includingDependents\") {\n\t\t\t\t// Complete refresh\n\t\t\t\toBinding.refresh();\n\t\t\t}\n\t\t} else {\n\t\t\tLog.info(`ObjectPage: ${oOPLayout.getId()} was not refreshed. No binding found!`);\n\t\t}\n\t}\n};\n\nconst ViewStateExtensionOverride = {\n\t_getObjectPageLayout: function (this: ViewState): ObjectPageLayout {\n\t\tconst view = this.getView();\n\t\tconst controller = view.getController() as ObjectPageController;\n\t\treturn controller._getObjectPageLayoutControl();\n\t},\n\n\t/**\n\t * Get the state handler for ObjectPageLayout in view.\n\t * @param control The control for state interaction\n\t * @returns State handler\n\t */\n\t_getOPStateHandler: function (\n\t\tthis: ViewState,\n\t\tcontrol: ManagedObject\n\t): ControlStateHandler<ObjectPageLayout, ObjectPageState> | undefined {\n\t\tconst viewOP = ViewStateExtensionOverride._getObjectPageLayout.call(this);\n\t\tif (viewOP === control) {\n\t\t\treturn {\n\t\t\t\tretrieve: opControlHandlers.retrieve,\n\t\t\t\tapply: opControlHandlers.apply\n\t\t\t};\n\t\t}\n\t},\n\n\t/**\n\t * Get the refresh handler for ObjectPageLayout in view.\n\t * @param control The control being refreshed\n\t * @returns Refresh handler\n\t */\n\t_getOPRefreshHandler: function (\n\t\tthis: ViewState,\n\t\tcontrol: ManagedObject\n\t): ControlStateHandler<ObjectPageLayout, ObjectPageState> | undefined {\n\t\tconst viewOP = ViewStateExtensionOverride._getObjectPageLayout.call(this);\n\t\tif (viewOP === control) {\n\t\t\treturn {\n\t\t\t\trefreshBinding: opControlHandlers.refreshBinding\n\t\t\t};\n\t\t}\n\t},\n\n\t/**\n\t * Pass the state handlers of object page view according to the control in concern.\n\t * @param control The control for state interaction\n\t * @param controlStateHandlers State handlers\n\t */\n\tadaptControlStateHandler: function (\n\t\tthis: ViewState,\n\t\tcontrol: ManagedObject,\n\t\tcontrolStateHandlers: ControlStateHandler<ObjectPageLayout, ObjectPageState>[]\n\t): void {\n\t\tconst opStateHandler = ViewStateExtensionOverride._getOPStateHandler.call(this, control);\n\t\tif (opStateHandler) {\n\t\t\tcontrolStateHandlers.push(opStateHandler);\n\t\t}\n\t},\n\n\t/**\n\t * Pass the refresh handlers of object page view according to the control being refreshed.\n\t * @param control The control being refreshed\n\t * @param controlRefreshHandlers Refresh handlers\n\t */\n\tadaptBindingRefreshHandler: function (\n\t\tthis: ViewState,\n\t\tcontrol: ManagedObject,\n\t\tcontrolRefreshHandlers: ControlStateHandler<ObjectPageLayout, ObjectPageState>\n\t): void {\n\t\tconst opStateHandler = ViewStateExtensionOverride._getOPRefreshHandler.call(this, control);\n\t\tif (opStateHandler) {\n\t\t    controlRefreshHandlers.refreshBinding = opStateHandler.refreshBinding;\n\t\t}\n\t},\n\n\tapplyInitialStateOnly: function (): boolean {\n\t\treturn false;\n\t},\n\tadaptStateControls: function (this: ViewState, aStateControls: Control[]): void {\n\t\tconst oView = this.base.getView(),\n\t\t\toViewData = oView.getViewData();\n\t\tswitch (oViewData.variantManagement) {\n\t\t\tcase VariantManagement.Control:\n\t\t\t\tbreak;\n\t\t\tcase VariantManagement.Page:\n\t\t\tcase VariantManagement.None:\n\t\t\t\tbreak;\n\t\t\tdefault:\n\t\t\t\tthrow new Error(`unhandled variant setting: ${oViewData.variantManagement}`);\n\t\t}\n\n\t\taStateControls.push(oView.byId(\"fe::ObjectPage\") as Control);\n\t},\n\tadaptBindingRefreshControls: function (this: ViewState, aControls: Control[]): Control[] {\n\t\tconst oView = this.base.getView(),\n\t\t\tsRefreshStrategy = KeepAliveHelper.getViewRefreshInfo(oView),\n\t\t\toController = oView.getController();\n\t\tlet aControlsToRefresh: Control[] = [];\n\n\t\tif (sRefreshStrategy) {\n\t\t\tconst oObjectPageControl = (oController as ObjectPageController)._getObjectPageLayoutControl();\n\t\t\taControlsToRefresh.push(oObjectPageControl);\n\t\t}\n\t\tif (sRefreshStrategy !== \"includingDependents\") {\n\t\t\tconst aViewControls = (oController as ObjectPageController)._findTables();\n\t\t\taControlsToRefresh = aControlsToRefresh.concat(KeepAliveHelper.getControlsForRefresh(oView, aViewControls) || []);\n\t\t}\n\t\treturn aControlsToRefresh.reduce(function (aPrevControls, oControl) {\n\t\t\tif (!aPrevControls.includes(oControl)) {\n\t\t\t\taPrevControls.push(oControl);\n\t\t\t}\n\t\t\treturn aPrevControls;\n\t\t}, aControls);\n\t}\n};\n\nexport default ViewStateExtensionOverride;\n"],"mappings":"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","ignoreList":[]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["VariantManagement","CoreLibrary","opControlHandlers","retrieve","oOPLayout","controller","getView","getController","targetSubSection","selectedSection","getSelectedSection","selectedSubSection","getId","apply","opLayout","controlState","opSectionToSelect","getSections","find","section","isSubSectionId","byId","isA","navigationTarget","isNavigatingToSubSection","getTargetSectionId","s","getSubSections","some","ss","pageReady","waitPageReady","then","targetSectionId","performNavigation","getDomRef","currentSection","localId","getLocalId","getExtensionAPI","navigateToSubSection","scrollToSection","getVisible","controllerWithFlag","skipViewStateSectionRestore","pollForSectionStability","onResetDetected","guardCheck","catch","refreshBinding","oBindingContext","getBindingContext","oBinding","getBinding","sMetaPath","ModelHelper","getMetaPathForContext","sStrategy","KeepAliveHelper","getControlRefreshStrategyForContextPath","oModel","getModel","oMetaModel","getMetaModel","oNavigationProperties","CommonUtils","getContextPathProperties","$kind","aNavPropertiesToRequest","Object","keys","reduce","aPrev","sNavProp","$isCollection","push","$NavigationPropertyPath","aProperties","$PropertyPath","sGroupId","getGroupId","requestSideEffects","concat","refresh","Log","info","ViewStateExtensionOverride","_getObjectPageLayout","view","_getObjectPageLayoutControl","_getOPStateHandler","control","viewOP","call","_getOPRefreshHandler","adaptControlStateHandler","controlStateHandlers","opStateHandler","adaptBindingRefreshHandler","controlRefreshHandlers","applyInitialStateOnly","adaptStateControls","aStateControls","oView","base","oViewData","getViewData","variantManagement","Control","Page","None","Error","adaptBindingRefreshControls","aControls","sRefreshStrategy","getViewRefreshInfo","oController","aControlsToRefresh","oObjectPageControl","aViewControls","_findTables","getControlsForRefresh","aPrevControls","oControl","includes"],"sourceRoot":".","sources":["ViewState.ts"],"sourcesContent":["import Log from \"sap/base/Log\";\nimport CommonUtils from \"sap/fe/core/CommonUtils\";\nimport type ViewState from \"sap/fe/core/controllerextensions/ViewState\";\nimport { type ControlStateHandler } from \"sap/fe/core/controllerextensions/ViewState\";\nimport KeepAliveHelper from \"sap/fe/core/helpers/KeepAliveHelper\";\nimport ModelHelper from \"sap/fe/core/helpers/ModelHelper\";\nimport CoreLibrary from \"sap/fe/core/library\";\nimport { pollForSectionStability } from \"sap/fe/templates/ObjectPage/helpers/SectionNavigationHelper\";\nimport type ObjectPageController from \"sap/fe/templates/ObjectPage/ObjectPageController.controller\";\nimport type ManagedObject from \"sap/ui/base/ManagedObject\";\nimport type Control from \"sap/ui/core/Control\";\nimport type ODataV4Context from \"sap/ui/model/odata/v4/Context\";\nimport type ObjectPageLayout from \"sap/uxap/ObjectPageLayout\";\nimport type ObjectPageSection from \"sap/uxap/ObjectPageSection\";\nimport type { MetaModelNavProperty } from \"types/metamodel_types\";\n\nconst VariantManagement = CoreLibrary.VariantManagement;\nexport type ObjectPageState = { selectedSection: string | null; selectedSubSection?: string | null };\n\nconst opControlHandlers = {\n\tretrieve: function (this: ViewState, oOPLayout: ObjectPageLayout): ObjectPageState {\n\t\tconst controller = this.getView().getController() as ObjectPageController;\n\t\t// Get subsection from controller's stored target subsection (set by onNavigateChange or targetControlId navigation)\n\t\tconst targetSubSection = (controller as unknown as { targetSubSection?: { getId: () => string } }).targetSubSection;\n\t\tconst selectedSection = oOPLayout.getSelectedSection();\n\t\tconst selectedSubSection = targetSubSection?.getId() ?? null;\n\t\treturn {\n\t\t\tselectedSection,\n\t\t\tselectedSubSection\n\t\t};\n\t},\n\tapply: function (\n\t\tthis: ViewState,\n\t\topLayout: ObjectPageLayout,\n\t\tcontrolState?: { selectedSection: string | null; selectedSubSection?: string | null }\n\t): void {\n\t\tconst selectedSection = controlState?.selectedSection;\n\t\tconst selectedSubSection = controlState?.selectedSubSection;\n\n\t\tif (!selectedSection) {\n\t\t\treturn;\n\t\t}\n\n\t\t// Check if the selected section is a section or subsection\n\t\tconst opSectionToSelect = opLayout.getSections().find((section: ObjectPageSection) => section.getId() === selectedSection);\n\t\tconst isSubSectionId = !opSectionToSelect && this.getView().byId(selectedSection)?.isA(\"sap.uxap.ObjectPageSubSection\");\n\t\tconst controller = this.getView().getController() as ObjectPageController;\n\n\t\t// Determine the target to navigate to: prefer subsection if available\n\t\tconst navigationTarget = selectedSubSection ?? selectedSection;\n\t\tconst isNavigatingToSubSection = !!selectedSubSection || isSubSectionId;\n\n\t\t// Determine target section ID for comparison  (needed before pageReady)\n\t\tconst getTargetSectionId = (): string | undefined => {\n\t\t\tif (isSubSectionId) {\n\t\t\t\treturn opLayout\n\t\t\t\t\t.getSections()\n\t\t\t\t\t.find((s) => s.getSubSections().some((ss) => ss.getId() === navigationTarget))\n\t\t\t\t\t?.getId();\n\t\t\t}\n\t\t\treturn selectedSection;\n\t\t};\n\n\t\t// Wait for pageReady, then navigate and poll for UX rules reset\n\t\tcontroller.pageReady\n\t\t\t.waitPageReady()\n\t\t\t.then(async () => {\n\t\t\t\tconst targetSectionId = getTargetSectionId();\n\n\t\t\t\t// Skip if no valid target section (e.g., subsection's parent no longer exists)\n\t\t\t\t// or already on target section - no navigation or polling needed\n\t\t\t\tif (!targetSectionId || opLayout.getSelectedSection() === targetSectionId) {\n\t\t\t\t\treturn;\n\t\t\t\t}\n\n\t\t\t\tconst performNavigation = (): void => {\n\t\t\t\t\t// Guard: don't navigate if ObjectPageLayout has been destroyed\n\t\t\t\t\tif (!opLayout.getDomRef()) {\n\t\t\t\t\t\treturn;\n\t\t\t\t\t}\n\n\t\t\t\t\t// Guard: don't navigate if already on target section\n\t\t\t\t\tconst currentSection = opLayout.getSelectedSection();\n\t\t\t\t\tif (currentSection === targetSectionId) {\n\t\t\t\t\t\treturn;\n\t\t\t\t\t}\n\n\t\t\t\t\tif (isNavigatingToSubSection) {\n\t\t\t\t\t\t// For subsection navigation, use navigateToSubSection which handles parent section activation\n\t\t\t\t\t\tconst localId = controller.getView().getLocalId(navigationTarget);\n\t\t\t\t\t\tif (localId) {\n\t\t\t\t\t\t\tcontroller.getExtensionAPI().navigateToSubSection(localId);\n\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\topLayout.scrollToSection(navigationTarget, 0);\n\t\t\t\t\t\t}\n\t\t\t\t\t} else if (opSectionToSelect && opSectionToSelect.getVisible() === true) {\n\t\t\t\t\t\t// For section IDs, navigate if section is visible\n\t\t\t\t\t\topLayout.scrollToSection(selectedSection, 0);\n\t\t\t\t\t}\n\t\t\t\t};\n\n\t\t\t\t// Skip navigation and polling on subsequent loads - only restore section during initial load\n\t\t\t\t// This prevents overriding user's manual tab selection when state is restored later\n\t\t\t\tconst controllerWithFlag = controller as unknown as { skipViewStateSectionRestore?: boolean };\n\t\t\t\tif (controllerWithFlag.skipViewStateSectionRestore === true) {\n\t\t\t\t\treturn;\n\t\t\t\t}\n\n\t\t\t\t// Navigate immediately\n\t\t\t\tperformNavigation();\n\n\t\t\t\t// Skip polling if already on target section\n\t\t\t\tif (opLayout.getSelectedSection() === targetSectionId) {\n\t\t\t\t\treturn;\n\t\t\t\t}\n\n\t\t\t\t// Poll to detect UX rules reset during initial load\n\t\t\t\t// Uses shared utility from helpers/SectionNavigationHelper.ts\n\t\t\t\tawait pollForSectionStability({\n\t\t\t\t\tgetSelectedSection: () => opLayout.getSelectedSection(),\n\t\t\t\t\ttargetSectionId,\n\t\t\t\t\tonResetDetected: performNavigation,\n\t\t\t\t\tguardCheck: () => !!opLayout.getDomRef()\n\t\t\t\t});\n\t\t\t\treturn; // Required by linter rule promise/always-return\n\t\t\t})\n\t\t\t.catch(() => {\n\t\t\t\t// ViewState: ObjectPageLayout section state couldn't be applied\n\t\t\t\t// Don't re-throw - allow page to continue even if navigation fails\n\t\t\t});\n\t},\n\trefreshBinding: function (oOPLayout: ObjectPageLayout): void {\n\t\tconst oBindingContext = oOPLayout.getBindingContext() as ODataV4Context | undefined;\n\t\tconst oBinding = oBindingContext && oBindingContext.getBinding();\n\t\tif (oBinding) {\n\t\t\tconst sMetaPath = ModelHelper.getMetaPathForContext(oBindingContext);\n\t\t\tconst sStrategy = KeepAliveHelper.getControlRefreshStrategyForContextPath(oOPLayout, sMetaPath);\n\t\t\tif (sStrategy === \"self\") {\n\t\t\t\t// Refresh main context and 1-1 navigation properties or OP\n\t\t\t\tconst oModel = oBindingContext.getModel(),\n\t\t\t\t\toMetaModel = oModel.getMetaModel(),\n\t\t\t\t\toNavigationProperties: Record<string, MetaModelNavProperty> =\n\t\t\t\t\t\t(CommonUtils.getContextPathProperties(oMetaModel, sMetaPath, {\n\t\t\t\t\t\t\t$kind: \"NavigationProperty\"\n\t\t\t\t\t\t}) as Record<string, MetaModelNavProperty>) || {},\n\t\t\t\t\taNavPropertiesToRequest = Object.keys(oNavigationProperties).reduce(function (\n\t\t\t\t\t\taPrev: { $NavigationPropertyPath: string }[],\n\t\t\t\t\t\tsNavProp: string\n\t\t\t\t\t) {\n\t\t\t\t\t\tif (oNavigationProperties[sNavProp].$isCollection !== true) {\n\t\t\t\t\t\t\taPrev.push({ $NavigationPropertyPath: sNavProp });\n\t\t\t\t\t\t}\n\t\t\t\t\t\treturn aPrev;\n\t\t\t\t\t}, []),\n\t\t\t\t\taProperties: ({ $NavigationPropertyPath: string } | { $PropertyPath: string })[] = [{ $PropertyPath: \"*\" }],\n\t\t\t\t\tsGroupId = oBinding.getGroupId();\n\n\t\t\t\toBindingContext.requestSideEffects(aProperties.concat(aNavPropertiesToRequest), sGroupId);\n\t\t\t} else if (sStrategy === \"includingDependents\") {\n\t\t\t\t// Complete refresh\n\t\t\t\toBinding.refresh();\n\t\t\t}\n\t\t} else {\n\t\t\tLog.info(`ObjectPage: ${oOPLayout.getId()} was not refreshed. No binding found!`);\n\t\t}\n\t}\n};\n\nconst ViewStateExtensionOverride = {\n\t_getObjectPageLayout: function (this: ViewState): ObjectPageLayout {\n\t\tconst view = this.getView();\n\t\tconst controller = view.getController() as ObjectPageController;\n\t\treturn controller._getObjectPageLayoutControl();\n\t},\n\n\t/**\n\t * Get the state handler for ObjectPageLayout in view.\n\t * @param control The control for state interaction\n\t * @returns State handler\n\t */\n\t_getOPStateHandler: function (\n\t\tthis: ViewState,\n\t\tcontrol: ManagedObject\n\t): ControlStateHandler<ObjectPageLayout, ObjectPageState> | undefined {\n\t\tconst viewOP = ViewStateExtensionOverride._getObjectPageLayout.call(this);\n\t\tif (viewOP === control) {\n\t\t\treturn {\n\t\t\t\tretrieve: opControlHandlers.retrieve,\n\t\t\t\tapply: opControlHandlers.apply\n\t\t\t};\n\t\t}\n\t},\n\n\t/**\n\t * Get the refresh handler for ObjectPageLayout in view.\n\t * @param control The control being refreshed\n\t * @returns Refresh handler\n\t */\n\t_getOPRefreshHandler: function (\n\t\tthis: ViewState,\n\t\tcontrol: ManagedObject\n\t): ControlStateHandler<ObjectPageLayout, ObjectPageState> | undefined {\n\t\tconst viewOP = ViewStateExtensionOverride._getObjectPageLayout.call(this);\n\t\tif (viewOP === control) {\n\t\t\treturn {\n\t\t\t\trefreshBinding: opControlHandlers.refreshBinding\n\t\t\t};\n\t\t}\n\t},\n\n\t/**\n\t * Pass the state handlers of object page view according to the control in concern.\n\t * @param control The control for state interaction\n\t * @param controlStateHandlers State handlers\n\t */\n\tadaptControlStateHandler: function (\n\t\tthis: ViewState,\n\t\tcontrol: ManagedObject,\n\t\tcontrolStateHandlers: ControlStateHandler<ObjectPageLayout, ObjectPageState>[]\n\t): void {\n\t\tconst opStateHandler = ViewStateExtensionOverride._getOPStateHandler.call(this, control);\n\t\tif (opStateHandler) {\n\t\t\tcontrolStateHandlers.push(opStateHandler);\n\t\t}\n\t},\n\n\t/**\n\t * Pass the refresh handlers of object page view according to the control being refreshed.\n\t * @param control The control being refreshed\n\t * @param controlRefreshHandlers Refresh handlers\n\t */\n\tadaptBindingRefreshHandler: function (\n\t\tthis: ViewState,\n\t\tcontrol: ManagedObject,\n\t\tcontrolRefreshHandlers: ControlStateHandler<ObjectPageLayout, ObjectPageState>\n\t): void {\n\t\tconst opStateHandler = ViewStateExtensionOverride._getOPRefreshHandler.call(this, control);\n\t\tif (opStateHandler) {\n\t\t\tcontrolRefreshHandlers.refreshBinding = opStateHandler.refreshBinding;\n\t\t}\n\t},\n\n\tapplyInitialStateOnly: function (): boolean {\n\t\treturn false;\n\t},\n\tadaptStateControls: function (this: ViewState, aStateControls: Control[]): void {\n\t\tconst oView = this.base.getView(),\n\t\t\toViewData = oView.getViewData();\n\t\tswitch (oViewData.variantManagement) {\n\t\t\tcase VariantManagement.Control:\n\t\t\t\tbreak;\n\t\t\tcase VariantManagement.Page:\n\t\t\tcase VariantManagement.None:\n\t\t\t\tbreak;\n\t\t\tdefault:\n\t\t\t\tthrow new Error(`unhandled variant setting: ${oViewData.variantManagement}`);\n\t\t}\n\n\t\taStateControls.push(oView.byId(\"fe::ObjectPage\") as Control);\n\t},\n\tadaptBindingRefreshControls: function (this: ViewState, aControls: Control[]): Control[] {\n\t\tconst oView = this.base.getView(),\n\t\t\tsRefreshStrategy = KeepAliveHelper.getViewRefreshInfo(oView),\n\t\t\toController = oView.getController();\n\t\tlet aControlsToRefresh: Control[] = [];\n\n\t\tif (sRefreshStrategy) {\n\t\t\tconst oObjectPageControl = (oController as ObjectPageController)._getObjectPageLayoutControl();\n\t\t\taControlsToRefresh.push(oObjectPageControl);\n\t\t}\n\t\tif (sRefreshStrategy !== \"includingDependents\") {\n\t\t\tconst aViewControls = (oController as ObjectPageController)._findTables();\n\t\t\taControlsToRefresh = aControlsToRefresh.concat(KeepAliveHelper.getControlsForRefresh(oView, aViewControls) || []);\n\t\t}\n\t\treturn aControlsToRefresh.reduce(function (aPrevControls, oControl) {\n\t\t\tif (!aPrevControls.includes(oControl)) {\n\t\t\t\taPrevControls.push(oControl);\n\t\t\t}\n\t\t\treturn aPrevControls;\n\t\t}, aControls);\n\t}\n};\n\nexport default ViewStateExtensionOverride;\n"],"mappings":"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","ignoreList":[]}

package/src/sap/fe/templates/ObjectPage/overrides/ViewState.ts

@@ -5,6 +5,7 @@ import { type ControlStateHandler } from "sap/fe/core/controllerextensions/ViewS
 import KeepAliveHelper from "sap/fe/core/helpers/KeepAliveHelper";
 import ModelHelper from "sap/fe/core/helpers/ModelHelper";
 import CoreLibrary from "sap/fe/core/library";
+import { pollForSectionStability } from "sap/fe/templates/ObjectPage/helpers/SectionNavigationHelper";
 import type ObjectPageController from "sap/fe/templates/ObjectPage/ObjectPageController.controller";
 import type ManagedObject from "sap/ui/base/ManagedObject";
 import type Control from "sap/ui/core/Control";
@@ -14,34 +15,119 @@ import type ObjectPageSection from "sap/uxap/ObjectPageSection";
 import type { MetaModelNavProperty } from "types/metamodel_types";
 
 const VariantManagement = CoreLibrary.VariantManagement;
-export type ObjectPageState = { selectedSection: string | null };
+export type ObjectPageState = { selectedSection: string | null; selectedSubSection?: string | null };
 
 const opControlHandlers = {
-	retrieve: function (oOPLayout: ObjectPageLayout): ObjectPageState {
+	retrieve: function (this: ViewState, oOPLayout: ObjectPageLayout): ObjectPageState {
+		const controller = this.getView().getController() as ObjectPageController;
+		// Get subsection from controller's stored target subsection (set by onNavigateChange or targetControlId navigation)
+		const targetSubSection = (controller as unknown as { targetSubSection?: { getId: () => string } }).targetSubSection;
+		const selectedSection = oOPLayout.getSelectedSection();
+		const selectedSubSection = targetSubSection?.getId() ?? null;
 		return {
-			selectedSection: oOPLayout.getSelectedSection()
+			selectedSection,
+			selectedSubSection
 		};
 	},
-	apply: function (this: ViewState, opLayout: ObjectPageLayout, controlState?: { selectedSection: string | null }): void {
+	apply: function (
+		this: ViewState,
+		opLayout: ObjectPageLayout,
+		controlState?: { selectedSection: string | null; selectedSubSection?: string | null }
+	): void {
 		const selectedSection = controlState?.selectedSection;
-		if (selectedSection) {
-			const opSectionToSelect = opLayout.getSections().find((section: ObjectPageSection) => section.getId() === selectedSection);
-			if (opSectionToSelect?.getVisible() === false) {
-				const controller = this.getView().getController() as ObjectPageController;
-				controller.pageReady
-					.waitPageReady()
-					.then(function (): void {
-						opLayout.setSelectedSection(selectedSection);
-						return undefined;
-					})
-					.catch((err: unknown): void => {
-						const message = err instanceof Error ? err.message : String(err);
-						Log.error(`FE V4 : OP : ViewState : ObjectPageLayout state couldn't be applied : ${message}`);
-					});
-			} else {
-				opLayout.setSelectedSection(selectedSection);
-			}
+		const selectedSubSection = controlState?.selectedSubSection;
+
+		if (!selectedSection) {
+			return;
 		}
+
+		// Check if the selected section is a section or subsection
+		const opSectionToSelect = opLayout.getSections().find((section: ObjectPageSection) => section.getId() === selectedSection);
+		const isSubSectionId = !opSectionToSelect && this.getView().byId(selectedSection)?.isA("sap.uxap.ObjectPageSubSection");
+		const controller = this.getView().getController() as ObjectPageController;
+
+		// Determine the target to navigate to: prefer subsection if available
+		const navigationTarget = selectedSubSection ?? selectedSection;
+		const isNavigatingToSubSection = !!selectedSubSection || isSubSectionId;
+
+		// Determine target section ID for comparison  (needed before pageReady)
+		const getTargetSectionId = (): string | undefined => {
+			if (isSubSectionId) {
+				return opLayout
+					.getSections()
+					.find((s) => s.getSubSections().some((ss) => ss.getId() === navigationTarget))
+					?.getId();
+			}
+			return selectedSection;
+		};
+
+		// Wait for pageReady, then navigate and poll for UX rules reset
+		controller.pageReady
+			.waitPageReady()
+			.then(async () => {
+				const targetSectionId = getTargetSectionId();
+
+				// Skip if no valid target section (e.g., subsection's parent no longer exists)
+				// or already on target section - no navigation or polling needed
+				if (!targetSectionId || opLayout.getSelectedSection() === targetSectionId) {
+					return;
+				}
+
+				const performNavigation = (): void => {
+					// Guard: don't navigate if ObjectPageLayout has been destroyed
+					if (!opLayout.getDomRef()) {
+						return;
+					}
+
+					// Guard: don't navigate if already on target section
+					const currentSection = opLayout.getSelectedSection();
+					if (currentSection === targetSectionId) {
+						return;
+					}
+
+					if (isNavigatingToSubSection) {
+						// For subsection navigation, use navigateToSubSection which handles parent section activation
+						const localId = controller.getView().getLocalId(navigationTarget);
+						if (localId) {
+							controller.getExtensionAPI().navigateToSubSection(localId);
+						} else {
+							opLayout.scrollToSection(navigationTarget, 0);
+						}
+					} else if (opSectionToSelect && opSectionToSelect.getVisible() === true) {
+						// For section IDs, navigate if section is visible
+						opLayout.scrollToSection(selectedSection, 0);
+					}
+				};
+
+				// Skip navigation and polling on subsequent loads - only restore section during initial load
+				// This prevents overriding user's manual tab selection when state is restored later
+				const controllerWithFlag = controller as unknown as { skipViewStateSectionRestore?: boolean };
+				if (controllerWithFlag.skipViewStateSectionRestore === true) {
+					return;
+				}
+
+				// Navigate immediately
+				performNavigation();
+
+				// Skip polling if already on target section
+				if (opLayout.getSelectedSection() === targetSectionId) {
+					return;
+				}
+
+				// Poll to detect UX rules reset during initial load
+				// Uses shared utility from helpers/SectionNavigationHelper.ts
+				await pollForSectionStability({
+					getSelectedSection: () => opLayout.getSelectedSection(),
+					targetSectionId,
+					onResetDetected: performNavigation,
+					guardCheck: () => !!opLayout.getDomRef()
+				});
+				return; // Required by linter rule promise/always-return
+			})
+			.catch(() => {
+				// ViewState: ObjectPageLayout section state couldn't be applied
+				// Don't re-throw - allow page to continue even if navigation fails
+			});
 	},
 	refreshBinding: function (oOPLayout: ObjectPageLayout): void {
 		const oBindingContext = oOPLayout.getBindingContext() as ODataV4Context | undefined;
@@ -150,7 +236,7 @@ const ViewStateExtensionOverride = {
 	): void {
 		const opStateHandler = ViewStateExtensionOverride._getOPRefreshHandler.call(this, control);
 		if (opStateHandler) {
-		    controlRefreshHandlers.refreshBinding = opStateHandler.refreshBinding;
+			controlRefreshHandlers.refreshBinding = opStateHandler.refreshBinding;
 		}
 	},
 

package/src/sap/fe/templates/ObjectPage/view/fragments/EmphasizedFirstHeaderAction.fragment.xml

@@ -157,6 +157,7 @@
 
 			<template:if test="{= ${emphHeaderAction>type} !== 'Menu' }">
 				<Button
+					core:require="{FPM: 'sap/fe/core/helpers/FPMHelper'}"
 					id="{= ID.generate(['fe', (${emphHeaderAction>id} ? ${emphHeaderAction>id} : ${emphHeaderAction>key}), 'EmphasizedFirst']) }"
 					dt:designtime="not-adaptable"
 					text="{emphHeaderAction>text}"

package/src/sap/fe/templates/ObjectPage/view/fragments/ExpandedHeading.fragment.xml

@@ -35,16 +35,16 @@ OP: 'sap/fe/templates/ObjectPage/ObjectPageTemplating'
 			<template:if test="{= ${header>aiNotice} &amp;&amp; ${header>aiNotice/visible} !== false }">
 				<macros:AINotice visible="{header>aiNotice/visible}" placementType="Bottom">
 					<macros:popoverContent>
-						<template:if test="{header>aiNotice/contentText}">
+						<template:if test="{header>aiNotice/contentFragmentName}">
 							<template:then>
-								<Text text="{header>aiNotice/contentText}" />
-							</template:then>
-							<template:elseif test="{header>aiNotice/contentFragmentName}">
 								<fpm:CustomFragment
 									id="fe::expandedHeaderNotice"
 									fragmentName="{header>aiNotice/contentFragmentName}"
 									contextPath="{fullContextPath>}"
 								/>
+							</template:then>
+							<template:elseif test="{header>aiNotice/contentText}">
+								<Text text="{header>aiNotice/contentText}" />
 							</template:elseif>
 						</template:if>
 					</macros:popoverContent>

package/src/sap/fe/templates/ObjectPage/view/fragments/Heading.fragment.xml

@@ -44,16 +44,16 @@
 						<template:if test="{= ${header>aiNotice} &amp;&amp; ${header>aiNotice/visible} !== false }">
 							<macros:AINotice visible="{header>aiNotice/visible}" placementType="Bottom">
 								<macros:popoverContent>
-									<template:if test="{header>aiNotice/contentText}">
+									<template:if test="{header>aiNotice/contentFragmentName}">
 										<template:then>
-											<Text text="{header>aiNotice/contentText}" />
-										</template:then>
-										<template:elseif test="{header>aiNotice/contentFragmentName}">
 											<fpm:CustomFragment
 												id="fe::snappedHeaderNotice"
 												fragmentName="{header>aiNotice/contentFragmentName}"
 												contextPath="{fullContextPath>}"
 											/>
+										</template:then>
+										<template:elseif test="{header>aiNotice/contentText}">
+											<Text text="{header>aiNotice/contentText}" />
 										</template:elseif>
 									</template:if>
 								</macros:popoverContent>

package/src/sap/fe/templates/ObjectPage/view/fragments/ObjectPageHeaderAddress.fragment.xml

@@ -18,7 +18,7 @@
 			displayInline="true"
 			binding="{= OP.createBindingForAlternateAndSecondaryKeys((MODEL.getNavigationPath(${headerFacet>Target/$AnnotationPath@@UI.getDataModelObjectPath})))}"
 		>
-			<Title text="{headerFacet>Label}" />
+			<Title text="{headerFacet>Label}" level="H3" />
 			<Text renderWhitespace="true" class="sapMLabel" text="{addressPath>label@@MODEL.format}" />
 		</VBox>
 	</template:with>

package/src/sap/fe/templates/ObjectPage/view/fragments/ObjectPageHeaderContact.fragment.xml

@@ -19,7 +19,7 @@
 				binding="{= OP.createBindingForAlternateAndSecondaryKeys(${headerFacet>Target/$AnnotationPath@@UI.getDataModelObjectPath})}"
 			>
 				<template:if test="{headerFacet>@@MODEL.label}">
-					<Title text="{headerFacet>@@MODEL.label}" class="sapUiSmallMarginBottom" />
+					<Title text="{headerFacet>@@MODEL.label}" level="H3" class="sapUiSmallMarginBottom" />
 				</template:if>
 				<template:with path="headerFacet>Target/$AnnotationPath" var="metaPath">
 					<macro:Contact

package/src/sap/fe/templates/ObjectPage/view/fragments/ObjectPageHeaderForm.fragment.xml

@@ -25,6 +25,7 @@
 			<Title
 				text="{converterHeaderFacet>headerFormData/label}"
 				id="{= ID.generate([ ${converterHeaderFacet>headerFormData/id}, 'Title'])}"
+				level="H3"
 				class="sapUiSmallMarginBottom"
 			/>
 		</template:if>

package/src/sap/fe/templates/library.js

@@ -36,7 +36,7 @@ sap.ui.define(["sap/f/library", "sap/fe/core/library", "sap/fe/macros/library",
     controls: [],
     elements: [],
     // eslint-disable-next-line no-template-curly-in-string
-    version: "1.147.0",
+    version: "1.148.1",
     noLibraryCSS: true
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   });