@openui5/sap.ui.mdc 1.112.0 → 1.113.0

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

@@ -7,6 +7,7 @@
 // Provides the base implementation for all model implementations
 sap.ui.define([
 	'sap/ui/mdc/field/ConditionsType',
+	'sap/ui/mdc/condition/ConditionValidateException',
 	'sap/ui/mdc/condition/FilterOperatorUtil',
 	'sap/ui/mdc/condition/Operator',
 	'sap/ui/mdc/condition/Condition',
@@ -17,10 +18,12 @@ sap.ui.define([
 	'sap/ui/model/FormatException',
 	'sap/ui/model/ParseException',
 	'sap/ui/model/ValidateException',
-	'sap/m/library'
+	'sap/m/library',
+	'sap/base/util/merge'
 ],
 	function(
 		ConditionsType,
+		ConditionValidateException,
 		FilterOperatorUtil,
 		Operator,
 		Condition,
@@ -31,7 +34,8 @@ sap.ui.define([
 		FormatException,
 		ParseException,
 		ValidateException,
-		mLibrary
+		mLibrary,
+		merge
 		) {
 	"use strict";
 
@@ -44,7 +48,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.field.ConditionsType
 	 *
 	 * @author SAP SE
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 *
 	 * @since 1.96.0
 	 * @private
@@ -55,15 +59,15 @@ sap.ui.define([
 	 * @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 {string} [oFormatOptions.fieldHelpID] ID of the field help to determine the key and description
+	 * @param {boolean} [oFormatOptions.hideOperator] If set, only the value of the condition is shown, but no operator. (Use it only if just one operator is supported.)
 	 * @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 {sap.ui.mdc.condition.ConditionObject} [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
@@ -210,7 +214,7 @@ sap.ui.define([
 		}
 
 		if (!Array.isArray(aConditions)) {
-			throw new ValidateException("No valid conditions provided");
+			throw new ConditionValidateException("No valid conditions provided", undefined, undefined, aConditions);
 		}
 
 		var oType = _getValueType.call(this);
@@ -220,16 +224,24 @@ sap.ui.define([
 			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"));
+				throw new ConditionValidateException(this._oResourceBundle.getText("field.VALUE_NOT_VALID"), undefined, typeof oCondition === "object" ? merge({}, oCondition) : oCondition, aConditions);
 			}
 
 			var oOperator = FilterOperatorUtil.getOperator(oCondition.operator);
 
 			if (!oOperator || aOperators.indexOf(oOperator.name) === -1) {
-				throw new ValidateException("No valid condition provided, Operator wrong.");
+				throw new ConditionValidateException("No valid condition provided, Operator wrong.", undefined, merge({}, oCondition), aConditions);
 			}
 
-			oOperator.validate(oCondition.values, oType);
+			try {
+				oOperator.validate(oCondition.values, oType);
+			} catch (oException) {
+				if (oException instanceof ValidateException) {
+					// add condition to exception to improve mapping in FieldBase handleValidationError
+					throw new ConditionValidateException(oException.message, oException.violatedConstraints, merge({}, oCondition), aConditions);
+				}
+				throw oException;
+			}
 		}
 
 	};

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

@@ -72,6 +72,17 @@ sap.ui.define([
 	var TextAlign = coreLibrary.TextAlign;
 	var TextDirection = coreLibrary.TextDirection;
 
+	/**
+	 * Modules for {@link sap.ui.mdc.Field Field} and {@link sap.ui.mdc.FilterField FilterField}
+	 * @namespace
+	 * @name sap.ui.mdc.field
+	 * @since 1.58.0
+	 * @private
+	 * @experimental As of version 1.58
+	 * @ui5-restricted sap.ui.mdc sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 */
+
 	/**
 	 * Constructor for a new <code>FieldBase</code>.
 	 *
@@ -79,14 +90,15 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 *
 	 * @class
-	 * The <code>FieldBase</code> control is the basic control to be used within the {@link sap.ui.mdc.Field Field} and {@link sap.ui.mdc.FilterField FilterField} controls.
+	 * The <code>FieldBase</code> control is the basic control to be used within the {@link sap.ui.mdc.Field Field}, {@link sap.ui.mdc.MultiValueField MultiValueField}
+	 * and {@link sap.ui.mdc.FilterField FilterField} controls.
 	 * It must not be used stand-alone.
 	 *
 	 * @extends sap.ui.mdc.Control
 	 * @implements sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.FieldBase
@@ -94,7 +106,8 @@ sap.ui.define([
 	 * @abstract
 	 *
 	 * @private
-	 * @ui5-restricted sap.ui.mdc
+	 * @ui5-restricted sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
 	 * @experimental As of version 1.58
 	 */
 	var FieldBase = Control.extend("sap.ui.mdc.field.FieldBase", /* @lends sap.ui.mdc.field.FieldBase.prototype */ {
@@ -270,7 +283,7 @@ sap.ui.define([
 				 * <ul>
 				 * <li><code>$filters</code> as the name of the condition model</li>
 				 * <li><code>/conditions/</code> as a required static part of the binding</li>
-				 * <li><code>navPath#42;/</code> as the navigation property name</li>
+				 * <li><code>navPath&#42;/</code> as the navigation property name</li>
 				 * <li><code>propertyPath</code> as the property name</li>
 				 * </ul>
 				 * Between <code>navPath</code> and <code>propertyPath</code>, <b>&#42;/</b> is required.
@@ -281,7 +294,8 @@ sap.ui.define([
 					type: "object[]",
 					group: "Data",
 					defaultValue: [],
-					byValue: true
+					byValue: true,
+					bindable: "bindable"
 				},
 
 				/**
@@ -441,15 +455,15 @@ sap.ui.define([
 				/**
 				 * Optional <code>FieldHelp</code>.
 				 *
-				 * This is an association that allows the usage of one <code>FieldHelp</code> instance for multiple fields.
+				 * This is an association that allows the usage of one <code>ValueHelp</code> instance for multiple fields.
 				 *
-				 * <b>Note:</b> If the field is inside of a table, do not set the <code>FieldHelp</code> instance as <code>dependent</code>
+				 * <b>Note:</b> If the field is inside of a table, do not set the <code>ValueHelp</code> instance as <code>dependent</code>
 				 * to the field. If you do, every field instance in every table row gets a clone of it.
-				 * Put the <code>FieldHelp</code> instance e.g. as dependent on the table or page.
+				 * Put the <code>ValueHelp</code> instance e.g. as dependent on the table or page.
 				 * The <code>FieldHelp</code> instance must be somewhere in the control tree, otherwise there might
 				 * be rendering or update issues.
 				 *
-				 * <b>Note:</b> For <code>Boolean</code> fields, no <code>FieldHelp</code> should be added, but a default <code>FieldHelp</code> used instead.
+				 * <b>Note:</b> For <code>Boolean</code> fields, no <code>ValueHelp</code> should be added, but a default <code>ValueHelp</code> used instead.
 				 */
 				fieldHelp: {
 					type: "sap.ui.mdc.ValueHelp",
@@ -1337,7 +1351,11 @@ sap.ui.define([
 	};
 
 	/*
-	 * If Field is inside of a SemanticFormElement return formatted value in display mode
+	 * If Field is inside of a {@link sap.ui.layout.form.SemanticFormElement SemanticFormElement} return formatted value in display mode
+	 *
+	 * @returns {string} formatted value of the field
+	 * @private
+	 * @ui5-restricted sap.ui.layout.form.SemanticFormElement
 	 */
 	FieldBase.prototype.getFormFormattedValue = function() {
 
@@ -1372,7 +1390,11 @@ sap.ui.define([
 	};
 
 	/*
-	 * If Field is inside of a SemanticFormElement return value holding property (don't use "value" property of Field as conditions are updares async)
+	 * If Field is inside of a {@link sap.ui.layout.form.SemanticFormElement SemanticFormElement} return value holding property (don't use "value" property of Field as conditions are updated async)
+	 *
+	 * @returns {string} name of the value holding property
+	 * @private
+	 * @ui5-restricted sap.ui.layout.form.SemanticFormElement
 	 */
 	FieldBase.prototype.getFormValueProperty = function() {
 
@@ -1491,16 +1513,16 @@ sap.ui.define([
 	}
 
 	/**
-	 * Assigns a <code>Label</code> control to the <code>Field</code> or </code>FilterField</code> controls.
+	 * Assigns a <code>Label</code> control to the {@link sap.ui.mdc.Field Field} or {@link sap.ui.mdc.FilterField FilterField} controls.
 	 *
-	 * The text of the label is taken from the <code>Field</code> or </code>FilterField</code> controls.
-	 * The <code>labelFor</code> association is set to the <code>Field</code> or </code>FilterField</code> control.
+	 * The text of the label is taken from the {@link sap.ui.mdc.Field Field} or {@link sap.ui.mdc.FilterField FilterField} controls.
+	 * The <code>labelFor</code> association is set to the {@link sap.ui.mdc.Field Field} or {@link sap.ui.mdc.FilterField FilterField} control.
 	 *
 	 * @param {sap.ui.core.Label} oLabel Label control
 	 * @returns {this} Reference to <code>this</code> to allow method chaining
 	 *
 	 * @private
-	 * @ui5-restricted sap.fe
+	 * @ui5-restricted sap.ui.mdc sap.fe
 	 * @MDC_PUBLIC_CANDIDATE
 	 * @experimental As of version 1.62.0
 	 * @since 1.62.0 Disclaimer: this function is in a beta state - incompatible API changes may be done before its official public release. Use at your own discretion.
@@ -1815,6 +1837,7 @@ sap.ui.define([
 			var sId = _getIdForInternalControl.call(this);
 			this._oCreateContentPromise = this._getContentFactory().createContent(oContentType, sContentMode, sId);
 			this._oCreateContentPromise.then(function(aControls) {
+				delete this._oCreateContentPromise; // after finished new creation request can be sync again (clear at the beginning as error might break function before end)
 				for (var iIndex = 0; iIndex < aControls.length; iIndex++) {
 					var oControl = aControls[iIndex];
 					oControl.attachEvent("parseError", _handleParseError, this);
@@ -1830,7 +1853,9 @@ sap.ui.define([
 				}
 
 				_refreshLabel.call(this);
-				delete this._oCreateContentPromise; // after finished new creation request can be sync again
+			}.bind(this)).catch(function(oException) {
+				delete this._oCreateContentPromise; // clean up to not run into endless loop
+				throw oException;
 			}.bind(this));
 		}
 	}

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

@@ -162,22 +162,14 @@ sap.ui.define([
 	};
 
 	/**
-	 * Determines the key, description, and the in and out parameters of a user input.
+	 * Determines the key, description, and payload of a user input.
 	 *
 	 * If this needs to be determined asynchronously, a <code>Promise</code> is returned.
 	 *
-	 * The result needs to be an object containing the following properties: description, key, and in and out parameters.
-	 * <ul>
-	 * <li><code>key</code>: Key of the item </li>
-	 * <li><code>description</code>: Description of the item </li>
-	 * <li><code>inParameters</code>: Object with in parameters and the corresponding value </li>
-	 * <li><code>outParameters</code>: Object with out parameters and the corresponding value </li>
-	 * </ul>
-	 *
 	 * If the item cannot be determined, a corresponding <code>ParseException<code> is thrown.
 	 *
 	 * @param {object} oPayload Payload for delegate
-	 * @param {sap.ui.mdc.ValueHelp} oValueHelp Field help assigned to the <code>Field</code> or <code>FilterField</code> control
+	 * @param {sap.ui.mdc.ValueHelp} oValueHelp Field help assigned to the {@link sap.ui.mdc.Field Field} or {@link sap.ui.mdc.FilterField FilterField} control
 	 * @param {object} [oConfig] Configuration
 	 * @param {any} oConfig.value Value as entered by user
 	 * @param {any} oConfig.parsedValue Value parsed by data type to fit the data type of the key
@@ -185,7 +177,7 @@ sap.ui.define([
 	 * @param {boolean} oConfig.checkKey If set, it should be checked if there is an item with the given key. This is set to <code>false</code> if the value cannot be a valid key because of type validation.
 	 * @param {boolean} oConfig.checkDescription If set, it should be checked if there is an item with the given description. This is set to <code>false</code> if only the key is used in the field.
 	 * @param {sap.ui.core.Control} oConfig.control Instance if the calling control
-	 * @returns {object|Promise} Object containing description, key, in and out parameters. If it is not available right now (must be requested), a <code>Promise</code> is returned.
+	 * @returns {sap.ui.mdc.valuehelp.ValueHelpItem|Promise<sap.ui.mdc.valuehelp.ValueHelpItem>} Object containing description, key, and payload. If it is not available right now (must be requested), a <code>Promise</code> is returned.
 	 * @throws {sap.ui.model.ParseException} if item cannot be determined
 	 * @since: 1.78.0
 	 * @private
@@ -203,7 +195,7 @@ sap.ui.define([
 	/**
 	 * Determines the description for a given key.
 	 *
-	 * This function is called while formatting the output of a <code>Field</code> or <code>FilterField</code> control
+	 * This function is called while formatting the output of a {@link sap.ui.mdc.Field Field} or {@link sap.ui.mdc.FilterField FilterField} control
 	 * in case a description is to be displayed but only a key is given.
 	 *
 	 * If this needs to be determined asynchronously, a <code>Promise</code> is returned.
@@ -213,10 +205,10 @@ sap.ui.define([
 	 * If the description cannot be determined, a corresponding <code>FormatException<code> is thrown.
 	 *
 	 * @param {object} oPayload Payload for delegate
-	 * @param {sap.ui.mdc.ValueHelp} oValueHelp Field help assigned to the <code>Field</code> or <code>FilterField</code> control
+	 * @param {sap.ui.mdc.ValueHelp} oValueHelp Field help assigned to the {@link sap.ui.mdc.Field Field} or {@link sap.ui.mdc.FilterField FilterField} control
 	 * @param {any} vKey Key
-	 * @param {object} oInParameters In parameters for the key (as a key must not be unique.)
-	 * @param {object} oOutParameters Out parameters for the key (as a key must not be unique.)
+	 * @param {object} oInParameters In parameters for the key (as a key must not be unique.) (Only filled in conditions of old variants.)
+	 * @param {object} oOutParameters Out parameters for the key (as a key must not be unique.) (Only filled in conditions of old variants.)
 	 * @param {sap.ui.model.Context} oBindingContext <code>BindingContext</code> of the checked field. Inside a table the <code>FieldHelp</code> element might be connected to a different row.
 	 * @param {sap.ui.mdc.condition.ConditionModel} [oConditionModel] <code>ConditionModel</code>, if bound to one - NOT LONGER USED
 	 * @param {string} [sConditionModelName] Name of the <code>ConditionModel</code>, if bound to one - NOT LONGER USED

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

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A <code>FieldInfoBase</code> element is a base class that shows any kind of information related to the <code>Field</code> control, for example, navigation targets or contact details.
 	 * @extends sap.ui.mdc.Element
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 * @constructor
 	 * @private
 	 * @since 1.54.0

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class The <code>FieldInput</code> control is used to render an input field inside a control based on {@link sap.ui.mdc.field.FieldBase FieldBase}.
 	 * @extends sap.m.Input
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 * @constructor
 	 * @abstract
 	 * @private

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

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @class Functions uses in <code>FieldInputRenderer</code> and <code>FieldMultiInputRenderer</code> to adjust aria attributes.
 	 *
 	 * @author SAP SE
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 * @since 1.86.0
 	 * @alias sap.ui.mdc.field.FieldInputRenderUtil
 	 *

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class The <code>FieldMultiInput</code> control is used to render a multi-input field inside a control based on {@link sap.ui.mdc.field.FieldBase FieldBase}.
 	 * @extends sap.m.MultiInput
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 * @constructor
 	 * @abstract
 	 * @private

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

@@ -18,12 +18,12 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 *
 	 * @class
-	 * An item that is used in the {@link sap.ui.mdc.field.ListFieldHelp ListFieldHelp} element if grouping is needed.
+	 * An item that is used in the {@link sap.ui.mdc.valuehelp.content.FixedList FixedList}.
 	 *
 	 * @extends sap.ui.core.ListItem
 	 *
 	 * @author SAP SE
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.fe

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.112.0
+	 * @version 1.113.0
 	 * @constructor
 	 * @abstract
 	 * @private

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

@@ -23,11 +23,11 @@ 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.112.0
+	 * @version 1.113.0
 	 * @constructor
 	 * @abstract
 	 * @private
-	 * @ui5-restricted sap.ui.mdc.field.TokenDisplay
+	 * @ui5-restricted sap.ui.mdc.field.FieldBase
 	 * @since 1.99.0
 	 * @alias sap.ui.mdc.field.TokenDisplay
 	 */

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

@@ -28,11 +28,11 @@ 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.112.0
+	 * @version 1.113.0
 	 * @constructor
 	 * @abstract
 	 * @private
-	 * @ui5-restricted sap.ui.mdc.field.TokenizerDisplay
+	 * @ui5-restricted sap.ui.mdc.field.FieldBase
 	 * @since 1.99.0
 	 * @alias sap.ui.mdc.field.TokenizerDisplay
 	 */

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

@@ -62,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.112.0
+	 * @version 1.113.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -666,17 +666,12 @@ sap.ui.define([
 		}
 	};
 
-	FilterBarBase.prototype._isPersistenceSupported = function(oEvent) {
-		return this.getEngine().isModificationSupported(this);
-	};
-
 	FilterBarBase.prototype.getPropertyInfoSet = function() {
 		return this.getPropertyHelper() ? this.getPropertyHelper().getProperties() : [];
 	};
 
 
 	FilterBarBase.prototype._addConditionChange = function(pConditionState) {
-
 		this._aOngoingChangeAppliance.push(this.getEngine().createChanges({
 			control: this,
 			applySequentially: true,
@@ -704,7 +699,7 @@ sap.ui.define([
 
 				var sFieldPath = sPath.substring("/conditions/".length);
 
-				if (this._bPersistValues && this._isPersistenceSupported()) {
+				if (this._bPersistValues) {
 
 					var aConditions = oEvent.getParameter("value");
 
@@ -1880,13 +1875,13 @@ sap.ui.define([
 			this._bDoNotTriggerFiltersChangeEventBasedOnVariantSwitch = true;
 		}
 
-		return this.awaitPendingModification().then(function(aChangesProcessed){
+		return this.awaitPendingModification().then(function(aAffectedControllers){
 			//clean-up fields in error state
 			this._cleanUpAllFilterFieldsInErrorState();
 
 			// ensure that the initial filters are applied --> only trigger search & validate when no filterbar changes exists.
 			// Filterbar specific changes will be handled via _onModifications.
-			if (this._bInitialFiltersApplied && (aChangesProcessed.length === 0)) {
+			if (this._bInitialFiltersApplied && (aAffectedControllers.indexOf("Filter") === -1)) {
 				this._reportModelChange({
 					triggerFilterUpdate: false,
 					triggerSearch: this._bExecuteOnSelect

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.112.0
+	 * @version 1.113.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.112.0
+	 * @version 1.113.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -311,15 +311,6 @@ sap.ui.define([
 		return this.getEngine().waitForChanges(this._getAdaptationControlInstance());
 	};
 
-	AdaptationFilterBar.prototype.applyConditionsAfterChangesApplied = function(oControl) {
-		if (oControl === this._getAdaptationControlInstance()) {
-			this._getWaitForChangesPromise()
-			.then(function(){
-				this.triggerSearch();
-			}.bind(this));
-		}
-	};
-
 	/**
 	 * Method which will initialize the <code>AdaptationFilterBar</code> and create the required FilterFields
 	 *
@@ -384,11 +375,13 @@ sap.ui.define([
 			}.bind(this));
 
 			return Promise.all(aFieldPromises).then(function(){
-				this.getP13nData().items.forEach(function(oItem){
+				var oP13nData = this.getP13nData();
+				oP13nData.items.forEach(function(oItem){
 					this.addAggregation("filterItems", this.mFilterFields[oItem.name]);
 				}.bind(this));
 
-				this._oFilterBarLayout.setP13nData(this.getP13nData());
+				this._updateActiveStatus(oP13nData.items);
+				this._oFilterBarLayout.setP13nData(oP13nData);
 				this._bFilterFieldsCreated = true;
 
 				return this;

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

@@ -76,7 +76,7 @@ sap.ui.define([
 	};
 
 	GroupContainer.prototype.getInitialFocusedControl = function() {
-		return this.oLayout._getSearchField && this.oLayout._getSearchField();
+		return this.oLayout.getInitialFocusedControl && this.oLayout.getInitialFocusedControl();
 	};
 
 	return GroupContainer;

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.112.0
+		 * @version 1.113.0
 		 * @constructor
 		 * @private
 		 * @ui5-restricted sap.fe

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

@@ -13,27 +13,31 @@ sap.ui.define([
     var oActionFlex = Object.assign({}, ItemBaseFlex);
 
 	oActionFlex.findItem = function(oModifier, aActions, sName) {
-		return sap.ui.getCore().byId(sName);
+		return aActions.find(function (oAction) {
+			return oModifier.getId(oAction) === sName;
+		});
 	};
 
 	oActionFlex.determineAggregation = function(oModifier, oControl) {
-		return Promise.resolve().then(function() {
+		return oModifier.getAggregation(oControl, "actions").then(function(aActions) {
 			return {
 				name: "actions",
-				items: oControl.getActions()
+				items: aActions
 			};
 		});
 	};
 
 	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")) {
+		var oModifier = mPropertyBag.modifier;
+		if (oModifier.getParent(oControl)){
+			var oParent = oModifier.getParent(oControl);
+			if (oModifier.getControlType(oParent) === "sap.ui.mdc.Chart") {
 				// ActionToolbar of sap.ui.mdc.Chart
-				oControl = oControl.getParent();
-			} else if (oControl.getParent().getParent().isA("sap.ui.mdc.Table")) {
+				oControl = oParent;
+			} else if (oModifier.getParent(oParent) && oModifier.getControlType(oModifier.getParent(oParent)) === "sap.ui.mdc.Table") {
 				// ActionToolbar of sap.ui.mdc.Table
-				oControl = oControl.getParent().getParent();
+				oControl = oModifier.getParent(oParent);
 			}
 		}
 		this.beforeApply(oChange.getChangeType(), oControl, bIsRevert);
@@ -41,11 +45,11 @@ sap.ui.define([
 			this._delayInvalidate(oControl);
 		}
 
-		var oModifier = mPropertyBag.modifier;
 		var oChangeContent = bIsRevert ? oChange.getRevertData() : oChange.getContent();
 		var oControlAggregationItem;
 		var oAggregation;
 		var iOldIndex;
+		var sControlAggregationItemId;
 
 		// 1) Fetch existing item
 		var pMove = this.determineAggregation(oModifier, oControl)
@@ -62,6 +66,7 @@ sap.ui.define([
 			if (!oControlAggregationItem) {
 				throw new Error("No corresponding item in " + oAggregation.name + " found. Change to move item cannot be " + this._getOperationText(bIsRevert) + "at this moment");
 			}
+			sControlAggregationItemId = oModifier.getId(oControlAggregationItem);
 			return oModifier.findIndexInParentAggregation(oControlAggregationItem);
 		}.bind(this))
 
@@ -82,7 +87,8 @@ sap.ui.define([
 			} else {
 				oChange.setRevertData({
 					name: oChangeContent.name,
-					index: iOldIndex
+					index: iOldIndex,
+					item: sControlAggregationItemId
 				});
 			}
 			this.afterApply(oChange.getChangeType(), oControl, bIsRevert);

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

@@ -10,25 +10,6 @@ sap.ui.define([
 ], function(Engine, Util, CondenserClassification) {
 	"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;
-				Engine.getInstance().waitForChanges(oControl).then(function () {
-					if (bExecuteRebindForTable) {
-						oControl.rebind();
-					} else if (bExecuteRebindForChart) {
-						oControl.rebind();
-					}
-					delete oControl._bWaitForBindChanges;
-				});
-
-			}
-		}
-	};
-
 	var fFinalizeAggregateChange = function (oChange, oControl, oAggregateContent, bIsRevert) {
 		if (bIsRevert) {
 			// Clear the revert data on the change
@@ -37,8 +18,6 @@ sap.ui.define([
 			// Set revert data on the change
 			oChange.setRevertData(oAggregateContent);
 		}
-		// Rebind Table if needed
-		fRebindControl(oControl);
 	};
 
 	var fAddAggregate = function (oChange, oControl, mPropertyBag, sChangeReason) {

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.112.0
+	 * @version 1.113.0
 	 */
 	return {
 		addItem: ChartItemFlex.addItem,