@quillsql/react 2.12.16 → 2.12.18
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 +32 -8
- package/dist/cjs/Dashboard.d.ts +7 -2
- package/dist/cjs/Dashboard.d.ts.map +1 -1
- package/dist/cjs/Dashboard.js +10 -5
- package/dist/cjs/components/Dashboard/DataLoader.d.ts +5 -2
- package/dist/cjs/components/Dashboard/DataLoader.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/DataLoader.js +4 -2
- package/dist/cjs/hooks/useQuill.d.ts.map +1 -1
- package/dist/cjs/hooks/useQuill.js +4 -1
- package/dist/cjs/internals/ReportBuilder/PivotModal.d.ts +1 -1
- package/dist/cjs/internals/ReportBuilder/PivotModal.d.ts.map +1 -1
- package/dist/cjs/internals/ReportBuilder/PivotModal.js +45 -37
- package/dist/cjs/utils/axisFormatter.d.ts.map +1 -1
- package/dist/cjs/utils/axisFormatter.js +14 -0
- package/dist/cjs/utils/dashboard.d.ts.map +1 -1
- package/dist/cjs/utils/dashboard.js +7 -4
- package/dist/cjs/utils/filterProcessing.d.ts +2 -0
- package/dist/cjs/utils/filterProcessing.d.ts.map +1 -0
- package/dist/cjs/utils/filterProcessing.js +25 -0
- package/dist/cjs/utils/valueFormatter.d.ts.map +1 -1
- package/dist/cjs/utils/valueFormatter.js +15 -0
- package/dist/esm/Chart.d.ts.map +1 -1
- package/dist/esm/Chart.js +32 -8
- package/dist/esm/Dashboard.d.ts +7 -2
- package/dist/esm/Dashboard.d.ts.map +1 -1
- package/dist/esm/Dashboard.js +10 -5
- package/dist/esm/components/Dashboard/DataLoader.d.ts +5 -2
- package/dist/esm/components/Dashboard/DataLoader.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/DataLoader.js +4 -2
- package/dist/esm/hooks/useQuill.d.ts.map +1 -1
- package/dist/esm/hooks/useQuill.js +4 -1
- package/dist/esm/internals/ReportBuilder/PivotModal.d.ts +1 -1
- package/dist/esm/internals/ReportBuilder/PivotModal.d.ts.map +1 -1
- package/dist/esm/internals/ReportBuilder/PivotModal.js +45 -37
- package/dist/esm/utils/axisFormatter.d.ts.map +1 -1
- package/dist/esm/utils/axisFormatter.js +14 -0
- package/dist/esm/utils/dashboard.d.ts.map +1 -1
- package/dist/esm/utils/dashboard.js +7 -4
- package/dist/esm/utils/filterProcessing.d.ts +2 -0
- package/dist/esm/utils/filterProcessing.d.ts.map +1 -0
- package/dist/esm/utils/filterProcessing.js +21 -0
- package/dist/esm/utils/valueFormatter.d.ts.map +1 -1
- package/dist/esm/utils/valueFormatter.js +15 -0
- package/package.json +1 -1
package/dist/cjs/Chart.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Chart.d.ts","sourceRoot":"","sources":["../../src/Chart.tsx"],"names":[],"mappings":";AAaA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAe7C,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"Chart.d.ts","sourceRoot":"","sources":["../../src/Chart.tsx"],"names":[],"mappings":";AAaA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAe7C,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AA4GzC,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,WAQhE;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,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;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,WAAW,GAAG,GAAG,CAAC;IAE3B;;;;;;;;OAQG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAElB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;OAEG;IACH,2BAA2B,CAAC,EAAE,OAAO,CAAC;IAEtC;;OAEG;IACH,yBAAyB,CAAC,EAAE,OAAO,CAAC;IAEpC;;OAEG;IACH,wBAAwB,CAAC,EAAE,OAAO,CAAC;IAEnC;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B;;;OAGG;IACH,mBAAmB,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;IAEzC;;OAEG;IACH,sBAAsB,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;IAE5C;;OAEG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAEhC;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;IACH,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,KAAK,YAAY,CAAC;IAE7E;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IAErC;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAErC,4EAA4E;IAC5E,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB,qEAAqE;IACrE,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;IAE1C,gDAAgD;IAChD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,QAAA,MAAM,KAAK,UAAW,UAAU,4CA+C/B,CAAC;AAyzBF,eAAe,KAAK,CAAC"}
|
package/dist/cjs/Chart.js
CHANGED
|
@@ -25,6 +25,7 @@ const dateRangePickerUtils_1 = require("./DateRangePicker/dateRangePickerUtils")
|
|
|
25
25
|
const valueFormatter_2 = require("./utils/valueFormatter");
|
|
26
26
|
const useTheme_1 = __importDefault(require("./hooks/useTheme"));
|
|
27
27
|
const errorProcessing_1 = require("./utils/errorProcessing");
|
|
28
|
+
const filterProcessing_1 = require("./utils/filterProcessing");
|
|
28
29
|
const MAX_ROWS_FOR_GENERIC_TABLE = 300;
|
|
29
30
|
// @ts-ignore
|
|
30
31
|
function sumByKey(arr, key) {
|
|
@@ -192,7 +193,7 @@ const ChartUpdater = ({ colors, reportId, className, containerStyle, isAnimation
|
|
|
192
193
|
clientId: client.publicKey,
|
|
193
194
|
task: 'item',
|
|
194
195
|
databaseType: client.databaseType,
|
|
195
|
-
filters: minimalFilters,
|
|
196
|
+
filters: minimalFilters.filter((f) => f.dashboardName === dashboard[reportId].dashboardName),
|
|
196
197
|
customFields,
|
|
197
198
|
additionalProcessing: updatedProcessing,
|
|
198
199
|
paginateTable: true,
|
|
@@ -200,7 +201,7 @@ const ChartUpdater = ({ colors, reportId, className, containerStyle, isAnimation
|
|
|
200
201
|
};
|
|
201
202
|
const cloudBody = {
|
|
202
203
|
id: reportId,
|
|
203
|
-
filters: minimalFilters,
|
|
204
|
+
filters: minimalFilters.filter((f) => f.dashboardName === dashboard[reportId].dashboardName),
|
|
204
205
|
};
|
|
205
206
|
setError(undefined);
|
|
206
207
|
const resp = await (0, dataFetcher_1.getData)(client, 'itempost', 'omit', hostedBody, cloudBody);
|
|
@@ -210,7 +211,10 @@ const ChartUpdater = ({ colors, reportId, className, containerStyle, isAnimation
|
|
|
210
211
|
if (resp.compareRows) {
|
|
211
212
|
(0, merge_1.mergeComparisonRange)(resp);
|
|
212
213
|
}
|
|
213
|
-
const dashboardItem = {
|
|
214
|
+
const dashboardItem = {
|
|
215
|
+
...resp,
|
|
216
|
+
filtersApplied: minimalFilters.filter((f) => f.dashboardName === dashboard[reportId].dashboardName),
|
|
217
|
+
};
|
|
214
218
|
dispatch({
|
|
215
219
|
type: 'UPDATE_DASHBOARD_ITEM',
|
|
216
220
|
id: reportId,
|
|
@@ -272,7 +276,7 @@ const ChartUpdater = ({ colors, reportId, className, containerStyle, isAnimation
|
|
|
272
276
|
clientId: client.publicKey,
|
|
273
277
|
task: 'item',
|
|
274
278
|
databaseType: client.databaseType,
|
|
275
|
-
filters: minimalFilters,
|
|
279
|
+
filters: minimalFilters.filter((f) => f.dashboardName === dashboard[reportId].dashboardName),
|
|
276
280
|
customFields,
|
|
277
281
|
additionalProcessing: updatedProcessing,
|
|
278
282
|
paginateTable: true,
|
|
@@ -280,7 +284,7 @@ const ChartUpdater = ({ colors, reportId, className, containerStyle, isAnimation
|
|
|
280
284
|
};
|
|
281
285
|
const cloudBody = {
|
|
282
286
|
id: reportId,
|
|
283
|
-
filters: minimalFilters,
|
|
287
|
+
filters: minimalFilters.filter((f) => f.dashboardName === dashboard[reportId].dashboardName),
|
|
284
288
|
};
|
|
285
289
|
setError(undefined);
|
|
286
290
|
const resp = await (0, dataFetcher_1.getData)(client, 'itempost', 'omit', hostedBody, cloudBody);
|
|
@@ -290,7 +294,10 @@ const ChartUpdater = ({ colors, reportId, className, containerStyle, isAnimation
|
|
|
290
294
|
if (resp.compareRows) {
|
|
291
295
|
(0, merge_1.mergeComparisonRange)(resp);
|
|
292
296
|
}
|
|
293
|
-
const dashboardItem = {
|
|
297
|
+
const dashboardItem = {
|
|
298
|
+
...resp,
|
|
299
|
+
filtersApplied: minimalFilters.filter((f) => f.dashboardName === dashboard[reportId].dashboardName),
|
|
300
|
+
};
|
|
294
301
|
dispatch({
|
|
295
302
|
type: 'UPDATE_DASHBOARD_ITEM',
|
|
296
303
|
id: reportId,
|
|
@@ -329,7 +336,7 @@ const ChartDisplay = ({ reportId, config, colors, className, containerStyle, hid
|
|
|
329
336
|
: ['#4E80EE', '#E14F62', '#55B5A6', '#E9A23B', '#6466E9', '#55B685'];
|
|
330
337
|
}, [colors]);
|
|
331
338
|
const dateFilter = !hideDateRangeFilter &&
|
|
332
|
-
Object.values(dashboardFilters
|
|
339
|
+
(0, filterProcessing_1.findAndProcessDateFilter)(Object.values(dashboardFilters ?? []));
|
|
333
340
|
const isPivot = config?.pivot;
|
|
334
341
|
const pivotTable = (0, react_1.useMemo)(() => {
|
|
335
342
|
const pivot = config?.pivot;
|
|
@@ -470,7 +477,24 @@ const ChartDisplay = ({ reportId, config, colors, className, containerStyle, hid
|
|
|
470
477
|
const yAxis = yAxisFields[0]?.field;
|
|
471
478
|
barChartData = [{ [xAxis]: '', [yAxis]: '0' }];
|
|
472
479
|
}
|
|
473
|
-
|
|
480
|
+
let xAxisFormat = config.xAxisFormat;
|
|
481
|
+
if (dateBucket) {
|
|
482
|
+
switch (dateBucket) {
|
|
483
|
+
case 'day':
|
|
484
|
+
xAxisFormat = 'MMM_dd';
|
|
485
|
+
break;
|
|
486
|
+
case 'week':
|
|
487
|
+
xAxisFormat = 'string';
|
|
488
|
+
break;
|
|
489
|
+
case 'month':
|
|
490
|
+
xAxisFormat = 'MMM_yyyy';
|
|
491
|
+
break;
|
|
492
|
+
default:
|
|
493
|
+
xAxisFormat = 'MMM_yyyy';
|
|
494
|
+
break;
|
|
495
|
+
}
|
|
496
|
+
}
|
|
497
|
+
return ((0, jsx_runtime_1.jsx)(BarChart_1.default, { colors: chartColors, theme: theme, isStacked: isPivot && yAxisFields.length > (dateFilter?.comparison ? 2 : 1), yAxisFields: yAxisFields, data: barChartData, xAxisField: config.xAxisField, xAxisLabel: config.xAxisLabel, xAxisFormat: xAxisFormat, containerStyle: containerStyle, className: className, comparison: dateFilter?.comparison, isAnimationActive: isAnimationActive, hideXAxis: hideXAxis, hideYAxis: hideYAxis, hideCartesianGrid: hideCartesianGrid, colorMap: colorMap, onClickChartElement: onClickChartElement }));
|
|
474
498
|
}
|
|
475
499
|
if (chartTypes.includes('metric')) {
|
|
476
500
|
const data = config;
|
package/dist/cjs/Dashboard.d.ts
CHANGED
|
@@ -11,6 +11,7 @@ export interface QuillReportProps {
|
|
|
11
11
|
isLoading?: boolean;
|
|
12
12
|
error?: string;
|
|
13
13
|
children?: ReactNode;
|
|
14
|
+
dateBucket?: string;
|
|
14
15
|
onPageChange?: (page: {
|
|
15
16
|
currentPage: number;
|
|
16
17
|
rowsPerPage: number;
|
|
@@ -124,6 +125,7 @@ export interface DashboardProps {
|
|
|
124
125
|
* The name of the dashboard you created in the Quill Portal.
|
|
125
126
|
*/
|
|
126
127
|
name?: string;
|
|
128
|
+
hidden?: boolean;
|
|
127
129
|
/** A component that wraps a dashboard item for 'metric' chart types. */
|
|
128
130
|
MetricComponent?: ({ report, onClick, isLoading, error, }: {
|
|
129
131
|
report: QuillReport;
|
|
@@ -132,12 +134,13 @@ export interface DashboardProps {
|
|
|
132
134
|
error?: string;
|
|
133
135
|
}) => JSX.Element;
|
|
134
136
|
/** A component that wraps a dashboard item for non-table, non-metric chart types. */
|
|
135
|
-
ChartComponent?: ({ report, onClick, isLoading, error, children, onClickChartElement }: {
|
|
137
|
+
ChartComponent?: ({ report, onClick, isLoading, error, dateBucket, children, onClickChartElement, }: {
|
|
136
138
|
report: QuillReport;
|
|
137
139
|
onClick?: (report: QuillReport) => void;
|
|
138
140
|
isLoading?: boolean;
|
|
139
141
|
error?: string;
|
|
140
142
|
children?: ReactNode;
|
|
143
|
+
dateBucket?: string;
|
|
141
144
|
onClickChartElement?: (data: any) => void;
|
|
142
145
|
}) => JSX.Element;
|
|
143
146
|
/** A component that wraps a dashboard item for 'table' chart types. */
|
|
@@ -252,6 +255,8 @@ export interface DashboardProps {
|
|
|
252
255
|
onClickChartElement?: (data: any) => void;
|
|
253
256
|
/** An override for the pivot date bucketing. */
|
|
254
257
|
dateBucket?: 'day' | 'week' | 'month' | 'year';
|
|
258
|
+
/** An optional limit that will be appended to every dashboart item query */
|
|
259
|
+
limit?: number;
|
|
255
260
|
}
|
|
256
261
|
/**
|
|
257
262
|
* ### Quill Dashboard
|
|
@@ -284,5 +289,5 @@ export interface DashboardProps {
|
|
|
284
289
|
* ### API Reference
|
|
285
290
|
* @see https://docs.quillsql.com/components/dashboard
|
|
286
291
|
*/
|
|
287
|
-
export default function Dashboard({ name, SelectComponent, MultiSelectComponent, EmptyDashboardComponent, DateRangePickerComponent, MetricComponent, ChartComponent, TableComponent, DashboardSectionComponent, DashboardSectionContainerComponent, FilterContainerComponent, onClickReport, onChangeLoading, hideFilters, hideDateRangeFilter, hideXAxis, hideYAxis, hideCartesianGrid, comparisonLineStyle, containerStyle, className, chartContainerStyle, filters, onClickChartElement, dateBucket, }: DashboardProps): import("react/jsx-runtime").JSX.Element | null;
|
|
292
|
+
export default function Dashboard({ name, hidden, SelectComponent, MultiSelectComponent, EmptyDashboardComponent, DateRangePickerComponent, MetricComponent, ChartComponent, TableComponent, DashboardSectionComponent, DashboardSectionContainerComponent, FilterContainerComponent, onClickReport, onChangeLoading, hideFilters, hideDateRangeFilter, hideXAxis, hideYAxis, hideCartesianGrid, comparisonLineStyle, containerStyle, className, chartContainerStyle, filters, onClickChartElement, dateBucket, limit, }: DashboardProps): import("react/jsx-runtime").JSX.Element | null;
|
|
288
293
|
//# sourceMappingURL=Dashboard.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Dashboard.d.ts","sourceRoot":"","sources":["../../src/Dashboard.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Dashboard.d.ts","sourceRoot":"","sources":["../../src/Dashboard.tsx"],"names":[],"mappings":"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"}
|
package/dist/cjs/Dashboard.js
CHANGED
|
@@ -84,7 +84,7 @@ const defaultChartContainerStyles = {
|
|
|
84
84
|
* ### API Reference
|
|
85
85
|
* @see https://docs.quillsql.com/components/dashboard
|
|
86
86
|
*/
|
|
87
|
-
function Dashboard({ name, SelectComponent = QuillSelectWithCombo_1.QuillSelectComponentWithCombo, MultiSelectComponent = QuillMultiSelectWithCombo_1.QuillMultiSelectComponentWithCombo, EmptyDashboardComponent = UiComponents_1.QuillEmptyDashboardComponent, DateRangePickerComponent = QuillDateRangePicker_1.QuillDateRangePicker, MetricComponent = MetricComponent_1.default, ChartComponent = ChartComponent_1.default, TableComponent = TableComponent_1.default, DashboardSectionComponent = DashboardSection_1.default, DashboardSectionContainerComponent = DashboardSectionContainer_1.default, FilterContainerComponent = UiComponents_1.QuillFilterContainerComponent, onClickReport, onChangeLoading, hideFilters, hideDateRangeFilter = false, hideXAxis = false, hideYAxis = false, hideCartesianGrid = false, comparisonLineStyle = 'solid', containerStyle, className, chartContainerStyle = defaultChartContainerStyles, filters, onClickChartElement, dateBucket, }) {
|
|
87
|
+
function Dashboard({ name, hidden = false, SelectComponent = QuillSelectWithCombo_1.QuillSelectComponentWithCombo, MultiSelectComponent = QuillMultiSelectWithCombo_1.QuillMultiSelectComponentWithCombo, EmptyDashboardComponent = UiComponents_1.QuillEmptyDashboardComponent, DateRangePickerComponent = QuillDateRangePicker_1.QuillDateRangePicker, MetricComponent = MetricComponent_1.default, ChartComponent = ChartComponent_1.default, TableComponent = TableComponent_1.default, DashboardSectionComponent = DashboardSection_1.default, DashboardSectionContainerComponent = DashboardSectionContainer_1.default, FilterContainerComponent = UiComponents_1.QuillFilterContainerComponent, onClickReport, onChangeLoading, hideFilters, hideDateRangeFilter = false, hideXAxis = false, hideYAxis = false, hideCartesianGrid = false, comparisonLineStyle = 'solid', containerStyle, className, chartContainerStyle = defaultChartContainerStyles, filters, onClickChartElement, dateBucket, limit, }) {
|
|
88
88
|
const { dispatch } = (0, react_1.useContext)(Context_1.DashboardContext);
|
|
89
89
|
const { isLoading: isDataLoading, data, reload, } = (0, useDashboard_1.useDashboard)(name);
|
|
90
90
|
const [dashboardSections, setDashboardSections] = (0, react_1.useState)(null);
|
|
@@ -171,7 +171,7 @@ function Dashboard({ name, SelectComponent = QuillSelectWithCombo_1.QuillSelectC
|
|
|
171
171
|
dashboardFiltersDispatch({
|
|
172
172
|
type: 'ADD_DASHBOARD_FILTER',
|
|
173
173
|
id: 'date_range',
|
|
174
|
-
data: filter,
|
|
174
|
+
data: { ...filter, dashboardName: name },
|
|
175
175
|
});
|
|
176
176
|
}
|
|
177
177
|
bigFilterObj[filter.field] = filter;
|
|
@@ -186,6 +186,7 @@ function Dashboard({ name, SelectComponent = QuillSelectWithCombo_1.QuillSelectC
|
|
|
186
186
|
.filter((filter) => filter.filterType !== 'date')
|
|
187
187
|
.forEach((filter) => {
|
|
188
188
|
bigFilterObj[filter.field] = processFilter(filter);
|
|
189
|
+
bigFilterObj.dashboardName = name;
|
|
189
190
|
});
|
|
190
191
|
}
|
|
191
192
|
if ((0, crypto_1.hashCode)(JSON.stringify(dashboardFilters)) !==
|
|
@@ -201,7 +202,7 @@ function Dashboard({ name, SelectComponent = QuillSelectWithCombo_1.QuillSelectC
|
|
|
201
202
|
dashboardFiltersDispatch({
|
|
202
203
|
type: 'ADD_DASHBOARD_FILTER',
|
|
203
204
|
id: filter.field,
|
|
204
|
-
data: filter,
|
|
205
|
+
data: { ...filter, dashboardName: name },
|
|
205
206
|
});
|
|
206
207
|
});
|
|
207
208
|
}
|
|
@@ -283,6 +284,7 @@ function Dashboard({ name, SelectComponent = QuillSelectWithCombo_1.QuillSelectC
|
|
|
283
284
|
data: {
|
|
284
285
|
...filterWithoutSelectedValue,
|
|
285
286
|
...selectedValue,
|
|
287
|
+
dashboardName: name,
|
|
286
288
|
},
|
|
287
289
|
});
|
|
288
290
|
return;
|
|
@@ -344,6 +346,7 @@ function Dashboard({ name, SelectComponent = QuillSelectWithCombo_1.QuillSelectC
|
|
|
344
346
|
field: 'date_range',
|
|
345
347
|
options: filter.options,
|
|
346
348
|
label: 'Date',
|
|
349
|
+
dashboardName: name,
|
|
347
350
|
},
|
|
348
351
|
});
|
|
349
352
|
}
|
|
@@ -389,6 +392,8 @@ function Dashboard({ name, SelectComponent = QuillSelectWithCombo_1.QuillSelectC
|
|
|
389
392
|
const tables = (section) => dashboardSections[section]
|
|
390
393
|
.filter(({ chartType }) => chartType === 'table')
|
|
391
394
|
.sort(sortByOrdering);
|
|
395
|
+
if (hidden)
|
|
396
|
+
return null;
|
|
392
397
|
return ((0, jsx_runtime_1.jsxs)("div", { className: className, ...(0, styles_1.styleToProps)(containerStyle), children: [!hideFilters && sortedFilters.length > 0 && ((0, jsx_runtime_1.jsx)("div", { style: {
|
|
393
398
|
display: 'flex',
|
|
394
399
|
boxSizing: 'content-box',
|
|
@@ -411,9 +416,9 @@ function Dashboard({ name, SelectComponent = QuillSelectWithCombo_1.QuillSelectC
|
|
|
411
416
|
return ((0, jsx_runtime_1.jsx)(DataLoader_1.default, { id: item._id, children: ({ isLoading, error }) => ((0, jsx_runtime_1.jsx)(MetricComponent, { error: error, isLoading: isLoading, report: (0, dashboard_1.cleanDashboardItem)(dashboard[item._id] ?? item, dashboardFilters), onClick: !isLoading && onClickReport
|
|
412
417
|
? () => handleOnClickDashboardItem(item)
|
|
413
418
|
: undefined }, item.name + '' + index)) }, `${item.name}${index}`));
|
|
414
|
-
}) })), charts(section).length > 0 && ((0, jsx_runtime_1.jsx)(DashboardSectionComponent, { section: "charts", children: charts(section).map((item, index) => ((0, jsx_runtime_1.jsx)(DataLoader_1.ChartDataLoader, { id: item._id, hideDateRangeFilter: hideDateRangeFilter, children: ({ isLoading, data, error, }) => ((0, jsx_runtime_1.jsx)(ChartComponent, { report: (0, dashboard_1.cleanDashboardItem)(
|
|
419
|
+
}) })), charts(section).length > 0 && ((0, jsx_runtime_1.jsx)(DashboardSectionComponent, { section: "charts", children: charts(section).map((item, index) => ((0, jsx_runtime_1.jsx)(DataLoader_1.ChartDataLoader, { id: item._id, hideDateRangeFilter: hideDateRangeFilter, dateBucket: dateBucket, limit: limit, children: ({ isLoading, data, error, dateBucket, }) => ((0, jsx_runtime_1.jsx)(ChartComponent, { report: (0, dashboard_1.cleanDashboardItem)(data, dashboardFilters), error: error, onClick: !isLoading && onClickReport
|
|
415
420
|
? () => handleOnClickDashboardItem(item)
|
|
416
|
-
: undefined, onClickChartElement: onClickChartElement, isLoading: isLoading, children: (0, jsx_runtime_1.jsx)(Chart_1.default, { config: data, containerStyle: chartContainerStyle, colors: theme.chartColors?.length
|
|
421
|
+
: undefined, onClickChartElement: onClickChartElement, isLoading: isLoading, dateBucket: dateBucket, children: (0, jsx_runtime_1.jsx)(Chart_1.default, { config: data, containerStyle: chartContainerStyle, colors: theme.chartColors?.length
|
|
417
422
|
? theme.chartColors
|
|
418
423
|
: undefined, hideXAxis: hideXAxis, hideYAxis: hideYAxis, hideCartesianGrid: hideCartesianGrid, comparisonLineStyle: comparisonLineStyle, onClickChartElement: onClickChartElement, dateBucket: dateBucket }) }, item.name + '' + index)) }, `${item.name}${index}`))) })), tables(section).length > 0 && ((0, jsx_runtime_1.jsx)(DashboardSectionComponent, { section: "tables", children: tables(section).map((item, index) => ((0, jsx_runtime_1.jsx)(DataLoader_1.default, { id: item._id, children: ({ isLoading, error, onPageChange, onSortChange, }) => ((0, jsx_runtime_1.jsx)(TableComponent, { report: (0, dashboard_1.cleanDashboardItem)(dashboard[item._id] ?? item, dashboardFilters), isLoading: isLoading, error: error, onClick: !isLoading && onClickReport
|
|
419
424
|
? () => handleOnClickDashboardItem(item)
|
|
@@ -31,12 +31,15 @@ export type ChartDataLoaderChildProps = {
|
|
|
31
31
|
isLoading: boolean;
|
|
32
32
|
error?: string;
|
|
33
33
|
data?: any;
|
|
34
|
+
dateBucket?: string;
|
|
34
35
|
};
|
|
35
|
-
export declare const ChartDataLoader: ({ id, children, hideDateRangeFilter, }: {
|
|
36
|
+
export declare const ChartDataLoader: ({ id, children, hideDateRangeFilter, dateBucket, limit, }: {
|
|
36
37
|
id: string;
|
|
37
38
|
hideDateRangeFilter?: boolean | undefined;
|
|
39
|
+
dateBucket?: string | undefined;
|
|
38
40
|
mapColorsToFields?: ((_report: QuillReport, _theme: QuillTheme) => ColorMapType) | undefined;
|
|
39
|
-
|
|
41
|
+
limit?: number | undefined;
|
|
42
|
+
children: ({ isLoading, error, data, dateBucket, }: ChartDataLoaderChildProps) => JSX.Element;
|
|
40
43
|
}) => JSX.Element;
|
|
41
44
|
export {};
|
|
42
45
|
//# sourceMappingURL=DataLoader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataLoader.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DataLoader.tsx"],"names":[],"mappings":";AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAKjD,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,CAAC,IAAI,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAC3E,YAAY,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CACpE,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,EAAE,EACF,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,CAAC,EACT,SAAS,EACT,KAAK,EACL,YAAY,EACZ,YAAY,GACb,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;CACzC,GAAG,GAAG,CAAC,OAAO,CAmHd;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,CAAC,EAAE,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"DataLoader.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DataLoader.tsx"],"names":[],"mappings":";AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAKjD,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,CAAC,IAAI,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAC3E,YAAY,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CACpE,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,EAAE,EACF,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,CAAC,EACT,SAAS,EACT,KAAK,EACL,YAAY,EACZ,YAAY,GACb,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;CACzC,GAAG,GAAG,CAAC,OAAO,CAmHd;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,CAAC,EAAE,GAAG,CAAC;IACX,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAIF,eAAO,MAAM,eAAe;QAOtB,MAAM;;;mCAIC,WAAW,UACZ,UAAU,KACf,YAAY;;wDAOd,yBAAyB,KAAK,WAAW;MAC1C,WA6FH,CAAC"}
|
|
@@ -114,7 +114,7 @@ function DataLoader({ id, children, }) {
|
|
|
114
114
|
exports.default = DataLoader;
|
|
115
115
|
// The same data-loader pattern as above, but with special logic for charts
|
|
116
116
|
// At some point these may be able to get merged into one function.
|
|
117
|
-
const ChartDataLoader = ({ id, children, hideDateRangeFilter = false, }) => {
|
|
117
|
+
const ChartDataLoader = ({ id, children, hideDateRangeFilter = false, dateBucket, limit, }) => {
|
|
118
118
|
const { dispatch, dashboard } = (0, react_1.useContext)(Context_1.DashboardContext);
|
|
119
119
|
const { dashboardFilters } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
|
|
120
120
|
const [initialLoad, setInitialLoad] = (0, react_1.useState)(true);
|
|
@@ -155,6 +155,7 @@ const ChartDataLoader = ({ id, children, hideDateRangeFilter = false, }) => {
|
|
|
155
155
|
databaseType: client.databaseType,
|
|
156
156
|
filters: minimalFilters,
|
|
157
157
|
customFields,
|
|
158
|
+
runQueryConfig: limit ? { limitBy: limit } : undefined,
|
|
158
159
|
},
|
|
159
160
|
};
|
|
160
161
|
const cloudBody = {
|
|
@@ -189,11 +190,12 @@ const ChartDataLoader = ({ id, children, hideDateRangeFilter = false, }) => {
|
|
|
189
190
|
(0, react_1.useEffect)(() => {
|
|
190
191
|
setInitialLoad(false);
|
|
191
192
|
getChartOptions();
|
|
192
|
-
}, [dashboardFilters, client, id]);
|
|
193
|
+
}, [dashboardFilters, client, id, limit]);
|
|
193
194
|
return children({
|
|
194
195
|
isLoading: loading || initialLoad,
|
|
195
196
|
data: loading || initialLoad ? undefined : dashboard[id],
|
|
196
197
|
error,
|
|
198
|
+
dateBucket,
|
|
197
199
|
});
|
|
198
200
|
};
|
|
199
201
|
exports.ChartDataLoader = ChartDataLoader;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useQuill.d.ts","sourceRoot":"","sources":["../../../src/hooks/useQuill.ts"],"names":[],"mappings":"AAWA,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,UAAU,UAAU;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B;AAED,eAAO,MAAM,QAAQ,cACR,MAAM;UAEX,WAAW,GAAG,IAAI;aACf,OAAO;WACT,MAAM,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"useQuill.d.ts","sourceRoot":"","sources":["../../../src/hooks/useQuill.ts"],"names":[],"mappings":"AAWA,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,UAAU,UAAU;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B;AAED,eAAO,MAAM,QAAQ,cACR,MAAM;UAEX,WAAW,GAAG,IAAI;aACf,OAAO;WACT,MAAM,GAAG,IAAI;CA0FrB,CAAC"}
|
|
@@ -34,7 +34,10 @@ const useQuill = (reportId) => {
|
|
|
34
34
|
orgId: client.customerId || '*',
|
|
35
35
|
clientId: client.publicKey,
|
|
36
36
|
task: 'item',
|
|
37
|
-
filters: [
|
|
37
|
+
filters: [
|
|
38
|
+
...Object.values(dashboardFilters).filter((elem) => elem
|
|
39
|
+
?.dashboardName === data?.dashboardName),
|
|
40
|
+
],
|
|
38
41
|
databaseType: client?.databaseType,
|
|
39
42
|
customFields,
|
|
40
43
|
},
|
|
@@ -95,7 +95,7 @@ export declare function generatePivotTableYAxis(pivot: Pivot, cols: {
|
|
|
95
95
|
field: string;
|
|
96
96
|
label: string;
|
|
97
97
|
format: string;
|
|
98
|
-
}[];
|
|
98
|
+
}[] | null;
|
|
99
99
|
export declare function generatePivotTitle(pivot: Pivot): string;
|
|
100
100
|
export declare function isDateField(fieldType: string): boolean;
|
|
101
101
|
export declare function generatePivotTable(pivot: Pivot, data: any, dateRange: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PivotModal.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotModal.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"PivotModal.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotModal.tsx"],"names":[],"mappings":"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"}
|
|
@@ -503,24 +503,10 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
|
|
|
503
503
|
};
|
|
504
504
|
exports.PivotModal = PivotModal;
|
|
505
505
|
function generatePivotTableYAxis(pivot, cols, format) {
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
return cols.slice(1).map(({ field, label }) => ({ field, label, format }));
|
|
509
|
-
}
|
|
510
|
-
// For count aggregations, use 'count' for the label
|
|
511
|
-
if (pivot?.aggregationType === 'count') {
|
|
512
|
-
return [
|
|
513
|
-
{ field: pivot.valueField || 'count', label: 'count', format: format },
|
|
514
|
-
];
|
|
506
|
+
if (!pivot.columnField) {
|
|
507
|
+
return null;
|
|
515
508
|
}
|
|
516
|
-
|
|
517
|
-
return [
|
|
518
|
-
{
|
|
519
|
-
field: pivot.valueField,
|
|
520
|
-
label: '',
|
|
521
|
-
format: format,
|
|
522
|
-
},
|
|
523
|
-
];
|
|
509
|
+
return cols.slice(1).map(({ field, label }) => ({ field, label, format }));
|
|
524
510
|
}
|
|
525
511
|
exports.generatePivotTableYAxis = generatePivotTableYAxis;
|
|
526
512
|
function generatePivotTitle(pivot) {
|
|
@@ -654,24 +640,45 @@ function dayDifferenceToInterval(dayDifference, dateRange) {
|
|
|
654
640
|
return (0, date_fns_1.eachYearOfInterval)(dateRange);
|
|
655
641
|
}
|
|
656
642
|
}
|
|
657
|
-
function getDateString(value, dateRange) {
|
|
643
|
+
function getDateString(value, dateRange, dateBucket) {
|
|
658
644
|
let format;
|
|
659
|
-
if (
|
|
660
|
-
|
|
645
|
+
if (dateBucket) {
|
|
646
|
+
switch (dateBucket) {
|
|
647
|
+
case 'day':
|
|
648
|
+
format = 'MMM_dd';
|
|
649
|
+
break;
|
|
650
|
+
case 'week':
|
|
651
|
+
format = 'MMM_dd-MMM_dd';
|
|
652
|
+
break;
|
|
653
|
+
case 'month':
|
|
654
|
+
format = 'MMM_yyyy';
|
|
655
|
+
break;
|
|
656
|
+
case 'year':
|
|
657
|
+
format = 'yyyy';
|
|
658
|
+
break;
|
|
659
|
+
default:
|
|
660
|
+
format = 'MMM_yyyy';
|
|
661
|
+
break;
|
|
662
|
+
}
|
|
661
663
|
}
|
|
662
664
|
else {
|
|
663
|
-
|
|
664
|
-
if (dayDifference < 14) {
|
|
665
|
-
format = 'MMM_dd_yyyy';
|
|
666
|
-
}
|
|
667
|
-
else if (dayDifference < 60) {
|
|
668
|
-
format = 'MMM_dd-MMM_dd';
|
|
669
|
-
}
|
|
670
|
-
else if (dayDifference < 365 * 3) {
|
|
665
|
+
if (!dateRange) {
|
|
671
666
|
format = 'MMM_yyyy';
|
|
672
667
|
}
|
|
673
668
|
else {
|
|
674
|
-
|
|
669
|
+
const dayDifference = (0, date_fns_1.differenceInDays)(new Date(dateRange.end), new Date(dateRange.start));
|
|
670
|
+
if (dayDifference < 14) {
|
|
671
|
+
format = 'MMM_dd_yyyy';
|
|
672
|
+
}
|
|
673
|
+
else if (dayDifference < 60) {
|
|
674
|
+
format = 'MMM_dd-MMM_dd';
|
|
675
|
+
}
|
|
676
|
+
else if (dayDifference < 365 * 3) {
|
|
677
|
+
format = 'MMM_yyyy';
|
|
678
|
+
}
|
|
679
|
+
else {
|
|
680
|
+
format = 'yyyy';
|
|
681
|
+
}
|
|
675
682
|
}
|
|
676
683
|
}
|
|
677
684
|
return (0, valueFormatter_1.valueFormatter)({
|
|
@@ -761,12 +768,12 @@ function generatePivotTable(pivot, data, dateRange, isComparison, rowLimit = -1,
|
|
|
761
768
|
data.forEach((item) => {
|
|
762
769
|
if (isDateCol) {
|
|
763
770
|
const key = getDateString(item[col], dateRange);
|
|
764
|
-
const value = getDateString(item[`comparison_${col}`], dateRange);
|
|
771
|
+
const value = getDateString(item[`comparison_${col}`], dateRange, dateBucket);
|
|
765
772
|
COL_DATE_MAP[key] = value;
|
|
766
773
|
}
|
|
767
774
|
if (isDateRow) {
|
|
768
775
|
const key = getDateString(item[row], dateRange);
|
|
769
|
-
const value = getDateString(item[`comparison_${row}`], dateRange);
|
|
776
|
+
const value = getDateString(item[`comparison_${row}`], dateRange, dateBucket);
|
|
770
777
|
ROW_DATE_MAP[key] = value;
|
|
771
778
|
}
|
|
772
779
|
});
|
|
@@ -796,7 +803,7 @@ function generatePivotTable(pivot, data, dateRange, isComparison, rowLimit = -1,
|
|
|
796
803
|
rowsToGenerate.forEach((rowValue, rowIndex) => {
|
|
797
804
|
const row = {
|
|
798
805
|
[pivot.rowField]: isDateField(pivot.rowFieldType)
|
|
799
|
-
? getDateString(rowValue, dateRange)
|
|
806
|
+
? getDateString(rowValue, dateRange, dateBucket)
|
|
800
807
|
: rowValue === null
|
|
801
808
|
? 'Null'
|
|
802
809
|
: rowValue === false
|
|
@@ -1001,12 +1008,14 @@ function generatePivotTable(pivot, data, dateRange, isComparison, rowLimit = -1,
|
|
|
1001
1008
|
});
|
|
1002
1009
|
const columns = [
|
|
1003
1010
|
{
|
|
1004
|
-
label: pivot.rowField === null
|
|
1011
|
+
label: pivot.rowField === null
|
|
1012
|
+
? 'Null'
|
|
1013
|
+
: (0, textProcessing_1.snakeAndCamelCaseToTitleCase)(pivot.rowField),
|
|
1005
1014
|
field: pivot.rowField,
|
|
1006
1015
|
},
|
|
1007
1016
|
...uniqueColumns.map((column, index) => {
|
|
1008
1017
|
const columnName = isDateField(pivot.columnFieldType || '')
|
|
1009
|
-
? getDateString(column, dateRange)
|
|
1018
|
+
? getDateString(column, dateRange, dateBucket)
|
|
1010
1019
|
: column;
|
|
1011
1020
|
return {
|
|
1012
1021
|
label: column === null
|
|
@@ -1024,7 +1033,7 @@ function generatePivotTable(pivot, data, dateRange, isComparison, rowLimit = -1,
|
|
|
1024
1033
|
...(isComparison && pivot.columnField
|
|
1025
1034
|
? uniqueColumns.map((column, index) => {
|
|
1026
1035
|
const columnName = isDateField(pivot.columnFieldType || '')
|
|
1027
|
-
? getDateString(column, dateRange)
|
|
1036
|
+
? getDateString(column, dateRange, dateBucket)
|
|
1028
1037
|
: column;
|
|
1029
1038
|
return {
|
|
1030
1039
|
label: column === null
|
|
@@ -1036,8 +1045,7 @@ function generatePivotTable(pivot, data, dateRange, isComparison, rowLimit = -1,
|
|
|
1036
1045
|
index === 1
|
|
1037
1046
|
? 'Comparison Count'
|
|
1038
1047
|
: isDateField(pivot.columnFieldType || '')
|
|
1039
|
-
? COL_DATE_MAP[getDateString(column, dateRange)] ??
|
|
1040
|
-
'Comparison'
|
|
1048
|
+
? COL_DATE_MAP[getDateString(column, dateRange, dateBucket)] ?? 'Comparison'
|
|
1041
1049
|
: `comparison ${(0, textProcessing_1.snakeAndCamelCaseToTitleCase)(columnName)}`,
|
|
1042
1050
|
field: `comparison_${columnName}`,
|
|
1043
1051
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"axisFormatter.d.ts","sourceRoot":"","sources":["../../../src/utils/axisFormatter.ts"],"names":[],"mappings":"AAGA,KAAK,KAAK,GAAG;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,SAAS,CAAC;CACnB,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,GAAG,IAAI,CAAC;IACpD,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACjC,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,aAAa,8BAIvB,KAAK,KAAG,MAAM,GAAG,MAAM,GAAG,
|
|
1
|
+
{"version":3,"file":"axisFormatter.d.ts","sourceRoot":"","sources":["../../../src/utils/axisFormatter.ts"],"names":[],"mappings":"AAGA,KAAK,KAAK,GAAG;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,SAAS,CAAC;CACnB,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,GAAG,IAAI,CAAC;IACpD,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACjC,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,aAAa,8BAIvB,KAAK,KAAG,MAAM,GAAG,MAAM,GAAG,OAgC5B,CAAC"}
|
|
@@ -29,6 +29,7 @@ const axisFormatter = ({ value, field, fields, }) => {
|
|
|
29
29
|
MMM_yyyy: format_MMM_yyyy,
|
|
30
30
|
MMM_dd: format_MMM_dd,
|
|
31
31
|
MMM_dd_yyyy: format_MMM_dd_yyyy,
|
|
32
|
+
MMM_ww_yyyy: format_MMM_ww_yyyy,
|
|
32
33
|
hh_ap_pm: format_hh_ap_pm,
|
|
33
34
|
'MMM_dd-MMM_dd': format_MMM_dd_MMM_dd,
|
|
34
35
|
'MMM_dd_hh:mm_ap_pm': format_MMM_dd_hh_mm_ap_pm,
|
|
@@ -224,6 +225,19 @@ const format_MMM_dd_MMM_dd = (value) => {
|
|
|
224
225
|
return `${(0, date_fns_1.format)(monday, 'MMM dd')} - ${(0, date_fns_1.format)(sunday, 'MMM dd')}`;
|
|
225
226
|
}
|
|
226
227
|
};
|
|
228
|
+
const format_MMM_ww_yyyy = (value) => {
|
|
229
|
+
const utcDate = (0, date_fns_tz_1.utcToZonedTime)(new Date(value), 'UTC');
|
|
230
|
+
if (!(0, date_fns_1.isValid)(utcDate))
|
|
231
|
+
return 'Invalid date';
|
|
232
|
+
const currentDate = new Date();
|
|
233
|
+
const startOfWeekDate = (0, date_fns_1.startOfWeek)(utcDate, { weekStartsOn: 1 });
|
|
234
|
+
const endOfWeekDate = (0, date_fns_1.endOfWeek)(utcDate, { weekStartsOn: 1 });
|
|
235
|
+
const month = (0, date_fns_1.format)(utcDate, 'MMM');
|
|
236
|
+
const startDay = (0, date_fns_1.format)(startOfWeekDate, 'd');
|
|
237
|
+
const endDay = (0, date_fns_1.format)(endOfWeekDate, 'd');
|
|
238
|
+
const year = (0, date_fns_1.format)(utcDate, 'yyyy');
|
|
239
|
+
return `${month}, ${startDay}-${endDay}, ${year}`;
|
|
240
|
+
};
|
|
227
241
|
const format_MMM_dd_hh_mm_ap_pm = (value) => {
|
|
228
242
|
const utcDate = (0, date_fns_tz_1.utcToZonedTime)(new Date(value), 'UTC');
|
|
229
243
|
if (!(0, date_fns_1.isValid)(utcDate))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,WAAW,EAAE,MAAM,cAAc,CAAC;AA6BvD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,GACpB,WAAW,CAsCb"}
|
|
@@ -31,7 +31,6 @@ const defaultDashboardItem = {
|
|
|
31
31
|
* @param item
|
|
32
32
|
*/
|
|
33
33
|
function cleanDashboardItem(item, dashboardFilters) {
|
|
34
|
-
// console.log(item);
|
|
35
34
|
if (!item)
|
|
36
35
|
return defaultDashboardItem;
|
|
37
36
|
if (!item.rows)
|
|
@@ -55,7 +54,9 @@ function cleanDashboardItem(item, dashboardFilters) {
|
|
|
55
54
|
primaryAggregation,
|
|
56
55
|
comparisonAggregation,
|
|
57
56
|
aggregationPercentChange,
|
|
58
|
-
yAxisFields:
|
|
57
|
+
yAxisFields: pivotTable
|
|
58
|
+
? extractPivotedYAxis(pivotTable, item)
|
|
59
|
+
: item.yAxisFields,
|
|
59
60
|
xAxisLabel: item.xAxisLabel,
|
|
60
61
|
xAxisField: item.xAxisField,
|
|
61
62
|
xAxisFormat: item.xAxisFormat,
|
|
@@ -141,8 +142,10 @@ function extractPivotedData(pivotTable, item, config = undefined) {
|
|
|
141
142
|
*/
|
|
142
143
|
function extractPivotedYAxis(pivotTable, itemInfo, config = undefined) {
|
|
143
144
|
if (!pivotTable)
|
|
144
|
-
return [];
|
|
145
|
+
return itemInfo?.yAxisFields ?? [];
|
|
145
146
|
const pivot = itemInfo?.pivot || config?.pivot;
|
|
147
|
+
if (!pivot.columnField)
|
|
148
|
+
return itemInfo?.yAxisFields ?? [];
|
|
146
149
|
const yAxisFields = config ? config.yAxisFields : itemInfo?.yAxisFields;
|
|
147
150
|
const pivotTableYAxis = yAxisFields
|
|
148
151
|
? (0, PivotModal_1.generatePivotTableYAxis)(pivot, pivotTable.columns, yAxisFields?.[0]?.format)
|
|
@@ -157,7 +160,7 @@ function extractPivotedYAxis(pivotTable, itemInfo, config = undefined) {
|
|
|
157
160
|
fields[fields.length] = {
|
|
158
161
|
...sampleField,
|
|
159
162
|
field: `comparison_${sampleField.field}`,
|
|
160
|
-
label: `
|
|
163
|
+
label: `Comparison ${sampleField.label}`,
|
|
161
164
|
};
|
|
162
165
|
}
|
|
163
166
|
return fields;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AAAA,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,CAoB5D"}
|