@lightdash/common 0.1459.1 → 0.1459.3

package/dist/visualizations/CartesianChartDataModel.js

@@ -276,7 +276,7 @@ class CartesianChartDataModel {
         return {
             columns: [
                 transformedData.indexColumn.reference,
-                ...transformedData.valuesColumns,
+                ...transformedData.valuesColumns.map((valueColumn) => valueColumn.pivotColumnName),
             ],
             rows: transformedData.results,
         };
@@ -303,6 +303,7 @@ class CartesianChartDataModel {
         const rightYAxisSeriesReferences = [];
         const series = transformedData.valuesColumns.map((seriesColumn, index) => {
             const seriesDisplay = Object.values(display?.series || {}).find((s) => s.yAxisIndex === index);
+            const seriesColumnId = seriesColumn.pivotColumnName;
             const seriesColor = seriesDisplay?.color;
             const seriesValueLabelPosition = seriesDisplay?.valueLabelPosition;
             const seriesType = seriesDisplay?.type ?? defaultSeriesType;
@@ -318,22 +319,22 @@ class CartesianChartDataModel {
                 : undefined;
             const seriesLabel = singleYAxisLabel ?? seriesDisplay?.label;
             if (whichYAxis === 1) {
-                rightYAxisSeriesReferences.push(seriesColumn);
+                rightYAxisSeriesReferences.push(seriesColumnId);
             }
             else {
-                leftYAxisSeriesReferences.push(seriesColumn);
+                leftYAxisSeriesReferences.push(seriesColumnId);
             }
             return {
-                dimensions: [xAxisReference, seriesColumn],
+                dimensions: [xAxisReference, seriesColumnId],
                 type: seriesType ?? defaultSeriesType,
                 stack: shouldStack && seriesType === 'bar'
                     ? 'stack-all-series'
                     : undefined,
                 name: seriesLabel ||
-                    (0, field_1.capitalize)(seriesColumn.toLowerCase()).replaceAll('_', ' '),
+                    (0, field_1.capitalize)(seriesColumnId.toLowerCase()).replaceAll('_', ' '),
                 encode: {
                     x: xAxisReference,
-                    y: seriesColumn,
+                    y: seriesColumnId,
                 },
                 // NOTE: this yAxisIndex is the echarts option, NOT the yAxisIndex
                 // we had been storing in the display object.
@@ -357,7 +358,6 @@ class CartesianChartDataModel {
                 },
                 color: seriesColor ||
                     CartesianChartDataModel.getDefaultColor(index, orgColors),
-                // this.getSeriesColor( seriesColumn, possibleXAxisValues, orgColors),
             };
         });
         const xAxisType = display?.xAxis?.type ||

package/dist/visualizations/PieChartDataModel.js

@@ -243,7 +243,10 @@ class PieChartDataModel {
                             ? result[transformedData.indexColumn.reference]
                             : '-',
                         groupId: transformedData.indexColumn?.reference,
-                        value: result[transformedData.valuesColumns[0]],
+                        // Pie chart uses only the first value column, though others
+                        // could be returned from the pivot query. If the pie chart
+                        // ever supports pivoting, we'll need to update this.
+                        value: result[transformedData.valuesColumns[0].pivotColumnName],
                     })),
                 },
             ],

package/dist/visualizations/types/index.d.ts

@@ -54,11 +54,20 @@ export type PivotIndexColum = {
     reference: string;
     type: VizIndexType;
 } | undefined;
+export type PivotValuesColumn = {
+    referenceField: string;
+    pivotColumnName: string;
+    aggregation: VizAggregationOptions;
+    pivotValues: {
+        referenceField: string;
+        value: string;
+    }[];
+};
 export type PivotChartData = {
     fileUrl: string | undefined;
     results: RawResultRow[];
     indexColumn: PivotIndexColum;
-    valuesColumns: string[];
+    valuesColumns: PivotValuesColumn[];
     columns: VizColumn[];
 };
 export type PivotChartLayout = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightdash/common",
-  "version": "0.1459.1",
+  "version": "0.1459.3",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [