@openui5/sap.ui.mdc 1.99.0 → 1.100.0

package/src/sap/ui/mdc/odata/v4/FilterBarDelegate.js

@@ -44,9 +44,7 @@ sap.ui.define([
 		"Edm.Time": "TimeOfDay"
 	};
 
-	var mMainEntitySet = {};
-
-
+	var InstanceCache = new Map();
 
 	ODataFilterBarDelegate._fetchPropertiesByMetadata = function(oControl, mPropertyBag) {
 
@@ -92,7 +90,7 @@ sap.ui.define([
 						}
 				};
 
-				return mPropertyBag ? this.fetchProperties(oObj) : oControl.getControlDelegate().fetchProperties(oControl);
+				return mPropertyBag ? this.fetchProperties(oObj) : Promise.resolve(oControl.getPropertyHelper().getProperties());
 			}.bind(this));
 	};
 
@@ -246,6 +244,109 @@ sap.ui.define([
 		return Promise.resolve(this._createFilter(sPropertyName, oFilterBar, mPropertyBag));
 	};
 
+
+	ODataFilterBarDelegate._getInstanceCacheEntry = function(oControl, sKey) {
+		var sId = oControl.getId && oControl.getId() || oControl.id;
+		var oCacheEntry = InstanceCache.get(sId);
+		return oCacheEntry && oCacheEntry[sKey];
+	};
+	ODataFilterBarDelegate._setInstanceCacheEntry = function(oControl, sKey, oValue) {
+		var sId = oControl.getId && oControl.getId() || oControl.id;
+		var oCacheEntry = InstanceCache.get(sId) || {};
+		oCacheEntry[sKey] = oValue;
+		InstanceCache.set(sId, oCacheEntry);
+	};
+
+	ODataFilterBarDelegate._addPropertyInfoEntry = function(oControl, sPropertyName, aPropertyInfo, aFetchedProperties, oModifier) {
+
+		if (aFetchedProperties) {
+			var nIdx = aFetchedProperties.findIndex(function(oEntry) {
+				return oEntry.name === sPropertyName;
+			});
+
+			if (nIdx >= 0) {
+				aPropertyInfo.push({
+					name: sPropertyName,
+					dataType: aFetchedProperties[nIdx].typeConfig.className,
+					maxConditions: aFetchedProperties[nIdx].maxConditions,
+					constraints: aFetchedProperties[nIdx].constraints,
+					formatOption: aFetchedProperties[nIdx].formatOptions,
+					required: aFetchedProperties[nIdx].required,
+					caseSensitive: aFetchedProperties[nIdx].caseSensitive,
+					display: aFetchedProperties[nIdx].display,
+					label: aFetchedProperties[nIdx].label,
+					hiddenFilter: aFetchedProperties[nIdx].hiddenFilter
+				});
+				oModifier.setProperty(oControl, "propertyInfo", aPropertyInfo);
+			} else {
+				Log.error("ConditionFlex-ChangeHandler: no type info for property '" + sPropertyName + "'");
+			}
+		}
+	};
+
+
+	ODataFilterBarDelegate._updatePropertyInfo = function(sPropertyName, oFilterBar, mPropertyBag) {
+
+		if (oFilterBar.isA && oFilterBar.isA("sap.ui.mdc.FilterBar")) {
+			return Promise.resolve();
+		}
+
+		var oModifier = mPropertyBag.modifier;
+
+		return oModifier.getProperty(oFilterBar, "propertyInfo")
+		.then(function(aPropertyInfo) {
+			if (!aPropertyInfo) {
+				return Promise.resolve();
+			}
+			var nIdx = aPropertyInfo.findIndex(function(oEntry) {
+				return oEntry.name === sPropertyName;
+			});
+
+			if (nIdx < 0) {
+
+				var aFetchedProperties = ODataFilterBarDelegate._getInstanceCacheEntry(oFilterBar, "fetchedProperties");
+				if (aFetchedProperties) {
+					ODataFilterBarDelegate._addPropertyInfoEntry(oFilterBar, sPropertyName, aPropertyInfo, aFetchedProperties, oModifier);
+				} else {
+					//fetch
+					return ODataFilterBarDelegate.fetchProperties(oFilterBar, mPropertyBag)
+					.then(function(aProperties) {
+						ODataFilterBarDelegate._setInstanceCacheEntry(oFilterBar, "fetchedProperties", aProperties);
+						ODataFilterBarDelegate._addPropertyInfoEntry(oFilterBar, sPropertyName, aPropertyInfo, aProperties, oModifier);
+					});
+				}
+			}
+		});
+	};
+
+
+	/**
+	 * This methods is called during the appliance of the add condition change.
+	 * This intention is to update the propertyInfo property.
+	 *
+	 * @param {string} sPropertyName The name of a property.
+	 * @param {sap.ui.mdc.FilterBar} oFilterBar - the instance of filter bar
+	 * @param {Object} mPropertyBag Instance of property bag from Flex change API
+	 * @returns {Promise} Promise that resolves once the properyInfo property was updated
+	 */
+	ODataFilterBarDelegate.addCondition = function(sPropertyName, oFilterBar, mPropertyBag) {
+		return ODataFilterBarDelegate._updatePropertyInfo(sPropertyName, oFilterBar, mPropertyBag);
+	};
+
+	/**
+	 * This methods is called during the appliance of the remove condition change.
+	 * This intention is to update the propertyInfo property.
+	 *
+	 * @param {string} sPropertyName The name of a property.
+	 * @param {sap.ui.mdc.FilterBar} oFilterBar - the instance of filter bar
+	 * @param {Object} mPropertyBag Instance of property bag from Flex change API
+	 * @returns {Promise} Promise that resolves once the properyInfo property was updated
+	 */
+	ODataFilterBarDelegate.removeCondition = function(sPropertyName, oFilterBar, mPropertyBag) {
+		return ODataFilterBarDelegate._updatePropertyInfo(sPropertyName, oFilterBar, mPropertyBag);
+	};
+
+
 	/**
 	 * Can be used to trigger any necessary follow-up steps on removal of filter items. The returned boolean value inside the Promise can be used to
 	 * prevent default follow-up behaviour of Flex.
@@ -560,7 +661,11 @@ sap.ui.define([
 	 * @param {object} oFilterBar - the instance of filter bar
 	 * @returns {Promise} once resolved an array of property info is returned
 	 */
-	ODataFilterBarDelegate.fetchProperties = function (oFilterBar) {
+	ODataFilterBarDelegate.fetchProperties = function (oFilterBar, mPropertyBag) {
+
+		if (!(oFilterBar.isA && oFilterBar.isA("sap.ui.mdc.FilterBar")) && mPropertyBag) {
+			return ODataFilterBarDelegate._fetchPropertiesByMetadata(oFilterBar, mPropertyBag);
+		}
 
 		var sModelName = oFilterBar.getDelegate().payload.modelName;
 		var sEntitySet = oFilterBar.getDelegate().payload.collectionName;
@@ -569,9 +674,9 @@ sap.ui.define([
 
 				var oMetaModel;
 
-				var sCachKey = oFilterBar.getId() + '->' + sEntitySet;
-				if (mMainEntitySet[sCachKey]) {
-					resolve(mMainEntitySet[sCachKey]);
+				var oCachedEntitySet = ODataFilterBarDelegate._getInstanceCacheEntry(oFilterBar, "fetchedProperties");
+				if (oCachedEntitySet) {
+					resolve(oCachedEntitySet);
 					return;
 				}
 
@@ -594,7 +699,7 @@ sap.ui.define([
 						ODataFilterBarDelegate._fetchEntitySet(oMetaModel, '/' + sEntitySet, aVisitedEntityTypes, null, oParamInfo).then(function(aProperties) {
 
 							if (oParamInfo.parameterNavigationName && (oParamInfo.parameters.length > 0)) {
-								window[oFilterBar.getId() + '->' + sEntitySet + "-Parameters"] = oParamInfo;
+								ODataFilterBarDelegate._setInstanceCacheEntry(oFilterBar, sEntitySet + "-Parameters", oParamInfo);
 
 								//parameters are initially at the top of the result
 								aProperties.sort(function(p1, p2) {
@@ -622,7 +727,7 @@ sap.ui.define([
 								return mProperties[sName];
 							});
 
-							mMainEntitySet[sCachKey] = aProperties;
+							ODataFilterBarDelegate._setInstanceCacheEntry(oFilterBar, "fetchedProperties", aProperties);
 							resolve(aProperties);
 						});
 					}
@@ -633,17 +738,8 @@ sap.ui.define([
 		}.bind(this));
 	};
 
-
 	ODataFilterBarDelegate.cleanup = function (oFilterBar) {
-		var sFilterBarId = oFilterBar.getId() + "->";
-
-		Object.keys(mMainEntitySet).forEach(function(sKey){
-			if (sKey.indexOf(sFilterBarId) === 0) {
-
-				delete window[sFilterBarId + sKey + "-Parameters"];
-				delete mMainEntitySet[sKey];
-			}
-		});
+		InstanceCache.delete(oFilterBar.getId());
 	};
 
 	ODataFilterBarDelegate.getTypeUtil = function (oPayload) {

package/src/sap/ui/mdc/odata/v4/ODataMetaModelUtil.js

@@ -163,8 +163,8 @@ sap.ui.define(["sap/ui/mdc/util/TypeUtil"], function(TypeUtil) {
 
 	/**
 	 * Checks whether the thresholds are dynamic or constant.
-	 * @param {object} the threshold skeleton
-	 * @param {object} the UI.DataPoint.CriticalityCalculation annotation
+	 * @param {object} oThresholds the threshold skeleton
+	 * @param {object} oCriticalityCalculation the UI.DataPoint.CriticalityCalculation annotation
 	 * @returns {boolean} <code>true</code> if the threshold should be supplied as ConstantThresholds, <code>false</code> if the threshold should
 	 *          be supplied as DynamicThresholds
 	 * @private

package/src/sap/ui/mdc/odata/v4/TableDelegate.js

@@ -6,6 +6,7 @@
 
 sap.ui.define([
 	"../../TableDelegate",
+	"../../table/V4AnalyticsPropertyHelper",
 	"../../util/loadModules",
 	"../../library",
 	"sap/m/ColumnPopoverSelectListItem",
@@ -17,6 +18,7 @@ sap.ui.define([
 	"sap/ui/base/ManagedObjectObserver"
 ], function(
 	TableDelegate,
+	V4AnalyticsPropertyHelper,
 	loadModules,
 	library,
 	ColumnPopoverSelectListItem,
@@ -51,37 +53,14 @@ sap.ui.define([
 	var Delegate = Object.assign({}, TableDelegate);
 
 	/**
-	 * Fetches the model-specific <code>PropertyHelper</code> class or instance.
+	 * Gets the model-specific <code>PropertyHelper</code> class to create an instance of.
 	 *
-	 * <b>Note:</b> The <code>PropertyHelper</code> class adds the extension of a property to the reserved attribute "extension". It is not allowed to
-	 * add an <code>extension</code> attribute in the standard <code>PropertyInfo</code>.
-	 *
-	 * @example <caption>Initializing a <code>PropertyHelper</code> with extensions:</caption>
-	 * new PropertyHelper(
-	 *     [{
-	 *         name: "propA",
-	 *         label: "Property A",
-	 *         extension: {
-	 *             messageType: "Success"
-	 *         }
-	 *     }, {
-	 *         name: "propB",
-	 *         label: "Property B"
-	 *     }]
-	 * )
-	 *
-	 * @param {sap.ui.mdc.Table} oTable Instance of the table
-	 * @param {object[]} aProperties <code>PropertyInfo</code>
-	 * @param {Promise<object<string, object>|null>} mExtensions The property extensions
-	 * @returns {Promise<sap.ui.mdc.table.V4AnalyticsPropertyHelper>} A <code>Promise</code> that resolves with the <code>PropertyHelper</code> class
-	 * or instance
+	 * @returns {sap.ui.mdc.table.V4AnalyticsPropertyHelper} The <code>PropertyHelper</code> class.
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
 	 */
-	Delegate.fetchPropertyHelper = function(oTable, aProperties, mExtensions) {
-		return loadModules("sap/ui/mdc/table/V4AnalyticsPropertyHelper").then(function(aResult) {
-			return aResult[0];
-		});
+	Delegate.getPropertyHelperClass = function() {
+		return V4AnalyticsPropertyHelper;
 	};
 
 	/**
@@ -94,7 +73,7 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.mdc.Table} oTable Instance of the table
 	 * @param {object[]} aProperties <code>PropertyInfo</code>
-	 * @returns {Promise<object<string, object>|null>} Key-value map, where the key is the name of the property, and the value is the extension
+	 * @returns {Promise<Object<string, object>|null>} Key-value map, where the key is the name of the property, and the value is the extension
 	 * @protected
 	 */
 	Delegate.fetchPropertyExtensions = function(oTable, aProperties) {
@@ -121,7 +100,7 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.mdc.Table} oTable Instance of the table
 	 * @param {object[]} aProperties <code>PropertyInfo</code>
-	 * @returns {Promise<object<string, object>|null>} Key-value map, where the key is the name of the property, and the value is the extension
+	 * @returns {Promise<Object<string, object>|null>} Key-value map, where the key is the name of the property, and the value is the extension
 	 * @protected
 	 */
 	Delegate.fetchPropertyExtensionsForBinding = function(oTable, aProperties) {
@@ -226,7 +205,7 @@ sap.ui.define([
 	 * <code>model</code>... must be provided in the {@link #updateBindingInfo updateBindingInfo} method always,
 	 * and those keys must not be changed conditionally.
 	 *
-	 * @param {sap.ui.mdc.Table} oMDCTable Instance of the table
+	 * @param {sap.ui.mdc.Table} oTable Instance of the table
 	 * @param {sap.ui.base.ManagedObject.AggregationBindingInfo} oBindingInfo The binding info object to be used to bind the table to the model.
 	 * @param {sap.ui.model.ListBinding} [oBinding] The binding instance of the table
 	 * @protected
@@ -707,10 +686,9 @@ sap.ui.define([
 			return oDelegate.fetchPropertyExtensionsForBinding(oTable, aProperties);
 		}).then(function(mExtensionsForBinding) {
 			mExtensions = mExtensionsForBinding;
-			return oDelegate.fetchPropertyHelper(oTable, aProperties, mExtensions);
+			return oDelegate.getPropertyHelperClass();
 		}).then(function(PropertyHelper) {
-			var bIsPropertyHelperInstance = PropertyHelper.constructor === PropertyHelper;
-			mTableMap.oPropertyHelperForBinding = bIsPropertyHelperInstance ? PropertyHelper : new PropertyHelper(aProperties, mExtensions, oTable);
+			mTableMap.oPropertyHelperForBinding = new PropertyHelper(aProperties, mExtensions, oTable);
 			return mTableMap.oPropertyHelperForBinding;
 		});
 	}

package/src/sap/ui/mdc/odata/v4/TypeUtil.js

@@ -4,7 +4,7 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define(['sap/ui/mdc/odata/TypeUtil', 'sap/ui/mdc/enum/BaseType'], function(ODataTypeUtil, BaseType) {
+sap.ui.define(['sap/ui/mdc/odata/TypeUtil', 'sap/ui/mdc/enum/BaseType',	'sap/base/util/merge'], function(ODataTypeUtil, BaseType, merge) {
 	"use strict";
 
 	/**
@@ -62,9 +62,7 @@ sap.ui.define(['sap/ui/mdc/odata/TypeUtil', 'sap/ui/mdc/enum/BaseType'], functio
 		switch (sDataType) {
 			case "sap.ui.model.odata.type.DateTimeOffset":
 			case "Edm.DateTimeOffset":
-				if (!constraints) {
-					constraints = {};
-				}
+				constraints = merge({}, constraints);
 				constraints.V4 = true;
 				break;
 

package/src/sap/ui/mdc/odata/v4/ValueHelpDelegate.js

@@ -15,7 +15,7 @@ sap.ui.define([
 
 	var ODataV4ValueHelpDelegate = Object.assign({}, ValueHelpDelegate);
 
-	ODataV4ValueHelpDelegate.isSearchSupported = function(oPayload, oListBinding) {
+	ODataV4ValueHelpDelegate.isSearchSupported = function(oPayload, oContent, oListBinding) {
 		return !!oListBinding.changeParameters;
 	};