@openui5/sap.ui.fl 1.111.2 → 1.112.2

package/src/sap/ui/fl/variants/VariantModel.js

@@ -230,13 +230,22 @@ sap.ui.define([
 	}
 
 	function updatePersonalVariantPropertiesWithFlpSettings(oVariant) {
-		Settings.getInstance().then(function (oSettings) {
-			if (!oSettings.isVariantPersonalizationEnabled()) {
-				oVariant.remove = false;
-				oVariant.rename = false;
-				oVariant.change = false;
-			}
-		});
+		var oSettings = Settings.getInstanceOrUndef();
+		if (oSettings && !oSettings.isVariantPersonalizationEnabled()) {
+			oVariant.remove = false;
+			oVariant.rename = false;
+			oVariant.change = false;
+		}
+	}
+
+	function updatePublicVariantPropertiesWithSettings(oVariant) {
+		var oSettings = Settings.getInstanceOrUndef();
+		var bUserIsAuthorized = oSettings &&
+			(oSettings.isKeyUser() || !oSettings.getUserId() ||
+			(oSettings.isPublicFlVariantEnabled() && oSettings.getUserId().toUpperCase() === oVariant.author.toUpperCase()));
+		oVariant.remove = bUserIsAuthorized;
+		oVariant.rename = bUserIsAuthorized;
+		oVariant.change = bUserIsAuthorized;
 	}
 
 	function isVariantValidForRemove(oVariant, sVariantManagementReference, bDesignTimeModeToBeSet) {
@@ -261,22 +270,43 @@ sap.ui.define([
 		});
 	}
 
+	function initUshellServices() {
+		var oUShellContainer = Utils.getUshellContainer();
+		if (oUShellContainer) {
+			var aServicePromises = [
+				Utils.getUShellService("UserInfo"),
+				Utils.getUShellService("URLParsing"),
+				Utils.getUShellService("CrossApplicationNavigation"),
+				Utils.getUShellService("ShellNavigation")
+			];
+			return Promise.all(aServicePromises)
+				.then(function(aServices) {
+					setUShellService("UserInfo", aServices[0]);
+					setUShellService("URLParsing", aServices[1]);
+					setUShellService("CrossApplicationNavigation", aServices[2]);
+					setUShellService("ShellNavigation", aServices[3]);
+				})
+				.catch(function(vError) {
+					throw new Error("Error getting service from Unified Shell: " + vError);
+				});
+		}
+	}
+
 	/**
 	 * Constructor for a new sap.ui.fl.variants.VariantModel model.
 	 * @class Variant model implementation for JSON format.
 	 * @extends sap.ui.model.json.JSONModel
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 * @param {object} oData - Either the URL where to load the JSON from or a JS object
 	 * @param {object} mPropertyBag - Map of properties required for the constructor
 	 * @param {sap.ui.fl.FlexController} mPropertyBag.flexController - <code>FlexController</code> instance for the component which uses the variant model
 	 * @param {sap.ui.core.Component} mPropertyBag.appComponent - Application component instance that is currently loading
 	 * @constructor
 	 * @private
-	 * @ui5-restricted
+	 * @ui5-restricted sap.ui.fl
 	 * @since 1.50
 	 * @alias sap.ui.fl.variants.VariantModel
-	 * @experimental Since 1.50. This class is experimental and provides only limited functionality. Also the API might be changed in future.
 	 */
 
 	var VariantModel = JSONModel.extend("sap.ui.fl.variants.VariantModel", /** @lends sap.ui.fl.variants.VariantModel.prototype */ {
@@ -348,29 +378,7 @@ sap.ui.define([
 	 * @returns {Promise} Promise resolving when the VariantModel is initialized
 	 */
 	VariantModel.prototype.initialize = function() {
-		return Promise.resolve()
-			.then(function() {
-				var oUShellContainer = Utils.getUshellContainer();
-				if (oUShellContainer) {
-					var aServicePromises = [
-						Utils.getUShellService("UserInfo"),
-						Utils.getUShellService("URLParsing"),
-						Utils.getUShellService("CrossApplicationNavigation"),
-						Utils.getUShellService("ShellNavigation")
-					];
-					return Promise.all(aServicePromises)
-						.then(function(aServices) {
-							setUShellService("UserInfo", aServices[0]);
-							setUShellService("URLParsing", aServices[1]);
-							setUShellService("CrossApplicationNavigation", aServices[2]);
-							setUShellService("ShellNavigation", aServices[3]);
-						})
-						.catch(function(vError) {
-							throw new Error("Error getting service from Unified Shell: " + vError);
-						});
-				}
-				return undefined;
-			})
+		return Promise.all([Settings.getInstance(), initUshellServices()])
 			.then(function() {
 				//initialize hash data - variants map & model should exist at this point (set on constructor)
 				URLHandler.initialize({ model: this });
@@ -767,9 +775,23 @@ sap.ui.define([
 			originalContexts: oDuplicateVariantData.instance.getContexts(),
 			contexts: oDuplicateVariantData.instance.getContexts()
 		};
+		var aChanges = [];
+
+		// when created a new public variant other users do not see the new public variant
+		if (mPropertyBag.layer === Layer.PUBLIC) {
+			oDuplicateVariantData.instance.setFavorite(false);
+			var oChangeProperties = {
+				selector: JsControlTreeModifier.getSelector(mPropertyBag.newVariantReference, mPropertyBag.appComponent),
+				changeType: "setFavorite",
+				fileType: "ctrl_variant_change",
+				generator: mPropertyBag.generator,
+				layer: Layer.USER,
+				content: {favorite: true}
+			};
+			aChanges.push(this.oFlexController.createBaseChange(oChangeProperties, mPropertyBag.appComponent));
+		}
 
 		// sets copied variant and associated changes as dirty
-		var aChanges = [];
 		[oDuplicateVariantData.instance].concat(oDuplicateVariantData.controlChanges).forEach(function(oChange) {
 			aChanges.push(this.oChangePersistence.addDirtyChange(oChange));
 		}.bind(this));
@@ -827,15 +849,18 @@ sap.ui.define([
 		var aModelVariants = oData.variants;
 		var aChanges = [];
 		var mPropertyBag = {};
+		var oSettings = Settings.getInstanceOrUndef();
 
 		aModelVariants.forEach(function(oVariant) {
+			// layer can be PUBLIC for setTitle, setExecuteOnSelect or setVisible, but never for setFavorite, setDefault or setContexts
+			var sLayerOfChange = oSettings && oSettings.isPublicFlVariantEnabled() && oVariant.layer === Layer.PUBLIC ? Layer.PUBLIC : sLayer;
 			if (oVariant.originalTitle !== oVariant.title) {
 				mPropertyBag = {
 					variantReference: oVariant.key,
 					changeType: "setTitle",
 					title: oVariant.title,
 					originalTitle: oVariant.originalTitle,
-					layer: sLayer
+					layer: sLayerOfChange
 				};
 				aChanges.push(mPropertyBag);
 			}
@@ -855,7 +880,7 @@ sap.ui.define([
 					changeType: "setExecuteOnSelect",
 					executeOnSelect: oVariant.executeOnSelect,
 					originalExecuteOnSelect: oVariant.originalExecuteOnSelect,
-					layer: sLayer
+					layer: sLayerOfChange
 				};
 				aChanges.push(mPropertyBag);
 			}
@@ -864,7 +889,7 @@ sap.ui.define([
 					variantReference: oVariant.key,
 					changeType: "setVisible",
 					visible: false,
-					layer: sLayer
+					layer: sLayerOfChange
 				};
 				aChanges.push(mPropertyBag);
 			}
@@ -1242,12 +1267,8 @@ sap.ui.define([
 						updatePersonalVariantPropertiesWithFlpSettings(oVariant);
 						break;
 					case Layer.PUBLIC:
-						var oUser = this._oUserInfoService && this._oUserInfoService.getUser();
-						var bUserIsAuthorized = !oUser || oUser.getId().toUpperCase() === oVariant.author.toUpperCase() || Settings.getInstanceOrUndef().isKeyUser();
-						oVariant.remove = bUserIsAuthorized;
-						oVariant.rename = bUserIsAuthorized;
-						oVariant.change = bUserIsAuthorized;
 						oVariant.sharing = this.sharing.PUBLIC;
+						updatePublicVariantPropertiesWithSettings(oVariant);
 						break;
 					default:
 						oVariant.rename = false;

package/src/sap/ui/fl/write/_internal/SaveAs.js

@@ -12,7 +12,6 @@ sap.ui.define([
 	"sap/ui/fl/Utils",
 	"sap/base/Log",
 	"sap/ui/fl/Layer",
-	"sap/base/util/includes",
 	"sap/base/util/merge",
 	"sap/base/util/restricted/_omit",
 	"sap/ui/fl/registry/Settings"
@@ -24,7 +23,6 @@ sap.ui.define([
 	Utils,
 	Log,
 	Layer,
-	includes,
 	merge,
 	_omit,
 	Settings
@@ -137,60 +135,31 @@ sap.ui.define([
 	}
 
 	function _getDirtyDescrChanges(vSelector) {
-		var oDescriptorFlexControllerPersistence = ChangesController.getDescriptorFlexControllerInstance(vSelector)._oChangePersistence;
-		if (oDescriptorFlexControllerPersistence) {
-			var aDescrChanges = oDescriptorFlexControllerPersistence.getDirtyChanges();
-			aDescrChanges = aDescrChanges.slice();
-			return aDescrChanges;
-		}
-		return [];
-	}
-
-	function _getDirtyUIChanges(vSelector) {
 		var oFlexControllerPersistence = ChangesController.getFlexControllerInstance(vSelector)._oChangePersistence;
-		if (oFlexControllerPersistence) {
-			var aUIChanges = oFlexControllerPersistence.getDirtyChanges();
-			aUIChanges = aUIChanges.slice();
-			return aUIChanges;
+		if (!oFlexControllerPersistence) {
+			return [];
 		}
-		return [];
+		return oFlexControllerPersistence.getDirtyChanges().filter(function(oChange) {
+			return DescriptorChangeTypes.getChangeTypes().includes(oChange.getChangeType());
+		});
 	}
 
-	function _arePersistenciesTheSame(vSelector) {
+	function _getDirtyChanges(vSelector) {
 		var oFlexControllerPersistence = ChangesController.getFlexControllerInstance(vSelector)._oChangePersistence;
-		var oDescriptorFlexControllerPersistence = ChangesController.getDescriptorFlexControllerInstance(vSelector)._oChangePersistence;
-		// If the base application is already an app variant, the references and both persistences are same
-		return oFlexControllerPersistence === oDescriptorFlexControllerPersistence;
-	}
-
-	function _reactOnChangesBasedOnPersistences(vSelector, bArePersistencesEqual, oAppVariant) {
-		var aDescrChanges = [];
-		if (bArePersistencesEqual) {
-			_getDirtyDescrChanges(vSelector).forEach(function(oChange) {
-				// UI and Descriptor changes need to be separated here so as to perform different operations on changes
-				if (includes(DescriptorChangeTypes.getChangeTypes(), oChange.getChangeType())) {
-					aDescrChanges.push(oChange);
-				} else {
-					_moveChangesToNewFlexReference(oChange, oAppVariant);
-				}
-			});
-		} else {
-			_getDirtyUIChanges(vSelector).forEach(function(oChange) {
-				_moveChangesToNewFlexReference(oChange, oAppVariant);
-			});
-
-			aDescrChanges = _getDirtyDescrChanges(vSelector);
+		if (!oFlexControllerPersistence) {
+			return [];
 		}
-
-		return aDescrChanges;
+		var aChanges = oFlexControllerPersistence.getDirtyChanges();
+		aChanges = aChanges.slice();
+		return aChanges;
 	}
 
 	function _deleteDescrChangesFromPersistence(vSelector) {
 		// In case of app variant, both persistences hold descriptor changes and have to be removed from one of the persistences
 		_getDirtyDescrChanges(vSelector).forEach(function(oChange) {
-			if (includes(DescriptorChangeTypes.getChangeTypes(), oChange.getChangeType())) {
+			if (DescriptorChangeTypes.getChangeTypes().includes(oChange.getChangeType())) {
 				// In case there are UI changes, they will be sent to the backend in the last resolved promise and will be removed from the persistence
-				ChangesController.getDescriptorFlexControllerInstance(vSelector)._oChangePersistence.deleteChange(oChange);
+				ChangesController.getFlexControllerInstance(vSelector)._oChangePersistence.deleteChange(oChange);
 			}
 		});
 	}
@@ -215,7 +184,6 @@ sap.ui.define([
 		saveAs: function(mPropertyBag) {
 			var oAppVariantClosure;
 			var oAppVariantResultClosure;
-			var bArePersistencesEqual = false;
 
 			return AppVariantFactory.prepareCreate(mPropertyBag)
 				.then(function(oAppVariant) {
@@ -226,8 +194,15 @@ sap.ui.define([
 					return _setTransportAndPackageInfoForAppVariant(oAppVariantClosure, oTransportInfo);
 				})
 				.then(function() {
-					bArePersistencesEqual = _arePersistenciesTheSame(mPropertyBag.selector);
-					var aDescrChanges = _reactOnChangesBasedOnPersistences(mPropertyBag.selector, bArePersistencesEqual, oAppVariantClosure);
+					var aDescrChanges = [];
+					_getDirtyChanges(mPropertyBag.selector).forEach(function(oChange) {
+						// UI and Descriptor changes need to be separated here so as to perform different operations on changes
+						if (DescriptorChangeTypes.getChangeTypes().includes(oChange.getChangeType())) {
+							aDescrChanges.push(oChange);
+						} else {
+							_moveChangesToNewFlexReference(oChange, oAppVariantClosure);
+						}
+					});
 					return _getInlineChangesFromDescrChanges(aDescrChanges);
 				})
 				.then(function(aAllInlineChanges) {
@@ -243,22 +218,15 @@ sap.ui.define([
 				})
 				.then(function(oResult) {
 					oAppVariantResultClosure = merge({}, oResult);
-
-					if (bArePersistencesEqual) {
-						_deleteDescrChangesFromPersistence(mPropertyBag.selector);
-					}
+					_deleteDescrChangesFromPersistence(mPropertyBag.selector);
 
 					var oFlexController = ChangesController.getFlexControllerInstance(mPropertyBag.selector);
 
-					var aUIChanges = _getDirtyUIChanges(mPropertyBag.selector);
+					var aUIChanges = _getDirtyChanges(mPropertyBag.selector); //after removing descr changes, all remaining dirty changes are UI changes
 					if (aUIChanges.length) {
 						// Save the dirty UI changes to backend => firing PersistenceWriteApi.save
 						return oFlexController.saveAll(ChangesController.getAppComponentForSelector(mPropertyBag.selector), true)
 							.catch(function(oError) {
-								if (bArePersistencesEqual) {
-									_deleteDescrChangesFromPersistence(mPropertyBag.selector);
-								}
-
 								// Delete the inconsistent app variant if the UI changes failed to save
 								return this.deleteAppVariant({
 									id: mPropertyBag.id
@@ -273,10 +241,6 @@ sap.ui.define([
 					return Promise.resolve();
 				}.bind(this))
 				.then(function() {
-					//Reference Application Usecase: Since the UI changes have been successfully saved, the descriptor inline changes will now be removed from persistence
-					if (!bArePersistencesEqual) {
-						_deleteDescrChangesFromPersistence(mPropertyBag.selector);
-					}
 					return oAppVariantResultClosure;
 				})
 				.catch(function(oError) {
@@ -317,7 +281,7 @@ sap.ui.define([
 				.then(function() {
 					var aDescrChanges = [];
 					_getDirtyDescrChanges(mPropertyBag.selector).forEach(function(oChange) {
-						if (includes(DescriptorChangeTypes.getChangeTypes(), oChange.getChangeType())) {
+						if (DescriptorChangeTypes.getChangeTypes().includes(oChange.getChangeType())) {
 							aDescrChanges.push(oChange);
 						}
 					});

package/src/sap/ui/fl/write/_internal/Storage.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.Storage
 	 * @since 1.67
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/write/_internal/StorageFeaturesMerger.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.StorageFeaturesMerger
 	 * @since 1.70
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/Versions.js

@@ -174,7 +174,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.Versions
 	 * @since 1.74
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -250,12 +250,15 @@ sap.ui.define([
 	 * @param {string} mPropertyBag.reference - ID of the application for which the versions are requested (this reference must not contain the ".Component" suffix)
 	 * @param {string} mPropertyBag.layer - Layer for which the versions should be retrieved
 	 * @param {boolean} [mPropertyBag.contextBasedAdaptation] - Parameter that indicates whether or not a new backend draft was triggered via contextBasedAdaptationsAPI
+	 * @param {array} [mPropertyBag.draftFilenames] - Array with filesnames which was saved as draft
 	 */
 	Versions.onAllChangesSaved = function (mPropertyBag) {
 		mPropertyBag.reference = Utils.normalizeReference(mPropertyBag.reference);
 		var oModel = Versions.getVersionsModel(mPropertyBag);
 		var bVersioningEnabled = oModel.getProperty("/versioningEnabled");
 		var bDirtyChanges = oModel.getProperty("/dirtyChanges");
+		var aDraftFilenames = oModel.getProperty("/draftFilenames");
+		oModel.setProperty("/draftFilenames", aDraftFilenames.concat(mPropertyBag.draftFilenames));
 		oModel.setProperty("/dirtyChanges", true);
 		oModel.setProperty("/backendDraft", bVersioningEnabled && bDirtyChanges || !!mPropertyBag.contextBasedAdaptation);
 		oModel.updateDraftVersion();

package/src/sap/ui/fl/write/_internal/appVariant/AppVariant.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariant
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/write/_internal/appVariant/AppVariantFactory.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariantFactory
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/write/_internal/appVariant/AppVariantInlineChange.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariantInlineChange
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/write/_internal/appVariant/AppVariantInlineChangeFactory.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.appVariant.AppVariantInlineChangeFactory
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/write/_internal/condenser/Condenser.js

@@ -51,7 +51,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.condenser.Condenser
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 */
 	var Condenser = {};
 
@@ -73,7 +73,7 @@ sap.ui.define([
 	/**
 	 * Verify 'move' subtype has already been added to the data structure before 'create' subtype and they both belong to the same targetContainer
 	 *
-	 * @param {Map} mSubtypes - Map of properties that holds key-value pairs. A key is a unique identifier. A value is an array object that contains changes
+	 * @param {object} mSubtypes - Map of properties that holds key-value pairs. A key is a unique identifier. A value is an array object that contains changes
 	 * @param {object} oCondenserInfo - Condenser specific information that is delivered by the change handler
 	 * @returns {boolean} <code>true</code> if the 'move' subtype has been added to the data structure before 'create' subtype
 	 */
@@ -87,7 +87,7 @@ sap.ui.define([
 	/**
 	 * Verify 'destroy' subtype has already been added to the data structure before 'move' subtype
 	 *
-	 * @param {Map} mSubtypes - Map of properties that holds key-value pairs. A key is a unique identifier. A value is an array object that contains changes
+	 * @param {object} mSubtypes - Map of properties that holds key-value pairs. A key is a unique identifier. A value is an array object that contains changes
 	 * @param {object} oCondenserInfo - Condenser specific information that is delivered by the change handler
 	 * @returns {boolean} <code>true</code> if the 'destroy' subtype has been added to the data structure before 'move' subtype
 	 */
@@ -98,7 +98,7 @@ sap.ui.define([
 	/**
 	 * Verify 'destroy' subtype has already been added to the data structure before 'create' subtype
 	 *
-	 * @param {Map} mClassifications - Map of properties that holds key-value pairs. A key is a unique identifier. A value is an array object that contains changes
+	 * @param {object} mClassifications - Map of properties that holds key-value pairs. A key is a unique identifier. A value is an array object that contains changes
 	 * @param {object} oCondenserInfo - Condenser specific information that is delivered by the change handler
 	 * @returns {boolean} <code>true</code> if the 'move' subtype has been added to the data structure before 'create' subtype
 	 */
@@ -109,8 +109,8 @@ sap.ui.define([
 	/**
 	 * Adds an index-related change to the data structures.
 	 *
-	 * @param {Map} mClassifications - Map of properties that holds key-value pairs. A key is a unique identifier. A value is an array object that contains changes
-	 * @param {Map} mUIReconstructions - Map of UI reconstructions that holds key-value pairs. A key is a selector ID of the container. A value is a nested map which contains initial and target UI reconstructions
+	 * @param {object} mClassifications - Map of properties that holds key-value pairs. A key is a unique identifier. A value is an array object that contains changes
+	 * @param {object} mUIReconstructions - Map of UI reconstructions that holds key-value pairs. A key is a selector ID of the container. A value is a nested map which contains initial and target UI reconstructions
 	 * @param {object} oCondenserInfo - Condenser specific information that is delivered by the change handler
 	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange - Change instance that will be added to the array
 	 * @returns {Promise} resolves when the change is added to the data structure
@@ -155,7 +155,7 @@ sap.ui.define([
 
 	/**
 	 * Adds a non-index related change to the map.
-	 * @param {Map} mClassifications - Map of properties that holds key-value pairs. A key is a unique identifier. A value is an array object that contains changes
+	 * @param {object} mClassifications - Map of properties that holds key-value pairs. A key is a unique identifier. A value is an array object that contains changes
 	 * @param {object} oCondenserInfo - Condenser specific information that is delivered by the change handler
 	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange - Change instance that will be added to the array
 	 * @returns {Promise} returns when change is added to the map
@@ -172,10 +172,10 @@ sap.ui.define([
 	/**
 	 * Adds a classified change to the data structures.
 	 *
-	 * @param {Map} mTypes - Map of classification types that holds key-value pairs. A key is a unique identifier. A value is a nested map which contains non-index-related and index-related reduced changes
-	 * @param {Map} mUIReconstructions - Map of UI reconstructions that holds key-value pairs. A key is a selector ID of the container. A value is a nested map which contains initial and target UI reconstructions
+	 * @param {object} mTypes - Map of classification types that holds key-value pairs. A key is a unique identifier. A value is a nested map which contains non-index-related and index-related reduced changes
+	 * @param {object} mUIReconstructions - Map of UI reconstructions that holds key-value pairs. A key is a selector ID of the container. A value is a nested map which contains initial and target UI reconstructions
 	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} aIndexRelatedChanges - Array of all index related changes
-	 * @param {Object} oCondenserInfo - Condenser-specific information that is delivered by the change handler
+	 * @param {object} oCondenserInfo - Condenser-specific information that is delivered by the change handler
 	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange - Change instance that will be added to the array
 	 * @returns {Promise} returns when change is added to the data structures
 	 */
@@ -196,7 +196,7 @@ sap.ui.define([
 	/**
 	 * Adds an unclassified change to the data structure.
 	 *
-	 * @param {Map} mTypes - Map of change types that holds key-value pairs. A key is a unique identifier. A value is an array object that contains all unclassified changes
+	 * @param {object} mTypes - Map of change types that holds key-value pairs. A key is a unique identifier. A value is an array object that contains all unclassified changes
 	 * @param {string} sKey - Key of the "unclassified" map that reflects the fact that the delivered change is not classified
 	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange - Change instance
 	 */
@@ -262,14 +262,16 @@ sap.ui.define([
 	/**
 	 * Retrieves the classification types map.
 	 *
-	 * @param {Map} mReducedChanges - Map of reduced changes
+	 * @param {object} mReducedChanges - Map of reduced changes
 	 * @param {object} oCondenserInfo - Condenser-specific information that is delivered by the change handler
 	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange - Change instance
 	 * @param {sap.ui.core.Component} oAppComponent - Application component of the control at runtime
-	 * @returns {Map} Classification types map
+	 * @returns {object} Classification types map
 	 */
 	function getTypesMap(mReducedChanges, oCondenserInfo, oChange, oAppComponent) {
-		var sAffectedControlId = oCondenserInfo !== undefined ? oCondenserInfo.affectedControl : JsControlTreeModifier.getControlIdBySelector(oChange.getSelector(), oAppComponent);
+		var sAffectedControlId = oCondenserInfo !== undefined
+			? oCondenserInfo.affectedControl
+			: JsControlTreeModifier.getControlIdBySelector(oChange.getSelector(), oAppComponent);
 		if (!mReducedChanges[sAffectedControlId]) {
 			mReducedChanges[sAffectedControlId] = {};
 		}
@@ -277,8 +279,13 @@ sap.ui.define([
 		// (e.g. iFrame added as Section) and the changes must be brought to the same group (= same affected control)
 		if (oCondenserInfo && oCondenserInfo.updateControl) {
 			var sUpdateControlId = oCondenserInfo.updateControl;
-			mReducedChanges[sAffectedControlId] = Object.assign(mReducedChanges[sAffectedControlId], mReducedChanges[sUpdateControlId]);
-			delete mReducedChanges[sUpdateControlId];
+			var aPath = [CondenserUtils.NOT_INDEX_RELEVANT, CondenserClassification.Update, oCondenserInfo.uniqueKey];
+			var oUpdateCondenserInfo = ObjectPath.get(aPath, mReducedChanges[sUpdateControlId]);
+			if (oUpdateCondenserInfo) {
+				ObjectPath.set(aPath, oUpdateCondenserInfo, mReducedChanges[sAffectedControlId]);
+				delete mReducedChanges[sUpdateControlId][CondenserUtils.NOT_INDEX_RELEVANT]
+					[CondenserClassification.Update][oCondenserInfo.uniqueKey];
+			}
 		}
 		return mReducedChanges[sAffectedControlId];
 	}
@@ -322,8 +329,8 @@ sap.ui.define([
 	 * 		}
 	 *
 	 * @param {sap.ui.core.Component} oAppComponent - Application component of the control at runtime
-	 * @param {Map} mReducedChanges - Map of reduced changes
-	 * @param {Map} mUIReconstructions - Map of UI reconstructions
+	 * @param {object} mReducedChanges - Map of reduced changes
+	 * @param {object} mUIReconstructions - Map of UI reconstructions
 	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} aIndexRelatedChanges - Array of all index related changes
 	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} aChanges - All Change instances
 	 * @returns {Promise} Resolves when all changes were added to the maps
@@ -375,7 +382,7 @@ sap.ui.define([
 	 * If the original change is marked for deletion, the update can be skipped
 	 * If the original change is already persisted, the new content is an update
 	 *
-	 * @param {Map} mTypes - Map with the changes
+	 * @param {object} mTypes - Map with the changes
 	 * @param {object} oCondenserInfo - Condenser-specific information that is delivered by the change handler
 	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange - The change that is getting updated
 	 */
@@ -396,7 +403,7 @@ sap.ui.define([
 	/**
 	 * Retrieves an array of changes from the delivered data structure.
 	 *
-	 * @param {Map} mObjects - Delivered data structure
+	 * @param {object} mObjects - Delivered data structure
 	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} aChanges - Array of changes
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} All necessary changes in the map of reduced changes
 	 */
@@ -424,7 +431,7 @@ sap.ui.define([
 	/**
 	 * Retrieves an array of changes from the reduced changes map.
 	 *
-	 * @param {Map} mReducedChanges - Map of reduced changes
+	 * @param {object} mReducedChanges - Map of reduced changes
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} Array of the reduced changes
 	 */
 	function getAllReducedChanges(mReducedChanges) {
@@ -434,7 +441,7 @@ sap.ui.define([
 	/**
 	 * Retrieves an array of index-related changes from the array of reduced changes.
 	 *
-	 * @param {Map} mReducedChanges - Map of reduced changes
+	 * @param {object} mReducedChanges - Map of reduced changes
 	 * @param {object[]} aCondenserInfos - Empty array object that will be filled with condenser info objects
 	 * @returns {object[]} Array of objects that contain condenser-specific information and change instance
 	 */

package/src/sap/ui/fl/write/_internal/condenser/UIReconstruction.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.condenser.UIReconstruction
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 */
 	var UIReconstruction = {};
 

package/src/sap/ui/fl/write/_internal/connectors/BackendConnector.js

@@ -74,7 +74,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.BackendConnector
 	 * @since 1.72
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.connectors
 	 */

package/src/sap/ui/fl/write/_internal/connectors/KeyUserConnector.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.KeyUserConnector
 	 * @since 1.70
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/LrepConnector.js

@@ -166,7 +166,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.LrepConnector
 	 * @since 1.67
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/NeoLrepConnector.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.NeoLrepConnector
 	 * @since 1.81
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/ObjectPathConnector.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.ObjectPathConnector
 	 * @since 1.73
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/PersonalizationConnector.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.PersonalizationConnector
 	 * @since 1.70
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */