@sapui5/sap.fe.templates 1.144.0 → 1.145.1

package/src/sap/fe/templates/ObjectPage/ObjectPageController.controller.ts

@@ -27,7 +27,6 @@ import { RecommendationDialogDecision } from "sap/fe/core/controls/Recommendatio
 import type { HiddenDraft, MicroChartManifestConfiguration } from "sap/fe/core/converters/ManifestSettings";
 import type { InternalModelContext } from "sap/fe/core/helpers/ModelHelper";
 import ModelHelper from "sap/fe/core/helpers/ModelHelper";
-import { getResourceModel } from "sap/fe/core/helpers/ResourceModelHelper";
 import FELibrary from "sap/fe/core/library";
 import { type WrappedCard } from "sap/fe/core/services/CollaborationManagerServiceFactory";
 import type ChartBlock from "sap/fe/macros/Chart";
@@ -53,7 +52,6 @@ import TableScroller from "sap/fe/templates/TableScroller";
 import type Button from "sap/m/Button";
 import type InputBase from "sap/m/InputBase";
 import InstanceManager from "sap/m/InstanceManager";
-import MessageBox from "sap/m/MessageBox";
 import type NavContainer from "sap/m/NavContainer";
 import type Popover from "sap/m/Popover";
 import type ToolbarSpacer from "sap/m/ToolbarSpacer";
@@ -565,9 +563,15 @@ class ObjectPageController extends PageController {
 					const oSubSection = aSubSections[iSubSection];
 					// SubSection's binding is enabled.
 					oSubSection.setBindingContext(undefined);
-					const blocks = oSubSection.getBlocks() as SubSectionBlock[];
+					const blocks = oSubSection.getBlocks();
 					// SubSection's contents binding is disabled.
-					blocks.forEach((block) => block.setBindingContext(null));
+					blocks.forEach((block) => {
+						if (block.isA<SubSectionBlock>("sap.fe.templates.ObjectPage.controls.SubSectionBlock")) {
+							block.content.setBindingContext(null);
+						} else {
+							block.setBindingContext(null);
+						}
+					});
 					oSubSection.getMoreBlocks().forEach((subBlock) => subBlock.setBindingContext(null));
 					oSubSection.getActions().forEach((actions) => actions.setBindingContext(null));
 				}
@@ -712,8 +716,14 @@ class ObjectPageController extends PageController {
 		if (oSubSection.isA<SubSection>("sap.fe.macros.controls.section.SubSection")) {
 			oSubSection.handleSubSectionCreated(this.getView());
 		}
-		const blocks = oSubSection.getBlocks() as SubSectionBlock[];
-		blocks.forEach((block) => block.setBindingContext(undefined));
+		const blocks = oSubSection.getBlocks();
+		blocks.forEach((block) => {
+			if (block.isA<SubSectionBlock>("sap.fe.templates.ObjectPage.controls.SubSectionBlock")) {
+				block.content.setBindingContext(undefined);
+			} else {
+				block.setBindingContext(undefined);
+			}
+		});
 		oSubSection.getMoreBlocks().forEach((subBlock) => subBlock.setBindingContext(undefined));
 		oSubSection.getActions().forEach((actions) => actions.setBindingContext(undefined));
 	}
@@ -1217,10 +1227,7 @@ class ObjectPageController extends PageController {
 			});
 	}
 
-	_showMessagePopover(err?: string, oRet?: unknown): unknown {
-		if (err) {
-			Log.error(err);
-		}
+	_showMessagePopover(): void {
 		const isEditMode = CommonUtils.getIsEditable(this.getView());
 		const rootViewController = this.getAppComponent().getRootViewController();
 		const currentPageView = rootViewController.isFclEnabled()
@@ -1239,7 +1246,6 @@ class ObjectPageController extends PageController {
 				}, 0);
 			}
 		}
-		return oRet;
 	}
 
 	async _editDocument(): Promise<void | Context> {
@@ -1432,7 +1438,10 @@ class ObjectPageController extends PageController {
 				BusyLocker.unlock(model);
 			}
 			if (messagePopoverErr !== undefined) {
-				this._showMessagePopover(messagePopoverErr);
+				if (messagePopoverErr.length) {
+					Log.error(messagePopoverErr);
+				}
+				this._showMessagePopover();
 			}
 		}
 	}
@@ -2005,6 +2014,10 @@ class ObjectPageController extends PageController {
 			this.messageButton.fireModelContextChange();
 		},
 
+		onTableBindingUpdated(this: ObjectPageController): void {
+			this.messageButton.fireModelContextChange();
+		},
+
 		async onCallAction(
 			oView: FEView,
 			sActionName: string,
@@ -2035,8 +2048,13 @@ class ObjectPageController extends PageController {
 
 			return oController.editFlow
 				.invokeAction(sActionName, mParameters)
-				.then(oController._showMessagePopover.bind(oController, undefined))
-				.catch(oController._showMessagePopover.bind(oController));
+				.then((res) => {
+					oController._showMessagePopover();
+					return res;
+				})
+				.catch(() => {
+					oController._showMessagePopover();
+				});
 		},
 		onDataPointTitlePressed(
 			oController: ObjectPageController,
@@ -2132,35 +2150,18 @@ class ObjectPageController extends PageController {
 		},
 		navigateToSubSection: function (oController: ObjectPageController, vDetailConfig: string | object): void {
 			const oDetailConfig = typeof vDetailConfig === "string" ? JSON.parse(vDetailConfig) : vDetailConfig;
-			const oObjectPage = oController.getView().byId("fe::ObjectPage") as ObjectPageLayout;
-			let oSection;
-			let oSubSection;
-			if (oDetailConfig.sectionId) {
-				oSection = oController.getView().byId(oDetailConfig.sectionId) as ObjectPageSection;
-				oSubSection = (
-					oDetailConfig.subSectionId
-						? oController.getView().byId(oDetailConfig.subSectionId)
-						: oSection && oSection.getSubSections() && oSection.getSubSections()[0]
-				) as ObjectPageSubSection;
-			} else if (oDetailConfig.subSectionId) {
-				oSubSection = oController.getView().byId(oDetailConfig.subSectionId) as ObjectPageSubSection;
-				oSection = oSubSection && (oSubSection.getParent() as ObjectPageSection);
-			}
-			if (!oSection || !oSubSection || !oSection.getVisible() || !oSubSection.getVisible()) {
-				const sTitle = getResourceModel(oController).getText(
-					"C_ROUTING_NAVIGATION_DISABLED_TITLE",
-					undefined,
-					oController.getView().getViewData().entitySet
-				);
-				Log.error(sTitle);
-				MessageBox.error(sTitle);
+
+			// Determine the target ID based on input type
+			let targetId: string | undefined;
+			if (typeof oDetailConfig === "string") {
+				targetId = oDetailConfig;
 			} else {
-				oObjectPage.setSelectedSection(oSubSection.getId());
-				// trigger iapp state change
-				oObjectPage.fireNavigate({
-					section: oSection,
-					subSection: oSubSection
-				});
+				// Priority: subSectionId > sectionId
+				targetId = oDetailConfig.subSectionId ?? oDetailConfig.sectionId;
+			}
+
+			if (targetId) {
+				oController.getExtensionAPI().navigateToSubSection(targetId);
 			}
 		},