@openui5/sap.ui.fl 1.115.1 → 1.117.0

package/.eslintrc.json

@@ -15,10 +15,41 @@
 		"no-multi-spaces": "error",
 		"indent": ["error", "tab", {
 			"SwitchCase": 1,
-			"MemberExpression": "off"
+			"MemberExpression": 0
 		}],
 		"one-var": ["error", "never"],
 		"no-useless-call": "error",
-		"key-spacing": ["error", { "beforeColon": false }]
+		"key-spacing": ["error", { "beforeColon": false }],
+		"default-case": ["error", { "commentPattern": "^skip\\sdefault" }],
+
+		"comma-dangle": ["error", "never"],
+		"max-len": ["warn", {
+			"code": 140,
+			"ignorePattern": "@param|@returns|@description|<|QUnit.test",
+			"ignoreUrls": true
+		}],
+		"space-before-function-paren": ["error", {
+			"anonymous": "never",
+			"named": "never",
+			"asyncArrow": "always"
+		}],
+		"no-multi-assign": ["error", { "ignoreNonDeclaration": true }],
+		"dot-notation": ["error", { "allowKeywords": true }],
+		"spaced-comment": ["error", "always", {
+			"line": {
+				"exceptions": ["-"]
+			},
+			"block": {
+				"markers": ["!"],
+				"exceptions": ["*"],
+				"balanced": true
+			}
+
+		}],
+		"no-multiple-empty-lines": ["error", {"max": 1}],
+		"quotes": ["error", "double", {
+			"avoidEscape": true,
+			"allowTemplateLiterals": true
+		}]
 	}
 }

package/.reuse/dep5

@@ -457,11 +457,6 @@ Comment: these files belong to: UI5 Web Components
 
 # Outside of Libraries:
 
-Files: src/testsuite-utils/src/main/resources/META-INF/less/less.js
-Copyright: 2009-2014, Alexis Sellier <self@cloudhead.net>
-License: Apache-2.0
-Comment: these files belong to: LESS
-
 Files: lib/jsdoc/ui5/plugin.js
 Copyright:
     2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors

package/THIRDPARTY.txt

@@ -460,19 +460,13 @@ Contained in: src/sap.ui.webc.main/src/sap/ui/webc/main/thirdparty/*.*
 
 Outside of Libraries:
 
-Component: LESS, version: 1.6.3
-Copyright: 2009-2014, Alexis Sellier <self@cloudhead.net>
-License: Apache-2.0
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
-Contained in: src/testsuite-utils/src/main/resources/META-INF/less/less.js
-
 Component: JSDoc 3, version: 3.6.7
 Copyright: 2011-present Michael Mathews micmath@gmail.com and the contributors to JSDoc
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: lib/jsdoc/ui5/plugin.js
 
-Component: SAP Theming Base Content, version: 11.3.0
+Component: SAP Theming Base Content, version: 11.4.2
 Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.fl",
-  "version": "1.115.1",
+  "version": "1.117.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.115.1",
-    "@openui5/sap.ui.core": "1.115.1"
+    "@openui5/sap.m": "1.117.0",
+    "@openui5/sap.ui.core": "1.117.0"
   }
 }

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

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

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

@@ -8,13 +8,15 @@ sap.ui.define([
 	"sap/base/util/ObjectPath",
 	"sap/base/Log",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
-	"sap/ui/fl/apply/api/ControlVariantApplyAPI"
+	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
+	"sap/ui/fl/Utils"
 ],
 function(
 	ObjectPath,
 	Log,
 	FlexState,
-	ControlVariantApplyAPI
+	ControlVariantApplyAPI,
+	Utils
 ) {
 	"use strict";
 
@@ -26,7 +28,7 @@ function(
 	 * @alias sap.ui.fl.Cache
 	 * @experimental Since 1.25.0
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl
@@ -63,17 +65,15 @@ function(
 		return ObjectPath.get(vPath, mStorageResponse);
 	}
 
-	function _concatControlVariantIdWithCacheKey(sCacheKey, sControlVariantIds) {
+	function concatControlVariantIdWithCacheKey(sCacheKey, sControlVariantIds) {
 		if (!sControlVariantIds) {
 			return sCacheKey;
 		}
-		return sCacheKey === Cache.NOTAG ?
-			sCacheKey.replace(/>$/, ''.concat('-', sControlVariantIds, '>')) :
-			sCacheKey.concat('-', sControlVariantIds);
+		return sCacheKey.concat("-", sControlVariantIds);
 	}
 
 	function _trimEtag(sCacheKey) {
-		return sCacheKey.replace(/(^W\/|")/g, '');
+		return sCacheKey.replace(/(^W\/|")/g, "");
 	}
 
 	Cache.NOTAG = "<NoTag>";
@@ -104,7 +104,7 @@ function(
 	Cache.getChangesFillingCache = function(mComponent, mPropertyBag, bInvalidateCache) {
 		var oPromise = Promise.resolve();
 		if (bInvalidateCache) {
-			oPromise = FlexState.clearAndInitialize(mPropertyBag);
+			oPromise = FlexState.update(mPropertyBag);
 		}
 
 		return oPromise.then(function() {
@@ -127,38 +127,35 @@ function(
 	 * @ui5-restricted sap.ui.fl
 	 *
 	 */
-	Cache.getCacheKey = function(mComponent, oAppComponent) {
+	Cache.getCacheKey = async function(mComponent, oAppComponent) {
+		let sCacheKey = Cache.NOTAG;
 		if (!mComponent || !mComponent.name || !oAppComponent) {
 			Log.warning("Not all parameters were passed to determine a flexibility cache key.");
-			return Promise.resolve(Cache.NOTAG);
-		}
-		return this.getChangesFillingCache(mComponent)
-			.then(function(oWrappedChangeFileContent) {
-				if (oWrappedChangeFileContent && oWrappedChangeFileContent.cacheKey) {
-					return _trimEtag(oWrappedChangeFileContent.cacheKey);
-				}
-
-				return Cache.NOTAG;
-			})
-			.then(function(sCacheKey) {
-				// concat current control variant ids to cachekey if available
-				var oVariantModel = oAppComponent.getModel(ControlVariantApplyAPI.getVariantModelName());
-				if (!oVariantModel) {
-					return sCacheKey;
-				}
-				// If there are no changes, the standard variant is created after the variant management control is instantiated
-				// When the cache key is calculated before this happens, the standard variant id is unknown
-				// To avoid inconsistencies between page load and navigation scenarios, all standard variants are filtered
-				var aVariantManagementControlIds = oVariantModel.getVariantManagementControlIds();
-				var aCurrentControlVariantIds = oVariantModel.getCurrentControlVariantIds()
+		} else {
+			const oWrappedChangeFileContent = await this.getChangesFillingCache(mComponent);
+			if (oWrappedChangeFileContent && oWrappedChangeFileContent.cacheKey) {
+				sCacheKey = _trimEtag(oWrappedChangeFileContent.cacheKey);
+
+				// Concat current control variant ids to cache key
+				if (Utils.isApplicationComponent(oAppComponent) || Utils.isEmbeddedComponent(oAppComponent)) {
+					const oVariantModel = await ControlVariantApplyAPI.getVariantModel(oAppComponent);
+					// If there are no changes, the standard variant is created after the variant management control is instantiated
+					// When the cache key is calculated before this happens, the standard variant id is unknown
+					// To avoid inconsistencies between page load and navigation scenarios, all standard variants are filtered
+					var aVariantManagementControlIds = oVariantModel.getVariantManagementControlIds();
+					var aCurrentControlVariantIds = oVariantModel.getCurrentControlVariantIds()
 					.filter(function(sVariantId) {
 						// FIXME: The standard variant flag should be part of the variant instance
 						// This can be changed once the variant data selector is ready
 						// For now rely on the fact that standard variants have the same name as the vm control
 						return !aVariantManagementControlIds.includes(sVariantId);
 					});
-				return _concatControlVariantIdWithCacheKey(sCacheKey, aCurrentControlVariantIds.join("-"));
-			});
+					sCacheKey = concatControlVariantIdWithCacheKey(sCacheKey, aCurrentControlVariantIds.join("-"));
+				}
+			}
+		}
+
+		return sCacheKey;
 	};
 
 	/**

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

@@ -66,7 +66,7 @@ sap.ui.define([
 	 *
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 * @experimental Since 1.25.0
 	 * @param {object} mComponent - Component data to initiate <code>ChangePersistence</code> instance
 	 * @param {string} mComponent.name - Name of the component this instance is responsible for
@@ -77,7 +77,7 @@ sap.ui.define([
 		this._mChanges = DependencyHandler.createEmptyDependencyMap();
 		this._bChangesMapCreated = false;
 
-		//_mChangesInitial contains a clone of _mChanges to recreated dependencies if changes need to be reapplied
+		// _mChangesInitial contains a clone of _mChanges to recreated dependencies if changes need to be reapplied
 		this._mChangesInitial = merge({}, this._mChanges);
 
 		if (!this._mComponent || !this._mComponent.name) {
@@ -170,7 +170,7 @@ sap.ui.define([
 	/**
 	 * Calls the back end asynchronously and fetches all changes for the component
 	 * New changes (dirty state) that are not yet saved to the back end won't be returned.
-	 * @param {map} mPropertyBag Contains additional data needed for reading changes
+	 * @param {object} mPropertyBag Contains additional data needed for reading changes
 	 * @param {object} [mPropertyBag.appDescriptor] Manifest that belongs to the current running component
 	 * @param {string} [mPropertyBag.siteId] ID of the site belonging to the current running component
 	 * @param {string} [mPropertyBag.currentLayer] Specifies a single layer for loading changes. If this parameter is set, the max layer filtering is not applied
@@ -185,65 +185,65 @@ sap.ui.define([
 	 */
 	ChangePersistence.prototype.getChangesForComponent = function(mPropertyBag, bInvalidateCache) {
 		return Utils.getUShellService("URLParsing")
-			.then(function(oURLParsingService) {
-				this._oUShellURLParsingService = oURLParsingService;
-				return Cache.getChangesFillingCache(this._mComponent, mPropertyBag, bInvalidateCache);
-			}.bind(this))
-			.then(function(mPropertyBag, oWrappedChangeFileContent) {
-				var oChangeFileContent = merge({}, oWrappedChangeFileContent);
-				var oAppComponent = mPropertyBag && mPropertyBag.component && Utils.getAppComponentForControl(mPropertyBag.component);
-
-				var bHasFlexObjects = StorageUtils.isStorageResponseFilled(oChangeFileContent.changes);
-
-				if (!bHasFlexObjects) {
-					return [];
-				}
+		.then(function(oURLParsingService) {
+			this._oUShellURLParsingService = oURLParsingService;
+			return Cache.getChangesFillingCache(this._mComponent, mPropertyBag, bInvalidateCache);
+		}.bind(this))
+		.then(function(mPropertyBag, oWrappedChangeFileContent) {
+			var oChangeFileContent = merge({}, oWrappedChangeFileContent);
+			var oAppComponent = mPropertyBag && mPropertyBag.component && Utils.getAppComponentForControl(mPropertyBag.component);
+
+			var bHasFlexObjects = StorageUtils.isStorageResponseFilled(oChangeFileContent.changes);
 
-				var aChanges = oChangeFileContent.changes.changes;
-
-				//Binds a json model of message bundle to the component the first time a change within the vendor layer was detected
-				//It enables the translation of changes
-				if (!this._oMessagebundle && oChangeFileContent.messagebundle && oAppComponent) {
-					if (!oAppComponent.getModel("i18nFlexVendor")) {
-						if (aChanges.some(function(oChange) {
-							return oChange.layer === Layer.VENDOR;
-						})) {
-							this._oMessagebundle = oChangeFileContent.messagebundle;
-							var oModel = new JSONModel(this._oMessagebundle);
-							oAppComponent.setModel(oModel, "i18nFlexVendor");
-						}
+			if (!bHasFlexObjects) {
+				return [];
+			}
+
+			var aChanges = oChangeFileContent.changes.changes;
+
+			// Binds a json model of message bundle to the component the first time a change within the vendor layer was detected
+			// It enables the translation of changes
+			if (!this._oMessagebundle && oChangeFileContent.messagebundle && oAppComponent) {
+				if (!oAppComponent.getModel("i18nFlexVendor")) {
+					if (aChanges.some(function(oChange) {
+						return oChange.layer === Layer.VENDOR;
+					})) {
+						this._oMessagebundle = oChangeFileContent.messagebundle;
+						var oModel = new JSONModel(this._oMessagebundle);
+						oAppComponent.setModel(oModel, "i18nFlexVendor");
 					}
 				}
+			}
 
-				var sCurrentLayer = mPropertyBag && mPropertyBag.currentLayer;
-				var bFilterMaxLayer = !(mPropertyBag && mPropertyBag.ignoreMaxLayerParameter);
-				var fnFilter = function() { return true; };
-				if (sCurrentLayer) {
-					aChanges = LayerUtils.filterChangeOrChangeDefinitionsByCurrentLayer(aChanges, sCurrentLayer);
-				} else if (LayerUtils.isLayerFilteringRequired(this._oUShellURLParsingService) && bFilterMaxLayer) {
-					fnFilter = filterChangeForMaxLayer.bind(this);
-					//If layer filtering required, excludes changes in higher layer than the max layer
-					aChanges = aChanges.filter(fnFilter);
-				} else if (this._bHasChangesOverMaxLayer && !bFilterMaxLayer) {
-					// ignoreMaxLayerParameter = true is set from flexController.hasHigherLayerChanges(),
-					// triggered by rta.stop(), to check if reload needs to be performed
-					// as ctrl variant changes are already gone and to improve performance, just return the constant
-					this._bHasChangesOverMaxLayer = false;
-					return this.HIGHER_LAYER_CHANGES_EXIST;
-				}
+			var sCurrentLayer = mPropertyBag && mPropertyBag.currentLayer;
+			var bFilterMaxLayer = !(mPropertyBag && mPropertyBag.ignoreMaxLayerParameter);
+			var fnFilter = function() { return true; };
+			if (sCurrentLayer) {
+				aChanges = LayerUtils.filterChangeOrChangeDefinitionsByCurrentLayer(aChanges, sCurrentLayer);
+			} else if (LayerUtils.isLayerFilteringRequired(this._oUShellURLParsingService) && bFilterMaxLayer) {
+				fnFilter = filterChangeForMaxLayer.bind(this);
+				// If layer filtering required, excludes changes in higher layer than the max layer
+				aChanges = aChanges.filter(fnFilter);
+			} else if (this._bHasChangesOverMaxLayer && !bFilterMaxLayer) {
+				// ignoreMaxLayerParameter = true is set from flexController.hasHigherLayerChanges(),
+				// triggered by rta.stop(), to check if reload needs to be performed
+				// as ctrl variant changes are already gone and to improve performance, just return the constant
+				this._bHasChangesOverMaxLayer = false;
+				return this.HIGHER_LAYER_CHANGES_EXIST;
+			}
 
-				var bIncludeControlVariants = oChangeFileContent.changes && mPropertyBag && mPropertyBag.includeCtrlVariants;
-				var aFilteredVariantChanges = this._getAllCtrlVariantChanges(oChangeFileContent, bIncludeControlVariants, fnFilter);
-				aChanges = aChanges.concat(aFilteredVariantChanges);
+			var bIncludeControlVariants = oChangeFileContent.changes && mPropertyBag && mPropertyBag.includeCtrlVariants;
+			var aFilteredVariantChanges = this._getAllCtrlVariantChanges(oChangeFileContent, bIncludeControlVariants, fnFilter);
+			aChanges = aChanges.concat(aFilteredVariantChanges);
 
-				return this._checkAndGetChangeInstances(aChanges, oChangeFileContent);
-			}.bind(this, mPropertyBag));
+			return this._checkAndGetChangeInstances(aChanges, oChangeFileContent);
+		}.bind(this, mPropertyBag));
 	};
 
 	ChangePersistence.prototype._checkAndGetChangeInstances = function(aChanges, oChangeFileContent) {
 		return aChanges
-			.filter(preconditionsFulfilled)
-			.map(getChangeInstance.bind(this, oChangeFileContent));
+		.filter(preconditionsFulfilled)
+		.map(getChangeInstance.bind(this, oChangeFileContent));
 	};
 
 	function filterChangeForMaxLayer(oChangeOrChangeContent) {
@@ -274,13 +274,13 @@ sap.ui.define([
 			return VariantManagementState.getInitialChanges({reference: this._mComponent.name});
 		}
 		return ["variants", "variantChanges", "variantDependentControlChanges", "variantManagementChanges"]
-			.reduce(function(aResult, sVariantChangeType) {
-				if (oChangeFileContent.changes[sVariantChangeType]) {
-					return aResult.concat(oChangeFileContent.changes[sVariantChangeType]);
-				}
-				return aResult;
-			}, [])
-			.filter(fnFilter);
+		.reduce(function(aResult, sVariantChangeType) {
+			if (oChangeFileContent.changes[sVariantChangeType]) {
+				return aResult.concat(oChangeFileContent.changes[sVariantChangeType]);
+			}
+			return aResult;
+		}, [])
+		.filter(fnFilter);
 	};
 
 	/**
@@ -295,7 +295,7 @@ sap.ui.define([
 
 		function createChangeMap(aChanges) {
 			Measurement.start("fl.createDependencyMap", "Measurement of creating initial dependency map");
-			//Since starting RTA does not recreate ChangePersistence instance, resets changes map is required to filter personalized changes
+			// Since starting RTA does not recreate ChangePersistence instance, resets changes map is required to filter personalized changes
 			this._mChanges = DependencyHandler.createEmptyDependencyMap();
 
 			aChanges.forEach(this.addChangeAndUpdateDependencies.bind(this, oAppComponent));
@@ -396,7 +396,7 @@ sap.ui.define([
 
 	/**
 	 * Getter for the private aggregation containing sap.ui.fl.apply._internal.flexObjects.FlexObject objects mapped by their selector ids.
-	 * @return {map} mChanges mapping with changes sorted by their selector ids
+	 * @return {Object<string,object>} mChanges mapping with changes sorted by their selector ids
 	 * @public
 	 */
 	ChangePersistence.prototype.getChangesMapForComponent = function() {
@@ -405,7 +405,7 @@ sap.ui.define([
 
 	/**
 	 * Returns all changes that are currently loaded for the component.
-	 * @param {map} mPropertyBag - Contains additional data needed for reading changes
+	 * @param {object} mPropertyBag - Contains additional data needed for reading changes
 	 * @param {string} [mPropertyBag.layer] - Specifies a single layer for loading changes
 	 * @param {boolean} [mPropertyBag.includeDirtyChanges] - Whether dirty changes of the current session should be included
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} Array of changes
@@ -415,7 +415,7 @@ sap.ui.define([
 		var aChanges = union(
 			this.getChangesMapForComponent().aChanges,
 			mPropertyBag.includeDirtyChanges && this.getDirtyChanges()
-		).filter(function (oChange) {
+		).filter(function(oChange) {
 			return (
 				Boolean(oChange)
 				&& oChange.getFileType() === "change"
@@ -448,7 +448,7 @@ sap.ui.define([
 	 * view1
 	 * view1--view2--view3
 	 *
-	 * @param {map} mPropertyBag contains additional data that are needed for reading of changes
+	 * @param {object} mPropertyBag contains additional data that are needed for reading of changes
 	 * @param {string} mPropertyBag.viewId - id of the view
 	 * @param {string} mPropertyBag.name - name of the view
 	 * @param {sap.ui.core.Component} mPropertyBag.appComponent - Application component for the view
@@ -463,6 +463,12 @@ sap.ui.define([
 		});
 	};
 
+	function finalizeChangeCreation(oChange, oAppComponent) {
+		this._addRunTimeCreatedChangeAndUpdateDependencies(oAppComponent, oChange);
+		this._mChangesEntries[oChange.getId()] = oChange;
+		this._addPropagationListener(oAppComponent);
+	}
+
 	/**
 	 * Adds a new change and returns the id of the new change.
 	 *
@@ -473,20 +479,35 @@ sap.ui.define([
 	 */
 	ChangePersistence.prototype.addChange = function(vChange, oAppComponent) {
 		var oChange = this.addDirtyChange(vChange);
-		this._addRunTimeCreatedChangeAndUpdateDependencies(oAppComponent, oChange);
-		this._mChangesEntries[oChange.getId()] = oChange;
-		this._addPropagationListener(oAppComponent);
+		finalizeChangeCreation.call(this, oChange, oAppComponent);
 		return oChange;
 	};
 
+	/**
+	 * Adds new changes and returns the ids of the new changes.
+	 *
+	 * @param {object[]} aChanges - Array with complete and finalized JSON object representation the file content of the changes or Change instances
+	 * @param {sap.ui.core.Component} oAppComponent - Application component instance
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} the newly created changes
+	 * @public
+	 */
+	ChangePersistence.prototype.addChanges = function(aChanges, oAppComponent) {
+		var aNewChanges = this.addDirtyChanges(aChanges);
+		aNewChanges.forEach(function(oChange) {
+			finalizeChangeCreation.call(this, oChange, oAppComponent);
+		}.bind(this));
+		return aNewChanges;
+	};
+
 	/**
 	 * Adds a new dirty change.
 	 *
 	 * @param {object} vChange - JSON object of change or change object
+	 * @param {boolean} [bSkipAddToState] - If set to true, the change won't be added to the FlexState
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject} The prepared change object
 	 * @public
 	 */
-	ChangePersistence.prototype.addDirtyChange = function(vChange) {
+	ChangePersistence.prototype.addDirtyChange = function(vChange, bSkipAddToState) {
 		var oNewChange;
 		if (typeof vChange.isA === "function" && vChange.isA("sap.ui.fl.apply._internal.flexObjects.FlexObject")) {
 			oNewChange = vChange;
@@ -497,11 +518,28 @@ sap.ui.define([
 		// don't add the same change twice
 		if (this._aDirtyChanges.indexOf(oNewChange) === -1) {
 			this._aDirtyChanges.push(oNewChange);
-			FlexState.addDirtyFlexObject(this._mComponent.name, oNewChange);
+			if (!bSkipAddToState) {
+				FlexState.addDirtyFlexObject(this._mComponent.name, oNewChange);
+			}
 		}
 		return oNewChange;
 	};
 
+	/**
+	 * Adds new dirty changes.
+	 *
+	 * @param {object[]} aChanges - JSON objects of changes or change objects
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} The prepared change objects
+	 * @public
+	 */
+	ChangePersistence.prototype.addDirtyChanges = function(aChanges) {
+		var aNewChanges = aChanges.map(function(oChange) {
+			return this.addDirtyChange(oChange, true);
+		}.bind(this));
+		FlexState.addDirtyFlexObjects(this._mComponent.name, aNewChanges);
+		return aNewChanges;
+	};
+
 	/**
 	 * If the first changes were created, the <code>propagationListener</code> of <code>sap.ui.fl</code> might not yet
 	 * be attached to the application component and must be added then.
@@ -728,7 +766,7 @@ sap.ui.define([
 		if (sParentVersion) {
 			// in case of changes saved for a draft only the first writing operation must have the parentVersion targeting the basis
 			// followup changes must point the the existing draft created with the first request
-			var aNewChanges = aDirtyChanges.filter(function (oChange) {
+			var aNewChanges = aDirtyChanges.filter(function(oChange) {
 				return oChange.getState() === States.LifecycleState.NEW;
 			});
 			oFirstNewChange = [].concat(aNewChanges).shift();
@@ -736,8 +774,8 @@ sap.ui.define([
 
 		return aDirtyChanges.reduce(function(oPreviousPromise, oDirtyChange) {
 			return oPreviousPromise
-				.then(performSingleSaveAction.bind(undefined, oDirtyChange, oFirstNewChange, sParentVersion))
-				.then(this._updateCacheAndDirtyState.bind(this, oDirtyChange, bSkipUpdateCache));
+			.then(performSingleSaveAction.bind(undefined, oDirtyChange, oFirstNewChange, sParentVersion))
+			.then(this._updateCacheAndDirtyState.bind(this, oDirtyChange, bSkipUpdateCache));
 		}.bind(this), Promise.resolve());
 	};
 
@@ -779,14 +817,12 @@ sap.ui.define([
 		if (!bSkipUpdateCache) {
 			switch (oDirtyChange.getState()) {
 				case States.LifecycleState.NEW:
-					oDirtyChange.setState(States.LifecycleState.PERSISTED);
 					Cache.addChange(this._mComponent, oDirtyChange.convertToFileContent());
 					break;
 				case States.LifecycleState.DELETED:
 					Cache.deleteChange(this._mComponent, oDirtyChange.convertToFileContent());
 					break;
 				case States.LifecycleState.DIRTY:
-					oDirtyChange.setState(States.LifecycleState.PERSISTED);
 					Cache.updateChange(this._mComponent, oDirtyChange.convertToFileContent());
 					break;
 				default:
@@ -857,8 +893,9 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange the change to be deleted
 	 * @param {boolean} [bRunTimeCreatedChange] set if the change was created at runtime
+	 * @param {boolean} [bSkipRemoveFromFlexState] set if the change should not be removed from the FlexState
 	 */
-	ChangePersistence.prototype.deleteChange = function(oChange, bRunTimeCreatedChange) {
+	ChangePersistence.prototype.deleteChange = function(oChange, bRunTimeCreatedChange, bSkipRemoveFromFlexState) {
 		var nIndexInDirtyChanges = this._aDirtyChanges.indexOf(oChange);
 
 		if (nIndexInDirtyChanges > -1) {
@@ -866,7 +903,9 @@ sap.ui.define([
 				return;
 			}
 			this._aDirtyChanges.splice(nIndexInDirtyChanges, 1);
-			FlexState.removeDirtyFlexObject(this._mComponent.name, oChange);
+			if (!bSkipRemoveFromFlexState) {
+				FlexState.removeDirtyFlexObject(this._mComponent.name, oChange);
+			}
 			this._deleteChangeInMap(oChange, bRunTimeCreatedChange);
 			return;
 		}
@@ -876,6 +915,22 @@ sap.ui.define([
 		this._deleteChangeInMap(oChange, bRunTimeCreatedChange);
 	};
 
+	/**
+	 * Prepares multiple changes to be deleted with the next call to
+	 * @see {ChangePersistence#saveDirtyChanges};
+	 *
+	 * Removal from the FlexState happens in one go to trigger only one invalidation.
+	 *
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} aChanges the changes to be deleted
+	 * @param {boolean} [bRunTimeCreatedChanges] set if the change was created at runtime
+	 */
+	ChangePersistence.prototype.deleteChanges = function(aChanges, bRunTimeCreatedChanges) {
+		aChanges.forEach(function(oChange) {
+			this.deleteChange(oChange, bRunTimeCreatedChanges, true);
+		}.bind(this));
+		FlexState.removeDirtyFlexObjects(this._mComponent.name, aChanges);
+	};
+
 	ChangePersistence.prototype.removeChange = function(oChange) {
 		var nIndexInDirtyChanges = this._aDirtyChanges.indexOf(oChange);
 
@@ -935,7 +990,7 @@ sap.ui.define([
 
 			return Storage.publish({
 				transportDialogSettings: {
-					rootControl: oRootControl, //TODO not used value, should be removed.
+					rootControl: oRootControl, // TODO not used value, should be removed.
 					styleClass: sStyleClass
 				},
 				layer: sLayer,
@@ -974,7 +1029,7 @@ sap.ui.define([
 		var aLayers = [].concat(vLayer || []);
 		var aDirtyChanges = this._aDirtyChanges;
 
-		var aChangesToBeRemoved = aDirtyChanges.filter(function (oChange) {
+		var aChangesToBeRemoved = aDirtyChanges.filter(function(oChange) {
 			var bChangeValid = true;
 
 			if (aLayers.length && !aLayers.includes(oChange.getLayer())) {
@@ -997,11 +1052,11 @@ sap.ui.define([
 			return bChangeValid;
 		});
 
-		aChangesToBeRemoved.forEach(function (oChange) {
+		FlexState.removeDirtyFlexObjects(this._mComponent.name, aChangesToBeRemoved);
+		aChangesToBeRemoved.forEach(function(oChange) {
 			var nIndex = aDirtyChanges.indexOf(oChange);
 			aDirtyChanges.splice(nIndex, 1);
-			FlexState.removeDirtyFlexObject(this._mComponent.name, oChange);
-		}.bind(this));
+		});
 
 		return Promise.resolve(aChangesToBeRemoved);
 	};
@@ -1023,7 +1078,7 @@ sap.ui.define([
 		var bSelectorIdsProvided = aSelectorIds && aSelectorIds.length > 0;
 		var bChangeTypesProvided = aChangeTypes && aChangeTypes.length > 0;
 
-		//In case of application reset and PUBLIC layer available, also includes comp variant entities
+		// In case of application reset and PUBLIC layer available, also includes comp variant entities
 		var isPublicLayerAvailable = Settings.getInstanceOrUndef() && Settings.getInstanceOrUndef().isPublicLayerAvailable();
 		var isApplicationReset = sGenerator === undefined && aSelectorIds === undefined && aChangeTypes === undefined;
 		var aCompVariantsEntries = [];
@@ -1052,11 +1107,11 @@ sap.ui.define([
 		}.bind(this))
 		.then(function(oResponse) {
 			var aChangesToRevert = [];
-			//If reset changes for control, returns an array of deleted changes for reverting
+			// If reset changes for control, returns an array of deleted changes for reverting
 			if (aSelectorIds || aChangeTypes) {
 				var aNames = [];
 				if (oResponse && oResponse.response && oResponse.response.length > 0) {
-					oResponse.response.forEach(function (oChangeContentId) {
+					oResponse.response.forEach(function(oChangeContentId) {
 						aNames.push(oChangeContentId.fileName);
 					});
 				}

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

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.ChangePersistenceFactory
 	 * @experimental Since 1.27.0
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */