@openui5/sap.ui.mdc 1.98.0 → 1.101.0

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,
@@ -32,6 +34,7 @@ sap.ui.define([
 	/*global Set */
 
 	var TableType = library.TableType;
+	var P13nMode = library.TableP13nMode;
 	var TableMap = new window.WeakMap(); // To store table-related information for easy access in the delegate.
 
 	/**
@@ -51,37 +54,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 +74,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,24 +101,13 @@ 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) {
 		return this.fetchPropertyExtensions(oTable, aProperties);
 	};
 
-	/**
-	 * Formats the title text of a group header row of the 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.
-	 * @private
-	 */
-	Delegate.formatGroupHeader = function(oTable, oContext, sProperty) {};
-
 	Delegate.preInit = function(oTable) {
 		if (!TableMap.has(oTable)) {
 			TableMap.set(oTable, {});
@@ -226,7 +195,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
@@ -234,7 +203,7 @@ sap.ui.define([
 	 */
 	Delegate.updateBinding = function(oTable, oBindingInfo, oBinding) {
 		if (!oBinding || oBinding.getPath() != oBindingInfo.path) {
-			this.rebindTable(oTable, oBindingInfo);
+			this.rebind(oTable, oBindingInfo);
 			return;
 		}
 
@@ -252,7 +221,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.
@@ -271,7 +240,7 @@ sap.ui.define([
 	 */
 	Delegate.rebind = function (oTable, oBindingInfo) {
 		setAggregation(oTable, oBindingInfo);
-		TableDelegate.rebindTable(oTable, oBindingInfo);
+		TableDelegate.rebind(oTable, oBindingInfo);
 	};
 
 	Delegate.addColumnMenuItems = function(oTable, oMDCColumn) {
@@ -283,7 +252,7 @@ sap.ui.define([
 			return [];
 		}
 
-		if (oTable.isGroupingEnabled() && supportsGrouping(oTable)) {
+		if (oTable.isGroupingEnabled()) {
 			var aGroupProperties = oProperty.getGroupableProperties();
 
 			if (aGroupProperties.length > 0) {
@@ -291,7 +260,7 @@ sap.ui.define([
 			}
 		}
 
-		if (oTable.isAggregationEnabled() && supportsAggregation(oTable)) {
+		if (oTable.isAggregationEnabled()) {
 			var aAggregateProperties = oProperty.getAggregatableProperties();
 
 			if (aAggregateProperties.length > 0) {
@@ -318,6 +287,21 @@ sap.ui.define([
 		return aItems;
 	};
 
+	Delegate.getSupportedP13nModes = function(oTable) {
+		var aSupportedModes = TableDelegate.getSupportedP13nModes(oTable);
+
+		if (oTable._getStringType() === TableType.Table) {
+			if (!aSupportedModes.includes(P13nMode.Group)) {
+				aSupportedModes.push(P13nMode.Group);
+			}
+			if (!aSupportedModes.includes(P13nMode.Aggregate)) {
+				aSupportedModes.push(P13nMode.Aggregate);
+			}
+		}
+
+		return aSupportedModes;
+	};
+
 	function createGroupPopoverItem(aGroupProperties, oMDCColumn) {
 		var aGroupChildren = aGroupProperties.map(function(oGroupProperty) {
 			return new Item({
@@ -603,26 +587,6 @@ sap.ui.define([
 		}
 	}
 
-	/**
-	 * Checks whether the inner table supports grouping.
-	 *
-	 * @param {sap.ui.mdc.Table} oTable Instance of the table
-	 * @returns {boolean} Whether the inner table supports grouping
-	 */
-	function supportsGrouping(oTable) {
-		return oTable._isOfType(TableType.Table);
-	}
-
-	/**
-	 * Checks whether the inner table supports aggregation.
-	 *
-	 * @param {sap.ui.mdc.Table} oTable Instance of the table
-	 * @returns {boolean} Whether the inner table supports aggregation
-	 */
-	function supportsAggregation(oTable) {
-		return oTable._isOfType(TableType.Table);
-	}
-
 	/**
 	 * Checks whether aggregation features of the model are used.
 	 *
@@ -707,10 +671,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

@@ -6,16 +6,34 @@
 
 sap.ui.define([
 	"../../ValueHelpDelegate",
-	"sap/ui/model/FilterType"
+	"sap/ui/model/FilterType",
+	'sap/ui/mdc/odata/v4/TypeUtil',
+	'sap/ui/mdc/condition/ConditionConverter'
 ], function(
 	ValueHelpDelegate,
-	FilterType
+	FilterType,
+	TypeUtil,
+	ConditionConverter
 ) {
 	"use strict";
 
-	var ODataV4ValueHelpDelegate = Object.assign({}, ValueHelpDelegate);
-
-	ODataV4ValueHelpDelegate.isSearchSupported = function(oPayload, oListBinding) {
+	/**
+	 * Delegate for {@link sap.ui.mdc.ValueHelp ValueHelp} used in oData v4 environment.<br>
+	 * <b>Note:</b> The class is experimental and the API/behavior is not finalized and hence this should not be used for productive usage.
+	 *
+	 * @namespace
+	 * @author SAP SE
+	 * @private
+	 * @ui5-restricted sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 * @experimental As of version 1.95
+	 * @since 1.95.0
+	 * @extends module:sap/ui/mdc/ValueHelpDelegate
+	 * @alias module:sap/ui/mdc/odata/v4/ValueHelpDelegate
+	 */
+	 var ODataV4ValueHelpDelegate = Object.assign({}, ValueHelpDelegate);
+
+	ODataV4ValueHelpDelegate.isSearchSupported = function(oPayload, oContent, oListBinding) {
 		return !!oListBinding.changeParameters;
 	};
 
@@ -90,5 +108,47 @@ sap.ui.define([
 
 	};
 
+	ODataV4ValueHelpDelegate.getInitialFilterConditions = function (oPayload, oContent, oControl) {
+		var oConditions = {};
+		return oConditions;
+	};
+
+	ODataV4ValueHelpDelegate.getTypeUtil = function (oPayload) {
+		return TypeUtil;
+	};
+
+	function _convertCondition(oOptions, bExternalize) {
+		var oTypeUtil = ODataV4ValueHelpDelegate.getTypeUtil();
+		var oTypeConfig = oTypeUtil.getTypeConfig(oOptions.type, oOptions.formatOptions, oOptions.constraints);
+		var fnConvert = bExternalize ? ConditionConverter.toString : ConditionConverter.toType;
+		return fnConvert(oOptions.condition, oTypeConfig, ODataV4ValueHelpDelegate.getTypeUtil());
+	}
+
+	/**
+	 * @param  {object} oPayload Delegate payload
+ 	 * @param  {object} oOptions Options for conversion
+	 * @param  {object} oOptions.condition Condition to be converted
+	 * @param  {object} oOptions.type Data type for this condition
+	 * @param  {object} oOptions.formatOptions formatOptions for given type
+  	 * @param  {object} oOptions.constraints constraints for given type
+	 * @returns {object<sap.ui.mdc.condition.ConditionObject>} returns a stringified condition object
+	 */
+	ODataV4ValueHelpDelegate.externalizeCondition = function (oPayload, oOptions) {
+		return _convertCondition(oOptions, true);
+	};
+
+	/**
+	 * @param  {object} oPayload Delegate payload
+ 	 * @param  {object} oOptions Options for conversion
+	 * @param  {object} oOptions.condition Condition to be converted
+	 * @param  {object} oOptions.type Data type for this condition
+	 * @param  {object} oOptions.formatOptions formatOptions for given type
+  	 * @param  {object} oOptions.constraints constraints for given type
+	 * @returns {object<sap.ui.mdc.condition.ConditionObject>} returns a type based condition object
+	 */
+	ODataV4ValueHelpDelegate.internalizeCondition = function (oPayload, oOptions) {
+		return _convertCondition(oOptions, false);
+	};
+
 	return ODataV4ValueHelpDelegate;
 });