@openui5/sap.ui.mdc 1.110.0 → 1.111.0

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

@@ -18,11 +18,13 @@ sap.ui.define([
 	'sap/ui/mdc/condition/Condition',
 	'sap/ui/mdc/condition/ConditionConverter',
 	'sap/ui/mdc/util/IdentifierUtil',
+	'sap/ui/mdc/util/FilterUtil',
 	"sap/ui/mdc/filterbar/PropertyHelper",
+	"sap/ui/mdc/enum/ReasonMode",
+	"sap/ui/mdc/enum/FilterBarValidationStatus",
 	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
 	"sap/m/library",
 	"sap/m/Button",
-	'sap/m/MessageBox',
 	"./FilterBarBaseRenderer"
 ],
 	function(
@@ -40,11 +42,13 @@ sap.ui.define([
 		Condition,
 		ConditionConverter,
 		IdentifierUtil,
+		FilterUtil,
 		PropertyHelper,
+		ReasonMode,
+		FilterBarValidationStatus,
 		ControlVariantApplyAPI,
 		mLibrary,
 		Button,
-		MessageBox,
 		FilterBarBaseRenderer
 	) {
 	"use strict";
@@ -58,7 +62,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.110.0
+	 * @version 1.111.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -118,6 +122,7 @@ sap.ui.define([
 				/**
 				 * Displays possible errors during the search in a message box.
 				 * @since 1.74
+				 * @deprecated Since version 1.111 replaced by the new validation handling through {@link sap.ui.mdc.FilterBarDelegate#determineValidationState determineValidationState} and {@link sap.ui.mdc.FilterBarDelegate#visualizeValidationState visualizeValidationState}.
 				 */
 				showMessages: {
 					type: "boolean",
@@ -224,6 +229,20 @@ sap.ui.define([
 				 * <b>Note</b>: this event should never be executed programmatically. It is triggered internally by the filter bar after a <code>triggerSearch</code> is executed
 				 */
 				search: {
+					/**
+					 * Indicates the initial reason for the search. This can either be:<br>
+					 * <ul>
+					 *     <li><code>{@link sap.ui.mdc.enum.ReasonMode.Variant}</code>: Search is triggered based on variant settings</li>
+					 *     <li><code>{@link sap.ui.mdc.enum.ReasonMode.Enter}</code>: Search is triggered based on pressing Enter in a filter field</li>
+					 *     <li><code>{@link sap.ui.mdc.enum.ReasonMode.Go}</code>: Search is triggered based on pressing the Go button</li>
+					 *     <li><code>{@link sap.ui.mdc.enum.ReasonMode.Unclear}</code>: Any other reasons for the search</li>
+					 * </ul>
+					 *
+					 * @since 1.111.0
+					 */
+					reason: {
+						type: "sap.ui.mdc.enum.ReasonMode"
+					}
 				},
 
 				/**
@@ -269,14 +288,6 @@ sap.ui.define([
 	FilterBarBase.INNER_MODEL_NAME = "$sap.ui.filterbar.mdc.FilterBarBase";
 	FilterBarBase.CONDITION_MODEL_NAME = "$filters";
 
-	var ErrorState = {
-			NoError: -1,
-			RequiredHasNoValue: 0,
-			FieldInErrorState: 1,
-			AsyncValidation: 2,
-			OngoingChangeAppliance: 3
-	};
-
 	FilterBarBase.prototype.init = function() {
 
 		Control.prototype.init.apply(this, arguments);
@@ -666,13 +677,6 @@ sap.ui.define([
 
 	FilterBarBase.prototype._addConditionChange = function(pConditionState) {
 
-		if (!this._oApplyingChanges) {
-			this._fResolveApplyingChanges = undefined;
-			this._oApplyingChanges = new Promise(function(resolve) {
-				this._fResolveApplyingChanges  = resolve;
-			}.bind(this));
-		}
-
 		this._aOngoingChangeAppliance.push(this.getEngine().createChanges({
 			control: this,
 			applySequentially: true,
@@ -863,6 +867,9 @@ sap.ui.define([
 	FilterBarBase.prototype.onSearch = function(oEvent) {
 		if (!this._bSearchPressed) {
 			this._bSearchPressed = true;
+
+			this._sReason = ReasonMode.Go;
+
 			this.triggerSearch().then(function() {
 				this._bSearchPressed = false;
 			}.bind(this), function(){
@@ -939,33 +946,21 @@ sap.ui.define([
 		}
 	};
 
-	FilterBarBase.prototype._getRequiredFieldsWithoutValues = function() {
-		var aReqFiltersWithoutValue = [];
-		this._getRequiredPropertyNames().forEach(function(sName) {
-			var aConditions = this._getConditionModel().getConditions(sName);
-			if (!aConditions || aConditions.length === 0) {
-				aReqFiltersWithoutValue.push(sName);
-			}
-		}.bind(this));
-
-		return aReqFiltersWithoutValue;
-	};
-
 	FilterBarBase.prototype._checkAsyncValidation = function() {
-		var vRetErrorState = ErrorState.NoError;
+		var vRetErrorState = FilterBarValidationStatus.NoError;
 
 		if (this._aFIChanges && this._aFIChanges.length > 0) {
-			vRetErrorState = ErrorState.AsyncValidation;
+			vRetErrorState = FilterBarValidationStatus.AsyncValidation;
 		}
 
 		return vRetErrorState;
 	};
 
 	FilterBarBase.prototype._checkOngoingChangeAppliance = function() {
-		var vRetErrorState = ErrorState.NoError;
+		var vRetErrorState = FilterBarValidationStatus.NoError;
 
 		if (this._aOngoingChangeAppliance && this._aOngoingChangeAppliance.length > 0) {
-			vRetErrorState = ErrorState.OngoingChangeAppliance;
+			vRetErrorState = FilterBarValidationStatus.OngoingChangeAppliance;
 		}
 
 		return vRetErrorState;
@@ -979,7 +974,7 @@ sap.ui.define([
 					(oFilterField.getValueStateText() === this._oRb.getText("filterbar.REQUIRED_FILTER_VALUE_MISSING"))) {
 
 					if (!aReqFiltersWithoutValue) {
-						aReqFiltersWithoutValue = this._getRequiredFieldsWithoutValues();
+						aReqFiltersWithoutValue = FilterUtil.getRequiredFieldNamesWithoutValues(this);
 					}
 
 					if (aReqFiltersWithoutValue.indexOf(oFilterField.getFieldPath()) < 0) {
@@ -991,9 +986,9 @@ sap.ui.define([
 	};
 
 	FilterBarBase.prototype._checkRequiredFields = function() {
-		var vRetErrorState = ErrorState.NoError;
+		var vRetErrorState = FilterBarValidationStatus.NoError;
 
-		var aReqFiltersWithoutValue = this._getRequiredFieldsWithoutValues();
+		var aReqFiltersWithoutValue = FilterUtil.getRequiredFieldNamesWithoutValues(this);
 		aReqFiltersWithoutValue.forEach(function(sName) {
 			var oFilterField = this._getFilterField(sName);
 			if (oFilterField) {
@@ -1005,23 +1000,23 @@ sap.ui.define([
 				Log.error("Mandatory filter field '" + sName + "' not visible on FilterBarBase has no value.");
 			}
 
-			vRetErrorState = ErrorState.RequiredHasNoValue;
+			vRetErrorState = FilterBarValidationStatus.RequiredHasNoValue;
 		}.bind(this));
 
 		return vRetErrorState;
 	};
 
 	FilterBarBase.prototype._checkFieldsInErrorState = function() {
-		var vRetErrorState = ErrorState.NoError;
+		var vRetErrorState = FilterBarValidationStatus.NoError;
 
 		this.getFilterItems().some(function(oFilterField) {
 			if (oFilterField && (oFilterField.getValueState() !== ValueState.None)) {
 				if (oFilterField.getValueStateText() !== this._oRb.getText("filterbar.REQUIRED_FILTER_VALUE_MISSING")) {
-					vRetErrorState = ErrorState.FieldInErrorState;
+					vRetErrorState = FilterBarValidationStatus.FieldInErrorState;
 				}
 			}
 
-			return vRetErrorState !== ErrorState.NoError;
+			return vRetErrorState !== FilterBarValidationStatus.NoError;
 		}.bind(this));
 
 		return vRetErrorState;
@@ -1031,11 +1026,18 @@ sap.ui.define([
 
 		var oPromise = oEvent.getParameter("promise");
 		if (oPromise) {
+
+			this._sReason = ReasonMode.Enter;
+
 			oPromise.then(function() {
-				this.triggerSearch();
+				var oWaitPromises = (this._aOngoingChangeAppliance && (this._aOngoingChangeAppliance.length > 0)) ? this._aOngoingChangeAppliance.slice() : [Promise.resolve()];
+				Promise.all(oWaitPromises).then(function() {
+					this.triggerSearch();
+				}.bind(this));
 			}.bind(this)).catch(function(oEx) {
 				Log.error(oEx);
-			});
+				this.triggerSearch().catch(function(oEx) { }); // catch rejected and do nothing
+			}.bind(this));
 		}
 	};
 
@@ -1058,24 +1060,33 @@ sap.ui.define([
 		this._aFIChanges.push({ name: oFilterField.getFieldPath(), promise: oEvent.getParameter("promise")});
 	};
 
-	FilterBarBase.prototype._checkFilters = function() {
+	 /**
+	  * Checks the validation status of the filter fields.
+	  * <b>Note:</b><br>
+	  * This method returns the current inner state of the filter bar.
+	  * @private
+	  * @MDC_PUBLIC_CANDIDATE
+	  * @ui5-restricted sap.fe, sap.ui.mdc
+	  * @returns {sap.ui.mdc.enum.FilterBarValidationStatus} Returns the validation status
+	  */
+	FilterBarBase.prototype.checkFilters = function() {
 		var vRetErrorState = this._checkAsyncValidation();
-		if (vRetErrorState !== ErrorState.NoError) {
+		if (vRetErrorState !== FilterBarValidationStatus.NoError) {
 			return vRetErrorState;
 		}
 
 		vRetErrorState = this._checkOngoingChangeAppliance();
-		if (vRetErrorState !== ErrorState.NoError) {
+		if (vRetErrorState !== FilterBarValidationStatus.NoError) {
 			return vRetErrorState;
 		}
 
-		vRetErrorState = this._checkRequiredFields();
-		if (vRetErrorState !== ErrorState.NoError) {
+		vRetErrorState = this._checkFieldsInErrorState();
+		if (vRetErrorState !== FilterBarValidationStatus.NoError) {
 			return vRetErrorState;
 		}
 
-		vRetErrorState = this._checkFieldsInErrorState();
-		if (vRetErrorState !== ErrorState.NoError) {
+		vRetErrorState = this._checkRequiredFields();
+		if (vRetErrorState !== FilterBarValidationStatus.NoError) {
 			return vRetErrorState;
 		}
 
@@ -1095,7 +1106,12 @@ sap.ui.define([
 		return oFilterField;
 	};
 
-	FilterBarBase.prototype._handleAsyncValidation = function(bFireSearch) {
+	FilterBarBase.prototype._handleAsyncValidation = function(bFireSearch, fnCallBack) {
+
+		if (!fnCallBack) {
+			fnCallBack = this._validate.bind(this);
+		}
+
 		if (this._aFIChanges && (this._aFIChanges.length > 0)) {
 
 			var aNamePromisesArray = this._aFIChanges.slice();
@@ -1114,14 +1130,19 @@ sap.ui.define([
 						oFF.setValueState(ValueState.None); //valid existing value -> clear missing required error
 					}
 				}, this);
-				this._validate(bFireSearch);
-			}.bind(this), function(aConditionsArray) {
-				this._validate(bFireSearch);
-			}.bind(this));
+				fnCallBack(bFireSearch);
+			}.bind(this)).catch(function(oEx) {
+				fnCallBack(bFireSearch);
+			});
 		}
 	};
 
-	FilterBarBase.prototype._handleOngoingChangeAppliance = function(bFireSearch) {
+	FilterBarBase.prototype._handleOngoingChangeAppliance = function(bFireSearch, fnCallBack) {
+
+		if (!fnCallBack) {
+			fnCallBack = this._validate.bind(this);
+		}
+
         if (this._aOngoingChangeAppliance && (this._aOngoingChangeAppliance.length > 0)) {
 
             var aChangePromises = this._aOngoingChangeAppliance.slice();
@@ -1132,22 +1153,85 @@ sap.ui.define([
             }
 
 			Promise.all(aChangePromises).then(function() {
-				this._validate(bFireSearch);
-			}.bind(this), function() {
-				this._validate(bFireSearch);
-			}.bind(this));
+				fnCallBack(bFireSearch);
+			}).catch(function(oEx) {
+				fnCallBack(bFireSearch);
+			});
 		}
 	};
 
+	 FilterBarBase.prototype._determineValidationState = function() {
+		 return this.awaitControlDelegate().then(function(oDelegate) {
+			 return oDelegate.determineValidationState(this, this.checkFilters());
+		 }.bind(this));
+	 };
+
+	 FilterBarBase.prototype._visualizeValidationState = function(nValidationStatus) {
+		 if (this._oDelegate) {
+			 this._oDelegate.visualizeValidationState(this, { status: nValidationStatus});
+		 }
+	 };
+
+	 /**
+	  * Returns the corresponding library text.
+	  * @private
+	  * @param {strings} sKey of the text
+	  * @returns {string} associated text from the message bundle
+	  */
+	 FilterBarBase.prototype.getText = function(sKey) {
+		 return this._oRb.getText(sKey);
+	 };
+
+
+	 FilterBarBase.prototype._restartCheckAndNotify = function(bFireSearch) {
+		 var vRetErrorState = this.checkFilters();
+		 this._checkAndNotify(bFireSearch, vRetErrorState);
+	 };
+
+	 FilterBarBase.prototype._checkAndNotify = function(bFireSearch, vRetErrorState) {
+		 var fnCheckAndFireSearch = function() {
+			 if (bFireSearch) {
+					var oObj = {
+						reason: this._sReason ? this._sReason : ReasonMode.Unclear
+					};
+					this._sReason = ReasonMode.Unclear;
+
+					this.fireSearch(oObj);
+			 }
+		 }.bind(this);
+
+		 var fnCleanup = function() {
+			 this._oValidationPromise = null;
+			 this._fRejectedSearchPromise = null;
+			 this._fResolvedSearchPromise = null;
+		 }.bind(this);
+
+		 if (vRetErrorState === FilterBarValidationStatus.AsyncValidation) {
+			 this._handleAsyncValidation(bFireSearch, this._restartCheckAndNotify.bind(this));
+			 return;
+		 }
+
+		 if (vRetErrorState === FilterBarValidationStatus.OngoingChangeAppliance) {
+			 this._handleOngoingChangeAppliance(bFireSearch, this._restartCheckAndNotify.bind(this));
+			 return;
+		 }
+
+		 if (vRetErrorState === FilterBarValidationStatus.NoError) {
+			 if (this._fResolvedSearchPromise) {
+				 fnCheckAndFireSearch();
+				 this._fResolvedSearchPromise();
+			 }
+		 } else if (this._fRejectedSearchPromise) {
+			 //this._setFocusOnFirstErroneousField();
+			 this._fRejectedSearchPromise();
+		 }
+
+		 this._visualizeValidationState(vRetErrorState);
+		 fnCleanup();
+	 };
+
 	 // Executes the search.
 	 FilterBarBase.prototype._validate = function(bFireSearch) {
-		var sErrorMessage, vRetErrorState;
-
-		var fnCheckAndFireSearch = function() {
-			if (bFireSearch) {
-				this.fireSearch();
-			}
-		}.bind(this);
 
 		var fnCleanup = function() {
 			this._oValidationPromise = null;
@@ -1160,45 +1244,9 @@ sap.ui.define([
 			return;
 		}
 
-		// First check for validation errors or if search should be prevented
-		vRetErrorState = this._checkFilters();
-
-		if (vRetErrorState === ErrorState.AsyncValidation) {
-			this._handleAsyncValidation(bFireSearch);
-			return;
-		}
-
-		if (vRetErrorState === ErrorState.OngoingChangeAppliance) {
-			this._handleOngoingChangeAppliance(bFireSearch);
-			return;
-		}
-
-		if (vRetErrorState === ErrorState.NoError) {
-			fnCheckAndFireSearch();
-			this._fResolvedSearchPromise();
-			fnCleanup();
-		} else {
-			if (vRetErrorState === ErrorState.RequiredHasNoValue) {
-				sErrorMessage = this._oRb.getText("filterbar.REQUIRED_CONDITION_MISSING");
-			} else {
-				sErrorMessage = this._oRb.getText("filterbar.VALIDATION_ERROR");
-			}
-
-			if (this.getShowMessages() && !this._isLiveMode()) {
-				try {
-					MessageBox.error(sErrorMessage, {
-						styleClass: (this.$() && this.$().closest(".sapUiSizeCompact").length) ? "sapUiSizeCompact" : "",
-						onClose: this._setFocusOnFirstErroneousField.bind(this)
-					});
-				} catch (x) {
-					Log.error(x.message);
-				}
-			} else {
-				Log.warning("search was not triggered. " + sErrorMessage);
-			}
-			this._fRejectedSearchPromise();
-			fnCleanup();
-		}
+		this._determineValidationState().then(function(vRetErrorState) {
+			this._checkAndNotify(bFireSearch, vRetErrorState);
+		}.bind(this));
 	};
 
 	/**
@@ -1405,17 +1453,27 @@ sap.ui.define([
 			// --> no filter changes have been done
 			return Promise.resolve();
 		}
+
+
+		var fResolveApplyingChanges;
+
+		if (!this._oApplyingChanges) {
+			this._oApplyingChanges = new Promise(function(resolve) {
+				fResolveApplyingChanges  = resolve;
+			});
+		}
+
 		return this._setXConditions(this.getFilterConditions()).then(function(){
+
 			this._reportModelChange({
 				triggerSearch: false,
 				triggerFilterUpdate: true,
 				recheckMissingRequired: true
 			});
 
-			if (this._oApplyingChanges) {
-				this._fResolveApplyingChanges();
-				this._oApplyingChanges = null;
-			}
+			fResolveApplyingChanges();
+			this._oApplyingChanges = null;
+
 		}.bind(this));
 	};
 
@@ -1668,7 +1726,7 @@ sap.ui.define([
 					this._fRejectMetadataApplied = null;
 				}.bind(this);
 
-				if (this.bDelegateInitialized) {
+				if (this.isControlDelegateInitialized()) {
 					this.finalizePropertyHelper().then(function() {
 						fnResolveMetadata(true);
 					});
@@ -1814,6 +1872,8 @@ sap.ui.define([
 
 		this._bExecuteOnSelect = this._getExecuteOnSelectionOnVariant(oVariant);
 
+		this._sReason = this._bExecuteOnSelect ? ReasonMode.Variant : ReasonMode.Unclear;
+
 		this._bDoNotTriggerFiltersChangeEventBasedOnVariantSwitch = false;
 		if (oVariant.hasOwnProperty("createScenario") && (oVariant.createScenario === "saveAs")) {
 			//during SaveAs a switch occurs but the processing of related variants based changes may still be ongoing
@@ -1907,7 +1967,7 @@ sap.ui.define([
 			});
 		}
 
-		if (this.bDelegateInitialized && this.getControlDelegate().cleanup) {
+		if (this.isControlDelegateInitialized() && this.getControlDelegate().cleanup) {
 			this.getControlDelegate().cleanup(this);
 		}
 

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

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.util.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @private
 	 * @experimental

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.mdc.filterbar.FilterBarBase
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @constructor
 	 * @private
 	 * @since 1.80.0
@@ -150,12 +150,24 @@ sap.ui.define([
 		}.bind(this));
 	};
 
+	AdaptationFilterBar.prototype.awaitControlDelegate = function() {
+		return this._oAdaptationControlPromise.then(function() {
+			return this._getAdaptationControlInstance().awaitControlDelegate();
+		}.bind(this));
+	};
+
 	AdaptationFilterBar.prototype.initPropertyHelper = function() {
 		return this._oAdaptationControlPromise.then(function() {
 			return this._getAdaptationControlInstance().initPropertyHelper();
 		}.bind(this));
 	};
 
+	AdaptationFilterBar.prototype.finalizePropertyHelper = function() {
+		return this._oAdaptationControlPromise.then(function() {
+			return this._getAdaptationControlInstance().finalizePropertyHelper();
+		}.bind(this));
+	};
+
 	AdaptationFilterBar.prototype.getTypeUtil = function() {
 		if (!this._getAdaptationControlInstance()) {
 			throw new Error("No adaptation control assigned yet.");
@@ -192,7 +204,6 @@ sap.ui.define([
 
 		return this._oAdaptationControlPromise.then(function() {
 			return this._getAdaptationControlInstance().awaitPropertyHelper().then(function(oPropertyHelper) {
-				this._oMetadataAppliedPromise = Promise.resolve();
 				if (!this._getAdaptationControlInstance().isPropertyHelperFinal()) {
 					return this.finalizePropertyHelper();
 				}
@@ -202,8 +213,12 @@ sap.ui.define([
 		}.bind(this));
 	};
 
+	AdaptationFilterBar.prototype.isControlDelegateInitialized = function() {
+		return this._getAdaptationControlInstance().isControlDelegateInitialized();
+	};
+
 	AdaptationFilterBar.prototype.createConditionChanges = function() {
-		return Promise.all([this._oAdaptationControlPromise, this._getAdaptationControlInstance().awaitControlDelegate()]).then(function() {
+		return Promise.all([this._oAdaptationControlPromise, this.awaitControlDelegate()]).then(function() {
 			var mConditions = this._getModelConditions(this._getConditionModel(), false, true);
 			if (this._bPersistValues) {
 				//this._getAdaptationControlInstance(), "Filter", mConditions, true, true

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.110.0
+		 * @version 1.111.0
 		 * @constructor
 		 * @private
 		 * @ui5-restricted sap.fe
@@ -303,7 +303,7 @@ sap.ui.define(
 		/**
 		 * Getter for the initial focusable <code>control</code> on the <code>FilterBar</code>.
 		 *
-		 * @returns {control} Control instance which could get the focus.
+		 * @returns {sap.ui.core.Control} Control instance which could get the focus.
 		 *
 		 * @private
 		 * @ui5-restricted sap.ui.mdc

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

@@ -5,8 +5,9 @@
  */
 sap.ui.define([
 	"sap/m/p13n/Engine",
-	"sap/ui/mdc/flexibility/Util"
-], function(Engine, Util) {
+	"sap/ui/mdc/flexibility/Util",
+	"sap/ui/fl/changeHandler/condenser/Classification"
+], function(Engine, Util, CondenserClassification) {
 	"use strict";
 
 	var fRebindControl = function (oControl) {
@@ -91,14 +92,25 @@ sap.ui.define([
 
 	var Aggregate = {};
 
+	var fGetCondenserInfoCondition = function(oChange, mPropertyBag) {
+		var oContent = oChange.getContent();
+		return {
+			classification: CondenserClassification.Reverse,
+			affectedControl: oChange.getSelector(),
+			uniqueKey: "aggregate" + "_" + oContent.name
+		};
+	};
+
 	Aggregate.addAggregate = Util.createChangeHandler({
 		apply: fAddAggregate,
-		revert: fRemoveAggregate
+		revert: fRemoveAggregate,
+		getCondenserInfo: fGetCondenserInfoCondition
 	});
 
 	Aggregate.removeAggregate = Util.createChangeHandler({
 		apply: fRemoveAggregate,
-		revert: fAddAggregate
+		revert: fAddAggregate,
+		getCondenserInfo: fGetCondenserInfoCondition
 	});
 
 	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.110.0
+	 * @version 1.111.0
 	 */
 	return {
 		addItem: ChartItemFlex.addItem,

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

@@ -4,8 +4,9 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/mdc/flexibility/Util"
-], function(Util) {
+	"sap/ui/mdc/flexibility/Util",
+	"sap/ui/fl/changeHandler/condenser/Classification"
+], function(Util, Classification) {
 	"use strict";
 
 	var ChartTypeFlex = {};
@@ -25,11 +26,21 @@ sap.ui.define([
 	var fRevertChartType = function(oChange, oChart, mPropertyBag) {
 		mPropertyBag.modifier.setProperty(oChart, "chartType", oChange.getRevertData());
 		oChange.resetRevertData();
+		return Promise.resolve();
+	};
+
+	var fGetCondenserInfoChartType = function(oChange, mPropertyBag) {
+		return {
+			classification: Classification.LastOneWins,
+			affectedControl: oChange.getSelector(),
+			uniqueKey: "chartType"
+		};
 	};
 
 	ChartTypeFlex.setChartType = Util.createChangeHandler({
 		apply: fSetChartType,
-		revert: fRevertChartType
+		revert: fRevertChartType,
+		getCondenserInfo: fGetCondenserInfoChartType
 	});
 
 	return ChartTypeFlex;