@sapui5/sap.fe.templates 1.95.0 → 1.98.0

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

@@ -1,13 +1,12 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[
 		"sap/fe/core/PageController",
 		"sap/fe/core/controllerextensions/InternalRouting",
 		"./overrides/InternalRouting",
-		"sap/fe/core/controllerextensions/SideEffects",
 		"sap/fe/core/controllerextensions/EditFlow",
 		"sap/fe/core/controllerextensions/InternalEditFlow",
 		"sap/fe/core/controllerextensions/PageReady",
@@ -41,13 +40,14 @@ sap.ui.define(
 		"sap/ui/model/json/JSONModel",
 		"sap/fe/core/controllerextensions/Paginator",
 		"./overrides/Paginator",
-		"sap/fe/core/controllerextensions/Placeholder"
+		"sap/fe/core/controllerextensions/Placeholder",
+		"sap/base/util/UriParameters",
+		"sap/fe/core/controllerextensions/MassEdit"
 	],
 	function(
 		PageController,
 		InternalRouting,
 		InternalRoutingOverride,
-		SideEffects,
 		EditFlow,
 		InternalEditFlow,
 		PageReady,
@@ -81,7 +81,9 @@ sap.ui.define(
 		JSONModel,
 		Paginator,
 		PaginatorOverride,
-		Placeholder
+		Placeholder,
+		UriParameters,
+		MassEdit
 	) {
 		"use strict";
 
@@ -100,7 +102,6 @@ sap.ui.define(
 				}
 			},
 			placeholder: Placeholder,
-			sideEffects: SideEffects,
 			editFlow: EditFlow,
 			share: Share.override(ShareOverrides),
 			_editFlow: InternalEditFlow.override(EditFlowOverrides),
@@ -112,7 +113,7 @@ sap.ui.define(
 				getNavigationMode: function() {
 					var bIsStickyEditMode =
 						this._oView.getController().getStickyEditMode && this._oView.getController().getStickyEditMode();
-					return bIsStickyEditMode ? "explace" : "inplace";
+					return bIsStickyEditMode ? "explace" : undefined;
 				}
 			}),
 			viewState: ViewState.override(ViewStateOverrides),
@@ -121,6 +122,7 @@ sap.ui.define(
 					return true;
 				}
 			}),
+			massEdit: MassEdit,
 
 			getExtensionAPI: function(sId) {
 				if (sId) {
@@ -152,7 +154,7 @@ sap.ui.define(
 				});
 				oInternalModelContext.setProperty("batchGroups", this._getBatchGroupsForView());
 				oInternalModelContext.setProperty("errorNavigationSectionFlag", false);
-				if (oObjectPage.getEnableLazyLoading()) {
+				if (!this.getView().getViewData().useNewLazyLoading && oObjectPage.getEnableLazyLoading()) {
 					//Attaching the event to make the subsection context binding active when it is visible.
 					oObjectPage.attachEvent("subSectionEnteredViewPort", this._handleSubSectionEnteredViewPort.bind(this));
 				}
@@ -203,8 +205,8 @@ sap.ui.define(
 					aTables = this._findTables(),
 					oFastCreationRow,
 					oObjectPage = this.byId("fe::ObjectPage"),
-					oBinding = mParameters.listBinding,
 					oInternalModelContext = that.getView().getBindingContext("internal"),
+					oInternalModel = that.getView().getModel("internal"),
 					aBatchGroups = oInternalModelContext.getProperty("batchGroups"),
 					iViewLevel = this.getView().getViewData().viewLevel;
 
@@ -260,29 +262,37 @@ sap.ui.define(
 				});
 
 				//Set the Binding for Paginators using ListBinding ID
-				if (oBinding && iViewLevel > 1) {
-					if (oBinding.isA("sap.ui.model.odata.v4.ODataListBinding")) {
-						this.paginator.initialize(oBinding, oContext);
-					} else {
-						//if the binding type is not ODataListBinding because of a deeplink navigation or a refresh of the page
-						// we need to create it
-						var sContextPath = oBinding.getPath().replace(/\([^\)]*\)*$/, ""); //removing the last tuple
-						var oBinding = new sap.ui.model.odata.v4.ODataListBinding(
-							oBinding.oModel,
-							"",
-							oBinding.oModel.createBindingContext(sContextPath)
-						);
-
-						oBinding.getContexts(0);
-						oBinding.attachEvent("change", function _setListBindingAsync() {
-							if (oBinding.getContexts().length > 0) {
-								that.paginator.initialize(oBinding, oContext);
-								oBinding.detachEvent("change", _setListBindingAsync);
-							}
-						});
+				if (iViewLevel > 1) {
+					var oBinding = mParameters && mParameters.listBinding,
+						oPaginatorCurrentContext = oInternalModel.getProperty("/paginatorCurrentContext");
+					if (oPaginatorCurrentContext) {
+						var oBindingToUse = oPaginatorCurrentContext.getBinding();
+						this.paginator.initialize(oBindingToUse, oPaginatorCurrentContext);
+						oInternalModel.setProperty("/paginatorCurrentContext", null);
+					} else if (oBinding) {
+						if (oBinding.isA("sap.ui.model.odata.v4.ODataListBinding")) {
+							this.paginator.initialize(oBinding, oContext);
+						} else {
+							//if the binding type is not ODataListBinding because of a deeplink navigation or a refresh of the page
+							// we need to create it
+							var sContextPath = oBinding.getPath().replace(/\([^\)]*\)*$/, ""); //removing the last tuple
+							oBinding = new sap.ui.model.odata.v4.ODataListBinding(
+								oBinding.oModel,
+								"",
+								oBinding.oModel.createBindingContext(sContextPath)
+							);
+
+							oBinding.getContexts(0);
+							oBinding.attachEvent("change", function _setListBindingAsync() {
+								if (oBinding.getContexts().length > 0) {
+									that.paginator.initialize(oBinding, oContext);
+									oBinding.detachEvent("change", _setListBindingAsync);
+								}
+							});
+						}
 					}
 				}
-				if (oObjectPage.getEnableLazyLoading()) {
+				if (!this.getView().getViewData().useNewLazyLoading && oObjectPage.getEnableLazyLoading()) {
 					var aSections = oObjectPage.getSections(),
 						bUseIconTabBar = oObjectPage.getUseIconTabBar(),
 						iSkip = 2,
@@ -295,7 +305,9 @@ sap.ui.define(
 							// In IconTabBar mode keep the second section bound if there is an editable header and we are switching to display mode
 							if (iSkip < 1 || (bUseIconTabBar && (iSection > 1 || (iSection === 1 && !bEditableHeader && !bIsInEditMode)))) {
 								var oSubSection = aSubSections[iSubSection];
-								oSubSection.setBindingContext(null);
+								if (oSubSection.data().isVisibilityDynamic !== "true") {
+									oSubSection.setBindingContext(null);
+								}
 							}
 						}
 					}
@@ -315,37 +327,44 @@ sap.ui.define(
 				var aActions = oObjectPage.getHeaderTitle() && oObjectPage.getHeaderTitle().getActions();
 				if (aActions && aActions.length) {
 					oFirstClickableElement = aActions.find(function(oAction) {
-						return oAction.getVisible();
+						return oAction.getVisible() && oAction.getEnabled();
 					});
 				}
 				return oFirstClickableElement;
 			},
 
 			_getFirstEmptyMandatoryFieldFromSubSection: function(aSubSections) {
-				for (var subSection = 0; aSubSections && subSection < aSubSections.length; subSection++) {
-					var aBlocks = aSubSections[subSection].getBlocks();
-
-					for (var block = 0; aBlocks && block < aBlocks.length; block++) {
-						var aFormContainers;
-
-						if (aBlocks[block].isA("sap.ui.layout.form.Form")) {
-							aFormContainers = aBlocks[block].getFormContainers();
-						} else if (
-							aBlocks[block].getContent &&
-							aBlocks[block].getContent() &&
-							aBlocks[block].getContent().isA("sap.ui.layout.form.Form")
-						) {
-							aFormContainers = aBlocks[block].getContent().getFormContainers();
-						}
-
-						for (var formContainer = 0; aFormContainers && formContainer < aFormContainers.length; formContainer++) {
-							var aFormElements = aFormContainers[formContainer].getFormElements();
-
-							for (var formElement = 0; aFormElements && formElement < aFormElements.length; formElement++) {
-								var aFields = aFormElements[formElement].getFields();
+				if (aSubSections) {
+					for (var subSection = 0; subSection < aSubSections.length; subSection++) {
+						var aBlocks = aSubSections[subSection].getBlocks();
+
+						if (aBlocks) {
+							for (var block = 0; block < aBlocks.length; block++) {
+								var aFormContainers;
+
+								if (aBlocks[block].isA("sap.ui.layout.form.Form")) {
+									aFormContainers = aBlocks[block].getFormContainers();
+								} else if (
+									aBlocks[block].getContent &&
+									aBlocks[block].getContent() &&
+									aBlocks[block].getContent().isA("sap.ui.layout.form.Form")
+								) {
+									aFormContainers = aBlocks[block].getContent().getFormContainers();
+								}
 
-								if (aFields[0].getRequired() && !aFields[0].getValue()) {
-									return aFields[0];
+								if (aFormContainers) {
+									for (var formContainer = 0; formContainer < aFormContainers.length; formContainer++) {
+										var aFormElements = aFormContainers[formContainer].getFormElements();
+										if (aFormElements) {
+											for (var formElement = 0; formElement < aFormElements.length; formElement++) {
+												var aFields = aFormElements[formElement].getFields();
+
+												if (aFields[0].getRequired() && !aFields[0].getValue()) {
+													return aFields[0];
+												}
+											}
+										}
+									}
 								}
 							}
 						}
@@ -354,57 +373,58 @@ sap.ui.define(
 				return undefined;
 			},
 
-			initialTab: {
-				value: true
+			_updateFocusInEditMode: function(aSubSections) {
+				var oObjectPage = this.byId("fe::ObjectPage");
+
+				var oMandatoryField = this._getFirstEmptyMandatoryFieldFromSubSection(aSubSections);
+				var oFieldToFocus;
+				if (oMandatoryField) {
+					oFieldToFocus = oMandatoryField.content.getContentEdit()[0];
+				} else {
+					oFieldToFocus = oObjectPage._getFirstEditableInput() || this._getFirstClickableElement(oObjectPage);
+				}
+
+				if (oFieldToFocus) {
+					setTimeout(function() {
+						// We set the focus in a timeeout, otherwise the focus sometimes goes to the TabBar
+						oFieldToFocus.focus();
+					}, 0);
+				}
 			},
 
 			_handleSubSectionEnteredViewPort: function(oEvent) {
 				var oSubSection = oEvent.getParameter("subSection");
-				var oInternalModelContext = this.getView().getBindingContext("internal");
 				oSubSection.setBindingContext(undefined);
-				var oObjectPage = this.byId("fe::ObjectPage");
-				if (oObjectPage.getModel("ui").getProperty("/editMode") !== "Display") {
-					if (
-						this.getView().getViewData().sectionLayout === "Tabs" &&
-						this.initialTab.value === false &&
-						oInternalModelContext.getProperty("errorNavigationSectionFlag") === false
-					) {
-						var oFieldToFocus = this._getFirstEmptyMandatoryFieldFromSubSection([oSubSection]);
-						if (oFieldToFocus) {
-							oFieldToFocus.content.getContentEdit()[0].focus();
-						} else {
-							var oFirstEditableInput = oObjectPage._getFirstEditableInput();
-							if (oFirstEditableInput) {
-								oFirstEditableInput.focus();
-							} else {
-								var oFirstClickableElement = this._getFirstClickableElement(oObjectPage);
-								if (oFirstClickableElement) {
-									oFirstClickableElement.focus();
-								}
-							}
-						}
-					}
-				}
 			},
 
 			_onBackNavigationInDraft: function(oContext) {
-				CommonUtils.fnProcessDataLossOrDraftDiscardConfirmation(
-					function() {
-						history.back();
-					},
-					Function.prototype,
-					oContext,
-					this.getView().getController(),
-					false
-				);
+				if (
+					this.getAppComponent()
+						.getRouterProxy()
+						.checkIfBackHasSameContext()
+				) {
+					// Back nav will keep the same context --> no need to display the dialog
+					history.back();
+				} else {
+					CommonUtils.fnProcessDataLossOrDraftDiscardConfirmation(
+						function() {
+							history.back();
+						},
+						Function.prototype,
+						oContext,
+						this,
+						false
+					);
+				}
 			},
 
 			_onAfterBinding: function(oBindingContext, mParameters) {
 				var oObjectPage = this.byId("fe::ObjectPage"),
 					that = this,
-					aTables = this._findTables();
+					aTables = this._findTables(),
+					aFormContainers = this._findFormContainers();
 
-				this.sideEffects.clearPropertiesStatus();
+				this._sideEffects.clearPropertiesStatus();
 
 				// TODO: this is only a temp solution as long as the model fix the cache issue and we use this additional
 				// binding with ownRequest
@@ -416,6 +436,32 @@ sap.ui.define(
 						aIBNActions = CommonUtils.getIBNActions(oSubSection, aIBNActions);
 					});
 				});
+
+				// Assign internal binding contexts to oFormContainer:
+				// 1. It is not possible to assign the internal binding context to the XML fragment
+				// (FormContainer.fragment.xml) yet - it is used already for the data-structure.
+				// 2. Another problem is, that FormContainers assigned to a 'MoreBlock' does not have an
+				// internal model context at all.
+
+				aFormContainers.forEach(function(oFormContainer) {
+					var oInternalModelContext,
+						oInternalModel = oObjectPage.getModel("internal"),
+						sPageContextPath = "/pages/" + that.getView().getId(),
+						sFormContainerContextPath = "controls/" + that.getView().getLocalId(oFormContainer.getId()),
+						SHOW_DETAILS = "showDetails";
+					if (oFormContainer.getModel("internal") === undefined) {
+						oFormContainer.setModel(oInternalModel, "internal");
+						oFormContainer.setBindingContext(
+							oInternalModel.createBindingContext(sPageContextPath + "/" + sFormContainerContextPath),
+							"internal"
+						);
+						oFormContainer.bindElement({ path: "", model: "internal" });
+					} else {
+						oFormContainer.bindElement({ path: sFormContainerContextPath, model: "internal" });
+					}
+					oInternalModelContext = oFormContainer.getBindingContext("internal");
+					oInternalModelContext.setProperty(SHOW_DETAILS, false);
+				});
 				aTables.forEach(function(oTable) {
 					var oInternalModelContext = oTable.getBindingContext("internal");
 					oInternalModelContext.setProperty("creationRowFieldValidity", {});
@@ -434,7 +480,6 @@ sap.ui.define(
 						}
 					}
 					// Workaround ends here!!
-					TableUtils.getSemanticTargetsFromTable(that, oTable);
 
 					// Update 'enabled' property of DataFieldForAction buttons on table toolbar
 					// The same is also performed on Table selectionChange event
@@ -557,98 +602,69 @@ sap.ui.define(
 							});
 					});
 
-					// should be called only after binding is ready hence calling it in onAfterBinding
-					oObjectPage._triggerVisibleSubSectionsEvents();
+					if (!this.getView().getViewData().useNewLazyLoading) {
+						// should be called only after binding is ready hence calling it in onAfterBinding
+						oObjectPage._triggerVisibleSubSectionsEvents();
+					}
 				}
 			},
 			onPageReady: function(mParameters) {
 				// Apply app state only after the page is ready with the first section selected
-				function getVisibleSections(oObjectPage) {
-					var aVisibleSections;
-					var aSections = oObjectPage.getSections();
-					if (aSections && aSections.length) {
-						aVisibleSections = aSections.filter(function(oSection) {
-							return oSection.getVisible() === true;
-						});
-					}
-					return aVisibleSections;
-				}
 				var that = this;
-				var oInternalModelContext = this.getView().getBindingContext("internal");
-				var oBindingContext = this.getView().getBindingContext();
+				var oView = this.getView();
+				var oInternalModelContext = oView.getBindingContext("internal");
+				var oBindingContext = oView.getBindingContext();
 				//Show popup while navigating back from object page in case of draft
 				if (oBindingContext) {
 					var bIsStickyMode = ModelHelper.isStickySessionSupported(oBindingContext.getModel().getMetaModel());
 					if (!bIsStickyMode) {
-						var oAppComponent = CommonUtils.getAppComponent(this.getView());
+						var oAppComponent = CommonUtils.getAppComponent(oView);
 						oAppComponent.getShellServices().setBackNavigation(that._onBackNavigationInDraft.bind(that, oBindingContext));
 					}
 				}
 				this.getAppComponent()
 					.getAppStateHandler()
 					.applyAppState();
-				var oLastFocusedControl = mParameters.lastFocusedControl;
-				if (oLastFocusedControl && oLastFocusedControl.controlId && oLastFocusedControl.focusInfo) {
-					var oView = this.getView();
-					var oFocusControl = oView.byId(oLastFocusedControl.controlId);
-					if (oFocusControl) {
-						oFocusControl.applyFocusInfo(oLastFocusedControl.focusInfo);
-						return;
-					}
-				}
-				var oObjectPage = this.byId("fe::ObjectPage");
-				// set the focus to the first action button, or to the first editable input if in editable mode
-				var isInDisplayMode = oObjectPage.getModel("ui").getProperty("/editMode") === "Display";
-				var oFirstClickableElement;
-				var aVisibleSections = getVisibleSections(oObjectPage);
 
-				if (isInDisplayMode) {
-					//Focus on the first visible section if page OP is in Display Mode
-					oObjectPage.setSelectedSection(aVisibleSections[0].getId());
-					oFirstClickableElement = this._getFirstClickableElement(oObjectPage);
-					if (oFirstClickableElement) {
-						oFirstClickableElement.focus();
-					}
-				} else {
-					//Focus on first mandatory empty field
+				if (mParameters.forceFocus) {
+					var oObjectPage = this.byId("fe::ObjectPage");
+					// set the focus to the first action button, or to the first editable input if in editable mode
+					var isInDisplayMode = oObjectPage.getModel("ui").getProperty("/editMode") === "Display";
+					var aVisibleSections = oObjectPage.getSections().filter(function(oSection) {
+						return oSection.getVisible() === true;
+					});
+					// Select the first visible section
 					oObjectPage.setSelectedSection(aVisibleSections[0].getId());
-					if (
-						this.getView().getViewData().sectionLayout === "Page" ||
-						(this.getView().getViewData().sectionLayout === "Tabs" && this.initialTab.value === true)
-					) {
-						var oFieldToFocus;
-						var aSubSections = [];
-						for (var section = 0; section < aVisibleSections.length; section++) {
-							aSubSections = aVisibleSections[section].getSubSections();
-							oFieldToFocus = this._getFirstEmptyMandatoryFieldFromSubSection(aSubSections);
-							if (oFieldToFocus) {
-								oFieldToFocus.content.getContentEdit()[0].focus();
-								break;
-							}
-						}
 
-						//this.initialTab.value = false;
-					}
-					if (!oFieldToFocus) {
-						var oFirstEditableInput = oObjectPage._getFirstEditableInput();
-						if (oFirstEditableInput) {
-							oFirstEditableInput.focus();
+					if (isInDisplayMode) {
+						var oFirstClickableElement = this._getFirstClickableElement(oObjectPage);
+						if (oFirstClickableElement) {
+							oFirstClickableElement.focus();
+						}
+					} else {
+						var aVisibleSubSections;
+						if (oView.getViewData().sectionLayout === "Tabs") {
+							// In a tabbed layout, only the subsections of the selected section are visible on the screen
+							aVisibleSubSections = aVisibleSections[0].getSubSections();
 						} else {
-							oFirstClickableElement = this._getFirstClickableElement(oObjectPage);
-							if (oFirstClickableElement) {
-								oFirstClickableElement.focus();
-							}
+							// In a paged layout, all subsections of the visible sections are visible on the screen
+							aVisibleSubSections = aVisibleSections
+								.map(function(oSection) {
+									return oSection.getSubSections();
+								})
+								.flat();
 						}
+						this._updateFocusInEditMode(aVisibleSubSections);
 					}
-					this.initialTab.value = false;
 				}
+
 				oInternalModelContext.setProperty("errorNavigationSectionFlag", false);
 				this._checkDataPointTitleForExternalNavigation();
 			},
 			/**
-			 * Get sticky edit mode.
+			 * Get the status of edit mode for sticky session.
 			 *
-			 * @returns {boolean} Sticky edit mode status
+			 * @returns {boolean} The status of edit mode for sticky session
 			 *
 			 *
 			 */
@@ -680,7 +696,7 @@ sap.ui.define(
 					icon: ""
 				};
 
-				return Promise.resolve(oTitleInfo);
+				return oTitleInfo;
 			},
 
 			_executeHeaderShortcut: function(sId) {
@@ -815,7 +831,9 @@ sap.ui.define(
 						.saveDocument(oContext, mParameters)
 						.catch(that._showMessagePopover.bind(that))
 						.finally(function() {
-							BusyLocker.unlock(oModel);
+							if (BusyLocker.isLocked(oModel)) {
+								BusyLocker.unlock(oModel);
+							}
 						});
 				});
 			},
@@ -898,6 +916,37 @@ sap.ui.define(
 				return aBlocks;
 			},
 
+			_findFormContainers: function() {
+				var aSubSections = this._getAllSubSections(),
+					aFormContainers = [];
+
+				function _collectFormContainersInBlocks(aBlocks) {
+					for (var i = 0; i < aBlocks.length; i++) {
+						var oElement = aBlocks[i].getContent instanceof Function && aBlocks[i].getContent();
+						if (oElement && oElement.isA && oElement.isA("sap.ui.layout.DynamicSideContent")) {
+							oElement = oElement.getMainContent instanceof Function && oElement.getMainContent();
+							if (oElement && oElement.length > 0) {
+								oElement = oElement[0];
+							}
+						}
+						if (
+							oElement &&
+							oElement.isA &&
+							oElement.isA("sap.ui.layout.form.Form") &&
+							oElement.getFormContainers instanceof Function
+						) {
+							aFormContainers = aFormContainers.concat(oElement.getFormContainers());
+						}
+					}
+				}
+
+				for (var i = 0; i < aSubSections.length; i++) {
+					_collectFormContainersInBlocks(aSubSections[i].getBlocks());
+					_collectFormContainersInBlocks(aSubSections[i].getMoreBlocks());
+				}
+				return aFormContainers;
+			},
+
 			//TODO: This is needed for two workarounds - to be removed again
 			_findTables: function() {
 				var aSubSections = this._getAllSubSections(),
@@ -1069,20 +1118,17 @@ sap.ui.define(
 					aPathParts.forEach(function(sPathPart, i) {
 						sPath += "/" + sPathPart;
 						var oRootViewController = oAppComponent.getRootViewController();
-						var oTitleHierarchyCache = oRootViewController.getTitleHierarchyCache();
 						var pWaitForTitleHiearchyInfo;
 						var sParameterPath = oMetaModel.getMetaPath(sPath);
-						var bResultContext = oMetaModel.getProperty(sParameterPath + "/@com.sap.vocabularies.Common.v1.ResultContext");
+						var bResultContext = oMetaModel.getObject(sParameterPath + "/@com.sap.vocabularies.Common.v1.ResultContext");
 						if (bResultContext) {
 							// We dont need to create a breadcrumb for Parameter path
 							iSkipParameterized = 1;
 							return;
 						}
-						if (!oTitleHierarchyCache[sPath]) {
-							pWaitForTitleHiearchyInfo = oRootViewController.addNewEntryInCacheTitle(sPath, oAppComponent);
-						} else {
-							pWaitForTitleHiearchyInfo = Promise.resolve(oTitleHierarchyCache[sPath]);
-						}
+
+						pWaitForTitleHiearchyInfo = oRootViewController.getTitleInfoFromPath(sPath);
+
 						pWaitForTitleHiearchyInfo
 							.then(function(oTitleHiearchyInfo) {
 								var idx = i - iSkipParameterized,
@@ -1300,7 +1346,8 @@ sap.ui.define(
 							.getModel()
 							.getMetaModel()
 							.getMetaPath(oDataPointOrChartBindingContext.getPath()),
-						aNavigationData = oController._getChartContextData(oDataPointOrChartBindingContext, sCollectionPath);
+						aNavigationData = oController._getChartContextData(oDataPointOrChartBindingContext, sCollectionPath),
+						additionalNavigationParameters;
 
 					aNavigationData = aNavigationData.map(function(oNavigationData) {
 						return {
@@ -1308,10 +1355,18 @@ sap.ui.define(
 							metaPath: sMetaPath + (sCollectionPath ? "/" + sCollectionPath : "")
 						};
 					});
+					if (oTargetInfo && oTargetInfo.parameters) {
+						var oParams =
+							oTargetInfo.parameters && oController._intentBasedNavigation.getOutboundParams(oTargetInfo.parameters);
+						if (Object.keys(oParams).length > 0) {
+							additionalNavigationParameters = oParams;
+						}
+					}
 					if (oTargetInfo && oTargetInfo.semanticObject && oTargetInfo.action) {
 						oController._intentBasedNavigation.navigate(oTargetInfo.semanticObject, oTargetInfo.action, {
 							navigationContexts: aNavigationData,
-							semanticObjectMapping: aSemanticObjectMapping
+							semanticObjectMapping: aSemanticObjectMapping,
+							additionalNavigationParameters: additionalNavigationParameters
 						});
 					}
 				},
@@ -1339,6 +1394,17 @@ sap.ui.define(
 					//will be called always when we click on a section tab
 					this.getExtensionAPI().updateAppState();
 					this.bSectionNavigated = true;
+
+					var oInternalModelContext = this.getView().getBindingContext("internal");
+					var oObjectPage = this.byId("fe::ObjectPage");
+					if (
+						oObjectPage.getModel("ui").getProperty("/editMode") !== "Display" &&
+						this.getView().getViewData().sectionLayout === "Tabs" &&
+						oInternalModelContext.getProperty("errorNavigationSectionFlag") === false
+					) {
+						var oSubSection = oEvent.getParameter("subSection");
+						this._updateFocusInEditMode([oSubSection]);
+					}
 				},
 				onVariantSelected: function(oEvent) {
 					this.getExtensionAPI().updateAppState();
@@ -1394,11 +1460,6 @@ sap.ui.define(
 				onChartSelectionChanged: function(oEvent) {
 					ChartRuntime.fnUpdateChart(oEvent);
 				}
-			},
-			formatters: {
-				compareTitleFromTableAndTab: function(headerVisible, tableTitle, tabTitle) {
-					return this.commonFormatters.compareTitleFromTableAndTab(headerVisible, tableTitle, tabTitle, this);
-				}
 			}
 		});
 	}

package/src/sap/fe/templates/ObjectPage/controls/StashableHBox.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	["sap/m/HBox", "sap/m/HBoxRenderer", "sap/ui/core/StashedControlSupport"],
@@ -67,6 +67,7 @@ sap.ui.define(
 		 */
 		StashableHBox.prototype.getTitleControl = function() {
 			var aItems = [],
+				content,
 				i;
 			if (this.getItems && this.getItems()[0] && this.getItems()[0].getItems) {
 				aItems = this.getItems()[0].getItems();
@@ -75,6 +76,13 @@ sap.ui.define(
 			}
 			for (i = 0; i < aItems.length; i++) {
 				if (aItems[i].isA("sap.m.Title") || aItems[i].isA("sap.m.Link")) {
+					if (aItems[i].isA("sap.m.Title")) {
+						// If a title was found, check if there is a link in the content aggregation
+						content = aItems[i].getContent();
+						if (content && content.isA("sap.m.Link")) {
+							return content;
+						}
+					}
 					return aItems[i];
 				}
 			}

package/src/sap/fe/templates/ObjectPage/controls/StashableVBox.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	["sap/m/VBox", "sap/m/VBoxRenderer", "sap/ui/core/StashedControlSupport"],