@openui5/sap.ui.rta 1.144.0 → 1.145.1

package/src/sap/ui/rta/plugin/Selection.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @class The Selection plugin allows you to select or focus overlays with mouse or keyboard and navigate to others.
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.144.0
+	 * @version 1.145.1
 	 * @constructor
 	 * @private
 	 * @since 1.34

package/src/sap/ui/rta/plugin/Settings.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @class The Settings allows trigger change of settings operations on the overlay
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.144.0
+	 * @version 1.145.1
 	 * @constructor
 	 * @private
 	 * @since 1.44

package/src/sap/ui/rta/plugin/Split.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.144.0
+	 * @version 1.145.1
 	 * @constructor
 	 * @private
 	 * @since 1.46

package/src/sap/ui/rta/plugin/Stretch.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.plugin.Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.144.0
+	 * @version 1.145.1
 	 *
 	 * @constructor
 	 * @private

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

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * handled by the AdditionalElements Plugin (Reveal, Add Via Delegate, Add Custom)
 	 *
 	 * @author SAP SE
-	 * @version 1.144.0
+	 * @version 1.145.1
 	 * @private
 	 * @since 1.94
 	 */

package/src/sap/ui/rta/plugin/additionalElements/AddElementsDialog.fragment.xml

@@ -64,26 +64,9 @@
 					id="rta_addElementsDialogList"
 					mode="MultiSelect"
 					includeItemInSelection="true"
-					growing="true"
-					growingScrollToLoad="true"
-					items="{ path: '/elements', sorter: { path: 'label', descending: false}, templateShareable: false }"
-					noDataText="{i18n>MSG_NO_FIELDS}">
-					<CustomListItem
-						class="sapUIRtaListItem"
-						type="Active"
-						selected="{selected}"
-						tooltip="{tooltip}">
-						<VBox>
-							<Label
-								design="Standard"
-								text="{= ${parentPropertyName} &amp;&amp; ${duplicateName} ? ${label} + ' (' + ${parentPropertyName} + ')' : ${label} }"/>
-							<Label
-								text="{= ${originalLabel} ? ${i18n>LBL_FREP}.replace('{0}', ${originalLabel}) : ''}"
-								visible="{= !!${originalLabel} }"/>
-						</VBox>
-					</CustomListItem>
-				</List>
+					items="{ path: '/elementsFlat', factory: '._createListItem' }"
+					noDataText="{i18n>MSG_NO_FIELDS}"/>
 			</ScrollContainer>
 		</content>
 	</Dialog>
-</core:FragmentDefinition>
+</core:FragmentDefinition>

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

@@ -4,24 +4,28 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
+	"sap/m/CustomListItem",
+	"sap/m/FormattedText",
+	"sap/m/GroupHeaderListItem",
+	"sap/m/VBox",
 	"sap/ui/base/ManagedObject",
 	"sap/ui/core/Element",
 	"sap/ui/core/Fragment",
+	"sap/ui/fl/util/CancelError",
 	"sap/ui/model/json/JSONModel",
-	"sap/ui/model/Filter",
-	"sap/ui/model/FilterOperator",
 	"sap/ui/model/resource/ResourceModel",
-	"sap/ui/model/Sorter",
 	"sap/ui/rta/Utils"
 ], function(
+	CustomListItem,
+	FormattedText,
+	GroupHeaderListItem,
+	VBox,
 	ManagedObject,
 	Element,
 	Fragment,
+	CancelError,
 	JSONModel,
-	Filter,
-	FilterOperator,
 	ResourceModel,
-	Sorter,
 	Utils
 ) {
 	"use strict";
@@ -32,7 +36,7 @@ sap.ui.define([
 	 * @class Context - Dialog for available Fields in Runtime Authoring
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.144.0
+	 * @version 1.145.1
 	 * @constructor
 	 * @private
 	 * @since 1.44
@@ -57,6 +61,154 @@ sap.ui.define([
 		}
 	});
 
+	/**
+	 * Highlights matching text by wrapping it in <strong> tags.
+	 * Escapes HTML in the text to prevent XSS.
+	 *
+	 * @param {string} sText - The text to process
+	 * @param {string} sSearchValue - The search value to highlight
+	 * @returns {string} The text with matching parts wrapped in <strong> tags
+	 * @private
+	 */
+	function highlightText(sText, sSearchValue) {
+		if (!sText) {
+			return "";
+		}
+		if (!sSearchValue) {
+			return encodeXML(sText);
+		}
+
+		const sLowerText = sText.toLowerCase();
+		const sLowerSearch = sSearchValue.toLowerCase();
+		const iIndex = sLowerText.indexOf(sLowerSearch);
+
+		if (iIndex === -1) {
+			return encodeXML(sText);
+		}
+
+		// Split the text into parts: before match, match, after match
+		const sBefore = sText.substring(0, iIndex);
+		const sMatch = sText.substring(iIndex, iIndex + sSearchValue.length);
+		const sAfter = sText.substring(iIndex + sSearchValue.length);
+
+		// Recursively highlight the rest of the text (for multiple occurrences)
+		return `${encodeXML(sBefore)}<strong>${encodeXML(sMatch)}</strong>${highlightText(sAfter, sSearchValue)}`;
+	}
+
+	/**
+	 * Encodes special XML/HTML characters to prevent XSS.
+	 *
+	 * @param {string} sText - The text to encode
+	 * @returns {string} The encoded text
+	 * @private
+	 */
+	function encodeXML(sText) {
+		if (!sText) {
+			return "";
+		}
+		return sText
+		.replace(/&/g, "&amp;")
+		.replace(/</g, "&lt;")
+		.replace(/>/g, "&gt;")
+		.replace(/"/g, "&quot;")
+		.replace(/'/g, "&#39;");
+	}
+
+	/**
+	 * Transforms flat elements array into a flat list with group headers.
+	 * Elements without entityTypeDisplayName are placed at the root level (top).
+	 * Elements with entityTypeDisplayName are grouped under their entity name with a group header.
+	 *
+	 * @param {object[]} aElements - Flat array of elements
+	 * @param {string} [sFilterValue] - Optional filter value to filter elements
+	 * @private
+	 */
+	function buildElementsList(aElements, sFilterValue) {
+		const aRootElements = [];
+		const mGroups = {};
+
+		// Filter elements if filter value is provided
+		const aFilteredElements = sFilterValue
+			? aElements.filter((oElement) => this._elementMatchesFilter(oElement, sFilterValue))
+			: aElements;
+
+		// Separate elements into root elements and grouped elements
+		aFilteredElements.forEach(function(oElement) {
+			if (oElement.entityTypeDisplayName) {
+				// Element belongs to an entity group
+				mGroups[oElement.entityTypeDisplayName] ||= [];
+				mGroups[oElement.entityTypeDisplayName].push(oElement);
+			} else {
+				// Element has no entity - place at root level
+				aRootElements.push(oElement);
+			}
+		});
+
+		// Sort root elements
+		const bDescending = this._bDescendingSortOrder;
+		aRootElements.sort(function(a, b) {
+			const sLabelA = (a.label || "").toLowerCase();
+			const sLabelB = (b.label || "").toLowerCase();
+			if (sLabelA < sLabelB) {
+				return bDescending ? 1 : -1;
+			}
+			if (sLabelA > sLabelB) {
+				return bDescending ? -1 : 1;
+			}
+			return 0;
+		});
+
+		// Build flat list: root elements first, then group headers with their elements
+		const aFlatList = [];
+
+		// Add root elements (without entityTypeDisplayName) first
+		aRootElements.forEach(function(oElement) {
+			aFlatList.push(oElement);
+		});
+
+		// Add groups with their elements (groups sorted alphabetically, elements sorted by label)
+		const aGroupNames = Object.keys(mGroups);
+		aGroupNames.sort(function(a, b) {
+			const sNameA = a.toLowerCase();
+			const sNameB = b.toLowerCase();
+			if (sNameA < sNameB) {
+				return bDescending ? 1 : -1;
+			}
+			if (sNameA > sNameB) {
+				return bDescending ? -1 : 1;
+			}
+			return 0;
+		});
+
+		aGroupNames.forEach(function(sEntityName) {
+			// Add group header
+			aFlatList.push({
+				label: sEntityName,
+				isGroupHeader: true
+			});
+
+			// Sort and add elements within this group
+			const aGroupElements = mGroups[sEntityName];
+			aGroupElements.sort(function(a, b) {
+				const sLabelA = (a.label || "").toLowerCase();
+				const sLabelB = (b.label || "").toLowerCase();
+				if (sLabelA < sLabelB) {
+					return bDescending ? 1 : -1;
+				}
+				if (sLabelA > sLabelB) {
+					return bDescending ? -1 : 1;
+				}
+				return 0;
+			});
+
+			aGroupElements.forEach(function(oElement) {
+				aFlatList.push(oElement);
+			});
+		});
+
+		this._oDialogModel.setProperty("/elementsFlat", aFlatList);
+	}
+
 	/**
 	 * Initialize the Dialog
 	 *
@@ -69,12 +221,15 @@ sap.ui.define([
 			customFieldButtonVisible: false,
 			businessContextVisible: false,
 			customFieldButtonTooltip: "",
-			businessContextTexts: [{ text: "" }], // empty element in first place to be replaced by the headerText (see: addExtensibilityInfo)
+			// empty element in first place to be replaced by the headerText (see: addExtensibilityInfo)
+			businessContextTexts: [{ text: "" }],
 			extensibilityMenuButtonActive: false,
 			extensibilityMenuButtonText: "",
 			extensibilityMenuButtonTooltip: "",
 			extensibilityOptions: []
 		});
+		// Increase the default size limit (100) to allow for large numbers of elements. More than 1000 causes performance issues.
+		this._oDialogModel.setSizeLimit(1000);
 
 		this._bDescendingSortOrder = false;
 		this.oRTAResourceModel = new ResourceModel({ bundleName: "sap.ui.rta.messagebundle" });
@@ -111,6 +266,7 @@ sap.ui.define([
 			// retrieve List to set the sorting for the 'items' aggregation, since sap.ui.model.Sorter
 			// does not support binding to a model property...
 			this._oList = Element.getElementById(`${this.getId()}--rta_addElementsDialogList`);
+
 			this._openDialog();
 		}.bind(this));
 	};
@@ -161,11 +317,17 @@ sap.ui.define([
 		});
 		this._oDialog.close();
 		// indicate that the dialog has been closed without choosing to add any fields (canceled)
-		this._fnRejectOnDialogCancel();
+		this._fnRejectOnDialogCancel(new CancelError());
 	};
 
 	AddElementsDialog.prototype.setElements = function(aElements) {
+		if (aElements.length > 1000) {
+			throw new Error("AddElementsDialog: displaying more than 1000 elements is not supported.");
+		}
 		this._oDialogModel.setProperty("/elements", aElements);
+		// Reset filter when new elements are set (e.g., when dialog is reopened)
+		this._sCurrentFilterValue = "";
+		buildElementsList.call(this, aElements);
 	};
 
 	AddElementsDialog.prototype.getElements = function() {
@@ -193,38 +355,128 @@ sap.ui.define([
 	};
 
 	/**
-	 * Resort the list
+	 * Factory function to create list items.
+	 * Creates GroupHeaderListItem for group headers and CustomListItem for regular elements.
+	 *
+	 * @param {string} sId - The ID for the new item
+	 * @param {sap.ui.model.Context} oContext - The binding context
+	 * @returns {sap.m.ListItemBase} The created list item
+	 * @private
+	 */
+	AddElementsDialog.prototype._createListItem = function(sId, oContext) {
+		const oData = oContext.getObject();
+
+		if (oData.isGroupHeader) {
+			// Create a group header item (no checkbox, acts as a divider)
+			return new GroupHeaderListItem(sId, {
+				title: "{label}"
+			});
+		}
+
+		// Get the current filter value for highlighting
+		const sFilterValue = this._sCurrentFilterValue;
+
+		// Build the label text with optional parent property name
+		let sLabelText = oData.label || "";
+		if (oData.parentPropertyName && oData.duplicateName) {
+			sLabelText = `${sLabelText} (${oData.parentPropertyName})`;
+		}
+
+		// Create label with highlighted text if filter is active
+		const sHighlightedLabel = highlightText(sLabelText, sFilterValue);
+		const oLabelText = new FormattedText({
+			htmlText: sHighlightedLabel
+		});
+
+		// Build the original label text with highlighting
+		let oOriginalLabel;
+		if (oData.originalLabel) {
+			const sOriginalLabelText = this.oRTAResourceModel.getProperty("LBL_FREP").replace("{0}", oData.originalLabel);
+			const sHighlightedOriginal = highlightText(sOriginalLabelText, sFilterValue);
+			oOriginalLabel = new FormattedText({
+				htmlText: sHighlightedOriginal
+			});
+		}
+
+		const aVBoxItems = [oLabelText];
+		if (oOriginalLabel) {
+			aVBoxItems.push(oOriginalLabel);
+		}
+
+		const oVBox = new VBox({
+			items: aVBoxItems
+		});
+
+		return new CustomListItem(sId, {
+			content: [oVBox],
+			type: "Active",
+			selected: "{selected}",
+			tooltip: "{tooltip}"
+		}).addStyleClass("sapUIRtaListItem");
+	};
+
+	/**
+	 * Resort the list by rebuilding it with sorted elements
 	 *
 	 * @private
 	 */
 	AddElementsDialog.prototype._resortList = function() {
 		this._bDescendingSortOrder = !this._bDescendingSortOrder;
-		const oBinding = this._oList.getBinding("items");
-		const aSorter = [];
-		aSorter.push(new Sorter("label", this._bDescendingSortOrder));
-		oBinding.sort(aSorter);
+		buildElementsList.call(this, this._oDialogModel.getProperty("/elements"), this._sCurrentFilterValue);
+		this._rebindList();
 	};
 
 	/**
-	 * Updates the model on filter events
+	 * Updates the model on filter events by rebuilding the list with filtered elements
 	 *
 	 * @param {sap.ui.base.Event} oEvent event object
 	 * @private
 	 */
 	AddElementsDialog.prototype._updateModelFilter = function(oEvent) {
 		const sValue = oEvent.getParameter("newValue");
-		const oBinding = this._oList.getBinding("items");
-		if ((typeof sValue) === "string") {
-			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([]);
+		this._sCurrentFilterValue = sValue;
+		buildElementsList.call(this, this._oDialogModel.getProperty("/elements"), sValue);
+		this._rebindList();
+	};
+
+	/**
+	 * Rebinds the list items to force recreation with updated highlighting
+	 *
+	 * @private
+	 */
+	AddElementsDialog.prototype._rebindList = function() {
+		if (this._oList) {
+			// Unbind and rebind to force factory function to be called again
+			this._oList.bindItems({
+				path: "/elementsFlat",
+				factory: this._createListItem.bind(this)
+			});
+		}
+	};
+
+	/**
+	 * Checks if an element matches the filter criteria
+	 *
+	 * @param {object} oElement - The element to check
+	 * @param {string} sFilterValue - The filter value to match
+	 * @returns {boolean} True if the element matches the filter
+	 * @private
+	 */
+	AddElementsDialog.prototype._elementMatchesFilter = function(oElement, sFilterValue) {
+		const sLowerFilterValue = sFilterValue.toLowerCase();
+		// Check label
+		if (oElement.label?.toLowerCase().includes(sLowerFilterValue)) {
+			return true;
+		}
+		// Check originalLabel
+		if (oElement.originalLabel?.toLowerCase().includes(sLowerFilterValue)) {
+			return true;
+		}
+		// Check parentPropertyName (only for duplicates)
+		if (oElement.duplicateName && oElement.parentPropertyName?.toLowerCase().includes(sLowerFilterValue)) {
+			return true;
 		}
+		return false;
 	};
 
 	/**

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

@@ -123,7 +123,7 @@ sap.ui.define([
 	}
 
 	function oPropertyToAdditionalElementInfo(oProperty) {
-		return {
+		const oReturn = {
 			selected: false,
 			label: oProperty.label || oProperty.name,
 			parentPropertyName: oProperty.parentPropertyName ? oProperty.parentPropertyName : "",
@@ -136,6 +136,10 @@ sap.ui.define([
 			name: oProperty.name,
 			bindingPath: oProperty.bindingPath
 		};
+		if (oProperty.entityTypeDisplayName) {
+			oReturn.entityTypeDisplayName = oProperty.entityTypeDisplayName;
+		}
+		return oReturn;
 	}
 
 	function getLabel(oElement, mAction) {
@@ -152,7 +156,7 @@ sap.ui.define([
 	function elementToAdditionalElementInfo(mData) {
 		const oElement = mData.element;
 		const sLabel = getLabel(oElement, mData.action);
-		return {
+		const oReturn = {
 			selected: false,
 			label: oElement.__label || sLabel,
 			tooltip: oElement.__tooltip || sLabel || oElement.__bindingPath,
@@ -165,6 +169,10 @@ sap.ui.define([
 			elementId: oElement.getId(),
 			sourceAggregation: mData.sourceAggregation
 		};
+		if (oElement.__entityTypeDisplayName) {
+			oReturn.entityTypeDisplayName = oElement.__entityTypeDisplayName;
+		}
+		return oReturn;
 	}
 
 	/**
@@ -191,17 +199,36 @@ sap.ui.define([
 		return [oElement];
 	}
 
+	/**
+	 * Marks properties with duplicate labels within the same entity type display name.
+	 * The same entity can have different contexts (e.g. peer and manager both from Person entity),
+	 * that's why we use the display name and not the entity type itself.
+	 *
+	 * @param {object[]} aProperties - Array of property objects
+	 * @returns {object[]} - The same array with duplicateName flag set where applicable
+	 */
 	function checkForDuplicateProperties(aProperties) {
-		aProperties.forEach(function(oModelProperty, index, aProperties) {
-			if (oModelProperty.duplicateName !== true) {
-				for (let j = index + 1; j < aProperties.length - 1; j++) {
-					if (oModelProperty.label === aProperties[j].label) {
-						oModelProperty.duplicateName = true;
-						aProperties[j].duplicateName = true;
-					}
-				}
+		// Group properties by entityType and label to find duplicates
+		const mLabelsByEntityTypeDisplayName = {};
+
+		aProperties.forEach(function(oProperty) {
+			const sEntityTypeDisplayName = oProperty.entityTypeDisplayName || "";
+			const sLabel = oProperty.label || "";
+			const sKey = `${sEntityTypeDisplayName}|||${sLabel}`;
+
+			mLabelsByEntityTypeDisplayName[sKey] ||= [];
+			mLabelsByEntityTypeDisplayName[sKey].push(oProperty);
+		});
+
+		// Mark properties as duplicates if there are multiple with the same entityType display name and label
+		Object.values(mLabelsByEntityTypeDisplayName).forEach(function(aPropertiesWithSameLabel) {
+			if (aPropertiesWithSameLabel.length > 1) {
+				aPropertiesWithSameLabel.forEach(function(oProperty) {
+					oProperty.duplicateName = true;
+				});
 			}
 		});
+
 		return aProperties;
 	}
 
@@ -314,8 +341,10 @@ sap.ui.define([
 	 */
 	function enhanceInvisibleElement(oInvisibleElement, mSomeItem) {
 		oInvisibleElement.__originalLabel = mSomeItem.label;
-
 		oInvisibleElement.__tooltip = mSomeItem.tooltip;
+		if (mSomeItem.entityTypeDisplayName) {
+			oInvisibleElement.__entityTypeDisplayName = mSomeItem.entityTypeDisplayName;
+		}
 
 		// found element
 		oInvisibleElement.__bindingPath = mSomeItem.name;

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

@@ -12,6 +12,7 @@ sap.ui.define([
 	"sap/ui/core/Lib",
 	"sap/ui/dt/OverlayRegistry",
 	"sap/ui/dt/OverlayUtil",
+	"sap/ui/fl/util/CancelError",
 	"sap/ui/fl/write/api/FieldExtensibility",
 	"sap/ui/rta/plugin/additionalElements/ActionExtractor",
 	"sap/ui/rta/plugin/additionalElements/AddElementsDialog",
@@ -28,6 +29,7 @@ sap.ui.define([
 	Lib,
 	OverlayRegistry,
 	OverlayUtil,
+	CancelError,
 	FieldExtensibility,
 	ActionExtractor,
 	AddElementsDialog,
@@ -119,7 +121,7 @@ sap.ui.define([
 	 * @class The plugin allows to add additional elements that exist either hidden in the UI or in the OData service
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.144.0
+	 * @version 1.145.1
 	 * @constructor
 	 * @private
 	 * @since 1.44
@@ -323,8 +325,7 @@ sap.ui.define([
 				const oOverlayToFocus = OverlayRegistry.getOverlay(vSiblingElement) || oResponsibleElementOverlay;
 				oOverlayToFocus.focus();
 			} catch (oError) {
-				// no error means canceled dialog
-				if (oError instanceof Error) {
+				if (!(oError instanceof CancelError)) {
 					throw oError;
 				}
 			}

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

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * Helper object containing methods for the AdditionalElements plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.144.0
+	 * @version 1.145.1
 	 * @private
 	 * @since 1.94
 	 */

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * Helper object to build the RTA commands resulting from the AdditionalElements Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.144.0
+	 * @version 1.145.1
 	 * @private
 	 * @since 1.94
 	 */

package/src/sap/ui/rta/plugin/annotations/AnnotationChangeDialog.fragment.xml

@@ -24,7 +24,7 @@
 					<link>
 						<Link text="{i18n>ANNOTATION_CHANGE_DIALOG_WARNING_MORE_INFO}"
 							target="_blank"
-							href="{path: '/', formatter: '.formatDocumentationUrl'}"/>
+							href="{/documentationUrl}"/>
 					</link>
 				</MessageStrip>
 				<Label