@openui5/sap.ui.mdc 1.99.0 → 1.100.1

package/src/sap/ui/mdc/designtime/actiontoolbar/ActionToolbar.designtime.js

@@ -3,41 +3,34 @@
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-sap.ui.define([], function () {
+sap.ui.define([
+    "sap/ui/mdc/ActionToolbar",
+    "../Util"
+], function (ActionToolbar, Util) {
 	"use strict";
 
     var oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
 
-	return {
-        aggregations: {
-            content: {
-                ignore: true
-            },
-            // ActionToolbarActions
+    var oDesignTime = {
+            description: "{description}",
+            name: "{name}",
+            aggregations: {},
+            properties: {},
             actions: {
-                ignore: true
-            },
-            begin: {
-                ignore: true
-            },
-            between: {
-                ignore: true
-            },
-            end: {
-                ignore: true
+                settings: {
+                    name: oResourceBundle.getText("actiontoolbar.RTA_SETTINGS_NAME"),
+                    handler: function (oControl, mPropertyBag) {
+                        return sap.ui.mdc.p13n.Engine.getInstance().getRTASettingsActionHandler(oControl, mPropertyBag, "actionsKey").then(function(aChanges){
+                            return aChanges;
+                        });
+                    },
+                    CAUTION_variantIndependent: true
+                }
             }
-		},
-        actions: {
-            settings: {
-                name: oResourceBundle.getText("actiontoolbar.RTA_SETTINGS_NAME"),
-                handler: function (oControl, mPropertyBag) {
-                    return sap.ui.mdc.p13n.Engine.getInstance().getRTASettingsActionHandler(oControl, mPropertyBag, "actionsKey").then(function(aChanges){
-                        return aChanges;
-                    });
-                },
-                CAUTION_variantIndependent: true
-            }
-        }
-	};
+	    },
+        aAllowedAggregations = [],
+        aAllProperties = [];
+
+    return Util.getDesignTime(ActionToolbar, aAllProperties, aAllowedAggregations, oDesignTime);
 
 });

package/src/sap/ui/mdc/designtime/chart/Chart.designtime.js

@@ -67,6 +67,9 @@ sap.ui.define([
 			},
 			showSelectionDetails: {
 				ignore: true
+			},
+			propertyInfo: {
+				ignore: true
 			}
 		},
 		aggregations: {

package/src/sap/ui/mdc/designtime/link/PanelItem.designtime.js

@@ -5,7 +5,9 @@
  */
 
 // Provides the Design Time Metadata for the sap.ui.mdc.Link
-sap.ui.define([], function() {
+sap.ui.define([
+	"sap/ui/thirdparty/jquery"
+], function(jQuery) {
 	"use strict";
 
 	return {

package/src/sap/ui/mdc/designtime/table/Table.designtime.js

@@ -5,67 +5,54 @@
  */
 sap.ui.define([
 	"sap/ui/mdc/p13n/Engine",
-	"sap/ui/mdc/Table"
-], function (Engine, Table) {
+	"sap/ui/mdc/Table",
+	"../Util"
+], function (Engine, Table, Util) {
 	"use strict";
 
-	// Returns the designTime metadata for the control. By default all the properties/aggregations which are not part of the allowed list array will be ignored from RTA/DTA
-	function enhanceDesignTimeMetadata(aAllowed, sKey, oDesignTime) {
-		var bAllowed = aAllowed.includes(sKey);
-		var oObject = bAllowed && oDesignTime[sKey] || {};
-		if (!Object.keys(oObject).length) {
-			oObject[sKey] = {
-				ignore: !bAllowed
-			};
-		}
-		Object.assign(oDesignTime, oObject);
-	}
+	// initial structure of designTime object
+	var oDesignTime = {
+		name: "{name}",
+		description: "{description}",
+		actions: {
+			settings: function () {
+				//RTA expects the settings to be returned as function
+				return {
+					handler: function (oControl, mPropertyBag) {
+						return Engine.getInstance().getRTASettingsActionHandler(oControl, mPropertyBag, oControl.getP13nMode());
+					}
+				};
+			}
+		},
+		properties: {},
+		aggregations: {
+			_content: {
+				propagateMetadata: function(oElement) {
+					if (oElement.isA("sap.ui.mdc.ActionToolbar")) {
+						return {
+							actions: {
+								settings: {}
+							}
+						};
+					}
 
-	// Returns the designTime object for RTA/DTA
-	function getDesignTime() {
-		// initial structure of designTime object
-		var oDesignTime = {
-			name: "{name}",
-			description: "{description}",
-			actions: {
-				settings: function () {
-					//RTA expects the settings to be returned as function
 					return {
-						handler: function (oControl, mPropertyBag) {
-							return Engine.getInstance().getRTASettingsActionHandler(oControl, mPropertyBag, oControl.getP13nMode());
-						}
+						actions: "not-adaptable" // other controls within the conten aggregation will not be adaptable for RTA and Visual Editor
 					};
 				}
-			},
-			properties: {},
-			aggregations: {}
-		};
-
-		var oTableMetadata = Table.getMetadata(),
-			// array containing all allowed control properties. Update the aAllowedProperties to enable a property for DTA
-			aAllowedProperties = ["width", "height", "headerLevel",
+			}
+		}
+	};
+	// array containing all allowed control properties. Update the aAllowedProperties to enable a property for DTA
+	var aAllowedProperties = ["width", "height", "headerLevel",
 			"header", "headerVisible", "showRowCount", "threshold",
 			"noDataText", "enableExport", "busyIndicatorDelay","enableColumnResize",
 			"showPasteButton", "multiSelectMode"],
-			// array containing all allowed control aggregations. Update the aAllowedAggregations to enable an aggregation for DTA
-			aAllowedAggregations = [],
-			// array containing all control properties
-			aAllProperties = Object.keys(oTableMetadata.getAllProperties()).concat(Object.keys(oTableMetadata.getAllPrivateProperties())),
-			// array containing all control aggregations
-			aAllAggregations = Object.keys(oTableMetadata.getAllAggregations()).concat(Object.keys(oTableMetadata.getAllPrivateAggregations()));
-
-		// populate the oDesignTime.properties with the control properties (allowed/disallowed). By default all properties are ignored.
-		aAllProperties.forEach(function(sPropertyName) {
-			enhanceDesignTimeMetadata(aAllowedProperties, sPropertyName, oDesignTime.properties);
-		});
-
-		// populate the oDesignTime.aggregations with the control aggregations (allowed/disallowed). By default all aggregations are ignored.
-		aAllAggregations.forEach(function(sAggregationName) {
-			enhanceDesignTimeMetadata(aAllowedAggregations, sAggregationName, oDesignTime.aggregations);
-		});
+		// array containing all allowed control aggregations. Update the aAllowedAggregations to enable an aggregation for DTA
+		aAllowedAggregations = [
+			"_content"
+		];
 
-		return oDesignTime;
-	}
+	return Util.getDesignTime(Table, aAllowedProperties, aAllowedAggregations, oDesignTime);
 
-	return getDesignTime();
 });

package/src/sap/ui/mdc/field/BoolFieldHelp.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A field help used in the <code>FieldHelp</code> association in <code>FieldBase</code> controls that shows a list for Boolean values.
 	 * @extends sap.ui.mdc.field.FieldHelpBase
-	 * @version 1.99.0
+	 * @version 1.100.1
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.field.FieldBase

package/src/sap/ui/mdc/field/ConditionFieldHelp.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A field help used in the <code>FieldHelp</code> association in <code>FieldBase</code> controls to show a popover of conditions.
 	 * @extends sap.ui.mdc.field.FieldHelpBase
-	 * @version 1.99.0
+	 * @version 1.100.1
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.field.FieldBase, sap.fe

package/src/sap/ui/mdc/field/ConditionType.js

@@ -18,6 +18,7 @@ sap.ui.define([
 	'sap/ui/mdc/enum/BaseType',
 	'sap/ui/mdc/enum/ConditionValidated',
 	'sap/base/util/merge',
+	'sap/base/strings/whitespaceReplacer',
 	'sap/ui/base/SyncPromise'
 ],
 	function(
@@ -33,6 +34,7 @@ sap.ui.define([
 		BaseType,
 		ConditionValidated,
 		merge,
+		whitespaceReplacer,
 		SyncPromise
 		) {
 	"use strict";
@@ -46,7 +48,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.1
 	 *
 	 * @since 1.62.0
 	 * @private
@@ -72,6 +74,7 @@ sap.ui.define([
 	 * @param {sap.ui.mdc.condition.ConditionModel} [oFormatOptions.conditionModel] <code>ConditionModel</code>, if bound to one
 	 * @param {string} [oFormatOptions.conditionModelName] Name of the <code>ConditionModel</code>, if bound to one
 	 * @param {string} [oFormatOptions.defaultOperatorName] Name of the default <code>Operator</code>
+	 * @param {boolean} [oFormatOptions.convertWhitespaces] If set, whitespaces will be replaced by special characters to display whitespaces in HTML
 	 * @param {object} [oConstraints] Value constraints
 	 * @alias sap.ui.mdc.field.ConditionType
 	 */
@@ -204,7 +207,15 @@ sap.ui.define([
 			throw new FormatException("No valid condition provided, Operator wrong.");
 		}
 
-		return oOperator.format(oCondition, oType, sDisplay, bHideOperator);
+		var sResult = oOperator.format(oCondition, oType, sDisplay, bHideOperator);
+		var bConvertWhitespaces = this.oFormatOptions.convertWhitespaces;
+
+		if (bConvertWhitespaces && (_getBaseType.call(this, oType) === BaseType.String || sDisplay !== FieldDisplay.Value)) {
+			// convert only string types to prevent unwanted side effects
+			sResult = whitespaceReplacer(sResult);
+		}
+
+		return sResult;
 
 	}
 
@@ -635,14 +646,14 @@ sap.ui.define([
 			throw new ValidateException(this._oResourceBundle.getText("field.VALUE_NOT_VALID"));
 		}
 
-		var oOperator = FilterOperatorUtil.getOperator(oCondition.operator, aOperators);
+		var oOperator = FilterOperatorUtil.getOperator(oCondition.operator);
 
 		if (bIsUnit) {
 			// only use unit in condition
 			oOperator = FilterOperatorUtil.getEQOperator(); // as only EQ is allowed for unit
 		}
 
-		if (!oOperator) {
+		if (!oOperator || aOperators.indexOf(oOperator.name) === -1) {
 			throw new ValidateException("No valid condition provided, Operator wrong.");
 		}
 

package/src/sap/ui/mdc/field/ConditionsType.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.1
 	 *
 	 * @since 1.62.0
 	 * @private
@@ -62,6 +62,7 @@ sap.ui.define([
 	 * @param {sap.ui.mdc.condition.ConditionModel} [oFormatOptions.conditionModel] <code>ConditionModel</code>, if bound to one
 	 * @param {string} [oFormatOptions.conditionModelName] Name of the <code>ConditionModel</code>, if bound to one
 	 * @param {string} [oFormatOptions.defaultOperatorName] Name of the default <code>Operator</code>
+	 * @param {boolean} [oFormatOptions.convertWhitespaces] If set, whitespaces will be replaced by special characters to display whitespaces in HTML
 	 * @param {object} [oConstraints] Value constraints
 	 * @alias sap.ui.mdc.field.ConditionsType
 	 */

package/src/sap/ui/mdc/field/CustomFieldHelp.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A field help used in the <code>FieldHelp</code> association in <code>FieldBase</code> controls that allows you to add custom content.
 	 * @extends sap.ui.mdc.field.FieldHelpBase
-	 * @version 1.99.0
+	 * @version 1.100.1
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe

package/src/sap/ui/mdc/field/CustomFieldInfo.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A field help used in the <code>FieldInfo</code> aggregation in <code>FieldBase</code> controls that allows you to add custom content.
 	 * @extends sap.ui.mdc.field.FieldInfoBase
-	 * @version 1.99.0
+	 * @version 1.100.1
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe

package/src/sap/ui/mdc/field/DefineConditionPanel.js

@@ -32,7 +32,8 @@ sap.ui.define([
 	'sap/m/Button',
 	'sap/m/Panel',
 	'sap/base/Log',
-	'sap/ui/core/InvisibleMessage'
+	'sap/ui/core/InvisibleMessage',
+	'sap/ui/thirdparty/jquery'
 ], function(
 		Control,
 		ManagedObjectObserver,
@@ -62,7 +63,8 @@ sap.ui.define([
 		Button,
 		Panel,
 		Log,
-		InvisibleMessage
+		InvisibleMessage,
+		jQuery
 		) {
 	"use strict";
 
@@ -89,7 +91,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.1
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.DefineConditionPanel
@@ -280,6 +282,12 @@ sap.ui.define([
 				}
 			}
 
+			if (aConditions.length === 1 && iIndex === 0) {
+				// the only one existing condition is removed. -> add dummy condition to have it in update in one step
+				this.addDummyCondition(1); // TODO: without setProperty to update condition at once?
+				aConditions = this.getConditions();
+			}
+
 			aConditions.splice(iIndex, 1);
 			this.setProperty("conditions", aConditions, true); // do not invalidate whole DefineConditionPanel
 			_checkInvalidInput.call(this, undefined); // check if invalid condition was removed
@@ -700,6 +708,7 @@ sap.ui.define([
 				delegate: _getDelegate.call(this),
 				value: { path: "$this>", type: oNullableType, mode: 'TwoWay', targetType: 'raw' },
 				editMode: {parts: [{path: "$condition>operator"}, {path: "$condition>invalid"}], formatter: _getEditModeFromOperator},
+				multipleLines: false,
 				width: "100%"
 			});
 		}
@@ -980,7 +989,7 @@ sap.ui.define([
 			if (oOperator && oOperator.valueTypes[0] === Operator.ValueType.Static && (oCondition.values.length === 0 || bTypeChange)) {
 				// if type changed the text needs to be new formatted (setting of type and conditions might be async.)
 				if (oOperator.getStaticText) {
-					var sText = oOperator.getStaticText(oDataType);
+					var sText = oOperator.getStaticText(oDataType, _getBaseType.call(this, oDataType));
 					if (oCondition.values.length > 0) {
 						oCondition.values[0] = sText;
 					} else {
@@ -1167,7 +1176,9 @@ sap.ui.define([
 		var oOperatorField = new Field(sIdPrefix + "-operator", {
 			value: {path: "$this>operator", type: this._oOperatorFieldType},
 			width: "100%",
-			display: "Description",
+			display: FieldDisplay.Description,
+			editMode: EditMode.Editable,
+			multipleLines: false,
 			fieldHelp: this.getId() + "--rowSelect-help",
 			change: this.onSelectChange.bind(this),
 			ariaLabelledBy: this.getId() + "--ivtOperator"

package/src/sap/ui/mdc/field/DynamicDateRangeConditionsType.js

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.field.ConditionsType
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.1
 	 *
 	 * @since 1.96.0
 	 * @private
@@ -120,20 +120,22 @@ sap.ui.define([
 			}
 
 			var aValues = [];
-			var sOption = oOperator.name;
-			if (!mLibrary.StandardDynamicDateRangeKeys[sOption]) {
-				sOption = oOperator.alias || sOption;
-			}
+			var sBaseType = _getBaseType.call(this);
+			var sOption = FilterOperatorUtil.getDynamicDateOptionForOperator(oOperator, mLibrary.StandardDynamicDateRangeKeys, sBaseType);
 
 			for (var i = 0; i < oOperator.valueTypes.length; i++) {
-				if (mLibrary.StandardDynamicDateRangeKeys[sOption] && oOperator.valueTypes[i] === Operator.ValueType.Self) { // only for standard operators
+				if (sOption && oOperator.valueTypes[i] === Operator.ValueType.Self) { // only for standard operators
 					aValues.push(_dateToTimestamp.call(this, oCondition.values[i]));
 				} else if (oOperator.valueTypes[i] && oOperator.valueTypes[i] !== Operator.ValueType.Static) {
 					aValues.push(oCondition.values[i]);
 				}
 			}
 
-			var oDynamicDateType = _getDynamicDateType.call(this, oOperator);
+			if (!sOption) {
+				sOption = FilterOperatorUtil.getCustomDynamicDateOptionForOperator(oOperator, sBaseType);
+			}
+
+			var oDynamicDateType = _getDynamicDateType.call(this, sBaseType);
 			vResult = oDynamicDateType.formatValue({operator: sOption, values: aValues}, sInternalType);
 		}
 
@@ -141,7 +143,7 @@ sap.ui.define([
 
 	};
 
-	function _getDynamicDateType(oOperator) {
+	function _getDynamicDateType(sBaseType) {
 
 		if (!this._oDynamicDateType) {
 			var oDynamicDateFormatOptions = {
@@ -150,6 +152,11 @@ sap.ui.define([
 				},
 				"int": {}
 			};
+			if (sBaseType === BaseType.DateTime) {
+				oDynamicDateFormatOptions.datetime = {
+					source: {pattern: "timestamp"}
+				};
+			}
 
 			this._oDynamicDateType = new DynamicDateType(oDynamicDateFormatOptions);
 		}
@@ -160,12 +167,30 @@ sap.ui.define([
 	function _dateToTimestamp(vValue) {
 
 		var oType = _getInternalType.call(this);
+		var sBaseType = _getBaseType.call(this);
 		var sDate = oType.formatValue(vValue, "string");
-		var aDate = sDate.split("-");
-		var iYear = parseInt(aDate[0]);
-		var iMonth = parseInt(aDate[1]) - 1;
-		var iDate = parseInt(aDate[2]);
-		var iTimeStamp = new Date(iYear, iMonth, iDate).getTime();
+		var aParts;
+		var iHour = 0;
+		var iMinute = 0;
+		var iSecond = 0;
+		var iMillisecond = 0;
+
+		if (sBaseType === BaseType.DateTime) {
+			aParts = sDate.split("T");
+			sDate = aParts[0];
+			var sTime = aParts[1];
+			aParts = sTime.split(":");
+			iHour = parseInt(aParts[0]);
+			iMinute = parseInt(aParts[1]);
+			iSecond = parseInt(aParts[2]);
+			iMillisecond = parseInt(aParts[3]);
+		}
+
+		aParts = sDate.split("-");
+		var iYear = parseInt(aParts[0]);
+		var iMonth = parseInt(aParts[1]) - 1;
+		var iDate = parseInt(aParts[2]);
+		var iTimeStamp = new Date(iYear, iMonth, iDate, iHour, iMinute, iSecond, iMillisecond).getTime();
 
 		return iTimeStamp;
 
@@ -174,11 +199,20 @@ sap.ui.define([
 	function _timestampToDate(iTimeStamp) {
 
 		var oType = _getInternalType.call(this);
+		var sBaseType = _getBaseType.call(this);
 		var oDate = new Date(iTimeStamp);
 		var iYear = oDate.getFullYear();
 		var iMonth = oDate.getMonth() + 1;
 		var iDate = oDate.getDate();
 		var sDate = iYear.toString() + "-" + ((iMonth < 10) ? "0" : "") + iMonth.toString() + "-" + ((iDate < 10) ? "0" : "") + iDate.toString();
+
+		if (sBaseType === BaseType.DateTime) {
+			var iHour = oDate.getHours();
+			var iMinute = oDate.getMinutes();
+			var iSecond = oDate.getSeconds();
+			var iMillisecond = oDate.getMilliseconds();
+			sDate = sDate + "T" + ((iHour < 10) ? "0" : "") + iHour.toString() + ":" + ((iMinute < 10) ? "0" : "") + iMinute.toString() + ":" + ((iSecond < 10) ? "0" : "") + iSecond.toString() + ":" + ((iMillisecond < 100) ? "0" : "") + ((iMillisecond < 10) ? "0" : "") + iMillisecond.toString();
+		}
 		var vDate = oType.parseValue(sDate, "string");
 
 		return vDate;
@@ -189,7 +223,15 @@ sap.ui.define([
 
 		if (!this._oInternalType) {
 			var oType = _getValueType.call(this);
-			this._oInternalType = DateUtil.createInternalType(oType, "yyyy-MM-dd");
+			var sBaseType = _getBaseType.call(this);
+			var sPattern;
+
+			if (sBaseType === BaseType.DateTime) {
+				sPattern = "yyyy-MM-dd'T'HH:mm:ss:SSS";
+			} else {
+				sPattern = "yyyy-MM-dd";
+			}
+			this._oInternalType = DateUtil.createInternalType(oType, sPattern);
 		}
 
 		return this._oInternalType;
@@ -214,11 +256,12 @@ sap.ui.define([
 			}
 
 			var sOperator = oValue.operator; // sOperator is the Option name
-			var oOperator = FilterOperatorUtil.getOperator(sOperator); // getOperator will search via name and alias
+			var oOperator = FilterOperatorUtil.getOperatorForDynamicDateOption(sOperator, _getBaseType.call(this)); // search via name and alias
 			sOperator = oOperator.name; // map it back to the real Operator name
 
 			if (oOperator) {
-				var oDynamicDateType = _getDynamicDateType.call(this, oOperator);
+				var sBaseType = _getBaseType.call(this);
+				var oDynamicDateType = _getDynamicDateType.call(this, sBaseType);
 				var vResult = oDynamicDateType.parseValue(oValue, sInternalType);
 				var aValues = [];
 
@@ -261,9 +304,9 @@ sap.ui.define([
 				throw new ValidateException(this._oResourceBundle.getText("field.VALUE_NOT_VALID"));
 			}
 
-			var oOperator = FilterOperatorUtil.getOperator(oCondition.operator, aOperators);
+			var oOperator = FilterOperatorUtil.getOperator(oCondition.operator);
 
-			if (!oOperator) {
+			if (!oOperator || aOperators.indexOf(oOperator.name) === -1) {
 				throw new ValidateException("No valid condition provided, Operator wrong.");
 			}
 
@@ -299,13 +342,27 @@ sap.ui.define([
 
 		var aOperators = this.oFormatOptions.operators;
 		if (!aOperators || aOperators.length === 0) {
-			aOperators = FilterOperatorUtil.getOperatorsForType(BaseType.Date); // TODO: check for type
+			aOperators = FilterOperatorUtil.getOperatorsForType(_getBaseType.call(this));
 		}
 
 		return aOperators;
 
 	}
 
+	function _getBaseType() {
+
+		var oType = _getValueType.call(this);
+		var sType = oType.getMetadata().getName();
+		var oFormatOptions = oType.getFormatOptions();
+		var oConstraints = oType.getConstraints();
+		var oDelegate = this.oFormatOptions.delegate;
+		var oPayload = this.oFormatOptions.payload;
+		var sBaseType = oDelegate ? oDelegate.getTypeUtil(oPayload).getBaseType(sType, oFormatOptions, oConstraints) : BaseType.Date;
+
+		return sBaseType;
+
+	}
+
 	return DynamicDateRangeConditionsType;
 
 });