@provoly/dashboard 0.14.8 → 0.14.10

package/fesm2022/provoly-dashboard-tooltips-attribute.mjs

@@ -15,16 +15,23 @@ class AttributeTooltipComponent extends BaseTooltipComponent {
         this.context = this.context ?? { attributes: [] };
     }
     getValue(attribute) {
-        switch (attribute) {
-            case 'id':
-                return of(this.data.item[attribute]);
-            case 'oClass':
-                return this.translateIdPipe.transform(this.data.item[attribute], {
-                    type: 'class',
-                    output: 'name'
-                });
-            default:
-                return of((this.data.item.attributes[attribute]?.value ?? ''));
+        if (!this.data.item.properties) {
+            // This is for Provoly-like items
+            switch (attribute) {
+                case 'id':
+                    return of(this.data.item[attribute]);
+                case 'oClass':
+                    return this.translateIdPipe.transform(this.data.item[attribute], {
+                        type: 'class',
+                        output: 'name'
+                    });
+                default:
+                    return of((this.data.item.attributes[attribute]?.value ?? ''));
+            }
+        }
+        else {
+            // This is for other items, like WMSFeatures
+            return of(this.data.item.properties.find((prop) => prop.key === attribute).value);
         }
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.6", ngImport: i0, type: AttributeTooltipComponent, deps: [{ token: i1.TranslateIdPipe }], target: i0.ɵɵFactoryTarget.Component }); }

package/fesm2022/provoly-dashboard-tooltips-attribute.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"provoly-dashboard-tooltips-attribute.mjs","sources":["../../../../projects/provoly/dashboard/tooltips/attribute/attribute-tooltip.component.ts","../../../../projects/provoly/dashboard/tooltips/attribute/attribute-tooltip.component.html","../../../../projects/provoly/dashboard/tooltips/attribute/attribute-tooltip.module.ts","../../../../projects/provoly/dashboard/tooltips/attribute/provoly-dashboard-tooltips-attribute.ts"],"sourcesContent":["import { Component } from '@angular/core';\nimport { BaseTooltipComponent, TranslateIdPipe } from '@provoly/dashboard';\nimport { Observable, of } from 'rxjs';\n\n@Component({\n  selector: 'pry-attribute-tooltip',\n  templateUrl: './attribute-tooltip.component.html'\n})\nexport class AttributeTooltipComponent extends BaseTooltipComponent {\n  constructor(private translateIdPipe: TranslateIdPipe) {\n    super();\n    this.context = this.context ?? { attributes: [] };\n  }\n\n  getValue(attribute: string): Observable<string> {\n    switch (attribute) {\n      case 'id':\n        return of(this.data.item[attribute]);\n      case 'oClass':\n        return this.translateIdPipe.transform(this.data.item[attribute], {\n          type: 'class',\n          output: 'name'\n        }) as Observable<string>;\n      default:\n        return of((this.data.item.attributes[attribute]?.value ?? '') as string);\n    }\n  }\n}\n","<div class=\"m-tooltip__item__content\">\n  <h3 class=\"a-h3 -attribute\">\n    <img\n      [src]=\"data.item | translateItemToSymbol | async\"\n      [alt]=\"data.item.oClass | translateId : { type: 'class', output: 'name' } | async\"\n      width=\"32\"\n      aria-hidden=\"true\"\n    />\n    <span>{{ data.item.oClass | translateId : { type: 'class', output: 'name' } | async }}</span>\n  </h3>\n  <ng-container *ngFor=\"let attribute of context.attributes\">\n    <p>\n      <span>{{ attribute }}:</span> {{ getValue(attribute) | async }}\n    </p>\n  </ng-container>\n</div>\n","import { OverlayModule } from '@angular/cdk/overlay';\nimport { CommonModule } from '@angular/common';\nimport { NgModule, Type } from '@angular/core';\nimport { FormsModule } from '@angular/forms';\nimport { BaseTooltipComponent, BaseTooltipModule, PryCoreModule } from '@provoly/dashboard';\nimport { AttributeTooltipComponent } from './attribute-tooltip.component';\n\n@NgModule({\n  declarations: [AttributeTooltipComponent],\n  imports: [CommonModule, FormsModule, OverlayModule, PryCoreModule],\n  exports: [AttributeTooltipComponent]\n})\nexport class PryAttributeTooltipModule extends BaseTooltipModule {\n  override getComponent() {\n    return AttributeTooltipComponent as Type<BaseTooltipComponent>;\n  }\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './public-api';\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"provoly-dashboard-tooltips-attribute.mjs","sources":["../../../../projects/provoly/dashboard/tooltips/attribute/attribute-tooltip.component.ts","../../../../projects/provoly/dashboard/tooltips/attribute/attribute-tooltip.component.html","../../../../projects/provoly/dashboard/tooltips/attribute/attribute-tooltip.module.ts","../../../../projects/provoly/dashboard/tooltips/attribute/provoly-dashboard-tooltips-attribute.ts"],"sourcesContent":["import { Component } from '@angular/core';\nimport { BaseTooltipComponent, TranslateIdPipe } from '@provoly/dashboard';\nimport { Observable, of } from 'rxjs';\n\n@Component({\n  selector: 'pry-attribute-tooltip',\n  templateUrl: './attribute-tooltip.component.html'\n})\nexport class AttributeTooltipComponent extends BaseTooltipComponent {\n  constructor(private translateIdPipe: TranslateIdPipe) {\n    super();\n    this.context = this.context ?? { attributes: [] };\n  }\n\n  getValue(attribute: string): Observable<string> {\n    if (!this.data.item.properties) {\n      // This is for Provoly-like items\n      switch (attribute) {\n        case 'id':\n          return of(this.data.item[attribute]);\n        case 'oClass':\n          return this.translateIdPipe.transform(this.data.item[attribute], {\n            type: 'class',\n            output: 'name'\n          }) as Observable<string>;\n        default:\n          return of((this.data.item.attributes[attribute]?.value ?? '') as string);\n      }\n    } else {\n      // This is for other items, like WMSFeatures\n      return of(this.data.item.properties.find((prop: { key: string; value: string }) => prop.key === attribute).value);\n    }\n  }\n}\n","<div class=\"m-tooltip__item__content\">\n  <h3 class=\"a-h3 -attribute\">\n    <img\n      [src]=\"data.item | translateItemToSymbol | async\"\n      [alt]=\"data.item.oClass | translateId : { type: 'class', output: 'name' } | async\"\n      width=\"32\"\n      aria-hidden=\"true\"\n    />\n    <span>{{ data.item.oClass | translateId : { type: 'class', output: 'name' } | async }}</span>\n  </h3>\n  <ng-container *ngFor=\"let attribute of context.attributes\">\n    <p>\n      <span>{{ attribute }}:</span> {{ getValue(attribute) | async }}\n    </p>\n  </ng-container>\n</div>\n","import { OverlayModule } from '@angular/cdk/overlay';\nimport { CommonModule } from '@angular/common';\nimport { NgModule, Type } from '@angular/core';\nimport { FormsModule } from '@angular/forms';\nimport { BaseTooltipComponent, BaseTooltipModule, PryCoreModule } from '@provoly/dashboard';\nimport { AttributeTooltipComponent } from './attribute-tooltip.component';\n\n@NgModule({\n  declarations: [AttributeTooltipComponent],\n  imports: [CommonModule, FormsModule, OverlayModule, PryCoreModule],\n  exports: [AttributeTooltipComponent]\n})\nexport class PryAttributeTooltipModule extends BaseTooltipModule {\n  override getComponent() {\n    return AttributeTooltipComponent as Type<BaseTooltipComponent>;\n  }\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './public-api';\n"],"names":[],"mappings":"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"}

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: {