@openui5/sap.ui.fl 1.124.0 → 1.125.0

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.124.0
+	 * @version 1.125.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.124.0
+	 * @version 1.125.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.124.0
+	 * @version 1.125.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.124.0
+	 * @version 1.125.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.124.0
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted
 	 */

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.124.0
+	 * @version 1.125.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.124.0
+	 * @version 1.125.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

@@ -0,0 +1,249 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	"sap/base/util/merge",
+	"sap/base/util/restricted/_omit",
+	"sap/ui/core/util/reflection/JsControlTreeModifier",
+	"sap/ui/core/Element",
+	"sap/ui/fl/apply/_internal/changes/Utils",
+	"sap/ui/fl/apply/_internal/flexState/changes/DependencyHandler",
+	"sap/ui/fl/apply/_internal/flexState/changes/UIChangesState",
+	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState",
+	"sap/ui/fl/apply/_internal/flexState/FlexState",
+	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
+	"sap/ui/fl/Utils"
+], function(
+	merge,
+	_omit,
+	JsControlTreeModifier,
+	Element,
+	ChangesUtils,
+	DependencyHandler,
+	UIChangesState,
+	VariantManagementState,
+	FlexState,
+	ManifestUtils,
+	Utils
+) {
+	"use strict";
+
+	/**
+	 * @namespace
+	 * @alias sap.ui.fl.apply._internal.flexState.FlexObjectState
+	 * @since 1.83
+	 * @version 1.125.0
+	 * @private
+	 * @ui5-restricted sap.ui.fl
+	 */
+	const FlexObjectState = {};
+
+	function getCompleteDependency(oChange, sReference) {
+		const mInitialDependencies = FlexObjectState.getCompleteDependencyMap(sReference).mDependencies;
+		return mInitialDependencies[oChange.getId()] && Object.assign({}, mInitialDependencies[oChange.getId()]);
+	}
+
+	function copyDependencies(oInitialDependency, aNewValidDependencies, oAppComponent, oChange, sReference) {
+		const aNewValidControlDependencies = [];
+		const oDependencyMap = FlexObjectState.getLiveDependencyMap(sReference);
+		const oModifiedDependency = Object.assign({}, 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)) {
+				const sControlId = JsControlTreeModifier.getControlIdBySelector(oDependentControlSelector, oAppComponent);
+				aNewValidControlDependencies.push(oDependentControlSelector);
+				oDependencyMap.mControlsWithDependencies[sControlId] ||= [];
+				if (!oDependencyMap.mControlsWithDependencies[sControlId].includes(oChange.getId())) {
+					oDependencyMap.mControlsWithDependencies[sControlId].push(oChange.getId());
+				}
+			}
+		});
+
+		oModifiedDependency.dependencies = aNewValidDependencies;
+		oModifiedDependency.controlsDependencies = aNewValidControlDependencies;
+		if (aNewValidDependencies.length || aNewValidControlDependencies.length) {
+			oDependencyMap.mDependencies[oChange.getId()] = oModifiedDependency;
+		}
+		return oModifiedDependency;
+	}
+
+	function areControlsAvailable(oChange, oAppComponent) {
+		// is control available
+		const aSelectors = oChange.getDependentControlSelectorList();
+		aSelectors.push(oChange.getSelector());
+		return !aSelectors.some((oSelector) => !JsControlTreeModifier.bySelector(oSelector, oAppComponent));
+	}
+
+	function checkDependencies(oChange, mDependencies, mChanges, oAppComponent, aRelevantChanges) {
+		let bResult = areControlsAvailable(oChange, oAppComponent);
+		if (!bResult) {
+			return [];
+		}
+		aRelevantChanges.push(oChange);
+		const sDependencyKey = oChange.getId();
+		const aDependentChanges = mDependencies[sDependencyKey] && mDependencies[sDependencyKey].dependencies || [];
+		for (let i = 0, n = aDependentChanges.length; i < n; i++) {
+			const oDependentChange = Utils.getChangeFromChangesMap(mChanges, aDependentChanges[i]);
+			bResult = checkDependencies(oDependentChange, mDependencies, mChanges, oAppComponent, aRelevantChanges);
+			if (bResult.length === 0) {
+				aRelevantChanges = [];
+				break;
+			}
+			delete mDependencies[sDependencyKey];
+		}
+		return aRelevantChanges;
+	}
+
+	/**
+	 * 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
+	 */
+	FlexObjectState.getAllApplicableUIChanges = function(sReference) {
+		const aVMIndependentUIChanges = UIChangesState.getVariantIndependentUIChanges(sReference);
+		return aVMIndependentUIChanges.concat(VariantManagementState.getInitialUIChanges({
+			reference: sReference
+		}));
+	};
+
+	/**
+	 * Fetches the complete dependency map based on all current UIChanges.
+	 *
+	 * @param {string} sReference - Flex reference
+	 * @returns {object} Dependency Map
+	 */
+	FlexObjectState.getCompleteDependencyMap = function(sReference) {
+		const oVMIndependentUIChangesDepMap = UIChangesState.getVMIndependentCompleteDependencyMap(sReference);
+		const oVMDependentUIChangesDepMap = VariantManagementState.getDependencyMap(sReference);
+		const oCombinedDepMap = merge({}, oVMIndependentUIChangesDepMap);
+
+		merge(oCombinedDepMap.mDependencies, oVMDependentUIChangesDepMap.mDependencies);
+		merge(oCombinedDepMap.mDependentChangesOnMe, oVMDependentUIChangesDepMap.mDependentChangesOnMe);
+		oCombinedDepMap.aChanges = oCombinedDepMap.aChanges.concat(oVMDependentUIChangesDepMap.aChanges);
+
+		["mChanges", "mControlsWithDependencies"].forEach((sKey) => {
+			Object.entries(oVMDependentUIChangesDepMap[sKey]).forEach(([sControlId, aChanges]) => {
+				if (Object.keys(oCombinedDepMap[sKey]).includes(sControlId)) {
+					oCombinedDepMap[sKey][sControlId] = oCombinedDepMap[sKey][sControlId].concat(aChanges);
+				} else {
+					oCombinedDepMap[sKey][sControlId] = aChanges;
+				}
+			});
+		});
+
+		return oCombinedDepMap;
+	};
+
+	/**
+	 * Fetches the current dependency map from the Flex State.
+	 * This map is continuously being modified as changes are getting applied.
+	 * If the Flex State is not initialized, return an empty map.
+	 * For now, this map can be mutated by the consumer
+	 *
+	 * @param {string} sReference - Flex reference
+	 * @returns {object} Dependency Map
+	 */
+	FlexObjectState.getLiveDependencyMap = function(sReference) {
+		return FlexState.getRuntimeOnlyData(sReference).liveDependencyMap || DependencyHandler.createEmptyDependencyMap();
+	};
+
+	/**
+	 * 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
+	 */
+	FlexObjectState.getOpenDependentChangesForControl = function(oSelector, oAppComponent) {
+		const sReference = ManifestUtils.getFlexReferenceForControl(oAppComponent);
+		return DependencyHandler.getOpenDependentChangesForControl(
+			FlexObjectState.getLiveDependencyMap(sReference),
+			JsControlTreeModifier.getControlIdBySelector(oSelector, oAppComponent),
+			oAppComponent
+		);
+	};
+
+	/**
+	 * Copies the complete dependencies for the given change to the live dependency map.
+	 * Also checks if the dependency is still valid in a callback
+	 * This function is used in the case that controls got destroyed and recreated
+	 *
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange - The change whose dependencies should be copied
+	 * @param {sap.ui.core.Component} oAppComponent - Application component instance
+	 */
+	FlexObjectState.copyDependenciesFromCompleteDependencyMap = function(oChange, oAppComponent) {
+		const sReference = ManifestUtils.getFlexReferenceForControl(oAppComponent);
+		let oCompleteDependency = getCompleteDependency(oChange, sReference);
+		if (oCompleteDependency) {
+			const oLiveDependencyMap = FlexObjectState.getLiveDependencyMap(sReference);
+			const aNewValidDependencies = [];
+			oCompleteDependency.dependencies.forEach(function(sChangeId) {
+				if (ChangesUtils.checkIfDependencyIsStillValid(oAppComponent, JsControlTreeModifier, oLiveDependencyMap, sChangeId)) {
+					oLiveDependencyMap.mDependentChangesOnMe[sChangeId] ||= [];
+					oLiveDependencyMap.mDependentChangesOnMe[sChangeId].push(oChange.getId());
+					aNewValidDependencies.push(sChangeId);
+				}
+			});
+			oCompleteDependency = copyDependencies(oCompleteDependency, aNewValidDependencies, oAppComponent, oChange, sReference);
+		}
+	};
+
+	/**
+	 * Waits for all the changes for all controls that are passed to be processed and a variant switch to be done.
+	 *
+	 * @param {object[]} aSelectorInformation - An array containing an object with {@link sap.ui.fl.Selector} and further configuration
+	 * @param {sap.ui.fl.Selector} aSelectorInformation.selector - A {@link sap.ui.fl.Selector}
+	 * @param {string[]} [aSelectorInformation.changeTypes] - An array containing the change types that will be considered. If empty no filtering will be done
+	 * @returns {Promise} Resolves when a variant switch is done and all changes on controls have been processed
+	 */
+	FlexObjectState.waitForFlexObjectsToBeApplied = async function(aSelectorInformation) {
+		const oAppComponent = Utils.getAppComponentForSelector(aSelectorInformation[0].selector);
+		if (!oAppComponent) {
+			return;
+		}
+		const sFlexReference = ManifestUtils.getFlexReferenceForControl(oAppComponent);
+
+		await VariantManagementState.getVariantSwitchPromise(sFlexReference);
+		await Promise.all(aSelectorInformation.map((oSelector) => {
+			const oControl = oSelector.selector.id && Element.getElementById(oSelector.selector.id) || oSelector.selector;
+
+			oSelector.changeTypes ||= [];
+			const mChangesMap = FlexObjectState.getLiveDependencyMap(sFlexReference);
+			let aPromises = [];
+			const mDependencies = Object.assign({}, mChangesMap.mDependencies);
+			const {mChanges} = mChangesMap;
+			const aChangesForControl = mChanges[oControl.getId()] || [];
+
+			// filter out already applied changes and, if given, filter by change type
+			const aNotYetProcessedChanges = aChangesForControl.filter((oChange) => {
+				return !oChange.isCurrentProcessFinished()
+				&& (oSelector.changeTypes.length === 0 || oSelector.changeTypes.includes(oChange.getChangeType()));
+			});
+
+			const aRelevantChanges = [];
+			aNotYetProcessedChanges.forEach((oChange) => {
+				const aChanges = checkDependencies(oChange, mDependencies, mChangesMap.mChanges, oAppComponent, []);
+				aChanges.forEach((oDependentChange) => {
+					if (aRelevantChanges.indexOf(oDependentChange) === -1) {
+						aRelevantChanges.push(oDependentChange);
+					}
+				});
+			});
+
+			// attach promises to the relevant Changes and wait for them to be applied
+			aRelevantChanges.forEach((oChange) => {
+				aPromises = aPromises.concat(oChange.addChangeProcessingPromises());
+			});
+
+			return Promise.all(aPromises);
+		}));
+	};
+
+	return FlexObjectState;
+});

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

