@openui5/sap.ui.fl 1.96.1 → 1.96.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.fl",
-  "version": "1.96.1",
+  "version": "1.96.5",
   "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.96.1",
-    "@openui5/sap.ui.core": "1.96.1"
+    "@openui5/sap.m": "1.96.5",
+    "@openui5/sap.ui.core": "1.96.5"
   }
 }

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

@@ -4,9 +4,9 @@
   <name>sap.ui.fl</name>
   <vendor>SAP SE</vendor>
   <copyright>OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.96.1</version>
+  <version>1.96.5</version>
 
   <documentation>SAPUI5 library with sap.ui.fl controls.</documentation>
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -24,7 +24,7 @@ function(
 	 * @alias sap.ui.fl.Cache
 	 * @experimental Since 1.25.0
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.96.5
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -960,28 +960,24 @@ sap.ui.define([
 	};
 
 	/**
-	 * Removes unsaved changes and reverts these.
+	 * Removes unsaved changes.
 	 *
-	 * @param {string} sLayer - Layer for which changes shall be deleted
-	 * @param {sap.ui.core.Component} oComponent - Component instance
-	 * @param {string} oControl - Control for which the changes should be removed
+	 * @param {string|string[]} [vLayer] - Layer or multiple layers for which changes shall be deleted. If omitted, changes on all layers are considered.
+	 * @param {sap.ui.core.Component} [oComponent] - Component instance, required if oControl is specified
+	 * @param {string} [oControl] - Control for which the changes should be deleted. If omitted, all changes for the app component are considered.
 	 * @param {string} [sGenerator] - Generator of changes (optional)
 	 * @param {string[]} [aChangeTypes] - Types of changes (optional)
 	 *
 	 * @returns {Promise} Promise that resolves after the deletion took place
 	 */
-	ChangePersistence.prototype.removeDirtyChanges = function(sLayer, oComponent, oControl, sGenerator, aChangeTypes) {
-		if (!oControl) {
-			Log.error("The selectorId must be provided");
-			return Promise.reject("The selectorId must be provided");
-		}
-
+	ChangePersistence.prototype.removeDirtyChanges = function(vLayer, oComponent, oControl, sGenerator, aChangeTypes) {
+		var aLayers = [].concat(vLayer || []);
 		var aDirtyChanges = this._aDirtyChanges;
 
 		var aChangesToBeRemoved = aDirtyChanges.filter(function (oChange) {
 			var bChangeValid = true;
 
-			if (oChange.getLayer() !== sLayer) {
+			if (aLayers.length && !aLayers.includes(oChange.getLayer())) {
 				return false;
 			}
 
@@ -989,8 +985,10 @@ sap.ui.define([
 				return false;
 			}
 
-			var vSelector = oChange.getSelector();
-			bChangeValid = oControl.getId() === JsControlTreeModifier.getControlIdBySelector(vSelector, oComponent);
+			if (oControl) {
+				var vSelector = oChange.getSelector();
+				bChangeValid = oControl.getId() === JsControlTreeModifier.getControlIdBySelector(vSelector, oComponent);
+			}
 
 			if (aChangeTypes) {
 				bChangeValid = bChangeValid && aChangeTypes.indexOf(oChange.getChangeType()) !== -1;

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.ChangePersistenceFactory
 	 * @experimental Since 1.27.0
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.96.5
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @experimental Since 1.56
 	 * @since 1.56
-	 * @version 1.96.1
+	 * @version 1.96.5
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -14,7 +14,7 @@ sap.ui.define(function () {
 	 * @alias sap.ui.fl.EventHistory
 	 * @experimental Since 1.47.0
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.96.5
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl.RegistrationDelegator

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -20,7 +20,7 @@ function(
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.96.5
 	 *
 	 * @private
 	 * @static

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -20,7 +20,7 @@ function(
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.96.5
 	 *
 	 * @private
 	 * @static

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.96.5
 	 *
 	 * @private
 	 * @static

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -35,7 +35,7 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	function revertChangesAndUpdateVariantModel(oComponent, aChanges) {
+	function revertChangesAndUpdateVariantModel(oComponent, bSkipUrlUpdate, aChanges) {
 		return Promise.resolve()
 			.then(function () {
 				if (aChanges.length !== 0) {
@@ -59,12 +59,14 @@ sap.ui.define([
 							}
 						});
 
-						URLHandler.update({
-							parameters: [],
-							updateURL: true,
-							updateHashEntry: true,
-							model: oModel
-						});
+						if (!bSkipUrlUpdate) {
+							URLHandler.update({
+								parameters: [],
+								updateURL: true,
+								updateHashEntry: true,
+								model: oModel
+							});
+						}
 					}
 				}
 
@@ -81,7 +83,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.FlexController
 	 * @experimental Since 1.27.0
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.96.5
 	 */
 	var FlexController = function(sComponentName) {
 		this._oChangePersistence = undefined;
@@ -440,21 +442,35 @@ sap.ui.define([
 		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 Promise.resolve();
+	};
+
 	/**
 	 * Saves all changes of a persistence instance.
 	 *
 	 * @param {sap.ui.core.UIComponent} [oAppComponent] - AppComponent instance
 	 * @param {boolean} [bSkipUpdateCache=false] - Indicates the cache should not be updated
 	 * @param {boolean} [bDraft=false] - Indicates if changes should be written as a draft
+	 * @param {string} [sLayer] - Layer for which the changes should be saved
+	 * @param {boolean} [bRemoveOtherLayerChanges=false] - Whether to remove changes on other layers before saving
 	 * @returns {Promise} resolving with an array of responses or rejecting with the first error
 	 * @public
 	 */
-	FlexController.prototype.saveAll = function(oAppComponent, bSkipUpdateCache, bDraft) {
+	FlexController.prototype.saveAll = function(oAppComponent, bSkipUpdateCache, bDraft, sLayer, bRemoveOtherLayerChanges) {
 		var nParentVersion = bDraft ? Versions.getVersionsModel({
 			reference: Utils.normalizeReference(this._sComponentName),
 			layer: Layer.CUSTOMER // only the customer layer has draft active
 		}).getProperty("/persistedVersion") : undefined;
-		return this._oChangePersistence.saveDirtyChanges(oAppComponent, bSkipUpdateCache, undefined, nParentVersion)
+
+		return this._removeOtherLayerChanges(oAppComponent, sLayer, bRemoveOtherLayerChanges)
+			.then(this._oChangePersistence.saveDirtyChanges.bind(this._oChangePersistence, oAppComponent, bSkipUpdateCache, undefined, nParentVersion))
 			.then(function(oResult) {
 				if (bDraft && oResult && oResult.response) {
 					var vChangeDefinition = oResult.response;
@@ -568,23 +584,24 @@ 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));
+			.then(revertChangesAndUpdateVariantModel.bind(this, oComponent, undefined));
 	};
 
 	/**
-	 * Removes unsaved changes and reverts these.
+	 * Removes unsaved changes and reverts these. If no control is provided, all dirty changes are removed.
 	 *
-	 * @param {string} sLayer - Layer for which changes shall be deleted
+	 * @param {string|string[]} vLayer - Layer or multiple layers for which changes shall be deleted
 	 * @param {sap.ui.core.Component} oComponent - Component instance
-	 * @param {sap.ui.core.Control} oControl - Control for which the changes should be removed
+	 * @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(sLayer, oComponent, oControl, sGenerator, aChangeTypes) {
-		return this._oChangePersistence.removeDirtyChanges(sLayer, oComponent, oControl, sGenerator, aChangeTypes)
-			.then(revertChangesAndUpdateVariantModel.bind(this, oComponent));
+	FlexController.prototype.removeDirtyChanges = function(vLayer, oComponent, oControl, sGenerator, aChangeTypes, bSkipUrlUpdate) {
+		return this._oChangePersistence.removeDirtyChanges(vLayer, oComponent, oControl, sGenerator, aChangeTypes)
+			.then(revertChangesAndUpdateVariantModel.bind(this, oComponent, bSkipUrlUpdate));
 	};
 
 	/**

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.FlexControllerFactory
 	 * @experimental Since 1.27.0
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.96.5
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -41,7 +41,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.LayerUtils
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.96.5
 	 */
 	var LayerUtils = {
 		_mLayersIndex: mLayersIndex,

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.96.5
 	 * @experimental Since 1.27.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.core

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.96.5
 	 * @experimental Since 1.43.0
 	 */
 	var RegistrationDelegator = {

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -47,7 +47,7 @@ function(
 	 * @namespace
 	 * @alias sap.ui.fl.Utils
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.96.5
 	 * @experimental Since 1.25.0
 	 */
 	var Utils = {

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @class Variant class.
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.96.5
 	 * @alias sap.ui.fl.Variant
 	 * @experimental Since 1.52.0
 	 */

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.96.5
 	 * @experimental Since 1.27.0
 	 */
 	var XmlPreprocessorImpl = function() {

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -25,7 +25,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.96.5
 	 *
 	 * @experimental Since 1.80 This class is experimental and provides only limited functionality. Also the API might be
 	 *               changed in future.

package/src/sap/ui/fl/apply/_internal/appVariant/DescriptorChangeTypes.js

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -50,7 +50,8 @@ sap.ui.define([
 	function _checkAndAdjustChangeStatusSync(oControl, oChange, mChangesMap, oFlexController, mPropertyBag) {
 		var mControl = Utils.getControlIfTemplateAffected(oChange, oControl, mPropertyBag);
 		var oModifier = mPropertyBag.modifier;
-		var bIsCurrentlyAppliedOnControl = FlexCustomData.sync.hasChangeApplyFinishedCustomData(mControl.control, oChange, oModifier);
+		var bHasAppliedCustomData = !!FlexCustomData.sync.getAppliedCustomDataValue(mControl.control, oChange);
+		var bIsCurrentlyAppliedOnControl = bHasAppliedCustomData || FlexCustomData.sync.hasChangeApplyFinishedCustomData(mControl.control, oChange);
 		var bChangeStatusAppliedFinished = oChange.isApplyProcessFinished();
 		if (bChangeStatusAppliedFinished && !bIsCurrentlyAppliedOnControl) {
 			// if a change was already processed and is not applied anymore, then the control was destroyed and recreated.
@@ -60,9 +61,11 @@ sap.ui.define([
 			oChange.setInitialApplyState();
 		} else if (!bChangeStatusAppliedFinished && bIsCurrentlyAppliedOnControl) {
 			// if a change is already applied on the control, but the status does not reflect that, the status has to be updated
-			// and the revert data fetched from the Custom Data
 			// scenario: viewCache
-			oChange.setRevertData(FlexCustomData.sync.getParsedRevertDataFromCustomData(oControl, oChange));
+			if (bHasAppliedCustomData) {
+				// if the change was applied, set the revert data fetched from the custom data
+				oChange.setRevertData(FlexCustomData.sync.getParsedRevertDataFromCustomData(oControl, oChange));
+			}
 			oChange.markFinished();
 		}
 	}
@@ -75,8 +78,20 @@ sap.ui.define([
 		var bXmlModifier = _isXmlModifier(mPropertyBag);
 		var mControl = Utils.getControlIfTemplateAffected(oChange, oControl, mPropertyBag);
 		var oModifier = mPropertyBag.modifier;
-		return FlexCustomData.hasChangeApplyFinishedCustomData(mControl.control, oChange, oModifier)
-			.then(function (bIsCurrentlyAppliedOnControl) {
+		return FlexCustomData.getAppliedCustomDataValue(mControl.control, oChange, oModifier)
+			.then(function(oAppliedCustomData) {
+				var bHasAppliedCustomData = !!oAppliedCustomData;
+				return Promise.all([
+					bHasAppliedCustomData,
+					(
+						bHasAppliedCustomData
+						|| FlexCustomData.hasChangeApplyFinishedCustomData(mControl.control, oChange, oModifier)
+					)
+				]);
+			})
+			.then(function(aCustomDataState) {
+				var bHasAppliedCustomData = aCustomDataState[0];
+				var bIsCurrentlyAppliedOnControl = aCustomDataState[1];
 				var bChangeStatusAppliedFinished = oChange.isApplyProcessFinished();
 				var oModifier = mPropertyBag.modifier;
 				var oAppComponent = mPropertyBag.appComponent;
@@ -93,13 +108,17 @@ sap.ui.define([
 					return oPromise.then(oChange.setInitialApplyState.bind(oChange));
 				} else if (!bChangeStatusAppliedFinished && bIsCurrentlyAppliedOnControl) {
 					// if a change is already applied on the control, but the status does not reflect that, the status has to be updated
-					// and the revert data fetched from the Custom Data
 					// scenario: viewCache
-					return FlexCustomData.getParsedRevertDataFromCustomData(oControl, oChange, oModifier)
-						.then(function (oParsedRevertDataFromCustomData) {
-							oChange.setRevertData(oParsedRevertDataFromCustomData);
-							oChange.markFinished();
-						});
+					if (bHasAppliedCustomData) {
+						// if the change was applied, set the revert data fetched from the custom data
+						return FlexCustomData.getParsedRevertDataFromCustomData(oControl, oChange, oModifier)
+							.then(function (oParsedRevertDataFromCustomData) {
+								oChange.setRevertData(oParsedRevertDataFromCustomData);
+								oChange.markFinished();
+							});
+					}
+					oChange.markFinished();
+					return undefined;
 				} else if (bChangeStatusAppliedFinished && bIsCurrentlyAppliedOnControl) {
 					// both the change instance and the UI Control are already applied, so the change can be directly marked as finished
 					oChange.markFinished();

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.FlexCustomData
 	 * @experimental Since 1.61.0
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.96.5
 	 */
 	var FlexCustomData = {};
 	FlexCustomData.sync = {};

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.connectors.changes.Utils
 	 * @since 1.70
-	 * @version 1.96.1
+	 * @version 1.96.5
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal, sap.ui.fl.write._internal
 	 */

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

@@ -1,7 +1,7 @@
 
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,7 +1,7 @@
 
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */