@quillsql/react 2.12.53 → 2.13.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/ChartBuilder.d.ts.map +1 -1
- package/dist/cjs/ChartBuilder.js +4 -4
- package/dist/cjs/ChartEditor.d.ts.map +1 -1
- package/dist/cjs/ChartEditor.js +10 -10
- package/dist/cjs/Context.d.ts +13 -1
- package/dist/cjs/Context.d.ts.map +1 -1
- package/dist/cjs/Context.js +114 -17
- package/dist/cjs/Dashboard.d.ts.map +1 -1
- package/dist/cjs/Dashboard.js +107 -313
- package/dist/cjs/DateRangePicker/QuillDateRangePicker.d.ts.map +1 -1
- package/dist/cjs/DateRangePicker/QuillDateRangePicker.js +14 -6
- package/dist/cjs/ReportBuilder.d.ts.map +1 -1
- package/dist/cjs/ReportBuilder.js +13 -7
- package/dist/cjs/SQLEditor.d.ts.map +1 -1
- package/dist/cjs/SQLEditor.js +6 -5
- package/dist/cjs/components/Dashboard/DashboardFilter.d.ts +2 -1
- package/dist/cjs/components/Dashboard/DashboardFilter.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/DashboardFilter.js +7 -7
- package/dist/cjs/components/Dashboard/DataLoader.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/DataLoader.js +36 -3
- package/dist/cjs/components/QuillMultiSelect.js +1 -1
- package/dist/cjs/components/QuillMultiSelectWithCombo.js +1 -1
- package/dist/cjs/components/QuillSelect.d.ts +1 -1
- package/dist/cjs/components/QuillSelect.d.ts.map +1 -1
- package/dist/cjs/components/QuillSelect.js +3 -3
- package/dist/cjs/components/QuillSelectWithCombo.d.ts +1 -1
- package/dist/cjs/components/QuillSelectWithCombo.d.ts.map +1 -1
- package/dist/cjs/components/QuillSelectWithCombo.js +3 -3
- package/dist/cjs/components/QuillTable.d.ts.map +1 -1
- package/dist/cjs/components/QuillTable.js +10 -3
- package/dist/cjs/components/UiComponents.d.ts +1 -0
- package/dist/cjs/components/UiComponents.d.ts.map +1 -1
- package/dist/cjs/hooks/useDashboard.d.ts +4 -1
- package/dist/cjs/hooks/useDashboard.d.ts.map +1 -1
- package/dist/cjs/hooks/useDashboard.js +122 -53
- package/dist/cjs/hooks/useExport.d.ts.map +1 -1
- package/dist/cjs/hooks/useExport.js +8 -2
- package/dist/cjs/hooks/useQuill.d.ts.map +1 -1
- package/dist/cjs/hooks/useQuill.js +11 -13
- package/dist/cjs/models/Client.d.ts +6 -0
- package/dist/cjs/models/Client.d.ts.map +1 -1
- package/dist/cjs/models/Filter.d.ts +4 -3
- package/dist/cjs/models/Filter.d.ts.map +1 -1
- package/dist/cjs/models/Filter.js +38 -1
- package/dist/cjs/utils/paginationProcessing.js +1 -1
- package/dist/cjs/utils/report.js +2 -2
- package/dist/cjs/utils/tableProcessing.d.ts +2 -2
- package/dist/cjs/utils/tableProcessing.d.ts.map +1 -1
- package/dist/esm/ChartBuilder.d.ts.map +1 -1
- package/dist/esm/ChartBuilder.js +4 -4
- package/dist/esm/ChartEditor.d.ts.map +1 -1
- package/dist/esm/ChartEditor.js +10 -10
- package/dist/esm/Context.d.ts +13 -1
- package/dist/esm/Context.d.ts.map +1 -1
- package/dist/esm/Context.js +114 -17
- package/dist/esm/Dashboard.d.ts.map +1 -1
- package/dist/esm/Dashboard.js +107 -313
- package/dist/esm/DateRangePicker/QuillDateRangePicker.d.ts.map +1 -1
- package/dist/esm/DateRangePicker/QuillDateRangePicker.js +15 -7
- package/dist/esm/ReportBuilder.d.ts.map +1 -1
- package/dist/esm/ReportBuilder.js +14 -8
- package/dist/esm/SQLEditor.d.ts.map +1 -1
- package/dist/esm/SQLEditor.js +6 -5
- package/dist/esm/components/Dashboard/DashboardFilter.d.ts +2 -1
- package/dist/esm/components/Dashboard/DashboardFilter.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/DashboardFilter.js +7 -7
- package/dist/esm/components/Dashboard/DataLoader.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/DataLoader.js +37 -4
- package/dist/esm/components/QuillMultiSelect.js +1 -1
- package/dist/esm/components/QuillMultiSelectWithCombo.js +1 -1
- package/dist/esm/components/QuillSelect.d.ts +1 -1
- package/dist/esm/components/QuillSelect.d.ts.map +1 -1
- package/dist/esm/components/QuillSelect.js +3 -3
- package/dist/esm/components/QuillSelectWithCombo.d.ts +1 -1
- package/dist/esm/components/QuillSelectWithCombo.d.ts.map +1 -1
- package/dist/esm/components/QuillSelectWithCombo.js +3 -3
- package/dist/esm/components/QuillTable.d.ts.map +1 -1
- package/dist/esm/components/QuillTable.js +10 -3
- package/dist/esm/components/UiComponents.d.ts +1 -0
- package/dist/esm/components/UiComponents.d.ts.map +1 -1
- package/dist/esm/hooks/useDashboard.d.ts +4 -1
- package/dist/esm/hooks/useDashboard.d.ts.map +1 -1
- package/dist/esm/hooks/useDashboard.js +121 -55
- package/dist/esm/hooks/useExport.d.ts.map +1 -1
- package/dist/esm/hooks/useExport.js +9 -3
- package/dist/esm/hooks/useQuill.d.ts.map +1 -1
- package/dist/esm/hooks/useQuill.js +12 -14
- package/dist/esm/models/Client.d.ts +6 -0
- package/dist/esm/models/Client.d.ts.map +1 -1
- package/dist/esm/models/Filter.d.ts +4 -3
- package/dist/esm/models/Filter.d.ts.map +1 -1
- package/dist/esm/models/Filter.js +36 -0
- package/dist/esm/utils/paginationProcessing.js +1 -1
- package/dist/esm/utils/report.js +2 -2
- package/dist/esm/utils/tableProcessing.d.ts +2 -2
- package/dist/esm/utils/tableProcessing.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -1,9 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.useDashboard = exports.useReports = void 0;
|
|
4
7
|
const react_1 = require("react");
|
|
5
8
|
const Context_1 = require("../Context");
|
|
6
9
|
const dashboard_1 = require("../utils/dashboard");
|
|
10
|
+
const dateRangePickerUtils_1 = require("../DateRangePicker/dateRangePickerUtils");
|
|
11
|
+
const fast_deep_equal_1 = __importDefault(require("fast-deep-equal"));
|
|
7
12
|
const useReports = () => {
|
|
8
13
|
const [dashboard, dispatch] = (0, react_1.useContext)(Context_1.DashboardContext);
|
|
9
14
|
const reloadReport = (id) => {
|
|
@@ -27,50 +32,126 @@ const useReports = () => {
|
|
|
27
32
|
exports.useReports = useReports;
|
|
28
33
|
const useDashboard = (dashboardName) => {
|
|
29
34
|
const [dashboardConfig, dashboardConfigContext] = (0, react_1.useContext)(Context_1.DashboardConfigContext);
|
|
35
|
+
const { dashboardFilters, loadFiltersForDashboard } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
|
|
30
36
|
const [dashboard] = (0, react_1.useContext)(Context_1.DashboardContext);
|
|
31
37
|
const [isLoading, setIsLoading] = (0, react_1.useState)(true);
|
|
32
38
|
const [error, setError] = (0, react_1.useState)(null);
|
|
33
39
|
const [client, isClientLoading] = (0, react_1.useContext)(Context_1.ClientContext);
|
|
34
|
-
const [dashboardFilters, setDashboardFilters] = (0, react_1.useState)(null);
|
|
35
|
-
const [dashboardFiltersLoading, setDashboardFiltersLoading] = (0, react_1.useState)(true);
|
|
36
40
|
const loading = (0, react_1.useMemo)(() => isLoading ||
|
|
37
41
|
isClientLoading ||
|
|
38
42
|
(dashboardConfig[dashboardName] &&
|
|
39
43
|
!dashboardConfig[dashboardName]?.sections), [isLoading, isClientLoading, dashboardConfig, dashboardName]);
|
|
40
|
-
const handleReload = async (overrideDashboardName, fetchFromServer = false, reportAction) => {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
+
const handleReload = async (overrideDashboardName, fetchFromServer = false, reportAction, overrideFilters) => {
|
|
45
|
+
if (!fetchFromServer && isLoading)
|
|
46
|
+
return;
|
|
47
|
+
if (overrideFilters) {
|
|
48
|
+
// Pull the date filter out of the override filters, process it, and append it to the filters
|
|
49
|
+
const dateFilter = overrideFilters.filters.find((f) => f.filterType === 'date_range');
|
|
50
|
+
loadFiltersForDashboard(dashboardName, [
|
|
51
|
+
...(dateFilter
|
|
52
|
+
? [
|
|
53
|
+
{
|
|
54
|
+
...dateFilter,
|
|
55
|
+
dateField: [
|
|
56
|
+
...new Map(Object.values(dashboardConfig[overrideDashboardName ?? dashboardName]
|
|
57
|
+
?.sections ?? {})
|
|
58
|
+
.flat()
|
|
59
|
+
.map((report) => {
|
|
60
|
+
const key = JSON.stringify(report.dateField);
|
|
61
|
+
return [key, report.dateField];
|
|
62
|
+
})).values(),
|
|
63
|
+
],
|
|
64
|
+
},
|
|
65
|
+
]
|
|
66
|
+
: []),
|
|
67
|
+
...(overrideFilters.filters.filter((f) => f.filterType !== 'date_range') ?? []),
|
|
68
|
+
], overrideFilters.editedFilterLabel);
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
71
|
+
const dashboard = await getDashboards(overrideDashboardName ?? dashboardName, fetchFromServer, reportAction);
|
|
72
|
+
if (!fetchFromServer &&
|
|
73
|
+
Object.keys(dashboardFilters[dashboardName] ?? {}).length)
|
|
74
|
+
return;
|
|
75
|
+
const dateFilter = dashboard?.dateFilter
|
|
76
|
+
? {
|
|
77
|
+
...dashboard?.dateFilter,
|
|
78
|
+
startDate: dateRangePickerUtils_1.PRIMARY_RANGE[dashboard?.dateFilter.primaryRange?.value ?? 'LAST_30_DAYS']?.start,
|
|
79
|
+
endDate: dateRangePickerUtils_1.PRIMARY_RANGE[dashboard?.dateFilter.primaryRange?.value ?? 'LAST_30_DAYS']?.end,
|
|
80
|
+
filterType: 'date_range',
|
|
81
|
+
dateField: [
|
|
82
|
+
...new Map(Object.values(dashboard?.sections ?? {})
|
|
83
|
+
.flat()
|
|
84
|
+
.map((report) => {
|
|
85
|
+
const key = JSON.stringify(report.dateField);
|
|
86
|
+
return [key, report.dateField];
|
|
87
|
+
})).values(),
|
|
88
|
+
],
|
|
89
|
+
preset: dashboard?.dateFilter.primaryRange,
|
|
90
|
+
dashboardName: overrideDashboardName ?? dashboardName,
|
|
91
|
+
comparisonRange: dashboard?.dateFilter.comparison
|
|
92
|
+
? {
|
|
93
|
+
startDate: dashboard?.dateFilter.comparsionRange?.startDate ??
|
|
94
|
+
dateRangePickerUtils_1.COMPARISON_RANGE[dashboard?.dateFilter
|
|
95
|
+
.defaultComparisonRange ??
|
|
96
|
+
'NO_COMPARISON']({
|
|
97
|
+
start: dateRangePickerUtils_1.PRIMARY_RANGE[dashboard?.dateFilter.primaryRange?.value ??
|
|
98
|
+
'LAST_30_DAYS']?.start,
|
|
99
|
+
end: dateRangePickerUtils_1.PRIMARY_RANGE[dashboard?.dateFilter.primaryRange?.value ??
|
|
100
|
+
'LAST_30_DAYS']?.end,
|
|
101
|
+
})?.start,
|
|
102
|
+
endDate: dashboard?.dateFilter.comparsionRange?.endDate ??
|
|
103
|
+
dateRangePickerUtils_1.COMPARISON_RANGE[dashboard?.dateFilter
|
|
104
|
+
.defaultComparisonRange ??
|
|
105
|
+
'NO_COMPARISON']({
|
|
106
|
+
start: dateRangePickerUtils_1.PRIMARY_RANGE[dashboard?.dateFilter.primaryRange?.value ??
|
|
107
|
+
'LAST_30_DAYS']?.start,
|
|
108
|
+
end: dateRangePickerUtils_1.PRIMARY_RANGE[dashboard?.dateFilter.primaryRange?.value ??
|
|
109
|
+
'LAST_30_DAYS']?.end,
|
|
110
|
+
})?.end,
|
|
111
|
+
value: dashboard?.dateFilter.comparsionRange?.value ??
|
|
112
|
+
dashboard.dateFilter?.defaultComparisonRange,
|
|
113
|
+
}
|
|
114
|
+
: undefined,
|
|
115
|
+
}
|
|
116
|
+
: undefined;
|
|
117
|
+
// Append dateFilter to the filters unless it's undefined
|
|
118
|
+
loadFiltersForDashboard(dashboardName, [
|
|
119
|
+
...(dateFilter ? [dateFilter] : []),
|
|
120
|
+
...(dashboard?.filters ?? []),
|
|
44
121
|
]);
|
|
45
122
|
};
|
|
46
123
|
//FIXME: report should be of type QuillReport
|
|
47
124
|
async function getDashboards(dashboardName, fetchFromServer = false, reportAction) {
|
|
48
|
-
|
|
49
|
-
if (!fetchFromServer &&
|
|
125
|
+
const curDashboardConfig = dashboardConfig[dashboardName];
|
|
126
|
+
if (!fetchFromServer && curDashboardConfig?.sections) {
|
|
50
127
|
if (reportAction?.action === 'delete') {
|
|
51
128
|
dashboardConfigContext({
|
|
52
129
|
type: 'UPDATE_DASHBOARD',
|
|
53
130
|
id: dashboardName,
|
|
54
131
|
data: {
|
|
55
|
-
...
|
|
56
|
-
sections: {
|
|
57
|
-
|
|
132
|
+
...curDashboardConfig,
|
|
133
|
+
sections: Object.fromEntries(Object.entries(curDashboardConfig?.sections ?? {}).map(([sectionKey, reports]) => [
|
|
134
|
+
sectionKey,
|
|
135
|
+
reports.filter((report) => (report.id ?? report._id) !==
|
|
58
136
|
(reportAction.report.id ?? reportAction.report._id)),
|
|
59
|
-
|
|
137
|
+
])),
|
|
60
138
|
},
|
|
61
139
|
});
|
|
62
140
|
}
|
|
63
141
|
else if (reportAction?.action === 'upsert') {
|
|
64
|
-
const containsReport =
|
|
142
|
+
const containsReport = Object.values(curDashboardConfig?.sections ?? {})
|
|
143
|
+
.flat()
|
|
144
|
+
.some((report) => (report.id ?? report._id) ===
|
|
65
145
|
(reportAction?.report.id ?? reportAction?.report._id));
|
|
66
146
|
dashboardConfigContext({
|
|
67
147
|
type: 'UPDATE_DASHBOARD',
|
|
68
148
|
id: dashboardName,
|
|
69
149
|
data: {
|
|
70
|
-
...
|
|
71
|
-
sections: {
|
|
72
|
-
|
|
73
|
-
|
|
150
|
+
...curDashboardConfig,
|
|
151
|
+
sections: Object.fromEntries(Object.entries(curDashboardConfig?.sections ?? {}).map(([sectionKey, reports]) => [
|
|
152
|
+
sectionKey,
|
|
153
|
+
containsReport
|
|
154
|
+
? reports.map((report) => {
|
|
74
155
|
return {
|
|
75
156
|
report,
|
|
76
157
|
// FIXME: this is bizarre. The _id field shouldn't even exist on the report according to the type, but that's what is set.
|
|
@@ -83,75 +164,63 @@ const useDashboard = (dashboardName) => {
|
|
|
83
164
|
};
|
|
84
165
|
})
|
|
85
166
|
: [
|
|
86
|
-
...(
|
|
167
|
+
...(reports ?? []),
|
|
87
168
|
{
|
|
88
169
|
report: reportAction?.report,
|
|
89
170
|
...dashboard[reportAction?.report.id ?? reportAction?.report._id],
|
|
90
171
|
_id: reportAction?.report.id ?? reportAction?.report._id,
|
|
91
172
|
},
|
|
92
173
|
],
|
|
93
|
-
|
|
174
|
+
])),
|
|
94
175
|
},
|
|
95
176
|
});
|
|
96
177
|
}
|
|
97
178
|
setIsLoading(false);
|
|
98
|
-
return;
|
|
179
|
+
return curDashboardConfig;
|
|
99
180
|
}
|
|
100
|
-
const curDashboardConfig = dashboardConfig[dashboardName];
|
|
101
181
|
if (!fetchFromServer &&
|
|
102
182
|
curDashboardConfig &&
|
|
103
183
|
curDashboardConfig.newQueries) {
|
|
104
184
|
setIsLoading(false);
|
|
105
|
-
return;
|
|
185
|
+
return curDashboardConfig;
|
|
106
186
|
}
|
|
107
187
|
if (!client || !client.publicKey || !client.organizationId) {
|
|
108
|
-
return;
|
|
188
|
+
return curDashboardConfig;
|
|
109
189
|
}
|
|
110
190
|
if (dashboardName === null || dashboardName === undefined)
|
|
111
|
-
return;
|
|
191
|
+
return curDashboardConfig;
|
|
112
192
|
try {
|
|
193
|
+
setIsLoading(true);
|
|
113
194
|
const resp = await (0, dashboard_1.getDashboard)(dashboardName, client);
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
195
|
+
// if dashboard has changed
|
|
196
|
+
if (!(0, fast_deep_equal_1.default)(resp, curDashboardConfig)) {
|
|
197
|
+
dashboardConfigContext({
|
|
198
|
+
type: 'ADD_DASHBOARD',
|
|
199
|
+
id: dashboardName,
|
|
200
|
+
data: { ...resp },
|
|
201
|
+
});
|
|
202
|
+
}
|
|
120
203
|
setError(null);
|
|
204
|
+
return resp;
|
|
121
205
|
}
|
|
122
206
|
catch (error) {
|
|
123
|
-
setIsLoading(false);
|
|
124
207
|
setError(error);
|
|
125
208
|
console.error('Error fetching data:', error);
|
|
126
209
|
}
|
|
127
|
-
}
|
|
128
|
-
async function getDashboardFilters(dashboardName, fetchFromServer = false) {
|
|
129
|
-
if (!fetchFromServer && dashboardFilters) {
|
|
130
|
-
setDashboardFiltersLoading(false);
|
|
131
|
-
return;
|
|
132
|
-
}
|
|
133
|
-
setDashboardFiltersLoading(true);
|
|
134
|
-
if (!client || !client.publicKey || !client.organizationId) {
|
|
135
|
-
return;
|
|
136
|
-
}
|
|
137
|
-
if (dashboardName === null || dashboardName === undefined)
|
|
138
|
-
return;
|
|
139
|
-
try {
|
|
140
|
-
const resp = await (0, dashboard_1.getDashboardFilters)(dashboardName, client);
|
|
141
|
-
setDashboardFilters(resp);
|
|
142
|
-
}
|
|
143
|
-
catch (error) {
|
|
144
|
-
console.error('Error fetching data:', error);
|
|
145
|
-
}
|
|
146
210
|
finally {
|
|
147
|
-
|
|
211
|
+
setIsLoading(false);
|
|
148
212
|
}
|
|
149
213
|
}
|
|
214
|
+
function isDashboardFilterLoading(filterName) {
|
|
215
|
+
return dashboardFilters[dashboardName]?.[filterName]?.loading;
|
|
216
|
+
}
|
|
150
217
|
return {
|
|
151
218
|
data: loading ? null : dashboardConfig[dashboardName],
|
|
152
|
-
dashboardFilters: dashboardFilters
|
|
219
|
+
dashboardFilters: dashboardFilters[dashboardName] !== undefined
|
|
220
|
+
? Object.values(dashboardFilters[dashboardName] ?? {}).map((f) => f.filter)
|
|
221
|
+
: null,
|
|
153
222
|
isLoading: loading,
|
|
154
|
-
|
|
223
|
+
isDashboardFilterLoading,
|
|
155
224
|
error,
|
|
156
225
|
reload: handleReload,
|
|
157
226
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useExport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useExport.tsx"],"names":[],"mappings":"AA8DA,eAAO,MAAM,SAAS,cAAe,MAAM;;;;
|
|
1
|
+
{"version":3,"file":"useExport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useExport.tsx"],"names":[],"mappings":"AA8DA,eAAO,MAAM,SAAS,cAAe,MAAM;;;;CA2D1C,CAAC"}
|
|
@@ -50,6 +50,12 @@ async function getExportData(client, dashboardFilters, reportId) {
|
|
|
50
50
|
}
|
|
51
51
|
const useExport = (reportId) => {
|
|
52
52
|
const { dashboardFilters } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
|
|
53
|
+
const specificDashboardFilters = (0, react_1.useMemo)(() => {
|
|
54
|
+
//FIXME: Pretty sure this won't work with multiple dashboards
|
|
55
|
+
Object.values(dashboardFilters).map((dashboardFilter) => {
|
|
56
|
+
return dashboardFilter.filter;
|
|
57
|
+
});
|
|
58
|
+
}, [dashboardFilters]);
|
|
53
59
|
const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
|
|
54
60
|
const [client] = (0, react_1.useContext)(Context_1.ClientContext);
|
|
55
61
|
const [isLoading, setIsLoading] = (0, react_1.useState)(false);
|
|
@@ -62,7 +68,7 @@ const useExport = (reportId) => {
|
|
|
62
68
|
return;
|
|
63
69
|
}
|
|
64
70
|
setIsLoading(true);
|
|
65
|
-
const resp = await getExportData(client,
|
|
71
|
+
const resp = await getExportData(client, specificDashboardFilters, reportId);
|
|
66
72
|
(0, csv_1.downloadCSV)({
|
|
67
73
|
rows: resp.rows,
|
|
68
74
|
fields: resp.columns,
|
|
@@ -75,7 +81,7 @@ const useExport = (reportId) => {
|
|
|
75
81
|
return;
|
|
76
82
|
}
|
|
77
83
|
setIsLoading(true);
|
|
78
|
-
const resp = await getExportData(client,
|
|
84
|
+
const resp = await getExportData(client, specificDashboardFilters, reportId);
|
|
79
85
|
const iframe = document.createElement('iframe');
|
|
80
86
|
document.body.appendChild(iframe);
|
|
81
87
|
if (iframe && iframe.contentDocument && theme) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useQuill.d.ts","sourceRoot":"","sources":["../../../src/hooks/useQuill.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACL,WAAW,EAIZ,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"useQuill.d.ts","sourceRoot":"","sources":["../../../src/hooks/useQuill.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACL,WAAW,EAIZ,MAAM,yBAAyB,CAAC;AAGjC,UAAU,MAAM;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,QAAQ,cACR,MAAM,eACJ;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE;UAEtD,WAAW,GAAG,IAAI;aACf,OAAO;WACT,MAAM,GAAG,SAAS;sBACP,MAAM,KAAK,IAAI;qBAChB,MAAM,aAAa,MAAM,KAAK,IAAI;2BAEnC,WAAW,KAAK,MAAM,GAAG,SAAS,WACvC,SAAS;CAiLrB,CAAC;AAEF,eAAO,MAAM,QAAQ,cACR,MAAM;UAEX;QAAE,IAAI,EAAE,GAAG,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS;WAC7C,MAAM,GAAG,SAAS;CAoD1B,CAAC"}
|
|
@@ -11,6 +11,14 @@ const dataProcessing_1 = require("../utils/dataProcessing");
|
|
|
11
11
|
const useQuill = (reportId, pagination) => {
|
|
12
12
|
const [dashboard, dispatch] = (0, react_1.useContext)(Context_1.DashboardContext);
|
|
13
13
|
const { dashboardFilters } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
|
|
14
|
+
const specificDashboardFilters = (0, react_1.useMemo)(() => {
|
|
15
|
+
if (!reportId)
|
|
16
|
+
return [];
|
|
17
|
+
const dashboardName = dashboard[reportId]?.dashboardName;
|
|
18
|
+
if (!dashboardName)
|
|
19
|
+
return [];
|
|
20
|
+
return Object.values(dashboardFilters[dashboardName] ?? {}).map((f) => f.filter);
|
|
21
|
+
}, [dashboardFilters, reportId, dashboard]);
|
|
14
22
|
const [schemaData] = (0, react_1.useContext)(Context_1.SchemaDataContext);
|
|
15
23
|
const [client] = (0, react_1.useContext)(Context_1.ClientContext);
|
|
16
24
|
const [data, setData] = (0, react_1.useState)(null);
|
|
@@ -76,13 +84,8 @@ const useQuill = (reportId, pagination) => {
|
|
|
76
84
|
if (!loading && reportId && data) {
|
|
77
85
|
setLoading(true);
|
|
78
86
|
try {
|
|
79
|
-
const specificDashboardFilter = dashboardFilters.filter((f) => f &&
|
|
80
|
-
reportId &&
|
|
81
|
-
dashboard[reportId] &&
|
|
82
|
-
// @ts-ignore
|
|
83
|
-
dashboard[reportId].dashboardName === f.dashboardName);
|
|
84
87
|
const updatedProcessing = { ...additionalProcessing, ...processing };
|
|
85
|
-
const paginatedRows = await (0, tableProcessing_1.fetchResultsByReport)(reportId, client, updatedProcessing,
|
|
88
|
+
const paginatedRows = await (0, tableProcessing_1.fetchResultsByReport)(reportId, client, updatedProcessing, specificDashboardFilters, schemaData.customFields);
|
|
86
89
|
if (paginatedRows.error) {
|
|
87
90
|
throw new Error('Error fetching chart');
|
|
88
91
|
}
|
|
@@ -115,19 +118,14 @@ const useQuill = (reportId, pagination) => {
|
|
|
115
118
|
setLoading(false);
|
|
116
119
|
return;
|
|
117
120
|
}
|
|
118
|
-
const specificDashboardFilter = dashboardFilters.filter((f) => f &&
|
|
119
|
-
reportId &&
|
|
120
|
-
dashboard[curReportId] &&
|
|
121
|
-
// @ts-ignore
|
|
122
|
-
dashboard[curReportId].dashboardName === f.dashboardName);
|
|
123
121
|
setLoading(true);
|
|
124
|
-
const { report, error } = await (0, report_1.fetchReport)(curReportId, client, useReportTask,
|
|
122
|
+
const { report, error } = await (0, report_1.fetchReport)(curReportId, client, useReportTask, specificDashboardFilters, additionalProcessing, undefined, schemaData.customFields);
|
|
125
123
|
dispatch({
|
|
126
124
|
type: 'ADD_DASHBOARD_ITEM',
|
|
127
125
|
id: reportId,
|
|
128
126
|
data: {
|
|
129
127
|
...report,
|
|
130
|
-
filtersApplied:
|
|
128
|
+
filtersApplied: specificDashboardFilters,
|
|
131
129
|
triggerReload: false,
|
|
132
130
|
},
|
|
133
131
|
});
|
|
@@ -5,6 +5,9 @@ export type Client = {
|
|
|
5
5
|
multiTenancyDisabled?: boolean;
|
|
6
6
|
adminCustomerId?: string;
|
|
7
7
|
recommendedPivotsDisabled?: boolean;
|
|
8
|
+
featureFlags?: {
|
|
9
|
+
[key: string]: boolean;
|
|
10
|
+
};
|
|
8
11
|
};
|
|
9
12
|
export type QuillProviderClient = {
|
|
10
13
|
organizationId?: string;
|
|
@@ -18,5 +21,8 @@ export type QuillProviderClient = {
|
|
|
18
21
|
multiTenancyDisabled?: boolean;
|
|
19
22
|
adminCustomerId?: string;
|
|
20
23
|
recommendedPivotsDisabled?: boolean;
|
|
24
|
+
featureFlags?: {
|
|
25
|
+
[key: string]: boolean;
|
|
26
|
+
};
|
|
21
27
|
};
|
|
22
28
|
//# sourceMappingURL=Client.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Client.d.ts","sourceRoot":"","sources":["../../../src/models/Client.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,MAAM,GAAG;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yBAAyB,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"Client.d.ts","sourceRoot":"","sources":["../../../src/models/Client.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,MAAM,GAAG;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;CAC3C,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;CAC3C,CAAC"}
|
|
@@ -156,8 +156,8 @@ export interface DashboardStringFilter extends DashboardBaseFilter {
|
|
|
156
156
|
}
|
|
157
157
|
export interface DashboardDateFilter extends DashboardBaseFilter {
|
|
158
158
|
filterType: DashboardFilterType.Date;
|
|
159
|
-
comparison
|
|
160
|
-
defaultComparisonRange
|
|
159
|
+
comparison?: boolean;
|
|
160
|
+
defaultComparisonRange?: ComparisonRangeKey;
|
|
161
161
|
options: {
|
|
162
162
|
label: string;
|
|
163
163
|
value: string;
|
|
@@ -176,11 +176,12 @@ export interface DashboardDateFilter extends DashboardBaseFilter {
|
|
|
176
176
|
};
|
|
177
177
|
startDate: Date;
|
|
178
178
|
endDate: Date;
|
|
179
|
-
comparisonRange
|
|
179
|
+
comparisonRange?: {
|
|
180
180
|
startDate?: Date;
|
|
181
181
|
endDate?: Date;
|
|
182
182
|
value: ComparisonRangeKey;
|
|
183
183
|
};
|
|
184
184
|
}
|
|
185
|
+
export declare function convertDashboardFilterToFilter(dashboardFilter: DashboardFilter): Filter;
|
|
185
186
|
export {};
|
|
186
187
|
//# sourceMappingURL=Filter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Filter.d.ts","sourceRoot":"","sources":["../../../src/models/Filter.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Filter.d.ts","sourceRoot":"","sources":["../../../src/models/Filter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
// import * as Constants from '../utils/filterConstants';
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.DashboardFilterType = exports.FilterNames = exports.FieldTypes = exports.TimeUnit = exports.BoolOperator = exports.NullOperator = exports.NumberOperator = exports.DateOperator = exports.StringOperator = void 0;
|
|
4
|
+
exports.convertDashboardFilterToFilter = exports.DashboardFilterType = exports.FilterNames = exports.FieldTypes = exports.TimeUnit = exports.BoolOperator = exports.NullOperator = exports.NumberOperator = exports.DateOperator = exports.StringOperator = void 0;
|
|
5
5
|
/* eslint-disable no-unused-vars */
|
|
6
6
|
const IS_EXACTLY = 'is exactly';
|
|
7
7
|
const IS_NOT_EXACTLY = 'is not exactly';
|
|
@@ -110,3 +110,40 @@ var StringFilterType;
|
|
|
110
110
|
StringFilterType["Default"] = "default";
|
|
111
111
|
StringFilterType["Multiselect"] = "multiselect";
|
|
112
112
|
})(StringFilterType || (StringFilterType = {}));
|
|
113
|
+
//FIXME: This is likely incorrect
|
|
114
|
+
function convertDashboardFilterToFilter(dashboardFilter) {
|
|
115
|
+
if (dashboardFilter.filterType === DashboardFilterType.String) {
|
|
116
|
+
return {
|
|
117
|
+
filterType: FilterNames.StringFilter,
|
|
118
|
+
fieldType: FieldTypes.String,
|
|
119
|
+
operator: StringOperator.Is,
|
|
120
|
+
field: dashboardFilter.field,
|
|
121
|
+
value: dashboardFilter.selectedValue,
|
|
122
|
+
table: dashboardFilter.table,
|
|
123
|
+
};
|
|
124
|
+
}
|
|
125
|
+
else {
|
|
126
|
+
if (dashboardFilter.comparison) {
|
|
127
|
+
return {
|
|
128
|
+
filterType: FilterNames.DateComparisonFilter,
|
|
129
|
+
fieldType: FieldTypes.Date,
|
|
130
|
+
operator: DateOperator.Custom,
|
|
131
|
+
field: dashboardFilter.field,
|
|
132
|
+
value: dashboardFilter.comparisonRange?.value,
|
|
133
|
+
};
|
|
134
|
+
}
|
|
135
|
+
else {
|
|
136
|
+
return {
|
|
137
|
+
filterType: FilterNames.DateCustomFilter,
|
|
138
|
+
fieldType: FieldTypes.Date,
|
|
139
|
+
operator: DateOperator.Custom,
|
|
140
|
+
field: dashboardFilter.field,
|
|
141
|
+
value: {
|
|
142
|
+
startDate: dashboardFilter.startDate.toISOString(),
|
|
143
|
+
endDate: dashboardFilter.endDate.toISOString(),
|
|
144
|
+
},
|
|
145
|
+
};
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
exports.convertDashboardFilterToFilter = convertDashboardFilterToFilter;
|
|
@@ -4,7 +4,7 @@ exports.shouldSortInMemory = exports.shouldFetchMore = exports.DEFAULT_PAGINATIO
|
|
|
4
4
|
exports.DEFAULT_PAGINATION = {
|
|
5
5
|
page: 0,
|
|
6
6
|
rowsPerPage: 10,
|
|
7
|
-
rowsPerRequest:
|
|
7
|
+
rowsPerRequest: 600,
|
|
8
8
|
};
|
|
9
9
|
function shouldFetchMore(pagination, page, maxPage) {
|
|
10
10
|
if (!pagination) {
|
package/dist/cjs/utils/report.js
CHANGED
|
@@ -77,7 +77,7 @@ async function fetchReport(reportId, client, useReportTask = true, filters = [],
|
|
|
77
77
|
clientId: client.publicKey,
|
|
78
78
|
task: useReportTask ? 'report' : 'item',
|
|
79
79
|
databaseType: client.databaseType,
|
|
80
|
-
filters: filters,
|
|
80
|
+
filters: filters.map((filter) => ({ ...filter, options: undefined })),
|
|
81
81
|
customFields,
|
|
82
82
|
additionalProcessing,
|
|
83
83
|
useNewNodeSql: true,
|
|
@@ -176,7 +176,7 @@ async function fetchReportRowCount(reportId, client, useReportTask = true, filte
|
|
|
176
176
|
clientId: client.publicKey,
|
|
177
177
|
task: useReportTask ? 'report' : 'item',
|
|
178
178
|
databaseType: client.databaseType,
|
|
179
|
-
filters: filters,
|
|
179
|
+
filters: filters.filter((filter) => filter.options === undefined),
|
|
180
180
|
customFields,
|
|
181
181
|
additionalProcessing,
|
|
182
182
|
useNewNodeSql: true,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { NodeSQLParser } from '../components/ReportBuilder/ast';
|
|
2
2
|
import { QuillProviderClient } from '../models/Client';
|
|
3
3
|
import { Column, ColumnInternal } from '../models/Columns';
|
|
4
|
-
import {
|
|
4
|
+
import { DashboardFilter } from '../models/Filter';
|
|
5
5
|
import { Pagination } from '../models/Pagination';
|
|
6
6
|
import { DateRangesByColumn, UniqueValuesByColumn } from '../models/Tables';
|
|
7
7
|
export interface AdditionalProcessing {
|
|
@@ -42,7 +42,7 @@ export declare const getPaginatedRows: (client: QuillProviderClient, query?: str
|
|
|
42
42
|
rowCount?: number;
|
|
43
43
|
error?: string;
|
|
44
44
|
}>;
|
|
45
|
-
export declare const fetchResultsByQuery: (query: string, client: QuillProviderClient, processing?: AdditionalProcessing, customFields?: any, filters?:
|
|
45
|
+
export declare const fetchResultsByQuery: (query: string, client: QuillProviderClient, processing?: AdditionalProcessing, customFields?: any, filters?: DashboardFilter[], dateField?: {
|
|
46
46
|
field: string;
|
|
47
47
|
table: string;
|
|
48
48
|
} | null, rowsOnly?: boolean, rowCountOnly?: boolean) => Promise<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tableProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/tableProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,aAAa,EACd,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"tableProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/tableProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,aAAa,EACd,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAgB5E,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,eAAO,MAAM,cAAc,YAChB,MAAM,EAAE,qBACE,MAAM,EAAE,KAC1B,OAUF,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC1B,MAAM,EAAE,SACV,MAAM,QACP,GAAG,UACD,mBAAmB,gBACb,GAAG,EAAE;;;;SAmEpB,CAAC;AAEF,eAAO,MAAM,qBAAqB,YACvB,cAAc,EAAE,aACd,MAAM,UACT,GAAG,iBACI,GAAG,yBACK,GAAG,wBACJ,OAAO,UACrB,MAAM,iBA2Cf,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC1B,cAAc,EAAE,UACjB,mBAAmB,SACpB,MAAM,iBACE,GAAG;;;;EA6DnB,CAAC;AAEF,eAAO,MAAM,kBAAkB,YACpB,MAAM,EAAE,SACV,MAAM,UACL,mBAAmB,gBACb,GAAG,EAAE,KAClB,QAAQ;IACT,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,eAAe,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CACvC,CAiDA,CAAC;AAkDF,eAAO,MAAM,qBAAqB,YACvB,MAAM,EAAE,SACV,MAAM,UACL,mBAAmB,gBACb,GAAG,EAAE;;mBAEY;YAAE,KAAK,EAAE,IAAI,CAAC;YAAC,GAAG,EAAE,IAAI,CAAA;SAAE;;SAiB1D,CAAC;AA2DF,eAAO,MAAM,gBAAgB,WACnB,mBAAmB,UACnB,MAAM,aACH,MAAM,eACJ,oBAAoB,YACvB,GAAG,iBACE,GAAG,KACjB,QAAQ;IACT,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAaA,CAAC;AAEF,eAAO,MAAM,mBAAmB,UACvB,MAAM,UACL,mBAAmB,eACd,oBAAoB,iBAClB,GAAG,YACR,eAAe,EAAE,cACf;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,aACxC,OAAO,iBACH,OAAO;aAEb,cAAc,EAAE;UACnB,GAAG,EAAE;;;;EA2DZ,CAAC;AAEF,eAAO,MAAM,oBAAoB,aACrB,MAAM,UACR,mBAAmB,eACd,oBAAoB,YACvB,GAAG,iBACE,GAAG;aAET,MAAM,EAAE;UACX,GAAG,EAAE;;;EAgFZ,CAAC;AAEF,eAAO,MAAM,eAAe,QACrB,cAAc,MAAM,UACjB,mBAAmB,eACd,oBAAoB,iBAClB,GAAG,aACP,OAAO,iBACH,OAAO;aAEb,cAAc,EAAE;UACnB,GAAG,EAAE;;;;EAyDZ,CAAC;AAEF,eAAO,MAAM,+CAA+C,0BACnC,oBAAoB;;CAU5C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChartBuilder.d.ts","sourceRoot":"","sources":["../../src/ChartBuilder.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAOZ,SAAS,EACT,aAAa,EACd,MAAM,OAAO,CAAC;AAkBf,OAAO,EAmBL,uBAAuB,EACxB,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAM1D,OAAO,EAAe,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAanE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"ChartBuilder.d.ts","sourceRoot":"","sources":["../../src/ChartBuilder.tsx"],"names":[],"mappings":"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"}
|
package/dist/esm/ChartBuilder.js
CHANGED
|
@@ -406,8 +406,8 @@ export default function ChartBuilder({ TextInputComponent = QuillTextInput, Sele
|
|
|
406
406
|
const { dashboardFilters } = useContext(DashboardFiltersContext);
|
|
407
407
|
const [dashboardConfig] = useContext(DashboardConfigContext);
|
|
408
408
|
const [filtersActive, setFiltersActive] = useState(true);
|
|
409
|
-
const
|
|
410
|
-
return dashboardFilters.
|
|
409
|
+
const specificDashboardFilters = useMemo(() => {
|
|
410
|
+
return Object.values(dashboardFilters[defaultDashboardName] ?? {}).map((f) => f.filter);
|
|
411
411
|
}, [dashboardFilters, filtersActive]);
|
|
412
412
|
const [showFilterModal, setShowFilterModal] = useState(false);
|
|
413
413
|
const [filterIssues, setFilterIssues] = useState([]);
|
|
@@ -977,7 +977,7 @@ export default function ChartBuilder({ TextInputComponent = QuillTextInput, Sele
|
|
|
977
977
|
columns: formData.columns.filter((col) => !invalidColumns.includes(col)),
|
|
978
978
|
pivotRows: selectedPivotTable?.rows || undefined,
|
|
979
979
|
pivotColumns: selectedPivotTable?.columns || undefined,
|
|
980
|
-
filtersApplied:
|
|
980
|
+
filtersApplied: specificDashboardFilters,
|
|
981
981
|
triggerReload: true,
|
|
982
982
|
error: undefined,
|
|
983
983
|
},
|
|
@@ -991,7 +991,7 @@ export default function ChartBuilder({ TextInputComponent = QuillTextInput, Sele
|
|
|
991
991
|
...resp,
|
|
992
992
|
rows,
|
|
993
993
|
columns: formData.columns.filter((col) => !invalidColumns.includes(col)),
|
|
994
|
-
filtersApplied:
|
|
994
|
+
filtersApplied: specificDashboardFilters,
|
|
995
995
|
});
|
|
996
996
|
}
|
|
997
997
|
};
|