@openui5/sap.ui.fl 1.141.2 → 1.143.0

package/src/sap/ui/fl/variants/VariantModel.js

@@ -8,76 +8,54 @@ sap.ui.define([
 	"sap/base/util/restricted/_difference",
 	"sap/base/util/restricted/_isEqual",
 	"sap/base/util/restricted/_omit",
+	"sap/base/util/Deferred",
 	"sap/base/util/isEmptyObject",
 	"sap/base/util/merge",
+	"sap/m/library",
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
-	"sap/ui/core/BusyIndicator",
 	"sap/ui/core/Lib",
 	"sap/ui/fl/apply/_internal/controlVariants/URLHandler",
 	"sap/ui/fl/apply/_internal/controlVariants/Utils",
 	"sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory",
 	"sap/ui/fl/apply/_internal/flexState/changes/DependencyHandler",
-	"sap/ui/fl/apply/_internal/flexState/controlVariants/Switcher",
 	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState",
 	"sap/ui/fl/apply/_internal/flexState/FlexObjectState",
-	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
 	"sap/ui/fl/initial/_internal/ManifestUtils",
 	"sap/ui/fl/initial/_internal/Settings",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/LayerUtils",
 	"sap/ui/fl/Utils",
 	"sap/ui/model/json/JSONModel",
-	"sap/ui/model/BindingMode",
-	"sap/m/library"
+	"sap/ui/model/BindingMode"
 ], function(
 	_difference,
 	_isEqual,
 	_omit,
+	Deferred,
 	isEmptyObject,
 	merge,
+	mobileLibrary,
 	JsControlTreeModifier,
-	BusyIndicator,
 	Lib,
 	URLHandler,
 	VariantUtil,
 	FlexObjectFactory,
 	DependencyHandler,
-	Switcher,
 	VariantManagementState,
 	FlexObjectState,
-	ControlVariantApplyAPI,
 	ManifestUtils,
 	Settings,
 	Layer,
 	LayerUtils,
 	Utils,
 	JSONModel,
-	BindingMode,
-	mobileLibrary
+	BindingMode
 ) {
 	"use strict";
 
 	var _mUShellServices = {};
 	const { SharingMode } = mobileLibrary;
 
-	/**
-	 * Adds the passed function to the variant switch promise and returns the whole promise chain.
-	 *
-	 * @param {function():Promise} fnCallback - Callback function returning a promise
-	 * @param {string} sFlexReference - Flex reference of the app
-	 * @param {string} sVMReference - Variant Management reference
-	 * @returns {Promise} Resolves when the variant model is not busy anymore
-	 * @private
-	 */
-	function executeAfterSwitch(fnCallback, sFlexReference, sVMReference) {
-		// if there are multiple switches triggered very quickly this makes sure that they are being executed one after another
-		const oNewPromise = VariantManagementState.waitForVariantSwitch(sFlexReference, sVMReference)
-		.catch(function() {})
-		.then(fnCallback);
-		VariantManagementState.setVariantSwitchPromise(sFlexReference, sVMReference, oNewPromise);
-		return oNewPromise;
-	}
-
 	/**
 	 * Saves the specified Unified Shell service on the model
 	 *
@@ -88,23 +66,6 @@ sap.ui.define([
 		_mUShellServices[sServiceName] = oService;
 	}
 
-	function switchVariantAndUpdateModel(mPropertyBag, sScenario) {
-		return Switcher.switchVariant(mPropertyBag)
-		.then(function() {
-			// update current variant in model
-			if (this.oData[mPropertyBag.vmReference].updateVariantInURL) {
-				URLHandler.updateVariantInURL({
-					vmReference: mPropertyBag.vmReference,
-					newVReference: mPropertyBag.newVReference,
-					model: this
-				});
-			}
-
-			// tell listeners that variant switch has happened
-			this.callVariantSwitchListeners(mPropertyBag.vmReference, mPropertyBag.newVReference, undefined, sScenario);
-		}.bind(this));
-	}
-
 	function updatePersonalVariantPropertiesWithFlpSettings(oVariant) {
 		var oSettings = Settings.getInstanceOrUndef();
 		if (oSettings && !oSettings.getIsVariantPersonalizationEnabled()) {
@@ -184,7 +145,7 @@ sap.ui.define([
 	 * @class Variant model implementation for JSON format.
 	 * @extends sap.ui.model.json.JSONModel
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @param {object} oData - Either the URL where to load the JSON from or a JS object
 	 * @param {object} mPropertyBag - Map of properties required for the constructor
 	 * @param {sap.ui.core.Component} mPropertyBag.appComponent - Application component instance that is currently loading
@@ -195,7 +156,6 @@ sap.ui.define([
 	 * @alias sap.ui.fl.variants.VariantModel
 	 */
 	var VariantModel = JSONModel.extend("sap.ui.fl.variants.VariantModel", /** @lends sap.ui.fl.variants.VariantModel.prototype */ {
-		// eslint-disable-next-line object-shorthand
 		constructor: function(oData, mPropertyBag) {
 			// JSON model internal properties
 			this.pSequentialImportCompleted = Promise.resolve();
@@ -219,7 +179,7 @@ sap.ui.define([
 
 			const oLiveDependencyMap = FlexObjectState.getLiveDependencyMap(this.sFlexReference);
 			VariantManagementState.getInitialUIChanges(
-				{reference: this.sFlexReference},
+				{ reference: this.sFlexReference },
 				this.oAppComponent.getId(),
 				this.sFlexReference
 			).forEach((oFlexObject) => {
@@ -233,7 +193,7 @@ sap.ui.define([
 	VariantModel.prototype.updateData = function() {
 		const oNewVariantsMap = this.oDataSelector.get({ reference: this.sFlexReference });
 		const oCurrentData = { ...this.getData() };
-		Object.entries(oNewVariantsMap).forEach(function(aVariants) {
+		Object.entries(oNewVariantsMap).forEach((aVariants) => {
 			const sVariantManagementKey = aVariants[0];
 			const oVariantMapEntry = { ...aVariants[1] };
 			oCurrentData[sVariantManagementKey] ||= {};
@@ -244,6 +204,25 @@ sap.ui.define([
 				});
 				return { ...(oCurrentVariantData || {}), ...oVariant };
 			});
+			const sOldCurrentVariant = oCurrentData[sVariantManagementKey].currentVariant;
+			// Currently the VariantModel is still created independent of the existence of a VM control
+			// It is likely that the control was created if sOldCurrentVariant is set but there are edge cases,
+			// e.g. when creating the standard variant from a source variant directly in the FlexState
+			// In such cases the switch was not triggered by a user though and thus must not be reflected in
+			// the url, making it safe to ignore
+			const oVMControl = VariantUtil.getVariantManagementControlByVMReference(sVariantManagementKey, this.oAppComponent);
+			if (
+				oVMControl
+				&& oVMControl.getUpdateVariantInURL()
+				&& sOldCurrentVariant
+				&& sOldCurrentVariant !== oVariantMapEntry.currentVariant
+			) {
+				URLHandler.updateVariantInURL({
+					vmReference: sVariantManagementKey,
+					newVReference: oVariantMapEntry.currentVariant,
+					model: this
+				});
+			}
 			oCurrentData[sVariantManagementKey].currentVariant = oVariantMapEntry.currentVariant;
 			oCurrentData[sVariantManagementKey].defaultVariant = oVariantMapEntry.defaultVariant;
 			oCurrentData[sVariantManagementKey].modified = oVariantMapEntry.modified;
@@ -256,7 +235,7 @@ sap.ui.define([
 	};
 
 	VariantModel.prototype.invalidateMap = function() {
-		this.oDataSelector.checkUpdate({reference: this.sFlexReference});
+		this.oDataSelector.checkUpdate({ reference: this.sFlexReference });
 	};
 
 	/**
@@ -271,38 +250,6 @@ sap.ui.define([
 		}.bind(this));
 	};
 
-	/**
-	 * Updates the storage of the current variant for a given variant management control.
-	 * @param {object} mPropertyBag - Object with parameters as properties
-	 * @param {string} mPropertyBag.variantManagementReference - Variant management reference
-	 * @param {string} mPropertyBag.newVariantReference - Newly selected variant reference
-	 * @param {sap.ui.core.Component} [mPropertyBag.appComponent] - Application component responsible for the variant management reference
-	 * @param {boolean} [mPropertyBag.internallyCalled] - If set variant model is not set to busy explicitly
-	 * @param {string} [mPropertyBag.scenario] - The current scenario, e.g. 'saveAs'
-	 *
-	 * @returns {Promise} Promise that resolves after the variant is updated
-	 * @private
-	 */
-	VariantModel.prototype.updateCurrentVariant = function(mPropertyBag) {
-		var mProperties = {
-			vmReference: mPropertyBag.variantManagementReference,
-			currentVReference: this.getCurrentVariantReference(mPropertyBag.variantManagementReference),
-			newVReference: mPropertyBag.newVariantReference,
-			appComponent: mPropertyBag.appComponent || this.oAppComponent,
-			modifier: JsControlTreeModifier,
-			reference: this.sFlexReference
-		};
-
-		if (mPropertyBag.internallyCalled) {
-			return switchVariantAndUpdateModel.call(this, mProperties, mPropertyBag.scenario);
-		}
-		return executeAfterSwitch(
-			switchVariantAndUpdateModel.bind(this, mProperties, mPropertyBag.scenario),
-			this.sFlexReference,
-			mPropertyBag.variantManagementReference
-		);
-	};
-
 	/**
 	 * Returns the current variant for a given variant management control.
 	 * @param {string} sVariantManagementReference - Variant management reference
@@ -341,31 +288,6 @@ sap.ui.define([
 		);
 	};
 
-	/**
-	 * Searches for the variant and returns the current title.
-	 *
-	 * @param {string} sVariantReference - Variant reference
-	 * @param {string} sVMReference - Variant management reference
-	 * @returns {string} Title of the variant
-	 */
-	VariantModel.prototype.getVariantTitle = function(sVariantReference, sVMReference) {
-		return getVariant(this.oData[sVMReference].variants, sVariantReference).title;
-	};
-
-	VariantModel.prototype.callVariantSwitchListeners = function(sVMReference, sNewVariantReference, fnCallback, sScenario) {
-		const oVMControl = ControlVariantApplyAPI.getVariantManagementControlByVMReference(sVMReference, this.oAppComponent);
-		const oVariant = getVariant(this.oData[sVMReference].variants, sNewVariantReference);
-		if (sScenario) {
-			oVariant.createScenario = sScenario;
-		}
-
-		if (fnCallback) {
-			fnCallback(oVariant);
-		} else {
-			oVMControl._executeAllVariantAppliedListeners(oVariant);
-		}
-	};
-
 	function createNewVariant(oSourceVariant, mPropertyBag) {
 		var mProperties = {
 			id: mPropertyBag.newVariantReference,
@@ -476,7 +398,7 @@ sap.ui.define([
 			});
 		};
 
-		oEvent.getParameter("renamed")?.forEach(({key: sVariantKey, name: sNewTitle}) => {
+		oEvent.getParameter("renamed")?.forEach(({ key: sVariantKey, name: sNewTitle }) => {
 			const oVariant = findVariant(sVariantKey);
 			fnAddPreparedChange(
 				oVariant,
@@ -487,7 +409,7 @@ sap.ui.define([
 				}
 			);
 		});
-		oEvent.getParameter("fav")?.forEach(({key: sVariantKey, visible: bNewIsFavorite}) => {
+		oEvent.getParameter("fav")?.forEach(({ key: sVariantKey, visible: bNewIsFavorite }) => {
 			const oVariant = findVariant(sVariantKey);
 			fnAddPreparedChange(
 				oVariant,
@@ -498,7 +420,7 @@ sap.ui.define([
 				}
 			);
 		});
-		oEvent.getParameter("exe")?.forEach(({key: sVariantKey, exe: bNewExecuteOnSelect}) => {
+		oEvent.getParameter("exe")?.forEach(({ key: sVariantKey, exe: bNewExecuteOnSelect }) => {
 			const oVariant = findVariant(sVariantKey);
 			fnAddPreparedChange(
 				oVariant,
@@ -520,7 +442,7 @@ sap.ui.define([
 			);
 			aVariantsToBeDeleted.push(sVariantKey);
 		});
-		oEvent.getParameter("contexts")?.forEach(({key: sVariantKey, contexts: aNewContexts}) => {
+		oEvent.getParameter("contexts")?.forEach(({ key: sVariantKey, contexts: aNewContexts }) => {
 			const oVariant = findVariant(sVariantKey);
 			fnAddPreparedChange(
 				oVariant,
@@ -551,7 +473,7 @@ sap.ui.define([
 	/**
 	 * Sets the passed properties on a variant for the passed variant management reference and
 	 * returns the content for change creation
-	 * @param {sap.ui.fl.variants.VariantManagement} sVariantManagementReference - Variant management reference
+	 * @param {string} sVariantManagementReference - Variant management reference
 	 * @param {object} mPropertyBag - Map of properties
 	 * @param {string} mPropertyBag.variantReference - Variant reference for which properties should be set
 	 * @param {string} mPropertyBag.changeType - Change type due to which properties are being set
@@ -563,7 +485,6 @@ sap.ui.define([
 	 * @param {boolean} [mPropertyBag.favorite] - New favorite value for <code>setFavorite</code> change type
 	 * @param {boolean} [mPropertyBag.executeOnSelect] - New executeOnSelect value for <code>setExecuteOnSelect</code> change type
 	 * @param {string} [mPropertyBag.defaultVariant] - New default variant for <code>setDefault</code> change type
-	 * @param {boolean} [bUpdateCurrentVariant] - Update current variant
 	 * @returns {{title: string} | {favorite: boolean} | {executeOnSelect: boolean} | {visible: boolean, createdByReset: boolean} | {contexts: object} | {defaultVariant: string}} Additional content for change creation
 	 * @private
 	 * @ui5-restricted
@@ -572,6 +493,7 @@ sap.ui.define([
 		// TODO: this function needs refactoring
 		var oData = this.getData();
 		var oVariantInstance = this.getVariant(mPropertyBag.variantReference, sVariantManagementReference).instance;
+		const oVMControl = VariantUtil.getVariantManagementControlByVMReference(sVariantManagementReference, this.oAppComponent);
 
 		var mAdditionalChangeContent = {};
 
@@ -600,8 +522,8 @@ sap.ui.define([
 			case "setDefault":
 				mAdditionalChangeContent.defaultVariant = mPropertyBag.defaultVariant;
 				// Update hash data
-				var aHashParameters = URLHandler.getStoredHashParams({model: this});
-				if (aHashParameters && this.oData[sVariantManagementReference].updateVariantInURL) {
+				var aHashParameters = URLHandler.getStoredHashParams({ model: this });
+				if (aHashParameters && oVMControl.getUpdateVariantInURL()) {
 					if (
 						oData[sVariantManagementReference].defaultVariant !== oData[sVariantManagementReference].currentVariant
 						&& aHashParameters.indexOf(oData[sVariantManagementReference].currentVariant) === -1
@@ -657,7 +579,7 @@ sap.ui.define([
 		}
 	};
 
-	VariantModel.prototype.setModelPropertiesForControl = function(sVariantManagementReference, bDesignTimeModeToBeSet, oControl) {
+	VariantModel.prototype.setModelPropertiesForControl = function(sVariantManagementReference, bDesignTimeModeToBeSet, oVMControl) {
 		this.oData[sVariantManagementReference].showFavorites = true;
 
 		// this._bDesignTime is undefined initially
@@ -666,11 +588,11 @@ sap.ui.define([
 			this._bDesignTimeMode = bDesignTimeModeToBeSet;
 
 			if (bDesignTimeModeToBeSet) {
-				URLHandler.clearAllVariantURLParameters({model: this});
-			} else if (bOriginalMode && this.oData[sVariantManagementReference].updateVariantInURL) {
+				URLHandler.clearAllVariantURLParameters({ model: this });
+			} else if (bOriginalMode && oVMControl.getUpdateVariantInURL()) {
 				// use case: switch from end user -> key user with a restart; the initial hash data is empty
 				URLHandler.update({
-					parameters: URLHandler.getStoredHashParams({model: this}),
+					parameters: URLHandler.getStoredHashParams({ model: this }),
 					updateURL: true,
 					updateHashEntry: false,
 					model: this
@@ -681,9 +603,9 @@ sap.ui.define([
 		if (!(typeof this.fnManageClick === "function" && typeof this.fnManageClickRta === "function")) {
 			this._initializeManageVariantsEvents();
 		}
-		oControl.detachManage(this.fnManageClick, this); /* attach done below */
+		oVMControl.detachManage(this.fnManageClick, this); /* attach done below */
 
-		if (bDesignTimeModeToBeSet && this.oData[sVariantManagementReference]._isEditable) {
+		if (bDesignTimeModeToBeSet && oVMControl.getEditable()) {
 			// Key user adaptation settings
 			this.oData[sVariantManagementReference].variantsEditable = false;
 
@@ -694,8 +616,8 @@ sap.ui.define([
 				oVariant.sharing = this.sharing.PUBLIC;
 				oVariant.remove = isVariantValidForRemove(oVariant, sVariantManagementReference, bDesignTimeModeToBeSet);
 			}.bind(this));
-		} else if (this.oData[sVariantManagementReference]._isEditable) { // Personalization settings
-			oControl.attachManage({
+		} else if (oVMControl.getEditable()) { // Personalization settings
+			oVMControl.attachManage({
 				variantManagementReference: sVariantManagementReference
 			}, this.fnManageClick, this);
 
@@ -766,28 +688,6 @@ sap.ui.define([
 		return JsControlTreeModifier.getSelector(sId, oAppComponent).id;
 	};
 
-	VariantModel.prototype.switchToDefaultForVariantManagement = function(sVariantManagementReference) {
-		if (this.oData[sVariantManagementReference].currentVariant !== this.oData[sVariantManagementReference].defaultVariant) {
-			BusyIndicator.show(200);
-			this.updateCurrentVariant({
-				variantManagementReference: sVariantManagementReference,
-				newVariantReference: this.oData[sVariantManagementReference].defaultVariant
-			}).then(function() {
-				BusyIndicator.hide();
-			});
-		}
-	};
-
-	VariantModel.prototype.switchToDefaultForVariant = function(sVariantId) {
-		Object.keys(this.oData).forEach(function(sVariantManagementReference) {
-			// set default variant only if passed variant id matches the current variant, or
-			// if no variant id passed, set to default variant
-			if (!sVariantId || this.oData[sVariantManagementReference].currentVariant === sVariantId) {
-				this.switchToDefaultForVariantManagement(sVariantManagementReference);
-			}
-		}.bind(this));
-	};
-
 	function resolveTitleBindingsAndCreateVariantChanges(oVariantManagementControl, sVariantManagementReference) {
 		this.oData[sVariantManagementReference].variants.forEach(function(oVariant) {
 			// Find model and key from patterns like {i18n>TextKey} or {i18n>namespace.TextKey} - only resource models are supported
@@ -826,9 +726,6 @@ sap.ui.define([
 		// ensure standard variants are mocked, if no variants are present in the changes.variantSection response from the backend
 		this._ensureStandardVariantExists(sVariantManagementReference);
 
-		// original setting of control parameter 'editable' is needed
-		this.oData[sVariantManagementReference]._isEditable = oVariantManagementControl.getEditable();
-
 		// only attachVariantApplied will set this to true
 		oVariantManagementControl.setShowExecuteOnSelection(false);
 
@@ -848,10 +745,7 @@ sap.ui.define([
 		// set model's properties specific to control's appearance
 		this.setModelPropertiesForControl(sVariantManagementReference, false, oVariantManagementControl);
 
-		// control property updateVariantInURL set initially
-		const bUpdateURL = oVariantManagementControl.getUpdateVariantInURL(); // default false
-		this.oData[sVariantManagementReference].updateVariantInURL = bUpdateURL;
-		if (bUpdateURL) {
+		if (oVariantManagementControl.getUpdateVariantInURL()) {
 			URLHandler.registerControl({
 				vmReference: sVariantManagementReference,
 				updateURL: true,
@@ -859,7 +753,8 @@ sap.ui.define([
 			});
 			URLHandler.handleModelContextChange({
 				model: this,
-				vmControl: oVariantManagementControl
+				vmControl: oVariantManagementControl,
+				appComponent: this.oAppComponent
 			});
 		}
 
@@ -937,8 +832,15 @@ sap.ui.define([
 				DependencyHandler.removeChangeFromDependencies(oLiveDependencyMap, oChange.getId());
 			}
 		});
+		// this promise can be used in tests to properly wait for the asynchronous logic of the destroy function
+		this.oDestroyPromise = new Deferred();
 		sap.ui.require(["sap/ui/fl/write/_internal/flexState/FlexObjectManager"], (FlexObjectManager) => {
-			FlexObjectManager.deleteFlexObjects({reference: this.sFlexReference, flexObjects: aDirtyChanges});
+			FlexObjectManager.deleteFlexObjects({
+				reference: this.sFlexReference,
+				flexObjects: aDirtyChanges,
+				componentId: this.oAppComponent.getId()
+			});
+			this.oDestroyPromise.resolve();
 		});
 
 		this.oDataSelector.removeUpdateListener(this.fnUpdateListener);
@@ -956,7 +858,7 @@ sap.ui.define([
 			}
 		});
 		if (aFakeVariantsToBeAdded.length) {
-			VariantManagementState.addRuntimeOnlyFlexObjects(this.sFlexReference, aFakeVariantsToBeAdded);
+			VariantManagementState.addRuntimeOnlyFlexObjects(this.sFlexReference, this.oAppComponent.getId(), aFakeVariantsToBeAdded);
 		}
 
 		VariantManagementState.clearRuntimeSteadyObjects(this.sFlexReference, this.oAppComponent.getId());

package/src/sap/ui/fl/variants/context/Component.js

@@ -76,7 +76,7 @@ sap.ui.define([
 		 */
 		setSelectedContexts(oSelectedContexts) {
 			var aSelectedRoles = oSelectedContexts.role.map(function(oRole) {
-				return {id: oRole, description: ""};
+				return { id: oRole, description: "" };
 			});
 			var oSelectedContextsModel = this.getModel("selectedContexts");
 			oSelectedContextsModel.setProperty("/selected", aSelectedRoles);

package/src/sap/ui/fl/variants/context/controller/ContextVisibility.controller.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	}
 
 	function assignDescriptionsToSelectedRoles(oSelectedRoles) {
-		var mPropertyBag = {layer: Layer.CUSTOMER, flexObjects: oSelectedRoles};
+		var mPropertyBag = { layer: Layer.CUSTOMER, flexObjects: oSelectedRoles };
 		return WriteStorage.loadContextDescriptions(mPropertyBag).then(function(oResponse) {
 			if (oResponse.role && oResponse.role.length === oSelectedRoles.role.length) {
 				this.oSelectedContextsModel.setProperty("/selected", oResponse.role);
@@ -56,7 +56,7 @@ sap.ui.define([
 	}
 
 	function itemToJson(oItem) {
-		return {id: oItem.getTitle(), description: oItem.getDescription()};
+		return { id: oItem.getTitle(), description: oItem.getDescription() };
 	}
 
 	return Controller.extend("sap.ui.fl.variants.context.controller.ContextVisibility", {
@@ -111,7 +111,7 @@ sap.ui.define([
 		_appendDataFromBackend() {
 			var oRoles = this.oContextsModel.getProperty("/values");
 			if (this.oContextsModel.getProperty("/lastHitReached") === false) {
-				var mConfig = {$skip: oRoles.length};
+				var mConfig = { $skip: oRoles.length };
 				return getData.call(this, mConfig, oRoles);
 			}
 			return Promise.resolve(oRoles);
@@ -163,7 +163,7 @@ sap.ui.define([
 		 */
 		onSearch(oEvent) {
 			oEvent.getSource().clearSelection();
-			var mConfig = {$filter: oEvent.getParameter("value")};
+			var mConfig = { $filter: oEvent.getParameter("value") };
 			return getData.call(this, mConfig);
 		},
 

package/src/sap/ui/fl/write/_internal/SaveAs.js

@@ -10,8 +10,8 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/fl/apply/_internal/appVariant/DescriptorChangeTypes",
 	"sap/ui/fl/apply/_internal/flexState/FlexObjectState",
-	"sap/ui/fl/initial/_internal/ManifestUtils",
 	"sap/ui/fl/apply/api/FlexRuntimeInfoAPI",
+	"sap/ui/fl/initial/_internal/ManifestUtils",
 	"sap/ui/fl/initial/_internal/Settings",
 	"sap/ui/fl/write/_internal/appVariant/AppVariantFactory",
 	"sap/ui/fl/write/_internal/appVariant/AppVariantInlineChangeFactory",
@@ -24,8 +24,8 @@ sap.ui.define([
 	Log,
 	DescriptorChangeTypes,
 	FlexObjectState,
-	ManifestUtils,
 	FlexRuntimeInfoAPI,
+	ManifestUtils,
 	Settings,
 	AppVariantFactory,
 	AppVariantInlineChangeFactory,
@@ -153,7 +153,8 @@ sap.ui.define([
 	}
 
 	function _deleteDescrChangesFromPersistence(vSelector) {
-		const sReference = ManifestUtils.getFlexReferenceForSelector(vSelector);
+		const oAppComponent = Utils.getAppComponentForSelector(vSelector);
+		const sReference = ManifestUtils.getFlexReferenceForSelector(oAppComponent);
 		var aChangesToBeDeleted = [];
 		// In case of app variant, both persistencies hold descriptor changes and have to be removed from one of the persistencies
 		_getDirtyDescrChanges(vSelector).forEach(function(oChange) {
@@ -164,6 +165,7 @@ sap.ui.define([
 		});
 		FlexObjectManager.deleteFlexObjects({
 			reference: sReference,
+			componentId: oAppComponent.getId(),
 			flexObjects: aChangesToBeDeleted
 		});
 	}

package/src/sap/ui/fl/write/_internal/Storage.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.Storage
 	 * @since 1.67
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/write/_internal/Versions.js

@@ -52,7 +52,7 @@ sap.ui.define([
 
 			// add draft
 			if (!_doesDraftExistInVersions(aVersions) && bDraftAvailable) {
-				aVersions.splice(0, 0, {version: Version.Number.Draft, type: Version.Type.Draft, filenames: [], isPublished: false});
+				aVersions.splice(0, 0, { version: Version.Number.Draft, type: Version.Type.Draft, filenames: [], isPublished: false });
 			}
 
 			// remove draft
@@ -159,7 +159,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.Versions
 	 * @since 1.74
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/write/_internal/appVariant/AppVariant.js

@@ -36,12 +36,11 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariant
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
 	var AppVariant = ManagedObject.extend("sap.ui.fl.write._internal.appVariant.AppVariant", /** @lends sap.ui.fl.write._internal.appVariant.AppVariant */ {
-		// eslint-disable-next-line object-shorthand
 		constructor: function(mPropertyBag) {
 			ManagedObject.apply(this);
 			if (!isPlainObject(mPropertyBag)) {

package/src/sap/ui/fl/write/_internal/appVariant/AppVariantFactory.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariantFactory
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/write/_internal/appVariant/AppVariantInlineChange.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariantInlineChange
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -36,7 +36,6 @@ sap.ui.define([
 		metadata: {
 			library: "sap.ui.fl"
 		},
-		// eslint-disable-next-line object-shorthand
 		constructor: function(mPropertyBag) {
 			ManagedObject.apply(this);
 			if (!isPlainObject(mPropertyBag)) {

package/src/sap/ui/fl/write/_internal/appVariant/AppVariantInlineChangeFactory.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariantInlineChangeFactory
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/write/_internal/condenser/Condenser.js

@@ -53,7 +53,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.condenser.Condenser
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 */
 	const Condenser = {};
 

package/src/sap/ui/fl/write/_internal/condenser/UIReconstruction.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.condenser.UIReconstruction
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 */
 	const UIReconstruction = {};
 

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

@@ -74,7 +74,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.BackendConnector
 	 * @since 1.72
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.connectors
 	 */

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * Connector for saving and deleting data from SAPUI5 Flexibility KeyUser service - including personalization.
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.BtpServiceConnector
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */
@@ -58,7 +58,7 @@ sap.ui.define([
 
 		async getSeenFeatureIds(mPropertyBag) {
 			const sUrl = InitialUtils.getUrl(this.ROUTES.SEEN_FEATURES, mPropertyBag);
-			const oResult = await InitialUtils.sendRequest(sUrl, "GET", {initialConnector: InitialConnector});
+			const oResult = await InitialUtils.sendRequest(sUrl, "GET", { initialConnector: InitialConnector });
 			return oResult.response?.seenFeatureIds;
 		},