@provoly/dashboard 0.14.9 → 0.14.11

package/fesm2022/provoly-dashboard-widgets-widget-aggregated-chart.mjs

@@ -150,18 +150,29 @@ class WidgetAggregatedChartComponent extends DataWidgetComponent {
             const ordinate = classes
                 .map((clazz) => clazz.attributes.find((attr) => attr.id === options.ordinate.attribute))
                 .find((attr) => !!attr);
+            const groupBy = classes
+                .map((clazz) => clazz.attributes.find((attr) => attr.id === options.groupBy?.attribute))
+                .find((attr) => !!attr);
             const abscissaFieldType = fields.find((field) => field.id === abscissa?.field)?.type ?? FieldType.STRING;
             const ordinateFieldType = fields.find((field) => field.id === ordinate?.field)?.type ?? FieldType.STRING;
+            const groupByFieldType = fields.find((field) => field.id === groupBy?.field)?.type ?? FieldType.STRING;
             return {
                 abscissa: {
                     fieldType: abscissaFieldType,
-                    vegaType: this.translateToVegaType(abscissaFieldType, abscissa?.name ?? '')
+                    vegaType: this.translateToVegaType(abscissaFieldType, abscissa?.name ?? ''),
+                    name: abscissa?.name ?? ''
                 },
                 ordinate: {
                     fieldType: ordinateFieldType,
                     vegaType: options.ordinate.operation === Operation.COUNT || options.ordinate.operation === Operation.DISTINCT
                         ? VegaType.QUANTITATIVE
-                        : this.translateToVegaType(ordinateFieldType, ordinate?.name ?? '')
+                        : this.translateToVegaType(ordinateFieldType, ordinate?.name ?? ''),
+                    name: ordinate?.name ?? ''
+                },
+                groupBy: {
+                    fieldType: groupByFieldType,
+                    vegaType: this.translateToVegaType(groupByFieldType, groupBy?.name),
+                    name: groupBy?.name ?? ''
                 }
             };
         }));
@@ -192,6 +203,7 @@ class WidgetAggregatedChartComponent extends DataWidgetComponent {
         ]).pipe(map(([options, types, values, size, display]) => {
             const isCircular = [GraphType.CIRCULAR, GraphType.DONUT].includes(options.graph.type);
             const stacked = options.graph.type.startsWith('bar') ? !options.graph.stacked : options.graph.stacked;
+            const legendTitle = this.translateService.instant(options.groupBy ? types.groupBy.name ?? '' : '@pry.widget.chart.legendLabel');
             return mergeDeep({
                 $schema: 'https://vega.github.io/schema/vega-lite/v5.json',
                 title: this.getTitle(options),
@@ -252,7 +264,7 @@ class WidgetAggregatedChartComponent extends DataWidgetComponent {
                                 : undefined,
                             theta: isCircular ? { field: 'value', type: types.ordinate.vegaType } : undefined,
                             color: {
-                                title: this.translateService.instant(options.groupBy ? '@pry.widget.chart.series' : '@pry.widget.chart.legendLabel'),
+                                title: legendTitle,
                                 field: !isCircular ? 'series' : 'key',
                                 legend: options.graph.legend,
                                 scale: options.graph.legend ? { scheme: options.groupBy?.color ?? this.schemes[0].id } : undefined
@@ -270,7 +282,7 @@ class WidgetAggregatedChartComponent extends DataWidgetComponent {
                                         { field: 'value', type: types.ordinate.vegaType, title: options.ordinate.label },
                                         {
                                             field: 'series',
-                                            title: this.translateService.instant('@pry.widget.chart.series'),
+                                            title: legendTitle,
                                             type: 'nominal'
                                         }
                                     ]
@@ -301,7 +313,9 @@ class WidgetAggregatedChartComponent extends DataWidgetComponent {
                     renderer: 'canvas',
                     formatLocale: this.translateService.instantObject('@pry.widget.chart.numberLocale'),
                     timeFormatLocale: this.translateService.instantObject('@pry.widget.chart.timeFormatLocale')
-                }).then((result) => (this.view = result.view));
+                })
+                    .then((result) => (this.view = result.view))
+                    .catch((err) => console.error('Cannot display chart', err));
             }
             else {
                 setTimeout(() => this.trigger$.next(), 100);
@@ -801,7 +815,6 @@ const frTranslations = {
                     title: 'Opération'
                 },
                 chooseParameters: "Merci de sélectionner les paramètres afin d'afficher le graphique",
-                series: 'Regroupement',
                 type: 'Type de graphique',
                 title: 'Titre du graphique',
                 graphType: {