@openui5/sap.m 1.120.7 → 1.121.0

package/src/sap/m/p13n/modules/StateHandlerRegistry.js

@@ -6,13 +6,13 @@
 
 sap.ui.define([
 	"sap/ui/base/EventProvider"
-], function (EventProvider) {
+], (EventProvider) => {
 	"use strict";
 
-	var ERROR_INSTANCING = "StateHandlerRegistry: This class is a singleton and should not be used without an AdaptationProvider. Please use 'Engine.getInstance().stateHandlerRegistry' instead";
+	const ERROR_INSTANCING = "StateHandlerRegistry: This class is a singleton and should not be used without an AdaptationProvider. Please use 'Engine.getInstance().stateHandlerRegistry' instead";
 
 	//Singleton storage
-	var oStateHandlerRegistry;
+	let oStateHandlerRegistry;
 
 	/**
 	 * Constructor for a new StateHandlerRegistry.
@@ -21,13 +21,13 @@ sap.ui.define([
 	 * @extends sap.ui.base.EventProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 *
 	 * @private
 	 * @since 1.104
 	 * @alias sap.m.p13n.modules.StateHandlerRegistry
 	 */
-	var StateHandlerRegistry = EventProvider.extend("sap.m.p13n.modules.StateHandlerRegistry", {
+	const StateHandlerRegistry = EventProvider.extend("sap.m.p13n.modules.StateHandlerRegistry", {
 		constructor: function() {
 
 			if (oStateHandlerRegistry) {
@@ -91,7 +91,7 @@ sap.ui.define([
 	 *
 	 * @returns {this} Returns the <code>StateHandlerRegistry</code> instance.
 	 */
-	StateHandlerRegistry.getInstance = function () {
+	StateHandlerRegistry.getInstance = () => {
 		if (!oStateHandlerRegistry) {
 			oStateHandlerRegistry = new StateHandlerRegistry();
 		}
@@ -99,4 +99,4 @@ sap.ui.define([
 	};
 
 	return StateHandlerRegistry;
-});
+});

package/src/sap/m/p13n/modules/UIManager.js

@@ -6,14 +6,15 @@
 
 sap.ui.define([
 	"sap/ui/base/Object",
-	"sap/base/Log"
-], function (BaseObject, Log) {
+	"sap/base/Log",
+	"sap/ui/core/Lib"
+], (BaseObject, Log, Library) => {
 	"use strict";
 
-	var ERROR_INSTANCING = "UIManager: This class is a singleton and should not be used without an AdaptationProvider. Please use 'Engine.getInstance().uimanager' instead";
+	const ERROR_INSTANCING = "UIManager: This class is a singleton and should not be used without an AdaptationProvider. Please use 'Engine.getInstance().uimanager' instead";
 
 	//Singleton storage
-	var oUIManager;
+	let oUIManager;
 
 	/**
 	 * Constructor for a new UIManager.
@@ -27,14 +28,14 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 *
 	 * @private
 	 *
 	 * @since 1.104
 	 * @alias sap.m.p13n.modules.UIManager
 	 */
-	var UIManager = BaseObject.extend("sap.m.p13n.modules.UIManager", {
+	const UIManager = BaseObject.extend("sap.m.p13n.modules.UIManager", {
 		constructor: function(oAdaptationProvider) {
 
 			if (oUIManager) {
@@ -47,8 +48,8 @@ sap.ui.define([
 		}
 	});
 
-	var loadModules = function(aModules) {
-		return new Promise(function(resolve, reject) {
+	const loadModules = (aModules) => {
+		return new Promise((resolve, reject) => {
 			sap.ui.require(aModules, resolve, reject);
 		});
 	};
@@ -72,142 +73,143 @@ sap.ui.define([
 	 * @returns {Promise} Promise resolving in the <code>sap.m.p13n.Popup</code> instance.
 	 */
 	UIManager.prototype.show = function(oControl, vPanelKeys, mSettings) {
-		var aPanelKeys = vPanelKeys instanceof Array ? vPanelKeys : [vPanelKeys];
-		var oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m");
-		var that = this;
+		const aPanelKeys = vPanelKeys instanceof Array ? vPanelKeys : [vPanelKeys];
+		const oResourceBundle = Library.getResourceBundleFor("sap.m");
+		const that = this;
 		mSettings = Object.assign({}, mSettings);
 
-		if (!this.hasActiveP13n(oControl)){
+		if (!this.hasActiveP13n(oControl)) {
 			this.setActiveP13n(oControl, vPanelKeys);
 
 			return this.create(oControl, vPanelKeys, mSettings)
-			.then(function(aInitializedPanels){
-				return loadModules(["sap/m/p13n/Popup"]).then(function(Popup){
-
-					//if there is no title provided and only one panel created, use it's title as the Popup title
-					var sTitle;
-					if (!mSettings.title && aPanelKeys.length === 1 && aInitializedPanels.length > 0) {
-						sTitle = aInitializedPanels[0].getTitle();
-					} else {
-						sTitle = mSettings.title || oResourceBundle.getText("p13n.VIEW_SETTINGS");
-					}
+				.then((aInitializedPanels) => {
+					return loadModules(["sap/m/p13n/Popup"]).then((Popup) => {
+
+						//if there is no title provided and only one panel created, use it's title as the Popup title
+						let sTitle;
+						if (!mSettings.title && aPanelKeys.length === 1 && aInitializedPanels.length > 0) {
+							sTitle = aInitializedPanels[0].getTitle();
+						} else {
+							sTitle = mSettings.title || oResourceBundle.getText("p13n.VIEW_SETTINGS");
+						}
 
-					//Enrich Popup with AdaptationProvider functionality --> add controller logic (reset and appliance)
-					var oP13nContainer = new Popup({
-						mode: mSettings.mode,
-						warningText: mSettings.warningText || oResourceBundle.getText("p13n.RESET_WARNING_TEXT"),
-						title: sTitle,
-						close: function(oEvt){
+						//Enrich Popup with AdaptationProvider functionality --> add controller logic (reset and appliance)
+						const oP13nContainer = new Popup({
+							mode: mSettings.mode,
+							warningText: mSettings.warningText || oResourceBundle.getText("p13n.RESET_WARNING_TEXT"),
+							title: sTitle,
+							close: function(oEvt) {
 
-							var sReason = oEvt.getParameter("reason");
-							if (sReason == "Ok") {
-								that.oAdaptationProvider.handleP13n(oControl, aPanelKeys);
-							}
-							var aPanels = oP13nContainer.getPanels();
-
-							aPanels.forEach(function(oPanel){
-								if (oPanel.keepAlive instanceof Function && oPanel.keepAlive()){
-									oP13nContainer.removePanel(oPanel);
+								const sReason = oEvt.getParameter("reason");
+								if (sReason == "Ok") {
+									that.oAdaptationProvider.handleP13n(oControl, aPanelKeys);
 								}
-							});
+								const aPanels = oP13nContainer.getPanels();
+
+								aPanels.forEach((oPanel) => {
+									if (oPanel.keepAlive instanceof Function && oPanel.keepAlive()) {
+										oP13nContainer.removePanel(oPanel);
+									}
+								});
+
+								that.setActiveP13n(oControl, null);
+								oP13nContainer._oPopup.attachAfterClose(() => {
+									if (mSettings.close instanceof Function) {
+										mSettings.close();
+									}
+									oP13nContainer.destroy();
+								});
+							}
+						});
 
-							that.setActiveP13n(oControl, null);
-							oP13nContainer._oPopup.attachAfterClose(function(){
-								if (mSettings.close instanceof Function) {
-									mSettings.close();
-								}
-								oP13nContainer.destroy();
+						if (mSettings.showReset !== false) {
+							oP13nContainer.setReset(() => {
+								const fnReset = mSettings.reset instanceof Function ? mSettings.reset : that.oAdaptationProvider.reset.bind(that.oAdaptationProvider);
+								fnReset(oControl, aPanelKeys);
 							});
 						}
-					});
 
-					if (mSettings.showReset !== false) {
-						oP13nContainer.setReset(function(){
-							var fnReset = mSettings.reset instanceof Function ? mSettings.reset : that.oAdaptationProvider.reset.bind(that.oAdaptationProvider);
-							fnReset(oControl, aPanelKeys);
+						aInitializedPanels.forEach((oPanel, iIndex) => {
+							oP13nContainer.addPanel(oPanel, aPanelKeys[iIndex]);
 						});
-					}
-
-					aInitializedPanels.forEach(function(oPanel, iIndex){
-						oP13nContainer.addPanel(oPanel, aPanelKeys[iIndex]);
-					});
 
-					oControl.addDependent(oP13nContainer);
-					oP13nContainer.open(mSettings.source, mSettings);
-					return oP13nContainer._oPopup;
+						oControl.addDependent(oP13nContainer);
+						oP13nContainer.open(mSettings.source, mSettings);
+						return oP13nContainer._oPopup;
 
+					});
+				}, (eContainerFailure) => {
+					this.setActiveP13n(oControl, null);
+					Log.error("UIManager failure:" + eContainerFailure.stack);
 				});
-			}, function(eContainerFailure){
-				this.setActiveP13n(oControl, null);
-				Log.error("UIManager failure:" + eContainerFailure.stack);
-			}.bind(this));
 		} else {
 			return Promise.resolve();
 		}
 	};
 
 	UIManager.prototype.create = function(oControl, vPanelKeys) {
-		var aPanelKeys = vPanelKeys instanceof Array ? vPanelKeys : [vPanelKeys];
-		var that = this;
+		const aPanelKeys = vPanelKeys instanceof Array ? vPanelKeys : [vPanelKeys];
+		const that = this;
 
 		return this.oAdaptationProvider.initAdaptation(oControl, aPanelKeys)
-		.then(function(){
-			var vSettings = this.oAdaptationProvider.getUISettings(oControl, aPanelKeys);
-
-			//if condition only temporarly necessary until sap.ui.comp adjusted
-			if (vSettings instanceof Promise) {
-				return vSettings;
-			} else {
-				var aPanelPromises = [], aPanelSettings = [];
-				Object.keys(vSettings).forEach(function(sSetting){
-					var vSetting = vSettings[sSetting];
-					if (vSetting && vSetting.hasOwnProperty("adaptationUI")) {
-						var pCreation = vSetting.adaptationUI;
-						aPanelPromises.push(pCreation);
-
-						aPanelSettings.push({
-							key: sSetting,
-							settings: vSetting
-						});
-					}
-				});
-				return Promise.all(aPanelPromises).then(function(aPanels){
-					var mMappedSetting = {};
-					aPanels.forEach(function(oPanel, iIndex){
-						if (oPanel) {
-							var oPanelSetting = aPanelSettings[iIndex];
-							var mContainerSettings = oPanelSetting.settings.containerSettings;
-							if (mContainerSettings.title) {
-								oPanel.setTitle(mContainerSettings.title);
-							}
-							mMappedSetting[oPanelSetting.key] = {
-								panel: oPanel
-							};
+			.then(() => {
+				const vSettings = this.oAdaptationProvider.getUISettings(oControl, aPanelKeys);
+
+				//if condition only temporarly necessary until sap.ui.comp adjusted
+				if (vSettings instanceof Promise) {
+					return vSettings;
+				} else {
+					const aPanelPromises = [],
+						aPanelSettings = [];
+					Object.keys(vSettings).forEach((sSetting) => {
+						const vSetting = vSettings[sSetting];
+						if (vSetting && vSetting.hasOwnProperty("adaptationUI")) {
+							const pCreation = vSetting.adaptationUI;
+							aPanelPromises.push(pCreation);
+
+							aPanelSettings.push({
+								key: sSetting,
+								settings: vSetting
+							});
 						}
 					});
-					return mMappedSetting;
-				});
-			}
-		}.bind(this))
+					return Promise.all(aPanelPromises).then((aPanels) => {
+						const mMappedSetting = {};
+						aPanels.forEach((oPanel, iIndex) => {
+							if (oPanel) {
+								const oPanelSetting = aPanelSettings[iIndex];
+								const mContainerSettings = oPanelSetting.settings.containerSettings;
+								if (mContainerSettings.title) {
+									oPanel.setTitle(mContainerSettings.title);
+								}
+								mMappedSetting[oPanelSetting.key] = {
+									panel: oPanel
+								};
+							}
+						});
+						return mMappedSetting;
+					});
+				}
+			})
 
-		.then(function(mSettings){
-			var aInitializedPanels = [];
+			.then((mSettings) => {
+				const aInitializedPanels = [];
 
-			//Attach state validation during personalization
-			Object.keys(mSettings).forEach(function(sPanel, iIndex){
-				var oPanel = mSettings[sPanel].panel;
+				//Attach state validation during personalization
+				Object.keys(mSettings).forEach((sPanel, iIndex) => {
+					const oPanel = mSettings[sPanel].panel;
 
-				//not every panel used is a p13n.BasePanel (comp.FilterPanel, AdaptationFilterBar) these panels might not provide a change event
-				if (oPanel.attachChange instanceof Function) {
-					oPanel.attachChange(function(oEvt){
-						that.oAdaptationProvider.validateP13n(oControl, aPanelKeys[iIndex], oEvt.getSource());
-					});
-				}
-				aInitializedPanels.push(oPanel);
-			});
+					//not every panel used is a p13n.BasePanel (comp.FilterPanel, AdaptationFilterBar) these panels might not provide a change event
+					if (oPanel.attachChange instanceof Function) {
+						oPanel.attachChange((oEvt) => {
+							that.oAdaptationProvider.validateP13n(oControl, aPanelKeys[iIndex], oEvt.getSource());
+						});
+					}
+					aInitializedPanels.push(oPanel);
+				});
 
-			return aInitializedPanels;
-		});
+				return aInitializedPanels;
+			});
 	};
 
 	UIManager.getInstance = function(oAdaptationProvider) {
@@ -225,7 +227,7 @@ sap.ui.define([
 	};
 
 	UIManager.prototype.hasActiveP13n = function(vControl) {
-		var bActiveP13n = false;
+		let bActiveP13n = false;
 		if (this.oAdaptationProvider.hasActiveP13n instanceof Function) {
 			bActiveP13n = this.oAdaptationProvider.hasActiveP13n(vControl);
 		}
@@ -240,8 +242,8 @@ sap.ui.define([
 	 *
 	 * @param {sap.m.AdaptationProvider} oAdaptationProvider Object implementing the <code>sap.m.AdaptationProvider</code> interface to provide personalization capabilites.
 	 */
-	UIManager._checkValidInterface = function(oAdaptationProvider) {
-		if (!oAdaptationProvider || !oAdaptationProvider.isA("sap.m.p13n.modules.AdaptationProvider")){
+	UIManager._checkValidInterface = (oAdaptationProvider) => {
+		if (!oAdaptationProvider || !oAdaptationProvider.isA("sap.m.p13n.modules.AdaptationProvider")) {
 			throw Error("The UIManager singleton must not be accessed without an AdaptationProvider interface!");
 		}
 	};

package/src/sap/m/p13n/modules/xConfigAPI.js

@@ -6,7 +6,7 @@
 sap.ui.define([
 	"sap/base/util/merge",
 	"sap/ui/core/util/reflection/JsControlTreeModifier"
-], function(merge, JsControlTreeModifier) {
+], (merge, JsControlTreeModifier) => {
 	"use strict";
 
 	/**
@@ -14,7 +14,7 @@ sap.ui.define([
 	 * @private
 	 * @alias sap.m.p13n.modules.xConfigAPI
 	 */
-	var xConfigAPI = {};
+	const xConfigAPI = {};
 
 	/**
 	 * Enhances the xConfig object for a given mdc control instance.
@@ -31,41 +31,41 @@ sap.ui.define([
 	 *
 	 * @returns {Promise<object>} Promise resolving to the adapted xConfig object
 	 */
-	xConfigAPI.enhanceConfig = function(oControl, oModificationPayload) {
-		var mPropertyBag = oModificationPayload.propertyBag;
-		var oModifier = mPropertyBag ? mPropertyBag.modifier : JsControlTreeModifier;
-		var oControlMetadata;
-		var oXConfig;
+	xConfigAPI.enhanceConfig = (oControl, oModificationPayload) => {
+		const mPropertyBag = oModificationPayload.propertyBag;
+		const oModifier = mPropertyBag ? mPropertyBag.modifier : JsControlTreeModifier;
+		let oControlMetadata;
+		let oXConfig;
 
 		return oModifier.getControlMetadata(oControl)
-			.then(function(oRetrievedControlMetadata) {
+			.then((oRetrievedControlMetadata) => {
 				oControlMetadata = oRetrievedControlMetadata;
 				oModificationPayload.controlMetadata = oControlMetadata;
 				return oModifier.getAggregation(oControl, "customData");
 			})
-			.then(function(aCustomData) {
+			.then((aCustomData) => {
 
-				return Promise.all(aCustomData.map(function(oCustomData){
+				return Promise.all(aCustomData.map((oCustomData) => {
 					return oModifier.getProperty(oCustomData, "key");
-				})).then(function(aCustomDataKeys){
-					return aCustomData.reduce(function(oResult, mCustomData, iIndex){
+				})).then((aCustomDataKeys) => {
+					return aCustomData.reduce((oResult, mCustomData, iIndex) => {
 						return aCustomDataKeys[iIndex] === "xConfig" ? mCustomData : oResult;
 					}, undefined);
 				});
 			})
-			.then(function(oRetrievedXConfig) {
+			.then((oRetrievedXConfig) => {
 				oXConfig = oRetrievedXConfig;
 				if (oXConfig) {
 					return oModifier.getProperty(oXConfig, "value")
-					.then(function(sConfig){
-						return merge({}, JSON.parse(sConfig.replace(/\\/g, '')));
-					});
+						.then((sConfig) => {
+							return merge({}, JSON.parse(sConfig.replace(/\\/g, '')));
+						});
 				}
 				return {};
 			})
-			.then(function(oExistingConfig) {
+			.then((oExistingConfig) => {
 
-				var oConfig;
+				let oConfig;
 				if (oModificationPayload.controlMeta && oModificationPayload.controlMeta.aggregation) {
 					oConfig = xConfigAPI.createAggregationConfig(oControl, oModificationPayload, oExistingConfig);
 				} else {
@@ -76,21 +76,21 @@ sap.ui.define([
 					oConfig.modified = true;
 				}
 
-				var oAppComponent = mPropertyBag ? mPropertyBag.appComponent : undefined;
+				const oAppComponent = mPropertyBag ? mPropertyBag.appComponent : undefined;
 
-				var pDelete = Promise.resolve();
+				let pDelete = Promise.resolve();
 				if (oXConfig && oControl.isA) {
 					pDelete = oModifier.removeAggregation(oControl, "customData", oXConfig)
-					.then(function(){
-						return oModifier.destroy(oXConfig);
-					});
+						.then(() => {
+							return oModifier.destroy(oXConfig);
+						});
 				}
 
-				return pDelete.then(function(){
+				return pDelete.then(() => {
 					return oModifier.createAndAddCustomData(oControl, "xConfig", JSON.stringify(oConfig), oAppComponent)
-					.then(function(){
-						return merge({}, oConfig);
-					});
+						.then(() => {
+							return merge({}, oConfig);
+						});
 				});
 			});
 	};
@@ -104,25 +104,24 @@ sap.ui.define([
 	 *
 	 * @returns {Promise<object>|object} A promise resolving to the adapted xConfig object or the object directly
 	 */
-	xConfigAPI.readConfig = function(oControl, oModificationPayload) {
-		var oConfig, oAggregationConfig;
+	xConfigAPI.readConfig = (oControl, oModificationPayload) => {
 
 		if (oModificationPayload) {
-			var oModifier = oModificationPayload.propertyBag ? oModificationPayload.propertyBag.modifier : JsControlTreeModifier;
+			const oModifier = oModificationPayload.propertyBag ? oModificationPayload.propertyBag.modifier : JsControlTreeModifier;
 			return oModifier.getAggregation(oControl, "customData")
-				.then(function(aCustomData) {
-					return Promise.all(aCustomData.map(function(oCustomData){
+				.then((aCustomData) => {
+					return Promise.all(aCustomData.map((oCustomData) => {
 						return oModifier.getProperty(oCustomData, "key");
-					})).then(function(aCustomDataKeys){
-						return aCustomData.reduce(function(oResult, mCustomData, iIndex){
+					})).then((aCustomDataKeys) => {
+						return aCustomData.reduce((oResult, mCustomData, iIndex) => {
 							return aCustomDataKeys[iIndex] === "xConfig" ? mCustomData : oResult;
 						}, undefined);
 					});
 				})
-				.then(function(oAggregationConfig) {
+				.then((oAggregationConfig) => {
 					if (oAggregationConfig) {
 						return oModifier.getProperty(oAggregationConfig, "value")
-							.then(function(sValue) {
+							.then((sValue) => {
 								return merge({}, JSON.parse(sValue.replace(/\\/g, '')));
 							});
 					}
@@ -132,12 +131,12 @@ sap.ui.define([
 
 		// These functions are used instead of the modifier to avoid that the
 		// entire call stack is changed to async when it's not needed
-		var fnGetAggregationSync = function(oParent, sAggregationName) {
-			var fnFindAggregation = function(oControl, sAggregationName) {
+		const fnGetAggregationSync = (oParent, sAggregationName) => {
+			const fnFindAggregation = (oControl, sAggregationName) => {
 				if (oControl) {
 					if (oControl.getMetadata) {
-						var oMetadata = oControl.getMetadata();
-						var oAggregations = oMetadata.getAllAggregations();
+						const oMetadata = oControl.getMetadata();
+						const oAggregations = oMetadata.getAllAggregations();
 						if (oAggregations) {
 							return oAggregations[sAggregationName];
 						}
@@ -146,26 +145,26 @@ sap.ui.define([
 				return undefined;
 			};
 
-			var oAggregation = fnFindAggregation(oParent, sAggregationName);
+			const oAggregation = fnFindAggregation(oParent, sAggregationName);
 			if (oAggregation) {
 				return oParent[oAggregation._sGetter]();
 			}
 			return undefined;
 		};
 
-		var fnGetPropertySync = function(oControl, sPropertyName) {
-			var oMetadata = oControl.getMetadata().getPropertyLikeSetting(sPropertyName);
+		const fnGetPropertySync = (oControl, sPropertyName) => {
+			const oMetadata = oControl.getMetadata().getPropertyLikeSetting(sPropertyName);
 			if (oMetadata) {
-				var sPropertyGetter = oMetadata._sGetter;
+				const sPropertyGetter = oMetadata._sGetter;
 				return oControl[sPropertyGetter]();
 			}
 			return undefined;
 		};
 
-		oAggregationConfig = fnGetAggregationSync(oControl, "customData").find(function(oCustomData){
+		const oAggregationConfig = fnGetAggregationSync(oControl, "customData").find((oCustomData) => {
 			return fnGetPropertySync(oCustomData, "key") == "xConfig";
 		});
-		oConfig = oAggregationConfig ? merge({}, JSON.parse(fnGetPropertySync(oAggregationConfig, "value").replace(/\\/g, ''))) : null;
+		const oConfig = oAggregationConfig ? merge({}, JSON.parse(fnGetPropertySync(oAggregationConfig, "value").replace(/\\/g, ''))) : null;
 		return oConfig;
 	};
 
@@ -183,18 +182,18 @@ sap.ui.define([
 	 *
 	 * @returns {object} The adapted xConfig object
 	 */
-	xConfigAPI.createAggregationConfig = function(oControl, oModificationPayload, oExistingConfig) {
+	xConfigAPI.createAggregationConfig = (oControl, oModificationPayload, oExistingConfig) => {
 
-		var sPropertyInfoKey = oModificationPayload.key || oModificationPayload.name;
-		var mControlMeta = oModificationPayload.controlMeta;
+		const sPropertyInfoKey = oModificationPayload.key || oModificationPayload.name;
+		const mControlMeta = oModificationPayload.controlMeta;
 
-		var sAffectedProperty = oModificationPayload.property;
+		const sAffectedProperty = oModificationPayload.property;
 
-		var vValue = oModificationPayload.value;
-		var oControlMetadata = oModificationPayload.controlMetadata || oControl.getMetadata();
-		var sAffectedAggregation = mControlMeta.aggregation;
-		var sAggregationName = sAffectedAggregation ? sAffectedAggregation : oControlMetadata.getDefaultAggregation().name;
-		var oConfig = oExistingConfig || {};
+		const vValue = oModificationPayload.value;
+		const oControlMetadata = oModificationPayload.controlMetadata || oControl.getMetadata();
+		const sAffectedAggregation = mControlMeta.aggregation;
+		const sAggregationName = sAffectedAggregation ? sAffectedAggregation : oControlMetadata.getDefaultAggregation().name;
+		const oConfig = oExistingConfig || {};
 
 		if (!oConfig.hasOwnProperty("aggregations")) {
 			oConfig.aggregations = {};
@@ -214,17 +213,19 @@ sap.ui.define([
 
 		if (vValue !== null || (vValue && vValue.hasOwnProperty("value") && vValue.value !== null)) {
 
+			const currentState = oModificationPayload.currentState;
+
 			switch (oModificationPayload.operation) {
 				case "move":
 					Object.entries(oConfig.aggregations[sAggregationName]).forEach((aEntry) => {
 						if (
 							aEntry[0] !== sPropertyInfoKey &&
 							aEntry[1].position !== undefined
-						){
-							var newIndex = vValue.index;
-							var currentState = oModificationPayload.currentState;
-							var currentItemState = currentState?.find((item) => item.key == sPropertyInfoKey);
-							var currentItemIndex = currentState?.indexOf(currentItemState);
+						) {
+							const newIndex = vValue.index;
+							const currentState = oModificationPayload.currentState;
+							const currentItemState = currentState?.find((item) => item.key == sPropertyInfoKey);
+							const currentItemIndex = currentState?.indexOf(currentItemState);
 
 							//In case of move changes, we also need to ensure that existing xConfig position changes
 							//are adapted accordingly to avoid index mismatches
@@ -243,11 +244,13 @@ sap.ui.define([
 						}
 					});
 					oConfig.aggregations[sAggregationName][sPropertyInfoKey][sAffectedProperty] = vValue.index;
+					if (vValue.persistenceIdentifier) {
+						oConfig.aggregations[sAggregationName][sPropertyInfoKey]["persistenceIdentifier"] = vValue.persistenceIdentifier;
+					}
 					break;
 				case "remove":
 				case "add":
 				default:
-					var currentState = oModificationPayload.currentState;
 
 					//Adjust index after a remove happened for instance
 					if (currentState && currentState instanceof Array) {
@@ -262,6 +265,9 @@ sap.ui.define([
 					if (vValue.hasOwnProperty("value")) {
 						oConfig.aggregations[sAggregationName][sPropertyInfoKey][sAffectedProperty] = vValue.value;
 						oConfig.aggregations[sAggregationName][sPropertyInfoKey]["position"] = vValue.index;
+						if (vValue.persistenceIdentifier) {
+							oConfig.aggregations[sAggregationName][sPropertyInfoKey]["persistenceIdentifier"] = vValue.persistenceIdentifier;
+						}
 					} else {
 						oConfig.aggregations[sAggregationName][sPropertyInfoKey][sAffectedProperty] = vValue;
 					}
@@ -297,14 +303,14 @@ sap.ui.define([
 	 *
 	 * @returns {object} The adapted xConfig object
 	 */
-	xConfigAPI.createPropertyConfig = function(oControl, oModificationPayload, oExistingConfig) {
+	xConfigAPI.createPropertyConfig = (oControl, oModificationPayload, oExistingConfig) => {
 
 		//var sDataKey = oModificationPayload.key;
 
-		var vValue = oModificationPayload.value;
+		const vValue = oModificationPayload.value;
 		//var oControlMetadata = oModificationPayload.controlMetadata || oControl.getMetadata();
-		var sAffectedProperty = oModificationPayload.property;
-		var oConfig = oExistingConfig || {};
+		const sAffectedProperty = oModificationPayload.property;
+		const oConfig = oExistingConfig || {};
 
 		if (!oConfig.properties) {
 			oConfig.properties = {};
@@ -314,13 +320,13 @@ sap.ui.define([
 			oConfig.properties[sAffectedProperty] = [];
 		}
 
-		var sOperation = oModificationPayload.operation;
+		const sOperation = oModificationPayload.operation;
 
-		var oItem = oConfig.properties[sAffectedProperty].find(function(oEntry){
+		const oItem = oConfig.properties[sAffectedProperty].find((oEntry) => {
 			return oEntry.key === oModificationPayload.key;
 		});
 
-		if (oItem) {
+		if (oItem && sOperation !== "add") {
 			oConfig.properties[sAffectedProperty].splice(oConfig.properties[sAffectedProperty].indexOf(oItem), 1);
 		}