@openui5/sap.ui.mdc 1.112.2 → 1.114.0

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

@@ -4,17 +4,25 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-// Provides control sap.ui.mdc.filterbar.FilterItemLayout.
 sap.ui.define([
 	'sap/ui/core/Element'
 ], function(Element) {
 	"use strict";
 
+	/**
+	 * @class The <code>IFilterContainer</code> is the base container for the visualization of the filter items in the filter bar.
+	 * @private
+	 * @ui5-restricted sap.fe sap.ui.mdc
+	 * @MDC_PUBLIC_CANDIDATE
+	 * @since 1.61.0
+	 * @alias sap.ui.mdc.filterbar.IFilterContainer
+	 */
 	var IFilterContainer = Element.extend("sap.ui.mdc.filterbar.IFilterContainer");
 
 	/**
-	 * Creates the inner layout for the IFilterContainer.
-	 * @protected
+	 * Creates the inner layout for the <code>IFilterContainer</code>.
+	 * @private
+	 * @MDC_PUBLIC_CANDIDATE
 	 * @ui5-restricted sap.ui.mdc, sap.fe
 	 */
 	IFilterContainer.prototype.init = function() {
@@ -24,8 +32,9 @@ sap.ui.define([
 
 	/**
 	 * Getter for the inner layout item.
-	 * @returns {sap.ui.core.Control} Control instance of the inner layout item.
-	 * @protected
+	 * @returns {sap.ui.core.Control} Control instance of the inner layout item
+	 * @private
+	 * @MDC_PUBLIC_CANDIDATE
 	 * @ui5-restricted sap.ui.mdc, sap.fe
 	 */
 	IFilterContainer.prototype.getInner = function(){
@@ -33,26 +42,33 @@ sap.ui.define([
 	};
 
 	/**
-	 * Insert the inner content to the layout item.
-	 * @protected
+	 * Inserts the inner content into the layout item.
+	 * @private
+	 * @MDC_PUBLIC_CANDIDATE
+	 * @ui5-restricted sap.ui.mdc, sap.fe
+	 * @param {sap.ui.mdc.FilterItem} oControl to be inserted
+	 * @param {int} iIndex Position where the control is added
 	 */
 	IFilterContainer.prototype.insertFilterField = function(oControl, iIndex) {
 		//insert the content to the inner layout this.oLayout
 	};
 
 	/**
-	 * Remove the inner content from the layout item.
-	 * @protected
+	 * Removes the inner content from the layout item.
+	 * @private
+	 * @MDC_PUBLIC_CANDIDATE
 	 * @ui5-restricted sap.ui.mdc, sap.fe
+	 * @param {sap.ui.mdc.FilterItem} oControl Control that is removed
 	 */
 	IFilterContainer.prototype.removeFilterField = function(oControl) {
 		//remove the content from the inner layout this.oLayout
 	};
 
 	/**
-	 * Insert the inner content to the layout item.
-	 * @returns {Array} Array of all inner controls in the layout item.
-	 * @protected
+	 * Returns the inner controls of the layout item.
+	 * @returns {sap.ui.mdc.FilterItem[]} Array of all inner controls in the layout item
+	 * @private
+	 * @MDC_PUBLIC_CANDIDATE
 	 * @ui5-restricted sap.ui.mdc, sap.fe
 	 */
 	IFilterContainer.prototype.getFilterFields = function() {
@@ -60,9 +76,10 @@ sap.ui.define([
 	};
 
 	/**
-	 * Overwrite the default 'exit' to cleanup the created layout properly
+	 * Overwrites the default exit to clean up the created layout properly.
 	 *
-	 * @protected
+	 * @private
+	 * @MDC_PUBLIC_CANDIDATE
 	 * @ui5-restricted sap.ui.mdc, sap.fe
 	 */
 	IFilterContainer.prototype.exit = function() {

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

@@ -20,17 +20,16 @@ sap.ui.define([
 	 *     A reference to an instance that will act as the parent of this helper
 	 *
 	 * @class
-	 * Filter bar property helpers give a consistent and standardized view on properties and their attributes.
-	 * Validates the given properties, sets defaults, and provides utilities to work with these properties.
+	 * Filter bar property helper provide a consistent and standardized view on properties and their attributes.
+	 * Validates the given properties, sets default values, and provides utilities to work with these properties.
 	 * The utilities can only be used for properties that are known to the helper. Known properties are all those that are passed to the constructor.
 	 *
 	 * @extends sap.ui.mdc.util.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.114.0
 	 *
-	 * @private
-	 * @experimental
+	 * @public
 	 * @since 1.95
 	 * @alias sap.ui.mdc.filterbar.PropertyHelper
 	 */
@@ -49,9 +48,9 @@ sap.ui.define([
 
 
 	/**
-	 * Applies defaults and resolves property references.
+	 * Applies default values and resolves property references.
 	 *
-	 * @param {object} oProperty The property to prepare
+	 * @param {object} oProperty The passed property
 	 * @protected
 	 */
 	PropertyHelper.prototype.prepareProperty = function(oProperty) {

package/src/sap/ui/mdc/filterbar/aligned/FilterContainer.js

@@ -4,7 +4,6 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-// Provides control sap.ui.mdc.filterbar.aligned.FilterItemLayout.
 sap.ui.define([
 	'sap/ui/mdc/filterbar/IFilterContainer', 'sap/ui/layout/AlignedFlowLayout'
 ], function(IFilterContainer, AlignedFlowLayout) {
@@ -12,11 +11,10 @@ sap.ui.define([
 	/**
 	 * Constructor for a new filterBar/aligned/FilterContainer.
 	 * @param {string} [sId] ID for the new control, generated automatically if no ID is given
-	 * @class The FilterContainer is a IFilterContainer implementation for <code>AlignedFlowLayout</code>
+	 * @class The <code>FilterContainer</code> is an {@link sap.ui.layout.IFilterContainer IFilterContainer} implementation for {@link sap.ui.layout.AlignedFlowLayout AlignedFlowLayout}.
+	 * It is used by the {@link sap.ui.mdc.FilterBar FilterBar} to display the filter items.
 	 * @extends sap.ui.mdc.filterbar.IFilterContainer
 	 * @constructor
-	 * @private
-	 * @ui5-restricted sap.ui.mdc, sap.fe
 	 * @since 1.80.0
 	 * @alias sap.ui.mdc.filterbar.aligned.FilterContainer
 	 */

package/src/sap/ui/mdc/filterbar/aligned/FilterItemLayout.js

@@ -16,8 +16,6 @@ sap.ui.define(['sap/ui/layout/VerticalLayout', 'sap/ui/layout/VerticalLayoutRend
 	 * @class Represents a filter item on the UI.
 	 * @extends sap.ui.layout.VerticalLayout
 	 * @constructor
-	 * @private
-	 * @ui5-restricted sap.ui.mdc, sap.fe
 	 * @since 1.61.0
 	 * @alias sap.ui.mdc.filterbar.aligned.FilterItemLayout
 	 */

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.2
+	 * @version 1.114.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -79,7 +79,7 @@ sap.ui.define([
 
 	/**
 	 * This method will be called whenever the <code>AdaptationFilterBar</code> will be instantiated in a Dialog using the
-	 * <code>sap.m.p13n.UIManager</code>. This flag determines whether the control should be destroyed or kept alive once the p13n
+	 * {@link sap.m.p13n.UIManager}. This flag determines whether the control should be destroyed or kept alive once the p13n
 	 * dialog closes.
 	 *
 	 * @private
@@ -266,7 +266,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * Please note that the provided model should be created with sap.ui.mdc.p13n.P13nBuilder
+	 * Please note that the provided model should be created with {@link sap.ui.mdc.p13n.P13nBuilder}
 	 *
 	 * @param {object[]} aP13nData Necessary data to display and create <code>FilterColumnLayout</code> instances.
 	 *
@@ -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
 	 *
@@ -330,11 +321,13 @@ sap.ui.define([
 			var mConditions = this._bPersistValues ? this._getAdaptationControlInstance().getFilterConditions() : this._getAdaptationControlInstance()._getXConditions();
 
 			this.setFilterConditions(mConditions);
-			this._setXConditions(mConditions);
+			var pConditions = this._setXConditions(mConditions);
 
 			if (this._bFilterFieldsCreated) {
-				this._oFilterBarLayout.setP13nData(this.getP13nData());
-				return this;
+				return pConditions.then(function(){
+					this._oFilterBarLayout.setP13nData(this.getP13nData());
+					return this;
+				}.bind(this));
 			}
 
 			var oAdaptationControl = this._getAdaptationControlInstance();
@@ -384,11 +377,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;
@@ -473,6 +468,7 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.mdc.Control} oControl the mdc control instance
 	 * @param {boolean} bSuppressInvalidate suppress invalidation
+	 * @return {sap.ui.mdc.filterbar.p13n.AdaptationFilterBar} this
 	 */
 	AdaptationFilterBar.prototype.setAdaptationControl = function(oControl, bSuppressInvalidate) {
 

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

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

@@ -11,20 +11,6 @@ sap.ui.define([
 
 	var ColumnFlex = Object.assign({}, ItemBaseFlex);
 
-	// Rebind triggered on the Control only during runtime JS change
-	var fRebindControl = function(oControl) {
-		if (oControl && oControl.isA && oControl.isA("sap.ui.mdc.Table") && oControl.isTableBound()) {
-			if (!oControl._bWaitForBindChanges) {
-				oControl._bWaitForBindChanges = true;
-				Engine.getInstance().waitForChanges(oControl).then(function() {
-					oControl.rebind();
-					delete oControl._bWaitForBindChanges;
-				});
-
-			}
-		}
-	};
-
 	ColumnFlex.findItem = function(oModifier, aColumns, sName) {
 		return aColumns.reduce(function(oPreviousPromise, oColumn) {
 			return oPreviousPromise
@@ -43,10 +29,6 @@ sap.ui.define([
 		}, Promise.resolve());
 	};
 
-	ColumnFlex.afterApply = function(sChangeType, oTable, bIsRevert) {
-		fRebindControl(oTable);
-	};
-
 	ColumnFlex.addColumn = ColumnFlex.createAddChangeHandler();
 	ColumnFlex.removeColumn = ColumnFlex.createRemoveChangeHandler();
 	ColumnFlex.moveColumn = ColumnFlex.createMoveChangeHandler();

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

@@ -38,21 +38,11 @@ sap.ui.define([
 		});
 	};
 
-	var fDetermineFilterControl = function(oControl) {
-		var oController = oControl && oControl.getEngine ? oControl.getEngine().getController(oControl, "Filter") : null;
-		return oController ? oController.getFilterControl() : null;
-	};
-
 	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);
-		}
-
 		var mConditionsData, aConditions = null, oModifier = mPropertyBag.modifier;
 
 		return fnQueueChange(oControl, function(){
@@ -116,14 +106,9 @@ sap.ui.define([
 
 	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);
-		}
-
 		var mConditionsData, aConditions, nDelIndex = -1, oModifier = mPropertyBag.modifier;
 
 		return fnQueueChange(oControl, function(){

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.112.2
+	 * @version 1.114.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.112.2
+	 * @version 1.114.0
 	 */
 
 	var oFilterItemFlex = Object.assign({}, ItemBaseFlex);

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

@@ -11,25 +11,6 @@ sap.ui.define([
 ], function(Engine, Util, FLChangeHandlerBase, 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 fFinalizeGroupChange = function (oChange, oControl, oGroupContent, bIsRevert) {
 		if (bIsRevert) {
 			// Clear the revert data on the change
@@ -38,8 +19,6 @@ sap.ui.define([
 			// Set revert data on the change
 			oChange.setRevertData(oGroupContent);
 		}
-		// Rebind Table if needed
-		fRebindControl(oControl);
 	};
 
 	var fAddGroup = function (oChange, oControl, mPropertyBag, sChangeReason) {
@@ -194,7 +173,8 @@ sap.ui.define([
 				targetContainer: oChange.getSelector(),
 				targetAggregation: "groupLevels",
 				classification: CondenserClassification.Move,
-				sourceIndex: oChange.getContent().index,
+				//sourceIndex: oChange.getContent().index,
+				sourceIndex: oChange.getRevertData().index,
 				customAggregation: mPropertyBag.modifier.bySelector(oChange.getSelector(), mPropertyBag.appComponent).getGroupConditions().groupLevels,
 				sourceContainer: oChange.getSelector(),
 				sourceAggregation: "groupLevels",

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

@@ -263,7 +263,7 @@ sap.ui.define([
 						// Continue? --> destroy the item (but only if it exists, it may not exist if an earlier layer removed it already)
 						if (bContinue && oControlAggregationItem) {
 							// destroy the item
-							sControlAggregationItemId = sControlAggregationItemId = oControlAggregationItem.getId ? oControlAggregationItem.getId() : oControlAggregationItem.id;
+							sControlAggregationItemId = oModifier.getId(oControlAggregationItem);
 							oModifier.destroy(oControlAggregationItem, "KeepDom");
 						}
 						this.afterApply(oChange.getChangeType(), oControl, bIsRevert);

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

@@ -10,24 +10,6 @@ sap.ui.define([
 	"sap/ui/fl/changeHandler/condenser/Classification"
 ], function(Engine, Util, FLChangeHandlerBase, 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 fFinalizeSortChange = function(oChange, oControl, oSortContent, bIsRevert) {
 		if (bIsRevert) {
@@ -37,8 +19,6 @@ sap.ui.define([
 			// Set revert data on the change
 			oChange.setRevertData(oSortContent);
 		}
-		// Rebind Table if needed
-		fRebindControl(oControl);
 	};
 
 	var fAddSort = function(oChange, oControl, mPropertyBag, sChangeReason) {
@@ -194,7 +174,8 @@ sap.ui.define([
 				targetContainer: oChange.getSelector(),
 				targetAggregation: "sorters",
 				classification: CondenserClassification.Move,
-				sourceIndex: oChange.getContent().index,
+				//sourceIndex: oChange.getContent().index,
+				sourceIndex: oChange.getRevertData().index,
 				customAggregation: mPropertyBag.modifier.bySelector(oChange.getSelector(), mPropertyBag.appComponent).getSortConditions().sorters,
 				sourceContainer: oChange.getSelector(),
 				sourceAggregation: "sorters",

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

@@ -117,18 +117,20 @@ sap.ui.define([
 				onAfterXMLChangeProcessing: function(oControl, mPropertyBag) {
 					mPropertyBag.modifier.getProperty(oControl, "delegate")
 					.then(function(oDelegate){
-						loadModules(oDelegate.name)
-						.then(function(aModules){
-							var oDelegate = aModules[0];
+						if (oDelegate) {
+							loadModules(oDelegate.name)
+							.then(function(aModules){
+								var oDelegate = aModules[0];
 
-							if (oDelegate.onAfterXMLChangeProcessing instanceof Function) {
-								oDelegate.onAfterXMLChangeProcessing(oControl, mPropertyBag);
-							}
+								if (oDelegate.onAfterXMLChangeProcessing instanceof Function) {
+									oDelegate.onAfterXMLChangeProcessing(oControl, mPropertyBag);
+								}
 
-						});
+							});
+						}
 					});
-				}
-//				,getCondenserInfo: mSettings.getCondenserInfo
+				},
+				getCondenserInfo: mSettings.getCondenserInfo
 			},
 			"layers": {
 				"USER": true

package/src/sap/ui/mdc/flp/FlpLinkDelegate.js

@@ -187,7 +187,7 @@ sap.ui.define([
 					};
 				}
 
-				// If more then one local property maps to the same target property (clash situation)
+				// If more than one local property maps to the same target property (clash situation)
 				// we take the value of the last property and write an error log
 				if (oResults[sSemanticObject][sAttributeNameMapped]) {
 					SapBaseLog.error("FlpLinkDelegate: The attribute " + sAttributeName + " can not be renamed to the attribute " + sAttributeNameMapped + " due to a clash situation. This can lead to wrong navigation later on.");