@openui5/sap.ui.mdc 1.97.1 → 1.100.0

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

@@ -14,9 +14,9 @@ sap.ui.define([
 	 * modules such as the UIManager and the DefaultProviderRegistry.
 	 *
 	 * @author SAP SE
-	 * @private
 	 * @since 1.90
 	 * @experimental As of version 1.90
+	 * @private
 	 * @ui5-restricted sap.ui.mdc
 	 * @alias sap.ui.mdc.p13n.AdaptationProvider
 	 */

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

@@ -32,15 +32,16 @@ sap.ui.define([
 	var oEngine;
 
 	/**
-	 * Constructor for a new Engine. The Engine should always be accessed
-	 * via 'getInstance' and not by creating a new instance of it. The class should only be used
-	 * to create derivations.
+	 * Constructor for a new Engine.
+	 *
+	 * The Engine should always be accessed via 'getInstance' and not by creating a new instance of it.
+	 * The class should only be used to create derivations.
 	 *
 	 * @class
-	 * @extends sap.ui.base.Object
+	 * @extends sap.ui.mdc.p13n.AdaptationProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -192,7 +193,7 @@ sap.ui.define([
 		return this.initAdaptation(vControl, sKey).then(function(){
 
 			var oController = this.getController(vControl, sKey);
-			var mchangeOperations = oController.getChangeOperations();
+			var mChangeOperations = oController.getChangeOperations();
 
 			var oRegistryEntry = this._getRegistryEntry(vControl);
 			var oCurrentState = oController.getCurrentState();
@@ -203,7 +204,7 @@ sap.ui.define([
 				applyAbsolute: bApplyAbsolute,
 				changedState: aNewState,
 				control: oController.getAdaptationControl(),
-				changeOperations: mchangeOperations,
+				changeOperations: mChangeOperations,
 				deltaAttributes: ["name"],
 				propertyInfo: oRegistryEntry.helper.getProperties().map(function(a){return {name: a.name};})
 			};
@@ -235,7 +236,14 @@ sap.ui.define([
 
 		aKeys = aKeys instanceof Array ? aKeys : [aKeys];
 
+		var aSelectors = [];
+
+		aKeys.forEach(function(sKey) {
+			aSelectors = aSelectors.concat(this.getController(oControl, sKey).getSelectorForReset());
+		}.bind(this));
+
 		var oResetConfig = {
+			selectors: aSelectors,
 			selector: oControl
 		};
 
@@ -293,7 +301,11 @@ sap.ui.define([
 			var oModificationSetting = this._determineModification(vControl);
 			return oModificationSetting.handler.processChanges(aChanges, oModificationSetting.payload)
 			.then(function(aChanges){
-				this.stateHandlerRegistry.fireChange(Engine.getControlInstance(vControl));
+				var oControl = Engine.getControlInstance(vControl);
+				this.stateHandlerRegistry.fireChange(oControl);
+				if (oControl._onChangeAppliance instanceof Function) {
+					oControl._onChangeAppliance.call(oControl);
+				}
 				return aChanges;
 			}.bind(this));
 		} else {
@@ -318,9 +330,10 @@ sap.ui.define([
 		var fResolveRTA;
 
 		//var aVMs = Engine.hasForReference(oControl, "sap.ui.fl.variants.VariantManagement");
+		// TODO: clarify if we need this error handling / what to do with the Link if we want to keep it
 		var aPVs = Engine.hasForReference(oControl, "sap.ui.mdc.p13n.PersistenceProvider");
 
-		if (aPVs.length > 0) {
+		if (aPVs.length > 0 && !oControl.isA("sap.ui.mdc.link.Panel")) {
 			return Promise.reject("Please do not use a PeristenceProvider in RTA.");
 		}
 
@@ -344,6 +357,9 @@ sap.ui.define([
 				oCustomHeader.getContentRight()[0].setVisible(false);
 			}
 			oContainer.addStyleClass(mPropertyBag.styleClass);
+			if (mPropertyBag.fnAfterClose instanceof Function) {
+				oContainer.attachAfterClose(mPropertyBag.fnAfterClose);
+			}
 		});
 
 		oRTAPromise.then(function(){
@@ -377,15 +393,14 @@ sap.ui.define([
 
 		return Promise.resolve()
 			.then(function() {
-				if (oRegistryEntry) {
-					var oModificationHandler = this.getModificationHandler(vControl);
-					return oModificationHandler.enhanceConfig(oControl, mEnhanceConfig)
-						.then(function(oConfig){
+				var oModificationHandler = this.getModificationHandler(vControl);
+				return oModificationHandler.enhanceConfig(oControl, mEnhanceConfig)
+					.then(function(oConfig){
+						if (oRegistryEntry) {
+							//to simplify debugging
 							oRegistryEntry.xConfig = oConfig;
-						});
-				} else {
-					throw new Error("The control instance needs to be registered to use xConfig!");
-				}
+						}
+					});
 			}.bind(this));
 	};
 
@@ -544,7 +559,7 @@ sap.ui.define([
 	 * @private
 	 *
 	 * @param {sap.ui.mdc.Control} vControl The registered control instance
-	 * @param {string} sKey The key for the according Controller
+	 * @param {string|string[]} aKeys The key for the according Controller
 	 * @param {Object[]} aCustomInfo A custom set of propertyinfos as base to create the UI
 	 *
 	 * @returns {Promise} A Promise resolving after the adaptation housekeeping has been initialized.
@@ -609,11 +624,12 @@ sap.ui.define([
 	 * and the set of provided registered keys.
 	 *
 	 * @param {sap.ui.mdc.Control} vControl The registered Control instance.
-	 * @param {string|array} vKey A key as string or an array of keys
+	 * @param {string|array} vKeys A key as string or an array of keys
 	 *
 	 * @returns {object} The requested UI settings of the control instance and provided keys
 	 */
-	Engine.prototype.getUISettings = function(vControl, aKeys) {
+	Engine.prototype.getUISettings = function(vControl, vKeys) {
+		var aKeys = Array.isArray(vKeys) ? vKeys : [vKeys];
 		this.verifyController(vControl, aKeys);
 		var oPropertyHelper = this._getRegistryEntry(vControl).helper;
 		var mUiSettings = {};
@@ -622,6 +638,8 @@ sap.ui.define([
 			var oController = this.getController(vControl, sKey);
 			var pAdaptationUI = oController.getAdaptationUI(oPropertyHelper);
 			//Check faceless controller implementations and skip them
+
+			//TODO: error handling for non promises
 			if (pAdaptationUI instanceof Promise){
 				mUiSettings[sKey] = {};
 				mUiSettings[sKey] = {
@@ -743,6 +761,9 @@ sap.ui.define([
 		var sHandlerMode = aPersistenceProvider ? aPersistenceProvider[0].getMode() : "Standard";
 
 		var mHandlerMode = {
+			//During preprocessing, it might be necessary to calculate the modification handler instance
+			//without an initialized control instance --> use flex as default
+			undefined: FlexModificationHandler,
 			Global: FlexModificationHandler,
 			Transient: FlexModificationHandler,
 			Standard: FlexModificationHandler,
@@ -792,8 +813,8 @@ sap.ui.define([
 	 * Determines and registeres the ModificationHandler per control instance
 	 *
 	 * @private
-	 * @param {String} sControlId The control id
-	 * @param {String} sAncestorControlId The control ancestor id
+	 * @param {string} sControlId The control id
+	 * @param {string} sAncestorControlId The control ancestor id
 	 *
 	 * @returns {boolean} Returns whether an according ancestor could be found.
 	 */
@@ -913,7 +934,7 @@ sap.ui.define([
 	/**
 	 * Reads the current state of the subcontrollers and triggers a state appliance
 	 *
-	 * @param {sap.ui.mdc.Control} vControl The registered Control instance.
+	 * @param {sap.ui.mdc.Control} oControl The registered Control instance.
 	 * @param {array} aKeys An array of keys
 	 * @returns {Promise} A Promise resolving after all p13n changes have been calculated and processed
 	 */
@@ -969,27 +990,27 @@ sap.ui.define([
 	 * @param {object[]} [aCustomPropertyInfo] A custom set of propertyinfo.
 	 *
 	 */
-	Engine.prototype._retrievePropertyHelper = function(vControl, aCustomPropertyInfo){
+	Engine.prototype._retrievePropertyHelper = function (vControl, aCustomPropertyInfo) {
 
 		var oRegistryEntry = this._getRegistryEntry(vControl);
 		var oControl = Engine.getControlInstance(vControl);
 
 		if (aCustomPropertyInfo) {
-			if (oRegistryEntry.helper){
+			if (oRegistryEntry.helper) {
 				oRegistryEntry.helper.destroy();
 			}
 			oRegistryEntry.helper = new PropertyHelper(aCustomPropertyInfo);
 			return Promise.resolve(oRegistryEntry.helper);
-        }
+		}
 
 		if (oRegistryEntry.helper) {
 			return Promise.resolve(oRegistryEntry.helper);
 		}
 
-		return oControl.initPropertyHelper().then(function(oPropertyHelper){
+		return oControl.initPropertyHelper().then(function (oPropertyHelper) {
 			oRegistryEntry.helper = oPropertyHelper;
 			return oPropertyHelper;
-		}, function(sHelperError){
+		}, function (sHelperError) {
 			throw new Error(sHelperError);
 		});
 	};
@@ -1008,9 +1029,9 @@ sap.ui.define([
 	};
 
 	/**
-	 * @private
-	 *
 	 * This method can be used for debugging to retrieve the complete registry.
+	 *
+	 * @private
 	 */
 	Engine.prototype._getRegistry = function() {
 		var oRegistry = {

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

@@ -10,101 +10,6 @@ sap.ui.define([
 
 	var FlexUtil = {
 
-		/**
-		* Generates a set of changes based on the given arrays for a specified control
-		*
-		* @public
-		*
-		* @param {object} mDeltaInfo Map containing the necessary information to calculate the diff as change objects
-		* @param {array} mDeltaInfo.existingState An array describing the control state before a adaptation
-		* @param {array} mDeltaInfo.changedState An array describing the control state after a certain adaptation
-		* @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 {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)
-		*
-		* @returns {array} Array containing the delta based created changes
-		*/
-		getArrayDeltaChanges: function (mDeltaInfo) {
-
-			var aExistingArray = mDeltaInfo.existingState;
-			var aChangedArray = mDeltaInfo.changedState;
-			var oControl = mDeltaInfo.control;
-			var sInsertOperation = mDeltaInfo.changeOperations.add;
-			var sRemoveOperation = mDeltaInfo.changeOperations.remove;
-			var sMoveOperation = mDeltaInfo.changeOperations.move;
-			var sGenerator = mDeltaInfo.generator;
-
-			var aDeltaAttributes = mDeltaInfo.deltaAttributes || [];
-
-			var fnSymbol = function(o) {
-				var sDiff = "";
-				aDeltaAttributes.forEach(function(sAttribute){
-					sDiff = sDiff + o[sAttribute];
-				});
-				return sDiff;
-			};
-
-			var aResults = diff(aExistingArray, aChangedArray, fnSymbol);
-			// Function to match field with exising field in the given array
-			var fMatch = function (oField, aArray) {
-				return aArray.filter(function (oExistingField) {
-					return oExistingField && (oExistingField.name === oField.name);
-				})[0];
-			};
-
-			var aChanges = [];
-			var aProcessedArray = aExistingArray.slice(0);
-
-			aResults.forEach(function (oResult) {
-				// Begin --> hack for handling result returned by diff
-				if (oResult.type === "delete" && aProcessedArray[oResult.index] === undefined) {
-					aProcessedArray.splice(oResult.index, 1);
-					return;
-				}
-
-				var oProp, oExistingProp, iLength;
-				if (oResult.type === "insert") {
-					oExistingProp = fMatch(aChangedArray[oResult.index], aProcessedArray);
-					if (oExistingProp) {
-						oExistingProp.index = aProcessedArray.indexOf(oExistingProp);
-						aProcessedArray.splice(oExistingProp.index, 1, undefined);
-						aChanges.push(FlexUtil.createAddRemoveChange(oControl, sRemoveOperation, FlexUtil._getChangeContent(oExistingProp, aDeltaAttributes), sGenerator));
-					}
-				}
-				// End hack
-				oProp = oResult.type === "delete" ? aProcessedArray[oResult.index] : aChangedArray[oResult.index];
-				oProp.index = oResult.index;
-				if (oResult.type === "delete") {
-					aProcessedArray.splice(oProp.index, 1);
-				} else {
-					aProcessedArray.splice(oProp.index, 0, oProp);
-				}
-				// Move operation shows up as insert followed by delete OR delete followed by insert
-				if (sMoveOperation) {
-					iLength = aChanges.length;
-					// Get the last added change
-					if (iLength) {
-						oExistingProp = aChanges[iLength - 1];
-						oExistingProp = oExistingProp ? oExistingProp.changeSpecificData.content : undefined;
-					}
-					// Matching property exists with a different index --> then this is a move operation
-					if (oExistingProp && oExistingProp.name === oProp.name && oResult.index != oExistingProp.index) {
-						// remove the last insert/delete operation
-						aChanges.pop();
-						aChanges.push(FlexUtil.createMoveChange(oExistingProp.id, oExistingProp.name, oResult.index, sMoveOperation, oControl, sMoveOperation !== "moveSort", sGenerator));
-						return;
-					}
-				}
-
-				aChanges.push(FlexUtil.createAddRemoveChange(oControl, oResult.type === "delete" ? sRemoveOperation : sInsertOperation, FlexUtil._getChangeContent(oProp, aDeltaAttributes), sGenerator));
-
-			});
-			return aChanges;
-		},
-
 		getPropertySetterChanges: function(mDeltaInfo) {
 			var oControl = mDeltaInfo.control;
 			var aExistingState = mDeltaInfo.existingState;
@@ -124,7 +29,7 @@ sap.ui.define([
 					var vNewValue = oItem[sSetAttribute];
 					var bValueChanged = vOldValue !== vNewValue;
 					if (bValueChanged) {
-						aSetterChanges.push(this.createAddRemoveChange(oControl, sOperation, {
+						aSetterChanges.push(this.createChange(oControl, sOperation, {
 							name: oItem.name,
 							value: oItem[sSetAttribute]
 						}));
@@ -193,7 +98,9 @@ sap.ui.define([
 					Log.warning("property '" + sFieldPath + "' not supported");
 					continue;
 				}
-				aConditionChanges = aConditionChanges.concat(FlexUtil._diffConditionPath(sFieldPath, mNewConditionState[sFieldPath], mPreviousConditionState[sFieldPath], oAdaptationControl));
+
+				var aFilterConditionChanges = FlexUtil._diffConditionPath(sFieldPath, mNewConditionState[sFieldPath], mPreviousConditionState[sFieldPath], oAdaptationControl);
+				aConditionChanges = aConditionChanges.concat(aFilterConditionChanges);
 			}
 
 			return aConditionChanges;
@@ -274,7 +181,8 @@ sap.ui.define([
 
 			return aChanges;
 		},
-		createAddRemoveChange: function(oControl, sOperation, oContent){
+
+		createChange: function(oControl, sOperation, oContent){
 			var oAddRemoveChange = {
 				selectorElement: oControl,
 				changeSpecificData: {
@@ -285,26 +193,6 @@ sap.ui.define([
 			return oAddRemoveChange;
 		},
 
-		createMoveChange: function (sId, sPropertyName, iNewIndex, sMoveOperation, oControl, bPersistId) {
-			var oMoveChange =  {
-				selectorElement: oControl,
-				changeSpecificData: {
-					changeType: sMoveOperation,
-					content: {
-						id: sId,
-						name: sPropertyName,
-						index: iNewIndex
-					}
-				}
-			};
-
-			if (!bPersistId) {
-				delete oMoveChange.changeSpecificData.content.id;
-			}
-
-			return oMoveChange;
-		},
-
 		createConditionChange: function(sChangeType, oControl, sFieldPath, oCondition) {
 			var oConditionChange = {
 				selectorElement: oControl,

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

@@ -31,8 +31,8 @@ sap.ui.define([
          * @param {object} oP13nUI Control displayed in the content area
          * @param {object} mDialogSettings Settings to overwrite popover default properties, such as: <code>contentHeight</code>
          * @param {object} [mDialogSettings.reset] Reset settings for the custom header creation
-         * @param {Function} [mDialogSettings.reset.onExecute] Callback executed upon triggering a reset
-         * @param {String} [mDialogSettings.reset.warningText] Warning which is displyed prior to executing the reset
+         * @param {function} [mDialogSettings.reset.onExecute] Callback executed upon triggering a reset
+         * @param {string} [mDialogSettings.reset.warningText] Warning which is displyed prior to executing the reset
          *
          * @returns {Promise} promise resolving in the Popover instance
          */
@@ -76,8 +76,8 @@ sap.ui.define([
          * @param {object} oP13nUI Control displayed in the content area
          * @param {object} mDialogSettings Settings to overwrite dialog default properties, such as: <code>contentHeight</code>
          * @param {object} [mDialogSettings.reset] Reset settings for the custom header creation
-         * @param {Function} [mDialogSettings.reset.onExecute] Callback executed upon triggering a reset
-         * @param {String} [mDialogSettings.reset.warningText] Warning which is displyed prior to executing the reset
+         * @param {function} [mDialogSettings.reset.onExecute] Callback executed upon triggering a reset
+         * @param {string} [mDialogSettings.reset.warningText] Warning which is displyed prior to executing the reset
          *
          * @returns {Promise} Promise resolving in the Dialog instance
          */
@@ -149,9 +149,9 @@ sap.ui.define([
         /**
          *
          * @param {object} mSettings Settings object to create a customHeader including a reset Button
-         * @param {String} mSettings.title Title for the custom reset header
+         * @param {string} mSettings.title Title for the custom reset header
          * @param {function} mSettings.reset Control specific reset handling
-         * @param {String} [mSettings.warningText] Text which is displayed prior to executing to reset execution
+         * @param {string} [mSettings.warningText] Text which is displayed prior to executing to reset execution
          *
          * @returns {sap.m.Bar} The created custom header Bar
          */
@@ -196,7 +196,7 @@ sap.ui.define([
         prepareAdaptationData: function(vProperties, fnEnhace, bGroupData) {
 
 			var oPropertyHelper =
-				vProperties && vProperties.getProperties instanceof Function ?
+                vProperties && vProperties.getProperties instanceof Function ?
 				vProperties : new P13nPropertyHelper(vProperties);
 
             var aItems = [];

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

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @param {object[]} aProperties
 	 *     The properties to process in this helper
-	 * @param {object<string, object>} [mExtensions]
+	 * @param {Object<string, object>} [mExtensions]
 	 *     Key-value map, where the key is the name of the property and the value is the extension containing mode-specific information.
 	 *     The extension of a property is stored in a reserved <code>extension</code> attribute and its attributes must be specified with
 	 *     <code>mExtensionAttributeMetadata</code>.
@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.util.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @private
 	 * @experimental

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

@@ -43,6 +43,10 @@ sap.ui.define([
 		*	<li><code>aggregated</code> - Set to <code>false</code>  to remove an aggregation.</li>
 		*	</ul>
 		*
+		*	<b>Note:</b>To improve the performance, you should avoid additional calls of the control’s delegate.
+		*	To do this, the <code>propertyInfo</code> property of the relevant control can be enriched with the properties used in the provided state.
+		*
+		*
 		* @private
 		* @ui5-restricted sap.fe
 		* @MDC_PUBLIC_CANDIDATE
@@ -79,6 +83,16 @@ sap.ui.define([
 		*			Country: {
 		*				aggregated: false
 		*			}
+		*		},
+		*		//The supplementaryConfig can be used to modify control specific attributes, for example the column width in the Table
+		*		supplementaryConfig: {
+		*			aggregations: {
+		*				columns: {
+		*					Category: {
+		*						width: "150px"
+		*					}
+		*				}
+		*			}
 		*		}
 		* }
 		*
@@ -112,6 +126,9 @@ sap.ui.define([
 		 * Attaches an event handler to the <code>StateUtil</code>.
 		 * The event handler may be fired every time a user triggers a personalization change for a control instance during runtime.
 		 *
+		 * @private
+		 * @ui5-restricted sap.fe
+		 * @MDC_PUBLIC_CANDIDATE
 		 * @param {function} fnListener fnFunction The handler function to call when the event occurs
 		 */
 		attachStateChange: function(fnListener) {
@@ -122,6 +139,9 @@ sap.ui.define([
 		 * Removes a previously attached state change event handler from the <code>StateUtil</code> class.
 		 * The passed parameters must match those used for registration with {@link StateUtil#attachChange} beforehand.
 		 *
+		 * @private
+		 * @ui5-restricted sap.fe
+		 * @MDC_PUBLIC_CANDIDATE
 		 * @param {function} fnListener fnFunction The handler function to detach from the event
 		 */
 		detachStateChange: function(fnListener) {
@@ -135,7 +155,8 @@ sap.ui.define([
 				Aggregate: "aggregations",
 				Filter: "filter",
 				Item: "items",
-				Column: "items"
+				Column: "items",
+				ColumnWidth: "supplementaryConfig"
 			};
 			var oTransformedState = {};
 
@@ -144,10 +165,6 @@ sap.ui.define([
 				var sTransformedKey = sExternalKey || sProvidedEngineKey;//no external key --> provide internal key
 				oTransformedState[sTransformedKey] = oInternalState[sProvidedEngineKey];
 			});
-			//TODO: Remove once the stateUtil for columnWidth is introduced
-			if (oTransformedState.ColumnWidth) {
-				delete oTransformedState.ColumnWidth;
-			}
 			return oTransformedState;
 		},
 
@@ -157,7 +174,8 @@ sap.ui.define([
 				groupLevels: ["Group"],
 				aggregations: ["Aggregate"],
 				filter: ["Filter"],
-				items: ["Item", "Column"]
+				items: ["Item", "Column"],
+				supplementaryConfig: ["ColumnWidth"]
 			};
 
 			var oTransformedState = {};

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

@@ -10,8 +10,9 @@ sap.ui.define([
 	"sap/m/p13n/Container",
 	"sap/m/p13n/AbstractContainerItem",
 	"sap/base/util/UriParameters",
-	"sap/base/Log"
-], function (BaseObject, P13nBuilder, P13nContainer, AbstractContainerItem, SAPUriParameters, Log) {
+	"sap/base/Log",
+	"sap/ui/thirdparty/jquery"
+], function (BaseObject, P13nBuilder, P13nContainer, AbstractContainerItem, SAPUriParameters, Log, jQuery) {
 	"use strict";
 
 	var ERROR_INSTANCING = "UIManager: This class is a singleton and should not be used without an AdaptationProvider. Please use 'sap.ui.mdc.p13n.Engine.getInstance().uimanager' instead";
@@ -20,7 +21,7 @@ sap.ui.define([
 	var oUIManager;
 
 	//Used for experimental features (such as livemode)
-	var oURLParams = new SAPUriParameters(window.location.search);
+	var oURLParams = SAPUriParameters.fromQuery(window.location.search);
 
 	/**
 	 * Constructor for a new UIManager.
@@ -32,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -73,7 +74,7 @@ sap.ui.define([
 		this.bLiveMode = false;
 
 		//!!!Warning: experimental and only for testing purposes!!!----------
-		if (oURLParams.getAll("sap-ui-xx-p13nLiveMode")[0] === "true"){
+		if (oURLParams.get("sap-ui-xx-p13nLiveMode") === "true"){
 			this.bLiveMode = true;
 			Log.warning("Please note that the p13n liveMode is experimental");
 		}
@@ -101,7 +102,7 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.mdc
 	 *
 	 * @param {sap.ui.mdc.Control} vControl The registered control instance
-	 * @param {string} sKey The key for the according Controller
+	 * @param {string|string[]} vKey The key for the according Controller
 	 * @param {Object[]} aCustomInfo A custom set of propertyinfos as base to create the UI
 	 *
 	 * @returns {Promise} A Promise resolving in the P13n UI.
@@ -157,8 +158,8 @@ sap.ui.define([
 	 *
 	 * @private
 	 *
-	 * @param {sap.ui.mdc.Control} vControl The registered control instance.
-	 * @param {string} aKeys The registerd key to get the corresponding Controller.
+	 * @param {sap.ui.mdc.Control} oControl The registered control instance.
+	 * @param {string} aKeys The registered key to get the corresponding Controller.
 	 *
 	 * @returns {Promise} A Promise resolving in the according container
 	 * (Depending on the Controllers livemode config).
@@ -233,9 +234,10 @@ sap.ui.define([
 	 *
 	 * @private
 	 *
-	 * @param {sap.ui.mdc.Control} vControl The registered control instance.
-	 * @param {string} sKey The registerd key to get the corresponding Controller.
-	 * @param {sap.ui.core.Control} oPanel The control instance which is set in the content area of the container.
+	 * @param {sap.ui.mdc.Control} oControl The registered control instance.
+	 * @param {string[]} aKeys The registered keys to get the corresponding Controller.
+	 * @param {*} oPopupContent
+	 * @param {*} oUISettings
 	 *
 	 * @returns {Promise} Returns a Promise resolving in the container instance
 	 */
@@ -297,9 +299,10 @@ sap.ui.define([
 	 *
 	 * @private
 	 *
-	 * @param {sap.ui.mdc.Control} vControl The registered control instance.
-	 * @param {string} sKey The registerd key to get the corresponding Controller.
+	 * @param {sap.ui.mdc.Control} oControl The registered control instance.
+	 * @param {string[]} aKeys The registerd key to get the corresponding Controller.
 	 * @param {sap.ui.core.Control} oPanel The control instance which is set in the content area of the container.
+	 * @param {object} mUISettings
 	 *
 	 * @returns {sap.m.ResponsivePopover} The popover instance.
 	 */
@@ -364,7 +367,7 @@ sap.ui.define([
 
 		var mSettings = Object.assign({
 			verticalScrolling: true,
-			reset: mUISettings.reset,
+			reset: mUISettings.reset || {},
 			afterClose: function(oEvt) {
 				var oDialog = oEvt.getSource();
 				if (oDialog) {
@@ -375,11 +378,9 @@ sap.ui.define([
 		}, mUISettings.containerSettings);
 
 		if (mUISettings.resetEnabled){
-			mSettings.reset = {
-				onExecute: function() {
-					this.oAdaptationProvider.reset(oControl, aKeys);
-				}.bind(this)
-			};
+			mSettings.reset.onExecute = function() {
+				this.oAdaptationProvider.reset(oControl, aKeys);
+			}.bind(this);
 		}
 
 		mSettings.confirm = {

package/src/sap/ui/mdc/p13n/modification/FlexModificationHandler.js

@@ -54,8 +54,11 @@ sap.ui.define([
 
     FlexModificationHandler.prototype.reset = function(mPropertyBag, oModificationPayload){
         var sPersistenceMode = oModificationPayload.mode;
+
         var bIsGlobal = sPersistenceMode === mode.Global;
-        return bIsGlobal ? FlexUtil.reset.call(this, mPropertyBag) : FlexUtil.restore.call(this, mPropertyBag);
+        var bIsAutoGlobal = !oModificationPayload.hasVM && oModificationPayload.hasPP && sPersistenceMode === mode.Auto;
+
+        return (bIsGlobal || bIsAutoGlobal) ? FlexUtil.reset.call(this, mPropertyBag) : FlexUtil.restore.call(this, mPropertyBag);
     };
 
     FlexModificationHandler.prototype.isModificationSupported = function(mPropertyBag, oModificationPayload){