@sapui5/sap.fe.core 1.94.0 → 1.96.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.fe.core",
-	"version": "1.94.0",
+	"version": "1.96.3",
 	"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.94.0</version>
+    <version>1.96.3</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;
 			},
@@ -424,6 +385,14 @@ sap.ui.define(
 				var oComponentData = this.getComponentData();
 				var oStartUpParameters = (oComponentData && oComponentData.startupParameters) || {};
 				return Promise.resolve(oStartUpParameters);
+			},
+			restore: function() {
+				// called by FLP when app sap-keep-alive is enabled and app is restored
+				this.getRootViewController().viewState.onRestore();
+			},
+			suspend: function() {
+				// called by FLP when app sap-keep-alive is enabled and app is suspended
+				this.getRootViewController().viewState.onSuspend();
 			}
 		});
 

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);
 		},