@openui5/sap.ui.fl 1.129.0 → 1.130.1

package/src/sap/ui/fl/write/_internal/connectors/LrepConnector.js

@@ -168,7 +168,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.LrepConnector
 	 * @since 1.67
-	 * @version 1.129.0
+	 * @version 1.130.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */
@@ -373,7 +373,7 @@ sap.ui.define([
 		 * @returns {Promise<boolean>} Promise resolves with true
 		 * @deprecated
 		 */
-		 isContextSharingEnabled() {
+		isContextSharingEnabled() {
 			return Promise.resolve(true);
 		},
 
@@ -434,19 +434,71 @@ sap.ui.define([
 		},
 
 		/**
-		 * Write flex data into LRep back end; This method is called with a map of condensed changes
-		 * that also condense the stored changes on the backend.
+		 * Write flex data into LRep back end; This function splits the condense format by namespaces.
 		 *
 		 * @param {object} mPropertyBag Property bag
 		 * @param {object} mPropertyBag.flexObjects Map of condensed changes
+		 * @param {object} mPropertyBag.allChanges Original set of changes
 		 * @param {string} mPropertyBag.url Configured url for the connector
 		 * @param {string} [mPropertyBag.transport] The transport ID
 		 * @param {boolean} [mPropertyBag.isLegacyVariant] Whether the new flex data has file type .variant or not
 		 * @returns {Promise} Promise resolves as soon as the writing was completed
 		 */
 		condense(mPropertyBag) {
+			const oFlexObjects = mPropertyBag.flexObjects;
+			const oNamespaceMap = {};
+
+			// Helper to process each change and add it to the correct namespace/action
+			function processChange(sAction, sNamespace, sFileType, sFileName, oChange) {
+				// Ensure the namespace object exists
+				oNamespaceMap[sNamespace] ||= {
+					namespace: sNamespace,
+					layer: oFlexObjects.layer
+				};
+
+				oNamespaceMap[sNamespace][sAction] ||= {};
+				oNamespaceMap[sNamespace][sAction][sFileType] ||= [];
+
+				// For 'delete' and 'reorder', just add the file name
+				if (sAction === "delete" || sAction === "reorder") {
+					oNamespaceMap[sNamespace][sAction][sFileType].push(sFileName);
+				} else {
+					// For 'create' and 'update', add the full change object
+					oNamespaceMap[sNamespace][sAction][sFileType].push({
+						[sFileName]: oChange[sFileName] || oChange
+					});
+				}
+			}
+
+			// Loop through flexObjects to organize changes by namespace
+			["create", "reorder", "update", "delete"].forEach((sAction) => {
+				const oChangesByAction = oFlexObjects[sAction];
+
+				if (oChangesByAction) {
+					Object.keys(oChangesByAction).forEach((sFileType) => {
+						oChangesByAction[sFileType].forEach((oChange) => {
+							const sFileName = oChange.fileName || (typeof oChange === "object" ? Object.keys(oChange)[0] : oChange);
+							var sNamespace = oChange[sFileName]?.namespace || oChange[sFileType]?.namespace;
+
+							// If namespace is missing, fallback to allChanges to resolve it
+							if (!sNamespace) {
+								const oMatchingChange = mPropertyBag.allChanges.find((oChangeItem) => oChangeItem.getId() === sFileName);
+								sNamespace = oMatchingChange ? oMatchingChange.getNamespace() : undefined;
+							}
+
+							// Ensure we have a valid namespace and process the change
+							if (sNamespace) {
+								processChange(sAction, sNamespace, sFileType, sFileName, oChange);
+							}
+						});
+					});
+				}
+			});
+
+			mPropertyBag.flexObjects = Object.values(oNamespaceMap);
 			mPropertyBag.method = "POST";
 			mPropertyBag.isCondensingEnabled = true;
+
 			return _doWrite(mPropertyBag);
 		},
 

package/src/sap/ui/fl/write/_internal/connectors/NeoLrepConnector.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.NeoLrepConnector
 	 * @since 1.81
-	 * @version 1.129.0
+	 * @version 1.130.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/ObjectPathConnector.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.ObjectPathConnector
 	 * @since 1.73
-	 * @version 1.129.0
+	 * @version 1.130.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/PersonalizationConnector.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.PersonalizationConnector
 	 * @since 1.70
-	 * @version 1.129.0
+	 * @version 1.130.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

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

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.Utils
 	 * @since 1.70
-	 * @version 1.129.0
+	 * @version 1.130.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.connectors, sap.ui.fl.write._internal.transport
 	 */

package/src/sap/ui/fl/write/_internal/controlVariants/ControlVariantWriteUtils.js

@@ -0,0 +1,59 @@
+/*!
+ * 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/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState",
+	"sap/ui/fl/registry/Settings",
+	"sap/ui/fl/write/_internal/flexState/FlexObjectManager"
+], function(
+	VariantManagementState,
+	Settings,
+	FlexObjectManager
+) {
+	"use strict";
+
+	const ControlVariantWriteUtils = {};
+
+	/**
+	 * Deletes a control variant and its associated changes. This is only possible for USER layer variants
+	 * and CUSTOMER layer variants which are part of a draft (not activated).
+	 *
+	 * @param {string} sReference - Flex reference
+	 * @param {string} sVMReference - Variant management reference
+	 * @param {string} sVariantReference - Variant reference
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} - Array of flex objects that were deleted
+	 */
+	ControlVariantWriteUtils.deleteVariant = function(sReference, sVMReference, sVariantReference) {
+		// Deletion of variant-related objects is only supported for backends with condensing enabled
+		if (!Settings.getInstanceOrUndef()?.isCondensingEnabled()) {
+			return [];
+		}
+
+		const mPropertyBag = {
+			reference: sReference,
+			vmReference: sVMReference,
+			vReference: sVariantReference
+		};
+		const aVMChanges = VariantManagementState.getVariantManagementChanges(mPropertyBag);
+		const aControlChanges = VariantManagementState.getControlChangesForVariant({
+			...mPropertyBag,
+			includeReferencedChanges: false
+		});
+		const oVariant = VariantManagementState.getVariant(mPropertyBag).instance;
+		const aVariantChanges = VariantManagementState.getVariantChangesForVariant(mPropertyBag);
+
+		const aFlexObjectsToDelete = [oVariant, ...aVMChanges, ...aVariantChanges, ...aControlChanges];
+
+		FlexObjectManager.deleteFlexObjects({
+			reference: sReference,
+			flexObjects: aFlexObjectsToDelete
+		});
+
+		return aFlexObjectsToDelete;
+	};
+
+	return ControlVariantWriteUtils;
+});

package/src/sap/ui/fl/write/_internal/delegates/ODataV2ReadDelegate.js

@@ -256,10 +256,9 @@ sap.ui.define(["sap/ui/model/ListBinding"], function(ListBinding) {
 		return aProperties;
 	}
 	/**
-	 * Default read delegate for ODataV2 protocoll.
+	 * Default read delegate for ODataV2 protocol.
 	 * @namespace sap.ui.fl.write._internal.delegate.ODataV2ReadDelegate
 	 * @implements {sap.ui.fl.interfaces.Delegate}
-	 * @experimental Since 1.123
 	 * @since 1.123
 	 * @private
 	 */

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

@@ -35,7 +35,7 @@ function(
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.129.0
+	 * @version 1.130.1
 	 */
 	var Processor = {
 		applyExtensionPoint(oExtensionPoint) {

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.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.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.129.0
+	 * @version 1.130.1
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

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

@@ -51,7 +51,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.flexState.FlexObjectManager
 	 * @since 1.83
-	 * @version 1.129.0
+	 * @version 1.130.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -309,7 +309,38 @@ sap.ui.define([
 			removeFlexObjectFromDependencyHandler(mPropertyBag.reference, oFlexObject);
 		});
 		FlexState.removeDirtyFlexObjects(mPropertyBag.reference, aToBeRemovedDirtyFlexObjects);
-		FlexObjectManager.addDirtyFlexObjects(mPropertyBag.reference, aToBeDeletedFlexObjects);
+		const aAddedFlexObjects = FlexObjectManager.addDirtyFlexObjects(mPropertyBag.reference, aToBeDeletedFlexObjects);
+		if (!aToBeRemovedDirtyFlexObjects.length && !aAddedFlexObjects.length) {
+			const oFlexObjectsDataSelector = FlexState.getFlexObjectsDataSelector();
+			oFlexObjectsDataSelector.checkUpdate({
+				reference: mPropertyBag.reference
+			});
+		}
+	};
+
+	/**
+	 * Restores previously deleted flex objects. They can be in state DELETED or NEW (when they were dirty and removed from the FlexState).
+	 * Objects are restored to the state they were in before deletion.
+	 * If the flex object was not persisted, it is added as a dirty object again.
+	 * Deleting a change in the State NEW is done by just removing the change from the map instead of changing the state to DELETED.
+	 *
+	 * @param {object} mPropertyBag - Object with parameters as properties
+	 * @param {string} mPropertyBag.reference - Flex reference of the application
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} mPropertyBag.flexObjects - Flex objects to be restored
+	 */
+	FlexObjectManager.restoreDeletedFlexObjects = function(mPropertyBag) {
+		const aDeletedFlexObjects = mPropertyBag.flexObjects.filter((oFlexObject) => (
+			oFlexObject.getState() === States.LifecycleState.DELETED
+			|| oFlexObject.getState() === States.LifecycleState.NEW
+		));
+		aDeletedFlexObjects.forEach((oFlexObject) => {
+			oFlexObject.restorePreviousState();
+		});
+
+		const aDirtyFlexObjectsToBeAdded = aDeletedFlexObjects.filter((oFlexObject) => (
+			oFlexObject.getState() !== States.LifecycleState.PERSISTED
+		));
+		FlexObjectManager.addDirtyFlexObjects(mPropertyBag.reference, aDirtyFlexObjectsToBeAdded);
 	};
 
 	/**

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

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

@@ -9,17 +9,21 @@ sap.ui.define([
 	"sap/ui/core/Component",
 	"sap/ui/fl/apply/_internal/changes/Applier",
 	"sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory",
+	"sap/ui/fl/apply/_internal/flexObjects/States",
 	"sap/ui/fl/apply/_internal/flexState/changes/DependencyHandler",
 	"sap/ui/fl/apply/_internal/flexState/FlexObjectState",
-	"sap/ui/fl/apply/_internal/flexState/FlexState"
+	"sap/ui/fl/apply/_internal/flexState/FlexState",
+	"sap/ui/fl/write/_internal/flexState/FlexObjectManager"
 ], function(
 	_omit,
 	Component,
 	Applier,
 	FlexObjectFactory,
+	States,
 	DependencyHandler,
 	FlexObjectState,
-	FlexState
+	FlexState,
+	FlexObjectManager
 ) {
 	"use strict";
 
@@ -29,7 +33,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.flexState.changes.UIChangeManager
 	 * @since 1.129
-	 * @version 1.129.0
+	 * @version 1.130.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -82,5 +86,24 @@ sap.ui.define([
 		return aAddedChanges;
 	};
 
+	/**
+	 * Restores previously deleted UIChanges.
+	 * They can be in state DELETED or NEW (when they were dirty and removed from the FlexState).
+	 *
+	 * @param {string} sReference - Flex reference of the application
+	 * @param {sap.ui.fl.apply._internal.flexObjects.UIChange[]} aChanges - Array of UIChange instances to be restored
+	 * @param {sap.ui.core.Component} oAppComponent - Application component instance
+	 */
+	UIChangeManager.restoreDeletedChanges = function(sReference, aChanges, oAppComponent) {
+		FlexObjectManager.restoreDeletedFlexObjects({
+			reference: sReference,
+			flexObjects: aChanges
+		});
+		const aDirtyChanges = aChanges.filter((oChange) => oChange.getState() !== States.LifecycleState.PERSISTED);
+		aDirtyChanges.forEach((oChange) => {
+			finalizeChangeCreation(sReference, oChange, oAppComponent);
+		});
+	};
+
 	return UIChangeManager;
 });

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

@@ -17,6 +17,7 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexObjects/States",
 	"sap/ui/fl/apply/_internal/flexObjects/UpdatableChange",
 	"sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantMerger",
+	"sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantManagementState",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"sap/ui/fl/initial/api/Version",
 	"sap/ui/fl/registry/Settings",
@@ -35,6 +36,7 @@ sap.ui.define([
 	States,
 	UpdatableChange,
 	CompVariantMerger,
+	CompVariantManagementState,
 	FlexState,
 	Version,
 	Settings,
@@ -310,7 +312,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.flexState.compVariants.CompVariantState
 	 * @since 1.83
-	 * @version 1.129.0
+	 * @version 1.130.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -341,12 +343,11 @@ sap.ui.define([
 		// TODO: remove as soon as the development uses an IDE using rta which passes the correct parameter
 		mPropertyBag.layer ||= new URLSearchParams(window.location.search).get("sap-ui-layer") || Layer.USER;
 
-		var mCompVariantsMap = FlexState.getCompVariantsMap(mPropertyBag.reference)._getOrCreate(mPropertyBag.persistencyKey);
-		var sChangeType = "defaultVariant";
-		var aDefaultVariantChanges = mCompVariantsMap.defaultVariants;
-		var oChange = aDefaultVariantChanges[aDefaultVariantChanges.length - 1];
+		let oChange = CompVariantManagementState.getDefaultChanges(mPropertyBag).slice(-1)[0];
 
 		if (!oChange || !isChangeUpdatable(oChange, mPropertyBag)) {
+			var mCompVariantsMap = FlexState.getCompVariantsMap(mPropertyBag.reference)._getOrCreate(mPropertyBag.persistencyKey);
+			var sChangeType = "defaultVariant";
 			var oChangeParameter = {
 				fileName: Utils.createDefaultFileName(sChangeType),
 				fileType: "change",
@@ -363,7 +364,6 @@ sap.ui.define([
 			oChangeParameter.adaptationId = mPropertyBag.changeSpecificData?.adaptationId;
 			oChangeParameter.support.generator ||= `CompVariantState.${sChangeType}`;
 			oChange = FlexObjectFactory.createFromFileContent(oChangeParameter, UpdatableChange);
-			mCompVariantsMap.defaultVariants.push(oChange);
 			mCompVariantsMap.byId[oChange.getId()] = oChange;
 			oChange.addRevertInfo(new RevertData({
 				type: CompVariantState.operationType.NewChange
@@ -390,16 +390,15 @@ sap.ui.define([
 	 * @param {string} mPropertyBag.persistencyKey - ID of the variant management internal identifier
 	 */
 	CompVariantState.revertSetDefaultVariantId = function(mPropertyBag) {
-		var mCompVariantsMap = FlexState.getCompVariantsMap(mPropertyBag.reference)._getOrCreate(mPropertyBag.persistencyKey);
-		var aDefaultVariantChanges = mCompVariantsMap.defaultVariants;
-		var oChange = aDefaultVariantChanges[aDefaultVariantChanges.length - 1];
-		var oRevertInfo = oChange.popLatestRevertInfo();
+		const aDefaultChanges = CompVariantManagementState.getDefaultChanges(mPropertyBag);
+		const oChange = aDefaultChanges?.slice(-1)[0];
+		const oRevertInfo = oChange.popLatestRevertInfo();
 		if (oRevertInfo.getType() === CompVariantState.operationType.ContentUpdate) {
 			oChange.setContent(oRevertInfo.getContent().previousContent);
 			oChange.setState(oRevertInfo.getContent().previousState);
 		} else {
 			oChange.setState(States.LifecycleState.DELETED);
-			mCompVariantsMap.defaultVariants.pop();
+			aDefaultChanges.pop();
 		}
 	};
 
@@ -919,9 +918,18 @@ sap.ui.define([
 		const sPersistencyKey = mPropertyBag.persistencyKey;
 		const mCompVariantsMap = FlexState.getCompVariantsMap(sReference);
 		const mCompVariantsMapByPersistencyKey = mCompVariantsMap._getOrCreate(sPersistencyKey);
+		const aSetDefaultChanges = CompVariantManagementState.getDefaultChanges({
+			reference: mPropertyBag.reference,
+			persistencyKey: mPropertyBag.persistencyKey
+		});
+
+		const aCompVariantEntities = [
+			...getAllCompVariantObjects(mCompVariantsMapByPersistencyKey),
+			...aSetDefaultChanges
+		];
 
 		const oStoredResponse = await FlexState.getStorageResponse(sReference);
-		const aFlexObjects = getAllCompVariantObjects(mCompVariantsMapByPersistencyKey).filter(needsPersistencyCall);
+		const aFlexObjects = aCompVariantEntities.filter(needsPersistencyCall);
 		const aPromises = aFlexObjects.map(function(oFlexObject, index) {
 			if (index === 0) {
 				const sParentVersion = getPropertyFromVersionsModel("/persistedVersion", {

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