@openui5/sap.ui.fl 1.121.1 → 1.122.0

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

@@ -40,7 +40,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.KeyUserConnector
 	 * @since 1.70
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */
@@ -72,7 +72,7 @@ sap.ui.define([
 			var aParameters = ["type", "$skip", "$filter"];
 			var mParameters = _pick(mPropertyBag, aParameters);
 
-			var sContextsUrl = InitialUtils.getUrl(KeyUserConnector.ROUTES.CONTEXTS, mPropertyBag, mParameters);
+			var sContextsUrl = InitialUtils.getUrl(this.ROUTES.CONTEXTS, mPropertyBag, mParameters);
 			return InitialUtils.sendRequest(sContextsUrl, "GET", {initialConnector: InitialConnector}).then(function(oResult) {
 				return oResult.response;
 			});
@@ -81,8 +81,8 @@ sap.ui.define([
 		loadContextDescriptions(mPropertyBag) {
 			var mParameters = {};
 			InitialUtils.addLanguageInfo(mParameters);
-			_enhancePropertyBagWithTokenInfo(mPropertyBag);
-			var sContextsUrl = InitialUtils.getUrl(KeyUserConnector.ROUTES.CONTEXTS, mPropertyBag, mParameters);
+			_enhancePropertyBagWithTokenInfo.call(this, mPropertyBag);
+			var sContextsUrl = InitialUtils.getUrl(this.ROUTES.CONTEXTS, mPropertyBag, mParameters);
 			mPropertyBag.payload = JSON.stringify(mPropertyBag.flexObjects);
 			mPropertyBag.dataType = "json";
 			mPropertyBag.contentType = "application/json; charset=utf-8";
@@ -108,7 +108,7 @@ sap.ui.define([
 
 	function _enhancePropertyBagWithTokenInfo(mPropertyBag) {
 		mPropertyBag.initialConnector = InitialConnector;
-		mPropertyBag.tokenUrl = KeyUserConnector.ROUTES.TOKEN;
+		mPropertyBag.tokenUrl = this.ROUTES.TOKEN;
 	}
 
 	function _enhancePropertyBagForDraftActivation(mPropertyBag) {
@@ -128,11 +128,11 @@ sap.ui.define([
 
 	KeyUserConnector.versions = {
 		load(mPropertyBag) {
-			_enhancePropertyBagWithTokenInfo(mPropertyBag);
+			_enhancePropertyBagWithTokenInfo.call(this, mPropertyBag);
 			var mParameters = {};
 			InitialUtils.addLanguageInfo(mParameters);
 			mParameters.limit = mPropertyBag.limit;
-			var sVersionsUrl = InitialUtils.getUrl(KeyUserConnector.ROUTES.VERSIONS.GET, mPropertyBag, mParameters);
+			var sVersionsUrl = InitialUtils.getUrl(this.ROUTES.VERSIONS.GET, mPropertyBag, mParameters);
 			return InitialUtils.sendRequest(sVersionsUrl, "GET", mPropertyBag).then(function(oResult) {
 				return oResult.response.versions.map(function(oVersion) {
 					return renameVersionNumberProperty(oVersion);
@@ -140,19 +140,19 @@ sap.ui.define([
 			});
 		},
 		activate(mPropertyBag) {
-			_enhancePropertyBagWithTokenInfo(mPropertyBag);
+			_enhancePropertyBagWithTokenInfo.call(this, mPropertyBag);
 			_enhancePropertyBagForDraftActivation(mPropertyBag);
 			var mParameters = {version: mPropertyBag.version};
 			InitialUtils.addLanguageInfo(mParameters);
-			var sVersionsUrl = InitialUtils.getUrl(KeyUserConnector.ROUTES.VERSIONS.ACTIVATE, mPropertyBag, mParameters);
+			var sVersionsUrl = InitialUtils.getUrl(this.ROUTES.VERSIONS.ACTIVATE, mPropertyBag, mParameters);
 			return WriteUtils.sendRequest(sVersionsUrl, "POST", mPropertyBag).then(function(oResult) {
 				var oVersion = oResult.response;
 				return renameVersionNumberProperty(oVersion);
 			});
 		},
 		discardDraft(mPropertyBag) {
-			_enhancePropertyBagWithTokenInfo(mPropertyBag);
-			var sVersionsUrl = InitialUtils.getUrl(KeyUserConnector.ROUTES.VERSIONS.DISCARD, mPropertyBag);
+			_enhancePropertyBagWithTokenInfo.call(this, mPropertyBag);
+			var sVersionsUrl = InitialUtils.getUrl(this.ROUTES.VERSIONS.DISCARD, mPropertyBag);
 			return WriteUtils.sendRequest(sVersionsUrl, "DELETE", mPropertyBag);
 		},
 		publish(mPropertyBag) {
@@ -169,10 +169,9 @@ sap.ui.define([
 				});
 				return "Error";
 			};
-
-			_enhancePropertyBagWithTokenInfo(mPropertyBag);
+			_enhancePropertyBagWithTokenInfo.call(this, mPropertyBag);
 			var mParameters = {version: mPropertyBag.version};
-			var sVersionsUrl = InitialUtils.getUrl(KeyUserConnector.ROUTES.VERSIONS.PUBLISH, mPropertyBag, mParameters);
+			var sVersionsUrl = InitialUtils.getUrl(this.ROUTES.VERSIONS.PUBLISH, mPropertyBag, mParameters);
 			return WriteUtils.sendRequest(sVersionsUrl, "POST", mPropertyBag).then(function() {
 				BusyIndicator.hide();
 				return oResourceBundle.getText("MSG_CF_PUBLISH_SUCCESS");
@@ -182,26 +181,26 @@ sap.ui.define([
 
 	KeyUserConnector.translation = {
 		getTexts(mPropertyBag) {
-			_enhancePropertyBagWithTokenInfo(mPropertyBag);
+			_enhancePropertyBagWithTokenInfo.call(this, mPropertyBag);
 			var mParameters = _pick(mPropertyBag, ["sourceLanguage", "targetLanguage"]);
-			var sTranslationUrl = InitialUtils.getUrl(KeyUserConnector.ROUTES.TRANSLATION.DOWNLOAD, mPropertyBag, mParameters);
+			var sTranslationUrl = InitialUtils.getUrl(this.ROUTES.TRANSLATION.DOWNLOAD, mPropertyBag, mParameters);
 			return InitialUtils.sendRequest(sTranslationUrl, "GET", mPropertyBag).then(function(oResult) {
 				return oResult.response;
 			});
 		},
 
 		getSourceLanguages(mPropertyBag) {
-			_enhancePropertyBagWithTokenInfo(mPropertyBag);
+			_enhancePropertyBagWithTokenInfo.call(this, mPropertyBag);
 			var mParameters = {};
-			var sTranslationUrl = InitialUtils.getUrl(KeyUserConnector.ROUTES.TRANSLATION.GET_SOURCELANGUAGE, mPropertyBag, mParameters);
+			var sTranslationUrl = InitialUtils.getUrl(this.ROUTES.TRANSLATION.GET_SOURCELANGUAGE, mPropertyBag, mParameters);
 			return InitialUtils.sendRequest(sTranslationUrl, "GET", mPropertyBag).then(function(oResult) {
 				return oResult && oResult.response && oResult.response.sourceLanguages ? oResult.response.sourceLanguages : [];
 			});
 		},
 
 		postTranslationTexts(mPropertyBag) {
-			_enhancePropertyBagWithTokenInfo(mPropertyBag);
-			var sTranslationUrl = InitialUtils.getUrl(KeyUserConnector.ROUTES.TRANSLATION.UPLOAD, mPropertyBag, {});
+			_enhancePropertyBagWithTokenInfo.call(this, mPropertyBag);
+			var sTranslationUrl = InitialUtils.getUrl(this.ROUTES.TRANSLATION.UPLOAD, mPropertyBag, {});
 			return InitialUtils.sendRequest(sTranslationUrl, "POST", mPropertyBag);
 		}
 	};

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

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

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.NeoLrepConnector
 	 * @since 1.81
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.ObjectPathConnector
 	 * @since 1.73
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.PersonalizationConnector
 	 * @since 1.70
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

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

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.Utils
 	 * @since 1.70
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.connectors, sap.ui.fl.write._internal.transport
 	 */

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

@@ -35,7 +35,7 @@ function(
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 */
 	var Processor = {
 		applyExtensionPoint(oExtensionPoint) {

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

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ABAPAccess
 	 * @since 1.87.0
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @private
 	 */
 	var ABAPAccess = {};

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

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @class
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ABAPExtensibilityVariant
 	 * @since 1.87
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @public
 	 * @param {sap.ui.base.ManagedObject} oControl - Control to add extensions
 	 */

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

@@ -115,7 +115,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ABAPExtensibilityVariantFactory
 	 * @since 1.87.0
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @private
 	 */
 	var ABAPExtensibilityVariantFactory = {};

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.MultiTenantABAPExtensibilityVariant
 	 * @since 1.87
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @public
 	 */
 

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

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ServiceValidation
 	 * @since 1.87.0
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @private
 	 */
 	var ServiceValidation = {};

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

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

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

@@ -134,7 +134,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.UriParser
 	 * @since 1.87.0
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @private
 	 */
 	var UriParser = {};

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

@@ -245,7 +245,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.Utils
 	 * @since 1.87.0
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @private
 	 */
 	var Utils = {};

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

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

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

@@ -82,7 +82,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.dialog.CustomFieldCAPDialog
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @since 1.93
 	 * @private
 	 * @ui5-restricted

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/booleanEditor/BooleanEditor.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.booleanEditor.BooleanEditor
 	 * @author SAP SE
 	 * @since 1.93
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/rangeEditor/RangeEditor.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.rangeEditor.RangeEditor
 	 * @author SAP SE
 	 * @since 1.93
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/timeEditor/TimeEditor.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.timeEditor.TimeEditor
 	 * @author SAP SE
 	 * @since 1.93
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

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

@@ -39,22 +39,12 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.flexState.FlexObjectState
 	 * @since 1.83
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
 	var FlexObjectState = {};
 
-	function initFlexStateAndSetReference(mPropertyBag) {
-		mPropertyBag.reference = ManifestUtils.getFlexReferenceForControl(mPropertyBag.selector);
-		return FlexState.initialize({
-			componentId: mPropertyBag.componentId || Utils.getAppComponentForControl(mPropertyBag.selector).getId(),
-			reference: mPropertyBag.reference,
-			componentData: {},
-			manifest: {}
-		});
-	}
-
 	function getCompVariantEntities(mPropertyBag) {
 		var mCompEntities = FlexState.getCompVariantsMap(mPropertyBag.reference);
 		var aEntities = [];
@@ -195,13 +185,10 @@ sap.ui.define([
 	 * @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) {
-		return initFlexStateAndSetReference(mPropertyBag)
-		.then(function() {
-			return getChangePersistenceEntities(mPropertyBag);
-		}).then(function(aChangePersistenceEntities) {
-			return getCompVariantEntities(mPropertyBag).concat(aChangePersistenceEntities);
-		});
+	FlexObjectState.getFlexObjects = async function(mPropertyBag) {
+		mPropertyBag.reference = ManifestUtils.getFlexReferenceForControl(mPropertyBag.selector);
+		const aChangePersistenceEntities = await getChangePersistenceEntities(mPropertyBag);
+		return getCompVariantEntities(mPropertyBag).concat(aChangePersistenceEntities);
 	};
 
 	/**

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.121.1
+	 * @version 1.122.0
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -291,7 +291,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.flexState.compVariants.CompVariantState
 	 * @since 1.83
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -349,6 +349,7 @@ sap.ui.define([
 			oChange.addRevertInfo(new RevertData({
 				type: CompVariantState.operationType.NewChange
 			}));
+			FlexState.addDirtyFlexObject(mPropertyBag.reference, oChange);
 		} else {
 			oChange.addRevertInfo(new RevertData({
 				type: CompVariantState.operationType.ContentUpdate,
@@ -425,6 +426,7 @@ sap.ui.define([
 		var oMapOfPersistencyKey = mCompVariantsMap._getOrCreate(mPropertyBag.persistencyKey);
 		oMapOfPersistencyKey.variants.push(oFlexObject);
 		oMapOfPersistencyKey.byId[oFlexObject.getId()] = oFlexObject;
+		FlexState.addDirtyFlexObject(mPropertyBag.reference, oFlexObject);
 		return oFlexObject;
 	};
 
@@ -559,6 +561,7 @@ sap.ui.define([
 				var sPersistencyKey = oChange.getSelector().persistencyKey;
 				mCompVariantsMap[sPersistencyKey].changes.push(oChange);
 				mCompVariantsMap[sPersistencyKey].byId[oChange.getId()] = oChange;
+				FlexState.addDirtyFlexObject(mPropertyBag.reference, oChange);
 			}
 
 			var oContent = {};
@@ -738,6 +741,7 @@ sap.ui.define([
 			mCompVariantsMap[sPersistencyKey].changes = mCompVariantsMap[sPersistencyKey].changes.filter(function(oChangeInMap) {
 				return oChangeInMap !== oChange;
 			});
+			FlexState.removeDirtyFlexObject(mPropertyBag.reference, oChange);
 		}
 
 		var oVariant = getVariantById(mPropertyBag);

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

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

@@ -16,12 +16,12 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/changes/Reverter",
 	"sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory",
 	"sap/ui/fl/apply/_internal/flexObjects/States",
+	"sap/ui/fl/apply/_internal/flexState/changes/UIChangesState",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/descriptorRelated/api/DescriptorChangeFactory",
 	"sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerStorage",
 	"sap/ui/fl/write/api/ContextBasedAdaptationsAPI",
 	"sap/ui/fl/write/_internal/appVariant/AppVariantInlineChangeFactory",
-	"sap/ui/fl/ChangePersistenceFactory",
 	"sap/ui/fl/Utils"
 ], function(
 	_omit,
@@ -35,12 +35,12 @@ sap.ui.define([
 	Reverter,
 	FlexObjectFactory,
 	States,
+	UIChangesState,
 	ManifestUtils,
 	DescriptorChangeFactory,
 	ChangeHandlerStorage,
 	ContextBasedAdaptationsAPI,
 	AppVariantInlineChangeFactory,
-	ChangePersistenceFactory,
 	Utils
 ) {
 	"use strict";
@@ -189,8 +189,10 @@ sap.ui.define([
 		// TODO: Descriptor apply function
 		return Applier.applyChangeOnControl(mPropertyBag.change, mPropertyBag.element, _omit(mPropertyBag, ["element", "change"]))
 		.then(function(oResult) {
-			var oChangePersistence = ChangePersistenceFactory.getChangePersistenceForControl(mPropertyBag.element);
-			var aDependentChanges = oChangePersistence.getOpenDependentChangesForControl(mPropertyBag.change.getSelector(), mPropertyBag.appComponent);
+			var aDependentChanges = UIChangesState.getOpenDependentChangesForControl(
+				JsControlTreeModifier.getControlIdBySelector(mPropertyBag.change.getSelector(), mPropertyBag.appComponent),
+				mPropertyBag.appComponent
+			);
 			if (aDependentChanges.length > 0) {
 				return ChangesWriteAPI.revert({
 					change: mPropertyBag.change,

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

@@ -107,7 +107,7 @@ sap.ui.define([
 		 * @private
 		 * @ui5-restricted
 		 */
-		add(mPropertyBag) {
+		async add(mPropertyBag) {
 			if (!mPropertyBag.changes.length) {
 				return Promise.resolve([]);
 			}
@@ -210,19 +210,14 @@ sap.ui.define([
 			// Make sure to first create and add all changes so that change handlers
 			// that rely on change batching in the applier can wait for them, e.g.
 			// when adding multiple columns at once to a MDC table
-			return FlexState.initialize({
-				componentId: oAppComponent.getId()
-			}).then(function() {
-				return createChanges()
-				.then(applyChanges)
-				.then(function() {
-					(mChangeCreationListeners[sFlexReference] || [])
-					.forEach(function(fnCallback) {
-						fnCallback(aSuccessfulChanges);
-					});
-					return aSuccessfulChanges;
-				});
+			const aChanges = await createChanges();
+			await applyChanges(aChanges);
+
+			(mChangeCreationListeners[sFlexReference] || [])
+			.forEach(function(fnCallback) {
+				fnCallback(aSuccessfulChanges);
 			});
+			return aSuccessfulChanges;
 		},
 
 		/**

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.121.1
+	 * @version 1.122.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.rta, sap.ui.mdc
 	 */

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

@@ -55,9 +55,6 @@ sap.ui.define([
 				throw new Error("not all mandatory properties were provided for the storage of the personalization");
 			}
 
-			await FlexState.initialize({
-				componentId: mPropertyBag.selector.getId()
-			});
 			await UI2PersonalizationState.setPersonalization(_omit(mPropertyBag, ["selector"]));
 		},
 
@@ -85,9 +82,6 @@ sap.ui.define([
 				throw new Error("not all mandatory properties were provided for the deletion of the personalization");
 			}
 
-			await FlexState.initialize({
-				componentId: mPropertyBag.selector.getId()
-			});
 			await UI2PersonalizationState.deletePersonalization(
 				mPropertyBag.reference,
 				mPropertyBag.containerKey,

package/src/sap/ui/fl/write/api/connectors/ObjectStorageConnector.js

@@ -390,6 +390,22 @@ sap.ui.define([
 				var vFlexObject = this.storage._itemsStoredAsObjects ? oFileContent : JSON.stringify(oFileContent);
 				aPromises.push(this.storage.setItem(oItemToSet.key, vFlexObject));
 			}.bind(this));
+			// discard draft when last draft change is delete
+			if (mFeatures.isVersioningEnabled && mPropertyBag.layer === Layer.CUSTOMER
+				&& oCondenseInformation.delete && Object.keys(oCondenseInformation.delete).length !== 0) {
+				const aVersions = await this.versions.load.call(this, mPropertyBag);
+				if (aVersions.length) {
+					const oDraftVersion = aVersions.find((oVersion) => oVersion.isDraft);
+					Object.values(oCondenseInformation.delete).forEach(function(aChangeIds) {
+						aChangeIds.forEach(function(sChangeId) {
+							oDraftVersion.filenames = oDraftVersion.filenames.filter(function(filename) { return filename !== sChangeId; });
+						});
+					});
+					if (!oDraftVersion.filenames.length) {
+						await this.versions.discardDraft.call(this, mPropertyBag);
+					}
+				}
+			}
 			return Promise.all(aPromises).then(function() {
 				return Promise.resolve({response: aResponse});
 			});
@@ -455,8 +471,7 @@ sap.ui.define([
 				const aVersions = await this.versions.load.call(this, mPropertyBag);
 				// default is always the latest non-draft
 				sVersionId ||= aVersions.find((oVersion) => !oVersion.isDraft)?.id;
-
-				while (sVersionId) {
+				while (sVersionId && sVersionId !== Version.Number.Original) {
 					const oVersion = aVersions.find(findVersion.bind(undefined, sVersionId));
 					aVersionChain.push(oVersion.id);
 					sVersionId = oVersion.parentVersion;

package/src/sap/ui/fl/apply/_internal/preprocessors/EventHistory.js

@@ -1,91 +0,0 @@
-/*!
- * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
- */
-
-sap.ui.define(["sap/ui/core/EventBus"], function(EventBus) {
-	"use strict";
-
-	/**
-	 * Provides a history of events. This is needed to show/hide the personalization icon
-	 *
-	 * @namespace
-	 * @alias sap.ui.fl.apply._internal.preprocessors.EventHistory
-	 * @since 1.47.0
-	 * @author SAP SE
-	 * @version 1.121.1
-	 *
-	 * @private
-	 * @ui5-restricted sap.ui.fl.apply._internal.preprocessors.RegistrationDelegator
-	 */
-	var EventHistory = function() {
-	};
-
-	EventHistory._aEventIds = [
-		"ControlForPersonalizationRendered"
-	];
-
-	EventHistory._aUnsubscribedEventIds = [];
-
-	EventHistory._oHistory = {};
-
-	/**
-	 * Starts listening to the events
-	 */
-	EventHistory.start = function() {
-		EventHistory._aEventIds.forEach(function(sEventId) {
-			if (EventHistory._aUnsubscribedEventIds.indexOf(sEventId) === -1) {
-				EventBus.getInstance().subscribe("sap.ui", sEventId, EventHistory.saveEvent);
-				EventHistory._oHistory[sEventId] = [];
-			}
-		});
-	};
-
-	/**
-	 * Saves an event when fired
-	 *
-	 * @param {string} sChannelId The channel of the event
-	 * @param {string} sEventId The identifier of the event
-	 * @param {map} mParameters The parameter map carried by the event
-	 */
-	EventHistory.saveEvent = function(sChannelId, sEventId, mParameters) {
-		var oEvent = {
-			channelId: sChannelId,
-			eventId: sEventId,
-			parameters: mParameters.getId() // we only need the id. In unified.shell Element.getElementById(vControl); will be used.
-		};
-
-		if (EventHistory._oHistory[sEventId]) {
-			var bExists = EventHistory._oHistory[sEventId].some(function(oObject) {
-				return (oObject.channelId === oEvent.channelId &&
-					oObject.eventId === oEvent.eventId &&
-					oObject.parameters === oEvent.parameters);
-			});
-			if (!bExists) {
-				EventHistory._oHistory[sEventId].push(oEvent);
-			}
-		}
-	};
-
-	/**
-	 * Returns the history of the event and stops listening
-	 *
-	 * @param {string} sEventId The identifier of the event
-	 *
-	 * @return {array} List of events
-	 */
-	EventHistory.getHistoryAndStop = function(sEventId) {
-		EventBus.getInstance().unsubscribe("sap.ui", sEventId, EventHistory.saveEvent);
-		EventHistory._addUnsubscribedEvent(sEventId);
-		return EventHistory._oHistory[sEventId] || [];
-	};
-
-	EventHistory._addUnsubscribedEvent = function(sEventId) {
-		if (EventHistory._aUnsubscribedEventIds.indexOf(sEventId) === -1) {
-			EventHistory._aUnsubscribedEventIds.push(sEventId);
-		}
-	};
-
-	return EventHistory;
-});