@quillsql/react 2.10.22 → 2.10.24
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/Chart.d.ts.map +1 -1
- package/dist/cjs/Chart.js +73 -103
- package/dist/cjs/Dashboard.d.ts.map +1 -1
- package/dist/cjs/Dashboard.js +3 -1
- package/dist/cjs/QuillProvider.js +1 -1
- package/dist/cjs/SQLEditor.d.ts +1 -2
- package/dist/cjs/SQLEditor.d.ts.map +1 -1
- package/dist/cjs/SQLEditor.js +1 -16
- package/dist/cjs/components/Dashboard/MetricComponent.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/MetricComponent.js +1 -0
- package/dist/cjs/utils/dashboard.d.ts.map +1 -1
- package/dist/cjs/utils/dashboard.js +1 -0
- package/dist/esm/Chart.d.ts.map +1 -1
- package/dist/esm/Chart.js +74 -104
- package/dist/esm/Dashboard.d.ts.map +1 -1
- package/dist/esm/Dashboard.js +3 -1
- package/dist/esm/QuillProvider.js +1 -1
- package/dist/esm/SQLEditor.d.ts +1 -2
- package/dist/esm/SQLEditor.d.ts.map +1 -1
- package/dist/esm/SQLEditor.js +1 -16
- package/dist/esm/components/Dashboard/MetricComponent.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/MetricComponent.js +1 -0
- package/dist/esm/utils/dashboard.d.ts.map +1 -1
- package/dist/esm/utils/dashboard.js +1 -0
- package/package.json +1 -1
package/dist/cjs/Chart.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Chart.d.ts","sourceRoot":"","sources":["../../src/Chart.tsx"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"Chart.d.ts","sourceRoot":"","sources":["../../src/Chart.tsx"],"names":[],"mappings":";AA4BA,UAAU,cAAc;IACtB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACrC,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,UAAU,WAAY,SAAQ,cAAc;IAC1C,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,WAAW,GACnB,cAAc,GACd,mBAAmB,GACnB,oBAAoB,GACpB,eAAe,GACf,cAAc,GACd,UAAU,GACV,aAAa,GACb,eAAe,GACf,oBAAoB,GACpB,UAAU,GACV,SAAS,GACT,QAAQ,CAAC;AAEb,UAAU,UAAU;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,WAAW,CAAC;CACrB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,KAAK,EAAE,GAAG,CAAC;CACZ;AAED,UAAU,UAAW,SAAQ,cAAc;IACzC,MAAM,EAAE,aAAa,GAAG,GAAG,CAAC;CAC7B;AAED,KAAK,UAAU,GAAG,WAAW,GAAG,UAAU,CAAC;AA4D3C,wBAAgB,gBAAgB,CAAC,aAAa,KAAA,EAAE,OAAO,KAAA,WAQtD;AAKD,QAAA,MAAM,KAAK,8JAYR,UAAU,4CAkCZ,CAAC;AAicF,eAAe,KAAK,CAAC"}
|
package/dist/cjs/Chart.js
CHANGED
|
@@ -7,8 +7,6 @@ exports.didFiltersChange = void 0;
|
|
|
7
7
|
const jsx_runtime_1 = require("react/jsx-runtime");
|
|
8
8
|
// @ts-nocheck
|
|
9
9
|
const react_1 = require("react");
|
|
10
|
-
const aggregate_1 = require("./utils/aggregate");
|
|
11
|
-
const ReportBuilder_1 = require("./ReportBuilder");
|
|
12
10
|
const date_fns_1 = require("date-fns");
|
|
13
11
|
const BarList_1 = __importDefault(require("./BarList"));
|
|
14
12
|
const PieChart_1 = __importDefault(require("./PieChart"));
|
|
@@ -22,6 +20,7 @@ const BarChart_1 = __importDefault(require("./components/Chart/BarChart"));
|
|
|
22
20
|
const merge_1 = require("./utils/merge");
|
|
23
21
|
const ChartSkeleton_1 = __importDefault(require("./components/Chart/ChartSkeleton"));
|
|
24
22
|
const ChartError_1 = __importDefault(require("./components/Chart/ChartError"));
|
|
23
|
+
const dateRangePickerUtils_1 = require("./DateRangePicker/dateRangePickerUtils");
|
|
25
24
|
// @ts-ignore
|
|
26
25
|
function sumByKey(arr, key) {
|
|
27
26
|
// @ts-ignore
|
|
@@ -92,9 +91,9 @@ const Chart = ({ chartId, config, colors, containerStyle, query, SelectComponent
|
|
|
92
91
|
return ((0, jsx_runtime_1.jsx)(ChartUpdater, { config: config, dispatch: dispatch, dashboard: dashboard, chartId: chartId, containerStyle: containerStyle, colors: chartColors, client: client, theme: theme, dashboardFilters: dashboardFilters, query: query, isAnimationActive: isAnimationActive, hideXAxis: hideXAxis, hideYAxis: hideYAxis, hideCartesianGrid: hideCartesianGrid, dateRangeFilterDisabled: dateRangeFilterDisabled }));
|
|
93
92
|
};
|
|
94
93
|
const ChartUpdater = ({ colors, chartId, config, containerStyle, dashboard, dispatch, client, theme, dashboardFilters, isAnimationActive, hideXAxis, hideYAxis, hideCartesianGrid, dateRangeFilterDisabled, }) => {
|
|
94
|
+
const [initialLoad, setInitialLoad] = (0, react_1.useState)(true);
|
|
95
95
|
const [loading, setLoading] = (0, react_1.useState)(false);
|
|
96
96
|
const [isComparison, setIsComparison] = (0, react_1.useState)(false);
|
|
97
|
-
const [bucketData, setBucketData] = (0, react_1.useState)(null);
|
|
98
97
|
(0, react_1.useEffect)(() => {
|
|
99
98
|
async function getChartOptions() {
|
|
100
99
|
if (!didFiltersChange(dashboard[chartId], dashboardFilters)) {
|
|
@@ -133,7 +132,7 @@ const ChartUpdater = ({ colors, chartId, config, containerStyle, dashboard, disp
|
|
|
133
132
|
filters: minimalFilters,
|
|
134
133
|
};
|
|
135
134
|
const resp = await (0, dataFetcher_1.getData)(client, 'itempost', 'omit', hostedBody, cloudBody);
|
|
136
|
-
if (resp && resp.name !== 'error') {
|
|
135
|
+
if (resp && resp.name !== 'error' && !resp.errorMessage) {
|
|
137
136
|
setIsComparison(!!resp.compareRows?.length);
|
|
138
137
|
if (resp.compareRows) {
|
|
139
138
|
(0, merge_1.mergeComparisonRange)(resp);
|
|
@@ -158,44 +157,9 @@ const ChartUpdater = ({ colors, chartId, config, containerStyle, dashboard, disp
|
|
|
158
157
|
setLoading(false);
|
|
159
158
|
return;
|
|
160
159
|
}
|
|
160
|
+
setInitialLoad(false);
|
|
161
161
|
getChartOptions();
|
|
162
162
|
}, [dashboardFilters, client, chartId]);
|
|
163
|
-
(0, react_1.useEffect)(() => {
|
|
164
|
-
if (!dashboardFilters ||
|
|
165
|
-
!chartId ||
|
|
166
|
-
!dashboard[chartId] ||
|
|
167
|
-
!dashboard[chartId].buckets ||
|
|
168
|
-
!dashboard[chartId].buckets.length) {
|
|
169
|
-
return;
|
|
170
|
-
}
|
|
171
|
-
const dateFilter = Object.values(dashboardFilters).find((filter) => filter.filterType == 'date_range');
|
|
172
|
-
if (dateFilter && dashboard[chartId].rows.length) {
|
|
173
|
-
const aggregatedObj = (0, aggregate_1.aggregate)(dashboard[chartId], dashboard[chartId].buckets, dateFilter);
|
|
174
|
-
setBucketData({
|
|
175
|
-
name: dashboard[chartId].name,
|
|
176
|
-
xAxisFormat: aggregatedObj.xAxisFormat,
|
|
177
|
-
xAxisField: aggregatedObj.xAxisField,
|
|
178
|
-
xAxisLabel: aggregatedObj.xAxisLabel,
|
|
179
|
-
rows: aggregatedObj.bucketedRows,
|
|
180
|
-
});
|
|
181
|
-
}
|
|
182
|
-
const stringFilters = dashboard[chartId].buckets.filter((bucket) => {
|
|
183
|
-
return ((0, ReportBuilder_1.getPostgresBasicType)(dashboard[chartId].fields.find((field) => field.name === bucket.field)) === 'string');
|
|
184
|
-
});
|
|
185
|
-
if (stringFilters.length && dashboard[chartId].rows.length) {
|
|
186
|
-
const aggregatedObj = (0, aggregate_1.aggregate)(dashboard[chartId], dashboard[chartId].buckets, null);
|
|
187
|
-
setBucketData({
|
|
188
|
-
name: dashboard[chartId].name,
|
|
189
|
-
xAxisFormat: aggregatedObj.xAxisFormat,
|
|
190
|
-
xAxisField: aggregatedObj.xAxisField,
|
|
191
|
-
xAxisLabel: aggregatedObj.xAxisLabel,
|
|
192
|
-
rows: aggregatedObj.bucketedRows,
|
|
193
|
-
});
|
|
194
|
-
}
|
|
195
|
-
if (!dashboard[chartId].rows.length && bucketData !== null) {
|
|
196
|
-
setBucketData(null);
|
|
197
|
-
}
|
|
198
|
-
}, [dashboard[chartId]]);
|
|
199
163
|
const dateFilter = Object.values(dashboardFilters ?? {}).find((filter) => filter.filterType == 'date_range');
|
|
200
164
|
const isPivot = dashboard[chartId]?.pivot || config?.pivot;
|
|
201
165
|
const pivotTable = (0, react_1.useMemo)(() => {
|
|
@@ -227,7 +191,7 @@ const ChartUpdater = ({ colors, chartId, config, containerStyle, dashboard, disp
|
|
|
227
191
|
: null;
|
|
228
192
|
}, [pivotTable]);
|
|
229
193
|
if (!config && (!dashboard[chartId] || loading)) {
|
|
230
|
-
if (loading) {
|
|
194
|
+
if (loading || initialLoad) {
|
|
231
195
|
return (0, jsx_runtime_1.jsx)(ChartSkeleton_1.default, { containerStyle: containerStyle });
|
|
232
196
|
}
|
|
233
197
|
else {
|
|
@@ -279,25 +243,12 @@ const ChartUpdater = ({ colors, chartId, config, containerStyle, dashboard, disp
|
|
|
279
243
|
return ((0, jsx_runtime_1.jsx)(BarList_1.default, { data: pivotTable
|
|
280
244
|
? pivotTable.rows
|
|
281
245
|
: config
|
|
282
|
-
?
|
|
283
|
-
|
|
284
|
-
config.bucketedRows) ||
|
|
285
|
-
config.rows
|
|
286
|
-
: bucketData && bucketData.rows
|
|
287
|
-
? bucketData.rows
|
|
288
|
-
: dashboard[chartId].rows, theme: theme, yAxisFields: pivotTableYAxis
|
|
246
|
+
? config.rows
|
|
247
|
+
: dashboard[chartId].rows, theme: theme, yAxisFields: pivotTableYAxis
|
|
289
248
|
? pivotTableYAxis
|
|
290
249
|
: config
|
|
291
250
|
? config.yAxisFields
|
|
292
|
-
: dashboard[chartId].yAxisFields, colors: colors, xAxisField: config
|
|
293
|
-
? config.xAxisField
|
|
294
|
-
: bucketData
|
|
295
|
-
? bucketData.xAxisField
|
|
296
|
-
: dashboard[chartId].xAxisField, xAxisFormat: config
|
|
297
|
-
? config.xAxisFormat
|
|
298
|
-
: bucketData
|
|
299
|
-
? bucketData.xAxisFormat
|
|
300
|
-
: dashboard[chartId].xAxisFormat, containerStyle: containerStyle }));
|
|
251
|
+
: dashboard[chartId].yAxisFields, colors: colors, xAxisField: config ? config.xAxisField : dashboard[chartId].xAxisField, xAxisFormat: config ? config.xAxisFormat : dashboard[chartId].xAxisFormat, containerStyle: containerStyle }));
|
|
301
252
|
}
|
|
302
253
|
const yAxisFields = pivotTableYAxis
|
|
303
254
|
? pivotTableYAxis
|
|
@@ -315,13 +266,8 @@ const ChartUpdater = ({ colors, chartId, config, containerStyle, dashboard, disp
|
|
|
315
266
|
const data = (pivotTable
|
|
316
267
|
? pivotTable.rows
|
|
317
268
|
: config
|
|
318
|
-
?
|
|
319
|
-
|
|
320
|
-
config.bucketedRows) ||
|
|
321
|
-
config.rows
|
|
322
|
-
: bucketData && bucketData.rows && bucketData.rows.length > 0
|
|
323
|
-
? bucketData.rows
|
|
324
|
-
: dashboard[chartId].rows)
|
|
269
|
+
? config.rows
|
|
270
|
+
: dashboard[chartId].rows)
|
|
325
271
|
// filter out any rows with a comparison key but no corresponding primary
|
|
326
272
|
?.filter((row) => Object.keys(row).every((key) => !key.startsWith('comparison_') ||
|
|
327
273
|
(key.startsWith('comparison_') &&
|
|
@@ -329,23 +275,16 @@ const ChartUpdater = ({ colors, chartId, config, containerStyle, dashboard, disp
|
|
|
329
275
|
if (chartTypes.includes('column')) {
|
|
330
276
|
return ((0, jsx_runtime_1.jsx)(BarChart_1.default, { colors: colors, theme: theme, isStacked: isPivot && yAxisFields.length > (dateFilter?.comparison ? 2 : 1), yAxisFields: yAxisFields,
|
|
331
277
|
// @ts-ignore
|
|
332
|
-
data: data, xAxisField: config
|
|
333
|
-
? config.xAxisField
|
|
334
|
-
: bucketData
|
|
335
|
-
? bucketData.xAxisField
|
|
336
|
-
: dashboard[chartId].xAxisField, xAxisLabel: config
|
|
337
|
-
? config.xAxisLabel
|
|
338
|
-
: bucketData
|
|
339
|
-
? bucketData.xAxisLabel
|
|
340
|
-
: dashboard[chartId].xAxisLabel, xAxisFormat: config
|
|
341
|
-
? config.xAxisFormat
|
|
342
|
-
: bucketData
|
|
343
|
-
? bucketData.xAxisFormat
|
|
344
|
-
: dashboard[chartId].xAxisFormat, containerStyle: containerStyle, comparison: dateFilter?.comparison, isAnimationActive: isAnimationActive, hideXAxis: hideXAxis, hideYAxis: hideYAxis, hideCartesianGrid: hideCartesianGrid }));
|
|
278
|
+
data: data, xAxisField: config ? config.xAxisField : dashboard[chartId].xAxisField, xAxisLabel: config ? config.xAxisLabel : dashboard[chartId].xAxisLabel, xAxisFormat: config ? config.xAxisFormat : dashboard[chartId].xAxisFormat, containerStyle: containerStyle, comparison: dateFilter?.comparison, isAnimationActive: isAnimationActive, hideXAxis: hideXAxis, hideYAxis: hideYAxis, hideCartesianGrid: hideCartesianGrid }));
|
|
345
279
|
}
|
|
346
280
|
if (chartTypes.includes('metric')) {
|
|
347
281
|
const data = dashboard[chartId] ? dashboard[chartId] : config;
|
|
348
|
-
|
|
282
|
+
const isComparison = data.rows.length > 0 &&
|
|
283
|
+
Object.keys(data.rows[0]).includes(`comparison_${data.xAxisField}`);
|
|
284
|
+
const primaryMetricLabel = data?.filtersApplied?.date_range?.preset?.label;
|
|
285
|
+
const comparisonKey = data?.filtersApplied?.date_range?.comparisonRange?.value;
|
|
286
|
+
const comparisonLabel = dateRangePickerUtils_1.COMPARISON_OPTIONS.find((opt) => opt.value === comparisonKey)?.text;
|
|
287
|
+
return ((0, jsx_runtime_1.jsxs)("div", { style: {
|
|
349
288
|
fontFamily: theme?.fontFamily,
|
|
350
289
|
fontSize: 32,
|
|
351
290
|
color: theme?.primaryTextColor,
|
|
@@ -359,31 +298,62 @@ const ChartUpdater = ({ colors, chartId, config, containerStyle, dashboard, disp
|
|
|
359
298
|
overflow: 'hidden',
|
|
360
299
|
height: containerStyle?.height || '100%',
|
|
361
300
|
display: 'flex',
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
301
|
+
width: '100%',
|
|
302
|
+
flexDirection: 'row',
|
|
303
|
+
}, children: [(0, jsx_runtime_1.jsxs)("div", { style: {
|
|
304
|
+
display: 'flex',
|
|
305
|
+
gap: 4,
|
|
306
|
+
alignItems: 'baseline',
|
|
307
|
+
marginRight: 'auto',
|
|
308
|
+
}, children: [(0, jsx_runtime_1.jsx)("span", { children: data.rows.length > 0 &&
|
|
309
|
+
(0, valueFormatter_1.valueFormatter)({
|
|
310
|
+
value: data.rows[0][data.xAxisField],
|
|
311
|
+
field: data.xAxisField,
|
|
312
|
+
fields: [
|
|
313
|
+
{
|
|
314
|
+
field: data.xAxisField,
|
|
315
|
+
format: data.xAxisFormat,
|
|
316
|
+
},
|
|
317
|
+
],
|
|
318
|
+
}) }), isComparison && ((0, jsx_runtime_1.jsx)("span", { style: {
|
|
319
|
+
fontSize: 13,
|
|
320
|
+
fontWeight: '500',
|
|
321
|
+
fontFamily: theme?.fontFamily,
|
|
322
|
+
color: theme?.primaryTextColor,
|
|
323
|
+
marginLeft: 2,
|
|
324
|
+
}, children: primaryMetricLabel
|
|
325
|
+
? `in ${primaryMetricLabel.toLowerCase()}`
|
|
326
|
+
: 'this period' }))] }), isComparison && ((0, jsx_runtime_1.jsxs)("div", { style: {
|
|
327
|
+
display: 'flex',
|
|
328
|
+
gap: 4,
|
|
329
|
+
alignItems: 'baseline',
|
|
330
|
+
paddingTop: 4,
|
|
331
|
+
color: theme?.secondaryTextColor,
|
|
332
|
+
}, children: [(0, jsx_runtime_1.jsx)("span", { style: {
|
|
333
|
+
fontSize: 28,
|
|
334
|
+
fontWeight: '500',
|
|
335
|
+
fontFamily: theme?.fontFamily,
|
|
336
|
+
color: theme?.secondaryTextColor,
|
|
337
|
+
}, children: data.rows.length > 0 &&
|
|
338
|
+
(0, valueFormatter_1.valueFormatter)({
|
|
339
|
+
value: data.rows[0][`comparison_${data.xAxisField}`],
|
|
340
|
+
field: data.xAxisField,
|
|
341
|
+
fields: [
|
|
342
|
+
{
|
|
343
|
+
field: data.xAxisField,
|
|
344
|
+
format: data.xAxisFormat,
|
|
345
|
+
},
|
|
346
|
+
],
|
|
347
|
+
}) }), (0, jsx_runtime_1.jsx)("span", { style: {
|
|
348
|
+
fontSize: 13,
|
|
349
|
+
fontWeight: '500',
|
|
350
|
+
fontFamily: theme?.fontFamily,
|
|
351
|
+
color: theme?.secondaryTextColor,
|
|
352
|
+
marginLeft: 2,
|
|
353
|
+
}, children: comparisonLabel
|
|
354
|
+
? 'in ' + comparisonLabel.toLowerCase()
|
|
355
|
+
: 'previous period' })] }))] }));
|
|
374
356
|
}
|
|
375
|
-
return ((0, jsx_runtime_1.jsx)(LineChart_1.default, { colors: colors, yAxisFields: yAxisFields, data: data, xAxisField: config
|
|
376
|
-
? config.xAxisField
|
|
377
|
-
: bucketData
|
|
378
|
-
? bucketData.xAxisField
|
|
379
|
-
: dashboard[chartId].xAxisField, xAxisLabel: config
|
|
380
|
-
? config.xAxisLabel
|
|
381
|
-
: bucketData
|
|
382
|
-
? bucketData.xAxisLabel
|
|
383
|
-
: dashboard[chartId].xAxisLabel, xAxisFormat: config
|
|
384
|
-
? config.xAxisFormat
|
|
385
|
-
: bucketData
|
|
386
|
-
? bucketData.xAxisFormat
|
|
387
|
-
: dashboard[chartId].xAxisFormat, containerStyle: containerStyle, theme: theme, comparison: dateFilter?.comparison, isAnimationActive: isAnimationActive, hideXAxis: hideXAxis, hideYAxis: hideYAxis, hideCartesianGrid: hideCartesianGrid }));
|
|
357
|
+
return ((0, jsx_runtime_1.jsx)(LineChart_1.default, { colors: colors, yAxisFields: yAxisFields, data: data, xAxisField: config ? config.xAxisField : dashboard[chartId].xAxisField, xAxisLabel: config ? config.xAxisLabel : dashboard[chartId].xAxisLabel, xAxisFormat: config ? config.xAxisFormat : dashboard[chartId].xAxisFormat, containerStyle: containerStyle, theme: theme, comparison: dateFilter?.comparison, isAnimationActive: isAnimationActive, hideXAxis: hideXAxis, hideYAxis: hideYAxis, hideCartesianGrid: hideCartesianGrid }));
|
|
388
358
|
};
|
|
389
359
|
exports.default = Chart;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Dashboard.d.ts","sourceRoot":"","sources":["../../src/Dashboard.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Dashboard.d.ts","sourceRoot":"","sources":["../../src/Dashboard.tsx"],"names":[],"mappings":"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"}
|
package/dist/cjs/Dashboard.js
CHANGED
|
@@ -166,6 +166,7 @@ function Dashboard({ name, containerStyle, chartContainerStyle = defaultChartCon
|
|
|
166
166
|
const [client] = (0, react_1.useContext)(Context_1.ClientContext);
|
|
167
167
|
const [isLoading, setIsLoading] = (0, react_1.useState)(isDataLoading);
|
|
168
168
|
const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
|
|
169
|
+
const [initialLoad, setInitialLoad] = (0, react_1.useState)(true);
|
|
169
170
|
const { dashboardFilters, dashboardFiltersDispatch } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
|
|
170
171
|
const { setDateFilter } = (0, react_1.useContext)(Context_1.DateFilterContext);
|
|
171
172
|
(0, react_1.useEffect)(() => {
|
|
@@ -181,6 +182,7 @@ function Dashboard({ name, containerStyle, chartContainerStyle = defaultChartCon
|
|
|
181
182
|
}, [name, client]);
|
|
182
183
|
const onDashboardDataChange = (resp) => {
|
|
183
184
|
setDashboardSections(resp.sections);
|
|
185
|
+
setInitialLoad(false);
|
|
184
186
|
const bigFilterObj = {};
|
|
185
187
|
if (resp.dateFilter && Object.keys(resp.dateFilter).length) {
|
|
186
188
|
let presetsOptions = dateRangePickerUtils_1.defaultOptionsV2;
|
|
@@ -412,7 +414,7 @@ function Dashboard({ name, containerStyle, chartContainerStyle = defaultChartCon
|
|
|
412
414
|
onChangeLoading(isLoading);
|
|
413
415
|
}
|
|
414
416
|
}, [isLoading, onChangeLoading]);
|
|
415
|
-
if (isLoading)
|
|
417
|
+
if (isLoading || initialLoad)
|
|
416
418
|
return null;
|
|
417
419
|
if (!dashboardSections || Object.keys(dashboardSections).length == 0)
|
|
418
420
|
return (0, jsx_runtime_1.jsx)(EmptyDashboardComponent, {});
|
|
@@ -28,7 +28,7 @@ exports.defaultQuillTheme = {
|
|
|
28
28
|
loadingStateBackgroundColor: '#F9F9FA',
|
|
29
29
|
hoverBackgroundColor: '#F4F4F5',
|
|
30
30
|
};
|
|
31
|
-
const QuillProvider = ({ organizationId, publicKey, queryEndpoint, queryHeaders, environment, children, theme = exports.defaultQuillTheme, withCredentials = false, }) => {
|
|
31
|
+
const QuillProvider = ({ organizationId, publicKey, queryEndpoint = 'https://quill-344421.uc.r.appspot.com/cloud', queryHeaders, environment, children, theme = exports.defaultQuillTheme, withCredentials = false, }) => {
|
|
32
32
|
return ((0, jsx_runtime_1.jsx)(Context_1.ContextProvider, { initialTheme: theme, publicKey: publicKey, environment: environment, customerId: organizationId, queryEndpoint: queryEndpoint, queryHeaders: queryHeaders, withCredentials: withCredentials, children: children }));
|
|
33
33
|
};
|
|
34
34
|
exports.default = QuillProvider;
|
package/dist/cjs/SQLEditor.d.ts
CHANGED
|
@@ -34,7 +34,6 @@ interface SQLEditorProps {
|
|
|
34
34
|
addToDashboardButtonLabel?: string;
|
|
35
35
|
onAddToDashboardComplete?: () => void;
|
|
36
36
|
organizationName?: string;
|
|
37
|
-
onlyQueryQuillViews?: boolean;
|
|
38
37
|
}
|
|
39
38
|
interface TableComponentProps {
|
|
40
39
|
rows: any[];
|
|
@@ -47,7 +46,7 @@ interface TextInputComponentProps {
|
|
|
47
46
|
id: string;
|
|
48
47
|
placeholder?: string;
|
|
49
48
|
}
|
|
50
|
-
export default function QueryEditor({ containerStyle, ButtonComponent, SecondaryButtonComponent, TextInputComponent, TableComponent, newQueryEnabled, LoadingComponent, defaultQuery, onChangeQuery, onChangeData, onChangeColumns, onChangeFields, isEditMode, chartBuilderEnabled, showTableFormatOptions, showDateFieldOptions, showAccessControlOptions, destinationDashboard, chartBuilderTitle, chartBuilderButtonLabel, onAddToDashboardComplete, addToDashboardButtonLabel, dashboardItem, organizationName,
|
|
49
|
+
export default function QueryEditor({ containerStyle, ButtonComponent, SecondaryButtonComponent, TextInputComponent, TableComponent, newQueryEnabled, LoadingComponent, defaultQuery, onChangeQuery, onChangeData, onChangeColumns, onChangeFields, isEditMode, chartBuilderEnabled, showTableFormatOptions, showDateFieldOptions, showAccessControlOptions, destinationDashboard, chartBuilderTitle, chartBuilderButtonLabel, onAddToDashboardComplete, addToDashboardButtonLabel, dashboardItem, organizationName, }: SQLEditorProps): import("react/jsx-runtime").JSX.Element;
|
|
51
50
|
export declare const SchemaListComponent: ({ schema, theme, loading, LoadingComponent, width, }: {
|
|
52
51
|
schema: any;
|
|
53
52
|
theme: any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SQLEditor.d.ts","sourceRoot":"","sources":["../../src/SQLEditor.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAmD,MAAM,OAAO,CAAC;AAUxE,wBAAgB,qBAAqB,CAAC,MAAM,KAAA;;;;;EAwE3C;AA2BD,UAAU,oBAAoB;IAC5B,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,UAAU,cAAc;IACtB,cAAc,EAAE,KAAK,CAAC,aAAa,CAAC;IAEpC,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC/D,wBAAwB,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAExE,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,GAAG,CAAC,OAAO,CAAC;IACrE,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC7D,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IACrC,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACxC,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC9C,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC5C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,wBAAwB,CAAC,EAAE,MAAM,IAAI,CAAC;IACtC,gBAAgB,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"SQLEditor.d.ts","sourceRoot":"","sources":["../../src/SQLEditor.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAmD,MAAM,OAAO,CAAC;AAUxE,wBAAgB,qBAAqB,CAAC,MAAM,KAAA;;;;;EAwE3C;AA2BD,UAAU,oBAAoB;IAC5B,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,UAAU,cAAc;IACtB,cAAc,EAAE,KAAK,CAAC,aAAa,CAAC;IAEpC,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC/D,wBAAwB,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAExE,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,GAAG,CAAC,OAAO,CAAC;IACrE,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC7D,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IACrC,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACxC,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC9C,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC5C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,wBAAwB,CAAC,EAAE,MAAM,IAAI,CAAC;IACtC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAQD,UAAU,mBAAmB;IAC3B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,uBAAuB;IAC/B,QAAQ,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AA+ED,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,cAAoC,EACpC,eAAe,EACf,wBAAwB,EACxB,kBAAkB,EAClB,cAAc,EACd,eAAuB,EACvB,gBAAgB,EAChB,YAAY,EACZ,aAAa,EACb,YAAY,EACZ,eAAe,EACf,cAAc,EACd,UAAkB,EAClB,mBAA2B,EAC3B,sBAA8B,EAC9B,oBAA4B,EAC5B,wBAAgC,EAChC,oBAAoB,EACpB,iBAAiB,EACjB,uBAAuB,EACvB,wBAAwB,EACxB,yBAA8C,EAC9C,aAAyB,EACzB,gBAA4B,GAC7B,EAAE,cAAc,2CAgVhB;AA8LD,eAAO,MAAM,mBAAmB;;;;;;6CAqG/B,CAAC"}
|
package/dist/cjs/SQLEditor.js
CHANGED
|
@@ -148,7 +148,7 @@ const QuillTextInput = ({ onChange, value, id, placeholder, theme, }) => {
|
|
|
148
148
|
borderRadius: '6px',
|
|
149
149
|
}, id: id, onChange: onChange, value: value, placeholder: placeholder }));
|
|
150
150
|
};
|
|
151
|
-
function QueryEditor({ containerStyle = { height: '100vh' }, ButtonComponent, SecondaryButtonComponent, TextInputComponent, TableComponent, newQueryEnabled = false, LoadingComponent, defaultQuery, onChangeQuery, onChangeData, onChangeColumns, onChangeFields, isEditMode = false, chartBuilderEnabled = false, showTableFormatOptions = false, showDateFieldOptions = false, showAccessControlOptions = false, destinationDashboard, chartBuilderTitle, chartBuilderButtonLabel, onAddToDashboardComplete, addToDashboardButtonLabel = 'Add to dashboard', dashboardItem = undefined, organizationName = undefined,
|
|
151
|
+
function QueryEditor({ containerStyle = { height: '100vh' }, ButtonComponent, SecondaryButtonComponent, TextInputComponent, TableComponent, newQueryEnabled = false, LoadingComponent, defaultQuery, onChangeQuery, onChangeData, onChangeColumns, onChangeFields, isEditMode = false, chartBuilderEnabled = false, showTableFormatOptions = false, showDateFieldOptions = false, showAccessControlOptions = false, destinationDashboard, chartBuilderTitle, chartBuilderButtonLabel, onAddToDashboardComplete, addToDashboardButtonLabel = 'Add to dashboard', dashboardItem = undefined, organizationName = undefined, }) {
|
|
152
152
|
const [sqlPrompt, setSqlPrompt] = (0, react_1.useState)('');
|
|
153
153
|
const [isOpen, setIsOpen] = (0, react_1.useState)(false);
|
|
154
154
|
const [client] = (0, react_1.useContext)(Context_1.ClientContext);
|
|
@@ -210,21 +210,6 @@ function QueryEditor({ containerStyle = { height: '100vh' }, ButtonComponent, Se
|
|
|
210
210
|
try {
|
|
211
211
|
setSqlQueryLoading(true);
|
|
212
212
|
setErrorMessage('');
|
|
213
|
-
if (onlyQueryQuillViews) {
|
|
214
|
-
const tableAlias = query.match(/(\w+) AS \(/gi)?.map((match) => match.split(' ')[0]) ||
|
|
215
|
-
[];
|
|
216
|
-
const tableNames = query
|
|
217
|
-
.match(/FROM\s+(\w+)/gi)
|
|
218
|
-
.map((match) => match.split(' ')[1])
|
|
219
|
-
.filter((tableName) => !tableAlias.includes(tableName) &&
|
|
220
|
-
tableName?.toLocaleLowerCase() !== '(select');
|
|
221
|
-
const unselectableTables = tableNames.filter((tableName) => !schema.some((table) => table.displayName === tableName));
|
|
222
|
-
if (unselectableTables.length !== 0) {
|
|
223
|
-
setSqlQueryLoading(false);
|
|
224
|
-
setErrorMessage('No Quill SQL views with the name ' + unselectableTables[0]);
|
|
225
|
-
return;
|
|
226
|
-
}
|
|
227
|
-
}
|
|
228
213
|
const hostedBody = {
|
|
229
214
|
metadata: {
|
|
230
215
|
query,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetricComponent.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/MetricComponent.tsx"],"names":[],"mappings":";AAAA,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,EACpC,aAAa,EACb,oBAAoB,EACpB,KAAK,EACL,KAAK,EACL,QAAQ,GACT,EAAE,GAAG,GAAG,GAAG,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"MetricComponent.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/MetricComponent.tsx"],"names":[],"mappings":";AAAA,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,EACpC,aAAa,EACb,oBAAoB,EACpB,KAAK,EACL,KAAK,EACL,QAAQ,GACT,EAAE,GAAG,GAAG,GAAG,CAAC,OAAO,CAsGnB"}
|
|
@@ -58,6 +58,7 @@ function DashboardItem({ dashboardItem, onClickDashboardItem, theme, style, chil
|
|
|
58
58
|
}, children: 'view report →' })) : null] }), (0, jsx_runtime_1.jsx)("div", { style: {
|
|
59
59
|
padding: 0,
|
|
60
60
|
height: '100%',
|
|
61
|
+
width: '100%',
|
|
61
62
|
boxSizing: 'content-box',
|
|
62
63
|
}, children: children })] }) }) }) }, dashboardItem?.name));
|
|
63
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AA6B7C;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,GACpB,aAAa,
|
|
1
|
+
{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AA6B7C;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,GACpB,aAAa,CAmCf"}
|
package/dist/esm/Chart.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Chart.d.ts","sourceRoot":"","sources":["../../src/Chart.tsx"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"Chart.d.ts","sourceRoot":"","sources":["../../src/Chart.tsx"],"names":[],"mappings":";AA4BA,UAAU,cAAc;IACtB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACrC,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,UAAU,WAAY,SAAQ,cAAc;IAC1C,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,WAAW,GACnB,cAAc,GACd,mBAAmB,GACnB,oBAAoB,GACpB,eAAe,GACf,cAAc,GACd,UAAU,GACV,aAAa,GACb,eAAe,GACf,oBAAoB,GACpB,UAAU,GACV,SAAS,GACT,QAAQ,CAAC;AAEb,UAAU,UAAU;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,WAAW,CAAC;CACrB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,KAAK,EAAE,GAAG,CAAC;CACZ;AAED,UAAU,UAAW,SAAQ,cAAc;IACzC,MAAM,EAAE,aAAa,GAAG,GAAG,CAAC;CAC7B;AAED,KAAK,UAAU,GAAG,WAAW,GAAG,UAAU,CAAC;AA4D3C,wBAAgB,gBAAgB,CAAC,aAAa,KAAA,EAAE,OAAO,KAAA,WAQtD;AAKD,QAAA,MAAM,KAAK,8JAYR,UAAU,4CAkCZ,CAAC;AAicF,eAAe,KAAK,CAAC"}
|
package/dist/esm/Chart.js
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
import { jsx as _jsx } from "react/jsx-runtime";
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
// @ts-nocheck
|
|
3
3
|
import { useState, useEffect, useContext, useMemo } from 'react';
|
|
4
|
-
import { aggregate } from './utils/aggregate';
|
|
5
|
-
import { getPostgresBasicType } from './ReportBuilder';
|
|
6
4
|
import { differenceInHours } from 'date-fns';
|
|
7
5
|
import BarList from './BarList';
|
|
8
6
|
import PieChart from './PieChart';
|
|
@@ -16,6 +14,7 @@ import BarChart from './components/Chart/BarChart';
|
|
|
16
14
|
import { mergeComparisonRange } from './utils/merge';
|
|
17
15
|
import ChartSkeleton from './components/Chart/ChartSkeleton';
|
|
18
16
|
import ChartError from './components/Chart/ChartError';
|
|
17
|
+
import { COMPARISON_OPTIONS } from './DateRangePicker/dateRangePickerUtils';
|
|
19
18
|
// @ts-ignore
|
|
20
19
|
function sumByKey(arr, key) {
|
|
21
20
|
// @ts-ignore
|
|
@@ -85,9 +84,9 @@ const Chart = ({ chartId, config, colors, containerStyle, query, SelectComponent
|
|
|
85
84
|
return (_jsx(ChartUpdater, { config: config, dispatch: dispatch, dashboard: dashboard, chartId: chartId, containerStyle: containerStyle, colors: chartColors, client: client, theme: theme, dashboardFilters: dashboardFilters, query: query, isAnimationActive: isAnimationActive, hideXAxis: hideXAxis, hideYAxis: hideYAxis, hideCartesianGrid: hideCartesianGrid, dateRangeFilterDisabled: dateRangeFilterDisabled }));
|
|
86
85
|
};
|
|
87
86
|
const ChartUpdater = ({ colors, chartId, config, containerStyle, dashboard, dispatch, client, theme, dashboardFilters, isAnimationActive, hideXAxis, hideYAxis, hideCartesianGrid, dateRangeFilterDisabled, }) => {
|
|
87
|
+
const [initialLoad, setInitialLoad] = useState(true);
|
|
88
88
|
const [loading, setLoading] = useState(false);
|
|
89
89
|
const [isComparison, setIsComparison] = useState(false);
|
|
90
|
-
const [bucketData, setBucketData] = useState(null);
|
|
91
90
|
useEffect(() => {
|
|
92
91
|
async function getChartOptions() {
|
|
93
92
|
if (!didFiltersChange(dashboard[chartId], dashboardFilters)) {
|
|
@@ -126,7 +125,7 @@ const ChartUpdater = ({ colors, chartId, config, containerStyle, dashboard, disp
|
|
|
126
125
|
filters: minimalFilters,
|
|
127
126
|
};
|
|
128
127
|
const resp = await getData(client, 'itempost', 'omit', hostedBody, cloudBody);
|
|
129
|
-
if (resp && resp.name !== 'error') {
|
|
128
|
+
if (resp && resp.name !== 'error' && !resp.errorMessage) {
|
|
130
129
|
setIsComparison(!!resp.compareRows?.length);
|
|
131
130
|
if (resp.compareRows) {
|
|
132
131
|
mergeComparisonRange(resp);
|
|
@@ -151,44 +150,9 @@ const ChartUpdater = ({ colors, chartId, config, containerStyle, dashboard, disp
|
|
|
151
150
|
setLoading(false);
|
|
152
151
|
return;
|
|
153
152
|
}
|
|
153
|
+
setInitialLoad(false);
|
|
154
154
|
getChartOptions();
|
|
155
155
|
}, [dashboardFilters, client, chartId]);
|
|
156
|
-
useEffect(() => {
|
|
157
|
-
if (!dashboardFilters ||
|
|
158
|
-
!chartId ||
|
|
159
|
-
!dashboard[chartId] ||
|
|
160
|
-
!dashboard[chartId].buckets ||
|
|
161
|
-
!dashboard[chartId].buckets.length) {
|
|
162
|
-
return;
|
|
163
|
-
}
|
|
164
|
-
const dateFilter = Object.values(dashboardFilters).find((filter) => filter.filterType == 'date_range');
|
|
165
|
-
if (dateFilter && dashboard[chartId].rows.length) {
|
|
166
|
-
const aggregatedObj = aggregate(dashboard[chartId], dashboard[chartId].buckets, dateFilter);
|
|
167
|
-
setBucketData({
|
|
168
|
-
name: dashboard[chartId].name,
|
|
169
|
-
xAxisFormat: aggregatedObj.xAxisFormat,
|
|
170
|
-
xAxisField: aggregatedObj.xAxisField,
|
|
171
|
-
xAxisLabel: aggregatedObj.xAxisLabel,
|
|
172
|
-
rows: aggregatedObj.bucketedRows,
|
|
173
|
-
});
|
|
174
|
-
}
|
|
175
|
-
const stringFilters = dashboard[chartId].buckets.filter((bucket) => {
|
|
176
|
-
return (getPostgresBasicType(dashboard[chartId].fields.find((field) => field.name === bucket.field)) === 'string');
|
|
177
|
-
});
|
|
178
|
-
if (stringFilters.length && dashboard[chartId].rows.length) {
|
|
179
|
-
const aggregatedObj = aggregate(dashboard[chartId], dashboard[chartId].buckets, null);
|
|
180
|
-
setBucketData({
|
|
181
|
-
name: dashboard[chartId].name,
|
|
182
|
-
xAxisFormat: aggregatedObj.xAxisFormat,
|
|
183
|
-
xAxisField: aggregatedObj.xAxisField,
|
|
184
|
-
xAxisLabel: aggregatedObj.xAxisLabel,
|
|
185
|
-
rows: aggregatedObj.bucketedRows,
|
|
186
|
-
});
|
|
187
|
-
}
|
|
188
|
-
if (!dashboard[chartId].rows.length && bucketData !== null) {
|
|
189
|
-
setBucketData(null);
|
|
190
|
-
}
|
|
191
|
-
}, [dashboard[chartId]]);
|
|
192
156
|
const dateFilter = Object.values(dashboardFilters ?? {}).find((filter) => filter.filterType == 'date_range');
|
|
193
157
|
const isPivot = dashboard[chartId]?.pivot || config?.pivot;
|
|
194
158
|
const pivotTable = useMemo(() => {
|
|
@@ -220,7 +184,7 @@ const ChartUpdater = ({ colors, chartId, config, containerStyle, dashboard, disp
|
|
|
220
184
|
: null;
|
|
221
185
|
}, [pivotTable]);
|
|
222
186
|
if (!config && (!dashboard[chartId] || loading)) {
|
|
223
|
-
if (loading) {
|
|
187
|
+
if (loading || initialLoad) {
|
|
224
188
|
return _jsx(ChartSkeleton, { containerStyle: containerStyle });
|
|
225
189
|
}
|
|
226
190
|
else {
|
|
@@ -272,25 +236,12 @@ const ChartUpdater = ({ colors, chartId, config, containerStyle, dashboard, disp
|
|
|
272
236
|
return (_jsx(BarList, { data: pivotTable
|
|
273
237
|
? pivotTable.rows
|
|
274
238
|
: config
|
|
275
|
-
?
|
|
276
|
-
|
|
277
|
-
config.bucketedRows) ||
|
|
278
|
-
config.rows
|
|
279
|
-
: bucketData && bucketData.rows
|
|
280
|
-
? bucketData.rows
|
|
281
|
-
: dashboard[chartId].rows, theme: theme, yAxisFields: pivotTableYAxis
|
|
239
|
+
? config.rows
|
|
240
|
+
: dashboard[chartId].rows, theme: theme, yAxisFields: pivotTableYAxis
|
|
282
241
|
? pivotTableYAxis
|
|
283
242
|
: config
|
|
284
243
|
? config.yAxisFields
|
|
285
|
-
: dashboard[chartId].yAxisFields, colors: colors, xAxisField: config
|
|
286
|
-
? config.xAxisField
|
|
287
|
-
: bucketData
|
|
288
|
-
? bucketData.xAxisField
|
|
289
|
-
: dashboard[chartId].xAxisField, xAxisFormat: config
|
|
290
|
-
? config.xAxisFormat
|
|
291
|
-
: bucketData
|
|
292
|
-
? bucketData.xAxisFormat
|
|
293
|
-
: dashboard[chartId].xAxisFormat, containerStyle: containerStyle }));
|
|
244
|
+
: dashboard[chartId].yAxisFields, colors: colors, xAxisField: config ? config.xAxisField : dashboard[chartId].xAxisField, xAxisFormat: config ? config.xAxisFormat : dashboard[chartId].xAxisFormat, containerStyle: containerStyle }));
|
|
294
245
|
}
|
|
295
246
|
const yAxisFields = pivotTableYAxis
|
|
296
247
|
? pivotTableYAxis
|
|
@@ -308,13 +259,8 @@ const ChartUpdater = ({ colors, chartId, config, containerStyle, dashboard, disp
|
|
|
308
259
|
const data = (pivotTable
|
|
309
260
|
? pivotTable.rows
|
|
310
261
|
: config
|
|
311
|
-
?
|
|
312
|
-
|
|
313
|
-
config.bucketedRows) ||
|
|
314
|
-
config.rows
|
|
315
|
-
: bucketData && bucketData.rows && bucketData.rows.length > 0
|
|
316
|
-
? bucketData.rows
|
|
317
|
-
: dashboard[chartId].rows)
|
|
262
|
+
? config.rows
|
|
263
|
+
: dashboard[chartId].rows)
|
|
318
264
|
// filter out any rows with a comparison key but no corresponding primary
|
|
319
265
|
?.filter((row) => Object.keys(row).every((key) => !key.startsWith('comparison_') ||
|
|
320
266
|
(key.startsWith('comparison_') &&
|
|
@@ -322,23 +268,16 @@ const ChartUpdater = ({ colors, chartId, config, containerStyle, dashboard, disp
|
|
|
322
268
|
if (chartTypes.includes('column')) {
|
|
323
269
|
return (_jsx(BarChart, { colors: colors, theme: theme, isStacked: isPivot && yAxisFields.length > (dateFilter?.comparison ? 2 : 1), yAxisFields: yAxisFields,
|
|
324
270
|
// @ts-ignore
|
|
325
|
-
data: data, xAxisField: config
|
|
326
|
-
? config.xAxisField
|
|
327
|
-
: bucketData
|
|
328
|
-
? bucketData.xAxisField
|
|
329
|
-
: dashboard[chartId].xAxisField, xAxisLabel: config
|
|
330
|
-
? config.xAxisLabel
|
|
331
|
-
: bucketData
|
|
332
|
-
? bucketData.xAxisLabel
|
|
333
|
-
: dashboard[chartId].xAxisLabel, xAxisFormat: config
|
|
334
|
-
? config.xAxisFormat
|
|
335
|
-
: bucketData
|
|
336
|
-
? bucketData.xAxisFormat
|
|
337
|
-
: dashboard[chartId].xAxisFormat, containerStyle: containerStyle, comparison: dateFilter?.comparison, isAnimationActive: isAnimationActive, hideXAxis: hideXAxis, hideYAxis: hideYAxis, hideCartesianGrid: hideCartesianGrid }));
|
|
271
|
+
data: data, xAxisField: config ? config.xAxisField : dashboard[chartId].xAxisField, xAxisLabel: config ? config.xAxisLabel : dashboard[chartId].xAxisLabel, xAxisFormat: config ? config.xAxisFormat : dashboard[chartId].xAxisFormat, containerStyle: containerStyle, comparison: dateFilter?.comparison, isAnimationActive: isAnimationActive, hideXAxis: hideXAxis, hideYAxis: hideYAxis, hideCartesianGrid: hideCartesianGrid }));
|
|
338
272
|
}
|
|
339
273
|
if (chartTypes.includes('metric')) {
|
|
340
274
|
const data = dashboard[chartId] ? dashboard[chartId] : config;
|
|
341
|
-
|
|
275
|
+
const isComparison = data.rows.length > 0 &&
|
|
276
|
+
Object.keys(data.rows[0]).includes(`comparison_${data.xAxisField}`);
|
|
277
|
+
const primaryMetricLabel = data?.filtersApplied?.date_range?.preset?.label;
|
|
278
|
+
const comparisonKey = data?.filtersApplied?.date_range?.comparisonRange?.value;
|
|
279
|
+
const comparisonLabel = COMPARISON_OPTIONS.find((opt) => opt.value === comparisonKey)?.text;
|
|
280
|
+
return (_jsxs("div", { style: {
|
|
342
281
|
fontFamily: theme?.fontFamily,
|
|
343
282
|
fontSize: 32,
|
|
344
283
|
color: theme?.primaryTextColor,
|
|
@@ -352,31 +291,62 @@ const ChartUpdater = ({ colors, chartId, config, containerStyle, dashboard, disp
|
|
|
352
291
|
overflow: 'hidden',
|
|
353
292
|
height: containerStyle?.height || '100%',
|
|
354
293
|
display: 'flex',
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
294
|
+
width: '100%',
|
|
295
|
+
flexDirection: 'row',
|
|
296
|
+
}, children: [_jsxs("div", { style: {
|
|
297
|
+
display: 'flex',
|
|
298
|
+
gap: 4,
|
|
299
|
+
alignItems: 'baseline',
|
|
300
|
+
marginRight: 'auto',
|
|
301
|
+
}, children: [_jsx("span", { children: data.rows.length > 0 &&
|
|
302
|
+
valueFormatter({
|
|
303
|
+
value: data.rows[0][data.xAxisField],
|
|
304
|
+
field: data.xAxisField,
|
|
305
|
+
fields: [
|
|
306
|
+
{
|
|
307
|
+
field: data.xAxisField,
|
|
308
|
+
format: data.xAxisFormat,
|
|
309
|
+
},
|
|
310
|
+
],
|
|
311
|
+
}) }), isComparison && (_jsx("span", { style: {
|
|
312
|
+
fontSize: 13,
|
|
313
|
+
fontWeight: '500',
|
|
314
|
+
fontFamily: theme?.fontFamily,
|
|
315
|
+
color: theme?.primaryTextColor,
|
|
316
|
+
marginLeft: 2,
|
|
317
|
+
}, children: primaryMetricLabel
|
|
318
|
+
? `in ${primaryMetricLabel.toLowerCase()}`
|
|
319
|
+
: 'this period' }))] }), isComparison && (_jsxs("div", { style: {
|
|
320
|
+
display: 'flex',
|
|
321
|
+
gap: 4,
|
|
322
|
+
alignItems: 'baseline',
|
|
323
|
+
paddingTop: 4,
|
|
324
|
+
color: theme?.secondaryTextColor,
|
|
325
|
+
}, children: [_jsx("span", { style: {
|
|
326
|
+
fontSize: 28,
|
|
327
|
+
fontWeight: '500',
|
|
328
|
+
fontFamily: theme?.fontFamily,
|
|
329
|
+
color: theme?.secondaryTextColor,
|
|
330
|
+
}, children: data.rows.length > 0 &&
|
|
331
|
+
valueFormatter({
|
|
332
|
+
value: data.rows[0][`comparison_${data.xAxisField}`],
|
|
333
|
+
field: data.xAxisField,
|
|
334
|
+
fields: [
|
|
335
|
+
{
|
|
336
|
+
field: data.xAxisField,
|
|
337
|
+
format: data.xAxisFormat,
|
|
338
|
+
},
|
|
339
|
+
],
|
|
340
|
+
}) }), _jsx("span", { style: {
|
|
341
|
+
fontSize: 13,
|
|
342
|
+
fontWeight: '500',
|
|
343
|
+
fontFamily: theme?.fontFamily,
|
|
344
|
+
color: theme?.secondaryTextColor,
|
|
345
|
+
marginLeft: 2,
|
|
346
|
+
}, children: comparisonLabel
|
|
347
|
+
? 'in ' + comparisonLabel.toLowerCase()
|
|
348
|
+
: 'previous period' })] }))] }));
|
|
367
349
|
}
|
|
368
|
-
return (_jsx(LineChart, { colors: colors, yAxisFields: yAxisFields, data: data, xAxisField: config
|
|
369
|
-
? config.xAxisField
|
|
370
|
-
: bucketData
|
|
371
|
-
? bucketData.xAxisField
|
|
372
|
-
: dashboard[chartId].xAxisField, xAxisLabel: config
|
|
373
|
-
? config.xAxisLabel
|
|
374
|
-
: bucketData
|
|
375
|
-
? bucketData.xAxisLabel
|
|
376
|
-
: dashboard[chartId].xAxisLabel, xAxisFormat: config
|
|
377
|
-
? config.xAxisFormat
|
|
378
|
-
: bucketData
|
|
379
|
-
? bucketData.xAxisFormat
|
|
380
|
-
: dashboard[chartId].xAxisFormat, containerStyle: containerStyle, theme: theme, comparison: dateFilter?.comparison, isAnimationActive: isAnimationActive, hideXAxis: hideXAxis, hideYAxis: hideYAxis, hideCartesianGrid: hideCartesianGrid }));
|
|
350
|
+
return (_jsx(LineChart, { colors: colors, yAxisFields: yAxisFields, data: data, xAxisField: config ? config.xAxisField : dashboard[chartId].xAxisField, xAxisLabel: config ? config.xAxisLabel : dashboard[chartId].xAxisLabel, xAxisFormat: config ? config.xAxisFormat : dashboard[chartId].xAxisFormat, containerStyle: containerStyle, theme: theme, comparison: dateFilter?.comparison, isAnimationActive: isAnimationActive, hideXAxis: hideXAxis, hideYAxis: hideYAxis, hideCartesianGrid: hideCartesianGrid }));
|
|
381
351
|
};
|
|
382
352
|
export default Chart;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Dashboard.d.ts","sourceRoot":"","sources":["../../src/Dashboard.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Dashboard.d.ts","sourceRoot":"","sources":["../../src/Dashboard.tsx"],"names":[],"mappings":"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"}
|
package/dist/esm/Dashboard.js
CHANGED
|
@@ -159,6 +159,7 @@ export default function Dashboard({ name, containerStyle, chartContainerStyle =
|
|
|
159
159
|
const [client] = useContext(ClientContext);
|
|
160
160
|
const [isLoading, setIsLoading] = useState(isDataLoading);
|
|
161
161
|
const [theme] = useContext(ThemeContext);
|
|
162
|
+
const [initialLoad, setInitialLoad] = useState(true);
|
|
162
163
|
const { dashboardFilters, dashboardFiltersDispatch } = useContext(DashboardFiltersContext);
|
|
163
164
|
const { setDateFilter } = useContext(DateFilterContext);
|
|
164
165
|
useEffect(() => {
|
|
@@ -174,6 +175,7 @@ export default function Dashboard({ name, containerStyle, chartContainerStyle =
|
|
|
174
175
|
}, [name, client]);
|
|
175
176
|
const onDashboardDataChange = (resp) => {
|
|
176
177
|
setDashboardSections(resp.sections);
|
|
178
|
+
setInitialLoad(false);
|
|
177
179
|
const bigFilterObj = {};
|
|
178
180
|
if (resp.dateFilter && Object.keys(resp.dateFilter).length) {
|
|
179
181
|
let presetsOptions = defaultOptionsV2;
|
|
@@ -405,7 +407,7 @@ export default function Dashboard({ name, containerStyle, chartContainerStyle =
|
|
|
405
407
|
onChangeLoading(isLoading);
|
|
406
408
|
}
|
|
407
409
|
}, [isLoading, onChangeLoading]);
|
|
408
|
-
if (isLoading)
|
|
410
|
+
if (isLoading || initialLoad)
|
|
409
411
|
return null;
|
|
410
412
|
if (!dashboardSections || Object.keys(dashboardSections).length == 0)
|
|
411
413
|
return _jsx(EmptyDashboardComponent, {});
|
|
@@ -25,7 +25,7 @@ export const defaultQuillTheme = {
|
|
|
25
25
|
loadingStateBackgroundColor: '#F9F9FA',
|
|
26
26
|
hoverBackgroundColor: '#F4F4F5',
|
|
27
27
|
};
|
|
28
|
-
const QuillProvider = ({ organizationId, publicKey, queryEndpoint, queryHeaders, environment, children, theme = defaultQuillTheme, withCredentials = false, }) => {
|
|
28
|
+
const QuillProvider = ({ organizationId, publicKey, queryEndpoint = 'https://quill-344421.uc.r.appspot.com/cloud', queryHeaders, environment, children, theme = defaultQuillTheme, withCredentials = false, }) => {
|
|
29
29
|
return (_jsx(ContextProvider, { initialTheme: theme, publicKey: publicKey, environment: environment, customerId: organizationId, queryEndpoint: queryEndpoint, queryHeaders: queryHeaders, withCredentials: withCredentials, children: children }));
|
|
30
30
|
};
|
|
31
31
|
export default QuillProvider;
|
package/dist/esm/SQLEditor.d.ts
CHANGED
|
@@ -34,7 +34,6 @@ interface SQLEditorProps {
|
|
|
34
34
|
addToDashboardButtonLabel?: string;
|
|
35
35
|
onAddToDashboardComplete?: () => void;
|
|
36
36
|
organizationName?: string;
|
|
37
|
-
onlyQueryQuillViews?: boolean;
|
|
38
37
|
}
|
|
39
38
|
interface TableComponentProps {
|
|
40
39
|
rows: any[];
|
|
@@ -47,7 +46,7 @@ interface TextInputComponentProps {
|
|
|
47
46
|
id: string;
|
|
48
47
|
placeholder?: string;
|
|
49
48
|
}
|
|
50
|
-
export default function QueryEditor({ containerStyle, ButtonComponent, SecondaryButtonComponent, TextInputComponent, TableComponent, newQueryEnabled, LoadingComponent, defaultQuery, onChangeQuery, onChangeData, onChangeColumns, onChangeFields, isEditMode, chartBuilderEnabled, showTableFormatOptions, showDateFieldOptions, showAccessControlOptions, destinationDashboard, chartBuilderTitle, chartBuilderButtonLabel, onAddToDashboardComplete, addToDashboardButtonLabel, dashboardItem, organizationName,
|
|
49
|
+
export default function QueryEditor({ containerStyle, ButtonComponent, SecondaryButtonComponent, TextInputComponent, TableComponent, newQueryEnabled, LoadingComponent, defaultQuery, onChangeQuery, onChangeData, onChangeColumns, onChangeFields, isEditMode, chartBuilderEnabled, showTableFormatOptions, showDateFieldOptions, showAccessControlOptions, destinationDashboard, chartBuilderTitle, chartBuilderButtonLabel, onAddToDashboardComplete, addToDashboardButtonLabel, dashboardItem, organizationName, }: SQLEditorProps): import("react/jsx-runtime").JSX.Element;
|
|
51
50
|
export declare const SchemaListComponent: ({ schema, theme, loading, LoadingComponent, width, }: {
|
|
52
51
|
schema: any;
|
|
53
52
|
theme: any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SQLEditor.d.ts","sourceRoot":"","sources":["../../src/SQLEditor.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAmD,MAAM,OAAO,CAAC;AAUxE,wBAAgB,qBAAqB,CAAC,MAAM,KAAA;;;;;EAwE3C;AA2BD,UAAU,oBAAoB;IAC5B,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,UAAU,cAAc;IACtB,cAAc,EAAE,KAAK,CAAC,aAAa,CAAC;IAEpC,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC/D,wBAAwB,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAExE,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,GAAG,CAAC,OAAO,CAAC;IACrE,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC7D,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IACrC,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACxC,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC9C,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC5C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,wBAAwB,CAAC,EAAE,MAAM,IAAI,CAAC;IACtC,gBAAgB,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"SQLEditor.d.ts","sourceRoot":"","sources":["../../src/SQLEditor.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAmD,MAAM,OAAO,CAAC;AAUxE,wBAAgB,qBAAqB,CAAC,MAAM,KAAA;;;;;EAwE3C;AA2BD,UAAU,oBAAoB;IAC5B,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,UAAU,cAAc;IACtB,cAAc,EAAE,KAAK,CAAC,aAAa,CAAC;IAEpC,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC/D,wBAAwB,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAExE,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,GAAG,CAAC,OAAO,CAAC;IACrE,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC7D,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IACrC,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACxC,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC9C,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC5C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,wBAAwB,CAAC,EAAE,MAAM,IAAI,CAAC;IACtC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAQD,UAAU,mBAAmB;IAC3B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,uBAAuB;IAC/B,QAAQ,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AA+ED,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,cAAoC,EACpC,eAAe,EACf,wBAAwB,EACxB,kBAAkB,EAClB,cAAc,EACd,eAAuB,EACvB,gBAAgB,EAChB,YAAY,EACZ,aAAa,EACb,YAAY,EACZ,eAAe,EACf,cAAc,EACd,UAAkB,EAClB,mBAA2B,EAC3B,sBAA8B,EAC9B,oBAA4B,EAC5B,wBAAgC,EAChC,oBAAoB,EACpB,iBAAiB,EACjB,uBAAuB,EACvB,wBAAwB,EACxB,yBAA8C,EAC9C,aAAyB,EACzB,gBAA4B,GAC7B,EAAE,cAAc,2CAgVhB;AA8LD,eAAO,MAAM,mBAAmB;;;;;;6CAqG/B,CAAC"}
|
package/dist/esm/SQLEditor.js
CHANGED
|
@@ -141,7 +141,7 @@ const QuillTextInput = ({ onChange, value, id, placeholder, theme, }) => {
|
|
|
141
141
|
borderRadius: '6px',
|
|
142
142
|
}, id: id, onChange: onChange, value: value, placeholder: placeholder }));
|
|
143
143
|
};
|
|
144
|
-
export default function QueryEditor({ containerStyle = { height: '100vh' }, ButtonComponent, SecondaryButtonComponent, TextInputComponent, TableComponent, newQueryEnabled = false, LoadingComponent, defaultQuery, onChangeQuery, onChangeData, onChangeColumns, onChangeFields, isEditMode = false, chartBuilderEnabled = false, showTableFormatOptions = false, showDateFieldOptions = false, showAccessControlOptions = false, destinationDashboard, chartBuilderTitle, chartBuilderButtonLabel, onAddToDashboardComplete, addToDashboardButtonLabel = 'Add to dashboard', dashboardItem = undefined, organizationName = undefined,
|
|
144
|
+
export default function QueryEditor({ containerStyle = { height: '100vh' }, ButtonComponent, SecondaryButtonComponent, TextInputComponent, TableComponent, newQueryEnabled = false, LoadingComponent, defaultQuery, onChangeQuery, onChangeData, onChangeColumns, onChangeFields, isEditMode = false, chartBuilderEnabled = false, showTableFormatOptions = false, showDateFieldOptions = false, showAccessControlOptions = false, destinationDashboard, chartBuilderTitle, chartBuilderButtonLabel, onAddToDashboardComplete, addToDashboardButtonLabel = 'Add to dashboard', dashboardItem = undefined, organizationName = undefined, }) {
|
|
145
145
|
const [sqlPrompt, setSqlPrompt] = useState('');
|
|
146
146
|
const [isOpen, setIsOpen] = useState(false);
|
|
147
147
|
const [client] = useContext(ClientContext);
|
|
@@ -203,21 +203,6 @@ export default function QueryEditor({ containerStyle = { height: '100vh' }, Butt
|
|
|
203
203
|
try {
|
|
204
204
|
setSqlQueryLoading(true);
|
|
205
205
|
setErrorMessage('');
|
|
206
|
-
if (onlyQueryQuillViews) {
|
|
207
|
-
const tableAlias = query.match(/(\w+) AS \(/gi)?.map((match) => match.split(' ')[0]) ||
|
|
208
|
-
[];
|
|
209
|
-
const tableNames = query
|
|
210
|
-
.match(/FROM\s+(\w+)/gi)
|
|
211
|
-
.map((match) => match.split(' ')[1])
|
|
212
|
-
.filter((tableName) => !tableAlias.includes(tableName) &&
|
|
213
|
-
tableName?.toLocaleLowerCase() !== '(select');
|
|
214
|
-
const unselectableTables = tableNames.filter((tableName) => !schema.some((table) => table.displayName === tableName));
|
|
215
|
-
if (unselectableTables.length !== 0) {
|
|
216
|
-
setSqlQueryLoading(false);
|
|
217
|
-
setErrorMessage('No Quill SQL views with the name ' + unselectableTables[0]);
|
|
218
|
-
return;
|
|
219
|
-
}
|
|
220
|
-
}
|
|
221
206
|
const hostedBody = {
|
|
222
207
|
metadata: {
|
|
223
208
|
query,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetricComponent.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/MetricComponent.tsx"],"names":[],"mappings":";AAAA,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,EACpC,aAAa,EACb,oBAAoB,EACpB,KAAK,EACL,KAAK,EACL,QAAQ,GACT,EAAE,GAAG,GAAG,GAAG,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"MetricComponent.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/MetricComponent.tsx"],"names":[],"mappings":";AAAA,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,EACpC,aAAa,EACb,oBAAoB,EACpB,KAAK,EACL,KAAK,EACL,QAAQ,GACT,EAAE,GAAG,GAAG,GAAG,CAAC,OAAO,CAsGnB"}
|
|
@@ -56,6 +56,7 @@ export default function DashboardItem({ dashboardItem, onClickDashboardItem, the
|
|
|
56
56
|
}, children: 'view report →' })) : null] }), _jsx("div", { style: {
|
|
57
57
|
padding: 0,
|
|
58
58
|
height: '100%',
|
|
59
|
+
width: '100%',
|
|
59
60
|
boxSizing: 'content-box',
|
|
60
61
|
}, children: children })] }) }) }) }, dashboardItem?.name));
|
|
61
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AA6B7C;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,GACpB,aAAa,
|
|
1
|
+
{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AA6B7C;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,GACpB,aAAa,CAmCf"}
|