@openui5/sap.ui.fl 1.121.1 → 1.122.0

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddLibrary.js

@@ -48,7 +48,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.ui5.AddLibrary
 	 * @since 1.74
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddNewModel.js

@@ -95,7 +95,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.ui5.AddNewModel
 	 * @since 1.87
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddNewModelEnhanceWith.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.ui5.AddNewModelEnhanceWith
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/SetFlexExtensionPointEnabled.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.ui5.SetFlexExtensionPointEnabled
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/SetMinUI5Version.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 *
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.ui5.SetMinUI5Version
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/connectors/ObjectStorageUtils.js

@@ -12,7 +12,7 @@ sap.ui.define([], function() {
 	 *
 	 * @namespace sap.ui.fl.initial._internal.connectors.Utils
 	 * @since 1.70
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal, sap.ui.fl.write._internal
 	 */

package/src/sap/ui/fl/apply/_internal/extensionPoint/Processor.js

@@ -6,26 +6,25 @@
 
 // Provides object sap.ui.fl.apply._internal.extensionPoint.Processor
 sap.ui.define([
+	"sap/base/util/merge",
+	"sap/ui/base/DesignTime",
+	"sap/ui/base/SyncPromise",
+	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/fl/apply/_internal/changes/Applier",
 	"sap/ui/fl/apply/_internal/extensionPoint/Registry",
-	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"sap/ui/fl/apply/_internal/flexState/changes/ExtensionPointState",
-	"sap/ui/fl/Utils",
-	"sap/ui/core/util/reflection/JsControlTreeModifier",
-	"sap/ui/base/SyncPromise",
-	"sap/base/util/merge",
-	"sap/ui/base/DesignTime"
-],
-function(
+	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
+	"sap/ui/fl/Utils"
+], function(
+	merge,
+	DesignTime,
+	SyncPromise,
+	JsControlTreeModifier,
 	Applier,
 	ExtensionPointRegistry,
-	FlexState,
 	ExtensionPointState,
-	Utils,
-	JsControlTreeModifier,
-	SyncPromise,
-	merge,
-	DesignTime
+	ManifestUtils,
+	Utils
 ) {
 	"use strict";
 
@@ -37,7 +36,7 @@ function(
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 */
 	var Processor;
 
@@ -109,10 +108,10 @@ function(
 		mPropertyBag.modifier = JsControlTreeModifier;
 		mPropertyBag.viewId = oExtensionPoint.view.getId();
 		mPropertyBag.componentId = oAppComponent.getId();
+		mPropertyBag.reference = ManifestUtils.getFlexReferenceForControl(oAppComponent);
 
 		return Processor.registerExtensionPoint(mExtensionPointInfo)
-		.then(FlexState.initialize.bind(FlexState, mPropertyBag))
-		// enhance exiting extension point changes with mExtensionPointInfo
+		// enhance existing extension point changes with mExtensionPointInfo
 		.then(ExtensionPointState.enhanceExtensionPointChanges.bind(ExtensionPointState, mPropertyBag, oExtensionPoint))
 		.then(Processor.createDefaultContent.bind(this, oExtensionPoint, bSkipInsertContent, applyExtensionPoint))
 		.then(Processor.addDefaultContentToExtensionPointInfo.bind(this, mExtensionPointInfo, bSkipInsertContent));

package/src/sap/ui/fl/apply/_internal/extensionPoint/Registry.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.apply._internal.extensionPoint.Registry
 	 *
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

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

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.AppDescriptorChange
 	 * @since 1.105
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.Variant
 	 * @alias sap.ui.fl.apply._internal.flexObjects.CompVariant
 	 * @since 1.103
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.comp
 	 */

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.ControllerExtensionChange
 	 * @since 1.105
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.Variant
 	 * @alias sap.ui.fl.apply._internal.flexObjects.FlVariant
 	 * @since 1.104
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -69,7 +69,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @since 1.100
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -97,7 +97,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexObjects.FlexObjectFactory
 	 * @since 1.100
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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.121.1
+	 * @version 1.122.0
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -17,7 +17,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.121.1
+	 * @version 1.122.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 *
 	 * @function
 	 * @since 1.121
-	 * @version 1.121.1
+	 * @version 1.122.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/FlexState.js

@@ -20,6 +20,7 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/Loader",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/initial/_internal/FlexInfoSession",
+	"sap/ui/fl/initial/_internal/StorageUtils",
 	"sap/ui/fl/LayerUtils",
 	"sap/ui/fl/requireAsync"
 ], function(
@@ -38,6 +39,7 @@ sap.ui.define([
 	Loader,
 	ManifestUtils,
 	FlexInfoSession,
+	StorageUtils,
 	LayerUtils,
 	requireAsync
 ) {
@@ -76,6 +78,7 @@ sap.ui.define([
 	 * 				liveDependencyMap: {...}
 	 * 			}
 	 * 		}
+	 * 		emptyState: <boolean>,
 	 *		partialFlexState: <boolean>,
 	 *		componentId: "<componentId>",
 	 *		componentData: {...}
@@ -83,7 +86,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.FlexState
 	 * @since 1.73
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
@@ -205,7 +208,7 @@ sap.ui.define([
 
 	function getInstanceEntryOrThrowError(sReference, sMapName) {
 		if (!_mInstances[sReference]) {
-			throw new Error("State is not yet initialized");
+			initializeEmptyState(sReference);
 		}
 
 		if (!_mInstances[sReference].preparedMaps[sMapName]) {
@@ -306,7 +309,7 @@ sap.ui.define([
 	function initializeNewInstance(mPropertyBag) {
 		var sReference = mPropertyBag.reference;
 		var bDataUpdated = false;
-		if (!_mInstances[sReference].componentData) {
+		if (!_mInstances[sReference].componentData && mPropertyBag.componentId) {
 			var oComponent = Component.getComponentById(mPropertyBag.componentId);
 			_mInstances[sReference].componentData = oComponent ? oComponent.getComponentData() : mPropertyBag.componentData;
 			bDataUpdated = true;
@@ -356,8 +359,6 @@ sap.ui.define([
 		_mInitPromises[mPropertyBag.reference] = Loader.loadFlexData(mPropertyBag)
 		.then(async (mResponse) => {
 			mResponse.authors = await Loader.loadVariantsAuthors(mPropertyBag.reference);
-			return mResponse;
-		}).then((mResponse) => {
 			// The following line is used by the Flex Support Tool to set breakpoints - please adjust the tool if you change it!
 			_mInstances[mPropertyBag.reference] = merge({}, {
 				unfilteredStorageResponse: mResponse,
@@ -394,7 +395,6 @@ sap.ui.define([
 			mInitProperties.partialFlexData = merge({}, oFlexInstance.unfilteredStorageResponse.changes);
 			mInitProperties.reInitialize = true;
 		}
-		return mInitProperties;
 	}
 
 	function checkComponentId(mInitProperties) {
@@ -403,7 +403,6 @@ sap.ui.define([
 		if (!mInitProperties.reInitialize && sFlexInstanceComponentId !== mInitProperties.componentId) {
 			mInitProperties.reInitialize = true;
 		}
-		return mInitProperties;
 	}
 
 	// TODO: get rid of the following module dependencies as soon as the change state
@@ -417,9 +416,25 @@ sap.ui.define([
 		});
 	}
 
-	// TODO: the additional safeguard for the runtimePersistence will not be necessary after the FlexState.initialize rework
+	function initializeEmptyState(sReference) {
+		_mInstances[sReference] = {
+			unfilteredStorageResponse: { changes: StorageUtils.getEmptyFlexDataResponse() },
+			storageResponse: { changes: StorageUtils.getEmptyFlexDataResponse() },
+			preparedMaps: {},
+			emptyState: true,
+			// this makes sure that a proper initialize will still work as expected
+			reInitialize: true,
+			componentId: ""
+		};
+		_mInitPromises[sReference] = Promise.resolve();
+		initializeNewInstance({ reference: sReference });
+	}
+
 	FlexState.getRuntimeOnlyData = function(sReference) {
-		return _mInstances[sReference]?.runtimePersistence?.runtimeOnlyData || {};
+		if (!_mInstances[sReference]) {
+			initializeEmptyState(sReference);
+		}
+		return _mInstances[sReference].runtimePersistence.runtimeOnlyData;
 	};
 
 	/**
@@ -438,30 +453,24 @@ sap.ui.define([
 	 * @param {boolean} [mPropertyBag.partialFlexState=false] - if true state is initialized partially and does not include flex bundles
 	 * @returns {Promise<undefined>} Resolves a promise as soon as FlexState is initialized
 	 */
-	FlexState.initialize = function(mPropertyBag) {
-		return Promise.all([
-			lazyLoadModules()
-		])
-		.then(function() {
-			enhancePropertyBag(mPropertyBag);
-			var sFlexReference = mPropertyBag.reference;
-
-			if (_mInitPromises[sFlexReference]) {
-				return _mInitPromises[sFlexReference]
-				.then(checkPartialFlexState.bind(null, mPropertyBag))
-				.then(checkComponentId)
-				.then(function(mEvaluatedProperties) {
-					return mEvaluatedProperties.reInitialize
-						? loadFlexData(mEvaluatedProperties)
-						: _mInstances[sFlexReference].unfilteredStorageResponse;
-				});
+	FlexState.initialize = async function(mPropertyBag) {
+		await lazyLoadModules();
+		const mProperties = merge({}, mPropertyBag);
+		enhancePropertyBag(mProperties);
+		var sFlexReference = mProperties.reference;
+
+		if (_mInitPromises[sFlexReference]) {
+			await _mInitPromises[sFlexReference];
+			checkPartialFlexState(mProperties);
+			checkComponentId(mProperties);
+			if (mProperties.reInitialize) {
+				await loadFlexData(mProperties);
 			}
+		} else {
+			await loadFlexData(mProperties);
+		}
 
-			return loadFlexData(mPropertyBag);
-		})
-		.then(function(mPropertyBag) {
-			initializeNewInstance(mPropertyBag);
-		}.bind(null, mPropertyBag));
+		initializeNewInstance(mProperties);
 	};
 
 	/**
@@ -507,7 +516,7 @@ sap.ui.define([
 	 * @param {string} [mPropertyBag.adaptationId] - Context-based adaptation for which the state should be updated
 	 * @returns {Promise<undefined>} Resolves when the data is loaded and the runtime persistence is updated
 	 */
-	FlexState.update = function(mPropertyBag) {
+	FlexState.update = async function(mPropertyBag) {
 		enhancePropertyBag(mPropertyBag);
 		var sReference = mPropertyBag.reference;
 		var oCurrentRuntimePersistence = _mInstances[sReference].runtimePersistence;
@@ -521,19 +530,17 @@ sap.ui.define([
 			_oChangePersistenceFactory._instanceCache[sReference].removeDirtyChanges();
 		}
 
-		return (_mInitPromises[sReference] || Promise.resolve())
-		.then(loadFlexData.bind(this, mPropertyBag))
-		.then(function() {
-			_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mInstances[sReference].unfilteredStorageResponse);
-			var bUpdated = updateRuntimePersistence(
-				sReference,
-				_mInstances[sReference].storageResponse,
-				oCurrentRuntimePersistence
-			);
-			if (bUpdated) {
-				oFlexObjectsDataSelector.checkUpdate({ reference: sReference });
-			}
-		});
+		await _mInitPromises[sReference];
+		await loadFlexData(mPropertyBag);
+		_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mInstances[sReference].unfilteredStorageResponse);
+		var bUpdated = updateRuntimePersistence(
+			sReference,
+			_mInstances[sReference].storageResponse,
+			oCurrentRuntimePersistence
+		);
+		if (bUpdated) {
+			oFlexObjectsDataSelector.checkUpdate({ reference: sReference });
+		}
 	};
 
 	function getChangeCategory(oChangeDefinition) {
@@ -619,9 +626,6 @@ sap.ui.define([
 
 	FlexState.clearState = function(sReference) {
 		if (sReference) {
-			delete _mInstances[sReference];
-			delete _mInitPromises[sReference];
-			oFlexObjectsDataSelector.clearCachedResult({ reference: sReference });
 			// TODO: get rid of the following deletes as soon as the change state
 			// is migrated from changePersistenceFactory to the FlexState
 			if (
@@ -630,6 +634,9 @@ sap.ui.define([
 			) {
 				_oChangePersistenceFactory._instanceCache[sReference].removeDirtyChanges();
 			}
+			delete _mInstances[sReference];
+			delete _mInitPromises[sReference];
+			oFlexObjectsDataSelector.clearCachedResult({ reference: sReference });
 		} else {
 			_mInstances = {};
 			_mInitPromises = {};
@@ -715,6 +722,9 @@ sap.ui.define([
 	 * @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);
@@ -738,6 +748,9 @@ sap.ui.define([
 	 * @param {array.<sap.ui.fl.apply._internal.flexObjects.FlexObject>} aFlexObjects - Flexibility objects
 	 */
 	FlexState.addDirtyFlexObjects = function(sReference, aFlexObjects) {
+		if (!_mInstances[sReference]) {
+			initializeEmptyState(sReference);
+		}
 		const sAdaptationLayer = FlexInfoSession.getByReference(sReference)?.adaptationLayer;
 		aFlexObjects = !sAdaptationLayer ? aFlexObjects : aFlexObjects
 		.filter((oFlexObject) => !LayerUtils.isOverLayer(oFlexObject.getLayer(), sAdaptationLayer));

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.121.1
+	 * @version 1.122.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.121.1
+	 * @version 1.122.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.121.1
+	 * @version 1.122.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.121.1
+	 * @version 1.122.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -39,7 +39,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.changes.ExtensionPointState
 	 * @since 1.79
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -49,7 +49,7 @@ sap.ui.define([
 		if (oChange.getSelector().name !== mPropertyBag.extensionPointName) {
 			return false;
 		}
-		return ChangesUtils.filterChangeByView(mPropertyBag, oChange);
+		return ChangesUtils.isChangeInView(mPropertyBag, oChange);
 	}
 
 	function isValidForRuntimeOnlyChanges(oChange, mExtensionPointInfo) {

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

@@ -5,7 +5,6 @@
  */
 
 sap.ui.define([
-	"sap/base/util/includes",
 	"sap/base/util/merge",
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/fl/apply/_internal/changes/Utils",
@@ -15,7 +14,6 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils"
 ], (
-	includes,
 	merge,
 	JsControlTreeModifier,
 	Utils,
@@ -36,7 +34,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.flexState.changes.UIChangesState
 	 * @since 1.121
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -57,7 +55,7 @@ sap.ui.define([
 				const sControlId = JsControlTreeModifier.getControlIdBySelector(oDependentControlSelector, oAppComponent);
 				aNewValidControlDependencies.push(oDependentControlSelector);
 				oDependencyMap.mControlsWithDependencies[sControlId] ||= [];
-				if (!includes(oDependencyMap.mControlsWithDependencies[sControlId], oChange.getId())) {
+				if (!oDependencyMap.mControlsWithDependencies[sControlId].includes(oChange.getId())) {
 					oDependencyMap.mControlsWithDependencies[sControlId].push(oChange.getId());
 				}
 			}
@@ -90,7 +88,7 @@ sap.ui.define([
 		parentDataSelector: oAllUIChangesDataSelector,
 		executeFunction(aFlexObjects) {
 			return aFlexObjects.filter((oFlexObject) => {
-				return !oFlexObject.getVariantReference();
+				return !oFlexObject.getVariantReference() && !oFlexObject.getSelector().persistencyKey;
 			});
 		},
 		checkInvalidation(mParameters, oUpdateInfo) {
@@ -143,6 +141,21 @@ sap.ui.define([
 		return oCombinedDepMap;
 	};
 
+	/**
+	 * Fetches all UIChanges that can be applied. This includes the UIChanges of any current FlVariant.
+	 * This excludes update changes for CompVariants
+	 *
+	 * @param {string} sReference - Flex Reference
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.UIChange[]} Returns all applicable UIChanges
+	 */
+	UIChangesState.getAllApplicableUIChanges = function(sReference) {
+		const aVMIndependentUIChanges = oVMIndependentUIChangesDataSelector.get({reference: sReference});
+		return aVMIndependentUIChanges.concat(VariantManagementState.getInitialChanges({
+			reference: sReference,
+			includeDirtyChanges: true
+		}));
+	};
+
 	/**
 	 * Fetches the current dependency map from the Flex State.
 	 * This map is continuously being modified as changes are getting applied.
@@ -181,6 +194,23 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * Checks the current dependencies map for any open (unresolved) dependencies belonging to the given control
+	 * and returns the open dependent changes.
+	 *
+	 * @param {object} oSelector - Selector of the control
+	 * @param {sap.ui.core.UIComponent} oAppComponent - Application component instance that is currently loading
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} Array of all open dependent changes for the control
+	 */
+	UIChangesState.getOpenDependentChangesForControl = function(oSelector, oAppComponent) {
+		const sReference = ManifestUtils.getFlexReferenceForControl(oAppComponent);
+		return DependencyHandler.getOpenDependentChangesForControl(
+			UIChangesState.getLiveDependencyMap(sReference),
+			JsControlTreeModifier.getControlIdBySelector(oSelector, oAppComponent),
+			oAppComponent
+		);
+	};
+
 	/**
 	 * Returns all UI Changes.
 	 *

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

@@ -123,7 +123,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.compVariants.CompVariantMerger
 	 * @since 1.86
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -208,7 +208,7 @@ sap.ui.define([
 		 *
 		 * @function
 		 * @since 1.89
-		 * @version 1.121.1
+		 * @version 1.122.0
 		 * @private
 		 * @ui5-restricted sap.ui.fl
 		 *

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

@@ -29,7 +29,7 @@ sap.ui.define([], function() {
 	*/
 	Utils.getDefaultVariantId = (mCompVariantsMap) => {
 		const aDefaultVariantChanges = mCompVariantsMap.defaultVariants;
-		const oChange = aDefaultVariantChanges.toReversed().find((oChange) => {
+		const oChange = [...aDefaultVariantChanges].reverse().find((oChange) => {
 			return mCompVariantsMap.variants.some((oVariant) => {
 				return oChange?.getContent().defaultVariantName === oVariant.getId();
 			});