@openui5/sap.ui.rta 1.131.1 → 1.132.1

package/src/sap/ui/rta/plugin/additionalElements/ActionExtractor.js

@@ -1,11 +1,10 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
 sap.ui.define([
-	"sap/base/util/restricted/_difference",
 	"sap/base/util/merge",
 	"sap/base/Log",
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
@@ -16,7 +15,6 @@ sap.ui.define([
 	"sap/ui/rta/plugin/additionalElements/AdditionalElementsUtils",
 	"sap/ui/rta/Utils"
 ], function(
-	difference,
 	merge,
 	Log,
 	JsControlTreeModifier,
@@ -34,33 +32,31 @@ sap.ui.define([
 	 * handled by the AdditionalElements Plugin (Reveal, Add Via Delegate, Add Custom)
 	 *
 	 * @author SAP SE
-	 * @version 1.131.1
+	 * @version 1.132.1
 	 * @private
 	 * @since 1.94
 	 */
 	const ActionExtractor = {};
 
-	function getAddViaDelegateActionData(mAction, oDesignTimeMetadata, oPlugin) {
-		return oPlugin.hasChangeHandler(mAction.changeType, mAction.element)
-		.then(function(bHasChangeHandler) {
-			if (bHasChangeHandler) {
-				return {
-					aggregationName: mAction.aggregation,
-					addPropertyActionData: {
-						designTimeMetadata: oDesignTimeMetadata,
-						action: mAction,
-						delegateInfo: {
-							payload: mAction.delegateInfo.payload || {},
-							delegate: mAction.delegateInfo.instance,
-							modelType: mAction.delegateInfo.modelType,
-							requiredLibraries: mAction.delegateInfo.requiredLibraries,
-							delegateType: mAction.delegateInfo.delegateType
-						}
+	async function getAddViaDelegateActionData(mAction, oDesignTimeMetadata, oPlugin) {
+		const bHasChangeHandler = await oPlugin.hasChangeHandler(mAction.changeType, mAction.element);
+		if (bHasChangeHandler) {
+			return {
+				aggregationName: mAction.aggregation,
+				addPropertyActionData: {
+					designTimeMetadata: oDesignTimeMetadata,
+					action: mAction,
+					delegateInfo: {
+						payload: mAction.delegateInfo.payload || {},
+						delegate: mAction.delegateInfo.instance,
+						modelType: mAction.delegateInfo.modelType,
+						requiredLibraries: mAction.delegateInfo.requiredLibraries,
+						delegateType: mAction.delegateInfo.delegateType
 					}
-				};
-			}
-			return undefined;
-		});
+				}
+			};
+		}
+		return undefined;
 	}
 
 	function getInvisibleElements(oParentOverlay, sAggregationName, oPlugin) {
@@ -123,7 +119,7 @@ sap.ui.define([
 	}
 
 	// Return all elements that can be made visible in each aggregation (including elements from other aggregations)
-	function getRevealActionFromAggregations(aParents, _mReveal, sAggregationName, aAggregationNames, oPlugin) {
+	async function getRevealActionFromAggregations(aParents, _mReveal, sAggregationName, aAggregationNames, oPlugin) {
 		const aInvisibleElements = aParents.reduce(function(aInvisibleChildren, oParentOverlay) {
 			let aInvisibleChildrenPerAggregation = [];
 			aAggregationNames.forEach(function(sAggregation) {
@@ -133,24 +129,20 @@ sap.ui.define([
 			return oParentOverlay ? aInvisibleChildren.concat(aInvisibleChildrenPerAggregation) : aInvisibleChildren;
 		}.bind(this), []);
 
-		const oInitialRevealObject = {
+		let oRevealObject = {
 			elements: [],
 			controlTypeNames: []
 		};
-		const mRevealPromise = aInvisibleElements.reduce(function(oPreviousPromise, mInvisibleElement) {
-			return oPreviousPromise.then(function(mReveal) {
-				return checkAndEnrichReveal(mReveal, mInvisibleElement, oPlugin, sAggregationName);
-			});
-		}, Promise.resolve(oInitialRevealObject));
+		for (const mInvisibleElement of aInvisibleElements) {
+			oRevealObject = await checkAndEnrichReveal(oRevealObject, mInvisibleElement, oPlugin, sAggregationName);
+		}
 
-		return mRevealPromise.then(function(mReveal) {
-			if (mReveal.elements.length > 0) {
-				_mReveal[sAggregationName] = {
-					reveal: mReveal
-				};
-			}
-			return _mReveal;
-		});
+		if (oRevealObject.elements.length > 0) {
+			_mReveal[sAggregationName] = {
+				reveal: oRevealObject
+			};
+		}
+		return _mReveal;
 	}
 
 	function filterValidAddPropertyActions(aActions, mParents, oPlugin) {
@@ -161,21 +153,18 @@ sap.ui.define([
 		});
 	}
 
-	function loadRequiredLibraries(mRequiredLibraries) {
+	async function loadRequiredLibraries(mRequiredLibraries) {
 		const aRequiredLibraries = Object.keys(mRequiredLibraries || {});
-		const aRequireLibrariesPromise = [];
-		aRequiredLibraries.forEach((sLibrary) => {
-			aRequireLibrariesPromise.push(
-				Lib.load({name: sLibrary})
-			);
-		});
-		return Promise.all(aRequireLibrariesPromise)
-		.then(() => true)
-		.catch((vError) => {
+		try {
+			for (const sLibrary of aRequiredLibraries) {
+				await Lib.load({name: sLibrary});
+			}
+			return true;
+		} catch (vError) {
 			Log.error("Required library not available: ", vError);
 			// Ignore the error here as the write delegate might not be required
 			return false;
-		});
+		}
 	}
 
 	function filterValidDelegateForAction(aActions, mParents) {
@@ -203,68 +192,53 @@ sap.ui.define([
 		return oFilterPromise;
 	}
 
-	function checkAndEnrichReveal(mReveal, mInvisibleElement, oPlugin, sTargetAggregation) {
-		const oInvisibleElement = mInvisibleElement.element;
-		let oDesignTimeMetadata;
-		let mRevealAction;
-		let bRevealEnabled = false;
-		let oHasChangeHandlerPromise = Promise.resolve(false);
-		const sSourceAggregation = mInvisibleElement.sourceAggregation;
-
-		const oOverlay = OverlayRegistry.getOverlay(oInvisibleElement);
+	async function checkAndEnrichReveal(mReveal, mInvisibleElement, oPlugin, sTargetAggregation) {
+		const oOverlay = OverlayRegistry.getOverlay(mInvisibleElement.element);
 		if (oOverlay) {
-			oDesignTimeMetadata = oOverlay.getDesignTimeMetadata();
+			const oDesignTimeMetadata = oOverlay.getDesignTimeMetadata();
 
-			mRevealAction = oDesignTimeMetadata && oDesignTimeMetadata.getAction("reveal", oInvisibleElement);
+			const mRevealAction = oDesignTimeMetadata && oDesignTimeMetadata.getAction("reveal", mInvisibleElement.element);
 			if (mRevealAction && mRevealAction.changeType) {
-				let oRevealSelector = oInvisibleElement;
+				let oRevealSelector = mInvisibleElement.element;
 				if (mRevealAction.changeOnRelevantContainer) {
 					oRevealSelector = oOverlay.getRelevantContainer();
 				}
 
-				oHasChangeHandlerPromise = oPlugin.hasChangeHandler(mRevealAction.changeType, oRevealSelector)
-				.then(function(bHasChangeHandler) {
-					// Element can be made invalid while the check is running (e.g. destroyed during undo of split)
-					if (ElementUtil.isElementValid(oInvisibleElement)) {
-						const mParents = AdditionalElementsUtils.getParents(true, oOverlay, oPlugin);
-						if (bHasChangeHandler) {
-							if (mRevealAction.changeOnRelevantContainer) {
-								// we have the child overlay, so we need the parents
-								bRevealEnabled = oPlugin.hasStableId(mParents.relevantContainerOverlay)
-									&& oPlugin.hasStableId(mParents.parentOverlay);
-							} else {
-								bRevealEnabled = true;
-							}
-							mRevealAction.getAggregationName ||= defaultGetAggregationName;
+				// Element can be made invalid while the check is running (e.g. destroyed during undo of split)
+				if (ElementUtil.isElementValid(mInvisibleElement.element)) {
+					const mParents = AdditionalElementsUtils.getParents(true, oOverlay, oPlugin);
+					const bHasChangeHandler = await oPlugin.hasChangeHandler(mRevealAction.changeType, oRevealSelector);
+					if (bHasChangeHandler) {
+						let bRevealEnabled = mRevealAction.changeOnRelevantContainer ?
+							// we have the child overlay, so we need the parents
+							oPlugin.hasStableId(mParents.relevantContainerOverlay) && oPlugin.hasStableId(mParents.parentOverlay)
+							: true;
+						mRevealAction.getAggregationName ||= defaultGetAggregationName;
+
+						// Check if the invisible element can be moved to the target aggregation
+						if (bRevealEnabled && (mInvisibleElement.sourceAggregation !== sTargetAggregation)) {
+							const oAggregationOverlay = mParents.parentOverlay.getAggregationOverlay(sTargetAggregation);
+							bRevealEnabled = await Utils.checkTargetZone(oAggregationOverlay, oOverlay, oPlugin);
+						}
 
-							// Check if the invisible element can be moved to the target aggregation
-							if (bRevealEnabled && (sSourceAggregation !== sTargetAggregation)) {
-								const oAggregationOverlay = mParents.parentOverlay.getAggregationOverlay(sTargetAggregation);
-								return Utils.checkTargetZone(oAggregationOverlay, oOverlay, oPlugin);
+						if (bRevealEnabled) {
+							mReveal.elements.push({
+								element: mInvisibleElement.element,
+								designTimeMetadata: oDesignTimeMetadata,
+								action: mRevealAction,
+								sourceAggregation: mInvisibleElement.sourceAggregation,
+								targetAggregation: sTargetAggregation
+							});
+							const mName = oDesignTimeMetadata.getName(mInvisibleElement.element);
+							if (mName) {
+								mReveal.controlTypeNames.push(mName);
 							}
 						}
 					}
-					return bRevealEnabled;
-				});
-			}
-		}
-
-		return oHasChangeHandlerPromise.then(function(bIncludeReveal) {
-			if (bIncludeReveal) {
-				mReveal.elements.push({
-					element: oInvisibleElement,
-					designTimeMetadata: oDesignTimeMetadata,
-					action: mRevealAction,
-					sourceAggregation: sSourceAggregation,
-					targetAggregation: sTargetAggregation
-				});
-				const mName = oDesignTimeMetadata.getName(oInvisibleElement);
-				if (mName) {
-					mReveal.controlTypeNames.push(mName);
 				}
 			}
-			return mReveal;
-		});
+		}
+		return mReveal;
 	}
 
 	/**
@@ -298,32 +272,28 @@ sap.ui.define([
 	 *
 	 * @return {Promise} Resolving to a structure with all "add/reveal" action relevant data collected
 	 */
-	ActionExtractor.getActions = function(bSibling, oSourceElementOverlay, oPlugin, bInvalidate, oDesignTime) {
+	ActionExtractor.getActions = async function(bSibling, oSourceElementOverlay, oPlugin, bInvalidate, oDesignTime) {
 		const sSiblingOrChild = bSibling ? "asSibling" : "asChild";
 		if (!bInvalidate && oSourceElementOverlay._mAddActions) {
-			return Promise.resolve(oSourceElementOverlay._mAddActions[sSiblingOrChild]);
+			return oSourceElementOverlay._mAddActions[sSiblingOrChild];
 		}
 
-		const oRevealActionsPromise = this._getRevealActions(bSibling, oSourceElementOverlay, oPlugin, oDesignTime);
-		const oAddPropertyActionsPromise = this._getAddViaDelegateActions(bSibling, oSourceElementOverlay, oPlugin);
-
-		return Promise.all([
-			oRevealActionsPromise,
-			oAddPropertyActionsPromise
-		]).then(function(aAllActions) {
-			// join and condense all action data
-			const mAllActions = merge(aAllActions[0], aAllActions[1]);
-			oSourceElementOverlay._mAddActions ||= {asSibling: {}, asChild: {}};
-			oSourceElementOverlay._mAddActions[sSiblingOrChild] = mAllActions;
-			return mAllActions;
-		});
+		const [oRevealAction, oAddViaDelegateAction] = await Promise.all([
+			this._getRevealActions(bSibling, oSourceElementOverlay, oPlugin, oDesignTime),
+			this._getAddViaDelegateActions(bSibling, oSourceElementOverlay, oPlugin)
+		]);
+		// join and condense all action data
+		const mAllActions = merge(oRevealAction, oAddViaDelegateAction);
+		oSourceElementOverlay._mAddActions ||= {asSibling: {}, asChild: {}};
+		oSourceElementOverlay._mAddActions[sSiblingOrChild] = mAllActions;
+		return mAllActions;
 	};
 
 	/**
 	 * Returns the already calculated actions of an Overlay, or undefined if no actions available
 	 * @param {boolean} bSibling - Indicates if the elements should be added as sibling (true) or child (false) to the overlay
 	 * @param {sap.ui.dt.ElementOverlay} oOverlay - Elements will be added in relation (sibling/parent) to this overlay
-	 * @returns {object/undefined} - Object with all "add/reveal" action relevant data collected or undefined if no actions available
+	 * @returns {object|undefined} - Object with all "add/reveal" action relevant data collected or undefined if no actions available
 	 */
 	ActionExtractor.getActionsOrUndef = function(bSibling, oOverlay) {
 		const sSiblingOrChild = bSibling ? "asSibling" : "asChild";
@@ -342,7 +312,7 @@ sap.ui.define([
 	 *
 	 * @returns {Promise<object>} Reveal action data
 	 */
-	ActionExtractor._getRevealActions = function(bSibling, oSourceElementOverlay, oPlugin, oDesignTime) {
+	ActionExtractor._getRevealActions = async function(bSibling, oSourceElementOverlay, oPlugin, oDesignTime) {
 		if (bIsSyncRegistered) {
 			bIsSyncRegistered = false;
 			oDesignTime.attachEventOnce("synced", function() {
@@ -371,19 +341,17 @@ sap.ui.define([
 			}).map(function(oAggregationOverlay) {
 				return oAggregationOverlay.getAggregationName();
 			});
-			return aAggregationNames.reduce(function(oPreviousPromise, sAggregationName) {
+			const mAggregatedReveal = await aAggregationNames.reduce(function(oPreviousPromise, sAggregationName) {
 				return oPreviousPromise.then(function(mReveal) {
 					return getRevealActionFromAggregations(aParents, mReveal, sAggregationName, aAggregationNames, oPlugin);
 				});
-			}, Promise.resolve({}))
-			.then(function(mAggregatedReveal) {
-				if (bSibling) {
-					mRevealCache[mParents.parentOverlay.getId()] = mAggregatedReveal;
-				}
-				return mAggregatedReveal;
-			});
+			}, Promise.resolve({}));
+			if (bSibling) {
+				mRevealCache[mParents.parentOverlay.getId()] = mAggregatedReveal;
+			}
+			return mAggregatedReveal;
 		}
-		return Promise.resolve({});
+		return {};
 	};
 
 	/**
@@ -415,4 +383,4 @@ sap.ui.define([
 	};
 
 	return ActionExtractor;
-});
+});

package/src/sap/ui/rta/plugin/additionalElements/AddElementsDialog.js

@@ -1,13 +1,12 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
 	"sap/ui/base/ManagedObject",
 	"sap/ui/core/Element",
 	"sap/ui/core/Fragment",
-	"sap/ui/core/Lib",
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/model/Filter",
 	"sap/ui/model/FilterOperator",
@@ -18,7 +17,6 @@ sap.ui.define([
 	ManagedObject,
 	Element,
 	Fragment,
-	Lib,
 	JSONModel,
 	Filter,
 	FilterOperator,
@@ -34,13 +32,13 @@ sap.ui.define([
 	 * @class Context - Dialog for available Fields in Runtime Authoring
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.131.1
+	 * @version 1.132.1
 	 * @constructor
 	 * @private
 	 * @since 1.44
 	 * @alias sap.ui.rta.plugin.additionalElements.AddElementsDialog
 	 */
-	var AddElementsDialog = ManagedObject.extend("sap.ui.rta.plugin.additionalElements.AddElementsDialog", {
+	const AddElementsDialog = ManagedObject.extend("sap.ui.rta.plugin.additionalElements.AddElementsDialog", {
 		metadata: {
 			library: "sap.ui.rta",
 			properties: {
@@ -59,7 +57,7 @@ sap.ui.define([
 		}
 	});
 
-	var oRTAResourceModel;
+	let oRTAResourceModel;
 
 	/**
 	 * Initialize the Dialog
@@ -124,11 +122,10 @@ sap.ui.define([
 	 * Close the dialog.
 	 * @returns {Promise} a Promise that resolves (to nothing) once the dialog is loaded and closed
 	 */
-	AddElementsDialog.prototype._submitDialog = function() {
-		return this._oDialogPromise.then(function(oDialog) {
-			oDialog.close();
-			this._fnResolveOnDialogConfirm();
-		}.bind(this));
+	AddElementsDialog.prototype._submitDialog = async function() {
+		const oDialog = await this._oDialogPromise;
+		oDialog.close();
+		this._fnResolveOnDialogConfirm();
 		// indicate that the dialog has been closed and the selected fields (if any) are to be added to the UI
 	};
 
@@ -188,8 +185,8 @@ sap.ui.define([
 	 */
 	AddElementsDialog.prototype._resortList = function() {
 		this._bDescendingSortOrder = !this._bDescendingSortOrder;
-		var oBinding = this._oList.getBinding("items");
-		var aSorter = [];
+		const oBinding = this._oList.getBinding("items");
+		const aSorter = [];
 		aSorter.push(new Sorter("label", this._bDescendingSortOrder));
 		oBinding.sort(aSorter);
 	};
@@ -201,15 +198,15 @@ sap.ui.define([
 	 * @private
 	 */
 	AddElementsDialog.prototype._updateModelFilter = function(oEvent) {
-		var sValue = oEvent.getParameter("newValue");
-		var oBinding = this._oList.getBinding("items");
+		const sValue = oEvent.getParameter("newValue");
+		const oBinding = this._oList.getBinding("items");
 		if ((typeof sValue) === "string") {
-			var oFilterLabel = new Filter("label", FilterOperator.Contains, sValue);
-			var oOriginalLabelFilter = new Filter("originalLabel", FilterOperator.Contains, sValue);
-			var oParentPropertyNameFilter = new Filter("parentPropertyName", FilterOperator.Contains, sValue);
-			var oDuplicateNameFilter = new Filter("duplicateName", FilterOperator.EQ, true);
-			var oParentNameFilter = new Filter({ filters: [oParentPropertyNameFilter, oDuplicateNameFilter], and: true });
-			var oFilterLabelOrInfo = new Filter({ filters: [oFilterLabel, oOriginalLabelFilter, oParentNameFilter], and: false });
+			const oFilterLabel = new Filter("label", FilterOperator.Contains, sValue);
+			const oOriginalLabelFilter = new Filter("originalLabel", FilterOperator.Contains, sValue);
+			const oParentPropertyNameFilter = new Filter("parentPropertyName", FilterOperator.Contains, sValue);
+			const oDuplicateNameFilter = new Filter("duplicateName", FilterOperator.EQ, true);
+			const oParentNameFilter = new Filter({ filters: [oParentPropertyNameFilter, oDuplicateNameFilter], and: true });
+			const oFilterLabelOrInfo = new Filter({ filters: [oFilterLabel, oOriginalLabelFilter, oParentNameFilter], and: false });
 			oBinding.filter([oFilterLabelOrInfo]);
 		} else {
 			oBinding.filter([]);
@@ -228,19 +225,19 @@ sap.ui.define([
 		});
 	};
 
-	AddElementsDialog.prototype.setTitle = function(sTitle) {
+	AddElementsDialog.prototype.setTitle = async function(sTitle) {
 		ManagedObject.prototype.setProperty.call(this, "title", sTitle, true);
-		this._oDialogPromise.then(function(oDialog) {
-			oDialog.setTitle(sTitle);
-		});
+		const oDialog = await this._oDialogPromise;
+		oDialog.setTitle(sTitle);
 	};
 
 	/**
 	 * Sets the information for the extensibility menu button items
 	 *
-	 * @param {string} sButtonText - Text for the extensibility MenuButton
-	 * @param {string} sButtonTooltip - Tooltip for the extensibility MenuButton
-	 * @param {object[]} aExtensibilityOptions - Options available on the extensibility MenuButton
+	 * @param {object} oExtensibilityInfo - Information for the extensibility menu button
+	 * @param {string} oExtensibilityInfo.UITexts.buttonText - Text for the extensibility MenuButton
+	 * @param {string} oExtensibilityInfo.UITexts.tooltip - Tooltip for the extensibility MenuButton
+	 * @param {object[]} oExtensibilityInfo.UITexts.options - Options available on the extensibility MenuButton
 	 * @public
 	 */
 	AddElementsDialog.prototype.setExtensibilityOptions = function(oExtensibilityInfo) {
@@ -286,7 +283,7 @@ sap.ui.define([
 		// clear old values from last run
 		this._removeExtensionDataTexts();
 
-		var aBusinessContextTexts = this._oDialogModel.getObject("/businessContextTexts");
+		const aBusinessContextTexts = this._oDialogModel.getObject("/businessContextTexts");
 		if (aContexts && aContexts.length > 0) {
 			aContexts.forEach(function(oContext) {
 				aBusinessContextTexts.push({
@@ -313,9 +310,9 @@ sap.ui.define([
 	 * @private
 	 */
 	AddElementsDialog.prototype._removeExtensionDataTexts = function() {
-		var aBusinessContextTexts = this._oDialogModel.getObject("/businessContextTexts");
+		const aBusinessContextTexts = this._oDialogModel.getObject("/businessContextTexts");
 		aBusinessContextTexts.splice(1);
 	};
 
 	return AddElementsDialog;
-});
+});