@openui5/sap.m 1.120.6 → 1.121.0

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

@@ -12,24 +12,39 @@ sap.ui.define([
 	"sap/m/MessageStrip",
 	"sap/ui/core/library",
 	"sap/ui/core/Element",
+	"sap/ui/core/ElementRegistry",
 	"sap/m/p13n/modules/DefaultProviderRegistry",
 	"sap/m/p13n/modules/UIManager",
 	"sap/m/p13n/modules/StateHandlerRegistry",
 	"sap/m/p13n/modules/xConfigAPI",
-	"sap/m/p13n/enum/ProcessingStrategy"
-], function (AdaptationProvider, merge, Log, FlexModificationHandler, MessageStrip, coreLibrary, Element, DefaultProviderRegistry, UIManager, StateHandlerRegistry, xConfigAPI, ProcessingStrategy) {
+	"sap/m/p13n/enums/ProcessingStrategy"
+], (
+	AdaptationProvider,
+	merge,
+	Log,
+	FlexModificationHandler,
+	MessageStrip,
+	coreLibrary,
+	Element,
+	ElementRegistry,
+	DefaultProviderRegistry,
+	UIManager,
+	StateHandlerRegistry,
+	xConfigAPI,
+	ProcessingStrategy
+) => {
 	"use strict";
 
-	var ERROR_INSTANCING = "Engine: This class is a singleton. Please use the getInstance() method instead.";
+	const ERROR_INSTANCING = "Engine: This class is a singleton. Please use the getInstance() method instead.";
 
 	//Shortcut to 'MessageType'
-	var MessageType = coreLibrary.MessageType;
+	const MessageType = coreLibrary.MessageType;
 
 	/*global WeakMap */
-	var _mRegistry = new WeakMap();
+	const _mRegistry = new WeakMap();
 
 	//Singleton storage
-	var oEngine;
+	let oEngine;
 
 	/**
 	 *
@@ -57,12 +72,12 @@ sap.ui.define([
 	 * @alias sap.m.p13n.Engine
 	 * @extends sap.m.p13n.modules.AdaptationProvider
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @public
 	 * @since 1.104
 	 */
-	var Engine = AdaptationProvider.extend("sap.m.p13n.Engine", {
-		constructor: function () {
+	const Engine = AdaptationProvider.extend("sap.m.p13n.Engine", {
+		constructor: function() {
 			AdaptationProvider.call(this);
 
 			if (oEngine) {
@@ -91,12 +106,6 @@ sap.ui.define([
 	 * @public
 	 */
 
-	/**
-	 * @namespace
-	 * @name sap.m.p13n.MetadataHelper
-	 * @public
-	 */
-
 	/**
 	 *
 	 * The central registration for personalization functionality.
@@ -105,7 +114,7 @@ sap.ui.define([
 	 * methods that always expect a control instance as parameter. Only registered control instances can be used for personalization through the <code>Engine</code>.
 	 * @public
 	 * @typedef {object} sap.m.p13n.EngineRegistrationConfig
-	 * @property {sap.m.p13n.MetadataHelper} helper The <code>{@link sap.m.p13n.modification.MetadataHelper MetadataHelper}</code> to provide metadata-specific information.
+	 * @property {sap.m.p13n.MetadataHelper} helper The <code>{@link sap.m.p13n.MetadataHelper MetadataHelper}</code> to provide metadata-specific information. It may be used to define more granular information for the selection of items.
 	 * @property {Object<string,sap.m.p13n.SelectionController>} 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.
 	 */
 
@@ -135,13 +144,13 @@ sap.ui.define([
 	 * 		}
 	 *	}
 	 */
-	Engine.prototype.register = function (oControl, oConfig) {
+	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.");
 		}
 
-		var oRegistryEntry = this._getRegistryEntry(oControl);
+		let oRegistryEntry = this._getRegistryEntry(oControl);
 
 		if (oRegistryEntry) {
 			this.deregister(oControl);
@@ -149,11 +158,11 @@ sap.ui.define([
 
 		oRegistryEntry = this._createRegistryEntry(oControl, oConfig);
 
-		var aControllerKeys = Object.keys(oConfig.controller);
+		const aControllerKeys = Object.keys(oConfig.controller);
 
-		aControllerKeys.forEach(function (sKey) {
+		aControllerKeys.forEach((sKey) => {
 
-			var oSubController = oConfig.controller[sKey];
+			const oSubController = oConfig.controller[sKey];
 
 			if (!this.getController(oControl, sKey)) {
 				if (this._aRegistry.indexOf(oControl.getId()) < 0) {
@@ -163,10 +172,10 @@ sap.ui.define([
 				this.addController(oSubController, sKey);
 			}
 
-		}.bind(this));
+		});
 
 		//In case the control is marked as modified, the state change event is triggered once initially to apply the default state
-		var oXConfig = oControl.getCustomData().find((oCustomData) => oCustomData.getKey() == "xConfig");
+		const oXConfig = oControl.getCustomData().find((oCustomData) => oCustomData.getKey() == "xConfig");
 		if (oXConfig && JSON.parse((oXConfig.getValue()).replace(/\\/g, ''))?.modified) {
 			this.fireStateChange(oControl);
 		}
@@ -183,12 +192,12 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.core.Control} oControl The registered control instance
 	 */
-	Engine.prototype.deregister = function (oControl) {
-		var oRegistryEntry = this._getRegistryEntry(oControl);
+	Engine.prototype.deregister = function(oControl) {
+		const oRegistryEntry = this._getRegistryEntry(oControl);
 
 		//destroy subcontroller
-		Object.keys(oRegistryEntry.controller).forEach(function (sKey) {
-			var oController = oRegistryEntry.controller[sKey];
+		Object.keys(oRegistryEntry.controller).forEach((sKey) => {
+			const oController = oRegistryEntry.controller[sKey];
 			oController.destroy();
 
 			delete oRegistryEntry.controller[sKey];
@@ -198,7 +207,7 @@ sap.ui.define([
 		_mRegistry.delete(oControl);
 
 		//Remove the control from the array to maintain debugging
-		var iControlIndex = this._aRegistry.indexOf(oControl.getId());
+		const iControlIndex = this._aRegistry.indexOf(oControl.getId());
 		this._aRegistry.splice(iControlIndex, 1);
 	};
 
@@ -219,14 +228,17 @@ sap.ui.define([
 	 *
 	 * @returns {Promise<sap.m.p13n.Popup>} Promise resolving in the <code>sap.m.p13n.Popup</code> instance
 	 */
-	Engine.prototype.show = function (oControl, vPanelKeys, mSettings) {
-		return this.hasChanges(oControl)
-		.catch((oError) => {
-			return false;
-		})
-		.then(function(enableReset){
-			return this.uimanager.show(oControl, vPanelKeys, {...mSettings, enableReset});
-		}.bind(this));
+	Engine.prototype.show = function(oControl, vPanelKeys, mSettings) {
+		return this.hasChanges(oControl, vPanelKeys)
+			.catch((oError) => {
+				return false;
+			})
+			.then((enableReset) => {
+				return this.uimanager.show(oControl, vPanelKeys, {
+					...mSettings,
+					enableReset
+				});
+			});
 	};
 
 	/**
@@ -238,7 +250,7 @@ sap.ui.define([
 	 * @param {function(sap.ui.base.Event):void} fnStateEventHandler The handler function to call when the event occurs
 	 * @returns {this} Returns <code>this</code> to allow method chaining
 	 */
-	Engine.prototype.attachStateChange = function (fnStateEventHandler) {
+	Engine.prototype.attachStateChange = function(fnStateEventHandler) {
 		return this.stateHandlerRegistry.attachChange(fnStateEventHandler);
 	};
 
@@ -251,7 +263,7 @@ sap.ui.define([
 	 * @param {function(sap.ui.base.Event):void} fnStateEventHandler The handler function to detach from the event
 	 * @returns {this} Returns <code>this</code> to allow method chaining
 	 */
-	Engine.prototype.detachStateChange = function (fnStateEventHandler) {
+	Engine.prototype.detachStateChange = function(fnStateEventHandler) {
 		return this.stateHandlerRegistry.detachChange(fnStateEventHandler);
 	};
 
@@ -259,20 +271,38 @@ sap.ui.define([
 	 * Check if there are changes for a given control instance
 	 *
 	 * @private
-         * @ui5-restricted sap.m, sap.ui.mdc
-         *
+	 * @ui5-restricted sap.m, sap.ui.mdc
+	 *
 	 * @param {sap.ui.core.Control} control The control instance
 	 * @param {string} key The affected controller key
 	 * @returns {Promise<boolean>} A Promise that resolves if the given control instance has applied changes
 	 */
 	Engine.prototype.hasChanges = function(control, key) {
-		const changeOperations = this.getController(control, key)?.getChangeOperations();
+		const oChangeOperations = this.getController(control, key)?.getChangeOperations();
 		let changeTypes;
-		if (changeOperations) {
-			changeTypes = Object.values(changeOperations);
+		if (oChangeOperations) {
+			changeTypes = [];
+			Object.values(oChangeOperations).forEach((vChangeOperation) => {
+				if (Array.isArray(vChangeOperation)) {
+					changeTypes = changeTypes.concat(vChangeOperation);
+				} else {
+					changeTypes.push(vChangeOperation);
+				}
+			});
 		}
-		var oModificationSetting = this._determineModification(control);
-		return this.getModificationHandler(control).hasChanges({selector: control, changeTypes}, oModificationSetting?.payload).then((enableReset) => {
+		let selectors = [];
+		if (this.getController(control, key)?.getSelectorsForHasChanges) {
+			selectors = selectors.concat(this.getController(control, key).getSelectorsForHasChanges());
+		} else {
+			selectors.push(control);
+		}
+
+		const oModificationSetting = this._determineModification(control);
+		return this.getModificationHandler(control).hasChanges({
+			selector: control,
+			selectors,
+			changeTypes
+		}, oModificationSetting?.payload).then((enableReset) => {
 			return enableReset;
 		});
 	};
@@ -287,7 +317,7 @@ sap.ui.define([
 	 *
 	 * @returns {Promise<null>} A Promise resolving once the reset is completed
 	 */
-	Engine.prototype.reset = function (oControl, aKeys) {
+	Engine.prototype.reset = function(oControl, aKeys) {
 
 		if (aKeys === undefined) {
 			aKeys = this.getRegisteredControllers(oControl);
@@ -295,36 +325,35 @@ sap.ui.define([
 
 		aKeys = aKeys instanceof Array ? aKeys : [aKeys];
 
-		var aSelectors = [];
+		let aSelectors = [];
 
-		aKeys.forEach(function (sKey) {
+		aKeys.forEach((sKey) => {
 			aSelectors = aSelectors.concat(this.getController(oControl, sKey).getSelectorForReset());
-		}.bind(this));
+		});
 
-		var oResetConfig = {
+		const oResetConfig = {
 			selectors: aSelectors,
 			selector: oControl
 		};
 
 		if (aKeys) {
-			var aChangeTypes = [];
-			aKeys.forEach(function (sKey) {
+			let aChangeTypes = [];
+			aKeys.forEach((sKey) => {
 				aChangeTypes = aChangeTypes.concat(Object.values(this.getController(oControl, sKey).getChangeOperations()));
-			}.bind(this));
-			oResetConfig.changeTypes = [].concat.apply([], aChangeTypes);
+			});
+			oResetConfig.changeTypes = [].concat(...aChangeTypes);
 		}
 
-		var oModificationSetting = this._determineModification(oControl);
-		return oModificationSetting.handler.reset(oResetConfig, oModificationSetting.payload).then(function () {
-			this.stateHandlerRegistry.fireChange(oControl);
+		const oModificationSetting = this._determineModification(oControl);
+		return oModificationSetting.handler.reset(oResetConfig, oModificationSetting.payload).then(() => {
 			//Re-Init housekeeping after update
-			return this.initAdaptation(oControl, aKeys).then(function (oPropertyHelper) {
-				aKeys.forEach(function (sKey) {
-					var oController = this.getController(oControl, sKey);
+			return this.initAdaptation(oControl, aKeys).then((oPropertyHelper) => {
+				aKeys.forEach((sKey) => {
+					const oController = this.getController(oControl, sKey);
 					oController.update(oPropertyHelper);
-				}.bind(this));
-			}.bind(this));
-		}.bind(this));
+				});
+			});
+		});
 	};
 
 	/**
@@ -367,7 +396,7 @@ sap.ui.define([
 	 *		},
 	 *		{
 	 *			key: "key2",
-	 *			grouped: false //Removes selection status for key2
+	 *			grouped: false //Removes grouping status for key2
 	 *		},{
 	 *			key: "key3",
 	 *			position: 2 //Reorders current grouping position in the array
@@ -379,12 +408,13 @@ sap.ui.define([
 	 *
 	 * @returns {Promise<sap.m.p13n.State>} A Promise resolving after the state has been applied
 	 */
-	Engine.prototype.applyState = function (oControl, oState) {
+	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) {
-
-			var aStatePromise = [], aChanges = [], mInfoState = {};
+		return this.retrieveState(oControl).then((oCurrentState) => {
+			const aStatePromise = [];
+			let aChanges = [];
+			let mInfoState = {};
 
 			if (oControl.validateState instanceof Function) {
 				mInfoState = oControl.validateState(this.externalizeKeys(oControl, oState));
@@ -394,10 +424,9 @@ sap.ui.define([
 				Log.error(mInfoState.message);
 			}
 
-			var aKeys = Object.keys(oState);
-			aKeys.forEach(function (sControllerKey) {
-
-				var oController = this.getController(oControl, sControllerKey);
+			const aKeys = Object.keys(oState);
+			aKeys.forEach((sControllerKey) => {
+				const oController = this.getController(oControl, sControllerKey);
 
 				if (!oController) {
 					//In case no controller can be found, skip change creation & appliance
@@ -405,7 +434,7 @@ sap.ui.define([
 					return;
 				}
 
-				var oStatePromise = this.createChanges({
+				const oStatePromise = this.createChanges({
 					control: oControl,
 					key: sControllerKey,
 					state: oController.sanityCheck(oState[sControllerKey]),
@@ -414,24 +443,23 @@ sap.ui.define([
 				});
 
 				aStatePromise.push(oStatePromise);
-			}.bind(this));
+			});
 
-			return Promise.all(aStatePromise).then(function (aRawChanges) {
-				var mChangeMap = {};
+			return Promise.all(aStatePromise).then((aRawChanges) => {
+				const mChangeMap = {};
 
-				aRawChanges.forEach(function (aSpecificChanges, iIndex) {
+				aRawChanges.forEach((aSpecificChanges, iIndex) => {
 
 					if (aSpecificChanges && aSpecificChanges.length > 0) {
 						aChanges = aChanges.concat(aSpecificChanges);
-						var sKey = aKeys[iIndex];
+						const sKey = aKeys[iIndex];
 						mChangeMap[sKey] = aSpecificChanges;
 					}
 				});
 
 				return this._processChanges(oControl, mChangeMap);
-			}.bind(this));
-
-		}.bind(this));
+			});
+		});
 	};
 
 	/**
@@ -447,16 +475,16 @@ sap.ui.define([
 	 *
 	 * @returns {Promise<sap.m.p13n.State>} A Promise resolving in the current control state
 	 */
-	Engine.prototype.retrieveState = function (oControl) {
+	Engine.prototype.retrieveState = function(oControl) {
 
 		//ensure that the control has been initialized
-		return this.checkControlInitialized(oControl).then(function () {
+		return this.checkControlInitialized(oControl).then(() => {
 
 			//ensure that all changes have been applied
-			return Engine.getInstance().waitForChanges(oControl).then(function () {
+			return Engine.getInstance().waitForChanges(oControl).then(() => {
 
-				var oRetrievedState = {};
-				Engine.getInstance().getRegisteredControllers(oControl).forEach(function (sKey) {
+				const oRetrievedState = {};
+				Engine.getInstance().getRegisteredControllers(oControl).forEach((sKey) => {
 					oRetrievedState[sKey] = Engine.getInstance().getController(oControl, sKey).getCurrentState(true);
 				});
 
@@ -475,19 +503,19 @@ sap.ui.define([
 	 * @param {sap.ui.core.Control} vControl The registered control instance
 	 * @param {sap.m.p13n.modification.ModificationHandler} oModificationHandler The modification handler object
 	 */
-	Engine.prototype._setModificationHandler = function (vControl, oModificationHandler) {
+	Engine.prototype._setModificationHandler = function(vControl, oModificationHandler) {
 		if (!oModificationHandler.isA("sap.m.p13n.modification.ModificationHandler")) {
 			throw new Error("Only sap.m.p13n.modification.ModificationHandler derivations are allowed for modification");
 		}
-		var oModificationSetting = this._determineModification(vControl); //check and calculate modification basics
+		const oModificationSetting = this._determineModification(vControl); //check and calculate modification basics
 		oModificationSetting.handler = oModificationHandler;
 		this._getRegistryEntry(vControl).modification = oModificationSetting;
 	};
 
-	Engine.prototype._addToQueue = function (oControl, fTask) {
-		var oRegistryEntry = this._getRegistryEntry(oControl);
+	Engine.prototype._addToQueue = function(oControl, fTask) {
+		const oRegistryEntry = this._getRegistryEntry(oControl);
 
-		var fCleanupPromiseQueue = function (pOriginalPromise) {
+		const fCleanupPromiseQueue = (pOriginalPromise) => {
 			if (oRegistryEntry.pendingModification === pOriginalPromise) {
 				oRegistryEntry.pendingModification = null;
 			}
@@ -521,62 +549,66 @@ sap.ui.define([
 	 *
 	 * @returns {Promise} A Promise resolving in the related delta changes
 	 */
-	Engine.prototype.createChanges = function (mDiffParameters) {
+	Engine.prototype.createChanges = function(mDiffParameters) {
 
-		var oControl = Engine.getControlInstance(mDiffParameters.control);
-		var sKey = mDiffParameters.key;
-		var vNewState = mDiffParameters.state;
-		var bSuppressCallback = !!mDiffParameters.suppressAppliance;
+		const oControl = Engine.getControlInstance(mDiffParameters.control);
+		const sKey = mDiffParameters.key;
+		const vNewState = mDiffParameters.state;
+		const bSuppressCallback = !!mDiffParameters.suppressAppliance;
 
 		if (!sKey || !mDiffParameters.control || !vNewState) {
 			return Promise.resolve([]);
 		}
 
-		var fDeltaHandling = function () {
-			return this.initAdaptation(oControl, sKey).then(function () {
+		const fDeltaHandling = () => {
+			return this.initAdaptation(oControl, sKey).then(() => {
 				return vNewState;
 			})
-				.then(function (aNewState) {
-
-					var oController = this.getController(oControl, sKey);
-					var mChangeOperations = oController.getChangeOperations();
-
-					var oRegistryEntry = this._getRegistryEntry(oControl);
-					var oCurrentState = oController.getCurrentState();
-					var oPriorState = merge(oCurrentState instanceof Array ? [] : {}, oCurrentState);
+				.then((aNewState) => {
+
+					const oController = this.getController(oControl, sKey);
+					const mChangeOperations = oController.getChangeOperations();
+
+					const oRegistryEntry = this._getRegistryEntry(oControl);
+					const oCurrentState = oController.getCurrentState();
+					const oPriorState = merge(oCurrentState instanceof Array ? [] : {}, oCurrentState);
+
+					const oControllerHelper = oController.getMetadataHelper();
+					const oHelper = oControllerHelper ? oControllerHelper : oRegistryEntry.helper;
+					const oPropertyInfo = oHelper.getProperties().map((a) => {
+						return {
+							key: a.key,
+							name: a.name
+						};
+					});
 
-					var mDeltaConfig = {
+					const mDeltaConfig = {
 						existingState: mDiffParameters.stateBefore || oPriorState,
 						applyAbsolute: mDiffParameters.applyAbsolute,
 						changedState: aNewState,
 						control: oController.getAdaptationControl(),
 						changeOperations: mChangeOperations,
 						deltaAttributes: ["key"],
-						propertyInfo: oRegistryEntry.helper.getProperties().map(function (a) {
-							return {
-								key: a.key,
-								name: a.name
-							};
-						})
+						propertyInfo: oPropertyInfo
 					};
 
 					//Only execute change calculation in case there is a difference (--> example: press 'Ok' without a difference)
-					var aChanges = oController.getDelta(mDeltaConfig);
+					const aChanges = oController.getDelta(mDeltaConfig);
 
 					if (!bSuppressCallback) {
-						var mChangeMap = {};
+						const mChangeMap = {};
 						mChangeMap[sKey] = aChanges;
 						return this._processChanges(oControl, mChangeMap)
-							.then(function () {
+							.then(() => {
 								return aChanges;
 							});
 					}
 
 					return aChanges || [];
 
-				}.bind(this));
+				});
 
-		}.bind(this);
+		};
 
 		return this._addToQueue(oControl, fDeltaHandling);
 	};
@@ -590,11 +622,11 @@ 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) {
-		var oModificationSetting = this._determineModification(oControl);
-		var oRegistryEntry = this._getRegistryEntry(oControl);
+	Engine.prototype.waitForChanges = function(oControl) {
+		const oModificationSetting = this._determineModification(oControl);
+		const oRegistryEntry = this._getRegistryEntry(oControl);
 		return oRegistryEntry && oRegistryEntry.pendingModification ? oRegistryEntry.pendingModification : Promise.resolve()
-			.then(function () {
+			.then(() => {
 				return oModificationSetting.handler.waitForChanges({
 					element: oControl
 				}, oModificationSetting.payload);
@@ -609,17 +641,17 @@ sap.ui.define([
 	 *
 	 * @returns {Promise} A Promise resolving in a Boolean that determines whether the requirements for the persistence layer are met
 	 */
-	Engine.prototype.isModificationSupported = function (oControl) {
-		var oModificationSetting = this._determineModification(oControl);
+	Engine.prototype.isModificationSupported = function(oControl) {
+		const oModificationSetting = this._determineModification(oControl);
 		return oModificationSetting.handler.isModificationSupported({
 			element: oControl
 		}, oModificationSetting.payload);
 	};
 
-	Engine.prototype.fireStateChange = function (oControl) {
-		return this.retrieveState(oControl).then(function (oState) {
+	Engine.prototype.fireStateChange = function(oControl) {
+		return this.retrieveState(oControl).then((oState) => {
 			this.stateHandlerRegistry.fireChange(oControl, oState);
-		}.bind(this));
+		});
 	};
 
 	/**
@@ -630,24 +662,19 @@ sap.ui.define([
 	 * @param {object} mChanges A map of keys and arrays, every controller will provide an array of changes
 	 * @returns {Promise} The change appliance <code>Promise</code>
 	 */
-	Engine.prototype._processChanges = function (vControl, mChanges) {
-		var aChanges = [];
-		var aKeys = Object.keys(mChanges);
-		var oDiff = {};
+	Engine.prototype._processChanges = function(vControl, mChanges) {
+		let aChanges = [];
+		const aKeys = Object.keys(mChanges);
+		const oDiff = {};
 
-		aKeys.forEach(function (sKey) {
+		aKeys.forEach((sKey) => {
 			oDiff[sKey] = this.getController(vControl, sKey).changesToState(mChanges[sKey]);
 			aChanges = aChanges.concat(mChanges[sKey]);
-		}.bind(this));
+		});
 
 		if (aChanges instanceof Array && aChanges.length > 0) {
-			var oModificationSetting = this._determineModification(vControl);
-			return oModificationSetting.handler.processChanges(aChanges, oModificationSetting.payload)
-				.then(function (aChanges) {
-					var oControl = Engine.getControlInstance(vControl);
-					this.fireStateChange(oControl);
-					return aChanges;
-				}.bind(this));
+			const oModificationSetting = this._determineModification(vControl);
+			return oModificationSetting.handler.processChanges(aChanges, oModificationSetting.payload);
 		} else {
 			return Promise.resolve([]);
 		}
@@ -667,26 +694,26 @@ sap.ui.define([
 	 *
 	 * @returns {Promise} A Promise resolving in the set of changes to be created during UI adaptation at runtime
 	 */
-	Engine.prototype.getRTASettingsActionHandler = function (oControl, mPropertyBag, aKeys) {
+	Engine.prototype.getRTASettingsActionHandler = function(oControl, mPropertyBag, aKeys) {
 
-		var fResolveRTA;
+		let fResolveRTA;
 
 		//var aVMs = this.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 = this.hasForReference(oControl, "sap.m.p13n.PersistenceProvider");
+		const aPVs = this.hasForReference(oControl, "sap.m.p13n.PersistenceProvider");
 
 		if (aPVs.length > 0 && !oControl.isA("sap.ui.mdc.link.Panel")) {
 			return Promise.reject("Please do not use a PeristenceProvider in RTA.");
 		}
 
-		var oOriginalModifHandler = this.getModificationHandler(oControl);
-		var oTemporaryRTAHandler = new FlexModificationHandler();
+		const oOriginalModifHandler = this.getModificationHandler(oControl);
+		const oTemporaryRTAHandler = new FlexModificationHandler();
 
-		var oRTAPromise = new Promise(function (resolve, reject) {
+		const oRTAPromise = new Promise((resolve, reject) => {
 			fResolveRTA = resolve;
 		});
 
-		oTemporaryRTAHandler.processChanges = function (aChanges) {
+		oTemporaryRTAHandler.processChanges = (aChanges) => {
 			fResolveRTA(aChanges);
 			return Promise.resolve(aChanges);
 		};
@@ -695,8 +722,8 @@ sap.ui.define([
 
 		this.uimanager.show(oControl, aKeys, {
 			showReset: false
-		}).then(function (oContainer) {
-			var oCustomHeader = oContainer.getCustomHeader();
+		}).then((oContainer) => {
+			const oCustomHeader = oContainer.getCustomHeader();
 			if (oCustomHeader) {
 				oCustomHeader.getContentRight()[0].setVisible(false);
 			}
@@ -706,10 +733,10 @@ sap.ui.define([
 			}
 		});
 
-		oRTAPromise.then(function () {
+		oRTAPromise.then(() => {
 			this._setModificationHandler(oControl, oOriginalModifHandler);
 			oTemporaryRTAHandler.destroy();
-		}.bind(this));
+		});
 
 		return oRTAPromise;
 
@@ -731,14 +758,15 @@ sap.ui.define([
 	 * @param {object} [mEnhanceConfig.propertyBag] Optional property bag for the <code>ModificationHandler</code>
 	 * @returns {Promise} Promise resolving when the xConfig is successfully enhanced
 	 */
-	Engine.prototype.enhanceXConfig = function (vControl, mEnhanceConfig) {
+	Engine.prototype.enhanceXConfig = function(vControl, mEnhanceConfig) {
 
-		var oControl = Engine.getControlInstance(vControl);
-		var oRegistryEntry = this._getRegistryEntry(vControl);
-		mEnhanceConfig.currentState = Engine.getInstance().getController(oControl, mEnhanceConfig.changeType)?.getCurrentState();
+		const oControl = Engine.getControlInstance(vControl);
+		const oRegistryEntry = this._getRegistryEntry(vControl);
+		const sPersistenceIdentifier = mEnhanceConfig && mEnhanceConfig.value && mEnhanceConfig.value.controllerKey ? mEnhanceConfig.value.controllerKey : undefined;
+		mEnhanceConfig.currentState = Engine.getInstance().getController(oControl, mEnhanceConfig.changeType, sPersistenceIdentifier)?.getCurrentState();
 
 		return xConfigAPI.enhanceConfig(oControl, mEnhanceConfig)
-			.then(function (oConfig) {
+			.then((oConfig) => {
 				if (oRegistryEntry) {
 					//to simplify debugging
 					oRegistryEntry.xConfig = oConfig;
@@ -759,9 +787,9 @@ sap.ui.define([
 	 * @returns {Promise<object>|object}
 	 * A <code>Promise</code> that resolves with the configuration. The xConfig itself if it is already available, or <code>null</code> if there is no xConfig
 	 */
-	Engine.prototype.readXConfig = function (vControl, mEnhanceConfig) {
+	Engine.prototype.readXConfig = (vControl, mEnhanceConfig) => {
 
-		var oControl = Engine.getControlInstance(vControl);
+		const oControl = Engine.getControlInstance(vControl);
 		return xConfigAPI.readConfig(oControl, mEnhanceConfig) || {};
 	};
 
@@ -775,14 +803,14 @@ sap.ui.define([
 	 * @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);
+	Engine.prototype.externalizeKeys = function(vControl, oInternalState) {
+		const oExternalState = {};
+		Object.keys(oInternalState).forEach((sInternalKey) => {
+			const oController = this.getController(Engine.getControlInstance(vControl), sInternalKey);
 			if (oController) {
 				oExternalState[oController.getStateKey()] = oInternalState[sInternalKey];
 			}
-		}.bind(this));
+		});
 		return oExternalState;
 	};
 
@@ -796,56 +824,58 @@ sap.ui.define([
 	 * @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();
+	Engine.prototype.internalizeKeys = function(vControl, oExternalState) {
+		const aControllerKeys = this.getRegisteredControllers(vControl),
+			oInternalState = {};
+		aControllerKeys.forEach((sInternalRegistryKey) => {
+			const sExternalStateKey = this.getController(vControl, sInternalRegistryKey).getStateKey();
 			if (oExternalState.hasOwnProperty(sExternalStateKey)) {
 				oInternalState[sInternalRegistryKey] = oExternalState[sExternalStateKey];
 			}
-		}.bind(this));
+		});
 		return oInternalState;
 	};
 
-	Engine.prototype.diffState = function (oControl, oOld, oNew) {
+	Engine.prototype.diffState = function(oControl, oOld, oNew) {
 
-		var aDiffCreation = [], oDiffState = {};
+		const aDiffCreation = [],
+			oDiffState = {};
 		oOld = merge({}, oOld);
 		oNew = merge({}, oNew);
 
-		Object.keys(oNew).forEach(function (sKey) {
+		Object.keys(oNew).forEach((sKey) => {
 			aDiffCreation.push(this.createChanges({
 				control: oControl,
 				stateBefore: oOld[sKey],
-				state: oNew[sKey],
+				state: this.getController(oControl, sKey).sanityCheck(oNew[sKey]),
 				applyAbsolute: ProcessingStrategy.FullReplace,
 				key: sKey,
 				suppressAppliance: true
 			}));
-		}.bind(this));
+		});
 		return Promise.all(aDiffCreation)
-			.then(function (aChanges) {
-				Object.keys(oNew).forEach(function (sKey, i) {
+			.then((aChanges) => {
+				Object.keys(oNew).forEach((sKey, i) => {
 
 					if (oNew[sKey]) {
-						var aState = this.getController(oControl, sKey).changesToState(aChanges[i], oOld[sKey], oNew[sKey]);
+						const aState = this.getController(oControl, sKey).changesToState(aChanges[i], oOld[sKey], oNew[sKey]);
 						oDiffState[sKey] = aState;
 					}
-				}.bind(this));
+				});
 
 				return oDiffState;
 
-			}.bind(this));
+			});
 	};
 
-	Engine.prototype.checkControlInitialized = function (vControl) {
-		var oControl = Engine.getControlInstance(vControl);
-		var pInitialize = oControl.initialized instanceof Function ? oControl.initialized() : Promise.resolve();
+	Engine.prototype.checkControlInitialized = (vControl) => {
+		const oControl = Engine.getControlInstance(vControl);
+		const pInitialize = oControl.initialized instanceof Function ? oControl.initialized() : Promise.resolve();
 		return pInitialize || Promise.resolve();
 	};
 
-	Engine.prototype.checkPropertyHelperInitialized = function (vControl) {
-		var oControl = Engine.getControlInstance(vControl);
+	Engine.prototype.checkPropertyHelperInitialized = (vControl) => {
+		const oControl = Engine.getControlInstance(vControl);
 		return oControl.initPropertyHelper instanceof Function ? oControl.initPropertyHelper() : Promise.resolve();
 	};
 
@@ -860,21 +890,21 @@ sap.ui.define([
 	 *
 	 * @returns {Promise} A Promise resolving after the adaptation housekeeping has been initialized
 	 */
-	Engine.prototype.initAdaptation = function (vControl, aKeys) {
+	Engine.prototype.initAdaptation = function(vControl, aKeys) {
 		this.verifyController(vControl, aKeys);
 
 		//1) Cache property helper
-		var oRegistryEntry = this._getRegistryEntry(vControl);
-		var oControl = Engine.getControlInstance(vControl);
+		const oRegistryEntry = this._getRegistryEntry(vControl);
+		const oControl = Engine.getControlInstance(vControl);
 
 		if (oRegistryEntry.helper) {
 			return Promise.resolve(oRegistryEntry.helper);
 		}
 
-		return this.checkPropertyHelperInitialized(oControl).then(function (oPropertyHelper) {
+		return this.checkPropertyHelperInitialized(oControl).then((oPropertyHelper) => {
 			oRegistryEntry.helper = oPropertyHelper;
 			return oPropertyHelper;
-		}, function (sHelperError) {
+		}, (sHelperError) => {
 			throw new Error(sHelperError);
 		});
 
@@ -889,8 +919,8 @@ sap.ui.define([
 	 * @param {string} sKey The key that defines the later access to the controller instance.
 	 * @param {object} oPreConfig A predefined configuration
 	 */
-	Engine.prototype.addController = function (oController, sKey, oPreConfig) {
-		var oRegistryEntry = this._getRegistryEntry(oController.getAdaptationControl(), oPreConfig);
+	Engine.prototype.addController = function(oController, sKey, oPreConfig) {
+		const oRegistryEntry = this._getRegistryEntry(oController.getAdaptationControl(), oPreConfig);
 		oRegistryEntry.controller[sKey] = oController;
 	};
 
@@ -900,27 +930,34 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.core.Control} vControl The registered Control instance.
 	 * @param {string} sKey The key/changeType for which the controller has been registered.
+	 * @param {string} [sPersistenceIdentifier] The key defined for the controller. Should be used if <code>sKey</code> represents the changeType.
 	 *
 	 * @returns {sap.m.p13n.SelectionController} The controller instance
 	 */
-	Engine.prototype.getController = function (vControl, sKey) {
-		var oRegistryEntry = this._getRegistryEntry(vControl), oController;
+	Engine.prototype.getController = function(vControl, sKey, sPersistenceIdentifier) {
+		const oRegistryEntry = this._getRegistryEntry(vControl);
+		let oController;
 		if (oRegistryEntry && oRegistryEntry.controller.hasOwnProperty(sKey)) {
 			oController = oRegistryEntry.controller[sKey];
 		}
 
-		if (!oController) {
-			this.getRegisteredControllers(vControl).forEach(function (sController) {
-				var oRegisteredController = this.getController(vControl, sController);
-				if (oRegisteredController) {
-					Object.keys(oRegisteredController.getChangeOperations()).forEach(function (sOperationType) {
-						if (oRegisteredController.getChangeOperations()[sOperationType] === sKey) {
+		if (oController) {
+			return oController;
+		}
+
+		this.getRegisteredControllers(vControl).forEach((sController) => {
+			const oRegisteredController = this.getController(vControl, sController);
+			if (oRegisteredController) {
+				Object.keys(oRegisteredController.getChangeOperations()).forEach((sOperationType) => {
+					if (oRegisteredController.getChangeOperations()[sOperationType] === sKey) {
+						if (!sPersistenceIdentifier || sPersistenceIdentifier === oRegisteredController.getPersistenceIdentifier()) {
 							oController = oRegisteredController;
 						}
-					});
-				}
-			}.bind(this));
-		}
+					}
+				});
+			}
+		});
+
 		return oController;
 	};
 
@@ -930,15 +967,15 @@ sap.ui.define([
 	 * @param {sap.ui.core.Control} vControl The registered Control instance.
 	 * @param {string|array} vKey A key as string or an array of keys
 	 */
-	Engine.prototype.verifyController = function (vControl, vKey) {
-		var aKeys = vKey instanceof Array ? vKey : [vKey];
+	Engine.prototype.verifyController = function(vControl, vKey) {
+		const aKeys = vKey instanceof Array ? vKey : [vKey];
 
-		aKeys.forEach(function (sKey) {
+		aKeys.forEach((sKey) => {
 			if (!this.getController(vControl, sKey)) {
-				var oControl = Engine.getControlInstance(vControl);
+				const oControl = Engine.getControlInstance(vControl);
 				throw new Error("No controller registered yet for " + oControl.getId() + " and key: " + sKey);
 			}
-		}.bind(this));
+		});
 
 	};
 
@@ -951,26 +988,27 @@ sap.ui.define([
 	 *
 	 * @returns {object} The requested UI settings of the control instance and provided keys
 	 */
-	Engine.prototype.getUISettings = function (vControl, vKeys) {
-		var aKeys = Array.isArray(vKeys) ? vKeys : [vKeys];
+	Engine.prototype.getUISettings = function(vControl, vKeys) {
+		const aKeys = Array.isArray(vKeys) ? vKeys : [vKeys];
 		this.verifyController(vControl, aKeys);
-		var oPropertyHelper = this._getRegistryEntry(vControl).helper;
-		var mUiSettings = {}, aPanelCreation = [];
+		const oPropertyHelper = this._getRegistryEntry(vControl).helper;
+		const mUiSettings = {},
+			aPanelCreation = [];
 
-		aKeys.forEach(function (sKey) {
-			var oController = this.getController(vControl, sKey);
-			var pAdaptationUI = oController.initAdaptationUI(oPropertyHelper);
+		aKeys.forEach((sKey) => {
+			const oController = this.getController(vControl, sKey);
+			const pAdaptationUI = oController.initAdaptationUI(oPropertyHelper);
 
 			//Check faceless controller implementations and skip them
 			if (pAdaptationUI instanceof Promise) {
 				aPanelCreation.push(pAdaptationUI);
 			}
-		}.bind(this));
+		});
 
 		return Promise.all(aPanelCreation)
-			.then(function (aPanels) {
-				aPanels.forEach(function (oPanel, iIndex) {
-					var sKey = aKeys[iIndex];
+			.then((aPanels) => {
+				aPanels.forEach((oPanel, iIndex) => {
+					const sKey = aKeys[iIndex];
 					mUiSettings[sKey] = {
 						panel: oPanel
 					};
@@ -988,8 +1026,8 @@ sap.ui.define([
 	 * @param {string|sap.ui.core.Control} vControl The control ID or instance
 	 * @returns {boolean} true if modification settings were already determined
 	 */
-	Engine.prototype.isRegistered = function (vControl) {
-		var oRegistryEntry = this._getRegistryEntry(vControl);
+	Engine.prototype.isRegistered = function(vControl) {
+		const oRegistryEntry = this._getRegistryEntry(vControl);
 		return !!oRegistryEntry;
 	};
 
@@ -999,10 +1037,10 @@ sap.ui.define([
 	 * @private
 	 *
 	 * @param {sap.ui.core.Control} vControl The registered Control instance
-	   * @returns {boolean} true if modification settings were already determined
+	 * @returns {boolean} true if modification settings were already determined
 	 */
-	Engine.prototype.isRegisteredForModification = function (vControl) {
-		var oRegistryEntry = this._getRegistryEntry(vControl);
+	Engine.prototype.isRegisteredForModification = function(vControl) {
+		const oRegistryEntry = this._getRegistryEntry(vControl);
 		return oRegistryEntry && !!oRegistryEntry.modification;
 	};
 
@@ -1012,8 +1050,8 @@ sap.ui.define([
 	 * @param {string|sap.ui.core.Control} vControl The control ID or instance
 	 * @returns {array} An array of all registered controller instances
 	 */
-	Engine.prototype.getRegisteredControllers = function (vControl) {
-		var oRegistryEntry = this._getRegistryEntry(vControl);
+	Engine.prototype.getRegisteredControllers = function(vControl) {
+		const oRegistryEntry = this._getRegistryEntry(vControl);
 		return oRegistryEntry ? Object.keys(oRegistryEntry.controller) : [];
 	};
 	/**
@@ -1024,9 +1062,9 @@ sap.ui.define([
 	 *
 	 * @returns {object} The related registry entry
 	 */
-	Engine.prototype._getRegistryEntry = function (vControl) {
+	Engine.prototype._getRegistryEntry = (vControl) => {
 
-		var oControl = Engine.getControlInstance(vControl);
+		const oControl = Engine.getControlInstance(vControl);
 		return _mRegistry.get(oControl);
 
 	};
@@ -1040,8 +1078,8 @@ sap.ui.define([
 	 * @param {string|sap.ui.core.Control} vControl The control id or instance
 	 * @returns {object} The related ModificationHandler.
 	 */
-	Engine.prototype.getModificationHandler = function (vControl) {
-		var oModificationSetting = this._determineModification(vControl);
+	Engine.prototype.getModificationHandler = function(vControl) {
+		const oModificationSetting = this._determineModification(vControl);
 
 		//This method might also be retrieved by non-registered Controls (such as FilterBarBase) - the default should always be Flex.
 		return oModificationSetting.handler;
@@ -1056,9 +1094,9 @@ sap.ui.define([
 	 * @param {object} oPreConfig A predefined configuration
 	 * @returns {object} The related registry entry
 	 */
-	Engine.prototype._createRegistryEntry = function (vControl, oPreConfig) {
+	Engine.prototype._createRegistryEntry = (vControl, oPreConfig) => {
 
-		var oControl = Engine.getControlInstance(vControl);
+		const oControl = Engine.getControlInstance(vControl);
 
 		if (!_mRegistry.has(oControl)) {
 
@@ -1083,29 +1121,30 @@ 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) {
+	Engine.prototype.trace = function(vControl, oChange) {
+		const oRegistryEntry = this._getRegistryEntry(vControl);
+		this.getRegisteredControllers(vControl).forEach((sKey) => {
+			const oController = this.getController(vControl, sKey);
+			const mChangeOperations = oController.getChangeOperations();
+			Object.keys(mChangeOperations).forEach((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), oTrace;
+	Engine.prototype.getTrace = function(vControl, oChange) {
+		const oRegistryEntry = this._getRegistryEntry(vControl);
+		let oTrace;
 		if (oRegistryEntry) {
 			oTrace = Object.keys(oRegistryEntry.pendingAppliance);
 		}
 		return oTrace;
 	};
 
-	Engine.prototype.clearTrace = function (vControl, oChange) {
-		var oRegistryEntry = this._getRegistryEntry(vControl);
+	Engine.prototype.clearTrace = function(vControl, oChange) {
+		const oRegistryEntry = this._getRegistryEntry(vControl);
 		if (oRegistryEntry) {
 			oRegistryEntry.pendingAppliance = {};
 		}
@@ -1118,22 +1157,22 @@ sap.ui.define([
 	 * @param {string|sap.ui.core.Control} vControl The control id or instance
 	 * @returns {object} The related modification registry entry
 	 */
-	Engine.prototype._determineModification = function (vControl) {
+	Engine.prototype._determineModification = function(vControl) {
 
-		var oRegistryEntry = this._getRegistryEntry(vControl);
+		const oRegistryEntry = this._getRegistryEntry(vControl);
 
 		//Modification setting is only calculated once per control instance
 		if (oRegistryEntry && oRegistryEntry.modification) {
 			return oRegistryEntry.modification;
 		}
 
-		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");
+		const aPPResults = this.hasForReference(vControl, "sap.m.p13n.PersistenceProvider").concat(this.hasForReference(vControl, "sap.ui.mdc.p13n.PersistenceProvider"));
+		const aVMResults = this.hasForReference(vControl, "sap.ui.fl.variants.VariantManagement");
 
-		var aPersistenceProvider = aPPResults.length ? aPPResults : undefined;
-		var sHandlerMode = aPersistenceProvider ? aPersistenceProvider[0].getMode() : "Standard";
+		const aPersistenceProvider = aPPResults.length ? aPPResults : undefined;
+		const sHandlerMode = aPersistenceProvider ? aPersistenceProvider[0].getMode() : "Standard";
 
-		var oModificationSetting = {
+		const oModificationSetting = {
 			handler: FlexModificationHandler.getInstance(),
 			payload: {
 				hasVM: aVMResults && aVMResults.length > 0,
@@ -1149,14 +1188,14 @@ sap.ui.define([
 		return oModificationSetting;
 	};
 
-	Engine.prototype.hasForReference = function (vControl, sControlType) {
-		var sControlId = vControl && vControl.getId ? vControl.getId() : vControl;
-		var aResults = Element.registry.filter(function (oElement) {
+	Engine.prototype.hasForReference = (vControl, sControlType) => {
+		const sControlId = vControl && vControl.getId ? vControl.getId() : vControl;
+		const aResults = ElementRegistry.filter((oElement) => {
 			if (!oElement.isA(sControlType)) {
 				return false;
 			}
-			var aFor = oElement.getFor instanceof Function ? oElement.getFor() : [];
-			for (var n = 0; n < aFor.length; n++) {
+			const aFor = oElement.getFor instanceof Function ? oElement.getFor() : [];
+			for (let n = 0; n < aFor.length; n++) {
 				if (aFor[n] === sControlId || oEngine.hasControlAncestorWithId(sControlId, aFor[n])) {
 					return true;
 				}
@@ -1175,14 +1214,14 @@ sap.ui.define([
 	 *
 	 * @returns {boolean} Returns whether an related ancestor could be found.
 	 */
-	Engine.prototype.hasControlAncestorWithId = function (sControlId, sAncestorControlId) {
-		var oControl;
+	Engine.prototype.hasControlAncestorWithId = (sControlId, sAncestorControlId) => {
+		let oControl;
 
 		if (sControlId === sAncestorControlId) {
 			return true;
 		}
 
-		oControl = sap.ui.getCore().byId(sControlId);
+		oControl = Element.getElementById(sControlId);
 		while (oControl) {
 			if (oControl.getId() === sAncestorControlId) {
 				return true;
@@ -1208,8 +1247,8 @@ sap.ui.define([
 	 * @param {string|sap.ui.core.Control} vControl The control ID or instance
 	 * @returns {sap.ui.core.Control} The control instance
 	 */
-	Engine.getControlInstance = function (vControl) {
-		return typeof vControl == "string" ? sap.ui.getCore().byId(vControl) : vControl;
+	Engine.getControlInstance = (vControl) => {
+		return typeof vControl == "string" ? Element.getElementById(vControl) : vControl;
 	};
 
 	/**
@@ -1222,7 +1261,7 @@ sap.ui.define([
 	 *
 	 * @returns {boolean} The related flag is the Control has an open P13n container
 	 */
-	Engine.prototype.hasActiveP13n = function (vControl) {
+	Engine.prototype.hasActiveP13n = function(vControl) {
 		return !!this._getRegistryEntry(vControl).activeP13n;
 	};
 
@@ -1237,7 +1276,7 @@ sap.ui.define([
 	 * @param {string} sKey The registered key to get the corresponding controller.
 	 * @param {boolean} bModified Determines whether changes have been triggered while the dialog has been opened
 	 */
-	Engine.prototype.setActiveP13n = function (vControl, sKey, bModified) {
+	Engine.prototype.setActiveP13n = function(vControl, sKey, bModified) {
 		this._getRegistryEntry(vControl).activeP13n = sKey ? {
 			usedControllers: sKey,
 			modified: bModified
@@ -1255,15 +1294,15 @@ sap.ui.define([
 	 * @param {string} sKey The registered key to get the corresponding controller.
 	 * @param {sap.ui.core.Control} oP13nUI The adaptation UI displayed in the container (e.g. BasePanel derivation).
 	 */
-	Engine.prototype.validateP13n = function (vControl, sKey, oP13nUI) {
-		var oController = this.getController(vControl, sKey);
-		var oControl = Engine.getControlInstance(vControl);
+	Engine.prototype.validateP13n = function(vControl, sKey, oP13nUI) {
+		const oController = this.getController(vControl, sKey);
+		const oControl = Engine.getControlInstance(vControl);
 
 
-		var mControllers = this._getRegistryEntry(vControl).controller;
-		var oTheoreticalState = {};
+		const mControllers = this._getRegistryEntry(vControl).controller;
+		const oTheoreticalState = {};
 
-		Object.keys(mControllers).forEach(function (sControllerKey) {
+		Object.keys(mControllers).forEach((sControllerKey) => {
 			oTheoreticalState[sControllerKey] = mControllers[sControllerKey].getCurrentState();
 		});
 
@@ -1271,14 +1310,14 @@ sap.ui.define([
 		if (oController && oController.model2State instanceof Function) {
 			oTheoreticalState[sKey] = oController.model2State();
 
-			var mInfoState = {
+			let mInfoState = {
 				validation: MessageType.None
 			};
 			if (oControl.validateState instanceof Function) {
 				mInfoState = oControl.validateState(this.externalizeKeys(oControl, oTheoreticalState), sKey);
 			}
 
-			var oMessageStrip;
+			let oMessageStrip;
 
 			if (mInfoState.validation !== MessageType.None) {
 				oMessageStrip = new MessageStrip({
@@ -1304,28 +1343,28 @@ sap.ui.define([
 	 * @param {string[]} aKeys An array of keys
 	 * @returns {Promise} A Promise resolving after all p13n changes have been calculated and processed
 	 */
-	Engine.prototype.handleP13n = function (oControl, aKeys) {
+	Engine.prototype.handleP13n = function(oControl, aKeys) {
 
-		var pChanges = [];
+		const pChanges = [];
 
-		aKeys.forEach(function (sControllerKey) {
+		aKeys.forEach((sControllerKey) => {
 
-			var oController = this.getController(oControl, sControllerKey);
+			const oController = this.getController(oControl, sControllerKey);
 
-			var vP13nData = oController.getP13nData();
+			const vP13nData = oController.getP13nData();
 			if (vP13nData) {
-				var p = this.createChanges({
+				const p = this.createChanges({
 					control: oControl,
 					key: sControllerKey,
 					state: vP13nData,
 					suppressAppliance: true,
 					applyAbsolute: true
 				})
-					.then(function (aItemChanges) {
+					.then((aItemChanges) => {
 
-						return oController.getBeforeApply().then(function (aChanges) {
+						return oController.getBeforeApply().then((aChanges) => {
 
-							var aComulatedChanges = aChanges ? aChanges.concat(aItemChanges) : aItemChanges;
+							const aComulatedChanges = aChanges ? aChanges.concat(aItemChanges) : aItemChanges;
 							return aComulatedChanges;
 
 						});
@@ -1334,15 +1373,15 @@ sap.ui.define([
 				pChanges.push(p);
 			}
 
-		}.bind(this));
+		});
 
-		return Promise.all(pChanges).then(function (aChangeMatrix) {
+		return Promise.all(pChanges).then((aChangeMatrix) => {
 
-			var aApplyChanges = [];
-			var mChangeMap = {};
-			aChangeMatrix.forEach(function (aTypeChanges, iIndex) {
+			let aApplyChanges = [];
+			const mChangeMap = {};
+			aChangeMatrix.forEach((aTypeChanges, iIndex) => {
 				aApplyChanges = aApplyChanges.concat(aTypeChanges);
-				var sKey = aKeys[iIndex];
+				const sKey = aKeys[iIndex];
 				mChangeMap[sKey] = aTypeChanges;
 			});
 
@@ -1356,12 +1395,11 @@ sap.ui.define([
 	/**
 	 * This method is the central point of access to the Engine Singleton.
 	 *
-	 * @private
-	 * @ui5-restricted sap.m, sap.ui.mdc
+	 * @public
 	 *
 	 * @returns {sap.m.p13n.Engine} The Engine instance
 	 */
-	Engine.getInstance = function () {
+	Engine.getInstance = () => {
 		if (!oEngine) {
 			oEngine = new Engine();
 		}
@@ -1374,15 +1412,15 @@ sap.ui.define([
 	 * @private
 	 * @returns {object} The Engine registry object
 	 */
-	Engine.prototype._getRegistry = function () {
-		var oRegistry = {
+	Engine.prototype._getRegistry = function() {
+		const oRegistry = {
 			stateHandlerRegistry: this.stateHandlerRegistry,
 			defaultProviderRegistry: this.defaultProviderRegistry,
 			controlRegistry: {}
 		};
 
-		this._aRegistry.forEach(function (sKey) {
-			var oControl = sap.ui.getCore().byId(sKey);
+		this._aRegistry.forEach((sKey) => {
+			const oControl = Element.getElementById(sKey);
 			oRegistry.controlRegistry[sKey] = _mRegistry.get(oControl);
 		});
 
@@ -1393,7 +1431,7 @@ sap.ui.define([
 	 * @override
 	 * @inheritDoc
 	 */
-	Engine.prototype.destroy = function () {
+	Engine.prototype.destroy = function() {
 		AdaptationProvider.prototype.destroy.apply(this, arguments);
 		oEngine = null;
 		this._aRegistry = null;
@@ -1405,6 +1443,5 @@ sap.ui.define([
 		this.uimanager.destroy();
 		this.uimanager = null;
 	};
-
 	return Engine;
 });