@openui5/sap.ui.mdc 1.96.2 → 1.98.0

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (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([
@@ -88,7 +88,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.DefineConditionPanel
@@ -277,6 +277,7 @@ sap.ui.define([
 
 			aConditions.splice(iIndex, 1);
 			this.setProperty("conditions", aConditions, true); // do not invalidate whole DefineConditionPanel
+			_checkInvalidInput.call(this, undefined); // check if invalid condition was removed
 
 			this.fireConditionProcessed();
 		},
@@ -301,8 +302,10 @@ sap.ui.define([
 			var sOperator = oOperator.name;
 			var oCondition = Condition.createCondition(sOperator, oOperator.valueDefaults ? oOperator.valueDefaults : [], undefined, undefined, ConditionValidated.NotValidated);
 
-			// mark the condition as initial and not modified by the user
-			oCondition.isInitial = true;
+			if (oOperator.valueTypes[0] && oOperator.valueTypes[0] !== Operator.ValueType.Static) {
+				// mark the condition as initial and not modified by the user
+				oCondition.isInitial = true;
+			}
 
 			FilterOperatorUtil.updateConditionValues(oCondition);
 			FilterOperatorUtil.checkConditionsEmpty(oCondition, aOperators);
@@ -313,6 +316,11 @@ sap.ui.define([
 				aConditions.push(oCondition);
 			}
 			this.setProperty("conditions", aConditions, true); // do not invalidate whole DefineConditionPanel
+
+			if (!oCondition.isInitial) {
+				// static condition added, it is ready to use -> fire event
+				this.fireConditionProcessed();
+			}
 		},
 
 		updateDefineConditions: function() {
@@ -350,6 +358,21 @@ sap.ui.define([
 
 		onSelectChange: function(oEvent) {
 			var oField = oEvent.getSource();
+			var oCondition = oField.getBindingContext("$this").getObject();
+			var aConditions = this.getConditions();
+			var iIndex = FilterOperatorUtil.indexOfCondition(oCondition, aConditions);
+			if (iIndex >= 0) {
+				oCondition = aConditions[iIndex]; // to get right instance
+			}
+
+			if (!oEvent.getParameter("valid")) { // if Operator in error state -> don't update values
+				oCondition.invalid = true;
+				this.setProperty("conditions", aConditions, true); // do not invalidate whole DefineConditionPanel
+				oField._sOldKey = oField.getValue();
+				_checkInvalidInput.call(this, true); // set imediately, not only if row left
+				return;
+			}
+
 			var sKey = oField.getValue();
 			var sOldKey = oField._sOldKey;
 			var oOperator = FilterOperatorUtil.getOperator(sKey); // operator must exist as List is created from valid operators
@@ -357,16 +380,11 @@ sap.ui.define([
 
 			if (oOperator && oOperatorOld) {
 				var bUpdate = false;
-				var oCondition = oField.getBindingContext("$this").getObject();
-				var aConditions = this.getConditions();
-				var iIndex = FilterOperatorUtil.indexOfCondition(oCondition, aConditions);
 
 				if (!deepEqual(oOperator.valueTypes[0], oOperatorOld.valueTypes[0]) && oOperator.valueTypes[0] !== Operator.ValueType.Static ) {
 					// type changed -> remove entered value (only if changed by user in Select)
 					// As Static text updated on condition change, don't delete it here.
 					if (iIndex >= 0) {
-						oCondition = aConditions[iIndex]; // to get right instance
-
 						oCondition.values.forEach(function(value, index) {
 							if (value !== null) {
 								if ((oOperator.valueTypes[index] === Operator.ValueType.Self && oOperatorOld.valueTypes[index] === Operator.ValueType.SelfNoParse) ||
@@ -391,8 +409,6 @@ sap.ui.define([
 
 				if (iIndex >= 0 && oOperator.valueDefaults) {
 					// sets the default values for the operator back to default, if the condition is inital or the value is null
-					oCondition = aConditions[iIndex];
-
 					oCondition.values.forEach(function(value, index) {
 						if ((oCondition.isInitial && value !== oOperator.valueDefaults[index]) ||  (value === null)) {
 							// set the default value and mark the condition as initial
@@ -407,7 +423,6 @@ sap.ui.define([
 				if (!oOperator.valueTypes[1] && oOperatorOld.valueTypes[1]) {
 					// switch from BT to EQ -> remove second value even if filled
 					if (iIndex >= 0) {
-						oCondition = aConditions[iIndex]; // to get right instance
 						if (oCondition.values.length > 1 && oCondition.values[1]) {
 							oCondition.values = oCondition.values.slice(0, 1);
 							bUpdate = true;
@@ -415,9 +430,14 @@ sap.ui.define([
 					}
 				}
 
+				if (oCondition.invalid) {
+					delete oCondition.invalid;
+					bUpdate = true;
+				}
 				if (bUpdate) {
 					FilterOperatorUtil.checkConditionsEmpty(oCondition, _getOperators.call(this));
 					this.setProperty("conditions", aConditions, true); // do not invalidate whole DefineConditionPanel
+					_checkInvalidInput.call(this, false); // set imediately, not only if row left
 				}
 			}
 
@@ -674,7 +694,7 @@ sap.ui.define([
 			oControl = new Field(sId, {
 				delegate: _getDelegate.call(this),
 				value: { path: "$this>", type: oNullableType, mode: 'TwoWay', targetType: 'raw' },
-				editMode: {path: "$condition>operator", formatter: _getEditModeFromOperator},
+				editMode: {parts: [{path: "$condition>operator"}, {path: "$condition>invalid"}], formatter: _getEditModeFromOperator},
 				width: "100%"
 			});
 		}
@@ -788,7 +808,7 @@ sap.ui.define([
 			// default operator not valid -> cannot use -> use first include-operator which requires some values
 			for (var i = 0; i < aOperators.length; i++) {
 				oOperator = FilterOperatorUtil.getOperator(aOperators[i]);
-				if (oOperator.exclude || !oOperator.hasRequiredValues()) {
+				if (!oOperator || oOperator.exclude || !oOperator.hasRequiredValues()) {
 					oOperator = undefined;
 				} else {
 					break;
@@ -1210,10 +1230,12 @@ sap.ui.define([
 
 	}
 
-	function _getEditModeFromOperator(sOperator) {
+	function _getEditModeFromOperator(sOperator, bInvalid) {
 
 		if (!sOperator) {
 			return EditMode.Display;
+		} else if (bInvalid) {
+			return EditMode.ReadOnly;
 		}
 
 		var oOperator = FilterOperatorUtil.getOperator(sOperator);
@@ -1231,7 +1253,7 @@ sap.ui.define([
 
 		var oOperator = sOperator && FilterOperatorUtil.getOperator(sOperator);
 
-		if (!oOperator || !oOperator.valueTypes[0]) {
+		if (!oOperator || !oOperator.valueTypes[0] || (oOperator.valueTypes[0] === Operator.ValueType.Static && !oOperator.getStaticText)) {
 			return "XL8 L8 M8 S0";
 		} else {
 			return "";
@@ -1309,6 +1331,10 @@ sap.ui.define([
 		if (oBindingContext) {
 			oOperatorField.setFieldGroupIds([oBindingContext.getPath()]); // use path to have a ID for every condition
 		}
+		if (oOperatorField.getValueState() === ValueState.Error && !oCondition.invalid) {
+			// remove error and show right value
+			oOperatorField.setValue(oOperatorField.getValue());
+		}
 		iIndex++;
 
 		var oRemoveButton = aGridContent[iIndex];
@@ -1323,8 +1349,7 @@ sap.ui.define([
 		var oValue0Field = aGridContent[iIndex];
 		var oValue1Field;
 		if (oValue0Field.hasOwnProperty("_iValueIndex") && oValue0Field._iValueIndex === 0) {
-			var sEditMode = _getEditModeFromOperator(oCondition.operator);
-			if (oCondition.values.length > 0 || sEditMode === EditMode.Display) { // as static text for display controls is created after update
+			if (oCondition.values.length > 0) {
 				oValueBindingContext = this._oManagedObjectModel.getContext(oBindingContext.getPath() + "values/0/");
 				oValue0Field.setBindingContext(oValueBindingContext, "$this");
 				oValue0Field.setBindingContext(oBindingContext, "$condition");
@@ -1421,9 +1446,9 @@ sap.ui.define([
 		var oField2; // also update second Field if exist
 		var oCondition = oBindingContext.getObject();
 		var oOperator = FilterOperatorUtil.getOperator(oCondition.operator);
-		var bInvalid = false;
+		var bInvalid = !!oCondition.invalid;
 
-		if (oOperator.valueTypes.length > 0 && oOperator.valueTypes[0] !== Operator.ValueType.Static) {
+		if (!bInvalid && oOperator.valueTypes.length > 0 && oOperator.valueTypes[0] !== Operator.ValueType.Static) {
 			// check only not static operators
 			if (oOperator.valueTypes.length > 1 && oOperator.valueTypes[1]) {
 				// two fields exist
@@ -1467,14 +1492,26 @@ sap.ui.define([
 
 	function _checkInvalidInput(bInvalid) {
 
+		var i = 0;
+
 		if (bInvalid !== true) {
 			// if already known that invalid input exist -> no additional check needed
+			var aConditions = this.getConditions();
+			for (i = 0; i < aConditions.length; i++) {
+				if (aConditions[i].invalid) {
+					bInvalid = true;
+					break;
+				}
+			}
+		}
+
+		if (bInvalid !== true) {
 			var oGrid = this.byId("conditions");
 			var aContent = oGrid.getContent();
 			bInvalid = false;
-			for (var i = 0; i < aContent.length; i++) {
+			for (i = 0; i < aContent.length; i++) {
 				var oControl = aContent[i];
-				if (oControl instanceof Field && oControl.hasOwnProperty("_iValueIndex") && oControl.getValueState() === ValueState.Error) {
+				if (oControl.hasOwnProperty("_iValueIndex") && oControl.getValueState && oControl.getValueState() === ValueState.Error) {
 					bInvalid = true;
 					break;
 				}

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

@@ -0,0 +1,311 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+// Provides the base implementation for all model implementations
+sap.ui.define([
+	'sap/ui/mdc/field/ConditionsType',
+	'sap/ui/mdc/condition/FilterOperatorUtil',
+	'sap/ui/mdc/condition/Operator',
+	'sap/ui/mdc/condition/Condition',
+	'sap/ui/mdc/enum/ConditionValidated',
+	'sap/ui/mdc/enum/BaseType',
+	"sap/ui/mdc/util/DateUtil",
+	'sap/ui/model/SimpleType',
+	'sap/ui/model/FormatException',
+	'sap/ui/model/ParseException',
+	'sap/ui/model/ValidateException',
+	'sap/m/DynamicDate',
+	'sap/m/library'
+],
+	function(
+		ConditionsType,
+		FilterOperatorUtil,
+		Operator,
+		Condition,
+		ConditionValidated,
+		BaseType,
+		DateUtil,
+		SimpleType,
+		FormatException,
+		ParseException,
+		ValidateException,
+		DynamicDateType,
+		mLibrary
+		) {
+	"use strict";
+
+	/**
+	 * Constructor for a <code>ConditionsType</code> to be used in <code>DynamicDateRange</code> control.
+	 *
+	 * @class
+	 * This class represents a type to map an array of conditions used in a {@link sap.ui.mdc.FilterField FilterField} control to a value of a {@link sap.m.DynamicDateRange DynamicDateRange} control.
+	 *
+	 * @extends sap.ui.mdc.field.ConditionsType
+	 *
+	 * @author SAP SE
+	 * @version 1.98.0
+	 *
+	 * @since 1.96.0
+	 * @private
+	 * @ui5-restricted sap.ui.mdc.field.FieldBase, sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 *
+	 * @param {object} [oFormatOptions] Formatting options
+	 * @param {sap.ui.model.Type} [oFormatOptions.valueType] Type of the value of the condition (used for formatting and parsing)
+	 * @param {string[]} [oFormatOptions.operators] Possible operators to be used in the condition
+	 * @param {sap.ui.mdc.enum.FieldDisplay} [oFormatOptions.display] DisplayFormat used to visualize a value
+	 * @param {string} [oFormatOptions.fieldHelpID] ID of the field help to determine the key and description // TODO: async request????
+	 * @param {boolean} [oFormatOptions.hideOperator] If set, only the value of the condition is shown, but no operator //TODO
+	 * @param {int} [oFormatOptions.maxConditions] Maximum number of allowed conditions
+	 * @param {sap.ui.model.Context} [oFormatOptions.bindingContext] <code>BindingContext</code> of field. Used to get a key or description from the value help using in/out parameters. (In a table, the value help might be connected to a different row)
+	 * @param {sap.ui.model.Type} [oFormatOptions.originalDateType] Type used on field, for example, for date types; a different type is used internally to have different <code>formatOptions</code>
+	 * @param {boolean} [oFormatOptions.isUnit] If set, the type is used for the unit part of a field
+	 * @param {function} [oFormatOptions.getConditions] Function to get the existing conditions of the field. Only used if <code>isUnit</code> is set. TODO: better solution
+	 * @param {function} [oFormatOptions.asyncParsing] Callback function to tell the <code>Field</code> the parsing is asynchronous.
+	 * @param {object} [oFormatOptions.navigateCondition] Condition of keyboard navigation. If this is filled, no real parsing is needed as the condition has already been determined and is just returned
+	 * @param {object} [oFormatOptions.delegate] Field delegate to handle model-specific logic
+	 * @param {object} [oFormatOptions.payload] Payload of the delegate
+	 * @param {boolean} [oFormatOptions.preventGetDescription] If set, description is not read by <code>formatValue</code> as it is known that no description exists or might be set later
+	 * @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 {object} [oConstraints] Value constraints
+	 * @alias sap.ui.mdc.field.DynamicDateRangeConditionsType
+	 */
+	var DynamicDateRangeConditionsType = ConditionsType.extend("sap.ui.mdc.field.DynamicDateRangeConditionsType", /** @lends sap.ui.mdc.field.DynamicDateRangeConditionsType.prototype */ {
+
+		constructor : function (oFormatOptions, oConstraints) {
+			SimpleType.apply(this, arguments);
+			this.sName = "ConditionsDateRange";
+			this._oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
+			//TODO: specialConditionDataRangeType if used for tokens in MultiValue FilterField
+		}
+
+	});
+
+	DynamicDateRangeConditionsType.prototype.destroy = function() {
+
+		SimpleType.prototype.destroy.apply(this, arguments);
+
+		this._bDestroyed = true;
+
+	};
+
+	DynamicDateRangeConditionsType.prototype.formatValue = function(aConditions, sInternalType) {
+
+		if (aConditions == undefined || aConditions == null || this._bDestroyed) { // if destroyed do nothing
+			return null;
+		}
+
+		if (!Array.isArray(aConditions)) {
+			throw new FormatException("No valid conditions provided");
+		}
+
+		var iMaxConditions = _getMaxConditions.call(this);
+		var vResult;
+
+		if (iMaxConditions !== 1) {
+			throw new FormatException("MaxConditions must be 1");
+		}
+
+		if (aConditions.length === 1) {
+			var oCondition = aConditions[0];
+
+			var oOperator = FilterOperatorUtil.getOperator(oCondition.operator);
+			if (!oCondition.operator || !oOperator) {
+				throw new FormatException("No valid condition provided, Operator wrong.");
+			}
+
+			var aValues = [];
+			var sOption = oOperator.name;
+			if (!mLibrary.StandardDynamicDateRangeKeys[sOption]) {
+				sOption = oOperator.alias || sOption;
+			}
+
+			for (var i = 0; i < oOperator.valueTypes.length; i++) {
+				if (mLibrary.StandardDynamicDateRangeKeys[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);
+			vResult = oDynamicDateType.formatValue({operator: sOption, values: aValues}, sInternalType);
+		}
+
+		return vResult;
+
+	};
+
+	function _getDynamicDateType(oOperator) {
+
+		if (!this._oDynamicDateType) {
+			var oDynamicDateFormatOptions = {
+				date: {
+					source: {pattern: "timestamp"}
+				},
+				"int": {}
+			};
+
+			this._oDynamicDateType = new DynamicDateType(oDynamicDateFormatOptions);
+		}
+
+		return this._oDynamicDateType;
+	}
+
+	function _dateToTimestamp(vValue) {
+
+		var oType = _getInternalType.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();
+
+		return iTimeStamp;
+
+	}
+
+	function _timestampToDate(iTimeStamp) {
+
+		var oType = _getInternalType.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();
+		var vDate = oType.parseValue(sDate, "string");
+
+		return vDate;
+
+	}
+
+	function _getInternalType() {
+
+		if (!this._oInternalType) {
+			var oType = _getValueType.call(this);
+			this._oInternalType = DateUtil.createInternalType(oType, "yyyy-MM-dd");
+		}
+
+		return this._oInternalType;
+
+	}
+
+	DynamicDateRangeConditionsType.prototype.parseValue = function(oValue, sInternalType) {
+
+		if (this._bDestroyed) { // if destroyed do nothing
+			return null;
+		}
+
+		if (_getMaxConditions.call(this) !== 1) {
+			throw new ParseException("Only one condition supported for parsing");
+		}
+
+		var aOperators = _getOperators.call(this);
+		var aConditions = [];
+		if (oValue && oValue.operator) {
+			if (oValue.operator === "PARSEERROR") {
+				throw new ParseException(oValue.values[0]);
+			}
+
+			var sOperator = oValue.operator; // sOperator is the Option name
+			var oOperator = FilterOperatorUtil.getOperator(sOperator); // getOperator will 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 vResult = oDynamicDateType.parseValue(oValue, sInternalType);
+				var aValues = [];
+
+				for (var i = 0; i < oOperator.valueTypes.length; i++) {
+					if (mLibrary.StandardDynamicDateRangeKeys[oValue.operator] && oOperator.valueTypes[i] === Operator.ValueType.Self) { // only for standard operators
+						aValues.push(_timestampToDate.call(this, vResult.values[i]));
+					} else if (oOperator.valueTypes[i] && oOperator.valueTypes[i] !== Operator.ValueType.Static) {
+						aValues.push(vResult.values[i]);
+					}
+				}
+
+				var oCondition = Condition.createCondition(oOperator.name, aValues, undefined, undefined, ConditionValidated.NotValidated);
+				FilterOperatorUtil.updateConditionValues(oCondition);
+				FilterOperatorUtil.checkConditionsEmpty(oCondition, aOperators);
+				aConditions.push(oCondition);
+			}
+		}
+
+		return aConditions;
+
+	};
+
+	DynamicDateRangeConditionsType.prototype.validateValue = function(aConditions) {
+
+		if (aConditions === undefined || aConditions === null || this._bDestroyed) { // if destroyed do nothing
+			return;
+		}
+
+		if (!Array.isArray(aConditions)) {
+			throw new ValidateException("No valid conditions provided");
+		}
+
+		var oType = _getValueType.call(this);
+		var aOperators = _getOperators.call(this);
+
+		for (var i = 0; i < aConditions.length; i++) {
+			var oCondition = aConditions[i];
+			if (typeof oCondition !== "object" || !oCondition.operator || !oCondition.values ||
+					!Array.isArray(oCondition.values)) {
+				throw new ValidateException(this._oResourceBundle.getText("field.VALUE_NOT_VALID"));
+			}
+
+			var oOperator = FilterOperatorUtil.getOperator(oCondition.operator, aOperators);
+
+			if (!oOperator) {
+				throw new ValidateException("No valid condition provided, Operator wrong.");
+			}
+
+			oOperator.validate(oCondition.values, oType);
+		}
+
+	};
+
+	function _getMaxConditions() {
+
+		var iMaxConditions = 1;
+
+		if (this.oFormatOptions.hasOwnProperty("maxConditions")) {
+			iMaxConditions = this.oFormatOptions.maxConditions;
+		}
+
+		return iMaxConditions;
+
+	}
+
+	function _getValueType() {
+
+		var oType = this.oFormatOptions.valueType;
+		if (!oType) {
+			throw new Error("Type missing");
+		}
+
+		return oType;
+
+	}
+
+	function _getOperators() {
+
+		var aOperators = this.oFormatOptions.operators;
+		if (!aOperators || aOperators.length === 0) {
+			aOperators = FilterOperatorUtil.getOperatorsForType(BaseType.Date); // TODO: check for type
+		}
+
+		return aOperators;
+
+	}
+
+	return DynamicDateRangeConditionsType;
+
+});