@openui5/sap.ui.fl 1.94.0 → 1.97.0

package/.reuse/dep5

@@ -309,7 +309,7 @@ License: MIT
 Comment: these files belong to: lodash
 
 Files: src/sap.ui.core/src/sap/ui/thirdparty/hyphenopoly/*
-Copyright: 2018 Mathias Nater
+Copyright: 2021 Mathias Nater
 License: MIT
 Comment: these files belong to: Hyphenopoly
 
@@ -347,11 +347,6 @@ Copyright: 2013 Ariya Hidayat and other contributors
 License: BSD-2-Clause
 Comment: these files belong to: Esprima
 
-Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/google-code-prettify/*
-Copyright: 2006 Google Inc.
-License: Apache-2.0
-Comment: these files belong to: google-code-prettify
-
 Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/highlight.js/*
 Copyright: 2006-2020, Ivan Sagalaev
 License: BSD-3-Clause
@@ -405,6 +400,11 @@ Copyright: 2014 Vitaly Puzrin, Alex Kocharin
 License: MIT
 Comment: these files belong to: Markdown-it
 
+Files: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
+Copyright: 2015-2017 Evgeny Poberezkin
+License: MIT
+Comment: these files belong to: ajv
+
 
 # Library: sap.ui.mdc:
 
@@ -418,7 +418,7 @@ Comment: these files contain content from SAP and BooleanExpressionEvaluator: Bo
 
 # Library: sap.ui.webc.common:
 
-Files: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theme-base/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/localization/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.*
+Files: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theming/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/localization/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-business-suite/*.*
 Copyright: SAP
 License: Apache-2.0
 Comment: these files belong to: UI5 Web Components
@@ -452,11 +452,6 @@ Copyright: 2009-2014, Alexis Sellier <self@cloudhead.net>
 License: Apache-2.0
 Comment: these files belong to: LESS
 
-Files: ../test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
-Copyright: 2015-2017 Evgeny Poberezkin
-License: MIT
-Comment: these files belong to: ajv
-
 Files: lib/jsdoc/ui5/plugin.js
 Copyright:
     2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
@@ -464,3 +459,8 @@ Copyright:
 License: Apache-2.0
 Comment: these files contain content from SAP and JSDoc 3: plugin.js is overall written by SAP, but contains code taken from JSDoc 3.6.7 (see the respective comments)
 
+Files: src/sap.ui.core/src/sap/ui/core/themes/base/base.less src/themelib_sap_belize/src/sap/ui/core/themes/*/base.less src/themelib_sap_fiori_3/src/sap/ui/core/themes/*/base.less src/themelib_sap_horizon/src/sap/ui/core/themes/*/base.less
+Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
+License: Apache-2.0
+Comment: these files belong to: SAP Theming Base Content
+

package/THIRDPARTY.txt

@@ -6,7 +6,7 @@ The full text of all referenced licenses is appended at the end of this file.
 
 Library: sap.ui.codeeditor:
 
-Component: Ace (Ajax.org Cloud9 Editor), version: 1.4.4
+Component: Ace (Ajax.org Cloud9 Editor), version: 1.4.13
 Copyright: 2010, Ajax.org B.V.
 License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
@@ -197,7 +197,7 @@ License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/sinon-qunit.js
 
-Component: URI.js, version: 1.19.6
+Component: URI.js, version: 1.19.7
 Copyright: Rodney Rehm
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
@@ -279,8 +279,8 @@ License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/base/util/restricted/_/lodash.custom.js
 
-Component: Hyphenopoly, version: 2.4.0
-Copyright: 2018 Mathias Nater
+Component: Hyphenopoly, version: 3.4.0
+Copyright: 2021 Mathias Nater
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/hyphenopoly/*
@@ -324,12 +324,6 @@ License: BSD-2-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-2-Clause.txt
 Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/esprima.js
 
-Component: google-code-prettify, version: 20130304
-Copyright: 2006 Google Inc.
-License: Apache-2.0
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
-Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/google-code-prettify/*
-
 Component: highlight.js, version: 10.4.1
 Copyright: 2006-2020, Ivan Sagalaev
 License: BSD-3-Clause
@@ -395,6 +389,12 @@ License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/markdown-it.js
 
+Component: ajv, version: 6.12.3
+Copyright: 2015-2017 Evgeny Poberezkin
+License: MIT
+License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
+Contained in: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
+
 
 Library: sap.ui.mdc:
 
@@ -412,10 +412,11 @@ Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.*
-	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theme-base/*.*
+	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theming/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/localization/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.*
+	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-business-suite/*.*
 
 Component: lit-html, version: 1.4.1
 Copyright: Google LLC
@@ -450,18 +451,21 @@ 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: ajv, version: 6.12.3
-Copyright: 2015-2017 Evgeny Poberezkin
-License: MIT
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: ../test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.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.1.34
+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
+Contained in: src/sap.ui.core/src/sap/ui/core/themes/base/base.less
+	src/themelib_sap_belize/src/sap/ui/core/themes/*/base.less
+	src/themelib_sap_fiori_3/src/sap/ui/core/themes/*/base.less
+	src/themelib_sap_horizon/src/sap/ui/core/themes/*/base.less
+
 
 ALL LICENSE TEXTS:
 ==================

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.fl",
-  "version": "1.94.0",
+  "version": "1.97.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.94.0",
-    "@openui5/sap.ui.core": "1.94.0"
+    "@openui5/sap.m": "1.97.0",
+    "@openui5/sap.ui.core": "1.97.0"
   }
 }

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

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

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

@@ -24,7 +24,7 @@ function(
 	 * @alias sap.ui.fl.Cache
 	 * @experimental Since 1.25.0
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

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

@@ -13,6 +13,7 @@ sap.ui.define([
 	"sap/ui/fl/registry/Settings",
 	"sap/base/Log",
 	"sap/ui/fl/apply/_internal/appVariant/DescriptorChangeTypes",
+	"sap/ui/fl/apply/_internal/flexObjects/States",
 	"sap/base/util/includes"
 ], function (
 	jQuery,
@@ -23,6 +24,7 @@ sap.ui.define([
 	Settings,
 	Log,
 	DescriptorChangeTypes,
+	States,
 	includes
 ) {
 	"use strict";
@@ -76,10 +78,10 @@ sap.ui.define([
 	});
 
 	Change.states = {
-		NEW: "NEW",
-		PERSISTED: "NONE",
-		DELETED: "DELETE",
-		DIRTY: "UPDATE"
+		NEW: States.NEW,
+		PERSISTED: States.PERSISTED,
+		DELETED: States.DELETED,
+		DIRTY: States.DIRTY
 	};
 
 	Change.applyState = {
@@ -815,16 +817,6 @@ sap.ui.define([
 		return (this._bUserDependent);
 	};
 
-	/**
-	 * Returns the pending action on the change item.
-	 * @returns {string} One of the following values: DELETE/NEW/UPDATE/NONE
-	 *
-	 * @public
-	 */
-	Change.prototype.getPendingAction = function () {
-		return this.getState();
-	};
-
 	/**
 	 * Gets the JSON definition of the change.
 	 * @returns {object} Content of the change file
@@ -948,6 +940,15 @@ sap.ui.define([
 		return oModifier.bySelector(oDependentSelector, oAppComponent, mPropertyBag.view);
 	};
 
+	/**
+	 * Returns the 'originalSelector' from the dependent selectors. This is only set in case of changes on a template.
+	 *
+	 * @returns {sap.ui.fl.selector} the original selector if available
+	 */
+	Change.prototype.getOriginalSelector = function() {
+		return this.getDefinition().dependentSelector && this.getDefinition().dependentSelector.originalSelector;
+	};
+
 	/**
 	 * Returns all dependent selectors, including the selector from the selector of the change.
 	 *
@@ -1034,6 +1035,9 @@ sap.ui.define([
 	 * @public
 	 */
 	Change.prototype.setRevertData = function(vData) {
+		if (vData === undefined) {
+			throw new Error("Change cannot be applied in XML as revert data is not available yet. Retrying in JS.");
+		}
 		this._vRevertData = vData;
 	};
 

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

@@ -138,13 +138,13 @@ sap.ui.define([
 	ChangePersistence.prototype._preconditionsFulfilled = function(oChangeOrChangeContent) {
 		var oChangeContent = oChangeOrChangeContent instanceof Change ? oChangeOrChangeContent.getDefinition() : oChangeOrChangeContent;
 
-		function _isControlVariantChange() {
+		function isControlVariantChange() {
 			if ((oChangeContent.fileType === "ctrl_variant") || (oChangeContent.fileType === "ctrl_variant_change") || (oChangeContent.fileType === "ctrl_variant_management_change")) {
 				return oChangeContent.variantManagementReference || oChangeContent.variantReference || (oChangeContent.selector && oChangeContent.selector.id);
 			}
 		}
 
-		return oChangeContent.fileType === "change" || _isControlVariantChange();
+		return oChangeContent.fileType === "change" || isControlVariantChange();
 	};
 
 	/**
@@ -164,55 +164,60 @@ sap.ui.define([
 	 * @public
 	 */
 	ChangePersistence.prototype.getChangesForComponent = function(mPropertyBag, bInvalidateCache) {
-		return Cache.getChangesFillingCache(this._mComponent, mPropertyBag, bInvalidateCache).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 [];
-			}
+		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 [];
+				}
 
-			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 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() && bFilterMaxLayer) {
-				fnFilter = this._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 = this._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) {
@@ -222,7 +227,7 @@ sap.ui.define([
 	};
 
 	ChangePersistence.prototype._filterChangeForMaxLayer = function(oChangeOrChangeContent) {
-		if (LayerUtils.isOverMaxLayer(this._getLayerFromChangeOrChangeContent(oChangeOrChangeContent))) {
+		if (LayerUtils.isOverMaxLayer(this._getLayerFromChangeOrChangeContent(oChangeOrChangeContent), this._oUShellURLParsingService)) {
 			if (!this._bHasChangesOverMaxLayer) {
 				this._bHasChangesOverMaxLayer = true;
 			}
@@ -414,7 +419,7 @@ sap.ui.define([
 	 * @param {map} 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 {Promise} Promise resolving with an array of changes
+	 * @returns {sap.ui.fl.Change[]} Array of changes
 	 * @public
 	 */
 	ChangePersistence.prototype.getAllUIChanges = function(mPropertyBag) {
@@ -654,6 +659,7 @@ sap.ui.define([
 	 * @param {boolean} [bSkipUpdateCache] - If true, then the dirty change shall be saved for the new created app variant, but not for the current app;
 	 * therefore, the cache update of the current app is skipped because the dirty change is not saved for the running app.
 	 * @param {sap.ui.fl.Change} [aChanges] - If passed only those changes are saved
+	 * @param {number} nParentVersion - Parent version
 	 * @returns {Promise} Resolving after all changes have been saved
 	 */
 	ChangePersistence.prototype.saveDirtyChanges = function(oAppComponent, bSkipUpdateCache, aChanges, nParentVersion) {
@@ -667,9 +673,9 @@ sap.ui.define([
 		var aChangesClone = aAllChanges.slice(0);
 		var aDirtyChangesClone = aDirtyChanges.slice(0);
 		var aRequests = this._getRequests(aDirtyChanges);
-		var aPendingActions = this._getPendingActions(aDirtyChanges);
+		var aStates = this._getStates(aDirtyChanges);
 
-		if (aPendingActions.length === 1 && aRequests.length === 1 && aPendingActions[0] === Change.states.NEW) {
+		if (aStates.length === 1 && aRequests.length === 1 && aStates[0] === Change.states.NEW) {
 			var oCondensedChangesPromise = Promise.resolve(aChangesClone);
 			if (shouldCondensingBeEnabled(oAppComponent, aChangesClone)) {
 				oCondensedChangesPromise = Condenser.condense(oAppComponent, aChangesClone);
@@ -726,7 +732,7 @@ sap.ui.define([
 			// 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) {
-				return oChange.getPendingAction() === "NEW";
+				return oChange.getState() === Change.states.NEW;
 			});
 			oFirstNewChange = [].concat(aNewChanges).shift();
 		}
@@ -740,24 +746,23 @@ sap.ui.define([
 
 	ChangePersistence.prototype._performSingleSaveAction = function(oDirtyChange, oFirstChange, nParentVersion) {
 		return function() {
-			if (oDirtyChange.getPendingAction() === "NEW") {
-				if (nParentVersion !== undefined) {
-					nParentVersion = oDirtyChange === oFirstChange ? nParentVersion : sap.ui.fl.Versions.Draft;
-				}
-				return Storage.write({
-					layer: oDirtyChange.getLayer(),
-					flexObjects: [oDirtyChange.getDefinition()],
-					transport: oDirtyChange.getRequest(),
-					parentVersion: nParentVersion
-				});
-			}
-
-			if (oDirtyChange.getPendingAction() === "DELETE") {
-				return Storage.remove({
-					flexObject: oDirtyChange.getDefinition(),
-					layer: oDirtyChange.getLayer(),
-					transport: oDirtyChange.getRequest()
-				});
+			switch (oDirtyChange.getState()) {
+				case Change.states.NEW:
+					if (nParentVersion !== undefined) {
+						nParentVersion = oDirtyChange === oFirstChange ? nParentVersion : sap.ui.fl.Versions.Draft;
+					}
+					return Storage.write({
+						layer: oDirtyChange.getLayer(),
+						flexObjects: [oDirtyChange.getDefinition()],
+						transport: oDirtyChange.getRequest(),
+						parentVersion: nParentVersion
+					});
+				case Change.states.DELETED:
+					return Storage.remove({
+						flexObject: oDirtyChange.getDefinition(),
+						layer: oDirtyChange.getLayer(),
+						transport: oDirtyChange.getRequest()
+					});
 			}
 		};
 	};
@@ -775,14 +780,20 @@ sap.ui.define([
 					reference: this._mComponent.name,
 					changeToBeAddedOrDeleted: oDirtyChange
 				});
-			} else if (oDirtyChange.getPendingAction() === Change.states.NEW) {
-				oDirtyChange.setState(Change.states.PERSISTED);
-				Cache.addChange(this._mComponent, oDirtyChange.getDefinition());
-			} else if (oDirtyChange.getPendingAction() === Change.states.DELETED) {
-				Cache.deleteChange(this._mComponent, oDirtyChange.getDefinition());
-			} else if (oDirtyChange.getPendingAction() === Change.states.DIRTY) {
-				oDirtyChange.setState(Change.states.PERSISTED);
-				Cache.updateChange(this._mComponent, oDirtyChange.getDefinition());
+			} else {
+				switch (oDirtyChange.getState()) {
+					case Change.states.NEW:
+						oDirtyChange.setState(Change.states.PERSISTED);
+						Cache.addChange(this._mComponent, oDirtyChange.getDefinition());
+						break;
+					case Change.states.DELETED:
+						Cache.deleteChange(this._mComponent, oDirtyChange.getDefinition());
+						break;
+					case Change.states.DIRTY:
+						oDirtyChange.setState(Change.states.PERSISTED);
+						Cache.updateChange(this._mComponent, oDirtyChange.getDefinition());
+						break;
+				}
 			}
 		}
 
@@ -792,7 +803,8 @@ sap.ui.define([
 	};
 
 	/**
-	 * @param {boolean} [bSkipUpdateCache] If true, then the dirty change shall be saved for the new created app variant, but not for the current app;
+	 * @param {sap.ui.fl.Change[]} aDirtyChanges - Array of dirty changes
+	 * @param {boolean} [bSkipUpdateCache]-  If <code>true</code>, then the dirty change shall be saved for the newly created app variant, but not for the current app;
 	 * therefore, the cache update of the current app is skipped because the dirty change is not saved for the running app.
 	 */
 	ChangePersistence.prototype._massUpdateCacheAndDirtyState = function(aDirtyChanges, bSkipUpdateCache) {
@@ -814,17 +826,17 @@ sap.ui.define([
 		return aRequests;
 	};
 
-	ChangePersistence.prototype._getPendingActions = function(aDirtyChanges) {
-		var aPendingActions = [];
+	ChangePersistence.prototype._getStates = function(aDirtyChanges) {
+		var aStates = [];
 
 		aDirtyChanges.forEach(function(oChange) {
-			var sPendingAction = oChange.getPendingAction();
-			if (aPendingActions.indexOf(sPendingAction) === -1) {
-				aPendingActions.push(sPendingAction);
+			var sState = oChange.getState();
+			if (aStates.indexOf(sState) === -1) {
+				aStates.push(sState);
 			}
 		});
 
-		return aPendingActions;
+		return aStates;
 	};
 
 	ChangePersistence.prototype._prepareDirtyChanges = function(aDirtyChanges) {
@@ -846,7 +858,7 @@ sap.ui.define([
 	 * @see {ChangePersistence#saveDirtyChanges};
 	 *
 	 * If the given change is already in the dirty changes and
-	 * has pending action 'NEW' it will be removed, assuming,
+	 * has the 'NEW' state it will be removed, assuming,
 	 * it has just been created in the current session;
 	 *
 	 * Otherwise it will be marked for deletion.
@@ -858,7 +870,7 @@ sap.ui.define([
 		var nIndexInDirtyChanges = this._aDirtyChanges.indexOf(oChange);
 
 		if (nIndexInDirtyChanges > -1) {
-			if (oChange.getPendingAction() === "DELETE") {
+			if (oChange.getState() === Change.states.DELETED) {
 				return;
 			}
 			this._aDirtyChanges.splice(nIndexInDirtyChanges, 1);
@@ -1066,4 +1078,4 @@ sap.ui.define([
 	};
 
 	return ChangePersistence;
-}, true);
+});

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

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

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

@@ -14,7 +14,7 @@ sap.ui.define(function () {
 	 * @alias sap.ui.fl.EventHistory
 	 * @experimental Since 1.47.0
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl.RegistrationDelegator

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

@@ -20,7 +20,7 @@ function(
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @private
 	 * @static

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

@@ -20,7 +20,7 @@ function(
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @private
 	 * @static

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

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @private
 	 * @static