@openui5/sap.ui.fl 1.129.0 → 1.130.1

package/src/sap/ui/fl/write/_internal/condenser/UIReconstruction.js

@@ -31,19 +31,19 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.condenser.UIReconstruction
 	 * @author SAP SE
-	 * @version 1.129.0
+	 * @version 1.130.1
 	 */
-	var UIReconstruction = {};
+	const UIReconstruction = {};
 
-	var INDEX_RELATED = {
+	const INDEX_RELATED = {
 		create: Create,
 		destroy: Destroy,
 		move: Move
 	};
 
 	function forEveryMapInMap(mMap, fnCallback) {
-		each(mMap, function(sOuterKey, mOuterMap) {
-			each(mOuterMap, function(sInnerKey, mInnerMap) {
+		each(mMap, (sOuterKey, mOuterMap) => {
+			each(mOuterMap, (sInnerKey, mInnerMap) => {
 				fnCallback(mOuterMap, sOuterKey, mInnerMap, sInnerKey);
 			});
 		});
@@ -68,20 +68,20 @@ sap.ui.define([
 	 * @returns {Map} Simulation of the UI reconstruction
 	 */
 	function defineContainersMap(mUIReconstructions, aCondenserInfos) {
-		var mContainers = {};
-		forEveryMapInMap(mUIReconstructions, function(mUIState, sContainerKey, mUIAggregationState, sAggregationName) {
-			var aTargetElementIds = mUIAggregationState[Utils.TARGET_UI];
-			var aSourceElementIds = mUIAggregationState[Utils.INITIAL_UI];
+		const mContainers = {};
+		forEveryMapInMap(mUIReconstructions, (mUIState, sContainerKey, mUIAggregationState, sAggregationName) => {
+			const aTargetElementIds = mUIAggregationState[Utils.TARGET_UI];
+			const aSourceElementIds = mUIAggregationState[Utils.INITIAL_UI];
 
-			aCondenserInfos.forEach(function(oCondenserInfo) {
-				var bElementPartOfInitialOrTargetUi = aTargetElementIds.indexOf(oCondenserInfo.affectedControl) > -1
+			aCondenserInfos.forEach((oCondenserInfo) => {
+				const bElementPartOfInitialOrTargetUi = aTargetElementIds.indexOf(oCondenserInfo.affectedControl) > -1
 					|| aSourceElementIds.indexOf(oCondenserInfo.affectedControl) > -1;
 
 				if (sAggregationName === oCondenserInfo.targetAggregation && bElementPartOfInitialOrTargetUi) {
 					mContainers[sContainerKey] ||= {};
-					var mAggregations = mContainers[sContainerKey];
+					const mAggregations = mContainers[sContainerKey];
 					mAggregations[sAggregationName] ||= [];
-					var aContainerElements = mAggregations[sAggregationName];
+					const aContainerElements = mAggregations[sAggregationName];
 					aContainerElements.push(oCondenserInfo);
 				}
 			});
@@ -96,7 +96,7 @@ sap.ui.define([
 	 * @returns {boolean} <code>true</code> if the array of condenser info objects contains only changes of type 'create'
 	 */
 	function containsOnlyCreateChanges(aCondenserInfos) {
-		return !aCondenserInfos.some(function(vElement) {
+		return !aCondenserInfos.some((vElement) => {
 			return vElement.classification !== CondenserClassification.Create;
 		});
 	}
@@ -108,7 +108,7 @@ sap.ui.define([
 	 * @returns {boolean} <code>true</code> if the array of elements contains no unknown elements
 	 */
 	function containsNoPlaceholder(aElements) {
-		return !aElements.some(function(vElement) {
+		return !aElements.some((vElement) => {
 			return Utils.isUnknown(vElement);
 		});
 	}
@@ -129,9 +129,9 @@ sap.ui.define([
 	 * @param {object[]} aCondenserInfos - Array of condenser info objects
 	 */
 	function sortAscendingByTargetIndex(aCondenserInfos) {
-		aCondenserInfos.sort(function(a, b) {
-			var iCurrentTargetIndex = getTargetIndex(a);
-			var iNextTargetIndex = getTargetIndex(b);
+		aCondenserInfos.sort((a, b) => {
+			const iCurrentTargetIndex = getTargetIndex(a);
+			const iNextTargetIndex = getTargetIndex(b);
 			return iCurrentTargetIndex - iNextTargetIndex;
 		});
 	}
@@ -143,7 +143,7 @@ sap.ui.define([
 	 * @returns {boolean} <code>true</code> if the array of elements contains an unknown element
 	 */
 	function containsOnlyPlaceholder(aElements) {
-		return !aElements.some(function(vElement) {
+		return !aElements.some((vElement) => {
 			return !Utils.isUnknown(vElement);
 		});
 	}
@@ -156,7 +156,7 @@ sap.ui.define([
 	 * @returns {boolean} <code>true</code> if the passed arrays are equal
 	 */
 	function isEqual(a, b) {
-		var c;
+		let c;
 		if (a.length < b.length) {
 			c = b.slice(a.length);
 			if (!containsOnlyPlaceholder(c)) {
@@ -184,20 +184,20 @@ sap.ui.define([
 	 * @returns {boolean} <code>true</code> if the simulated and the target UI reconstructions are equal
 	 */
 	function isEqualReconstructedUI(sContainerKey, sAggregationName, aInitialUIElementIds, aTargetUIElementIds, aCondenserInfos) {
-		var mUISimulatedStates = {};
+		const mUISimulatedStates = {};
 
-		aCondenserInfos.forEach(function(oCondenserInfo) {
-			var sContainerKey = oCondenserInfo.targetContainer;
+		aCondenserInfos.forEach((oCondenserInfo) => {
+			const sContainerKey = oCondenserInfo.targetContainer;
 			mUISimulatedStates[sContainerKey] ||= {};
-			var mUIAggregationState = mUISimulatedStates[sContainerKey];
+			const mUIAggregationState = mUISimulatedStates[sContainerKey];
 			mUIAggregationState[sAggregationName] ||= Utils.initializeArrayWithPlaceholders(0, aInitialUIElementIds.length - 1);
 
 			INDEX_RELATED[oCondenserInfo.classification].simulate(mUIAggregationState[sAggregationName], oCondenserInfo, aInitialUIElementIds);
 		});
 
-		var aSortedUIElementIds = mUISimulatedStates[sContainerKey][sAggregationName];
+		const aSortedUIElementIds = mUISimulatedStates[sContainerKey][sAggregationName];
 		if (isEqual(aTargetUIElementIds, aSortedUIElementIds)) {
-			aCondenserInfos.forEach(function(oCondenserInfo) {
+			aCondenserInfos.forEach((oCondenserInfo) => {
 				if (oCondenserInfo.sameIndex) {
 					oCondenserInfo.change.condenserState = "delete";
 				}
@@ -219,7 +219,7 @@ sap.ui.define([
 				// setting the target index will most likely make the change dirty,
 				// but the condenser needs the current state of the change.
 				// so in this function the state should not change
-				var sOldState = oCondenserInfo.change.getState();
+				const sOldState = oCondenserInfo.change.getState();
 				oCondenserInfo.setTargetIndex(oCondenserInfo.change, iIndex);
 				oCondenserInfo.change.setState(sOldState);
 				if (oCondenserInfo.change.isPersisted()) {
@@ -229,11 +229,11 @@ sap.ui.define([
 		}
 
 		function adjustReconstructionMap(mUIStates, sContainerId, mUIAggregationState) {
-			mUIAggregationState[Utils.TARGET_UI].forEach(function(sTargetElementId, iIndex) {
+			mUIAggregationState[Utils.TARGET_UI].forEach((sTargetElementId, iIndex) => {
 				if (!Utils.isUnknown(sTargetElementId)) {
-					var mTypes = mReducedChanges[sTargetElementId];
-					var mAggregations = mTypes[Utils.INDEX_RELEVANT];
-					forEveryMapInMap(mAggregations, function(mSubtypes, sAggregationName, aCondenserInfos, sSubtypeKey) {
+					const mTypes = mReducedChanges[sTargetElementId];
+					const mAggregations = mTypes[Utils.INDEX_RELEVANT];
+					forEveryMapInMap(mAggregations, (mSubtypes, sAggregationName, aCondenserInfos, sSubtypeKey) => {
 						if (sSubtypeKey !== CondenserClassification.Destroy) {
 							aCondenserInfos.forEach(updateCondenserChange.bind(this, iIndex));
 						}
@@ -247,21 +247,22 @@ sap.ui.define([
 
 	/**
 	 * Compares the initial and target UI reconstructions of the corresponding container.
-	 * If the UI reconstructions are equal, the corresponding index-related changes will be removed from the data structure with the reduced changes.
+	 * If the UI reconstructions are equal, the corresponding index-related changes will be removed
+	 * from the data structure with the reduced changes.
 	 *
 	 * @param {Map} mReducedChanges - Map of reduced changes
 	 * @param {Map} mUIReconstructions - Map of UI reconstructions
 	 */
 	function compareUIReconstructions(mReducedChanges, mUIReconstructions) {
-		forEveryMapInMap(mUIReconstructions, function(mUIStates, sContainerId, mUIAggregationState, sKey) {
-			var aInitialElementIds = mUIAggregationState[Utils.INITIAL_UI];
-			var aTargetElementIds = mUIAggregationState[Utils.TARGET_UI];
+		forEveryMapInMap(mUIReconstructions, (mUIStates, sContainerId, mUIAggregationState, sKey) => {
+			const aInitialElementIds = mUIAggregationState[Utils.INITIAL_UI];
+			const aTargetElementIds = mUIAggregationState[Utils.TARGET_UI];
 			if (isEqual(aInitialElementIds, aTargetElementIds)) {
-				aTargetElementIds.forEach(function(sTargetElementId) {
-					var mTypes = mReducedChanges[sTargetElementId];
+				aTargetElementIds.forEach((sTargetElementId) => {
+					const mTypes = mReducedChanges[sTargetElementId];
 					if (mTypes !== undefined) {
-						forEveryMapInMap(mTypes[Utils.INDEX_RELEVANT], function(mSubtypes, sAggregationName, aCondenserInfos) {
-							aCondenserInfos.forEach(function(oCondenserInfo) {
+						forEveryMapInMap(mTypes[Utils.INDEX_RELEVANT], (mSubtypes, sAggregationName, aCondenserInfos) => {
+							aCondenserInfos.forEach((oCondenserInfo) => {
 								oCondenserInfo.change.condenserState = "delete";
 							});
 						});
@@ -281,14 +282,14 @@ sap.ui.define([
 	 * @param {Map} mUIReconstructions - Map of UI reconstructions
 	 */
 	function updateTargetUIReconstructions(mReducedChanges, mUIReconstructions) {
-		forEveryMapInMap(mUIReconstructions, function(mUIStates, sContainerId, mUIAggregationState, sAggregationName) {
-			var aInitialElementIds = mUIAggregationState[Utils.INITIAL_UI];
-			var aTargetElementIds = mUIAggregationState[Utils.TARGET_UI];
-			aInitialElementIds.forEach(function(initialElementId, index) {
-				var mTypes = mReducedChanges[initialElementId];
+		forEveryMapInMap(mUIReconstructions, (mUIStates, sContainerId, mUIAggregationState, sAggregationName) => {
+			const aInitialElementIds = mUIAggregationState[Utils.INITIAL_UI];
+			const aTargetElementIds = mUIAggregationState[Utils.TARGET_UI];
+			aInitialElementIds.forEach((initialElementId, index) => {
+				const mTypes = mReducedChanges[initialElementId];
 				if (!mTypes || !ObjectPath.get([Utils.INDEX_RELEVANT, sAggregationName], mTypes)) {
-					var sPlaceholder = Utils.PLACEHOLDER + index;
-					var iTargetIndex = aTargetElementIds.indexOf(initialElementId);
+					const sPlaceholder = Utils.PLACEHOLDER + index;
+					const iTargetIndex = aTargetElementIds.indexOf(initialElementId);
 					if (iTargetIndex >= 0) {
 						aTargetElementIds[iTargetIndex] = sPlaceholder;
 					}
@@ -305,10 +306,10 @@ sap.ui.define([
 	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} aAllReducedChanges - Array of all reduced changes
 	 */
 	UIReconstruction.swapChanges = function(aSortedIndexRelatedChanges, aAllReducedChanges) {
-		var aIndexes = aSortedIndexRelatedChanges.map(function(oChange) {
+		const aIndexes = aSortedIndexRelatedChanges.map((oChange) => {
 			return aAllReducedChanges.indexOf(oChange);
 		}).sort();
-		aSortedIndexRelatedChanges.forEach(function(oChange) {
+		aSortedIndexRelatedChanges.forEach((oChange) => {
 			aAllReducedChanges[aIndexes.shift()] = oChange;
 		});
 	};
@@ -321,13 +322,13 @@ sap.ui.define([
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} Sorted array of index-related changes
 	 */
 	UIReconstruction.sortIndexRelatedChanges = function(mUIReconstructions, aCondenserInfos) {
-		var aSortedIndexRelatedChangesPerContainer = [];
-		var mContainers = defineContainersMap(mUIReconstructions, aCondenserInfos);
+		const aSortedIndexRelatedChangesPerContainer = [];
+		const mContainers = defineContainersMap(mUIReconstructions, aCondenserInfos);
 
-		forEveryMapInMap(mContainers, function(mAggregations, sContainerKey, aCondenserInfos, sAggregationName) {
-			var aTargetElementIds = mUIReconstructions[sContainerKey][sAggregationName][Utils.TARGET_UI];
-			var aInitialElementIds = mUIReconstructions[sContainerKey][sAggregationName][Utils.INITIAL_UI];
-			var bCorrectSortingFound = true;
+		forEveryMapInMap(mContainers, (mAggregations, sContainerKey, aCondenserInfos, sAggregationName) => {
+			const aTargetElementIds = mUIReconstructions[sContainerKey][sAggregationName][Utils.TARGET_UI];
+			const aInitialElementIds = mUIReconstructions[sContainerKey][sAggregationName][Utils.INITIAL_UI];
+			let bCorrectSortingFound = true;
 
 			if (
 				containsNoPlaceholder(aTargetElementIds)
@@ -339,10 +340,10 @@ sap.ui.define([
 				bCorrectSortingFound = isEqualReconstructedUI(sContainerKey, sAggregationName, aInitialElementIds, aTargetElementIds, aCondenserInfos);
 			} else if (!isEqualReconstructedUI(sContainerKey, sAggregationName, aInitialElementIds, aTargetElementIds, aCondenserInfos)) {
 				bCorrectSortingFound = false;
-				var iTimes = aCondenserInfos.length;
+				let iTimes = aCondenserInfos.length;
 				while (iTimes !== 0 && !bCorrectSortingFound) {
-					var iOldIndex = 0;
-					var iNewIndex = 1;
+					let iOldIndex = 0;
+					let iNewIndex = 1;
 					// TODO implement intelligent / efficient sorting  -> smart sort
 					while (iNewIndex < aCondenserInfos.length && !bCorrectSortingFound) {
 						shiftElement(aCondenserInfos, iOldIndex, iNewIndex);
@@ -358,11 +359,11 @@ sap.ui.define([
 				throw Error(`no correct sorting found for the container: ${sContainerKey}`);
 			}
 
-			aCondenserInfos = aCondenserInfos.filter(function(oCondenserInfo) {
+			aCondenserInfos = aCondenserInfos.filter((oCondenserInfo) => {
 				return oCondenserInfo.change.condenserState !== "delete";
 			});
 
-			aSortedIndexRelatedChangesPerContainer.push(aCondenserInfos.map(function(oCondenserInfo) {
+			aSortedIndexRelatedChangesPerContainer.push(aCondenserInfos.map((oCondenserInfo) => {
 				if (oCondenserInfo.revertIndex > -1) {
 					oCondenserInfo.setIndexInRevertData(oCondenserInfo.change, oCondenserInfo.revertIndex);
 					oCondenserInfo.sourceIndex = oCondenserInfo.revertIndex;
@@ -374,8 +375,8 @@ sap.ui.define([
 		return aSortedIndexRelatedChangesPerContainer;
 	};
 
-	UIReconstruction.addChange = function(mUIReconstructions, oCondenserInfo) {
-		return INDEX_RELATED[oCondenserInfo.classification].addToReconstructionMap(mUIReconstructions, oCondenserInfo);
+	UIReconstruction.addChange = async function(mUIReconstructions, oCondenserInfo) {
+		await INDEX_RELATED[oCondenserInfo.classification].addToReconstructionMap(mUIReconstructions, oCondenserInfo);
 	};
 
 	UIReconstruction.compareAndUpdate = function(mReducedChanges, mUIReconstructions) {

package/src/sap/ui/fl/write/_internal/condenser/Utils.js

@@ -13,7 +13,7 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	var Utils = {};
+	const Utils = {};
 
 	Utils.TARGET_UI = "targetUI";
 	Utils.INITIAL_UI = "initialUI";
@@ -43,9 +43,9 @@ sap.ui.define([
 	 */
 	Utils.getInitialUIContainerElementIds = function(mUIReconstructions, sContainerKey, sAggregationName, aContainerElements) {
 		mUIReconstructions[sContainerKey] ||= {};
-		var mUIStates = mUIReconstructions[sContainerKey];
+		const mUIStates = mUIReconstructions[sContainerKey];
 		mUIStates[sAggregationName] ||= {};
-		var mUIAggregationState = mUIStates[sAggregationName];
+		const mUIAggregationState = mUIStates[sAggregationName];
 		mUIAggregationState[Utils.TARGET_UI] ||= aContainerElements;
 		mUIAggregationState[Utils.INITIAL_UI] ||= aContainerElements.slice(0);
 		return mUIAggregationState[Utils.INITIAL_UI];
@@ -60,14 +60,12 @@ sap.ui.define([
 	 * @param {string} [sAffectedControlIdProperty] - Property name of the ID used for the container element
 	 * @returns {Promise<string[]>} Array of Ids wrapped in Promise
 	 */
-	Utils.getContainerElementIds = function(sContainerId, sAggregationName, aCustomAggregation, sAffectedControlIdProperty) {
-		var oContainer = Element.getElementById(sContainerId);
+	Utils.getContainerElementIds = async function(sContainerId, sAggregationName, aCustomAggregation, sAffectedControlIdProperty) {
+		const oContainer = Element.getElementById(sContainerId);
 
-		return Promise.resolve(aCustomAggregation || JsControlTreeModifier.getAggregation(oContainer, sAggregationName))
-		.then(function(aContainerElements) {
-			return aContainerElements.map(function(oElement) {
-				return sAffectedControlIdProperty ? oElement[sAffectedControlIdProperty] : oElement.getId();
-			});
+		const aContainerElements = aCustomAggregation || await JsControlTreeModifier.getAggregation(oContainer, sAggregationName);
+		return aContainerElements.map((oElement) => {
+			return sAffectedControlIdProperty ? oElement[sAffectedControlIdProperty] : oElement.getId();
 		});
 	};
 
@@ -79,17 +77,17 @@ sap.ui.define([
 	 * @returns {string} Array of Placeholders
 	 */
 	Utils.initializeArrayWithPlaceholders = function(iTargetIndex, iSourceIndex) {
-		var iLength = getNeededLengthOfNewArray(iSourceIndex, iTargetIndex);
-		return Array(iLength).fill(Utils.PLACEHOLDER).map(function(sPlaceholder, iIterator) {
+		const iLength = getNeededLengthOfNewArray(iSourceIndex, iTargetIndex);
+		return Array(iLength).fill(Utils.PLACEHOLDER).map((sPlaceholder, iIterator) => {
 			return sPlaceholder + iIterator;
 		});
 	};
 
 	Utils.extendArrayWithPlaceholders = function(aElements, iSourceIndex, iTargetIndex) {
-		var iLength = getNeededLengthOfNewArray(iSourceIndex, iTargetIndex);
+		const iLength = getNeededLengthOfNewArray(iSourceIndex, iTargetIndex);
 		if (aElements.length < iLength) {
-			var sUnknown;
-			for (var i = aElements.length; i <= iLength; i++) {
+			let sUnknown;
+			for (let i = aElements.length; i <= iLength; i++) {
 				sUnknown = Utils.PLACEHOLDER + (aElements.length);
 				aElements.splice(aElements.length, 0, sUnknown);
 			}
@@ -107,8 +105,8 @@ sap.ui.define([
 	Utils.extendElementsArray = function(aElements, iSourceIndex, iTargetIndex, sAffectedControlId) {
 		Utils.extendArrayWithPlaceholders(aElements, iSourceIndex, iTargetIndex);
 
-		var iCurrentIndex = aElements.indexOf(sAffectedControlId);
-		var iUnknownIndex = aElements.indexOf(Utils.PLACEHOLDER + iSourceIndex);
+		const iCurrentIndex = aElements.indexOf(sAffectedControlId);
+		const iUnknownIndex = aElements.indexOf(Utils.PLACEHOLDER + iSourceIndex);
 		if (
 			iCurrentIndex !== iSourceIndex
 			&& iSourceIndex !== undefined
@@ -145,8 +143,8 @@ sap.ui.define([
 			sValue !== undefined
 			&& sValue.indexOf(Utils.PLACEHOLDER) === 0
 		) {
-			var sResult = sValue.slice(1, sValue.length);
-			var iParsedIndex = parseInt(sResult);
+			const sResult = sValue.slice(1, sValue.length);
+			const iParsedIndex = parseInt(sResult);
 			if (isNaN(iParsedIndex)) {
 				return false;
 			}

package/src/sap/ui/fl/write/_internal/condenser/classifications/Create.js

@@ -21,21 +21,21 @@ sap.ui.define([
 		 * @param {object} oCondenserInfo - Condenser specific information
 		 * @returns {Promise} resolves when a create change is added to UI Reconstruction Map
 		 */
-		addToReconstructionMap(mUIReconstructions, oCondenserInfo) {
-			var oAffectedControl = Element.getElementById(oCondenserInfo.affectedControl);
-			var sAggregationName = oCondenserInfo.targetAggregation || oAffectedControl && oAffectedControl.sParentAggregationName;
-			return CondenserUtils.getContainerElementIds(
+		async addToReconstructionMap(mUIReconstructions, oCondenserInfo) {
+			const oAffectedControl = Element.getElementById(oCondenserInfo.affectedControl);
+			const sAggregationName = oCondenserInfo.targetAggregation || oAffectedControl && oAffectedControl.sParentAggregationName;
+			const aTargetContainerElementIds = await CondenserUtils.getContainerElementIds(
 				oCondenserInfo.targetContainer, sAggregationName,
 				oCondenserInfo.customAggregation, oCondenserInfo.affectedControlIdProperty
-			)
-			.then(function(aTargetContainerElementIds) {
-				var aContainerElementIds = CondenserUtils.getInitialUIContainerElementIds(mUIReconstructions, oCondenserInfo.targetContainer, oCondenserInfo.targetAggregation, aTargetContainerElementIds);
-				var iIndex = aContainerElementIds.indexOf(oCondenserInfo.affectedControl);
-				// if the index is -1 the element was already removed by a different add change
-				if (iIndex > -1) {
-					aContainerElementIds.splice(iIndex, 1);
-				}
-			});
+			);
+			const aContainerElementIds = CondenserUtils.getInitialUIContainerElementIds(
+				mUIReconstructions, oCondenserInfo.targetContainer, oCondenserInfo.targetAggregation, aTargetContainerElementIds
+			);
+			const iIndex = aContainerElementIds.indexOf(oCondenserInfo.affectedControl);
+			// if the index is -1 the element was already removed by a different add change
+			if (iIndex > -1) {
+				aContainerElementIds.splice(iIndex, 1);
+			}
 		},
 
 		/**

package/src/sap/ui/fl/write/_internal/condenser/classifications/Destroy.js

@@ -19,26 +19,24 @@ sap.ui.define([
 		 * @param {object} oCondenserInfo - Condenser specific information
  		 * @returns {Promise} resolves when a destroy change is added to UI Reconstruction Map
 		 */
-		addToReconstructionMap(mUIReconstructions, oCondenserInfo) {
-			return CondenserUtils.getContainerElementIds(
+		async addToReconstructionMap(mUIReconstructions, oCondenserInfo) {
+			const aTargetContainerElementIds = await CondenserUtils.getContainerElementIds(
 				oCondenserInfo.targetContainer, oCondenserInfo.targetAggregation,
 				oCondenserInfo.customAggregation, oCondenserInfo.affectedControlIdProperty
-			)
-			.then(function(aTargetContainerElementIds) {
-				var aContainerElementIds = CondenserUtils.getInitialUIContainerElementIds(
-					mUIReconstructions, oCondenserInfo.targetContainer,
-					oCondenserInfo.targetAggregation, aTargetContainerElementIds
-				);
-				if (aContainerElementIds.length - 1 < oCondenserInfo.sourceIndex) {
-					while (aContainerElementIds.length - 1 < oCondenserInfo.sourceIndex) {
-						var iIndex = aContainerElementIds.length;
-						aContainerElementIds.splice(aContainerElementIds.length, 0, CondenserUtils.PLACEHOLDER + iIndex);
-					}
-					aContainerElementIds[oCondenserInfo.sourceIndex] = oCondenserInfo.affectedControl;
-				} else {
-					aContainerElementIds.splice(oCondenserInfo.sourceIndex, 0, oCondenserInfo.affectedControl);
+			);
+			const aContainerElementIds = CondenserUtils.getInitialUIContainerElementIds(
+				mUIReconstructions, oCondenserInfo.targetContainer,
+				oCondenserInfo.targetAggregation, aTargetContainerElementIds
+			);
+			if (aContainerElementIds.length - 1 < oCondenserInfo.sourceIndex) {
+				while (aContainerElementIds.length - 1 < oCondenserInfo.sourceIndex) {
+					const iIndex = aContainerElementIds.length;
+					aContainerElementIds.splice(aContainerElementIds.length, 0, CondenserUtils.PLACEHOLDER + iIndex);
 				}
-			});
+				aContainerElementIds[oCondenserInfo.sourceIndex] = oCondenserInfo.affectedControl;
+			} else {
+				aContainerElementIds.splice(oCondenserInfo.sourceIndex, 0, oCondenserInfo.affectedControl);
+			}
 		},
 
 		/**
@@ -49,9 +47,9 @@ sap.ui.define([
 		 * @param {string[]} aInitialUIElementIds - Array with the Ids of the initial elements in the container
 		 */
 		simulate(aContainerElements, oCondenserInfo, aInitialUIElementIds) {
-			var iCurrentSourceIndex = aContainerElements.indexOf(oCondenserInfo.affectedControl);
+			let iCurrentSourceIndex = aContainerElements.indexOf(oCondenserInfo.affectedControl);
 			if (iCurrentSourceIndex === -1) {
-				var sUnknown = CondenserUtils.PLACEHOLDER + aInitialUIElementIds.indexOf(oCondenserInfo.affectedControl);
+				const sUnknown = CondenserUtils.PLACEHOLDER + aInitialUIElementIds.indexOf(oCondenserInfo.affectedControl);
 				iCurrentSourceIndex = aContainerElements.indexOf(sUnknown);
 			}
 

package/src/sap/ui/fl/write/_internal/condenser/classifications/Move.js

@@ -19,8 +19,8 @@ sap.ui.define([
 		 * @param {object} oCondenserInfo - Condenser specific information
 		 * @returns {Promise} resolves when a create change is added to UI Reconstruction Map
 		 */
-		addToReconstructionMap(mUIReconstructions, oCondenserInfo) {
-			return Promise.all([
+		async addToReconstructionMap(mUIReconstructions, oCondenserInfo) {
+			const [aSourceContainerElementIds, aTargetContainerElementIds] = await Promise.all([
 				CondenserUtils.getContainerElementIds(
 					oCondenserInfo.sourceContainer, oCondenserInfo.sourceAggregation,
 					oCondenserInfo.customAggregation, oCondenserInfo.affectedControlIdProperty
@@ -29,36 +29,33 @@ sap.ui.define([
 					oCondenserInfo.targetContainer, oCondenserInfo.targetAggregation,
 					oCondenserInfo.customAggregation, oCondenserInfo.affectedControlIdProperty
 				)
-			]).then(function(aSourceTargetElementIds) {
-				var aSourceContainerElementIds = aSourceTargetElementIds[0];
-				var aTargetContainerElementIds = aSourceTargetElementIds[1];
+			]);
 
-				var aContainerElementIds;
-				var iTargetIndex;
-				if (
-					oCondenserInfo.targetContainer === oCondenserInfo.sourceContainer
-					&& oCondenserInfo.targetAggregation === oCondenserInfo.sourceAggregation
-				) {
-					aContainerElementIds = CondenserUtils.getInitialUIContainerElementIds(
-						mUIReconstructions, oCondenserInfo.targetContainer,
-						oCondenserInfo.targetAggregation, aTargetContainerElementIds
-					);
-					iTargetIndex = aContainerElementIds.indexOf(oCondenserInfo.affectedControl);
-					CondenserUtils.shiftElement(aContainerElementIds, iTargetIndex, oCondenserInfo.sourceIndex);
-				} else {
-					aContainerElementIds = CondenserUtils.getInitialUIContainerElementIds(
-						mUIReconstructions, oCondenserInfo.targetContainer,
-						oCondenserInfo.targetAggregation, aTargetContainerElementIds
-					);
-					iTargetIndex = aContainerElementIds.indexOf(oCondenserInfo.affectedControl);
-					aContainerElementIds.splice(iTargetIndex, 1);
-					aContainerElementIds = CondenserUtils.getInitialUIContainerElementIds(
-						mUIReconstructions, oCondenserInfo.sourceContainer,
-						oCondenserInfo.sourceAggregation, aSourceContainerElementIds
-					);
-					aContainerElementIds.splice(oCondenserInfo.sourceIndex, 0, oCondenserInfo.affectedControl);
-				}
-			});
+			let aContainerElementIds;
+			let iTargetIndex;
+			if (
+				oCondenserInfo.targetContainer === oCondenserInfo.sourceContainer
+				&& oCondenserInfo.targetAggregation === oCondenserInfo.sourceAggregation
+			) {
+				aContainerElementIds = CondenserUtils.getInitialUIContainerElementIds(
+					mUIReconstructions, oCondenserInfo.targetContainer,
+					oCondenserInfo.targetAggregation, aTargetContainerElementIds
+				);
+				iTargetIndex = aContainerElementIds.indexOf(oCondenserInfo.affectedControl);
+				CondenserUtils.shiftElement(aContainerElementIds, iTargetIndex, oCondenserInfo.sourceIndex);
+			} else {
+				aContainerElementIds = CondenserUtils.getInitialUIContainerElementIds(
+					mUIReconstructions, oCondenserInfo.targetContainer,
+					oCondenserInfo.targetAggregation, aTargetContainerElementIds
+				);
+				iTargetIndex = aContainerElementIds.indexOf(oCondenserInfo.affectedControl);
+				aContainerElementIds.splice(iTargetIndex, 1);
+				aContainerElementIds = CondenserUtils.getInitialUIContainerElementIds(
+					mUIReconstructions, oCondenserInfo.sourceContainer,
+					oCondenserInfo.sourceAggregation, aSourceContainerElementIds
+				);
+				aContainerElementIds.splice(oCondenserInfo.sourceIndex, 0, oCondenserInfo.affectedControl);
+			}
 		},
 
 		/**
@@ -69,13 +66,13 @@ sap.ui.define([
 		 * @param {string[]} aInitialUIElementIds - Array with the Ids of the initial elements in the container
 		 */
 		simulate(aContainerElements, oCondenserInfo, aInitialUIElementIds) {
-			var sAffectedControlId = oCondenserInfo.affectedControl;
-			var iInitialSourceIndex = aInitialUIElementIds.indexOf(sAffectedControlId);
+			const sAffectedControlId = oCondenserInfo.affectedControl;
+			const iInitialSourceIndex = aInitialUIElementIds.indexOf(sAffectedControlId);
 			// the move itself should not extend the array, just replace the placeholder
 			CondenserUtils.extendElementsArray(aContainerElements, iInitialSourceIndex, undefined, sAffectedControlId);
 
-			var iCurrentSourceIndex = aContainerElements.indexOf(sAffectedControlId);
-			var iTargetIndex = oCondenserInfo.getTargetIndex(oCondenserInfo.change);
+			const iCurrentSourceIndex = aContainerElements.indexOf(sAffectedControlId);
+			const iTargetIndex = oCondenserInfo.getTargetIndex(oCondenserInfo.change);
 
 			// if the move was done from a different container the element can't be found
 			if (iInitialSourceIndex === -1) {

package/src/sap/ui/fl/write/_internal/condenser/classifications/Update.js

@@ -4,11 +4,7 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define([
-	"sap/base/util/each"
-], function(
-	each
-) {
+sap.ui.define([], function() {
 	"use strict";
 
 	return {
@@ -31,11 +27,7 @@ sap.ui.define([
 		},
 
 		getChangesFromMap(mObjects, sUniqueKey) {
-			var aChanges = [];
-			each(mObjects[sUniqueKey], function(sKey, oCondenserInfo) {
-				aChanges.push(oCondenserInfo.change);
-			});
-			return aChanges;
+			return Object.values(mObjects[sUniqueKey]).map((oCondenserInfo) => oCondenserInfo.change);
 		}
 	};
 });

package/src/sap/ui/fl/write/_internal/connectors/BackendConnector.js

@@ -74,7 +74,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.BackendConnector
 	 * @since 1.72
-	 * @version 1.129.0
+	 * @version 1.130.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.connectors
 	 */

package/src/sap/ui/fl/write/_internal/connectors/BtpServiceConnector.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * Connector for saving and deleting data from SAPUI5 Flexibility KeyUser service - including personalization.
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.BtpServiceConnector
-	 * @version 1.129.0
+	 * @version 1.130.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/KeyUserConnector.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.KeyUserConnector
 	 * @since 1.70
-	 * @version 1.129.0
+	 * @version 1.130.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */