@sapui5/sap.fe.core 1.95.0 → 1.98.0

package/src/sap/fe/core/CommonUtils.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(
@@ -53,7 +53,7 @@ sap.ui.define(
 		Fragment
 	) {
 		"use strict";
-
+		var CommonUtils;
 		var ProgrammingModel = FELibrary.ProgrammingModel;
 
 		var aValidTypes = [
@@ -77,9 +77,31 @@ sap.ui.define(
 		];
 
 		/**
-		 * Returns the actual property type of a given datafield or property.
+		 * Method to split the search term on spaces and wrap each word in double quotes.
+		 *
+		 * @param {string} sSearchTerm The search term
+		 * @returns {string|undefined} The normalized search term, undefined if empty
+		 */
+		function normalizeSearchTerm(sSearchTerm) {
+			if (!sSearchTerm) {
+				return undefined;
+			}
+
+			return sSearchTerm
+				.replace(/"/g, " ")
+				.split(/\s+/)
+				.reduce(function(sNormalized, sCurrentWord) {
+					if (sCurrentWord !== "") {
+						sNormalized = (sNormalized ? sNormalized + " " : "") + '"' + sCurrentWord + '"';
+					}
+					return sNormalized;
+				}, undefined);
+		}
+
+		/**
+		 * Returns the actual property type of a given data field or property.
 		 *
-		 * @param {sap.ui.model.Context} oNavigationContext The metamodel context
+		 * @param {sap.ui.model.Context} oNavigationContext The MetaModel context
 		 * @returns {string} The name of the actual data type
 		 */
 		function getPropertyDataType(oNavigationContext) {
@@ -272,6 +294,11 @@ sap.ui.define(
 			return getAppComponent(oControl).getShellServices();
 		}
 
+		function getHash() {
+			var sHash = window.location.hash;
+			return sHash.split("&")[0];
+		}
+
 		function _getSOIntents(oObjectPageLayout, oSemanticObject, oParam) {
 			var oShellServiceHelper = CommonUtils.getShellServices(oObjectPageLayout);
 			return oShellServiceHelper.getLinks({
@@ -284,8 +311,9 @@ sap.ui.define(
 		function _createMappings(oMapping) {
 			var aSOMappings = [];
 			var aMappingKeys = Object.keys(oMapping);
+			var oSemanticMapping;
 			for (var i = 0; i < aMappingKeys.length; i++) {
-				var oSemanticMapping = {
+				oSemanticMapping = {
 					"LocalProperty": {
 						"$PropertyPath": aMappingKeys[i]
 					},
@@ -780,7 +808,7 @@ sap.ui.define(
 			var fnGetLinks = function(oData) {
 				if (oData) {
 					var aKeys = Object.keys(oData);
-					aKeys.map(function(sKey) {
+					aKeys.forEach(function(sKey) {
 						if (sKey.indexOf("_") !== 0 && sKey.indexOf("odata.context") === -1) {
 							oParams[sKey] = { value: oData[sKey] };
 						}
@@ -797,7 +825,7 @@ sap.ui.define(
 								params: oParams
 							})
 							.then(function(aLink) {
-								oIBNAction.setVisible(aLink && aLink.length === 1);
+								oIBNAction.setVisible(oIBNAction.getVisible() && aLink && aLink.length === 1);
 							})
 							.catch(function(oError) {
 								Log.error("Cannot retrieve the links from the shell service", oError);
@@ -825,8 +853,8 @@ sap.ui.define(
 		 *
 		 * @param {string} sFrameworkKey Current key.
 		 * @param {object} oResourceBundle Contains the local resource bundle
-		 * @param {object} oParams Parameter object for the resource value
-		 * @param {object} sEntitySetName EntitySet name of the control where the resource is being used
+		 * @param {object} [oParams] Parameter object for the resource value
+		 * @param {string} [sEntitySetName] EntitySet name of the control where the resource is being used
 		 * @returns {string} The translated text
 		 */
 		function getTranslatedText(sFrameworkKey, oResourceBundle, oParams, sEntitySetName) {
@@ -1448,13 +1476,14 @@ sap.ui.define(
 		 * @param {object} oSelectionVariant Instance of {@link sap.fe.navigation.SelectionVariant} SelectionVariant to be used.
 		 * @param {object} mFilters Conditons to be added to the SelectionVariant
 		 * @param {object} oTargetInfo Object returned after selection variant from the table is prepared.
+		 * @param {object} oFilterInfo Object containing the converted FilterBar filters
 		 * @returns {object} Instance of {@link sap.fe.navigation.SelectionVariant} SelectionVariant with the conditions.
 		 * @private
 		 * @ui5-restricted
 		 * @example <code>
 		 * </code>
 		 */
-		function addExternalStateFiltersToSelectionVariant(oSelectionVariant, mFilters, oTargetInfo) {
+		function addExternalStateFiltersToSelectionVariant(oSelectionVariant, mFilters, oTargetInfo, oFilterInfo) {
 			var sFilter,
 				sLow = "",
 				sHigh = null;
@@ -1485,6 +1514,10 @@ sap.ui.define(
 					case "EQ":
 						oSelectOptionState.option = sOperator;
 						break;
+					case "TODAY":
+					case "DATE":
+						oSelectOptionState.option = "EQ";
+						break;
 					case "EEQ":
 						oSelectOptionState.option = "EQ";
 						break;
@@ -1544,6 +1577,13 @@ sap.ui.define(
 					var oFilter = aFilters[item];
 					sLow = (oFilter.values[0] && oFilter.values[0].toString()) || "";
 					sHigh = (oFilter.values[1] && oFilter.values[1].toString()) || null;
+					if (oFilter.operator === "TODAY" || oFilter.operator === "DATE") {
+						var aFilter = oFilterInfo[0].aFilters.filter(function(oFilter) {
+							return oFilter.sPath === sFilter;
+						});
+						sLow = aFilter[0].oValue1 || "";
+						sHigh = null;
+					}
 					var oSelectOptionValues = fnGetSignAndOption(oFilter.operator, sLow, sHigh);
 					if (oSelectOptionValues.option) {
 						oSelectionVariant.addSelectOption(
@@ -1645,32 +1685,37 @@ sap.ui.define(
 		}
 
 		/**
-		 * Sets the FLP user defaults.
+		 * Defines the user default settings for the SAP Fiori Launchpad.
 		 *
 		 * @function
 		 * @name sap.fe.core.CommonUtils.setUserDefaults
 		 * @memberof sap.fe.core.CommonUtils
 		 * @param {object} [oAppComponent] The AppComponent
 		 * @param {Array} [aParameters] Parameters in the dialog
-		 * @param {object} [oModel] Model to which the default value has to be set
+		 * @param {object} [oModel]  Model for which the default value has to be set
 		 * @param {boolean} [bIsAction] `true` if aParameters contains action parameters
+		 * @param {boolean} [bIsCreate] `true` if preferredMode is 'create'
+		 * @param {object} [oActionDefaultValues] Inbound Create Parameters from the Manifest
 		 * @returns {Promise}
 		 * @ui5-restricted
 		 * @final
 		 **/
-		function setUserDefaults(oAppComponent, aParameters, oModel, bIsAction) {
+		function setUserDefaults(oAppComponent, aParameters, oModel, bIsAction, bIsCreate, oActionDefaultValues) {
 			return new Promise(function(resolve, reject) {
 				var oComponentData = oAppComponent.getComponentData(),
 					oStartupParameters = (oComponentData && oComponentData.startupParameters) || {},
 					oShellServices = oAppComponent.getShellServices();
-
 				if (!oShellServices.hasUShell()) {
-					aParameters.map(function(oParameter) {
+					aParameters.forEach(function(oParameter) {
 						var sPropertyName = bIsAction
 							? "/" + oParameter.$Name
 							: oParameter.getPath().slice(oParameter.getPath().lastIndexOf("/") + 1);
 						var sParameterName = bIsAction ? sPropertyName.slice(1) : sPropertyName;
-						if (oStartupParameters[sParameterName]) {
+						if (oActionDefaultValues && bIsCreate) {
+							if (oActionDefaultValues[sParameterName]) {
+								oModel.setProperty(sPropertyName, oActionDefaultValues[sParameterName]);
+							}
+						} else if (oStartupParameters[sParameterName]) {
 							oModel.setProperty(sPropertyName, oStartupParameters[sParameterName][0]);
 						}
 					});
@@ -1679,12 +1724,16 @@ sap.ui.define(
 				return oShellServices.getStartupAppState(oAppComponent).then(function(oStartupAppState) {
 					var oData = oStartupAppState.getData() || {},
 						aExtendedParameters = (oData.selectionVariant && oData.selectionVariant.SelectOptions) || [];
-					aParameters.map(function(oParameter) {
+					aParameters.forEach(function(oParameter) {
 						var sPropertyName = bIsAction
 							? "/" + oParameter.$Name
 							: oParameter.getPath().slice(oParameter.getPath().lastIndexOf("/") + 1);
 						var sParameterName = bIsAction ? sPropertyName.slice(1) : sPropertyName;
-						if (oStartupParameters[sParameterName]) {
+						if (oActionDefaultValues && bIsCreate) {
+							if (oActionDefaultValues[sParameterName]) {
+								oModel.setProperty(sPropertyName, oActionDefaultValues[sParameterName]);
+							}
+						} else if (oStartupParameters[sParameterName]) {
 							oModel.setProperty(sPropertyName, oStartupParameters[sParameterName][0]);
 						} else if (aExtendedParameters.length > 0) {
 							for (var i in aExtendedParameters) {
@@ -1703,6 +1752,24 @@ sap.ui.define(
 			});
 		}
 
+		function getAdditionalParamsForCreate(oStartupParameters, oInboundParameters) {
+			var oInbounds = oInboundParameters,
+				aCreateParameters = oInbounds
+					? Object.keys(oInbounds).filter(function(sParameter) {
+							return oInbounds[sParameter].useForCreate;
+					  })
+					: [],
+				oRet;
+			for (var i = 0; i < aCreateParameters.length; i++) {
+				var sCreateParameter = aCreateParameters[i];
+				var aValues = oStartupParameters && oStartupParameters[sCreateParameter];
+				if (aValues && aValues.length === 1) {
+					oRet = oRet || Object.create(null);
+					oRet[sCreateParameter] = aValues[0];
+				}
+			}
+			return oRet;
+		}
 		/**
 		 * Gets semantic object mappings defined in app descriptor outbounds.
 		 *
@@ -1857,7 +1924,7 @@ sap.ui.define(
 				.then(function(aValues) {
 					var aLinks,
 						_oLink,
-						_sLinkIntent,
+						_sLinkIntentAction,
 						aFinalLinks = [];
 					var oFinalSemanticObjects = {};
 					var bIntentHasActions = function(sIntent, aActions) {
@@ -1882,10 +1949,11 @@ sap.ui.define(
 								var hasTargets = false;
 								for (var iLinkCount = 0; iLinkCount < aLinks[i][0].length; iLinkCount++) {
 									_oLink = aLinks[i][0][iLinkCount];
-									_sLinkIntent = _oLink && _oLink.intent.split("-")[1];
+									_sLinkIntentAction = _oLink && _oLink.intent.split("?")[0].split("-")[1];
+
 									if (!(_oLink && _oLink.intent && _oLink.intent.indexOf(sCurrentHash) === 0)) {
 										hasTargetsNotFiltered = true;
-										if (!bIntentHasActions(_sLinkIntent, aSemanticObjects[k].unavailableActions)) {
+										if (!bIntentHasActions(_sLinkIntentAction, aSemanticObjects[k].unavailableActions)) {
 											aFinalLinks[i].push(_oLink);
 											hasTargets = true;
 										}
@@ -1962,9 +2030,6 @@ sap.ui.define(
 		 * @returns {Promise} Once resolved, a promise is returned which is resolved without a result in case of success of setting internal Semantic Targets Model
 		 */
 		function fnGetSemanticTargetsFromPageModel(oController, sPageModel) {
-			var _fnfindValues = function(obj, key) {
-				return _fnfindValuesHelper(obj, key, []);
-			};
 			var _fnfindValuesHelper = function(obj, key, list) {
 				if (!obj) {
 					return list;
@@ -1989,6 +2054,9 @@ sap.ui.define(
 				}
 				return list;
 			};
+			var _fnfindValues = function(obj, key) {
+				return _fnfindValuesHelper(obj, key, []);
+			};
 			var _fnDeleteDuplicateSemanticObjects = function(aSemanticObjectPath) {
 				return aSemanticObjectPath.filter(function(value, index) {
 					return aSemanticObjectPath.indexOf(value) === index;
@@ -2009,7 +2077,7 @@ sap.ui.define(
 				var aSemanticObjectsFound = _fnfindValues(oPageModel, "semanticObjectPath");
 				aSemanticObjectsFound = _fnDeleteDuplicateSemanticObjects(aSemanticObjectsFound);
 				var oShellServiceHelper = CommonUtils.getShellServices(oAppComponent);
-				var sCurrentHash = oShellServiceHelper.hrefForExternal();
+				var sCurrentHash = CommonUtils.getHash();
 				var aSemanticObjectsForGetLinks = [];
 				var aSemanticObjects = [];
 				var sPath;
@@ -2220,20 +2288,39 @@ sap.ui.define(
 		 * @ui5-restricted
 		 */
 		function addEventToBindingInfo(oControl, sEventName, fHandler) {
-			var oBindingInfo = oControl.data("rowsBindingInfo") || oControl.getBindingInfo("data");
-			if (oBindingInfo) {
-				if (!oBindingInfo.events) {
-					oBindingInfo.events = {};
-				}
-				if (!oBindingInfo.events[sEventName]) {
-					oBindingInfo.events[sEventName] = fHandler;
-				} else {
-					var fOriginalHandler = oBindingInfo.events[sEventName];
-					oBindingInfo.events[sEventName] = function() {
-						fHandler.apply(this, arguments);
-						fOriginalHandler.apply(this, arguments);
-					};
+			var oBindingInfo;
+			var setBindingInfo = function() {
+				if (oBindingInfo) {
+					if (!oBindingInfo.events) {
+						oBindingInfo.events = {};
+					}
+					if (!oBindingInfo.events[sEventName]) {
+						oBindingInfo.events[sEventName] = fHandler;
+					} else {
+						var fOriginalHandler = oBindingInfo.events[sEventName];
+						oBindingInfo.events[sEventName] = function() {
+							fHandler.apply(this, arguments);
+							fOriginalHandler.apply(this, arguments);
+						};
+					}
 				}
+			};
+			if (oControl.isA("sap.ui.mdc.Chart")) {
+				oControl
+					.innerChartBound()
+					.then(function() {
+						oBindingInfo = oControl
+							.getControlDelegate()
+							._getChart(oControl)
+							.getBindingInfo("data");
+						setBindingInfo();
+					})
+					.catch(function(sError) {
+						Log.error(sError);
+					});
+			} else {
+				oBindingInfo = oControl.data("rowsBindingInfo");
+				setBindingInfo();
 			}
 		}
 
@@ -2245,181 +2332,7 @@ sap.ui.define(
 			});
 		}
 
-		/**
-		 * Check if given path resides in the context path provided.
-		 *
-		 * @function
-		 * @name sap.fe.core.CommonUtils.isPathApplicableToContextPath
-		 * @memberof sap.fe.core.CommonUtils
-		 * @param {object} [oMetaModel] MetaModel to be used
-		 * @param {string} [sContextPath] Context path to be used
-		 * @param {string} [sPath] Path to be used
-		 * @param {string} [sStrategy] Strategy, it could be 'self' | 'includingDependents'
-		 * @returns {boolean} If path is applicable to context.
-		 **/
-		function isPathApplicableToContextPath(oMetaModel, sContextPath, sPath, sStrategy) {
-			var sContextPathToCheck = sContextPath.startsWith("/") ? sContextPath : "/" + sContextPath,
-				sPathToCheck = sPath.startsWith("/") ? sPath : "/" + sPath,
-				fnIsApplicable = function(sPrimaryPath, sKey) {
-					return sPrimaryPath === sKey || (sStrategy === "includingDependents" && sPrimaryPath.startsWith(sKey));
-				},
-				fnSimplifyEntitySetPath = function(sEntitySetPathToUse) {
-					var sEntitySetPath = ModelHelper.getEntitySetPath(sEntitySetPathToUse);
-					var sEntitySet = sEntitySetPath.indexOf("$NavigationPropertyBinding") > -1 && oMetaModel.getObject(sEntitySetPath);
-					return sEntitySet ? "/" + sEntitySet : sEntitySetPathToUse;
-				};
-
-			if (!fnIsApplicable(sContextPathToCheck, sPathToCheck)) {
-				sContextPathToCheck = fnSimplifyEntitySetPath(sContextPathToCheck);
-
-				if (!fnIsApplicable(sContextPathToCheck, sPathToCheck)) {
-					sPathToCheck = fnSimplifyEntitySetPath(sPathToCheck);
-				} else {
-					return true;
-				}
-			}
-
-			return fnIsApplicable(sContextPathToCheck, sPathToCheck);
-		}
-
-		/**
-		 * Get controls to refresh in a view.
-		 *
-		 * @function
-		 * @name sap.fe.core.CommonUtils.getControlsForRefresh
-		 * @memberof sap.fe.core.CommonUtils
-		 * @param {object} [oView] View of the controls
-		 * @param {Array} [aViewControls] Controls to be checked
-		 * @returns {Array} Controls that need to be refreshed
-		 **/
-		function getControlsForRefresh(oView, aViewControls) {
-			var aControls = [],
-				oMetaModel = oView.getModel().getMetaModel(),
-				oInternalModel = oView.getModel("internal"),
-				oRefreshStrategyForKeepAliveRestore = oInternalModel.getProperty("/refreshStrategyOnAppRestore") || {};
-
-			if (aViewControls) {
-				aViewControls.forEach(function(oControl) {
-					var sContextPath = oControl.data("targetCollectionPath");
-
-					for (var sKey in oRefreshStrategyForKeepAliveRestore) {
-						var sStrategy = oRefreshStrategyForKeepAliveRestore[sKey];
-						if (CommonUtils.isPathApplicableToContextPath(oMetaModel, sContextPath, sKey, sStrategy)) {
-							aControls.push(oControl);
-						}
-					}
-				});
-			}
-
-			return aControls;
-		}
-
-		/**
-		 * Get refresh strategy for the control for a context path.
-		 *
-		 * @function
-		 * @name sap.fe.core.CommonUtils.getControlRefreshStrategyForContextPath
-		 * @memberof sap.fe.core.CommonUtils
-		 * @param {object} [oControl] Control from which refresh info is needed
-		 * @param {string} sContextPath ContextPath for properities
-		 * @returns {string} Strategy for control refresh
-		 **/
-
-		function getControlRefreshStrategyForContextPath(oControl, sContextPath) {
-			var oMetaModel = oControl.getModel().getMetaModel(),
-				oInternalModel = oControl.getModel("internal"),
-				oRefreshStrategyForKeepAliveRestore = oInternalModel.getProperty("/refreshStrategyOnAppRestore"),
-				sStrategy;
-
-			if (sContextPath) {
-				for (var sKey in oRefreshStrategyForKeepAliveRestore) {
-					var sStrategyToCheck = oRefreshStrategyForKeepAliveRestore[sKey];
-					if (CommonUtils.isPathApplicableToContextPath(oMetaModel, sContextPath, sKey, sStrategyToCheck)) {
-						sStrategy = sStrategyToCheck;
-						if (sStrategy === "includingDependents") {
-							break;
-						}
-					}
-				}
-			}
-
-			return sStrategy;
-		}
-
-		/**
-		 * Get refresh info from view.
-		 *
-		 * @function
-		 * @name sap.fe.core.CommonUtils.getViewRefreshInfo
-		 * @memberof sap.fe.core.CommonUtils
-		 * @param {object} [oView] View from which refresh info is needed
-		 * @returns {string} Strategy for view refresh
-		 **/
-		function getViewRefreshInfo(oView) {
-			var mViewData = oView.getViewData(),
-				sContextPath = mViewData && (mViewData.contextPath || "/" + mViewData.entitySet);
-
-			return CommonUtils.getControlRefreshStrategyForContextPath(oView, sContextPath);
-		}
-
-		/**
-		 * Get MetaPath for the context.
-		 *
-		 * @function
-		 * @name sap.fe.core.CommonUtils.getMetaPathForContext
-		 * @memberof sap.fe.core.CommonUtils
-		 * @param {object} [oContext] Outbound defined in app descriptor
-		 * @returns {string} Meta path for the context
-		 **/
-		function getMetaPathForContext(oContext) {
-			var oModel = oContext && oContext.getModel && oContext.getModel(),
-				oMetaModel = oModel && oModel.getMetaModel && oModel.getMetaModel(),
-				sPath = oContext && oContext.getPath && oContext.getPath();
-
-			return oMetaModel && sPath && oMetaModel.getMetaPath && oMetaModel.getMetaPath(sPath);
-		}
-
-		/**
-		 * Get MetaPath for the listbinding.
-		 *
-		 * @function
-		 * @name sap.fe.core.CommonUtils.getAbsoluteMetaPathForListBinding
-		 * @memberof sap.fe.core.CommonUtils
-		 * @param {object} [oView] The View
-		 * @param {sap.ui.model.odata.v4.ODataListBinding|string} vListBinding  ODataListBinding object or the binding path for a temporary list binding
-		 * @returns {string} Meta path for the listbinding
-		 **/
-		function getAbsoluteMetaPathForListBinding(oView, vListBinding) {
-			var oMetaModel = oView.getModel().getMetaModel(),
-				sMetaPath;
-			if (vListBinding && typeof vListBinding === "object") {
-				// we already get a list binding use this one
-				var oBinding = vListBinding;
-				var oRootBinding = oBinding.getRootBinding();
-				if (oBinding === oRootBinding) {
-					// absolute path
-					sMetaPath = oMetaModel.getMetaPath(oBinding.getPath());
-				} else {
-					// relative path
-					var sRootBindingPath = oRootBinding.getPath();
-					var sRelativePath = oBinding.getPath();
-					sMetaPath = oMetaModel.getMetaPath(sRootBindingPath + "/" + sRelativePath);
-				}
-			} else if (typeof vListBinding === "string") {
-				if (vListBinding.startsWith("/")) {
-					// absolute path
-					sMetaPath = oMetaModel.getMetaPath(vListBinding);
-				} else {
-					// relative path
-					var oBindingContext = oView.getBindingContext();
-					var sRootContextPath = oBindingContext.getPath();
-					sMetaPath = oMetaModel.getMetaPath(sRootContextPath + "/" + vListBinding);
-				}
-			}
-			return sMetaPath;
-		}
-
-		var CommonUtils = {
+		CommonUtils = {
 			isPropertyFilterable: isPropertyFilterable,
 			isFieldControlPathInapplicable: isFieldControlPathInapplicable,
 			removeSensitiveData: removeSensitiveData,
@@ -2448,6 +2361,7 @@ sap.ui.define(
 			getNonComputedVisibleFields: getNonComputedVisibleFields,
 			setUserDefaults: setUserDefaults,
 			getShellServices: getShellServices,
+			getHash: getHash,
 			getIBNActions: fnGetIBNActions,
 			getHeaderFacetItemConfigForExternalNavigation: getHeaderFacetItemConfigForExternalNavigation,
 			getSemanticObjectMapping: getSemanticObjectMapping,
@@ -2461,6 +2375,7 @@ sap.ui.define(
 			getSearchRestrictions: getSearchRestrictions,
 			getFilterRestrictionsByPath: getFilterRestrictionsByPath,
 			getSpecificAllowedExpression: getSpecificAllowedExpression,
+			getAdditionalParamsForCreate: getAdditionalParamsForCreate,
 			requestSingletonProperty: requestSingletonProperty,
 			templateControlFragment: templateControlFragment,
 			addEventToBindingInfo: addEventToBindingInfo,
@@ -2478,12 +2393,7 @@ sap.ui.define(
 				"MultiRangeOrSearchExpression"
 			],
 			fnProcessDataLossOrDraftDiscardConfirmation: fnProcessDataLossOrDraftDiscardConfirmation,
-			isPathApplicableToContextPath: isPathApplicableToContextPath,
-			getControlsForRefresh: getControlsForRefresh,
-			getViewRefreshInfo: getViewRefreshInfo,
-			getMetaPathForContext: getMetaPathForContext,
-			getAbsoluteMetaPathForListBinding: getAbsoluteMetaPathForListBinding,
-			getControlRefreshStrategyForContextPath: getControlRefreshStrategyForContextPath
+			normalizeSearchTerm: normalizeSearchTerm
 		};
 
 		return CommonUtils;

package/src/sap/fe/core/ExtensionAPI.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/ui/base/Object", "sap/fe/core/CommonUtils", "sap/base/Log", "sap/ui/core/Component", "sap/ui/model/json/JSONModel"],
@@ -157,11 +157,12 @@ sap.ui.define(
 			 * @alias sap.fe.core.ExtensionAPI#navigateToTarget
 			 * @param {string} sTarget Name of the target route
 			 * @param {sap.ui.model.Context} [oContext] Context instance
+			 * @returns {Promise} Promise that is resolved when the navigation is finalized
 			 *
 			 * @public
 			 */
 			navigateToTarget: function(sTarget, oContext) {
-				this._controller._routing.navigateToTarget(oContext, sTarget);
+				return this._controller._routing.navigateToTarget(oContext, sTarget);
 			},
 
 			/**
@@ -229,10 +230,17 @@ sap.ui.define(
 			 * @public
 			 */
 			updateAppState: function() {
-				return this._controller
-					.getAppComponent()
-					.getAppStateHandler()
-					.createAppState();
+				if (
+					!this._controller
+						.getAppComponent()
+						.getModel("internal")
+						.getProperty("/uiAdaptation")
+				) {
+					return this._controller
+						.getAppComponent()
+						.getAppStateHandler()
+						.createAppState();
+				}
 			},
 
 			/**

package/src/sap/fe/core/PageController.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(
 	[
@@ -17,7 +17,9 @@ sap.ui.define(
 		"sap/fe/core/controllerextensions/Share",
 		"sap/fe/core/controllerextensions/ViewState",
 		"sap/fe/core/controllerextensions/Paginator",
-		"sap/fe/core/controllerextensions/Placeholder"
+		"sap/fe/core/controllerextensions/Placeholder",
+		"sap/fe/core/controllerextensions/SideEffects",
+		"sap/fe/core/controllerextensions/MassEdit"
 	],
 	function(
 		Controller,
@@ -33,7 +35,9 @@ sap.ui.define(
 		Share,
 		ViewState,
 		Paginator,
-		Placeholder
+		Placeholder,
+		SideEffects,
+		MassEdit
 	) {
 		"use strict";
 
@@ -60,6 +64,8 @@ sap.ui.define(
 			paginator: Paginator,
 			viewState: ViewState,
 			placeholder: Placeholder,
+			_sideEffects: SideEffects,
+			massEdit: MassEdit,
 			/**
 			 * @private
 			 * @name sap.fe.core.PageController.getMetadata
@@ -121,38 +127,6 @@ sap.ui.define(
 				this.getAppComponent()
 					.getAppStateHandler()
 					.applyAppState();
-			},
-			commonFormatters: {
-				compareTitleFromTableAndTab: function(headerVisible, tableTitle, tabTitle, thisController) {
-					if (typeof headerVisible !== "boolean") {
-						headerVisible = headerVisible === "true";
-					}
-					function _seekingFinalString(i18nValue) {
-						var i18nSearch = i18nValue.slice(i18nValue.indexOf(">") + 1, -1);
-						var modelToSearch = i18nValue.slice(1, i18nValue.indexOf(">"));
-						if (thisController.getAppComponent().getModel(modelToSearch)) {
-							return thisController
-								.getAppComponent()
-								.getModel(modelToSearch)
-								.getResourceBundle()
-								.getText(i18nSearch);
-						} else if (thisController.getAppComponent().getModel("i18n")) {
-							return thisController
-								.getAppComponent()
-								.getModel("i18n")
-								.getResourceBundle()
-								.getText(i18nSearch);
-						}
-					}
-
-					if (tableTitle.includes("i18n")) {
-						tableTitle = _seekingFinalString(tableTitle);
-					}
-					if (tabTitle.includes("i18n")) {
-						tabTitle = _seekingFinalString(tabTitle);
-					}
-					return headerVisible && !(tableTitle == tabTitle);
-				}
 			}
 		});
 	}