@sapui5/sap.fe.templates 1.101.1 → 1.102.2

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

@@ -1,11 +1,12 @@
 import ResourceBundle from "sap/base/i18n/ResourceBundle";
 import Log from "sap/base/Log";
 import merge from "sap/base/util/merge";
-import { connect } from "sap/fe/core/actions/collaboration/ActivitySync";
-import { openManageDialog, showUserDetails } from "sap/fe/core/actions/collaboration/Manage";
-import BusyLocker from "sap/fe/core/BusyLocker";
 import CommonUtils from "sap/fe/core/CommonUtils";
+import BusyLocker from "sap/fe/core/controllerextensions/BusyLocker";
+import { connect } from "sap/fe/core/controllerextensions/collaboration/ActivitySync";
+import { openManageDialog, showUserDetails } from "sap/fe/core/controllerextensions/collaboration/Manage";
 import EditFlow from "sap/fe/core/controllerextensions/EditFlow";
+import draft from "sap/fe/core/controllerextensions/editFlow/draft";
 import IntentBasedNavigation from "sap/fe/core/controllerextensions/IntentBasedNavigation";
 import InternalEditFlow from "sap/fe/core/controllerextensions/InternalEditFlow";
 import InternalIntentBasedNavigation from "sap/fe/core/controllerextensions/InternalIntentBasedNavigation";
@@ -36,11 +37,13 @@ import Popover from "sap/m/Popover";
 import SelectList from "sap/m/SelectList";
 import Event from "sap/ui/base/Event";
 import Control from "sap/ui/core/Control";
+import Core from "sap/ui/core/Core";
 import Fragment from "sap/ui/core/Fragment";
 import Item from "sap/ui/core/Item";
 import OverrideExecution from "sap/ui/core/mvc/OverrideExecution";
 import XMLPreprocessor from "sap/ui/core/util/XMLPreprocessor";
 import XMLTemplateProcessor from "sap/ui/core/XMLTemplateProcessor";
+import Binding from "sap/ui/model/Binding";
 import JSONModel from "sap/ui/model/json/JSONModel";
 import Context from "sap/ui/model/odata/v4/Context";
 import ODataListBinding from "sap/ui/model/odata/v4/ODataListBinding";