@@ -88,7 +88,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.FlexState
 	 * @since 1.73
-	 * @version 1.124.0
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
@@ -164,11 +164,9 @@ sap.ui.define([
 		mPropertyBag.manifest ||= mPropertyBag.rawManifest || (oComponent && oComponent.getManifestObject()) || {};
 		mPropertyBag.reference ||= ManifestUtils.getFlexReference(mPropertyBag);
 		const oFlexInfoSession = FlexInfoSession.getByReference(mPropertyBag.reference);
-		if (oFlexInfoSession.reloadFlexData) {
-			mPropertyBag.version ||= oFlexInfoSession.version;
-			mPropertyBag.adaptationId ||= oFlexInfoSession.displayedAdaptationId;
-			mPropertyBag.allContextsProvided ||= oFlexInfoSession.allContextsProvided;
-		}
+		mPropertyBag.version ||= oFlexInfoSession.version;
+		mPropertyBag.adaptationId ||= oFlexInfoSession.displayedAdaptationId;
+		mPropertyBag.allContextsProvided ||= oFlexInfoSession.allContextsProvided;
 	}
 
 	function createFlexObjects(oStorageResponse) {
@@ -403,7 +401,6 @@ sap.ui.define([
 		if (oResponse.info !== undefined) {
 			oFlexInfoSession = Object.assign(oFlexInfoSession, oResponse.info);
 		}
-		oFlexInfoSession.reloadFlexData = false;
 		FlexInfoSession.setByReference(oFlexInfoSession, sReference);
 	}
 
@@ -577,9 +574,10 @@ sap.ui.define([
 			_oChangePersistenceFactory._instanceCache[sReference].removeDirtyChanges();
 		}
 
-		await _mInitPromises[sReference].promise;
+		const oOldInitPromise = _mInitPromises[sReference].promise;
 		const oNewInitPromise = new Deferred();
 		_mInitPromises[sReference] = oNewInitPromise;
+		await oOldInitPromise;
 		await loadFlexData(mPropertyBag);
 		_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mInstances[sReference].unfilteredStorageResponse);
 		_mInstances[sReference].maxLayer = FlexInfoSession.getByReference(sReference).maxLayer;

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.124.0
+	 * @version 1.125.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.124.0
+	 * @version 1.125.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.124.0
+	 * @version 1.125.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.124.0
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -12,7 +12,7 @@ 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/UIChangesState",
+	"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",
@@ -26,7 +26,7 @@ sap.ui.define([
 	ChangesUtils,
 	FlexObjectFactory,
 	FlexObjectStates,
-	UIChangesState,
+	FlexObjectState,
 	FlexState,
 	ManifestUtils,
 	ChangeHandlerStorage,
@@ -41,7 +41,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.changes.ExtensionPointState
 	 * @since 1.79
-	 * @version 1.124.0
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -142,7 +142,7 @@ sap.ui.define([
 			Log.error("Missing name from extension point info!");
 			return [];
 		}
-		const aFlexObjects = UIChangesState.getAllApplicableUIChanges(sReference);
+		const aFlexObjects = FlexObjectState.getAllApplicableUIChanges(sReference);
 		return aFlexObjects.filter((oFlexObject) => {
 			if (oFlexObject.getSelector().name !== mPropertyBag.extensionPointName) {
 				return false;

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

@@ -5,23 +5,13 @@
  */
 
 sap.ui.define([
-	"sap/base/util/merge",
-	"sap/ui/core/util/reflection/JsControlTreeModifier",
-	"sap/ui/fl/apply/_internal/changes/Utils",
 	"sap/ui/fl/apply/_internal/flexState/changes/DependencyHandler",
-	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState",
 	"sap/ui/fl/apply/_internal/flexState/DataSelector",
-	"sap/ui/fl/apply/_internal/flexState/FlexState",
-	"sap/ui/fl/apply/_internal/flexState/ManifestUtils"
+	"sap/ui/fl/apply/_internal/flexState/FlexState"
 ], (
-	merge,
-	JsControlTreeModifier,
-	Utils,
 	DependencyHandler,
-	VariantManagementState,
 	DataSelector,
-	FlexState,
-	ManifestUtils
+	FlexState
 ) => {
 	"use strict";
 
@@ -34,41 +24,12 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.flexState.changes.UIChangesState
 	 * @since 1.121
-	 * @version 1.124.0
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted
 	 */
 	const UIChangesState = {};
 
-	function getCompleteDependency(oChange, sReference) {
-		const mInitialDependencies = UIChangesState.getCompleteDependencyMap(sReference).mDependencies;
-		return mInitialDependencies[oChange.getId()] && Object.assign({}, mInitialDependencies[oChange.getId()]);
-	}
-
-	function copyDependencies(oInitialDependency, aNewValidDependencies, oAppComponent, oChange, sReference) {
-		const aNewValidControlDependencies = [];
-		const oDependencyMap = UIChangesState.getLiveDependencyMap(sReference);
-		const oModifiedDependency = Object.assign({}, oInitialDependency);
-		oInitialDependency.controlsDependencies.forEach(function(oDependentControlSelector) {
-			// if the control is already available we don't need to add a dependency to it
-			if (!JsControlTreeModifier.bySelector(oDependentControlSelector, oAppComponent)) {
-				const sControlId = JsControlTreeModifier.getControlIdBySelector(oDependentControlSelector, oAppComponent);
-				aNewValidControlDependencies.push(oDependentControlSelector);
-				oDependencyMap.mControlsWithDependencies[sControlId] ||= [];
-				if (!oDependencyMap.mControlsWithDependencies[sControlId].includes(oChange.getId())) {
-					oDependencyMap.mControlsWithDependencies[sControlId].push(oChange.getId());
-				}
-			}
-		});
-
-		oModifiedDependency.dependencies = aNewValidDependencies;
-		oModifiedDependency.controlsDependencies = aNewValidControlDependencies;
-		if (aNewValidDependencies.length || aNewValidControlDependencies.length) {
-			oDependencyMap.mDependencies[oChange.getId()] = oModifiedDependency;
-		}
-		return oModifiedDependency;
-	}
-
 	const oAllUIChangesDataSelector = new DataSelector({
 		id: "allUIChanges",
 		parentDataSelector: FlexState.getFlexObjectsDataSelector(),
@@ -118,46 +79,8 @@ sap.ui.define([
 		}
 	});
 
-	/**
-	 * Fetches the complete dependency map based on all current UIChanges.
-	 *
-	 * @param {string} sReference - Flex reference
-	 * @returns {object} Dependency Map
-	 */
-	UIChangesState.getCompleteDependencyMap = function(sReference) {
-		const oVMIndependentUIChangesDepMap = oVMIndependentCompleteDependencyMapDataSelector.get({reference: sReference});
-		const oVMDependentUIChangesDepMap = VariantManagementState.getDependencyMap(sReference);
-		const oCombinedDepMap = merge({}, oVMIndependentUIChangesDepMap);
-
-		merge(oCombinedDepMap.mDependencies, oVMDependentUIChangesDepMap.mDependencies);
-		merge(oCombinedDepMap.mDependentChangesOnMe, oVMDependentUIChangesDepMap.mDependentChangesOnMe);
-		oCombinedDepMap.aChanges = oCombinedDepMap.aChanges.concat(oVMDependentUIChangesDepMap.aChanges);
-
-		["mChanges", "mControlsWithDependencies"].forEach((sKey) => {
-			Object.entries(oVMDependentUIChangesDepMap[sKey]).forEach(([sControlId, aChanges]) => {
-				if (Object.keys(oCombinedDepMap[sKey]).includes(sControlId)) {
-					oCombinedDepMap[sKey][sControlId] = oCombinedDepMap[sKey][sControlId].concat(aChanges);
-				} else {
-					oCombinedDepMap[sKey][sControlId] = aChanges;
-				}
-			});
-		});
-
-		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.getInitialUIChanges({
-			reference: sReference
-		}));
+	UIChangesState.getVMIndependentCompleteDependencyMap = function(sReference) {
+		return oVMIndependentCompleteDependencyMapDataSelector.get({reference: sReference});
 	};
 
 	UIChangesState.getVariantIndependentUIChanges = function(sReference) {
@@ -165,62 +88,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * Fetches the current dependency map from the Flex State.
-	 * This map is continuously being modified as changes are getting applied.
-	 * If the Flex State is not initialized, return an empty map.
-	 * For now, this map can be mutated by the consumer
-	 *
-	 * @param {string} sReference - Flex reference
-	 * @returns {object} Dependency Map
-	 */
-	UIChangesState.getLiveDependencyMap = function(sReference) {
-		return FlexState.getRuntimeOnlyData(sReference).liveDependencyMap || DependencyHandler.createEmptyDependencyMap();
-	};
-
-	/**
-	 * Copies the complete dependencies for the given change to the live dependency map.
-	 * Also checks if the dependency is still valid in a callback
-	 * This function is used in the case that controls got destroyed and recreated
-	 *
-	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange - The change whose dependencies should be copied
-	 * @param {sap.ui.core.Component} oAppComponent - Application component instance
-	 */
-	UIChangesState.copyDependenciesFromCompleteDependencyMap = function(oChange, oAppComponent) {
-		const sReference = ManifestUtils.getFlexReferenceForControl(oAppComponent);
-		let oCompleteDependency = getCompleteDependency(oChange, sReference);
-		if (oCompleteDependency) {
-			const oLiveDependencyMap = UIChangesState.getLiveDependencyMap(sReference);
-			const aNewValidDependencies = [];
-			oCompleteDependency.dependencies.forEach(function(sChangeId) {
-				if (Utils.checkIfDependencyIsStillValid(oAppComponent, JsControlTreeModifier, oLiveDependencyMap, sChangeId)) {
-					oLiveDependencyMap.mDependentChangesOnMe[sChangeId] ||= [];
-					oLiveDependencyMap.mDependentChangesOnMe[sChangeId].push(oChange.getId());
-					aNewValidDependencies.push(sChangeId);
-				}
-			});
-			oCompleteDependency = copyDependencies(oCompleteDependency, aNewValidDependencies, oAppComponent, oChange, sReference);
-		}
-	};
-
-	/**
-	 * 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.
+	 * Returns all UI Changes, including variant dependent UI Changes.
 	 *
 	 * @param {string} sReference - Flex reference
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} 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.124.0
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -208,7 +208,7 @@ sap.ui.define([
 		 *
 		 * @function
 		 * @since 1.89
-		 * @version 1.124.0
+		 * @version 1.125.0
 		 * @private
 		 * @ui5-restricted sap.ui.fl
 		 *

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

@@ -77,7 +77,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.Switcher
 	 * @since 1.74
-	 * @version 1.124.0
+	 * @version 1.125.0
 	 * @private
 	 * @ui5-restricted
 	 */