@quillsql/react 2.12.18 → 2.12.20
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 +2 -1
- package/dist/cjs/Chart.d.ts.map +1 -1
- package/dist/cjs/Chart.js +117 -105
- package/dist/cjs/ChartBuilder.d.ts +4 -2
- package/dist/cjs/ChartBuilder.d.ts.map +1 -1
- package/dist/cjs/ChartBuilder.js +26 -11
- package/dist/cjs/ChartEditor.d.ts +1 -1
- package/dist/cjs/ChartEditor.d.ts.map +1 -1
- package/dist/cjs/ChartEditor.js +20 -12
- package/dist/cjs/Context.d.ts +0 -9
- package/dist/cjs/Context.d.ts.map +1 -1
- package/dist/cjs/Context.js +15 -43
- package/dist/cjs/Dashboard.d.ts +20 -3
- package/dist/cjs/Dashboard.d.ts.map +1 -1
- package/dist/cjs/Dashboard.js +64 -65
- package/dist/cjs/ReportBuilder.d.ts.map +1 -1
- package/dist/cjs/Table.d.ts.map +1 -1
- package/dist/cjs/Table.js +11 -4
- package/dist/cjs/components/Chart/BarChart.d.ts +2 -1
- package/dist/cjs/components/Chart/BarChart.d.ts.map +1 -1
- package/dist/cjs/components/Chart/BarChart.js +2 -2
- package/dist/cjs/components/Chart/ChartTooltip.d.ts +1 -0
- package/dist/cjs/components/Chart/ChartTooltip.d.ts.map +1 -1
- package/dist/cjs/components/Chart/ChartTooltip.js +3 -4
- package/dist/cjs/components/Chart/LineChart.d.ts +2 -1
- package/dist/cjs/components/Chart/LineChart.d.ts.map +1 -1
- package/dist/cjs/components/Chart/LineChart.js +2 -2
- package/dist/cjs/components/Dashboard/ChartComponent.d.ts +1 -1
- package/dist/cjs/components/Dashboard/ChartComponent.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/ChartComponent.js +10 -4
- package/dist/cjs/components/Dashboard/DashboardFilter.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/DashboardFilter.js +3 -18
- package/dist/cjs/components/Dashboard/DataLoader.d.ts +7 -4
- package/dist/cjs/components/Dashboard/DataLoader.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/DataLoader.js +47 -32
- package/dist/cjs/components/Dashboard/MetricComponent.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/MetricComponent.js +27 -43
- package/dist/cjs/components/Dashboard/TableComponent.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/TableComponent.js +25 -52
- package/dist/cjs/hooks/useDashboard.d.ts.map +1 -1
- package/dist/cjs/hooks/useDashboard.js +3 -2
- package/dist/cjs/hooks/useQuill.d.ts +7 -0
- package/dist/cjs/hooks/useQuill.d.ts.map +1 -1
- package/dist/cjs/hooks/useQuill.js +43 -4
- package/dist/cjs/index.d.ts +1 -1
- package/dist/cjs/index.d.ts.map +1 -1
- package/dist/cjs/index.js +2 -1
- package/dist/cjs/internals/ReportBuilder/PivotList.d.ts.map +1 -1
- package/dist/cjs/internals/ReportBuilder/PivotModal.d.ts +8 -3
- package/dist/cjs/internals/ReportBuilder/PivotModal.d.ts.map +1 -1
- package/dist/cjs/internals/ReportBuilder/PivotModal.js +24 -12
- package/dist/cjs/utils/aggregate.d.ts.map +1 -1
- package/dist/cjs/utils/aggregate.js +0 -4
- package/dist/cjs/utils/dashboard.d.ts +2 -2
- package/dist/cjs/utils/dashboard.d.ts.map +1 -1
- package/dist/cjs/utils/dashboard.js +16 -11
- package/dist/cjs/utils/dates.d.ts.map +1 -1
- package/dist/cjs/utils/dates.js +7 -4
- package/dist/esm/Chart.d.ts +2 -1
- package/dist/esm/Chart.d.ts.map +1 -1
- package/dist/esm/Chart.js +116 -105
- package/dist/esm/ChartBuilder.d.ts +4 -2
- package/dist/esm/ChartBuilder.d.ts.map +1 -1
- package/dist/esm/ChartBuilder.js +27 -12
- package/dist/esm/ChartEditor.d.ts +1 -1
- package/dist/esm/ChartEditor.d.ts.map +1 -1
- package/dist/esm/ChartEditor.js +21 -13
- package/dist/esm/Context.d.ts +0 -9
- package/dist/esm/Context.d.ts.map +1 -1
- package/dist/esm/Context.js +14 -40
- package/dist/esm/Dashboard.d.ts +20 -3
- package/dist/esm/Dashboard.d.ts.map +1 -1
- package/dist/esm/Dashboard.js +66 -67
- package/dist/esm/ReportBuilder.d.ts.map +1 -1
- package/dist/esm/Table.d.ts.map +1 -1
- package/dist/esm/Table.js +12 -5
- package/dist/esm/components/Chart/BarChart.d.ts +2 -1
- package/dist/esm/components/Chart/BarChart.d.ts.map +1 -1
- package/dist/esm/components/Chart/BarChart.js +2 -2
- package/dist/esm/components/Chart/ChartTooltip.d.ts +1 -0
- package/dist/esm/components/Chart/ChartTooltip.d.ts.map +1 -1
- package/dist/esm/components/Chart/ChartTooltip.js +3 -4
- package/dist/esm/components/Chart/LineChart.d.ts +2 -1
- package/dist/esm/components/Chart/LineChart.d.ts.map +1 -1
- package/dist/esm/components/Chart/LineChart.js +2 -2
- package/dist/esm/components/Dashboard/ChartComponent.d.ts +1 -1
- package/dist/esm/components/Dashboard/ChartComponent.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/ChartComponent.js +7 -4
- package/dist/esm/components/Dashboard/DashboardFilter.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/DashboardFilter.js +3 -18
- package/dist/esm/components/Dashboard/DataLoader.d.ts +7 -4
- package/dist/esm/components/Dashboard/DataLoader.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/DataLoader.js +48 -33
- package/dist/esm/components/Dashboard/MetricComponent.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/MetricComponent.js +28 -44
- package/dist/esm/components/Dashboard/TableComponent.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/TableComponent.js +26 -53
- package/dist/esm/hooks/useDashboard.d.ts.map +1 -1
- package/dist/esm/hooks/useDashboard.js +3 -2
- package/dist/esm/hooks/useQuill.d.ts +7 -0
- package/dist/esm/hooks/useQuill.d.ts.map +1 -1
- package/dist/esm/hooks/useQuill.js +41 -3
- package/dist/esm/index.d.ts +1 -1
- package/dist/esm/index.d.ts.map +1 -1
- package/dist/esm/index.js +1 -1
- package/dist/esm/internals/ReportBuilder/PivotList.d.ts.map +1 -1
- package/dist/esm/internals/ReportBuilder/PivotList.js +1 -1
- package/dist/esm/internals/ReportBuilder/PivotModal.d.ts +8 -3
- package/dist/esm/internals/ReportBuilder/PivotModal.d.ts.map +1 -1
- package/dist/esm/internals/ReportBuilder/PivotModal.js +24 -12
- package/dist/esm/utils/aggregate.d.ts.map +1 -1
- package/dist/esm/utils/aggregate.js +0 -4
- package/dist/esm/utils/dashboard.d.ts +2 -2
- package/dist/esm/utils/dashboard.d.ts.map +1 -1
- package/dist/esm/utils/dashboard.js +16 -11
- package/dist/esm/utils/dates.d.ts.map +1 -1
- package/dist/esm/utils/dates.js +7 -4
- package/package.json +1 -1
|
@@ -193,5 +193,5 @@ export interface ChartEditorProps {
|
|
|
193
193
|
* ### Chart Editor API
|
|
194
194
|
* @see https://docs.quillsql.com/components/chart-editor
|
|
195
195
|
*/
|
|
196
|
-
export default function ChartEditor({ isOpen, reportId, isAdmin, destinationDashboard, chartBuilderTitle, chartBuilderButtonLabel, onAddToDashboardComplete, organizationName, isHorizontalView, onDelete, setIsOpen, SelectComponent, TextInputComponent, ButtonComponent, SecondaryButtonComponent, HeaderComponent, SubHeaderComponent, LabelComponent, TextComponent, DeleteButtonComponent, ModalComponent, CardComponent, PopoverComponent, LoadingComponent, TableComponent, ChartBuilderInputRowContainer, ChartBuilderInputColumnContainer, PivotRowContainer, PivotColumnContainer, ErrorMessageComponent, ChartBuilderFormContainer, hideDeleteButton, hideSubmitButton, onClickChartElement }: ChartEditorProps): import("react/jsx-runtime").JSX.Element;
|
|
196
|
+
export default function ChartEditor({ isOpen, reportId, isAdmin, destinationDashboard, chartBuilderTitle, chartBuilderButtonLabel, onAddToDashboardComplete, organizationName, isHorizontalView, onDelete, setIsOpen, SelectComponent, TextInputComponent, ButtonComponent, SecondaryButtonComponent, HeaderComponent, SubHeaderComponent, LabelComponent, TextComponent, DeleteButtonComponent, ModalComponent, CardComponent, PopoverComponent, LoadingComponent, TableComponent, ChartBuilderInputRowContainer, ChartBuilderInputColumnContainer, PivotRowContainer, PivotColumnContainer, ErrorMessageComponent, ChartBuilderFormContainer, hideDeleteButton, hideSubmitButton, onClickChartElement, }: ChartEditorProps): import("react/jsx-runtime").JSX.Element;
|
|
197
197
|
//# sourceMappingURL=ChartEditor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChartEditor.d.ts","sourceRoot":"","sources":["../../src/ChartEditor.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EACZ,SAAS,
|
|
1
|
+
{"version":3,"file":"ChartEditor.d.ts","sourceRoot":"","sources":["../../src/ChartEditor.tsx"],"names":[],"mappings":"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"}
|
package/dist/esm/ChartEditor.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
2
|
/* eslint-disable no-unused-vars */
|
|
3
|
-
import { useContext, useEffect, useRef, useState, } from 'react';
|
|
3
|
+
import { useContext, useEffect, useMemo, useRef, useState, } from 'react';
|
|
4
4
|
import ChartBuilder from './ChartBuilder';
|
|
5
5
|
import { DashboardContext, DashboardFiltersContext, ClientContext, CustomFieldContext, } from './Context';
|
|
6
6
|
import { MemoizedModal, QuillChartBuilderFormContainer, QuillChartBuilderInputColumnContainer, QuillChartBuilderInputRowContainer, QuillErrorMessageComponent, QuillLoadingComponent, QuillPivotColumnContainer, QuillPivotRowContainer, QuillTableComponent, } from './components/UiComponents';
|
|
@@ -8,6 +8,7 @@ import { getData } from './utils/dataFetcher';
|
|
|
8
8
|
import { mergeComparisonRange } from './utils/merge';
|
|
9
9
|
import { QuillCard } from './components/QuillCard';
|
|
10
10
|
import { processFilterErrorList } from './utils/errorProcessing';
|
|
11
|
+
import { cleanDashboardItem } from './utils/dashboard';
|
|
11
12
|
/**
|
|
12
13
|
* ### Quill Chart Editor
|
|
13
14
|
*
|
|
@@ -34,12 +35,17 @@ import { processFilterErrorList } from './utils/errorProcessing';
|
|
|
34
35
|
* ### Chart Editor API
|
|
35
36
|
* @see https://docs.quillsql.com/components/chart-editor
|
|
36
37
|
*/
|
|
37
|
-
export default function ChartEditor({ isOpen, reportId, isAdmin = false, destinationDashboard, chartBuilderTitle = 'Edit chart', chartBuilderButtonLabel, onAddToDashboardComplete, organizationName, isHorizontalView = true, onDelete, setIsOpen, SelectComponent, TextInputComponent, ButtonComponent, SecondaryButtonComponent, HeaderComponent, SubHeaderComponent, LabelComponent, TextComponent, DeleteButtonComponent, ModalComponent = MemoizedModal, CardComponent = QuillCard, PopoverComponent, LoadingComponent = QuillLoadingComponent, TableComponent = QuillTableComponent, ChartBuilderInputRowContainer = QuillChartBuilderInputRowContainer, ChartBuilderInputColumnContainer = QuillChartBuilderInputColumnContainer, PivotRowContainer = QuillPivotRowContainer, PivotColumnContainer = QuillPivotColumnContainer, ErrorMessageComponent = QuillErrorMessageComponent, ChartBuilderFormContainer = QuillChartBuilderFormContainer, hideDeleteButton = false, hideSubmitButton = false, onClickChartElement }) {
|
|
38
|
+
export default function ChartEditor({ isOpen, reportId, isAdmin = false, destinationDashboard, chartBuilderTitle = 'Edit chart', chartBuilderButtonLabel, onAddToDashboardComplete, organizationName, isHorizontalView = true, onDelete, setIsOpen, SelectComponent, TextInputComponent, ButtonComponent, SecondaryButtonComponent, HeaderComponent, SubHeaderComponent, LabelComponent, TextComponent, DeleteButtonComponent, ModalComponent = MemoizedModal, CardComponent = QuillCard, PopoverComponent, LoadingComponent = QuillLoadingComponent, TableComponent = QuillTableComponent, ChartBuilderInputRowContainer = QuillChartBuilderInputRowContainer, ChartBuilderInputColumnContainer = QuillChartBuilderInputColumnContainer, PivotRowContainer = QuillPivotRowContainer, PivotColumnContainer = QuillPivotColumnContainer, ErrorMessageComponent = QuillErrorMessageComponent, ChartBuilderFormContainer = QuillChartBuilderFormContainer, hideDeleteButton = false, hideSubmitButton = false, onClickChartElement, }) {
|
|
38
39
|
const parentRef = useRef(null);
|
|
39
40
|
const [modalWidth, setModalWidth] = useState(200);
|
|
40
41
|
const [modalHeight, setModalHeight] = useState(200);
|
|
41
42
|
const { dispatch, dashboard } = useContext(DashboardContext);
|
|
42
43
|
const { dashboardFilters } = useContext(DashboardFiltersContext);
|
|
44
|
+
const specificDashboardFilter = useMemo(() => {
|
|
45
|
+
return dashboardFilters.filter((f) => f &&
|
|
46
|
+
dashboard?.[reportId] &&
|
|
47
|
+
dashboard?.[reportId].dashboardName === f.dashboardName);
|
|
48
|
+
}, [dashboardFilters]);
|
|
43
49
|
const [client, _] = useContext(ClientContext);
|
|
44
50
|
const [dashboardItem, setDashboardItem] = useState(dashboard?.[reportId]);
|
|
45
51
|
const [isLoading, setIsLoading] = useState(false);
|
|
@@ -47,7 +53,7 @@ export default function ChartEditor({ isOpen, reportId, isAdmin = false, destina
|
|
|
47
53
|
const [numberOfRows, setNumberOfRows] = useState(undefined);
|
|
48
54
|
const [previousPage, setPreviousPage] = useState(0);
|
|
49
55
|
const [customFields] = useContext(CustomFieldContext);
|
|
50
|
-
const dateFilter = Object.values(
|
|
56
|
+
const dateFilter = Object.values(specificDashboardFilter).find((filter) => filter.filterType == 'date_range');
|
|
51
57
|
const dateRange = dateFilter?.startDate
|
|
52
58
|
? { start: dateFilter.startDate, end: dateFilter.endDate }
|
|
53
59
|
: undefined;
|
|
@@ -98,8 +104,8 @@ export default function ChartEditor({ isOpen, reportId, isAdmin = false, destina
|
|
|
98
104
|
}
|
|
99
105
|
updatedProcessing.page.currentPage = 0;
|
|
100
106
|
}
|
|
101
|
-
const minimalFilters = Object.values(
|
|
102
|
-
? Object.values(
|
|
107
|
+
const minimalFilters = Object.values(specificDashboardFilter).length
|
|
108
|
+
? Object.values(specificDashboardFilter).map((filter) => {
|
|
103
109
|
const newFilter = { ...filter };
|
|
104
110
|
if (newFilter.filterType === 'date_range') {
|
|
105
111
|
delete newFilter['field'];
|
|
@@ -140,17 +146,16 @@ export default function ChartEditor({ isOpen, reportId, isAdmin = false, destina
|
|
|
140
146
|
}
|
|
141
147
|
}
|
|
142
148
|
}
|
|
143
|
-
|
|
149
|
+
const dashboardItem = {
|
|
144
150
|
...resp,
|
|
145
|
-
filtersApplied:
|
|
146
|
-
}
|
|
151
|
+
filtersApplied: specificDashboardFilter,
|
|
152
|
+
};
|
|
153
|
+
const cleanedReport = cleanDashboardItem(dashboardItem, specificDashboardFilter);
|
|
154
|
+
setDashboardItem(cleanedReport);
|
|
147
155
|
dispatch({
|
|
148
156
|
type: 'UPDATE_DASHBOARD_ITEM',
|
|
149
157
|
id: reportId,
|
|
150
|
-
data:
|
|
151
|
-
...resp,
|
|
152
|
-
filtersApplied: dashboardFilters,
|
|
153
|
-
},
|
|
158
|
+
data: cleanedReport,
|
|
154
159
|
});
|
|
155
160
|
}
|
|
156
161
|
setTimeout(() => {
|
|
@@ -185,5 +190,8 @@ export default function ChartEditor({ isOpen, reportId, isAdmin = false, destina
|
|
|
185
190
|
return (_jsx("div", { ref: parentRef, style: { height: '100%' }, children: _jsx(ModalComponent, { isOpen: isOpen, setIsOpen: setIsOpen, title: chartBuilderTitle || 'Add to dashboard',
|
|
186
191
|
// For isHorizontalView, use full viewport size minus 80px for padding,
|
|
187
192
|
// otherwise use the default layout method of the modal (contents).
|
|
188
|
-
width: isHorizontalView ? modalWidth : undefined, height: isHorizontalView ? modalHeight : undefined, children: _jsx(ChartBuilder, { report: dashboardItem, rows: dashboardItem.rows, columns: dashboardItem.columns, query: dashboardItem.queryString, pivot: dashboardItem.pivot, isOpen: isOpen, isLoading: isLoading, setIsOpen: setIsOpen, showTableFormatOptions: isAdmin, showDateFieldOptions: isAdmin, showAccessControlOptions: isAdmin, showDashboardDropdown: isAdmin, destinationDashboard: destinationDashboard, onAddToDashboardComplete: onAddToDashboardComplete, dateRange: dateRange, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, ButtonComponent: ButtonComponent, SecondaryButtonComponent: SecondaryButtonComponent, HeaderComponent: HeaderComponent, SubHeaderComponent: SubHeaderComponent, LabelComponent: LabelComponent, TextComponent: TextComponent, DeleteButtonComponent: DeleteButtonComponent, CardComponent: CardComponent, ModalComponent: ModalComponent, isHorizontalView: isHorizontalView, PopoverComponent: PopoverComponent, TableComponent: TableComponent, ChartBuilderInputRowContainer: ChartBuilderInputRowContainer, ChartBuilderInputColumnContainer: ChartBuilderInputColumnContainer, PivotRowContainer: PivotRowContainer, PivotColumnContainer: PivotColumnContainer, ErrorMessageComponent: ErrorMessageComponent, LoadingComponent: LoadingComponent, onDelete: onDelete, title: chartBuilderTitle, buttonLabel: chartBuilderButtonLabel, organizationName: organizationName, hideSubmitButton: hideSubmitButton, hideDeleteButton: hideDeleteButton, FormContainer: ChartBuilderFormContainer, onPageChange: onPageChange, onSortChange: onSortChange, numberOfRows: numberOfRows, onClickChartElement: onClickChartElement
|
|
193
|
+
width: isHorizontalView ? modalWidth : undefined, height: isHorizontalView ? modalHeight : undefined, children: _jsx(ChartBuilder, { report: dashboardItem, rows: dashboardItem.rows, columns: dashboardItem.columns, query: dashboardItem.queryString, pivot: dashboardItem.pivot, isOpen: isOpen, isComparison: dateFilter?.comparisonRange, isLoading: isLoading, setIsOpen: setIsOpen, showTableFormatOptions: isAdmin, showDateFieldOptions: isAdmin, showAccessControlOptions: isAdmin, showDashboardDropdown: isAdmin, destinationDashboard: destinationDashboard, onAddToDashboardComplete: onAddToDashboardComplete, dateRange: dateRange, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, ButtonComponent: ButtonComponent, SecondaryButtonComponent: SecondaryButtonComponent, HeaderComponent: HeaderComponent, SubHeaderComponent: SubHeaderComponent, LabelComponent: LabelComponent, TextComponent: TextComponent, DeleteButtonComponent: DeleteButtonComponent, CardComponent: CardComponent, ModalComponent: ModalComponent, isHorizontalView: isHorizontalView, PopoverComponent: PopoverComponent, TableComponent: TableComponent, ChartBuilderInputRowContainer: ChartBuilderInputRowContainer, ChartBuilderInputColumnContainer: ChartBuilderInputColumnContainer, PivotRowContainer: PivotRowContainer, PivotColumnContainer: PivotColumnContainer, ErrorMessageComponent: ErrorMessageComponent, LoadingComponent: LoadingComponent, onDelete: onDelete, title: chartBuilderTitle, buttonLabel: chartBuilderButtonLabel, organizationName: organizationName, hideSubmitButton: hideSubmitButton, hideDeleteButton: hideDeleteButton, FormContainer: ChartBuilderFormContainer, onPageChange: onPageChange, onSortChange: onSortChange, numberOfRows: numberOfRows, onClickChartElement: onClickChartElement, pivotData: {
|
|
194
|
+
rows: dashboardItem.pivotRows,
|
|
195
|
+
columns: dashboardItem.pivotColumns,
|
|
196
|
+
} }) }) }));
|
|
189
197
|
}
|
package/dist/esm/Context.d.ts
CHANGED
|
@@ -24,14 +24,5 @@ export declare const useChartDateFilters: () => {
|
|
|
24
24
|
getChartDateFilterById: (id: string) => any;
|
|
25
25
|
setChartDateFilter: (id: string, dateFilter: any) => void;
|
|
26
26
|
};
|
|
27
|
-
export declare const ComparisonRangeContext: React.Context<any>;
|
|
28
|
-
export declare const useDateFilter: () => {
|
|
29
|
-
dateFilter: any;
|
|
30
|
-
setDateFilter: any;
|
|
31
|
-
};
|
|
32
|
-
export declare const useComparisonRange: () => {
|
|
33
|
-
comparisonRange: any;
|
|
34
|
-
setComparisonRange: any;
|
|
35
|
-
};
|
|
36
27
|
export declare const ContextProvider: ({ children, initialTheme, publicKey, environment, authToken, customerId, userId, queryEndpoint, queryHeaders, withCredentials, }: any) => import("react/jsx-runtime").JSX.Element | null;
|
|
37
28
|
//# sourceMappingURL=Context.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../src/Context.tsx"],"names":[],"mappings":"AAAA,OAAO,KAMN,MAAM,OAAO,CAAC;AAMf,eAAO,MAAM,iBAAiB,oBAAwC,CAAC;AACvE,eAAO,MAAM,aAAa,oBAAwC,CAAC;AACnE,eAAO,MAAM,kBAAkB,oBAAwC,CAAC;AACxE,eAAO,MAAM,cAAc,oBAA0C,CAAC;AACtE,eAAO,MAAM,WAAW,oBAA0C,CAAC;AACnE,eAAO,MAAM,2BAA2B,oBAAuC,CAAC;AAChF,eAAO,MAAM,cAAc,oBAAwC,CAAC;AACpE,eAAO,MAAM,mBAAmB,oBAAwC,CAAC;AACzE,eAAO,MAAM,2BAA2B,oBAGtC,CAAC;AACH,eAAO,MAAM,kBAAkB,oBAAwC,CAAC;AACxE,eAAO,MAAM,YAAY,oBAA0C,CAAC;AACpE,eAAO,MAAM,aAAa,oBAA0C,CAAC;AACrE,eAAO,MAAM,sCAAsC,oBAGjD,CAAC;AACH,eAAO,MAAM,0BAA0B,oBAGrC,CAAC;AACH,eAAO,MAAM,0BAA0B,oBAGrC,CAAC;AACH,eAAO,MAAM,oCAAoC,oBAG/C,CAAC;AACH,eAAO,MAAM,yBAAyB,oBAAwC,CAAC;AAC/E,eAAO,MAAM,wBAAwB,oBAAwC,CAAC;AAC9E,eAAO,MAAM,gBAAgB,oBAAwC,CAAC;AACtE,eAAO,MAAM,uBAAuB,oBAAwC,CAAC;AAC7E,eAAO,MAAM,uBAAuB,oBAAwC,CAAC;AAE7E,eAAO,MAAM,mBAAmB;iCAKM,MAAM;6BACV,MAAM,cAAc,GAAG;CAQxD,CAAC;
|
|
1
|
+
{"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../src/Context.tsx"],"names":[],"mappings":"AAAA,OAAO,KAMN,MAAM,OAAO,CAAC;AAMf,eAAO,MAAM,iBAAiB,oBAAwC,CAAC;AACvE,eAAO,MAAM,aAAa,oBAAwC,CAAC;AACnE,eAAO,MAAM,kBAAkB,oBAAwC,CAAC;AACxE,eAAO,MAAM,cAAc,oBAA0C,CAAC;AACtE,eAAO,MAAM,WAAW,oBAA0C,CAAC;AACnE,eAAO,MAAM,2BAA2B,oBAAuC,CAAC;AAChF,eAAO,MAAM,cAAc,oBAAwC,CAAC;AACpE,eAAO,MAAM,mBAAmB,oBAAwC,CAAC;AACzE,eAAO,MAAM,2BAA2B,oBAGtC,CAAC;AACH,eAAO,MAAM,kBAAkB,oBAAwC,CAAC;AACxE,eAAO,MAAM,YAAY,oBAA0C,CAAC;AACpE,eAAO,MAAM,aAAa,oBAA0C,CAAC;AACrE,eAAO,MAAM,sCAAsC,oBAGjD,CAAC;AACH,eAAO,MAAM,0BAA0B,oBAGrC,CAAC;AACH,eAAO,MAAM,0BAA0B,oBAGrC,CAAC;AACH,eAAO,MAAM,oCAAoC,oBAG/C,CAAC;AACH,eAAO,MAAM,yBAAyB,oBAAwC,CAAC;AAC/E,eAAO,MAAM,wBAAwB,oBAAwC,CAAC;AAC9E,eAAO,MAAM,gBAAgB,oBAAwC,CAAC;AACtE,eAAO,MAAM,uBAAuB,oBAAwC,CAAC;AAC7E,eAAO,MAAM,uBAAuB,oBAAwC,CAAC;AAE7E,eAAO,MAAM,mBAAmB;iCAKM,MAAM;6BACV,MAAM,cAAc,GAAG;CAQxD,CAAC;AAkDF,eAAO,MAAM,eAAe,qIAWzB,GAAG,mDAuPL,CAAC"}
|
package/dist/esm/Context.js
CHANGED
|
@@ -36,7 +36,7 @@ export const EditVisualizationModalVisibleContext = createContext([
|
|
|
36
36
|
export const ReportBuilderQueryContext = createContext(['', dummySetter]);
|
|
37
37
|
export const SavedReportsQueryContext = createContext(['', dummySetter]);
|
|
38
38
|
export const DashboardContext = createContext([{}, dummySetter]);
|
|
39
|
-
export const DashboardFiltersContext = createContext([
|
|
39
|
+
export const DashboardFiltersContext = createContext([[], dummySetter]);
|
|
40
40
|
export const ChartDateFiltersContext = createContext([{}, dummySetter]);
|
|
41
41
|
export const useChartDateFilters = () => {
|
|
42
42
|
const { chartDateFilters, setChartDateFilters } = useContext(ChartDateFiltersContext);
|
|
@@ -49,15 +49,6 @@ export const useChartDateFilters = () => {
|
|
|
49
49
|
setChartDateFilter,
|
|
50
50
|
};
|
|
51
51
|
};
|
|
52
|
-
export const ComparisonRangeContext = createContext(null);
|
|
53
|
-
export const useDateFilter = () => {
|
|
54
|
-
const { dateFilter, setDateFilter } = useContext(DateFilterContext);
|
|
55
|
-
return { dateFilter, setDateFilter };
|
|
56
|
-
};
|
|
57
|
-
export const useComparisonRange = () => {
|
|
58
|
-
const { comparisonRange, setComparisonRange } = useContext(ComparisonRangeContext);
|
|
59
|
-
return { comparisonRange, setComparisonRange };
|
|
60
|
-
};
|
|
61
52
|
const dashboardReducer = (state, action) => {
|
|
62
53
|
switch (action.type) {
|
|
63
54
|
case 'UPDATE_DASHBOARD_ITEM':
|
|
@@ -82,29 +73,20 @@ const dashboardReducer = (state, action) => {
|
|
|
82
73
|
const dashboardFiltersReducer = (state, action) => {
|
|
83
74
|
switch (action.type) {
|
|
84
75
|
case 'UPDATE_DASHBOARD_FILTER':
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
},
|
|
91
|
-
};
|
|
76
|
+
const index = state.findIndex((filter) => filter.field === action.data.field &&
|
|
77
|
+
filter.dashboardName === action.data.dashboardName);
|
|
78
|
+
if (index === -1)
|
|
79
|
+
return state;
|
|
80
|
+
return [...state.slice(0, index), action.data, ...state.slice(index + 1)];
|
|
92
81
|
case 'ADD_DASHBOARD_FILTERS':
|
|
93
|
-
return
|
|
94
|
-
...action.data,
|
|
95
|
-
};
|
|
96
|
-
case 'UPDATE_DASHBOARD_FILTERS':
|
|
97
|
-
return {
|
|
98
|
-
...state,
|
|
99
|
-
...action.data,
|
|
100
|
-
};
|
|
82
|
+
return [...state, ...action.data];
|
|
101
83
|
case 'ADD_DASHBOARD_FILTER':
|
|
102
|
-
return
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
84
|
+
return [...state, action.data];
|
|
85
|
+
case 'CLEAR_AND_ADD_DASHBOARD_FILTERS':
|
|
86
|
+
const newFilters = state.filter((filter) => filter.dashboardName !== action.dashboardName);
|
|
87
|
+
return [...newFilters, ...action.data];
|
|
106
88
|
case 'CLEAR_DASHBOARD_FILTERS':
|
|
107
|
-
return
|
|
89
|
+
return [];
|
|
108
90
|
default:
|
|
109
91
|
return state;
|
|
110
92
|
}
|
|
@@ -129,9 +111,7 @@ export const ContextProvider = ({ children, initialTheme, publicKey, environment
|
|
|
129
111
|
const [queryResultsLoading, setQueryResultsLoading] = useState(false);
|
|
130
112
|
const [editVisualizationModalVisible, setEditVisualizationModalVisible] = useState(false);
|
|
131
113
|
const [dashboard, dispatch] = useReducer(dashboardReducer, {});
|
|
132
|
-
const [dashboardFilters, dashboardFiltersDispatch] = useReducer(dashboardFiltersReducer,
|
|
133
|
-
const [dateFilter, setDateFilter] = useState(null);
|
|
134
|
-
const [comparisonRange, setComparisonRange] = useState(null);
|
|
114
|
+
const [dashboardFilters, dashboardFiltersDispatch] = useReducer(dashboardFiltersReducer, []);
|
|
135
115
|
const customFieldHelper = async (client) => {
|
|
136
116
|
const customFields = await getCustomFieldInfo(client, 'context');
|
|
137
117
|
setCustomFields(customFields);
|
|
@@ -274,11 +254,5 @@ export const ContextProvider = ({ children, initialTheme, publicKey, environment
|
|
|
274
254
|
], children: _jsx(DashboardContext.Provider, { value: { dashboard, dispatch }, children: _jsx(DashboardFiltersContext.Provider, { value: {
|
|
275
255
|
dashboardFilters,
|
|
276
256
|
dashboardFiltersDispatch,
|
|
277
|
-
}, children:
|
|
278
|
-
dateFilter,
|
|
279
|
-
setDateFilter,
|
|
280
|
-
}, children: _jsx(ComparisonRangeContext.Provider, { value: {
|
|
281
|
-
comparisonRange,
|
|
282
|
-
setComparisonRange,
|
|
283
|
-
}, children: children }) }) }) }) }) }) }) }) }) }) }) }) }) }) }) }) }) }) }) }) }));
|
|
257
|
+
}, children: children }) }) }) }) }) }) }) }) }) }) }) }) }) }) }) }) }) }) }));
|
|
284
258
|
};
|
package/dist/esm/Dashboard.d.ts
CHANGED
|
@@ -117,6 +117,21 @@ export interface QuillReport {
|
|
|
117
117
|
direction: string;
|
|
118
118
|
};
|
|
119
119
|
}
|
|
120
|
+
export interface QuillReportInternal extends QuillReport {
|
|
121
|
+
/** The pivot row info. */
|
|
122
|
+
pivotRows?: {
|
|
123
|
+
[key: string]: string;
|
|
124
|
+
}[];
|
|
125
|
+
/**
|
|
126
|
+
* A list of metadata about the pivot yAxes of this report.
|
|
127
|
+
*/
|
|
128
|
+
pivotColumns?: {
|
|
129
|
+
/** The field for this yAxis. */
|
|
130
|
+
field: string;
|
|
131
|
+
/** The label to use for this yAxis. */
|
|
132
|
+
label: string;
|
|
133
|
+
}[];
|
|
134
|
+
}
|
|
120
135
|
/**
|
|
121
136
|
* Props for the Quill Dashboard component.
|
|
122
137
|
*/
|
|
@@ -255,8 +270,10 @@ export interface DashboardProps {
|
|
|
255
270
|
onClickChartElement?: (data: any) => void;
|
|
256
271
|
/** An override for the pivot date bucketing. */
|
|
257
272
|
dateBucket?: 'day' | 'week' | 'month' | 'year';
|
|
258
|
-
/**
|
|
259
|
-
|
|
273
|
+
/** Additional processing allowed by our backend */
|
|
274
|
+
additionalProcessing?: {
|
|
275
|
+
last?: number;
|
|
276
|
+
};
|
|
260
277
|
}
|
|
261
278
|
/**
|
|
262
279
|
* ### Quill Dashboard
|
|
@@ -289,5 +306,5 @@ export interface DashboardProps {
|
|
|
289
306
|
* ### API Reference
|
|
290
307
|
* @see https://docs.quillsql.com/components/dashboard
|
|
291
308
|
*/
|
|
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,
|
|
309
|
+
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, additionalProcessing, }: DashboardProps): import("react/jsx-runtime").JSX.Element | null;
|
|
293
310
|
//# sourceMappingURL=Dashboard.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Dashboard.d.ts","sourceRoot":"","sources":["../../src/Dashboard.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAMZ,SAAS,EACT,WAAW,
|
|
1
|
+
{"version":3,"file":"Dashboard.d.ts","sourceRoot":"","sources":["../../src/Dashboard.tsx"],"names":[],"mappings":"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"}
|
package/dist/esm/Dashboard.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
/* eslint-disable no-unused-vars */
|
|
3
|
-
import { useContext, useEffect, useState, } from 'react';
|
|
3
|
+
import { useContext, useEffect, useState, useMemo, } from 'react';
|
|
4
4
|
import Chart from './Chart';
|
|
5
5
|
import { PRIMARY_RANGE, COMPARISON_RANGE, defaultOptionsV2, getRangeFromPresetOptions, } from './DateRangePicker/dateRangePickerUtils';
|
|
6
|
-
import { ClientContext, DashboardContext, ThemeContext, DashboardFiltersContext,
|
|
6
|
+
import { ClientContext, DashboardContext, ThemeContext, DashboardFiltersContext, } from './Context';
|
|
7
7
|
import { useDashboard } from './hooks/useDashboard';
|
|
8
8
|
import { hashCode } from './utils/crypto';
|
|
9
9
|
import DashboardSectionContainer from './components/Dashboard/DashboardSectionContainer';
|
|
@@ -12,7 +12,6 @@ import QuillTableComponent from './components/Dashboard/TableComponent';
|
|
|
12
12
|
import QuillChartComponent from './components/Dashboard/ChartComponent';
|
|
13
13
|
import DashboardSection from './components/Dashboard/DashboardSection';
|
|
14
14
|
import { styleToProps } from './utils/styles';
|
|
15
|
-
import { cleanDashboardItem } from './utils/dashboard';
|
|
16
15
|
import { QuillDateRangePicker } from './DateRangePicker/QuillDateRangePicker';
|
|
17
16
|
import DataLoader, { ChartDataLoader, } from './components/Dashboard/DataLoader';
|
|
18
17
|
import { QuillEmptyDashboardComponent, QuillFilterContainerComponent, } from './components/UiComponents';
|
|
@@ -56,7 +55,7 @@ const defaultChartContainerStyles = {
|
|
|
56
55
|
* ### API Reference
|
|
57
56
|
* @see https://docs.quillsql.com/components/dashboard
|
|
58
57
|
*/
|
|
59
|
-
export default function Dashboard({ name, hidden = false, SelectComponent = QuillSelectComponentWithCombo, MultiSelectComponent = QuillMultiSelectComponentWithCombo, EmptyDashboardComponent = QuillEmptyDashboardComponent, DateRangePickerComponent = QuillDateRangePicker, MetricComponent = QuillMetricComponent, ChartComponent = QuillChartComponent, TableComponent = QuillTableComponent, DashboardSectionComponent = DashboardSection, DashboardSectionContainerComponent = DashboardSectionContainer, FilterContainerComponent = QuillFilterContainerComponent, onClickReport, onChangeLoading, hideFilters, hideDateRangeFilter = false, hideXAxis = false, hideYAxis = false, hideCartesianGrid = false, comparisonLineStyle = 'solid', containerStyle, className, chartContainerStyle = defaultChartContainerStyles, filters, onClickChartElement, dateBucket,
|
|
58
|
+
export default function Dashboard({ name, hidden = false, SelectComponent = QuillSelectComponentWithCombo, MultiSelectComponent = QuillMultiSelectComponentWithCombo, EmptyDashboardComponent = QuillEmptyDashboardComponent, DateRangePickerComponent = QuillDateRangePicker, MetricComponent = QuillMetricComponent, ChartComponent = QuillChartComponent, TableComponent = QuillTableComponent, DashboardSectionComponent = DashboardSection, DashboardSectionContainerComponent = DashboardSectionContainer, FilterContainerComponent = QuillFilterContainerComponent, onClickReport, onChangeLoading, hideFilters, hideDateRangeFilter = false, hideXAxis = false, hideYAxis = false, hideCartesianGrid = false, comparisonLineStyle = 'solid', containerStyle, className, chartContainerStyle = defaultChartContainerStyles, filters, onClickChartElement, dateBucket, additionalProcessing, }) {
|
|
60
59
|
const { dispatch } = useContext(DashboardContext);
|
|
61
60
|
const { isLoading: isDataLoading, data, reload, } = useDashboard(name);
|
|
62
61
|
const [dashboardSections, setDashboardSections] = useState(null);
|
|
@@ -67,8 +66,13 @@ export default function Dashboard({ name, hidden = false, SelectComponent = Quil
|
|
|
67
66
|
const [theme] = useContext(ThemeContext);
|
|
68
67
|
const [initialLoad, setInitialLoad] = useState(true);
|
|
69
68
|
const { dashboardFilters, dashboardFiltersDispatch } = useContext(DashboardFiltersContext);
|
|
70
|
-
const
|
|
71
|
-
|
|
69
|
+
const specificDashboardFilters = useMemo(() => {
|
|
70
|
+
return dashboardFilters
|
|
71
|
+
.sort((filter) => (filter.filterType === 'date_range' ? -1 : 1))
|
|
72
|
+
.filter((f) => f &&
|
|
73
|
+
(!hideDateRangeFilter || f.filterType !== 'date_range') &&
|
|
74
|
+
f.dashboardName === name);
|
|
75
|
+
}, [dashboardFilters, data]);
|
|
72
76
|
useEffect(() => {
|
|
73
77
|
setIsLoading(isDataLoading);
|
|
74
78
|
}, [isDataLoading]);
|
|
@@ -78,12 +82,14 @@ export default function Dashboard({ name, hidden = false, SelectComponent = Quil
|
|
|
78
82
|
onDashboardDataChange(data);
|
|
79
83
|
}, [data, filters]);
|
|
80
84
|
useEffect(() => {
|
|
85
|
+
setIsLoading(true);
|
|
81
86
|
reload(name);
|
|
82
87
|
}, [name, client]);
|
|
83
88
|
const onDashboardDataChange = (resp) => {
|
|
84
89
|
setDashboardSections(resp.sections);
|
|
85
90
|
setInitialLoad(false);
|
|
86
|
-
const
|
|
91
|
+
const filterArray = [];
|
|
92
|
+
// Add date_range filter to filterArray
|
|
87
93
|
if (resp.dateFilter && Object.keys(resp.dateFilter).length) {
|
|
88
94
|
let presetsOptions = defaultOptionsV2;
|
|
89
95
|
if (resp.dateFilter.presetRanges) {
|
|
@@ -124,6 +130,7 @@ export default function Dashboard({ name, hidden = false, SelectComponent = Quil
|
|
|
124
130
|
preset: {
|
|
125
131
|
label: primaryPreset.label,
|
|
126
132
|
},
|
|
133
|
+
dashboardName: name,
|
|
127
134
|
};
|
|
128
135
|
if (resp.dateFilter.comparison) {
|
|
129
136
|
filter.comparison = true;
|
|
@@ -138,61 +145,41 @@ export default function Dashboard({ name, hidden = false, SelectComponent = Quil
|
|
|
138
145
|
else {
|
|
139
146
|
filter.comparison = false;
|
|
140
147
|
}
|
|
141
|
-
|
|
142
|
-
hashCode(JSON.stringify(filter))) {
|
|
143
|
-
dashboardFiltersDispatch({
|
|
144
|
-
type: 'ADD_DASHBOARD_FILTER',
|
|
145
|
-
id: 'date_range',
|
|
146
|
-
data: { ...filter, dashboardName: name },
|
|
147
|
-
});
|
|
148
|
-
}
|
|
149
|
-
bigFilterObj[filter.field] = filter;
|
|
150
|
-
setDateFilter(presetsOptions.find((opt) => opt.value === resp.dateFilter.primaryRange?.value)?.label ?? null);
|
|
151
|
-
}
|
|
152
|
-
else {
|
|
153
|
-
setDateFilter(null);
|
|
154
|
-
setComparisonRange(null);
|
|
148
|
+
filterArray.push(filter);
|
|
155
149
|
}
|
|
150
|
+
// Add string filters to filterArray
|
|
156
151
|
if (resp.filters && resp.filters.length) {
|
|
157
152
|
Object.values(resp.filters)
|
|
158
|
-
.filter((filter) => filter.filterType !== '
|
|
153
|
+
.filter((filter) => filter.filterType !== 'date_range')
|
|
159
154
|
.forEach((filter) => {
|
|
160
|
-
|
|
161
|
-
bigFilterObj.dashboardName = name;
|
|
162
|
-
});
|
|
163
|
-
}
|
|
164
|
-
if (hashCode(JSON.stringify(dashboardFilters)) !==
|
|
165
|
-
hashCode(JSON.stringify(bigFilterObj))) {
|
|
166
|
-
dashboardFiltersDispatch({
|
|
167
|
-
type: 'ADD_DASHBOARD_FILTERS',
|
|
168
|
-
id: 'tons',
|
|
169
|
-
data: bigFilterObj,
|
|
155
|
+
filterArray.push(processFilter(filter));
|
|
170
156
|
});
|
|
171
157
|
}
|
|
158
|
+
// Add custom filter to filterArray
|
|
172
159
|
if (filters) {
|
|
173
160
|
filters.forEach((filter) => {
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
161
|
+
filterArray.push({ ...filter, dashboardName: name });
|
|
162
|
+
});
|
|
163
|
+
}
|
|
164
|
+
// remove all that are already present in dashboardSpecificFilters
|
|
165
|
+
const dashboardSpecificFilters = dashboardFilters.filter((f) => f.dashboardName === name);
|
|
166
|
+
if (hashCode(JSON.stringify(dashboardSpecificFilters)) !==
|
|
167
|
+
hashCode(JSON.stringify(filterArray))) {
|
|
168
|
+
dashboardFiltersDispatch({
|
|
169
|
+
type: 'CLEAR_AND_ADD_DASHBOARD_FILTERS',
|
|
170
|
+
data: filterArray,
|
|
171
|
+
dashboardName: name,
|
|
179
172
|
});
|
|
180
173
|
}
|
|
181
174
|
};
|
|
182
175
|
const handleOnClickDashboardItem = (elem) => {
|
|
183
|
-
|
|
184
|
-
if (dashboard[elem._id]?._id && onClickReport) {
|
|
185
|
-
// The _id add-on is a patch for backwards compatability
|
|
186
|
-
// TODO: remove all _id references from the codebase (admin and react)
|
|
187
|
-
onClickReport({ ...cleanedItem, _id: elem._id });
|
|
188
|
-
}
|
|
189
|
-
else if (onClickReport) {
|
|
176
|
+
if (onClickReport) {
|
|
190
177
|
dispatch({
|
|
191
178
|
type: 'UPDATE_DASHBOARD_ITEM',
|
|
192
|
-
id: elem.
|
|
193
|
-
data:
|
|
179
|
+
id: elem.id,
|
|
180
|
+
data: elem,
|
|
194
181
|
});
|
|
195
|
-
onClickReport({ ...
|
|
182
|
+
onClickReport({ ...elem, _id: elem._id });
|
|
196
183
|
}
|
|
197
184
|
};
|
|
198
185
|
function removeQuotes(str) {
|
|
@@ -218,6 +205,7 @@ export default function Dashboard({ name, hidden = false, SelectComponent = Quil
|
|
|
218
205
|
return {
|
|
219
206
|
...filterWithoutSelectedValue,
|
|
220
207
|
...(selectedValue ? { selectedValue } : {}),
|
|
208
|
+
dashboardName: name,
|
|
221
209
|
};
|
|
222
210
|
}
|
|
223
211
|
if (filter.filterType === 'date' || filter.filterType === 'date_range') {
|
|
@@ -228,6 +216,7 @@ export default function Dashboard({ name, hidden = false, SelectComponent = Quil
|
|
|
228
216
|
label: 'Date',
|
|
229
217
|
field: 'date_range',
|
|
230
218
|
options: filter.options,
|
|
219
|
+
dashboardName: name,
|
|
231
220
|
};
|
|
232
221
|
}
|
|
233
222
|
};
|
|
@@ -251,7 +240,7 @@ export default function Dashboard({ name, hidden = false, SelectComponent = Quil
|
|
|
251
240
|
}
|
|
252
241
|
}
|
|
253
242
|
dashboardFiltersDispatch({
|
|
254
|
-
type: '
|
|
243
|
+
type: 'UPDATE_DASHBOARD_FILTER',
|
|
255
244
|
id: filter.field,
|
|
256
245
|
data: {
|
|
257
246
|
...filterWithoutSelectedValue,
|
|
@@ -278,7 +267,7 @@ export default function Dashboard({ name, hidden = false, SelectComponent = Quil
|
|
|
278
267
|
primaryRange = getRangeFromPresetOptions(value.preset, presetFilters);
|
|
279
268
|
}
|
|
280
269
|
dashboardFiltersDispatch({
|
|
281
|
-
type: '
|
|
270
|
+
type: 'UPDATE_DASHBOARD_FILTER',
|
|
282
271
|
id: 'date_range',
|
|
283
272
|
data: {
|
|
284
273
|
startDate: primaryRange.start,
|
|
@@ -295,6 +284,7 @@ export default function Dashboard({ name, hidden = false, SelectComponent = Quil
|
|
|
295
284
|
endDate: COMPARISON_RANGE[key](primaryRange)?.end,
|
|
296
285
|
value: key,
|
|
297
286
|
},
|
|
287
|
+
dashboardName: name,
|
|
298
288
|
},
|
|
299
289
|
});
|
|
300
290
|
}
|
|
@@ -307,7 +297,7 @@ export default function Dashboard({ name, hidden = false, SelectComponent = Quil
|
|
|
307
297
|
};
|
|
308
298
|
const preset = value.preset ? value.preset : '';
|
|
309
299
|
dashboardFiltersDispatch({
|
|
310
|
-
type: '
|
|
300
|
+
type: 'UPDATE_DASHBOARD_FILTER',
|
|
311
301
|
id: 'date_range',
|
|
312
302
|
data: {
|
|
313
303
|
...filter,
|
|
@@ -338,11 +328,6 @@ export default function Dashboard({ name, hidden = false, SelectComponent = Quil
|
|
|
338
328
|
onChangeLoading(initialLoad || isLoading);
|
|
339
329
|
}
|
|
340
330
|
}, [isLoading, onChangeLoading]);
|
|
341
|
-
if (!dashboardSections || Object.keys(dashboardSections).length == 0) {
|
|
342
|
-
if (initialLoad)
|
|
343
|
-
return null;
|
|
344
|
-
return _jsx(EmptyDashboardComponent, {});
|
|
345
|
-
}
|
|
346
331
|
const sortByOrdering = (a, b) => {
|
|
347
332
|
if (a.order === undefined && b.order === undefined)
|
|
348
333
|
return 0;
|
|
@@ -352,9 +337,6 @@ export default function Dashboard({ name, hidden = false, SelectComponent = Quil
|
|
|
352
337
|
return -1;
|
|
353
338
|
return a.order - b.order;
|
|
354
339
|
};
|
|
355
|
-
const sortedFilters = Object.values(dashboardFilters)
|
|
356
|
-
.sort((filter) => (filter.filterType === 'date_range' ? -1 : 1))
|
|
357
|
-
.filter((f) => !hideDateRangeFilter || f.filterType !== 'date_range');
|
|
358
340
|
const metrics = (section) => dashboardSections[section]
|
|
359
341
|
.filter(({ chartType }) => chartType === 'metric')
|
|
360
342
|
.sort(sortByOrdering);
|
|
@@ -364,14 +346,19 @@ export default function Dashboard({ name, hidden = false, SelectComponent = Quil
|
|
|
364
346
|
const tables = (section) => dashboardSections[section]
|
|
365
347
|
.filter(({ chartType }) => chartType === 'table')
|
|
366
348
|
.sort(sortByOrdering);
|
|
367
|
-
if (hidden)
|
|
349
|
+
if (hidden || isLoading)
|
|
368
350
|
return null;
|
|
369
|
-
|
|
351
|
+
if (!dashboardSections || Object.keys(dashboardSections).length == 0) {
|
|
352
|
+
if (initialLoad || isLoading)
|
|
353
|
+
return null;
|
|
354
|
+
return _jsx(EmptyDashboardComponent, {});
|
|
355
|
+
}
|
|
356
|
+
return (_jsxs("div", { className: className, ...styleToProps(containerStyle), children: [!hideFilters && specificDashboardFilters.length > 0 && (_jsx("div", { style: {
|
|
370
357
|
display: 'flex',
|
|
371
358
|
boxSizing: 'content-box',
|
|
372
359
|
flexDirection: 'row',
|
|
373
360
|
alignItems: 'center',
|
|
374
|
-
}, children: _jsx(FilterContainerComponent, { children:
|
|
361
|
+
}, children: _jsx(FilterContainerComponent, { children: specificDashboardFilters.map((filter, index) => (_jsx(DashboardFilter, { filter: filter, onChangeFilter: updateFilter, theme: theme, SelectComponent: SelectComponent, MultiSelectComponent: MultiSelectComponent, DateRangePickerComponent: DateRangePickerComponent }, index))) }) })), Object.keys(dashboardSections)
|
|
375
362
|
.sort(function (a, b) {
|
|
376
363
|
return a.length - b.length;
|
|
377
364
|
})
|
|
@@ -385,15 +372,27 @@ export default function Dashboard({ name, hidden = false, SelectComponent = Quil
|
|
|
385
372
|
textAlign: 'left',
|
|
386
373
|
marginTop: 12,
|
|
387
374
|
}, children: section })] })), metrics(section).length > 0 && (_jsx(DashboardSectionComponent, { section: "metrics", children: metrics(section).map((item, index) => {
|
|
388
|
-
return (_jsx(DataLoader, { id: item._id, children: ({ isLoading, error }) => (_jsx(MetricComponent, { error: error, isLoading: isLoading, report:
|
|
389
|
-
? () => handleOnClickDashboardItem(
|
|
375
|
+
return (_jsx(DataLoader, { id: item._id, filters: specificDashboardFilters, children: ({ isLoading, error, data }) => (_jsx(MetricComponent, { error: error, isLoading: isLoading, report: { ...data, name: item.name }, onClick: !isLoading && onClickReport
|
|
376
|
+
? () => handleOnClickDashboardItem({
|
|
377
|
+
...item,
|
|
378
|
+
...data,
|
|
379
|
+
})
|
|
390
380
|
: undefined }, item.name + '' + index)) }, `${item.name}${index}`));
|
|
391
|
-
}) })), charts(section).length > 0 && (_jsx(DashboardSectionComponent, { section: "charts", children: charts(section).map((item, index) => (_jsx(ChartDataLoader, { id: item._id, hideDateRangeFilter: hideDateRangeFilter, dateBucket: dateBucket,
|
|
392
|
-
? () => handleOnClickDashboardItem(
|
|
381
|
+
}) })), charts(section).length > 0 && (_jsx(DashboardSectionComponent, { section: "charts", children: charts(section).map((item, index) => (_jsx(ChartDataLoader, { id: item._id, hideDateRangeFilter: hideDateRangeFilter, dateBucket: dateBucket, additionalProcessing: additionalProcessing, filters: specificDashboardFilters, children: ({ isLoading, data, error, dateBucket, }) => (_jsx(ChartComponent, { report: { ...data, name: item.name }, error: error, onClick: !isLoading && onClickReport
|
|
382
|
+
? () => handleOnClickDashboardItem({
|
|
383
|
+
...item,
|
|
384
|
+
...data,
|
|
385
|
+
})
|
|
393
386
|
: undefined, onClickChartElement: onClickChartElement, isLoading: isLoading, dateBucket: dateBucket, children: _jsx(Chart, { config: data, containerStyle: chartContainerStyle, colors: theme.chartColors?.length
|
|
394
387
|
? theme.chartColors
|
|
395
|
-
: undefined, hideXAxis: hideXAxis, hideYAxis: hideYAxis, hideCartesianGrid: hideCartesianGrid, comparisonLineStyle: comparisonLineStyle, onClickChartElement: onClickChartElement, dateBucket: dateBucket }) }, item.name + '' + index)) }, `${item.name}${index}`))) })), tables(section).length > 0 && (_jsx(DashboardSectionComponent, { section: "tables", children: tables(section).map((item, index) => (_jsx(DataLoader, { id: item._id, children: ({ isLoading, error, onPageChange, onSortChange, }) => (_jsx(TableComponent, { report:
|
|
396
|
-
|
|
388
|
+
: undefined, hideXAxis: hideXAxis, hideYAxis: hideYAxis, hideCartesianGrid: hideCartesianGrid, comparisonLineStyle: comparisonLineStyle, onClickChartElement: onClickChartElement, dateBucket: dateBucket }) }, item.name + '' + index)) }, `${item.name}${index}`))) })), tables(section).length > 0 && (_jsx(DashboardSectionComponent, { section: "tables", children: tables(section).map((item, index) => (_jsx(DataLoader, { id: item._id, filters: specificDashboardFilters, children: ({ isLoading, error, onPageChange, onSortChange, data, }) => (_jsx(TableComponent, { report: {
|
|
389
|
+
...data,
|
|
390
|
+
name: item.name,
|
|
391
|
+
}, isLoading: isLoading, error: error, onClick: !isLoading && onClickReport
|
|
392
|
+
? () => handleOnClickDashboardItem({
|
|
393
|
+
...item,
|
|
394
|
+
...data,
|
|
395
|
+
})
|
|
397
396
|
: undefined, onPageChange: (page) => onPageChange(page), onSortChange: (sort) => onSortChange(sort) })) }, `${item.name}${index}`))) }))] }, section + '' + sectionIndex));
|
|
398
397
|
})] }));
|
|
399
398
|
}
|