@openui5/sap.ui.fl 1.140.0 → 1.141.1

package/src/sap/ui/fl/write/_internal/fieldExtensibility/ABAPAccess.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ABAPAccess
 	 * @since 1.87.0
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @private
 	 */
 	var ABAPAccess = {};

package/src/sap/ui/fl/write/_internal/fieldExtensibility/ABAPExtensibilityVariant.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @class
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ABAPExtensibilityVariant
 	 * @since 1.87
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @public
 	 * @param {sap.ui.base.ManagedObject} oControl - Control to add extensions
 	 */

package/src/sap/ui/fl/write/_internal/fieldExtensibility/ABAPExtensibilityVariantFactory.js

@@ -115,7 +115,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ABAPExtensibilityVariantFactory
 	 * @since 1.87.0
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @private
 	 */
 	var ABAPExtensibilityVariantFactory = {};

package/src/sap/ui/fl/write/_internal/fieldExtensibility/MultiTenantABAPExtensibilityVariant.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.MultiTenantABAPExtensibilityVariant
 	 * @since 1.87
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @public
 	 */
 

package/src/sap/ui/fl/write/_internal/fieldExtensibility/ServiceValidation.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ServiceValidation
 	 * @since 1.87.0
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @private
 	 */
 	var ServiceValidation = {};

package/src/sap/ui/fl/write/_internal/fieldExtensibility/SingleTenantABAPExtensibilityVariant.js

