@openui5/sap.ui.fl 1.118.0 → 1.119.0

package/src/sap/ui/fl/util/IFrameRenderer.js

@@ -40,7 +40,15 @@ sap.ui.define([
 		oRm.style("border", "none");
 
 		oRm.attr("sandbox", "allow-forms allow-popups allow-scripts allow-same-origin allow-modals");
-		oRm.attr("src", oIFrame.getUrl());
+
+		if (oIFrame.getUseLegacyNavigation()) {
+			oRm.attr("src", oIFrame.getUrl());
+		} else {
+			// With the new location.replace approach, the actual
+			// target url will be set onAfterRendering
+			oRm.attr("src", "about:blank");
+		}
+
 		var sTitle = oIFrame.getTitle();
 		if (sTitle) {
 			oRm.attr("title", sTitle);

package/src/sap/ui/fl/util/ManagedObjectModel.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/fl/util/resolveBinding.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 *
 	 * @function
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @alias sap.ui.fl.util.resolveBinding
 	 * @since 1.91
 	 * @private

package/src/sap/ui/fl/variants/VariantManagement.js

@@ -164,23 +164,6 @@ sap.ui.define([
 					type: "sap.ui.core.CSSSize",
 					group: "Dimension",
 					defaultValue: "100%"
-				},
-
-				/**
-				 * Renders the name of the variant as a text.
-				 * The name of the variant is usually rendered as {@link sap.m.Title}
-				 * but there are use cases - related to accessibility requirements - where the
-				 * rendering should be done using {@link sap.m.Text} instead.
-				 * <b>Note:</b>:<br>
-				 * If the name of the variant is rendered as <code>sap.m.Text</code>, all the <code>sap.m.Title</code>-
-				 * specific information (<code>headerLevel</code> and <code>titleStyle</code>) is ignored.
-				 *
-				 * @since 1.118
-				 */
-				showAsText: {
-					type: "boolean",
-					group: "Misc",
-					defaultValue: false
 				}
 			},
 			events: {
@@ -675,12 +658,28 @@ sap.ui.define([
 		return this;
 	};
 
+	/**
+ 	 * Special handling of the rendering of this control.
+	 * @param {boolean} bValue defines the intended rendering
+	 * @returns {sap.ui.fl.variants.VariantManagement} the current instance
+	 * @private
+	 * @restricted sap.ui.mdc
+ 	 */
 	VariantManagement.prototype.setShowAsText = function(bValue) {
-		this.setProperty("showAsText", bValue);
 		this._oVM.setShowAsText(bValue);
 		return this;
 	};
 
+	/**
+ 	 * Special handling of the rendering of this control.
+	 * @returns {boolean} the current intend
+	 * @private
+	 * @restricted sap.ui.mdc
+ 	 */
+	VariantManagement.prototype.getShowAsText = function() {
+		return this._oVM.getShowAsText();
+	};
+
 	VariantManagement.prototype.setEditable = function(bValue) {
 		this.setProperty("editable", bValue);
 		this._oVM.setShowFooter(bValue);

package/src/sap/ui/fl/variants/VariantModel.js

@@ -292,7 +292,7 @@ sap.ui.define([
 	 * @class Variant model implementation for JSON format.
 	 * @extends sap.ui.model.json.JSONModel
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @param {object} oData - Either the URL where to load the JSON from or a JS object
 	 * @param {object} mPropertyBag - Map of properties required for the constructor
 	 * @param {sap.ui.fl.FlexController} mPropertyBag.flexController - <code>FlexController</code> instance for the component which uses the variant model
@@ -1489,6 +1489,7 @@ sap.ui.define([
 	VariantModel.prototype.destroy = function() {
 		this.oDataSelector.removeUpdateListener(this.fnUpdateListener);
 		VariantManagementState.clearRuntimeSteadyObjects(this.sFlexReference, this.oAppComponent.getId());
+		VariantManagementState.resetCurrentVariantReference(this.sFlexReference);
 		JSONModel.prototype.destroy.apply(this);
 	};
 

package/src/sap/ui/fl/variants/context/manifest.json

@@ -30,8 +30,8 @@
 		"dependencies": {
 			"minUI5Version": "1.87.0",
 			"libs": {
-				"sap.ui.core": {},
-				"sap.m": {}
+				"sap.m": {},
+				"sap.ui.core": {}
 			}
 		},
 		"contentDensities": {

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.Storage
 	 * @since 1.67
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.StorageFeaturesMerger
 	 * @since 1.70
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

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

@@ -201,7 +201,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.Versions
 	 * @since 1.74
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -267,7 +267,7 @@ sap.ui.define([
 	Versions.hasVersionsModel = function(mPropertyBag) {
 		var sReference = mPropertyBag.reference;
 		var sLayer = mPropertyBag.layer;
-		return _mInstances[sReference] && _mInstances[sReference][sLayer];
+		return !!(_mInstances[sReference] && _mInstances[sReference][sLayer]);
 	};
 
 	Versions.clearInstances = function() {
@@ -283,7 +283,7 @@ sap.ui.define([
 	 * @returns {Promise<sap.ui.fl.Version>} Promise resolving with the updated version model for the application from the backend
 	 */
 	Versions.updateModelFromBackend = function(mPropertyBag) {
-		if (Versions.hasVersionsModel(mPropertyBag)) {
+		if (Versions.hasVersionsModel(mPropertyBag) && Versions.getVersionsModel(mPropertyBag).getProperty("/versioningEnabled")) {
 			mPropertyBag.limit = BACKEND_REQUEST_LIMIT;
 			return Storage.versions.load(mPropertyBag)
 			.then(function(aVersions) {

package/src/sap/ui/fl/write/_internal/appVariant/AppVariant.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariant
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/write/_internal/appVariant/AppVariantFactory.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariantFactory
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/write/_internal/appVariant/AppVariantInlineChange.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariantInlineChange
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/write/_internal/appVariant/AppVariantInlineChangeFactory.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariantInlineChangeFactory
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/write/_internal/condenser/Condenser.js

@@ -51,7 +51,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.condenser.Condenser
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 */
 	var Condenser = {};
 

package/src/sap/ui/fl/write/_internal/condenser/UIReconstruction.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.condenser.UIReconstruction
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 */
 	var UIReconstruction = {};
 

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

@@ -74,7 +74,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.BackendConnector
 	 * @since 1.72
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.connectors
 	 */

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

@@ -12,7 +12,7 @@ sap.ui.define([
 	"sap/ui/fl/initial/_internal/connectors/Utils",
 	"sap/ui/fl/write/_internal/connectors/Utils",
 	"sap/base/util/restricted/_pick",
-	"sap/ui/fl/write/_internal/FlexInfoSession",
+	"sap/ui/fl/initial/_internal/FlexInfoSession",
 	"sap/ui/core/BusyIndicator",
 	"sap/base/Log",
 	"sap/m/MessageBox"
@@ -38,7 +38,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.KeyUserConnector
 	 * @since 1.70
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

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

@@ -166,7 +166,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.LrepConnector
 	 * @since 1.67
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.NeoLrepConnector
 	 * @since 1.81
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @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.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

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

@@ -28,7 +28,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.PersonalizationConnector
 	 * @since 1.70
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @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.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.connectors, sap.ui.fl.write._internal.transport
 	 */

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

@@ -28,7 +28,7 @@ function(
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 */
 	var Processor = {
 		applyExtensionPoint(oExtensionPoint) {

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

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.extensionPoint.Registry
 	 *
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

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.118.0
+	 * @version 1.119.0
 	 * @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.118.0
+	 * @version 1.119.0
 	 * @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.118.0
+	 * @version 1.119.0
 	 * @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.118.0
+	 * @version 1.119.0
 	 * @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.118.0
+	 * @version 1.119.0
 	 * @private
 	 */
 	var ServiceValidation = {};

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

@@ -43,7 +43,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.SingleTenantABAPExtensibilityVariant
 	 * @since 1.87
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @public
 	 */
 

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.118.0
+	 * @version 1.119.0
 	 * @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.118.0
+	 * @version 1.119.0
 	 * @private
 	 */
 	var Utils = {};

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

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

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

@@ -80,7 +80,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.dialog.CustomFieldCAPDialog
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @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.118.0
+	 * @version 1.119.0
 	 *
 	 * @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.118.0
+	 * @version 1.119.0
 	 *
 	 * @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.118.0
+	 * @version 1.119.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

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

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.flexState.FlexObjectState
 	 * @since 1.83
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -269,23 +269,35 @@ sap.ui.define([
 		}
 	}
 
+	function getSVMControls(sReference) {
+		const mCompVariantsMap = FlexState.getCompVariantsMap(sReference);
+		const aSVMControls = [];
+		if (mCompVariantsMap) {
+			Object.values(mCompVariantsMap).forEach(function(mMap) {
+				const oSVMControl = mMap.controlId && Core.byId(mMap.controlId);
+				if (oSVMControl) {
+					aSVMControls.push(oSVMControl);
+				}
+			});
+		}
+		return aSVMControls;
+	}
+
 	/**
 	 * CompVariant state class to handle the state of the compVariants and its changes.
 	 * This class is in charge of updating the maps stored in the <code>sap.ui.fl.apply._internal.flexState.FlexState</code>.
 	 *
 	 * @namespace sap.ui.fl.write._internal.flexState.compVariants.CompVariantState
 	 * @since 1.83
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
 	var CompVariantState = {};
 
 	CompVariantState.checkSVMControlsForDirty = function(sReference) {
-		var mCompVariantsMap = FlexState.getCompVariantsMap(sReference);
-		return Object.values(mCompVariantsMap).some(function(mMap) {
-			var oControl = mMap.controlId && Core.byId(mMap.controlId);
-			return oControl && oControl.getModified();
+		return getSVMControls(sReference).some((oSVMControl) => {
+			return oSVMControl.getModified();
 		});
 	};
 
@@ -821,7 +833,7 @@ sap.ui.define([
 	 * @returns {Promise} Promise resolving with an array of responses or rejecting with the first error
 	 * @private
 	 */
-	CompVariantState.persist = function(mPropertyBag) {
+	CompVariantState.persist = async function(mPropertyBag) {
 		function writeObjectAndAddToState(oFlexObject, oStoredResponse, sParentVersion) {
 			// new public variant should not be visible for other users
 			if (oFlexObject.getLayer() === Layer.PUBLIC) {
@@ -850,7 +862,7 @@ sap.ui.define([
 				}
 			}).then(function() {
 				// update StorageResponse
-				var oFileContent = oFlexObject.convertToFileContent();
+				const oFileContent = oFlexObject.convertToFileContent();
 				getSubSection(oStoredResponse.changes.comp, oFlexObject).push(oFileContent);
 				return oFileContent;
 			});
@@ -868,41 +880,41 @@ sap.ui.define([
 					ifVariantClearRevertData(oFlexObject);
 					return deleteObjectAndRemoveFromStorage(oFlexObject, mCompVariantsMapByPersistencyKey, oStoredResponse, sParentVersion);
 				default:
-					break;
+					return undefined;
 			}
 		}
 
-		var sReference = mPropertyBag.reference;
-		var sPersistencyKey = mPropertyBag.persistencyKey;
-		var mCompVariantsMap = FlexState.getCompVariantsMap(sReference);
-		var mCompVariantsMapByPersistencyKey = mCompVariantsMap._getOrCreate(sPersistencyKey);
-
-		return FlexState.getStorageResponse(sReference)
-		.then(function(oStoredResponse) {
-			var aFlexObjects = getAllCompVariantObjects(mCompVariantsMapByPersistencyKey).filter(needsPersistencyCall);
-			var aPromises = aFlexObjects.map(function(oFlexObject, index) {
-				if (index === 0) {
-					var sParentVersion = getPropertyFromVersionsModel("/persistedVersion", {
-						layer: oFlexObject.getLayer(),
-						reference: oFlexObject.getFlexObjectMetadata().reference
-					});
-					// TODO: use condensing route to reduce backend requests
-					// need to save first entry to generate draft version in backend
-					return saveObject(oFlexObject, mCompVariantsMapByPersistencyKey, oStoredResponse, sParentVersion)
-					.then(function() {
-						var aPromises = aFlexObjects.map(function(oFlexObject, index) {
-							if (index !== 0) {
-								var sDraftVersion = sParentVersion ? Version.Number.Draft : undefined;
-								return saveObject(oFlexObject, mCompVariantsMapByPersistencyKey, oStoredResponse, sDraftVersion);
-							}
-						});
-						return Promise.all(aPromises);
+		const sReference = mPropertyBag.reference;
+		const sPersistencyKey = mPropertyBag.persistencyKey;
+		const mCompVariantsMap = FlexState.getCompVariantsMap(sReference);
+		const mCompVariantsMapByPersistencyKey = mCompVariantsMap._getOrCreate(sPersistencyKey);
+
+		const oStoredResponse = await FlexState.getStorageResponse(sReference);
+		const aFlexObjects = getAllCompVariantObjects(mCompVariantsMapByPersistencyKey).filter(needsPersistencyCall);
+		const aPromises = aFlexObjects.map(function(oFlexObject, index) {
+			if (index === 0) {
+				const sParentVersion = getPropertyFromVersionsModel("/persistedVersion", {
+					layer: oFlexObject.getLayer(),
+					reference: oFlexObject.getFlexObjectMetadata().reference
+				});
+				// TODO: use condensing route to reduce backend requests
+				// need to save first entry to generate draft version in backend
+				return saveObject(oFlexObject, mCompVariantsMapByPersistencyKey, oStoredResponse, sParentVersion)
+				.then(function() {
+					const aPromises = aFlexObjects.map(function(oFlexObject, index) {
+						if (index !== 0) {
+							const sDraftVersion = sParentVersion ? Version.Number.Draft : undefined;
+							return saveObject(oFlexObject, mCompVariantsMapByPersistencyKey, oStoredResponse, sDraftVersion);
+						}
+						return undefined;
 					});
-				}
-			});
-			// TODO Consider not rejecting with first error, but wait for all promises and collect the results
-			return Promise.all(aPromises);
+					return Promise.all(aPromises);
+				});
+			}
+			return undefined;
 		});
+		// TODO Consider not rejecting with first error, but wait for all promises and collect the results
+		return Promise.all(aPromises);
 	};
 
 	/**
@@ -912,16 +924,24 @@ sap.ui.define([
 	 * @returns {Promise} Promise resolving with an array of responses or rejecting with the first error
 	 * @private
 	 */
-	CompVariantState.persistAll = function(sReference) {
-		var mCompEntities = _omit(FlexState.getCompVariantsMap(sReference), "_getOrCreate", "_initialize");
+	CompVariantState.persistAll = async function(sReference) {
+		const mCompEntities = _omit(FlexState.getCompVariantsMap(sReference), "_getOrCreate", "_initialize");
 		// Calls must be done sequentially because the backend can't do this in parallel
 		// and first call might create draft which requires other parameters for following calls
-		return Object.keys(mCompEntities).reduce(function(oPromise, sPersistencyKey) {
-			return oPromise.then(CompVariantState.persist.bind(undefined, {
+		const aResponses = [];
+		const aSVMControls = getSVMControls(sReference);
+		for (const sPersistencyKey of Object.keys(mCompEntities)) {
+			const oResponse = await CompVariantState.persist({
 				reference: sReference,
 				persistencyKey: sPersistencyKey
-			}));
-		}, Promise.resolve());
+			});
+			aResponses.push(oResponse);
+		}
+		// persistAll can be triggered from e.g. Key User Adaptation, making the controls no longer dirty
+		aSVMControls.forEach((oSVMControl) => {
+			oSVMControl.setModified(false);
+		});
+		return aResponses;
 	};
 
 	/**

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.118.0
+	 * @version 1.119.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.