@openui5/sap.ui.fl 1.128.0 → 1.129.0

package/src/sap/ui/fl/apply/_internal/flexObjects/UIChange.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.UIChange
 	 * @since 1.109
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -113,13 +113,14 @@ sap.ui.define([
 	 * @static
 	 */
 	UIChange.getMappingInfo = function() {
-		return Object.assign(FlexObject.getMappingInfo(), {
+		return {
+			...FlexObject.getMappingInfo(),
 			selector: "selector",
 			dependentSelectors: "dependentSelector",
 			jsOnly: "jsOnly",
 			variantReference: "variantReference",
 			isChangeOnStandardVariant: "isChangeOnStandardVariant"
-		});
+		};
 	};
 
 	/**
@@ -335,7 +336,7 @@ sap.ui.define([
 			throw new Error("Parameter mPropertyBag is mandatory");
 		}
 
-		var oCurrentDependentSelectors = Object.assign({}, this.getDependentSelectors());
+		var oCurrentDependentSelectors = { ...this.getDependentSelectors() };
 
 		if (oCurrentDependentSelectors[sAlias]) {
 			throw new Error(`Alias '${sAlias}' already exists in the change.`);
@@ -469,7 +470,7 @@ sap.ui.define([
 	 */
 	UIChange.prototype.getExtensionPointInfo = function() {
 		if (isPlainObject(this._oExtensionPointInfo)) {
-			return Object.assign({}, this._oExtensionPointInfo);
+			return { ...this._oExtensionPointInfo };
 		}
 		return this._oExtensionPointInfo;
 	};

package/src/sap/ui/fl/apply/_internal/flexObjects/UpdatableChange.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @static
 	 */
 	UpdatableChange.getMappingInfo = function() {
-		return Object.assign(UIChange.getMappingInfo(), {});
+		return { ...UIChange.getMappingInfo() };
 	};
 
 	UpdatableChange.prototype.popLatestRevertInfo = function() {

package/src/sap/ui/fl/apply/_internal/flexObjects/Variant.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.Variant
 	 * @since 1.103
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -94,11 +94,12 @@ sap.ui.define([
 	 * @static
 	 */
 	Variant.getMappingInfo = function() {
-		return Object.assign(FlexObject.getMappingInfo(), {
+		return {
+			...FlexObject.getMappingInfo(),
 			favorite: "favorite",
 			executeOnSelection: "executeOnSelection",
 			contexts: "contexts"
-		});
+		};
 	};
 
 	/**

package/src/sap/ui/fl/apply/_internal/flexObjects/getVariantAuthor.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 *
 	 * @function
 	 * @since 1.121
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 * @alias module:sap/ui/fl/apply/_internal/flexState/compVariants/getVariantAuthor

package/src/sap/ui/fl/apply/_internal/flexState/FlexObjectState.js

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.flexState.FlexObjectState
 	 * @since 1.83
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -58,13 +58,13 @@ sap.ui.define([
 
 	function getCompleteDependency(oChange, sReference) {
 		const mInitialDependencies = FlexObjectState.getCompleteDependencyMap(sReference).mDependencies;
-		return mInitialDependencies[oChange.getId()] && Object.assign({}, mInitialDependencies[oChange.getId()]);
+		return mInitialDependencies[oChange.getId()] && { ...mInitialDependencies[oChange.getId()] };
 	}
 
 	function copyDependencies(oInitialDependency, aNewValidDependencies, oAppComponent, oChange, sReference) {
 		const aNewValidControlDependencies = [];
 		const oDependencyMap = FlexObjectState.getLiveDependencyMap(sReference);
-		const oModifiedDependency = Object.assign({}, oInitialDependency);
+		const oModifiedDependency = { ...oInitialDependency };
 		oInitialDependency.controlsDependencies.forEach((oDependentControlSelector) => {
 			// if the control is already available we don't need to add a dependency to it
 			if (!JsControlTreeModifier.bySelector(oDependentControlSelector, oAppComponent)) {
@@ -231,7 +231,7 @@ sap.ui.define([
 			oSelector.changeTypes ||= [];
 			const mChangesMap = FlexObjectState.getLiveDependencyMap(sFlexReference);
 			let aPromises = [];
-			const mDependencies = Object.assign({}, mChangesMap.mDependencies);
+			const mDependencies = { ...mChangesMap.mDependencies };
 			const {mChanges} = mChangesMap;
 			const aChangesForControl = mChanges[oControl.getId()] || [];
 

package/src/sap/ui/fl/apply/_internal/flexState/FlexState.js

@@ -89,7 +89,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.FlexState
 	 * @since 1.73
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
@@ -145,11 +145,7 @@ sap.ui.define([
 					);
 					// If the parent variant no longer exists, change the reference to the standard variant
 					if (!bParentVariantExists) {
-						return Object.assign(
-							{},
-							oVariant,
-							{ variantReference: oVariant.variantManagementReference }
-						);
+						return { ...oVariant, variantReference: oVariant.variantManagementReference };
 					}
 					return oVariant;
 				});
@@ -306,7 +302,8 @@ sap.ui.define([
 			});
 		});
 
-		_mInstances[sReference].runtimePersistence = Object.assign(oRuntimePersistence, {
+		_mInstances[sReference].runtimePersistence = {
+			...oRuntimePersistence,
 			flexObjects: aChangeDefinitions.map(function(oChangeDef) {
 				var iObjectIndex;
 				// Only keep FlexObjects found in the storage change definitions
@@ -328,7 +325,7 @@ sap.ui.define([
 				Log.error(sErrorText);
 				throw new Error(sErrorText);
 			})
-		});
+		};
 
 		// If the final length is different, an object is no longer there (e.g. new version requested)
 		if (iInitialFlexObjectsLength !== _mInstances[sReference].runtimePersistence.flexObjects.length) {
@@ -416,7 +413,7 @@ sap.ui.define([
 		var oResponse = mResponse && mResponse.changes || {};
 		var oFlexInfoSession = FlexInfoSession.getByReference(sReference);
 		if (oResponse.info !== undefined) {
-			oFlexInfoSession = Object.assign(oFlexInfoSession, oResponse.info);
+			oFlexInfoSession = { ...oFlexInfoSession, ...oResponse.info };
 		}
 		FlexInfoSession.setByReference(oFlexInfoSession, sReference);
 	}
@@ -756,97 +753,55 @@ sap.ui.define([
 		}
 	};
 
-	/**
-	 * Adds a dirty flex object to the flex state.
-	 *
-	 * @param {string} sReference - Flexibility reference of the app
-	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oFlexObject - Flexibility object
-	 */
-	FlexState.addDirtyFlexObject = function(sReference, oFlexObject) {
-		if (!_mInstances[sReference]) {
-			initializeEmptyState(sReference);
-		}
-		const sAdaptationLayer = FlexInfoSession.getByReference(sReference).adaptationLayer;
-		const bFlexObjectsOverAdaptationLayer = !!sAdaptationLayer
-			&& LayerUtils.isOverLayer(oFlexObject.getLayer(), sAdaptationLayer);
-		const bAlreadyInRuntimePersistence = _mInstances[sReference].runtimePersistence.flexObjects.includes(oFlexObject);
-		// FIXME: Currently called from the ChangePersistence which might be
-		// independent of FlexState in some test cases
-		// Once the ChangePersistence is no longer used
-		// make sure to remove the safeguard
-		if (!bFlexObjectsOverAdaptationLayer && _mInstances[sReference] && !bAlreadyInRuntimePersistence) {
-			_mInstances[sReference].runtimePersistence.flexObjects.push(oFlexObject);
-			oFlexObjectsDataSelector.checkUpdate(
-				{ reference: sReference },
-				[{ type: "addFlexObject", updatedObject: oFlexObject }]
-			);
-		}
-	};
-
 	/**
 	 * Adds a list of dirty flex objects to the flex state.
 	 *
 	 * @param {string} sReference - Flexibility reference of the app
-	 * @param {array.<sap.ui.fl.apply._internal.flexObjects.FlexObject>} aFlexObjects - Flexibility objects
+	 * @param {array.<sap.ui.fl.apply._internal.flexObjects.FlexObject>} aFlexObjects - Flex objects
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} The flex objects that were added
 	 */
 	FlexState.addDirtyFlexObjects = function(sReference, aFlexObjects) {
 		if (!_mInstances[sReference]) {
 			initializeEmptyState(sReference);
 		}
 		const sAdaptationLayer = FlexInfoSession.getByReference(sReference).adaptationLayer;
-		aFlexObjects = aFlexObjects
+		const aFilteredFlexObjects = aFlexObjects
 		.filter((oFlexObject) => !sAdaptationLayer || !LayerUtils.isOverLayer(oFlexObject.getLayer(), sAdaptationLayer))
 		.filter((oFlexObject) => (
 			!_mInstances[sReference].runtimePersistence.flexObjects
 			.some((oExistingFlexObject) => (oExistingFlexObject.getId() === oFlexObject.getId()))
 		));
 
-		if (aFlexObjects.length > 0 && _mInstances[sReference]) {
+		if (aFilteredFlexObjects.length > 0) {
 			_mInstances[sReference].runtimePersistence.flexObjects =
-				_mInstances[sReference].runtimePersistence.flexObjects.concat(aFlexObjects);
+				_mInstances[sReference].runtimePersistence.flexObjects.concat(aFilteredFlexObjects);
 			oFlexObjectsDataSelector.checkUpdate(
 				{ reference: sReference },
-				aFlexObjects.map(function(oFlexObject) {
+				aFilteredFlexObjects.map(function(oFlexObject) {
 					return { type: "addFlexObject", updatedObject: oFlexObject };
 				})
 			);
 		}
-	};
 
-	FlexState.removeDirtyFlexObject = function(sReference, oFlexObject) {
-		// FIXME: Currently called from the ChangePersistence which might be
-		// independent of FlexState in some test cases
-		// Once the ChangePersistence is no longer used
-		// make sure to remove the safeguard
-		if (_mInstances[sReference]) {
-			const aFlexObjects = _mInstances[sReference].runtimePersistence.flexObjects;
-			const iIndex = aFlexObjects.indexOf(oFlexObject);
-			if (iIndex >= 0) {
-				aFlexObjects.splice(iIndex, 1);
-				oFlexObjectsDataSelector.checkUpdate(
-					{ reference: sReference },
-					[{ type: "removeFlexObject", updatedObject: oFlexObject }]
-				);
-			}
-		}
+		return aFilteredFlexObjects;
 	};
 
 	FlexState.removeDirtyFlexObjects = function(sReference, aFlexObjects) {
+		const aRemovedFlexObjects = [];
 		// FIXME: Currently called from the ChangePersistence which might be
 		// independent of FlexState in some test cases
 		// Once the ChangePersistence is no longer used
 		// make sure to remove the safeguard
 		if (_mInstances[sReference] && aFlexObjects.length > 0) {
-			let bFlexObjectRemoved = false;
 			const aCurrentFlexObjects = _mInstances[sReference].runtimePersistence.flexObjects;
 			aFlexObjects.forEach(function(oFlexObject) {
 				const iIndex = aCurrentFlexObjects.indexOf(oFlexObject);
 				if (iIndex >= 0) {
-					bFlexObjectRemoved = true;
+					aRemovedFlexObjects.push(oFlexObject);
 					aCurrentFlexObjects.splice(iIndex, 1);
 				}
 			});
-			if (bFlexObjectRemoved) {
+			if (aRemovedFlexObjects.length > 0) {
 				oFlexObjectsDataSelector.checkUpdate(
 					{ reference: sReference },
 					aFlexObjects.map(function(oFlexObject) {
@@ -855,6 +810,7 @@ sap.ui.define([
 				);
 			}
 		}
+		return aRemovedFlexObjects;
 	};
 
 	FlexState.getComponentIdForReference = function(sReference) {

package/src/sap/ui/fl/apply/_internal/flexState/Loader.js

@@ -102,7 +102,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.Loader
 	 * @since 1.74
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal.flexState
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/ManifestUtils.js

@@ -78,7 +78,7 @@ function(
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.ManifestUtils
 	 * @since 1.74
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 * @private
 	 */
 	var ManifestUtils = {

package/src/sap/ui/fl/apply/_internal/flexState/UI2Personalization/UI2PersonalizationState.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.UI2Personalization.UI2PersonalizationState
 	 * @since 1.75
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/changes/DependencyHandler.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.changes.DependencyHandler
 	 * @since 1.74
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/changes/ExtensionPointState.js

@@ -12,11 +12,11 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/changes/Utils",
 	"sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory",
 	"sap/ui/fl/apply/_internal/flexObjects/States",
+	"sap/ui/fl/apply/_internal/flexState/changes/DependencyHandler",
 	"sap/ui/fl/apply/_internal/flexState/FlexObjectState",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerStorage",
-	"sap/ui/fl/ChangePersistenceFactory",
 	"sap/ui/fl/Utils"
 ], (
 	_omit,
@@ -26,11 +26,11 @@ sap.ui.define([
 	ChangesUtils,
 	FlexObjectFactory,
 	FlexObjectStates,
+	DependencyHandler,
 	FlexObjectState,
 	FlexState,
 	ManifestUtils,
 	ChangeHandlerStorage,
-	ChangePersistenceFactory,
 	Utils
 ) => {
 	"use strict";
@@ -41,7 +41,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.changes.ExtensionPointState
 	 * @since 1.79
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -167,7 +167,6 @@ sap.ui.define([
 	 */
 	ExtensionPointState.enhanceExtensionPointChanges = function(mPropertyBag, mExtensionPointInfo) {
 		mPropertyBag.extensionPointName = mExtensionPointInfo.name;
-		const oChangePersistence = ChangePersistenceFactory.getChangePersistenceForControl(mExtensionPointInfo.targetControl);
 		const sReference = ManifestUtils.getFlexReferenceForControl(mExtensionPointInfo.targetControl);
 
 		const aChanges = ExtensionPointState.getChangesForExtensionPoint(sReference, mPropertyBag);
@@ -183,7 +182,9 @@ sap.ui.define([
 				// If the component creation is async, the changesMap already created without changes on EP --> it need to be updated
 				// Otherwise, update the selector of changes is enough, change map will be created later correctly
 				if (FlexState.isInitialized(mPropertyBag)) {
-					oChangePersistence.addChangeAndUpdateDependencies(mPropertyBag.appComponent, oChange);
+					DependencyHandler.addChangeAndUpdateDependencies(
+						oChange, mPropertyBag.appComponent, FlexObjectState.getLiveDependencyMap(sReference)
+					);
 				}
 			} else if (isValidForRuntimeOnlyChanges(oChange, mExtensionPointInfo)) {
 				// Change is applied but we need to create additional runtime only changes
@@ -217,7 +218,10 @@ sap.ui.define([
 						oFlexObjectMetadata.moduleName = oChange.getFlexObjectMetadata().moduleName;
 						oRuntimeOnlyChange.setFlexObjectMetadata(oFlexObjectMetadata);
 						oRuntimeOnlyChange.setCreation(oChange.getCreation());
-						oChangePersistence.addChangeAndUpdateDependencies(mPropertyBag.appComponent, oRuntimeOnlyChange, oChange);
+						DependencyHandler.insertChange(oRuntimeOnlyChange, FlexObjectState.getLiveDependencyMap(sReference), oChange);
+						DependencyHandler.addChangeAndUpdateDependencies(
+							oRuntimeOnlyChange, mPropertyBag.appComponent, FlexObjectState.getLiveDependencyMap(sReference)
+						);
 						aPromises.push(oRuntimeOnlyChange);
 					})
 				);

package/src/sap/ui/fl/apply/_internal/flexState/changes/UIChangesState.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.flexState.changes.UIChangesState
 	 * @since 1.121
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantMerger.js

@@ -125,7 +125,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.compVariants.CompVariantMerger
 	 * @since 1.86
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -215,7 +215,7 @@ sap.ui.define([
 		 *
 		 * @function
 		 * @since 1.89
-		 * @version 1.128.0
+		 * @version 1.129.0
 		 * @private
 		 * @ui5-restricted sap.ui.fl
 		 *

package/src/sap/ui/fl/apply/_internal/flexState/compVariants/prepareCompVariantsMap.js

@@ -33,7 +33,7 @@ sap.ui.define([
 
 	function initialize(mMap, mAuthors, sPersistencyKey, aVariants, sSVMControlId) {
 		aVariants ||= [];
-		var mMapOfKey = getOrCreate(mMap, sPersistencyKey);
+		const mMapOfKey = getOrCreate(mMap, sPersistencyKey);
 		mMapOfKey.controlId = sSVMControlId;
 
 		// clear all non-persisted variants in case of a reinitialization
@@ -42,11 +42,15 @@ sap.ui.define([
 		});
 
 		mMapOfKey.nonPersistedVariants = aVariants.map(function(oVariant) {
-			var oVariantInstance = Object.assign({
-				id: oVariant.id,
-				persisted: false
-			}, oVariant);
-			oVariantInstance = CompVariantMerger.createVariant(sPersistencyKey, oVariantInstance, mAuthors);
+			const oVariantInstance = CompVariantMerger.createVariant(
+				sPersistencyKey,
+				{
+					id: oVariant.id,
+					persisted: false,
+					...oVariant
+				},
+				mAuthors
+			);
 			mMapOfKey.byId[oVariant.id] = oVariantInstance;
 			return oVariantInstance;
 		});
@@ -55,19 +59,16 @@ sap.ui.define([
 	}
 
 	function buildSectionMap(mCompSection, sSubSection, mCompVariants, mAuthors) {
-		var aFlexObjects = mCompSection[sSubSection].map(function(oCompVariantChangeDefinition) {
-			var oFlexObject;
-			if (sSubSection === "variants") {
-				oFlexObject = FlexObjectFactory.createCompVariant(oCompVariantChangeDefinition, mAuthors);
-			} else {
-				oFlexObject = FlexObjectFactory.createFromFileContent(oCompVariantChangeDefinition, UpdatableChange);
-			}
+		const aFlexObjects = mCompSection[sSubSection].map(function(oCompVariantChangeDefinition) {
+			const oFlexObject = sSubSection === "variants"
+				? FlexObjectFactory.createCompVariant(oCompVariantChangeDefinition, mAuthors)
+				: FlexObjectFactory.createFromFileContent(oCompVariantChangeDefinition, UpdatableChange);
 			oFlexObject.setState(States.LifecycleState.PERSISTED); // prevent persisting these anew
 			return oFlexObject;
 		});
 
 		aFlexObjects.forEach(function(oFlexObject) {
-			var sPersistencyKey = oFlexObject.getPersistencyKey
+			const sPersistencyKey = oFlexObject.getPersistencyKey
 				? oFlexObject.getPersistencyKey()
 				: oFlexObject.getSelector().persistencyKey;
 			getOrCreate(
@@ -99,7 +100,7 @@ sap.ui.define([
 	 * @returns {object} The prepared map for compVariants
 	 */
 	return function(mPropertyBag) {
-		var mCompVariants = {};
+		const mCompVariants = {};
 
 		// provide the function for fl-internal consumers reuse
 		mCompVariants._getOrCreate = getOrCreate.bind(undefined, mCompVariants);

package/src/sap/ui/fl/apply/_internal/flexState/controlVariants/Switcher.js

@@ -34,19 +34,17 @@ sap.ui.define([
 	 * @ui5-restricted
 	 */
 	function getControlChangesForVariantSwitch(mPropertyBag) {
-		var aCurrentVariantChanges = VariantManagementState.getControlChangesForVariant(
-			Object.assign(
-				_pick(mPropertyBag, ["vmReference", "variantsMap", "reference"]), {
-					vReference: mPropertyBag.currentVReference
-				}
-			)
+		const aCurrentVariantChanges = VariantManagementState.getControlChangesForVariant(
+			{
+				...(_pick(mPropertyBag, ["vmReference", "variantsMap", "reference"])),
+				vReference: mPropertyBag.currentVReference
+			}
 		);
 		var aNewChanges = VariantManagementState.getControlChangesForVariant(
-			Object.assign(
-				_pick(mPropertyBag, ["vmReference", "variantsMap", "reference"]), {
-					vReference: mPropertyBag.newVReference
-				}
-			)
+			{
+				...(_pick(mPropertyBag, ["vmReference", "variantsMap", "reference"])),
+				vReference: mPropertyBag.newVReference
+			}
 		);
 
 		var aRevertChanges = [];
@@ -77,7 +75,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.Switcher
 	 * @since 1.74
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.VariantManagementState
 	 * @since 1.74
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -60,6 +60,11 @@ sap.ui.define([
 		});
 
 		// Check if variant is set via url parameter
+		// Legacy URLs can have multiple variant technical parameter instances (length > 1)
+		if (aVariantReferencesFromUrl.length === 1) {
+			aVariantReferencesFromUrl = aVariantReferencesFromUrl[0].split(",");
+		}
+
 		var sDesiredSelectedVariantId = aVariantKeys.find((sVariantKey) => {
 			return aVariantReferencesFromUrl.includes(sVariantKey);
 		});
@@ -603,7 +608,7 @@ sap.ui.define([
 	 * @ui5-restricted
 	 */
 	VariantManagementState.getInitialUIChanges = function(mPropertyBag) {
-		var oVariantsMap = oVariantManagementMapDataSelector.get({
+		const oVariantsMap = oVariantManagementMapDataSelector.get({
 			reference: mPropertyBag.reference
 		});
 		mPropertyBag.includeDirtyChanges = !!mPropertyBag.includeDirtyChanges;
@@ -612,10 +617,11 @@ sap.ui.define([
 				(mPropertyBag.vmReference && mPropertyBag.vmReference === sVMReference)
 				|| !mPropertyBag.vmReference
 			) {
-				var mArguments = Object.assign({}, mPropertyBag, {
+				const mArguments = {
+					...mPropertyBag,
 					vmReference: sVMReference,
 					vReference: oVariantsMap[sVMReference].currentVariant
-				});
+				};
 
 				// Concatenate with the previous flex changes
 				return aInitialChanges.concat(VariantManagementState.getControlChangesForVariant(mArguments));
@@ -643,10 +649,11 @@ sap.ui.define([
 				(mPropertyBag.vmReference && mPropertyBag.vmReference === sVMReference)
 				|| !mPropertyBag.vmReference
 			) {
-				const mArguments = Object.assign({}, mPropertyBag, {
+				const mArguments = {
+					...mPropertyBag,
 					vmReference: sVMReference,
 					vReference: oVariantsMap[sVMReference].currentVariant
-				});
+				};
 				const oVariant = VariantManagementState.getVariant(mArguments);
 				return aInitialChanges
 				.concat(oVariant.variantChanges)

package/src/sap/ui/fl/apply/_internal/preprocessors/ControllerExtension.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 * @since 1.27.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.core

package/src/sap/ui/fl/apply/_internal/preprocessors/RegistrationDelegator.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 * @since 1.43.0
 	 * @private
 	 */

package/src/sap/ui/fl/apply/_internal/preprocessors/XmlPreprocessor.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 * @since 1.27.0
 	 * @private
 	 */