@@ -49,7 +49,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.SingleTenantABAPExtensibilityVariant
 	 * @since 1.87
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @public
 	 */
 	const SingleTenantABAPExtensibilityVariant = ABAPExtensibilityVariant.extend(sNamespace, {

package/src/sap/ui/fl/write/_internal/fieldExtensibility/UriParser.js

@@ -134,7 +134,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.UriParser
 	 * @since 1.87.0
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @private
 	 */
 	var UriParser = {};

package/src/sap/ui/fl/write/_internal/fieldExtensibility/Utils.js

@@ -245,7 +245,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.Utils
 	 * @since 1.87.0
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @private
 	 */
 	var Utils = {};

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/CAPAccess.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @since 1.93
 	 * @private
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 */
 	var CAPAccess = {};
 

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/dialog/CustomFieldCAPDialog.js

@@ -82,7 +82,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.dialog.CustomFieldCAPDialog
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @since 1.93
 	 * @private
 	 * @ui5-restricted

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/booleanEditor/BooleanEditor.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.booleanEditor.BooleanEditor
 	 * @author SAP SE
 	 * @since 1.93
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/rangeEditor/RangeEditor.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.rangeEditor.RangeEditor
 	 * @author SAP SE
 	 * @since 1.93
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/timeEditor/TimeEditor.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.timeEditor.TimeEditor
 	 * @author SAP SE
 	 * @since 1.93
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

package/src/sap/ui/fl/write/_internal/flexState/FlexObjectManager.js

@@ -57,7 +57,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.flexState.FlexObjectManager
 	 * @since 1.83
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -119,20 +119,17 @@ sap.ui.define([
 	}
 
 	function updateCacheAndDeleteUnsavedChanges(aAllChanges, aCondensedChanges, bSkipUpdateCache, bAlreadyDeletedViaCondense, sReference) {
-		aCondensedChanges.forEach((oDirtyChange) => {
-			updateCacheAndDirtyState(oDirtyChange, bSkipUpdateCache, sReference);
-		});
-		FlexState.getFlexObjectsDataSelector().checkUpdate({reference: sReference});
+		const aUpdates = aCondensedChanges.map((oDirtyChange) => createStorageUpdate(oDirtyChange, bSkipUpdateCache))
+		.filter(Boolean);
 
-		aAllChanges.filter((oChange) => {
-			return !aCondensedChanges.some((oCondensedChange) => oChange.getId() === oCondensedChange.getId());
-		}).forEach((oChange) => {
+		aAllChanges.filter((oChange) => !aCondensedChanges.some((oCondensedChange) => oChange.getId() === oCondensedChange.getId()))
+		.forEach((oChange) => {
 			if (bAlreadyDeletedViaCondense) {
 				FlexState.removeDirtyFlexObjects(sReference, [oChange]);
 				removeFlexObjectFromDependencyHandler(sReference, oChange);
 
 				// Remove also from Cache if the persisted change is still there (e.g. navigate away and back to the app)
-				FlexState.updateStorageResponse(sReference, [{flexObject: oChange.convertToFileContent(), type: "delete"}]);
+				aUpdates.push({ type: "delete", flexObject: oChange.convertToFileContent() });
 			} else {
 				FlexObjectManager.deleteFlexObjects({
 					reference: sReference,
@@ -140,6 +137,10 @@ sap.ui.define([
 				});
 			}
 		});
+		if (aUpdates.length) {
+			FlexState.getFlexObjectsDataSelector().checkUpdate({reference: sReference});
+			FlexState.update(sReference, aUpdates);
+		}
 	}
 
 	function getAllRelevantChangesForCondensing(aDirtyChanges, aDraftFilenames, bCondenseAnyLayer, sLayer, sReference) {
@@ -172,6 +173,7 @@ sap.ui.define([
 			response: []
 		};
 
+		const aUpdates = [];
 		for (const oDirtyChange of aDirtyChanges) {
 			const oPropertyBag = {
 				layer: oDirtyChange.getLayer(),
@@ -189,41 +191,50 @@ sap.ui.define([
 				oPropertyBag.flexObject = oDirtyChange.convertToFileContent();
 				oStorageResponse = await Storage.remove(oPropertyBag);
 			}
-			updateCacheAndDirtyState(oDirtyChange, bSkipUpdateCache, sReference);
+			const oUpdate = createStorageUpdate(oDirtyChange, bSkipUpdateCache);
+			if (oUpdate) {
+				aUpdates.push(oUpdate);
+			}
 
 			if (oStorageResponse?.response) {
 				oCollectedResponse.response.push(...oStorageResponse.response);
 			}
 		}
+		if (aUpdates.length) {
+			FlexState.update(sReference, aUpdates);
+		}
 		FlexState.getFlexObjectsDataSelector().checkUpdate({reference: sReference});
 		return oCollectedResponse;
 	}
 
-	function updateCacheAndDirtyState(oDirtyChange, bSkipUpdateCache, sReference) {
+	function createStorageUpdate(oDirtyChange, bSkipUpdateCache) {
 		if (!bSkipUpdateCache) {
+			let oUpdate;
 			switch (oDirtyChange.getState()) {
 				case States.LifecycleState.NEW:
-					FlexState.updateStorageResponse(sReference, [{
+					oUpdate = {
 						type: "add",
 						flexObject: oDirtyChange.convertToFileContent()
-					}]);
+					};
 					break;
 				case States.LifecycleState.DELETED:
-					FlexState.updateStorageResponse(sReference, [{
+					oUpdate = {
 						type: "delete",
 						flexObject: oDirtyChange.convertToFileContent()
-					}]);
+					};
 					break;
 				case States.LifecycleState.UPDATED:
-					FlexState.updateStorageResponse(sReference, [{
+					oUpdate = {
 						type: "update",
 						flexObject: oDirtyChange.convertToFileContent()
-					}]);
+					};
 					break;
 				default:
 			}
 			oDirtyChange.setState(States.LifecycleState.PERSISTED);
+			return oUpdate;
 		}
+		return undefined;
 	}
 
 	/**
@@ -343,8 +354,6 @@ sap.ui.define([
 	 * @param {boolean} [mPropertyBag.includeManifestChanges] - Flag if manifest changes should be included
 	 * @param {boolean} [mPropertyBag.includeAnnotationChanges] - Flag if annotation changes should be included
 	 * @param {boolean} [mPropertyBag.onlyCurrentVariants] - Flag if only current variants should be included. Is only considered if includeCtrlVariants is true
-	 * @param {string} [mPropertyBag.adaptationId] - Adaptation to load into Flex State after saving (e.g. undefined when exiting RTA)
-	 * @param {boolean} [mPropertyBag.version] - The version for which the objects are retrieved if the Cache should be invalidated
 	 * @returns {Promise<sap.ui.fl.apply._internal.flexObjects.FlexObject[]>} Flex objects, containing changes, compVariants & changes as well as ctrl_variant and changes
 	 */
 	FlexObjectManager.getFlexObjects = async function(mPropertyBag) {
@@ -352,7 +361,7 @@ sap.ui.define([
 		if (mPropertyBag.invalidateCache) {
 			const oAppComponent = Utils.getAppComponentForSelector(mPropertyBag.selector);
 			mPropertyBag.componentId = oAppComponent.getId();
-			await FlexState.update(mPropertyBag);
+			await FlexState.reinitialize(mPropertyBag);
 		}
 
 		let aRelevantFlexObjects = UIChangesState.getVariantIndependentUIChanges(mPropertyBag.reference)
@@ -619,7 +628,7 @@ sap.ui.define([
 			const aChangesToRevert = aFlexObjects.filter((oChange) => {
 				return aFileNames.indexOf(oChange.getId()) !== -1;
 			});
-			FlexState.updateStorageResponse(sReference, aChangesToRevert.map((oFlexObject) => {
+			FlexState.update(sReference, aChangesToRevert.map((oFlexObject) => {
 				return { flexObject: oFlexObject.convertToFileContent(), type: "delete" };
 			}));
 

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.flexState.UI2Personalization.UI2PersonalizationState
 	 * @since 1.120
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -53,7 +53,7 @@ sap.ui.define([
 		const oPersonalizationSubsection = FlexState.getUI2Personalization(oPersonalizationResult.response.reference);
 		oPersonalizationSubsection[oPersonalizationResult.response.containerKey] ||= [];
 		oPersonalizationSubsection[oPersonalizationResult.response.containerKey].push(oPersonalizationResult.response);
-		FlexState.updateStorageResponse(oPersonalizationResult.response.reference, [{
+		FlexState.update(oPersonalizationResult.response.reference, [{
 			type: "ui2",
 			newData: oPersonalizationSubsection
 		}]);
@@ -86,7 +86,7 @@ sap.ui.define([
 		const oToBeDeletedItem = UI2PersonalizationStateApply.getPersonalization(sReference, sContainerKey, sItemName);
 		const nIndexOfItem = aItems.indexOf(oToBeDeletedItem);
 		aItems.splice(nIndexOfItem, 1);
-		FlexState.updateStorageResponse(sReference, [{
+		FlexState.update(sReference, [{
 			type: "ui2",
 			newData: oUI2Personalization
 		}]);

package/src/sap/ui/fl/write/_internal/flexState/changes/UIChangeManager.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.flexState.changes.UIChangeManager
 	 * @since 1.129
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/write/_internal/flexState/compVariants/CompVariantManager.js

@@ -131,19 +131,6 @@ sap.ui.define([
 		return oFileContent;
 	}
 
-	function removeFromArrayById(aObjectArray, sObjectId) {
-		for (let i = aObjectArray.length - 1; i >= 0; i--) {
-			// aObjectArray can come from either back end response or flex state
-			// In the first case, the fileName is a direct property of object
-			// In the second case, it can be obtained from getId() function
-			const sFileName = aObjectArray[i].fileName || (aObjectArray[i].getId() && aObjectArray[i].getId());
-			if ((sFileName || aObjectArray[i].getId()) === sObjectId) {
-				aObjectArray.splice(i, 1);
-				break;
-			}
-		}
-	}
-
 	async function deleteObjectAndRemoveFromStorage(oFlexObject, oStoredResponse, sParentVersion, sReference) {
 		var oFileContent = oFlexObject.convertToFileContent();
 		await Storage.remove({
@@ -158,11 +145,7 @@ sap.ui.define([
 			layer: oFileContent.layer
 		});
 
-		// update StorageResponse
-		removeFromArrayById(
-			getSubSection(oStoredResponse.changes.comp, oFlexObject),
-			oFileContent.fileName
-		);
+		FlexState.update(sReference, [{ type: "delete", flexObject: oFileContent }]);
 		FlexState.getFlexObjectsDataSelector().checkUpdate({ reference: sReference });
 		return oFileContent;
 	}
@@ -274,7 +257,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.flexState.compVariants.CompVariantState
 	 * @since 1.83
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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.1
+	 * @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.140.0
+	 * @version 1.141.1
 	 * @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.

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.140.0
+	 * @version 1.141.1
 	 * @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

@@ -9,7 +9,8 @@ sap.ui.define([
 	"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,

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

@@ -13,9 +13,9 @@ sap.ui.define([
 	"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,
@@ -25,7 +25,6 @@ sap.ui.define([
 	ManifestUtils,
 	FlexObjectManager,
 	Storage,
-	ChangesWriteAPI,
 	Layer,
 	Utils
 ) => {
@@ -37,7 +36,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias module:sap/ui/fl/write/api/BusinessNetworkAPI
 	 * @since 1.135
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @private
 	 * @ui5-restricted SAP Business Network
 	 */
@@ -72,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;
 	};

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

@@ -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,

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

@@ -9,7 +9,6 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory",
 	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState",
 	"sap/ui/fl/initial/_internal/ManifestUtils",
-	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
 	"sap/ui/fl/initial/_internal/FlexInfoSession",
 	"sap/ui/fl/apply/_internal/flexState/compVariants/applyChangesOnVariant",
 	"sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantManagementState",
@@ -22,13 +21,13 @@ 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,
 	VariantManagementState,
 	ManifestUtils,
-	ControlVariantApplyAPI,
 	FlexInfoSession,
 	applyChangesOnVariant,
 	CompVariantManagementState,

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

@@ -10,7 +10,8 @@ sap.ui.define([
 	"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.140.0
+	 * @version 1.141.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.rta, sap.ui.mdc
 	 */

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

@@ -13,7 +13,8 @@ sap.ui.define([
 	"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

@@ -14,6 +14,7 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"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",
@@ -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,
@@ -34,6 +36,7 @@ sap.ui.define([
 	FlexState,
 	FlexRuntimeInfoAPI,
 	FlexInfoSession,
+	Loader,
 	ManifestUtils,
 	Settings,
 	Condenser,
@@ -150,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
@@ -217,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

@@ -7,6 +7,7 @@
 sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"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",
@@ -15,10 +16,12 @@ sap.ui.define([
 	"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,
 	FlexInfoSession,
+	Loader,
 	ManifestUtils,
 	Settings,
 	Version,
@@ -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);