@openui5/sap.ui.fl 1.139.0 → 1.141.0

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

@@ -8,13 +8,10 @@ sap.ui.define([
 	"sap/base/util/restricted/_difference",
 	"sap/base/util/restricted/_isEqual",
 	"sap/base/util/restricted/_omit",
-	"sap/base/util/each",
 	"sap/base/util/isEmptyObject",
 	"sap/base/util/merge",
-	"sap/base/Log",
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/core/BusyIndicator",
-	"sap/ui/core/Element",
 	"sap/ui/core/Lib",
 	"sap/ui/fl/apply/_internal/controlVariants/URLHandler",
 	"sap/ui/fl/apply/_internal/controlVariants/Utils",
@@ -23,7 +20,8 @@ sap.ui.define([
 	"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/_internal/flexState/ManifestUtils",
+	"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",
@@ -35,13 +33,10 @@ sap.ui.define([
 	_difference,
 	_isEqual,
 	_omit,
-	each,
 	isEmptyObject,
 	merge,
-	Log,
 	JsControlTreeModifier,
 	BusyIndicator,
-	Element,
 	Lib,
 	URLHandler,
 	VariantUtil,
@@ -50,6 +45,7 @@ sap.ui.define([
 	Switcher,
 	VariantManagementState,
 	FlexObjectState,
+	ControlVariantApplyAPI,
 	ManifestUtils,
 	Settings,
 	Layer,
@@ -63,22 +59,23 @@ sap.ui.define([
 
 	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 {sap.ui.fl.variants.VariantModel} oModel - Variant model
+	 * @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, oModel, sVMReference) {
+	function executeAfterSwitch(fnCallback, sFlexReference, sVMReference) {
 		// if there are multiple switches triggered very quickly this makes sure that they are being executed one after another
-		oModel._oVariantSwitchPromises[sVMReference] = oModel._oVariantSwitchPromises[sVMReference]
+		const oNewPromise = VariantManagementState.waitForVariantSwitch(sFlexReference, sVMReference)
 		.catch(function() {})
 		.then(fnCallback);
-		VariantManagementState.setVariantSwitchPromise(oModel.sFlexReference, oModel._oVariantSwitchPromises[sVMReference], sVMReference);
-		return oModel._oVariantSwitchPromises[sVMReference];
+		VariantManagementState.setVariantSwitchPromise(sFlexReference, sVMReference, oNewPromise);
+		return oNewPromise;
 	}
 
 	/**
@@ -121,7 +118,9 @@ sap.ui.define([
 		var oSettings = Settings.getInstanceOrUndef();
 		var bUserIsAuthorized = oSettings &&
 			(oSettings.getIsKeyUser() || !oSettings.getUserId() ||
-			(oSettings.getIsPublicFlVariantEnabled() && oSettings.getUserId().toUpperCase() === oVariant.instance.getSupportInformation().user.toUpperCase()));
+			(oSettings.getIsPublicFlVariantEnabled() &&
+				oSettings.getUserId().toUpperCase() === oVariant.instance.getSupportInformation().user.toUpperCase()
+			));
 		oVariant.remove = bUserIsAuthorized;
 		oVariant.rename = bUserIsAuthorized;
 		oVariant.change = bUserIsAuthorized;
@@ -135,20 +134,6 @@ sap.ui.define([
 		return false;
 	}
 
-	function waitForControlToBeRendered(oControl) {
-		return new Promise(function(resolve) {
-			if (oControl.getDomRef()) {
-				resolve();
-			} else {
-				oControl.addEventDelegate({
-					onAfterRendering() {
-						resolve();
-					}
-				});
-			}
-		});
-	}
-
 	function initUshellServices() {
 		var oUShellContainer = Utils.getUshellContainer();
 		if (oUShellContainer) {
@@ -199,7 +184,7 @@ sap.ui.define([
 	 * @class Variant model implementation for JSON format.
 	 * @extends sap.ui.model.json.JSONModel
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.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
@@ -224,8 +209,6 @@ sap.ui.define([
 			this.sFlexReference = ManifestUtils.getFlexReferenceForControl(mPropertyBag.appComponent);
 			this.oAppComponent = mPropertyBag.appComponent;
 			this._oResourceBundle = Lib.getResourceBundleFor("sap.ui.fl");
-			this._oVariantSwitchPromises = {};
-			this._oVariantAppliedListeners = {};
 
 			// set variant model data
 			this.fnUpdateListener = this.updateData.bind(this);
@@ -288,10 +271,6 @@ sap.ui.define([
 		}.bind(this));
 	};
 
-	VariantModel.prototype.waitForAllVMSwitchPromises = function() {
-		return Promise.all(Object.values(this._oVariantSwitchPromises));
-	};
-
 	/**
 	 * Updates the storage of the current variant for a given variant management control.
 	 * @param {object} mPropertyBag - Object with parameters as properties
@@ -319,7 +298,7 @@ sap.ui.define([
 		}
 		return executeAfterSwitch(
 			switchVariantAndUpdateModel.bind(this, mProperties, mPropertyBag.scenario),
-			this,
+			this.sFlexReference,
 			mPropertyBag.variantManagementReference
 		);
 	};
@@ -345,6 +324,7 @@ sap.ui.define([
 					iIndex = index;
 					return true;
 				}
+				return false;
 			});
 		}.bind(this));
 		return {
@@ -372,115 +352,20 @@ sap.ui.define([
 		return getVariant(this.oData[sVMReference].variants, sVariantReference).title;
 	};
 
-	function handleInitialLoadScenario(sVMReference, oVariantManagementControl) {
-		var aVariantChangesForVariant = VariantManagementState.getVariantChangesForVariant({
-			vmReference: sVMReference,
-			reference: this.sFlexReference
-		});
-		var sDefaultVariantReference = this.oData[sVMReference].defaultVariant;
-		if (
-			oVariantManagementControl.getExecuteOnSelectionForStandardDefault()
-			&& sDefaultVariantReference === sVMReference
-			&& !aVariantChangesForVariant.some((oVariantChange) => oVariantChange.getChangeType() === "setExecuteOnSelect")
-		) {
-			var oStandardVariant = getVariant(this.oData[sVMReference].variants, sVMReference);
-			// set executeOnSelect in model and State without creating a change
-			oStandardVariant.instance.setExecuteOnSelection(true);
-			this.oData[sVMReference].variants[0].executeOnSelect = true;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Saves a function that will be called after a variant has been applied with the new variant as parameter.
-	 * The function also performs a sanity check after the control has been rendered.
-	 * If the passed variant control ID does not match the responsible variant management control, the callback will not be saved.
-	 * Optionally this function is also called after the initial variant is applied without a sanity check.
-	 *
-	 * @param {object} mPropertyBag - Object with parameters as properties
-	 * @param {string} mPropertyBag.control - Instance of the control
-	 * @param {string} mPropertyBag.vmControlId - ID of the variant management control
-	 * @param {function} mPropertyBag.callback - Callback that will be called after a variant has been applied
-	 * @param {boolean} mPropertyBag.callAfterInitialVariant - The callback will also be called after the initial variant is applied
-	 * @returns {Promise} Promise that resolves after the sanity check
-	 */
-	VariantModel.prototype.attachVariantApplied = function(mPropertyBag) {
-		var oVariantManagementControl = Element.getElementById(mPropertyBag.vmControlId);
-		var sVMReference = this.getVariantManagementReferenceForControl(oVariantManagementControl);
-
-		return this.waitForVMControlInit(sVMReference).then(function(sVMReference, mPropertyBag) {
-			this._oVariantAppliedListeners[sVMReference] ||= {};
-
-			var bInitialLoad = handleInitialLoadScenario.call(this, sVMReference, oVariantManagementControl);
-
-			// if the parameter callAfterInitialVariant or initialLoad is true call the function without check
-			if (mPropertyBag.callAfterInitialVariant || bInitialLoad) {
-				var mParameters = {
-					appComponent: this.oAppComponent,
-					reference: this.sFlexReference,
-					vmReference: sVMReference
-				};
-				waitForInitialVariantChanges(mParameters).then(function() {
-					var sCurrentVariantReference = this.oData[sVMReference].currentVariant;
-					this.callVariantSwitchListeners(sVMReference, sCurrentVariantReference, mPropertyBag.callback);
-				}.bind(this));
-			}
-
-			// first check if the passed vmControlId is correct, then save the callback
-			// for this check the control has to be in the control tree already
-			return waitForControlToBeRendered(mPropertyBag.control).then(function() {
-				if (
-					VariantUtil.getRelevantVariantManagementControlId(
-						mPropertyBag.control,
-						this.getVariantManagementControlIds()
-					) === mPropertyBag.vmControlId
-				) {
-					this.oData[sVMReference].showExecuteOnSelection = true;
-					this.checkUpdate(true);
-					this._oVariantAppliedListeners[sVMReference][mPropertyBag.control.getId()] = mPropertyBag.callback;
-				} else {
-					Log.error("Error in attachVariantApplied: The passed VariantManagement ID does not match the "
-					+ "responsible VariantManagement control");
-				}
-			}.bind(this));
-		}.bind(this, sVMReference, mPropertyBag));
-	};
-
 	VariantModel.prototype.callVariantSwitchListeners = function(sVMReference, sNewVariantReference, fnCallback, sScenario) {
-		if (this._oVariantAppliedListeners[sVMReference]) {
-			var oVariant = getVariant(this.oData[sVMReference].variants, sNewVariantReference);
-			if (sScenario) {
-				oVariant.createScenario = sScenario;
-			}
-
-			if (fnCallback) {
-				fnCallback(oVariant);
-			} else {
-				each(this._oVariantAppliedListeners[sVMReference], function(sControlId, fnCallback) {
-					fnCallback(oVariant);
-				});
-			}
+		const oVMControl = ControlVariantApplyAPI.getVariantManagementControlByVMReference(sVMReference, this.oAppComponent);
+		const oVariant = getVariant(this.oData[sVMReference].variants, sNewVariantReference);
+		if (sScenario) {
+			oVariant.createScenario = sScenario;
 		}
-	};
 
-	VariantModel.prototype.detachVariantApplied = function(sVMControlId, sControlId) {
-		var sVMReference = this.getVariantManagementReferenceForControl(Element.getElementById(sVMControlId));
-		if (this._oVariantAppliedListeners[sVMReference]) {
-			delete this._oVariantAppliedListeners[sVMReference][sControlId];
+		if (fnCallback) {
+			fnCallback(oVariant);
+		} else {
+			oVMControl._executeAllVariantAppliedListeners(oVariant);
 		}
 	};
 
-	VariantModel.prototype._getVariantTitleCount = function(sNewText, sVariantManagementReference) {
-		var oData = this.getData();
-		return oData[sVariantManagementReference].variants.reduce(function(iCount, oVariant) {
-			if (sNewText.toLowerCase() === oVariant.title.toLowerCase() && oVariant.visible) {
-				iCount++;
-			}
-			return iCount;
-		}, 0);
-	};
-
 	function createNewVariant(oSourceVariant, mPropertyBag) {
 		var mProperties = {
 			id: mPropertyBag.newVariantReference,
@@ -527,7 +412,10 @@ sap.ui.define([
 			return oVariantChange.convertToFileContent();
 		});
 
-		mPropertyBag.currentVariantComparison = LayerUtils.compareAgainstCurrentLayer(oSourceVariant.instance.getLayer(), mPropertyBag.layer);
+		mPropertyBag.currentVariantComparison = LayerUtils.compareAgainstCurrentLayer(
+			oSourceVariant.instance.getLayer(),
+			mPropertyBag.layer
+		);
 		if (mPropertyBag.currentVariantComparison === 1) {
 			mPropertyBag.sourceVariantSource = this.getVariant(oSourceVariant.instance.getVariantReference());
 		}
@@ -701,7 +589,8 @@ sap.ui.define([
 				break;
 			case "setVisible":
 				mAdditionalChangeContent.visible = mPropertyBag.visible;
-				mAdditionalChangeContent.createdByReset = false; // 'createdByReset' is used by the backend to distinguish between setVisible change created via reset and delete
+				// 'createdByReset' is used by the backend to distinguish between setVisible change created via reset and delete
+				mAdditionalChangeContent.createdByReset = false;
 				oVariantInstance.setVisible(mPropertyBag.visible);
 				break;
 			case "setContexts":
@@ -717,7 +606,7 @@ sap.ui.define([
 						oData[sVariantManagementReference].defaultVariant !== oData[sVariantManagementReference].currentVariant
 						&& aHashParameters.indexOf(oData[sVariantManagementReference].currentVariant) === -1
 					) {
-						// if default variant is changed from the current variant, then add the current variant id as a variant URI parameter
+						// if default variant is changed from the current variant, add the current variant id as a variant URI parameter
 						URLHandler.update({
 							parameters: aHashParameters.concat(oData[sVariantManagementReference].currentVariant),
 							updateURL: !this._bDesignTimeMode,
@@ -750,8 +639,7 @@ sap.ui.define([
 	VariantModel.prototype._ensureStandardVariantExists = function(sVariantManagementReference) {
 		var oData = this.getData();
 		var oVMDataSection = oData[sVariantManagementReference] || {};
-		var oVMDataSectionWithoutInit = _omit(oVMDataSection, ["initPromise"]);
-		if (!oData[sVariantManagementReference] || isEmptyObject(oVMDataSectionWithoutInit)) { // Ensure standard variant exists
+		if (!oData[sVariantManagementReference] || isEmptyObject(oVMDataSection)) { // Ensure standard variant exists
 			// Standard Variant should always contain the value: "SAP" in "author" / "Created by" field
 			var oStandardVariantInstance = FlexObjectFactory.createFlVariant({
 				id: sVariantManagementReference,
@@ -878,12 +766,6 @@ sap.ui.define([
 		return JsControlTreeModifier.getSelector(sId, oAppComponent).id;
 	};
 
-	VariantModel.prototype.getVariantManagementReferenceForControl = function(oVariantManagementControl) {
-		var sControlId = oVariantManagementControl.getId();
-		var oAppComponent = Utils.getAppComponentForControl(oVariantManagementControl);
-		return (oAppComponent && oAppComponent.getLocalId(sControlId)) || sControlId;
-	};
-
 	VariantModel.prototype.switchToDefaultForVariantManagement = function(sVariantManagementReference) {
 		if (this.oData[sVariantManagementReference].currentVariant !== this.oData[sVariantManagementReference].defaultVariant) {
 			BusyIndicator.show(200);
@@ -939,7 +821,7 @@ sap.ui.define([
 	}
 
 	VariantModel.prototype.registerToModel = function(oVariantManagementControl) {
-		const sVariantManagementReference = this.getVariantManagementReferenceForControl(oVariantManagementControl);
+		const sVariantManagementReference = oVariantManagementControl.getVariantManagementReference();
 
 		// ensure standard variants are mocked, if no variants are present in the changes.variantSection response from the backend
 		this._ensureStandardVariantExists(sVariantManagementReference);
@@ -948,7 +830,7 @@ sap.ui.define([
 		this.oData[sVariantManagementReference]._isEditable = oVariantManagementControl.getEditable();
 
 		// only attachVariantApplied will set this to true
-		this.oData[sVariantManagementReference].showExecuteOnSelection = false;
+		oVariantManagementControl.setShowExecuteOnSelection(false);
 
 		// replace bindings in titles with the resolved texts
 		resolveTitleBindingsAndCreateVariantChanges.call(this, oVariantManagementControl, sVariantManagementReference);
@@ -989,44 +871,11 @@ sap.ui.define([
 			reference: this.sFlexReference,
 			vmReference: sVariantManagementReference
 		};
-		this._oVariantSwitchPromises[sVariantManagementReference] = waitForInitialVariantChanges(mParameters);
-
-		if (this.oData[sVariantManagementReference].initPromise) {
-			this.oData[sVariantManagementReference].initPromise.resolveFunction();
-			delete this.oData[sVariantManagementReference].initPromise;
-		}
-
-		this.oData[sVariantManagementReference].init = true;
-	};
-
-	VariantModel.prototype.waitForVMControlInit = function(sVMReference) {
-		if (!this.oData[sVMReference]) {
-			this.oData[sVMReference] = {};
-		} else if (this.oData[sVMReference].init) {
-			return Promise.resolve();
-		}
-
-		this.oData[sVMReference].initPromise = {};
-		this.oData[sVMReference].initPromise.promise = new Promise(function(resolve) {
-			this.oData[sVMReference].initPromise.resolveFunction = resolve;
-		}.bind(this));
-		return this.oData[sVMReference].initPromise.promise;
-	};
-
-	/**
-	 * Checks if the passed changes exist as dirty changes.
-	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} aControlChanges - Array of changes to be checked
-	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} Array of filtered changes
-	 * @private
-	 */
-	VariantModel.prototype._getDirtyChangesFromVariantChanges = function(aControlChanges) {
-		var aChangeFileNames = aControlChanges.map(function(oChange) {
-			return oChange.getId();
-		});
-
-		return FlexObjectState.getDirtyFlexObjects(this.sFlexReference).filter(function(oChange) {
-			return aChangeFileNames.includes(oChange.getId()) && !oChange.getSavedToVariant();
-		});
+		VariantManagementState.setVariantSwitchPromise(
+			this.sFlexReference,
+			sVariantManagementReference,
+			waitForInitialVariantChanges(mParameters)
+		);
 	};
 
 	/**

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

@@ -10,7 +10,7 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/fl/apply/_internal/appVariant/DescriptorChangeTypes",
 	"sap/ui/fl/apply/_internal/flexState/FlexObjectState",
-	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
+	"sap/ui/fl/initial/_internal/ManifestUtils",
 	"sap/ui/fl/apply/api/FlexRuntimeInfoAPI",
 	"sap/ui/fl/initial/_internal/Settings",
 	"sap/ui/fl/write/_internal/appVariant/AppVariantFactory",

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.139.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -340,6 +340,19 @@ sap.ui.define([
 		return _executeActionByName("setSeenFeatureIds", mPropertyBag);
 	};
 
+	/**
+	 * Deletes all user variants for the given variant management references.
+	 *
+	 * @param {object} mPropertyBag - Property bag
+	 * @param {string} mPropertyBag.flexReference - Flex reference of the app the VM controls belong to
+	 * @param {string[]} mPropertyBag.variantManagementReferences - Array of variant management references
+	 * @param {sap.ui.fl.Layer} mPropertyBag.layer - Layer
+	 * @returns {Promise<undefined>} Promise that resolves as soon as the deletion was completed
+	 */
+	Storage.deleteUserVariantsForVM = function(mPropertyBag) {
+		return _executeActionByName("deleteUserVariantsForVM", mPropertyBag);
+	};
+
 	/**
 	 * Gets the variant management context information.
 	 * The context information is a JSON object that has boolean property 'lastHitReached'

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

@@ -159,7 +159,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.Versions
 	 * @since 1.74
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -275,10 +275,10 @@ sap.ui.define([
 	 * @param {array} [mPropertyBag.draftFilenames] - Array with filesnames which was saved as draft
 	 */
 	Versions.onAllChangesSaved = function(mPropertyBag) {
-		var oModel = Versions.getVersionsModel(mPropertyBag);
-		var bVersioningEnabled = oModel.getProperty("/versioningEnabled");
-		var bDirtyChanges = oModel.getProperty("/dirtyChanges");
-		var aDraftFilenames = oModel.getProperty("/draftFilenames");
+		const oModel = Versions.getVersionsModel(mPropertyBag);
+		const bVersioningEnabled = oModel.getProperty("/versioningEnabled");
+		const bDirtyChanges = oModel.getProperty("/dirtyChanges");
+		const aDraftFilenames = oModel.getProperty("/draftFilenames");
 		oModel.setProperty("/draftFilenames", aDraftFilenames.concat(mPropertyBag.draftFilenames));
 		oModel.setProperty("/dirtyChanges", true);
 		oModel.setProperty("/backendDraft", bVersioningEnabled && bDirtyChanges || !!mPropertyBag.contextBasedAdaptation);
@@ -286,6 +286,10 @@ sap.ui.define([
 		// Save can happen without a reload and the model must be kept up-to-date
 		oModel.setProperty("/persistedVersion", Version.Number.Draft);
 		oModel.updateBindings(true);
+		// Set the Flex InfoSession version to draft "0"
+		const oFlexInfo = FlexInfoSession.getByReference(mPropertyBag.reference);
+		oFlexInfo.version = Version.Number.Draft;
+		FlexInfoSession.setByReference(oFlexInfo, mPropertyBag.reference);
 	};
 
 	/**

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

@@ -26,6 +26,7 @@ sap.ui.define([
 	 *
 	 * @param {object} mPropertyBag Parameters
 	 * @param {string} mPropertyBag.id ID of the app variant to be provided for a new app variant and for deleting an app variant
+	 * @param {object} [mPropertyBag.oParsedHash] - Parsed Hash containing semantic object, action and parameters for inbound
 	 * @param {string} [mPropertyBag.reference] Proposed referenced descriptor or app variant ID (might be overwritten by the back end) to be provided when creating a new app variant
 	 * @param {string} [mPropertyBag.transport] Transport with which the app variant should be transported
 	 * @param {string} [mPropertyBag.package] Package of the app variant
@@ -35,7 +36,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariant
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -164,6 +165,10 @@ sap.ui.define([
 		return this._oDefinition.id;
 	};
 
+	AppVariant.prototype.getParsedHash = function() {
+		return this._oDefinition.parsedHash;
+	};
+
 	AppVariant.prototype.getNamespace = function() {
 		return this._oDefinition.namespace || Utils.getNameAndNameSpace(this._oDefinition.id, this._oDefinition.reference).namespace;
 	};
@@ -306,6 +311,10 @@ sap.ui.define([
 			mPropertyBag.parentVersion = this._oDefinition.parentVersion;
 		}
 
+		if (this._oDefinition.parsedHash) {
+			mPropertyBag.parsedHash = this._oDefinition.parsedHash;
+		}
+
 		if (mMap.layer) {
 			mPropertyBag.layer = mMap.layer;
 		}

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.139.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -80,6 +80,7 @@ sap.ui.define([
 	 * @param {object} mPropertyBag Parameters
 	 * @param {string} mPropertyBag.id Id of the app variant
 	 * @param {string} mPropertyBag.reference Proposed referenced descriptor or app variant ID (might be overwritten by the back end)
+	 * @param {object} [mPropertyBag.oParsedHash] - Parsed Hash containing semantic object, action and parameters for inbound
 	 * @param {string} [mPropertyBag.transport] Transport with which the app variant should be transported
 	 * @param {string} [mPropertyBag.package] Package of the app variant
 	 * @param {string} [mPropertyBag.version] Version of the app variant
@@ -96,6 +97,10 @@ sap.ui.define([
 			Utils.checkParameterAndType(mPropertyBag, "reference", "string");
 			Utils.checkParameterAndType(mPropertyBag, "id", "string");
 
+			if (mPropertyBag.parsedHash) {
+				Utils.checkParameterAndType(mPropertyBag, "parsedHash", "object");
+			}
+
 			if (mPropertyBag.version) {
 				Utils.checkParameterAndType(mPropertyBag, "version", "string");
 			}

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.139.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

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.139.0
+	 * @version 1.141.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.139.0
+	 * @version 1.141.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.139.0
+	 * @version 1.141.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.139.0
+	 * @version 1.141.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.139.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */
@@ -52,7 +52,8 @@ sap.ui.define([
 				GET_SOURCELANGUAGE: `${InitialConnector.ROOT}/translation/sourcelanguages`
 			},
 			CONTEXTS: `${InitialConnector.ROOT}/contexts`,
-			SEEN_FEATURES: `${InitialConnector.ROOT}/seenFeatures`
+			SEEN_FEATURES: `${InitialConnector.ROOT}/seenFeatures`,
+			DELETE_USER_VARIANTS: `${InitialConnector.ROOT}/variantdata/delete`
 		},
 
 		async getSeenFeatureIds(mPropertyBag) {
@@ -103,6 +104,30 @@ sap.ui.define([
 			);
 
 			return WriteUtils.sendRequest(sUrl, "POST", oRequestOption);
+		},
+
+		/**
+		 * Deletes all user variants for the given variant management references.
+		 *
+		 * @param {object} mPropertyBag - Property bag
+		 * @param {string} mPropertyBag.flexReference - Flex reference of the app the variant management controls belong to
+		 * @param {string[]} mPropertyBag.variantManagementReferences - Array of variant management references
+		 * @param {string} mPropertyBag.url - Configured url for the connector
+		 * @returns {Promise<undefined>} Promise that resolves as soon as the deletion was completed
+		 */
+		deleteUserVariantsForVM(mPropertyBag) {
+			const mPayload = {
+				flexReference: mPropertyBag.flexReference,
+				variantManagementReferences: mPropertyBag.variantManagementReferences
+			};
+			const sUrl = InitialUtils.getUrl(this.ROUTES.DELETE_USER_VARIANTS, mPropertyBag);
+			return WriteUtils.sendRequest(sUrl, "POST", {
+				tokenUrl: this.ROUTES.TOKEN,
+				initialConnector: InitialConnector,
+				payload: JSON.stringify(mPayload),
+				dataType: "json",
+				contentType: "application/json; charset=utf-8"
+			});
 		}
 	});
 

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.139.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

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

@@ -104,6 +104,9 @@ sap.ui.define([
 		if (mPropertyBag.parentVersion) {
 			mParameters.parentVersion = mPropertyBag.parentVersion;
 		}
+		if (mPropertyBag.parsedHash) {
+			mParameters.parsedHash = JSON.stringify(mPropertyBag.parsedHash);
+		}
 		InitialUtils.addSAPLogonLanguageInfo(mParameters);
 		InitialConnector._addClientInfo(mParameters);
 		// single update --> fileName needs to be in the url
@@ -168,7 +171,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.LrepConnector
 	 * @since 1.67
-	 * @version 1.139.0
+	 * @version 1.141.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.139.0
+	 * @version 1.141.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */