@openui5/sap.ui.mdc 1.100.0 → 1.101.0

package/src/sap/ui/mdc/p13n/Engine.js

@@ -12,12 +12,12 @@ sap.ui.define([
 	"sap/ui/mdc/p13n/modification/FlexModificationHandler",
 	"sap/m/MessageStrip",
 	"sap/ui/core/library",
-	"sap/ui/mdc/p13n/StateUtil",
 	"sap/ui/core/Element",
 	"sap/ui/mdc/p13n/modules/DefaultProviderRegistry",
 	"sap/ui/mdc/p13n/UIManager",
-	"sap/ui/mdc/p13n/modules/StateHandlerRegistry"
-], function (AdaptationProvider, merge, Log, PropertyHelper, FlexModificationHandler, MessageStrip, coreLibrary, StateUtil, Element, DefaultProviderRegistry, UIManager, StateHandlerRegistry) {
+	"sap/ui/mdc/p13n/modules/StateHandlerRegistry",
+	"sap/ui/mdc/p13n/modules/xConfigAPI"
+], function (AdaptationProvider, merge, Log, PropertyHelper, FlexModificationHandler, MessageStrip, coreLibrary, Element, DefaultProviderRegistry, UIManager, StateHandlerRegistry, xConfigAPI) {
 	"use strict";
 
 	var ERROR_INSTANCING = "Engine: This class is a singleton. Please use the getInstance() method instead.";
@@ -41,7 +41,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.p13n.AdaptationProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -161,6 +161,19 @@ sap.ui.define([
 		this._getRegistryEntry(vControl).modification = oModificationSetting;
 	};
 
+	var fnQueue = function(oControl, fTask) {
+		var fCleanupPromiseQueue = function(pOriginalPromise) {
+			if (oControl._pModificationQueue === pOriginalPromise){
+				delete oControl._pModificationQueue;
+			}
+		};
+
+		oControl._pModificationQueue = oControl._pModificationQueue instanceof Promise ? oControl._pModificationQueue.then(fTask) : fTask();
+		oControl._pModificationQueue.then(fCleanupPromiseQueue.bind(null, oControl._pModificationQueue));
+
+		return oControl._pModificationQueue;
+	};
+
 	/**
 	 * <code>Engine#createChanges</code> can be used to programmatically trigger the creation
 	 * of a set of changes based on the current control state and the provided state.
@@ -172,54 +185,67 @@ sap.ui.define([
 	 * @param {string} mDiffParameters.key The key used to retrieve the corresponding Controller.
 	 * @param {object} mDiffParameters.state The state which should be applied on the provided control instance
 	 * @param {boolean} [mDiffParameters.applyAbsolute] Decides whether unmentioned entries should be affected,
+	 * @param {boolean} [mDiffParameters.stateBefore] In case the state should be diffed manually
 	 * for example if "A" is existing in the control state, but not mentioned in the new state provided in the
 	 * mDiffParameters.state then the absolute appliance decides whether to remove "A" or to keep it.
 	 * @param {boolean} [mDiffParameters.suppressAppliance] Decides whether the change should be applied directly.
+	 * @param {boolean} [mDiffParameters.applySequentially] Decides whether the appliance should be queued or processed in parallel.
 	 * Controller
 	 *
 	 * @returns {Promise} A Promise resolving in the according delta changes.
 	 */
 	Engine.prototype.createChanges = function(mDiffParameters) {
 
-		var vControl = mDiffParameters.control;
 		var sKey = mDiffParameters.key;
 		var aNewState = mDiffParameters.state;
 		var bApplyAbsolute = !!mDiffParameters.applyAbsolute;
 		var bSuppressCallback = !!mDiffParameters.suppressAppliance;
-		if (!sKey || !vControl || !aNewState) {
+		var bApplySequentially = !!mDiffParameters.applySequentially;
+
+		if (!sKey || !mDiffParameters.control || !aNewState) {
 			throw new Error("To create changes via Engine, atleast a 1)Control 2)Key and 3)State needs to be provided.");
 		}
 
-		return this.initAdaptation(vControl, sKey).then(function(){
+		var oControl = Engine.getControlInstance(mDiffParameters.control);
 
-			var oController = this.getController(vControl, sKey);
-			var mChangeOperations = oController.getChangeOperations();
-
-			var oRegistryEntry = this._getRegistryEntry(vControl);
-			var oCurrentState = oController.getCurrentState();
-			var oPriorState = merge(oCurrentState instanceof Array ? [] : {}, oCurrentState);
-
-			var mDeltaConfig = {
-				existingState: oPriorState,
-				applyAbsolute: bApplyAbsolute,
-				changedState: aNewState,
-				control: oController.getAdaptationControl(),
-				changeOperations: mChangeOperations,
-				deltaAttributes: ["name"],
-				propertyInfo: oRegistryEntry.helper.getProperties().map(function(a){return {name: a.name};})
-			};
-
-			//Only execute change calculation in case there is a difference (--> example: press 'Ok' without a difference)
-			var aChanges = oController.getDelta(mDeltaConfig);
-
-			if (!bSuppressCallback) {
-				this._processChanges(vControl, aChanges);
-			}
+		var fDeltaHandling = function() {
+			return this.initAdaptation(oControl, sKey).then(function(){
 
-			return aChanges || [];
+				var oController = this.getController(oControl, sKey);
+				var mChangeOperations = oController.getChangeOperations();
 
-		}.bind(this));
+				var oRegistryEntry = this._getRegistryEntry(oControl);
+				var oCurrentState = oController.getCurrentState();
+				var oPriorState = merge(oCurrentState instanceof Array ? [] : {}, oCurrentState);
+
+				var mDeltaConfig = {
+					existingState: mDiffParameters.stateBefore || oPriorState,
+					applyAbsolute: bApplyAbsolute,
+					changedState: aNewState,
+					control: oController.getAdaptationControl(),
+					changeOperations: mChangeOperations,
+					deltaAttributes: ["name"],
+					propertyInfo: oRegistryEntry.helper.getProperties().map(function(a){return {name: a.name};})
+				};
+
+				//Only execute change calculation in case there is a difference (--> example: press 'Ok' without a difference)
+				var aChanges = oController.getDelta(mDeltaConfig);
+
+				if (!bSuppressCallback) {
+					return this._processChanges(oControl, aChanges);
+				}
+
+				return aChanges || [];
+
+			}.bind(this));
 
+		}.bind(this);
+
+		if (bApplySequentially) {
+			return fnQueue(oControl, fDeltaHandling);
+		} else {
+			return fDeltaHandling.apply(this);
+		}
 	};
 
 	/**
@@ -303,9 +329,6 @@ sap.ui.define([
 			.then(function(aChanges){
 				var oControl = Engine.getControlInstance(vControl);
 				this.stateHandlerRegistry.fireChange(oControl);
-				if (oControl._onChangeAppliance instanceof Function) {
-					oControl._onChangeAppliance.call(oControl);
-				}
 				return aChanges;
 			}.bind(this));
 		} else {
@@ -337,19 +360,19 @@ sap.ui.define([
 			return Promise.reject("Please do not use a PeristenceProvider in RTA.");
 		}
 
-		var oModificationHandler = this.getModificationHandler(oControl);
-		var fnInitialAppliance = oModificationHandler.processChanges;
+		var oOriginalModifHandler = this.getModificationHandler(oControl);
+		var oTemporaryRTAHandler = new FlexModificationHandler();
 
 		var oRTAPromise = new Promise(function(resolve, reject){
 			fResolveRTA = resolve;
 		});
 
-		oModificationHandler.processChanges = function(aChanges) {
+		oTemporaryRTAHandler.processChanges = function(aChanges) {
 			fResolveRTA(aChanges);
 			return Promise.resolve(aChanges);
 		};
 
-		this._setModificationHandler(oControl, oModificationHandler);
+		this._setModificationHandler(oControl, oTemporaryRTAHandler);
 
 		this.uimanager.show(oControl, aKeys).then(function(oContainer){
 			var oCustomHeader = oContainer.getCustomHeader();
@@ -363,8 +386,9 @@ sap.ui.define([
 		});
 
 		oRTAPromise.then(function(){
-			oModificationHandler.processChanges = fnInitialAppliance;
-		});
+			this._setModificationHandler(oControl, oOriginalModifHandler);
+			oTemporaryRTAHandler.destroy();
+		}.bind(this));
 
 		return oRTAPromise;
 
@@ -393,15 +417,14 @@ sap.ui.define([
 
 		return Promise.resolve()
 			.then(function() {
-				var oModificationHandler = this.getModificationHandler(vControl);
-				return oModificationHandler.enhanceConfig(oControl, mEnhanceConfig)
+				return xConfigAPI.enhanceConfig(oControl, mEnhanceConfig)
 					.then(function(oConfig){
 						if (oRegistryEntry) {
 							//to simplify debugging
 							oRegistryEntry.xConfig = oConfig;
 						}
 					});
-			}.bind(this));
+			});
 	};
 
 	/**
@@ -410,16 +433,56 @@ sap.ui.define([
 	 * @param {sap.ui.core.Element} vControl The according element which should be checked
 	 * @param {object} [mEnhanceConfig] An object providing a modification handler specific payload
 	 * @param {object} [mEnhanceConfig.propertyBag] Optional propertybag for different modification handler derivations
-	 * @param {boolean} [bSync] If the method should be executed synchronously; e.g. for the Table
 	 *
-	 * @returns {Promise<object>} Promise resolving with the adapted xConfig object
+	 * @returns {Promise<object>|object}
+	 *     A promise that resolves with the xConfig, the xConfig directly if it is already available, or <code>null</code> if there is no xConfig
 	 */
-	Engine.prototype.readXConfig = function(vControl, mEnhanceConfig, bSync) {
+	Engine.prototype.readXConfig = function(vControl, mEnhanceConfig) {
 
 		var oControl = Engine.getControlInstance(vControl);
-		var oModificationHandler = this.getModificationHandler(vControl);
-		return oModificationHandler.readConfig(oControl, mEnhanceConfig, bSync) || Promise.resolve({});
+		return xConfigAPI.readConfig(oControl, mEnhanceConfig) || {};
+	};
+
+	/**
+	 * The Engine is processing state via the internal key registry.
+	 * The external state representation might differ from the internal registration.
+	 * <b>Note:</b> This will only replace the keys to the external StateUtil representation, but not transform the state content itself.
+	 *
+	 * @private
+	 * @param {string|sap.ui.mdc.Control} vControl The registered control instance
+	 * @param {object} oInternalState The internal state
+	 * @returns {object} The externalized state
+	 */
+	Engine.prototype.externalizeKeys = function(vControl, oInternalState) {
+		var oExternalState = {};
+		Object.keys(oInternalState).forEach(function(sInternalKey){
+			var oController = this.getController(Engine.getControlInstance(vControl), sInternalKey);
+			if (oController) {
+				oExternalState[oController.getStateKey()] = oInternalState[sInternalKey];
+			}
+		}.bind(this));
+		return oExternalState;
+	};
 
+	/**
+	 * The Engine is processing state via the internal key registry.
+	 * The external state representation might differ from the internal registration.
+	 * <b>Note:</b> This will only replace the keys to the internal Engine registry, but not transform the state content itself.
+	 *
+	 * @private
+	 * @param {string|sap.ui.mdc.Control} vControl The registered control instance
+	 * @param {object} oExternalState The external state
+	 * @returns {object} The internalized state
+	 */
+	Engine.prototype.internalizeKeys = function (vControl, oExternalState) {
+		var aControllerKeys = this.getRegisteredControllers(vControl), oInternalState = {};
+		aControllerKeys.forEach(function(sInternalRegistryKey){
+			var sExternalStateKey = this.getController(vControl, sInternalRegistryKey).getStateKey();
+			if (oExternalState.hasOwnProperty(sExternalStateKey)) {
+				oInternalState[sInternalRegistryKey] = oExternalState[sExternalStateKey];
+			}
+		}.bind(this));
+		return oInternalState;
 	};
 
 	/**
@@ -444,7 +507,7 @@ sap.ui.define([
 			var aStatePromise = [], aChanges = [], mInfoState = {};
 
 			if (oControl.validateState instanceof Function) {
-				mInfoState = oControl.validateState(StateUtil._externalizeKeys(oState));
+				mInfoState = oControl.validateState(this.externalizeKeys(oControl, oState));
 			}
 
 			if (mInfoState.validation === MessageType.Error){
@@ -483,6 +546,39 @@ sap.ui.define([
 		}.bind(this));
 	};
 
+	Engine.prototype.diffState = function(oControl, oOld, oNew) {
+
+		var aDiffCreation = [], oDiffState = {};
+		oOld = merge({}, oOld);
+		oNew = merge({}, oNew);
+
+		this.getRegisteredControllers(oControl).forEach(function(sKey){
+
+			aDiffCreation.push(this.createChanges({
+				control: oControl,
+				stateBefore: oOld[sKey],
+				state: oNew[sKey],
+				applyAbsolute: true,
+				key: sKey,
+				suppressAppliance: true
+			}));
+
+		}.bind(this));
+
+		return Promise.all(aDiffCreation)
+		.then(function(aChanges){
+			this.getRegisteredControllers(oControl).forEach(function(sKey, i){
+
+				var aState = this.getController(oControl, sKey).changesToState(aChanges[i], oOld[sKey], oNew[sKey]);
+				oDiffState[sKey] = aState;
+
+			}.bind(this));
+
+			return oDiffState;
+
+		}.bind(this));
+	};
+
 	/**
 	 *  Retrieves the externalized state for a given control instance.
 	 *  The retrieved state is equivalent to the "getCurrentState" API for the given Control,
@@ -910,7 +1006,7 @@ sap.ui.define([
 		if (oController.model2State instanceof Function) {
 			oTheoreticalState[sKey] = oController.model2State();
 
-			var mInfoState = oControl.validateState(StateUtil._externalizeKeys(oTheoreticalState), sKey);
+			var mInfoState = oControl.validateState(this.externalizeKeys(oControl, oTheoreticalState), sKey);
 
 			var oMessageStrip;
 

package/src/sap/ui/mdc/p13n/FlexUtil.js

@@ -4,8 +4,8 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
 */
 sap.ui.define([
-	'sap/base/util/array/diff', 'sap/base/util/deepEqual','sap/ui/mdc/condition/FilterOperatorUtil', 'sap/base/Log'
-], function (diff, deepEqual, FilterOperatorUtil, Log) {
+	'sap/base/util/merge', 'sap/base/util/deepEqual','sap/ui/mdc/condition/FilterOperatorUtil', 'sap/base/Log'
+], function (merge, deepEqual, FilterOperatorUtil, Log) {
 	"use strict";
 
 	var FlexUtil = {
@@ -78,6 +78,7 @@ sap.ui.define([
 		* @param {object} mDeltaInfo.control Control instance which is being used to generate the changes
 		* @param {object} mDeltaInfo.changeOperations Map containing the changeOperations for the given Control instance
 		* @param {string} mDeltaInfo.changeOperations.add Name of the control specific 'add' changehandler
+		* @param {boolean} mDeltaInfo.applyAbsolute Indicates whether the appliance should also implicitly remove entries in case they are not provided in the new state
 		* @param {string} mDeltaInfo.changeOperations.remove Name of the control specific 'remove' changehandler
 		* @param {string} [mDeltaInfo.changeOperations.move] Name of the control specific 'move' changehandler
 		* @param {string} [mDeltaInfo.generator] Name of the change generator (E.g. the namespace of the UI creating the change object)
@@ -90,6 +91,7 @@ sap.ui.define([
 			var mNewConditionState = mDeltaInfo.changedState;
 			var mPreviousConditionState = mDeltaInfo.existingState;
 			var oAdaptationControl = mDeltaInfo.control;
+			var bAbsoluteAppliance = mDeltaInfo.hasOwnProperty("applyAbsolute") ? mDeltaInfo.applyAbsolute : true;
 			var aPropertyInfo = mDeltaInfo.propertyInfo;
 
 			for (var sFieldPath in mNewConditionState) {
@@ -99,7 +101,7 @@ sap.ui.define([
 					continue;
 				}
 
-				var aFilterConditionChanges = FlexUtil._diffConditionPath(sFieldPath, mNewConditionState[sFieldPath], mPreviousConditionState[sFieldPath], oAdaptationControl);
+				var aFilterConditionChanges = FlexUtil._diffConditionPath(sFieldPath, mNewConditionState[sFieldPath], mPreviousConditionState[sFieldPath], oAdaptationControl, bAbsoluteAppliance);
 				aConditionChanges = aConditionChanges.concat(aFilterConditionChanges);
 			}
 
@@ -123,16 +125,17 @@ sap.ui.define([
 		*
 		* @public
 		* @param {array} sFieldPath The relevant fieldPath
-		* @param {array} aOrigConditions The conditions after they have been changed
+		* @param {array} aConditions The conditions after they have been changed
 		* @param {function} aOrigShadowConditions The conditions before they have been changed
 		* @param {object} oControl Control instance which is being used to generate the changes
+		* @param {boolean} [bAbsoluteAppliance] Indicates whether the appliance should also implicitly remove entries in case they are not provided in the new state
 		*
 		* @returns {array} Array containing the delta based created changes
 		*/
-		_diffConditionPath: function(sFieldPath, aOrigConditions, aOrigShadowConditions, oControl){
+		_diffConditionPath: function(sFieldPath, aConditions, aOrigShadowConditions, oControl, bAbsoluteAppliance){
 			var oChange, aChanges = [];
-			var aConditions = aOrigConditions;
-			var aShadowConditions = aOrigShadowConditions ? aOrigShadowConditions : [];
+			var aOrigConditions = merge([], aConditions);
+			var aShadowConditions = aOrigShadowConditions ? merge([], aOrigShadowConditions) : [];
 
 
 			if (deepEqual(aConditions, aShadowConditions)) {
@@ -147,11 +150,16 @@ sap.ui.define([
 
 					for (var i = 0; i < aConditions.length; i++) {
 
-						var nConditionIdx = FilterOperatorUtil.indexOfCondition(aConditions[i], aShadowConditions);
+						var oNewCondition = aConditions[i];
+						var nConditionIdx = FilterOperatorUtil.indexOfCondition(oNewCondition, aShadowConditions);
 						if (nConditionIdx > -1) {
 
 							aConditions.splice(i, 1);
-							aShadowConditions.splice(nConditionIdx, 1);
+
+							if (bAbsoluteAppliance) {
+								aShadowConditions.splice(nConditionIdx, 1);
+							}
+
 							bRunAgain = true;
 							break;
 						}
@@ -164,15 +172,18 @@ sap.ui.define([
 			if ((aConditions.length > 0) || (aShadowConditions.length > 0)) {
 
 				aShadowConditions.forEach(function(oCondition) {
-					oChange = FlexUtil.createConditionChange("removeCondition", oControl, sFieldPath, oCondition);
-					if (oChange) {
+					//In case of absolute appliance always remove, in case of explicit appliance only remove if explicitly given in the new state via filtered=false
+					var iNewCondition = FilterOperatorUtil.indexOfCondition(oCondition, aOrigConditions);
+					var bNewConditionExplicitlyRemoved = iNewCondition > -1 && aOrigConditions[iNewCondition].filtered === false;
+					if (bAbsoluteAppliance || bNewConditionExplicitlyRemoved) {
+						oChange = FlexUtil.createConditionChange("removeCondition", oControl, sFieldPath, oCondition);
 						aChanges.push(oChange);
 					}
 				});
 
 				aConditions.forEach(function(oCondition) {
-					oChange = FlexUtil.createConditionChange("addCondition", oControl, sFieldPath, oCondition);
-					if (oChange) {
+					if (bAbsoluteAppliance || (!oCondition.hasOwnProperty("filtered") || oCondition.filtered !== false)) {
+						oChange = FlexUtil.createConditionChange("addCondition", oControl, sFieldPath, oCondition);
 						aChanges.push(oChange);
 					}
 				});
@@ -194,6 +205,7 @@ sap.ui.define([
 		},
 
 		createConditionChange: function(sChangeType, oControl, sFieldPath, oCondition) {
+			delete oCondition.filtered;
 			var oConditionChange = {
 				selectorElement: oControl,
 				changeSpecificData: {
@@ -261,4 +273,4 @@ sap.ui.define([
 		}
 	};
 	return FlexUtil;
-});
+});

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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.util.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @private
 	 * @experimental

package/src/sap/ui/mdc/p13n/StateUtil.js

@@ -4,7 +4,8 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
 */
 sap.ui.define([
-], function() {
+	"sap/ui/mdc/p13n/Engine"
+], function(Engine) {
 	"use strict";
 
 	/**
@@ -51,7 +52,7 @@ sap.ui.define([
 		* @ui5-restricted sap.fe
 		* @MDC_PUBLIC_CANDIDATE
 		*
-		* @param {object} oControl The control that is used to create changes and to which changes are made
+		* @param {sap.ui.mdc.Control} oControl The control that is used to create changes and to which changes are made
 		* @param {object} oState The state in which the control is represented
 		*
 		* @example
@@ -99,7 +100,8 @@ sap.ui.define([
 		* @returns {Promise} <code>Promise</code> that resolves after all changes have been applied
 		*/
 		applyExternalState: function(oControl, oState){
-			return oControl.getEngine().applyState(oControl, StateUtil._internalizeKeys(oState));
+			var oInternalState = Engine.getInstance().internalizeKeys(oControl, oState);
+			return Engine.getInstance().applyState(oControl, oInternalState);
 		},
 
 		/**
@@ -112,13 +114,33 @@ sap.ui.define([
 		 * @private
 		 * @ui5-restricted sap.fe
 		 * @MDC_PUBLIC_CANDIDATE
-		 * @param {object} oControl The control instance implementing IxState to retrieve the externalized state
+		 * @param {sap.ui.mdc.Control} oControl The control instance implementing IxState to retrieve the externalized state
 		 *
 		 * @returns {Promise} <code>Promise</code> that resolves after the current state has been retrieved
 		 */
 		retrieveExternalState: function(oControl) {
-			return oControl.getEngine().retrieveState(oControl).then(function(oEngineState){
-				return StateUtil._externalizeKeys(oEngineState);
+			return Engine.getInstance().retrieveState(oControl).then(function(oEngineState){
+				return Engine.getInstance().externalizeKeys(oControl, oEngineState);
+			});
+		},
+
+		/**
+		 * Creates a delta between two states.
+		 *
+		 * @private
+		 * @ui5-restricted sap.fe
+		 *
+		 * @MDC_PUBLIC_CANDIDATE
+		 * @param {sap.ui.mdc.Control} oControl The control instance implementing IxState
+		 * @param {object} oOldState The prior state
+		 * @param {object} oNewState The new state
+		 *
+		 * @returns {Promise} <code>Promise</code> that resolves after the current state has been diffed
+		 */
+		diffState: function(oControl, oOldState, oNewState) {
+			return sap.ui.mdc.p13n.Engine.getInstance().diffState(oControl, Engine.getInstance().internalizeKeys(oControl, oOldState), Engine.getInstance().internalizeKeys(oControl, oNewState))
+			.then(function(oEngineStateDiff){
+				return Engine.getInstance().externalizeKeys(oControl, oEngineStateDiff);
 			});
 		},
 
@@ -132,7 +154,7 @@ sap.ui.define([
 		 * @param {function} fnListener fnFunction The handler function to call when the event occurs
 		 */
 		attachStateChange: function(fnListener) {
-			sap.ui.mdc.p13n.Engine.getInstance().stateHandlerRegistry.attachChange(fnListener);
+			Engine.getInstance().stateHandlerRegistry.attachChange(fnListener);
 		},
 
 		/**
@@ -145,50 +167,7 @@ sap.ui.define([
 		 * @param {function} fnListener fnFunction The handler function to detach from the event
 		 */
 		detachStateChange: function(fnListener) {
-			sap.ui.mdc.p13n.Engine.getInstance().stateHandlerRegistry.detachChange(fnListener);
-		},
-
-		_externalizeKeys: function(oInternalState) {
-			var mKeysForState = {
-				Sort: "sorters",
-				Group: "groupLevels",
-				Aggregate: "aggregations",
-				Filter: "filter",
-				Item: "items",
-				Column: "items",
-				ColumnWidth: "supplementaryConfig"
-			};
-			var oTransformedState = {};
-
-			Object.keys(oInternalState).forEach(function(sProvidedEngineKey){
-				var sExternalKey = mKeysForState[sProvidedEngineKey];
-				var sTransformedKey = sExternalKey || sProvidedEngineKey;//no external key --> provide internal key
-				oTransformedState[sTransformedKey] = oInternalState[sProvidedEngineKey];
-			});
-			return oTransformedState;
-		},
-
-		_internalizeKeys: function(oExternalState) {
-			var mKeysForEngine = {
-				sorters: ["Sort"],
-				groupLevels: ["Group"],
-				aggregations: ["Aggregate"],
-				filter: ["Filter"],
-				items: ["Item", "Column"],
-				supplementaryConfig: ["ColumnWidth"]
-			};
-
-			var oTransformedState = {};
-
-			Object.keys(oExternalState).forEach(function(sProvidedEngineKey){
-				if (mKeysForEngine[sProvidedEngineKey]) {
-					mKeysForEngine[sProvidedEngineKey].forEach(function(sTransformedKey){
-						oTransformedState[sTransformedKey] = oExternalState[sProvidedEngineKey];
-					});
-				}
-			});
-
-			return oTransformedState;
+			Engine.getInstance().stateHandlerRegistry.detachChange(fnListener);
 		}
 
 	};

package/src/sap/ui/mdc/p13n/UIManager.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -208,7 +208,11 @@ sap.ui.define([
 		}.bind(this));
 
 		return Promise.all(aPAdaptationUI).then(function(aUIs){
-			var oPopupContent = bUseP13nContainer ? new P13nContainer() : aUIs[0].panel;
+			var oPopupContent = bUseP13nContainer ? new P13nContainer({
+				afterViewSwitch: function(oEvt) {
+					this.oAdaptationProvider.validateP13n(oControl, oEvt.getParameter("target"), oEvt.getSource().getCurrentViewContent());
+				}.bind(this)
+			}) : aUIs[0].panel;
 			if (bUseP13nContainer) {
 				aUIs.forEach(function(mUI){
 					if (mUI.panel) {