@openui5/sap.ui.fl 1.99.1 → 1.102.0

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

@@ -19,7 +19,9 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantMerger",
 	"sap/ui/fl/registry/Settings",
-	"sap/ui/fl/write/_internal/Storage"
+	"sap/ui/fl/write/_internal/Storage",
+	"sap/ui/fl/write/_internal/Versions",
+	"sap/ui/fl/write/api/Version"
 ], function(
 	_omit,
 	_pick,
@@ -35,20 +37,40 @@ sap.ui.define([
 	FlexState,
 	CompVariantMerger,
 	Settings,
-	Storage
+	Storage,
+	Versions,
+	Version
 ) {
 	"use strict";
 
-	function isChangeUpdatable(oChange, sLayer) {
+	function isVersionIndependentOrInDraft(oChange, mPropertyBag) {
+		var aDraftFilenames = getPropertyFromVersionsModel("/draftFilenames", mPropertyBag);
+		if (aDraftFilenames) {
+			return oChange.getState() === Change.states.NEW || aDraftFilenames.includes(oChange.getFileName());
+		}
+		return true;
+	}
+
+	function getPropertyFromVersionsModel(sPropertyName, mPropertyBag) {
+		var bIsVersionEnabled = Settings.getInstanceOrUndef().isVersioningEnabled(mPropertyBag.layer);
+		if (bIsVersionEnabled && mPropertyBag.layer === Layer.CUSTOMER) {
+			return Versions.getVersionsModel({
+				reference: Utils.normalizeReference(mPropertyBag.reference),
+				layer: mPropertyBag.layer
+			}).getProperty(sPropertyName);
+		}
+		return undefined;
+	}
+
+	function isChangeUpdatable(oChange, mPropertyBag) {
 		if (!["defaultVariant", "updateVariant"].includes(oChange.getChangeType())) {
 			return false;
 		}
-
-		var bSameLayer = oChange.getLayer() === sLayer;
+		var bSameLayer = oChange.getLayer() === mPropertyBag.layer;
 		var sPackageName = oChange.getDefinition().packageName;
 		var bNotTransported = !sPackageName || sPackageName === "$TMP";
 
-		return bSameLayer && bNotTransported;
+		return bSameLayer && bNotTransported && isVersionIndependentOrInDraft(oChange, mPropertyBag);
 	}
 
 	function getSubSection(mMap, oFlexObject) {
@@ -76,18 +98,25 @@ sap.ui.define([
 	}
 
 	function updateObjectAndStorage(oFlexObject, oStoredResponse) {
+		var sParentVersion = getPropertyFromVersionsModel("/persistedVersion", {layer: oFlexObject.getLayer(), reference: oFlexObject.getDefinition().reference});
 		return Storage.update({
 			flexObject: oFlexObject.getDefinition(),
 			layer: oFlexObject.getLayer(),
-			transport: oFlexObject.getRequest()
+			transport: oFlexObject.getRequest(),
+			parentVersion: sParentVersion
 		}).then(function (result) {
-			// update FlexObject
+			// update FlexObject and versionModel
 			if (result && result.response) {
 				oFlexObject.setResponse(result.response);
+				if (sParentVersion) {
+					Versions.onAllChangesSaved({
+						reference: result.response.reference,
+						layer: result.response.layer
+					});
+				}
 			} else {
 				oFlexObject.setState(States.PERSISTED);
 			}
-
 			return oStoredResponse;
 		}).then(function (oStoredResponse) {
 			// update StorageResponse
@@ -97,7 +126,7 @@ sap.ui.define([
 		});
 	}
 
-	function deleteObjectAndRemoveFromStorage(oFlexObject, mCompVariantsMapByPersistencyKey, oStoredResponse) {
+	function deleteObjectAndRemoveFromStorage(oFlexObject, mCompVariantsMapByPersistencyKey, oStoredResponse, sParentVersion) {
 		function removeFromArrayByName(aObjectArray, oFlexObject) {
 			for (var i = aObjectArray.length - 1; i >= 0; i--) {
 				//aObjectArray can come from either back end response or flex state
@@ -113,7 +142,8 @@ sap.ui.define([
 		return Storage.remove({
 			flexObject: oFlexObject.getDefinition(),
 			layer: oFlexObject.getLayer(),
-			transport: oFlexObject.getRequest()
+			transport: oFlexObject.getRequest(),
+			parentVersion: sParentVersion
 		}).then(function () {
 			// update compVariantsMap
 			delete mCompVariantsMapByPersistencyKey.byId[oFlexObject.getId()];
@@ -220,7 +250,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.flexState.compVariants.CompVariantState
 	 * @since 1.83
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -250,7 +280,7 @@ sap.ui.define([
 		var aDefaultVariantChanges = mCompVariantsMap.defaultVariants;
 		var oChange = aDefaultVariantChanges[aDefaultVariantChanges.length - 1];
 
-		if (!oChange || !isChangeUpdatable(oChange, mPropertyBag.layer)) {
+		if (!oChange || !isChangeUpdatable(oChange, mPropertyBag)) {
 			var oChangeParameter = {
 				fileName: Utils.createDefaultFileName(sChangeType),
 				fileType: "change",
@@ -404,13 +434,12 @@ sap.ui.define([
 			var bIsChangedOnLayer = oVariant.getChanges().some(function (oChange) {
 				return oChange.getLayer() === sLayer;
 			});
-
-			return oVariant.getPersisted() && bSameLayer && bNotTransported && !bIsChangedOnLayer;
+			return oVariant.getPersisted() && bSameLayer && bNotTransported && !bIsChangedOnLayer && isVersionIndependentOrInDraft(oVariant, mPropertyBag);
 		}
 
 		function getLatestUpdatableChange(oVariant) {
 			return oVariant.getChanges().reverse().find(function (oChange) {
-				return oChange.getChangeType() === "updateVariant" && isChangeUpdatable(oChange, sLayer);
+				return oChange.getChangeType() === "updateVariant" && isChangeUpdatable(oChange, mPropertyBag);
 			});
 		}
 
@@ -719,21 +748,27 @@ sap.ui.define([
 	 * @private
 	 */
 	CompVariantState.persist = function(mPropertyBag) {
-		function writeObjectAndAddToState(oFlexObject, oStoredResponse) {
+		function writeObjectAndAddToState(oFlexObject, oStoredResponse, sParentVersion) {
 			// TODO: remove this line as soon as layering and a condensing is in place
 			return Storage.write({
 				flexObjects: [oFlexObject.getDefinition()],
 				layer: oFlexObject.getLayer(),
 				transport: oFlexObject.getRequest(),
-				isLegacyVariant: oFlexObject.isVariant()
+				isLegacyVariant: oFlexObject.isVariant(),
+				parentVersion: sParentVersion
 			}).then(function (result) {
-				// updateFlexObject
+				// updateFlexObject and versionModel
 				if (result && result.response && result.response[0]) {
 					oFlexObject.setResponse(result.response[0]);
+					if (sParentVersion) {
+						Versions.onAllChangesSaved({
+							reference: result.response[0].reference,
+							layer: result.response[0].layer
+						});
+					}
 				} else {
 					oFlexObject.setState(States.PERSISTED);
 				}
-
 				return oStoredResponse;
 			}).then(function (oStoredResponse) {
 				// update StorageResponse
@@ -742,32 +777,54 @@ sap.ui.define([
 			});
 		}
 
+		function saveObject(oFlexObject, mCompVariantsMapByPersistencyKey, oStoredResponse, sParentVersion) {
+			switch (oFlexObject.getState()) {
+				case States.NEW:
+					ifVariantClearRevertData(oFlexObject);
+					return writeObjectAndAddToState(oFlexObject, oStoredResponse, sParentVersion);
+				case States.DIRTY:
+					ifVariantClearRevertData(oFlexObject);
+					return updateObjectAndStorage(oFlexObject, oStoredResponse, sParentVersion);
+				case States.DELETED:
+					ifVariantClearRevertData(oFlexObject);
+					return deleteObjectAndRemoveFromStorage(oFlexObject, mCompVariantsMapByPersistencyKey, oStoredResponse, sParentVersion);
+				default:
+					break;
+			}
+		}
+
 		var sReference = mPropertyBag.reference;
 		var sPersistencyKey = mPropertyBag.persistencyKey;
 		var mCompVariantsMap = FlexState.getCompVariantsMap(sReference);
 		var mCompVariantsMapByPersistencyKey = mCompVariantsMap._getOrCreate(sPersistencyKey);
-		var oStoredResponse = FlexState.getStorageResponse(sReference);
-
-		var aPromises = getAllCompVariantObjects(mCompVariantsMapByPersistencyKey)
-			.filter(needsPersistencyCall)
-			.map(function (oFlexObject) {
-				switch (oFlexObject.getState()) {
-					case States.NEW:
-						ifVariantClearRevertData(oFlexObject);
-						return writeObjectAndAddToState(oFlexObject, oStoredResponse);
-					case States.DIRTY:
-						ifVariantClearRevertData(oFlexObject);
-						return updateObjectAndStorage(oFlexObject, oStoredResponse);
-					case States.DELETED:
-						ifVariantClearRevertData(oFlexObject);
-						return deleteObjectAndRemoveFromStorage(oFlexObject, mCompVariantsMapByPersistencyKey, oStoredResponse);
-					default:
-						break;
-				}
-			});
 
-		// TODO Consider not rejecting with first error, but wait for all promises and collect the results
-		return Promise.all(aPromises);
+		return FlexState.getStorageResponse(sReference)
+			.then(function(oStoredResponse) {
+				var aFlexObject = getAllCompVariantObjects(mCompVariantsMapByPersistencyKey).filter(needsPersistencyCall);
+				var aPromises = aFlexObject.map(function (oFlexObject, index) {
+					if (index === 0) {
+						var sParentVersion = getPropertyFromVersionsModel("/persistedVersion", {
+							layer: oFlexObject.getLayer(),
+							reference: oFlexObject.getDefinition().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 = aFlexObject.map(function (oFlexObject, index) {
+									if (index !== 0) {
+										var sDraftVersion = sParentVersion ? Version.Number.Draft : undefined;
+										return saveObject(oFlexObject, mCompVariantsMapByPersistencyKey, oStoredResponse, sDraftVersion);
+									}
+								});
+								return aPromises;
+							});
+					}
+				});
+
+				// TODO Consider not rejecting with first error, but wait for all promises and collect the results
+				return Promise.all(aPromises);
+			});
 	};
 
 	/**

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

@@ -62,6 +62,11 @@ sap.ui.define([
 				 */
 				lrepObject: {type: "any", group: "Misc", defaultValue: null},
 
+				/**
+				 * Flag if the "Local Object" button should be visible.
+				 */
+				localObjectVisible: {type: "boolean", group: "Misc", defaultValue: true},
+
 				/**
 				 * Flag indicating whether the selection of an ABAP package is to be hidden or not.
 				 */
@@ -143,13 +148,14 @@ sap.ui.define([
 	TransportDialog.prototype._createButtons = function() {
 		var that = this;
 
-		this.addButton(new Button({
+		this._oLocalObjectButton = new Button({
 			text: this._oResources.getText("TRANSPORT_DIALOG_LOCAL_OBJECT"),
 			tooltip: this._oResources.getText("TRANSPORT_DIALOG_LOCAL_OBJECT"),
 			press: function() {
 				that._onLocal();
 			}
-		}));
+		});
+		this.addButton(this._oLocalObjectButton);
 		this.addButton(new Button({
 			text: this._oResources.getText("TRANSPORT_DIALOG_OK"),
 			tooltip: this._oResources.getText("TRANSPORT_DIALOG_OK"),
@@ -423,6 +429,11 @@ sap.ui.define([
 		return null;
 	};
 
+	TransportDialog.prototype.setLocalObjectVisible = function (bLocalObjectVisible) {
+		this._oLocalObjectButton.setVisible(bLocalObjectVisible);
+		this.setProperty("localObjectVisible", bLocalObjectVisible);
+	};
+
 	/**
 	 * An ABAP package that can be used as default for the ABAP package selection.
 	 * The property can only be set once and afterwards it cannot be changed.

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.99.1
+	 * @version 1.102.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.
@@ -50,9 +50,10 @@ sap.ui.define([
 	 * @param {boolean} bCompactMode - Flag indicating whether the transport dialog should be opened in compact mode
 	 * @param {object} oControl - Control instance
 	 * @param {string} sStyleClass - CSS style class that should be added to any dialogs
+	 * @param {boolean} bLocalObjectVisible - Flag if the "Local Object" button should be visible in the transport dialog
 	 * @public
 	 */
-	TransportSelection.prototype.selectTransport = function(oObjectInfo, fOkay, fError, bCompactMode, oControl, sStyleClass) {
+	TransportSelection.prototype.selectTransport = function(oObjectInfo, fOkay, fError, bCompactMode, oControl, sStyleClass, bLocalObjectVisible) {
 		//No transport selection unless Lrep connector is available
 		if (!FlUtils.getLrepUrl()) {
 			fOkay(this._createEventObject(oObjectInfo, {transportId: ""}));
@@ -65,6 +66,7 @@ sap.ui.define([
 						hidePackage: !LayerUtils.doesCurrentLayerRequirePackage(),
 						pkg: oObjectInfo.package,
 						transports: oGetTransportsResult.transports,
+						localObjectVisible: bLocalObjectVisible,
 						lrepObject: this._toLREPObject(oObjectInfo)
 					}, fOkay, fError, bCompactMode, sStyleClass);
 				} else {
@@ -305,10 +307,11 @@ sap.ui.define([
 	 * @param {sap.ui.fl.Change} [oChange] - Change for which the transport information should be retrieved
 	 * @param {object} oControl - Object of the root control for the transport dialog
 	 * @param {string} sStyleClass - CSS style class that should be added to any dialogs
+	 * @param {boolean} bLocalObjectVisible - Flag if the "Local Object" button should be visible in the transport dialog
 	 * @returns {Promise} Promise that resolves
 	 * @public
 	 */
-	TransportSelection.prototype.openTransportSelection = function(oChange, oControl, sStyleClass) {
+	TransportSelection.prototype.openTransportSelection = function(oChange, oControl, sStyleClass, bLocalObjectVisible) {
 		var that = this;
 
 		return new Promise(function(resolve, reject) {
@@ -342,7 +345,7 @@ sap.ui.define([
 				oObject.type = oChange.getDefinition().fileType;
 			}
 
-			that.selectTransport(oObject, fnOkay, fnError, false, oControl, sStyleClass);
+			that.selectTransport(oObject, fnOkay, fnError, false, oControl, sStyleClass, bLocalObjectVisible);
 		});
 	};
 

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

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

@@ -7,11 +7,15 @@
 sap.ui.define([
 	"sap/ui/fl/apply/_internal/ChangesController",
 	"sap/ui/fl/write/_internal/SaveAs",
-	"sap/ui/fl/write/_internal/connectors/LrepConnector"
+	"sap/ui/fl/write/_internal/connectors/LrepConnector",
+	"sap/ui/fl/write/api/FeaturesAPI",
+	"sap/ui/fl/write/_internal/Versions"
 ], function(
 	ChangesController,
 	SaveAs,
-	LrepConnector
+	LrepConnector,
+	FeaturesAPI,
+	Versions
 ) {
 	"use strict";
 
@@ -59,8 +63,13 @@ sap.ui.define([
 			}
 			var oFlexController = ChangesController.getDescriptorFlexControllerInstance(mPropertyBag.selector);
 			mPropertyBag.reference = oFlexController.getComponentName();
-
-			return SaveAs.saveAs(mPropertyBag);
+			return FeaturesAPI.isVersioningEnabled(mPropertyBag.layer)
+				.then(function (bVersioningEnabled) {
+					if (bVersioningEnabled) {
+						mPropertyBag.parentVersion = Versions.getVersionsModel(mPropertyBag).getProperty("/displayedVersion");
+					}
+					return SaveAs.saveAs(mPropertyBag);
+				});
 		},
 
 		/**

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

@@ -53,7 +53,7 @@ sap.ui.define([
 		 * @description App variant functionality is only supported in S/4HANA Cloud Platform & S/4HANA on Premise.
 		 * App variant functionality should be available if the following conditions are met:
 		 * When the current layer is 'CUSTOMER'.
-		 * When it is not a standalone app runing on Neo Cloud.
+		 * When it is not a standalone app running on Neo Cloud.
 		 * When the backend supports this feature.
 		 * @private
 	 	 * @ui5-restricted
@@ -105,7 +105,7 @@ sap.ui.define([
 		 * Checks if key user has also the admin role to enable the translation button
 		 *
 		 * @param {sap.ui.fl.Layer} sLayer - Current layer
-		 * @returns {Promise<boolean>} Resolves to a boolean indicating if they keyuser is also admin
+		 * @returns {Promise<boolean>} Resolves to a boolean indicating if the key user is also an admin
 		 * @public
 		 */
 		isKeyUserTranslationEnabled: function (sLayer) {

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write.api.FieldExtensibility
 	 * @since 1.87
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.rta
 	 */

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

@@ -14,11 +14,14 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/appVariant/DescriptorChangeTypes",
 	"sap/ui/fl/write/_internal/condenser/Condenser",
 	"sap/ui/fl/write/_internal/flexState/FlexObjectState",
+	"sap/ui/fl/write/_internal/Storage",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
+	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState",
 	"sap/ui/fl/write/api/FeaturesAPI",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/LayerUtils",
-	"sap/ui/fl/registry/Settings"
+	"sap/ui/fl/registry/Settings",
+	"sap/ui/fl/Utils"
 ], function(
 	includes,
 	_omit,
@@ -29,11 +32,14 @@ sap.ui.define([
 	DescriptorChangeTypes,
 	Condenser,
 	FlexObjectState,
+	Storage,
 	ManifestUtils,
+	VariantManagementState,
 	FeaturesAPI,
 	Layer,
 	LayerUtils,
-	Settings
+	Settings,
+	FlUtils
 ) {
 	"use strict";
 
@@ -78,6 +84,37 @@ sap.ui.define([
 			});
 	}
 
+	/**
+	 * Removes variant-dependent changes belonging to variants which are currently not selected
+	 *
+	 * @param {array} aChanges - List of changes to check
+	 * @param {sap.ui.fl.Control} oControl - Control for which the changes are being checked
+	 * @returns {sap.ui.fl.Change[]} List of variant-dependent changes belonging to the currently selected variants
+	 */
+	function filterChangesByCurrentVariants(aChanges, oControl) {
+		// 1. Get current variant references
+		var oComponent = FlUtils.getAppComponentForControl(oControl);
+		var oModel = oComponent.getModel(FlUtils.VARIANT_MODEL_NAME);
+		var sFlexReference = oModel && oModel.sFlexReference;
+		var aVariantManagementReferences = VariantManagementState.getVariantManagementReferences(sFlexReference);
+
+		if (aVariantManagementReferences.length === 0) {
+			return aChanges;
+		}
+
+		var aCurrentVariantReferences = aVariantManagementReferences.map(function(sVMReference) {
+			return oModel.getCurrentVariantReference(sVMReference);
+		});
+
+		// 2. Remove variant-dependent changes not assigned to a current variant reference
+		return aChanges.filter(function(oChange) {
+			return aCurrentVariantReferences.some(function(sCurrentVariantReference) {
+				return oChange.getVariantReference() === sCurrentVariantReference
+					|| !oChange.getVariantReference();
+			});
+		});
+	}
+
 	/**
 	 * Determines if user-specific changes or variants are present in the flex persistence.
 	 *
@@ -154,7 +191,7 @@ sap.ui.define([
 			// If there is change and the layer is transportable , the request to back end is always necessary
 			// because of control variant reset logic through setVisible change and app descriptor changes
 			if (bIsLayerTransportable) {
-				return ChangesController.getFlexControllerInstance(mPropertyBag.selector).getResetAndPublishInfo(mPropertyBag)
+				return Storage.getFlexInfo(mPropertyBag)
 					.then(function(oResponse) {
 						oFlexInfo.allContextsProvided = oResponse.allContextsProvided === undefined || oResponse.allContextsProvided;
 						oFlexInfo.isResetEnabled = oResponse.isResetEnabled;
@@ -365,6 +402,7 @@ sap.ui.define([
 	 * @param {boolean} [mPropertyBag.includeDirtyChanges] - Flag if dirty UI changes should be included
 	 * @param {string} [mPropertyBag.cacheKey] - Key to validate the cache entry stored on client side
 	 * @param {boolean} [mPropertyBag.invalidateCache] - Indicates whether the cache is to be invalidated
+	 * @param {boolean} [mPropertyBag.onlyCurrentVariants] - Whether only changes for the currently active variants should be considered
 	 *
 	 * @returns {Promise} Promise resolves with an array of all change instances {@see sap.ui.fl.Change}
 	 * @private
@@ -375,7 +413,14 @@ sap.ui.define([
 			mPropertyBag.currentLayer = mPropertyBag.layer;
 		}
 
-		return FlexObjectState.getFlexObjects(mPropertyBag);
+		//TODO: Check the mPropertyBag.selector parameter name - the methods called on FlexObjectState expect a control
+		return FlexObjectState.getFlexObjects(mPropertyBag)
+			.then(function(aChanges) {
+				if (mPropertyBag.onlyCurrentVariants) {
+					return filterChangesByCurrentVariants(aChanges, mPropertyBag.selector);
+				}
+				return aChanges;
+			});
 	};
 
 	return PersistenceWriteAPI;

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

@@ -8,6 +8,7 @@ sap.ui.define([
 	"sap/ui/fl/LayerUtils",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/Utils",
+	"sap/ui/fl/write/api/Version",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/write/api/VersionsAPI",
 	"sap/ui/fl/write/api/FeaturesAPI",
@@ -17,6 +18,7 @@ sap.ui.define([
 	LayerUtils,
 	Layer,
 	Utils,
+	Version,
 	ManifestUtils,
 	VersionsAPI,
 	FeaturesAPI,
@@ -25,14 +27,14 @@ sap.ui.define([
 	"use strict";
 
 	function isDraftAvailable(oReloadInfo) {
-		var bUrlHasVersionParameter = !!Utils.getParameter(sap.ui.fl.Versions.UrlParameter, oReloadInfo.URLParsingService);
+		var bUrlHasVersionParameter = !!Utils.getParameter(Version.UrlParameter, oReloadInfo.URLParsingService);
 		if (bUrlHasVersionParameter) {
 			return Promise.resolve(false);
 		}
 
 		return FeaturesAPI.isVersioningEnabled(oReloadInfo.layer).then(function(bVersioningAvailable) {
 			return bVersioningAvailable && VersionsAPI.isDraftAvailable({
-				selector: oReloadInfo.selector,
+				control: oReloadInfo.selector,
 				layer: oReloadInfo.layer
 			});
 		});
@@ -137,7 +139,7 @@ sap.ui.define([
 		 * @returns {boolean} True if the parameter with the given value is in the URL
 		 */
 		hasVersionParameterWithValue: function(oParameter, oURLParsingService) {
-			return Utils.hasParameterAndValue(sap.ui.fl.Versions.UrlParameter, oParameter.value, oURLParsingService);
+			return Utils.hasParameterAndValue(Version.UrlParameter, oParameter.value, oURLParsingService);
 		},
 
 		/**
@@ -175,16 +177,16 @@ sap.ui.define([
 			}
 
 			// removes any version number set (original, draft, inactive and active versions)
-			var oVersionRegExp = new RegExp("\&*" + sap.ui.fl.Versions.UrlParameter + "=-?\\d*\&?", "g");
+			var oVersionRegExp = new RegExp("\&*" + Version.UrlParameter + "=-?\\d*\&?", "g");
 			oReloadInfo.parameters = oReloadInfo.parameters.replace(oVersionRegExp, "");
 
 			// startup reload due to draft
 			if (oReloadInfo.isDraftAvailable && !oReloadInfo.onExit) {
-				oReloadInfo.parameters = Utils.handleUrlParameters(oReloadInfo.parameters, sap.ui.fl.Versions.UrlParameter, sap.ui.fl.Versions.Draft, oReloadInfo.URLParsingService);
+				oReloadInfo.parameters = Utils.handleUrlParameters(oReloadInfo.parameters, Version.UrlParameter, Version.Number.Draft, oReloadInfo.URLParsingService);
 			}
 
 			if (oReloadInfo.versionSwitch) {
-				oReloadInfo.parameters = Utils.handleUrlParameters(oReloadInfo.parameters, sap.ui.fl.Versions.UrlParameter, oReloadInfo.version, oReloadInfo.URLParsingService);
+				oReloadInfo.parameters = Utils.handleUrlParameters(oReloadInfo.parameters, Version.UrlParameter, oReloadInfo.version, oReloadInfo.URLParsingService);
 			}
 
 			// clean up if the last parameter was removed
@@ -215,7 +217,7 @@ sap.ui.define([
 				mParsedHash.params[LayerUtils.FL_MAX_LAYER_PARAM] = [oReloadInfo.layer];
 			}
 			if (oReloadInfo.isDraftAvailable) {
-				mParsedHash.params[sap.ui.fl.Versions.UrlParameter] = [sap.ui.fl.Versions.Draft];
+				mParsedHash.params[Version.UrlParameter] = [Version.Number.Draft];
 			}
 			return mParsedHash;
 		},
@@ -232,8 +234,11 @@ sap.ui.define([
 		 */
 		initialDraftGotActivated: function(oReloadInfo) {
 			if (oReloadInfo.versioningEnabled) {
-				var bUrlHasVersionParameter = this.hasVersionParameterWithValue({value: sap.ui.fl.Versions.Draft}, oReloadInfo.URLParsingService);
-				return !VersionsAPI.isDraftAvailable(oReloadInfo) && bUrlHasVersionParameter;
+				var bUrlHasVersionParameter = this.hasVersionParameterWithValue({value: Version.Number.Draft}, oReloadInfo.URLParsingService);
+				return !VersionsAPI.isDraftAvailable({
+					control: oReloadInfo.selector,
+					layer: oReloadInfo.layer
+				}) && bUrlHasVersionParameter;
 			}
 			return false;
 		},
@@ -262,9 +267,11 @@ sap.ui.define([
 
 			// TODO fix app descriptor handling and reload behavior
 			// TODO move changesNeedReload near flexState; set flag when saving change that needs a reload
-			oReloadInfo.isDraftAvailable = oReloadInfo.isDraftAvailable || ReloadInfoAPI.hasVersionParameterWithValue({value: sap.ui.fl.Versions.Draft}, oReloadInfo.URLParsingService);
+			oReloadInfo.isDraftAvailable = oReloadInfo.isDraftAvailable || ReloadInfoAPI.hasVersionParameterWithValue({value: Version.Number.Draft}, oReloadInfo.URLParsingService);
 
-			if (oReloadInfo.activeVersion !== sap.ui.fl.Versions.Original) {
+			oReloadInfo.hasVersionUrlParameter = !!Utils.getParameter(Version.UrlParameter, oReloadInfo.URLParsingService);
+
+			if (oReloadInfo.activeVersion !== Version.Number.Original) {
 				oReloadInfo.activeVersionNotSelected = oReloadInfo.activeVersion && !ReloadInfoAPI.hasVersionParameterWithValue({value: oReloadInfo.activeVersion}, oReloadInfo.URLParsingService);
 			}
 			oReloadInfo.hasHigherLayerChanges = ReloadInfoAPI.hasMaxLayerParameterWithValue({value: oReloadInfo.layer}, oReloadInfo.URLParsingService);