@openui5/sap.ui.fl 1.138.0 → 1.140.0

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

@@ -50,7 +50,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.variants.VariantManager
 	 * @since 1.132
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.rta
 	 */
@@ -94,18 +94,18 @@ sap.ui.define([
 	 * 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<undefined>} Resolves when the variant model is not busy anymore
+	 * @returns {Promise} Resolves when the variant model is not busy anymore
 	 * @private
 	 */
-	function executeAfterSwitch(fnCallback, oModel) {
+	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._oVariantSwitchPromise = oModel._oVariantSwitchPromise
+		const oNewPromise = VariantManagementState.waitForVariantSwitch(sFlexReference, sVMReference)
 		.catch(function() {})
 		.then(fnCallback);
-		VariantManagementState.setVariantSwitchPromise(oModel.sFlexReference, oModel._oVariantSwitchPromise);
-		return oModel._oVariantSwitchPromise;
+		VariantManagementState.setVariantSwitchPromise(sFlexReference, sVMReference, oNewPromise);
+		return oNewPromise;
 	}
 
 	async function handleDirtyChanges(aDirtyChanges, sVariantManagementReference, oAppComponent, oVariantModel) {
@@ -189,7 +189,7 @@ sap.ui.define([
 			if (!bVariantSwitch) {
 				oModel.callVariantSwitchListeners(sVMReference, oModel.oData[sVMReference].currentVariant);
 			}
-		}.bind(null, oEvent.getParameters(), mPropertyBag), mPropertyBag.model);
+		}.bind(null, oEvent.getParameters(), mPropertyBag), mPropertyBag.model, mPropertyBag.vmReference);
 	};
 
 	VariantManager.handleManageEvent = async function(oEvent, oData, oVariantModel) {
@@ -338,7 +338,7 @@ sap.ui.define([
 				oAppComponent,
 				oVariantModel
 			);
-		}.bind(oVariantModel, sVMReference, oAppComponent, mParameters), oVariantModel);
+		}.bind(oVariantModel, sVMReference, oAppComponent, mParameters), oVariantModel, sVMReference);
 		return aNewVariantDirtyChanges;
 	};
 

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

@@ -8,7 +8,6 @@ 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",
@@ -23,7 +22,7 @@ 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/initial/_internal/ManifestUtils",
 	"sap/ui/fl/initial/_internal/Settings",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/LayerUtils",
@@ -35,7 +34,6 @@ sap.ui.define([
 	_difference,
 	_isEqual,
 	_omit,
-	each,
 	isEmptyObject,
 	merge,
 	Log,
@@ -63,22 +61,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) {
+	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._oVariantSwitchPromise = oModel._oVariantSwitchPromise
+		const oNewPromise = VariantManagementState.waitForVariantSwitch(sFlexReference, sVMReference)
 		.catch(function() {})
 		.then(fnCallback);
-		VariantManagementState.setVariantSwitchPromise(oModel.sFlexReference, oModel._oVariantSwitchPromise);
-		return oModel._oVariantSwitchPromise;
+		VariantManagementState.setVariantSwitchPromise(sFlexReference, sVMReference, oNewPromise);
+		return oNewPromise;
 	}
 
 	/**
@@ -121,7 +120,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;
@@ -194,12 +195,22 @@ sap.ui.define([
 		return aSelectors.length ? FlexObjectState.waitForFlexObjectsToBeApplied(aSelectors) : Promise.resolve();
 	}
 
+	function getVariantManagementControl(sVariantManagementReference, oAppComponent) {
+		let sVMControlId;
+		if (oAppComponent.byId(sVariantManagementReference)) {
+			sVMControlId = oAppComponent.createId(sVariantManagementReference);
+		} else {
+			sVMControlId = sVariantManagementReference;
+		}
+		return Element.getElementById(sVMControlId);
+	}
+
 	/**
 	 * Constructor for a new sap.ui.fl.variants.VariantModel model.
 	 * @class Variant model implementation for JSON format.
 	 * @extends sap.ui.model.json.JSONModel
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.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 +235,6 @@ sap.ui.define([
 			this.sFlexReference = ManifestUtils.getFlexReferenceForControl(mPropertyBag.appComponent);
 			this.oAppComponent = mPropertyBag.appComponent;
 			this._oResourceBundle = Lib.getResourceBundleFor("sap.ui.fl");
-			this._oVariantSwitchPromise = Promise.resolve();
-			this._oVariantAppliedListeners = {};
 
 			// set variant model data
 			this.fnUpdateListener = this.updateData.bind(this);
@@ -313,7 +322,11 @@ sap.ui.define([
 		if (mPropertyBag.internallyCalled) {
 			return switchVariantAndUpdateModel.call(this, mProperties, mPropertyBag.scenario);
 		}
-		return executeAfterSwitch(switchVariantAndUpdateModel.bind(this, mProperties, mPropertyBag.scenario), this);
+		return executeAfterSwitch(
+			switchVariantAndUpdateModel.bind(this, mProperties, mPropertyBag.scenario),
+			this.sFlexReference,
+			mPropertyBag.variantManagementReference
+		);
 	};
 
 	/**
@@ -337,6 +350,7 @@ sap.ui.define([
 					iIndex = index;
 					return true;
 				}
+				return false;
 			});
 		}.bind(this));
 		return {
@@ -402,8 +416,6 @@ sap.ui.define([
 		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
@@ -430,7 +442,7 @@ sap.ui.define([
 				) {
 					this.oData[sVMReference].showExecuteOnSelection = true;
 					this.checkUpdate(true);
-					this._oVariantAppliedListeners[sVMReference][mPropertyBag.control.getId()] = mPropertyBag.callback;
+					oVariantManagementControl._addVariantAppliedListener(mPropertyBag.control, mPropertyBag.callback);
 				} else {
 					Log.error("Error in attachVariantApplied: The passed VariantManagement ID does not match the "
 					+ "responsible VariantManagement control");
@@ -440,27 +452,22 @@ sap.ui.define([
 	};
 
 	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;
-			}
+		const oVMControl = getVariantManagementControl(sVMReference, this.oAppComponent);
+		const 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);
-				});
-			}
+		if (fnCallback) {
+			fnCallback(oVariant);
+		} else {
+			oVMControl._executeAllVariantAppliedListeners(oVariant);
 		}
 	};
 
-	VariantModel.prototype.detachVariantApplied = function(sVMControlId, sControlId) {
-		var sVMReference = this.getVariantManagementReferenceForControl(Element.getElementById(sVMControlId));
-		if (this._oVariantAppliedListeners[sVMReference]) {
-			delete this._oVariantAppliedListeners[sVMReference][sControlId];
-		}
+	VariantModel.prototype.detachVariantApplied = function(sVMControlId, oControl) {
+		const oVMControl = Element.getElementById(sVMControlId);
+		oVMControl._removeVariantAppliedListener(oControl);
 	};
 
 	VariantModel.prototype._getVariantTitleCount = function(sNewText, sVariantManagementReference) {
@@ -519,7 +526,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());
 		}
@@ -693,7 +703,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":
@@ -709,7 +720,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,
@@ -973,13 +984,6 @@ sap.ui.define([
 			});
 		}
 
-		if (this.oData[sVariantManagementReference].initPromise) {
-			this.oData[sVariantManagementReference].initPromise.resolveFunction();
-			delete this.oData[sVariantManagementReference].initPromise;
-		}
-
-		this.oData[sVariantManagementReference].init = true;
-
 		// the initial changes are not applied via a variant switch
 		// to enable early variant switches to work properly they need to wait for the initial changes
 		// so the initial changes are set as a variant switch
@@ -988,7 +992,18 @@ sap.ui.define([
 			reference: this.sFlexReference,
 			vmReference: sVariantManagementReference
 		};
-		this._oVariantSwitchPromise = this._oVariantSwitchPromise.then(waitForInitialVariantChanges.bind(undefined, mParameters));
+		VariantManagementState.setVariantSwitchPromise(
+			this.sFlexReference,
+			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) {

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.138.0
+	 * @version 1.140.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.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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.138.0
+	 * @version 1.140.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.138.0
+	 * @version 1.140.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.138.0
+	 * @version 1.140.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.138.0
+	 * @version 1.140.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.138.0
+	 * @version 1.140.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.138.0
+	 * @version 1.140.0
 	 */
 	const UIReconstruction = {};
 
@@ -120,7 +120,9 @@ sap.ui.define([
 	 * @returns {int} Target index of the index-related change
 	 */
 	function getTargetIndex(oCondenserInfo) {
-		return oCondenserInfo.getTargetIndex(oCondenserInfo.change);
+		// Destroy does not have a target index. But it can be sorted to the front of the array to first
+		// reduce the number of changes in the container to the same as the target UI
+		return oCondenserInfo.classification === "destroy" ? -1 : oCondenserInfo.getTargetIndex(oCondenserInfo.change);
 	}
 
 	/**

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.138.0
+	 * @version 1.140.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.138.0
+	 * @version 1.140.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.138.0
+	 * @version 1.140.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.138.0
+	 * @version 1.140.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.138.0
+	 * @version 1.140.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.138.0
+	 * @version 1.140.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.138.0
+	 * @version 1.140.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.138.0
+	 * @version 1.140.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.connectors, sap.ui.fl.write._internal.transport
 	 */

package/src/sap/ui/fl/write/_internal/controlVariants/ControlVariantWriteUtils.js

@@ -18,8 +18,8 @@ sap.ui.define([
 	const ControlVariantWriteUtils = {};
 
 	/**
-	 * Deletes a control variant and its associated changes. This is only possible for USER layer variants
-	 * and CUSTOMER layer variants which are part of a draft (not activated).
+	 * Deletes a control variant and its associated changes. This is only possible in the Business Network scenario
+	 * or for USER layer variants or CUSTOMER layer variants which are part of a draft (not activated).
 	 *
 	 * @param {string} sReference - Flex reference
 	 * @param {string} sVMReference - Variant management reference

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

@@ -35,7 +35,7 @@ function(
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.140.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.138.0
+	 * @version 1.140.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.138.0
+	 * @version 1.140.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.138.0
+	 * @version 1.140.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.138.0
+	 * @version 1.140.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.138.0
+	 * @version 1.140.0
 	 * @private
 	 */
 	var ServiceValidation = {};