@lightdash/common 0.2025.0 → 0.2026.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. package/dist/cjs/pivot/derivePivotConfigFromChart.d.ts.map +1 -1
  2. package/dist/cjs/pivot/derivePivotConfigFromChart.js +16 -10
  3. package/dist/cjs/pivot/derivePivotConfigFromChart.js.map +1 -1
  4. package/dist/cjs/pivot/derivePivotConfigFromChart.test.js +202 -0
  5. package/dist/cjs/pivot/derivePivotConfigFromChart.test.js.map +1 -1
  6. package/dist/esm/pivot/derivePivotConfigFromChart.d.ts.map +1 -1
  7. package/dist/esm/pivot/derivePivotConfigFromChart.js +16 -10
  8. package/dist/esm/pivot/derivePivotConfigFromChart.js.map +1 -1
  9. package/dist/esm/pivot/derivePivotConfigFromChart.test.js +203 -1
  10. package/dist/esm/pivot/derivePivotConfigFromChart.test.js.map +1 -1
  11. package/dist/tsconfig.types.tsbuildinfo +1 -1
  12. package/dist/types/pivot/derivePivotConfigFromChart.d.ts.map +1 -1
  13. package/package.json +1 -1
package/dist/cjs/pivot/derivePivotConfigFromChart.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"derivePivotConfigFromChart.d.ts","sourceRoot":"","sources":["../../../src/pivot/derivePivotConfigFromChart.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAKH,KAAK,QAAQ,EAChB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEzD,OAAO,EAGH,KAAK,aAAa,EACrB,MAAM,sBAAsB,CAAC;AAsP9B,wBAAgB,iCAAiC,CAC7C,UAAU,EAAE,IAAI,CAAC,aAAa,EAAE,aAAa,GAAG,aAAa,CAAC,EAC9D,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,QAAQ,GACjB,kBAAkB,GAAG,SAAS,CAqChC"}
1
+ {"version":3,"file":"derivePivotConfigFromChart.d.ts","sourceRoot":"","sources":["../../../src/pivot/derivePivotConfigFromChart.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAKH,KAAK,QAAQ,EAChB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEzD,OAAO,EAGH,KAAK,aAAa,EACrB,MAAM,sBAAsB,CAAC;AAgQ9B,wBAAgB,iCAAiC,CAC7C,UAAU,EAAE,IAAI,CAAC,aAAa,EAAE,aAAa,GAAG,aAAa,CAAC,EAC9D,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,QAAQ,GACjB,kBAAkB,GAAG,SAAS,CAqChC"}
package/dist/cjs/pivot/derivePivotConfigFromChart.js CHANGED
@@ -70,14 +70,19 @@ function getTablePivotConfiguration(savedChart, metricQuery, fields) {
70
70
  return undefined;
71
71
  })
72
72
  .filter((col) => col !== undefined);
73
- // Create value columns for each metric
74
- const valuesColumns = metricQuery.metrics
75
- .map((metric) => ({
76
- reference: metric,
77
- aggregation: types_1.VizAggregationOptions.ANY,
78
- }))
79
- .filter((col) => metricQuery.dimensions.includes(col.reference) ||
80
- metricQuery.metrics.includes(col.reference));
73
+ // Create value columns for each metric and table calculation
74
+ const valuesColumns = [
75
+ ...metricQuery.metrics.map((metric) => ({
76
+ reference: metric,
77
+ aggregation: types_1.VizAggregationOptions.ANY,
78
+ })),
79
+ ...(metricQuery.tableCalculations || []).map((tc) => ({
80
+ reference: tc.name,
81
+ aggregation: types_1.VizAggregationOptions.ANY,
82
+ })),
83
+ ].filter((col) => metricQuery.dimensions.includes(col.reference) ||
84
+ metricQuery.metrics.includes(col.reference) ||
85
+ (metricQuery.tableCalculations || []).some((tc) => tc.name === col.reference));
81
86
  // Group by columns are the pivot dimensions
82
87
  const groupByColumns = pivotColumns
