@sapui5/sap.fe.macros 1.140.0 → 1.141.1

package/src/sap/fe/macros/ai/EasyFilterDataFetcher.ts

@@ -2,6 +2,7 @@ import type { Property } from "@sap-ux/vocabularies-types";
 import type {
 	CodeListType,
 	TokenSelectedValuesDefinition,
+	ValueHelpBetweenSelectedValues,
 	ValueHelpSelectedValuesDefinition
 } from "sap/fe/controls/easyFilter/EasyFilterBarContainer";
 import CommonUtils from "sap/fe/core/CommonUtils";
@@ -60,7 +61,13 @@ async function resolveValueUsingValueList(
 	const path = `/${valueList.valueListInfo.CollectionPath}`;
 	const $select = generateSelectParameter(valueList);
 	let $search = CommonUtils.normalizeSearchTerm(valueToMatch instanceof Date ? valueToMatch.toISOString() : valueToMatch.toString());
-	const keyPropertyFilter = getKeyPropertyFilter(valueList, keyProperty, operator, valueToMatch);
+
+	// Handle negation operators (NE, NotContains, NotStartsWith, NotEndsWith)
+	// Strategy: Query for positive case, then apply negation client-side
+	const isNegation = isNegationOperator(operator);
+	// "cleaned" operator for possible negation operators
+	const cleanedOperator = isNegation ? getPositiveOperator(operator) : operator;
+	const keyPropertyFilter = getKeyPropertyFilter(valueList, keyProperty, cleanedOperator, valueToMatch);
 
 	// Check if the query exceeds the maximum length of the key property
 	const characterLimitOverflow = !$search || $search.length > (keyProperty.maxLength ?? $search.length);
@@ -80,9 +87,12 @@ async function resolveValueUsingValueList(
 		// There is at least one match in the key column:
 		// - If the operator is EQ: This indicates an exact key match, so the returned data will be used.
 		// - For other operators: One or more keys match the value based on the operator, so the original condition is preserved.
-		return operator === FilterOperator.EQ
+		return cleanedOperator === FilterOperator.EQ
 			? { operator, selectedValues: valueHelpKeyQuery.value.map(mapResult) }
-			: { operator, selectedValues: [{ value: valueToMatch, description: valueToMatch }] };
+			: {
+					operator,
+					selectedValues: [{ value: valueToMatch, description: valueToMatch }]
+			  };
 	}
 
 	if (valueHelpSearchQuery.status === "fulfilled" && valueHelpSearchQuery.value.length > 0) {
@@ -90,7 +100,7 @@ async function resolveValueUsingValueList(
 
 		let results = valueHelpSearchQuery.value.map(mapResult);
 
-		if (operator === FilterOperator.EQ) {
+		if (cleanedOperator === FilterOperator.EQ) {
 			const filteredResults = results.filter(
 				(result) => result.description.toString().toLowerCase() === valueToMatch.toString().toLowerCase()
 			);
@@ -99,14 +109,17 @@ async function resolveValueUsingValueList(
 				results = filteredResults;
 			}
 		}
-		return {
-			operator,
-			selectedValues: results
-		};
+
+		return { operator, selectedValues: results };
 	}
 
 	// No matches were found in either query; the original value will be used as a fallback.
-	return { operator, selectedValues: [{ value: valueToMatch, description: valueToMatch }], noMatch: true };
+
+	return {
+		operator,
+		selectedValues: [{ value: valueToMatch, description: valueToMatch }],
+		noMatch: true
+	};
 }
 
 /**
@@ -138,27 +151,6 @@ export function generateSelectParameter(valueList: ValueListInfo): string {
 	return [valueList.keyPath, valueList.descriptionPath].filter((path) => path && !path.includes("/")).join(",");
 }
 
-function handleIntervals(
-	operator: FilterOperator.BT | FilterOperator.NB,
-	resolvedValues: ValueHelpSelectedValuesDefinition[]
-): ValueHelpSelectedValuesDefinition[] {
-	const [resolvedLowerBound, resolvedUpperBound] = resolvedValues;
-
-	const result: ValueHelpSelectedValuesDefinition[] = [];
-	for (const { value: lowerBound, description: lowerBoundText } of resolvedLowerBound.selectedValues) {
-		for (const { value: upperBound, description: upperBoundText } of resolvedUpperBound.selectedValues) {
-			result.push({
-				operator,
-				selectedValues: [
-					{ value: lowerBound, description: lowerBoundText ?? lowerBound },
-					{ value: upperBound, description: upperBoundText ?? upperBound }
-				]
-			});
-		}
-	}
-	return result;
-}
-
 /**
  * Resolves token-based filter values using a value list.
  * @param valueList The value list used for resolving values.
@@ -186,16 +178,33 @@ export async function resolveTokenValue(
 		return unresolvedResult([value]);
 	}
 
-	const resolvedOperator = operator === FilterOperator.BT || operator === FilterOperator.NB ? FilterOperator.EQ : operator; // BT/NB: Use EQ for resolving the lower/upper bounds
-	const resolvedValues = await Promise.all(
-		selectedValues.map(async (selectedValue) =>
-			resolveValueUsingValueList(valueList, keyProperty, resolvedOperator, selectedValue, looseMatch)
-		)
-	);
-
-	return operator === FilterOperator.BT || operator === FilterOperator.NB
-		? handleIntervals(operator, resolvedValues)
-		: resolvedValues.flat();
+	// For comparison operators (GreaterThan, LessThan, Between, etc.), skip backend calls
+	// and return user input directly to EasyFilter
+	if (isComparisonOperator(operator)) {
+		if (operator === FilterOperator.BT || operator === FilterOperator.NB) {
+			// Handle Between/Not Between operators - they expect exactly 2 values
+			const [lowerBound, upperBound] = selectedValues;
+			return [
+				{
+					operator,
+					selectedValues: [
+						{ value: lowerBound, description: lowerBound },
+						{ value: upperBound, description: upperBound }
+					] as ValueHelpBetweenSelectedValues
+				}
+			];
+		} else {
+			// Handle other comparison operators (GT, GE, LT, LE)
+			return unresolvedResult([value]);
+		}
+	} else {
+		const resolvedValues = await Promise.all(
+			selectedValues.map(async (selectedValue) =>
+				resolveValueUsingValueList(valueList, keyProperty, operator as ScalarOperator, selectedValue, looseMatch)
+			)
+		);
+		return resolvedValues.flat();
+	}
 }
 
 /**
@@ -209,3 +218,43 @@ export function unresolvedResult(values: TokenSelectedValuesDefinition[]): Value
 		selectedValues: selectedValues.map((value) => ({ value, description: value }))
 	})) as ValueHelpSelectedValuesDefinition[];
 }
+
+/**
+ * Checks if the operator is a negation operator (NE, NotContains, NotStartsWith, NotEndsWith).
+ * @param operator The filter operator to check.
+ * @returns True if the operator is a negation operator.
+ */
+function isNegationOperator(operator: FilterOperator): boolean {
+	return [FilterOperator.NE, FilterOperator.NotContains, FilterOperator.NotStartsWith, FilterOperator.NotEndsWith].includes(operator);
+}
+
+/**
+ * Checks if the operator is a comparison operator (GT, GE, LT, LE, BT, NB).
+ * @param operator The filter operator to check.
+ * @returns True if the operator is a comparison operator.
+ */
+function isComparisonOperator(operator: FilterOperator): boolean {
+	return [FilterOperator.GT, FilterOperator.GE, FilterOperator.LT, FilterOperator.LE, FilterOperator.BT, FilterOperator.NB].includes(
+		operator
+	);
+}
+
+/**
+ * Converts a negation operator to its positive equivalent (NE -> EQ, NotContains -> Contains, etc.).
+ * @param negationOperator The negation operator to convert.
+ * @returns The corresponding positive operator.
+ */
+export function getPositiveOperator(negationOperator: FilterOperator): ScalarOperator {
+	switch (negationOperator) {
+		case FilterOperator.NE:
+			return FilterOperator.EQ;
+		case FilterOperator.NotContains:
+			return FilterOperator.Contains;
+		case FilterOperator.NotStartsWith:
+			return FilterOperator.StartsWith;
+		case FilterOperator.NotEndsWith:
+			return FilterOperator.EndsWith;
+		default:
+			return FilterOperator.EQ;
+	}
+}

package/src/sap/fe/macros/chart/Chart.js

@@ -26,7 +26,7 @@ sap.ui.define(["sap/base/Log", "sap/fe/base/ClassSupport", "../Chart"], function
    * This is currently an experimental API because the structure of the generated content will change to come closer to the Chart that you get out of templates.
    * The public method and property will not change but the internal structure will so be careful on your usage.
    * @public
-   * @experimental
+   * @ui5-experimental-since
    * @mixes sap.fe.macros.Chart
    * @augments sap.ui.core.Control
    * @deprecatedsince 1.130
@@ -44,4 +44,4 @@ sap.ui.define(["sap/base/Log", "sap/fe/base/ClassSupport", "../Chart"], function
   _exports = Chart;
   return _exports;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJDaGFydCIsIl9kZWMiLCJkZWZpbmVVSTVDbGFzcyIsIl9jbGFzcyIsIl9DaGFydEJsb2NrIiwicHJvcHMiLCJvdGhlcnMiLCJMb2ciLCJ3YXJuaW5nIiwiY2FsbCIsIl9leHBvcnRzIiwiX2luaGVyaXRzTG9vc2UiLCJDaGFydEJsb2NrIl0sInNvdXJjZVJvb3QiOiIuIiwic291cmNlcyI6WyJDaGFydC50c3giXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IExvZyBmcm9tIFwic2FwL2Jhc2UvTG9nXCI7XG5pbXBvcnQgeyBkZWZpbmVVSTVDbGFzcywgdHlwZSBQcm9wZXJ0aWVzT2YgfSBmcm9tIFwic2FwL2ZlL2Jhc2UvQ2xhc3NTdXBwb3J0XCI7XG5pbXBvcnQgdHlwZSB7ICRDb250cm9sU2V0dGluZ3MgfSBmcm9tIFwic2FwL3VpL21kYy9Db250cm9sXCI7XG5pbXBvcnQgQ2hhcnRCbG9jayBmcm9tIFwiLi4vQ2hhcnRcIjtcblxuLyoqXG4gKiBCdWlsZGluZyBibG9jayB1c2VkIHRvIGNyZWF0ZSBhIGNoYXJ0IGJhc2VkIG9uIHRoZSBtZXRhZGF0YSBwcm92aWRlZCBieSBPRGF0YSBWNC5cbiAqIDxicj5cbiAqIFVzdWFsbHksIGEgY29udGV4dFBhdGggYW5kIG1ldGFQYXRoIGlzIGV4cGVjdGVkLlxuICpcbiAqIFVzYWdlIGV4YW1wbGU6XG4gKiA8cHJlPlxuICogc2FwLnVpLnJlcXVpcmUoW1wic2FwL2ZlL21hY3Jvcy9jaGFydC9DaGFydFwiXSwgZnVuY3Rpb24oQ2hhcnQpIHtcbiAqIFx0IC4uLlxuICogXHQgbmV3IENoYXJ0KFwibXlDaGFydFwiLCB7bWV0YVBhdGg6XCJNeUNoYXJ0XCJ9KVxuICogfSlcbiAqIDwvcHJlPlxuICpcbiAqIFRoaXMgaXMgY3VycmVudGx5IGFuIGV4cGVyaW1lbnRhbCBBUEkgYmVjYXVzZSB0aGUgc3RydWN0dXJlIG9mIHRoZSBnZW5lcmF0ZWQgY29udGVudCB3aWxsIGNoYW5nZSB0byBjb21lIGNsb3NlciB0byB0aGUgQ2hhcnQgdGhhdCB5b3UgZ2V0IG91dCBvZiB0ZW1wbGF0ZXMuXG4gKiBUaGUgcHVibGljIG1ldGhvZCBhbmQgcHJvcGVydHkgd2lsbCBub3QgY2hhbmdlIGJ1dCB0aGUgaW50ZXJuYWwgc3RydWN0dXJlIHdpbGwgc28gYmUgY2FyZWZ1bCBvbiB5b3VyIHVzYWdlLlxuICogQHB1YmxpY1xuICogQGV4cGVyaW1lbnRhbFxuICogQG1peGVzIHNhcC5mZS5tYWNyb3MuQ2hhcnRcbiAqIEBhdWdtZW50cyBzYXAudWkuY29yZS5Db250cm9sXG4gKiBAZGVwcmVjYXRlZHNpbmNlIDEuMTMwXG4gKiBAZGVwcmVjYXRlZCBVc2Uge0BsaW5rIHNhcC5mZS5tYWNyb3MuQ2hhcnR9IGluc3RlYWRcbiAqL1xuQGRlZmluZVVJNUNsYXNzKFwic2FwLmZlLm1hY3Jvcy5jaGFydC5DaGFydFwiKVxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgQ2hhcnQgZXh0ZW5kcyBDaGFydEJsb2NrIHtcblx0Y29uc3RydWN0b3IocHJvcHM/OiBQcm9wZXJ0aWVzT2Y8Q2hhcnRCbG9jaz4gJiAkQ29udHJvbFNldHRpbmdzLCBvdGhlcnM/OiAkQ29udHJvbFNldHRpbmdzKSB7XG5cdFx0TG9nLndhcm5pbmcoXCJZb3UndmUgY29uc3VtZWQgZGVwcmVjYXRlZCBDaGFydCBjbGFzcy4gVXNlIHNhcC5mZS5tYWNyb3MuQ2hhcnQgaW5zdGVhZFwiKTtcblx0XHRzdXBlcihwcm9wcywgb3RoZXJzKTtcblx0fVxufVxuIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7RUFLQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtFQXJCQSxJQXVCcUJBLEtBQUssSUFBQUMsSUFBQSxHQUR6QkMsY0FBYyxDQUFDLDJCQUEyQixDQUFDLEVBQUFELElBQUEsQ0FBQUUsTUFBQSwwQkFBQUMsV0FBQTtJQUUzQyxTQUFBSixNQUFZSyxLQUFtRCxFQUFFQyxNQUF5QixFQUFFO01BQzNGQyxHQUFHLENBQUNDLE9BQU8sQ0FBQyx5RUFBeUUsQ0FBQztNQUFDLE9BQ3ZGSixXQUFBLENBQUFLLElBQUEsT0FBTUosS0FBSyxFQUFFQyxNQUFNLENBQUM7SUFDckI7SUFBQ0ksUUFBQSxHQUFBVixLQUFBO0lBQUFXLGNBQUEsQ0FBQVgsS0FBQSxFQUFBSSxXQUFBO0lBQUEsT0FBQUosS0FBQTtFQUFBLEVBSmlDWSxVQUFVLE1BQUFULE1BQUE7RUFBQU8sUUFBQSxHQUFBVixLQUFBO0VBQUEsT0FBQVUsUUFBQTtBQUFBIiwiaWdub3JlTGlzdCI6W119
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJDaGFydCIsIl9kZWMiLCJkZWZpbmVVSTVDbGFzcyIsIl9jbGFzcyIsIl9DaGFydEJsb2NrIiwicHJvcHMiLCJvdGhlcnMiLCJMb2ciLCJ3YXJuaW5nIiwiY2FsbCIsIl9leHBvcnRzIiwiX2luaGVyaXRzTG9vc2UiLCJDaGFydEJsb2NrIl0sInNvdXJjZVJvb3QiOiIuIiwic291cmNlcyI6WyJDaGFydC50c3giXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IExvZyBmcm9tIFwic2FwL2Jhc2UvTG9nXCI7XG5pbXBvcnQgeyBkZWZpbmVVSTVDbGFzcywgdHlwZSBQcm9wZXJ0aWVzT2YgfSBmcm9tIFwic2FwL2ZlL2Jhc2UvQ2xhc3NTdXBwb3J0XCI7XG5pbXBvcnQgdHlwZSB7ICRDb250cm9sU2V0dGluZ3MgfSBmcm9tIFwic2FwL3VpL21kYy9Db250cm9sXCI7XG5pbXBvcnQgQ2hhcnRCbG9jayBmcm9tIFwiLi4vQ2hhcnRcIjtcblxuLyoqXG4gKiBCdWlsZGluZyBibG9jayB1c2VkIHRvIGNyZWF0ZSBhIGNoYXJ0IGJhc2VkIG9uIHRoZSBtZXRhZGF0YSBwcm92aWRlZCBieSBPRGF0YSBWNC5cbiAqIDxicj5cbiAqIFVzdWFsbHksIGEgY29udGV4dFBhdGggYW5kIG1ldGFQYXRoIGlzIGV4cGVjdGVkLlxuICpcbiAqIFVzYWdlIGV4YW1wbGU6XG4gKiA8cHJlPlxuICogc2FwLnVpLnJlcXVpcmUoW1wic2FwL2ZlL21hY3Jvcy9jaGFydC9DaGFydFwiXSwgZnVuY3Rpb24oQ2hhcnQpIHtcbiAqIFx0IC4uLlxuICogXHQgbmV3IENoYXJ0KFwibXlDaGFydFwiLCB7bWV0YVBhdGg6XCJNeUNoYXJ0XCJ9KVxuICogfSlcbiAqIDwvcHJlPlxuICpcbiAqIFRoaXMgaXMgY3VycmVudGx5IGFuIGV4cGVyaW1lbnRhbCBBUEkgYmVjYXVzZSB0aGUgc3RydWN0dXJlIG9mIHRoZSBnZW5lcmF0ZWQgY29udGVudCB3aWxsIGNoYW5nZSB0byBjb21lIGNsb3NlciB0byB0aGUgQ2hhcnQgdGhhdCB5b3UgZ2V0IG91dCBvZiB0ZW1wbGF0ZXMuXG4gKiBUaGUgcHVibGljIG1ldGhvZCBhbmQgcHJvcGVydHkgd2lsbCBub3QgY2hhbmdlIGJ1dCB0aGUgaW50ZXJuYWwgc3RydWN0dXJlIHdpbGwgc28gYmUgY2FyZWZ1bCBvbiB5b3VyIHVzYWdlLlxuICogQHB1YmxpY1xuICogQHVpNS1leHBlcmltZW50YWwtc2luY2VcbiAqIEBtaXhlcyBzYXAuZmUubWFjcm9zLkNoYXJ0XG4gKiBAYXVnbWVudHMgc2FwLnVpLmNvcmUuQ29udHJvbFxuICogQGRlcHJlY2F0ZWRzaW5jZSAxLjEzMFxuICogQGRlcHJlY2F0ZWQgVXNlIHtAbGluayBzYXAuZmUubWFjcm9zLkNoYXJ0fSBpbnN0ZWFkXG4gKi9cbkBkZWZpbmVVSTVDbGFzcyhcInNhcC5mZS5tYWNyb3MuY2hhcnQuQ2hhcnRcIilcbmV4cG9ydCBkZWZhdWx0IGNsYXNzIENoYXJ0IGV4dGVuZHMgQ2hhcnRCbG9jayB7XG5cdGNvbnN0cnVjdG9yKHByb3BzPzogUHJvcGVydGllc09mPENoYXJ0QmxvY2s+ICYgJENvbnRyb2xTZXR0aW5ncywgb3RoZXJzPzogJENvbnRyb2xTZXR0aW5ncykge1xuXHRcdExvZy53YXJuaW5nKFwiWW91J3ZlIGNvbnN1bWVkIGRlcHJlY2F0ZWQgQ2hhcnQgY2xhc3MuIFVzZSBzYXAuZmUubWFjcm9zLkNoYXJ0IGluc3RlYWRcIik7XG5cdFx0c3VwZXIocHJvcHMsIG90aGVycyk7XG5cdH1cbn1cbiJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0VBS0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7RUFyQkEsSUF1QnFCQSxLQUFLLElBQUFDLElBQUEsR0FEekJDLGNBQWMsQ0FBQywyQkFBMkIsQ0FBQyxFQUFBRCxJQUFBLENBQUFFLE1BQUEsMEJBQUFDLFdBQUE7SUFFM0MsU0FBQUosTUFBWUssS0FBbUQsRUFBRUMsTUFBeUIsRUFBRTtNQUMzRkMsR0FBRyxDQUFDQyxPQUFPLENBQUMseUVBQXlFLENBQUM7TUFBQyxPQUN2RkosV0FBQSxDQUFBSyxJQUFBLE9BQU1KLEtBQUssRUFBRUMsTUFBTSxDQUFDO0lBQ3JCO0lBQUNJLFFBQUEsR0FBQVYsS0FBQTtJQUFBVyxjQUFBLENBQUFYLEtBQUEsRUFBQUksV0FBQTtJQUFBLE9BQUFKLEtBQUE7RUFBQSxFQUppQ1ksVUFBVSxNQUFBVCxNQUFBO0VBQUFPLFFBQUEsR0FBQVYsS0FBQTtFQUFBLE9BQUFVLFFBQUE7QUFBQSIsImlnbm9yZUxpc3QiOltdfQ==

package/src/sap/fe/macros/chart/Chart.tsx

@@ -19,7 +19,7 @@ import ChartBlock from "../Chart";
  * This is currently an experimental API because the structure of the generated content will change to come closer to the Chart that you get out of templates.
  * The public method and property will not change but the internal structure will so be careful on your usage.
  * @public
- * @experimental
+ * @ui5-experimental-since
  * @mixes sap.fe.macros.Chart
  * @augments sap.ui.core.Control
  * @deprecatedsince 1.130