@sapui5/sap.fe.core 1.92.0 → 1.93.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.fe.core",
-	"version": "1.92.0",
+	"version": "1.93.3",
 	"description": "SAPUI5 Library sap.fe.core",
 	"license": "SEE LICENSE IN LICENSE.txt",
 	"author": "SAP SE (https://www.sap.com)",
@@ -22,7 +22,6 @@
 	"devDependencies": {
 		"@babel/cli": "7.8.4",
 		"@ui5/cli": "^2.10.0",
-		"copyfiles": "2.2.0",
-		"yarn": "1.22.10"
+		"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.92.0</version>
+    <version>1.93.3</version>
 
     <documentation>UI5 library: sap.fe.core</documentation>
 

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

@@ -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

@@ -21,6 +21,7 @@ sap.ui.define(
 		"sap/ui/core/Component",
 		"sap/fe/core/TemplateComponent",
 		"sap/fe/core/helpers/ModelHelper",
+		"sap/fe/macros/internal/valuehelp/ValueListHelper",
 		"sap/fe/core/converters/MetaModelConverter"
 	],
 	function(
@@ -37,6 +38,7 @@ sap.ui.define(
 		Component,
 		TemplateComponent,
 		ModelHelper,
+		ValueListHelper,
 		MetaModelConverter
 	) {
 		"use strict";
@@ -96,6 +98,7 @@ sap.ui.define(
 		 */
 		var AppComponent = UIComponent.extend("sap.fe.core.AppComponent", {
 			metadata: {
+				interfaces: ["sap.ui.core.IAsyncContentCreation"],
 				config: {
 					fullWidth: true
 				},
@@ -163,6 +166,7 @@ sap.ui.define(
 				library: "sap.fe.core"
 			},
 
+			instanceMap: {},
 			/**
 			 * @private
 			 * @name sap.fe.core.AppComponent.getMetadata
@@ -317,6 +321,7 @@ sap.ui.define(
 				// 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
 				UIComponent.prototype.init.apply(that, arguments);
+				AppComponent.prototype.instanceMap[this.getId()] = this;
 			},
 			onServicesStarted: function() {
 				//router must be started once the rootcontainer is initialized
@@ -379,7 +384,22 @@ sap.ui.define(
 				// LEAKS, with workaround for some Flex / MDC issue
 				try {
 					// 	// This one is only a leak if you don't go back to the same component in the long run
-					// 	delete sap.ui.fl.FlexControllerFactory._componentInstantiationPromises[this.getId()];
+					//delete sap.ui.fl.FlexControllerFactory._componentInstantiationPromises[this.getId()];
+
+					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) {
 					// 		Object.keys(oRegistry[sKey].controller).forEach(function(sControllerKey) {

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

@@ -942,26 +942,54 @@ sap.ui.define(
 				var aApplicable = [],
 					aNotApplicable = [];
 				var sProperty = oActionOperationAvailableMap[sAction];
-				for (var i = 0; i < aSelectedContexts.length; i++) {
-					var oSelectedContext = aSelectedContexts[i];
-					if (oSelectedContext) {
-						var oContextData = oSelectedContext.getObject();
-						if (sProperty === null && !!oContextData["#" + sAction]) {
-							//look for action advertisement if present and its value is not null
-							oInternalModelContext
-								.getModel()
-								.setProperty(oInternalModelContext.getPath() + "/dynamicActions/" + sAction + "/bEnabled", true);
-							break;
-						} else if (oSelectedContext.getObject(sProperty)) {
-							oInternalModelContext
-								.getModel()
-								.setProperty(oInternalModelContext.getPath() + "/dynamicActions/" + sAction + "/bEnabled", true);
-							aApplicable.push(oSelectedContext);
-						} else {
-							aNotApplicable.push(oSelectedContext);
+				if (typeof sProperty === "object" && sProperty !== null && sProperty !== undefined) {
+					for (var i = 0; i < aSelectedContexts.length; i++) {
+						var oSelectedContext = aSelectedContexts[i];
+						if (oSelectedContext) {
+							var oContextData = oSelectedContext.getObject();
+							var oTransformedBinding = BindingExpression.transformRecursively(
+								sProperty,
+								"Binding",
+								// eslint-disable-next-line no-loop-func
+								function(oBindingExpression) {
+									return BindingExpression.constant(oContextData[oBindingExpression.path]);
+								},
+								true
+							);
+							var sResult = BindingExpression.compileBinding(oTransformedBinding);
+							if (sResult === "true") {
+								oInternalModelContext
+									.getModel()
+									.setProperty(oInternalModelContext.getPath() + "/dynamicActions/" + sAction + "/bEnabled", true);
+								aApplicable.push(oSelectedContext);
+							} else {
+								aNotApplicable.push(oSelectedContext);
+							}
+						}
+					}
+				} else {
+					for (var i = 0; i < aSelectedContexts.length; i++) {
+						var oSelectedContext = aSelectedContexts[i];
+						if (oSelectedContext) {
+							var oContextData = oSelectedContext.getObject();
+							if (sProperty === null && !!oContextData["#" + sAction]) {
+								//look for action advertisement if present and its value is not null
+								oInternalModelContext
+									.getModel()
+									.setProperty(oInternalModelContext.getPath() + "/dynamicActions/" + sAction + "/bEnabled", true);
+								break;
+							} else if (oSelectedContext.getObject(sProperty)) {
+								oInternalModelContext
+									.getModel()
+									.setProperty(oInternalModelContext.getPath() + "/dynamicActions/" + sAction + "/bEnabled", true);
+								aApplicable.push(oSelectedContext);
+							} else {
+								aNotApplicable.push(oSelectedContext);
+							}
 						}
 					}
 				}
+
 				oInternalModelContext
 					.getModel()
 					.setProperty(oInternalModelContext.getPath() + "/dynamicActions/" + sAction + "/aApplicable", aApplicable);
@@ -1223,11 +1251,10 @@ sap.ui.define(
 
 			aSelectOptionsPropertyNames.forEach(function(sSelectOption) {
 				if (sSelectOption.indexOf(".") > 0 && !sSelectOption.includes("$Parameter")) {
-					var sFullContextPath = !sSelectOption.includes(sContextPath.replace("/", ""))
-						? sContextPath + "/" + sSelectOption.replaceAll(".", "/")
-						: "/" + sSelectOption.replaceAll(".", "/");
-					// check if the full path, eg SalesOrderManage._Item.Material exists in the metamodel
-					if (oMetaModel.getObject(sFullContextPath)) {
+					var sFullContextPath = ("/" + sSelectOption.replaceAll(".", "/")).startsWith(sContextPath)
+						? "/" + sSelectOption.replaceAll(".", "/")
+						: sContextPath + "/" + sSelectOption.replaceAll(".", "/"); // check if the full path, eg SalesOrderManage._Item.Material exists in the metamodel
+					if (oMetaModel.getObject(sFullContextPath.replace("P_", ""))) {
 						_createConditionsForNavProperties(
 							sFullContextPath,
 							sContextPath,
@@ -1252,21 +1279,20 @@ sap.ui.define(
 		) {
 			var aNavObjectNames = sSelectOption.split(".");
 			// Eg: "SalesOrderManage._Item._Material.Material" or "_Item.Material"
-			if (sSelectOption.includes(sMainEntitySetPath.replace("/", ""))) {
-				aNavObjectNames.shift();
+			if (("/" + sSelectOption.replaceAll(".", "/")).startsWith(sMainEntitySetPath)) {
+				var sFullPath = ("/" + sSelectOption).replaceAll(".", "/"),
+					sNavPath = sFullPath.replace(sMainEntitySetPath + "/", "");
+				aNavObjectNames = sNavPath.split("/");
 			}
 			var sConditionPath = "";
-			var sContextPath = sSelectOption.includes(sMainEntitySetPath.replace("/", ""))
-				? sMainEntitySetPath
-				: "/" + sSelectOption.split(".")[0]; // /SalesOrderManage
 			var sPropertyName = aNavObjectNames[aNavObjectNames.length - 1]; // Material from SalesOrderManage._Item.Material
 			for (var i = 0; i < aNavObjectNames.length - 1; i++) {
-				if (oMetaModel.getObject(sContextPath + "/" + aNavObjectNames[i]).$isCollection) {
+				if (oMetaModel.getObject(sMainEntitySetPath + "/" + aNavObjectNames[i].replace("P_", "")).$isCollection) {
 					sConditionPath = sConditionPath + aNavObjectNames[i] + "*/"; // _Item*/ in case of 1:n cardinality
 				} else {
 					sConditionPath = sConditionPath + aNavObjectNames[i] + "/"; // _Item/ in case of 1:1 cardinality
 				}
-				sContextPath = sContextPath + "/" + aNavObjectNames[i];
+				sMainEntitySetPath = sMainEntitySetPath + "/" + aNavObjectNames[i];
 			}
 			var sNavPropertyPath = sFullContextPath.slice(0, sFullContextPath.lastIndexOf("/")),
 				oValidProperties = CommonUtils.getContextPathProperties(oMetaModel, sNavPropertyPath),
@@ -1274,24 +1300,40 @@ sap.ui.define(
 			var sSelectOptionName = sPropertyName;
 			if (oValidProperties[sPropertyName]) {
 				sSelectOptionName = sPropertyName;
-			} else if (
-				oValidProperties["P_" + sPropertyName] &&
-				aSelectOptionsPropertyNames.includes(oValidProperties["P_" + sPropertyName].slice(2, sPropertyName.length))
-			) {
-				sSelectOptionName = sPropertyName.slice(2, sPropertyName.length);
+			} else if (sPropertyName.startsWith("P_") && oValidProperties[sPropertyName.replace("P_", "")]) {
+				sSelectOptionName = sPropertyName.replace("P_", "");
+			} else if (oValidProperties["P_" + sPropertyName] && aSelectOptionsPropertyNames.includes("P_" + sPropertyName)) {
+				sSelectOptionName = "P_" + sPropertyName;
+			}
+			if (sPropertyName.startsWith("P_") && oConditions[sConditionPath + sSelectOptionName]) {
+				// if there is no SalesOrderManage._Item.Material yet in the oConditions
+				return;
+			} else if (!sPropertyName.startsWith("P_") && oConditions[sConditionPath + sSelectOptionName]) {
+				delete oConditions[sConditionPath + sSelectOptionName];
+				addSelectOptionsToConditions(
+					sNavPropertyPath,
+					oSelectionVariant,
+					sSelectOption,
+					oConditions,
+					sConditionPath,
+					sSelectOptionName,
+					oValidProperties,
+					oMetaModel,
+					false
+				);
+			} else {
+				addSelectOptionsToConditions(
+					sNavPropertyPath,
+					oSelectionVariant,
+					sSelectOption,
+					oConditions,
+					sConditionPath,
+					sSelectOptionName,
+					oValidProperties,
+					oMetaModel,
+					false
+				);
 			}
-
-			addSelectOptionsToConditions(
-				sNavPropertyPath,
-				oSelectionVariant,
-				sSelectOption,
-				oConditions,
-				sConditionPath,
-				sSelectOptionName,
-				oValidProperties,
-				oMetaModel,
-				false
-			);
 		}
 
 		/**
@@ -1316,13 +1358,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;
@@ -1353,6 +1396,10 @@ sap.ui.define(
 					case "EQ":
 						oSelectOptionState.option = sOperator;
 						break;
+					case "TODAY":
+					case "DATE":
+						oSelectOptionState.option = "EQ";
+						break;
 					case "EEQ":
 						oSelectOptionState.option = "EQ";
 						break;
@@ -1412,6 +1459,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(
@@ -1751,7 +1805,7 @@ sap.ui.define(
 								for (var iLinkCount = 0; iLinkCount < aLinks[i][0].length; iLinkCount++) {
 									_oLink = aLinks[i][0][iLinkCount];
 									_sLinkIntent = _oLink && _oLink.intent.split("-")[1];
-									if (!(sCurrentHash === _sLinkIntent)) {
+									if (!(_oLink && _oLink.intent && _oLink.intent.indexOf(sCurrentHash) === 0)) {
 										hasTargetsNotFiltered = true;
 										if (!bIntentHasActions(_sLinkIntent, aSemanticObjects[k].unavailableActions)) {
 											aFinalLinks[i].push(_oLink);
@@ -2051,6 +2105,33 @@ sap.ui.define(
 			}
 		}
 
+		/**
+		 * Method which returns a promise that resolves to a singleton property value.
+		 *
+		 * @param {string} sPath Absolute path to the singleton property
+		 * @param {object} oModel Instance of the OData V4 model
+		 * @returns {Promise} A promise which resolves to the property value for a singleton, otherwise null.
+		 */
+		function requestSingletonProperty(sPath, oModel) {
+			if (!sPath || !oModel) {
+				return Promise.resolve(null);
+			}
+
+			var oMetaModel = oModel.getMetaModel();
+			// Find the underlying entity set from the property path and check whether it is a singleton.
+			var aParts = sPath.split("/").filter(Boolean),
+				sPropertyName = aParts.pop(),
+				sNavigationPath = aParts.join("/"),
+				oEntitySet = sNavigationPath && oMetaModel.getObject("/" + sNavigationPath);
+			if (oEntitySet && oEntitySet.$kind === "Singleton") {
+				var sSingletonName = aParts[aParts.length - 1],
+					oPropertyBinding = oModel.bindProperty("/" + sSingletonName + "/" + sPropertyName);
+				return oPropertyBinding.requestValue();
+			}
+
+			return Promise.resolve(null);
+		}
+
 		function loadMacroLibrary() {
 			return new Promise(function(resolve, reject) {
 				sap.ui.require(["sap/fe/macros/macroLibrary"], function(/*macroLibrary*/) {
@@ -2101,6 +2182,7 @@ sap.ui.define(
 			getSearchRestrictions: getSearchRestrictions,
 			getFilterRestrictionsByPath: getFilterRestrictionsByPath,
 			getSpecificAllowedExpression: getSpecificAllowedExpression,
+			requestSingletonProperty: requestSingletonProperty,
 			templateControlFragment: templateControlFragment,
 			FilterRestrictions: {
 				REQUIRED_PROPERTIES: "RequiredProperties",