@openui5/sap.ui.fl 1.123.0 → 1.124.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.fl",
-  "version": "1.123.0",
+  "version": "1.124.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.123.0",
-    "@openui5/sap.ui.core": "1.123.0"
+    "@openui5/sap.m": "1.124.0",
+    "@openui5/sap.ui.core": "1.124.0"
   }
 }

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

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

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

@@ -5,7 +5,6 @@
  */
 
 sap.ui.define([
-	"sap/base/util/restricted/_union",
 	"sap/base/Log",
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/core/Component",
@@ -25,7 +24,6 @@ sap.ui.define([
 	"sap/ui/fl/LayerUtils",
 	"sap/ui/fl/Utils"
 ], function(
-	union,
 	Log,
 	JsControlTreeModifier,
 	Component,
@@ -68,7 +66,7 @@ sap.ui.define([
 	 *
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.123.0
+	 * @version 1.124.0
 	 * @since 1.25.0
 	 * @private
 	 * @param {object} mComponent - Component data to initiate <code>ChangePersistence</code> instance
@@ -128,7 +126,7 @@ sap.ui.define([
 
 		if (!mPropertyBag.includeCtrlVariants) {
 			aRelevantUIChanges = aRelevantUIChanges.concat(
-				VariantManagementState.getInitialChanges({reference: this._mComponent.name})
+				VariantManagementState.getInitialUIChanges({reference: this._mComponent.name})
 			);
 		} else {
 			aRelevantUIChanges = aRelevantUIChanges.concat(
@@ -172,28 +170,6 @@ sap.ui.define([
 		return UIChangesState.getLiveDependencyMap(this._mComponent.name);
 	};
 
-	/**
-	 * Returns all changes that are currently loaded for the component.
-	 * @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
-	 * @public
-	 */
-	ChangePersistence.prototype.getAllUIChanges = function(mPropertyBag) {
-		var aChanges = union(
-			this.getDependencyMapForComponent().aChanges,
-			mPropertyBag.includeDirtyChanges && this.getDirtyChanges()
-		).filter(function(oChange) {
-			return (
-				Boolean(oChange)
-				&& oChange.getFileType() === "change"
-				&& LayerUtils.compareAgainstCurrentLayer(oChange.getLayer(), mPropertyBag.layer) === 0
-			);
-		});
-		return aChanges;
-	};
-
 	function finalizeChangeCreation(oChange, oAppComponent) {
 		this._addRunTimeCreatedChangeToDependencyMap(oAppComponent, oChange);
 		this._addPropagationListener(oAppComponent);
@@ -363,11 +339,12 @@ sap.ui.define([
 		if (!aDirtyChanges.length && !bCondenseAnyLayer) {
 			return [];
 		}
-		var aPersistedAndSameLayerChanges = this.getDependencyMapForComponent().aChanges.filter(function(oChange) {
+		var aPersistedAndSameLayerChanges = UIChangesState.getAllUIChanges(this._mComponent.name).filter(function(oChange) {
 			if (sLayer === Layer.CUSTOMER && aDraftFilenames) {
 				return oChange.getState() === States.LifecycleState.PERSISTED && aDraftFilenames.includes(oChange.getId());
 			}
-			return oChange.getState() === States.LifecycleState.PERSISTED && LayerUtils.compareAgainstCurrentLayer(oChange.getLayer(), sLayer) === 0;
+			return oChange.getState() === States.LifecycleState.PERSISTED
+				&& LayerUtils.compareAgainstCurrentLayer(oChange.getLayer(), sLayer) === 0;
 		});
 		return aPersistedAndSameLayerChanges.concat(aDirtyChanges);
 	}
@@ -422,11 +399,13 @@ sap.ui.define([
 	}
 
 	/**
-	 * Saves the passed or all dirty changes by calling the appropriate back-end method (create for new changes, deleteChange for deleted changes);
+	 * Saves the passed or all dirty changes by calling the appropriate back-end method
+	 * (create for new changes, deleteChange for deleted changes);
 	 * to ensure the correct order, the methods are called sequentially;
 	 * after a change was saved successfully, it is removed from the dirty changes and the cache is updated.
 	 * If all changes are new they are condensed before they are passed to the Storage. For this the App Component is necessary.
-	 * Condensing is enabled by default for CUSTOMER and USER layers, but can be overruled with the URL Parameter 'sap-ui-xx-condense-changes'
+	 * Condensing is enabled by default for CUSTOMER and USER layers,
+	 * but can be overruled with the URL Parameter 'sap-ui-xx-condense-changes'
 	 *
 	 * @param {sap.ui.core.UIComponent} [oAppComponent] - AppComponent instance
 	 * @param {boolean} [bSkipUpdateCache] - If true, then the dirty change shall be saved for the new created app variant, but not for the current app;
@@ -438,10 +417,24 @@ sap.ui.define([
 	 * @param {string} [sLayer] - Layer for which the changes should be saved
 	 * @returns {Promise} Resolving after all changes have been saved
 	 */
-	ChangePersistence.prototype.saveDirtyChanges = function(oAppComponent, bSkipUpdateCache, aChanges, sParentVersion, aDraftFilenames, bCondenseAnyLayer, sLayer) {
+	ChangePersistence.prototype.saveDirtyChanges = function(
+		oAppComponent,
+		bSkipUpdateCache,
+		aChanges,
+		sParentVersion,
+		aDraftFilenames,
+		bCondenseAnyLayer,
+		sLayer
+	) {
 		var aDirtyChanges = aChanges || this._aDirtyChanges;
 		var sCurrentLayer = aDirtyChanges.length && aDirtyChanges[0].getLayer() || sLayer;
-		var aRelevantChangesForCondensing = getAllRelevantChangesForCondensing.call(this, aDirtyChanges, aDraftFilenames, bCondenseAnyLayer, sCurrentLayer);
+		var aRelevantChangesForCondensing = getAllRelevantChangesForCondensing.call(
+			this,
+			aDirtyChanges,
+			aDraftFilenames,
+			bCondenseAnyLayer,
+			sCurrentLayer
+		);
 		var bIsCondensingEnabled = (
 			isBackendCondensingEnabled(aRelevantChangesForCondensing)
 			&& canGivenChangesBeCondensed(oAppComponent, aRelevantChangesForCondensing, bCondenseAnyLayer)
@@ -472,14 +465,23 @@ sap.ui.define([
 					}.bind(this));
 				}
 				// Non-condensing route
-				return executeWriteAndRemoveCalls.call(this, sCurrentLayer, sRequest, sParentVersion, bSkipUpdateCache, aAllChanges, aCondensedChanges);
+				return executeWriteAndRemoveCalls.call(
+					this,
+					sCurrentLayer,
+					sRequest,
+					sParentVersion,
+					bSkipUpdateCache,
+					aAllChanges,
+					aCondensedChanges
+				);
 			}.bind(this));
 		}
 		return this.saveSequenceOfDirtyChanges(aDirtyChanges, bSkipUpdateCache, sParentVersion);
 	};
 
 	/**
-	 * Saves a sequence of dirty changes by calling the appropriate back-end method (create for new changes, deleteChange for deleted changes);
+	 * Saves a sequence of dirty changes by calling the appropriate back-end method
+	 * (create for new changes, deleteChange for deleted changes);
 	 * to ensure the correct order, the methods are called sequentially;
 	 * after a change was saved successfully, it is removed from the dirty changes and the cache is updated.
 	 *
@@ -739,19 +741,6 @@ sap.ui.define([
 		}.bind(this));
 	};
 
-	/**
-	 * Collect changes from the dependency map by names
-	 *
-	 * @param {string[]} aNames Names of changes
-	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} aChanges Array of changes with corresponding names
-	 * @private
-	 */
-	ChangePersistence.prototype._getChangesFromMapByNames = function(aNames) {
-		return this.getDependencyMapForComponent().aChanges.filter(function(oChange) {
-			return aNames.indexOf(oChange.getId()) !== -1;
-		});
-	};
-
 	/**
 	 * Removes unsaved changes.
 	 *
@@ -849,7 +838,9 @@ sap.ui.define([
 					aNames.push(oChangeContentId.fileName);
 				});
 			}
-			const aChangesToRevert = this._getChangesFromMapByNames(aNames);
+			const aChangesToRevert = UIChangesState.getAllUIChanges(this._mComponent.name).filter(function(oChange) {
+				return aNames.indexOf(oChange.getId()) !== -1;
+			});
 			FlexState.updateStorageResponse(this._mComponent.name, aChangesToRevert.map((oFlexObject) => {
 				return {flexObject: oFlexObject.convertToFileContent(), type: "delete"};
 			}));

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

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

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

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

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

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

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

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

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

@@ -9,7 +9,6 @@ sap.ui.define([
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/ChangePersistenceFactory",
 	"sap/ui/fl/write/_internal/Versions",
-	"sap/ui/fl/apply/_internal/changes/Applier",
 	"sap/ui/fl/apply/_internal/changes/Reverter",
 	"sap/ui/fl/apply/_internal/controlVariants/URLHandler",
 	"sap/ui/fl/apply/_internal/flexObjects/States",
@@ -17,14 +16,12 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
-	"sap/ui/core/Element",
-	"sap/base/Log"
+	"sap/ui/core/Element"
 ], function(
 	Utils,
 	Layer,
 	ChangePersistenceFactory,
 	Versions,
-	Applier,
 	Reverter,
 	URLHandler,
 	States,
@@ -32,8 +29,7 @@ sap.ui.define([
 	FlexState,
 	ControlVariantApplyAPI,
 	JsControlTreeModifier,
-	Element,
-	Log
+	Element
 ) {
 	"use strict";
 
@@ -81,7 +77,7 @@ sap.ui.define([
 	 * @since 1.27.0
 	 * @private
 	 * @author SAP SE
-	 * @version 1.123.0
+	 * @version 1.124.0
 	 */
 	var FlexController = function(sComponentName) {
 		this._oChangePersistence = undefined;
@@ -316,33 +312,6 @@ sap.ui.define([
 		.then(revertChangesAndUpdateVariantModel.bind(this, oComponent, bSkipUrlUpdate));
 	};
 
-	/**
-	 * Applying variant changes.
-	 *
-	 * @param {array} aChanges - Array of relevant changes
-	 * @param {sap.ui.core.Component} oAppComponent - Application component instance
-	 * @returns {Promise|sap.ui.fl.Utils.FakePromise} Returns promise that is resolved after all changes were applied in asynchronous or FakePromise for the synchronous processing scenario
-	 * @public
-	 */
-	FlexController.prototype.applyVariantChanges = function(aChanges, oAppComponent) {
-		var oControl;
-		return aChanges.reduce(function(oPreviousPromise, oChange) {
-			return oPreviousPromise.then(function() {
-				var mPropertyBag = {
-					modifier: JsControlTreeModifier,
-					appComponent: oAppComponent
-				};
-				this._oChangePersistence._addRunTimeCreatedChangeToDependencyMap(oAppComponent, oChange);
-				oControl = mPropertyBag.modifier.bySelector(oChange.getSelector(), oAppComponent);
-				if (oControl) {
-					return Applier.applyChangeOnControl(oChange, oControl, mPropertyBag);
-				}
-				Log.error("A flexibility change tries to change a nonexistent control.");
-				return undefined;
-			}.bind(this));
-		}.bind(this), (Utils.FakePromise ? new Utils.FakePromise() : Promise.resolve()));
-	};
-
 	/**
 	 * Saves changes sequentially on the associated change persistence instance;
 	 * This API must be only used in scenarios without draft (like personalization).

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

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

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

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

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

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