@openui5/sap.ui.fl 1.127.0 → 1.128.0

package/src/sap/ui/fl/support/_internal/getFlexObjectInfos.js

@@ -0,0 +1,53 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	"sap/ui/fl/apply/_internal/flexState/changes/UIChangesState",
+	"sap/ui/fl/apply/_internal/flexState/FlexObjectState",
+	"sap/ui/fl/apply/_internal/flexState/FlexState",
+	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
+	"sap/ui/fl/Utils"
+], function(
+	UIChangesState,
+	FlexObjectState,
+	FlexState,
+	ManifestUtils,
+	Utils
+) {
+	"use strict";
+
+	/**
+	 * Returns an array with all UI Changes for the application.
+	 *
+	 * @namespace sap.ui.fl.support._internal.getAllUIChanges
+	 * @since 1.128
+	 * @version 1.128.0
+	 * @private
+	 * @ui5-restricted sap.ui.fl.support.api.SupportAPI
+	 */
+
+	function getFlexObjectInfos(oCurrentAppContainerObject) {
+		const oAppComponent = oCurrentAppContainerObject.oContainer.getComponentInstance();
+		const sReference = ManifestUtils.getFlexReferenceForControl(oAppComponent);
+		return {
+			allUIChanges: UIChangesState.getAllUIChanges(sReference),
+			allFlexObjects: FlexState.getFlexObjectsDataSelector().get({ reference: sReference }),
+			dirtyFlexObjects: FlexObjectState.getDirtyFlexObjects(sReference),
+			completeDependencyMap: FlexObjectState.getCompleteDependencyMap(sReference),
+			liveDependencyMap: FlexObjectState.getLiveDependencyMap(sReference)
+		};
+	}
+
+	return async function(oAppComponent) {
+		// in most scenarios the appComponent will already be passed, but in iFrame cases (like cFLP) the appComponent is not available
+		// outside of the iFrame. In this case the function is called from inside the iFrame and has to fetch the appComponent
+		if (!oAppComponent) {
+			const oAppLifeCycleService = await Utils.getUShellService("AppLifeCycle");
+			return getFlexObjectInfos(oAppLifeCycleService.getCurrentApplication().componentInstance);
+		}
+		return getFlexObjectInfos(oAppComponent);
+	};
+});

package/src/sap/ui/fl/support/_internal/getFlexSettings.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.support._internal.getFlexSettings
 	 * @since 1.99
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.support.api.SupportAPI
 	 */

package/src/sap/ui/fl/support/api/SupportAPI.js

