@openui5/sap.ui.mdc 1.141.2 → 1.142.0

package/src/sap/ui/mdc/valuehelp/Popover.js

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Container for the {@link sap.ui.mdc.ValueHelp ValueHelp} element showing a popover.
 	 * @extends sap.ui.mdc.valuehelp.base.Container
-	 * @version 1.141.2
+	 * @version 1.142.0
 	 * @constructor
 	 *
 	 * @public

package/src/sap/ui/mdc/valuehelp/base/Container.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Container for the {@link sap.ui.mdc.ValueHelp ValueHelp} element.
 	 * @extends sap.ui.core.Element
-	 * @version 1.141.2
+	 * @version 1.142.0
 	 * @constructor
 	 * @abstract
 	 *

package/src/sap/ui/mdc/valuehelp/base/Content.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Content for the {@link sap.ui.mdc.valuehelp.base.Container Container} element.
 	 * @extends sap.ui.core.Element
-	 * @version 1.141.2
+	 * @version 1.142.0
 	 * @constructor
 	 * @abstract
 	 *

package/src/sap/ui/mdc/valuehelp/base/DefineConditionPanel.js

@@ -15,6 +15,7 @@ sap.ui.define([
 	'sap/ui/mdc/condition/Condition',
 	'sap/ui/mdc/condition/FilterOperatorUtil',
 	'sap/ui/mdc/field/ConditionsType',
+	'sap/ui/mdc/field/ConditionType',
 	'sap/ui/mdc/field/splitValue',
 	'sap/ui/mdc/enums/FieldEditMode',
 	'sap/ui/mdc/enums/FieldDisplay',
@@ -58,6 +59,7 @@ sap.ui.define([
 	Condition,
 	FilterOperatorUtil,
 	ConditionsType,
+	ConditionType,
 	splitValue,
 	FieldEditMode,
 	FieldDisplay,
@@ -121,7 +123,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.142.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.valuehelp.base.DefineConditionPanel
@@ -304,6 +306,8 @@ sap.ui.define([
 				onpaste: this.onPaste
 			};
 
+			this._oConditionType = new ConditionType();
+
 			_createInnerControls.call(this);
 			this.setModel(this._oManagedObjectModel, "$this");
 			this.setModel(this._oManagedObjectModel, "$condition"); // TODO: better solution to have 2 bindingContexts on one control
@@ -326,6 +330,9 @@ sap.ui.define([
 
 			this._oManagedObjectModel.destroy();
 			delete this._oManagedObjectModel;
+
+			this._oConditionType.destroy();
+			delete this._oConditionType;
 		},
 
 		byId: function(sId) {
@@ -479,7 +486,7 @@ sap.ui.define([
 		onChange: function(oEvent) {
 			const oPromise = oEvent && oEvent.getParameter("promise");
 			const oSourceControl = oEvent && oEvent.getSource();
-			const fnHandleChange = function(oEvent) {
+			const fnHandleChange = function(oEvent, oControl) {
 				const aOperators = _getOperators.call(this);
 				const aConditions = this.getConditions();
 				FilterOperatorUtil.checkConditionsEmpty(aConditions, aOperators);
@@ -496,28 +503,39 @@ sap.ui.define([
 				}
 
 				this.setProperty("conditions", aConditions, true); // do not invalidate whole DefineConditionPanel
+				if (deepEqual(aConditions, this.getConditions())) {
+					const oInvisibleText = _getInvisibleTextForField(oControl);
+					if (oInvisibleText) {
+						oInvisibleText.getBinding("text").checkUpdate(true);
+					}
+				}
 			}.bind(this);
 
 			if (oPromise) {
 				oPromise.then((vResult) => {
 					this._bPendingChange = false;
-					fnHandleChange({ mParameters: { value: vResult } }); // TODO: use a real event?
+					fnHandleChange({ mParameters: { value: vResult } }, oSourceControl); // TODO: use a real event?
 					if (this._bPendingValidateCondition) {
 						_validateCondition.call(this, oSourceControl);
 						delete this._bPendingValidateCondition;
 					}
 				}).catch((oError) => { // cleanup pending stuff
 					this._bPendingChange = false;
+					_setInvalidInvisibleText(oSourceControl);
 					if (this._bPendingValidateCondition) {
 						_validateCondition.call(this, oSourceControl);
 						delete this._bPendingValidateCondition;
 					}
 				});
 
+				if (oSourceControl) {
+					_resetInvisibleRemoveText(oSourceControl);
+				}
+
 				this._bPendingChange = true; // TODO: handle multiple changes
 				return;
 			} else {
-				fnHandleChange();
+				fnHandleChange(undefined, oSourceControl);
 			}
 
 		},
@@ -576,8 +594,7 @@ sap.ui.define([
 								bInvalid = true;
 								oCondition.invalid = true;
 								bUpdate = true;
-								oField.setValueState(ValueState.Error);
-								oField.setValueStateText(oMessageBundle.getText("field.CONDITION_ALREADY_EXIST", [sKey]));
+								_updateErrorValueState(oField, oMessageBundle.getText("field.CONDITION_ALREADY_EXIST", [sKey]));
 								break;
 							}
 						}
@@ -666,12 +683,8 @@ sap.ui.define([
 				const sConditionPath = oSource.getBindingContext("$condition").getPath(); // Path to condition of the active control
 				const iIndex = parseInt(sConditionPath.split("/")[2]); // index of current condition - to remove before adding new ones
 				const aConditions = this.getConditions();
-				const oFormatOptions = merge({}, this.getConfig());
-				oFormatOptions.display = FieldDisplay.Value;
-				oFormatOptions.getConditions = function() { return aConditions; }; // as condition where inserted will be removed
-				oFormatOptions.defaultOperatorName = aConditions[iIndex].operator; // use current operator as default
-				oFormatOptions.valueType = oFormatOptions.dataType;
-				delete oFormatOptions.dataType;
+
+				const oFormatOptions = _adjustFormatOptions(this.getConfig(), aConditions, iIndex);
 				const oConditionsType = new ConditionsType(oFormatOptions);
 
 				aConditions.splice(iIndex, 1); // remove old condition that is overwitten by pasting
@@ -753,6 +766,40 @@ sap.ui.define([
 		}
 	});
 
+	function _adjustFormatOptions(oOrigFormatOptions, aConditions, iCurrentCondition) {
+		const oCurrentCondition = aConditions[iCurrentCondition];
+
+		const oFormatOptions = merge({}, oOrigFormatOptions);
+		oFormatOptions.display = FieldDisplay.Value;
+		oFormatOptions.getConditions = function() { return aConditions; }; // as condition where inserted will be removed
+		oFormatOptions.defaultOperatorName = oCurrentCondition?.operator; // use current operator as default
+		oFormatOptions.valueType = oFormatOptions.dataType;
+		delete oFormatOptions.dataType;
+
+		return oFormatOptions;
+	}
+	// resetting the InvisibleText is necessary because conditions are updated async.
+	// the InvisibleText will be updated after the value is changed.
+	// and reading the old value again
+	function _resetInvisibleRemoveText(oField) {
+		const oInvisibleText = _getInvisibleTextForField(oField);
+		if (oInvisibleText) {
+			oInvisibleText.setText("");
+		}
+	}
+
+
+	function _getInvisibleTextForField(oField) {
+		if (!oField) {
+			return null;
+		}
+
+		const oGrid = oField.getParent();
+		const oFieldIndex = oGrid.getContent().indexOf(oField);
+		const oInvisibleText = oGrid.getContent().find((oControl, iIndex) => oControl.isA("sap.ui.core.InvisibleText") && iIndex > oFieldIndex);
+		return oInvisibleText;
+	}
+
 	function _observeChanges(oChanges) {
 
 		if (oChanges.name === "value") {
@@ -780,6 +827,10 @@ sap.ui.define([
 			const oFormatOptionsOld = oTypeOld && oTypeOld.getFormatOptions();
 			const oConstraints = oType && oType.getConstraints();
 			const oConstraintsOld = oTypeOld && oTypeOld.getConstraints();
+
+			const oCopiedFormatOptions = _adjustFormatOptions(oChanges.current, aConditions, -1);
+			this._oConditionType.setFormatOptions(oCopiedFormatOptions);
+
 			if (sType !== sTypeOld || !deepEqual(oFormatOptions, oFormatOptionsOld) || !deepEqual(oConstraints, oConstraintsOld)) {
 				// operators might be changed if type changed
 				// Field binding needs to be updated if type changed
@@ -908,7 +959,7 @@ sap.ui.define([
 
 		oField.setAdditionalValue(sDescription);
 
-		this.onChange();
+		this.onChange(undefined);
 	}
 
 	function _createControl(oCondition, iIndex, sId, oBindingContext) {
@@ -1545,11 +1596,26 @@ sap.ui.define([
 		oGrid.insertContent(oOperatorField, iIndex); // insert as add-Button is already at the end
 		iIndex++;
 
+		const oInvisibleRemoveText = new InvisibleText(sIdPrefix + "--ivtRemove", {
+			text: {
+				parts: [{ path: "$this>" }],
+				formatter: _getRemoveTextForCondition.bind(this)
+			}
+		}).setLayoutData(new GridData({
+			span: "XL1 L1 M1 S1",
+			visibleS: false,
+			visibleM: false,
+			visibleL: false,
+			visibleXL: false
+		}))
+		.setBindingContext(oBindingContext, "$this"); // to find condition on remove
+
 		const oRemoveButton = new Button(sIdPrefix + "--removeBtnSmall", {
 				press: this.removeCondition.bind(this),
 				type: ButtonType.Transparent,
 				icon: "sap-icon://decline",
-				tooltip: "{$i18n>valuehelp.DEFINECONDITIONS_REMOVECONDITION}"
+				tooltip: "{$i18n>valuehelp.DEFINECONDITIONS_REMOVECONDITION}",
+				ariaLabelledBy: oInvisibleRemoveText
 			})
 			.setLayoutData(new GridData({
 				span: "XL1 L1 M1 S2",
@@ -1560,6 +1626,7 @@ sap.ui.define([
 				visibleXL: false
 			}))
 			.setBindingContext(oBindingContext, "$this"); // to find condition on remove
+
 		if (oBindingContext) {
 			// as Button is between Operatot and Value don't trigger validation on tabbing between
 			oRemoveButton.setFieldGroupIds([oBindingContext.getPath()]); // use path to have a ID for every condition
@@ -1582,7 +1649,8 @@ sap.ui.define([
 				press: this.removeCondition.bind(this),
 				type: ButtonType.Transparent,
 				icon: "sap-icon://decline",
-				tooltip: "{$i18n>valuehelp.DEFINECONDITIONS_REMOVECONDITION}"
+				tooltip: "{$i18n>valuehelp.DEFINECONDITIONS_REMOVECONDITION}",
+				ariaLabelledBy: oInvisibleRemoveText
 			})
 			.setLayoutData(new GridData({
 				span: "XL1 L1 M1 S1",
@@ -1594,13 +1662,30 @@ sap.ui.define([
 			}))
 			.setBindingContext(oBindingContext, "$this"); // to find condition on remove
 
-		oGrid.insertContent(oRemoveButton2, iIndex);
-		iIndex++;
+			oGrid.insertContent(oRemoveButton2, iIndex);
+			iIndex++;
+			oGrid.insertContent(oInvisibleRemoveText, iIndex);
+			iIndex++;
 
 		return iIndex;
 
 	}
 
+	function _getRemoveTextForCondition(oCondition) {
+		const sRemoveUndefinedConditionText = oMessageBundle.getText("valuehelp.DEFINECONDITIONS_REMOVECONDITION_ARIALABEL_UNDEFINED");
+		const sFormatedValue = this._oConditionType.formatValue(oCondition);
+		if (!oCondition) { // can only happen on delete
+			return "";
+		}
+
+		if (oCondition.isEmpty || !sFormatedValue) {
+			return sRemoveUndefinedConditionText;
+		}
+
+		const sRemoveConditionText = oMessageBundle.getText("valuehelp.DEFINECONDITIONS_REMOVECONDITION_ARIALABEL", [sFormatedValue]);
+		return sRemoveConditionText;
+	}
+
 	function _getEditModeFromOperator(sOperator, bInvalid) {
 
 		if (!sOperator) {
@@ -1778,6 +1863,10 @@ sap.ui.define([
 		oRemoveButton2.setBindingContext(oBindingContext, "$this");
 		iIndex++;
 
+		const oInvisibleText = aGridContent[iIndex];
+		oInvisibleText.setBindingContext(oBindingContext, "$this");
+		iIndex++;
+
 		return iIndex;
 
 	}
@@ -1800,6 +1889,22 @@ sap.ui.define([
 
 	}
 
+	function _updateErrorValueState(oField, sMessage) {
+		oField.setValueState(ValueState.Error);
+		oField.setValueStateText(sMessage);
+		// update aria-label text
+		_setInvalidInvisibleText(oField);
+	}
+
+	function _setInvalidInvisibleText(oField) {
+		const sInvalidMessage = oMessageBundle.getText("valuehelp.DEFINECONDITIONS_REMOVECONDITION_ARIALABEL_INVALID");
+		const oInvisibleText = _getInvisibleTextForField(oField);
+		if (oInvisibleText) {
+			oInvisibleText.setText(sInvalidMessage);
+		}
+	}
+
+
 	function _validateCondition(oField) {
 
 		const oGrid = oField.getParent();
@@ -1849,11 +1954,9 @@ sap.ui.define([
 					}
 				} catch (oException) {
 					bInvalid = true;
-					oField.setValueState(ValueState.Error);
-					oField.setValueStateText(oException.message);
+					_updateErrorValueState(oField, oException.message);
 					if (oField2 && oField2.getMetadata().getAllProperties().valueState) {
-						oField2.setValueState(ValueState.Error);
-						oField2.setValueStateText(oException.message);
+						_updateErrorValueState(oField2, oException.message);
 					}
 				}
 			}
@@ -1866,11 +1969,9 @@ sap.ui.define([
 				for (let i = 0; i < aConditions.length; i++) {
 					if (i !== iIndex && !oCondition.isEmpty && FilterOperatorUtil.compareConditions(oCondition, aConditions[i])) {
 						bInvalid = true;
-						oField.setValueState(ValueState.Error);
-						oField.setValueStateText(oMessageBundle.getText("field.CONDITION_ALREADY_EXIST", [oCondition.values[0]]));
+						_updateErrorValueState(oField, oMessageBundle.getText("field.CONDITION_ALREADY_EXIST", [oCondition.values[0]]));
 						if (oField2 && oField2.getMetadata().getAllProperties().valueState) {
-							oField2.setValueState(ValueState.Error);
-							oField2.setValueStateText(oMessageBundle.getText("field.CONDITION_ALREADY_EXIST", [oCondition.values[1]]));
+							_updateErrorValueState(oField2, oMessageBundle.getText("field.CONDITION_ALREADY_EXIST", [oCondition.values[1]]));
 						}
 						break;
 					}

package/src/sap/ui/mdc/valuehelp/base/DialogTab.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Content for the <code>sap.ui.mdc.valuehelp.content.Dialog</code> element.
 	 * @extends sap.ui.core.Control
-	 * @version 1.141.2
+	 * @version 1.142.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc

package/src/sap/ui/mdc/valuehelp/base/FilterableListContent.js

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Content for the {@link sap.ui.mdc.valuehelp.base.Container Container} element.
 	 * @extends sap.ui.mdc.valuehelp.base.ListContent
-	 * @version 1.141.2
+	 * @version 1.142.0
 	 * @constructor
 	 * @abstract
 	 * @public
@@ -227,7 +227,9 @@ sap.ui.define([
 	FilterableListContent.prototype._findConditionsForContext = function(oContext, aConditions) {
 		const oDelegate = this.isValueHelpDelegateInitialized() && this.getValueHelpDelegate();
 		if (oContext && oDelegate) {
-			// <!-- Support for deprecated delegate method isFilterableListItemSelected
+			/**
+			 *  @deprecated since 1.118.0
+			 */
 			if (oDelegate.isFilterableListItemSelected) {
 				Log.warning("MDC.ValueHelp", "Delegate method 'isFilterableListItemSelected' is deprecated, please implement 'findConditionsForContext' instead.");
 
@@ -247,7 +249,6 @@ sap.ui.define([
 				}
 				return [];
 			}
-			// -->
 			return oDelegate.findConditionsForContext(this.getValueHelpInstance(), this, oContext, aConditions);
 		}
 		return [];

package/src/sap/ui/mdc/valuehelp/base/ListContent.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Content for the {@link sap.ui.mdc.valuehelp.base.Container Container} element.
 	 * @extends sap.ui.mdc.valuehelp.base.Content
-	 * @version 1.141.2
+	 * @version 1.142.0
 	 * @constructor
 	 * @abstract
 	 * @public

package/src/sap/ui/mdc/valuehelp/content/Bool.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Content for the {@link sap.ui.mdc.valuehelp.base.Container Container} element to provide a value help for boolean fields.
 	 * @extends sap.ui.mdc.valuehelp.content.FixedList
-	 * @version 1.141.2
+	 * @version 1.142.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc

package/src/sap/ui/mdc/valuehelp/content/Conditions.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Content for the {@link sap.ui.mdc.valuehelp.base.Container Container} element showing a condition panel.
 	 * @extends sap.ui.mdc.valuehelp.base.Content
-	 * @version 1.141.2
+	 * @version 1.142.0
 	 * @constructor
 	 * @public
 	 * @since 1.95.0

package/src/sap/ui/mdc/valuehelp/content/FixedList.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Content for the {@link sap.ui.mdc.valuehelp.base.Container Container} element showing a list with fixed values.
 	 * @extends sap.ui.mdc.valuehelp.base.ListContent
-	 * @version 1.141.2
+	 * @version 1.142.0
 	 * @constructor
 	 * @public
 	 * @since 1.95.0

package/src/sap/ui/mdc/valuehelp/content/FixedListItem.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.ListItem
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.142.0
 	 *
 	 * @public
 	 * @since 1.114.0

package/src/sap/ui/mdc/valuehelp/content/MDCTable.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Content for the {@link sap.ui.mdc.valuehelp.base.Container Container} element using a {@link sap.ui.mdc.Table}.
 	 * @extends sap.ui.mdc.valuehelp.base.FilterableListContent
-	 * @version 1.141.2
+	 * @version 1.142.0
 	 * @constructor
 	 * @public
 	 * @since 1.95.0

package/src/sap/ui/mdc/valuehelp/content/MTable.js

@@ -55,7 +55,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Content for the {@link sap.ui.mdc.valuehelp.base.Container Container} element using a {@link sap.m.Table}.
 	 * @extends sap.ui.mdc.valuehelp.base.FilterableListContent
-	 * @version 1.141.2
+	 * @version 1.142.0
 	 * @constructor
 	 * @public
 	 * @since 1.95.0