@sapui5/sap.fe.core 1.97.0 → 1.98.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.fe.core",
-	"version": "1.97.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",
-		"test-refs": "jest --config jest.config-refs.js",
-		"test-updateSnapshots": "jest -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": [

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.97.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(

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.
  */
 
 // ----------------------------------------------------------------------------------
@@ -286,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
@@ -377,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;
 			},

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) {

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 = [
@@ -294,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({
@@ -306,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]
 					},
@@ -802,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] };
 						}
@@ -1470,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;
@@ -1507,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;
@@ -1566,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(
@@ -1688,7 +1706,7 @@ sap.ui.define(
 					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);
@@ -1706,7 +1724,7 @@ 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);
@@ -1906,7 +1924,7 @@ sap.ui.define(
 				.then(function(aValues) {
 					var aLinks,
 						_oLink,
-						_sLinkIntent,
+						_sLinkIntentAction,
 						aFinalLinks = [];
 					var oFinalSemanticObjects = {};
 					var bIntentHasActions = function(sIntent, aActions) {
@@ -1931,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;
 										}
@@ -2011,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;
@@ -2038,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;
@@ -2058,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;
@@ -2286,7 +2305,7 @@ sap.ui.define(
 					}
 				}
 			};
-			if (oControl.isA("sap.ui.mdc.ChartNew")) {
+			if (oControl.isA("sap.ui.mdc.Chart")) {
 				oControl
 					.innerChartBound()
 					.then(function() {
@@ -2313,7 +2332,7 @@ sap.ui.define(
 			});
 		}
 
-		var CommonUtils = {
+		CommonUtils = {
 			isPropertyFilterable: isPropertyFilterable,
 			isFieldControlPathInapplicable: isFieldControlPathInapplicable,
 			removeSensitiveData: removeSensitiveData,
@@ -2342,6 +2361,7 @@ sap.ui.define(
 			getNonComputedVisibleFields: getNonComputedVisibleFields,
 			setUserDefaults: setUserDefaults,
 			getShellServices: getShellServices,
+			getHash: getHash,
 			getIBNActions: fnGetIBNActions,
 			getHeaderFacetItemConfigForExternalNavigation: getHeaderFacetItemConfigForExternalNavigation,
 			getSemanticObjectMapping: getSemanticObjectMapping,

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

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 /* eslint-disable no-alert */
 sap.ui.define(
@@ -190,7 +190,7 @@ sap.ui.define(
 			 * @param {boolean} bPreserveHistory If set to true, non-ancestor entries in history will be retained
 			 * @param {boolean} bDisablePreservationCache If set to true, cache preservation mechanism is disabled for the current navigation
 			 * @param {boolean} bForceFocus If set to true, the logic to set the focus once the navigation is finalized will be triggered (onPageReady)
-			 * @returns {Promise} Promise that is resolved when the navigation is finalized
+			 * @returns {Promise} Promise (resolved when the navigation is finalized) that returns 'true' if a navigation took place, 'false' if the navigation didn't happen
 			 * @ui5-restricted
 			 */
 			navToHash: function(sHash, bPreserveHistory, bDisablePreservationCache, bForceFocus) {
@@ -224,7 +224,7 @@ sap.ui.define(
 					// in the EditFlow we rely on a UI5 mechanism that displays a confirm dialog.
 					if (!confirm(this.oResourceBundle.getText("C_ROUTER_PROXY_SAPFE_EXIT_NOTSAVED_MESSAGE"))) {
 						// The user clicked on Cancel --> cancel navigation
-						return Promise.resolve();
+						return Promise.resolve(false);
 					}
 					this.bIsGuardCrossAllowed = true;
 				}
@@ -607,12 +607,12 @@ sap.ui.define(
 			},
 
 			/**
-			 * Rebuilds the browser history from the app root page.
+			 * Synchronizes the browser history with the internal history of the routerProxy, and triggers a navigation if needed.
 			 *
 			 * @memberof sap.fe.core.RouterProxy
 			 * @param {object} oHistoryAction Specifies the navigation action to be performed
-			 * @param {boolean} bRebuildOnly `true` if rebuilding history
-			 * @returns {Promise} A promise that is resolved when the navigation is finalized
+			 * @param {boolean} bRebuildOnly `true` if internal history is currently being rebuilt
+			 * @returns {Promise} Promise (resolved when the navigation is finalized) that returns 'true' if a navigation took place, 'false' if the navigation didn't happen
 			 * @ui5-restricted
 			 * @final
 			 */
@@ -640,7 +640,7 @@ sap.ui.define(
 						}
 
 						that.bIsRebuildHistoryRunning = false;
-						resolve();
+						resolve(true); // a navigation occurred
 					}
 
 					// Async callbacks when navigating back, in order to let all notifications and events get processed
@@ -655,7 +655,7 @@ sap.ui.define(
 					function backAsync() {
 						window.removeEventListener("popstate", backAsync);
 						that.bIsRebuildHistoryRunning = false;
-						resolve();
+						resolve(true); // a navigation occurred
 					}
 
 					that._bIgnoreRestore = true;
@@ -665,14 +665,14 @@ sap.ui.define(
 							that._oRouter.getHashChanger().replaceHash(oTargetState.hash);
 							history.replaceState(Object.assign({ feLevel: newLevel }, history.state), "");
 							that.bIsRebuildHistoryRunning = false;
-							resolve();
+							resolve(true); // a navigation occurred
 							break;
 
 						case "append":
 							that._oRouter.getHashChanger().setHash(oTargetState.hash);
 							history.replaceState(Object.assign({ feLevel: newLevel }, history.state), "");
 							that.bIsRebuildHistoryRunning = false;
-							resolve();
+							resolve(true); // a navigation occurred
 							break;
 
 						case "back":
@@ -689,7 +689,7 @@ sap.ui.define(
 						default:
 							// No navigation
 							that.bIsRebuildHistoryRunning = false;
-							resolve();
+							resolve(false); // no navigation --> resolve to false
 					}
 				});
 			},
@@ -803,6 +803,22 @@ sap.ui.define(
 					return !sPrevHash || !that.checkHashWithGuard(sPrevHash);
 				}
 				return false;
+			},
+
+			/**
+			 * Checks if the last 2 entries in the history share the same context.
+			 *
+			 * @returns {boolean} `true` if they share the same context.
+			 */
+			checkIfBackHasSameContext: function() {
+				if (this._oManagedHistory.length < 2) {
+					return false;
+				}
+
+				var oCurrentState = this._oManagedHistory[this._oManagedHistory.length - 1];
+				var oPreviousState = this._oManagedHistory[this._oManagedHistory.length - 2];
+
+				return oCurrentState.hash.split("?")[0] === oPreviousState.hash.split("?")[0];
 			}
 		});
 	}

package/src/sap/fe/core/Synchronization.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", "sap/ui/base/Object"], function(Log, BaseObject) {
 	"use strict";

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

@@ -1,10 +1,10 @@
 /*!
  * 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/UIComponent", "sap/fe/core/CommonUtils", "sap/base/Log"],
-	function(UIComponent, CommonUtils, Log) {
+	["sap/ui/core/UIComponent", "sap/fe/core/CommonUtils", "sap/ui/mdc/p13n/StateUtil", "sap/base/Log"],
+	function(UIComponent, CommonUtils, StateUtil, Log) {
 		"use strict";
 
 		var TemplateComponent = UIComponent.extend("sap.fe.core.TemplateComponent", {
@@ -12,7 +12,7 @@ sap.ui.define(
 				interfaces: ["sap.ui.core.IAsyncContentCreation"],
 				properties: {
 					/**
-					 * OData EntitySet name
+					 * Name of the OData entity set
 					 */
 					entitySet: {
 						type: "string",
@@ -93,6 +93,15 @@ sap.ui.define(
 			init: function() {
 				this.oAppComponent = CommonUtils.getAppComponent(this);
 				UIComponent.prototype.init.apply(this, arguments);
+				var oStateChangedHandler = function(oEvent) {
+					var oControl = oEvent.getParameter("control");
+					if (oControl.isA("sap.ui.mdc.Table") || oControl.isA("sap.ui.mdc.FilterBar")) {
+						var oMacroAPI = oControl.getParent();
+						oMacroAPI.fireStateChanged();
+					}
+				};
+				StateUtil.detachStateChange(oStateChangedHandler);
+				StateUtil.attachStateChange(oStateChangedHandler);
 			},
 
 			// This method is called by UI5 core to access to the component containing the customizing configuration.
@@ -141,7 +150,7 @@ sap.ui.define(
 						.getController()
 						._getPageTitleInformation();
 				} else {
-					return Promise.resolve({});
+					return {};
 				}
 			},
 

package/src/sap/fe/core/TemplateModel.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", "sap/ui/base/Object", "sap/ui/model/json/JSONModel"], function(Log, BaseObject, JSONModel) {
 	"use strict";