@openui5/sap.ui.mdc 1.102.2 → 1.104.0

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Base type for <code>MultiValueFieldItem</code> control.
 	 * @extends sap.ui.core.Element
-	 * @version 1.102.2
+	 * @version 1.104.0
 	 * @constructor
 	 * @abstract
 	 * @private

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class The <code>OutParameter</code> element is used in the {@link sap.ui.mdc.field.FieldValueHelp FieldValueHelp} element.
 	 * @extends sap.ui.mdc.field.InParameter
-	 * @version 1.102.2
+	 * @version 1.104.0
 	 * @constructor
 	 * @abstract
 	 * @private

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class The <code>TokenDisplay</code> control is used to render a field inside a control based on {@link sap.ui.mdc.field.FieldBase FieldBase}.
 	 * @extends sap.m.Token
-	 * @version 1.102.2
+	 * @version 1.104.0
 	 * @constructor
 	 * @abstract
 	 * @private
@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @alias sap.ui.mdc.field.TokenDisplay
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
-	var TokenDisplay = Token.extend("sap.ui.mdc.field.TokenDisplay", /** @lends sap.ui.mdc.field.TokenDisplay */
+	var TokenDisplay = Token.extend("sap.ui.mdc.field.TokenDisplay", /** @lends sap.ui.mdc.field.TokenDisplay.prototype */
 	{
 		metadata: {
 			library: "sap.ui.mdc",

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

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class The <code>TokenizerDisplay</code> control is used to render a Tokenizer inside a control based on {@link sap.ui.mdc.field.FieldBase FieldBase}.
 	 * @extends sap.m.Tokenizer
-	 * @version 1.102.2
+	 * @version 1.104.0
 	 * @constructor
 	 * @abstract
 	 * @private
@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @alias sap.ui.mdc.field.TokenizerDisplay
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
-	var TokenizerDisplay = Tokenizer.extend("sap.ui.mdc.field.TokenizerDisplay", /** @lends sap.ui.mdc.field.TokenizerDisplay */
+	var TokenizerDisplay = Tokenizer.extend("sap.ui.mdc.field.TokenizerDisplay", /** @lends sap.ui.mdc.field.TokenizerDisplay.prototype */
 	{
 		metadata: {
 			library: "sap.ui.mdc",

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

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.XMLComposite
 	 *
 	 * @author SAP SE
-	 * @version 1.102.2
+	 * @version 1.104.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.ValueHelpPanel
@@ -198,7 +198,6 @@ sap.ui.define([
 		 *
 		 * @private
 		 * @ui5-restricted sap.ui.mdc.field.FieldValueHelp
-		 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 		 */
 		setFilterbar: function(oFilterbar) {
 
@@ -243,7 +242,6 @@ sap.ui.define([
 		 *
 		 * @private
 		 * @ui5-restricted sap.ui.mdc.field.FieldValueHelp
-		 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 		 */
 		setTable: function(oTable) {
 			if (this._oTable) {
@@ -278,7 +276,6 @@ sap.ui.define([
 		 *
 		 * @private
 		 * @ui5-restricted sap.ui.mdc.field.FieldValueHelp
-		 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 		 */
 		getTable: function() {
 			if (this._oTable) {
@@ -295,7 +292,6 @@ sap.ui.define([
 		 *
 		 * @private
 		 * @ui5-restricted sap.ui.mdc.field.FieldValueHelp
-		 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 		 */
 		setDefineConditions: function(oDefineConditionPanel) {
 			var oITBar = this.byId("iconTabBar");

package/src/sap/ui/mdc/field/content/DateTimeContent.js

@@ -40,7 +40,7 @@ sap.ui.define([
 			if (DateUtil.showTimezone(oType)) {
 				// bind timezone to timezone part; handle as "unit"
 				var oUnitConditionsType = oContentFactory.getUnitConditionsType();
-				aControls[0].bindProperty("timezone", { path: "$field>/conditions", type: oUnitConditionsType });
+				aControls[0].bindProperty("timezone", { path: "$field>/conditions", type: oUnitConditionsType, targetType: "sap.ui.mdc.raw:1" }); // use own target type to allow special handling in ConditionType (DateTimePicker needs the raw value of the timezone, not translated)
 				aControls[0].setShowTimezone(true);
 			}
 

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

@@ -52,7 +52,7 @@ sap.ui.define([
 	 * @class The <code>FilterBarBase</code> control is used as a faceless base class for common functionality of any MDC FilterBar derivation.
 	 * @extends sap.ui.mdc.Control
 	 * @author SAP SE
-	 * @version 1.102.2
+	 * @version 1.104.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -677,7 +677,7 @@ sap.ui.define([
 
 	FilterBarBase.prototype._toExternal = function(oProperty, oCondition) {
 		var oConditionExternal = merge({}, oCondition);
-		oConditionExternal = ConditionConverter.toString(oConditionExternal, oProperty.typeConfig, this.getTypeUtil());
+		oConditionExternal = ConditionConverter.toString(oConditionExternal, oProperty.typeConfig.typeInstance, this.getTypeUtil());
 
 		this._cleanupCondition(oConditionExternal);
 
@@ -689,7 +689,7 @@ sap.ui.define([
 
 	FilterBarBase.prototype._toInternal = function(oProperty, oCondition) {
 		var oConditionInternal = merge({}, oCondition);
-		oConditionInternal = ConditionConverter.toType(oConditionInternal, oProperty.typeConfig, this.getTypeUtil());
+		oConditionInternal = ConditionConverter.toType(oConditionInternal, oProperty.typeConfig.typeInstance, this.getTypeUtil());
 
 		this. _convertInOutParameters(oCondition, oConditionInternal, "inParameters", ConditionConverter.toType);
 		this. _convertInOutParameters(oCondition, oConditionInternal, "outParameters", ConditionConverter.toType);
@@ -704,7 +704,7 @@ sap.ui.define([
 				var oProperty = this._getPropertyByName(sName);
 				if (oProperty) {
 					var oOutCondition = Condition.createCondition("EQ", [oCondition[sParameterName][sKey]]);
-					var vValue = fnConverter(oOutCondition, oProperty.typeConfig, this.getTypeUtil());
+					var vValue = fnConverter(oOutCondition, oProperty.typeConfig.typeInstance, this.getTypeUtil());
 					if (!oConditionConverted[sParameterName]) {
 						oConditionConverted[sParameterName] = {};
 					}

package/src/sap/ui/mdc/filterbar/IFilterContainer.js

@@ -24,7 +24,7 @@ sap.ui.define([
 
 	/**
 	 * Getter for the inner layout item.
-	 * @returns {Control} Control instance of the inner layout item.
+	 * @returns {sap.ui.core.Control} Control instance of the inner layout item.
 	 * @protected
 	 * @ui5-restricted sap.ui.mdc, sap.fe
 	 */

package/src/sap/ui/mdc/filterbar/PropertyHelper.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.util.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.102.2
+	 * @version 1.104.0
 	 *
 	 * @private
 	 * @experimental

package/src/sap/ui/mdc/filterbar/p13n/AdaptationFilterBar.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.mdc.filterbar.FilterBarBase
 	 * @author SAP SE
-	 * @version 1.102.2
+	 * @version 1.104.0
 	 * @constructor
 	 * @private
 	 * @since 1.80.0

package/src/sap/ui/mdc/filterbar/vh/FilterBar.js

@@ -56,7 +56,7 @@ sap.ui.define(
 		 * The metadata information is provided via the {@link sap.ui.mdc.FilterBarDelegate FilterBarDelegate} implementation. This implementation has to be provided by the application.
 		 * @extends sap.ui.mdc.filterbar.FilterBarBase
 		 * @author SAP SE
-		 * @version 1.102.2
+		 * @version 1.104.0
 		 * @constructor
 		 * @private
 		 * @ui5-restricted sap.fe

package/src/sap/ui/mdc/flexibility/ActionToolbar.flexibility.js

@@ -5,17 +5,93 @@
  */
 
 sap.ui.define([
-	'./ItemBaseFlex'
-], function(ItemBaseFlex) {
+	"./ItemBaseFlex",
+	"./Util"
+], function(ItemBaseFlex, Util) {
 	"use strict";
 
     var oActionFlex = Object.assign({}, ItemBaseFlex);
-    oActionFlex.findItem = function(oModifier, aActions, sName) {
+
+	oActionFlex.findItem = function(oModifier, aActions, sName) {
 		return sap.ui.getCore().byId(sName);
 	};
 
+	oActionFlex.determineAggregation = function(oModifier, oControl) {
+		return Promise.resolve().then(function() {
+			return {
+				name: "actions",
+				items: oControl.getActions()
+			};
+		});
+	};
+
+	oActionFlex._applyMove = function(oChange, oControl, mPropertyBag, sChangeReason) {
+		var bIsRevert = sChangeReason === Util.REVERT ? true : false;
+		if (oControl.getParent()){
+			if (oControl.getParent().isA("sap.ui.mdc.Chart")) {
+				// ActionToolbar of sap.ui.mdc.Chart
+				oControl = oControl.getParent();
+			} else if (oControl.getParent().getParent().isA("sap.ui.mdc.Table")) {
+				// ActionToolbar of sap.ui.mdc.Table
+				oControl = oControl.getParent().getParent();
+			}
+		}
+		this.beforeApply(oChange.getChangeType(), oControl, bIsRevert);
+		if (this._bSupressFlickering) {
+			this._delayInvalidate(oControl);
+		}
+
+		var oModifier = mPropertyBag.modifier;
+		var oChangeContent = bIsRevert ? oChange.getRevertData() : oChange.getContent();
+		var oControlAggregationItem;
+		var oAggregation;
+		var iOldIndex;
+
+		// 1) Fetch existing item
+		var pMove = this.determineAggregation(oModifier, oControl)
+		.then(function(oRetrievedAggregation){
+			oAggregation = oRetrievedAggregation;
+			return this._getExistingAggregationItem(oChangeContent, mPropertyBag, oControl);
+		}.bind(this))
+		.then(function(oRetrievedControlAggregationItem){
+			oControlAggregationItem = oRetrievedControlAggregationItem;
+		})
+
+		// 2) Throw error if for some reason no item could be found (should not happen for a move operation)
+		.then(function() {
+			if (!oControlAggregationItem) {
+				throw new Error("No corresponding item in " + oAggregation.name + " found. Change to move item cannot be " + this._getOperationText(bIsRevert) + "at this moment");
+			}
+			return oModifier.findIndexInParentAggregation(oControlAggregationItem);
+		}.bind(this))
+
+		// 3) Trigger the move (remove&insert)
+		.then(function(iRetrievedIndex) {
+			iOldIndex = iRetrievedIndex;
+			return oModifier.removeAggregation(oControl, oAggregation.name, oControlAggregationItem)
+			.then(function(){
+				return oModifier.insertAggregation(oControl, oAggregation.name, oControlAggregationItem, oChangeContent.index);
+			});
+		})
+
+		// 4) Prepare the revert data
+		.then(function() {
+			if (bIsRevert) {
+				// Clear the revert data on the change
+				oChange.resetRevertData();
+			} else {
+				oChange.setRevertData({
+					name: oChangeContent.name,
+					index: iOldIndex
+				});
+			}
+			this.afterApply(oChange.getChangeType(), oControl, bIsRevert);
+		}.bind(this));
+
+		return pMove;
+	};
+
 	return {
-        "moveControls": "default",
         moveAction: oActionFlex.createMoveChangeHandler()
 	};
 

package/src/sap/ui/mdc/flexibility/AggregateFlex.js

@@ -3,17 +3,19 @@
  * (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(["sap/ui/fl/apply/api/FlexRuntimeInfoAPI"], function (FlexRuntimeInfoAPI) {
+sap.ui.define([
+	"sap/ui/mdc/p13n/Engine",
+	"sap/ui/mdc/flexibility/Util"
+], function(Engine, Util) {
 	"use strict";
+
 	var fRebindControl = function (oControl) {
 		var bExecuteRebindForTable = oControl && oControl.isA && oControl.isA("sap.ui.mdc.Table") && oControl.isTableBound();
 		var bExecuteRebindForChart = oControl && oControl.isA && (oControl.isA("sap.ui.mdc.Chart"));
 		if (bExecuteRebindForTable || bExecuteRebindForChart) {
 			if (!oControl._bWaitForBindChanges) {
 				oControl._bWaitForBindChanges = true;
-				FlexRuntimeInfoAPI.waitForChanges({
-					element: oControl
-				}).then(function () {
+				Engine.getInstance().waitForChanges(oControl).then(function () {
 					if (bExecuteRebindForTable) {
 						oControl.rebind();
 					} else if (bExecuteRebindForChart) {
@@ -38,8 +40,9 @@ sap.ui.define(["sap/ui/fl/apply/api/FlexRuntimeInfoAPI"], function (FlexRuntimeI
 		fRebindControl(oControl);
 	};
 
-	var fAddAggregate = function (oChange, oControl, mPropertyBag, bIsRevert) {
+	var fAddAggregate = function (oChange, oControl, mPropertyBag, sChangeReason) {
 		return new Promise(function (resolve, reject) {
+			var bIsRevert = (sChangeReason === Util.REVERT);
 			var oModifier = mPropertyBag.modifier;
 			var oChangeContent = bIsRevert ? oChange.getRevertData() : oChange.getContent();
 			Promise.resolve()
@@ -60,8 +63,9 @@ sap.ui.define(["sap/ui/fl/apply/api/FlexRuntimeInfoAPI"], function (FlexRuntimeI
 		});
 	};
 
-	var fRemoveAggregate = function (oChange, oControl, mPropertyBag, bIsRevert) {
+	var fRemoveAggregate = function (oChange, oControl, mPropertyBag, sChangeReason) {
 		return new Promise(function (resolve, reject) {
+			var bIsRevert = (sChangeReason === Util.REVERT);
 			var oModifier = mPropertyBag.modifier;
 			var oChangeContent = bIsRevert ? oChange.getRevertData() : oChange.getContent();
 			Promise.resolve()
@@ -86,39 +90,16 @@ sap.ui.define(["sap/ui/fl/apply/api/FlexRuntimeInfoAPI"], function (FlexRuntimeI
 	};
 
 	var Aggregate = {};
-	Aggregate.removeAggregate = {
-		"changeHandler": {
-			applyChange: function (oChange, oControl, mPropertyBag) {
-				return fRemoveAggregate(oChange, oControl, mPropertyBag, false);
-			},
-			completeChangeContent: function (oChange, mChangeSpecificInfo, mPropertyBag) {
-				// Not used, but needs to be there
-			},
-			revertChange: function (oChange, oControl, mPropertyBag) {
-				return fAddAggregate(oChange, oControl, mPropertyBag, true);
-			}
-		},
-		"layers": {
-			"USER": true
-		}
-	};
 
-	Aggregate.addAggregate = {
-		"changeHandler": {
-			applyChange: function (oChange, oControl, mPropertyBag) {
-				return fAddAggregate(oChange, oControl, mPropertyBag, false);
-			},
-			completeChangeContent: function (oChange, mChangeSpecificInfo, mPropertyBag) {
-				// Not used, but needs to be there
-			},
-			revertChange: function (oChange, oControl, mPropertyBag) {
-				return fRemoveAggregate(oChange, oControl, mPropertyBag, true);
-			}
-		},
-		"layers": {
-			"USER": true
-		}
-	};
+	Aggregate.addAggregate = Util.createChangeHandler({
+		apply: fAddAggregate,
+		revert: fRemoveAggregate
+	});
+
+	Aggregate.removeAggregate = Util.createChangeHandler({
+		apply: fRemoveAggregate,
+		revert: fAddAggregate
+	});
 
 	return Aggregate;
 });

package/src/sap/ui/mdc/flexibility/Chart.flexibility.js

@@ -12,7 +12,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.mdc.flexibility.Chart
 	 * @author SAP SE
-	 * @version 1.102.2
+	 * @version 1.104.0
 	 */
 	return {
 		addItem: ChartItemFlex.addItem,

package/src/sap/ui/mdc/flexibility/ChartTypeFlex.js

@@ -4,51 +4,33 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-], function() {
+	"sap/ui/mdc/flexibility/Util"
+], function(Util) {
 	"use strict";
 
+	var ChartTypeFlex = {};
 
+	var fSetChartType = function(oChange, oChart, mPropertyBag) {
+		var oModifier = mPropertyBag.modifier;
+		return Promise.resolve()
+			.then(oModifier.getProperty.bind(oModifier, oChart, "chartType"))
+			.then(function(vOldValue) {
+				// First store the old value for revert
+				oChange.setRevertData(vOldValue);
+				// Then set the new value
+				oModifier.setProperty(oChart, "chartType", oChange.getContent().chartType);
+			});
+	};
 
-	var oChartTypeFlex = {};
-
-	oChartTypeFlex.setChartType = {
-		layers: {
-			USER: true
-		},
-		changeHandler: {
-			createChange: function(mPropertyBag) {
-				if (!mPropertyBag.control) {
-					throw new Error("Invalid control. The existing control object is mandatory");
-				}
-				return {
-					selectorElement: mPropertyBag.control,
-					changeSpecificData: {
-						changeType: "setChartType",
-						content: {
-							chartType: mPropertyBag.chartType
-						}
-					}
-				};
-			},
-			completeChangeContent: function(oChange, mSpecificChangeInfo) {
-			},
-			applyChange: function(oChange, oChart, mPropertyBag) {
-				var oModifier = mPropertyBag.modifier;
-				return Promise.resolve()
-					.then(oModifier.getProperty.bind(oModifier, oChart, "chartType"))
-					.then(function(vOldValue) {
-						// First store the old value for revert
-						oChange.setRevertData(vOldValue);
-						// Then set the new value
-						oModifier.setProperty(oChart, "chartType", oChange.getContent().chartType);
-					});
-			},
-			revertChange: function(oChange, oChart, mPropertyBag) {
-				mPropertyBag.modifier.setProperty(oChart, "chartType", oChange.getRevertData());
-				oChange.resetRevertData();
-			}
-		}
+	var fRevertChartType = function(oChange, oChart, mPropertyBag) {
+		mPropertyBag.modifier.setProperty(oChart, "chartType", oChange.getRevertData());
+		oChange.resetRevertData();
 	};
 
-	return oChartTypeFlex;
+	ChartTypeFlex.setChartType = Util.createChangeHandler({
+		apply: fSetChartType,
+		revert: fRevertChartType
+	});
+
+	return ChartTypeFlex;
 });

package/src/sap/ui/mdc/flexibility/ConditionFlex.js

@@ -4,8 +4,11 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	'sap/base/util/merge', 'sap/base/Log', 'sap/ui/mdc/condition/FilterOperatorUtil'
-], function(merge, Log, FilterOperatorUtil) {
+	'sap/base/util/merge',
+	'sap/base/Log',
+	'sap/ui/mdc/condition/FilterOperatorUtil',
+	'sap/ui/mdc/flexibility/Util'
+], function(merge, Log, FilterOperatorUtil, Util) {
 	"use strict";
 
 	/*
@@ -44,9 +47,11 @@ sap.ui.define([
 		return oController ? oController.getFilterControl() : null;
 	};
 
-	var fAddCondition = function(oChange, oChangeContent, oControl, mPropertyBag, bIsRevert) {
+	var fAddCondition = function(oChange, oControl, mPropertyBag, sChangeReason) {
 
 		var oFilterControl = fDetermineFilterControl(oControl);
+		var bIsRevert = (sChangeReason === Util.REVERT);
+		var oChangeContent = bIsRevert ? oChange.getRevertData() : oChange.getContent();
 
 		if (oFilterControl && oFilterControl.applyConditionsAfterChangesApplied) {
 			oFilterControl.applyConditionsAfterChangesApplied(oControl);
@@ -73,6 +78,14 @@ sap.ui.define([
 					aConditions = mConditionsData[oChangeContent.name];
 				}
 
+				if (!bIsRevert) {
+					// Set revert data on the change
+					oChange.setRevertData({
+						name: oChangeContent.name,
+						condition: oChangeContent.condition
+					});
+				}
+
 				var nConditionIdx = FilterOperatorUtil.indexOfCondition(oChangeContent.condition, aConditions);
 				if (nConditionIdx < 0) {
 					aConditions.push(oChangeContent.condition);
@@ -80,13 +93,6 @@ sap.ui.define([
 					// 'filterConditions' property needs to be updated for change selector
 					oModifier.setProperty(oControl, "filterConditions", mConditionsData);
 
-					if (!bIsRevert) {
-						// Set revert data on the change
-						oChange.setRevertData({
-							name: oChangeContent.name,
-							condition: oChangeContent.condition
-						});
-					}
 
 					return oModifier.getProperty(oControl, "delegate")
 					.then(function(oDelegate){
@@ -102,6 +108,9 @@ sap.ui.define([
 						}
 					})
 					.finally(function() {
+						if (bIsRevert) {
+							oChange.resetRevertData();
+						}
 						if (oFilterControl && oFilterControl.addCondition) {
 							return oFilterControl.addCondition(oChangeContent.name, oChangeContent.condition);
 						}
@@ -111,9 +120,11 @@ sap.ui.define([
 		});
 	};
 
-	var fRemoveCondition = function(oChange, oChangeContent, oControl, mPropertyBag, bIsRevert) {
+	var fRemoveCondition = function(oChange, oControl, mPropertyBag, sChangeReason) {
 
 		var oFilterControl = fDetermineFilterControl(oControl);
+		var bIsRevert = (sChangeReason === Util.REVERT);
+		var oChangeContent = bIsRevert ? oChange.getRevertData() : oChange.getContent();
 
 		if (oFilterControl && oFilterControl.applyConditionsAfterChangesApplied) {
 			oFilterControl.applyConditionsAfterChangesApplied(oControl);
@@ -136,6 +147,14 @@ sap.ui.define([
 						}
 					}
 
+					if (!bIsRevert) {
+						// Set revert data on the change
+						oChange.setRevertData({
+							name: oChangeContent.name,
+							condition: oChangeContent.condition
+						});
+					}
+
 					if (aConditions && (aConditions.length > 0)) {
 
 						nDelIndex = FilterOperatorUtil.indexOfCondition(oChangeContent.condition, aConditions);
@@ -147,14 +166,6 @@ sap.ui.define([
 							// 'filterConditions' property needs to be updated for change selector
 							oModifier.setProperty(oControl, "filterConditions", mConditionsData);
 
-							if (!bIsRevert) {
-								// Set revert data on the change
-								oChange.setRevertData({
-									name: oChangeContent.name,
-									condition: oChangeContent.condition
-								});
-							}
-
 							return oModifier.getProperty(oControl, "delegate")
 							.then(function(oDelegate){
 								return fnGetDelegate(oDelegate.name);
@@ -169,6 +180,9 @@ sap.ui.define([
 								}
 							})
 							.finally(function() {
+								if (bIsRevert) {
+									oChange.resetRevertData();
+								}
 								if (oFilterControl && oFilterControl.removeCondition) {
 									return oFilterControl.removeCondition(oChangeContent.name, oChangeContent.condition);
 								}
@@ -179,46 +193,17 @@ sap.ui.define([
 		});
 	};
 
-	var oConditionFlex = {};
-
-	oConditionFlex.addCondition = {
-		"changeHandler": {
-			applyChange: function(oChange, oControl, mPropertyBag) {
-				return fAddCondition(oChange, oChange.getContent(), oControl, mPropertyBag, false);
-			},
-			completeChangeContent: function(oChange, mChangeSpecificInfo, mPropertyBag) {
-				// TODO
-			},
-			revertChange: function(oChange, oControl, mPropertyBag) {
-				return fRemoveCondition(oChange, oChange.getRevertData(), oControl, mPropertyBag, true).then(function() {
-					oChange.resetRevertData();
-				});
+	var ConditionFlex = {};
 
-			}
-		},
-		"layers": {
-			"USER": true
-		}
-	};
-	oConditionFlex.removeCondition = {
-		"changeHandler": {
-			applyChange: function(oChange, oControl, mPropertyBag) {
-				return fRemoveCondition(oChange, oChange.getContent(), oControl, mPropertyBag, false);
-			},
-			completeChangeContent: function(oChange, mChangeSpecificInfo, mPropertyBag) {
-				// TODO
-			},
-			revertChange: function(oChange, oControl, mPropertyBag) {
-				return fAddCondition(oChange, oChange.getRevertData(), oControl, mPropertyBag, true).then(function() {
-					oChange.resetRevertData();
-				});
+	ConditionFlex.addCondition = Util.createChangeHandler({
+		apply: fAddCondition,
+		revert: fRemoveCondition
+	});
 
-			}
-		},
-		"layers": {
-			"USER": true
-		}
-	};
+	ConditionFlex.removeCondition = Util.createChangeHandler({
+		apply: fRemoveCondition,
+		revert: fAddCondition
+	});
 
-	return oConditionFlex;
+	return ConditionFlex;
 });

package/src/sap/ui/mdc/flexibility/FilterBar.flexibility.js

@@ -12,7 +12,7 @@ sap.ui.define(['./FilterItemFlex', './ConditionFlex', './PropertyInfoFlex'], fun
 	 *
 	 * @alias sap.ui.mdc.flexibility.FilterBar
 	 * @author SAP SE
-	 * @version 1.102.2
+	 * @version 1.104.0
 	 */
 
 	return {

package/src/sap/ui/mdc/flexibility/FilterItemFlex.js

@@ -12,7 +12,7 @@ sap.ui.define(['./ItemBaseFlex'], function(ItemBaseFlex) {
 	 *
 	 * @alias sap.ui.mdc.flexibility.FilterBar
 	 * @author SAP SE
-	 * @version 1.102.2
+	 * @version 1.104.0
 	 */
 
 	var oFilterItemFlex = Object.assign({}, ItemBaseFlex);