@openui5/sap.ui.mdc 1.97.1 → 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,
@@ -35,64 +37,43 @@ sap.ui.define([
 	var TableMap = new window.WeakMap(); // To store table-related information for easy access in the delegate.
 
 	/**
-	 * Delegate class for <code>sap.ui.mdc.Table</code> and <code>ODataV4</code>.
+	 * Delegate for {@link sap.ui.mdc.Table} and <code>ODataV4</code>.
 	 * Enables additional analytical capabilities.
 	 *
 	 * @author SAP SE
+	 * @namespace
+	 * @alias module:sap/ui/mdc/odata/v4/TableDelegate
+	 * @extends module:sap/ui/mdc/TableDelegate
 	 * @experimental
 	 * @private
 	 * @ui5-restricted sap.fe
 	 * @MDC_PUBLIC_CANDIDATE
 	 * @since 1.85
-	 * @alias sap.ui.mdc.odata.v4.TableDelegate
 	 */
 	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 PropertyHelper adds the extension of a property to the reserved attribute "extension". It is not allowed to add an "extension"
-	 * attribute in the standard property infos.
-	 *
-	 * @example <caption>Initialize a PropertyHelper 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 MDC table
-	 * @param {object[]} aProperties The property infos
-	 * @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;
 	};
 
 	/**
 	 * Fetches the property extensions.
 	 *
-	 * <b>Note:</b> Property extensions are adding model-specific information. To ensure a clear separation from the standard property information,
-	 * the extensions need to be passed separately to the constructor, together with their attribute metadata. An extension has to be provided as a
+	 * <b>Note:</b> Property extensions add model-specific information. To ensure a clear separation from the standard property information, the
+	 * extensions need to be passed separately to the constructor, together with their attribute metadata. An extension has to be provided as a
 	 * key-value pair, where the key is the name of the property and the value is the extension of this property. It is not allowed to provide
 	 * extensions without the corresponding attribute metadata.
 	 *
-	 * @param {sap.ui.mdc.Table} oTable Instance of the MDC table
-	 * @param {object[]} aProperties The property infos
-	 * @returns {Promise<object<string, object>|null>} Key-value map, where the key is the name of the property, and the value is the extension
+	 * @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
 	 * @protected
 	 */
 	Delegate.fetchPropertyExtensions = function(oTable, aProperties) {
@@ -100,11 +81,11 @@ sap.ui.define([
 	};
 
 	/**
-	 * Retrieves the relevant metadata that will be used for the table binding, and returns the property info array.
+	 * Retrieves the relevant metadata that will be used for the table binding, and returns the <code>PropertyInfo</code> array.
 	 * If it is not overridden, this method returns the same as <code>fetchProperties</code>.
 	 * When overriding the method make sure the returned result is consistent with what is returned by <code>fetchProperties</code>.
 	 *
-	 * @param {sap.ui.mdc.Table} oTable Instance of the MDC table
+	 * @param {sap.ui.mdc.Table} oTable Instance of the table
 	 * @returns {Promise} Once resolved, an array of <code>PropertyInfo</code> objects is returned
 	 * @protected
 	*/
@@ -117,9 +98,9 @@ sap.ui.define([
 	 * If it is not overridden, this method returns the same as <code>fetchPropertyExtensions</code>.
 	 * When overriding the method make sure the returned result is consistent with what is returned by <code>fetchPropertyExtensions</code>.
 	 *
-	 * @param {sap.ui.mdc.Table} oTable Instance of the MDC table
-	 * @param {object[]} aProperties The property infos
-	 * @returns {Promise<object<string, object>|null>} Key-value map, where the key is the name of the property, and the value is the extension
+	 * @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
 	 * @protected
 	 */
 	Delegate.fetchPropertyExtensionsForBinding = function(oTable, aProperties) {
@@ -129,7 +110,7 @@ sap.ui.define([
 	/**
 	 * Formats the title text of a group header row of the table.
 	 *
-	 * @param {sap.ui.mdc.Table} oTable Instance of the MDC table
+	 * @param {sap.ui.mdc.Table} oTable Instance of the table
 	 * @param {sap.ui.model.Context} oContext Binding context
 	 * @param {string} sProperty The name of the grouped property
 	 * @returns {string | undefined} The group header title. If <code>undefined</code> is returned, the default group header title is set.
@@ -144,7 +125,6 @@ sap.ui.define([
 
 		return configureInnerTable(oTable).then(function() {
 			setAggregation(oTable);
-			setUpTableObserver(oTable);
 		});
 	};
 
@@ -209,13 +189,12 @@ sap.ui.define([
 	 * {@link sap.ui.model.odata.v4.ODataListBinding#changeParameters}.
 	 *
 	 * @param {sap.ui.mdc.Table} oTable Instance of the MDC table
-	 * @param {object} oDelegatePayload The delegate payload
 	 * @param {sap.ui.base.ManagedObject.AggregationBindingInfo} oBindingInfo The binding info object to be used to bind the table to the model
 	 * @function
-	 * @name sap.ui.mdc.odata.v4.TableDelegate.updateBindingInfo
+	 * @name module:sap/ui/mdc/odata/v4/TableDelegate.updateBindingInfo
 	 * @abstract
 	 */
-	//Delegate.updateBindingInfo = function(oTable, oDelegatePayload, oBindingInfo) { };
+	//Delegate.updateBindingInfo = function(oTable, oBindingInfo) { };
 
 	/**
 	 * Updates the row binding of the table if possible, rebinds otherwise.
@@ -226,15 +205,15 @@ 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 MDC 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
 	 * @override
 	 */
 	Delegate.updateBinding = function(oTable, oBindingInfo, oBinding) {
-		if (!oBinding || oBinding.hasPendingChanges() || oBinding.getPath() != oBindingInfo.path) {
-			this.rebindTable(oTable, oBindingInfo);
+		if (!oBinding || oBinding.getPath() != oBindingInfo.path) {
+			this.rebind(oTable, oBindingInfo);
 			return;
 		}
 
@@ -252,7 +231,7 @@ sap.ui.define([
 			oBinding.filter(oBindingInfo.filters, "Application");
 			oBinding.sort(oBindingInfo.sorter);
 		} catch (e) {
-			this.rebindTable(oTable, oBindingInfo);
+			this.rebind(oTable, oBindingInfo);
 			if (oRootBinding == oBinding) {
 				// If we resume before the rebind, you get an extra request therefore we must
 				// resume after rebind, but only if the list binding was not the root binding.
@@ -269,29 +248,37 @@ sap.ui.define([
 	 * @override
 	 * @inheritDoc
 	 */
-	Delegate.rebindTable = function (oTable, oBindingInfo) {
+	Delegate.rebind = function (oTable, oBindingInfo) {
 		setAggregation(oTable, oBindingInfo);
-		TableDelegate.rebindTable(oTable, oBindingInfo);
+		TableDelegate.rebind(oTable, oBindingInfo);
 	};
 
 	Delegate.addColumnMenuItems = function(oTable, oMDCColumn) {
-		if (!isInnerTableReadyForAnalytics(oTable)) {
-			return [];
-		}
-
 		var oPropertyHelper = oTable.getPropertyHelper();
 		var oProperty = oPropertyHelper.getProperty(oMDCColumn.getDataProperty());
+		var aItems = [];
 
 		if (!oProperty) {
 			return [];
 		}
 
-		var aGroupProperties = oProperty.getGroupableProperties();
-		var aAggregateProperties = oProperty.getAggregatableProperties();
-		var oPopover = oTable._oPopover;
-		var oAggregatePopoverItem;
-		var oGroupPopoverItem;
+		if (oTable.isGroupingEnabled() && supportsGrouping(oTable)) {
+			var aGroupProperties = oProperty.getGroupableProperties();
+
+			if (aGroupProperties.length > 0) {
+				aItems.push(createGroupPopoverItem(aGroupProperties, oMDCColumn));
+			}
+		}
 
+		if (oTable.isAggregationEnabled() && supportsAggregation(oTable)) {
+			var aAggregateProperties = oProperty.getAggregatableProperties();
+
+			if (aAggregateProperties.length > 0) {
+				aItems.push(createAggregatePopoverItem(aAggregateProperties, oMDCColumn));
+			}
+		}
+
+		var oPopover = oTable._oPopover;
 		if (oPopover) {
 			oPopover.getItems().forEach(function(oItem, iIndex, aItems) {
 				var sLabel = oItem.getLabel();
@@ -307,15 +294,7 @@ sap.ui.define([
 			});
 		}
 
-		if (oTable.isGroupingEnabled() && aGroupProperties.length > 0) {
-			oGroupPopoverItem = createGroupPopoverItem(aGroupProperties, oMDCColumn);
-		}
-
-		if (oTable.isAggregationEnabled() && aAggregateProperties.length > 0) {
-			oAggregatePopoverItem = createAggregatePopoverItem(aAggregateProperties, oMDCColumn);
-		}
-
-		return [oGroupPopoverItem, oAggregatePopoverItem];
+		return aItems;
 	};
 
 	function createGroupPopoverItem(aGroupProperties, oMDCColumn) {
@@ -431,30 +410,36 @@ sap.ui.define([
 	/**
 	 * Updates the aggregation info if the plugin is enabled.
 	 *
-	 * @param {sap.ui.mdc.Table} oTable Instance of the MDC 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
 	 */
 	function setAggregation(oTable, oBindingInfo) {
-		if (isInnerTableReadyForAnalytics(oTable)) {
-			var aAggregates = Object.keys(oTable._getAggregatedProperties());
-			var sSearch = oBindingInfo && oBindingInfo.parameters["$search"] || undefined;
-			if (sSearch ) {
-				delete oBindingInfo.parameters["$search"];
-			}
-			var aGroupLevels = oTable._getGroupedProperties().map(function (mGroupLevel) {
-				return mGroupLevel.name;
-			});
-			var oAggregationInfo = {
-				visible: getVisibleProperties(oTable),
-				groupLevels: aGroupLevels,
-				grandTotal: aAggregates,
-				subtotals: aAggregates,
-				columnState: getColumnState(oTable, aAggregates),
-				search: sSearch
-			};
+		var oPlugin = TableMap.get(oTable).plugin;
+
+		if (!oPlugin || oPlugin.isDestroyed()) {
+			return;
+		}
+
+		var aGroupLevels = oTable._getGroupedProperties().map(function (mGroupLevel) {
+			return mGroupLevel.name;
+		});
+		var aAggregates = Object.keys(oTable._getAggregatedProperties());
+		var sSearch = oBindingInfo ? oBindingInfo.parameters["$search"] : undefined;
 
-			TableMap.get(oTable).plugin.setAggregationInfo(oAggregationInfo);
+		if (sSearch ) {
+			delete oBindingInfo.parameters["$search"];
 		}
+
+		var oAggregationInfo = {
+			visible: getVisibleProperties(oTable),
+			groupLevels: aGroupLevels,
+			grandTotal: aAggregates,
+			subtotals: aAggregates,
+			columnState: getColumnState(oTable, aAggregates),
+			search: sSearch
+		};
+
+		oPlugin.setAggregationInfo(oAggregationInfo);
 	}
 
 	function getVisibleProperties(oTable) {
@@ -469,7 +454,7 @@ sap.ui.define([
 			}
 
 			if (oProperty.isComplex()) {
-				// Add the names of all related (simple) propertyInfos in the list.
+				// Add the names of all related (simple) PropertyInfo in the list.
 				oProperty.getReferencedProperties().forEach(function(oProperty) {
 					oVisiblePropertiesSet.add(oProperty.name);
 				});
@@ -584,7 +569,7 @@ sap.ui.define([
 	 *
 	 * @param {Object} oBaseState Message set by the base <code>TableDelegate</code>
 	 * @param {Object} oValidationState Message set by the <code>ODataV4Delegate</code>
-	 * @return {Object} The message with higher priority
+	 * @returns {Object} The message with higher priority
 	 * @private
 	 */
 	function mergeValidation(oBaseState, oValidationState) {
@@ -598,39 +583,56 @@ sap.ui.define([
 	}
 
 	/**
-	 * Configures the inner table to support the personalization settings of the MDC table.
+	 * Checks whether the inner table supports grouping.
 	 *
-	 * @param {sap.ui.mdc.Table} oTable Instance of the MDC table
-	 * @return {Promise} A <code>Promise</code> that revolves when the inner table is configured
+	 * @param {sap.ui.mdc.Table} oTable Instance of the table
+	 * @returns {boolean} Whether the inner table supports grouping
 	 */
-	function configureInnerTable(oTable) {
-		return oTable._isOfType(TableType.Table) ? configureGridTable(oTable) : configureResponsiveTable(oTable);
+	function supportsGrouping(oTable) {
+		return oTable._isOfType(TableType.Table);
 	}
 
 	/**
-	 * Checks whether the inner table supports the "analytical" p13n modes <code>Group</code> and <code>Aggregate</code>.
+	 * Checks whether the inner table supports aggregation.
 	 *
-	 * @param {sap.ui.mdc.Table} oTable Instance of the MDC table
-	 * @return {boolean} Whether the inner table supports the "analytical" p13n modes
+	 * @param {sap.ui.mdc.Table} oTable Instance of the table
+	 * @returns {boolean} Whether the inner table supports aggregation
 	 */
-	function isInnerTableReadyForAnalytics(oTable) {
-		if (oTable._isOfType(TableType.Table)) {
-			var oPlugin = TableMap.get(oTable).plugin;
-			return oPlugin != null && !oPlugin.bIsDestroyed;
-		} else {
-			return false;
-		}
+	function supportsAggregation(oTable) {
+		return oTable._isOfType(TableType.Table);
 	}
 
-	function configureGridTable(oTable) {
-		return isAnalyticsEnabled(oTable) ? enableGridTablePlugin(oTable) : disableGridTablePlugin(oTable);
+	/**
+	 * Checks whether aggregation features of the model are used.
+	 *
+	 * @param {sap.ui.mdc.Table} oTable Instance of the table
+	 * @returns {boolean} Whether aggregation features are used
+	 * @see sap.ui.model.odata.v4.ODataListBinding#setAggregation
+	 */
+	function isAnalyticsEnabled(oTable) {
+		return (oTable.isGroupingEnabled() || oTable.isAggregationEnabled()) && oTable._isOfType(TableType.Table);
+	}
+
+	/**
+	 * Configures the inner table to support the personalization settings of the table.
+	 *
+	 * @param {sap.ui.mdc.Table} oTable Instance of the table
+	 * @return {Promise} A <code>Promise</code> that resolves when the inner table is configured
+	 */
+	function configureInnerTable(oTable) {
+		if (oTable._isOfType(TableType.Table)) {
+			return (isAnalyticsEnabled(oTable) ? enableGridTablePlugin(oTable) : disableGridTablePlugin(oTable)).then(function() {
+				return setUpTableObserver(oTable);
+			});
+		}
+		return Promise.resolve();
 	}
 
 	function enableGridTablePlugin(oTable) {
 		var mTableMap = TableMap.get(oTable);
 		var oPlugin = mTableMap.plugin;
 
-		if (oPlugin && !oPlugin.bIsDestroyed) {
+		if (oPlugin && !oPlugin.isDestroyed()) {
 			oPlugin.activate();
 			return Promise.resolve();
 		}
@@ -668,10 +670,6 @@ sap.ui.define([
 		return Promise.resolve();
 	}
 
-	function configureResponsiveTable(oTable) {
-		return Promise.resolve();
-	}
-
 	function fetchPropertyHelperForBinding(oTable) {
 		var mTableMap = TableMap.get(oTable);
 
@@ -688,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;
 		});
 	}
@@ -706,20 +703,17 @@ sap.ui.define([
 					if (mTableMap.oPropertyHelperForBinding) {
 						mTableMap.oPropertyHelperForBinding.destroy();
 					}
+
 				} else {
 					configureInnerTable(oTable);
 				}
 			});
-		}
-
-		mTableMap.observer.observe(oTable, {
-			properties: ["p13nMode"],
-			destroy: true
-		});
-	}
 
-	function isAnalyticsEnabled(oTable) {
-		return oTable.isGroupingEnabled() || oTable.isAggregationEnabled();
+			mTableMap.observer.observe(oTable, {
+				properties: ["p13nMode"],
+				destroy: true
+			});
+		}
 	}
 
 	return Delegate;

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;
 
@@ -77,4 +75,4 @@ sap.ui.define(['sap/ui/mdc/odata/TypeUtil', 'sap/ui/mdc/enum/BaseType'], functio
 
 	return ODataV4TypeUtil;
 
-}, /* bExport= */ true);
+});

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