@lightdash/common 0.2068.0 → 0.2068.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.
- package/dist/cjs/pivot/derivePivotConfigFromChart.d.ts.map +1 -1
- package/dist/cjs/pivot/derivePivotConfigFromChart.js +18 -30
- package/dist/cjs/pivot/derivePivotConfigFromChart.js.map +1 -1
- package/dist/cjs/pivot/derivePivotConfigFromChart.mock.d.ts +1 -0
- package/dist/cjs/pivot/derivePivotConfigFromChart.mock.d.ts.map +1 -1
- package/dist/cjs/pivot/derivePivotConfigFromChart.mock.js +34 -1
- package/dist/cjs/pivot/derivePivotConfigFromChart.mock.js.map +1 -1
- package/dist/cjs/pivot/derivePivotConfigFromChart.test.js +46 -7
- package/dist/cjs/pivot/derivePivotConfigFromChart.test.js.map +1 -1
- package/dist/esm/pivot/derivePivotConfigFromChart.d.ts.map +1 -1
- package/dist/esm/pivot/derivePivotConfigFromChart.js +18 -30
- package/dist/esm/pivot/derivePivotConfigFromChart.js.map +1 -1
- package/dist/esm/pivot/derivePivotConfigFromChart.mock.d.ts +1 -0
- package/dist/esm/pivot/derivePivotConfigFromChart.mock.d.ts.map +1 -1
- package/dist/esm/pivot/derivePivotConfigFromChart.mock.js +33 -0
- package/dist/esm/pivot/derivePivotConfigFromChart.mock.js.map +1 -1
- package/dist/esm/pivot/derivePivotConfigFromChart.test.js +47 -8
- package/dist/esm/pivot/derivePivotConfigFromChart.test.js.map +1 -1
- package/dist/tsconfig.types.tsbuildinfo +1 -1
- package/dist/types/pivot/derivePivotConfigFromChart.d.ts.map +1 -1
- package/dist/types/pivot/derivePivotConfigFromChart.mock.d.ts +1 -0
- package/dist/types/pivot/derivePivotConfigFromChart.mock.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -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;
|
|
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;AA4P9B,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"}
|
|
@@ -35,18 +35,10 @@ function getSortByForPivotConfiguration(partialPivot, metricQuery) {
|
|
|
35
35
|
}
|
|
36
36
|
return sortBy;
|
|
37
37
|
}
|
|
38
|
-
|
|
39
|
-
const { chartConfig, pivotConfig } = savedChart;
|
|
40
|
-
if (chartConfig.type !== savedCharts_1.ChartType.TABLE) {
|
|
41
|
-
throw new Error('Chart is not a table');
|
|
42
|
-
}
|
|
43
|
-
if (!pivotConfig) {
|
|
44
|
-
return undefined;
|
|
45
|
-
}
|
|
46
|
-
const pivotColumns = pivotConfig.columns || [];
|
|
38
|
+
const getIndexColumn = (pivotColumns, fields, metricQuery) => {
|
|
47
39
|
// Find dimensions that are NOT being pivoted on (these become index columns)
|
|
48
40
|
const nonPivotDimensions = metricQuery.dimensions.filter((dim) => !pivotColumns.includes(dim));
|
|
49
|
-
|
|
41
|
+
return nonPivotDimensions
|
|
50
42
|
.map((dim) => {
|
|
51
43
|
const field = fields[dim];
|
|
52
44
|
if (!field)
|
|
@@ -70,6 +62,15 @@ function getTablePivotConfiguration(savedChart, metricQuery, fields) {
|
|
|
70
62
|
return undefined;
|
|
71
63
|
})
|
|
72
64
|
.filter((col) => col !== undefined);
|
|
65
|
+
};
|
|
66
|
+
function getTablePivotConfiguration(savedChart, metricQuery, fields) {
|
|
67
|
+
const { chartConfig, pivotConfig } = savedChart;
|
|
68
|
+
if (chartConfig.type !== savedCharts_1.ChartType.TABLE) {
|
|
69
|
+
throw new Error('Chart is not a table');
|
|
70
|
+
}
|
|
71
|
+
if (!pivotConfig) {
|
|
72
|
+
return undefined;
|
|
73
|
+
}
|
|
73
74
|
// Create value columns for each metric and table calculation
|
|
74
75
|
const valuesColumns = [
|
|
75
76
|
...metricQuery.metrics.map((metric) => ({
|
|
@@ -83,12 +84,15 @@ function getTablePivotConfiguration(savedChart, metricQuery, fields) {
|
|
|
83
84
|
].filter((col) => metricQuery.dimensions.includes(col.reference) ||
|
|
84
85
|
metricQuery.metrics.includes(col.reference) ||
|
|
85
86
|
(metricQuery.tableCalculations || []).some((tc) => tc.name === col.reference));
|
|
87
|
+
const pivotColumns = pivotConfig.columns || [];
|
|
86
88
|
// Group by columns are the pivot dimensions
|
|
87
89
|
const groupByColumns = pivotColumns
|
|
88
90
|
.map((col) => ({
|
|
89
91
|
reference: col,
|
|
90
92
|
}))
|
|
91
93
|
.filter((col) => metricQuery.dimensions.includes(col.reference));
|
|
94
|
+
// Find dimensions that are NOT being pivoted on (these become index columns)
|
|
95
|
+
const indexColumn = getIndexColumn(pivotColumns, fields, metricQuery);
|
|
92
96
|
const partialPivotConfiguration = {
|
|
93
97
|
indexColumn,
|
|
94
98
|
valuesColumns,
|
|
@@ -125,34 +129,18 @@ function getCartesianPivotConfiguration(savedChart, metricQuery, fields) {
|
|
|
125
129
|
.filter((col) => metricQuery.dimensions.includes(col.reference) ||
|
|
126
130
|
metricQuery.metrics.includes(col.reference) ||
|
|
127
131
|
(metricQuery.tableCalculations || []).some((tc) => tc.name === col.reference));
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
if (xAxisDimension) {
|
|
131
|
-
if ((0, field_1.isDimension)(xAxisDimension)) {
|
|
132
|
-
xAxisType = (0, types_1.getColumnAxisType)(xAxisDimension.type);
|
|
133
|
-
}
|
|
134
|
-
else if ((0, field_1.isCustomDimension)(xAxisDimension)) {
|
|
135
|
-
xAxisType =
|
|
136
|
-
xAxisDimension.type === field_1.CustomDimensionType.SQL
|
|
137
|
-
? (0, types_1.getColumnAxisType)(xAxisDimension.dimensionType)
|
|
138
|
-
: (0, types_1.getColumnAxisType)(field_1.DimensionType.STRING);
|
|
139
|
-
}
|
|
140
|
-
}
|
|
141
|
-
const indexColumn = xAxisType
|
|
142
|
-
? {
|
|
143
|
-
reference: xField,
|
|
144
|
-
type: xAxisType,
|
|
145
|
-
}
|
|
146
|
-
: undefined;
|
|
132
|
+
// Find dimensions that are NOT being pivoted on (these become index columns)
|
|
133
|
+
const indexColumn = getIndexColumn(pivotConfig.columns, fields, metricQuery);
|
|
147
134
|
const partialPivotConfiguration = {
|
|
148
135
|
indexColumn,
|
|
149
136
|
valuesColumns,
|
|
150
137
|
groupByColumns,
|
|
151
138
|
};
|
|
152
|
-
|
|
139
|
+
const pivotConfiguration = {
|
|
153
140
|
...partialPivotConfiguration,
|
|
154
141
|
sortBy: getSortByForPivotConfiguration(partialPivotConfiguration, metricQuery),
|
|
155
142
|
};
|
|
143
|
+
return pivotConfiguration;
|
|
156
144
|
}
|
|
157
145
|
return undefined;
|
|
158
146
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"derivePivotConfigFromChart.js","sourceRoot":"","sources":["../../../src/pivot/derivePivotConfigFromChart.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"derivePivotConfigFromChart.js","sourceRoot":"","sources":["../../../src/pivot/derivePivotConfigFromChart.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,5 +3,6 @@ import { type MetricQuery } from '../types/metricQuery';
|
|
|
3
3
|
import { type CartesianChartConfig } from '../types/savedCharts';
|
|
4
4
|
export declare const mockItems: ItemsMap;
|
|
5
5
|
export declare const mockMetricQuery: MetricQuery;
|
|
6
|
+
export declare const mockMetricQueryWithMultipleIndexColumns: MetricQuery;
|
|
6
7
|
export declare const mockCartesianChartConfig: CartesianChartConfig;
|
|
7
8
|
//# sourceMappingURL=derivePivotConfigFromChart.mock.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"derivePivotConfigFromChart.mock.d.ts","sourceRoot":"","sources":["../../../src/pivot/derivePivotConfigFromChart.mock.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,KAAK,QAAQ,EAChB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAa,KAAK,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAG5E,eAAO,MAAM,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"derivePivotConfigFromChart.mock.d.ts","sourceRoot":"","sources":["../../../src/pivot/derivePivotConfigFromChart.mock.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,KAAK,QAAQ,EAChB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAa,KAAK,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAG5E,eAAO,MAAM,SAAS,EAAE,QA4DvB,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,WAe7B,CAAC;AAEF,eAAO,MAAM,uCAAuC,EAAE,WAmBrD,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,oBAWtC,CAAC"}
|
|
@@ -1,10 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.mockCartesianChartConfig = exports.mockMetricQuery = exports.mockItems = void 0;
|
|
3
|
+
exports.mockCartesianChartConfig = exports.mockMetricQueryWithMultipleIndexColumns = exports.mockMetricQuery = exports.mockItems = void 0;
|
|
4
4
|
const field_1 = require("../types/field");
|
|
5
5
|
const savedCharts_1 = require("../types/savedCharts");
|
|
6
6
|
// Items (fields) map derived from issue description
|
|
7
7
|
exports.mockItems = {
|
|
8
|
+
customers_customer_id: {
|
|
9
|
+
sql: '${TABLE}.customer_id',
|
|
10
|
+
name: 'customer_id',
|
|
11
|
+
type: field_1.DimensionType.STRING,
|
|
12
|
+
index: 1,
|
|
13
|
+
label: 'Customer ID',
|
|
14
|
+
table: 'customers',
|
|
15
|
+
groups: [],
|
|
16
|
+
hidden: false,
|
|
17
|
+
fieldType: field_1.FieldType.DIMENSION,
|
|
18
|
+
tableLabel: 'Customers',
|
|
19
|
+
description: 'Unique identifier for each customer',
|
|
20
|
+
},
|
|
8
21
|
payments_payment_method: {
|
|
9
22
|
sql: '${TABLE}.payment_method',
|
|
10
23
|
name: 'payment_method',
|
|
@@ -67,6 +80,26 @@ exports.mockMetricQuery = {
|
|
|
67
80
|
additionalMetrics: [],
|
|
68
81
|
metricOverrides: {},
|
|
69
82
|
};
|
|
83
|
+
exports.mockMetricQueryWithMultipleIndexColumns = {
|
|
84
|
+
exploreName: 'payments',
|
|
85
|
+
dimensions: [
|
|
86
|
+
'payments_payment_method',
|
|
87
|
+
'orders_status',
|
|
88
|
+
'customers_customer_id',
|
|
89
|
+
],
|
|
90
|
+
metrics: ['payments_total_revenue'],
|
|
91
|
+
filters: {},
|
|
92
|
+
sorts: [
|
|
93
|
+
{
|
|
94
|
+
fieldId: 'payments_payment_method',
|
|
95
|
+
descending: false,
|
|
96
|
+
},
|
|
97
|
+
],
|
|
98
|
+
limit: 500,
|
|
99
|
+
tableCalculations: [],
|
|
100
|
+
additionalMetrics: [],
|
|
101
|
+
metricOverrides: {},
|
|
102
|
+
};
|
|
70
103
|
exports.mockCartesianChartConfig = {
|
|
71
104
|
type: savedCharts_1.ChartType.CARTESIAN,
|
|
72
105
|
config: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"derivePivotConfigFromChart.mock.js","sourceRoot":"","sources":["../../../src/pivot/derivePivotConfigFromChart.mock.ts"],"names":[],"mappings":";;;AAAA,0CAKwB;AAExB,sDAA4E;AAE5E,oDAAoD;AACvC,QAAA,SAAS,GAAa;IAC/B,uBAAuB,EAAE;QACrB,GAAG,EAAE,yBAAyB;QAC9B,IAAI,EAAE,gBAAgB;QACtB,IAAI,EAAE,qBAAa,CAAC,MAAM;QAC1B,KAAK,EAAE,CAAC;QACR,KAAK,EAAE,gBAAgB;QACvB,KAAK,EAAE,UAAU;QACjB,MAAM,EAAE,EAAE;QACV,MAAM,EAAE,KAAK;QACb,SAAS,EAAE,iBAAS,CAAC,SAAS;QAC9B,UAAU,EAAE,UAAU;QACtB,WAAW,EAAE,iDAAiD;KACjE;IACD,aAAa,EAAE;QACX,GAAG,EAAE,iBAAiB;QACtB,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,qBAAa,CAAC,MAAM;QAC1B,KAAK,EAAE,CAAC;QACR,KAAK,EAAE,QAAQ;QACf,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,EAAE;QACV,MAAM,EAAE,KAAK;QACb,SAAS,EAAE,iBAAS,CAAC,SAAS;QAC9B,UAAU,EAAE,QAAQ;QACpB,WAAW,EACP,6hCAA6hC;KACpiC;IACD,sBAAsB,EAAE;QACpB,GAAG,EAAE,iBAAiB;QACtB,IAAI,EAAE,eAAe;QACrB,IAAI,EAAE,kBAAU,CAAC,GAAG;QACpB,KAAK,EAAE,CAAC;QACR,KAAK,EAAE,eAAe;QACtB,KAAK,EAAE,UAAU;QACjB,MAAM,EAAE,EAAE;QACV,MAAM,EAAE,KAAK;QACb,OAAO,EAAE,EAAE;QACX,SAAS,EAAE,iBAAS,CAAC,MAAM;QAC3B,SAAS,EAAE;YACP,UAAU,EAAE,EAAE;YACd,UAAU,EAAE,MAAM;SACrB;QACD,UAAU,EAAE,UAAU;QACtB,WAAW,EAAE,qBAAqB;QAClC,kBAAkB,EAAE,iBAAiB;KACxC;CACJ,CAAC;AAEW,QAAA,eAAe,GAAgB;IACxC,WAAW,EAAE,UAAU;IACvB,UAAU,EAAE,CAAC,yBAAyB,EAAE,eAAe,CAAC;IACxD,OAAO,EAAE,CAAC,wBAAwB,CAAC;IACnC,OAAO,EAAE,EAAE;IACX,KAAK,EAAE;QACH;YACI,OAAO,EAAE,yBAAyB;YAClC,UAAU,EAAE,KAAK;SACpB;KACJ;IACD,KAAK,EAAE,GAAG;IACV,iBAAiB,EAAE,EAAE;IACrB,iBAAiB,EAAE,EAAE;IACrB,eAAe,EAAE,EAAE;CACtB,CAAC;AAEW,QAAA,wBAAwB,GAAyB;IAC1D,IAAI,EAAE,uBAAS,CAAC,SAAS;IACzB,MAAM,EAAE;QACJ,MAAM,EAAE;YACJ,MAAM,EAAE,yBAAyB;YACjC,MAAM,EAAE,CAAC,wBAAwB,CAAC;SACrC;QACD,aAAa,EAAE;YACX,MAAM,EAAE,EAAE;SACb;KACJ;CACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"derivePivotConfigFromChart.mock.js","sourceRoot":"","sources":["../../../src/pivot/derivePivotConfigFromChart.mock.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,10 +16,47 @@ describe('derivePivotConfigurationFromChart', () => {
|
|
|
16
16
|
};
|
|
17
17
|
const result = (0, derivePivotConfigFromChart_1.derivePivotConfigurationFromChart)(savedChart, derivePivotConfigFromChart_mock_1.mockMetricQuery, derivePivotConfigFromChart_mock_1.mockItems);
|
|
18
18
|
expect(result).toEqual({
|
|
19
|
-
indexColumn:
|
|
20
|
-
|
|
21
|
-
|
|
19
|
+
indexColumn: [
|
|
20
|
+
{
|
|
21
|
+
reference: 'payments_payment_method',
|
|
22
|
+
type: types_1.VizIndexType.CATEGORY,
|
|
23
|
+
},
|
|
24
|
+
],
|
|
25
|
+
valuesColumns: [
|
|
26
|
+
{
|
|
27
|
+
reference: 'payments_total_revenue',
|
|
28
|
+
aggregation: types_1.VizAggregationOptions.ANY,
|
|
29
|
+
},
|
|
30
|
+
],
|
|
31
|
+
groupByColumns: [{ reference: 'orders_status' }],
|
|
32
|
+
sortBy: [
|
|
33
|
+
{
|
|
34
|
+
reference: 'payments_payment_method',
|
|
35
|
+
direction: types_1.SortByDirection.ASC,
|
|
36
|
+
},
|
|
37
|
+
],
|
|
38
|
+
});
|
|
39
|
+
});
|
|
40
|
+
it('derives pivot configuration for Cartesian charts with pivot config and multiple index columns', () => {
|
|
41
|
+
const savedChart = {
|
|
42
|
+
chartConfig: derivePivotConfigFromChart_mock_1.mockCartesianChartConfig,
|
|
43
|
+
pivotConfig: {
|
|
44
|
+
columns: ['orders_status'],
|
|
22
45
|
},
|
|
46
|
+
};
|
|
47
|
+
const result = (0, derivePivotConfigFromChart_1.derivePivotConfigurationFromChart)(savedChart, derivePivotConfigFromChart_mock_1.mockMetricQueryWithMultipleIndexColumns, derivePivotConfigFromChart_mock_1.mockItems);
|
|
48
|
+
expect(result).toEqual({
|
|
49
|
+
indexColumn: [
|
|
50
|
+
{
|
|
51
|
+
reference: 'payments_payment_method',
|
|
52
|
+
type: types_1.VizIndexType.CATEGORY,
|
|
53
|
+
},
|
|
54
|
+
// added by derivePivotConfigurationFromChart since this is not being pivoted on
|
|
55
|
+
{
|
|
56
|
+
reference: 'customers_customer_id',
|
|
57
|
+
type: types_1.VizIndexType.CATEGORY,
|
|
58
|
+
},
|
|
59
|
+
],
|
|
23
60
|
valuesColumns: [
|
|
24
61
|
{
|
|
25
62
|
reference: 'payments_total_revenue',
|
|
@@ -156,10 +193,12 @@ describe('derivePivotConfigurationFromChart', () => {
|
|
|
156
193
|
};
|
|
157
194
|
const result = (0, derivePivotConfigFromChart_1.derivePivotConfigurationFromChart)(savedChart, mq, items);
|
|
158
195
|
expect(result).toEqual({
|
|
159
|
-
indexColumn:
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
196
|
+
indexColumn: [
|
|
197
|
+
{
|
|
198
|
+
reference: 'amount_range',
|
|
199
|
+
type: types_1.VizIndexType.CATEGORY,
|
|
200
|
+
},
|
|
201
|
+
],
|
|
163
202
|
valuesColumns: [
|
|
164
203
|
{
|
|
165
204
|
reference: 'payments_total_revenue',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"derivePivotConfigFromChart.test.js","sourceRoot":"","sources":["../../../src/pivot/derivePivotConfigFromChart.test.ts"],"names":[],"mappings":";;AAAA,sDAI8B;AAC9B,mDAIiC;AACjC,6EAAiF;AACjF,
|
|
1
|
+
{"version":3,"file":"derivePivotConfigFromChart.test.js","sourceRoot":"","sources":["../../../src/pivot/derivePivotConfigFromChart.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;
|
|
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;AA4P9B,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"}
|
|
@@ -31,18 +31,10 @@ function getSortByForPivotConfiguration(partialPivot, metricQuery) {
|
|
|
31
31
|
}
|
|
32
32
|
return sortBy;
|
|
33
33
|
}
|
|
34
|
-
|
|
35
|
-
const { chartConfig, pivotConfig } = savedChart;
|
|
36
|
-
if (chartConfig.type !== ChartType.TABLE) {
|
|
37
|
-
throw new Error('Chart is not a table');
|
|
38
|
-
}
|
|
39
|
-
if (!pivotConfig) {
|
|
40
|
-
return undefined;
|
|
41
|
-
}
|
|
42
|
-
const pivotColumns = pivotConfig.columns || [];
|
|
34
|
+
const getIndexColumn = (pivotColumns, fields, metricQuery) => {
|
|
43
35
|
// Find dimensions that are NOT being pivoted on (these become index columns)
|
|
44
36
|
const nonPivotDimensions = metricQuery.dimensions.filter((dim) => !pivotColumns.includes(dim));
|
|
45
|
-
|
|
37
|
+
return nonPivotDimensions
|
|
46
38
|
.map((dim) => {
|
|
47
39
|
const field = fields[dim];
|
|
48
40
|
if (!field)
|
|
@@ -66,6 +58,15 @@ function getTablePivotConfiguration(savedChart, metricQuery, fields) {
|
|
|
66
58
|
return undefined;
|
|
67
59
|
})
|
|
68
60
|
.filter((col) => col !== undefined);
|
|
61
|
+
};
|
|
62
|
+
function getTablePivotConfiguration(savedChart, metricQuery, fields) {
|
|
63
|
+
const { chartConfig, pivotConfig } = savedChart;
|
|
64
|
+
if (chartConfig.type !== ChartType.TABLE) {
|
|
65
|
+
throw new Error('Chart is not a table');
|
|
66
|
+
}
|
|
67
|
+
if (!pivotConfig) {
|
|
68
|
+
return undefined;
|
|
69
|
+
}
|
|
69
70
|
// Create value columns for each metric and table calculation
|
|
70
71
|
const valuesColumns = [
|
|
71
72
|
...metricQuery.metrics.map((metric) => ({
|
|
@@ -79,12 +80,15 @@ function getTablePivotConfiguration(savedChart, metricQuery, fields) {
|
|
|
79
80
|
].filter((col) => metricQuery.dimensions.includes(col.reference) ||
|
|
80
81
|
metricQuery.metrics.includes(col.reference) ||
|
|
81
82
|
(metricQuery.tableCalculations || []).some((tc) => tc.name === col.reference));
|
|
83
|
+
const pivotColumns = pivotConfig.columns || [];
|
|
82
84
|
// Group by columns are the pivot dimensions
|
|
83
85
|
const groupByColumns = pivotColumns
|
|
84
86
|
.map((col) => ({
|
|
85
87
|
reference: col,
|
|
86
88
|
}))
|
|
87
89
|
.filter((col) => metricQuery.dimensions.includes(col.reference));
|
|
90
|
+
// Find dimensions that are NOT being pivoted on (these become index columns)
|
|
91
|
+
const indexColumn = getIndexColumn(pivotColumns, fields, metricQuery);
|
|
88
92
|
const partialPivotConfiguration = {
|
|
89
93
|
indexColumn,
|
|
90
94
|
valuesColumns,
|
|
@@ -121,34 +125,18 @@ function getCartesianPivotConfiguration(savedChart, metricQuery, fields) {
|
|
|
121
125
|
.filter((col) => metricQuery.dimensions.includes(col.reference) ||
|
|
122
126
|
metricQuery.metrics.includes(col.reference) ||
|
|
123
127
|
(metricQuery.tableCalculations || []).some((tc) => tc.name === col.reference));
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
if (xAxisDimension) {
|
|
127
|
-
if (isDimension(xAxisDimension)) {
|
|
128
|
-
xAxisType = getColumnAxisType(xAxisDimension.type);
|
|
129
|
-
}
|
|
130
|
-
else if (isCustomDimension(xAxisDimension)) {
|
|
131
|
-
xAxisType =
|
|
132
|
-
xAxisDimension.type === CustomDimensionType.SQL
|
|
133
|
-
? getColumnAxisType(xAxisDimension.dimensionType)
|
|
134
|
-
: getColumnAxisType(DimensionType.STRING);
|
|
135
|
-
}
|
|
136
|
-
}
|
|
137
|
-
const indexColumn = xAxisType
|
|
138
|
-
? {
|
|
139
|
-
reference: xField,
|
|
140
|
-
type: xAxisType,
|
|
141
|
-
}
|
|
142
|
-
: undefined;
|
|
128
|
+
// Find dimensions that are NOT being pivoted on (these become index columns)
|
|
129
|
+
const indexColumn = getIndexColumn(pivotConfig.columns, fields, metricQuery);
|
|
143
130
|
const partialPivotConfiguration = {
|
|
144
131
|
indexColumn,
|
|
145
132
|
valuesColumns,
|
|
146
133
|
groupByColumns,
|
|
147
134
|
};
|
|
148
|
-
|
|
135
|
+
const pivotConfiguration = {
|
|
149
136
|
...partialPivotConfiguration,
|
|
150
137
|
sortBy: getSortByForPivotConfiguration(partialPivotConfiguration, metricQuery),
|
|
151
138
|
};
|
|
139
|
+
return pivotConfiguration;
|
|
152
140
|
}
|
|
153
141
|
return undefined;
|
|
154
142
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"derivePivotConfigFromChart.js","sourceRoot":"","sources":["../../../src/pivot/derivePivotConfigFromChart.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EACH,mBAAmB,EACnB,aAAa,EACb,iBAAiB,EACjB,WAAW,GAEd,MAAM,gBAAgB,CAAC;AAIxB,OAAO,EACH,SAAS,EACT,sBAAsB,GAEzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,iBAAiB,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EACH,iBAAiB,EACjB,eAAe,EACf,qBAAqB,
|
|
1
|
+
{"version":3,"file":"derivePivotConfigFromChart.js","sourceRoot":"","sources":["../../../src/pivot/derivePivotConfigFromChart.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,5 +3,6 @@ import { type MetricQuery } from '../types/metricQuery';
|
|
|
3
3
|
import { type CartesianChartConfig } from '../types/savedCharts';
|
|
4
4
|
export declare const mockItems: ItemsMap;
|
|
5
5
|
export declare const mockMetricQuery: MetricQuery;
|
|
6
|
+
export declare const mockMetricQueryWithMultipleIndexColumns: MetricQuery;
|
|
6
7
|
export declare const mockCartesianChartConfig: CartesianChartConfig;
|
|
7
8
|
//# sourceMappingURL=derivePivotConfigFromChart.mock.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"derivePivotConfigFromChart.mock.d.ts","sourceRoot":"","sources":["../../../src/pivot/derivePivotConfigFromChart.mock.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,KAAK,QAAQ,EAChB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAa,KAAK,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAG5E,eAAO,MAAM,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"derivePivotConfigFromChart.mock.d.ts","sourceRoot":"","sources":["../../../src/pivot/derivePivotConfigFromChart.mock.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,KAAK,QAAQ,EAChB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAa,KAAK,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAG5E,eAAO,MAAM,SAAS,EAAE,QA4DvB,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,WAe7B,CAAC;AAEF,eAAO,MAAM,uCAAuC,EAAE,WAmBrD,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,oBAWtC,CAAC"}
|
|
@@ -2,6 +2,19 @@ import { DimensionType, FieldType, MetricType, } from '../types/field';
|
|
|
2
2
|
import { ChartType } from '../types/savedCharts';
|
|
3
3
|
// Items (fields) map derived from issue description
|
|
4
4
|
export const mockItems = {
|
|
5
|
+
customers_customer_id: {
|
|
6
|
+
sql: '${TABLE}.customer_id',
|
|
7
|
+
name: 'customer_id',
|
|
8
|
+
type: DimensionType.STRING,
|
|
9
|
+
index: 1,
|
|
10
|
+
label: 'Customer ID',
|
|
11
|
+
table: 'customers',
|
|
12
|
+
groups: [],
|
|
13
|
+
hidden: false,
|
|
14
|
+
fieldType: FieldType.DIMENSION,
|
|
15
|
+
tableLabel: 'Customers',
|
|
16
|
+
description: 'Unique identifier for each customer',
|
|
17
|
+
},
|
|
5
18
|
payments_payment_method: {
|
|
6
19
|
sql: '${TABLE}.payment_method',
|
|
7
20
|
name: 'payment_method',
|
|
@@ -64,6 +77,26 @@ export const mockMetricQuery = {
|
|
|
64
77
|
additionalMetrics: [],
|
|
65
78
|
metricOverrides: {},
|
|
66
79
|
};
|
|
80
|
+
export const mockMetricQueryWithMultipleIndexColumns = {
|
|
81
|
+
exploreName: 'payments',
|
|
82
|
+
dimensions: [
|
|
83
|
+
'payments_payment_method',
|
|
84
|
+
'orders_status',
|
|
85
|
+
'customers_customer_id',
|
|
86
|
+
],
|
|
87
|
+
metrics: ['payments_total_revenue'],
|
|
88
|
+
filters: {},
|
|
89
|
+
sorts: [
|
|
90
|
+
{
|
|
91
|
+
fieldId: 'payments_payment_method',
|
|
92
|
+
descending: false,
|
|
93
|
+
},
|
|
94
|
+
],
|
|
95
|
+
limit: 500,
|
|
96
|
+
tableCalculations: [],
|
|
97
|
+
additionalMetrics: [],
|
|
98
|
+
metricOverrides: {},
|
|
99
|
+
};
|
|
67
100
|
export const mockCartesianChartConfig = {
|
|
68
101
|
type: ChartType.CARTESIAN,
|
|
69
102
|
config: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"derivePivotConfigFromChart.mock.js","sourceRoot":"","sources":["../../../src/pivot/derivePivotConfigFromChart.mock.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,aAAa,EACb,SAAS,EACT,UAAU,GAEb,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,SAAS,EAA6B,MAAM,sBAAsB,CAAC;AAE5E,oDAAoD;AACpD,MAAM,CAAC,MAAM,SAAS,GAAa;IAC/B,uBAAuB,EAAE;QACrB,GAAG,EAAE,yBAAyB;QAC9B,IAAI,EAAE,gBAAgB;QACtB,IAAI,EAAE,aAAa,CAAC,MAAM;QAC1B,KAAK,EAAE,CAAC;QACR,KAAK,EAAE,gBAAgB;QACvB,KAAK,EAAE,UAAU;QACjB,MAAM,EAAE,EAAE;QACV,MAAM,EAAE,KAAK;QACb,SAAS,EAAE,SAAS,CAAC,SAAS;QAC9B,UAAU,EAAE,UAAU;QACtB,WAAW,EAAE,iDAAiD;KACjE;IACD,aAAa,EAAE;QACX,GAAG,EAAE,iBAAiB;QACtB,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,aAAa,CAAC,MAAM;QAC1B,KAAK,EAAE,CAAC;QACR,KAAK,EAAE,QAAQ;QACf,KAAK,EAAE,QAAQ;QACf,MAAM,EAAE,EAAE;QACV,MAAM,EAAE,KAAK;QACb,SAAS,EAAE,SAAS,CAAC,SAAS;QAC9B,UAAU,EAAE,QAAQ;QACpB,WAAW,EACP,6hCAA6hC;KACpiC;IACD,sBAAsB,EAAE;QACpB,GAAG,EAAE,iBAAiB;QACtB,IAAI,EAAE,eAAe;QACrB,IAAI,EAAE,UAAU,CAAC,GAAG;QACpB,KAAK,EAAE,CAAC;QACR,KAAK,EAAE,eAAe;QACtB,KAAK,EAAE,UAAU;QACjB,MAAM,EAAE,EAAE;QACV,MAAM,EAAE,KAAK;QACb,OAAO,EAAE,EAAE;QACX,SAAS,EAAE,SAAS,CAAC,MAAM;QAC3B,SAAS,EAAE;YACP,UAAU,EAAE,EAAE;YACd,UAAU,EAAE,MAAM;SACrB;QACD,UAAU,EAAE,UAAU;QACtB,WAAW,EAAE,qBAAqB;QAClC,kBAAkB,EAAE,iBAAiB;KACxC;CACJ,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAgB;IACxC,WAAW,EAAE,UAAU;IACvB,UAAU,EAAE,CAAC,yBAAyB,EAAE,eAAe,CAAC;IACxD,OAAO,EAAE,CAAC,wBAAwB,CAAC;IACnC,OAAO,EAAE,EAAE;IACX,KAAK,EAAE;QACH;YACI,OAAO,EAAE,yBAAyB;YAClC,UAAU,EAAE,KAAK;SACpB;KACJ;IACD,KAAK,EAAE,GAAG;IACV,iBAAiB,EAAE,EAAE;IACrB,iBAAiB,EAAE,EAAE;IACrB,eAAe,EAAE,EAAE;CACtB,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAyB;IAC1D,IAAI,EAAE,SAAS,CAAC,SAAS;IACzB,MAAM,EAAE;QACJ,MAAM,EAAE;YACJ,MAAM,EAAE,yBAAyB;YACjC,MAAM,EAAE,CAAC,wBAAwB,CAAC;SACrC;QACD,aAAa,EAAE;YACX,MAAM,EAAE,EAAE;SACb;KACJ;CACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"derivePivotConfigFromChart.mock.js","sourceRoot":"","sources":["../../../src/pivot/derivePivotConfigFromChart.mock.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ChartType, } from '../types/savedCharts';
|
|
2
2
|
import { SortByDirection, VizAggregationOptions, VizIndexType, } from '../visualizations/types';
|
|
3
3
|
import { derivePivotConfigurationFromChart } from './derivePivotConfigFromChart';
|
|
4
|
-
import { mockCartesianChartConfig, mockItems, mockMetricQuery, } from './derivePivotConfigFromChart.mock';
|
|
4
|
+
import { mockCartesianChartConfig, mockItems, mockMetricQuery, mockMetricQueryWithMultipleIndexColumns, } from './derivePivotConfigFromChart.mock';
|
|
5
5
|
// Jest provides describe/it/expect globals
|
|
6
6
|
import { BinType, CustomDimensionType, FieldType, MetricType, } from '../types/field';
|
|
7
7
|
describe('derivePivotConfigurationFromChart', () => {
|
|
@@ -14,10 +14,47 @@ describe('derivePivotConfigurationFromChart', () => {
|
|
|
14
14
|
};
|
|
15
15
|
const result = derivePivotConfigurationFromChart(savedChart, mockMetricQuery, mockItems);
|
|
16
16
|
expect(result).toEqual({
|
|
17
|
-
indexColumn:
|
|
18
|
-
|
|
19
|
-
|
|
17
|
+
indexColumn: [
|
|
18
|
+
{
|
|
19
|
+
reference: 'payments_payment_method',
|
|
20
|
+
type: VizIndexType.CATEGORY,
|
|
21
|
+
},
|
|
22
|
+
],
|
|
23
|
+
valuesColumns: [
|
|
24
|
+
{
|
|
25
|
+
reference: 'payments_total_revenue',
|
|
26
|
+
aggregation: VizAggregationOptions.ANY,
|
|
27
|
+
},
|
|
28
|
+
],
|
|
29
|
+
groupByColumns: [{ reference: 'orders_status' }],
|
|
30
|
+
sortBy: [
|
|
31
|
+
{
|
|
32
|
+
reference: 'payments_payment_method',
|
|
33
|
+
direction: SortByDirection.ASC,
|
|
34
|
+
},
|
|
35
|
+
],
|
|
36
|
+
});
|
|
37
|
+
});
|
|
38
|
+
it('derives pivot configuration for Cartesian charts with pivot config and multiple index columns', () => {
|
|
39
|
+
const savedChart = {
|
|
40
|
+
chartConfig: mockCartesianChartConfig,
|
|
41
|
+
pivotConfig: {
|
|
42
|
+
columns: ['orders_status'],
|
|
20
43
|
},
|
|
44
|
+
};
|
|
45
|
+
const result = derivePivotConfigurationFromChart(savedChart, mockMetricQueryWithMultipleIndexColumns, mockItems);
|
|
46
|
+
expect(result).toEqual({
|
|
47
|
+
indexColumn: [
|
|
48
|
+
{
|
|
49
|
+
reference: 'payments_payment_method',
|
|
50
|
+
type: VizIndexType.CATEGORY,
|
|
51
|
+
},
|
|
52
|
+
// added by derivePivotConfigurationFromChart since this is not being pivoted on
|
|
53
|
+
{
|
|
54
|
+
reference: 'customers_customer_id',
|
|
55
|
+
type: VizIndexType.CATEGORY,
|
|
56
|
+
},
|
|
57
|
+
],
|
|
21
58
|
valuesColumns: [
|
|
22
59
|
{
|
|
23
60
|
reference: 'payments_total_revenue',
|
|
@@ -154,10 +191,12 @@ describe('derivePivotConfigurationFromChart', () => {
|
|
|
154
191
|
};
|
|
155
192
|
const result = derivePivotConfigurationFromChart(savedChart, mq, items);
|
|
156
193
|
expect(result).toEqual({
|
|
157
|
-
indexColumn:
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
194
|
+
indexColumn: [
|
|
195
|
+
{
|
|
196
|
+
reference: 'amount_range',
|
|
197
|
+
type: VizIndexType.CATEGORY,
|
|
198
|
+
},
|
|
199
|
+
],
|
|
161
200
|
valuesColumns: [
|
|
162
201
|
{
|
|
163
202
|
reference: 'payments_total_revenue',
|