@sapui5/sap.fe.macros 1.141.2 → 1.143.0

package/src/sap/fe/macros/chart/ChartDelegate.ts

@@ -7,10 +7,13 @@ import type sapChart from "sap/chart/Chart";
 import TimeUnitType from "sap/chart/TimeUnitType";
 import type { SelectionMode } from "sap/chart/library";
 import type { CompiledBindingToolkitExpression } from "sap/fe/base/BindingToolkit";
-import type { _FilterRestrictions } from "sap/fe/core/CommonUtils";
 import CommonUtils from "sap/fe/core/CommonUtils";
 import type { MetaModelPropertyAnnotations } from "sap/fe/core/converters/MetaModelConverter";
+import * as MetaModelConverter from "sap/fe/core/converters/MetaModelConverter";
+import type { PageContextPathTarget } from "sap/fe/core/converters/TemplateConverter";
 import type { ChartApplySupported } from "sap/fe/core/converters/controls/Common/Chart";
+import type { FilterRestrictions } from "sap/fe/core/converters/controls/Common/filter/FilterRestrictions";
+import FetchFilterRestrictions from "sap/fe/core/converters/controls/Common/filter/FilterRestrictions";
 import valueFormatters from "sap/fe/core/formatters/ValueFormatter";
 import type {
 	FilterRestrictionsPropertyInfoType,
@@ -19,9 +22,9 @@ import type {
 } from "sap/fe/core/helpers/MetaModelFunction";
 import { getFilterableData, getSortRestrictionsInfo, isMultiValueFilterExpression } from "sap/fe/core/helpers/MetaModelFunction";
 import type { InternalModelContext } from "sap/fe/core/helpers/ModelHelper";
-import ModelHelper from "sap/fe/core/helpers/ModelHelper";
 import ResourceModelHelper from "sap/fe/core/helpers/ResourceModelHelper";
-import type { CollectionBindingInfo } from "sap/fe/macros/CollectionBindingInfo";
+import type { DataModelObjectPath } from "sap/fe/core/templating/DataModelPathHelper";
+import type { SerializedCollectionBindingInfo } from "sap/fe/macros/CollectionBindingInfo";
 import CommonHelper from "sap/fe/macros/CommonHelper";
 import type { PropertyInfo } from "sap/fe/macros/DelegateUtil";
 import MacrosDelegateUtil from "sap/fe/macros/DelegateUtil";
@@ -80,8 +83,10 @@ ChartDelegate._handleProperty = function (
 	const sortRestrictionsInfo = getSortRestrictionsInfo(mEntitySetAnnotations);
 	const metaModel = oContext.getModel();
 	const entityTypePath = oMDCChart.data("entityType");
-	const bindingPath = ModelHelper.getEntitySetPath(entityTypePath);
-	const filterRestrictions: _FilterRestrictions = CommonUtils.getFilterRestrictionsByPath(bindingPath, metaModel);
+	const dataModel = MetaModelConverter.getInvolvedDataModelObjects(metaModel.getContext(entityTypePath));
+	const filterRestrictions: FilterRestrictions = FetchFilterRestrictions.getFilterRestrictionsByDataModel(
+		dataModel as DataModelObjectPath<PageContextPathTarget>
+	);
 	const propertyFilterableData: Record<string, FilterRestrictionsPropertyInfoType> = {};
 	getFilterableData(
 		propertyFilterableData,
@@ -239,7 +244,7 @@ function addPropertyToChart(
 	sKey: string,
 	oPropertyAnnotations: MetaModelPropertyAnnotations,
 	isFilterable: boolean,
-	oFilterRestrictionsInfo: _FilterRestrictions,
+	oFilterRestrictionsInfo: FilterRestrictions,
 	isSortable: boolean,
 	oMDCChart: Chart,
 	sCriticality: string,
@@ -404,7 +409,7 @@ ChartDelegate._updateIllustratedMessage = function (oChart: Chart, illustratedMe
 	const noDataControl = oChart.getNoData() as IllustratedMessage;
 	noDataControl.setTitle(illustratedMessageDetail.title);
 	noDataControl.setDescription(illustratedMessageDetail.description);
-	noDataControl.setIllustrationType(illustratedMessageDetail.illustrationType || IllustratedMessageType.NoData);
+	noDataControl.setIllustrationType(illustratedMessageDetail.illustrationType || IllustratedMessageType.NoEntries);
 	noDataControl.setIllustrationSize(illustratedMessageDetail.illustrationSize || IllustratedMessageSize.Auto);
 };
 
@@ -424,13 +429,13 @@ ChartDelegate.setChartNoDataIllustratedMessage = function (chart: Chart, binding
 			return {
 				title: resourceModel.getText("T_ILLUSTRATED_MESSAGE_TITLE_NOSEARCHRESULTS", undefined, suffixResourceKey),
 				description: resourceModel.getText("M_TABLE_AND_CHART_NO_DATA_TEXT_MULTI_VIEW", undefined, suffixResourceKey),
-				illustrationType: IllustratedMessageType.NoSearchResults
+				illustrationType: IllustratedMessageType.NoFilterResults
 			};
 		}
 		return {
 			title: resourceModel.getText("T_ILLUSTRATED_MESSAGE_TITLE_NOSEARCHRESULTS", undefined, suffixResourceKey),
 			description: resourceModel.getText("T_TABLE_AND_CHART_NO_DATA_TEXT_WITH_FILTER", undefined, suffixResourceKey),
-			illustrationType: IllustratedMessageType.NoSearchResults,
+			illustrationType: IllustratedMessageType.NoFilterResults,
 			illustrationSize: converterType === "ObjectPage" ? IllustratedMessageSize.Small : IllustratedMessageSize.Auto
 		};
 	};
@@ -446,7 +451,7 @@ ChartDelegate.setChartNoDataIllustratedMessage = function (chart: Chart, binding
 		illustratedInformation = {
 			title: resourceModel.getText("T_ILLUSTRATED_MESSAGE_TITLE_NODATA", undefined, suffixResourceKey),
 			description: resourceModel.getText("M_TABLE_AND_CHART_NO_FILTERS_NO_DATA_TEXT", undefined, suffixResourceKey),
-			illustrationType: IllustratedMessageType.NoData,
+			illustrationType: IllustratedMessageType.NoEntries,
 			illustrationSize: IllustratedMessageSize.Small
 		};
 	}
@@ -454,7 +459,7 @@ ChartDelegate.setChartNoDataIllustratedMessage = function (chart: Chart, binding
 	ChartDelegate._updateIllustratedMessage(chart, illustratedInformation);
 };
 
-ChartDelegate.updateBindingInfo = function (oChart: Chart, oBindingInfo: CollectionBindingInfo): void {
+ChartDelegate.updateBindingInfo = function (oChart: Chart, oBindingInfo: SerializedCollectionBindingInfo): void {
 	const internalBindingContext = oChart.getBindingContext("internal") as InternalModelContext;
 
 	internalBindingContext.setProperty("isInsightsEnabled", true);
@@ -492,13 +497,14 @@ ChartDelegate.updateBindingInfo = function (oChart: Chart, oBindingInfo: Collect
 
 	// remove prefixes so that entityset will match with the property names with these field
 	if (oFilterInfo.filters) {
-		oFilterInfo.filters.forEach((element) => {
+		oFilterInfo.filters.forEach((element: Filter) => {
 			if (element.getPath()) {
 				(element as unknown as { sPath: string }).sPath = (oChart.getParent() as ChartType).getChartPropertiesWithoutPrefixes(
 					element.getPath()!
 				);
 			}
 		});
+		oFilterInfo.filters = ChartDelegate._removeSiblingEntityForDraftChart(oFilterInfo.filters);
 	}
 	oBindingInfo.events ??= {};
 	oBindingInfo.events.dataRequested = (oChart.getParent() as ChartType).onInternalDataRequested.bind(oChart.getParent());
@@ -511,7 +517,6 @@ ChartDelegate.updateBindingInfo = function (oChart: Chart, oBindingInfo: Collect
 ChartDelegate.fetchProperties = async function (oMDCChart: Chart): Promise<PropertyInfo[]> {
 	const oModel = this._getModel(oMDCChart);
 	let pCreatePropertyInfos: Promise<PropertyInfo[]>;
-
 	if (!oModel) {
 		pCreatePropertyInfos = new Promise<ODataModel>((resolve): void => {
 			oMDCChart.attachModelContextChange(
@@ -546,6 +551,33 @@ function onModelContextChange(this: typeof ChartDelegate, oEvent: UI5Event<{}, C
 		oData.resolver(oModel);
 	}
 }
+
+ChartDelegate._removeSiblingEntityForDraftChart = function (items: Filter[]): Filter[] {
+	if (!items?.length) {
+		return [];
+	}
+
+	return items
+		.map((item: Filter) => {
+			if (item.getPath() === "SiblingEntity/IsActiveEntity" || item.getPath() === "IsActiveEntity") {
+				return null;
+			}
+
+			if (item.getFilters()?.length) {
+				const filteredChildren = ChartDelegate._removeSiblingEntityForDraftChart(item.getFilters());
+
+				if (filteredChildren.length) {
+					return item;
+				}
+			} else if (item.getPath()) {
+				return item;
+			} else {
+				return null;
+			}
+		})
+		.filter((item: Filter | null | undefined): item is Filter => item !== null && item !== undefined);
+};
+
 ChartDelegate._createPropertyInfos = async function (oMDCChart: Chart, oModel: ODataModel): Promise<PropertyInfo[]> {
 	const sEntitySetPath = `/${oMDCChart.data("entitySet")}`;
 
@@ -627,7 +659,7 @@ ChartDelegate._createPropertyInfosForAggregatable = function (
 	oMDCChart: Chart,
 	sKey: string,
 	oPropertyAnnotations: MetaModelPropertyAnnotations,
-	oFilterRestrictionsInfo: _FilterRestrictions,
+	oFilterRestrictionsInfo: FilterRestrictions,
 	sortRestrictionsInfo: SortRestrictionsInfoType,
 	mKnownAggregatableProps: Record<string, Record<string, { label: string; name: string }>>,
 	mCustomAggregates: { [propertyName: string]: unknown },