@openui5/sap.m 1.108.2 → 1.110.0

package/src/sap/m/p13n/Engine.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -15,8 +15,9 @@ sap.ui.define([
 	"sap/m/p13n/modules/DefaultProviderRegistry",
 	"sap/m/p13n/modules/UIManager",
 	"sap/m/p13n/modules/StateHandlerRegistry",
-	"sap/m/p13n/modules/xConfigAPI"
-], function (AdaptationProvider, merge, Log, FlexModificationHandler, MessageStrip, coreLibrary, Element, DefaultProviderRegistry, UIManager, StateHandlerRegistry, xConfigAPI) {
+	"sap/m/p13n/modules/xConfigAPI",
+	"sap/m/p13n/enum/ProcessingStrategy"
+], function (AdaptationProvider, merge, Log, FlexModificationHandler, MessageStrip, coreLibrary, Element, DefaultProviderRegistry, UIManager, StateHandlerRegistry, xConfigAPI, ProcessingStrategy) {
 	"use strict";
 
 	var ERROR_INSTANCING = "Engine: This class is a singleton. Please use the getInstance() method instead.";
@@ -49,21 +50,14 @@ sap.ui.define([
 	 * <li>{@link sap.m.p13n.GroupController GroupController}: Used to define a list of groupable properties</li>
 	 * </ul>
 	 *
-	 * The following persistence layers can be chosen for personalization services:
+	 * Can be used in combination with <code>sap.ui.fl.variants.VariantManagement</code> to persist a state in variants using <code>sap.ui.fl</code> capabilities.</li>
 	 *
-	 * <ul>
-	 * <li>{@link sap.m.p13n.modification.FlexModificationHandler FlexModificationHandler}: Used in combination with <code>sap.ui.fl.variants.VariantManagement</code> to persist a state in variants using <code>sap.ui.fl</code> capabilities.</li>
-	 * <li>{@link sap.m.p13n.modification.LocalStorageModificationHandler LocalStorageModificationHandler}: Used to store a personalization state in the local storage</li>
-	 * <li>{@link sap.m.p13n.modification.ModificationHandler ModificationHandler}: Used by default - this handler will not persist a state.</li>
-	 * </ul>
-	 *
-	 * @namespace
+	 * @class
 	 * @alias sap.m.p13n.Engine
-	 * @extends sap.m.p13n.AdaptationProvider
+	 * @extends sap.m.p13n.modules.AdaptationProvider
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @public
-	 * @experimental Since 1.104. Please note that the API of this control is not yet finalized!
 	 * @since 1.104
 	 */
 	var Engine = AdaptationProvider.extend("sap.m.p13n.Engine", {
@@ -99,9 +93,10 @@ sap.ui.define([
 	 * @property {sap.m.p13n.ModificationHandler} modification The desired <code>{@link sap.m.p13n.modification.ModificationHandler ModificationHandler}</code> instance that is used for persistence.
 	 * @property {sap.m.p13n.MetadataHelper} helper The <code>{@link sap.m.p13n.modification.MetadataHelper MetadataHelper}</code> to provide metadata-specific information.
 	 * @property {object} controller A map of arbitrary keys that contain a controller instance as value. The key must be unique and needs to be provided for later access when using <code>Engine</code> functionality specific for one controller type.
-	 *
+	 */
+
+	/**
 	 * @public
-	 * @experimental Since 1.104. Please note that the API of this control is not yet finalized!
 	 *
 	 * @param {sap.ui.core.Control} oControl The control instance to be registered for adaptation
 	 * @param {sap.m.p13n.EngineRegistrationConfig} oConfig The Engine registration configuration
@@ -129,14 +124,10 @@ sap.ui.define([
 	 */
 	 Engine.prototype.register = function(oControl, oConfig) {
 
-		if (!oConfig.hasOwnProperty("controller") || Object.keys(oConfig.controller).length < 1) {
+		if (!oConfig.hasOwnProperty("controller")/* || Object.keys(oConfig.controller).length < 1*/) {
 			throw new Error("Please provide at least a configuration 'controller' containing a map of key-value pairs (key + Controller class) in order to register adaptation.");
 		}
 
-		if (!oConfig.hasOwnProperty("helper") || !(oConfig.helper.getProperties instanceof Function)) {
-			throw new Error("Please provide at least a configuration 'helper' containing a metadata helper instance implementing a #getProperties function.");
-		}
-
 		var oRegistryEntry = this._getRegistryEntry(oControl);
 
 		if (oRegistryEntry){
@@ -161,7 +152,9 @@ sap.ui.define([
 
 		}.bind(this));
 
-		this.getModificationHandler(oControl).initialize(oControl);
+		if (oRegistryEntry && oRegistryEntry.modification) {
+			this.getModificationHandler(oControl).initialize(oControl);
+		}
 
 	};
 
@@ -172,7 +165,6 @@ sap.ui.define([
 	 * such as the registered controllers, are destroyed.
 	 *
 	 * @public
-	 * @experimental Since 1.104. Please note that the API of this control is not yet finalized!
 	 *
 	 * @param {sap.ui.core.Control} oControl The registered control instance
 	 */
@@ -199,7 +191,6 @@ sap.ui.define([
 	 * Opens the personalization dialog.
 	 *
 	 * @public
-	 * @experimental Since 1.104. Please note that the API of this control is not yet finalized!
 	 *
 	 *
 	 * @param {sap.ui.core.Control} oControl The control instance that is personalized
@@ -222,7 +213,6 @@ sap.ui.define([
 	 * The event handler is fired every time a user triggers a personalization change for a control instance during runtime.
 	 *
 	 * @public
-	 * @experimental Since 1.104. Please note that the API of this control is not yet finalized!
 	 *
 	 * @param {function} fnStateEventHandler The handler function to call when the event occurs
 	 * @returns {this} Returns <code>this</code> to allow method chaining
@@ -236,7 +226,6 @@ sap.ui.define([
 	 * The passed parameters must match those used for registration with {@link sap.m.p13n.Engine#attachStateChange} beforehand.
 	 *
 	 * @public
-	 * @experimental Since 1.104. Please note that the API of this control is not yet finalized!
 	 *
 	 * @param {function} fnStateEventHandler The handler function to detach from the event
 	 * @returns {this} Returns <code>this</code> to allow method chaining
@@ -249,7 +238,6 @@ sap.ui.define([
 	 * This method can be used to trigger a reset to the provided control instance.
 	 *
 	 * @public
-	 * @experimental Since 1.104. Please note that the API of this control is not yet finalized!
 	 *
 	 * @param {sap.ui.core.Control} oControl The related control instance
 	 * @param {string} aKeys The key for the affected configuration
@@ -271,13 +259,24 @@ sap.ui.define([
 			selector: oControl
 		};
 
+		if (aKeys) {
+			var aChangeTypes = [];
+			aKeys.forEach(function(sKey){
+				aChangeTypes = aChangeTypes.concat(Object.values(this.getController(oControl, sKey).getChangeOperations()));
+			}.bind(this));
+			oResetConfig.changeTypes = [].concat.apply([], aChangeTypes);
+		}
+
 		var oModificationSetting = this._determineModification(oControl);
 		return oModificationSetting.handler.reset(oResetConfig, oModificationSetting.payload).then(function(){
+			this.stateHandlerRegistry.fireChange(oControl);
 			//Re-Init housekeeping after update
 			return this.initAdaptation(oControl, aKeys).then(function(oPropertyHelper){
 				aKeys.forEach(function(sKey){
 					var oController = this.getController(oControl, sKey);
-					oController.update(oPropertyHelper);
+					if (this.hasActiveP13n(oControl)) {
+						oController.update(oPropertyHelper);
+					}
 				}.bind(this));
 			}.bind(this));
 		}.bind(this));
@@ -297,11 +296,10 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.core.Control} oControl The registered control instance
 	 * @param {object} oState The state object
-	 * @param {boolean} bApplyAbsolute Defines whether the state should be an additional delta of the current control state
 	 *
 	 * @returns {Promise} A Promise resolving after the state has been applied
 	 */
-	 Engine.prototype.applyState = function(oControl, oState, bApplyAbsolute) {
+	 Engine.prototype.applyState = function(oControl, oState) {
 
 		//Call retrieve only to ensure that the control is initialized and enabled for modification
 		return this.retrieveState(oControl).then(function(oCurrentState){
@@ -322,7 +320,8 @@ sap.ui.define([
 				var oController = this.getController(oControl, sControllerKey);
 
 				if (!oController){
-					//TODO: p13nMode <> register <> StateUtil key alignment
+					//In case no controller can be found, skip change creation & appliance
+					//to avoid errors and react gracefully
 					return;
 				}
 
@@ -331,7 +330,7 @@ sap.ui.define([
 					key: sControllerKey,
 					state: oController.sanityCheck(oState[sControllerKey]),
 					suppressAppliance: true,
-					applyAbsolute: bApplyAbsolute
+					applyAbsolute: false
 				});
 
 				aStatePromise.push(oStatePromise);
@@ -405,19 +404,22 @@ sap.ui.define([
 		this._getRegistryEntry(vControl).modification = oModificationSetting;
 	};
 
-	var fnQueue = function(oControl, fTask) {
+	Engine.prototype._addToQueue = function(oControl, fTask) {
+		var oRegistryEntry = this._getRegistryEntry(oControl);
+
 		var fCleanupPromiseQueue = function(pOriginalPromise) {
-			if (oControl._pModificationQueue === pOriginalPromise){
-				delete oControl._pModificationQueue;
+			if (oRegistryEntry.pendingModification === pOriginalPromise){
+				oRegistryEntry.pendingModification = null;
 			}
 		};
 
-		oControl._pModificationQueue = oControl._pModificationQueue instanceof Promise ? oControl._pModificationQueue.then(fTask) : fTask();
-		oControl._pModificationQueue.then(fCleanupPromiseQueue.bind(null, oControl._pModificationQueue));
+		oRegistryEntry.pendingModification = oRegistryEntry.pendingModification instanceof Promise ? oRegistryEntry.pendingModification.then(fTask) : fTask();
+		oRegistryEntry.pendingModification.then(fCleanupPromiseQueue.bind(null, oRegistryEntry.pendingModification));
 
-		return oControl._pModificationQueue;
+		return oRegistryEntry.pendingModification;
 	};
 
+
 	/**
 	 * <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.
@@ -428,7 +430,7 @@ sap.ui.define([
 	 * @param {sap.ui.core.Control} mDiffParameters.control The control instance that should be adapted
 	 * @param {string} mDiffParameters.key The key used to retrieve the related controller
 	 * @param {object} mDiffParameters.state The state that is applied to the provided control instance
-	 * @param {boolean} [mDiffParameters.applyAbsolute] Determines whether unmentioned entries are affected
+	 * @param {sap.ui.mdc.p13n.ProcessingStrategy} [mDiffParameters.applyAbsolute] Determines about the comparison algorithm between two states
 	 * @param {boolean} [mDiffParameters.stateBefore] If the state should be diffed manually;
 	 * for example, if "A" exists in the control state, but is not mentioned in the new state provided in the
 	 * mDiffParameters.state then the absolute appliance decides whether to remove "A" or to keep it.
@@ -440,20 +442,20 @@ sap.ui.define([
 	 */
 	Engine.prototype.createChanges = function(mDiffParameters) {
 
+		var oControl = Engine.getControlInstance(mDiffParameters.control);
 		var sKey = mDiffParameters.key;
-		var aNewState = mDiffParameters.state;
-		var bApplyAbsolute = !!mDiffParameters.applyAbsolute;
+		var vNewState = mDiffParameters.state;
 		var bSuppressCallback = !!mDiffParameters.suppressAppliance;
-		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.");
+		if (!sKey || !mDiffParameters.control || !vNewState) {
+			return Promise.resolve([]);
 		}
 
-		var oControl = Engine.getControlInstance(mDiffParameters.control);
-
 		var fDeltaHandling = function() {
 			return this.initAdaptation(oControl, sKey).then(function(){
+				return vNewState;
+			})
+			.then(function(aNewState){
 
 				var oController = this.getController(oControl, sKey);
 				var mChangeOperations = oController.getChangeOperations();
@@ -464,12 +466,17 @@ sap.ui.define([
 
 				var mDeltaConfig = {
 					existingState: mDiffParameters.stateBefore || oPriorState,
-					applyAbsolute: bApplyAbsolute,
+					applyAbsolute: mDiffParameters.applyAbsolute,
 					changedState: aNewState,
 					control: oController.getAdaptationControl(),
 					changeOperations: mChangeOperations,
 					deltaAttributes: ["key"],
-					propertyInfo: oRegistryEntry.helper.getProperties().map(function(a){return {key: a.key};})
+					propertyInfo: oRegistryEntry.helper.getProperties().map(function(a){
+						return {
+							key: a.key,
+							name: a.name
+						};
+					})
 				};
 
 				//Only execute change calculation in case there is a difference (--> example: press 'Ok' without a difference)
@@ -478,7 +485,10 @@ sap.ui.define([
 				if (!bSuppressCallback) {
 					var mChangeMap = {};
 					mChangeMap[sKey] = aChanges;
-					return this._processChanges(oControl, mChangeMap);
+					return this._processChanges(oControl, mChangeMap)
+					.then(function(){
+						return aChanges;
+					});
 				}
 
 				return aChanges || [];
@@ -487,11 +497,7 @@ sap.ui.define([
 
 		}.bind(this);
 
-		if (bApplySequentially) {
-			return fnQueue(oControl, fDeltaHandling);
-		} else {
-			return fDeltaHandling.apply(this);
-		}
+		return this._addToQueue(oControl, fDeltaHandling);
 	};
 
 	/**
@@ -502,13 +508,16 @@ sap.ui.define([
 	 * @param {sap.ui.core.Control} oControl The related control instance
 	 * @returns {Promise} A Promise resolving after all pending modifications have been applied
 	 */
-	Engine.prototype.waitForChanges = function(oControl) {
+	 Engine.prototype.waitForChanges = function(oControl) {
 		var oModificationSetting = this._determineModification(oControl);
-		return oModificationSetting.handler.waitForChanges({
-			element: oControl
-		}, oModificationSetting.payload);
+		var oRegistryEntry = this._getRegistryEntry(oControl);
+		return oRegistryEntry && oRegistryEntry.pendingModification ? oRegistryEntry.pendingModification : Promise.resolve()
+		.then(function(){
+			return oModificationSetting.handler.waitForChanges({
+				element: oControl
+			}, oModificationSetting.payload);
+		});
 	};
-
 	/**
 	 * Determines whether the environment is suitable for the desired modification of the provided control instance.
 	 *
@@ -550,8 +559,10 @@ sap.ui.define([
 			var oModificationSetting = this._determineModification(vControl);
 			return oModificationSetting.handler.processChanges(aChanges, oModificationSetting.payload)
 			.then(function(aChanges){
+				var oControl = Engine.getControlInstance(vControl);
+				this.stateHandlerRegistry.fireChange(oControl);
 				return aChanges;
-			});
+			}.bind(this));
 		} else {
 			return Promise.resolve([]);
 		}
@@ -561,7 +572,7 @@ sap.ui.define([
 	 * This method can be used in the designtime metadata of the control
 	 * for key user personalization.
 	 *
-	 * @ui5-restricted
+	 * @ui5-restricted sap.ui.mdc
 	 *
 	 * @param {sap.ui.core.Control} oControl The registered control instance
 	 * @param {object} mPropertyBag The property bag provided in the settings action
@@ -577,7 +588,7 @@ sap.ui.define([
 		// TODO: clarify if we need this error handling / what to do with the Link if we want to keep it
 		var aPVs = this.hasForReference(oControl, "sap.m.p13n.PersistenceProvider");
 
-		if (aPVs.length > 0 && !oControl.isA("sap.m.link.Panel")) {
+		if (aPVs.length > 0 && !oControl.isA("sap.ui.mdc.link.Panel")) {
 			return Promise.reject("Please do not use a PeristenceProvider in RTA.");
 		}
 
@@ -595,12 +606,14 @@ sap.ui.define([
 
 		this._setModificationHandler(oControl, oTemporaryRTAHandler);
 
-		this.uimanager.show(oControl, aKeys).then(function(oContainer){
-			var oCustomHeader = oContainer._oPopup.getCustomHeader();
+		this.uimanager.show(oControl, aKeys, {
+			showReset: false
+		}).then(function(oContainer){
+			var oCustomHeader = oContainer.getCustomHeader();
 			if (oCustomHeader) {
 				oCustomHeader.getContentRight()[0].setVisible(false);
 			}
-			oContainer._oPopup.addStyleClass(mPropertyBag.styleClass);
+			oContainer.addStyleClass(mPropertyBag.styleClass);
 			if (mPropertyBag.fnAfterClose instanceof Function) {
 				oContainer.attachAfterClose(mPropertyBag.fnAfterClose);
 			}
@@ -709,26 +722,24 @@ sap.ui.define([
 		oOld = merge({}, oOld);
 		oNew = merge({}, oNew);
 
-		this.getRegisteredControllers(oControl).forEach(function(sKey){
-
+		Object.keys(oNew).forEach(function(sKey){
 			aDiffCreation.push(this.createChanges({
 				control: oControl,
 				stateBefore: oOld[sKey],
 				state: oNew[sKey],
-				applyAbsolute: true,
+				applyAbsolute: ProcessingStrategy.FullReplace,
 				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;
+			Object.keys(oNew).forEach(function(sKey, i){
 
+				if (oNew[sKey]) {
+					var aState = this.getController(oControl, sKey).changesToState(aChanges[i], oOld[sKey], oNew[sKey]);
+					oDiffState[sKey] = aState;
+				}
 			}.bind(this));
 
 			return oDiffState;
@@ -884,9 +895,8 @@ sap.ui.define([
 	 */
 	Engine.prototype.getRegisteredControllers = function(vControl){
 		var oRegistryEntry = this._getRegistryEntry(vControl);
-		return Object.keys(oRegistryEntry.controller);
+		return oRegistryEntry ? Object.keys(oRegistryEntry.controller) : [];
 	};
-
 	/**
 	 * This method can be used to get the registry entry for a control instance
 	 *
@@ -935,9 +945,9 @@ sap.ui.define([
 
 			_mRegistry.set(oControl, {
 				modification: oPreConfig && oPreConfig.modification ? {
-					handler: oPreConfig.modification,//TBD
+					handler: oPreConfig.modification,
 					payload: {
-						mode: "Auto",//TBD,
+						mode: "Auto",
 						hasVM: true,
 						hasPP: false
 					}
@@ -945,7 +955,8 @@ sap.ui.define([
 				controller: {},
 				activeP13n: null,
 				helper: oPreConfig && oPreConfig.helper ? oPreConfig.helper : null,
-				xConfig: null
+				xConfig: null,
+				pendingAppliance: {}
 			});
 
 		}
@@ -953,6 +964,29 @@ sap.ui.define([
 		return _mRegistry.get(oControl);
 	};
 
+	Engine.prototype.trace = function(vControl, oChange) {
+		var oRegistryEntry = this._getRegistryEntry(vControl);
+		this.getRegisteredControllers(vControl).forEach(function(sKey){
+			var oController = this.getController(vControl, sKey);
+			var mChangeOperations = oController.getChangeOperations();
+			Object.keys(mChangeOperations).forEach(function(sType){
+				if (mChangeOperations[sType] === oChange.changeSpecificData.changeType) {
+					oRegistryEntry.pendingAppliance[sKey] = [].concat(oRegistryEntry.pendingAppliance[sKey]).concat(oChange);
+				}
+			});
+		}.bind(this));
+	};
+
+	Engine.prototype.getTrace = function(vControl, oChange) {
+		var oRegistryEntry = this._getRegistryEntry(vControl);
+		return Object.keys(oRegistryEntry.pendingAppliance);
+	};
+
+	Engine.prototype.clearTrace = function(vControl, oChange) {
+		var oRegistryEntry = this._getRegistryEntry(vControl);
+		oRegistryEntry.pendingAppliance = {};
+	};
+
 	/**
 	 * Determines and registers the ModificationHandler per control instance
 	 *
@@ -969,7 +1003,7 @@ sap.ui.define([
 			return oRegistryEntry.modification;
 		}
 
-		var aPPResults = this.hasForReference(vControl, "sap.m.p13n.PersistenceProvider");
+		var aPPResults = this.hasForReference(vControl, "sap.m.p13n.PersistenceProvider").concat(this.hasForReference(vControl, "sap.ui.mdc.p13n.PersistenceProvider"));
 		var aVMResults = this.hasForReference(vControl, "sap.ui.fl.variants.VariantManagement");
 
 		var aPersistenceProvider = aPPResults.length ? aPPResults : undefined;
@@ -1015,7 +1049,7 @@ sap.ui.define([
 			}
 			var aFor = oElement.getFor instanceof Function ? oElement.getFor() : [];
 			for (var n = 0; n < aFor.length; n++) {
-				if (aFor[n] === sControlId || this.hasControlAncestorWithId(sControlId, aFor[n])) {
+				if (aFor[n] === sControlId || oEngine.hasControlAncestorWithId(sControlId, aFor[n])) {
 					return true;
 				}
 			}
@@ -1166,24 +1200,28 @@ sap.ui.define([
 
 			var oController = this.getController(oControl, sControllerKey);
 
-			var p = this.createChanges({
-				control: oControl,
-				key: sControllerKey,
-				state: oController.getP13nData(),
-				suppressAppliance: true,
-				applyAbsolute: true
-			})
-			.then(function(aItemChanges){
+			var vP13nData = oController.getP13nData();
+			if (vP13nData) {
+				var p = this.createChanges({
+					control: oControl,
+					key: sControllerKey,
+					state: vP13nData,
+					suppressAppliance: true,
+					applyAbsolute: true
+				})
+				.then(function(aItemChanges){
 
-				return oController.getBeforeApply().then(function(aChanges){
+					return oController.getBeforeApply().then(function(aChanges){
 
-					var aComulatedChanges = aChanges ? aChanges.concat(aItemChanges) : aItemChanges;
-					return aComulatedChanges;
+						var aComulatedChanges = aChanges ? aChanges.concat(aItemChanges) : aItemChanges;
+						return aComulatedChanges;
 
+					});
 				});
-			});
 
-			pChanges.push(p);
+				pChanges.push(p);
+			}
+
 		}.bind(this));
 
 		return Promise.all(pChanges).then(function(aChangeMatrix){
@@ -1204,10 +1242,11 @@ sap.ui.define([
 	};
 
 	/**
+	 * This method is the central point of access to the Engine Singleton.
+	 *
 	 * @private
 	 * @ui5-restricted sap.m
 	 *
-	 * This method is the central point of access to the Engine Singleton.
 	 * @returns {sap.m.p13n.Engine} The Engine instance
 	 */
 	Engine.getInstance = function() {
@@ -1255,5 +1294,5 @@ sap.ui.define([
 		this.uimanager = null;
 	};
 
-	return Engine.getInstance();
+	return Engine;
 });

package/src/sap/m/p13n/FlexUtil.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([

package/src/sap/m/p13n/GroupController.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -21,9 +21,8 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @public
-	 * @experimental
 	 * @since 1.104
 	 * @alias sap.m.p13n.GroupController
 	 */

package/src/sap/m/p13n/GroupPanel.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -21,10 +21,9 @@ sap.ui.define([
 	 * @extends sap.m.p13n.QueryPanel
 	 *
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 *
 	 * @public
-	 * @experimental Since 1.104. Please note that the API of this control is not yet finalized!
 	 * @alias sap.m.p13n.GroupPanel
 	 */
 	var GroupPanel = QueryPanel.extend("sap.m.p13n.GroupPanel", {
@@ -59,7 +58,6 @@ sap.ui.define([
 	/**
 	 * P13n <code>GroupItem</code> object type.
 	 *
-	 * @type {sap.m.p13n.GroupItem}
 	 * @static
 	 * @constant
 	 * @typedef {object} sap.m.p13n.GroupItem

package/src/sap/m/p13n/MetadataHelper.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -12,9 +12,9 @@ sap.ui.define([
     /**
      * The <code>MetadataHelper</code> entity offers utility functionality for providing service metadata during the <code>Engine#register</code> process.
      *
+     * @class
 	 * @author SAP SE
 	 * @public
-     * @experimental Since 1.104.
 	 * @alias sap.m.p13n.MetadataHelper
      */
     var MetadataHelper = BaseObject.extend("sap.m.p13n.MetadataHelper", {

package/src/sap/m/p13n/PersistenceProvider.js

@@ -1,11 +1,11 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/core/Control", 	"sap/ui/fl/variants/VariantManagement", "sap/ui/fl/Utils", "sap/m/p13n/enum/PersistenceMode", "sap/ui/layout/VerticalLayout"
-], function(CoreControl, VariantManagement, Utils, mode, VerticalLayout) {
+	"sap/ui/core/Control", 	"sap/ui/fl/variants/VariantManagement", "sap/ui/fl/apply/api/ControlVariantApplyAPI", "sap/m/p13n/enum/PersistenceMode", "sap/ui/layout/VerticalLayout"
+], function(CoreControl, VariantManagement, ControlVariantApplyAPI, mode, VerticalLayout) {
 	"use strict";
 
 	/**
@@ -14,9 +14,9 @@ sap.ui.define([
 	 * since any control that is a direct or indirect descendant of the provided <code>for</code> association is affected by this configuration.
 	 * For example, this controller can be used for <code>sap.ui.mdc</code> controls.
 	 *
-	 * @private
+	 * @class
+	 * @ui5-restricted sap.ui.mdc, sap.fe
 	 *
-	 * @experimental
 	 * @since 1.104
 	*/
 	var PersistenceProvider = CoreControl.extend("sap.m.p13n.PersistenceProvider", /** @lends sap.ui.mdc.p13n.PersistenceProvider.prototype */ {
@@ -65,8 +65,9 @@ sap.ui.define([
 
 	PersistenceProvider.prototype._setModel = function () {
 
-		var oModel = this.getModel(Utils.VARIANT_MODEL_NAME);
+		var oModel = this.getModel(ControlVariantApplyAPI.getVariantModelName());
 		if (oModel) {
+			this.reinitialize();
 			this._fnResolveModel(oModel);
 		}
 	};
@@ -78,7 +79,7 @@ sap.ui.define([
 		if (this.getMode() === mode.Transient) {
 			var oVM = new VariantManagement(this.getId() + "--vm", {"for": this.getAssociation("for")});
 			this._oModelPromise.then(function (oModel) {
-				oVM.setModel(oModel, Utils.VARIANT_MODEL_NAME);
+				oVM.setModel(oModel, ControlVariantApplyAPI.getVariantModelName());
 			});
 			this._oWrapper = new VerticalLayout(this.getId() + "--accWrapper", {
 				visible: true,
@@ -140,6 +141,21 @@ sap.ui.define([
 		return this;
 	};
 
+	/**
+	 * This method reinitializes the inner <code>VariantManagement</code> control be providing the
+	 * variant model and triggering a reinitialize on the inner VM in the static area
+	 *
+	 * @ui5-restricted sap.m.p13n
+	 */
+	PersistenceProvider.prototype.reinitialize = function () {
+		var oVM = sap.ui.getCore().byId(this.getId() + "--vm");
+		if (this.getMode() === mode.Transient && oVM) {
+			var oVariantModel = this.getModel(ControlVariantApplyAPI.getVariantModelName());
+			oVM.setModel(oVariantModel, ControlVariantApplyAPI.getVariantModelName());
+			oVM.reinitialize();
+		}
+	};
+
 	PersistenceProvider.prototype.exit = function () {
 		if (this._oWrapper) {
 			var oStatic = sap.ui.getCore().getUIArea(sap.ui.getCore().getStaticAreaRef());