@openui5/sap.ui.fl 1.124.2 → 1.126.0

package/.reuse/dep5

@@ -50,6 +50,11 @@ Copyright: Mario Heiderich
 License: Apache-2.0
 Comment: these files belong to: purify.js
 
+Files: src/sap.m/test/sap/m/qunit/_thirdparty/qunit-composite.css src/sap.m/test/sap/m/qunit/_thirdparty/qunit-composite.js
+Copyright: jQuery Foundation and other contributors, https://jquery.org/
+License: MIT
+Comment: these files belong to: QUnit Composite 2.0.0
+
 
 # Library: sap.ui.codeeditor:
 
@@ -379,13 +384,13 @@ Copyright: 2017 Wei Song and Oliver Nightingale
 License: MIT
 Comment: these files belong to: Elasticlunr
 
-Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/DataTables/DataTables-1.10.15/*
-Copyright: 2008-2017 SpryMedia Ltd
+Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/DataTables/DataTables-2.0.1/*
+Copyright: SpryMedia Ltd
 License: MIT
 Comment: these files belong to: DataTables
 
-Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/DataTables/Buttons-1.4.0/*
-Copyright: 2016 SpryMedia Ltd
+Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/DataTables/Buttons-3.0.0/*
+Copyright: SpryMedia Ltd
 License: MIT
 Comment: these files belong to: Buttons extension for DataTables
 

package/THIRDPARTY.txt

@@ -12,6 +12,13 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/sap.m/src/sap/m/_thirdparty/purify.js
 
+Component: QUnit Composite 2.0.0, version: 2.0.0
+Copyright: jQuery Foundation and other contributors, https://jquery.org/
+License: MIT
+License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
+Contained in: src/sap.m/test/sap/m/qunit/_thirdparty/qunit-composite.css
+	src/sap.m/test/sap/m/qunit/_thirdparty/qunit-composite.js
+
 
 Library: sap.ui.codeeditor:
 
@@ -356,17 +363,17 @@ License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/elasticlunr.js
 
-Component: DataTables, version: 1.10.15
-Copyright: 2008-2017 SpryMedia Ltd
+Component: DataTables, version: 2.0.1
+Copyright: SpryMedia Ltd
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/DataTables/DataTables-1.10.15/*
+Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/DataTables/DataTables-2.0.1/*
 
-Component: Buttons extension for DataTables, version: 1.4.0
-Copyright: 2016 SpryMedia Ltd
+Component: Buttons extension for DataTables, version: 3.0.0
+Copyright: SpryMedia Ltd
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/DataTables/Buttons-1.4.0/*
+Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/DataTables/Buttons-3.0.0/*
 
 
 Library: sap.ui.integration:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.fl",
-  "version": "1.124.2",
+  "version": "1.126.0",
   "description": "OpenUI5 UI Library sap.ui.fl",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,7 +14,7 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.m": "1.124.2",
-    "@openui5/sap.ui.core": "1.124.2"
+    "@openui5/sap.m": "1.126.0",
+    "@openui5/sap.ui.core": "1.126.0"
   }
 }

package/src/sap/ui/fl/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.124.2</version>
+  <version>1.126.0</version>
 
   <documentation>SAPUI5 library with sap.ui.fl controls.</documentation>
 

package/src/sap/ui/fl/ChangePersistence.js

@@ -15,6 +15,7 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/changes/UIChangesState",
 	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState",
 	"sap/ui/fl/apply/_internal/flexState/DataSelector",
+	"sap/ui/fl/apply/_internal/flexState/FlexObjectState",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"sap/ui/fl/initial/api/Version",
 	"sap/ui/fl/registry/Settings",
@@ -34,6 +35,7 @@ sap.ui.define([
 	UIChangesState,
 	VariantManagementState,
 	DataSelector,
+	FlexObjectState,
 	FlexState,
 	Version,
 	Settings,
@@ -66,7 +68,7 @@ sap.ui.define([
 	 *
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @since 1.25.0
 	 * @private
 	 * @param {object} mComponent - Component data to initiate <code>ChangePersistence</code> instance
@@ -167,7 +169,7 @@ sap.ui.define([
 	 * @public
 	 */
 	ChangePersistence.prototype.getDependencyMapForComponent = function() {
-		return UIChangesState.getLiveDependencyMap(this._mComponent.name);
+		return FlexObjectState.getLiveDependencyMap(this._mComponent.name);
 	};
 
 	function finalizeChangeCreation(oChange, oAppComponent) {

package/src/sap/ui/fl/ChangePersistenceFactory.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.ChangePersistenceFactory
 	 * @since 1.27.0
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/FakeLrepConnectorLocalStorage.js

@@ -20,7 +20,7 @@ function(
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 *
 	 * @private
 	 * @since 1.48

package/src/sap/ui/fl/FakeLrepConnectorSessionStorage.js

@@ -20,7 +20,7 @@ function(
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 *
 	 * @private
 	 * @since 1.58

package/src/sap/ui/fl/FakeLrepLocalStorage.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 *
 	 * @private
 	 * @since 1.48

package/src/sap/ui/fl/FlexController.js

@@ -5,66 +5,35 @@
  */
 
 sap.ui.define([
-	"sap/ui/fl/Utils",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/ChangePersistenceFactory",
 	"sap/ui/fl/write/_internal/Versions",
 	"sap/ui/fl/apply/_internal/changes/Reverter",
-	"sap/ui/fl/apply/_internal/controlVariants/URLHandler",
 	"sap/ui/fl/apply/_internal/flexObjects/States",
-	"sap/ui/fl/apply/_internal/flexState/changes/UIChangesState",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
-	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
-	"sap/ui/core/util/reflection/JsControlTreeModifier",
-	"sap/ui/core/Element"
+	"sap/ui/core/util/reflection/JsControlTreeModifier"
 ], function(
-	Utils,
 	Layer,
 	ChangePersistenceFactory,
 	Versions,
 	Reverter,
-	URLHandler,
 	States,
-	UIChangesState,
 	FlexState,
-	ControlVariantApplyAPI,
-	JsControlTreeModifier,
-	Element
+	JsControlTreeModifier
 ) {
 	"use strict";
 
-	function revertChangesAndUpdateVariantModel(oComponent, bSkipUrlUpdate, aChanges) {
-		return Promise.resolve()
-		.then(function() {
-			if (aChanges.length !== 0) {
-				// Always revert changes in reverse order
-				aChanges.reverse();
-				return Reverter.revertMultipleChanges(aChanges, {
-					appComponent: oComponent,
-					modifier: JsControlTreeModifier,
-					flexController: this
-				});
-			}
-			return undefined;
-		}.bind(this))
-		.then(function() {
-			if (oComponent) {
-				var oModel = oComponent.getModel(ControlVariantApplyAPI.getVariantModelName());
-				if (oModel) {
-					// Temporary fix, parameters generally should not be removed
-					if (!bSkipUrlUpdate) {
-						URLHandler.update({
-							parameters: [],
-							updateURL: true,
-							updateHashEntry: true,
-							model: oModel
-						});
-					}
-				}
-			}
-
-			return aChanges;
-		});
+	async function revertChangesAndUpdateVariantModel(oComponent, aChanges) {
+		if (aChanges.length !== 0) {
+			// Always revert changes in reverse order
+			aChanges.reverse();
+			await Reverter.revertMultipleChanges(aChanges, {
+				appComponent: oComponent,
+				modifier: JsControlTreeModifier,
+				reference: this._sComponentName
+			});
+		}
+		return aChanges;
 	}
 
 	/**
@@ -77,7 +46,7 @@ sap.ui.define([
 	 * @since 1.27.0
 	 * @private
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 */
 	var FlexController = function(sComponentName) {
 		this._oChangePersistence = undefined;
@@ -87,131 +56,12 @@ sap.ui.define([
 		}
 	};
 
-	/**
-	 * Sets the variant switch promise
-	 *
-	 * @param {Promise} oPromise variant switch promise
-	 */
-	FlexController.prototype.setVariantSwitchPromise = function(oPromise) {
-		this._oVariantSwitchPromise = oPromise;
-	};
-
-	/**
-	 * Returns the variant switch promise. By default this is a resolved promise
-	 *
-	 * @returns {Promise} variant switch promise
-	 */
-	FlexController.prototype.waitForVariantSwitch = function() {
-		this._oVariantSwitchPromise ||= Promise.resolve();
-		return this._oVariantSwitchPromise;
-	};
-
-	function checkDependencies(oChange, mDependencies, mChanges, oAppComponent, aRelevantChanges) {
-		var bResult = canChangePotentiallyBeApplied(oChange, oAppComponent);
-		if (!bResult) {
-			return [];
-		}
-		aRelevantChanges.push(oChange);
-		var sDependencyKey = oChange.getId();
-		var aDependentChanges = mDependencies[sDependencyKey] && mDependencies[sDependencyKey].dependencies || [];
-		for (var i = 0, n = aDependentChanges.length; i < n; i++) {
-			var oDependentChange = Utils.getChangeFromChangesMap(mChanges, aDependentChanges[i]);
-			bResult = checkDependencies(oDependentChange, mDependencies, mChanges, oAppComponent, aRelevantChanges);
-			if (bResult.length === 0) {
-				aRelevantChanges = [];
-				break;
-			}
-			delete mDependencies[sDependencyKey];
-		}
-		return aRelevantChanges;
-	}
-
-	function canChangePotentiallyBeApplied(oChange, oAppComponent) {
-		// is control available
-		var aSelectors = oChange.getDependentControlSelectorList();
-		aSelectors.push(oChange.getSelector());
-		return !aSelectors.some(function(oSelector) {
-			return !JsControlTreeModifier.bySelector(oSelector, oAppComponent);
-		});
-	}
-
-	/**
-	 * Resolves with a promise after all the changes for all controls that are passed have been processed.
-	 *
-	 * @param {object[]} aSelectors - An array containing an object with {@link sap.ui.fl.Selector} and further configuration
-	 * @param {sap.ui.fl.Selector} aSelectors.selector - A {@link sap.ui.fl.Selector}
-	 * @param {string[]} [aSelectors.changeTypes] - An array containing the change types that will be considered. If empty no filtering will be done
-	 * @param {boolean} [bSkipWaitForVariantSwitch] - Whether to skip waiting for the variant switch promise
-	 * @returns {Promise} Resolves when all changes on the controls have been processed
-	 */
-	FlexController.prototype.waitForChangesToBeApplied = function(aSelectors, bSkipWaitForVariantSwitch) {
-		var aPromises = aSelectors.map(function(mSelector) {
-			return this._waitForChangesToBeApplied(mSelector, bSkipWaitForVariantSwitch);
-		}.bind(this));
-		return Promise.all(aPromises)
-		.then(function() {
-			// the return value is not important in this function, only that it resolves
-			return undefined;
-		});
-	};
-
-	/**
-	 * Resolves with a Promise after all relevant changes for this control have been processed.
-	 *
-	 * @param {object} mPropertyBag - Object with control and list of change types
-	 * @param {sap.ui.fl.Selector} mPropertyBag.selector - A {@link sap.ui.fl.Selector}
-	 * @param {string[]} mPropertyBag.changeTypes - An array containing the change types that should be considered
-	 * @param {boolean} [bSkipWaitForVariantSwitch] - Whether to skip waiting for the variant switch promise
-	 * @returns {Promise} Resolves when all changes on the control have been processed
-	 */
-	FlexController.prototype._waitForChangesToBeApplied = function(mPropertyBag, bSkipWaitForVariantSwitch) {
-		function filterChanges(oChange) {
-			return !oChange.isCurrentProcessFinished()
-			&& (mPropertyBag.changeTypes.length === 0 || mPropertyBag.changeTypes.includes(oChange.getChangeType()));
-		}
-
-		const oControl = mPropertyBag.selector.id && Element.getElementById(mPropertyBag.selector.id) || mPropertyBag.selector;
-		const oAppComponent = mPropertyBag.selector.appComponent || Utils.getAppComponentForControl(oControl);
-
-		mPropertyBag.changeTypes ||= [];
-		var mChangesMap = UIChangesState.getLiveDependencyMap(this._sComponentName);
-		var aPromises = [];
-		var mDependencies = Object.assign({}, mChangesMap.mDependencies);
-		var {mChanges} = mChangesMap;
-		var aChangesForControl = mChanges[oControl.getId()] || [];
-
-		// filter out already applied changes and, if given, filter by change type
-		var aNotYetProcessedChanges = aChangesForControl.filter(filterChanges);
-
-		var aRelevantChanges = [];
-		aNotYetProcessedChanges.forEach(function(oChange) {
-			var aChanges = checkDependencies(oChange, mDependencies, mChangesMap.mChanges, oAppComponent, []);
-			aChanges.forEach(function(oDependentChange) {
-				if (aRelevantChanges.indexOf(oDependentChange) === -1) {
-					aRelevantChanges.push(oDependentChange);
-				}
-			});
-		});
-
-		// attach promises to the relevant Changes and wait for them to be applied
-		aRelevantChanges.forEach(function(oChange) {
-			aPromises = aPromises.concat(oChange.addChangeProcessingPromises());
-		}, this);
-
-		if (!bSkipWaitForVariantSwitch) {
-			// also wait for a potential variant switch to be done
-			aPromises.push(this.waitForVariantSwitch());
-		}
-
-		return Promise.all(aPromises);
-	};
-
 	FlexController.prototype._removeOtherLayerChanges = function(oAppComponent, sLayer, bRemoveOtherLayerChanges) {
 		if (bRemoveOtherLayerChanges && sLayer) {
 			var aLayersToReset = Object.values(Layer).filter(function(sLayerToCheck) {
 				return sLayerToCheck !== sLayer;
 			});
-			return this.removeDirtyChanges(aLayersToReset, oAppComponent, undefined, undefined, undefined, true);
+			return this.removeDirtyChanges(aLayersToReset, oAppComponent);
 		}
 		return Promise.resolve();
 	};
@@ -296,7 +146,7 @@ sap.ui.define([
 	 */
 	FlexController.prototype.resetChanges = function(sLayer, sGenerator, oComponent, aSelectorIds, aChangeTypes) {
 		return this._oChangePersistence.resetChanges(sLayer, sGenerator, aSelectorIds, aChangeTypes)
-		.then(revertChangesAndUpdateVariantModel.bind(this, oComponent, undefined));
+		.then(revertChangesAndUpdateVariantModel.bind(this, oComponent));
 	};
 
 	/**
@@ -307,13 +157,12 @@ sap.ui.define([
 	 * @param {sap.ui.core.Control} [oControl] - Control for which the changes should be removed
 	 * @param {string} [sGenerator] - Generator of changes (optional)
 	 * @param {string[]} [aChangeTypes] - Types of changes (optional)
-	 * @param {boolean} [bSkipUrlUpdate] - Whether to skip soft reload during variant model update
 	 *
 	 * @returns {Promise} Promise that resolves after the deletion took place
 	 */
-	FlexController.prototype.removeDirtyChanges = function(vLayer, oComponent, oControl, sGenerator, aChangeTypes, bSkipUrlUpdate) {
+	FlexController.prototype.removeDirtyChanges = function(vLayer, oComponent, oControl, sGenerator, aChangeTypes) {
 		return this._oChangePersistence.removeDirtyChanges(vLayer, oComponent, oControl, sGenerator, aChangeTypes)
-		.then(revertChangesAndUpdateVariantModel.bind(this, oComponent, bSkipUrlUpdate));
+		.then(revertChangesAndUpdateVariantModel.bind(this, oComponent));
 	};
 
 	/**

package/src/sap/ui/fl/FlexControllerFactory.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.FlexControllerFactory
 	 * @since 1.27.0
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

package/src/sap/ui/fl/LayerUtils.js

@@ -41,7 +41,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.LayerUtils
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 */
 	var LayerUtils = {
 		_mLayersIndex: mLayersIndex,

package/src/sap/ui/fl/Utils.js

@@ -65,7 +65,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.Utils
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.rta

package/src/sap/ui/fl/apply/_internal/DelegateMediator.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 *
 	 */
 	const DelegateMediator = {};

package/src/sap/ui/fl/apply/_internal/changes/Applier.js

@@ -12,7 +12,7 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/changes/FlexCustomData",
 	"sap/ui/fl/apply/_internal/changes/Utils",
 	"sap/ui/fl/apply/_internal/flexState/changes/DependencyHandler",
-	"sap/ui/fl/apply/_internal/flexState/changes/UIChangesState",
+	"sap/ui/fl/apply/_internal/flexState/FlexObjectState",
 	"sap/ui/fl/Utils"
 ], function(
 	Log,
@@ -22,7 +22,7 @@ sap.ui.define([
 	FlexCustomData,
 	Utils,
 	DependencyHandler,
-	UIChangesState,
+	FlexObjectState,
 	FlUtils
 ) {
 	"use strict";
@@ -99,7 +99,7 @@ sap.ui.define([
 			// if a change was already processed and is not applied anymore, then the control was destroyed and recreated.
 			// In this case we need to recreate/copy the dependencies if we are applying in JS
 			if (!bSkipDependencies) {
-				UIChangesState.copyDependenciesFromCompleteDependencyMap(oChange, mPropertyBag.appComponent);
+				FlexObjectState.copyDependenciesFromCompleteDependencyMap(oChange, mPropertyBag.appComponent);
 			}
 			oChange.setInitialApplyState();
 		} else if (!bChangeStatusAppliedFinished && bIsCurrentlyAppliedOnControl) {
@@ -394,6 +394,7 @@ sap.ui.define([
 		mPropertyBag.modifier = JsControlTreeModifier;
 		const aPromises = aChanges.map(function(oChange) {
 			const oControl = JsControlTreeModifier.bySelector(oChange.getSelector(), mPropertyBag.appComponent);
+			const oLiveDependencyMap = FlexObjectState.getLiveDependencyMap(mPropertyBag.reference);
 			if (oControl) {
 				checkAndAdjustChangeStatus(oControl, oChange, mPropertyBag, true);
 				if (!oChange.isApplyProcessFinished()) {
@@ -403,12 +404,12 @@ sap.ui.define([
 					return Applier.applyChangeOnControl(oChange, oControl, mPropertyBag)
 					.then(function(oResult) {
 						if (oResult.success) {
-							const oLiveDependencyMap = UIChangesState.getLiveDependencyMap(mPropertyBag.reference);
 							DependencyHandler.addRuntimeChangeToMap(oChange, mPropertyBag.appComponent, oLiveDependencyMap);
 						}
 					});
 				};
 			}
+			DependencyHandler.addChangeAndUpdateDependencies(oChange, mPropertyBag.appComponent.getId(), oLiveDependencyMap);
 			return () => Promise.resolve();
 		});
 		return FlUtils.execPromiseQueueSequentially(aPromises);
@@ -427,7 +428,7 @@ sap.ui.define([
 		// the changes have to be queued synchronously
 		// scenario 1: n controls get created, for all this function is called synchronously. Changes have to be queued synchronously
 		// scenario 2: control gets recreated, the changes for the new control have to be queued after the processing of the old control
-		const oDependencyMap = UIChangesState.getLiveDependencyMap(sReference);
+		const oDependencyMap = FlexObjectState.getLiveDependencyMap(sReference);
 		var sControlId = oControl.getId();
 		var aChangesForControl = oDependencyMap.mChanges[sControlId] || [];
 		var mPropertyBag = {

package/src/sap/ui/fl/apply/_internal/changes/FlexCustomData.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @since 1.61.0
 	 * @private
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 */
 	var FlexCustomData = {};
 

package/src/sap/ui/fl/apply/_internal/changes/Reverter.js

@@ -9,12 +9,16 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/changes/Applier",
 	"sap/ui/fl/apply/_internal/changes/FlexCustomData",
 	"sap/ui/fl/apply/_internal/changes/Utils",
+	"sap/ui/fl/apply/_internal/flexState/changes/DependencyHandler",
+	"sap/ui/fl/apply/_internal/flexState/FlexObjectState",
 	"sap/ui/fl/Utils"
 ], function(
 	Log,
 	Applier,
 	FlexCustomData,
 	Utils,
+	DependencyHandler,
+	FlexObjectState,
 	FlUtils
 ) {
 	"use strict";
@@ -34,14 +38,19 @@ sap.ui.define([
 		return Promise.resolve();
 	}
 
-	function revertAndDeleteChangeOnControl(oChange, oControl, mRevertProperties, mPropertyBag) {
-		return Reverter.revertChangeOnControl(oChange, oControl, mRevertProperties).then(function(vRevertResult) {
-			FlexCustomData.destroyAppliedCustomData(vRevertResult || oControl, oChange, mPropertyBag.modifier);
-			if (vRevertResult) {
-				// TODO should be changed as soon as new flex persistence is in place
-				mPropertyBag.flexController._oChangePersistence._deleteChangeInMap(oChange);
-			}
-		});
+	function removeChangeFromMaps(oChange, sReference) {
+		const sChangeKey = oChange.getId();
+		const oDependencyMap = FlexObjectState.getLiveDependencyMap(sReference);
+		DependencyHandler.removeChangeFromMap(oDependencyMap, sChangeKey);
+		DependencyHandler.removeChangeFromDependencies(oDependencyMap, sChangeKey);
+	}
+
+	async function revertAndDeleteChangeOnControl(oChange, oControl, mRevertProperties, mPropertyBag) {
+		const vRevertResult = await Reverter.revertChangeOnControl(oChange, oControl, mRevertProperties);
+		FlexCustomData.destroyAppliedCustomData(vRevertResult || oControl, oChange, mPropertyBag.modifier);
+		if (vRevertResult) {
+			removeChangeFromMaps(oChange, mPropertyBag.reference);
+		}
 	}
 
 	/**
@@ -97,8 +106,8 @@ sap.ui.define([
 	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} aChanges - Array of changes to be reverted
 	 * @param {object} mPropertyBag - Object with additional properties
 	 * @param {sap.ui.core.Component} mPropertyBag.appComponent - Component instance that is currently loading
+	 * @param {string} mPropertyBag.reference - Flex reference
 	 * @param {sap.ui.core.util.reflection.BaseTreeModifier} mPropertyBag.modifier - Polymorph reuse operations handling the changes on the given view type
-	 * @param {sap.ui.fl.FlexController} mPropertyBag.flexController - Instance of the flex controller the change is saved in
 	 * @returns {Promise|sap.ui.fl.Utils.FakePromise} Promise/FakePromise that resolves as soon as all changes are reverted
 	 */
 	Reverter.revertMultipleChanges = function(aChanges, mPropertyBag) {
@@ -110,7 +119,7 @@ sap.ui.define([
 				var oSelector = oChange.getSelector && oChange.getSelector();
 				var oControl = mPropertyBag.modifier.bySelector(oSelector, mPropertyBag.appComponent);
 				if (!oControl) {
-					Log.warning(`A flexibility change tries to revert changes on a nonexistent control with id ${oSelector.id}`);
+					removeChangeFromMaps(oChange, mPropertyBag.reference);
 					return (FlUtils.FakePromise ? new FlUtils.FakePromise() : Promise.resolve());
 				}
 				var mRevertProperties = {

package/src/sap/ui/fl/apply/_internal/changes/Utils.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.Utils
 	 * @since 1.70
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal, sap.ui.fl.write._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/Preprocessor.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.Preprocessor
 	 * @since 1.74
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/Registration.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.Registration
 	 * @since 1.74
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/RegistrationBuild.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild
 	 * @since 1.77
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
@@ -36,7 +36,8 @@ sap.ui.define([
 		appdescr_app_removeAllInboundsExceptOne: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/app/RemoveAllInboundsExceptOne"),
 		appdescr_app_changeInbound: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/app/ChangeInbound"),
 		appdescr_app_addNewInbound: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/app/AddNewInbound"),
-		appdescr_fiori_setAbstract: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/fiori/SetAbstract")
+		appdescr_fiori_setAbstract: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/fiori/SetAbstract"),
+		appdescr_fiori_setCloudDevAdaptationStatus: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/fiori/SetCloudDevAdaptationStatus")
 	};
 
 	var RegistrationCopy = Object.assign({}, Registration);

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/AddAnnotationsToOData.js

@@ -135,7 +135,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.app.AddAnnotationsToOData
 	 * @since 1.87
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/AddNewInbound.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	*
 	* @namespace
 	* @alias sap.ui.fl.apply._internal.changes.descriptor.app.AddNewInbound
-	* @version 1.124.2
+	* @version 1.126.0
 	* @private
 	* @ui5-restricted sap.ui.fl.apply._internal
 	*/