@openui5/sap.ui.mdc 1.97.1 → 1.100.0

package/src/sap/ui/mdc/condition/OperatorDynamicDateOption.js

@@ -8,9 +8,11 @@ sap.ui.define([
 	'sap/m/DynamicDateOption',
 	'sap/m/DynamicDateValueHelpUIType',
 	'sap/m/Input',
-	'sap/m/DatePicker',
 	'sap/ui/mdc/condition/Operator',
+	"sap/ui/mdc/enum/BaseType",
+	'sap/ui/mdc/enum/FieldDisplay',
 	'sap/ui/mdc/util/DateUtil',
+	'sap/ui/mdc/util/loadModules',
 	'sap/ui/model/json/JSONModel',
 	'sap/ui/model/FormatException',
 	'sap/ui/model/ParseException',
@@ -20,9 +22,11 @@ sap.ui.define([
 		DynamicDateOption,
 		DynamicDateValueHelpUIType,
 		Input,
-		DatePicker,
 		Operator,
+		BaseType,
+		FieldDisplay,
 		DateUtil,
+		loadModules,
 		JSONModel,
 		FormatException,
 		ParseException,
@@ -32,6 +36,8 @@ sap.ui.define([
 		"use strict";
 
 		var ValueState = coreLibrary.ValueState;
+		var DatePicker;
+		var DateTimePicker;
 
 		/**
 		 * Constructor for a new OperatorDynamicDateOption.
@@ -45,7 +51,7 @@ sap.ui.define([
 		 * @extends sap.m.DynamicDateOption
 		 *
 		 * @author SAP SE
-		 * @version 1.97.1
+		 * @version 1.100.0
 		 *
 		 * @private
 		 * @ui5-restricted sap.ui.mdc
@@ -61,20 +67,25 @@ sap.ui.define([
 					/**
 					 * Operator used in the corresponding filter field.
 					 *
-					 * <b>Note:</b> A condition must be an instance of {@link sap.ui.mdc.condition.Operator Operator}.
+					 * <b>Note:</b> An operator must be an instance of {@link sap.ui.mdc.condition.Operator Operator}.
 					 */
 					operator: { type: "object" },
 					/**
 					 * Data type of the corresponding filter field.
 					 *
-					 * <b>Note:</b> A condition must  be an instance of {@link sap.ui.model.Type Type}.
+					 * <b>Note:</b> A type must  be an instance of {@link sap.ui.model.Type Type}.
 					 */
-					type: { type: "object" }
+					type: { type: "object" },
+					/**
+					 * Basic type of the corresponding filter field.
+					 */
+					baseType: { type: "sap.ui.mdc.enum.BaseType" }
 				}
 			}
 		});
 
 		OperatorDynamicDateOption.prototype.exit = function() {
+			DynamicDateOption.prototype.exit.apply(this, arguments);
 			if (this._oModel) {
 				this._oModel.destroy();
 				this._oModel = undefined;
@@ -90,6 +101,31 @@ sap.ui.define([
 			// _removeControls.call(this);
 		};
 
+		OperatorDynamicDateOption.prototype.applySettings = function() {
+			DynamicDateOption.prototype.applySettings.apply(this, arguments);
+
+			// load needed pickers
+			// TODO: request in DateContent to be sure that loaded? But needed only on opening, so async loading on initialization should be ok
+			var aModules = [];
+			var sBaseType = this.getBaseType();
+			if (sBaseType === BaseType.DateTime && !DateTimePicker) {
+				aModules.push("sap/m/DateTimePicker");
+			} else if (!DatePicker) {
+				aModules.push("sap/m/DatePicker");
+			}
+
+			if (aModules.length > 0) {
+				return loadModules(aModules).then(function (aModules) {
+					if (sBaseType === BaseType.DateTime) {
+						DateTimePicker = aModules[0];
+					} else {
+						DatePicker = aModules[0];
+					}
+				});
+			}
+
+		};
+
 		OperatorDynamicDateOption.prototype.validateProperty = function(sPropertyName, oValue) {
 
 			if (sPropertyName === "operator" && oValue && (typeof oValue !== "object" || !oValue.isA || !oValue.isA("sap.ui.mdc.condition.Operator"))) {
@@ -104,13 +140,6 @@ sap.ui.define([
 
 		};
 
-		OperatorDynamicDateOption.prototype.getKey = function() {
-
-			var oOperator = this.getOperator();
-			return oOperator.name;
-
-		};
-
 		OperatorDynamicDateOption.prototype.isRange = function() {
 
 			var oOperator = this.getOperator();
@@ -130,15 +159,22 @@ sap.ui.define([
 			if (!this._aUITypes) {
 				var oOperator = this.getOperator();
 				var oType = this.getType();
+				var sBaseType = this.getBaseType();
 				this._aUITypes = [];
 
 				for (var i = 0; i < oOperator.valueTypes.length; i++) {
 					var vType = oOperator.valueTypes[i];
 					if (vType === Operator.ValueType.Self) {
+						var sType;
+						if (sBaseType === BaseType.DateTime) {
+							sType = "datetime";
+						} else {
+							sType = "date";
+						}
 						this._aUITypes.push(new DynamicDateValueHelpUIType({
-							type: "date"
+							type: sType
 						}));
-					} else if (vType === Operator.ValueType.Static) {
+					} else if (!vType || vType === Operator.ValueType.Static) {
 						continue;
 					} else {
 						oType = oOperator._createLocalType(vType, oType);
@@ -187,8 +223,12 @@ sap.ui.define([
 
 			for (var i = 0; i < oOperator.valueTypes.length; i++) {
 				var vType = oOperator.valueTypes[i];
+				var sBaseType = this.getBaseType();
 				var oDate;
 
+				if (!vType) {
+					continue;
+				}
 				if (!oControl.aControlsByParameters[sKey][i]) {
 					if (oOperator.createControl) {
 						// use internal model to bind the control
@@ -221,12 +261,18 @@ sap.ui.define([
 						// TODO: DatePicker or Calendar?
 						// convert internal value to date
 						if (oValue && oValue.values[i]) {
-							oDate = DateUtil.typeToUniversalDate(oValue.values[i], oType);
+							oDate = DateUtil.typeToUniversalDate(oValue.values[i], oType, sBaseType);
 							oDate = DateUtil.utcToLocal(oDate);
 						}
 						var oFormatOptions = oType.getFormatOptions();
 
-						var oDatePicker = new DatePicker(sControlId + "-" + i, {
+						var Picker;
+						if (sBaseType === BaseType.DateTime) {
+							Picker = DateTimePicker;
+						} else {
+							Picker = DatePicker;
+						}
+						var oDatePicker = new Picker(sControlId + "-" + i, {
 							dateValue: oDate,
 							displayFormat: oFormatOptions.style || oFormatOptions.pattern,
 							displayFormatType: oFormatOptions.calendarType,
@@ -235,8 +281,11 @@ sap.ui.define([
 						oControl.aControlsByParameters[sKey].push(oDatePicker);
 					} else if (typeof vType === "object"){
 						// just use Input
+						oType = oOperator._createLocalType(oOperator.valueTypes[i], oType);
+						// format value to String using type
+						var sValue = oType.formatValue(oValue && oValue.values[i], "string");
 						var oInput = new Input(sControlId + "-" + i, {
-							value: oValue && oValue.values[i],
+							value: sValue,
 							change: fnChangeHandler
 						});
 						oControl.aControlsByParameters[sKey].push(oInput);
@@ -311,9 +360,13 @@ sap.ui.define([
 			var oResult = {operator: sKey, values: []};
 			var oOperator = this.getOperator();
 			var oType = this.getType();
+			var sBaseType = this.getBaseType();
 			var sControlId = oControl.getId();
 
 			for (var i = 0; i < oOperator.valueTypes.length; i++) {
+				if (!oOperator.valueTypes[i]) {
+					continue;
+				}
 				var oInputControl = oControl.aControlsByParameters[sKey][i];
 				if (oInputControl) {
 					var vValue;
@@ -329,7 +382,7 @@ sap.ui.define([
 						if (vValue) {
 							// parse to Types format
 							vValue = DateUtil.localToUtc(vValue);
-							vValue = DateUtil.universalDateToType(vValue, oType);
+							vValue = DateUtil.universalDateToType(vValue, oType, sBaseType);
 						}
 					} else {
 						vValue = oInputControl.getValue();
@@ -365,21 +418,22 @@ sap.ui.define([
 		OperatorDynamicDateOption.prototype.toDates = function(oValue) {
 			var oOperator = this.getOperator();
 			var oType = this.getType();
+			var sBaseType = this.getBaseType();
 			var aRange;
 			var i = 0;
 
 			if (oOperator.isA("sap.ui.mdc.condition.RangeOperator")) {
-				aRange = oOperator._getRange(oValue && oValue.values, oType);
+				aRange = oOperator._getRange(oValue && oValue.values, oType, sBaseType);
 				// convert to local date
 				for (i = 0; i < aRange.length; i++) {
-					aRange[i] = DateUtil.typeToUniversalDate(aRange[i], oType);
+					aRange[i] = DateUtil.typeToUniversalDate(aRange[i], oType, sBaseType);
 					aRange[i] = DateUtil.utcToLocal(aRange[i]);
 				}
 			} else if (oOperator.valueTypes[0] === Operator.ValueType.Self) {
 				aRange = oValue.values;
 				for (i = 0; i < aRange.length; i++) {
 					if (aRange[i]) {
-						aRange[i] = DateUtil.typeToUniversalDate(aRange[i], oType);
+						aRange[i] = DateUtil.typeToUniversalDate(aRange[i], oType, sBaseType);
 						aRange[i] = DateUtil.utcToLocal(aRange[i]);
 					}
 				}
@@ -398,7 +452,7 @@ sap.ui.define([
 		OperatorDynamicDateOption.prototype.format = function(oValue) {
 			var oOperator = this.getOperator();
 			var oType = this.getType();
-			return oOperator.format(oValue, oType);
+			return oOperator.format(oValue, oType, FieldDisplay.Value);
 		};
 
 		OperatorDynamicDateOption.prototype.parse = function(sValue) {
@@ -408,7 +462,7 @@ sap.ui.define([
 			if (sValue && oOperator.parse(sValue)) {
 				var oResult = {};
 				oResult.operator = this.getKey();
-				oResult.values = oOperator.parse(sValue, oType);
+				oResult.values = oOperator.parse(sValue, oType, FieldDisplay.Value);
 				return oResult;
 			}
 		};

package/src/sap/ui/mdc/condition/RangeOperator.js

@@ -33,7 +33,7 @@ sap.ui.define([
 		 * @param {int[]|function} [oConfiguration.defaultValues] Array of values for the defaults of <code>RangeOperators</code> parameter. This can be a function, which returns the array of values. If not used the default for the values is 1.
 		 * @constructor
 		 * @author SAP SE
-		 * @version 1.97.1
+		 * @version 1.100.0
 		 * @private
 		 * @ui5-restricted sap.fe
 		 * @MDC_PUBLIC_CANDIDATE
@@ -87,12 +87,12 @@ sap.ui.define([
 			}
 		});
 
-		RangeOperator.prototype.getModelFilter = function(oCondition, sFieldPath, oType, bCaseSensitive) {
-			var aRange = this._getRange(oCondition.values, oType);
+		RangeOperator.prototype.getModelFilter = function(oCondition, sFieldPath, oType, bCaseSensitive, sBaseType) {
+			var aRange = this._getRange(oCondition.values, oType, sBaseType);
 			return new Filter({ path: sFieldPath, operator: "BT", value1: aRange[0], value2: aRange[1] });
 		};
 
-		RangeOperator.prototype._getRange = function(aValues, oType) {
+		RangeOperator.prototype._getRange = function(aValues, oType, sBaseType) {
 			var aRange;
 			if (aValues) {
 				if (aValues.length === 2) {
@@ -107,7 +107,7 @@ sap.ui.define([
 			for (var i = 0; i < 2; i++) {
 				//the calcRange result must be converted from local time to UTC and into the correct type format.
 				aRange[i].oDate = DateUtil.localToUtc(aRange[i].oDate);
-				aRange[i] = DateUtil.universalDateToType(aRange[i], oType);
+				aRange[i] = DateUtil.universalDateToType(aRange[i], oType, sBaseType);
 			}
 
 			return aRange;

package/src/sap/ui/mdc/designtime/Util.js

@@ -0,0 +1,63 @@
+/*
+ * ! OpenUI5
+ * (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 () {
+	"use strict";
+
+    function getDefaultDesginTime() {
+        return {
+            actions: {},
+            aggregations: {},
+            description: "{description}",
+            name: "{name}",
+            properties: {}
+        };
+    }
+
+    // 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);
+        }
+    }
+
+    return {
+        getDesignTime: function(ControlClass, aAllowedProperties, aAllowedAggregations, oDesignTime) {
+            // Check if designTime is provided and has all the necessary attributes.
+            oDesignTime = oDesignTime ? oDesignTime : getDefaultDesginTime();
+            oDesignTime.actions = oDesignTime.actions ? oDesignTime.actions : {};
+            oDesignTime.properties = oDesignTime.properties ? oDesignTime.properties : {};
+            oDesignTime.aggregations = oDesignTime.aggregations ? oDesignTime.aggregations : {};
+
+            var oControlMetadata = ControlClass.getMetadata(),
+                // array containing all allowed control properties. Update the aAllowedProperties to enable a property for DTA
+                aAllowedProperties = aAllowedProperties ? aAllowedProperties : [],
+                // array containing all allowed control aggregations. Update the aAllowedAggregations to enable an aggregation for DTA
+                aAllowedAggregations = aAllowedAggregations ? aAllowedAggregations : [],
+                // array containing all control properties
+                aAllProperties = Object.keys(oControlMetadata.getAllProperties()).concat(Object.keys(oControlMetadata.getAllPrivateProperties())),
+                // array containing all control aggregations
+                aAllAggregations = Object.keys(oControlMetadata.getAllAggregations()).concat(Object.keys(oControlMetadata.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);
+            });
+
+            return oDesignTime;
+        }
+    };
+
+});

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

@@ -4,15 +4,93 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-
-], function () {
+	"sap/ui/mdc/p13n/Engine"
+	], function (Engine) {
 	"use strict";
 
 	return {
-		name: "{name}",
-		description: "{description}",
 		actions: {
-            //TBD: keyuser support
+			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: {
+			width: {
+				ignore: true
+			},
+			height: {
+				ignore: true
+			},
+			delegate: {
+				ignore: true
+			},
+			header: {
+				ignore: true
+			},
+			noDataText: {
+				ignore: true
+			},
+			p13nMode: {
+				ignore: true
+			},
+			legendVisible: {
+				ignore: true
+			},
+			ignoreToolbarActions: {
+				ignore: true
+			},
+			minWidth: {
+				ignore: true
+			},
+			minHeight: {
+				ignore: true
+			},
+			sortConditions: {
+				ignore: true
+			},
+			filterConditions: {
+				ignore: true
+			},
+			showChartTooltip: {
+				ignore: true
+			},
+			autoBindOnInit: {
+				ignore: true
+			},
+			chartType: {
+				ignore: true
+			},
+			showSelectionDetails: {
+				ignore: true
+			},
+			propertyInfo: {
+				ignore: true
+			}
+		},
+		aggregations: {
+			items: {
+				ignore: true
+			},
+			actions: {
+				ignore: true
+			},
+			selectionDetailsActions: {
+				ignore: true
+			},
+			_toolbar: {
+				ignore: false
+			},
+			_breadcrumbs: {
+				ignore: true
+			},
+			_innerChart: {
+				ignore: true
+			}
 		}
 	};
 

package/src/sap/ui/mdc/designtime/field/Field.designtime.js

@@ -3,12 +3,14 @@
  * (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/fl/Utils', 'sap/ui/fl/apply/api/FlexRuntimeInfoAPI'], function(Utils, FlexRuntimeInfoAPI) {
 	"use strict";
 
+    var oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
+
 	return {
-		properties: {
+        properties: {
 			value: {
 				ignore: true
 			},
@@ -16,6 +18,80 @@ sap.ui.define([
 			additionalValue: {
 				ignore: true
 			}
-		}
-	};
+		},
+        getStableElements: function(oField) {
+            if (!oField.getFieldInfo()) {
+                return [];
+            }
+            var oFieldInfo = oField.getFieldInfo();
+            var oControl = typeof oFieldInfo.getSourceControl() === "string" ? sap.ui.getCore().byId(oFieldInfo.getSourceControl()) : oFieldInfo.getSourceControl();
+            if (!oControl) {
+                oControl = oField;
+            }
+            var oAppComponent = Utils.getAppComponentForControl(oControl) || Utils.getAppComponentForControl(oField);
+            var sStableID = oFieldInfo._createPanelId(Utils, FlexRuntimeInfoAPI);
+
+			return [
+                {
+                    id: sStableID,
+                    appComponent: oAppComponent
+                }
+            ];
+		},
+        actions: {
+            settings: function(oField) {
+                if (!oField.getFieldInfo()) {
+                    return {};
+                }
+
+                return {
+                    name: oResourceBundle.getText("info.POPOVER_DEFINE_LINKS"),
+                    handler: function (oControl, mPropertyBag) {
+                        var oFieldInfo = oControl.getFieldInfo();
+                        return oFieldInfo.getContent().then(function(oPanel) {
+                            oFieldInfo.addDependent(oPanel);
+                            // wait for createItem changes
+                            return FlexRuntimeInfoAPI.waitForChanges({
+                                element: oPanel
+                            }).then(function() {
+                                var oEngine = sap.ui.mdc.p13n.Engine.getInstance();
+                                mPropertyBag.fnAfterClose = function() {
+                                    oPanel.destroy();
+                                };
+                                var fnGetChanges = function() {
+                                    return oEngine.getRTASettingsActionHandler(oPanel, mPropertyBag, "LinkItems").then(function(aChanges) {
+                                        aChanges.forEach(function(oChange) {
+                                            var oSelectorElement = oChange.selectorElement;
+                                            delete oChange.selectorElement;
+
+                                            var oAppComponent = Utils.getAppComponentForControl(oControl) || Utils.getAppComponentForControl(oField);
+                                            oChange.selectorControl = {
+                                                id: oSelectorElement.getId(),
+                                                controlType: oSelectorElement === oPanel ? "sap.ui.mdc.link.Panel" : "sap.ui.mdc.link.PanelItem",
+                                                appComponent: oAppComponent
+                                            };
+                                        });
+                                        return aChanges;
+                                    });
+                                };
+                                var aPanelItems = oPanel.getItems();
+
+                                if (aPanelItems.length > 0) {
+                                    // wait for hideItem / revealItem changes
+                                    return FlexRuntimeInfoAPI.waitForChanges({
+                                        selectors: aPanelItems
+                                    }).then(function() {
+                                        return fnGetChanges();
+                                    });
+                                } else {
+                                    return fnGetChanges();
+                                }
+                            });
+                        });
+                    },
+                    CAUTION_variantIndependent: true
+                };
+            }
+        }
+    };
 });

package/src/sap/ui/mdc/designtime/filterbar/FilterBarBase.designtime.js

@@ -23,6 +23,9 @@ sap.ui.define([], function() {
 			filterConditions: {
 				ignore: true
 			},
+			propertyInfo: {
+				ignore: true
+			},
 			suspendSelection: {
 				ignore: true
 			}

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 {