@quillsql/react 2.13.20 → 2.13.21
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 +171 -23
- package/dist/cjs/Context.d.ts.map +1 -1
- package/dist/cjs/Context.js +13 -8
- package/dist/cjs/components/Dashboard/DashboardFilter.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/DashboardFilter.js +19 -1
- package/dist/cjs/components/Dashboard/DataLoader.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/DataLoader.js +4 -5
- package/dist/cjs/hooks/useExport.d.ts.map +1 -1
- package/dist/cjs/hooks/useExport.js +101 -70
- package/dist/cjs/hooks/useQuill.d.ts.map +1 -1
- package/dist/cjs/hooks/useQuill.js +21 -21
- package/dist/cjs/utils/filterProcessing.d.ts +2 -1
- package/dist/cjs/utils/filterProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/filterProcessing.js +16 -0
- package/dist/cjs/utils/queryConstructor.d.ts.map +1 -1
- package/dist/cjs/utils/queryConstructor.js +2 -1
- package/dist/cjs/utils/report.d.ts +1 -1
- package/dist/cjs/utils/report.d.ts.map +1 -1
- package/dist/cjs/utils/report.js +4 -2
- package/dist/esm/Chart.d.ts.map +1 -1
- package/dist/esm/Chart.js +173 -25
- package/dist/esm/Context.d.ts.map +1 -1
- package/dist/esm/Context.js +13 -8
- package/dist/esm/components/Dashboard/DashboardFilter.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/DashboardFilter.js +20 -2
- package/dist/esm/components/Dashboard/DataLoader.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/DataLoader.js +4 -5
- package/dist/esm/hooks/useExport.d.ts.map +1 -1
- package/dist/esm/hooks/useExport.js +102 -71
- package/dist/esm/hooks/useQuill.d.ts.map +1 -1
- package/dist/esm/hooks/useQuill.js +21 -21
- package/dist/esm/utils/filterProcessing.d.ts +2 -1
- package/dist/esm/utils/filterProcessing.d.ts.map +1 -1
- package/dist/esm/utils/filterProcessing.js +15 -0
- package/dist/esm/utils/queryConstructor.d.ts.map +1 -1
- package/dist/esm/utils/queryConstructor.js +2 -1
- package/dist/esm/utils/report.d.ts +1 -1
- package/dist/esm/utils/report.d.ts.map +1 -1
- package/dist/esm/utils/report.js +4 -2
- package/package.json +4 -4
package/dist/cjs/Chart.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Chart.d.ts","sourceRoot":"","sources":["../../src/Chart.tsx"],"names":[],"mappings":"AAAA,OAAO,EAKL,SAAS,EACT,WAAW,EACZ,MAAM,OAAO,CAAC;AAcf,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAK7C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,
|
|
1
|
+
{"version":3,"file":"Chart.d.ts","sourceRoot":"","sources":["../../src/Chart.tsx"],"names":[],"mappings":"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"}
|
package/dist/cjs/Chart.js
CHANGED
|
@@ -45,6 +45,8 @@ const ChartError_1 = __importDefault(require("./components/Chart/ChartError"));
|
|
|
45
45
|
const Filter_1 = require("./models/Filter");
|
|
46
46
|
const filterProcessing_1 = require("./utils/filterProcessing");
|
|
47
47
|
const UiComponents_1 = require("./components/UiComponents");
|
|
48
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
49
|
+
const DashboardFilter_1 = require("./components/Dashboard/DashboardFilter");
|
|
48
50
|
const QuillSelect_1 = require("./components/QuillSelect");
|
|
49
51
|
const QuillMultiSelect_1 = require("./components/QuillMultiSelect");
|
|
50
52
|
const QuillDateRangePicker_1 = require("./DateRangePicker/QuillDateRangePicker");
|
|
@@ -53,6 +55,7 @@ const paginationProcessing_1 = require("./utils/paginationProcessing");
|
|
|
53
55
|
const MetricComponent_1 = __importDefault(require("./components/Dashboard/MetricComponent"));
|
|
54
56
|
const DataLoader_1 = __importStar(require("./components/Dashboard/DataLoader"));
|
|
55
57
|
const TableComponent_1 = __importDefault(require("./components/Dashboard/TableComponent"));
|
|
58
|
+
const dateRangePickerUtils_1 = require("./DateRangePicker/dateRangePickerUtils");
|
|
56
59
|
const MAX_ROWS_FOR_GENERIC_TABLE = 500;
|
|
57
60
|
// @ts-ignore
|
|
58
61
|
function sumByKey(arr, key) {
|
|
@@ -174,17 +177,63 @@ FilterContainerComponent = UiComponents_1.QuillFilterContainerComponent, TableCo
|
|
|
174
177
|
const [dashboard] = (0, react_1.useContext)(Context_1.DashboardContext);
|
|
175
178
|
const { dashboardFilters } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
|
|
176
179
|
const { reports, reportsDispatch, fetchIndividualReport } = (0, react_1.useContext)(Context_1.ReportsContext);
|
|
177
|
-
const { reportFiltersDispatch, reportFilters } = (0, react_1.useContext)(Context_1.ReportFiltersContext);
|
|
178
|
-
const customDateFilterExists = (0, react_1.useMemo)(() => {
|
|
179
|
-
return filters?.some((f) => f.filterType === Filter_1.FilterType.DateCustomFilter);
|
|
180
|
-
}, [filters]);
|
|
180
|
+
const { reportFiltersDispatch, reportFilters, loadFiltersForReport } = (0, react_1.useContext)(Context_1.ReportFiltersContext);
|
|
181
181
|
const specificReportFilters = (0, react_1.useMemo)(() => {
|
|
182
|
-
return Object.values(reportFilters[reportId] ??
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
182
|
+
return Object.values(reportFilters[reportId] ??
|
|
183
|
+
(dashboard[reportId]
|
|
184
|
+
? dashboardFilters[dashboard[reportId].dashboardName]
|
|
185
|
+
: null) ??
|
|
186
|
+
{}).map((f) => f.filter);
|
|
187
|
+
}, [reportFilters[reportId]]);
|
|
188
|
+
const reportDateFilter = (0, react_1.useMemo)(() => {
|
|
189
|
+
return specificReportFilters.find((f) => f.filterType === 'date_range');
|
|
190
|
+
}, [specificReportFilters]);
|
|
191
|
+
const presetOptions = (0, react_1.useMemo)(() => {
|
|
192
|
+
return reportDateFilter
|
|
193
|
+
? (reportDateFilter.presetRanges?.map((elem) => {
|
|
194
|
+
if (!elem.isStatic) {
|
|
195
|
+
return {
|
|
196
|
+
label: elem.label,
|
|
197
|
+
value: elem.value,
|
|
198
|
+
startDate: dateRangePickerUtils_1.PRIMARY_RANGE[elem.value]?.startDate ??
|
|
199
|
+
dateRangePickerUtils_1.PRIMARY_RANGE['LAST_30_DAYS'].startDate,
|
|
200
|
+
endDate: dateRangePickerUtils_1.PRIMARY_RANGE[elem.value]?.endDate ??
|
|
201
|
+
dateRangePickerUtils_1.PRIMARY_RANGE['LAST_30_DAYS'].endDate,
|
|
202
|
+
};
|
|
203
|
+
}
|
|
204
|
+
return {
|
|
205
|
+
label: elem.label,
|
|
206
|
+
value: elem.value,
|
|
207
|
+
startDate: new Date(elem.startDate),
|
|
208
|
+
endDate: new Date(elem.endDate),
|
|
209
|
+
};
|
|
210
|
+
}) ?? dateRangePickerUtils_1.defaultOptionsV2)
|
|
211
|
+
: dateRangePickerUtils_1.defaultOptionsV2;
|
|
212
|
+
}, [reportDateFilter]);
|
|
213
|
+
const userFilters = (0, react_1.useMemo)(() => {
|
|
214
|
+
return filters?.filter((f) => f.filterType !== Filter_1.FilterType.DateCustomFilter &&
|
|
215
|
+
f.filterType !== Filter_1.FilterType.DateFilter &&
|
|
216
|
+
f.filterType !== Filter_1.FilterType.DateComparisonFilter);
|
|
217
|
+
}, [filters]);
|
|
218
|
+
(0, react_1.useEffect)(() => {
|
|
219
|
+
if (reportDateFilter) {
|
|
220
|
+
// Filter for custom date filter that applies to the report's dateField
|
|
221
|
+
const customDateFilter = filters?.find((f) => f.filterType === Filter_1.FilterType.DateCustomFilter);
|
|
222
|
+
if (!customDateFilter) {
|
|
223
|
+
return;
|
|
224
|
+
}
|
|
225
|
+
reportFiltersDispatch({
|
|
226
|
+
type: 'UPDATE_REPORT_FILTER',
|
|
227
|
+
id: reportId,
|
|
228
|
+
data: {
|
|
229
|
+
filter: (0, filterProcessing_1.applyCustomFilterToDashDateFilter)(customDateFilter, reportDateFilter),
|
|
230
|
+
loading: false,
|
|
231
|
+
},
|
|
232
|
+
});
|
|
233
|
+
}
|
|
234
|
+
}, [filters]);
|
|
186
235
|
const report = (0, react_1.useMemo)(() => reports[reportId], [reports, reportId]);
|
|
187
|
-
const [loading, setLoading] = (0, react_1.useState)(
|
|
236
|
+
const [loading, setLoading] = (0, react_1.useState)(true);
|
|
188
237
|
const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
|
|
189
238
|
const colorMap = (0, react_1.useMemo)(() => {
|
|
190
239
|
if (mapColorsToFields && report && theme) {
|
|
@@ -193,6 +242,96 @@ FilterContainerComponent = UiComponents_1.QuillFilterContainerComponent, TableCo
|
|
|
193
242
|
}, [report, theme]);
|
|
194
243
|
const [client, clientLoading] = (0, react_1.useContext)(Context_1.ClientContext);
|
|
195
244
|
const [error, setError] = (0, react_1.useState)(undefined);
|
|
245
|
+
const updateFilter = (filter, value, comparison) => {
|
|
246
|
+
let filterValue = {};
|
|
247
|
+
if (filter.filterType === Filter_1.DashboardFilterType.String) {
|
|
248
|
+
if (filter.stringFilterType === 'multiselect') {
|
|
249
|
+
if ((value?.length ?? 0) === 0) {
|
|
250
|
+
filterValue = { values: undefined, operator: undefined };
|
|
251
|
+
}
|
|
252
|
+
else {
|
|
253
|
+
filterValue = { values: value, operator: 'IN' };
|
|
254
|
+
}
|
|
255
|
+
}
|
|
256
|
+
else {
|
|
257
|
+
filterValue = { selectedValue: value };
|
|
258
|
+
}
|
|
259
|
+
}
|
|
260
|
+
else if (filter.filterType === Filter_1.DashboardFilterType.Date) {
|
|
261
|
+
if (comparison ||
|
|
262
|
+
(filter.comparison &&
|
|
263
|
+
(filter.comparisonRange?.value ?? 'NO_COMPARISON') !==
|
|
264
|
+
'NO_COMPARISON')) {
|
|
265
|
+
let preset = '';
|
|
266
|
+
if (comparison) {
|
|
267
|
+
preset = filter.preset.value;
|
|
268
|
+
}
|
|
269
|
+
const key = comparison?.value ||
|
|
270
|
+
(filter.comparisonRange?.value ?? 'NO_COMPARISON');
|
|
271
|
+
let primaryRange = {
|
|
272
|
+
startDate: value ? value.startDate : filter.startDate,
|
|
273
|
+
endDate: value ? value.endDate : filter.endDate,
|
|
274
|
+
};
|
|
275
|
+
if (value && value.preset) {
|
|
276
|
+
preset = value.preset;
|
|
277
|
+
primaryRange = (0, dateRangePickerUtils_1.getRangeFromPresetOptions)(value.preset, presetOptions);
|
|
278
|
+
}
|
|
279
|
+
filterValue = {
|
|
280
|
+
startDate: primaryRange.startDate,
|
|
281
|
+
endDate: primaryRange.endDate,
|
|
282
|
+
preset: {
|
|
283
|
+
label: presetOptions.find((o) => o.value === preset)?.label ?? preset,
|
|
284
|
+
value: preset,
|
|
285
|
+
},
|
|
286
|
+
comparisonRange: {
|
|
287
|
+
startDate: dateRangePickerUtils_1.COMPARISON_RANGE[key](primaryRange)
|
|
288
|
+
?.startDate,
|
|
289
|
+
endDate: dateRangePickerUtils_1.COMPARISON_RANGE[key](primaryRange)
|
|
290
|
+
?.endDate,
|
|
291
|
+
value: key,
|
|
292
|
+
},
|
|
293
|
+
};
|
|
294
|
+
}
|
|
295
|
+
else {
|
|
296
|
+
const primaryRange = value && value.preset
|
|
297
|
+
? (0, dateRangePickerUtils_1.getRangeFromPresetOptions)(value.preset, presetOptions)
|
|
298
|
+
: {
|
|
299
|
+
startDate: value?.startDate || filter.startDate,
|
|
300
|
+
endDate: value?.endDate || filter.endDate,
|
|
301
|
+
};
|
|
302
|
+
const preset = value?.preset ? value.preset : '';
|
|
303
|
+
filterValue = {
|
|
304
|
+
startDate: primaryRange.startDate,
|
|
305
|
+
endDate: primaryRange.endDate,
|
|
306
|
+
preset: {
|
|
307
|
+
label: presetOptions.find((o) => o.value === preset)?.label ?? preset,
|
|
308
|
+
value: preset,
|
|
309
|
+
},
|
|
310
|
+
};
|
|
311
|
+
}
|
|
312
|
+
}
|
|
313
|
+
reportFiltersDispatch({
|
|
314
|
+
type: 'UPDATE_REPORT_FILTER',
|
|
315
|
+
id: reportId,
|
|
316
|
+
data: {
|
|
317
|
+
filter: {
|
|
318
|
+
...filter,
|
|
319
|
+
...filterValue,
|
|
320
|
+
},
|
|
321
|
+
loading: true,
|
|
322
|
+
},
|
|
323
|
+
});
|
|
324
|
+
// FIXME: filter options by other options
|
|
325
|
+
// setTimeout(() => {
|
|
326
|
+
// loadFiltersForReport(
|
|
327
|
+
// reportId,
|
|
328
|
+
// 'Chart',
|
|
329
|
+
// specificReportFilters,
|
|
330
|
+
// filter.label,
|
|
331
|
+
// userFilters?.map(convertCustomFilter),
|
|
332
|
+
// );
|
|
333
|
+
// }, 2000);
|
|
334
|
+
};
|
|
196
335
|
const fetchReportHelper = async () => {
|
|
197
336
|
if (!client) {
|
|
198
337
|
return;
|
|
@@ -209,34 +348,43 @@ FilterContainerComponent = UiComponents_1.QuillFilterContainerComponent, TableCo
|
|
|
209
348
|
}
|
|
210
349
|
};
|
|
211
350
|
(0, react_1.useEffect)(() => {
|
|
212
|
-
if (reportId === undefined || reportId === '' || clientLoading)
|
|
351
|
+
if (reportId === undefined || reportId === '' || clientLoading) {
|
|
213
352
|
return;
|
|
353
|
+
}
|
|
354
|
+
if (dashboard[reportId] &&
|
|
355
|
+
dashboardFilters[dashboard[reportId].dashboardName]) {
|
|
356
|
+
reportFiltersDispatch({
|
|
357
|
+
type: 'ADD_REPORT_FILTERS',
|
|
358
|
+
id: reportId,
|
|
359
|
+
data: Object.values(dashboardFilters[dashboard[reportId].dashboardName] ?? {}),
|
|
360
|
+
});
|
|
361
|
+
}
|
|
214
362
|
if (dashboard[reportId]) {
|
|
215
363
|
reportsDispatch({
|
|
216
364
|
type: 'ADD_REPORT',
|
|
217
365
|
id: reportId,
|
|
218
366
|
data: dashboard[reportId],
|
|
219
367
|
});
|
|
368
|
+
setLoading(false);
|
|
220
369
|
}
|
|
221
370
|
else if (!reports[reportId]) {
|
|
222
371
|
fetchReportHelper();
|
|
372
|
+
return;
|
|
223
373
|
}
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
}
|
|
231
|
-
}, [dashboard[reportId], dashboardFilters[reportId], clientLoading]);
|
|
374
|
+
setLoading(false);
|
|
375
|
+
}, [
|
|
376
|
+
dashboard[reportId],
|
|
377
|
+
dashboard[reportId] && dashboardFilters[dashboard[reportId].dashboardName],
|
|
378
|
+
clientLoading,
|
|
379
|
+
]);
|
|
232
380
|
if (report?.error || error) {
|
|
233
381
|
return ((0, jsx_runtime_1.jsx)("div", { style: containerStyle, className: className, children: (0, jsx_runtime_1.jsx)(ChartError_1.default, { errorMessage: report?.error ?? error }) }));
|
|
234
382
|
}
|
|
235
|
-
return ((0, jsx_runtime_1.
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
383
|
+
return ((0, jsx_runtime_1.jsxs)("div", { children: [!hideFilters && ((0, jsx_runtime_1.jsx)(FilterContainerComponent, { children: specificReportFilters.map((filter, index) => ((0, jsx_runtime_1.jsx)(DashboardFilter_1.DashboardFilter, { filter: filter, isLoading: reportFilters[reportId]?.[filter.label]?.loading, onChangeFilter: updateFilter, theme: theme, SelectComponent: SelectComponent, MultiSelectComponent: MultiSelectComponent, DateRangePickerComponent: DateRangePickerComponent }, index))) })), loading || !report ? ((0, jsx_runtime_1.jsx)("div", { style: containerStyle, className: className, children: (0, jsx_runtime_1.jsx)(LoadingComponent, {}) })) : ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [('table' === report.chartType || 'metric' === report.chartType) && ((0, jsx_runtime_1.jsx)(DataLoader_1.default, { item: report, filters: specificReportFilters, userFilters: userFilters?.map(Filter_1.convertCustomFilter), additionalProcessing: {
|
|
384
|
+
page: paginationProcessing_1.DEFAULT_PAGINATION,
|
|
385
|
+
}, reportMode: true, children: ({ isLoading, error, onPageChange, onSortChange, data, rowCount, rowCountIsLoading, }) => 'metric' === report.chartType ? ((0, jsx_runtime_1.jsx)(MetricComponent, { error: error, isLoading: isLoading, report: data })) : ((0, jsx_runtime_1.jsx)(TableComponent, { report: data, isLoading: isLoading, error: error, rowCount: rowCount ?? data?.rowCount ?? data?.rows?.length ?? 0, rowCountIsLoading: rowCountIsLoading, onPageChange: (page) => onPageChange(page), onSortChange: (sort) => onSortChange(sort) })) })), report.chartType !== 'table' && report.chartType !== 'metric' && ((0, jsx_runtime_1.jsx)(DataLoader_1.ChartDataLoader, { item: report, dateBucket: dateBucket, userFilters: userFilters?.map(Filter_1.convertCustomFilter), additionalProcessing: {
|
|
386
|
+
page: paginationProcessing_1.DEFAULT_PAGINATION,
|
|
387
|
+
}, filters: specificReportFilters, reportMode: true, children: ({ isLoading, data, error }) => error ? ((0, jsx_runtime_1.jsx)("div", { style: containerStyle, className: className, children: (0, jsx_runtime_1.jsx)(ChartError_1.default, { errorMessage: error }) })) : ((0, jsx_runtime_1.jsx)(exports.ChartDisplay, { config: data, reportId: reportId, colors: colors, className: className, containerStyle: containerStyle, hideXAxis: hideXAxis, hideYAxis: hideYAxis, hideCartesianGrid: hideCartesianGrid, hideHorizontalCartesianGrid: hideHorizontalCartesianGrid, hideVerticalCartesianGrid: hideVerticalCartesianGrid, hideSubsequentXAxisTicks: hideSubsequentXAxisTicks, cartesianGridLineStyle: cartesianGridLineStyle, cartesianGridLineColor: cartesianGridLineColor, hideDateRangeFilter: hideDateRangeFilter, comparisonLineStyle: comparisonLineStyle, isAnimationActive: isAnimationActive, loading: isLoading, scrollable: true, colorMap: colorMap, LoadingComponent: LoadingComponent, onClickChartElement: onClickChartElement })) }))] }))] }));
|
|
240
388
|
}
|
|
241
389
|
const ChartDisplay = ({ reportId, config, colors, className, containerStyle, hideXAxis, hideYAxis, hideCartesianGrid, hideDateRangeFilter = false, hideHorizontalCartesianGrid = false, hideVerticalCartesianGrid = true, hideSubsequentXAxisTicks = false, cartesianGridLineStyle = 'solid', cartesianGridLineColor, comparisonLineStyle, isAnimationActive, scrollable = false, loading = false, ErrorComponent = ChartError_1.default, colorMap, LoadingComponent = ChartSkeleton_1.QuillLoadingSkeleton, onPageChange, onSortChange, onClickChartElement, overrideTheme, }) => {
|
|
242
390
|
const { downloadCSV } = (0, useExport_1.useExport)(reportId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../src/Context.tsx"],"names":[],"mappings":"AAAA,OAAO,KAMN,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../src/Context.tsx"],"names":[],"mappings":"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"}
|
package/dist/cjs/Context.js
CHANGED
|
@@ -8,6 +8,7 @@ const jsx_runtime_1 = require("react/jsx-runtime");
|
|
|
8
8
|
const react_1 = require("react");
|
|
9
9
|
const schema_1 = require("./utils/schema");
|
|
10
10
|
const client_1 = require("./utils/client");
|
|
11
|
+
const Filter_1 = require("./models/Filter");
|
|
11
12
|
const dashboard_1 = require("./utils/dashboard");
|
|
12
13
|
const fast_deep_equal_1 = __importDefault(require("fast-deep-equal"));
|
|
13
14
|
const dateRangePickerUtils_1 = require("./DateRangePicker/dateRangePickerUtils");
|
|
@@ -312,7 +313,6 @@ const ContextProvider = ({ children, initialTheme, publicKey, organizationId, qu
|
|
|
312
313
|
}
|
|
313
314
|
}, [initialTheme]);
|
|
314
315
|
async function loadFiltersForReport(reportId, initiator, filters, updatedFilterLabel, customFilters) {
|
|
315
|
-
const mergedDateFilters = (0, filterProcessing_1.mergeCustomFilters)(filters, customFilters ?? []);
|
|
316
316
|
// Abort all previous fetch requests
|
|
317
317
|
const currentRequest = reportFilterOptionsAbortControllers.current[reportId];
|
|
318
318
|
if (currentRequest) {
|
|
@@ -378,14 +378,16 @@ const ContextProvider = ({ children, initialTheme, publicKey, organizationId, qu
|
|
|
378
378
|
...filter,
|
|
379
379
|
options: undefined,
|
|
380
380
|
},
|
|
381
|
-
appliedFilters:
|
|
381
|
+
appliedFilters: filters
|
|
382
382
|
.filter((f) => f.label !== filter.label)
|
|
383
383
|
.map((f) => ({
|
|
384
384
|
...f,
|
|
385
385
|
query: undefined,
|
|
386
386
|
options: undefined,
|
|
387
387
|
})),
|
|
388
|
-
customFilters
|
|
388
|
+
customFilters: customFilters?.filter((f) => f.filterType !== Filter_1.FilterType.DateCustomFilter &&
|
|
389
|
+
f.filterType !== Filter_1.FilterType.DateFilter &&
|
|
390
|
+
f.filterType !== Filter_1.FilterType.DateComparisonFilter),
|
|
389
391
|
},
|
|
390
392
|
}),
|
|
391
393
|
signal: filterOptionsAbortController?.signal,
|
|
@@ -464,7 +466,7 @@ const ContextProvider = ({ children, initialTheme, publicKey, organizationId, qu
|
|
|
464
466
|
useNewNodeSql: true,
|
|
465
467
|
// rowsOnly,
|
|
466
468
|
// rowCountOnly,
|
|
467
|
-
|
|
469
|
+
getDefaultDashboardFilters: !filters.length,
|
|
468
470
|
},
|
|
469
471
|
};
|
|
470
472
|
const cloudBody = {
|
|
@@ -488,7 +490,7 @@ const ContextProvider = ({ children, initialTheme, publicKey, organizationId, qu
|
|
|
488
490
|
orgId: client.organizationId ?? organizationId,
|
|
489
491
|
useNewNodeSql: true,
|
|
490
492
|
filters: filters?.map((f) => ({ ...f, options: undefined })),
|
|
491
|
-
getDefaultDashboardFilters:
|
|
493
|
+
getDefaultDashboardFilters: !filters.length,
|
|
492
494
|
additionalProcessing,
|
|
493
495
|
dateBucket,
|
|
494
496
|
databaseType: client.databaseType,
|
|
@@ -516,12 +518,15 @@ const ContextProvider = ({ children, initialTheme, publicKey, organizationId, qu
|
|
|
516
518
|
id: reportId,
|
|
517
519
|
data: { ...report, filtersApplied: customFilters },
|
|
518
520
|
});
|
|
519
|
-
if (!fetchRows) {
|
|
520
|
-
const
|
|
521
|
+
if (!fetchRows || !filters?.length) {
|
|
522
|
+
const returnedFilters = !fetchRows
|
|
523
|
+
? results.data.filters
|
|
524
|
+
: results.filters;
|
|
525
|
+
const dateFilterTemplate = returnedFilters.find((f) => f.filterType === 'date_range');
|
|
521
526
|
const dateFilter = dateFilterTemplate
|
|
522
527
|
? (0, filterProcessing_1.createDefaultDateFilter)(dateFilterTemplate, [report], report.dashboardName)
|
|
523
528
|
: undefined;
|
|
524
|
-
const stringFilters =
|
|
529
|
+
const stringFilters = returnedFilters.filter((f) => f.filterType !== 'date_range');
|
|
525
530
|
const allFilters = [
|
|
526
531
|
...(dateFilter ? [dateFilter] : []),
|
|
527
532
|
...stringFilters,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DashboardFilter.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DashboardFilter.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"DashboardFilter.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DashboardFilter.tsx"],"names":[],"mappings":"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"}
|
|
@@ -2,11 +2,29 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DashboardFilter = DashboardFilter;
|
|
4
4
|
const jsx_runtime_1 = require("react/jsx-runtime");
|
|
5
|
+
const react_1 = require("react");
|
|
5
6
|
const dateRangePickerUtils_1 = require("../../DateRangePicker/dateRangePickerUtils");
|
|
6
7
|
const QuillDateRangePicker_1 = require("../../DateRangePicker/QuillDateRangePicker");
|
|
7
8
|
const QuillMultiSelect_1 = require("../QuillMultiSelect");
|
|
8
9
|
const QuillSelect_1 = require("../QuillSelect");
|
|
9
10
|
function DashboardFilter({ filter, onChangeFilter, SelectComponent = QuillSelect_1.QuillSelectComponent, MultiSelectComponent = QuillMultiSelect_1.QuillMultiSelectComponent, DateRangePickerComponent = QuillDateRangePicker_1.QuillDateRangePicker, theme, isLoading, }) {
|
|
11
|
+
const preset = (0, react_1.useMemo)(() => {
|
|
12
|
+
if ('preset' in filter && 'startDate' in filter && 'endDate' in filter) {
|
|
13
|
+
if (!filter.preset)
|
|
14
|
+
return '';
|
|
15
|
+
if (!filter.startDate || !filter.endDate)
|
|
16
|
+
return filter.preset.value;
|
|
17
|
+
const presetRange = filter.presetRanges?.find((range) => range.value === filter.preset.value) ?? dateRangePickerUtils_1.PRIMARY_RANGE[filter.preset.value];
|
|
18
|
+
if (!presetRange)
|
|
19
|
+
return filter.preset.value;
|
|
20
|
+
if (presetRange.startDate !== filter.startDate ||
|
|
21
|
+
presetRange.endDate !== filter.endDate) {
|
|
22
|
+
return '';
|
|
23
|
+
}
|
|
24
|
+
return filter.preset.value;
|
|
25
|
+
}
|
|
26
|
+
return '';
|
|
27
|
+
}, [filter]);
|
|
10
28
|
if (!filter.options && !isLoading && !(filter.filterType === 'date_range')) {
|
|
11
29
|
return null;
|
|
12
30
|
}
|
|
@@ -48,7 +66,7 @@ function DashboardFilter({ filter, onChangeFilter, SelectComponent = QuillSelect
|
|
|
48
66
|
display: 'flex',
|
|
49
67
|
flexDirection: 'row',
|
|
50
68
|
alignItems: 'flex-end',
|
|
51
|
-
}, children: [(0, jsx_runtime_1.jsx)(DateRangePickerComponent, { label: filter.label, dateRange: { startDate: filter.startDate, endDate: filter.endDate }, preset:
|
|
69
|
+
}, children: [(0, jsx_runtime_1.jsx)(DateRangePickerComponent, { label: filter.label, dateRange: { startDate: filter.startDate, endDate: filter.endDate }, preset: preset, onChangeDateRange: (value) => {
|
|
52
70
|
onChangeFilter(filter, {
|
|
53
71
|
startDate: value.startDate,
|
|
54
72
|
endDate: value.endDate,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataLoader.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DataLoader.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,EAAuB,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAajD,OAAO,EACL,oBAAoB,EAErB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"DataLoader.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DataLoader.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,EAAuB,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAajD,OAAO,EACL,oBAAoB,EAErB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AA0BtE,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,YAAY,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IACnE,IAAI,EAAE,WAAW,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAuFF,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,WAAW,EACX,oBAAoB,EAAE,2BAA2B,EACjD,UAAkB,GACnB,EAAE;IACD,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,cAAc,EAAE,CAAC;IAC/B,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,CAAC,EACT,SAAS,EACT,KAAK,EACL,YAAY,EACZ,YAAY,EACZ,IAAI,GACL,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;CACzC,GAAG,GAAG,CAAC,OAAO,CAuTd;AAED,KAAK,YAAY,GAAG;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,uBAAuB,CAAC,EAAE,MAAM,CAAC;QACjC,sBAAsB,CAAC,EAAE,MAAM,CAAC;KACjC,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,WAAW,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAIF,eAAO,MAAM,eAAe,4FAQzB;IACD,IAAI,EAAE,WAAW,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,CAClB,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,UAAU,KACf,YAAY,CAAC;IAClB,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,cAAc,EAAE,CAAC;IAC/B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,CAAC,EACT,SAAS,EACT,KAAK,EACL,IAAI,EACJ,UAAU,EACV,QAAQ,EACR,iBAAiB,GAClB,EAAE,yBAAyB,KAAK,GAAG,CAAC,OAAO,CAAC;CAC9C,KAAG,GAAG,CAAC,OA2JP,CAAC"}
|
|
@@ -14,7 +14,6 @@ const tableProcessing_1 = require("../../utils/tableProcessing");
|
|
|
14
14
|
const Chart_1 = require("../../Chart");
|
|
15
15
|
const merge_1 = require("../../utils/merge");
|
|
16
16
|
const fast_deep_equal_1 = __importDefault(require("fast-deep-equal"));
|
|
17
|
-
const filterProcessing_1 = require("../../utils/filterProcessing");
|
|
18
17
|
const constructReportFromItem = (item) => {
|
|
19
18
|
return {
|
|
20
19
|
...report_1.EMPTY_INTERNAL_REPORT,
|
|
@@ -143,7 +142,7 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
|
|
|
143
142
|
rowCountAbortController.current?.abort();
|
|
144
143
|
rowCountAbortController.current = new AbortController();
|
|
145
144
|
try {
|
|
146
|
-
const rowCount = await (0, report_1.fetchReportRowCount)(item.id, client, true,
|
|
145
|
+
const rowCount = await (0, report_1.fetchReportRowCount)(item.id, client, true, filters.concat(userFilters ?? []), processing, schemaData.customFields, rowCountAbortController.current.signal);
|
|
147
146
|
rowCountAbortController.current = null;
|
|
148
147
|
if (rowCount) {
|
|
149
148
|
if (reportMode) {
|
|
@@ -211,7 +210,7 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
|
|
|
211
210
|
updateTableRowsAbortController.current?.abort();
|
|
212
211
|
updateTableRowsAbortController.current = new AbortController();
|
|
213
212
|
const updatedProcessing = { ...additionalProcessing, ...processing };
|
|
214
|
-
const paginatedRows = await (0, tableProcessing_1.fetchResultsByReport)(item.id, client, updatedProcessing,
|
|
213
|
+
const paginatedRows = await (0, tableProcessing_1.fetchResultsByReport)(item.id, client, updatedProcessing, filters.concat(userFilters ?? []), schemaData.customFields, true, undefined, updateTableRowsAbortController.current.signal);
|
|
215
214
|
updateTableRowsAbortController.current = null;
|
|
216
215
|
if (paginatedRows.error) {
|
|
217
216
|
throw new Error('Error fetching chart');
|
|
@@ -279,7 +278,7 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
|
|
|
279
278
|
rowsAbortController.current = null;
|
|
280
279
|
}
|
|
281
280
|
else {
|
|
282
|
-
const { report: fetchedReport, error } = await (0, report_1.fetchReport)(item.id, client, true,
|
|
281
|
+
const { report: fetchedReport, error } = await (0, report_1.fetchReport)(item.id, client, true, filters.concat(userFilters ?? []), processing, undefined, schemaData.customFields, true, false, rowsAbortController.current.signal);
|
|
283
282
|
rowsAbortController.current = null;
|
|
284
283
|
dispatch({
|
|
285
284
|
type: 'ADD_DASHBOARD_ITEM',
|
|
@@ -399,7 +398,7 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
|
|
|
399
398
|
fetchReportAbortController.current = null;
|
|
400
399
|
}
|
|
401
400
|
else {
|
|
402
|
-
const { report, error } = await (0, report_1.fetchReport)(item.id, client, useReportTask,
|
|
401
|
+
const { report, error } = await (0, report_1.fetchReport)(item.id, client, useReportTask, filters.concat(userFilters ?? []), {
|
|
403
402
|
...additionalProcessing,
|
|
404
403
|
...(item.pivot ? {} : { page: paginationProcessing_1.DEFAULT_PAGINATION }),
|
|
405
404
|
}, dateBucket, schemaData.customFields, undefined, undefined, fetchReportAbortController.current.signal);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useExport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useExport.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"useExport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useExport.tsx"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AA0D/C,eAAO,MAAM,SAAS,cACT,MAAM,mEAMd;IACD,uBAAuB,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,GAAG,CAAC,OAAO,CAAC;IAChE,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;;;;;;;;;;;;CAyOF,CAAC;AAEF,UAAU,aAAa;IACrB,MAAM,EAAE,WAAW,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;CAC5B"}
|