@@ -5,30 +5,81 @@
  */
 
 sap.ui.define([
+	"sap/base/Log",
+	"sap/ui/core/ComponentRegistry",
 	"sap/ui/fl/support/_internal/getAllUIChanges",
+	"sap/ui/fl/support/_internal/getFlexObjectInfos",
 	"sap/ui/fl/support/_internal/getFlexSettings",
-	"sap/ui/fl/support/_internal/getChangeDependencies"
+	"sap/ui/fl/support/_internal/getChangeDependencies",
+	"sap/ui/fl/Utils"
 ], function(
+	Log,
+	ComponentRegistry,
 	getAllUIChanges,
+	getFlexObjectInfos,
 	getFlexSettings,
-	getChangeDependencies
+	getChangeDependencies,
+	Utils
 ) {
 	"use strict";
 
+	async function findComponentAndCallFunction(fnFunction, sModulePath) {
+		if (Utils.getUshellContainer()) {
+			const oAppLifeCycleService = await Utils.getUShellService("AppLifeCycle");
+			const oCurrentApp = oAppLifeCycleService.getCurrentApplication();
+			if (oCurrentApp.componentInstance) {
+				return fnFunction(oCurrentApp.componentInstance);
+			}
+
+			// potential cFLP scenario with the instance running in an iFrame where the top has no access to the componentInstance
+			// in this case the module has to be required inside the iFrame and executed there
+			const oIntent = await oCurrentApp.getIntent();
+			// The iFrame ID is not public API and may change in the future.
+			// Until there is an API, this is the way how to get any hold on the app at all
+			var iFrame = document.getElementById(`application-${oIntent.semanticObject}-${oIntent.action}`);
+			if (!iFrame) {
+				const sError = "Possible cFLP scenario, but the iFrame can't be found";
+				Log.error(sError);
+				throw Error(sError);
+			}
+
+			return new Promise(function(resolve) {
+				iFrame.contentWindow.sap.ui.require([sModulePath], function(fnModuleInsideIFrame) {
+					fnModuleInsideIFrame().then(resolve);
+				});
+			});
+		}
+
+		// standalone case
+		const aApplications = ComponentRegistry.filter(function(oComponent) {
+			return oComponent.getManifestObject().getRawJson()["sap.app"].type === "application";
+		});
+		if (aApplications.length === 1) {
+			return getAllUIChanges(aApplications[0]);
+		}
+
+		throw Error("No application component found");
+	}
+
 	/**
 	 * Provides an API for support tools
 	 *
 	 * @namespace sap.ui.fl.support.api.SupportAPI
 	 * @since 1.98
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @private
 	 * @ui5-restricted ui5 support tools
 	 */
 	var SupportAPI = /** @lends sap.ui.fl.support.api.SupportAPI */{
-		getAllUIChanges,
+		getAllUIChanges() {
+			return findComponentAndCallFunction(getAllUIChanges, "sap/ui/fl/support/_internal/getAllUIChanges");
+		},
+		getFlexObjectInfos() {
+			return findComponentAndCallFunction(getFlexObjectInfos, "sap/ui/fl/support/_internal/getFlexObjectInfos");
+		},
 		getChangeDependencies,
 		getFlexSettings
 	};
 
 	return SupportAPI;
-});
+});

package/src/sap/ui/fl/support/apps/contentbrowser/controller/ContentDetails.controller.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.controller.ContentDetails
 	 * @author SAP SE
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @since 1.45
 	 * @private
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/controller/ContentDetailsEdit.controller.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.controller.ContentDetailsEdit
 	 * @author SAP SE
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @since 1.45
 	 * @private
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/controller/LayerContentMaster.controller.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.controller.LayerContentMaster
 	 * @author SAP SE
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @since 1.45
 	 * @private
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/controller/Layers.controller.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.controller.Layers
 	 * @author SAP SE
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @since 1.45
 	 * @private
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/lrepConnector/LRepConnector.js

@@ -13,7 +13,7 @@ sap.ui.define(["sap/ui/fl/Utils", "sap/ui/thirdparty/jquery"], function(Utils, j
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.lrepConnector.LRepConnector
 	 * @author SAP SE
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @since 1.45
 	 * @private
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/utils/DataUtils.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.utils.DataUtils
 	 * @author SAP SE
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @since 1.45
 	 * @private
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/utils/ErrorUtils.js

@@ -17,7 +17,7 @@ function(MessageItem, MessagePopover, JSONModel) {
 		 * @constructor
 		 * @alias sap.ui.fl.support.apps.contentbrowser.utils.ErrorUtils
 		 * @author SAP SE
-		 * @version 1.127.0
+		 * @version 1.128.0
 		 * @since 1.45
 		 * @private
 		 */

package/src/sap/ui/fl/transport/TransportSelection.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.transport.TransportSelection
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @since 1.38.0
 	 * Helper object to select an ABAP transport for an LREP object. This is not a generic utility to select a transport request, but part
 	 *        of the SmartVariant control.

package/src/sap/ui/fl/util/IFrame.js

@@ -50,7 +50,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/fl/util/ManagedObjectModel.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/fl/util/changePropertyValueByPath.js

@@ -11,9 +11,20 @@ sap.ui.define([
 ) {
 	"use strict";
 
+	function splitEscapePath(sPropertyPath) {
+		const sReplaceEscapeWithDummy = sPropertyPath.replaceAll("\\/", "*");
+		const aPath = sReplaceEscapeWithDummy.split("/");
+		return aPath.map((element) => element.replaceAll("*", "/"));
+	}
+
 	function setPropValueByPath(oEntityProp, oRoot) {
-		var aPath = oEntityProp.propertyPath.split("/");
-		var valueByPath = ObjectPath.get(aPath, oRoot);
+		let aPath;
+		if (oEntityProp.propertyPath.includes("\\")) {
+			aPath = splitEscapePath(oEntityProp.propertyPath);
+		} else {
+			aPath = oEntityProp.propertyPath.split("/");
+		}
+		const valueByPath = ObjectPath.get(aPath, oRoot);
 
 		if (valueByPath && oEntityProp.operation === "INSERT") {
 			throw new Error("Path has already a value. 'INSERT' operation is not appropriate.");

package/src/sap/ui/fl/util/resolveBinding.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 *
 	 * @function
 	 * @author SAP SE
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @alias sap.ui.fl.util.resolveBinding
 	 * @since 1.91
 	 * @private

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

@@ -33,7 +33,7 @@ sap.ui.define([
 	"use strict";
 
 	// shortcut for sap.ui.core.TitleLevel
-	var {TitleLevel} = coreLibrary;
+	var { TitleLevel } = coreLibrary;
 
 	/**
 	 * Constructor for a new <code>VariantManagement</code>.
@@ -139,11 +139,11 @@ sap.ui.define([
 				},
 
 				/**
-                 * Semantic level of the header.
-                 * For more information, see {@link sap.m.Title#setLevel}.
-                 *
-                 * @since 1.104
-                 */
+								 * Semantic level of the header.
+								 * For more information, see {@link sap.m.Title#setLevel}.
+								 *
+								 * @since 1.104
+								 */
 				headerLevel: {
 					type: "sap.ui.core.TitleLevel",
 					group: "Appearance",
@@ -688,23 +688,23 @@ sap.ui.define([
 	};
 
 	/**
- 	 * Special handling of the rendering of this control.
+		 * Special handling of the rendering of this control.
 	 * @param {boolean} bValue Defines the intended rendering
 	 * @returns {sap.ui.fl.variants.VariantManagement} The current instance
 	 * @private
 	 * @restricted sap.ui.mdc
- 	 */
+		 */
 	VariantManagement.prototype.setShowAsText = function(bValue) {
 		this._oVM.setShowAsText(bValue);
 		return this;
 	};
 
 	/**
- 	 * Special handling of the rendering of this control.
+		 * Special handling of the rendering of this control.
 	 * @returns {boolean} The current intent
 	 * @private
 	 * @restricted sap.ui.mdc
- 	 */
+		 */
 	VariantManagement.prototype.getShowAsText = function() {
 		return this._oVM.getShowAsText();
 	};
@@ -920,7 +920,7 @@ sap.ui.define([
 	};
 
 	VariantManagement.prototype._createItemsModel = function(sModelName) {
-		var oItemsTemplate = new VariantItem({
+		this._oItemsTemplate = new VariantItem({
 			key: `{${sModelName}>key}`,
 			title: `{${sModelName}>title}`,
 			sharing: `{${sModelName}>sharing}`,
@@ -937,7 +937,7 @@ sap.ui.define([
 		this._oVM.bindAggregation("items", {
 			path: `${this.oContext}/variants`,
 			model: sModelName,
-			template: oItemsTemplate,
+			template: this._oItemsTemplate,
 			filters: new Filter({
 				path: "visible",
 				operator: FilterOperator.EQ,
@@ -1035,8 +1035,15 @@ sap.ui.define([
 		this._oVM.detachSelect(this._fireSelect, this);
 		this._oVM.detachSave(this._fireSave, this);
 
-		Control.prototype.exit.apply(this, aArgs);
-		this._oVM = undefined;
+		if (this._oVM) {
+			this._oVM.destroy();
+			this._oVM = undefined;
+		}
+
+		if (this._oItemsTemplate) {
+			this._oItemsTemplate.destroy();
+			this._oItemsTemplate = undefined;
+		}
 
 		this._fRegisteredApplyAutomaticallyOnStandardVariant = null;
 		this.oContext = undefined;
@@ -1046,6 +1053,8 @@ sap.ui.define([
 		this._aSaveEventHandlers = undefined;
 		this._aManageEventHandlers = undefined;
 		this._aSelectEventHandlers = undefined;
+
+		Control.prototype.exit.apply(this, aArgs);
 	};
 
 	// <overwrite for docu>

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

@@ -26,11 +26,11 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/FlexObjectState",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/apply/_internal/controlVariants/Utils",
+	"sap/ui/fl/write/api/ContextBasedAdaptationsAPI",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/LayerUtils",
 	"sap/ui/fl/Utils",
 	"sap/ui/fl/registry/Settings",
-	"sap/ui/fl/write/api/ContextBasedAdaptationsAPI",
 	"sap/ui/model/BindingMode",
 	"sap/ui/model/json/JSONModel"
 ], function(
@@ -55,11 +55,11 @@ sap.ui.define([
 	FlexObjectState,
 	ManifestUtils,
 	VariantUtil,
+	ContextBasedAdaptationsAPI,
 	Layer,
 	LayerUtils,
 	Utils,
 	Settings,
-	ContextBasedAdaptationsAPI,
 	BindingMode,
 	JSONModel
 ) {
@@ -306,7 +306,7 @@ sap.ui.define([
 	 * @class Variant model implementation for JSON format.
 	 * @extends sap.ui.model.json.JSONModel
 	 * @author SAP SE
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @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
@@ -628,7 +628,7 @@ sap.ui.define([
 				.then((oReturn) => {
 					if (!oReturn.success) {
 						var oException = oReturn.error || new Error("The change could not be applied.");
-						this._oChangePersistence.deleteChange(oChange, true);
+						this.oChangePersistence.deleteChange(oChange, true);
 						throw oException;
 					}
 				});
@@ -789,7 +789,8 @@ sap.ui.define([
 	};
 
 	VariantModel.prototype.removeVariant = function(mPropertyBag) {
-		var aChangesToBeDeleted = this.oChangePersistence.getDirtyChanges().filter(function(oChange) {
+		var aChangesToBeDeleted = FlexObjectState.getDirtyFlexObjects(this.sFlexReference)
+		.filter(function(oChange) {
 			return (oChange.getVariantReference && oChange.getVariantReference() === mPropertyBag.variant.getId()) ||
 				oChange.getId() === mPropertyBag.variant.getId();
 		});
@@ -1501,7 +1502,7 @@ sap.ui.define([
 			return oChange.getId();
 		});
 
-		return this.oChangePersistence.getDirtyChanges().filter(function(oChange) {
+		return FlexObjectState.getDirtyFlexObjects(this.sFlexReference).filter(function(oChange) {
 			return aChangeFileNames.includes(oChange.getId()) && !oChange.getSavedToVariant();
 		});
 	};

package/src/sap/ui/fl/variants/context/i18n/i18n_en_US_saptrc.properties

@@ -1,12 +1,12 @@
-RADIO_BUTTON_GROUP_LABEL=ue76W8qO/gND2dE1NFdw+w_Visibility
-ADD_CONTEXTS_BUTTON=QTU8mvIsxhn/eaqzQkJ9xQ_Add Roles
-REMOVE_ALL_BUTTON=aJSQ/uAeFl5PKbsCdMcpYw_Remove All
-NO_DATA=s90HF6hKj/osiBC6JhS51w_No roles found
-SELECT_ROLE_DIALOG_TITLE=96vF58WDC92I2fk64LkYAw_Select Roles
-COLUMN_CONTEXT_ID=lvM7cdTXglX69fl9P56LgA_Role
-COLUMN_CONTEXT_DESCRIPTION=k188UnefM86FjnRtq8rqqQ_Description
-SELECTED_CONTEXT_LIST_TITLE=f4QzI7Og2y6RMXdP20bSow_Selected Roles
-NO_DESCRIPTION=4OSYBxA26pM9G1jLHJ59mA_No description available
-NO_SELECTED_ROLES=HFCyWGdA3hJKMeYBO78QZA_No roles selected.
-NO_SELECTED_ROLES_WITH_ADVICE=jmmMUzlxBpnzxsVpvRpGcw_No roles selected. Please select at least one role.
-VISIBILITY=DvFExTl6+sVmrhScznmoUw_Visible for all users. Add roles to restrict the visibility of the view.
+RADIO_BUTTON_GROUP_LABEL=ljonvFscQfFk1oGzI3c0/g_Visibility
+ADD_CONTEXTS_BUTTON=WpqLmJzxQFT5hppV0oWSwg_Add Roles
+REMOVE_ALL_BUTTON=suTXSwopbwtnb6+85ArXaw_Remove All
+NO_DATA=I1bWi0ey/Wvn2UTHtE3i4g_No roles found
+SELECT_ROLE_DIALOG_TITLE=ViYV+sjlpAGK6t1nyrZmRg_Select Roles
+COLUMN_CONTEXT_ID=x1mo1EDRY2e9lJpGm0PNug_Role
+COLUMN_CONTEXT_DESCRIPTION=M9XtTNeBapBCOGZyIpClvw_Description
+SELECTED_CONTEXT_LIST_TITLE=ZeLd7YWYJ3swVvD0+nNelw_Selected Roles
+NO_DESCRIPTION=PPSp+tER40fcq/AiBejuuA_No description available
+NO_SELECTED_ROLES=UAMemN6rvmRz23bzRaWFvA_No roles selected.
+NO_SELECTED_ROLES_WITH_ADVICE=XEdQyZS2xN/XkLY5XGusrw_No roles selected. Please select at least one role.
+VISIBILITY=Zgl2xVdHdB9pcejiEKuHMw_Visible for all users. Add roles to restrict the visibility of the view.

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

@@ -9,6 +9,8 @@ sap.ui.define([
 	"sap/base/util/merge",
 	"sap/base/Log",
 	"sap/ui/fl/apply/_internal/appVariant/DescriptorChangeTypes",
+	"sap/ui/fl/apply/_internal/flexState/FlexObjectState",
+	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/registry/Settings",
 	"sap/ui/fl/write/_internal/appVariant/AppVariantFactory",
 	"sap/ui/fl/write/_internal/appVariant/AppVariantInlineChangeFactory",
@@ -20,6 +22,8 @@ sap.ui.define([
 	merge,
 	Log,
 	DescriptorChangeTypes,
+	FlexObjectState,
+	ManifestUtils,
 	Settings,
 	AppVariantFactory,
 	AppVariantInlineChangeFactory,
@@ -135,23 +139,15 @@ sap.ui.define([
 	}
 
 	function _getDirtyDescrChanges(vSelector) {
-		var oFlexControllerPersistence = FlexControllerFactory.createForSelector(vSelector)._oChangePersistence;
-		if (!oFlexControllerPersistence) {
-			return [];
-		}
-		return oFlexControllerPersistence.getDirtyChanges().filter(function(oChange) {
+		const sReference = ManifestUtils.getFlexReferenceForSelector(vSelector);
+		return FlexObjectState.getDirtyFlexObjects(sReference).filter(function(oChange) {
 			return DescriptorChangeTypes.getChangeTypes().includes(oChange.getChangeType());
 		});
 	}
 
 	function _getDirtyChanges(vSelector) {
-		var oFlexControllerPersistence = FlexControllerFactory.createForSelector(vSelector)._oChangePersistence;
-		if (!oFlexControllerPersistence) {
-			return [];
-		}
-		var aChanges = oFlexControllerPersistence.getDirtyChanges();
-		aChanges = aChanges.slice();
-		return aChanges;
+		const sReference = ManifestUtils.getFlexReferenceForSelector(vSelector);
+		return FlexObjectState.getDirtyFlexObjects(sReference).slice();
 	}
 
 	function _deleteDescrChangesFromPersistence(vSelector) {
@@ -228,6 +224,9 @@ sap.ui.define([
 				if (aUIChanges.length) {
 					// Save the dirty UI changes to backend => firing PersistenceWriteApi.save
 					return oFlexController.saveAll(Utils.getAppComponentForSelector(mPropertyBag.selector), true)
+					.then(function() {
+						oFlexController._oChangePersistence.removeDirtyChanges();
+					})
 					.catch(function(oError) {
 						// Delete the inconsistent app variant if the UI changes failed to save
 						return this.deleteAppVariant({

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.127.0
+	 * @version 1.128.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */