@sapui5/sap.fe.templates 1.93.3 → 1.97.0

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

@@ -6,7 +6,6 @@ sap.ui.define(
 	[
 		"sap/fe/core/PageController",
 		"sap/fe/core/controllerextensions/InternalRouting",
-		"./overrides/Routing",
 		"./overrides/InternalRouting",
 		"sap/fe/core/controllerextensions/SideEffects",
 		"sap/fe/core/controllerextensions/EditFlow",
@@ -37,12 +36,16 @@ sap.ui.define(
 		"sap/fe/core/controllerextensions/Share",
 		"./overrides/Share",
 		"sap/fe/macros/DelegateUtil",
-		"sap/fe/macros/CommonHelper"
+		"sap/fe/macros/CommonHelper",
+		"sap/fe/templates/TableScroller",
+		"sap/ui/model/json/JSONModel",
+		"sap/fe/core/controllerextensions/Paginator",
+		"./overrides/Paginator",
+		"sap/fe/core/controllerextensions/Placeholder"
 	],
 	function(
 		PageController,
 		InternalRouting,
-		RoutingOverride,
 		InternalRoutingOverride,
 		SideEffects,
 		EditFlow,
@@ -73,7 +76,12 @@ sap.ui.define(
 		Share,
 		ShareOverrides,
 		DelegateUtil,
-		CommonHelper
+		CommonHelper,
+		TableScroller,
+		JSONModel,
+		Paginator,
+		PaginatorOverride,
+		Placeholder
 	) {
 		"use strict";
 
@@ -91,11 +99,13 @@ sap.ui.define(
 					}
 				}
 			},
+			placeholder: Placeholder,
 			sideEffects: SideEffects,
 			editFlow: EditFlow,
 			share: Share.override(ShareOverrides),
 			_editFlow: InternalEditFlow.override(EditFlowOverrides),
 			_routing: InternalRouting.override(InternalRoutingOverride),
+			paginator: Paginator.override(PaginatorOverride),
 			messageHandler: MessageHandler.override(MessageHandlerOverride),
 			intentBasedNavigation: IntentBasedNavigation.override(IntentBasedNavigationOverride),
 			_intentBasedNavigation: InternalIntentBasedNavigation.override({
@@ -105,7 +115,6 @@ sap.ui.define(
 					return bIsStickyEditMode ? "explace" : "inplace";
 				}
 			}),
-			routing: Routing.override(RoutingOverride),
 			viewState: ViewState.override(ViewStateOverrides),
 			pageReady: PageReady.override({
 				isContextExpected: function() {
@@ -142,7 +151,7 @@ sap.ui.define(
 					items: null
 				});
 				oInternalModelContext.setProperty("batchGroups", this._getBatchGroupsForView());
-
+				oInternalModelContext.setProperty("errorNavigationSectionFlag", false);
 				if (oObjectPage.getEnableLazyLoading()) {
 					//Attaching the event to make the subsection context binding active when it is visible.
 					oObjectPage.attachEvent("subSectionEnteredViewPort", this._handleSubSectionEnteredViewPort.bind(this));
@@ -170,6 +179,11 @@ sap.ui.define(
 			_getTableBinding: function(oTable) {
 				return oTable && oTable.getRowBinding();
 			},
+
+			onBeforeRendering: function() {
+				PageController.prototype.onBeforeRendering.apply(this);
+			},
+
 			onAfterRendering: function(oEvent) {
 				var that = this;
 				this.getView()
@@ -191,7 +205,9 @@ sap.ui.define(
 					oObjectPage = this.byId("fe::ObjectPage"),
 					oBinding = mParameters.listBinding,
 					oInternalModelContext = that.getView().getBindingContext("internal"),
-					aBatchGroups = oInternalModelContext.getProperty("batchGroups");
+					aBatchGroups = oInternalModelContext.getProperty("batchGroups"),
+					iViewLevel = this.getView().getViewData().viewLevel;
+
 				aBatchGroups.push("$auto");
 				if (mParameters.bDraftNavigation !== true) {
 					this._closeSideContent();
@@ -244,13 +260,28 @@ sap.ui.define(
 				});
 
 				//Set the Binding for Paginators using ListBinding ID
-				if (oBinding && oBinding.isA("sap.ui.model.odata.v4.ODataListBinding")) {
-					var oPaginator = that.byId("fe::Paginator");
-					if (oPaginator) {
-						oPaginator.setListBinding(oBinding);
+				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 (oObjectPage.getEnableLazyLoading()) {
 					var aSections = oObjectPage.getSections(),
 						bUseIconTabBar = oObjectPage.getUseIconTabBar(),
@@ -269,6 +300,77 @@ sap.ui.define(
 						}
 					}
 				}
+
+				if (this.placeholder.isPlaceholderEnabled() && mParameters.showPlaceholder) {
+					var oView = this.getView();
+					var oNavContainer = oView.getParent().oContainer.getParent();
+					if (oNavContainer) {
+						oNavContainer.showPlaceholder({});
+					}
+				}
+			},
+
+			_getFirstClickableElement: function(oObjectPage) {
+				var oFirstClickableElement;
+				var aActions = oObjectPage.getHeaderTitle() && oObjectPage.getHeaderTitle().getActions();
+				if (aActions && aActions.length) {
+					oFirstClickableElement = aActions.find(function(oAction) {
+						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 (aFields[0].getRequired() && !aFields[0].getValue()) {
+									return aFields[0];
+								}
+							}
+						}
+					}
+				}
+				return undefined;
+			},
+
+			_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) {
@@ -291,7 +393,8 @@ sap.ui.define(
 			_onAfterBinding: function(oBindingContext, mParameters) {
 				var oObjectPage = this.byId("fe::ObjectPage"),
 					that = this,
-					aTables = this._findTables();
+					aTables = this._findTables(),
+					aFormContainers = this._findFormContainers();
 
 				this.sideEffects.clearPropertiesStatus();
 
@@ -299,20 +402,38 @@ sap.ui.define(
 				// binding with ownRequest
 				oBindingContext = oObjectPage.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());
-						oAppComponent.getShellServices().setBackNavigation(that._onBackNavigationInDraft.bind(that, oBindingContext));
-					}
-				}
 				var aIBNActions = [];
 				oObjectPage.getSections().forEach(function(oSection) {
 					oSection.getSubSections().forEach(function(oSubSection) {
 						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", {});
@@ -331,7 +452,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
@@ -458,48 +578,63 @@ sap.ui.define(
 					oObjectPage._triggerVisibleSubSectionsEvents();
 				}
 			},
-
 			onPageReady: function(mParameters) {
 				// Apply app state only after the page is ready with the first section selected
+				var that = this;
+				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(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 firstElementClickable;
-				if (isInDisplayMode) {
-					var aActions = oObjectPage.getHeaderTitle() && oObjectPage.getHeaderTitle().getActions();
-					if (aActions && aActions.length) {
-						firstElementClickable = aActions.find(function(action) {
-							// do we need && action.mProperties["enabled"] ?
-							return action.mProperties["visible"];
-						});
-						if (firstElementClickable) {
-							firstElementClickable.focus();
+
+				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 (isInDisplayMode) {
+						var oFirstClickableElement = this._getFirstClickableElement(oObjectPage);
+						if (oFirstClickableElement) {
+							oFirstClickableElement.focus();
 						}
-					}
-				} else {
-					var firstEditableInput = oObjectPage._getFirstEditableInput();
-					if (firstEditableInput) {
-						firstEditableInput.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 {
+							// 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);
 					}
 				}
+
+				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
 			 *
 			 *
 			 */
@@ -514,6 +649,11 @@ sap.ui.define(
 				}
 				return bIsStickyEditMode;
 			},
+
+			_getObjectPageLayoutControl: function() {
+				return this.byId("fe::ObjectPage");
+			},
+
 			_getPageTitleInformation: function() {
 				var oObjectPage = this.byId("fe::ObjectPage");
 				var oObjectPageSubtitle = oObjectPage.getCustomData().find(function(oCustomData) {
@@ -661,7 +801,9 @@ sap.ui.define(
 						.saveDocument(oContext, mParameters)
 						.catch(that._showMessagePopover.bind(that))
 						.finally(function() {
-							BusyLocker.unlock(oModel);
+							if (BusyLocker.isLocked(oModel)) {
+								BusyLocker.unlock(oModel);
+							}
 						});
 				});
 			},
@@ -744,6 +886,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(),
@@ -787,90 +960,7 @@ sap.ui.define(
 			},
 
 			/**
-			 * Get the Row that has the corresponding binding context
-			 *
-			 * @function
-			 * @name sap.fe.templates.ObjectPage.ObjectPageController.controller#_getTableRow
-			 * @param {object} oTableRowBindingContexts 'contexts of the table rows'
-			 * @param {string} sRowPath 'sPath of the table row'
-			 * @returns {object} row satisfying the criterias passed in parameter
-			 */
-
-			_getTableRow: function(oTableRowBindingContexts, sRowPath) {
-				if (
-					oTableRowBindingContexts.filter(function(item) {
-						return item !== undefined;
-					}).length > 0
-				) {
-					var oTableRow = oTableRowBindingContexts.find(function(item) {
-						return item.getPath().indexOf(sRowPath) !== -1;
-					});
-					return oTableRow;
-				} else {
-					return undefined;
-				}
-			},
-
-			/**
-			 * Scroll the table to the Row that has the corresponding sPath
-			 *
-			 * @function
-			 * @name sap.fe.templates.ObjectPage.ObjectPageController.controller#_scrollTableToRow
-			 * @param {object} oTable 'table to be scrolled'
-			 * @param {string} sRowPath 'sPath of the table row'
-			 *
-			 */
-
-			_scrollTableToRow: function(oTable, sRowPath) {
-				var oTableRowBinding = oTable.getRowBinding();
-				var that = this;
-				var pWait = new Promise(function(resolve, reject) {
-					if (oTableRowBinding) {
-						var oTableRowBindingContexts;
-						switch (oTable.data().tableType) {
-							case "GridTable":
-								oTableRowBindingContexts = oTableRowBinding.getContexts(0);
-								break;
-							case "ResponsiveTable":
-								oTableRowBindingContexts = oTableRowBinding.getCurrentContexts();
-								break;
-							default:
-						}
-						//wait for the bindingContexts to be ready when a view enters/goes out of FCL fullscreen :
-						if (
-							oTableRowBindingContexts.filter(function(item) {
-								return item === undefined;
-							}).length > 0 ||
-							oTableRowBindingContexts.length === 0
-						) {
-							oTableRowBinding.attachChange(function getTableRowCallBack(oEvent) {
-								var oTableRowBindingContexts = that._getTableRow(oEvent.getSource().getCurrentContexts(), sRowPath);
-								if (oTableRowBindingContexts) {
-									oTableRowBinding.detachChange(getTableRowCallBack);
-									resolve(oTableRowBindingContexts);
-								}
-							});
-						} else {
-							resolve(that._getTableRow(oTableRowBindingContexts, sRowPath));
-						}
-					} else {
-						reject();
-					}
-				});
-				pWait
-					.then(function(oTableRow) {
-						if (oTableRow) {
-							var iPos = oTableRow.iIndex;
-							oTable.scrollToIndex(iPos);
-						}
-					})
-					.catch(function() {
-						Log.warning("Could not find any matched row");
-					});
-			},
-
-			/**
-			 * Scroll the Tables to the Row with the sPath
+			 * Scroll the tables to the row with the sPath
 			 *
 			 * @function
 			 * @name sap.fe.templates.ObjectPage.ObjectPageController.controller#_scrollTablesToRow
@@ -882,7 +972,7 @@ sap.ui.define(
 				if (this._findTables && this._findTables().length > 0) {
 					var aTables = this._findTables();
 					for (var i = 0; i < aTables.length; i++) {
-						this._scrollTableToRow(aTables[i], sRowPath);
+						TableScroller.scrollTableToRow(aTables[i], sRowPath);
 					}
 				}
 			},
@@ -1001,7 +1091,7 @@ sap.ui.define(
 						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;
@@ -1195,11 +1285,6 @@ sap.ui.define(
 								Log.error("An error occurs while scrolling to the newly created Item: " + err);
 							});
 					}
-					// fire DataStateChange whenever there is a table context change to update row highlighting
-					var oDataStateIndicator = oTable.getDataStateIndicator();
-					if (oDataStateIndicator.getFilter()(null, oTable)) {
-						oDataStateIndicator.fireDataStateChange();
-					}
 					// fire ModelContextChange on the message button whenever the table context changes
 					var oMessageButton = that.getView().byId("fe::FooterBar::MessageButton");
 					oMessageButton.fireModelContextChange();
@@ -1234,7 +1319,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 {
@@ -1242,50 +1328,56 @@ 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
 						});
 					}
 				},
 				/**
 				 * Triggers an outbound navigation when a user chooses the chevron.
 				 *
-				 * @param oController
+				 * @param {object} oController
 				 * @param {string} sOutboundTarget Name of the outbound target (needs to be defined in the manifest)
-<<<<<<< HEAD   (2310ec [INTERNAL] Release notes for version 1.93.1)
-				 * @param {sap.ui.model.odata.v4.Context} oContext That contain the data for the target app
-=======
 				 * @param {sap.ui.model.odata.v4.Context} oContext The context that contains the data for the target app
 				 * @param {string} sCreatePath Create path when the chevron is created.
->>>>>>> CHANGE (657783 [FIX] The message popover controls are now closed when leavi)
 				 * @returns {Promise} Promise which is resolved once the navigation is triggered (??? maybe only once finished?)
+				 * @ui5-restricted
+				 * @final
 				 */
-				onChevronPressNavigateOutBound: function(oController, sOutboundTarget, oContext) {
-					var oOutbounds = oController
-							.getAppComponent()
-							.getRoutingService()
-							.getOutbounds(),
-						oDisplayOutbound = oOutbounds[sOutboundTarget];
-					if (oDisplayOutbound && oDisplayOutbound.semanticObject && oDisplayOutbound.action) {
-						oContext = oContext && oContext.isA && oContext.isA("sap.ui.model.odata.v4.Context") ? [oContext] : oContext;
-						oController._intentBasedNavigation.navigate(oDisplayOutbound.semanticObject, oDisplayOutbound.action, {
-							navigationContexts: oContext
-						});
-
-						//TODO: check why returning a promise is required
-						// If there is no reason for the promise then this function can be removed
-						// and instead intentBasedNavigation.navigate can be directly used.
-						return Promise.resolve();
-					} else {
-						throw new Error("outbound target " + sOutboundTarget + " not found in cross navigation definition of manifest");
-					}
+				onChevronPressNavigateOutBound: function(oController, sOutboundTarget, oContext, sCreatePath) {
+					return oController._intentBasedNavigation.onChevronPressNavigateOutBound(
+						oController,
+						sOutboundTarget,
+						oContext,
+						sCreatePath
+					);
 				},
+
 				onNavigateChange: function(oEvent) {
 					//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();

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

@@ -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/SubSectionBlock.js

@@ -9,7 +9,7 @@ sap.ui.define(["sap/uxap/BlockBase"], function(BlockBase) {
 	var SubSectionBlock = BlockBase.extend("sap.fe.templates.ObjectPage.controls.SubSectionBlock", {
 		metadata: {
 			properties: {
-				"columnLayout": { type: "sap.uxap.BlockBaseColumnLayout", group: "Behavior", defaultValue: 4 }
+				columnLayout: { type: "sap.uxap.BlockBaseColumnLayout", group: "Behavior", defaultValue: 4 }
 			},
 			aggregations: {
 				content: {

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

@@ -0,0 +1,13 @@
+/*!
+ * SAPUI5
+ * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ */
+sap.ui.define([], function() {
+	"use strict";
+	return {
+		onContextUpdate: function(oContext) {
+			var that = this;
+			that.base._routing.navigateToContext(oContext, { callExtension: true });
+		}
+	};
+});