@sapui5/sap.fe.core 1.95.0 → 1.96.4

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.fe.core",
-	"version": "1.95.0",
+	"version": "1.96.4",
 	"description": "SAPUI5 Library sap.fe.core",
 	"license": "SEE LICENSE IN LICENSE.txt",
 	"author": "SAP SE (https://www.sap.com)",

package/src/sap/fe/core/.library

@@ -6,7 +6,7 @@
     <copyright>SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     </copyright>
-    <version>1.95.0</version>
+    <version>1.96.4</version>
 
     <documentation>UI5 library: sap.fe.core</documentation>
 

package/src/sap/fe/core/AnnotationHelper.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(
@@ -362,8 +362,8 @@ sap.ui.define(
 			buildActionWrapper: function(oAction, oThis) {
 				var aParams = [
 					"$event",
-					CommonHelper.addSingleQuotes(oAction.handlerModule),
-					CommonHelper.addSingleQuotes(oAction.handlerMethod)
+					CommonHelper.addSingleQuotes(oAction.handlerModule, true),
+					CommonHelper.addSingleQuotes(oAction.handlerMethod, true)
 				];
 
 				if (oThis && oThis.id) {

package/src/sap/fe/core/AppComponent.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // ----------------------------------------------------------------------------------
@@ -17,7 +17,6 @@ sap.ui.define(
 		"sap/ui/model/json/JSONModel",
 		"sap/fe/core/library",
 		"sap/fe/core/helpers/SemanticDateOperators",
-		"sap/ui/core/CustomizingConfiguration",
 		"sap/ui/core/Component",
 		"sap/fe/core/TemplateComponent",
 		"sap/fe/core/helpers/ModelHelper",
@@ -34,7 +33,6 @@ sap.ui.define(
 		JSONModel,
 		library,
 		SemanticDateOperators,
-		CustomizingConfiguration,
 		Component,
 		TemplateComponent,
 		ModelHelper,
@@ -43,34 +41,6 @@ sap.ui.define(
 	) {
 		"use strict";
 
-		// ----- <Remove> -----
-		// Can be removed once core change is merged
-
-		// monkey patch the sap.ui.core.CustomizingConfiguration#getControllerExtension:
-		var fGetControllerExtension = CustomizingConfiguration.getControllerExtension;
-		CustomizingConfiguration.getControllerExtension = function(sControllerName, vObject) {
-			var oComponent = getAppComponent(vObject),
-				sComponentId = oComponent && oComponent.getId(),
-				oResultConfig = fGetControllerExtension.call(CustomizingConfiguration, sControllerName, sComponentId);
-			return oResultConfig;
-		};
-
-		function getAppComponent(vObject) {
-			// check whether a context is given and determine a componentId from it
-			// - either it is a string, then this is the pre-processor use case and the string is a component id
-			// - or it is a view or fragment and the Id of the owner component should be used
-			var sComponentId = vObject && typeof vObject === "string" ? vObject : vObject && Component.getOwnerIdFor(vObject);
-			// retrieve the component (if an Id is known)
-			var oComponent = sComponentId && Component.get(sComponentId);
-			// only when it inherits from TemplateComponent, ask for the AppComponent instead
-			if (oComponent instanceof TemplateComponent) {
-				oComponent = oComponent.oAppComponent;
-			}
-			// return the AppComponent
-			return oComponent;
-		}
-		// ----- </Remove> -----
-
 		var NAVCONF = {
 			FCL: {
 				VIEWNAME: "sap.fe.templates.RootContainer.view.Fcl",
@@ -389,16 +359,6 @@ sap.ui.define(
 					ValueListHelper.initializeCachedValueHelp();
 
 					delete AppComponent.prototype.instanceMap[this.getId()];
-					var sCurrentComponentName = this.getMetadata().getName();
-					var bHasOtherComponent = false;
-					Object.keys(AppComponent.prototype.instanceMap).forEach(function(instanceID) {
-						if (AppComponent.prototype.instanceMap[instanceID].getMetadata().getName() === sCurrentComponentName) {
-							bHasOtherComponent = true;
-						}
-					});
-					if (!bHasOtherComponent) {
-						sap.ui.fl.apply._internal.flexState.FlexState.clearState(sCurrentComponentName);
-					}
 
 					// 	var oRegistry = sap.ui.mdc.p13n.Engine.getInstance()._getRegistry();
 					// 	Object.keys(oRegistry).forEach(function(sKey) {
@@ -417,6 +377,7 @@ sap.ui.define(
 				var oMainModel = this.oModels[undefined];
 				var oHeaders = jQuery.extend({}, oMainModel.oRequestor.mHeaders);
 				// As we need to cleanup the application / handle the dirty object we need to call our cleanup before the models are destroyed
+				this.getRoutingService().beforeExit();
 				UIComponent.prototype.destroy.apply(this, arguments);
 				oMainModel.oRequestor.mHeaders = oHeaders;
 			},
@@ -427,9 +388,12 @@ sap.ui.define(
 			},
 			restore: function() {
 				// called by FLP when app sap-keep-alive is enabled and app is restored
-				this.getRootViewController().viewState.refreshViewBindings();
+				this.getRootViewController().viewState.onRestore();
 			},
-			suspend: function() {}
+			suspend: function() {
+				// called by FLP when app sap-keep-alive is enabled and app is suspended
+				this.getRootViewController().viewState.onSuspend();
+			}
 		});
 
 		return AppComponent;

package/src/sap/fe/core/AppStateHandler.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(
 	[
@@ -13,9 +13,22 @@ sap.ui.define(
 		"sap/base/Log",
 		"sap/base/util/merge",
 		"sap/base/util/deepEqual",
-		"sap/fe/core/BusyLocker"
+		"sap/fe/core/BusyLocker",
+		"sap/fe/core/helpers/ModelHelper"
 	],
-	function(StateUtil, BaseObject, CoreLibrary, NavLibrary, CommonUtils, ControlVariantApplyAPI, Log, merge, deepEqual, BusyLocker) {
+	function(
+		StateUtil,
+		BaseObject,
+		CoreLibrary,
+		NavLibrary,
+		CommonUtils,
+		ControlVariantApplyAPI,
+		Log,
+		merge,
+		deepEqual,
+		BusyLocker,
+		ModelHelper
+	) {
 		"use strict";
 
 		var NavType = NavLibrary.NavType;
@@ -59,6 +72,7 @@ sap.ui.define(
 					oRouterProxy = this.oAppComponent.getRouterProxy(),
 					sHash = oRouterProxy.getHash(),
 					oController = this.oAppComponent.getRootControl().getController(),
+					bIsStickyMode = ModelHelper.isStickySessionSupported(this.oAppComponent.getMetaModel()),
 					that = this;
 
 				if (!oController.viewState) {
@@ -76,7 +90,7 @@ sap.ui.define(
 						var sAppStateKey = oAppState.appStateKey;
 						var sNewHash = oNavigationService.replaceInnerAppStateKey(sHash, sAppStateKey);
 						if (sNewHash !== sHash) {
-							oRouterProxy.navToHash(sNewHash);
+							oRouterProxy.navToHash(sNewHash, null, null, null, !bIsStickyMode);
 							that.bNoRouteChange = true;
 						}
 						Log.info("APPSTATE: navToHash");

package/src/sap/fe/core/BaseController.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/core/mvc/Controller", "sap/fe/core/CommonUtils"], function(Controller, CommonUtils) {
 	"use strict";

package/src/sap/fe/core/BusyLocker.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/base/Log"], function(Log) {
@@ -90,10 +90,22 @@ sap.ui.define(["sap/base/Log"], function(Log) {
 	}
 
 	return {
+		/**
+		 *
+		 * @param oModelOrControl
+		 * @param [sPath]
+		 * @returns {boolean}
+		 */
 		lock: function(oModelOrControl, sPath) {
 			return this._updateLock(oModelOrControl, sPath, 1);
 		},
 
+		/**
+		 *
+		 * @param oModelOrControl
+		 * @param [sPath]
+		 * @returns {boolean}
+		 */
 		unlock: function(oModelOrControl, sPath) {
 			return this._updateLock(oModelOrControl, sPath, -1);
 		},

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(
@@ -797,7 +797,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 +825,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 +1448,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 +1486,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 +1549,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(
@@ -2220,20 +2232,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.ChartNew")) {
+				oControl
+					.innerChartBound()
+					.then(function() {
+						oBindingInfo = oControl
+							.getControlDelegate()
+							._getChart(oControl)
+							.getBindingInfo("data");
+						setBindingInfo();
+					})
+					.catch(function(sError) {
+						Log.error(sError);
+					});
+			} else {
+				oBindingInfo = oControl.data("rowsBindingInfo");
+				setBindingInfo();
 			}
 		}
 
@@ -2419,6 +2450,89 @@ sap.ui.define(
 			return sMetaPath;
 		}
 
+		/**
+		 * Get refresh strategy for an intent.
+		 *
+		 * @function
+		 * @name sap.fe.core.CommonUtils.getRefreshStrategyForIntent
+		 * @memberof sap.fe.core.CommonUtils
+		 * @param {object} mRefreshStrategies RefreshStrategies to consider
+		 * @param {string} sSemanticObject Outbound Semantic Object
+		 * @param {string} sAction Outbound Action
+		 * @returns {object} Meta path for the context
+		 **/
+		function getRefreshStrategyForIntent(mRefreshStrategies, sSemanticObject, sAction) {
+			return (
+				(mRefreshStrategies.intents &&
+					((sSemanticObject && sAction && mRefreshStrategies.intents[sSemanticObject + "-" + sAction]) ||
+						(sSemanticObject && mRefreshStrategies.intents[sSemanticObject]))) ||
+				mRefreshStrategies["defaultBehavior"] ||
+				mRefreshStrategies["_feDefault"]
+			);
+		}
+
+		/**
+		 * Store control refresh strategy for hash in the internal model.
+		 *
+		 * @function
+		 * @name sap.fe.core.CommonUtils.storeControlRefreshStrategyForHash
+		 * @memberof sap.fe.core.CommonUtils
+		 * @param {object} oControl Control for the refresh strategy
+		 * @param {object} oHash Shell hash object
+		 **/
+		function storeControlRefreshStrategyForHash(oControl, oHash) {
+			if (oControl && oControl.getModel("viewData") && oControl.getModel("internal")) {
+				var mViewData = oControl.getModel("viewData");
+				var oRefreshStrategies = mViewData.getObject("/refreshStrategyOnAppRestore");
+				if (oRefreshStrategies) {
+					var mInternalModel = oControl.getModel("internal");
+					var oRefreshStrategy = CommonUtils.getRefreshStrategyForIntent(
+						oRefreshStrategies,
+						oHash && oHash.semanticObject,
+						oHash && oHash.action
+					);
+
+					mInternalModel.setProperty("/refreshStrategyOnAppRestore", oRefreshStrategy);
+				}
+			}
+		}
+		/**
+		 * Method to refresh and restore the view if neccessary.
+		 *
+		 * @function
+		 * @name sap.fe.core.CommonUtils.restoreView
+		 * @memberof sap.fe.core.CommonUtils
+		 * @param {object} oView Control for the refresh strategy
+		 * @returns {Promise} A promise after view refresh and restore are triggered
+		 **/
+		function restoreView(oView) {
+			var oInternalModelContext = oView.getBindingContext("internal");
+			var oController = oView.getController();
+			var oViewState = oController.viewState;
+			var pRefreshBindings = Promise.resolve();
+			if (oInternalModelContext.getProperty("restoreStatus") === "pending") {
+				if (oViewState.refreshViewBindings) {
+					pRefreshBindings = oViewState.refreshViewBindings();
+					pRefreshBindings
+						.then(function() {
+							Log.info("FE V4: Refresh was triggered successfull: " + oView.getId());
+						})
+						.catch(function(err) {
+							Log.warning("FE V4: Refresh was unsuccessfull: " + oView.getId(), err);
+						});
+				}
+				pRefreshBindings
+					.then(function() {
+						oViewState.onRestore();
+						oInternalModelContext.setProperty("restoreStatus", "done");
+					})
+					.catch(function(err) {
+						Log.warning("FE V4: Restore was unsuccessfull: " + oView.getId());
+					});
+			}
+			return pRefreshBindings;
+		}
+
 		var CommonUtils = {
 			isPropertyFilterable: isPropertyFilterable,
 			isFieldControlPathInapplicable: isFieldControlPathInapplicable,
@@ -2483,7 +2597,10 @@ sap.ui.define(
 			getViewRefreshInfo: getViewRefreshInfo,
 			getMetaPathForContext: getMetaPathForContext,
 			getAbsoluteMetaPathForListBinding: getAbsoluteMetaPathForListBinding,
-			getControlRefreshStrategyForContextPath: getControlRefreshStrategyForContextPath
+			getControlRefreshStrategyForContextPath: getControlRefreshStrategyForContextPath,
+			getRefreshStrategyForIntent: getRefreshStrategyForIntent,
+			storeControlRefreshStrategyForHash: storeControlRefreshStrategyForHash,
+			restoreView: restoreView
 		};
 
 		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"],

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(
 	[
@@ -121,38 +121,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);
-				}
 			}
 		});
 	}