@sapui5/sap.fe.core 1.95.0 → 1.98.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.fe.core",
-	"version": "1.95.0",
+	"version": "1.98.0",
 	"description": "SAPUI5 Library sap.fe.core",
 	"license": "SEE LICENSE IN LICENSE.txt",
 	"author": "SAP SE (https://www.sap.com)",
@@ -10,9 +10,9 @@
 		"build-local": "tsc --project tsconfig-local.json && copyfiles -u 6 \"../../node_modules/@sap-ux/annotation-converter/ui5-dist/**/*.js\" dist-local/src && copyfiles ui5.yaml dist-local",
 		"copy-dependency": "copyfiles -u 6 \"../../node_modules/@sap-ux/annotation-converter/ui5-dist/**/*.js\" target/classes/META-INF/resources",
 		"prepare-npm-sources": "copyfiles -u 6 \"../../node_modules/@sap-ux/annotation-converter/ui5-dist/**/*.js\" target/npm-sources/src && babel target/npm-sources/src --out-dir target/npm-sources/src --extensions \".ts\" --config-file ../../.babelrc",
-		"test": "jest --detectOpenHandles --forceExit",
-		"test-refs": "jest --detectOpenHandles --forceExit --config jest.config-refs.js",
-		"test-updateSnapshots": "jest --detectOpenHandles --forceExit -u",
+		"test": "jest --runInBand",
+		"test-refs": "jest --runInBand --config jest.config-refs.js",
+		"test-updateSnapshots": "jest --runInBand -u",
 		"watch-local": "npm run build-local && tsc --project tsconfig-local.json --watch"
 	},
 	"keywords": [
@@ -21,7 +21,7 @@
 	],
 	"devDependencies": {
 		"@babel/cli": "^7.14.8",
-		"@ui5/cli": "^2.10.0",
+		"@ui5/cli": "^2.14.0",
 		"copyfiles": "2.2.0"
 	}
 }

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.98.0</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",
@@ -316,7 +286,8 @@ sap.ui.define(
 				}
 
 				// Adding Semantic Date Operators
-				SemanticDateOperators.addSemanticDateOperators();
+				// Commenting since it is not needed for SingleRange
+				// SemanticDateOperators.addSemanticDateOperators();
 
 				// the init function configures the routing according to the settings above
 				// it will call the createContent function to instantiate the RootView and add it to the UIComponent aggregations
@@ -389,16 +360,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 +378,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 +389,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(
 	[
@@ -105,7 +105,7 @@ sap.ui.define(
 			 * @ui5-restricted
 			 **/
 			applyAppState: function() {
-				if (BusyLocker.isLocked(this)) {
+				if (this.oAppComponent.getModel("internal").getProperty("/uiAdaptation") || BusyLocker.isLocked(this)) {
 					return Promise.resolve();
 				}
 				BusyLocker.lock(this);

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