@openui5/sap.ui.fl 1.127.0 → 1.128.0

package/src/sap/ui/fl/write/_internal/flexState/{FlexObjectState.js → FlexObjectManager.js}

@@ -6,30 +6,28 @@
 
 sap.ui.define([
 	"sap/base/util/restricted/_omit",
-	"sap/ui/fl/apply/_internal/flexObjects/States",
 	"sap/ui/fl/apply/_internal/flexState/changes/UIChangesState",
 	"sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantMerger",
 	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState",
+	"sap/ui/fl/apply/_internal/flexState/FlexObjectState",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"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"
 ], function(
 	_omit,
-	States,
 	UIChangesState,
 	CompVariantMerger,
 	VariantManagementState,
+	FlexObjectState,
 	FlexState,
 	ManifestUtils,
 	CompVariantState,
 	Versions,
 	FlexControllerFactory,
-	ChangePersistenceFactory,
 	LayerUtils,
 	Utils
 ) {
@@ -37,13 +35,13 @@ sap.ui.define([
 
 	/**
 	 * @namespace
-	 * @alias sap.ui.fl.write._internal.flexState.FlexObjectState
+	 * @alias sap.ui.fl.write._internal.flexState.FlexObjectManager
 	 * @since 1.83
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
-	var FlexObjectState = {};
+	var FlexObjectManager = {};
 
 	function getCompVariantEntities(mPropertyBag) {
 		const aEntities = [];
@@ -82,11 +80,6 @@ sap.ui.define([
 		return CompVariantState.persistAll(sReference);
 	}
 
-	function getChangePersistence(mPropertyBag) {
-		mPropertyBag.reference ||= ManifestUtils.getFlexReferenceForSelector(mPropertyBag.selector);
-		return ChangePersistenceFactory.getChangePersistenceForComponent(mPropertyBag.reference);
-	}
-
 	function saveChangePersistenceEntities(mPropertyBag, oAppComponent) {
 		var oFlexController = FlexControllerFactory.createForSelector(mPropertyBag.selector);
 
@@ -106,7 +99,7 @@ sap.ui.define([
 	 * @param {string} sReference - Flex reference of the application
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} Filtered list of FlexObjects
 	 */
-	FlexObjectState.filterHiddenFlexObjects = function(aFlexObjects, sReference) {
+	FlexObjectManager.filterHiddenFlexObjects = function(aFlexObjects, sReference) {
 		const aFilteredFlexObjects = VariantManagementState.filterHiddenFlexObjects(aFlexObjects, sReference);
 		return CompVariantState.filterHiddenFlexObjects(aFilteredFlexObjects, sReference);
 	};
@@ -124,7 +117,7 @@ sap.ui.define([
 	 * @param {boolean} [mPropertyBag.version] - The version for which the objects are retrieved if the Cache should be invalidated
 	 * @returns {Promise<sap.ui.fl.apply._internal.flexObjects.FlexObject[]>} Flex objects, containing changes, compVariants & changes as well as ctrl_variant and changes
 	 */
-	FlexObjectState.getFlexObjects = async function(mPropertyBag) {
+	FlexObjectManager.getFlexObjects = async function(mPropertyBag) {
 		mPropertyBag.reference = ManifestUtils.getFlexReferenceForControl(mPropertyBag.selector);
 		if (mPropertyBag.invalidateCache) {
 			await FlexState.update(mPropertyBag);
@@ -160,25 +153,6 @@ sap.ui.define([
 		return aRelevantFlexObjects.concat(getCompVariantEntities(mPropertyBag));
 	};
 
-	/**
-	 * Collects modified changes from the different states within the <code>sap.ui.fl</code> library.
-	 * This includes the flexState entities as well as the <code>sap.ui.fl.ChangePersistence</code>.
-	 *
-	 * @param {object} mPropertyBag - Object with parameters as properties
-	 * @param {sap.ui.fl.Selector} mPropertyBag.selector - Retrieves the associated flex persistence
-	 * @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) {
-		mPropertyBag.includeDirtyChanges = true;
-		var oChangePersistence = getChangePersistence(mPropertyBag);
-		var aChangePersistenceEntities = oChangePersistence.getDirtyChanges();
-		var aCompVariantEntities = getCompVariantEntities(mPropertyBag);
-		return aChangePersistenceEntities.concat(aCompVariantEntities).filter(function(oFlexObject) {
-			return oFlexObject.getState() !== States.LifecycleState.PERSISTED;
-		});
-	};
-
 	/**
 	 * Checks if dirty flex objects exist for the flex persistence associated with the selector control;
 	 * Includes dirty changes on the descriptor as well as dirty changes on SmartVariantManagement of the application.
@@ -187,12 +161,9 @@ 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) {
+	FlexObjectManager.hasDirtyFlexObjects = function(mPropertyBag) {
 		var sReference = ManifestUtils.getFlexReferenceForSelector(mPropertyBag.selector);
-		if (ChangePersistenceFactory.getChangePersistenceForComponent(sReference).getDirtyChanges().length > 0) {
-			return true;
-		}
-		return CompVariantState.hasDirtyChanges(sReference);
+		return FlexObjectState.getDirtyFlexObjects(sReference).length > 0 || CompVariantState.hasDirtyChanges(sReference);
 	};
 
 	/**
@@ -211,26 +182,25 @@ sap.ui.define([
 	 * @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) {
+	FlexObjectManager.saveFlexObjects = async function(mPropertyBag) {
 		var oAppComponent = Utils.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;
-			}
-			// with invalidation more parameters are required to make a new storage request
-			mPropertyBag.componentId = oAppComponent.getId();
-			mPropertyBag.invalidateCache = true;
-			return FlexObjectState.getFlexObjects(_omit(mPropertyBag, "skipUpdateCache"));
-		});
+		await saveCompEntities(mPropertyBag);
+		await saveChangePersistenceEntities(mPropertyBag, oAppComponent);
+
+		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;
+		}
+		// with invalidation more parameters are required to make a new storage request
+		mPropertyBag.componentId = oAppComponent.getId();
+		mPropertyBag.invalidateCache = true;
+		return FlexObjectManager.getFlexObjects(_omit(mPropertyBag, "skipUpdateCache"));
 	};
 
-	return FlexObjectState;
+	return FlexObjectManager;
 });

package/src/sap/ui/fl/write/_internal/flexState/UI2Personalization/UI2PersonalizationState.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.flexState.UI2Personalization.UI2PersonalizationState
 	 * @since 1.120
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -101,7 +101,7 @@ sap.ui.define([
 		}
 	}
 
-	function updateObjectAndStorage(oFlexObject, oStoredResponse, sParentVersion) {
+	function updateObjectAndStorage(oFlexObject, oStoredResponse, sParentVersion, sReference) {
 		return Storage.update({
 			flexObject: oFlexObject.convertToFileContent(),
 			layer: oFlexObject.getLayer(),
@@ -125,6 +125,7 @@ sap.ui.define([
 			// update StorageResponse
 			var aObjectArray = getSubSection(oStoredResponse.changes.comp, oFlexObject);
 			var oFileContent = oFlexObject.convertToFileContent();
+			FlexState.getFlexObjectsDataSelector().checkUpdate({ reference: sReference });
 			updateArrayByName(aObjectArray, oFileContent);
 			return oFileContent;
 		});
@@ -152,7 +153,7 @@ sap.ui.define([
 		}
 	}
 
-	function deleteObjectAndRemoveFromStorage(oFlexObject, mCompVariantsMapByPersistencyKey, oStoredResponse, sParentVersion) {
+	function deleteObjectAndRemoveFromStorage(oFlexObject, mCompVariantsMapByPersistencyKey, oStoredResponse, sParentVersion, sReference) {
 		var oFileContent = oFlexObject.convertToFileContent();
 		return Storage.remove({
 			flexObject: oFileContent,
@@ -171,6 +172,7 @@ sap.ui.define([
 				getSubSection(oStoredResponse.changes.comp, oFlexObject),
 				oFileContent.fileName
 			);
+			FlexState.getFlexObjectsDataSelector().checkUpdate({ reference: sReference });
 			return oFileContent;
 		});
 	}
@@ -308,7 +310,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.flexState.compVariants.CompVariantState
 	 * @since 1.83
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -444,7 +446,7 @@ sap.ui.define([
 		oMapOfPersistencyKey.variants.push(oFlexObject);
 		oMapOfPersistencyKey.byId[oFlexObject.getId()] = oFlexObject;
 		FlexState.addDirtyFlexObject(mPropertyBag.reference, oFlexObject);
-		if (oChangeSpecificData.layer === Layer.CUSTOMER) {
+		if (oChangeSpecificData.layer !== Layer.USER && oChangeSpecificData.layer !== Layer.PUBLIC) {
 			mPropertyBag.id = mPropertyBag.control.getCurrentVariantId();
 			revertAllVariantUpdate(getVariantById(mPropertyBag));
 		}
@@ -892,6 +894,7 @@ sap.ui.define([
 				// update StorageResponse
 				const oFileContent = oFlexObject.convertToFileContent();
 				getSubSection(oStoredResponse.changes.comp, oFlexObject).push(oFileContent);
+				FlexState.getFlexObjectsDataSelector().checkUpdate({ reference: mPropertyBag.reference });
 				return oFileContent;
 			});
 		}
@@ -903,10 +906,10 @@ sap.ui.define([
 					return writeObjectAndAddToState(oFlexObject, oStoredResponse, sParentVersion);
 				case States.LifecycleState.DIRTY:
 					ifVariantClearRevertData(oFlexObject);
-					return updateObjectAndStorage(oFlexObject, oStoredResponse, sParentVersion);
+					return updateObjectAndStorage(oFlexObject, oStoredResponse, sParentVersion, mPropertyBag.reference);
 				case States.LifecycleState.DELETED:
 					ifVariantClearRevertData(oFlexObject);
-					return deleteObjectAndRemoveFromStorage(oFlexObject, mCompVariantsMapByPersistencyKey, oStoredResponse, sParentVersion);
+					return deleteObjectAndRemoveFromStorage(oFlexObject, mCompVariantsMapByPersistencyKey, oStoredResponse, sParentVersion, mPropertyBag.reference);
 				default:
 					return undefined;
 			}

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.127.0
+	 * @version 1.128.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.

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

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

@@ -15,7 +15,7 @@ sap.ui.define([
 	"sap/ui/fl/LayerUtils",
 	"sap/ui/fl/Utils",
 	"sap/ui/fl/initial/_internal/FlexInfoSession",
-	"sap/ui/fl/write/_internal/flexState/FlexObjectState",
+	"sap/ui/fl/write/_internal/flexState/FlexObjectManager",
 	"sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantMerger",
 	"sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState",
 	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState",
@@ -33,7 +33,7 @@ sap.ui.define([
 	LayerUtils,
 	FlexUtils,
 	FlexInfoSession,
-	FlexObjectState,
+	FlexObjectManager,
 	CompVariantMerger,
 	CompVariantState,
 	VariantManagementState,
@@ -781,7 +781,7 @@ sap.ui.define([
 			flexObjects: []
 		};
 
-		return FlexObjectState.getFlexObjects({
+		return FlexObjectManager.getFlexObjects({
 			selector: mPropertyBag.control,
 			invalidateCache: false,
 			includeCtrlVariants: true,
@@ -834,7 +834,7 @@ sap.ui.define([
 		if (oContextBasedAdaptationModel.getProperty("/count") !== 0) {
 			return Promise.resolve(false);
 		}
-		return FlexObjectState.getFlexObjects({
+		return FlexObjectManager.getFlexObjects({
 			selector: mPropertyBag.control,
 			invalidateCache: false,
 			includeCtrlVariants: true,
@@ -888,7 +888,7 @@ sap.ui.define([
 
 		return createContextBasedAdaptation.call(this, mPropertyBag, mPropertyBag.contextBasedAdaptation)
 		.then(function() {
-			return FlexObjectState.getFlexObjects({
+			return FlexObjectManager.getFlexObjects({
 				selector: mPropertyBag.control,
 				invalidateCache: false,
 				includeCtrlVariants: true,
@@ -897,7 +897,7 @@ sap.ui.define([
 			});
 		}).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
+			// TODO refactor when FlexObjectManager.getFlexObjects will be refactored
 			var aCustomerFlexObjects = LayerUtils.filterChangeOrChangeDefinitionsByCurrentLayer(aFlexObjects, Layer.CUSTOMER);
 			var aCopiedChanges = copyVariantsAndChanges(aCustomerFlexObjects, mPropertyBag.contextBasedAdaptation.id);
 			return writeChangesToBackend(mPropertyBag, aCopiedChanges);

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

@@ -8,6 +8,7 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/core/Element",
+	"sap/ui/fl/apply/_internal/flexState/FlexObjectState",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"sap/ui/fl/apply/_internal/controlVariants/Utils",
 	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
@@ -23,6 +24,7 @@ sap.ui.define([
 	Log,
 	JsControlTreeModifier,
 	Element,
+	FlexObjectState,
 	FlexState,
 	VariantUtils,
 	ControlVariantApplyAPI,
@@ -305,8 +307,8 @@ sap.ui.define([
 				throw Error("App Component could not be determined");
 			}
 
-			var oChangePersistence = ChangePersistenceFactory.getChangePersistenceForControl(oAppComponent);
-			var aDirtyFlexObjects = oChangePersistence.getDirtyChanges();
+			const sReference = FlexRuntimeInfoAPI.getFlexReference({element: mPropertyBag.selector});
+			var aDirtyFlexObjects = FlexObjectState.getDirtyFlexObjects(sReference);
 
 			return aDirtyFlexObjects.some(function(oFlexObject) {
 				if (oFlexObject.getLayer() !== Layer.USER) {

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write.api.FieldExtensibility
 	 * @since 1.87
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.rta, sap.ui.mdc
 	 */

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

@@ -7,22 +7,22 @@
 sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexObjects/States",
 	"sap/ui/fl/apply/_internal/flexState/changes/UIChangesState",
+	"sap/ui/fl/apply/_internal/flexState/FlexObjectState",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/write/api/PersistenceWriteAPI",
 	"sap/ui/fl/write/api/ChangesWriteAPI",
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/fl/Utils",
-	"sap/ui/fl/ChangePersistenceFactory",
 	"sap/base/util/restricted/_union"
 ], function(
 	States,
 	UIChangesState,
+	FlexObjectState,
 	ManifestUtils,
 	PersistenceWriteAPI,
 	ChangesWriteAPI,
 	JsControlTreeModifier,
 	Utils,
-	ChangePersistenceFactory,
 	union
 ) {
 	"use strict";
@@ -111,8 +111,7 @@ sap.ui.define([
 				oChange.restorePreviousState();
 				var oControl = JsControlTreeModifier.bySelector(oChange.getSelector(), oAppComponent);
 				if (oChange.getState() === States.LifecycleState.PERSISTED) {
-					var oChangePersistence = ChangePersistenceFactory.getChangePersistenceForControl(oAppComponent);
-					var aDirtyChanges = oChangePersistence.getDirtyChanges();
+					const aDirtyChanges = FlexObjectState.getDirtyFlexObjects(oAppComponent.name);
 					var iIndex = aDirtyChanges.indexOf(oChange);
 					if (iIndex >= 0) {
 						aDirtyChanges.splice(iIndex, 1);

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

@@ -13,7 +13,7 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/registry/Settings",
 	"sap/ui/fl/write/_internal/condenser/Condenser",
-	"sap/ui/fl/write/_internal/flexState/FlexObjectState",
+	"sap/ui/fl/write/_internal/flexState/FlexObjectManager",
 	"sap/ui/fl/write/_internal/Storage",
 	"sap/ui/fl/write/api/FeaturesAPI",
 	"sap/ui/fl/initial/_internal/FlexInfoSession",
@@ -31,7 +31,7 @@ sap.ui.define([
 	ManifestUtils,
 	Settings,
 	Condenser,
-	FlexObjectState,
+	FlexObjectManager,
 	Storage,
 	FeaturesAPI,
 	FlexInfoSession,
@@ -93,7 +93,7 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.rta
 	 */
 	PersistenceWriteAPI.hasDirtyChanges = function(mPropertyBag) {
-		return FlexObjectState.hasDirtyFlexObjects(mPropertyBag);
+		return FlexObjectManager.hasDirtyFlexObjects(mPropertyBag);
 	};
 
 	/**
@@ -111,7 +111,7 @@ sap.ui.define([
 	PersistenceWriteAPI.hasHigherLayerChanges = function(mPropertyBag) {
 		mPropertyBag.upToLayer ||= LayerUtils.getCurrentLayer();
 
-		return FlexObjectState.getFlexObjects(mPropertyBag)
+		return FlexObjectManager.getFlexObjects(mPropertyBag)
 		.then(function(aFlexObjects) {
 			return aFlexObjects.filter(function(oFlexObject) {
 				return LayerUtils.isOverLayer(oFlexObject.getLayer(), mPropertyBag.upToLayer);
@@ -123,7 +123,7 @@ sap.ui.define([
 			}
 			// Hidden control variants and their related changes might be necessary for referenced variants, but are not relevant for this check
 			// Same apply for changes of deleted comp variants
-			return FlexObjectState.filterHiddenFlexObjects(aFilteredFlexObjects, mPropertyBag.reference).length > 0;
+			return FlexObjectManager.filterHiddenFlexObjects(aFilteredFlexObjects, mPropertyBag.reference).length > 0;
 		});
 	};
 
@@ -150,7 +150,7 @@ sap.ui.define([
 		var oFlexInfoSession = FlexInfoSession.getByReference(sReference);
 		oFlexInfoSession.saveChangeKeepSession = true;
 		FlexInfoSession.setByReference(oFlexInfoSession, sReference);
-		return FlexObjectState.saveFlexObjects(mPropertyBag).then(function(oFlexObject) {
+		return FlexObjectManager.saveFlexObjects(mPropertyBag).then(function(oFlexObject) {
 			if (oFlexObject && oFlexObject.length !== 0) {
 				return PersistenceWriteAPI.getResetAndPublishInfo(mPropertyBag).then(function(oResult) {
 					// other attributes like adaptationId, isEndUserAdaptation, init needs to be taken from flex info session if available
@@ -468,8 +468,8 @@ sap.ui.define([
 		}
 
 		mPropertyBag.invalidateCache = false;
-		// TODO: Check the mPropertyBag.selector parameter name - the methods called on FlexObjectState expect a control
-		return FlexObjectState.getFlexObjects(mPropertyBag);
+		// TODO: Check the mPropertyBag.selector parameter name - the methods called on FlexObjectManager expect a control
+		return FlexObjectManager.getFlexObjects(mPropertyBag);
 	};
 
 	/**

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

@@ -5,19 +5,19 @@
  */
 
 sap.ui.define([
-	"sap/ui/fl/write/_internal/flexState/FlexObjectState",
+	"sap/ui/fl/apply/_internal/flexState/FlexObjectState",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/write/_internal/Storage",
+	"sap/ui/fl/Utils",
 	"sap/base/util/isEmptyObject",
-	"sap/base/i18n/Localization",
-	"sap/ui/fl/Utils"
+	"sap/base/i18n/Localization"
 ], function(
 	FlexObjectState,
 	ManifestUtils,
 	Storage,
+	Utils,
 	isEmptyObject,
-	Localization,
-	Utils
+	Localization
 ) {
 	"use strict";
 
@@ -41,7 +41,7 @@ sap.ui.define([
 	 * @returns {boolean} <code>true</code> in case translatable texts are present
 	 */
 	TranslationAPI.hasTranslationRelevantDirtyChanges = function(mPropertyBag) {
-		return FlexObjectState.getDirtyFlexObjects(mPropertyBag).some(function(oChange) {
+		return FlexObjectState.getDirtyFlexObjects(ManifestUtils.getFlexReferenceForControl(mPropertyBag.selector)).some(function(oChange) {
 			return !isEmptyObject(oChange.getTexts());
 		});
 	};

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

@@ -5,6 +5,7 @@
  */
 
 sap.ui.define([
+	"sap/ui/fl/apply/_internal/flexState/FlexObjectState",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/initial/_internal/FlexInfoSession",
@@ -12,8 +13,10 @@ sap.ui.define([
 	"sap/ui/fl/write/_internal/Versions",
 	"sap/ui/fl/write/api/ContextBasedAdaptationsAPI",
 	"sap/ui/fl/write/api/FeaturesAPI",
+	"sap/ui/fl/ChangePersistenceFactory",
 	"sap/ui/fl/Utils"
 ], function(
+	FlexObjectState,
 	FlexState,
 	ManifestUtils,
 	FlexInfoSession,
@@ -21,12 +24,13 @@ sap.ui.define([
 	Versions,
 	ContextBasedAdaptationsAPI,
 	FeaturesAPI,
+	ChangePersistenceFactory,
 	Utils
 ) {
 	"use strict";
 
-	function getFlexReferenceForControl(control) {
-		var sReference = ManifestUtils.getFlexReferenceForControl(control);
+	function getFlexReferenceForControl(oControl) {
+		const sReference = ManifestUtils.getFlexReferenceForControl(oControl);
 
 		if (!sReference) {
 			throw Error("The application ID could not be determined");
@@ -35,6 +39,11 @@ sap.ui.define([
 		return sReference;
 	}
 
+	function doDirtyChangesExist(sReference) {
+		const aDirtyChanges = FlexObjectState.getDirtyFlexObjects(sReference);
+		return aDirtyChanges.length > 0;
+	}
+
 	function getVersionsModel(mPropertyBag) {
 		if (!mPropertyBag.control) {
 			throw Error("No control was provided");
@@ -45,11 +54,15 @@ sap.ui.define([
 
 		var sReference = getFlexReferenceForControl(mPropertyBag.control);
 
-		return Versions.getVersionsModel({
-			nonNormalizedReference: sReference,
+		const oVersionModel = Versions.getVersionsModel({
 			reference: sReference,
 			layer: mPropertyBag.layer
 		});
+
+		if (doDirtyChangesExist(sReference)) {
+			oVersionModel.updateDraftVersion();
+		}
+		return oVersionModel;
 	}
 
 	function incorporateAdaptationIdInSwitch(mPropertyBag) {
@@ -249,13 +262,15 @@ sap.ui.define([
 		}
 
 		const sReference = getFlexReferenceForControl(mPropertyBag.control);
+		if (doDirtyChangesExist(sReference)) {
+			return Promise.reject("Unsaved changes exist");
+		}
 
 		const oFlexInfo = FlexInfoSession.getByReference(sReference);
 		delete oFlexInfo.version;
 		FlexInfoSession.setByReference(oFlexInfo, sReference);
 
 		return Versions.activate({
-			nonNormalizedReference: sReference,
 			reference: sReference,
 			layer: mPropertyBag.layer,
 			title: mPropertyBag.title,
@@ -276,21 +291,31 @@ sap.ui.define([
 	 * rejects if an error occurs or the layer does not support draft handling
 	 */
 	VersionsAPI.discardDraft = function(mPropertyBag) {
+		const oAppComponent = Utils.getAppComponentForControl(mPropertyBag.control);
+		const sReference = getFlexReferenceForControl(oAppComponent);
+		function removeDirtyChanges() {
+			const oChangePersistence = ChangePersistenceFactory.getChangePersistenceForComponent(sReference);
+			const aDirtyChanges = FlexObjectState.getDirtyFlexObjects(sReference);
+			oChangePersistence.deleteChanges(aDirtyChanges, true);
+			return aDirtyChanges.length > 0;
+		}
+
 		if (!mPropertyBag.control) {
 			return Promise.reject("No control was provided");
 		}
 		if (!mPropertyBag.layer) {
 			return Promise.reject("No layer was provided");
 		}
-
-		const oAppComponent = Utils.getAppComponentForControl(mPropertyBag.control);
-		const sReference = getFlexReferenceForControl(oAppComponent);
 		return Versions.discardDraft({
-			nonNormalizedReference: sReference,
 			reference: sReference,
 			layer: mPropertyBag.layer
 		})
 		.then(function(oDiscardInfo) {
+			// in case of a existing draft known by the backend;
+			// we remove dirty changes only after successful DELETE request
+			const bDirtyChangesRemoved = removeDirtyChanges();
+			oDiscardInfo.dirtyChangesDiscarded = bDirtyChangesRemoved;
+
 			if (oDiscardInfo.backendChangesDiscarded) {
 				const bHasAdaptationsModel = ContextBasedAdaptationsAPI.hasAdaptationsModel({
 					layer: mPropertyBag.layer,