@openui5/sap.ui.fl 1.138.0 → 1.140.0

package/src/sap/ui/fl/write/_internal/transport/TransportSelection.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @private
 	 * @alias sap.ui.fl.write._internal.transport.TransportSelection
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @since 1.74.0
 	 * Helper object to select an ABAP transport for an LREP object. This is not a generic utility to select a transport request, but part
 	 *        of the SmartVariant control.
@@ -368,7 +368,7 @@ sap.ui.define([
 	 * @param {Array} aAllLocalChanges - Array that includes all local changes
 	 * @param {Array} [aAppVariantDescriptors] - Array that includes all app variant descriptors
 	 * @param {object} oContentParameters - Object containing parameters added into the publish request
-	 * @param {string} oContentParameters.reference - Application ID of the changes which should be transported
+	 * @param {string} oContentParameters.reference - Flexibility reference of the app
 	 * @param {string} oContentParameters.layer - Layer in which the changes are stored
 	 * @returns {Promise} Promise which resolves without parameters
 	 */

package/src/sap/ui/fl/write/_internal/transport/Transports.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * Entity that handles ABAP transport related information.
 	 * @alias sap.ui.fl.write._internal.transport.Transports
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @since 1.74.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.transport

package/src/sap/ui/fl/write/api/AppVariantWriteAPI.js

@@ -5,7 +5,7 @@
  */
 
 sap.ui.define([
-	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
+	"sap/ui/fl/initial/_internal/ManifestUtils",
 	"sap/ui/fl/write/_internal/SaveAs",
 	"sap/ui/fl/write/_internal/connectors/LrepConnector",
 	"sap/ui/fl/write/api/FeaturesAPI",
@@ -46,6 +46,7 @@ sap.ui.define([
 		 * @param {object} mPropertyBag - Object with parameters as properties
 		 * @param {sap.ui.fl.Selector} mPropertyBag.selector - Selector
 		 * @param {string} mPropertyBag.id - App variant ID
+		 * @param {object} [mPropertyBag.oParsedHash] - Parsed Hash containing semantic object, action and parameters for inbound
 		 * @param {sap.ui.fl.Layer} mPropertyBag.layer - Current working layer
 		 * @returns {Promise} Promise that resolves with the app variant save response
 		 *

package/src/sap/ui/fl/write/api/BusinessNetworkAPI.js

@@ -8,18 +8,24 @@ sap.ui.define([
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/fl/apply/_internal/controlVariants/Utils",
 	"sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory",
-	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
+	"sap/ui/fl/apply/_internal/flexObjects/States",
+	"sap/ui/fl/initial/_internal/FlexInfoSession",
+	"sap/ui/fl/initial/_internal/ManifestUtils",
 	"sap/ui/fl/write/_internal/flexState/FlexObjectManager",
 	"sap/ui/fl/write/_internal/Storage",
+	"sap/ui/fl/write/api/ChangesWriteAPI",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/Utils"
 ], (
 	JsControlTreeModifier,
 	ControlVariantsUtils,
 	FlexObjectFactory,
+	States,
+	FlexInfoSession,
 	ManifestUtils,
 	FlexObjectManager,
 	Storage,
+	ChangesWriteAPI,
 	Layer,
 	Utils
 ) => {
@@ -31,7 +37,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias module:sap/ui/fl/write/api/BusinessNetworkAPI
 	 * @since 1.135
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted SAP Business Network
 	 */
@@ -45,7 +51,7 @@ sap.ui.define([
 	 * @param {string} mPropertyBag.variantManagementReference - Reference to the variant management control
 	 * @param {string} mPropertyBag.variantName - Name of the new variant
 	 * @param {string} mPropertyBag.reference - Flex reference of the app the variant belongs to
-	 * @param {string} [mPropertyBag.id] - Id of the new variant
+	 * @param {string} [mPropertyBag.id] - ID of the new variant
 	 * @param {string} [mPropertyBag.variantReference] - Reference to the variant the new one should be based on
 	 * @param {sap.ui.fl.Layer} [mPropertyBag.layer="CUSTOMER"] - Layer of the new variant
 	 * @param {string} [mPropertyBag.generator="BusinessNetworkAPI.createVariant"] - Generator of the new variant
@@ -81,7 +87,7 @@ sap.ui.define([
 	 * @param {object} mPropertyBag - Object with parameters as properties
 	 * @param {sap.ui.fl.variants.VariantManagement} mPropertyBag.control - Variant Management control instance
 	 * @param {string} mPropertyBag.variantName - Name of the new variant
-	 * @param {string} [mPropertyBag.id] - Id of the new variant
+	 * @param {string} [mPropertyBag.id] - ID of the new variant
 	 * @param {string} [mPropertyBag.variantReference] - Reference to the variant the new one should be based on.
 	 * If non is given, the new variant will be based on the standard variant
 	 * @param {sap.ui.fl.Layer} [mPropertyBag.layer="USER"] - Layer of the new variant
@@ -122,7 +128,7 @@ sap.ui.define([
 	 * Saves all the changes.
 	 *
 	 * @param {sap.ui.core.Element} oControl - Control instance
-	 * @returns {Promise<sap.ui.fl.apply._internal.flexObjects.FlexObject[]>} All saved Flex objects
+	 * @returns {Promise<sap.ui.fl.apply._internal.flexObjects.FlexObject[]>} Resolves with all saved Flex Objects
 	 * @private
 	 * @ui5-restricted SAP Business Network
 	 */
@@ -133,5 +139,85 @@ sap.ui.define([
 		});
 	};
 
+	/**
+	 * Set the max layer to CUSTOMER to disable personalization.
+	 *
+	 * @param {string} sReference - Flex reference of the app
+	 * @throws {Error} If the provided reference is invalid
+	 * @private
+	 * @ui5-restricted SAP Business Network
+	 */
+	BusinessNetworkAPI.disablePersonalization = function(sReference) {
+		const oFlexInfoSession = FlexInfoSession.getByReference(sReference);
+		if (!oFlexInfoSession || Object.keys(oFlexInfoSession).length === 0) {
+			throw new Error(`Invalid reference provided: ${sReference}`);
+		}
+
+		oFlexInfoSession.maxLayer = Layer.CUSTOMER;
+		// The flag can't be cleared here because the app is started in a different flow. But not clearing the flag will only have an effect
+		// if the user would start the app again in that session, which is not a supported scenario.
+		oFlexInfoSession.saveChangeKeepSession = true;
+		FlexInfoSession.setByReference(oFlexInfoSession, sReference);
+		window.sessionStorage.setItem("sap.ui.rta.skipReload", true);
+	};
+
+	/**
+	 * Deletes a list of control variants and their associated changes, and saves.
+	 * This API method does not need a running application.
+	 *
+	 * @param {object} mPropertyBag - Object with parameters as properties
+	 * @param {string} mPropertyBag.reference - Flex reference of the app the variant belongs to
+	 * @param {string[]} mPropertyBag.variants - Variant IDs to be deleted
+	 * @param {sap.ui.fl.Layer} [mPropertyBag.layer="CUSTOMER"] - Layer of the variants to be deleted
+	 * @returns {Promise<sap.ui.fl.apply._internal.flexObjects.FlexObject[]>} Resolves with an array of Flex Objects that were deleted
+	 * @private
+	 * @ui5-restricted SAP Business Network
+	 */
+	BusinessNetworkAPI.deleteVariants = async function(mPropertyBag) {
+		const sLayer = mPropertyBag.layer || Layer.CUSTOMER;
+		const sNamespaceSubfolder = "variants";
+		const aDeletedVariants = mPropertyBag.variants
+		.map((sVariantId) => {
+			return {
+				fileName: sVariantId,
+				fileType: "ctrl_variant",
+				layer: sLayer,
+				reference: mPropertyBag.reference,
+				namespace: `apps/${mPropertyBag.reference}/${sNamespaceSubfolder}/`
+			};
+		})
+		.map((mChangeProperties) => FlexObjectFactory.createFromFileContent(mChangeProperties));
+		aDeletedVariants.forEach((oVariant) => {
+			oVariant.condenserState = "delete";
+			oVariant.setState(States.LifecycleState.DELETED);
+		});
+
+		await Storage.condense({
+			layer: sLayer,
+			reference: mPropertyBag.reference,
+			allChanges: aDeletedVariants,
+			condensedChanges: aDeletedVariants
+		});
+	};
+
+	/**
+	 * Deletes all USER layer variants for a given variant management.
+	 * This API method does not need a running application.
+	 *
+	 * @param {object} mPropertyBag - Object with parameters as properties
+	 * @param {string} mPropertyBag.reference - Flex reference of the app
+	 * @param {string} mPropertyBag.variantManagementReference - Reference of the variant management control
+	 * @returns {Promise<undefined>} Resolves when all variants are deleted
+	 * @private
+	 * @ui5-restricted SAP Business Network
+	 */
+	BusinessNetworkAPI.resetPersonalizationVariants = function(mPropertyBag) {
+		return Storage.deleteUserVariantsForVM({
+			flexReference: mPropertyBag.reference,
+			variantManagementReferences: [mPropertyBag.variantManagementReference],
+			layer: Layer.USER
+		});
+	};
+
 	return BusinessNetworkAPI;
-});
+});

package/src/sap/ui/fl/write/api/ChangesWriteAPI.js

@@ -17,15 +17,18 @@ 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/controlVariants/VariantManagementState",
 	"sap/ui/fl/apply/_internal/flexState/FlexObjectState",
-	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
+	"sap/ui/fl/initial/_internal/ManifestUtils",
 	"sap/ui/fl/descriptorRelated/api/DescriptorChangeFactory",
 	"sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerStorage",
 	"sap/ui/fl/write/_internal/appVariant/AppVariantInlineChangeFactory",
 	"sap/ui/fl/write/_internal/controlVariants/ControlVariantWriteUtils",
 	"sap/ui/fl/write/_internal/flexState/FlexObjectManager",
 	"sap/ui/fl/write/api/ContextBasedAdaptationsAPI",
+	"sap/ui/fl/write/api/FeaturesAPI",
 	"sap/ui/fl/write/api/VersionsAPI",
+	"sap/ui/fl/Layer",
 	"sap/ui/fl/Utils"
 ], function(
 	_omit,
@@ -40,6 +43,7 @@ sap.ui.define([
 	ChangesUtils,
 	FlexObjectFactory,
 	States,
+	VariantManagementState,
 	FlexObjectState,
 	ManifestUtils,
 	DescriptorChangeFactory,
@@ -48,7 +52,9 @@ sap.ui.define([
 	ControlVariantWriteUtils,
 	FlexObjectManager,
 	ContextBasedAdaptationsAPI,
+	FeaturesAPI,
 	VersionsAPI,
+	Layer,
 	Utils
 ) {
 	"use strict";
@@ -347,14 +353,17 @@ sap.ui.define([
 	};
 
 	/**
-	 * Deletes the variants and their related FlexObjects. Only variants that are in the draft or dirty state can be deleted,
-	 * as they have no dependencies on them. Returns all FlexObjects that were deleted in the process.
+	 * Deletes the variants and their related FlexObjects. By default, only variants that are in the draft
+	 * or dirty state can be deleted, as they have no dependencies on them.
+	 * The Business Network scenario can delete any variants (forceDelete=true).
+	 * Returns all FlexObjects that were deleted in the process.
 	 *
 	 * @param {object} mPropertyBag - Object with parameters as properties
 	 * @param {sap.ui.core.Control} mPropertyBag.variantManagementControl - Variant management control
 	 * @param {string[]} mPropertyBag.variants - Variant IDs to be deleted
-	 * @param {string} mPropertyBag.layer - Layer to get the draft objects from
-	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} Array of deleted FlexObjects
+	 * @param {string} mPropertyBag.layer - Layer that the variants belong to
+	 * @param {boolean} [mPropertyBag.forceDelete=false] - If set to true, the deletion will not check for draft or dirty state of the variants
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} Array of deleted Flex Objects
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.rta, similar tools
 	 */
@@ -366,20 +375,33 @@ sap.ui.define([
 		const oAppComponent = Utils.getAppComponentForControl(oVariantManagementControl);
 		const sVariantManagementReference = JsControlTreeModifier.getSelector(oVariantManagementControl, oAppComponent).id;
 		const sFlexReference = ManifestUtils.getFlexReferenceForControl(oAppComponent);
-		const aDraftFilenames = VersionsAPI.getDraftFilenames({
-			control: oVariantManagementControl,
-			layer: mPropertyBag.layer
+		// Filter out passed variants from other layers
+		let aVariantsToBeDeleted = mPropertyBag.variants.filter((sVariantId) => {
+			const oVariant = VariantManagementState.getVariant({
+				vmReference: sVariantManagementReference,
+				reference: sFlexReference,
+				vReference: sVariantId
+			});
+			if (!oVariant) {
+				Log.warning(`Variant with ID '${sVariantId}' does not exist in the Variant Management control.`);
+				return false;
+			}
+			return oVariant.layer === mPropertyBag.layer;
 		});
-		const aDirtyFlexObjectIds = FlexObjectState.getDirtyFlexObjects(sFlexReference).map((oFlexObject) => (
-			oFlexObject.getId()
-		));
-		const aVariantsToBeDeleted = mPropertyBag.variants.filter((sVariantID) => (
-			aDraftFilenames.includes(sVariantID) || aDirtyFlexObjectIds.includes(sVariantID)
-		));
+		if (!mPropertyBag.forceDelete) {
+			const aDraftFilenames = VersionsAPI.getDraftFilenames({
+				control: oVariantManagementControl,
+				layer: mPropertyBag.layer
+			});
+			const aDirtyFlexObjectIds = FlexObjectState.getDirtyFlexObjects(sFlexReference).map((oFlexObject) => (
+				oFlexObject.getId()
+			));
+			aVariantsToBeDeleted = aVariantsToBeDeleted.filter((sVariantID) => (
+				aDraftFilenames.includes(sVariantID) || aDirtyFlexObjectIds.includes(sVariantID)
+			));
+		}
 		return aVariantsToBeDeleted
-		.map((sVariantId) => (
-			ControlVariantWriteUtils.deleteVariant(sFlexReference, sVariantManagementReference, sVariantId)
-		))
+		.map((sVariantId) => (ControlVariantWriteUtils.deleteVariant(sFlexReference, sVariantManagementReference, sVariantId)))
 		.flat();
 	};
 

package/src/sap/ui/fl/write/api/ContextBasedAdaptationsAPI.js

@@ -7,12 +7,13 @@
 sap.ui.define([
 	"sap/ui/core/Lib",
 	"sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory",
-	"sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantMerger",
 	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState",
-	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
+	"sap/ui/fl/initial/_internal/ManifestUtils",
 	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
 	"sap/ui/fl/initial/_internal/FlexInfoSession",
-	"sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState",
+	"sap/ui/fl/apply/_internal/flexState/compVariants/applyChangesOnVariant",
+	"sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantManagementState",
+	"sap/ui/fl/write/_internal/flexState/compVariants/CompVariantManager",
 	"sap/ui/fl/write/_internal/flexState/FlexObjectManager",
 	"sap/ui/fl/write/_internal/Storage",
 	"sap/ui/fl/write/_internal/Versions",
@@ -25,12 +26,13 @@ sap.ui.define([
 ], function(
 	Lib,
 	FlexObjectFactory,
-	CompVariantMerger,
 	VariantManagementState,
 	ManifestUtils,
 	ControlVariantApplyAPI,
 	FlexInfoSession,
-	CompVariantState,
+	applyChangesOnVariant,
+	CompVariantManagementState,
+	CompVariantManager,
 	FlexObjectManager,
 	Storage,
 	Versions,
@@ -122,8 +124,7 @@ sap.ui.define([
 		return FeaturesAPI.isContextBasedAdaptationAvailable(sLayer)
 		.then(function(bContextBasedAdaptationsEnabledResponse) {
 			bContextBasedAdaptationsEnabled = bContextBasedAdaptationsEnabledResponse;
-			var oAdaptationsPromise = bContextBasedAdaptationsEnabled ? ContextBasedAdaptationsAPI.load(mPropertyBag) : Promise.resolve({adaptations: []});
-			return oAdaptationsPromise;
+			return bContextBasedAdaptationsEnabled ? ContextBasedAdaptationsAPI.load(mPropertyBag) : Promise.resolve({adaptations: []});
 		})
 		.then(function(oAdaptations) {
 			// Determine displayed adaptation
@@ -411,9 +412,8 @@ sap.ui.define([
 
 			// Clone it, to avoid that we modify the original and that modifying the original affects the state
 			var oClone = oVariant.clone();
-			aVariantChanges.forEach(CompVariantMerger.applyChangeOnVariant.bind(CompVariantMerger, oClone));
+			applyChangesOnVariant(oClone, aVariantChanges);
 			// Avoid garbage
-			oClone.removeAllChanges();
 			oClone.destroy();
 			return oClone.mProperties;
 		}
@@ -476,7 +476,7 @@ sap.ui.define([
 	function createChangeSetVisibleFalseToRestrictedVariant(oVariant, mPropertyBag, contextBasedAdaptationId, VariantManager) {
 		if (oVariant.isA("sap.ui.fl.apply._internal.flexObjects.CompVariant")) {
 			var sPersistencyKey = oVariant.getPersistencyKey();
-			oVariant = CompVariantState.updateVariant({
+			oVariant = CompVariantManager.updateVariant({
 				reference: mPropertyBag.appId,
 				persistencyKey: sPersistencyKey,
 				id: oVariant.getId(),
@@ -485,7 +485,7 @@ sap.ui.define([
 				adaptationId: contextBasedAdaptationId,
 				forceCreate: true
 			});
-			return oVariant.getChanges().reverse()[0].convertToFileContent();
+			return CompVariantManagementState.getVariantChanges(oVariant).reverse()[0].convertToFileContent();
 		}
 		// Fl variant
 		var oAppComponent = FlexUtils.getAppComponentForControl(mPropertyBag.control);
@@ -504,10 +504,10 @@ sap.ui.define([
 	}
 
 	function getObjectsByLayerAndType(aFlexObjects, sChangesLayer, bVariants) {
-		var aVariants = aFlexObjects.filter(function(oFlexObject) {
-			return (bVariants === oFlexObject.isA("sap.ui.fl.apply._internal.flexObjects.Variant")) && oFlexObject.getLayer() === sChangesLayer;
-		});
-		return aVariants;
+		return aFlexObjects.filter((oFlexObject) =>
+			bVariants === oFlexObject.isA("sap.ui.fl.apply._internal.flexObjects.Variant")
+			&& oFlexObject.getLayer() === sChangesLayer
+		);
 	}
 
 	function getVariantReference(oChange) {
@@ -528,15 +528,12 @@ sap.ui.define([
 	}
 
 	function isSetContextChange(oChange) {
-		if (oChange.getFileType() === "ctrl_variant_change" && oChange.getChangeType() === "setContexts") {
-			return true;
-		}
-		return false;
+		return oChange.getFileType() === "ctrl_variant_change" && oChange.getChangeType() === "setContexts";
 	}
 
 	/**
 	 * Filter all changes that are relevant to be copied for an adaptation during migration.
-	 * All non variant changes are taken over. Variant dependent changes are filtered depending on the variant
+	 * All non-variant changes are taken over. Variant dependent changes are filtered depending on the variant
 	 * Changes for variants that will not be taken over into this adaptation will be removed
 	 * Also removes setContext changes for FLVariants
 	 * @param {array<string>} aIgnoredVariantIds - IDs of variants that are out of scope

package/src/sap/ui/fl/write/api/ContextSharingAPI.js

@@ -7,7 +7,7 @@
 sap.ui.define([
 	"sap/ui/core/Component",
 	"sap/ui/core/ComponentContainer",
-	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
+	"sap/ui/fl/initial/_internal/ManifestUtils",
 	"sap/ui/fl/initial/_internal/Settings",
 	"sap/ui/fl/write/api/ContextBasedAdaptationsAPI",
 	"sap/ui/fl/Layer"

package/src/sap/ui/fl/write/api/FieldExtensibility.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write.api.FieldExtensibility
 	 * @since 1.87
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.rta, sap.ui.mdc
 	 */

package/src/sap/ui/fl/write/api/LocalResetAPI.js

@@ -9,7 +9,7 @@ sap.ui.define([
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/fl/apply/_internal/flexObjects/States",
 	"sap/ui/fl/apply/_internal/flexState/changes/UIChangesState",
-	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
+	"sap/ui/fl/initial/_internal/ManifestUtils",
 	"sap/ui/fl/write/_internal/flexState/changes/UIChangeManager",
 	"sap/ui/fl/write/api/ChangesWriteAPI",
 	"sap/ui/fl/write/api/PersistenceWriteAPI",

package/src/sap/ui/fl/write/api/PersistenceWriteAPI.js

@@ -12,9 +12,9 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/changes/FlexCustomData",
 	"sap/ui/fl/apply/_internal/flexObjects/UIChange",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
-	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/apply/api/FlexRuntimeInfoAPI",
 	"sap/ui/fl/initial/_internal/FlexInfoSession",
+	"sap/ui/fl/initial/_internal/ManifestUtils",
 	"sap/ui/fl/initial/_internal/Settings",
 	"sap/ui/fl/write/_internal/condenser/Condenser",
 	"sap/ui/fl/write/_internal/flexState/changes/UIChangeManager",
@@ -32,9 +32,9 @@ sap.ui.define([
 	FlexCustomData,
 	UIChange,
 	FlexState,
-	ManifestUtils,
 	FlexRuntimeInfoAPI,
 	FlexInfoSession,
+	ManifestUtils,
 	Settings,
 	Condenser,
 	UIChangeManager,
@@ -111,23 +111,19 @@ sap.ui.define([
 	 * @private
 	 * @ui5-restricted
 	 */
-	PersistenceWriteAPI.hasHigherLayerChanges = function(mPropertyBag) {
+	PersistenceWriteAPI.hasHigherLayerChanges = async function(mPropertyBag) {
 		mPropertyBag.upToLayer ||= LayerUtils.getCurrentLayer();
 
-		return FlexObjectManager.getFlexObjects(mPropertyBag)
-		.then(function(aFlexObjects) {
-			return aFlexObjects.filter(function(oFlexObject) {
-				return LayerUtils.isOverLayer(oFlexObject.getLayer(), mPropertyBag.upToLayer);
-			});
-		})
-		.then(function(aFilteredFlexObjects) {
-			if (aFilteredFlexObjects.length === 0) {
-				return false;
-			}
-			// Hidden control variants and their related changes might be necessary for referenced variants, but are not relevant for this check
-			// Same apply for changes of deleted comp variants
-			return FlexObjectManager.filterHiddenFlexObjects(aFilteredFlexObjects, mPropertyBag.reference).length > 0;
-		});
+		const aFlexObjects = await FlexObjectManager.getFlexObjects(mPropertyBag);
+		const aFilteredFlexObjects = aFlexObjects.filter(
+			(oFlexObject) => LayerUtils.isOverLayer(oFlexObject.getLayer(), mPropertyBag.upToLayer)
+		);
+		if (aFilteredFlexObjects.length === 0) {
+			return false;
+		}
+		// Hidden control variants and their related changes might be necessary for referenced variants, but are not relevant for this check
+		// Same apply for changes of deleted comp variants
+		return FlexObjectManager.filterHiddenFlexObjects(aFilteredFlexObjects, mPropertyBag.reference).length > 0;
 	};
 
 	/**
@@ -148,16 +144,19 @@ sap.ui.define([
 		// when save or activate a version in rta no reload is triggered but flex/data request is send
 		// and will delete version and maxLayer without saveChangeKeepSession
 		// after the request saveChangeKeepSession needs to be delete again
-		const sReference = ManifestUtils.getFlexReferenceForControl(mPropertyBag.selector);
+		const sReference = ManifestUtils.getFlexReferenceForSelector(mPropertyBag.selector);
 		let oFlexInfoSession = FlexInfoSession.getByReference(sReference);
 		oFlexInfoSession.saveChangeKeepSession = true;
 		FlexInfoSession.setByReference(oFlexInfoSession, sReference);
 		await FlexObjectManager.saveFlexObjects(mPropertyBag);
 
 		// This is needed as long the save requests does not return the necessary information to update the FlexState without a new request
-		const aFlexObjects = await FlexObjectManager.getFlexObjects(
-			{..._omit(mPropertyBag, ["skipUpdateCache", "layer"]), invalidateCache: true, currentLayer: mPropertyBag.layer}
-		);
+		const aFlexObjects = await FlexObjectManager.getFlexObjects({
+			..._omit(mPropertyBag, ["skipUpdateCache", "layer"]),
+			invalidateCache: true,
+			currentLayer: mPropertyBag.layer,
+			includeCtrlVariants: true
+		});
 
 		if (aFlexObjects?.length > 0) {
 			await PersistenceWriteAPI.updateResetAndPublishInfo(mPropertyBag);
@@ -180,6 +179,7 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.fl, sap.ui.rta
 	 */
 	PersistenceWriteAPI.updateResetAndPublishInfo = async function(mPropertyBag) {
+		const sReference = ManifestUtils.getFlexReferenceForSelector(mPropertyBag.selector);
 		const [bHasChanges, bIsPublishAvailable] = await Promise.all([
 			hasChanges(mPropertyBag),
 			FeaturesAPI.isPublishAvailable()
@@ -196,7 +196,10 @@ sap.ui.define([
 		// If the layer is transportable, fetch additional information from the backend
 		if (bIsLayerTransportable) {
 			try {
-				const oResponse = await Storage.getFlexInfo(mPropertyBag);
+				const oResponse = await Storage.getFlexInfo({
+					...mPropertyBag,
+					reference: sReference
+				});
 				// default is true, so only set to false if explicitly set to false
 				oFlexInfo.allContextsProvided = oResponse.allContextsProvided !== false;
 				oFlexInfo.isResetEnabled = oResponse.isResetEnabled;
@@ -207,7 +210,6 @@ sap.ui.define([
 		}
 
 		// Update the Flex Info Session
-		const sReference = ManifestUtils.getFlexReferenceForControl(mPropertyBag.selector);
 		const oOldFlexInfoSession = FlexInfoSession.getByReference(sReference);
 		const oNewFlexInfoSession = {
 			...oOldFlexInfoSession,

package/src/sap/ui/fl/write/api/ReloadInfoAPI.js

@@ -6,11 +6,11 @@
 
 sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
-	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/initial/_internal/FlexInfoSession",
+	"sap/ui/fl/initial/_internal/ManifestUtils",
 	"sap/ui/fl/initial/_internal/Settings",
 	"sap/ui/fl/initial/api/Version",
-	"sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState",
+	"sap/ui/fl/write/_internal/flexState/compVariants/CompVariantManager",
 	"sap/ui/fl/write/api/FeaturesAPI",
 	"sap/ui/fl/write/api/PersistenceWriteAPI",
 	"sap/ui/fl/write/api/VersionsAPI",
@@ -18,11 +18,11 @@ sap.ui.define([
 	"sap/ui/fl/LayerUtils"
 ], function(
 	FlexState,
-	ManifestUtils,
 	FlexInfoSession,
+	ManifestUtils,
 	Settings,
 	Version,
-	CompVariantState,
+	CompVariantManager,
 	FeaturesAPI,
 	PersistenceWriteAPI,
 	VersionsAPI,
@@ -64,7 +64,7 @@ sap.ui.define([
 
 	function checkSVMControlsForDirty(oReloadInfo) {
 		if (LayerUtils.isOverLayer(Layer.USER, oReloadInfo.layer)) {
-			return CompVariantState.checkSVMControlsForDirty((ManifestUtils.getFlexReferenceForControl(oReloadInfo.selector)));
+			return CompVariantManager.checkSVMControlsForDirty((ManifestUtils.getFlexReferenceForControl(oReloadInfo.selector)));
 		}
 		return false;
 	}

package/src/sap/ui/fl/write/api/SACIntegrationUpdateVariant.js

@@ -5,16 +5,16 @@
  */
 
 sap.ui.define([
-	"sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState",
-	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
+	"sap/ui/fl/write/_internal/flexState/compVariants/CompVariantManager",
 	"sap/ui/fl/apply/_internal/flexState/compVariants/Utils",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
+	"sap/ui/fl/initial/_internal/ManifestUtils",
 	"sap/ui/fl/Layer"
 ], function(
-	CompVariantState,
-	ManifestUtils,
+	CompVariantManager,
 	CompVariantUtils,
 	FlexState,
+	ManifestUtils,
 	Layer
 ) {
 	"use strict";
@@ -72,7 +72,7 @@ sap.ui.define([
 			return Promise.reject("the user is not authorized to edit the PUBLIC variant (no author nor key user)");
 		}
 
-		CompVariantState.updateVariant(mPropertyBag);
-		return CompVariantState.persist(mPropertyBag);
+		CompVariantManager.updateVariant(mPropertyBag);
+		return CompVariantManager.persist(mPropertyBag);
 	};
 });

package/src/sap/ui/fl/write/api/SmartBusinessWriteAPI.js

@@ -5,7 +5,7 @@
  */
 
 sap.ui.define([
-	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
+	"sap/ui/fl/initial/_internal/ManifestUtils",
 	"sap/ui/fl/initial/_internal/Settings",
 	"sap/ui/fl/write/_internal/appVariant/AppVariantFactory",
 	"sap/ui/fl/write/_internal/connectors/LrepConnector",