@openui5/sap.ui.fl 1.128.0 → 1.129.0

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

@@ -6,6 +6,11 @@
 
 sap.ui.define([
 	"sap/base/util/restricted/_omit",
+	"sap/ui/core/util/reflection/JsControlTreeModifier",
+	"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/DependencyHandler",
 	"sap/ui/fl/apply/_internal/flexState/changes/UIChangesState",
 	"sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantMerger",
 	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState",
@@ -13,12 +18,18 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState",
+	"sap/ui/fl/write/_internal/Storage",
 	"sap/ui/fl/write/_internal/Versions",
-	"sap/ui/fl/FlexControllerFactory",
 	"sap/ui/fl/LayerUtils",
+	"sap/ui/fl/requireAsync",
 	"sap/ui/fl/Utils"
 ], function(
 	_omit,
+	JsControlTreeModifier,
+	Reverter,
+	FlexObjectFactory,
+	States,
+	DependencyHandler,
 	UIChangesState,
 	CompVariantMerger,
 	VariantManagementState,
@@ -26,22 +37,25 @@ sap.ui.define([
 	FlexState,
 	ManifestUtils,
 	CompVariantState,
+	Storage,
 	Versions,
-	FlexControllerFactory,
 	LayerUtils,
+	requireAsync,
 	Utils
 ) {
 	"use strict";
 
 	/**
+	 * Central class for operations on the flex states and flex objects.
+	 *
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.flexState.FlexObjectManager
 	 * @since 1.83
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
-	var FlexObjectManager = {};
+	const FlexObjectManager = {};
 
 	function getCompVariantEntities(mPropertyBag) {
 		const aEntities = [];
@@ -80,7 +94,15 @@ sap.ui.define([
 		return CompVariantState.persistAll(sReference);
 	}
 
-	function saveChangePersistenceEntities(mPropertyBag, oAppComponent) {
+	function removeFlexObjectFromDependencyHandler(sReference, oFlexObject) {
+		if (oFlexObject.isValidForDependencyMap()) {
+			DependencyHandler.removeChangeFromMap(FlexObjectState.getLiveDependencyMap(sReference), oFlexObject.getId());
+			DependencyHandler.removeChangeFromDependencies(FlexObjectState.getLiveDependencyMap(sReference), oFlexObject.getId());
+		}
+	}
+
+	async function saveChangePersistenceEntities(mPropertyBag, oAppComponent) {
+		const FlexControllerFactory = await requireAsync("sap/ui/fl/FlexControllerFactory");
 		var oFlexController = FlexControllerFactory.createForSelector(mPropertyBag.selector);
 
 		return oFlexController.saveAll(
@@ -92,6 +114,16 @@ sap.ui.define([
 			mPropertyBag.condenseAnyLayer
 		);
 	}
+
+	function getOrCreateFlexObject(vFlexObject) {
+		return (
+			typeof vFlexObject.isA === "function"
+			&& vFlexObject.isA("sap.ui.fl.apply._internal.flexObjects.FlexObject")
+		)
+			? vFlexObject
+			: FlexObjectFactory.createFromFileContent(vFlexObject);
+	}
+
 	/**
 	 * Takes an array of FlexObjects and filters out any hidden variant and changes on those hidden variants
 	 *
@@ -166,6 +198,57 @@ sap.ui.define([
 		return FlexObjectState.getDirtyFlexObjects(sReference).length > 0 || CompVariantState.hasDirtyChanges(sReference);
 	};
 
+	/**
+	 * Adds new dirty flex objects.
+	 *
+	 * @param {string} sReference - Flex reference of the application
+	 * @param {object[]} aFlexObjects - JSON object representation of flex objects or flex object instances
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} The prepared flex objects
+	 * @public
+	 */
+	FlexObjectManager.addDirtyFlexObjects = function(sReference, aFlexObjects) {
+		return FlexState.addDirtyFlexObjects(sReference, aFlexObjects.map(getOrCreateFlexObject));
+	};
+
+	/**
+	 * Removes unsaved flex objects.
+	 *
+	 * @param {object} mPropertyBag - Properties to determine the flex objects to be removed
+	 * @param {string} mPropertyBag.reference - Flex reference of the application
+	 * @param {string|string[]} [mPropertyBag.layers] - Layer or multiple layers for which flex objects shall be deleted. If omitted, flex objects on all layers are considered.
+	 * @param {sap.ui.core.Component} [mPropertyBag.component] - Component instance, required if oControl is specified
+	 * @param {string} [mPropertyBag.control] - Control for which the flex objects should be deleted. If omitted, all flex objects for the reference are considered.
+	 * @param {string} [mPropertyBag.generator] - Generator of flex objects
+	 * @param {string[]} [mPropertyBag.changeTypes] - Types of flex objects
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} The flex objects that were removed
+	 */
+	FlexObjectManager.removeDirtyFlexObjects = function(mPropertyBag) {
+		const aLayers = [].concat(mPropertyBag.layers || []);
+		const aDirtyFlexObjects = FlexObjectState.getDirtyFlexObjects(mPropertyBag.reference);
+
+		const aFlexObjectsToBeRemoved = aDirtyFlexObjects.filter((oFlexObject) => {
+			let bChangeValid = true;
+
+			if (aLayers.length && !aLayers.includes(oFlexObject.getLayer())) {
+				return false;
+			}
+			if (mPropertyBag.generator && oFlexObject.getSupportInformation().generator !== mPropertyBag.generator) {
+				return false;
+			}
+			if (mPropertyBag.control) {
+				const sSelectorId = JsControlTreeModifier.getControlIdBySelector(oFlexObject.getSelector(), mPropertyBag.component);
+				bChangeValid = mPropertyBag.control.getId() === sSelectorId;
+			}
+			if (mPropertyBag.changeTypes) {
+				bChangeValid &&= mPropertyBag.changeTypes.includes(oFlexObject.getChangeType());
+			}
+
+			return bChangeValid;
+		});
+
+		return FlexState.removeDirtyFlexObjects(mPropertyBag.reference, aFlexObjectsToBeRemoved);
+	};
+
 	/**
 	 * Save Flex objects and reload Flex State
 	 * @param {object} mPropertyBag - Object with parameters as properties
@@ -202,5 +285,98 @@ sap.ui.define([
 		return FlexObjectManager.getFlexObjects(_omit(mPropertyBag, "skipUpdateCache"));
 	};
 
+	/**
+	 * Removes the provided flex objects from the FlexState and dependency handler and sets them to be deleted.
+	 * If a flex object is dirty it will only be removed from the FlexState.
+	 * Otherwise the next call to save dirty flex objects will remove them from the persistence.
+	 *
+	 * @param {object} mPropertyBag - Object with parameters as properties
+	 * @param {string} mPropertyBag.reference - Flex reference of the application
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} mPropertyBag.flexObjects - Flex objects to be deleted
+	 */
+	FlexObjectManager.deleteFlexObjects = function(mPropertyBag) {
+		const aDirtyFlexObjects = FlexObjectState.getDirtyFlexObjects(mPropertyBag.reference);
+
+		const aToBeDeletedFlexObjects = [];
+		const aToBeRemovedDirtyFlexObjects = [];
+		mPropertyBag.flexObjects.forEach(function(oFlexObject) {
+			if (aDirtyFlexObjects.indexOf(oFlexObject) > -1 && oFlexObject.getState() === States.LifecycleState.NEW) {
+				aToBeRemovedDirtyFlexObjects.push(oFlexObject);
+			} else {
+				oFlexObject.markForDeletion();
+				aToBeDeletedFlexObjects.push(oFlexObject);
+			}
+			removeFlexObjectFromDependencyHandler(mPropertyBag.reference, oFlexObject);
+		});
+		FlexState.removeDirtyFlexObjects(mPropertyBag.reference, aToBeRemovedDirtyFlexObjects);
+		FlexObjectManager.addDirtyFlexObjects(mPropertyBag.reference, aToBeDeletedFlexObjects);
+	};
+
+	/**
+	 * Reset flex objects on the server.
+	 * If the reset is performed for an entire component, a browser reload is required.
+	 * If the reset is performed for a control or change type, this function also triggers a reversion of deleted UI changes.
+	 * The to be deleted flexObjects can be filtered by selectorIds, changeTypes or generator.
+	 *
+	 * @param {object} mPropertyBag - Object with parameters as properties
+	 * @param {string} mPropertyBag.layer - Layer for which changes shall be deleted
+	 * @param {sap.ui.core.UIComponent} mPropertyBag.appComponent - Component instance
+	 * @param {string} [mPropertyBag.generator] - Generator of changes
+	 * @param {string[]} [mPropertyBag.selectorIds] - Selector IDs in local format
+	 * @param {string[]} [mPropertyBag.changeTypes] - Types of changes
+	 *
+	 * @returns {Promise<undefined>} Resolves after the deletion took place
+	 */
+	FlexObjectManager.resetFlexObjects = async function(mPropertyBag) {
+		const sReference = ManifestUtils.getFlexReferenceForControl(mPropertyBag.appComponent);
+		const aFlexObjects = await FlexObjectManager.getFlexObjects({
+			selector: mPropertyBag.appComponent,
+			currentLayer: mPropertyBag.layer,
+			includeCtrlVariants: true
+		});
+		const mParams = {
+			reference: sReference,
+			layer: mPropertyBag.layer,
+			changes: aFlexObjects
+		};
+		if (mPropertyBag.generator) {
+			mParams.generator = mPropertyBag.generator;
+		}
+		if (mPropertyBag.selectorIds) {
+			mParams.selectorIds = mPropertyBag.selectorIds;
+		}
+		if (mPropertyBag.changeTypes) {
+			mParams.changeTypes = mPropertyBag.changeTypes;
+		}
+		const oResponse = await Storage.reset(mParams);
+
+		if (mPropertyBag.selectorIds || mPropertyBag.changeTypes || mPropertyBag.generator) {
+			const aFileNames = [];
+			if (oResponse?.response?.length > 0) {
+				oResponse.response.forEach(function(oChangeContent) {
+					aFileNames.push(oChangeContent.fileName);
+				});
+			}
+			const aChangesToRevert = aFlexObjects.filter(function(oChange) {
+				return aFileNames.indexOf(oChange.getId()) !== -1;
+			});
+			FlexState.updateStorageResponse(sReference, aChangesToRevert.map((oFlexObject) => {
+				return { flexObject: oFlexObject.convertToFileContent(), type: "delete" };
+			}));
+
+			if (aChangesToRevert.length) {
+				await Reverter.revertMultipleChanges(
+					// Always revert changes in reverse order
+					[...aChangesToRevert].reverse(),
+					{
+						appComponent: mPropertyBag.appComponent,
+						modifier: JsControlTreeModifier,
+						reference: sReference
+					}
+				);
+			}
+		}
+	};
+
 	return FlexObjectManager;
 });

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

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

package/src/sap/ui/fl/write/_internal/flexState/changes/UIChangeManager.js

@@ -0,0 +1,86 @@
+/*!
+ * 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/base/util/restricted/_omit",
+	"sap/ui/core/Component",
+	"sap/ui/fl/apply/_internal/changes/Applier",
+	"sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory",
+	"sap/ui/fl/apply/_internal/flexState/changes/DependencyHandler",
+	"sap/ui/fl/apply/_internal/flexState/FlexObjectState",
+	"sap/ui/fl/apply/_internal/flexState/FlexState"
+], function(
+	_omit,
+	Component,
+	Applier,
+	FlexObjectFactory,
+	DependencyHandler,
+	FlexObjectState,
+	FlexState
+) {
+	"use strict";
+
+	/**
+	 * Central class for the management of UIChanges within the flex states.
+	 *
+	 * @namespace
+	 * @alias sap.ui.fl.write._internal.flexState.changes.UIChangeManager
+	 * @since 1.129
+	 * @version 1.129.0
+	 * @private
+	 * @ui5-restricted sap.ui.fl
+	 */
+	const UIChangeManager = {};
+
+	function finalizeChangeCreation(sReference, oChange, oAppComponent) {
+		DependencyHandler.addRuntimeChangeToMap(
+			oChange,
+			oAppComponent,
+			FlexObjectState.getLiveDependencyMap(sReference)
+		);
+
+		// If the first changes were created, the propagationListener of sap.ui.fl
+		// might not yet be attached to the application component and must be added then
+		if (oAppComponent instanceof Component) {
+			const bNoFlPropagationListenerAttached = oAppComponent.getPropagationListeners()
+			.every((fnPropagationListener) => (!fnPropagationListener._bIsSapUiFlFlexControllerApplyChangesOnControl));
+
+			if (bNoFlPropagationListenerAttached) {
+				const fnPropagationListener = Applier.applyAllChangesForControl.bind(Applier, oAppComponent, sReference);
+				fnPropagationListener._bIsSapUiFlFlexControllerApplyChangesOnControl = true;
+				oAppComponent.addPropagationListener(fnPropagationListener);
+			}
+		}
+	}
+
+	function getOrCreateFlexObject(vFlexObject) {
+		return (
+			typeof vFlexObject.isA === "function"
+			&& vFlexObject.isA("sap.ui.fl.apply._internal.flexObjects.FlexObject")
+		)
+			? vFlexObject
+			: FlexObjectFactory.createFromFileContent(vFlexObject);
+	}
+
+	/**
+	 * Adds new UIChanges and returns the IDs of the new UIChanges.
+	 *
+	 * @param {string} sReference - Flex reference of the application
+	 * @param {object[]} aChanges - Array with complete and finalized JSON object representation of the file content of the UIChanges or UIChange instances
+	 * @param {sap.ui.core.Component} oAppComponent - Application component instance
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} The newly added UIChanges
+	 * @public
+	 */
+	UIChangeManager.addDirtyChanges = function(sReference, aChanges, oAppComponent) {
+		const aAddedChanges = FlexState.addDirtyFlexObjects(sReference, aChanges.map(getOrCreateFlexObject));
+		aAddedChanges.forEach((oChange) => {
+			finalizeChangeCreation(sReference, oChange, oAppComponent);
+		});
+		return aAddedChanges;
+	};
+
+	return UIChangeManager;
+});

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

