@quillsql/react 2.13.24 → 2.13.26
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 +0 -1
- package/dist/cjs/Chart.d.ts.map +1 -1
- package/dist/cjs/Chart.js +28 -16
- package/dist/cjs/ChartBuilder.d.ts +8 -37
- package/dist/cjs/ChartBuilder.d.ts.map +1 -1
- package/dist/cjs/ChartBuilder.js +402 -189
- package/dist/cjs/ChartEditor.d.ts +1 -1
- package/dist/cjs/ChartEditor.d.ts.map +1 -1
- package/dist/cjs/ChartEditor.js +31 -167
- package/dist/cjs/Context.d.ts +13 -2
- package/dist/cjs/Context.d.ts.map +1 -1
- package/dist/cjs/Context.js +32 -12
- package/dist/cjs/Dashboard.d.ts.map +1 -1
- package/dist/cjs/Dashboard.js +3 -6
- package/dist/cjs/DateRangePicker/QuillDateRangePicker.d.ts +2 -1
- package/dist/cjs/DateRangePicker/QuillDateRangePicker.d.ts.map +1 -1
- package/dist/cjs/DateRangePicker/QuillDateRangePicker.js +7 -3
- package/dist/cjs/ReportBuilder.d.ts +1 -3
- package/dist/cjs/ReportBuilder.d.ts.map +1 -1
- package/dist/cjs/ReportBuilder.js +120 -137
- package/dist/cjs/SQLEditor.d.ts +2 -2
- package/dist/cjs/SQLEditor.d.ts.map +1 -1
- package/dist/cjs/SQLEditor.js +47 -24
- package/dist/cjs/components/Chart/BarChart.js +1 -1
- package/dist/cjs/components/Chart/InternalChart.d.ts +25 -0
- package/dist/cjs/components/Chart/InternalChart.d.ts.map +1 -0
- package/dist/cjs/components/Chart/InternalChart.js +385 -0
- package/dist/cjs/components/Chart/LineChart.d.ts.map +1 -1
- package/dist/cjs/components/Chart/LineChart.js +3 -1
- package/dist/cjs/components/Dashboard/DashboardFilter.d.ts +7 -4
- package/dist/cjs/components/Dashboard/DashboardFilter.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/DashboardFilter.js +8 -5
- package/dist/cjs/components/Dashboard/DataLoader.d.ts +3 -3
- package/dist/cjs/components/Dashboard/DataLoader.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/DataLoader.js +23 -9
- package/dist/cjs/components/Dashboard/MetricComponent.js +1 -1
- package/dist/cjs/components/QuillMultiSelectWithCombo.js +1 -1
- package/dist/cjs/components/ReportBuilder/convert.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/convert.js +54 -8
- package/dist/cjs/components/ReportBuilder/util.d.ts +1 -0
- package/dist/cjs/components/ReportBuilder/util.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/util.js +48 -0
- package/dist/cjs/components/UiComponents.d.ts +3 -1
- package/dist/cjs/components/UiComponents.d.ts.map +1 -1
- package/dist/cjs/components/UiComponents.js +4 -4
- package/dist/cjs/hooks/useDashboard.d.ts.map +1 -1
- package/dist/cjs/hooks/useDashboard.js +13 -0
- package/dist/cjs/hooks/useExport.d.ts.map +1 -1
- package/dist/cjs/hooks/useExport.js +6 -1
- package/dist/cjs/hooks/useQuill.js +9 -9
- package/dist/cjs/internals/ReportBuilder/PivotList.js +1 -1
- package/dist/cjs/internals/ReportBuilder/PivotModal.d.ts +3 -2
- package/dist/cjs/internals/ReportBuilder/PivotModal.d.ts.map +1 -1
- package/dist/cjs/internals/ReportBuilder/PivotModal.js +3 -8
- package/dist/cjs/models/Report.d.ts +9 -2
- package/dist/cjs/models/Report.d.ts.map +1 -1
- package/dist/cjs/models/Report.js +2 -0
- package/dist/cjs/models/Tables.d.ts +5 -6
- package/dist/cjs/models/Tables.d.ts.map +1 -1
- package/dist/cjs/utils/astProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/astProcessing.js +1 -0
- package/dist/cjs/utils/columnProcessing.d.ts +1 -0
- package/dist/cjs/utils/columnProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/columnProcessing.js +4 -0
- package/dist/cjs/utils/constants.d.ts.map +1 -1
- package/dist/cjs/utils/constants.js +6 -2
- package/dist/cjs/utils/dashboard.d.ts +1 -1
- package/dist/cjs/utils/dashboard.d.ts.map +1 -1
- package/dist/cjs/utils/dashboard.js +13 -18
- package/dist/cjs/utils/dataFetcher.d.ts.map +1 -1
- package/dist/cjs/utils/dataFetcher.js +2 -2
- package/dist/cjs/utils/filterProcessing.d.ts +5 -2
- package/dist/cjs/utils/filterProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/filterProcessing.js +5 -2
- package/dist/cjs/utils/merge.d.ts.map +1 -1
- package/dist/cjs/utils/merge.js +0 -4
- package/dist/cjs/utils/paginationProcessing.d.ts +1 -1
- package/dist/cjs/utils/paginationProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/paginationProcessing.js +1 -4
- package/dist/cjs/utils/pivotConstructor.d.ts +3 -2
- package/dist/cjs/utils/pivotConstructor.d.ts.map +1 -1
- package/dist/cjs/utils/pivotConstructor.js +20 -8
- package/dist/cjs/utils/pivotProcessing.d.ts +5 -2
- package/dist/cjs/utils/pivotProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/queryConstructor.d.ts +1 -1
- package/dist/cjs/utils/queryConstructor.d.ts.map +1 -1
- package/dist/cjs/utils/queryConstructor.js +4 -4
- package/dist/cjs/utils/report.d.ts +2 -1
- package/dist/cjs/utils/report.d.ts.map +1 -1
- package/dist/cjs/utils/report.js +23 -24
- package/dist/cjs/utils/tableProcessing.d.ts +18 -5
- package/dist/cjs/utils/tableProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/tableProcessing.js +14 -7
- package/dist/cjs/utils/validation.js +1 -1
- package/dist/esm/Chart.d.ts +0 -1
- package/dist/esm/Chart.d.ts.map +1 -1
- package/dist/esm/Chart.js +28 -16
- package/dist/esm/ChartBuilder.d.ts +8 -37
- package/dist/esm/ChartBuilder.d.ts.map +1 -1
- package/dist/esm/ChartBuilder.js +408 -192
- package/dist/esm/ChartEditor.d.ts +1 -1
- package/dist/esm/ChartEditor.d.ts.map +1 -1
- package/dist/esm/ChartEditor.js +33 -169
- package/dist/esm/Context.d.ts +13 -2
- package/dist/esm/Context.d.ts.map +1 -1
- package/dist/esm/Context.js +32 -12
- package/dist/esm/Dashboard.d.ts.map +1 -1
- package/dist/esm/Dashboard.js +5 -8
- package/dist/esm/DateRangePicker/QuillDateRangePicker.d.ts +2 -1
- package/dist/esm/DateRangePicker/QuillDateRangePicker.d.ts.map +1 -1
- package/dist/esm/DateRangePicker/QuillDateRangePicker.js +7 -3
- package/dist/esm/ReportBuilder.d.ts +1 -3
- package/dist/esm/ReportBuilder.d.ts.map +1 -1
- package/dist/esm/ReportBuilder.js +120 -137
- package/dist/esm/SQLEditor.d.ts +2 -2
- package/dist/esm/SQLEditor.d.ts.map +1 -1
- package/dist/esm/SQLEditor.js +48 -25
- package/dist/esm/components/Chart/BarChart.js +1 -1
- package/dist/esm/components/Chart/InternalChart.d.ts +25 -0
- package/dist/esm/components/Chart/InternalChart.d.ts.map +1 -0
- package/dist/esm/components/Chart/InternalChart.js +379 -0
- package/dist/esm/components/Chart/LineChart.d.ts.map +1 -1
- package/dist/esm/components/Chart/LineChart.js +4 -2
- package/dist/esm/components/Dashboard/DashboardFilter.d.ts +7 -4
- package/dist/esm/components/Dashboard/DashboardFilter.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/DashboardFilter.js +8 -5
- package/dist/esm/components/Dashboard/DataLoader.d.ts +3 -3
- package/dist/esm/components/Dashboard/DataLoader.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/DataLoader.js +23 -9
- package/dist/esm/components/Dashboard/MetricComponent.js +1 -1
- package/dist/esm/components/QuillMultiSelectWithCombo.js +1 -1
- package/dist/esm/components/ReportBuilder/convert.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/convert.js +54 -8
- package/dist/esm/components/ReportBuilder/util.d.ts +1 -0
- package/dist/esm/components/ReportBuilder/util.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/util.js +47 -0
- package/dist/esm/components/UiComponents.d.ts +3 -1
- package/dist/esm/components/UiComponents.d.ts.map +1 -1
- package/dist/esm/components/UiComponents.js +4 -4
- package/dist/esm/hooks/useDashboard.d.ts.map +1 -1
- package/dist/esm/hooks/useDashboard.js +14 -1
- package/dist/esm/hooks/useExport.d.ts.map +1 -1
- package/dist/esm/hooks/useExport.js +6 -1
- package/dist/esm/hooks/useQuill.js +9 -9
- package/dist/esm/internals/ReportBuilder/PivotList.js +1 -1
- package/dist/esm/internals/ReportBuilder/PivotModal.d.ts +3 -2
- package/dist/esm/internals/ReportBuilder/PivotModal.d.ts.map +1 -1
- package/dist/esm/internals/ReportBuilder/PivotModal.js +3 -8
- package/dist/esm/models/Report.d.ts +9 -2
- package/dist/esm/models/Report.d.ts.map +1 -1
- package/dist/esm/models/Report.js +1 -1
- package/dist/esm/models/Tables.d.ts +5 -6
- package/dist/esm/models/Tables.d.ts.map +1 -1
- package/dist/esm/utils/astProcessing.d.ts.map +1 -1
- package/dist/esm/utils/astProcessing.js +2 -1
- package/dist/esm/utils/columnProcessing.d.ts +1 -0
- package/dist/esm/utils/columnProcessing.d.ts.map +1 -1
- package/dist/esm/utils/columnProcessing.js +3 -0
- package/dist/esm/utils/constants.d.ts.map +1 -1
- package/dist/esm/utils/constants.js +6 -2
- package/dist/esm/utils/dashboard.d.ts +1 -1
- package/dist/esm/utils/dashboard.d.ts.map +1 -1
- package/dist/esm/utils/dashboard.js +13 -18
- package/dist/esm/utils/dataFetcher.d.ts.map +1 -1
- package/dist/esm/utils/dataFetcher.js +2 -2
- package/dist/esm/utils/filterProcessing.d.ts +5 -2
- package/dist/esm/utils/filterProcessing.d.ts.map +1 -1
- package/dist/esm/utils/filterProcessing.js +5 -2
- package/dist/esm/utils/merge.d.ts.map +1 -1
- package/dist/esm/utils/merge.js +0 -4
- package/dist/esm/utils/paginationProcessing.d.ts +1 -1
- package/dist/esm/utils/paginationProcessing.d.ts.map +1 -1
- package/dist/esm/utils/paginationProcessing.js +1 -4
- package/dist/esm/utils/pivotConstructor.d.ts +3 -2
- package/dist/esm/utils/pivotConstructor.d.ts.map +1 -1
- package/dist/esm/utils/pivotConstructor.js +20 -8
- package/dist/esm/utils/pivotProcessing.d.ts +5 -2
- package/dist/esm/utils/pivotProcessing.d.ts.map +1 -1
- package/dist/esm/utils/queryConstructor.d.ts +1 -1
- package/dist/esm/utils/queryConstructor.d.ts.map +1 -1
- package/dist/esm/utils/queryConstructor.js +3 -3
- package/dist/esm/utils/report.d.ts +2 -1
- package/dist/esm/utils/report.d.ts.map +1 -1
- package/dist/esm/utils/report.js +24 -25
- package/dist/esm/utils/tableProcessing.d.ts +18 -5
- package/dist/esm/utils/tableProcessing.d.ts.map +1 -1
- package/dist/esm/utils/tableProcessing.js +15 -8
- package/dist/esm/utils/validation.js +1 -1
- package/package.json +1 -1
|
@@ -2,7 +2,7 @@ import React from 'react';
|
|
|
2
2
|
import { type DateRangePickerComponentProps } from '../../DateRangePicker/QuillDateRangePicker';
|
|
3
3
|
import { QuillTheme } from '../../QuillProvider';
|
|
4
4
|
import { DashboardFilter as Filters } from '../../models/Filter';
|
|
5
|
-
type SelectComponentType = ({ label, value, options, onChange, width, isLoading, hideEmptyOption, }: {
|
|
5
|
+
type SelectComponentType = ({ label, value, options, onChange, width, isLoading, hideEmptyOption, disabled, }: {
|
|
6
6
|
value: string | null | undefined;
|
|
7
7
|
label?: string | undefined;
|
|
8
8
|
width: number;
|
|
@@ -13,8 +13,9 @@ type SelectComponentType = ({ label, value, options, onChange, width, isLoading,
|
|
|
13
13
|
isLoading?: boolean;
|
|
14
14
|
hideEmptyOption?: boolean;
|
|
15
15
|
onChange: (event: React.ChangeEvent<HTMLSelectElement>) => void;
|
|
16
|
+
disabled?: boolean;
|
|
16
17
|
}) => JSX.Element;
|
|
17
|
-
type MultiSelectComponentType = ({ label, value, options, onChange, width, isLoading, }: {
|
|
18
|
+
type MultiSelectComponentType = ({ label, value, options, onChange, width, isLoading, disabled, }: {
|
|
18
19
|
value: (string | null)[];
|
|
19
20
|
label?: string | undefined;
|
|
20
21
|
width: number;
|
|
@@ -28,8 +29,9 @@ type MultiSelectComponentType = ({ label, value, options, onChange, width, isLoa
|
|
|
28
29
|
value: (string | null)[];
|
|
29
30
|
};
|
|
30
31
|
}) => void;
|
|
32
|
+
disabled?: boolean;
|
|
31
33
|
}) => JSX.Element;
|
|
32
|
-
type DateRangePickerComponentType = ({ dateRange, onChangeDateRange, presetOptions, onChangePreset, preset, selectWidth, }: DateRangePickerComponentProps) => JSX.Element;
|
|
34
|
+
type DateRangePickerComponentType = ({ dateRange, onChangeDateRange, presetOptions, onChangePreset, preset, selectWidth, disabled, }: DateRangePickerComponentProps) => JSX.Element;
|
|
33
35
|
interface DashboardFilterProps {
|
|
34
36
|
filter: Filters;
|
|
35
37
|
onChangeFilter: (filter: Filters, value?: string | (string | null)[] | {
|
|
@@ -46,7 +48,8 @@ interface DashboardFilterProps {
|
|
|
46
48
|
DateRangePickerComponent: DateRangePickerComponentType | React.MemoExoticComponent<DateRangePickerComponentType>;
|
|
47
49
|
theme: QuillTheme;
|
|
48
50
|
isLoading?: boolean;
|
|
51
|
+
disabled?: boolean;
|
|
49
52
|
}
|
|
50
|
-
export declare function DashboardFilter({ filter, onChangeFilter, SelectComponent, MultiSelectComponent, DateRangePickerComponent, theme, isLoading, }: DashboardFilterProps): import("react/jsx-runtime").JSX.Element | null;
|
|
53
|
+
export declare function DashboardFilter({ filter, onChangeFilter, SelectComponent, MultiSelectComponent, DateRangePickerComponent, theme, isLoading, disabled, }: DashboardFilterProps): import("react/jsx-runtime").JSX.Element | null;
|
|
51
54
|
export {};
|
|
52
55
|
//# sourceMappingURL=DashboardFilter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DashboardFilter.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DashboardFilter.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAKvC,OAAO,EAEL,KAAK,6BAA6B,EACnC,MAAM,4CAA4C,CAAC;AAGpD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,eAAe,IAAI,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEjE,KAAK,mBAAmB,GAAG,CAAC,EAC1B,KAAK,EACL,KAAK,EACL,OAAO,EACP,QAAQ,EACR,KAAK,EACL,SAAS,EACT,eAAe,
|
|
1
|
+
{"version":3,"file":"DashboardFilter.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DashboardFilter.tsx"],"names":[],"mappings":"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"}
|
|
@@ -7,9 +7,11 @@ const dateRangePickerUtils_1 = require("../../DateRangePicker/dateRangePickerUti
|
|
|
7
7
|
const QuillDateRangePicker_1 = require("../../DateRangePicker/QuillDateRangePicker");
|
|
8
8
|
const QuillMultiSelect_1 = require("../QuillMultiSelect");
|
|
9
9
|
const QuillSelect_1 = require("../QuillSelect");
|
|
10
|
-
function DashboardFilter({ filter, onChangeFilter, SelectComponent = QuillSelect_1.QuillSelectComponent, MultiSelectComponent = QuillMultiSelect_1.QuillMultiSelectComponent, DateRangePickerComponent = QuillDateRangePicker_1.QuillDateRangePicker, theme, isLoading, }) {
|
|
10
|
+
function DashboardFilter({ filter, onChangeFilter, SelectComponent = QuillSelect_1.QuillSelectComponent, MultiSelectComponent = QuillMultiSelect_1.QuillMultiSelectComponent, DateRangePickerComponent = QuillDateRangePicker_1.QuillDateRangePicker, theme, isLoading, disabled, }) {
|
|
11
11
|
const preset = (0, react_1.useMemo)(() => {
|
|
12
|
-
if (('preset' in filter || 'primaryRange' in filter) &&
|
|
12
|
+
if (('preset' in filter || 'primaryRange' in filter) &&
|
|
13
|
+
'startDate' in filter &&
|
|
14
|
+
'endDate' in filter) {
|
|
13
15
|
if (!filter.preset && !filter.primaryRange)
|
|
14
16
|
return '';
|
|
15
17
|
if (!filter.startDate || !filter.endDate)
|
|
@@ -48,7 +50,7 @@ function DashboardFilter({ filter, onChangeFilter, SelectComponent = QuillSelect
|
|
|
48
50
|
value: elem[filter.field],
|
|
49
51
|
}))
|
|
50
52
|
: []),
|
|
51
|
-
], width: 200, isLoading: isLoading }));
|
|
53
|
+
], width: 200, isLoading: isLoading, disabled: disabled }));
|
|
52
54
|
}
|
|
53
55
|
return ((0, jsx_runtime_1.jsx)(SelectComponent, { label: filter.label, value: filter.selectedValue, onChange: (e) => {
|
|
54
56
|
onChangeFilter(filter, e.target.value);
|
|
@@ -59,13 +61,14 @@ function DashboardFilter({ filter, onChangeFilter, SelectComponent = QuillSelect
|
|
|
59
61
|
value: elem[filter.field] ?? '',
|
|
60
62
|
}))
|
|
61
63
|
: []),
|
|
62
|
-
], width: 200, isLoading: isLoading }));
|
|
64
|
+
], width: 200, isLoading: isLoading, disabled: disabled }));
|
|
63
65
|
}
|
|
64
66
|
else if (filter.filterType === 'date_range') {
|
|
65
67
|
return ((0, jsx_runtime_1.jsxs)("div", { style: {
|
|
66
68
|
display: 'flex',
|
|
67
69
|
flexDirection: 'row',
|
|
68
70
|
alignItems: 'flex-end',
|
|
71
|
+
flexWrap: 'wrap',
|
|
69
72
|
}, children: [(0, jsx_runtime_1.jsx)(DateRangePickerComponent, { label: filter.label, dateRange: { startDate: filter.startDate, endDate: filter.endDate }, preset: preset, onChangeDateRange: (value) => {
|
|
70
73
|
onChangeFilter(filter, {
|
|
71
74
|
startDate: value.startDate,
|
|
@@ -75,7 +78,7 @@ function DashboardFilter({ filter, onChangeFilter, SelectComponent = QuillSelect
|
|
|
75
78
|
onChangeFilter(filter, { preset: e.target.value });
|
|
76
79
|
}, presetOptions: filter.options?.map((option) => {
|
|
77
80
|
return { label: option.label, value: option.value };
|
|
78
|
-
}) ?? [], selectWidth: 200 }), filter.comparison && ((0, jsx_runtime_1.jsxs)("div", { style: {
|
|
81
|
+
}) ?? [], selectWidth: 200, disabled: disabled }), filter.comparison && ((0, jsx_runtime_1.jsxs)("div", { style: {
|
|
79
82
|
display: 'flex',
|
|
80
83
|
flexDirection: 'row',
|
|
81
84
|
alignItems: 'center',
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { QuillReport } from '../../models/Report';
|
|
1
|
+
import { QuillReport, QuillReportInternal } from '../../models/Report';
|
|
2
2
|
import { QuillTheme } from '../../QuillProvider';
|
|
3
3
|
import { AdditionalProcessing } from '../../utils/tableProcessing';
|
|
4
4
|
import { DashboardFilter, InternalFilter } from '../../models/Filter';
|
|
@@ -15,7 +15,7 @@ export type DataLoaderChildProps = {
|
|
|
15
15
|
rowCountIsLoading?: boolean;
|
|
16
16
|
};
|
|
17
17
|
export default function DataLoader({ item, children, filters, userFilters, additionalProcessing: defaultAdditionalProcessing, reportMode, }: {
|
|
18
|
-
item:
|
|
18
|
+
item: QuillReportInternal;
|
|
19
19
|
filters: DashboardFilter[];
|
|
20
20
|
userFilters?: InternalFilter[];
|
|
21
21
|
additionalProcessing: AdditionalProcessing;
|
|
@@ -41,7 +41,7 @@ export type ChartDataLoaderChildProps = {
|
|
|
41
41
|
rowCountIsLoading?: boolean;
|
|
42
42
|
};
|
|
43
43
|
export declare const ChartDataLoader: ({ item, children, dateBucket, additionalProcessing, filters, userFilters, reportMode, }: {
|
|
44
|
-
item:
|
|
44
|
+
item: QuillReportInternal;
|
|
45
45
|
dateBucket?: string;
|
|
46
46
|
mapColorsToFields?: (_report: QuillReport, _theme: QuillTheme) => ColorMapType;
|
|
47
47
|
additionalProcessing: AdditionalProcessing;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataLoader.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DataLoader.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"DataLoader.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DataLoader.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,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,mBAAmB,CAAC;IAC1B,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,CAqUd;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,mBAAmB,CAAC;IAC1B,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,OAqKP,CAAC"}
|
|
@@ -190,7 +190,7 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
|
|
|
190
190
|
};
|
|
191
191
|
const onSortChange = (sort) => {
|
|
192
192
|
const report = (reportMode ? reports : dashboard)[item.id];
|
|
193
|
-
if ((0, paginationProcessing_1.shouldSortInMemory)(additionalProcessing.page ?? paginationProcessing_1.DEFAULT_PAGINATION, report?.rowCount
|
|
193
|
+
if ((0, paginationProcessing_1.shouldSortInMemory)(additionalProcessing.page ?? paginationProcessing_1.DEFAULT_PAGINATION, report?.rowCount)) {
|
|
194
194
|
return;
|
|
195
195
|
}
|
|
196
196
|
const updatedProcessing = { page: additionalProcessing.page, sort };
|
|
@@ -291,9 +291,13 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
|
|
|
291
291
|
dispatch({
|
|
292
292
|
type: 'ADD_DASHBOARD_ITEM',
|
|
293
293
|
id: item.id,
|
|
294
|
-
data: {
|
|
295
|
-
|
|
296
|
-
|
|
294
|
+
data: {
|
|
295
|
+
...fetchedReport,
|
|
296
|
+
triggerReload: false,
|
|
297
|
+
rowCount: 0,
|
|
298
|
+
filtersApplied: userFilters,
|
|
299
|
+
loadingRows: false,
|
|
300
|
+
}, // rowCount 0 indicates it's still loading if row length is nonzero
|
|
297
301
|
});
|
|
298
302
|
setError(error);
|
|
299
303
|
}
|
|
@@ -328,9 +332,13 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
|
|
|
328
332
|
fetchReportHelper(additionalProcessing);
|
|
329
333
|
}, [filters, userFilters, item.id]);
|
|
330
334
|
(0, react_1.useEffect)(() => {
|
|
331
|
-
|
|
335
|
+
const tempReport = (reportMode ? reports : dashboard)[item.id];
|
|
336
|
+
if (tempReport?.triggerReload) {
|
|
332
337
|
fetchReportHelper(additionalProcessing);
|
|
333
338
|
}
|
|
339
|
+
else if (tempReport?.error) {
|
|
340
|
+
setError(tempReport.error);
|
|
341
|
+
}
|
|
334
342
|
}, [(reportMode ? reports : dashboard)[item.id]]);
|
|
335
343
|
return ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: children({
|
|
336
344
|
isLoading: loading,
|
|
@@ -416,9 +424,12 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
|
|
|
416
424
|
dispatch({
|
|
417
425
|
type: 'ADD_DASHBOARD_ITEM',
|
|
418
426
|
id: item.id,
|
|
419
|
-
data: {
|
|
420
|
-
|
|
421
|
-
|
|
427
|
+
data: {
|
|
428
|
+
...report,
|
|
429
|
+
triggerReload: false,
|
|
430
|
+
filtersApplied: userFilters,
|
|
431
|
+
loadingRows: false,
|
|
432
|
+
},
|
|
422
433
|
});
|
|
423
434
|
setError(error);
|
|
424
435
|
}
|
|
@@ -427,7 +438,7 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
|
|
|
427
438
|
if (e instanceof Error && e.name === 'AbortError') {
|
|
428
439
|
return;
|
|
429
440
|
}
|
|
430
|
-
|
|
441
|
+
setError(e.message ?? 'Error fetching report');
|
|
431
442
|
}
|
|
432
443
|
finally {
|
|
433
444
|
if (fetchRowsRequestId === rowsRequestId.current) {
|
|
@@ -455,6 +466,9 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
|
|
|
455
466
|
if (tempReport && tempReport.triggerReload) {
|
|
456
467
|
fetchReportHelper();
|
|
457
468
|
}
|
|
469
|
+
else if (tempReport?.error) {
|
|
470
|
+
setError(tempReport.error);
|
|
471
|
+
}
|
|
458
472
|
}, [(reportMode ? reports : dashboard)[item.id]]);
|
|
459
473
|
return children({
|
|
460
474
|
isLoading: !chartReport || loading,
|
|
@@ -12,7 +12,7 @@ const ChartSkeleton_1 = __importDefault(require("../Chart/ChartSkeleton"));
|
|
|
12
12
|
const Context_1 = require("../../Context");
|
|
13
13
|
function QuillMetricComponent({ report, onClick, error, isLoading, }) {
|
|
14
14
|
const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
|
|
15
|
-
const dateFilter = report?.filtersApplied?.find((filter) => filter.filterType
|
|
15
|
+
const dateFilter = report?.filtersApplied?.find((filter) => filter.filterType === 'date_range');
|
|
16
16
|
const primaryMetricLabel = dateFilter?.preset?.label;
|
|
17
17
|
const comparisonKey = dateFilter?.comparisonRange?.value;
|
|
18
18
|
const comparisonLabel = dateRangePickerUtils_1.COMPARISON_OPTIONS.find((opt) => opt.value === comparisonKey)?.text;
|
|
@@ -88,7 +88,7 @@ function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, v
|
|
|
88
88
|
selectAllRef.current.indeterminate =
|
|
89
89
|
selectAllCheckboxState === CheckboxState.INDETERMINATE;
|
|
90
90
|
}
|
|
91
|
-
}, [selectAllCheckboxState]);
|
|
91
|
+
}, [selectAllCheckboxState, showModal]);
|
|
92
92
|
(0, react_1.useEffect)(() => {
|
|
93
93
|
if (options.length > 0 && options?.[0]?.value === 'EXCEEDS_LIMIT') {
|
|
94
94
|
setExceedsLimit(true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/convert.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,IAAI,GAAG,EACpB,GAAG,EAOJ,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/convert.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,IAAI,GAAG,EACpB,GAAG,EAOJ,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAS5C,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAuBlE;AAGD,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,QAahB;AAGD,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,QAalB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAAC,MAAM,CAoDpD;AAUD;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,GAAG,CAAC,MAAM,EACf,YAAY,EAAE,KAAK,EAAE,GACpB,GAAG,CAAC,MAAM,CA8BZ;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,gBAkBrE;AA4JD,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,GAAG,CAAC,MAAM,EACf,UAAU,EAAE,cAAc,EAAE,GAC3B,KAAK,GAAG,IAAI,CAkFd;AA6CD;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,GAAG,EACR,YAAY,EAAE,KAAK,EAAE,EACrB,SAAS,CAAC,EAAE,KAAK,EACjB,SAAS,CAAC,EAAE,MAAM;;;;;;EAkInB;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,OAyNtE;AAID,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAY1E;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,OA+C5C"}
|
|
@@ -15,6 +15,7 @@ const date_fns_1 = require("date-fns");
|
|
|
15
15
|
const PivotModal_1 = require("../../internals/ReportBuilder/PivotModal");
|
|
16
16
|
const ast_1 = require("./ast");
|
|
17
17
|
const util_1 = require("./util");
|
|
18
|
+
const astFilterProcessing_1 = require("../../utils/astFilterProcessing");
|
|
18
19
|
// Helper functions that preprocess the AST.
|
|
19
20
|
// Find and replace certain pre-set date comparison queries with their
|
|
20
21
|
// more stable counterparts.
|
|
@@ -236,7 +237,15 @@ function convertGroupByToPivotData(ast, columns, aliasMap) {
|
|
|
236
237
|
// next field to columnField (if there is one)
|
|
237
238
|
for (let j = 0; j < ast.groupby.length; j++) {
|
|
238
239
|
const group = ast.groupby[j];
|
|
239
|
-
let groupValue
|
|
240
|
+
let groupValue;
|
|
241
|
+
if (group?.type === 'number') {
|
|
242
|
+
const index = typeof group.value === 'number' ? group.value : 1;
|
|
243
|
+
const equivalentColumn = ast.columns[index - 1];
|
|
244
|
+
groupValue = (0, ast_1.extractColumnish)(equivalentColumn.expr);
|
|
245
|
+
}
|
|
246
|
+
else {
|
|
247
|
+
groupValue = (0, ast_1.extractColumnish)(group);
|
|
248
|
+
}
|
|
240
249
|
if (!groupValue || (0, util_1.isIdColumn)(groupValue)) {
|
|
241
250
|
continue;
|
|
242
251
|
}
|
|
@@ -256,7 +265,12 @@ function convertGroupByToPivotData(ast, columns, aliasMap) {
|
|
|
256
265
|
pivot.rowFieldType = columns.find((c) => c.field === groupValue)?.fieldType;
|
|
257
266
|
}
|
|
258
267
|
else if (!pivot.columnField && groupValue !== pivot.rowField) {
|
|
268
|
+
const columnFieldType = columns.find((c) => c.field === groupValue)?.fieldType;
|
|
269
|
+
if (!['string', 'varchar', 'text', 'char'].includes(columnFieldType || '')) {
|
|
270
|
+
continue;
|
|
271
|
+
}
|
|
259
272
|
pivot.columnField = groupValue;
|
|
273
|
+
pivot.columnFieldType = columnFieldType;
|
|
260
274
|
}
|
|
261
275
|
}
|
|
262
276
|
return pivot;
|
|
@@ -365,18 +379,31 @@ function addValueFieldToPivot(newAst, pivot, columns) {
|
|
|
365
379
|
}
|
|
366
380
|
if (!pivot.valueField) {
|
|
367
381
|
let firstNumericNonIdColumn = undefined;
|
|
368
|
-
newAst.columns.forEach((col) => {
|
|
369
|
-
|
|
370
|
-
|
|
382
|
+
(newAst.groupby?.columns ?? newAst.columns).forEach((col) => {
|
|
383
|
+
const field = (0, astFilterProcessing_1.getFieldFromExpression)(col.expr) || col.as;
|
|
384
|
+
if (!(0, util_1.isIdColumn)(field) &&
|
|
385
|
+
(0, ast_1.isNumericColumnType)(columns.find((c) => c.field === field)?.fieldType)) {
|
|
371
386
|
firstNumericNonIdColumn = { ...col };
|
|
372
387
|
}
|
|
373
388
|
});
|
|
374
389
|
if (firstNumericNonIdColumn) {
|
|
375
|
-
pivot.valueField =
|
|
390
|
+
pivot.valueField =
|
|
391
|
+
(0, astFilterProcessing_1.getFieldFromExpression)(firstNumericNonIdColumn.expr) ||
|
|
392
|
+
firstNumericNonIdColumn.as;
|
|
376
393
|
pivot.aggregationType = 'sum';
|
|
377
394
|
}
|
|
378
395
|
else {
|
|
379
|
-
|
|
396
|
+
const numericColumn = columns.find((c) => (0, ast_1.isNumericColumnType)(c.fieldType));
|
|
397
|
+
if (numericColumn) {
|
|
398
|
+
newAst.columns.push((0, util_1.generateColumnExpr)(numericColumn.field));
|
|
399
|
+
pivot.valueField = numericColumn.field;
|
|
400
|
+
pivot.aggregationType = 'sum';
|
|
401
|
+
}
|
|
402
|
+
else {
|
|
403
|
+
pivot.columnField = undefined;
|
|
404
|
+
pivot.columnFieldType = undefined;
|
|
405
|
+
pivot.aggregationType = 'count';
|
|
406
|
+
}
|
|
380
407
|
}
|
|
381
408
|
}
|
|
382
409
|
}
|
|
@@ -460,8 +487,26 @@ function convertGroupBy(ast, schemaTables, prevPivot, prevTable) {
|
|
|
460
487
|
}
|
|
461
488
|
addAllPivotColumnsToColumnAST(ast.columns, pivot);
|
|
462
489
|
newAst = { ...ast };
|
|
463
|
-
|
|
464
|
-
newAst
|
|
490
|
+
const cleanedColumns = cleanASTColumns(ast, columns);
|
|
491
|
+
if (newAst?.columns &&
|
|
492
|
+
newAst.columns.length > 0 &&
|
|
493
|
+
cleanedColumns.length === 0) {
|
|
494
|
+
// no columns remaining, use star as default
|
|
495
|
+
newAst.columns = [
|
|
496
|
+
{
|
|
497
|
+
expr: {
|
|
498
|
+
type: 'column_ref',
|
|
499
|
+
table: null,
|
|
500
|
+
column: '*',
|
|
501
|
+
},
|
|
502
|
+
as: null,
|
|
503
|
+
},
|
|
504
|
+
];
|
|
505
|
+
newAst = convertWildcardColumns(newAst, schemaTables);
|
|
506
|
+
}
|
|
507
|
+
else {
|
|
508
|
+
newAst.columns = cleanedColumns;
|
|
509
|
+
}
|
|
465
510
|
// ADD sort if pivot has sort
|
|
466
511
|
if (pivot.sort) {
|
|
467
512
|
newAst.orderby = [
|
|
@@ -476,6 +521,7 @@ function convertGroupBy(ast, schemaTables, prevPivot, prevTable) {
|
|
|
476
521
|
addValueFieldToPivot(newAst, pivot, columns);
|
|
477
522
|
// @ts-ignore
|
|
478
523
|
const title = (0, PivotModal_1.generatePivotTitle)(pivot);
|
|
524
|
+
newAst.groupby = null;
|
|
479
525
|
return { pivot: { ...pivot, title }, ast: newAst };
|
|
480
526
|
}
|
|
481
527
|
function convertStringComparison(node, databaseType) {
|
|
@@ -74,6 +74,7 @@ export declare function removeNonSelectedTableReferences(ast: any, table: string
|
|
|
74
74
|
[value: string]: boolean;
|
|
75
75
|
};
|
|
76
76
|
} | null): any;
|
|
77
|
+
export declare function removeTableNameAlias(ast: any): any;
|
|
77
78
|
export declare function allNumericNodesValidInTree(node: any): boolean;
|
|
78
79
|
export declare function isIdColumn(columnName?: string): boolean | "" | undefined;
|
|
79
80
|
export declare function getCustomSentence(node: any, databaseType: string): string | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/util.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/util.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,7 @@ exports.tryConvertDateEquality = tryConvertDateEquality;
|
|
|
19
19
|
exports.showNodeAsRow = showNodeAsRow;
|
|
20
20
|
exports.getPostgresBasicType = getPostgresBasicType;
|
|
21
21
|
exports.removeNonSelectedTableReferences = removeNonSelectedTableReferences;
|
|
22
|
+
exports.removeTableNameAlias = removeTableNameAlias;
|
|
22
23
|
exports.allNumericNodesValidInTree = allNumericNodesValidInTree;
|
|
23
24
|
exports.isIdColumn = isIdColumn;
|
|
24
25
|
exports.getCustomSentence = getCustomSentence;
|
|
@@ -724,6 +725,18 @@ function removeNonSelectedTableFilters(node, table, columns, uniqueValues) {
|
|
|
724
725
|
return null;
|
|
725
726
|
}
|
|
726
727
|
}
|
|
728
|
+
function removeNonSelectedTableOrderBys(orderby, table, columns) {
|
|
729
|
+
if (!orderby || !orderby.length) {
|
|
730
|
+
return null;
|
|
731
|
+
}
|
|
732
|
+
return orderby
|
|
733
|
+
.filter((node) => node.expr &&
|
|
734
|
+
node.expr.table === table &&
|
|
735
|
+
columns.includes(node.expr.column))
|
|
736
|
+
.map((node) => {
|
|
737
|
+
return { ...node, expr: { ...node.expr, table: null } };
|
|
738
|
+
});
|
|
739
|
+
}
|
|
727
740
|
function removeNonSelectedTableReferences(ast, table, columns, uniqueValues) {
|
|
728
741
|
ast.columns = ast.columns.filter((col) => {
|
|
729
742
|
return col.table === table || col.expr.table === table || !col.expr.table;
|
|
@@ -731,6 +744,41 @@ function removeNonSelectedTableReferences(ast, table, columns, uniqueValues) {
|
|
|
731
744
|
if (!ast.where)
|
|
732
745
|
return ast;
|
|
733
746
|
ast.where = removeNonSelectedTableFilters(ast.where, table, columns, uniqueValues);
|
|
747
|
+
ast.orderby = removeNonSelectedTableOrderBys(ast.orderby, table, columns);
|
|
748
|
+
return ast;
|
|
749
|
+
}
|
|
750
|
+
function recursiveRemoveTableReference(node, table, as) {
|
|
751
|
+
if (!node || typeof node !== 'object') {
|
|
752
|
+
return node;
|
|
753
|
+
}
|
|
754
|
+
if (node.length) {
|
|
755
|
+
return node.map((n) => recursiveRemoveTableReference(n, table, as));
|
|
756
|
+
}
|
|
757
|
+
if (node.table && node.as && node.table === table && node.as === as) {
|
|
758
|
+
node.as = null;
|
|
759
|
+
}
|
|
760
|
+
else if (node.table && node.table === as) {
|
|
761
|
+
node.table = table;
|
|
762
|
+
}
|
|
763
|
+
Object.keys(node).forEach((key) => {
|
|
764
|
+
if (typeof node[key] === 'object') {
|
|
765
|
+
node[key] = recursiveRemoveTableReference(node[key], table, as);
|
|
766
|
+
}
|
|
767
|
+
});
|
|
768
|
+
return node;
|
|
769
|
+
}
|
|
770
|
+
function removeTableNameAlias(ast) {
|
|
771
|
+
if (!ast.from?.length || !ast.from) {
|
|
772
|
+
return ast;
|
|
773
|
+
}
|
|
774
|
+
const referencedTables = (0, exports.deepCopy)(ast.from);
|
|
775
|
+
referencedTables.forEach((from) => {
|
|
776
|
+
const table = from.table;
|
|
777
|
+
const as = from.as;
|
|
778
|
+
if (as) {
|
|
779
|
+
ast = recursiveRemoveTableReference(ast, table, as);
|
|
780
|
+
}
|
|
781
|
+
});
|
|
734
782
|
return ast;
|
|
735
783
|
}
|
|
736
784
|
function allNumericNodesValidInTree(node) {
|
|
@@ -35,6 +35,7 @@ export interface TextInputComponentProps {
|
|
|
35
35
|
value: string;
|
|
36
36
|
label?: string;
|
|
37
37
|
placeholder?: string;
|
|
38
|
+
disabled?: boolean;
|
|
38
39
|
onChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
|
|
39
40
|
}
|
|
40
41
|
export interface ModalComponentProps {
|
|
@@ -179,10 +180,11 @@ export interface TableComponentProps {
|
|
|
179
180
|
currentPage?: number;
|
|
180
181
|
setCurrentPage?: (page: number) => void;
|
|
181
182
|
disableSort?: boolean;
|
|
183
|
+
hideLabels?: boolean;
|
|
182
184
|
}
|
|
183
185
|
export declare const QuillTableSQLEditorComponent: ({ rows, columns, isLoading, rowCount, rowCountIsLoading, rowsPerPage, onPageChange, onSortChange, containerStyle, currentPage, setCurrentPage, }: TableComponentProps) => import("react/jsx-runtime").JSX.Element;
|
|
184
186
|
export declare const QuillTableReportBuilderComponent: ({ rows, columns, isLoading, rowCount, rowCountIsLoading, rowsPerPage, onPageChange, onSortChange, containerStyle, currentPage, setCurrentPage, disableSort, }: TableComponentProps) => import("react/jsx-runtime").JSX.Element;
|
|
185
|
-
export declare const QuillTableComponent: ({ rows, columns, isLoading, rowCount, rowCountIsLoading, onPageChange, onSortChange, currentPage, }: TableComponentProps) => import("react/jsx-runtime").JSX.Element;
|
|
187
|
+
export declare const QuillTableComponent: ({ rows, columns, isLoading, rowCount, rowCountIsLoading, onPageChange, onSortChange, currentPage, hideLabels, }: TableComponentProps) => import("react/jsx-runtime").JSX.Element;
|
|
186
188
|
export declare const QuillEmptyDashboardComponent: () => import("react/jsx-runtime").JSX.Element;
|
|
187
189
|
export declare const QuillLoadingDashboardComponent: ({ containerStyle, chartContainerStyle, LoadingComponent, }: {
|
|
188
190
|
containerStyle?: CSSProperties;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UiComponents.d.ts","sourceRoot":"","sources":["../../../src/components/UiComponents.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EACZ,WAAW,EACX,aAAa,EAEb,SAAS,EAKV,MAAM,OAAO,CAAC;AAOf,MAAM,WAAW,MAAM;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,SAAS,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,GAAG,CAAC;IACrB,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;CACtC;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAChC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,WAAW,CAAC,gBAAgB,CAAC,KAAK,IAAI,CAAC;CAChE;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,SAAS,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACrC,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,KAAK,CAAC,EAAE,GAAG,CAAC;CACb;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,SAAS,CAAC;CACrB;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,EAAE,SAAS,CAAC;CACrB;AAED;;GAEG;AACH,eAAO,MAAM,cAAc,
|
|
1
|
+
{"version":3,"file":"UiComponents.d.ts","sourceRoot":"","sources":["../../../src/components/UiComponents.tsx"],"names":[],"mappings":"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"}
|
|
@@ -38,7 +38,7 @@ const paginationProcessing_1 = require("../utils/paginationProcessing");
|
|
|
38
38
|
/**
|
|
39
39
|
* The fallback TextInput element for Quill.
|
|
40
40
|
*/
|
|
41
|
-
exports.QuillTextInput = (0, react_1.forwardRef)(({ id, value, width, label, placeholder, onChange }, ref) => {
|
|
41
|
+
exports.QuillTextInput = (0, react_1.forwardRef)(({ id, value, width, label, placeholder, onChange, disabled, }, ref) => {
|
|
42
42
|
const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
|
|
43
43
|
return ((0, jsx_runtime_1.jsxs)("label", { style: {
|
|
44
44
|
position: 'relative',
|
|
@@ -66,7 +66,7 @@ exports.QuillTextInput = (0, react_1.forwardRef)(({ id, value, width, label, pla
|
|
|
66
66
|
fontFamily: theme?.fontFamily,
|
|
67
67
|
width: width,
|
|
68
68
|
minWidth: width,
|
|
69
|
-
}, id: id, value: value, placeholder: placeholder, onChange: onChange })] }));
|
|
69
|
+
}, id: id, value: value, placeholder: placeholder, onChange: onChange, disabled: disabled })] }));
|
|
70
70
|
});
|
|
71
71
|
const MemoizedButton = ({ label, onClick, disabled, icon, tooltipText, isLoading, }) => {
|
|
72
72
|
const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
|
|
@@ -452,7 +452,7 @@ const QuillTableReportBuilderComponent = ({ rows, columns, isLoading = false, ro
|
|
|
452
452
|
}, sort: sort, currentPage: currentPage ?? page, isLoading: isLoading, containerStyle: containerStyle, disableSort: disableSort }));
|
|
453
453
|
};
|
|
454
454
|
exports.QuillTableReportBuilderComponent = QuillTableReportBuilderComponent;
|
|
455
|
-
const QuillTableComponent = ({ rows, columns, isLoading = false, rowCount, rowCountIsLoading, onPageChange, onSortChange, currentPage, }) => {
|
|
455
|
+
const QuillTableComponent = ({ rows, columns, isLoading = false, rowCount, rowCountIsLoading, onPageChange, onSortChange, currentPage, hideLabels, }) => {
|
|
456
456
|
const [sort, setSort] = (0, react_1.useState)({ field: '', direction: '' });
|
|
457
457
|
const [page, setPage] = (0, react_1.useState)(0);
|
|
458
458
|
const [initialLoad, setInitialLoad] = (0, react_1.useState)(true);
|
|
@@ -473,7 +473,7 @@ const QuillTableComponent = ({ rows, columns, isLoading = false, rowCount, rowCo
|
|
|
473
473
|
height: '100%',
|
|
474
474
|
}, children: (0, jsx_runtime_1.jsx)(ChartSkeleton_1.default, {}) }));
|
|
475
475
|
}
|
|
476
|
-
return ((0, jsx_runtime_1.jsx)(QuillTable_1.default, { rows: rows, columns: columns, hideLabels:
|
|
476
|
+
return ((0, jsx_runtime_1.jsx)(QuillTable_1.default, { rows: rows, columns: columns, hideLabels: hideLabels, rowsPerPage: paginationProcessing_1.DEFAULT_PAGINATION.rowsPerPage, rowCount: rowCount, rowCountIsLoading: rowCountIsLoading, onPageChange: (page) => {
|
|
477
477
|
setPage(page);
|
|
478
478
|
onPageChange && onPageChange(page);
|
|
479
479
|
}, onSortChange: (sort) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useDashboard.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDashboard.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"useDashboard.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDashboard.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EACL,eAAe,EAEf,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAGtD,eAAO,MAAM,YAAY,kBACR,MAAM,GAAG,IAAI,kBACZ,cAAc,EAAE;;;;2CA8Gc,MAAM;qCApF1B,MAAM,4CAEf;QACb,MAAM,EAAE,WAAW,GAAG;YAAE,EAAE,EAAE,MAAM,CAAA;SAAE,CAAC;QACrC,MAAM,EAAE,QAAQ,GAAG,QAAQ,CAAC;KAC7B,oBACiB;QAChB,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;KAC5B;CA8FJ,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;;;sDAwBrB;QACD,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,UAAU,CAAC,EAAE,eAAe,CAAC;KAC9B;4BA+CO,MAAM,oDAMT;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,UAAU,CAAC,EAAE,eAAe,CAAC;QAC7B,aAAa,CAAC,EAAE,cAAc,EAAE,CAAC;KAClC;4BAuGkC,MAAM;CA8B5C,CAAC"}
|
|
@@ -78,6 +78,7 @@ const useDashboard = (dashboardName, customFilters) => {
|
|
|
78
78
|
};
|
|
79
79
|
exports.useDashboard = useDashboard;
|
|
80
80
|
const useDashboards = () => {
|
|
81
|
+
const [, dashboardDispatch] = (0, react_1.useContext)(Context_1.DashboardContext);
|
|
81
82
|
const { dashboardConfig, isLoading: isDashboardsLoading, dashboardConfigDispatch, } = (0, react_1.useContext)(Context_1.DashboardConfigContext);
|
|
82
83
|
const { loadFiltersForDashboard, dispatch: dashboardFiltersDispatch } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
|
|
83
84
|
const [client, isLoading] = (0, react_1.useContext)(Context_1.ClientContext);
|
|
@@ -172,6 +173,18 @@ const useDashboards = () => {
|
|
|
172
173
|
...updated.data.dashboard,
|
|
173
174
|
},
|
|
174
175
|
});
|
|
176
|
+
// For each report in the updated.dashboard.sections, set the filterMap
|
|
177
|
+
Object.values(updated.data.dashboard.sections ?? {})
|
|
178
|
+
.flat()
|
|
179
|
+
.forEach((report) => {
|
|
180
|
+
dashboardDispatch({
|
|
181
|
+
type: 'UPDATE_DASHBOARD_ITEM',
|
|
182
|
+
id: report._id,
|
|
183
|
+
data: {
|
|
184
|
+
filterMap: report.filterMap,
|
|
185
|
+
},
|
|
186
|
+
});
|
|
187
|
+
});
|
|
175
188
|
const range = updated.data.dashboard.presetRanges?.find((range) => range.value === updated.data.dashboard.primaryRange?.value) ??
|
|
176
189
|
dateRangePickerUtils_1.PRIMARY_RANGE[updated.data.dashboard.primaryRange?.value ?? 'LAST_30_DAYS'] ??
|
|
177
190
|
dateRangePickerUtils_1.PRIMARY_RANGE['LAST_30_DAYS'];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useExport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useExport.tsx"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AA8D/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;;;;;
|
|
1
|
+
{"version":3,"file":"useExport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useExport.tsx"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AA8D/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;;;;;CAgPF,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"}
|
|
@@ -80,7 +80,12 @@ sectionField, } = {}) => {
|
|
|
80
80
|
const [isCSVLoading, setIsCSVLoading] = (0, react_1.useState)(false);
|
|
81
81
|
const [isPDFLoading, setIsPDFLoading] = (0, react_1.useState)(false);
|
|
82
82
|
if (!reportId || !client) {
|
|
83
|
-
return {
|
|
83
|
+
return {
|
|
84
|
+
downloadCSV: () => { },
|
|
85
|
+
downloadPDF: () => { },
|
|
86
|
+
isPDFLoading: false,
|
|
87
|
+
isCSVLoading: false,
|
|
88
|
+
};
|
|
84
89
|
}
|
|
85
90
|
return {
|
|
86
91
|
downloadCSV: async () => {
|