@sapui5/sap.fe.macros 1.141.2 → 1.142.1

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,
@@ -20,8 +23,9 @@ import type {
 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 ResourceModelHelper, { getLocalizedText } from "sap/fe/core/helpers/ResourceModelHelper";
+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 +84,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,
@@ -144,6 +150,15 @@ ChartDelegate._handleProperty = function (
 				if (!unitOfMeasures.includes(oAggregateProperty.path)) {
 					aProperties.push(oAggregateProperty);
 				}
+				if (oAggregateProperty.label.startsWith("{metaModel>")) {
+					oAggregateProperty.label = ModelHelper.fetchTextFromMetaModel(
+						oAggregateProperty.label,
+						undefined,
+						(oMDCChart.getModel() as ODataModel).getMetaModel()
+					);
+				} else {
+					oAggregateProperty.label = getLocalizedText(oAggregateProperty.label, oMDCChart);
+				}
 			});
 			//Add transformation aggregated properties to chart properties
 			if (aModes && aModes.includes("Filter")) {
@@ -239,7 +254,7 @@ function addPropertyToChart(
 	sKey: string,
 	oPropertyAnnotations: MetaModelPropertyAnnotations,
 	isFilterable: boolean,
-	oFilterRestrictionsInfo: _FilterRestrictions,
+	oFilterRestrictionsInfo: FilterRestrictions,
 	isSortable: boolean,
 	oMDCChart: Chart,
 	sCriticality: string,
@@ -297,6 +312,15 @@ function addPropertyToChart(
 				break;
 		}
 	}
+	if (oProperty.label.startsWith("{metaModel>")) {
+		oProperty.label = ModelHelper.fetchTextFromMetaModel(
+			oProperty.label,
+			undefined,
+			(oMDCChart.getModel() as ODataModel).getMetaModel()
+		);
+	} else {
+		oProperty.label = getLocalizedText(oProperty.label, oMDCChart);
+	}
 
 	aProperties.push(oProperty);
 	return aProperties;
@@ -404,7 +428,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 +448,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 +470,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 +478,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);
@@ -627,7 +651,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 },