@openui5/sap.m 1.120.6 → 1.121.0

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

@@ -5,27 +5,52 @@
  */
 
 sap.ui.define([
+	"sap/base/i18n/Localization",
 	'sap/base/util/array/diff',
 	'sap/ui/base/Object',
 	'sap/base/util/merge',
 	'sap/base/util/deepEqual',
 	'sap/m/p13n/SelectionPanel',
 	'sap/m/p13n/modules/xConfigAPI',
-	'sap/ui/core/Configuration',
+	"sap/ui/core/Locale",
+	"sap/ui/core/Lib",
 	'sap/ui/core/mvc/View'
-], function (diff, BaseObject, merge, deepEqual, SelectionPanel, xConfigAPI, Configuration, View) {
+], (
+	Localization,
+	diff,
+	BaseObject,
+	merge,
+	deepEqual,
+	SelectionPanel,
+	xConfigAPI,
+	Locale,
+	Library,
+	View
+) => {
 	"use strict";
 
+	/**
+	 * Personalization <code>SelectionState</code> object type. This object describes the state processed by this controller when accessing it through the {@link sap.m.p13n.Engine Engine}.
+	 *
+	 * @public
+	 * @typedef {object} sap.m.p13n.SelectionState
+	 * @property {string} key The key for the group state
+	 * @property {boolean} [visible] Defines whether the item is selected (if a selection state is provided, it's selected automatically)
+	 * @property {int} [index] Describes the index of the selection item
+	 *
+	 */
+
 	/**
 	 * Constructor for a new <code>SelectionController</code>.
 	 *
-	 * @param {string} [sId] ID for the new control, generated automatically if no ID is given
-	 * @param {object} [mSettings] Initial settings for the new control
+	 * @param {object} mSettings Initial settings for the new controller
 	 * @param {sap.ui.core.Control} mSettings.control The control instance that is personalized by this controller
 	 * @param {function} [mSettings.getKeyForItem] By default the SelectionController tries to identify the existing item through the
 	 * key by checking if there is an existing item with this id. This behaviour can be overruled by implementing this method which will
 	 * provide the according item of the <code>targetAggregation</code> to return the according key associated to this item.
 	 * @param {string} mSettings.targetAggregation The name of the aggregation that is now managed by this controller
+	 * @param {string} [mSettings.persistenceIdentifier] If multiple <code>SelectionController</code> controls exist for a personalization use case, the <code>persistenceIdentifier</code> property must be added to uniquely identify a <code>SelectionController</code> control
+	 * @param {sap.m.p13n.MetadataHelper} [mSettings.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.
 	 *
 	 * @class
 	 * The <code>SelectionController</code> entity serves as a base class to create control-specific personalization implementations.
@@ -33,16 +58,18 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @alias sap.m.p13n.SelectionController
 	 */
-	var SelectionController = BaseObject.extend("sap.m.p13n.SelectionController",{
+	const SelectionController = BaseObject.extend("sap.m.p13n.SelectionController", {
 		constructor: function(mSettings) {
 			BaseObject.call(this);
 
 			this._oAdaptationControl = mSettings.control;
+			this._sPersistenceIdentifier = mSettings.persistenceIdentifier ? mSettings.persistenceIdentifier : null;
+			this._oMetadataHelper = mSettings.helper ? mSettings.helper : null;
 
 			/**
 			 * The 'stableKeys' can be provided in the constructor to exclude the keys from the p13n UI, while still respecting them in the
@@ -66,16 +93,32 @@ sap.ui.define([
 		}
 	});
 
+	/**
+	 * Gets defined <code>persistenceIdentifier</code> of the controller.
+	 * @returns {string|null} String if <code>_sPersistenceIdentifier</code> is defined, otherwise null.
+	 */
+	SelectionController.prototype.getPersistenceIdentifier = function() {
+		return this._sPersistenceIdentifier;
+	};
+
+	/**
+	 * Gets defined {@link sap.m.p13n.MetadataHelper MetadataHelper} of the controller.
+	 * @returns {sap.m.p13n.MetadataHelper|null} Instance of {@link sap.m.p13n.MetadataHelper} if defined, otherwise null.
+	 */
+	SelectionController.prototype.getMetadataHelper = function() {
+		return this._oMetadataHelper;
+	};
+
 	/**
 	 * The control that is being personalized via this controller.
 	 *
 	 * @returns {sap.ui.mdc.Control} The control which is being adapted.
 	 */
-	SelectionController.prototype.getAdaptationControl = function(){
+	SelectionController.prototype.getAdaptationControl = function() {
 		return this._oAdaptationControl;
 	};
 
-	SelectionController.prototype.getTargetAggregation = function(){
+	SelectionController.prototype.getTargetAggregation = function() {
 		return this._sTargetAggregation;
 	};
 
@@ -85,7 +128,7 @@ sap.ui.define([
 	 *
 	 * @returns {object} A map of legal change types.
 	 */
-	SelectionController.prototype.getChangeOperations = function() {
+	SelectionController.prototype.getChangeOperations = () => {
 		return {
 			add: "addItem",
 			remove: "removeItem",
@@ -93,7 +136,7 @@ sap.ui.define([
 		};
 	};
 
-	 /**
+	/**
 	 * Defines which control(s) are considered for the reset.
 	 *
 	 * @returns {sap.ui.core.Control | sap.ui.core.Control[]}
@@ -102,7 +145,7 @@ sap.ui.define([
 		return this._oAdaptationControl;
 	};
 
-	SelectionController.prototype.sanityCheck = function(oState) {
+	SelectionController.prototype.sanityCheck = (oState) => {
 		return oState;
 	};
 
@@ -112,14 +155,14 @@ sap.ui.define([
 	 * @param {sap.ui.mdc.util.PropertyHelper} oPropertyHelper The property helper instance
 	 * @returns {sap.ui.core.Control|string|Promise} The control which is going to be used in the p13n container.
 	 */
-	SelectionController.prototype.initAdaptationUI = function(oPropertyHelper){
-		var oAdaptationData = this.mixInfoAndState(oPropertyHelper);
+	SelectionController.prototype.initAdaptationUI = function(oPropertyHelper) {
+		const oAdaptationData = this.mixInfoAndState(oPropertyHelper);
 		this._oPanel = this.createUI(oAdaptationData);
 		return Promise.resolve(this._oPanel);
 	};
 
 	SelectionController.prototype.createUI = function(oAdaptationData) {
-		var oSelectionPanel = new SelectionPanel({
+		const oSelectionPanel = new SelectionPanel({
 			showHeader: true,
 			enableCount: true
 		});
@@ -127,7 +170,7 @@ sap.ui.define([
 		return oSelectionPanel.setP13nData(oAdaptationData.items);
 	};
 
-	var getViewForControl = function(oControl) {
+	const getViewForControl = (oControl) => {
 		if (oControl instanceof View) {
 			return oControl;
 		}
@@ -138,28 +181,31 @@ sap.ui.define([
 		}
 	};
 
-	SelectionController.prototype.getCurrentState = function(){
-		var aState = [], aAggregationItems = this.getAdaptationControl().getAggregation(this.getTargetAggregation()) || [];
-		var oView = getViewForControl(this.getAdaptationControl());
-		aAggregationItems.forEach(function(oItem, iIndex) {
-			var sId = oView ? oView.getLocalId(oItem.getId()) : oItem.getId();
-			var vRelevant = this._fSelector ? this._fSelector(oItem) : oItem.getVisible();
+	SelectionController.prototype.getCurrentState = function() {
+		const aState = [],
+			aAggregationItems = this.getAdaptationControl().getAggregation(this.getTargetAggregation()) || [];
+		const oView = getViewForControl(this.getAdaptationControl());
+		aAggregationItems.forEach((oItem, iIndex) => {
+			const sId = oView ? oView.getLocalId(oItem.getId()) : oItem.getId();
+			const vRelevant = this._fSelector ? this._fSelector(oItem) : oItem.getVisible();
 			if (vRelevant) {
 				aState.push({
 					key: typeof vRelevant === "boolean" ? sId : vRelevant
 				});
 			}
-		}.bind(this));
+		});
 
-		var oXConfig = xConfigAPI.readConfig(this.getAdaptationControl()) || {};
-		var oItemXConfig = oXConfig.hasOwnProperty("aggregations") ? oXConfig.aggregations[this._sTargetAggregation] : {};
+		const oXConfig = xConfigAPI.readConfig(this.getAdaptationControl()) || {};
+		const oItemXConfig = oXConfig.hasOwnProperty("aggregations") ? oXConfig.aggregations[this._sTargetAggregation] : {};
 
-		for (var sKey in oItemXConfig) {
-			var aStateKeys = aState.map(function(o){return o.key;});
-			var iCurrentIndex = aStateKeys.indexOf(sKey);
-			var iNewIndex = oItemXConfig[sKey].position;
-			var bVisible = oItemXConfig[sKey].visible !== false;
-			var bReordered = iNewIndex !== undefined;
+		for (const sKey in oItemXConfig) {
+			const aStateKeys = aState.map((o) => {
+				return o.key;
+			});
+			let iCurrentIndex = aStateKeys.indexOf(sKey);
+			const iNewIndex = oItemXConfig[sKey].position;
+			const bVisible = oItemXConfig[sKey].visible !== false;
+			const bReordered = iNewIndex !== undefined;
 
 			if (bVisible && iCurrentIndex === -1) {
 				aState.push({
@@ -168,7 +214,7 @@ sap.ui.define([
 			}
 
 			if (bVisible && bReordered && aState.length > 0) {
-				var oItem = aState.splice(iCurrentIndex, 1)[0];
+				const oItem = aState.splice(iCurrentIndex, 1)[0];
 				aState.splice(iNewIndex, 0, oItem);
 				iCurrentIndex = iNewIndex;
 			}
@@ -180,34 +226,33 @@ sap.ui.define([
 		return aState;
 	};
 
-	SelectionController.prototype.getStateKey = function(){
+	SelectionController.prototype.getStateKey = () => {
 		return "items";
 	};
 
 	SelectionController.prototype.getDelta = function(mPropertyBag) {
-		var sPresenceAttribute = this._getPresenceAttribute(mPropertyBag.externalAppliance);
-		var aNewStatePrepared;
+		const sPresenceAttribute = this._getPresenceAttribute(mPropertyBag.externalAppliance);
 
-		var fnFilterUnselected = function (oItem) {
+		const fnFilterUnselected = (oItem) => {
 			return oItem.hasOwnProperty(sPresenceAttribute) && oItem[sPresenceAttribute] === false ? false : true;
 		};
-		aNewStatePrepared = mPropertyBag.applyAbsolute
-			? mPropertyBag.changedState.filter(fnFilterUnselected) :
+		const aNewStatePrepared = mPropertyBag.applyAbsolute ?
+			mPropertyBag.changedState.filter(fnFilterUnselected) :
 			this._getFilledArray(mPropertyBag.existingState, mPropertyBag.changedState, sPresenceAttribute).filter(fnFilterUnselected);
 
-		this._aStableKeys.forEach(function(sKey, iIndex){
-			var mExistingState = this.arrayToMap(this.getCurrentState());
-			var mNewState = this.arrayToMap(aNewStatePrepared);
-			var iStableIndex = mExistingState[sKey] || (iIndex - 1);
+		this._aStableKeys.forEach((sKey, iIndex) => {
+			const mExistingState = this.arrayToMap(this.getCurrentState());
+			const mNewState = this.arrayToMap(aNewStatePrepared);
+			const iStableIndex = mExistingState[sKey] || (iIndex - 1);
 
 			if (!mNewState.hasOwnProperty(sKey)) {
-				aNewStatePrepared.splice(iStableIndex, 0,mExistingState[sKey]);
+				aNewStatePrepared.splice(iStableIndex, 0, mExistingState[sKey]);
 			}
-		}.bind(this));
+		});
 		mPropertyBag.changedState = aNewStatePrepared;
 
 		//Example: Dialog Ok --> don't trigger unnecessary flex change processing
-		if (deepEqual(mPropertyBag.existingState, aNewStatePrepared)){
+		if (deepEqual(mPropertyBag.existingState, aNewStatePrepared)) {
 			return [];
 		} else {
 			return this.getArrayDeltaChanges(mPropertyBag);
@@ -216,62 +261,64 @@ sap.ui.define([
 	};
 
 	/**
-	* Generates a set of changes based on the given arrays for a specified control
-	*
-	* @param {object} mDeltaInfo Map containing the necessary information to calculate the diff as change objects
-	* @param {array} mDeltaInfo.existingState An array describing the control state before a adaptation
-	* @param {array} mDeltaInfo.changedState An array describing the control state after a certain adaptation
-	* @param {object} mDeltaInfo.control Control instance which is being used to generate the changes
-	* @param {object} mDeltaInfo.changeOperations Map containing the changeOperations for the given Control instance
-	* @param {string} mDeltaInfo.changeOperations.add Name of the control specific 'add' changehandler
-	* @param {string} mDeltaInfo.changeOperations.remove Name of the control specific 'remove' changehandler
-	* @param {string} [mDeltaInfo.changeOperations.move] Name of the control specific 'move' changehandler
-	* @param {string} [mDeltaInfo.generator] Name of the change generator (E.g. the namespace of the UI creating the change object)
-	*
-	* @returns {array} Array containing the delta based created changes
-	*/
+	 * Generates a set of changes based on the given arrays for a specified control
+	 *
+	 * @param {object} mDeltaInfo Map containing the necessary information to calculate the diff as change objects
+	 * @param {array} mDeltaInfo.existingState An array describing the control state before a adaptation
+	 * @param {array} mDeltaInfo.changedState An array describing the control state after a certain adaptation
+	 * @param {object} mDeltaInfo.control Control instance which is being used to generate the changes
+	 * @param {object} mDeltaInfo.changeOperations Map containing the changeOperations for the given Control instance
+	 * @param {string} mDeltaInfo.changeOperations.add Name of the control specific 'add' changehandler
+	 * @param {string} mDeltaInfo.changeOperations.remove Name of the control specific 'remove' changehandler
+	 * @param {string} [mDeltaInfo.changeOperations.move] Name of the control specific 'move' changehandler
+	 * @param {string} [mDeltaInfo.generator] Name of the change generator (E.g. the namespace of the UI creating the change object)
+	 *
+	 * @returns {array} Array containing the delta based created changes
+	 */
 	SelectionController.prototype.getArrayDeltaChanges = function(mDeltaInfo) {
-		var aExistingArray = mDeltaInfo.existingState;
-		var aChangedArray = mDeltaInfo.changedState;
-		var oControl = mDeltaInfo.control;
-		var sInsertOperation = mDeltaInfo.changeOperations.add;
-		var sRemoveOperation = mDeltaInfo.changeOperations.remove;
-		var sMoveOperation = mDeltaInfo.changeOperations.move;
-		var aDeltaAttributes = mDeltaInfo.deltaAttributes || [];
+		const aExistingArray = mDeltaInfo.existingState;
+		const aChangedArray = mDeltaInfo.changedState;
+		const oControl = mDeltaInfo.control;
+		const sInsertOperation = mDeltaInfo.changeOperations.add;
+		const sRemoveOperation = mDeltaInfo.changeOperations.remove;
+		const sMoveOperation = mDeltaInfo.changeOperations.move;
+		const aDeltaAttributes = mDeltaInfo.deltaAttributes || [];
 
-		var mDeleteInsert = this._calculateDeleteInserts(aExistingArray, aChangedArray, aDeltaAttributes);
-		var aChanges = this._createAddRemoveChanges(mDeleteInsert.deletes, oControl, sRemoveOperation, aDeltaAttributes);
+		const mDeleteInsert = this._calculateDeleteInserts(aExistingArray, aChangedArray, aDeltaAttributes);
+		let aChanges = this._createAddRemoveChanges(mDeleteInsert.deletes, oControl, sRemoveOperation, aDeltaAttributes);
 
 		if (sMoveOperation) {
-			var aExistingArrayWithoutDeletes = this._removeItems(aExistingArray, mDeleteInsert.deletes);
-			var aChangedArrayWithoutnserts = this._removeItems(aChangedArray, mDeleteInsert.inserts);
-			var aMoveChanges = this._createMoveChanges(aExistingArrayWithoutDeletes, aChangedArrayWithoutnserts, oControl, sMoveOperation, aDeltaAttributes);
+			const aExistingArrayWithoutDeletes = this._removeItems(aExistingArray, mDeleteInsert.deletes);
+			const aChangedArrayWithoutInserts = this._removeItems(aChangedArray, mDeleteInsert.inserts);
+			const aMoveChanges = this._createMoveChanges(aExistingArrayWithoutDeletes, aChangedArrayWithoutInserts, oControl, sMoveOperation, aDeltaAttributes);
 			aChanges = aChanges.concat(aMoveChanges);
 		}
 
-		var aInsertChanges = this._createAddRemoveChanges(mDeleteInsert.inserts, oControl, sInsertOperation, aDeltaAttributes);
+		const aInsertChanges = this._createAddRemoveChanges(mDeleteInsert.inserts, oControl, sInsertOperation, aDeltaAttributes);
 		aChanges = aChanges.concat(aInsertChanges);
 
 		return aChanges;
 	};
 
 	SelectionController.prototype._createMoveChanges = function(aExistingItems, aChangedItems, oControl, sOperation, aDeltaAttributes) {
-		var sKey, nIndex, oItem, aChanges = [];
+		let sKey;
+		let nIndex;
+		let oItem;
+		const aChanges = [];
 
 		if (aExistingItems.length === aChangedItems.length) {
 
-			var fnSymbol = function(o) {
-				var sDiff = "";
-				aDeltaAttributes.forEach(function(sAttribute) {
+			const fnSymbol = (o) => {
+				let sDiff = "";
+				aDeltaAttributes.forEach((sAttribute) => {
 					sDiff = sDiff + o[sAttribute];
 				});
 				return sDiff;
 			};
 
-
-			var aDiff = diff(aExistingItems, aChangedItems, fnSymbol);
-			var aDeleted = [];
-			for (var i = 0; i < aDiff.length; i++) {
+			const aDiff = diff(aExistingItems, aChangedItems, fnSymbol);
+			const aDeleted = [];
+			for (let i = 0; i < aDiff.length; i++) {
 				if (aDiff[i].type === "delete") {
 					oItem = aExistingItems[aDiff[i].index];
 					aDeleted.push(oItem);
@@ -280,14 +327,14 @@ sap.ui.define([
 
 					nIndex = aDiff[i].index;
 					// eslint-disable-next-line no-loop-func
-					aDeleted.forEach(function(oItem) {
+					aDeleted.forEach((oItem) => {
 						if (sKey != oItem.key) {
-							var nDelIndex = this._indexOfByKeyName(aExistingItems, oItem.key || oItem.name);
+							const nDelIndex = this._indexOfByKeyName(aExistingItems, oItem.key || oItem.name);
 							if (nDelIndex < aDiff[i].index) {
 								nIndex++;
 							}
 						}
-					}.bind(this));
+					});
 					// eslint-enable-next-line no-loop-func
 					aChanges.push(this._createMoveChange(sKey, Math.min(nIndex, aChangedItems.length), sOperation, oControl));
 				}
@@ -297,91 +344,91 @@ sap.ui.define([
 		return aChanges;
 	};
 
-   SelectionController.prototype._createAddRemoveChanges = function (aItems, oControl, sOperation, aDeltaAttributes) {
-	   var aChanges = [];
-	   for (var i = 0; i < aItems.length; i++) {
-		   aChanges.push(this._createAddRemoveChange(oControl, sOperation, this._getChangeContent(aItems[i], aDeltaAttributes)));
-	   }
-	   return aChanges;
-   };
-
-   SelectionController.prototype._removeItems = function (aTarget, aItems) {
-	   var sKey;
-	   var aResultingTarget = [];
-
-	   for (var i = 0; i < aTarget.length; i++) {
-		   sKey = aTarget[i].key || aTarget[i].name;
-		   if (this._indexOfByKeyName(aItems, sKey) === -1) {
-			   aResultingTarget.push(aTarget[i]);
-		   }
-	   }
-
-	   return aResultingTarget;
-   };
-
-   SelectionController.prototype._indexOfByKeyName = function (aArray, sKey) {
-	   var nIndex = -1;
-	   aArray.some(function(oItem, nIdx){
-		   if ((oItem.key === sKey) || (oItem.name === sKey)) {
-			   nIndex = nIdx;
-		   }
-		   return (nIndex != -1);
-	   });
-
-	   return nIndex;
-   };
-
-   SelectionController.prototype._calculateDeleteInserts = function (aSource, aTarget, aDeltaAttributes) {
-	   var i, sKey, oItem, nIdx;
-	   var mDeleteInserts = {
-		   deletes: [],
-		   inserts: []
-	   };
-
-	   for (i = 0; i < aSource.length; i++) {
-		   sKey = aSource[i].key || aSource[i].name;
-		   nIdx = this._indexOfByKeyName(aTarget, sKey);
-		   if (nIdx === -1) {
-			   oItem = merge({}, aSource[i]);
-			   mDeleteInserts.deletes.push(oItem);
-		   } else if (aDeltaAttributes.length){
-			   if (this._verifyDeltaAttributes(aSource[i], aTarget[nIdx], aDeltaAttributes)) {
-				   mDeleteInserts.deletes.push(aSource[i]);
-
-				   oItem = merge({}, aTarget[nIdx]);
-				   oItem.index = nIdx;
-				   mDeleteInserts.inserts.push(oItem);
-			   }
-		   }
-	   }
-	   for (i = 0; i < aTarget.length; i++) {
-		   sKey = aTarget[i].key || aTarget[i].name;
-		   if (this._indexOfByKeyName(aSource, sKey) === -1) {
-			   oItem = merge({}, aTarget[i]);
-			   oItem.index = i;
-			   mDeleteInserts.inserts.push(oItem);
-		   }
-	   }
-
-	   return mDeleteInserts;
-   };
-	SelectionController.prototype._verifyDeltaAttributes = function (oSource, oTarget, aDeltaAttributes) {
-		var bReturn = false;
-
-		aDeltaAttributes.some(function(sAttr) {
-			if (!oSource.hasOwnProperty(sAttr) && oTarget.hasOwnProperty(sAttr)  ||
-				 oSource.hasOwnProperty(sAttr) && !oTarget.hasOwnProperty(sAttr) ||
-				(oSource[sAttr] != oTarget[sAttr]) ) {
-					bReturn = true;
+	SelectionController.prototype._createAddRemoveChanges = function(aItems, oControl, sOperation, aDeltaAttributes) {
+		const aChanges = [];
+		for (let i = 0; i < aItems.length; i++) {
+			aChanges.push(this._createAddRemoveChange(oControl, sOperation, this._getChangeContent(aItems[i], aDeltaAttributes)));
+		}
+		return aChanges;
+	};
+
+	SelectionController.prototype._removeItems = function(aTarget, aItems) {
+		let sKey;
+		const aResultingTarget = [];
+
+		for (let i = 0; i < aTarget.length; i++) {
+			sKey = aTarget[i].key || aTarget[i].name;
+			if (this._indexOfByKeyName(aItems, sKey) === -1) {
+				aResultingTarget.push(aTarget[i]);
+			}
+		}
+
+		return aResultingTarget;
+	};
+
+	SelectionController.prototype._indexOfByKeyName = (aArray, sKey) => {
+		let nIndex = -1;
+		aArray.some((oItem, nIdx) => {
+			if ((oItem.key === sKey) || (oItem.name === sKey)) {
+				nIndex = nIdx;
+			}
+			return (nIndex != -1);
+		});
+
+		return nIndex;
+	};
+
+	SelectionController.prototype._calculateDeleteInserts = function(aSource, aTarget, aDeltaAttributes) {
+		let i, sKey, oItem, nIdx;
+		const mDeleteInserts = {
+			deletes: [],
+			inserts: []
+		};
+
+		for (i = 0; i < aSource.length; i++) {
+			sKey = aSource[i].key || aSource[i].name;
+			nIdx = this._indexOfByKeyName(aTarget, sKey);
+			if (nIdx === -1) {
+				oItem = merge({}, aSource[i]);
+				mDeleteInserts.deletes.push(oItem);
+			} else if (aDeltaAttributes.length) {
+				if (this._verifyDeltaAttributes(aSource[i], aTarget[nIdx], aDeltaAttributes)) {
+					mDeleteInserts.deletes.push(aSource[i]);
+
+					oItem = merge({}, aTarget[nIdx]);
+					oItem.index = nIdx;
+					mDeleteInserts.inserts.push(oItem);
 				}
+			}
+		}
+		for (i = 0; i < aTarget.length; i++) {
+			sKey = aTarget[i].key || aTarget[i].name;
+			if (this._indexOfByKeyName(aSource, sKey) === -1) {
+				oItem = merge({}, aTarget[i]);
+				oItem.index = i;
+				mDeleteInserts.inserts.push(oItem);
+			}
+		}
 
-				return bReturn;
+		return mDeleteInserts;
+	};
+	SelectionController.prototype._verifyDeltaAttributes = (oSource, oTarget, aDeltaAttributes) => {
+		let bReturn = false;
+
+		aDeltaAttributes.some((sAttr) => {
+			if (!oSource.hasOwnProperty(sAttr) && oTarget.hasOwnProperty(sAttr) ||
+				oSource.hasOwnProperty(sAttr) && !oTarget.hasOwnProperty(sAttr) ||
+				(oSource[sAttr] != oTarget[sAttr])) {
+				bReturn = true;
+			}
+
+			return bReturn;
 		});
 		return bReturn;
 
 	};
 
-	 /**
+	/**
 	 * Method which reduces a propertyinfo map to changecontent relevant attributes.
 	 * <b>Note:</b> This method determines the attributes stored in the changeContent.
 	 *
@@ -390,17 +437,17 @@ sap.ui.define([
 	 *
 	 * @returns {object} Object containing reduced content
 	 */
-	SelectionController.prototype._getChangeContent = function (oProperty, aDeltaAttributes) {
+	SelectionController.prototype._getChangeContent = (oProperty, aDeltaAttributes) => {
 
-		var oChangeContent = {};
+		const oChangeContent = {};
 
 		// Index
 		if (oProperty.hasOwnProperty("index") && oProperty.index >= 0) {
 			oChangeContent.index = oProperty.index;
 		}
 
-		aDeltaAttributes.forEach(function(sAttribute) {
-			if (oProperty.hasOwnProperty(sAttribute)){
+		aDeltaAttributes.forEach((sAttribute) => {
+			if (oProperty.hasOwnProperty(sAttribute)) {
 				oChangeContent[sAttribute] = oProperty[sAttribute];
 			}
 		});
@@ -408,17 +455,23 @@ sap.ui.define([
 		return oChangeContent;
 	};
 
-	SelectionController.prototype._createAddRemoveChange = function(oControl, sOperation, oContent){
+	SelectionController.prototype._createAddRemoveChange = function(oControl, sOperation, oContent) {
 
-		var oChangeContent = oContent;
+		const oChangeContent = oContent;
 
 		if (sOperation.indexOf("set") !== 0) {
 			oChangeContent.value = (sOperation == this.getChangeOperations()["add"]);
 		}
 
-		oChangeContent.targetAggregation = this.getTargetAggregation();
+		if (this.getTargetAggregation()) {
+			oChangeContent.targetAggregation = this.getTargetAggregation();
+		}
+
+		if (this._sPersistenceIdentifier) {
+			oChangeContent.persistenceIdentifier = this._sPersistenceIdentifier;
+		}
 
-		var oAddRemoveChange = {
+		const oAddRemoveChange = {
 			selectorElement: oControl,
 			changeSpecificData: {
 				changeType: sOperation,
@@ -428,21 +481,27 @@ sap.ui.define([
 		return oAddRemoveChange;
 	};
 
-	SelectionController.prototype._createMoveChange = function(sPropertykey, iNewIndex, sMoveOperation, oControl){
-		var oMoveChange =  {
+	SelectionController.prototype._createMoveChange = function(sPropertykey, iNewIndex, sMoveOperation, oControl) {
+		const oContent = {
+			key: sPropertykey,
+			targetAggregation: this.getTargetAggregation(),
+			index: iNewIndex
+		};
+
+		if (this._sPersistenceIdentifier) {
+			oContent.persistenceIdentifier = this._sPersistenceIdentifier;
+		}
+
+		const oMoveChange = {
 			selectorElement: oControl,
 			changeSpecificData: {
 				changeType: sMoveOperation,
-				content: {
-					key: sPropertykey,
-					targetAggregation: this.getTargetAggregation(),
-					index: iNewIndex
-				}
+				content: oContent
 			}
 		};
 		return oMoveChange;
 	};
-	SelectionController.prototype._getPresenceAttribute = function(bexternalAppliance){
+	SelectionController.prototype._getPresenceAttribute = (bexternalAppliance) => {
 		return "visible";
 	};
 
@@ -452,7 +511,7 @@ sap.ui.define([
 	 *
 	 * @returns {Promise} A Promise that should resolve with an array of additional changes.
 	 */
-	SelectionController.prototype.getBeforeApply = function(){
+	SelectionController.prototype.getBeforeApply = () => {
 		return Promise.resolve();
 	};
 
@@ -464,22 +523,24 @@ sap.ui.define([
 	 */
 	SelectionController.prototype.mixInfoAndState = function(oPropertyHelper) {
 
-		var aItemState = this.getCurrentState();
-		var mItemState = this.arrayToMap(aItemState);
+		const aItemState = this.getCurrentState();
+		const mItemState = this.arrayToMap(aItemState);
 
-		var oP13nData = this.prepareAdaptationData(oPropertyHelper, function(mItem, oProperty){
-			var oExisting = mItemState[oProperty.name || oProperty.key];
+		const oP13nData = this.prepareAdaptationData(oPropertyHelper, (mItem, oProperty) => {
+			const oExisting = mItemState[oProperty.name || oProperty.key];
 			mItem.visible = !!oExisting;
-			mItem.position =  oExisting ? oExisting.position : -1;
+			mItem.position = oExisting ? oExisting.position : -1;
 			return !(oProperty.visible === false || (this._aStableKeys.indexOf(oProperty.name || oProperty.key) > -1));
-		}.bind(this));
+		});
 
 		this.sortP13nData({
 			visible: "visible",
 			position: "position"
 		}, oP13nData.items);
 
-		oP13nData.items.forEach(function(oItem){delete oItem.position;});
+		oP13nData.items.forEach((oItem) => {
+			delete oItem.position;
+		});
 		return oP13nData;
 	};
 
@@ -501,62 +562,64 @@ sap.ui.define([
 	SelectionController.prototype.update = function(oPropertyHelper) {
 		if (this._oPanel) {
 			if (!this._oPanel.isDestroyed()) {
-				var oAdaptationData = this.mixInfoAndState(oPropertyHelper);
+				const oAdaptationData = this.mixInfoAndState(oPropertyHelper);
 				this._oPanel.setP13nData(oAdaptationData.items);
 			}
-		} else if (this._oAdaptationModel){
+		} else if (this._oAdaptationModel) {
 			//'setData' causes unnecessary rerendering in some cases
-			var oP13nData = this.mixInfoAndState(oPropertyHelper);
+			const oP13nData = this.mixInfoAndState(oPropertyHelper);
 			this._oAdaptationModel.setProperty("/items", oP13nData.items);
 			this._oAdaptationModel.setProperty("/itemsGrouped", oP13nData.itemsGrouped);
 		}
 	};
 
 	SelectionController.prototype._getFilledArray = function(aPreviousItems, aNewItems, sRemoveProperty) {
-		var aNewItemsPrepared = merge([], aPreviousItems);
-		var aNewItemState = merge([], aNewItems);
+		const aNewItemsPrepared = merge([], aPreviousItems);
+		const aNewItemState = merge([], aNewItems);
 
-		aNewItemState.forEach(function (oItem) {
-			var mExistingItems = this.arrayToMap(aNewItemsPrepared);
-			var oExistingItem = mExistingItems[oItem.key];
+		aNewItemState.forEach((oItem) => {
+			const mExistingItems = this.arrayToMap(aNewItemsPrepared);
+			const oExistingItem = mExistingItems[oItem.key];
 			if (!oItem.hasOwnProperty(sRemoveProperty) || oItem[sRemoveProperty]) {
-				var iNewPosition = oItem.position;
-				if (oExistingItem){//move if it exists
+				let iNewPosition = oItem.position;
+				if (oExistingItem) { //move if it exists
 					// do not reorder it in case it exists and no position is provided
-					iNewPosition = iNewPosition > -1  ? iNewPosition : oExistingItem.position;
-					var iOldPosition = oExistingItem.position;
+					iNewPosition = iNewPosition > -1 ? iNewPosition : oExistingItem.position;
+					const iOldPosition = oExistingItem.position;
 					aNewItemsPrepared.splice(iNewPosition, 0, aNewItemsPrepared.splice(iOldPosition, 1)[0]);
-				} else {//add if it does not exist the item will be inserted at the end
+				} else { //add if it does not exist the item will be inserted at the end
 					iNewPosition = iNewPosition > -1 ? iNewPosition : aNewItemsPrepared.length;
 					aNewItemsPrepared.splice(iNewPosition, 0, oItem);
 				}
-				aNewItemsPrepared[iNewPosition] = oItem;//overwrite existing item with new item (for correct values such as 'descending')
-			} else if (oExistingItem) {//check if exists before delete
+				aNewItemsPrepared[iNewPosition] = oItem; //overwrite existing item with new item (for correct values such as 'descending')
+			} else if (oExistingItem) { //check if exists before delete
 				aNewItemsPrepared[oExistingItem.position][sRemoveProperty] = false;
 			}
-		}.bind(this));
+		});
 
 		return aNewItemsPrepared;
 	};
 
 	SelectionController.prototype.getPropertySetterChanges = function(mDeltaInfo) {
-		var oControl = mDeltaInfo.control;
-		var aExistingState = mDeltaInfo.existingState;
-		var aChangedState = mDeltaInfo.changedState;
-		var sOperation = mDeltaInfo.operation;
-		var sSetAttribute = mDeltaInfo.deltaAttribute;
+		const oControl = mDeltaInfo.control;
+		const aExistingState = mDeltaInfo.existingState;
+		const aChangedState = mDeltaInfo.changedState;
+		const sOperation = mDeltaInfo.operation;
+		const sSetAttribute = mDeltaInfo.deltaAttribute;
 
-		var aSetterChanges = [];
+		const aSetterChanges = [];
 
-		aChangedState.forEach(function(oItem){
+		aChangedState.forEach((oItem) => {
 			//check if the provided state item holds the value to check for
 			if (oItem.hasOwnProperty(sSetAttribute)) {
-				var oExistingItem = aExistingState.find(function(oExisting){return oExisting.name == oItem.name;});
+				const oExistingItem = aExistingState.find((oExisting) => {
+					return oExisting.name == oItem.name;
+				});
 
 				//compare to identify delta (only create a change if really necessary)
-				var vOldValue = oExistingItem && oExistingItem.hasOwnProperty(sSetAttribute) && oExistingItem[sSetAttribute];
-				var vNewValue = oItem[sSetAttribute];
-				var bValueChanged = vOldValue !== vNewValue;
+				const vOldValue = oExistingItem && oExistingItem.hasOwnProperty(sSetAttribute) && oExistingItem[sSetAttribute];
+				const vNewValue = oItem[sSetAttribute];
+				const bValueChanged = vOldValue !== vNewValue;
 				if (bValueChanged) {
 					aSetterChanges.push(this._createAddRemoveChange(oControl, sOperation, {
 						[oItem.hasOwnProperty("key") ? "key" : "name"]: oItem.key || oItem.name,
@@ -565,18 +628,18 @@ sap.ui.define([
 					}));
 				}
 			}
-		}.bind(this));
+		});
 
 		return aSetterChanges;
 	};
 
 	SelectionController.prototype.changesToState = function(aChanges) {
 
-		var aState = [];
+		const aState = [];
 
-		aChanges.forEach(function(oChange){
-			var oStateDiffContent = merge({}, oChange.changeSpecificData.content);
-			var iIndex = oStateDiffContent.index;
+		aChanges.forEach((oChange) => {
+			const oStateDiffContent = merge({}, oChange.changeSpecificData.content);
+			const iIndex = oStateDiffContent.index;
 			delete oStateDiffContent.index;
 
 			//set the position in case its explicitly provided and different to the current position
@@ -590,26 +653,28 @@ sap.ui.define([
 			}
 
 			aState.push(oStateDiffContent);
-		}.bind(this));
+		});
 
 		return aState;
 	};
 
 	SelectionController.prototype.prepareAdaptationData = function(oPropertyHelper, fnEnhace, bGroupData) {
 
-		var aItems = [];
-		var mItemsGrouped = bGroupData ? {} : null;
+		const aItems = [];
+		const mItemsGrouped = bGroupData ? {} : null;
 
-		var bEnhance = fnEnhace instanceof Function;
+		const bEnhance = fnEnhace instanceof Function;
 
-		oPropertyHelper.getProperties().forEach(function(oProperty) {
+		const oControllerHelper = this.getMetadataHelper();
+		const oHelper = oControllerHelper ? oControllerHelper : oPropertyHelper;
+		oHelper.getProperties().forEach((oProperty) => {
 
-			var mItem = {};
+			const mItem = {};
 			mItem.key = oProperty.name || oProperty.key;
 			mItem.name = oProperty.name || oProperty.key;
 
 			if (bEnhance) {
-				var bIsValid = fnEnhace(mItem, oProperty);
+				const bIsValid = fnEnhace(mItem, oProperty);
 				if (!bIsValid) {
 					return;
 				}
@@ -629,7 +694,7 @@ sap.ui.define([
 
 		});
 
-		var oAdaptationData = {
+		const oAdaptationData = {
 			items: aItems
 		};
 
@@ -643,33 +708,33 @@ sap.ui.define([
 
 
 	SelectionController.prototype._buildGroupStructure = function(mItemsGrouped) {
-		var aGroupedItems = [];
-		Object.keys(mItemsGrouped).forEach(function(sGroupKey){
+		const aGroupedItems = [];
+		Object.keys(mItemsGrouped).forEach((sGroupKey) => {
 			this.sortP13nData("generic", mItemsGrouped[sGroupKey]);
 			aGroupedItems.push({
 				group: sGroupKey,
-				groupLabel: mItemsGrouped[sGroupKey][0].groupLabel || sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("p13n.BASIC_DEFAULT_GROUP"),//Grouplabel might not be necessarily be propagated to every item
+				groupLabel: mItemsGrouped[sGroupKey][0].groupLabel || Library.getResourceBundleFor("sap.m").getText("p13n.BASIC_DEFAULT_GROUP"), //Grouplabel might not be necessarily be propagated to every item
 				groupVisible: true,
 				items: mItemsGrouped[sGroupKey]
 			});
-		}.bind(this));
+		});
 		return aGroupedItems;
 
 	};
 
-	SelectionController.prototype.sortP13nData = function (oSorting, aItems) {
+	SelectionController.prototype.sortP13nData = (oSorting, aItems) => {
 
-		var mP13nTypeSorting = oSorting;
+		const mP13nTypeSorting = oSorting;
 
-		var sPositionAttribute = mP13nTypeSorting.position;
-		var sSelectedAttribute = mP13nTypeSorting.visible;
+		const sPositionAttribute = mP13nTypeSorting.position;
+		const sSelectedAttribute = mP13nTypeSorting.visible;
 
-		var sLocale = Configuration.getLocale().toString();
+		const sLocale = new Locale(Localization.getLanguageTag()).toString();
 
-		var oCollator = window.Intl.Collator(sLocale, {});
+		const oCollator = window.Intl.Collator(sLocale, {});
 
 		// group selected / unselected --> sort alphabetically in each group
-		aItems.sort(function(mField1, mField2) {
+		aItems.sort((mField1, mField2) => {
 			if (mField1[sSelectedAttribute] && mField2[sSelectedAttribute]) {
 				return (mField1[sPositionAttribute] || 0) - (mField2[sPositionAttribute] || 0);
 			} else if (mField1[sSelectedAttribute]) {
@@ -682,8 +747,8 @@ sap.ui.define([
 		});
 	};
 
-	SelectionController.prototype.arrayToMap = function(aArray) {
-		return aArray.reduce(function(mMap, oProp, iIndex){
+	SelectionController.prototype.arrayToMap = (aArray) => {
+		return aArray.reduce((mMap, oProp, iIndex) => {
 			mMap[oProp.key] = oProp;
 			mMap[oProp.key].position = iIndex;
 			return mMap;