@openui5/sap.ui.fl 1.114.0 → 1.115.1

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.114.0
+	 * @version 1.115.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.114.0
+	 * @version 1.115.1
 	 * @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.114.0
+	 * @version 1.115.1
 	 */
 	var Processor = {
 		applyExtensionPoint: function(oExtensionPoint) {

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.extensionPoint.Registry
 	 *
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 *
 	 * @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
 	 * @experimental Since 1.87.0
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 */
 	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.114.0
+	 * @version 1.115.1
 	 * @public
 	 * @param {sap.ui.base.ManagedObject} oControl - Control to add extensions
 	 */

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

@@ -117,7 +117,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ABAPExtensibilityVariantFactory
 	 * @experimental Since 1.87.0
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 */
 	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.114.0
+	 * @version 1.115.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
 	 * @experimental Since 1.87.0
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 */
 	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.114.0
+	 * @version 1.115.1
 	 * @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
 	 * @experimental Since 1.87.0
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 */
 	var UriParser = {};
 

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

@@ -249,7 +249,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.Utils
 	 * @experimental Since 1.87.0
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 */
 	var Utils = {};
 

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @experimental Since 1.93
 	 * @private
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 */
 	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.114.0
+	 * @version 1.115.1
 	 * @since 1.93
 	 * @experimental Since 1.93
 	 * @private

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.114.0
+	 * @version 1.115.1
 	 *
 	 * @private
 	 * @experimental 1.93

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.114.0
+	 * @version 1.115.1
 	 *
 	 * @private
 	 * @experimental 1.93

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.114.0
+	 * @version 1.115.1
 	 *
 	 * @private
 	 * @experimental 1.93

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

@@ -14,6 +14,7 @@ sap.ui.define([
 	"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/ChangePersistenceFactory",
 	"sap/ui/fl/LayerUtils",
 	"sap/ui/fl/Utils"
@@ -27,6 +28,7 @@ sap.ui.define([
 	ChangesController,
 	ControlVariantApplyAPI,
 	CompVariantState,
+	Versions,
 	ChangePersistenceFactory,
 	LayerUtils,
 	Utils
@@ -37,7 +39,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.flexState.FlexObjectState
 	 * @since 1.83
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -45,7 +47,6 @@ sap.ui.define([
 
 	function initFlexStateAndSetReference(mPropertyBag) {
 		mPropertyBag.reference = ManifestUtils.getFlexReferenceForControl(mPropertyBag.selector);
-
 		return FlexState.initialize({
 			componentId: mPropertyBag.componentId || Utils.getAppComponentForControl(mPropertyBag.selector).getId(),
 			reference: mPropertyBag.reference,
@@ -221,14 +222,11 @@ sap.ui.define([
 		if (ChangePersistenceFactory.getChangePersistenceForComponent(sReference).getDirtyChanges().length > 0) {
 			return true;
 		}
-		if (ChangePersistenceFactory.getChangePersistenceForComponent(Utils.normalizeReference(sReference)).getDirtyChanges().length > 0) {
-			return true;
-		}
 		return CompVariantState.hasDirtyChanges(sReference);
 	};
 
 	/**
-	 *
+	 * Save Flex objects and reload Flex State
 	 * @param {object} mPropertyBag - Object with parameters as properties
 	 * @param {sap.ui.fl.Selector} mPropertyBag.selector - Selector to retrieve the associated flex persistence
 	 * @param {object} [mPropertyBag.appDescriptor] - Manifest that belongs to the current running component
@@ -239,14 +237,20 @@ sap.ui.define([
 	 * @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.removeOtherLayerChanges=false] - Whether to remove changes on other layers before saving
-	 * @param {boolean} [mPropertyBag.version] - Version for which the objects are saved
+	 * @param {string} [mPropertyBag.version] - Version to load into Flex State after saving (e.g. undefined when exiting RTA)
+	 * @param {string} [mPropertyBag.adaptationId] - Adaptation to load into Flex State after saving (e.g. undefined when exiting RTA)
 	 * @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);
+		mPropertyBag.reference = ManifestUtils.getFlexReferenceForControl(mPropertyBag.selector);
 		return saveCompEntities(mPropertyBag)
 		.then(saveChangePersistenceEntities.bind(this, mPropertyBag, oAppComponent))
 		.then(function() {
+			if (mPropertyBag.version !== undefined && Versions.hasVersionsModel(mPropertyBag)) {
+				var oModel = Versions.getVersionsModel(mPropertyBag);
+				mPropertyBag.version = oModel.getProperty("/displayedVersion");
+			}
 			if (mPropertyBag.layer) {
 				//TODO: sync the layer parameter name with new persistence and remove this line
 				mPropertyBag.currentLayer = mPropertyBag.layer;

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

@@ -56,7 +56,7 @@ sap.ui.define([
 
 	function getPropertyFromVersionsModel(sPropertyName, mPropertyBag) {
 		var mPropertyBag = {
-			reference: Utils.normalizeReference(mPropertyBag.reference),
+			reference: mPropertyBag.reference,
 			layer: mPropertyBag.layer
 		};
 		if (Versions.hasVersionsModel(mPropertyBag)) {
@@ -105,7 +105,7 @@ sap.ui.define([
 
 	function updateObjectAndStorage(oFlexObject, oStoredResponse, sParentVersion) {
 		return Storage.update({
-			flexObject: oFlexObject.convertToFileContent ? oFlexObject.convertToFileContent() : oFlexObject.getDefinition(),
+			flexObject: oFlexObject.convertToFileContent(),
 			layer: oFlexObject.getLayer(),
 			transport: oFlexObject.getRequest(),
 			parentVersion: sParentVersion
@@ -126,7 +126,7 @@ sap.ui.define([
 		}).then(function () {
 			// update StorageResponse
 			var aObjectArray = getSubSection(oStoredResponse.changes.comp, oFlexObject);
-			var oFileContent = oFlexObject.convertToFileContent ? oFlexObject.convertToFileContent() : oFlexObject.getDefinition();
+			var oFileContent = oFlexObject.convertToFileContent();
 			updateArrayByName(aObjectArray, oFileContent);
 			return oFileContent;
 		});
@@ -155,7 +155,7 @@ sap.ui.define([
 	}
 
 	function deleteObjectAndRemoveFromStorage(oFlexObject, mCompVariantsMapByPersistencyKey, oStoredResponse, sParentVersion) {
-		var oFileContent = oFlexObject.convertToFileContent ? oFlexObject.convertToFileContent() : oFlexObject.getDefinition();
+		var oFileContent = oFlexObject.convertToFileContent();
 		return Storage.remove({
 			flexObject: oFileContent,
 			layer: oFlexObject.getLayer(),
@@ -164,7 +164,10 @@ sap.ui.define([
 		}).then(function () {
 			// update CompVariantsMap
 			removeFromCompVariantsMap(oFlexObject, mCompVariantsMapByPersistencyKey);
-		}).then(function () {
+		}).then(Versions.updateModelFromBackend.bind(this, {
+			reference: oFileContent.reference,
+			layer: oFileContent.layer
+		})).then(function() {
 			// update StorageResponse
 			removeFromArrayById(
 				getSubSection(oStoredResponse.changes.comp, oFlexObject),
@@ -272,7 +275,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.flexState.compVariants.CompVariantState
 	 * @since 1.83
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -805,7 +808,7 @@ sap.ui.define([
 			}
 			// TODO: remove this line as soon as layering and a condensing is in place
 			return Storage.write({
-				flexObjects: [oFlexObject.convertToFileContent ? oFlexObject.convertToFileContent() : oFlexObject.getDefinition()],
+				flexObjects: [oFlexObject.convertToFileContent()],
 				layer: oFlexObject.getLayer(),
 				transport: oFlexObject.getRequest(),
 				isLegacyVariant: oFlexObject.isVariant && oFlexObject.isVariant(),
@@ -826,7 +829,7 @@ sap.ui.define([
 				}
 			}).then(function () {
 				// update StorageResponse
-				var oFileContent = oFlexObject.convertToFileContent ? oFlexObject.convertToFileContent() : oFlexObject.getDefinition();
+				var oFileContent = oFlexObject.convertToFileContent();
 				getSubSection(oStoredResponse.changes.comp, oFlexObject).push(oFileContent);
 				return oFileContent;
 			});
@@ -860,9 +863,7 @@ sap.ui.define([
 					if (index === 0) {
 						var sParentVersion = getPropertyFromVersionsModel("/persistedVersion", {
 							layer: oFlexObject.getLayer(),
-							reference: oFlexObject.getFlexObjectMetadata ?
-								oFlexObject.getFlexObjectMetadata().reference :
-								oFlexObject.getDefinition().reference
+							reference: oFlexObject.getFlexObjectMetadata().reference
 						});
 						// TODO: use condensing route to reduce backend requests
 						// need to save first entry to generate draft version in backend

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

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

@@ -5,26 +5,28 @@
  */
 
 sap.ui.define([
-	"sap/ui/fl/registry/Settings",
 	"sap/ui/fl/write/api/Adaptations",
+	"sap/ui/fl/write/api/FeaturesAPI",
 	"sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/write/_internal/flexState/FlexObjectState",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/LayerUtils",
 	"sap/ui/fl/Utils",
+	"sap/ui/fl/write/_internal/FlexInfoSession",
 	"sap/ui/fl/write/_internal/Storage",
 	"sap/ui/fl/write/_internal/Versions",
 	"sap/ui/model/json/JSONModel"
 ], function(
-	Settings,
 	Adaptations,
+	FeaturesAPI,
 	FlexObjectFactory,
 	ManifestUtils,
 	FlexObjectState,
 	Layer,
 	LayerUtils,
 	FlexUtils,
+	FlexInfoSession,
 	Storage,
 	Versions,
 	JSONModel
@@ -49,28 +51,36 @@ sap.ui.define([
 		if (!sReference) {
 			throw Error("The application ID could not be determined");
 		}
-		return FlexUtils.normalizeReference(sReference);
+		return sReference;
 	}
 
 	/**
-	 * Processing the response to activate the draft if the expected status is contained in the response object
+	 * Processing the response to create/read/update/delete adaptations if the expected status is contained in the response object
+	 * In case of a deletion the version list is reloaded because the draft might have been deleted on the backend
 	 * @param {object} oResponse - Object with response data
 	 * @param {number} oResponse.status - HTTP response code
 	 * @param {number} nExpectedStatus - Expected HTTP response code
 	 * @param {object} mPropertyBag - Object with parameters as properties
 	 * @param {string} mPropertyBag.appId - Reference of the application
 	 * @param {string} mPropertyBag.layer - Layer
-	 * @returns {object} Object with response data
+	 * @param {boolean} [bDelete=false] - Indicator whether the response was from a delete
+	 * @returns {Promise<object>} Object with response data
 	 */
-	function handleResponseForVersioning(oResponse, nExpectedStatus, mPropertyBag) {
-		if (oResponse.status === nExpectedStatus) {
-			Versions.onAllChangesSaved({
+	function handleResponseForVersioning(oResponse, nExpectedStatus, mPropertyBag, bDelete) {
+		if (bDelete) {
+			return Versions.updateModelFromBackend({
 				reference: mPropertyBag.appId,
-				layer: mPropertyBag.layer,
-				contextBasedAdaptation: true
+				layer: mPropertyBag.layer
+			}).then(function() {
+				return oResponse;
 			});
 		}
-		return oResponse;
+		Versions.onAllChangesSaved({
+			reference: mPropertyBag.appId,
+			layer: mPropertyBag.layer,
+			contextBasedAdaptation: true
+		});
+		return Promise.resolve(oResponse);
 	}
 
 	/**
@@ -93,13 +103,26 @@ sap.ui.define([
 		if (_mInstances && _mInstances[sReference] && _mInstances[sReference][sLayer]) {
 			return Promise.resolve(_mInstances[sReference][sLayer]);
 		}
-		return Settings.getInstance()
-			.then(function(oSettings) {
-				var bContextBasedAdaptationsEnabled = oSettings.isContextBasedAdaptationEnabled();
+		var bContextBasedAdaptationsEnabled;
+		return FeaturesAPI.isContextBasedAdaptationAvailable(sLayer)
+			.then(function(bContextBasedAdaptationsEnabledResponse) {
+				bContextBasedAdaptationsEnabled = bContextBasedAdaptationsEnabledResponse;
 				var oAdaptationsPromise = bContextBasedAdaptationsEnabled ? ContextBasedAdaptationsAPI.load(mPropertyBag) : Promise.resolve({adaptations: []});
 				return oAdaptationsPromise;
-			}).then(function(oAdaptations) {
-				return ContextBasedAdaptationsAPI.createModel(oAdaptations.adaptations);
+			})
+			.then(function(oAdaptations) {
+				// Determine displayed adaptation
+				// Flex Info Session returns currently shown one based on Flex Data response
+				// If no longer available switch to highest ranked one
+				var oFlexInfoSession = FlexInfoSession.get(mPropertyBag.control) || {};
+				var oDisplayedAdaptation = oAdaptations.adaptations[0];
+				if (oFlexInfoSession.adaptationId) {
+					oDisplayedAdaptation = oAdaptations.adaptations.find(function(oAdaptation) {
+						return oAdaptation.id === oFlexInfoSession.adaptationId;
+					}) || oDisplayedAdaptation;
+				}
+
+				return ContextBasedAdaptationsAPI.createModel(oAdaptations.adaptations, oDisplayedAdaptation, bContextBasedAdaptationsEnabled);
 			})
 			.then(function(oModel) {
 				_mInstances[sReference] = _mInstances[sReference] || {};
@@ -111,19 +134,29 @@ sap.ui.define([
 
 	/**
 	 * Initializes and creates an new adaptation Model
-	 * @param {string[]} aAdaptations - List of adaptations from backend
+	 * @param {object[]} aAdaptations - List of adaptations from backend
+	 * @param {object} oDisplayedAdaptation - Adaptation to be set as displayedAdaptation
+	 * @param {boolean} bContextBasedAdaptationsEnabled - Whether the feature is enabled
 	 * @returns {sap.ui.model.json.JSONModel} - Model of adaptations enhanced with additional properties
 	 */
-	ContextBasedAdaptationsAPI.createModel = function(aAdaptations) {
+	ContextBasedAdaptationsAPI.createModel = function(aAdaptations, oDisplayedAdaptation, bContextBasedAdaptationsEnabled) {
 		if (!Array.isArray(aAdaptations)) {
 			throw Error("Adaptations model can only be initialized with an array of adaptations");
 		}
+		if (bContextBasedAdaptationsEnabled && !oDisplayedAdaptation) {
+			throw Error("Invalid call, must pass displayed adaptation");
+		}
+		if (!bContextBasedAdaptationsEnabled && aAdaptations.length) {
+			throw Error("Invalid call, must not pass adaptations if feature is disabled");
+		}
 
+		// TODO Extract class
 		var oModel = new JSONModel({
 			allAdaptations: [],
 			adaptations: [],
 			count: 0,
-			displayedAdaptation: {}
+			displayedAdaptation: {},
+			contextBasedAdaptationsEnabled: bContextBasedAdaptationsEnabled
 		});
 		oModel.updateAdaptations = function(aAdaptations) {
 			var aContextBasedAdaptations = aAdaptations.filter(function(oAdapation, iIndex) {
@@ -181,7 +214,7 @@ sap.ui.define([
 		};
 		if (aAdaptations.length > 0) {
 			oModel.updateAdaptations(aAdaptations);
-			oModel.setProperty("/displayedAdaptation", aAdaptations[0]);
+			oModel.setProperty("/displayedAdaptation", oDisplayedAdaptation);
 		}
 		return oModel;
 	};
@@ -234,10 +267,38 @@ sap.ui.define([
 		return _mInstances[sReference] && _mInstances[sReference][sLayer];
 	};
 
+	/**
+	 * Checks if an adaptation for a given reference and layer exists.
+	 * @param {object} mPropertyBag - Object with parameters as properties
+	 * @param {string} mPropertyBag.reference - ID of the application for which the versions are requested
+	 * @param {string} mPropertyBag.layer - Layer
+	 * @returns {boolean} checks if at least one adaptation exists for this reference and layer
+	 */
+	ContextBasedAdaptationsAPI.adaptationExists = function(mPropertyBag) {
+		var sReference = mPropertyBag.reference;
+		var sLayer = mPropertyBag.layer;
+		return this.hasAdaptationsModel({reference: sReference, layer: sLayer}) && _mInstances[sReference][sLayer].getProperty("/count") > 0;
+	};
+
 	ContextBasedAdaptationsAPI.clearInstances = function() {
 		_mInstances = {};
 	};
 
+	/**
+	 * Discards the model, initializes it again and returns the displayed adaptation.
+	 * @param {object} mPropertyBag - Object with parameters as properties
+	 * @param {sap.ui.core.Control} mPropertyBag.control - Control for which the request is done
+	 * @param {string} mPropertyBag.layer - Layer
+	 * @returns {string} Displayed adaptation id of the refreshed model
+	 */
+	ContextBasedAdaptationsAPI.refreshAdaptationModel = function(mPropertyBag) {
+		this.clearInstances();
+		return this.initialize(mPropertyBag)
+		.then(function(oModel) {
+			return oModel.getProperty("/displayedAdaptation/id");
+		});
+	};
+
 	function getNewVariantId(mFileNames, sOldVariantId) {
 		return mFileNames.get(sOldVariantId) || sOldVariantId;
 	}
@@ -250,10 +311,9 @@ sap.ui.define([
 	 */
 	function copyVariants(aVariants, aCopiedFlexObjects, mFileNames, sContextBasedAdaptationId) {
 		aVariants.forEach(function(oChange) {
-			var oCopiedVariant;
-			var sFileName = FlexUtils.createDefaultFileName(oChange.getId().split("_").pop());
 			// copy of CompVariant and FLVariant variants
-			oCopiedVariant = FlexObjectFactory.createFromFileContent(oChange.cloneFileContentWithNewId(sFileName));
+			var oCopiedVariant = FlexObjectFactory.createFromFileContent(oChange.cloneFileContentWithNewId());
+			var sFileName = oCopiedVariant.getId();
 			oCopiedVariant.setAdaptationId(sContextBasedAdaptationId);
 			aCopiedFlexObjects.push(oCopiedVariant);
 			mFileNames.set(oChange.getId(), sFileName);
@@ -361,9 +421,10 @@ sap.ui.define([
 		}).then(function(oResponse) {
 			var oModel = this.getAdaptationsModel(mPropertyBag);
 			oModel.insertAdaptation(mPropertyBag.contextBasedAdaptation);
-			handleResponseForVersioning(oResponse, 201, mPropertyBag);
+			return handleResponseForVersioning(oResponse, 201, mPropertyBag);
+		}.bind(this)).then(function() {
 			return FlexObjectState.getFlexObjects({ selector: mPropertyBag.control, invalidateCache: false, includeCtrlVariants: true, includeDirtyChanges: true, currentLayer: Layer.CUSTOMER });
-		}.bind(this)).then(function(aFlexObjects) {
+		}).then(function(aFlexObjects) {
 			//currently getFlexObjects contains also VENDOR layer ctrl variant changes which need to be removed before copy
 			//TODO refactor when FlexObjectState.getFlexObjects will be refactored
 			var aCustomerFlexObjects = LayerUtils.filterChangeOrChangeDefinitionsByCurrentLayer(aFlexObjects, Layer.CUSTOMER);
@@ -461,7 +522,6 @@ sap.ui.define([
 		mPropertyBag.appId = getFlexReferenceForControl(mPropertyBag.control);
 		return Storage.contextBasedAdaptation.load({
 			layer: mPropertyBag.layer,
-			flexObject: mPropertyBag.parameters,
 			appId: mPropertyBag.appId,
 			version: getParentVersion(mPropertyBag)
 		}).then(function(oAdaptations) {
@@ -497,7 +557,7 @@ sap.ui.define([
 			adaptationId: mPropertyBag.adaptationId,
 			parentVersion: getParentVersion(mPropertyBag)
 		}).then(function(oResponse) {
-			return handleResponseForVersioning(oResponse, 204, mPropertyBag);
+			return handleResponseForVersioning(oResponse, 204, mPropertyBag, true);
 		});
 	};
 

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

@@ -5,12 +5,16 @@
  */
 
 sap.ui.define([
+	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/variants/context/Component",
+	"sap/ui/fl/write/api/ContextBasedAdaptationsAPI",
 	"sap/ui/core/ComponentContainer",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/registry/Settings"
 ], function(
+	ManifestUtils,
 	ContextSharingComponent,
+	ContextBasedAdaptationsAPI,
 	ComponentContainer,
 	Layer,
 	Settings
@@ -37,6 +41,7 @@ sap.ui.define([
 		 *
 		 * @param {object} mPropertyBag - Object with parameters as properties
 		 * @param {string} [mPropertyBag.layer] - Layer
+		 * @param {sap.ui.core.Control} [mPropertyBag.variantManagementControl] - Comp or control variant management control
 		 * @returns {Promise<sap.ui.core.ComponentContainer>} Promise resolving with the ComponentContainer or nothing depending on the availability of the feature in the used back end
 		 * @private
 		 * @ui5-restricted sap.ui.comp, sap.ui.fl
@@ -45,8 +50,9 @@ sap.ui.define([
 			if (mPropertyBag.layer !== Layer.CUSTOMER) {
 				return Promise.resolve();
 			}
+			var sReference = ManifestUtils.getFlexReferenceForControl(mPropertyBag.variantManagementControl);
 			return Settings.getInstance().then(function(oSettings) {
-				return oSettings.isContextSharingEnabled();
+				return oSettings.isContextSharingEnabled() && !ContextBasedAdaptationsAPI.adaptationExists({reference: sReference, layer: Layer.CUSTOMER});
 			}).then(function(bIsEnabled) {
 				if (bIsEnabled) {
 					if (!oComponentContainer || oComponentContainer.bIsDestroyed) {