@openui5/sap.ui.fl 1.139.0 → 1.141.0

package/src/sap/ui/fl/write/_internal/init.js

@@ -0,0 +1,27 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	"sap/ui/fl/apply/_internal/init"
+], function(
+) {
+	"use strict";
+
+	/**
+	 * Initialization of the write bundle.
+	 * For now, this only executes the apply bundle initialization.
+ 	 * This module must be loaded by every publicly used module of the write bundle.
+	 *
+	 * @name sap.ui.fl.write._internal.init
+	 * @author SAP SE
+	 * @version 1.141.0
+	 * @since 1.141.0
+	 * @private
+	 */
+
+	// For now this is a no-op, but it ensures that the apply bundle is initialized
+	// when the write bundle is loaded.
+});

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.139.0
+	 * @version 1.141.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.139.0
+	 * @version 1.141.0
 	 * @since 1.74.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.transport

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

@@ -4,7 +4,7 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define([], function() {
+sap.ui.define(["sap/ui/fl/write/_internal/init"], function() {
 	"use strict";
 
 	/**

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

@@ -5,11 +5,12 @@
  */
 
 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",
-	"sap/ui/fl/write/_internal/Versions"
+	"sap/ui/fl/write/_internal/Versions",
+	"sap/ui/fl/write/_internal/init"
 ], function(
 	ManifestUtils,
 	SaveAs,
@@ -46,6 +47,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,22 +8,23 @@ 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"
+	"sap/ui/fl/Utils",
+	"sap/ui/fl/write/_internal/init"
 ], (
 	JsControlTreeModifier,
 	ControlVariantsUtils,
 	FlexObjectFactory,
-	ManifestUtils,
+	States,
 	FlexInfoSession,
+	ManifestUtils,
 	FlexObjectManager,
 	Storage,
-	ChangesWriteAPI,
 	Layer,
 	Utils
 ) => {
@@ -35,7 +36,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias module:sap/ui/fl/write/api/BusinessNetworkAPI
 	 * @since 1.135
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted SAP Business Network
 	 */
@@ -49,7 +50,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
@@ -70,11 +71,13 @@ sap.ui.define([
 			generator: mPropertyBag.generator || "BusinessNetworkAPI.createVariant"
 		};
 
-		const aFlexObjects = [FlexObjectFactory.createFlVariant(mProperties).convertToFileContent()];
+		const aFlexObjects = [FlexObjectFactory.createFlVariant(mProperties)];
 
-		const oResponse = await Storage.write({
-			layer: mProperties.layer,
-			flexObjects: aFlexObjects
+		const oResponse = await Storage.condense({
+			layer: mPropertyBag.layer || Layer.CUSTOMER,
+			reference: mPropertyBag.reference,
+			allChanges: aFlexObjects,
+			condensedChanges: aFlexObjects
 		});
 		return oResponse.response;
 	};
@@ -85,7 +88,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
@@ -126,7 +129,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
 	 */
@@ -161,29 +164,60 @@ sap.ui.define([
 
 	/**
 	 * 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 {sap.ui.fl.variants.VariantManagement} mPropertyBag.vmControl - Variant Management control instance
+	 * @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 {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} Array of flex objects that were 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 aFlexObjectsToDelete = ChangesWriteAPI.deleteVariantsAndRelatedObjects({
-			variantManagementControl: mPropertyBag.vmControl,
-			variants: mPropertyBag.variants,
-			layer: mPropertyBag.layer || Layer.CUSTOMER,
-			forceDelete: true // Skips the deletion checks such as draft status
+		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 FlexObjectManager.saveFlexObjects({
-			selector: mPropertyBag.vmControl,
-			flexObjects: aFlexObjectsToDelete,
-			layer: mPropertyBag.layer || Layer.CUSTOMER,
-			includeCtrlVariants: true
+
+		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 aFlexObjectsToDelete;
 	};
 
 	return BusinessNetworkAPI;

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

@@ -19,7 +19,7 @@ sap.ui.define([
 	"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",
@@ -29,7 +29,8 @@ sap.ui.define([
 	"sap/ui/fl/write/api/FeaturesAPI",
 	"sap/ui/fl/write/api/VersionsAPI",
 	"sap/ui/fl/Layer",
-	"sap/ui/fl/Utils"
+	"sap/ui/fl/Utils",
+	"sap/ui/fl/write/_internal/init"
 ], function(
 	_omit,
 	Log,
@@ -363,7 +364,7 @@ sap.ui.define([
 	 * @param {string[]} mPropertyBag.variants - Variant IDs to be deleted
 	 * @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 {Promise<sap.ui.fl.apply._internal.flexObjects.FlexObject[]>} Promise resolving with the array of deleted FlexObjects
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} Array of deleted Flex Objects
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.rta, similar tools
 	 */

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

@@ -7,12 +7,12 @@
 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/apply/api/ControlVariantApplyAPI",
+	"sap/ui/fl/initial/_internal/ManifestUtils",
 	"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",
@@ -21,16 +21,17 @@ sap.ui.define([
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/LayerUtils",
 	"sap/ui/fl/Utils",
-	"sap/ui/model/json/JSONModel"
+	"sap/ui/model/json/JSONModel",
+	"sap/ui/fl/write/_internal/init"
 ], function(
 	Lib,
 	FlexObjectFactory,
-	CompVariantMerger,
 	VariantManagementState,
 	ManifestUtils,
-	ControlVariantApplyAPI,
 	FlexInfoSession,
-	CompVariantState,
+	applyChangesOnVariant,
+	CompVariantManagementState,
+	CompVariantManager,
 	FlexObjectManager,
 	Storage,
 	Versions,
@@ -122,8 +123,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 +411,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 +475,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 +484,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 +503,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 +527,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,10 +7,11 @@
 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"
+	"sap/ui/fl/Layer",
+	"sap/ui/fl/write/_internal/init"
 ], function(
 	Component,
 	ComponentContainer,

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

@@ -20,7 +20,8 @@ sap.ui.define([
 	"sap/ui/fl/write/_internal/flexState/FlexObjectManager",
 	"sap/ui/fl/write/api/ChangesWriteAPI",
 	"sap/ui/fl/Layer",
-	"sap/ui/fl/Utils"
+	"sap/ui/fl/Utils",
+	"sap/ui/fl/write/_internal/init"
 ], function(
 	Log,
 	JsControlTreeModifier,

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

@@ -9,7 +9,8 @@ sap.ui.define([
 	"sap/ui/fl/initial/api/InitialFlexAPI",
 	"sap/ui/fl/write/_internal/Storage",
 	"sap/ui/fl/Layer",
-	"sap/ui/fl/Utils"
+	"sap/ui/fl/Utils",
+	"sap/ui/fl/write/_internal/init"
 ], function(
 	Settings,
 	InitialFlexAPI,

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

@@ -8,7 +8,8 @@ sap.ui.define([
 	"sap/ui/fl/write/_internal/fieldExtensibility/ABAPAccess",
 	"sap/ui/fl/write/_internal/fieldExtensibility/cap/CAPAccess",
 	"sap/ui/base/ManagedObject",
-	"sap/ui/fl/Utils"
+	"sap/ui/fl/Utils",
+	"sap/ui/fl/write/_internal/init"
 ], function(
 	ABAPAccess,
 	CAPAccess,
@@ -22,7 +23,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write.api.FieldExtensibility
 	 * @since 1.87
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.rta, sap.ui.mdc
 	 */

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

@@ -9,11 +9,12 @@ 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",
-	"sap/ui/fl/Utils"
+	"sap/ui/fl/Utils",
+	"sap/ui/fl/write/_internal/init"
 ], function(
 	union,
 	JsControlTreeModifier,

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

@@ -12,9 +12,10 @@ 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/Loader",
+	"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",
@@ -23,7 +24,8 @@ sap.ui.define([
 	"sap/ui/fl/write/api/FeaturesAPI",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/LayerUtils",
-	"sap/ui/fl/Utils"
+	"sap/ui/fl/Utils",
+	"sap/ui/fl/write/_internal/init"
 ], function(
 	_omit,
 	Log,
@@ -32,9 +34,10 @@ sap.ui.define([
 	FlexCustomData,
 	UIChange,
 	FlexState,
-	ManifestUtils,
 	FlexRuntimeInfoAPI,
 	FlexInfoSession,
+	Loader,
+	ManifestUtils,
 	Settings,
 	Condenser,
 	UIChangeManager,
@@ -111,23 +114,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;
 	};
 
 	/**
@@ -154,9 +153,13 @@ sap.ui.define([
 		FlexInfoSession.setByReference(oFlexInfoSession, sReference);
 		await FlexObjectManager.saveFlexObjects(mPropertyBag);
 
+		// When activating a new version or saving a new draft the request has to be made with the new version as parameter
+		oFlexInfoSession.version = mPropertyBag.version;
+		FlexInfoSession.setByReference(oFlexInfoSession, sReference);
+
 		// 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"]),
+			..._omit(mPropertyBag, ["skipUpdateCache", "layer", "version"]),
 			invalidateCache: true,
 			currentLayer: mPropertyBag.layer,
 			includeCtrlVariants: true
@@ -221,7 +224,7 @@ sap.ui.define([
 		};
 
 		FlexInfoSession.setByReference(oNewFlexInfoSession, sReference);
-		FlexState.setAllContextsProvided(sReference, oNewFlexInfoSession.allContextsProvided);
+		Loader.setAllContextsProvided(sReference, oNewFlexInfoSession.allContextsProvided);
 	};
 
 	/**

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

@@ -6,23 +6,26 @@
 
 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/Loader",
+	"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",
 	"sap/ui/fl/Layer",
-	"sap/ui/fl/LayerUtils"
+	"sap/ui/fl/LayerUtils",
+	"sap/ui/fl/write/_internal/init"
 ], function(
 	FlexState,
-	ManifestUtils,
 	FlexInfoSession,
+	Loader,
+	ManifestUtils,
 	Settings,
 	Version,
-	CompVariantState,
+	CompVariantManager,
 	FeaturesAPI,
 	PersistenceWriteAPI,
 	VersionsAPI,
@@ -64,7 +67,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;
 	}
@@ -95,7 +98,7 @@ sap.ui.define([
 			// Refresh oFlexInfoSession with updated backend data updated in updateResetAndPublishInfo
 			oFlexInfoSession = FlexInfoSession.getByReference(sReference);
 		} else {
-			FlexState.setAllContextsProvided(sReference, oFlexInfoSession.allContextsProvided);
+			Loader.setAllContextsProvided(sReference, oFlexInfoSession.allContextsProvided);
 		}
 		oFlexInfoSession.initialAllContexts = !oFlexInfoSession.allContextsProvided;
 		FlexInfoSession.setByReference(oFlexInfoSession, sReference);

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

@@ -5,16 +5,17 @@
  */
 
 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/Layer"
+	"sap/ui/fl/initial/_internal/ManifestUtils",
+	"sap/ui/fl/Layer",
+	"sap/ui/fl/write/_internal/init"
 ], function(
-	CompVariantState,
-	ManifestUtils,
+	CompVariantManager,
 	CompVariantUtils,
 	FlexState,
+	ManifestUtils,
 	Layer
 ) {
 	"use strict";
@@ -72,7 +73,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,14 +5,15 @@
  */
 
 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",
 	"sap/ui/fl/write/_internal/SaveAs",
 	"sap/ui/fl/write/api/ChangesWriteAPI",
 	"sap/ui/fl/write/api/PersistenceWriteAPI",
-	"sap/base/util/restricted/_pick"
+	"sap/base/util/restricted/_pick",
+	"sap/ui/fl/write/_internal/init"
 ], function(
 	ManifestUtils,
 	Settings,