@@ -60,6 +63,7 @@ import ViewStateOverrides from "./overrides/ViewState";
 
 @defineUI5Class("sap.fe.templates.ObjectPage.ObjectPageController")
 class ObjectPageController extends PageController {
+	oView!: any;
 	@usingExtension(Placeholder)
 	placeholder!: Placeholder;
 	@usingExtension(EditFlow)
@@ -104,6 +108,7 @@ class ObjectPageController extends PageController {
 	private oResourceBundle?: ResourceBundle;
 	private bSectionNavigated?: boolean;
 	private switchDraftAndActivePopOver?: Popover;
+	private currentBinding?: Binding;
 
 	@publicExtension()
 	@finalExtension()
@@ -158,6 +163,11 @@ class ObjectPageController extends PageController {
 		if (oMessagePopover && oMessagePopover.isOpen()) {
 			oMessagePopover.close();
 		}
+		//when exiting we set keepAlive context to false
+		const oContext = this.getView().getBindingContext() as Context;
+		if (oContext && oContext.isKeepAlive()) {
+			oContext.setKeepAlive(false);
+		}
 	}
 
 	_getTableBinding(oTable: any) {
@@ -166,6 +176,10 @@ class ObjectPageController extends PageController {
 
 	onBeforeRendering() {
 		PageController.prototype.onBeforeRendering.apply(this);
+		// In the retrieveTextFromValueList scenario we need to ensure in case of reload/refresh that the meta model in the methode retrieveTextFromValueList of the FieldRuntime is available
+		if (this.oView.oViewData.retrieveTextFromValueList && CommonHelper.getMetaModel() === undefined) {
+			CommonHelper.setMetaModel(this.getAppComponent().getMetaModel());
+		}
 	}
 
 	onAfterRendering() {
@@ -376,14 +390,15 @@ class ObjectPageController extends PageController {
 			// Back nav will keep the same context --> no need to display the dialog
 			history.back();
 		} else {
-			CommonUtils.fnProcessDataLossOrDraftDiscardConfirmation(
+			draft.processDataLossOrDraftDiscardConfirmation(
 				function () {
 					history.back();
 				},
 				Function.prototype,
 				oContext,
 				this,
-				false
+				false,
+				draft.NavigationType.BackNavigation
 			);
 		}
 	}
@@ -553,7 +568,12 @@ class ObjectPageController extends PageController {
 
 			//Attach the patch sent and patch completed event to the object page binding so that we can react
 			const oBinding = (oBindingContext.getBinding && oBindingContext.getBinding()) || oBindingContext;
-			oBinding.attachEvent("patchSent", this.editFlow.handlePatchSent, this);
+
+			// Attach the event handler only once to the same binding
+			if (this.currentBinding !== oBinding) {
+				oBinding.attachEvent("patchSent", this.editFlow.handlePatchSent, this);
+				this.currentBinding = oBinding;
+			}
 
 			aTables.forEach(function (oTable: any) {
 				// access binding only after table is bound
@@ -574,6 +594,21 @@ class ObjectPageController extends PageController {
 	@publicExtension()
 	@extensible(OverrideExecution.After)
 	onPageReady(mParameters: any) {
+		const setFocus = () => {
+			// Set the focus to the first action button, or to the first editable input if in editable mode
+			const oObjectPage = this._getObjectPageLayoutControl();
+			const isInDisplayMode = !oObjectPage.getModel("ui").getProperty("/isEditable");
+
+			if (isInDisplayMode) {
+				const oFirstClickableElement = this._getFirstClickableElement(oObjectPage);
+				if (oFirstClickableElement) {
+					oFirstClickableElement.focus();
+				}
+			} else {
+				const oSelectedSection: any = Core.byId(oObjectPage.getSelectedSection());
+				this._updateFocusInEditMode(oSelectedSection.getSubSections());
+			}
+		};
 		// Apply app state only after the page is ready with the first section selected
 		const oView = this.getView();
 		const oInternalModelContext = oView.getBindingContext("internal") as InternalModelContext;
@@ -586,39 +621,17 @@ class ObjectPageController extends PageController {
 				oAppComponent.getShellServices().setBackNavigation(() => this._onBackNavigationInDraft(oBindingContext));
 			}
 		}
-		this.getAppComponent().getAppStateHandler().applyAppState();
-
-		if (mParameters.forceFocus) {
-			const oObjectPage = this._getObjectPageLayoutControl() as ObjectPageLayout;
-			// set the focus to the first action button, or to the first editable input if in editable mode
-			const isInDisplayMode = !oObjectPage.getModel("ui").getProperty("/isEditable");
-			const aVisibleSections = oObjectPage.getSections().filter(function (oSection) {
-				return oSection.getVisible() === true;
-			});
-			// Select the first visible section
-			oObjectPage.setSelectedSection(aVisibleSections[0].getId());
-
-			if (isInDisplayMode) {
-				const oFirstClickableElement = this._getFirstClickableElement(oObjectPage);
-				if (oFirstClickableElement) {
-					oFirstClickableElement.focus();
+		this.getAppComponent()
+			.getAppStateHandler()
+			.applyAppState()
+			.then(() => {
+				if (mParameters.forceFocus) {
+					setFocus();
 				}
-			} else {
-				let aVisibleSubSections;
-				if ((oView.getViewData() as any).sectionLayout === "Tabs") {
-					// In a tabbed layout, only the subsections of the selected section are visible on the screen
-					aVisibleSubSections = aVisibleSections[0].getSubSections();
-				} else {
-					// In a paged layout, all subsections of the visible sections are visible on the screen
-					aVisibleSubSections = (
-						aVisibleSections.map(function (oSection: any) {
-							return oSection.getSubSections();
-						}) as any
-					).flat();
-				}
-				this._updateFocusInEditMode(aVisibleSubSections);
-			}
-		}
+			})
+			.catch(function (Error) {
+				Log.error("Error while setting the focus", Error);
+			});
 
 		oInternalModelContext.setProperty("errorNavigationSectionFlag", false);
 		this._checkDataPointTitleForExternalNavigation();
@@ -835,7 +848,7 @@ class ObjectPageController extends PageController {
 				.then((popover: any) => {
 					view.addDependent(popover);
 					popover.setModel(view.getModel("sap.fe.i18n"), "i18n");
-					popover.setPlacement("Bottom"); // TODO
+					popover.setPlacement("Bottom");
 					this.switchDraftAndActivePopOver = popover;
 					popover.attachAfterOpen(() => {
 						// While the list entry corresponding to the currently displayed document version is emphasized with a blue
@@ -945,7 +958,6 @@ class ObjectPageController extends PageController {
 		return aBlocks;
 	}
 
-	//TODO: This is needed for two workarounds - to be removed again
 	_findTables() {
 		const aSubSections = this._getAllSubSections();
 		const aTables: any[] = [];