83
88
  .map((col) => ({
@@ -111,14 +116,15 @@ function getCartesianPivotConfiguration(savedChart, metricQuery, fields) {
111
116
  reference: pv,
112
117
  }))
113
118
  .filter((col) => metricQuery.dimensions.includes(col.reference));
114
- // Extract value columns
119
+ // Extract value columns (metrics and table calculations from yField)
115
120
  const valuesColumns = yField
116
121
  .map((yf) => ({
117
122
  reference: yf,
118
123
  aggregation: types_1.VizAggregationOptions.ANY,
119
124
  }))
120
125
  .filter((col) => metricQuery.dimensions.includes(col.reference) ||
121
- metricQuery.metrics.includes(col.reference));
126
+ metricQuery.metrics.includes(col.reference) ||
127
+ (metricQuery.tableCalculations || []).some((tc) => tc.name === col.reference));
122
128
  const xAxisDimension = fields[xField];
123
129
  let xAxisType;
124
130
  if (xAxisDimension) {
package/dist/cjs/pivot/derivePivotConfigFromChart.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"derivePivotConfigFromChart.js","sourceRoot":"","sources":["../../../src/pivot/derivePivotConfigFromChart.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"derivePivotConfigFromChart.js","sourceRoot":"","sources":["../../../src/pivot/derivePivotConfigFromChart.ts"],"names":[],"mappings":"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"}
package/dist/cjs/pivot/derivePivotConfigFromChart.test.js CHANGED
@@ -175,5 +175,207 @@ describe('derivePivotConfigurationFromChart', () => {
175
175
  ],
176
176
  });
177
177
  });