@@ -192,7 +192,7 @@ sap.ui.define([
 
 	function needsPersistencyCall(oFlexObject) {
 		return oFlexObject &&
-			[States.LifecycleState.NEW, States.LifecycleState.DIRTY, States.LifecycleState.DELETED].includes(oFlexObject.getState());
+			[States.LifecycleState.NEW, States.LifecycleState.UPDATED, States.LifecycleState.DELETED].includes(oFlexObject.getState());
 	}
 
 	function getAllCompVariantObjects(mCompVariantsMapByPersistencyKey) {
@@ -266,13 +266,13 @@ sap.ui.define([
 			});
 			revertVariantUpdate(
 				oVariant,
-				Object.assign({
+				{
 					name: oRevertDataContent.previousName,
 					content: oRevertDataContent.previousContent,
 					favorite: oRevertDataContent.previousFavorite,
 					executeOnSelection: oRevertDataContent.previousExecuteOnSelection,
 					contexts: oRevertDataContent.previousContexts
-				})
+				}
 			);
 			oVariant.setState(oRevertDataContent.previousState);
 		}
@@ -310,7 +310,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.flexState.compVariants.CompVariantState
 	 * @since 1.83
-	 * @version 1.128.0
+	 * @version 1.129.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -368,7 +368,7 @@ sap.ui.define([
 			oChange.addRevertInfo(new RevertData({
 				type: CompVariantState.operationType.NewChange
 			}));
-			FlexState.addDirtyFlexObject(mPropertyBag.reference, oChange);
+			FlexState.addDirtyFlexObjects(mPropertyBag.reference, [oChange]);
 		} else {
 			oChange.addRevertInfo(new RevertData({
 				type: CompVariantState.operationType.ContentUpdate,
@@ -432,20 +432,20 @@ sap.ui.define([
 			return undefined;
 		}
 
-		var oChangeSpecificData = mPropertyBag.changeSpecificData;
+		const oChangeSpecificData = mPropertyBag.changeSpecificData;
 
 		oChangeSpecificData.layer = determineLayer(oChangeSpecificData);
 		oChangeSpecificData.changeType = oChangeSpecificData.type;
 		oChangeSpecificData.texts = getTexts(oChangeSpecificData);
 		setAuthor(oChangeSpecificData);
-		var oFileContent = Object.assign({}, oChangeSpecificData, _omit(mPropertyBag, "changeSpecificData"));
-		var oFlexObject = FlexObjectFactory.createCompVariant(oFileContent);
+		const oFileContent = { ...oChangeSpecificData, ...(_omit(mPropertyBag, "changeSpecificData")) };
+		const oFlexObject = FlexObjectFactory.createCompVariant(oFileContent);
 
-		var mCompVariantsMap = FlexState.getCompVariantsMap(mPropertyBag.reference);
-		var oMapOfPersistencyKey = mCompVariantsMap._getOrCreate(mPropertyBag.persistencyKey);
+		const mCompVariantsMap = FlexState.getCompVariantsMap(mPropertyBag.reference);
+		const oMapOfPersistencyKey = mCompVariantsMap._getOrCreate(mPropertyBag.persistencyKey);
 		oMapOfPersistencyKey.variants.push(oFlexObject);
 		oMapOfPersistencyKey.byId[oFlexObject.getId()] = oFlexObject;
-		FlexState.addDirtyFlexObject(mPropertyBag.reference, oFlexObject);
+		FlexState.addDirtyFlexObjects(mPropertyBag.reference, [oFlexObject]);
 		if (oChangeSpecificData.layer !== Layer.USER && oChangeSpecificData.layer !== Layer.PUBLIC) {
 			mPropertyBag.id = mPropertyBag.control.getCurrentVariantId();
 			revertAllVariantUpdate(getVariantById(mPropertyBag));
@@ -471,7 +471,7 @@ sap.ui.define([
 	 * @param {object} [mPropertyBag.contexts] - Map of contexts that restrict the visibility of the variant
 	 * @param {string[]} [mPropertyBag.contexts.role] - List of roles which are allowed to see the variant
 	 * @param {sap.ui.fl.Layer} mPropertyBag.layer - Layer in which the variant removal takes place;
-	 * @param {string} mPropertyBag.adaptationId - ID of the context-based adaptation
+	 * @param {string} [mPropertyBag.adaptationId] - ID of the context-based adaptation
 	 * @param {boolean} [mPropertyBag.forceCreate] - Parameter that forces a new change to be created
 	 * this either updates the variant from the layer or writes a change to that layer.
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.CompVariant} The updated variant
@@ -540,12 +540,12 @@ sap.ui.define([
 		}
 
 		function updateChange(mPropertyBag, oVariant, oChange) {
-			var aRevertData = oChange.getRevertData() || [];
-			var oChangeContent = Object.assign({}, oChange.getContent());
-			var oRevertData = {
-				previousContent: Object.assign({}, oChangeContent),
+			const aRevertData = oChange.getRevertData() || [];
+			const oChangeContent = { ...oChange.getContent() };
+			const oRevertData = {
+				previousContent: { ...oChangeContent },
 				previousState: oChange.getState(),
-				change: _pick(Object.assign({}, mPropertyBag), ["favorite", "visible", "executeOnSelection", "contexts", "content", "name"])
+				change: _pick(mPropertyBag, ["favorite", "visible", "executeOnSelection", "contexts", "content", "name"])
 			};
 			aRevertData.push(oRevertData);
 			oChange.setRevertData(aRevertData);
@@ -584,7 +584,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);
+				FlexState.addDirtyFlexObjects(mPropertyBag.reference, [oChange]);
 			}
 
 			var oContent = {};
@@ -610,10 +610,10 @@ sap.ui.define([
 				}
 			});
 
-			if (mPropertyBag.adaptationId !== undefined) {
-				oChange.setAdaptationId(mPropertyBag.adaptationId);
-			} else if (mPropertyBag.changeSpecificData && mPropertyBag.changeSpecificData.adaptationId !== undefined) {
-				oChange.setAdaptationId(mPropertyBag.changeSpecificData.adaptationId);
+			const sAdaptationId = mPropertyBag.adaptationId || mPropertyBag?.changeSpecificData?.adaptationId;
+
+			if (sAdaptationId) {
+				oChange.setAdaptationId(sAdaptationId);
 			}
 
 			if (mPropertyBag.name) {
@@ -765,7 +765,7 @@ sap.ui.define([
 			mCompVariantsMap[sPersistencyKey].changes = mCompVariantsMap[sPersistencyKey].changes.filter(function(oChangeInMap) {
 				return oChangeInMap !== oChange;
 			});
-			FlexState.removeDirtyFlexObject(mPropertyBag.reference, oChange);
+			FlexState.removeDirtyFlexObjects(mPropertyBag.reference, [oChange]);
 		}
 
 		var oVariant = getVariantById(mPropertyBag);
@@ -779,15 +779,15 @@ sap.ui.define([
 			case CompVariantState.operationType.ContentUpdate:
 				revertVariantUpdate(
 					oVariant,
-					Object.assign({
+					{
 						name: oRevertDataContent.previousName,
 						content: oRevertDataContent.previousContent,
 						favorite: oRevertDataContent.previousFavorite,
 						executeOnSelection: oRevertDataContent.previousExecuteOnSelection,
-						contexts: oRevertDataContent.previousContexts
-					},
-					_pick(mPropertyBag, ["reference", "persistencyKey", "id"])
-					));
+						contexts: oRevertDataContent.previousContexts,
+						..._pick(mPropertyBag, ["reference", "persistencyKey", "id"])
+					}
+				);
 				break;
 			case CompVariantState.operationType.NewChange:
 				oChange = oVariantRevertData.getChange();
@@ -795,31 +795,31 @@ sap.ui.define([
 				removeChange(oChange);
 				revertVariantChange(
 					oVariant,
-					Object.assign(
-						{
-							name: oRevertDataContent.previousName,
-							content: oRevertDataContent.previousContent,
-							favorite: oRevertDataContent.previousFavorite,
-							executeOnSelection: oRevertDataContent.previousExecuteOnSelection,
-							contexts: oRevertDataContent.previousContexts
-						},
-						_pick(mPropertyBag, ["reference", "persistencyKey", "id"])
-					));
+					{
+						name: oRevertDataContent.previousName,
+						content: oRevertDataContent.previousContent,
+						favorite: oRevertDataContent.previousFavorite,
+						executeOnSelection: oRevertDataContent.previousExecuteOnSelection,
+						contexts: oRevertDataContent.previousContexts,
+						..._pick(mPropertyBag, ["reference", "persistencyKey", "id"])
+					}
+				);
 				break;
 			case CompVariantState.operationType.UpdateVariantViaChangeUpdate:
 				oChange = oVariantRevertData.getChange();
 				revertVariantChange(
 					oVariant,
-					Object.assign(
-						{
+					{
+						...{
 							name: oRevertDataContent.previousName,
 							content: oRevertDataContent.previousContent,
 							favorite: oRevertDataContent.previousFavorite,
 							executeOnSelection: oRevertDataContent.previousExecuteOnSelection,
 							contexts: oRevertDataContent.previousContexts
 						},
-						_pick(mPropertyBag, ["reference", "persistencyKey", "id"])
-					));
+						..._pick(mPropertyBag, ["reference", "persistencyKey", "id"])
+					}
+				);
 				var oChangeRevertData = oChange.getRevertData().pop();
 				oChange.setContent(oChangeRevertData.previousContent);
 				oChange.setState(oChangeRevertData.previousState);
@@ -904,7 +904,7 @@ sap.ui.define([
 				case States.LifecycleState.NEW:
 					ifVariantClearRevertData(oFlexObject);
 					return writeObjectAndAddToState(oFlexObject, oStoredResponse, sParentVersion);
-				case States.LifecycleState.DIRTY:
+				case States.LifecycleState.UPDATED:
 					ifVariantClearRevertData(oFlexObject);
 					return updateObjectAndStorage(oFlexObject, oStoredResponse, sParentVersion, mPropertyBag.reference);
 				case States.LifecycleState.DELETED:

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

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

@@ -169,7 +169,7 @@ sap.ui.define([
 		}
 
 		// TODO Extract class
-		var oModel = new JSONModel({
+		const oModel = new JSONModel({
 			allAdaptations: [],
 			adaptations: [],
 			count: 0,
@@ -177,7 +177,7 @@ sap.ui.define([
 			contextBasedAdaptationsEnabled: bContextBasedAdaptationsEnabled
 		});
 		oModel.updateAdaptations = function(aAdaptations) {
-			var aContextBasedAdaptations = aAdaptations.filter(function(oAdaptation, iIndex) {
+			const aContextBasedAdaptations = aAdaptations.filter(function(oAdaptation, iIndex) {
 				oAdaptation.rank = iIndex + 1; // initialize ranks
 				return oAdaptation.type !== Adaptations.Type.Default;
 			});
@@ -186,59 +186,62 @@ sap.ui.define([
 			oModel.setProperty("/count", aContextBasedAdaptations.length);
 
 			// update displayed adaptation
-			var oDisplayedAdaptation = oModel.getProperty("/displayedAdaptation");
-			var oCorrespondingAdaptation = aAdaptations.find(function(oAdaptation) {
+			let oDisplayedAdaptation = oModel.getProperty("/displayedAdaptation");
+			const oCorrespondingAdaptation = aAdaptations.find(function(oAdaptation) {
 				return !!oDisplayedAdaptation && oAdaptation.id === oDisplayedAdaptation.id;
 			});
 			if (oCorrespondingAdaptation) {
-				oDisplayedAdaptation = Object.assign({}, oCorrespondingAdaptation);
+				oDisplayedAdaptation = { ...oCorrespondingAdaptation };
 				oModel.setProperty("/displayedAdaptation", oDisplayedAdaptation);
 			}
 			oModel.updateBindings(true);
 		};
 		oModel.insertAdaptation = function(oNewAdaptation) {
-			var aAdaptations = oModel.getProperty("/allAdaptations");
+			const aAdaptations = oModel.getProperty("/allAdaptations");
 			aAdaptations.splice(oNewAdaptation.priority, 0, oNewAdaptation);
 			delete oNewAdaptation.priority;
 			oModel.updateAdaptations(aAdaptations);
 		};
 		oModel.deleteAdaptation = function() {
-			var iIndex = oModel.getProperty("/displayedAdaptation").rank - 1;
-			var aAdaptations = oModel.getProperty("/adaptations");
-			var iModelCount = oModel.getProperty("/count");
-			var sToBeDisplayedAdaptationId;
+			const iIndex = oModel.getProperty("/displayedAdaptation").rank - 1;
+			const aAdaptations = oModel.getProperty("/adaptations");
+			const iModelCount = oModel.getProperty("/count");
+			let sToBeDisplayedAdaptationId;
 			if (iModelCount > 1) {
 				sToBeDisplayedAdaptationId = aAdaptations[iIndex + ((iIndex === iModelCount - 1) ? -1 : 1)].id;
 			}
 			aAdaptations.splice(iIndex, 1);
-			var oDefaultAdaptation = oModel.getProperty("/allAdaptations").pop();
+			const oDefaultAdaptation = oModel.getProperty("/allAdaptations").pop();
 			aAdaptations.push(oDefaultAdaptation);
 			oModel.updateAdaptations(aAdaptations);
 			return sToBeDisplayedAdaptationId;
 		};
 		oModel.switchDisplayedAdaptation = function(sAdaptationId) {
-			var iIndex = oModel.getIndexByAdaptationId(sAdaptationId);
-			var oNewDisplayedAdaptation = iIndex ? oModel.getProperty("/allAdaptations")[iIndex] : oModel.getProperty("/allAdaptations")[0];
+			const iIndex = oModel.getIndexByAdaptationId(sAdaptationId);
+			const oNewDisplayedAdaptation =
+				iIndex ?
+					oModel.getProperty("/allAdaptations")[iIndex] :
+					oModel.getProperty("/allAdaptations")[0];
 			oModel.setProperty("/displayedAdaptation", oNewDisplayedAdaptation);
 			oModel.updateBindings(true);
 		};
 		oModel.updateAdaptationContent = function(oContextBasedAdaptation) {
-			var aAdaptations = oModel.getProperty("/allAdaptations");
-			var oAdaptationForUpdate = aAdaptations.find(function(oAdaptation) {
+			const aAdaptations = oModel.getProperty("/allAdaptations");
+			const oAdaptationForUpdate = aAdaptations.find(function(oAdaptation) {
 				return oContextBasedAdaptation.adaptationId === oAdaptation.id;
 			});
 			oAdaptationForUpdate.title = oContextBasedAdaptation.title;
 			oAdaptationForUpdate.contexts = oContextBasedAdaptation.contexts;
-			var iIndex = oAdaptationForUpdate.rank - 1;
+			const iIndex = oAdaptationForUpdate.rank - 1;
 			if (iIndex !== oContextBasedAdaptation.priority) {
-				var aDisplayedAdaptation = aAdaptations.splice(iIndex, 1);
+				const aDisplayedAdaptation = aAdaptations.splice(iIndex, 1);
 				aAdaptations.splice(oContextBasedAdaptation.priority, 0, aDisplayedAdaptation[0]);
 			}
 			oModel.updateAdaptations(aAdaptations);
 		};
 		oModel.getIndexByAdaptationId = function(sAdaptationId) {
-			var aAdaptations = oModel.getProperty("/allAdaptations");
-			var iAdaptationIndex = aAdaptations.findIndex(function(oAdaptation) {
+			const aAdaptations = oModel.getProperty("/allAdaptations");
+			const iAdaptationIndex = aAdaptations.findIndex(function(oAdaptation) {
 				return oAdaptation.id === sAdaptationId;
 			});
 			return (iAdaptationIndex > -1) ? iAdaptationIndex : undefined;