@sapui5/sap.fe.macros 1.141.1 → 1.142.0

package/src/sap/fe/macros/CommonHelper.ts

@@ -14,9 +14,13 @@ import type { FilterSettings } from "sap/fe/core/converters/ManifestSettings";
 
 import type { PropertyPath } from "@sap-ux/vocabularies-types";
 import { aiIcon, type CustomAction } from "sap/fe/core/converters/controls/Common/Action";
+import FilterRestrictions from "sap/fe/core/converters/controls/Common/filter/FilterRestrictions";
+import * as MetaModelConverter from "sap/fe/core/converters/MetaModelConverter";
 import { convertTypes } from "sap/fe/core/converters/MetaModelConverter";
+import type { PageContextPathTarget } from "sap/fe/core/converters/TemplateConverter";
 import { isPropertyFilterable } from "sap/fe/core/helpers/MetaModelFunction";
 import ModelHelper from "sap/fe/core/helpers/ModelHelper";
+import type { DataModelObjectPath } from "sap/fe/core/templating/DataModelPathHelper";
 import type { ComputedAnnotationInterface } from "sap/fe/core/templating/UIFormatters";
 import * as DefaultSemanticDateOperators from "sap/fe/macros/filterBar/DefaultSemanticDateOperators";
 import ExtendedSemanticDateOperators from "sap/fe/macros/filterBar/ExtendedSemanticDateOperators";
@@ -68,30 +72,23 @@ function _isOperatorExcludedByManifest(operatorName: string, oSettings: FilterSe
 }
 
 /**
- * Helper function to get Empty/NotEmpty operators with manifest configuration support.
+ * Helper function to get Empty operators with manifest configuration support.
  * @param sType The field type
  * @param oSettings The settings object containing operator configuration
+ * @param bSemanticDateRange Flag indicating if semantic date range is used
  * @returns Array of Empty/NotEmpty operators if not excluded by manifest
  */
-function _getEmptyOps(sType: string, oSettings: FilterSettings | undefined): string[] {
-	// Only return Empty/NotEmpty for date types
-	if (sType !== "Edm.Date" && sType !== "Edm.DateTimeOffset") {
+function _getEmptyOps(sType: string, oSettings: FilterSettings | undefined, bSemanticDateRange: boolean): string[] {
+	// Only return Empty for date types
+	if ((sType !== "Edm.Date" && sType !== "Edm.DateTimeOffset") || !bSemanticDateRange) {
 		return [];
 	}
-
 	const result: string[] = [];
-
-	// Check manifest configuration and add operators in correct order (NotEmpty first to match test expectations)
-	const notEmptyExcluded = _isOperatorExcludedByManifest("NotEmpty", oSettings);
+	// Check manifest configuration and add operators
 	const emptyExcluded = _isOperatorExcludedByManifest("Empty", oSettings);
-
-	if (!notEmptyExcluded) {
-		result.push("NotEmpty");
-	}
 	if (!emptyExcluded) {
 		result.push("Empty");
 	}
-
 	return result;
 }
 
@@ -1061,7 +1058,10 @@ const CommonHelper = {
 		bUseSemanticDateRange?: boolean | string,
 		settings?: FilterSettings | string
 	): string[] {
-		const oFilterRestrictions = CommonUtils.getFilterRestrictionsByPath(sEntitySetPath, oContext);
+		const dataModel = MetaModelConverter.getInvolvedDataModelObjects(oContext.getContext(sEntitySetPath));
+		const oFilterRestrictions = FilterRestrictions.getFilterRestrictionsByDataModel(
+			dataModel as DataModelObjectPath<PageContextPathTarget>
+		);
 		const aEqualsOps = ["EQ"];
 		const aSingleRangeOps = ["EQ", "GE", "LE", "LT", "GT", "BT", "NE", "NOTBT", "NOTLE", "NOTLT", "NOTGE", "NOTGT"];
 		const aSingleRangeDTBasicOps = ["EQ", "BT"];
@@ -1072,8 +1072,8 @@ const CommonHelper = {
 		let aSemanticDateOps: string[] = [];
 		const oSettings = settings && typeof settings === "string" ? JSON.parse(settings).customData : settings;
 
-		// Initialize Empty/NotEmpty operators based on field type and manifest settings
-		const emptyOps = _getEmptyOps(sType || "", oSettings);
+		// Initialize Empty operators based on field type and manifest settings
+		const emptyOps = _getEmptyOps(sType || "", oSettings, bSemanticDateRange);
 
 		if ((oContext.getObject(`${sEntitySetPath}/@com.sap.vocabularies.Common.v1.ResultContext`) as unknown) === true) {
 			return aEqualsOps;
@@ -1109,14 +1109,7 @@ const CommonHelper = {
 			switch (sAllowedExpression) {
 				case "SingleValue":
 					const singleValueDateOps = DefaultSemanticDateOperators.getSingleValueDateOperations();
-					let aSingleValueOps: string[];
-					if (sType === "Edm.Date" && bSemanticDateRange) {
-						aSingleValueOps = [...singleValueDateOps, ...emptyOps];
-					} else if (sType === "Edm.Date" || sType === "Edm.DateTimeOffset") {
-						aSingleValueOps = [...aEqualsOps, ...emptyOps]; // ["EQ", "Empty", "NotEmpty"]
-					} else {
-						aSingleValueOps = aEqualsOps; // ["EQ"]
-					}
+					const aSingleValueOps = sType === "Edm.Date" && bSemanticDateRange ? singleValueDateOps : aEqualsOps;
 					restrictions = _getRestrictions(supportedOperators, aSingleValueOps);
 					break;
 				case "MultiValue":
@@ -1160,7 +1153,7 @@ const CommonHelper = {
 		// In case AllowedExpressions is not provided for type Edm.Date then all the default
 		// operators for the type should be returned excluding semantic operators from the list.
 		const aDefaultOperators = _getDefaultOperators(propertyType);
-		const aMultiRangeOps = ["EQ", "GE", "LE", "LT", "GT", "BT", "NE", "NOTBT", "NOTLE", "NOTLT", "NOTGE", "NOTGT", "Empty", "NotEmpty"];
+		const aMultiRangeOps = ["EQ", "GE", "LE", "LT", "GT", "BT", "NE", "NOTBT", "NOTLE", "NOTLT", "NOTGE", "NOTGT", "Empty"];
 		return _getRestrictions(aDefaultOperators, aMultiRangeOps);
 	},
 	getAIIcon: function (): string {