@openui5/sap.ui.fl 1.121.0 → 1.122.0

package/THIRDPARTY.txt

@@ -461,7 +461,7 @@ 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.10.0
+Component: SAP Theming Base Content, version: 11.12.0
 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.121.0",
+  "version": "1.122.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.121.0",
-    "@openui5/sap.ui.core": "1.121.0"
+    "@openui5/sap.m": "1.122.0",
+    "@openui5/sap.ui.core": "1.122.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.121.0</version>
+  <version>1.122.0</version>
 
   <documentation>SAPUI5 library with sap.ui.fl controls.</documentation>
 

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

@@ -10,7 +10,6 @@ sap.ui.define([
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/core/Component",
 	"sap/ui/fl/apply/_internal/changes/Applier",
-	"sap/ui/fl/apply/_internal/changes/Utils",
 	"sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory",
 	"sap/ui/fl/apply/_internal/flexObjects/States",
 	"sap/ui/fl/apply/_internal/flexState/changes/DependencyHandler",
@@ -31,7 +30,6 @@ sap.ui.define([
 	JsControlTreeModifier,
 	Component,
 	Applier,
-	ChangesUtils,
 	FlexObjectFactory,
 	States,
 	DependencyHandler,
@@ -70,7 +68,7 @@ sap.ui.define([
 	 *
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.121.0
+	 * @version 1.122.0
 	 * @since 1.25.0
 	 * @private
 	 * @param {object} mComponent - Component data to initiate <code>ChangePersistence</code> instance
@@ -97,7 +95,6 @@ sap.ui.define([
 
 			await FlexState.getStorageResponse(sReference);
 		} catch (oError) {
-			// FIXME the CompVariantState causes an exception in the save scenario,
 			Log.warning("Problem during ChangePersistence.prototype.getChangesForComponent");
 		}
 	}
@@ -145,22 +142,6 @@ sap.ui.define([
 		return aRelevantUIChanges;
 	};
 
-	/**
-	 * Checks the current dependencies map for any open (unresolved) dependencies belonging to the given control
-	 * and returns the IDs of the open dependent changes.
-	 *
-	 * @param {object} oSelector selector of the control
-	 * @param {sap.ui.core.Component} oAppComponent - Application component instance that is currently loading
-	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} Array of all open dependent changes for the control
-	 */
-	ChangePersistence.prototype.getOpenDependentChangesForControl = function(oSelector, oAppComponent) {
-		return DependencyHandler.getOpenDependentChangesForControl(
-			this.getDependencyMapForComponent(),
-			JsControlTreeModifier.getControlIdBySelector(oSelector, oAppComponent),
-			oAppComponent
-		);
-	};
-
 	/**
 	 * Adds a new change into dependency map positioned right after the referenced change and updates the change dependencies
 	 *
@@ -213,35 +194,6 @@ sap.ui.define([
 		return aChanges;
 	};
 
-	/**
-	 * Gets the changes for the given view id. The complete view prefix has to match.
-	 *
-	 * Example:
-	 * Change has selector id:
-	 * view1--view2--controlId
-	 *
-	 * Will match for view:
-	 * view1--view2
-	 *
-	 * Will not match for view:
-	 * view1
-	 * view1--view2--view3
-	 *
-	 * @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
-	 * @param {string} mPropertyBag.componentId - responsible component's id for the view
-	 * @param {sap.ui.core.util.reflection.BaseTreeModifier} mPropertyBag.modifier - responsible modifier
-	 * @returns {Promise} resolving with an array of changes
-	 * @public
-	 */
-	ChangePersistence.prototype.getChangesForView = function(mPropertyBag) {
-		return this.getChangesForComponent(mPropertyBag).then(function(aChanges) {
-			return aChanges.filter(ChangesUtils.filterChangeByView.bind(undefined, mPropertyBag));
-		});
-	};
-
 	function finalizeChangeCreation(oChange, oAppComponent) {
 		this._addRunTimeCreatedChangeToDependencyMap(oAppComponent, oChange);
 		this._addPropagationListener(oAppComponent);

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.121.0
+	 * @version 1.122.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.121.0
+	 * @version 1.122.0
 	 *
 	 * @private
 	 * @since 1.48

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

@@ -20,7 +20,7 @@ function(
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.121.0
+	 * @version 1.122.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.121.0
+	 * @version 1.122.0
 	 *
 	 * @private
 	 * @since 1.48

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

@@ -13,6 +13,7 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/changes/Reverter",
 	"sap/ui/fl/apply/_internal/controlVariants/URLHandler",
 	"sap/ui/fl/apply/_internal/flexObjects/States",
+	"sap/ui/fl/apply/_internal/flexState/changes/UIChangesState",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
@@ -27,6 +28,7 @@ sap.ui.define([
 	Reverter,
 	URLHandler,
 	States,
+	UIChangesState,
 	FlexState,
 	ControlVariantApplyAPI,
 	JsControlTreeModifier,
@@ -79,7 +81,7 @@ sap.ui.define([
 	 * @since 1.27.0
 	 * @private
 	 * @author SAP SE
-	 * @version 1.121.0
+	 * @version 1.122.0
 	 */
 	var FlexController = function(sComponentName) {
 		this._oChangePersistence = undefined;
@@ -164,7 +166,7 @@ sap.ui.define([
 	 * @param {string[]} mPropertyBag.changeTypes - An array containing the change types that should be considered
 	 * @returns {Promise} Resolves when all changes on the control have been processed
 	 */
-	FlexController.prototype._waitForChangesToBeApplied = async function(mPropertyBag) {
+	FlexController.prototype._waitForChangesToBeApplied = function(mPropertyBag) {
 		function filterChanges(oChange) {
 			return !oChange.isCurrentProcessFinished()
 			&& (mPropertyBag.changeTypes.length === 0 || mPropertyBag.changeTypes.includes(oChange.getChangeType()));
@@ -172,12 +174,9 @@ sap.ui.define([
 
 		const oControl = mPropertyBag.selector.id && Element.getElementById(mPropertyBag.selector.id) || mPropertyBag.selector;
 		const oAppComponent = mPropertyBag.selector.appComponent || Utils.getAppComponentForControl(oControl);
-		await FlexState.initialize({
-			componentId: oAppComponent.getId()
-		});
 
 		mPropertyBag.changeTypes ||= [];
-		var mChangesMap = this._oChangePersistence.getDependencyMapForComponent();
+		var mChangesMap = UIChangesState.getLiveDependencyMap(this._sComponentName);
 		var aPromises = [];
 		var mDependencies = Object.assign({}, mChangesMap.mDependencies);
 		var {mChanges} = mChangesMap;
@@ -259,24 +258,27 @@ sap.ui.define([
 			sLayer
 		))
 		.then(function(oResult) {
-			if (bDraft && oResult && oResult.response) {
-				var vChangeDefinition = oResult.response;
-				var aDraftFilenames = [];
-				if (Array.isArray(vChangeDefinition)) {
-					vChangeDefinition.forEach(function(change) {
-						aDraftFilenames.push(change.fileName);
-					});
-					// the reference and layer of all items are the same
-					[vChangeDefinition] = vChangeDefinition;
+			if (oResult && bDraft) {
+				var mPropertyBag = {
+					reference: this._sComponentName,
+					layer: Layer.CUSTOMER // only the customer layer has draft active
+				};
+				if (oResult.response && oResult.response.length > 0) {
+					var aDraftFilenames = [];
+					if (Array.isArray(oResult.response)) {
+						oResult.response.forEach(function(change) {
+							aDraftFilenames.push(change.fileName);
+						});
+					}
+					mPropertyBag.draftFilenames = aDraftFilenames;
+					Versions.onAllChangesSaved(mPropertyBag);
+				} else {
+					// need to update version model when condensing send post request with a delete change and afterwards call flex/data request with right version parameter
+					return Versions.updateModelFromBackend(mPropertyBag);
 				}
-				Versions.onAllChangesSaved({
-					reference: vChangeDefinition.reference,
-					layer: vChangeDefinition.layer,
-					draftFilenames: aDraftFilenames
-				});
 			}
 			return oResult;
-		});
+		}.bind(this));
 	};
 
 	/**

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.121.0
+	 * @version 1.122.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.121.0
+	 * @version 1.122.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.121.0
+	 * @version 1.122.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.rta
@@ -422,7 +422,7 @@ sap.ui.define([
 				oComponent instanceof Component
 				&& getComponentType(oComponent.getManifestObject()) === "component"
 				// Some embedded components might not have an app component
-				// e.g. sap.ushell.plugins.rta, sap.ushell.plugins.rta-personalize
+				// e.g. sap.ushell.plugins.rta
 				&& oAppComponent
 				&& Utils.isApplicationComponent(oAppComponent)
 			);

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.121.0
+	 * @version 1.122.0
 	 *
 	 */
 	var DelegateMediator = {};