178
+ describe('Table Calculations Support', () => {
179
+ const mockTableCalculation = {
180
+ name: 'revenue_per_order',
181
+ displayName: 'Revenue per Order',
182
+ sql: '${payments_total_revenue} / ${orders_count}',
183
+ };
184
+ const mockTableCalculation2 = {
185
+ name: 'revenue_growth',
186
+ displayName: 'Revenue Growth',
187
+ sql: '(${payments_total_revenue} - LAG(${payments_total_revenue})) / LAG(${payments_total_revenue})',
188
+ };
189
+ it('includes table calculations in valuesColumns for Table charts', () => {
190
+ const tableChartConfig = {
191
+ type: savedCharts_1.ChartType.TABLE,
192
+ config: {},
193
+ };
194
+ const savedChart = {
195
+ chartConfig: tableChartConfig,
196
+ pivotConfig: {
197
+ columns: ['payments_payment_method'],
198
+ },
199
+ };
200
+ const metricQueryWithTC = {
201
+ ...derivePivotConfigFromChart_mock_1.mockMetricQuery,
202
+ tableCalculations: [
203
+ mockTableCalculation,
204
+ mockTableCalculation2,
205
+ ],
206
+ };
207
+ const result = (0, derivePivotConfigFromChart_1.derivePivotConfigurationFromChart)(savedChart, metricQueryWithTC, derivePivotConfigFromChart_mock_1.mockItems);
208
+ expect(result?.valuesColumns).toEqual([
209
+ {
210
+ reference: 'payments_total_revenue',
211
+ aggregation: types_1.VizAggregationOptions.ANY,
212
+ },
213
+ {
214
+ reference: 'revenue_per_order',
215
+ aggregation: types_1.VizAggregationOptions.ANY,
216
+ },
217
+ {
218
+ reference: 'revenue_growth',
219
+ aggregation: types_1.VizAggregationOptions.ANY,
220
+ },
221
+ ]);
222
+ });
223
+ it('includes table calculations in valuesColumns for Cartesian charts when in yField', () => {
224
+ const cartesianChartWithTC = {
225
+ type: savedCharts_1.ChartType.CARTESIAN,
226
+ config: {
227
+ layout: {
228
+ xField: 'payments_payment_method',
229
+ yField: ['payments_total_revenue', 'revenue_per_order'],
230
+ },
231
+ eChartsConfig: { series: [] },
232
+ },
233
+ };
234
+ const savedChart = {
235
+ chartConfig: cartesianChartWithTC,
236
+ pivotConfig: { columns: ['orders_status'] },
237
+ };
238
+ const metricQueryWithTC = {
239
+ ...derivePivotConfigFromChart_mock_1.mockMetricQuery,
240
+ tableCalculations: [mockTableCalculation],
241
+ };
242
+ const result = (0, derivePivotConfigFromChart_1.derivePivotConfigurationFromChart)(savedChart, metricQueryWithTC, derivePivotConfigFromChart_mock_1.mockItems);
243
+ expect(result?.valuesColumns).toEqual([
244
+ {
245
+ reference: 'payments_total_revenue',
246
+ aggregation: types_1.VizAggregationOptions.ANY,
247
+ },
248
+ {
249
+ reference: 'revenue_per_order',
250
+ aggregation: types_1.VizAggregationOptions.ANY,
251
+ },
252
+ ]);
253
+ });
254
+ it('filters out table calculations not in yField for Cartesian charts', () => {
255
+ const cartesianChartWithTC = {
256
+ type: savedCharts_1.ChartType.CARTESIAN,
257
+ config: {
258
+ layout: {
259
+ xField: 'payments_payment_method',
260
+ yField: ['payments_total_revenue'], // Only metric, not the table calc
261
+ },
262
+ eChartsConfig: { series: [] },
263
+ },
264
+ };
265
+ const savedChart = {
266
+ chartConfig: cartesianChartWithTC,
267
+ pivotConfig: { columns: ['orders_status'] },
268
+ };
269
+ const metricQueryWithTC = {
270
+ ...derivePivotConfigFromChart_mock_1.mockMetricQuery,
271
+ tableCalculations: [mockTableCalculation], // TC exists but not in yField
272
+ };
273
+ const result = (0, derivePivotConfigFromChart_1.derivePivotConfigurationFromChart)(savedChart, metricQueryWithTC, derivePivotConfigFromChart_mock_1.mockItems);
274
+ // Should only include the metric that's actually in yField
275
+ expect(result?.valuesColumns).toEqual([
276
+ {
277
+ reference: 'payments_total_revenue',
278
+ aggregation: types_1.VizAggregationOptions.ANY,
279
+ },
280
+ ]);
281
+ });
282
+ it('handles mixed metrics and table calculations in Table charts', () => {
283
+ const tableChartConfig = {
284
+ type: savedCharts_1.ChartType.TABLE,
285
+ config: {},
286
+ };
287
+ const savedChart = {
288
+ chartConfig: tableChartConfig,
289
+ pivotConfig: {
290
+ columns: ['orders_status'],
291
+ },
292
+ };
293
+ // Add another metric to mockItems
294
+ const itemsWithMoreMetrics = {
295
+ ...derivePivotConfigFromChart_mock_1.mockItems,
296
+ orders_count: {
297
+ sql: 'COUNT(${TABLE}.order_id)',
298
+ name: 'count',
299
+ type: field_1.MetricType.COUNT,
300
+ fieldType: field_1.FieldType.METRIC,
301
+ table: 'orders',
302
+ tableLabel: 'Orders',
303
+ label: 'Order Count',
304
+ hidden: false,
305
+ index: 0,
306
+ filters: [],
307
+ groups: [],
308
+ },
309
+ };
310
+ const metricQueryWithMixed = {
311
+ ...derivePivotConfigFromChart_mock_1.mockMetricQuery,
312
+ metrics: ['payments_total_revenue', 'orders_count'],
313
+ tableCalculations: [mockTableCalculation],
314
+ };
315
+ const result = (0, derivePivotConfigFromChart_1.derivePivotConfigurationFromChart)(savedChart, metricQueryWithMixed, itemsWithMoreMetrics);
316
+ expect(result?.valuesColumns).toEqual([
317
+ {
318
+ reference: 'payments_total_revenue',
319
+ aggregation: types_1.VizAggregationOptions.ANY,
320
+ },
321
+ {
322
+ reference: 'orders_count',
323
+ aggregation: types_1.VizAggregationOptions.ANY,
324
+ },
325
+ {
326
+ reference: 'revenue_per_order',
327
+ aggregation: types_1.VizAggregationOptions.ANY,
328
+ },
329
+ ]);
330
+ });
331
+ it('handles empty table calculations array', () => {
332
+ const tableChartConfig = {
333
+ type: savedCharts_1.ChartType.TABLE,
334
+ config: {},
335
+ };
336
+ const savedChart = {
337
+ chartConfig: tableChartConfig,
338
+ pivotConfig: {
339
+ columns: ['payments_payment_method'],
340
+ },
341
+ };
342
+ const metricQueryWithEmptyTC = {
343
+ ...derivePivotConfigFromChart_mock_1.mockMetricQuery,
344
+ tableCalculations: [],
345
+ };
346
+ const result = (0, derivePivotConfigFromChart_1.derivePivotConfigurationFromChart)(savedChart, metricQueryWithEmptyTC, derivePivotConfigFromChart_mock_1.mockItems);
347
+ // Should only have the metric
348
+ expect(result?.valuesColumns).toEqual([
349
+ {
350
+ reference: 'payments_total_revenue',
351
+ aggregation: types_1.VizAggregationOptions.ANY,
352
+ },
353
+ ]);
354
+ });
355
+ it('handles undefined table calculations', () => {
356
+ const tableChartConfig = {
357
+ type: savedCharts_1.ChartType.TABLE,
358
+ config: {},
359
+ };
360
+ const savedChart = {
361
+ chartConfig: tableChartConfig,
362
+ pivotConfig: {
363
+ columns: ['payments_payment_method'],
364
+ },
365
+ };
366
+ const metricQueryNoTC = {
367
+ ...derivePivotConfigFromChart_mock_1.mockMetricQuery,
368
+ // tableCalculations field is optional, so it can be undefined
369
+ };
370
+ const result = (0, derivePivotConfigFromChart_1.derivePivotConfigurationFromChart)(savedChart, metricQueryNoTC, derivePivotConfigFromChart_mock_1.mockItems);
371
+ // Should only have the metric
372
+ expect(result?.valuesColumns).toEqual([
373
+ {
374
+ reference: 'payments_total_revenue',
375
+ aggregation: types_1.VizAggregationOptions.ANY,
376
+ },
377
+ ]);
378
+ });
379
+ });
178
380
  });
179
381
  //# sourceMappingURL=derivePivotConfigFromChart.test.js.map
package/dist/cjs/pivot/derivePivotConfigFromChart.test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"derivePivotConfigFromChart.test.js","sourceRoot":"","sources":["../../../src/pivot/derivePivotConfigFromChart.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"derivePivotConfigFromChart.test.js","sourceRoot":"","sources":["../../../src/pivot/derivePivotConfigFromChart.test.ts"],"names":[],"mappings":"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"}
package/dist/esm/pivot/derivePivotConfigFromChart.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"derivePivotConfigFromChart.d.ts","sourceRoot":"","sources":["../../../src/pivot/derivePivotConfigFromChart.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAKH,KAAK,QAAQ,EAChB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEzD,OAAO,EAGH,KAAK,aAAa,EACrB,MAAM,sBAAsB,CAAC;AAsP9B,wBAAgB,iCAAiC,CAC7C,UAAU,EAAE,IAAI,CAAC,aAAa,EAAE,aAAa,GAAG,aAAa,CAAC,EAC9D,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,QAAQ,GACjB,kBAAkB,GAAG,SAAS,CAqChC"}
1
+ {"version":3,"file":"derivePivotConfigFromChart.d.ts","sourceRoot":"","sources":["../../../src/pivot/derivePivotConfigFromChart.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAKH,KAAK,QAAQ,EAChB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEzD,OAAO,EAGH,KAAK,aAAa,EACrB,MAAM,sBAAsB,CAAC;AAgQ9B,wBAAgB,iCAAiC,CAC7C,UAAU,EAAE,IAAI,CAAC,aAAa,EAAE,aAAa,GAAG,aAAa,CAAC,EAC9D,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,QAAQ,GACjB,kBAAkB,GAAG,SAAS,CAqChC"}
package/dist/esm/pivot/derivePivotConfigFromChart.js CHANGED
@@ -66,14 +66,19 @@ function getTablePivotConfiguration(savedChart, metricQuery, fields) {
66
66
  return undefined;
67
67
  })
68
68
  .filter((col) => col !== undefined);
69
- // Create value columns for each metric
70
- const valuesColumns = metricQuery.metrics
71
- .map((metric) => ({
72
- reference: metric,
73
- aggregation: VizAggregationOptions.ANY,
74
- }))
75
- .filter((col) => metricQuery.dimensions.includes(col.reference) ||
76
- metricQuery.metrics.includes(col.reference));
69
+ // Create value columns for each metric and table calculation
70
+ const valuesColumns = [
71
+ ...metricQuery.metrics.map((metric) => ({
72
+ reference: metric,
73
+ aggregation: VizAggregationOptions.ANY,
74
+ })),
75
+ ...(metricQuery.tableCalculations || []).map((tc) => ({
76
+ reference: tc.name,
77
+ aggregation: VizAggregationOptions.ANY,
78
+ })),
79
+ ].filter((col) => metricQuery.dimensions.includes(col.reference) ||
80
+ metricQuery.metrics.includes(col.reference) ||
81
+ (metricQuery.tableCalculations || []).some((tc) => tc.name === col.reference));
77
82
  // Group by columns are the pivot dimensions
78
83
  const groupByColumns = pivotColumns
79
84
  .map((col) => ({
@@ -107,14 +112,15 @@ function getCartesianPivotConfiguration(savedChart, metricQuery, fields) {
107
112
  reference: pv,
108
113
  }))
109
114
  .filter((col) => metricQuery.dimensions.includes(col.reference));
110
- // Extract value columns
115
+ // Extract value columns (metrics and table calculations from yField)
111
116
  const valuesColumns = yField
112
117
  .map((yf) => ({
113
118
  reference: yf,
114
119
  aggregation: VizAggregationOptions.ANY,
115
120
  }))
116
121
  .filter((col) => metricQuery.dimensions.includes(col.reference) ||
117
- metricQuery.metrics.includes(col.reference));
122
+ metricQuery.metrics.includes(col.reference) ||
123
+ (metricQuery.tableCalculations || []).some((tc) => tc.name === col.reference));
118
124
  const xAxisDimension = fields[xField];
119
125
  let xAxisType;
120
126
  if (xAxisDimension) {
package/dist/esm/pivot/derivePivotConfigFromChart.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"derivePivotConfigFromChart.js","sourceRoot":"","sources":["../../../src/pivot/derivePivotConfigFromChart.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"derivePivotConfigFromChart.js","sourceRoot":"","sources":["../../../src/pivot/derivePivotConfigFromChart.ts"],"names":[],"mappings":"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"}
package/dist/esm/pivot/derivePivotConfigFromChart.test.js CHANGED
@@ -3,7 +3,7 @@ import { SortByDirection, VizAggregationOptions, VizIndexType, } from '../visual
3
3
  import { derivePivotConfigurationFromChart } from './derivePivotConfigFromChart';
4
4
  import { mockCartesianChartConfig, mockItems, mockMetricQuery, } from './derivePivotConfigFromChart.mock';
5
5
  // Jest provides describe/it/expect globals
6
- import { BinType, CustomDimensionType } from '../types/field';
6
+ import { BinType, CustomDimensionType, FieldType, MetricType, } from '../types/field';
7
7
  describe('derivePivotConfigurationFromChart', () => {
8
8
  it('derives pivot configuration for Cartesian charts with pivot config', () => {
9
9
  const savedChart = {
@@ -173,5 +173,207 @@ describe('derivePivotConfigurationFromChart', () => {
173
173
  ],
174
174
  });
175
175
  });
176
+ describe('Table Calculations Support', () => {
177
+ const mockTableCalculation = {
178
+ name: 'revenue_per_order',
179
+ displayName: 'Revenue per Order',
180
+ sql: '${payments_total_revenue} / ${orders_count}',
181
+ };
182
+ const mockTableCalculation2 = {
183
+ name: 'revenue_growth',
184
+ displayName: 'Revenue Growth',
185
+ sql: '(${payments_total_revenue} - LAG(${payments_total_revenue})) / LAG(${payments_total_revenue})',
186
+ };
187
+ it('includes table calculations in valuesColumns for Table charts', () => {
188
+ const tableChartConfig = {
189
+ type: ChartType.TABLE,
190
+ config: {},
191
+ };
192
+ const savedChart = {
193
+ chartConfig: tableChartConfig,
194
+ pivotConfig: {
195
+ columns: ['payments_payment_method'],
196
+ },
197
+ };
198
+ const metricQueryWithTC = {
199
+ ...mockMetricQuery,
200
+ tableCalculations: [
201
+ mockTableCalculation,
202
+ mockTableCalculation2,
203
+ ],
204
+ };
205
+ const result = derivePivotConfigurationFromChart(savedChart, metricQueryWithTC, mockItems);
206
+ expect(result?.valuesColumns).toEqual([
207
+ {
208
+ reference: 'payments_total_revenue',
209
+ aggregation: VizAggregationOptions.ANY,
210
+ },
211
+ {
212
+ reference: 'revenue_per_order',
213
+ aggregation: VizAggregationOptions.ANY,
214
+ },
215
+ {
216
+ reference: 'revenue_growth',
217
+ aggregation: VizAggregationOptions.ANY,
218
+ },
219
+ ]);
220
+ });
221
+ it('includes table calculations in valuesColumns for Cartesian charts when in yField', () => {
222
+ const cartesianChartWithTC = {
223
+ type: ChartType.CARTESIAN,
224
+ config: {
225
+ layout: {
226
+ xField: 'payments_payment_method',
227
+ yField: ['payments_total_revenue', 'revenue_per_order'],
228
+ },
229
+ eChartsConfig: { series: [] },
230
+ },
231
+ };
232
+ const savedChart = {
233
+ chartConfig: cartesianChartWithTC,
234
+ pivotConfig: { columns: ['orders_status'] },
235
+ };
236
+ const metricQueryWithTC = {
237
+ ...mockMetricQuery,
238
+ tableCalculations: [mockTableCalculation],
239
+ };
240
+ const result = derivePivotConfigurationFromChart(savedChart, metricQueryWithTC, mockItems);
241
+ expect(result?.valuesColumns).toEqual([
242
+ {
243
+ reference: 'payments_total_revenue',
244
+ aggregation: VizAggregationOptions.ANY,
245
+ },
246
+ {
247
+ reference: 'revenue_per_order',
248
+ aggregation: VizAggregationOptions.ANY,
249
+ },
250
+ ]);
251
+ });
252
+ it('filters out table calculations not in yField for Cartesian charts', () => {
253
+ const cartesianChartWithTC = {
254
+ type: ChartType.CARTESIAN,
255
+ config: {
256
+ layout: {
257
+ xField: 'payments_payment_method',
258
+ yField: ['payments_total_revenue'], // Only metric, not the table calc
259
+ },
260
+ eChartsConfig: { series: [] },
261
+ },
262
+ };
263
+ const savedChart = {
264
+ chartConfig: cartesianChartWithTC,
265
+ pivotConfig: { columns: ['orders_status'] },
266
+ };
267
+ const metricQueryWithTC = {
268
+ ...mockMetricQuery,
269
+ tableCalculations: [mockTableCalculation], // TC exists but not in yField
270
+ };
271
+ const result = derivePivotConfigurationFromChart(savedChart, metricQueryWithTC, mockItems);
272
+ // Should only include the metric that's actually in yField
273
+ expect(result?.valuesColumns).toEqual([
274
+ {
275
+ reference: 'payments_total_revenue',
276
+ aggregation: VizAggregationOptions.ANY,
277
+ },
278
+ ]);
279
+ });
280
+ it('handles mixed metrics and table calculations in Table charts', () => {
281
+ const tableChartConfig = {
282
+ type: ChartType.TABLE,
283
+ config: {},
284
+ };
285
+ const savedChart = {
286
+ chartConfig: tableChartConfig,
287
+ pivotConfig: {
288
+ columns: ['orders_status'],
289
+ },
290
+ };
291
+ // Add another metric to mockItems
292
+ const itemsWithMoreMetrics = {
293
+ ...mockItems,
294
+ orders_count: {
295
+ sql: 'COUNT(${TABLE}.order_id)',
296
+ name: 'count',
297
+ type: MetricType.COUNT,
298
+ fieldType: FieldType.METRIC,
299
+ table: 'orders',
300
+ tableLabel: 'Orders',
301
+ label: 'Order Count',
302
+ hidden: false,
303
+ index: 0,
304
+ filters: [],
305
+ groups: [],
306
+ },
307
+ };
308
+ const metricQueryWithMixed = {
309
+ ...mockMetricQuery,
310
+ metrics: ['payments_total_revenue', 'orders_count'],
311
+ tableCalculations: [mockTableCalculation],
312
+ };
313
+ const result = derivePivotConfigurationFromChart(savedChart, metricQueryWithMixed, itemsWithMoreMetrics);
314
+ expect(result?.valuesColumns).toEqual([
315
+ {
316
+ reference: 'payments_total_revenue',
317
+ aggregation: VizAggregationOptions.ANY,
318
+ },
319
+ {
320
+ reference: 'orders_count',
321
+ aggregation: VizAggregationOptions.ANY,
322
+ },
323
+ {
324
+ reference: 'revenue_per_order',
325
+ aggregation: VizAggregationOptions.ANY,
326
+ },
327
+ ]);
328
+ });
329
+ it('handles empty table calculations array', () => {
330
+ const tableChartConfig = {
331
+ type: ChartType.TABLE,
332
+ config: {},
333
+ };
334
+ const savedChart = {
335
+ chartConfig: tableChartConfig,
336
+ pivotConfig: {
337
+ columns: ['payments_payment_method'],
338
+ },
339
+ };
340
+ const metricQueryWithEmptyTC = {
341
+ ...mockMetricQuery,
342
+ tableCalculations: [],
343
+ };
344
+ const result = derivePivotConfigurationFromChart(savedChart, metricQueryWithEmptyTC, mockItems);
345
+ // Should only have the metric
346
+ expect(result?.valuesColumns).toEqual([
347
+ {
348
+ reference: 'payments_total_revenue',
349
+ aggregation: VizAggregationOptions.ANY,
350
+ },
351
+ ]);
352
+ });
353
+ it('handles undefined table calculations', () => {
354
+ const tableChartConfig = {
355
+ type: ChartType.TABLE,
356
+ config: {},
357
+ };
358
+ const savedChart = {
359
+ chartConfig: tableChartConfig,
360
+ pivotConfig: {
361
+ columns: ['payments_payment_method'],
362
+ },
363
+ };
364
+ const metricQueryNoTC = {
365
+ ...mockMetricQuery,
366
+ // tableCalculations field is optional, so it can be undefined
367
+ };
368
+ const result = derivePivotConfigurationFromChart(savedChart, metricQueryNoTC, mockItems);
369
+ // Should only have the metric
370
+ expect(result?.valuesColumns).toEqual([
371
+ {
372
+ reference: 'payments_total_revenue',
373
+ aggregation: VizAggregationOptions.ANY,
374
+ },
375
+ ]);
376
+ });
377
+ });
176
378
  });
177
379
  //# sourceMappingURL=derivePivotConfigFromChart.test.js.map