@openui5/sap.ui.fl 1.115.1 → 1.117.0

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

@@ -11,10 +11,10 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
-	"sap/ui/fl/apply/_internal/ChangesController",
 	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
 	"sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState",
 	"sap/ui/fl/write/_internal/Versions",
+	"sap/ui/fl/FlexControllerFactory",
 	"sap/ui/fl/ChangePersistenceFactory",
 	"sap/ui/fl/LayerUtils",
 	"sap/ui/fl/Utils"
@@ -25,10 +25,10 @@ sap.ui.define([
 	VariantManagementState,
 	FlexState,
 	ManifestUtils,
-	ChangesController,
 	ControlVariantApplyAPI,
 	CompVariantState,
 	Versions,
+	FlexControllerFactory,
 	ChangePersistenceFactory,
 	LayerUtils,
 	Utils
@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.flexState.FlexObjectState
 	 * @since 1.83
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -58,7 +58,7 @@ sap.ui.define([
 	function getCompVariantEntities(mPropertyBag) {
 		var mCompEntities = FlexState.getCompVariantsMap(mPropertyBag.reference);
 		var aEntities = [];
-		//Enhance CompVariantsMap with external data and standard variant after FlexState has been cleared and reinitialized
+		// Enhance CompVariantsMap with external data and standard variant after FlexState has been cleared and reinitialized
 		if (mPropertyBag.invalidateCache) {
 			var oDataToRestore = FlexState.getInitialNonFlCompVariantData(mPropertyBag.reference);
 			if (oDataToRestore) {
@@ -85,8 +85,7 @@ sap.ui.define([
 
 	function getChangePersistence(mPropertyBag) {
 		if (!mPropertyBag.reference) {
-			var oAppComponent = ChangesController.getAppComponentForSelector(mPropertyBag.selector);
-			mPropertyBag.reference = ManifestUtils.getFlexReferenceForControl(oAppComponent);
+			mPropertyBag.reference = ManifestUtils.getFlexReferenceForSelector(mPropertyBag.selector);
 		}
 		return ChangePersistenceFactory.getChangePersistenceForComponent(mPropertyBag.reference);
 	}
@@ -134,26 +133,26 @@ sap.ui.define([
 		var oChangePersistence = getChangePersistence(mPropertyBag);
 
 		return oChangePersistence.getChangesForComponent(_omit(mPropertyBag, ["invalidateCache", "selector"]), mPropertyBag.invalidateCache)
-			.then(function(aPersistedChanges) {
-				var aDirtyChanges = [];
-				if (mPropertyBag.includeDirtyChanges) {
-					aDirtyChanges = oChangePersistence.getDirtyChanges();
-					if (mPropertyBag.currentLayer) {
-						aDirtyChanges = aDirtyChanges.filter(function(oChange) {
-							return oChange.getLayer() === mPropertyBag.currentLayer;
-						});
-					}
+		.then(function(aPersistedChanges) {
+			var aDirtyChanges = [];
+			if (mPropertyBag.includeDirtyChanges) {
+				aDirtyChanges = oChangePersistence.getDirtyChanges();
+				if (mPropertyBag.currentLayer) {
+					aDirtyChanges = aDirtyChanges.filter(function(oChange) {
+						return oChange.getLayer() === mPropertyBag.currentLayer;
+					});
 				}
-				var aChanges = aPersistedChanges.concat(aDirtyChanges);
-				if (mPropertyBag.onlyCurrentVariants) {
-					return filterChangesByCurrentVariants(aChanges, mPropertyBag.selector);
-				}
-				return aChanges;
-			});
+			}
+			var aChanges = aPersistedChanges.concat(aDirtyChanges);
+			if (mPropertyBag.onlyCurrentVariants) {
+				return filterChangesByCurrentVariants(aChanges, mPropertyBag.selector);
+			}
+			return aChanges;
+		});
 	}
 
 	function saveChangePersistenceEntities(mPropertyBag, oAppComponent) {
-		var oFlexController = ChangesController.getFlexControllerInstance(mPropertyBag.selector);
+		var oFlexController = FlexControllerFactory.createForSelector(mPropertyBag.selector);
 
 		return oFlexController.saveAll(
 			oAppComponent,
@@ -172,20 +171,20 @@ sap.ui.define([
 	 * @param {object} mPropertyBag - Object with parameters as properties
 	 * @param {sap.ui.fl.Selector} mPropertyBag.selector - Retrieves the associated flex persistence
 	 * @param {string} [mPropertyBag.layer] - Specifies a single layer for loading change; if this parameter is set, the max layer filtering is not applied
-	 * @param {string} [mPropertyBar.currentLayer] - Specifies a single layer to filtering changes (without filtering ctrl variant changes)
+	 * @param {string} [mPropertyBag.currentLayer] - Specifies a single layer to filtering changes (without filtering ctrl variant changes)
 	 * @param {boolean} [mPropertyBag.invalidateCache] - Flag if the cache should be invalidated
 	 * @param {boolean} [mPropertyBag.includeCtrlVariants] - Flag if control variant changes should be included
 	 * @param {boolean} [mPropertyBag.includeDirtyChanges] - Flag if dirty UI changes should be included
 	 * @param {boolean} [mPropertyBag.version] - The version for which the objects are retrieved
 	 * @returns {Promise<sap.ui.fl.apply._internal.flexObjects.FlexObject[]>} Flex objects, containing changes, compVariants & changes as well as ctrl_variant and changes
 	 */
-	FlexObjectState.getFlexObjects = function (mPropertyBag) {
+	FlexObjectState.getFlexObjects = function(mPropertyBag) {
 		return initFlexStateAndSetReference(mPropertyBag)
-			.then(function () {
-				return getChangePersistenceEntities(mPropertyBag);
-			}).then(function (aChangePersistenceEntities) {
-				return getCompVariantEntities(mPropertyBag).concat(aChangePersistenceEntities);
-			});
+		.then(function() {
+			return getChangePersistenceEntities(mPropertyBag);
+		}).then(function(aChangePersistenceEntities) {
+			return getCompVariantEntities(mPropertyBag).concat(aChangePersistenceEntities);
+		});
 	};
 
 	/**
@@ -198,7 +197,7 @@ sap.ui.define([
 	 * @param {boolean} mPropertyBag.includeCtrlVariants - Flag if control variant changes should be included
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} Flex objects, containing changes, compVariants & changes as well as ctrl_variant and changes
 	 */
-	FlexObjectState.getDirtyFlexObjects = function (mPropertyBag) {
+	FlexObjectState.getDirtyFlexObjects = function(mPropertyBag) {
 		mPropertyBag.includeDirtyChanges = true;
 		var oChangePersistence = getChangePersistence(mPropertyBag);
 		var aChangePersistenceEntities = oChangePersistence.getDirtyChanges();
@@ -216,9 +215,8 @@ sap.ui.define([
 	 * @param {sap.ui.fl.Selector} mPropertyBag.selector To retrieve the associated flex persistence
 	 * @returns {boolean} <code>true</code> if dirty flex objects exist
 	 */
-	FlexObjectState.hasDirtyFlexObjects = function (mPropertyBag) {
-		var oAppComponent = ChangesController.getAppComponentForSelector(mPropertyBag.selector);
-		var sReference = ManifestUtils.getFlexReferenceForControl(oAppComponent);
+	FlexObjectState.hasDirtyFlexObjects = function(mPropertyBag) {
+		var sReference = ManifestUtils.getFlexReferenceForSelector(mPropertyBag.selector);
 		if (ChangePersistenceFactory.getChangePersistenceForComponent(sReference).getDirtyChanges().length > 0) {
 			return true;
 		}
@@ -242,7 +240,7 @@ sap.ui.define([
 	 * @returns {Promise<sap.ui.fl.apply._internal.flexObjects.FlexObject[]>} Flex objects, containing changes, compVariants & changes as well as ctrl_variant and changes
 	 */
 	FlexObjectState.saveFlexObjects = function(mPropertyBag) {
-		var oAppComponent = ChangesController.getAppComponentForSelector(mPropertyBag.selector);
+		var oAppComponent = Utils.getAppComponentForSelector(mPropertyBag.selector);
 		mPropertyBag.reference = ManifestUtils.getFlexReferenceForControl(mPropertyBag.selector);
 		return saveCompEntities(mPropertyBag)
 		.then(saveChangePersistenceEntities.bind(this, mPropertyBag, oAppComponent))
@@ -252,7 +250,7 @@ sap.ui.define([
 				mPropertyBag.version = oModel.getProperty("/displayedVersion");
 			}
 			if (mPropertyBag.layer) {
-				//TODO: sync the layer parameter name with new persistence and remove this line
+				// TODO: sync the layer parameter name with new persistence and remove this line
 				mPropertyBag.currentLayer = mPropertyBag.layer;
 			}
 			// with invalidation more parameters are required to make a new storage request

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

@@ -109,7 +109,7 @@ sap.ui.define([
 			layer: oFlexObject.getLayer(),
 			transport: oFlexObject.getRequest(),
 			parentVersion: sParentVersion
-		}).then(function (result) {
+		}).then(function(result) {
 			// update FlexObject and versionModel
 			if (result && result.response) {
 				oFlexObject.setResponse(result.response);
@@ -123,7 +123,7 @@ sap.ui.define([
 			} else {
 				oFlexObject.setState(States.LifecycleState.PERSISTED);
 			}
-		}).then(function () {
+		}).then(function() {
 			// update StorageResponse
 			var aObjectArray = getSubSection(oStoredResponse.changes.comp, oFlexObject);
 			var oFileContent = oFlexObject.convertToFileContent();
@@ -134,9 +134,9 @@ sap.ui.define([
 
 	function removeFromArrayById(aObjectArray, sObjectId) {
 		for (var 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
+			// 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
 			var sFileName = aObjectArray[i].fileName || (aObjectArray[i].getId() && aObjectArray[i].getId());
 			if ((sFileName || aObjectArray[i].getId()) === sObjectId) {
 				aObjectArray.splice(i, 1);
@@ -161,7 +161,7 @@ sap.ui.define([
 			layer: oFlexObject.getLayer(),
 			transport: oFlexObject.getRequest(),
 			parentVersion: sParentVersion
-		}).then(function () {
+		}).then(function() {
 			// update CompVariantsMap
 			removeFromCompVariantsMap(oFlexObject, mCompVariantsMapByPersistencyKey);
 		}).then(Versions.updateModelFromBackend.bind(this, {
@@ -180,7 +180,7 @@ sap.ui.define([
 	function getTexts(mPropertyBag) {
 		var mInternalTexts = {};
 		if (typeof (mPropertyBag.texts) === "object") {
-			Object.keys(mPropertyBag.texts).forEach(function (key) {
+			Object.keys(mPropertyBag.texts).forEach(function(key) {
 				mInternalTexts[key] = {
 					value: mPropertyBag.texts[key],
 					type: "XFLD"
@@ -197,9 +197,9 @@ sap.ui.define([
 
 	function getAllCompVariantObjects(mCompVariantsMapByPersistencyKey) {
 		return mCompVariantsMapByPersistencyKey.variants
-			.concat(mCompVariantsMapByPersistencyKey.changes)
-			.concat(mCompVariantsMapByPersistencyKey.defaultVariants)
-			.concat(mCompVariantsMapByPersistencyKey.standardVariantChange);
+		.concat(mCompVariantsMapByPersistencyKey.changes)
+		.concat(mCompVariantsMapByPersistencyKey.defaultVariants)
+		.concat(mCompVariantsMapByPersistencyKey.standardVariantChange);
 	}
 
 	function determineLayer(mPropertyBag) {
@@ -275,7 +275,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.flexState.compVariants.CompVariantState
 	 * @since 1.83
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -301,7 +301,7 @@ sap.ui.define([
 	 * @param {sap.ui.fl.Layer} [mPropertyBag.layer = Layer.USER] - Enables setDefault for the given layer
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject} Created or updated change object in charge for setting the default variant
 	 */
-	CompVariantState.setDefault = function (mPropertyBag) {
+	CompVariantState.setDefault = function(mPropertyBag) {
 		var oContent = {
 			defaultVariantName: mPropertyBag.defaultVariantId
 		};
@@ -327,6 +327,7 @@ sap.ui.define([
 				},
 				support: mPropertyBag.support || {}
 			};
+			oChangeParameter.adaptationId = mPropertyBag.changeSpecificData?.adaptationId;
 			oChangeParameter.support.generator = oChangeParameter.support.generator || "CompVariantState." + sChangeType;
 			oChangeParameter.support.sapui5Version = Core.getConfiguration().getVersion().toString();
 			oChange = FlexObjectFactory.createFromFileContent(oChangeParameter, UpdatableChange);
@@ -355,7 +356,7 @@ sap.ui.define([
 	 * @param {string} mPropertyBag.reference - Flex reference of the application
 	 * @param {string} mPropertyBag.persistencyKey - ID of the variant management internal identifier
 	 */
-	CompVariantState.revertSetDefaultVariantId = function (mPropertyBag) {
+	CompVariantState.revertSetDefaultVariantId = function(mPropertyBag) {
 		var mCompVariantsMap = FlexState.getCompVariantsMap(mPropertyBag.reference)._getOrCreate(mPropertyBag.persistencyKey);
 		var aDefaultVariantChanges = mCompVariantsMap.defaultVariants;
 		var oChange = aDefaultVariantChanges[aDefaultVariantChanges.length - 1];
@@ -427,27 +428,30 @@ sap.ui.define([
 	 * @param {object} [mPropertyBag.name] - Title of the variant
 	 * @param {object} [mPropertyBag.content] - Content of the new change
 	 * @param {object} [mPropertyBag.favorite] - Flag if the variant should be flagged as a favorite
+	 * @param {boolean} [mPropertyBag.visible] - Flag if the variant should be set visible
 	 * @param {object} [mPropertyBag.executeOnSelection] - Flag if the variant should be executed on selection
 	 * @param {object} [mPropertyBag.contexts] - Map of contexts that restrict the visibility of the variant
 	 * @param {string[]} [mPropertyBag.contexts.role] - List of roles which are allowed to see the variant
 	 * @param {sap.ui.fl.Layer} mPropertyBag.layer - Layer in which the variant removal takes place;
+	 * @param {string} mPropertyBag.adaptationId - ID of the context-based adaptation
+	 * @param {boolean} [mPropertyBag.forceCreate] - Parameter that forces a new change to be created
 	 * this either updates the variant from the layer or writes a change to that layer.
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.CompVariant} The updated variant
 	 */
-	CompVariantState.updateVariant = function (mPropertyBag) {
+	CompVariantState.updateVariant = function(mPropertyBag) {
 		function variantCanBeUpdated(oVariant, sLayer) {
 			var bSameLayer = oVariant.getLayer() === sLayer;
 			var sPackageName = oVariant.getFlexObjectMetadata().packageName;
 			var bNotTransported = !sPackageName || sPackageName === "$TMP";
 			// in case changes were already done within the layer, no update of the variant can be done to safeguard the execution order
-			var bIsChangedOnLayer = oVariant.getChanges().some(function (oChange) {
+			var bIsChangedOnLayer = oVariant.getChanges().some(function(oChange) {
 				return oChange.getLayer() === sLayer;
 			});
 			return oVariant.getPersisted() && bSameLayer && bNotTransported && !bIsChangedOnLayer && isVersionIndependentOrInDraft(oVariant, mPropertyBag);
 		}
 
 		function getLatestUpdatableChange(oVariant) {
-			return oVariant.getChanges().reverse().find(function (oChange) {
+			return oVariant.getChanges().reverse().find(function(oChange) {
 				return oChange.getChangeType() === "updateVariant" && isChangeUpdatable(oChange, mPropertyBag);
 			});
 		}
@@ -460,6 +464,7 @@ sap.ui.define([
 					previousState: oVariant.getState(),
 					previousContent: oVariant.getContent(),
 					previousFavorite: oVariant.getFavorite(),
+					previousVisible: oVariant.getVisible(),
 					previousExecuteOnSelection: oVariant.getExecuteOnSelection(),
 					previousContexts: oVariant.getContexts(),
 					previousName: oVariant.getName(),
@@ -475,9 +480,15 @@ sap.ui.define([
 			if (mPropertyBag.executeOnSelection !== undefined) {
 				oVariant.storeExecuteOnSelection(mPropertyBag.executeOnSelection);
 			}
-			if (mPropertyBag.favorite !== undefined) {
+			// public variant should not be visible for other users
+			if (mPropertyBag.layer === Layer.PUBLIC) {
+				oVariant.storeFavorite(false);
+			} else	if (mPropertyBag.favorite !== undefined) {
 				oVariant.storeFavorite(mPropertyBag.favorite);
 			}
+			if (mPropertyBag.visible !== undefined) {
+				oVariant.storeVisible(mPropertyBag.visible);
+			}
 			if (mPropertyBag.contexts) {
 				oVariant.storeContexts(mPropertyBag.contexts);
 			}
@@ -496,7 +507,7 @@ sap.ui.define([
 			var oRevertData = {
 				previousContent: Object.assign({}, oChangeContent),
 				previousState: oChange.getState(),
-				change: _pick(Object.assign({}, mPropertyBag), ["favorite", "executeOnSelection", "contexts", "content", "name"])
+				change: _pick(Object.assign({}, mPropertyBag), ["favorite", "visible", "executeOnSelection", "contexts", "content", "name"])
 			};
 			aRevertData.push(oRevertData);
 			oChange.setRevertData(aRevertData);
@@ -506,12 +517,18 @@ sap.ui.define([
 			if (mPropertyBag.favorite !== undefined) {
 				oChangeContent.favorite = mPropertyBag.favorite;
 			}
+			if (mPropertyBag.visible !== undefined) {
+				oChangeContent.visible = mPropertyBag.visible;
+			}
 			if (mPropertyBag.contexts) {
 				oChangeContent.contexts = mPropertyBag.contexts;
 			}
 			if (mPropertyBag.content) {
 				oChangeContent.variantContent = mPropertyBag.content;
 			}
+			if (mPropertyBag.adaptationId) {
+				oChange.setAdaptationId(mPropertyBag.adaptationId);
+			}
 			if (mPropertyBag.name) {
 				oChange.setText("variantName", mPropertyBag.name);
 			}
@@ -532,7 +549,7 @@ sap.ui.define([
 			}
 
 			var oContent = {};
-			["favorite", "executeOnSelection", "contexts"].forEach(function (sPropertyName) {
+			["favorite", "visible", "executeOnSelection", "contexts"].forEach(function(sPropertyName) {
 				if (mPropertyBag[sPropertyName] !== undefined) {
 					oContent[sPropertyName] = mPropertyBag[sPropertyName];
 				}
@@ -554,7 +571,9 @@ sap.ui.define([
 				}
 			});
 
-			if (mPropertyBag.changeSpecificData && mPropertyBag.changeSpecificData.adaptationId !== undefined) {
+			if (mPropertyBag.adaptationId !== undefined) {
+				oChange.setAdaptationId(mPropertyBag.adaptationId);
+			} else if (mPropertyBag.changeSpecificData && mPropertyBag.changeSpecificData.adaptationId !== undefined) {
 				oChange.setAdaptationId(mPropertyBag.changeSpecificData.adaptationId);
 			}
 
@@ -573,7 +592,9 @@ sap.ui.define([
 		var oVariant = getVariantById(mPropertyBag);
 		var sLayer = determineLayer(mPropertyBag);
 
-		if (variantCanBeUpdated(oVariant, sLayer)) {
+		if (mPropertyBag.forceCreate) {
+			createChange(mPropertyBag, oVariant);
+		} else if (variantCanBeUpdated(oVariant, sLayer)) {
 			updateVariant(mPropertyBag, oVariant);
 		} else {
 			var oUpdatableChange = getLatestUpdatableChange(oVariant);
@@ -603,8 +624,8 @@ sap.ui.define([
 		var oVariant = getVariantById(mPropertyBag);
 		var aVariantRevertData = oVariant.getRevertData();
 		if (aVariantRevertData.length !== 0) {
-			//Look at revert data backward, to find the content of last save action
-			var bIsVariantSaved = aVariantRevertData.slice().reverse().some(function (oRevertData) {
+			// Look at revert data backward, to find the content of last save action
+			var bIsVariantSaved = aVariantRevertData.slice().reverse().some(function(oRevertData) {
 				if (oRevertData.getContent().previousAction === CompVariantState.updateActionType.SAVE) {
 					mPropertyBag.content = oRevertData.getContent().previousContent;
 					mPropertyBag.action = CompVariantState.updateActionType.DISCARD;
@@ -616,7 +637,7 @@ sap.ui.define([
 				mPropertyBag.content = aVariantRevertData[0].getContent().previousContent;
 				mPropertyBag.action = CompVariantState.updateActionType.DISCARD;
 			}
-			//Update variant content to the last saved or original content
+			// Update variant content to the last saved or original content
 			CompVariantState.updateVariant(mPropertyBag);
 		}
 		return oVariant;
@@ -661,7 +682,7 @@ sap.ui.define([
 	 * this either removes the variant from the layer or writes a change to that layer.
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.CompVariant} The removed variant
 	 */
-	CompVariantState.removeVariant = function (mPropertyBag) {
+	CompVariantState.removeVariant = function(mPropertyBag) {
 		var oVariant = getVariantById(mPropertyBag);
 		var sCurrentState = oVariant.getState();
 
@@ -695,12 +716,12 @@ sap.ui.define([
 	 * @param {string} mPropertyBag.id - ID of the variant
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.CompVariant} The reverted variant
 	 */
-	CompVariantState.revert = function (mPropertyBag) {
+	CompVariantState.revert = function(mPropertyBag) {
 		function removeChange(oChange) {
 			var sPersistencyKey = oChange.getSelector().persistencyKey;
 			var mCompVariantsMap = FlexState.getCompVariantsMap(mPropertyBag.reference);
 			delete mCompVariantsMap[sPersistencyKey].byId[oChange.getId()];
-			mCompVariantsMap[sPersistencyKey].changes = mCompVariantsMap[sPersistencyKey].changes.filter(function (oChangeInMap) {
+			mCompVariantsMap[sPersistencyKey].changes = mCompVariantsMap[sPersistencyKey].changes.filter(function(oChangeInMap) {
 				return oChangeInMap !== oChange;
 			});
 		}
@@ -785,7 +806,7 @@ sap.ui.define([
 		oStandardVariant.setExecuteOnSelection(!!mPropertyBag.executeOnSelection);
 		var aChanges = oStandardVariant.getChanges();
 		oStandardVariant.removeAllChanges();
-		aChanges.forEach(function (oChange) {
+		aChanges.forEach(function(oChange) {
 			CompVariantMerger.applyChangeOnVariant(oStandardVariant, oChange);
 		});
 	};
@@ -813,7 +834,7 @@ sap.ui.define([
 				transport: oFlexObject.getRequest(),
 				isLegacyVariant: oFlexObject.isVariant && oFlexObject.isVariant(),
 				parentVersion: sParentVersion
-			}).then(function (result) {
+			}).then(function(result) {
 				// updateFlexObject and versionModel
 				if (result && result.response && result.response[0]) {
 					oFlexObject.setResponse(result.response[0]);
@@ -827,7 +848,7 @@ sap.ui.define([
 				} else {
 					oFlexObject.setState(States.LifecycleState.PERSISTED);
 				}
-			}).then(function () {
+			}).then(function() {
 				// update StorageResponse
 				var oFileContent = oFlexObject.convertToFileContent();
 				getSubSection(oStoredResponse.changes.comp, oFlexObject).push(oFileContent);
@@ -857,31 +878,31 @@ sap.ui.define([
 		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 aPromises;
+		.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);
+							}
 						});
-					}
-				});
-				// TODO Consider not rejecting with first error, but wait for all promises and collect the results
-				return Promise.all(aPromises);
+						return Promise.all(aPromises);
+					});
+				}
 			});
+			// TODO Consider not rejecting with first error, but wait for all promises and collect the results
+			return Promise.all(aPromises);
+		});
 	};
 
 	/**
@@ -893,13 +914,14 @@ sap.ui.define([
 	 */
 	CompVariantState.persistAll = function(sReference) {
 		var mCompEntities = _omit(FlexState.getCompVariantsMap(sReference), "_getOrCreate", "_initialize");
-		 var aPromises = Object.keys(mCompEntities).map(function(sPersistencyKey) {
-			return CompVariantState.persist({
+		// 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, {
 				reference: sReference,
 				persistencyKey: sPersistencyKey
-			});
-		});
-		return Promise.all(aPromises);
+			}));
+		}, Promise.resolve());
 	};
 
 	/**
@@ -908,7 +930,7 @@ sap.ui.define([
 	 * @param {string} sReference - Flex reference of the app
 	 * @returns {boolean} <code>true</code> if dirty changes exist
 	 */
-	CompVariantState.hasDirtyChanges = function (sReference) {
+	CompVariantState.hasDirtyChanges = function(sReference) {
 		var mCompEntities = FlexState.getCompVariantsMap(sReference);
 		var aEntities = [];
 		for (var sPersistencyKey in mCompEntities) {

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

@@ -95,7 +95,6 @@ sap.ui.define([
 		}
 	});
 
-
 	/**
 	 * Initializes the control.
 	 *
@@ -249,7 +248,7 @@ sap.ui.define([
 			tooltip: this._oResources.getText("TRANSPORT_DIALOG_TRANSPORT_TT"),
 			width: "100%",
 			selectionChange: function() {
-				//if package field is visible but has no value, the OK button is disable
+				// if package field is visible but has no value, the OK button is disable
 				if (that._oPackageListItem.getVisible() && !that._oPackage.getValue()) {
 					return;
 				}
@@ -375,7 +374,7 @@ sap.ui.define([
 		var oLock;
 		var aTransports;
 
-		//get the transports into an array.
+		// get the transports into an array.
 		oLock = this._hasLock(oTransports.transports);
 
 		if (oLock) {
@@ -384,16 +383,16 @@ sap.ui.define([
 			aTransports = oTransports.transports;
 		}
 
-		//set the transports.
+		// set the transports.
 		this.setTransports(aTransports);
 
-		//pre-select one, if necessary.
+		// pre-select one, if necessary.
 		if (aTransports && aTransports.length === 1) {
 			this._oTransport.setValue(aTransports[0].description, true);
 			this.getButtons()[1].setEnabled(true);
 		}
 
-		//clear the transport combo-box, if necessary.
+		// clear the transport combo-box, if necessary.
 		if (!aTransports || aTransports.length === 0) {
 			this._oTransport.setSelectedKey(null);
 			this._oTransport.setValueState(ValueState.None);
@@ -434,7 +433,7 @@ sap.ui.define([
 		return null;
 	};
 
-	TransportDialog.prototype.setLocalObjectVisible = function (bLocalObjectVisible) {
+	TransportDialog.prototype.setLocalObjectVisible = function(bLocalObjectVisible) {
 		this._oLocalObjectButton.setVisible(bLocalObjectVisible);
 		this.setProperty("localObjectVisible", bLocalObjectVisible);
 	};
@@ -462,7 +461,7 @@ sap.ui.define([
 			// correct the title.
 			this.setTitle(this._oResources.getText("TRANSPORT_DIALOG_TITLE_SIMPLE"));
 
-			//disable local object button, as package has been set from outside and therefore should not be changed.
+			// disable local object button, as package has been set from outside and therefore should not be changed.
 			this.getButtons()[0].setVisible(false);
 		}
 
@@ -533,18 +532,18 @@ sap.ui.define([
 	 * @public
 	 */
 	TransportDialog.prototype.setHidePackage = function(bHide) {
-		//set the property itself.
+		// set the property itself.
 		this.setProperty("hidePackage", bHide);
 
-		//toggle package visibility.
+		// toggle package visibility.
 		this._oPackageListItem.setVisible(!bHide);
 
 		if (bHide) {
-			//set the local object button to enabled,
-			//as the end-user might want to "just" save the object without selecting a transport.
+			// set the local object button to enabled,
+			// as the end-user might want to "just" save the object without selecting a transport.
 			this.getButtons()[0].setEnabled(bHide);
 
-			//correct the title.
+			// correct the title.
 			this.setTitle(this._oResources.getText("TRANSPORT_DIALOG_TITLE_SIMPLE"));
 		}