@quillsql/react 2.12.30 → 2.12.32
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 +6 -37
- package/dist/cjs/Chart.d.ts.map +1 -1
- package/dist/cjs/Chart.js +86 -327
- package/dist/cjs/ChartBuilder.d.ts +12 -49
- package/dist/cjs/ChartBuilder.d.ts.map +1 -1
- package/dist/cjs/ChartBuilder.js +68 -36
- package/dist/cjs/ChartEditor.d.ts +1 -1
- package/dist/cjs/ChartEditor.d.ts.map +1 -1
- package/dist/cjs/ChartEditor.js +11 -7
- package/dist/cjs/Context.d.ts +4 -1
- package/dist/cjs/Context.d.ts.map +1 -1
- package/dist/cjs/Context.js +10 -4
- package/dist/cjs/Dashboard.d.ts +61 -114
- package/dist/cjs/Dashboard.d.ts.map +1 -1
- package/dist/cjs/Dashboard.js +261 -30
- package/dist/cjs/DateRangePicker/DateRangePicker.d.ts.map +1 -1
- package/dist/cjs/DateRangePicker/DateRangePicker.js +0 -26
- package/dist/cjs/ReportBuilder.d.ts +1 -1
- package/dist/cjs/ReportBuilder.d.ts.map +1 -1
- package/dist/cjs/ReportBuilder.js +62 -97
- package/dist/cjs/SQLEditor.d.ts +2 -2
- package/dist/cjs/SQLEditor.d.ts.map +1 -1
- package/dist/cjs/SQLEditor.js +10 -5
- package/dist/cjs/Table.d.ts.map +1 -1
- package/dist/cjs/Table.js +41 -43
- package/dist/cjs/components/Chart/BarChart.d.ts.map +1 -1
- package/dist/cjs/components/Chart/BarChart.js +12 -1
- 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 +25 -1
- package/dist/cjs/components/Dashboard/DataLoader.d.ts +7 -7
- package/dist/cjs/components/Dashboard/DataLoader.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/DataLoader.js +64 -28
- package/dist/cjs/components/Dashboard/MetricComponent.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/MetricComponent.js +11 -45
- package/dist/cjs/components/Dashboard/TableComponent.d.ts +1 -1
- package/dist/cjs/components/Dashboard/TableComponent.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/TableComponent.js +1 -30
- package/dist/cjs/components/QuillMultiSelectWithCombo.d.ts.map +1 -1
- package/dist/cjs/components/QuillMultiSelectWithCombo.js +16 -1
- package/dist/cjs/components/QuillSelectWithCombo.d.ts.map +1 -1
- package/dist/cjs/components/QuillSelectWithCombo.js +4 -1
- package/dist/cjs/components/ReportBuilder/FilterModal.d.ts +10 -2
- package/dist/cjs/components/ReportBuilder/FilterModal.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/FilterModal.js +94 -70
- package/dist/cjs/components/ReportBuilder/convert.d.ts +7 -2
- package/dist/cjs/components/ReportBuilder/convert.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/convert.js +53 -1
- package/dist/cjs/components/ReportBuilder/ui.d.ts +6 -6
- package/dist/cjs/components/ReportBuilder/ui.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/ui.js +6 -22
- package/dist/cjs/components/UiComponents.d.ts +26 -1
- package/dist/cjs/components/UiComponents.d.ts.map +1 -1
- package/dist/cjs/components/UiComponents.js +97 -4
- package/dist/cjs/hooks/useQuill.d.ts.map +1 -1
- package/dist/cjs/hooks/useQuill.js +19 -3
- package/dist/cjs/index.d.ts +2 -1
- package/dist/cjs/index.d.ts.map +1 -1
- package/dist/cjs/internals/ReportBuilder/PivotModal.d.ts +1 -0
- package/dist/cjs/internals/ReportBuilder/PivotModal.d.ts.map +1 -1
- package/dist/cjs/models/Columns.d.ts +2 -1
- package/dist/cjs/models/Columns.d.ts.map +1 -1
- package/dist/cjs/models/Filter.d.ts +15 -4
- package/dist/cjs/models/Filter.d.ts.map +1 -1
- package/dist/cjs/models/Filter.js +9 -1
- package/dist/cjs/models/Report.d.ts +10 -23
- package/dist/cjs/models/Report.d.ts.map +1 -1
- package/dist/cjs/utils/astFilterProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/astFilterProcessing.js +37 -2
- package/dist/cjs/utils/columnProcessing.d.ts +2 -0
- package/dist/cjs/utils/columnProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/columnProcessing.js +54 -1
- package/dist/cjs/utils/dashboard.d.ts +1 -1
- package/dist/cjs/utils/dashboard.d.ts.map +1 -1
- package/dist/cjs/utils/dashboard.js +3 -56
- package/dist/cjs/utils/dataProcessing.d.ts +4 -2
- package/dist/cjs/utils/dataProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/dataProcessing.js +18 -1
- package/dist/cjs/utils/dates.d.ts +2 -1
- package/dist/cjs/utils/dates.d.ts.map +1 -1
- package/dist/cjs/utils/dates.js +23 -1
- package/dist/cjs/utils/filterProcessing.d.ts +7 -1
- package/dist/cjs/utils/filterProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/filterProcessing.js +100 -13
- package/dist/cjs/utils/pivotConstructor.d.ts +2 -1
- package/dist/cjs/utils/pivotConstructor.d.ts.map +1 -1
- package/dist/cjs/utils/pivotConstructor.js +7 -1
- package/dist/cjs/utils/report.d.ts +4 -1
- package/dist/cjs/utils/report.d.ts.map +1 -1
- package/dist/cjs/utils/report.js +94 -7
- package/dist/cjs/utils/tableProcessing.d.ts +1 -1
- package/dist/esm/Chart.d.ts +6 -37
- package/dist/esm/Chart.d.ts.map +1 -1
- package/dist/esm/Chart.js +87 -329
- package/dist/esm/ChartBuilder.d.ts +12 -49
- package/dist/esm/ChartBuilder.d.ts.map +1 -1
- package/dist/esm/ChartBuilder.js +68 -33
- package/dist/esm/ChartEditor.d.ts +1 -1
- package/dist/esm/ChartEditor.d.ts.map +1 -1
- package/dist/esm/ChartEditor.js +11 -7
- package/dist/esm/Context.d.ts +4 -1
- package/dist/esm/Context.d.ts.map +1 -1
- package/dist/esm/Context.js +9 -3
- package/dist/esm/Dashboard.d.ts +61 -114
- package/dist/esm/Dashboard.d.ts.map +1 -1
- package/dist/esm/Dashboard.js +263 -32
- package/dist/esm/DateRangePicker/DateRangePicker.d.ts.map +1 -1
- package/dist/esm/DateRangePicker/DateRangePicker.js +0 -26
- package/dist/esm/ReportBuilder.d.ts +1 -1
- package/dist/esm/ReportBuilder.d.ts.map +1 -1
- package/dist/esm/ReportBuilder.js +64 -99
- package/dist/esm/SQLEditor.d.ts +2 -2
- package/dist/esm/SQLEditor.d.ts.map +1 -1
- package/dist/esm/SQLEditor.js +11 -6
- package/dist/esm/Table.d.ts.map +1 -1
- package/dist/esm/Table.js +42 -44
- package/dist/esm/components/Chart/BarChart.d.ts.map +1 -1
- package/dist/esm/components/Chart/BarChart.js +13 -2
- 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 +26 -2
- package/dist/esm/components/Dashboard/DataLoader.d.ts +7 -7
- package/dist/esm/components/Dashboard/DataLoader.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/DataLoader.js +65 -29
- package/dist/esm/components/Dashboard/MetricComponent.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/MetricComponent.js +11 -45
- package/dist/esm/components/Dashboard/TableComponent.d.ts +1 -1
- package/dist/esm/components/Dashboard/TableComponent.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/TableComponent.js +1 -30
- package/dist/esm/components/QuillMultiSelectWithCombo.d.ts.map +1 -1
- package/dist/esm/components/QuillMultiSelectWithCombo.js +16 -1
- package/dist/esm/components/QuillSelectWithCombo.d.ts.map +1 -1
- package/dist/esm/components/QuillSelectWithCombo.js +5 -2
- package/dist/esm/components/ReportBuilder/FilterModal.d.ts +10 -2
- package/dist/esm/components/ReportBuilder/FilterModal.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/FilterModal.js +94 -70
- package/dist/esm/components/ReportBuilder/convert.d.ts +7 -2
- package/dist/esm/components/ReportBuilder/convert.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/convert.js +51 -0
- package/dist/esm/components/ReportBuilder/ui.d.ts +6 -6
- package/dist/esm/components/ReportBuilder/ui.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/ui.js +6 -22
- package/dist/esm/components/UiComponents.d.ts +26 -1
- package/dist/esm/components/UiComponents.d.ts.map +1 -1
- package/dist/esm/components/UiComponents.js +95 -3
- package/dist/esm/hooks/useQuill.d.ts.map +1 -1
- package/dist/esm/hooks/useQuill.js +19 -3
- package/dist/esm/index.d.ts +2 -1
- package/dist/esm/index.d.ts.map +1 -1
- package/dist/esm/internals/ReportBuilder/PivotModal.d.ts +1 -0
- package/dist/esm/internals/ReportBuilder/PivotModal.d.ts.map +1 -1
- package/dist/esm/models/Columns.d.ts +2 -1
- package/dist/esm/models/Columns.d.ts.map +1 -1
- package/dist/esm/models/Filter.d.ts +15 -4
- package/dist/esm/models/Filter.d.ts.map +1 -1
- package/dist/esm/models/Filter.js +8 -0
- package/dist/esm/models/Report.d.ts +10 -23
- package/dist/esm/models/Report.d.ts.map +1 -1
- package/dist/esm/utils/astFilterProcessing.d.ts.map +1 -1
- package/dist/esm/utils/astFilterProcessing.js +38 -3
- package/dist/esm/utils/columnProcessing.d.ts +2 -0
- package/dist/esm/utils/columnProcessing.d.ts.map +1 -1
- package/dist/esm/utils/columnProcessing.js +52 -0
- package/dist/esm/utils/dashboard.d.ts +1 -1
- package/dist/esm/utils/dashboard.d.ts.map +1 -1
- package/dist/esm/utils/dashboard.js +3 -56
- package/dist/esm/utils/dataProcessing.d.ts +4 -2
- package/dist/esm/utils/dataProcessing.d.ts.map +1 -1
- package/dist/esm/utils/dataProcessing.js +16 -0
- package/dist/esm/utils/dates.d.ts +2 -1
- package/dist/esm/utils/dates.d.ts.map +1 -1
- package/dist/esm/utils/dates.js +21 -0
- package/dist/esm/utils/filterProcessing.d.ts +7 -1
- package/dist/esm/utils/filterProcessing.d.ts.map +1 -1
- package/dist/esm/utils/filterProcessing.js +97 -12
- package/dist/esm/utils/pivotConstructor.d.ts +2 -1
- package/dist/esm/utils/pivotConstructor.d.ts.map +1 -1
- package/dist/esm/utils/pivotConstructor.js +7 -1
- package/dist/esm/utils/report.d.ts +4 -1
- package/dist/esm/utils/report.d.ts.map +1 -1
- package/dist/esm/utils/report.js +92 -6
- package/dist/esm/utils/tableProcessing.d.ts +1 -1
- package/package.json +1 -1
- package/dist/esm/components/ReportBuilder/convert.uspec.d.ts +0 -2
- package/dist/esm/components/ReportBuilder/convert.uspec.d.ts.map +0 -1
- package/dist/esm/components/ReportBuilder/convert.uspec.js +0 -1152
- package/dist/esm/utils/astFilterProcessing.uspec.d.ts +0 -2
- package/dist/esm/utils/astFilterProcessing.uspec.d.ts.map +0 -1
- package/dist/esm/utils/astFilterProcessing.uspec.js +0 -2729
- package/dist/esm/utils/dataProcessing.uspec.d.ts +0 -2
- package/dist/esm/utils/dataProcessing.uspec.d.ts.map +0 -1
- package/dist/esm/utils/dataProcessing.uspec.js +0 -204
- package/dist/esm/utils/queryConstructor.uspec.d.ts +0 -2
- package/dist/esm/utils/queryConstructor.uspec.d.ts.map +0 -1
- package/dist/esm/utils/queryConstructor.uspec.js +0 -223
- package/dist/esm/utils/report.ispec.d.ts +0 -2
- package/dist/esm/utils/report.ispec.d.ts.map +0 -1
- package/dist/esm/utils/report.ispec.js +0 -46
- package/dist/esm/utils/tableProcessing.ispec.d.ts +0 -2
- package/dist/esm/utils/tableProcessing.ispec.d.ts.map +0 -1
- package/dist/esm/utils/tableProcessing.ispec.js +0 -61
package/dist/esm/Dashboard.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
import { useContext, useEffect, useState, } from 'react';
|
|
3
|
-
import
|
|
3
|
+
import { ChartDisplay } from './Chart';
|
|
4
4
|
import { PRIMARY_RANGE, COMPARISON_RANGE, defaultOptionsV2, getRangeFromPresetOptions, } from './DateRangePicker/dateRangePickerUtils';
|
|
5
|
-
import { ClientContext, DashboardContext, ThemeContext, DashboardFiltersContext, } from './Context';
|
|
5
|
+
import { ClientContext, DashboardContext, ThemeContext, DashboardFiltersContext, SchemaContext, } from './Context';
|
|
6
6
|
import { useDashboard } from './hooks/useDashboard';
|
|
7
7
|
import { hashCode } from './utils/crypto';
|
|
8
8
|
import DashboardSectionContainer from './components/Dashboard/DashboardSectionContainer';
|
|
@@ -13,11 +13,19 @@ import DashboardSection from './components/Dashboard/DashboardSection';
|
|
|
13
13
|
import { styleToProps } from './utils/styles';
|
|
14
14
|
import { QuillDateRangePicker } from './DateRangePicker/QuillDateRangePicker';
|
|
15
15
|
import DataLoader, { ChartDataLoader, } from './components/Dashboard/DataLoader';
|
|
16
|
-
import { QuillEmptyDashboardComponent, QuillFilterContainerComponent, QuillLoadingDashboardComponent, } from './components/UiComponents';
|
|
16
|
+
import { QuillEmptyDashboardComponent, QuillFilterContainerComponent, QuillLoadingDashboardComponent, QuillUserFilterModalComponent, MemoizedButton, MemoizedSecondaryButton, QuillTextInput, MemoizedPopover, QuillErrorMessageComponent, } from './components/UiComponents';
|
|
17
17
|
import { DashboardFilter } from './components/Dashboard/DashboardFilter';
|
|
18
|
+
import { BoolOperator, FieldTypes, NullOperator, NumberOperator, StringOperator, } from './models/Filter';
|
|
18
19
|
import { QuillMultiSelectComponentWithCombo } from './components/QuillMultiSelectWithCombo';
|
|
19
20
|
import { QuillSelectComponentWithCombo } from './components/QuillSelectWithCombo';
|
|
21
|
+
import { getSchemaInfoWithCustomFields } from './utils/schema';
|
|
22
|
+
import { isTextColumnType } from './components/ReportBuilder/ast';
|
|
23
|
+
import { convertColumnInfoToColumnInternal } from './utils/columnProcessing';
|
|
24
|
+
import { getCountsByColumns, getUniqueValuesByColumns, } from './utils/tableProcessing';
|
|
25
|
+
import { filterSentence, getType } from './utils/filterProcessing';
|
|
20
26
|
import { QuillChartErrorWithAction } from './components/Chart/ChartError';
|
|
27
|
+
import { FilterPopoverWrapper, QuillFilterPopover, } from './components/ReportBuilder/ui';
|
|
28
|
+
import FilterModal from './components/ReportBuilder/FilterModal';
|
|
21
29
|
const defaultChartContainerStyles = {
|
|
22
30
|
display: 'flex',
|
|
23
31
|
width: '100%',
|
|
@@ -55,8 +63,8 @@ const defaultChartContainerStyles = {
|
|
|
55
63
|
* ### API Reference
|
|
56
64
|
* @see https://docs.quillsql.com/components/dashboard
|
|
57
65
|
*/
|
|
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, DashboardLoadingComponent = QuillLoadingDashboardComponent, ErrorComponent = QuillChartErrorWithAction, onClickReport, onChangeLoading, hideFilters, hideXAxis = false, hideYAxis = false, hideCartesianGrid = false, comparisonLineStyle = 'solid', containerStyle, className, chartContainerStyle = defaultChartContainerStyles, filters, onClickChartElement, dateBucket, additionalProcessing, }) {
|
|
59
|
-
const
|
|
66
|
+
export default function Dashboard({ name, hidden = false, SelectComponent = QuillSelectComponentWithCombo, MultiSelectComponent = QuillMultiSelectComponentWithCombo, UserFilterModalComponent = QuillUserFilterModalComponent, ButtonComponent = MemoizedButton, SecondaryButtonComponent = MemoizedSecondaryButton, FilterTagComponent = QuillFilterPopover, PopoverComponent = MemoizedPopover, TextInputComponent = QuillTextInput, EmptyDashboardComponent = QuillEmptyDashboardComponent, DateRangePickerComponent = QuillDateRangePicker, MetricComponent = QuillMetricComponent, ChartComponent = QuillChartComponent, TableComponent = QuillTableComponent, DashboardSectionComponent = DashboardSection, DashboardSectionContainerComponent = DashboardSectionContainer, FilterContainerComponent = QuillFilterContainerComponent, DashboardLoadingComponent = QuillLoadingDashboardComponent, ErrorComponent = QuillChartErrorWithAction, onClickReport, onChangeLoading, hideFilters, hideXAxis = false, hideYAxis = false, hideCartesianGrid = false, comparisonLineStyle = 'solid', containerStyle, className, chartContainerStyle = defaultChartContainerStyles, filters, onClickChartElement, dateBucket, additionalProcessing, hideAdminErrors = true, }) {
|
|
67
|
+
const [dashboard] = useContext(DashboardContext);
|
|
60
68
|
const { isLoading: isDataLoading, data, reload, } = useDashboard(name);
|
|
61
69
|
const [dashboardSections, setDashboardSections] = useState(null);
|
|
62
70
|
const [presetFilters, setPresetFilters] = useState(null);
|
|
@@ -66,20 +74,158 @@ export default function Dashboard({ name, hidden = false, SelectComponent = Quil
|
|
|
66
74
|
const [initialLoad, setInitialLoad] = useState(true);
|
|
67
75
|
const [appliedFilters, setAppliedFilters] = useState([]);
|
|
68
76
|
const { dashboardFilters, dashboardFiltersDispatch } = useContext(DashboardFiltersContext);
|
|
77
|
+
const [schema, setSchema] = useContext(SchemaContext);
|
|
78
|
+
const [filterSchemaIsLoaded, setFilterSchemaIsLoaded] = useState(false);
|
|
79
|
+
const [filterSchema, setFilterSchema] = useState({ columns: [] }); // Schema to be passed into FilterModal
|
|
80
|
+
const [schemaLoading, setSchemaLoading] = useState(false);
|
|
81
|
+
const [fieldValuesMap, setFieldValuesMap] = useState({}); // Mapping of unique values per field, used in string filter 'in' and 'not in'
|
|
82
|
+
const [referencedTables, setReferencedTables] = useState([]); // Intersection of tables referenced in the dashboard
|
|
83
|
+
const [fieldValuesIsLoaded, setFieldValuesIsLoaded] = useState(false);
|
|
84
|
+
const [addFilterPopoverIsOpen, setAddFilterPopoverIsOpen] = useState(false);
|
|
85
|
+
const [filterListIsOpen, setFilterListIsOpen] = useState(false);
|
|
86
|
+
const [filterListAddFilterPopoverIsOpen, setFilterListAddFilterPopoverIsOpen,] = useState(false);
|
|
87
|
+
const [uniqueCounter, setUniqueCounter] = useState(0);
|
|
88
|
+
const [userFilters, setUserFilters] = useState([]);
|
|
89
|
+
const [adminFilters, setAdminFilters] = useState([]);
|
|
90
|
+
const customOperatorOptions = {
|
|
91
|
+
[FieldTypes.Numeric]: [
|
|
92
|
+
NumberOperator.EqualTo,
|
|
93
|
+
NumberOperator.NotEqualTo,
|
|
94
|
+
NumberOperator.GreaterThan,
|
|
95
|
+
NumberOperator.LessThan,
|
|
96
|
+
NumberOperator.GreaterThanOrEqualTo,
|
|
97
|
+
NumberOperator.LessThanOrEqualTo,
|
|
98
|
+
NullOperator.IsNotNull,
|
|
99
|
+
NullOperator.IsNull,
|
|
100
|
+
],
|
|
101
|
+
[FieldTypes.String]: [
|
|
102
|
+
StringOperator.IsExactly,
|
|
103
|
+
StringOperator.IsNotExactly,
|
|
104
|
+
StringOperator.Contains,
|
|
105
|
+
StringOperator.Is,
|
|
106
|
+
StringOperator.IsNot,
|
|
107
|
+
NullOperator.IsNotNull,
|
|
108
|
+
NullOperator.IsNull,
|
|
109
|
+
],
|
|
110
|
+
[FieldTypes.Boolean]: [
|
|
111
|
+
BoolOperator.EqualTo,
|
|
112
|
+
BoolOperator.NotEqualTo,
|
|
113
|
+
NullOperator.IsNotNull,
|
|
114
|
+
NullOperator.IsNull,
|
|
115
|
+
],
|
|
116
|
+
};
|
|
117
|
+
const getSchema = async () => {
|
|
118
|
+
const { schemaData } = await getSchemaInfoWithCustomFields(client);
|
|
119
|
+
setSchema(schemaData);
|
|
120
|
+
setSchemaLoading(false);
|
|
121
|
+
};
|
|
122
|
+
useEffect(() => {
|
|
123
|
+
if (client && !schemaLoading) {
|
|
124
|
+
setSchemaLoading(true);
|
|
125
|
+
getSchema();
|
|
126
|
+
}
|
|
127
|
+
}, [client.publicKey]);
|
|
69
128
|
useEffect(() => {
|
|
70
129
|
setIsLoading(isDataLoading);
|
|
71
130
|
}, [isDataLoading]);
|
|
72
131
|
useEffect(() => {
|
|
73
132
|
if (!data)
|
|
74
133
|
return;
|
|
75
|
-
onDashboardDataChange(data);
|
|
76
|
-
}, [data, filters]);
|
|
134
|
+
onDashboardDataChange(data, schema);
|
|
135
|
+
}, [data, filters, schema]);
|
|
77
136
|
useEffect(() => {
|
|
78
137
|
setIsLoading(true);
|
|
79
138
|
reload(name);
|
|
80
139
|
}, [name, client]);
|
|
81
|
-
|
|
140
|
+
// Go through all columns in the referenced tables and get the unique values to use in fieldValuesMap
|
|
141
|
+
useEffect(() => {
|
|
142
|
+
const fetchData = async () => {
|
|
143
|
+
setFieldValuesIsLoaded(false);
|
|
144
|
+
const newFieldValues = {};
|
|
145
|
+
await Promise.all(referencedTables.map(async (table) => {
|
|
146
|
+
const tableInfo = schema.find((tableInfo) => tableInfo.name === table);
|
|
147
|
+
if (tableInfo) {
|
|
148
|
+
const uniqueValues = await getUniqueStringValues(tableInfo.columns, table);
|
|
149
|
+
if (uniqueValues) {
|
|
150
|
+
newFieldValues[table] = {};
|
|
151
|
+
Object.keys(uniqueValues).forEach((field) => {
|
|
152
|
+
newFieldValues[table][field] = Object.keys(uniqueValues[field] ?? []);
|
|
153
|
+
});
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
}));
|
|
157
|
+
setFieldValuesMap(newFieldValues);
|
|
158
|
+
setFieldValuesIsLoaded(true);
|
|
159
|
+
};
|
|
160
|
+
fetchData();
|
|
161
|
+
}, [referencedTables]);
|
|
162
|
+
useEffect(() => {
|
|
163
|
+
setUserFilters([...appliedFilters.filter((filter) => filter.isUserFilter)]);
|
|
164
|
+
setAdminFilters([
|
|
165
|
+
...appliedFilters.filter((filter) => !filter.isUserFilter),
|
|
166
|
+
]);
|
|
167
|
+
}, [appliedFilters]);
|
|
168
|
+
const getUniqueStringValues = async (columns, tableName) => {
|
|
169
|
+
const convertedStringColumns = columns
|
|
170
|
+
.filter((column) => {
|
|
171
|
+
return isTextColumnType(column.fieldType);
|
|
172
|
+
})
|
|
173
|
+
.map((column) => convertColumnInfoToColumnInternal(column));
|
|
174
|
+
const stringNames = convertedStringColumns.map((column) => column.field);
|
|
175
|
+
const smallStringColumns = await getCountsByColumns(convertedStringColumns, `Select ${stringNames.join(', ')} from ${tableName}`, client, []);
|
|
176
|
+
const smallStringNames = smallStringColumns.map((column) => column.field);
|
|
177
|
+
const newUniqueValues = await getUniqueValuesByColumns(smallStringColumns, `Select ${smallStringNames.join(', ')} from ${tableName}`, [], client, []);
|
|
178
|
+
return newUniqueValues;
|
|
179
|
+
};
|
|
180
|
+
// Get the relevant information from the dashboard and schema to pass to FilterModal
|
|
181
|
+
const updateFilterSchema = (sections, schema) => {
|
|
182
|
+
if (!sections || !schema || schema.length === 0) {
|
|
183
|
+
return;
|
|
184
|
+
}
|
|
185
|
+
setFilterSchemaIsLoaded(false);
|
|
186
|
+
// find intersection of all referenced tables
|
|
187
|
+
const tables = Object.keys(sections)
|
|
188
|
+
.map((section) => {
|
|
189
|
+
return sections[section].map((chart) => {
|
|
190
|
+
return chart.referencedTables;
|
|
191
|
+
});
|
|
192
|
+
})
|
|
193
|
+
.reduce((accumulator, currentArray) => {
|
|
194
|
+
return accumulator.concat(currentArray);
|
|
195
|
+
}, []);
|
|
196
|
+
if (tables && tables.length > 0) {
|
|
197
|
+
let intersection = new Set(tables[0]);
|
|
198
|
+
for (let i = 1; i < tables.length; ++i) {
|
|
199
|
+
const currentSet = new Set(tables[i]);
|
|
200
|
+
intersection = new Set(Array.from(intersection).filter((value) => currentSet.has(value)));
|
|
201
|
+
}
|
|
202
|
+
const tablesList = Array.from(intersection);
|
|
203
|
+
setReferencedTables(tablesList);
|
|
204
|
+
// get all columns from the intersected tables
|
|
205
|
+
const columns = tablesList
|
|
206
|
+
.map((table) => {
|
|
207
|
+
return (schema
|
|
208
|
+
.find((t) => {
|
|
209
|
+
return t.displayName === table || t.name === table;
|
|
210
|
+
})
|
|
211
|
+
?.columns.filter((col) => getType(col.fieldType) !== 'date')
|
|
212
|
+
?.map((col) => {
|
|
213
|
+
return { ...col, table: table };
|
|
214
|
+
}) ?? []);
|
|
215
|
+
})
|
|
216
|
+
.reduce((accumulator, currentArray) => {
|
|
217
|
+
return accumulator.concat(currentArray);
|
|
218
|
+
}, []);
|
|
219
|
+
setFilterSchema({ columns });
|
|
220
|
+
}
|
|
221
|
+
else {
|
|
222
|
+
setFilterSchema({ columns: [] });
|
|
223
|
+
}
|
|
224
|
+
setFilterSchemaIsLoaded(true);
|
|
225
|
+
};
|
|
226
|
+
const onDashboardDataChange = (resp, schema) => {
|
|
82
227
|
setDashboardSections(resp.sections);
|
|
228
|
+
updateFilterSchema(resp.sections, schema);
|
|
83
229
|
const filterArray = [];
|
|
84
230
|
// Add date_range filter to filterArray
|
|
85
231
|
if (resp.dateFilter && Object.keys(resp.dateFilter).length) {
|
|
@@ -150,7 +296,11 @@ export default function Dashboard({ name, hidden = false, SelectComponent = Quil
|
|
|
150
296
|
// Add custom filter to filterArray
|
|
151
297
|
if (filters) {
|
|
152
298
|
filters.forEach((filter) => {
|
|
153
|
-
filterArray.push({
|
|
299
|
+
filterArray.push({
|
|
300
|
+
...filter,
|
|
301
|
+
dashboardName: name,
|
|
302
|
+
isUserFilter: true,
|
|
303
|
+
});
|
|
154
304
|
});
|
|
155
305
|
}
|
|
156
306
|
// remove all that are already present in dashboardSpecificFilters
|
|
@@ -172,11 +322,6 @@ export default function Dashboard({ name, hidden = false, SelectComponent = Quil
|
|
|
172
322
|
};
|
|
173
323
|
const handleOnClickDashboardItem = (elem) => {
|
|
174
324
|
if (onClickReport) {
|
|
175
|
-
dispatch({
|
|
176
|
-
type: 'UPDATE_DASHBOARD_ITEM',
|
|
177
|
-
id: elem.id,
|
|
178
|
-
data: elem,
|
|
179
|
-
});
|
|
180
325
|
onClickReport({ ...elem, _id: elem.id });
|
|
181
326
|
}
|
|
182
327
|
};
|
|
@@ -223,7 +368,7 @@ export default function Dashboard({ name, hidden = false, SelectComponent = Quil
|
|
|
223
368
|
const { ...filterWithoutSelectedValue } = filter; // _ is a throwaway variable
|
|
224
369
|
if (filter.filterType === 'string') {
|
|
225
370
|
let selectedValue = {};
|
|
226
|
-
if (value) {
|
|
371
|
+
if (value || value === '') {
|
|
227
372
|
if (filter.stringFilterType === 'multiselect') {
|
|
228
373
|
if (value.length === 0) {
|
|
229
374
|
selectedValue = { values: [] };
|
|
@@ -340,6 +485,37 @@ export default function Dashboard({ name, hidden = false, SelectComponent = Quil
|
|
|
340
485
|
}
|
|
341
486
|
}
|
|
342
487
|
};
|
|
488
|
+
// generate the correct filter structure
|
|
489
|
+
const getUserFilter = (filter, id, existingFilter) => {
|
|
490
|
+
let userFilter = {};
|
|
491
|
+
if (existingFilter) {
|
|
492
|
+
userFilter = { ...existingFilter };
|
|
493
|
+
}
|
|
494
|
+
else {
|
|
495
|
+
userFilter = { _id: `userFilter_${id}` };
|
|
496
|
+
}
|
|
497
|
+
userFilter = {
|
|
498
|
+
...userFilter,
|
|
499
|
+
table: filter.table ?? '',
|
|
500
|
+
field: filter.field,
|
|
501
|
+
name: filter.name,
|
|
502
|
+
type: filter.type,
|
|
503
|
+
value: filter.value,
|
|
504
|
+
operator: filter.operator,
|
|
505
|
+
dashboardName: name,
|
|
506
|
+
isUserFilter: true,
|
|
507
|
+
};
|
|
508
|
+
return userFilter;
|
|
509
|
+
};
|
|
510
|
+
// new update filter function for user added filters
|
|
511
|
+
const updateUserFilter = (filter, id) => {
|
|
512
|
+
const newFilter = getUserFilter(filter, id);
|
|
513
|
+
dashboardFiltersDispatch({
|
|
514
|
+
type: 'ADD_DASHBOARD_FILTER',
|
|
515
|
+
data: newFilter,
|
|
516
|
+
});
|
|
517
|
+
setAppliedFilters([...appliedFilters, newFilter]);
|
|
518
|
+
};
|
|
343
519
|
useEffect(() => {
|
|
344
520
|
if (dashboardSections && dashboard) {
|
|
345
521
|
const totalNumberOfItems = Object.values(dashboardSections).reduce((count, arr) => count + arr.length, 0);
|
|
@@ -380,12 +556,72 @@ export default function Dashboard({ name, hidden = false, SelectComponent = Quil
|
|
|
380
556
|
return null;
|
|
381
557
|
return _jsx(EmptyDashboardComponent, {});
|
|
382
558
|
}
|
|
383
|
-
return (_jsxs("div", { className: className, ...styleToProps(containerStyle), children: [
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
559
|
+
return (_jsxs("div", { className: className, ...styleToProps(containerStyle), children: [filterSchemaIsLoaded &&
|
|
560
|
+
!hideAdminErrors &&
|
|
561
|
+
!hideFilters &&
|
|
562
|
+
filterSchema &&
|
|
563
|
+
filterSchema.columns.length === 0 && (_jsx("div", { style: { marginBottom: 10 }, children: _jsx(QuillErrorMessageComponent, { errorMessage: "Warning: No custom filter options because there are no common views among the charts in the dashboard" }) })), !hideFilters && (_jsxs(FilterContainerComponent, { children: [adminFilters.map((filter, index) => (_jsx(DashboardFilter, { filter: filter, onChangeFilter: updateFilter, theme: theme, SelectComponent: SelectComponent, MultiSelectComponent: MultiSelectComponent, DateRangePickerComponent: DateRangePickerComponent }, index))), _jsxs("div", { style: {
|
|
564
|
+
display: 'flex',
|
|
565
|
+
flexDirection: 'column',
|
|
566
|
+
}, children: [_jsx(SecondaryButtonComponent, { onClick: () => {
|
|
567
|
+
if (fieldValuesIsLoaded) {
|
|
568
|
+
setAddFilterPopoverIsOpen(true);
|
|
569
|
+
setFilterListIsOpen(false);
|
|
570
|
+
}
|
|
571
|
+
}, label: `Add Filter` }), _jsx(PopoverComponent, { isOpen: addFilterPopoverIsOpen, setIsOpen: setAddFilterPopoverIsOpen, popoverTitle: "Add Filter", popoverChildren: _jsx(FilterModal, { schema: filterSchema, fieldValuesMap: fieldValuesMap, onSubmitFilter: (filter) => {
|
|
572
|
+
setAddFilterPopoverIsOpen(false);
|
|
573
|
+
updateUserFilter(filter, appliedFilters.length);
|
|
574
|
+
}, onDeleteFilter: () => { }, ButtonComponent: ButtonComponent, SelectComponent: SelectComponent, MultiSelectComponent: MultiSelectComponent, TextInputComponent: TextInputComponent }), containerStyle: { position: 'relative', top: 10 } })] }), userFilters.length > 0 && (_jsx(UserFilterModalComponent, { triggerLabel: `Filters${userFilters.length > 0 ? ` (${userFilters.length})` : ''}`, isOpen: filterListIsOpen, setIsOpen: setFilterListIsOpen, title: "Filters", children: _jsxs("div", { style: {
|
|
575
|
+
display: 'flex',
|
|
576
|
+
flexDirection: 'column',
|
|
577
|
+
alignItems: 'start',
|
|
578
|
+
}, children: [userFilters.map((filter, index) => (_jsx(FilterPopoverWrapper, { schema: filterSchema, filter: {
|
|
579
|
+
name: filter.name,
|
|
580
|
+
type: filter.type,
|
|
581
|
+
field: filter.field,
|
|
582
|
+
operator: filter.operator,
|
|
583
|
+
value: filter.value,
|
|
584
|
+
}, filterLabel: filter ? filterSentence(filter) : '', index: index, fieldValuesMap: fieldValuesMap, customOperatorOptions: customOperatorOptions, FilterTagComponent: FilterTagComponent, FilterModal: FilterModal, ButtonComponent: ButtonComponent, SecondaryButtonComponent: SecondaryButtonComponent, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, MultiSelectComponent: MultiSelectComponent, handleFilterSave: (newFilter) => {
|
|
585
|
+
const updatedFilter = getUserFilter(newFilter, filter._id, filter);
|
|
586
|
+
const updateIndex = appliedFilters.findIndex((val) => {
|
|
587
|
+
return val._id === filter._id;
|
|
588
|
+
});
|
|
589
|
+
dashboardFiltersDispatch({
|
|
590
|
+
type: 'UPDATE_DASHBOARD_FILTER',
|
|
591
|
+
id: updatedFilter._id,
|
|
592
|
+
data: updateFilter,
|
|
593
|
+
});
|
|
594
|
+
setAppliedFilters([
|
|
595
|
+
...appliedFilters.slice(0, updateIndex),
|
|
596
|
+
updatedFilter,
|
|
597
|
+
...appliedFilters.slice(updateIndex + 1),
|
|
598
|
+
]);
|
|
599
|
+
}, handleFilterDelete: () => {
|
|
600
|
+
const deleteIndex = appliedFilters.findIndex((val) => {
|
|
601
|
+
return val._id === filter._id;
|
|
602
|
+
});
|
|
603
|
+
dashboardFiltersDispatch({
|
|
604
|
+
type: 'DELETE_DASHBOARD_FILTER',
|
|
605
|
+
id: appliedFilters[deleteIndex]._id,
|
|
606
|
+
});
|
|
607
|
+
setAppliedFilters([
|
|
608
|
+
...appliedFilters.slice(0, deleteIndex),
|
|
609
|
+
...appliedFilters.slice(deleteIndex + 1),
|
|
610
|
+
]);
|
|
611
|
+
}, containerStyle: { width: 300, marginBottom: 10 } }, `userFilter_${index}`))), _jsxs("div", { style: {
|
|
612
|
+
display: 'flex',
|
|
613
|
+
flexDirection: 'column',
|
|
614
|
+
}, children: [_jsx(SecondaryButtonComponent, { onClick: () => {
|
|
615
|
+
if (fieldValuesIsLoaded) {
|
|
616
|
+
setFilterListAddFilterPopoverIsOpen(true);
|
|
617
|
+
}
|
|
618
|
+
}, label: `Add Filter` }), _jsx(PopoverComponent, { isOpen: filterListAddFilterPopoverIsOpen, setIsOpen: setFilterListAddFilterPopoverIsOpen, popoverTitle: "Add Filter", popoverChildren: _jsx(FilterModal, { schema: filterSchema, fieldValuesMap: fieldValuesMap, onSubmitFilter: (filter) => {
|
|
619
|
+
setFilterListAddFilterPopoverIsOpen(false);
|
|
620
|
+
setFilterListIsOpen(false);
|
|
621
|
+
const id = uniqueCounter;
|
|
622
|
+
setUniqueCounter(uniqueCounter + 1);
|
|
623
|
+
updateUserFilter(filter, id);
|
|
624
|
+
}, onDeleteFilter: () => { }, ButtonComponent: ButtonComponent, SelectComponent: SelectComponent, MultiSelectComponent: MultiSelectComponent, TextInputComponent: TextInputComponent }), containerStyle: { position: 'relative', top: 10 } })] })] }) }))] })), Object.keys(dashboardSections)
|
|
389
625
|
.sort(function (a, b) {
|
|
390
626
|
return a.length - b.length;
|
|
391
627
|
})
|
|
@@ -399,31 +635,26 @@ export default function Dashboard({ name, hidden = false, SelectComponent = Quil
|
|
|
399
635
|
textAlign: 'left',
|
|
400
636
|
marginTop: 12,
|
|
401
637
|
}, children: section })] })), metrics(section).length > 0 && (_jsx(DashboardSectionComponent, { section: "metrics", children: metrics(section).map((item, index) => {
|
|
402
|
-
return (_jsx(DataLoader, {
|
|
638
|
+
return (_jsx(DataLoader, { item: item, filters: appliedFilters, children: ({ isLoading, error, data }) => (_jsx(MetricComponent, { error: error, isLoading: isLoading, report: data, onClick: !isLoading && onClickReport
|
|
403
639
|
? () => handleOnClickDashboardItem({
|
|
404
640
|
...item,
|
|
405
641
|
...data,
|
|
406
642
|
})
|
|
407
|
-
:
|
|
408
|
-
}) })), charts(section).length > 0 && (_jsx(DashboardSectionComponent, { section: "charts", children: charts(section).map((item, index) => (_jsx(ChartDataLoader, {
|
|
643
|
+
: () => { } }, item.name + '' + index)) }, `${item._id}${index}`));
|
|
644
|
+
}) })), charts(section).length > 0 && (_jsx(DashboardSectionComponent, { section: "charts", children: charts(section).map((item, index) => (_jsx(ChartDataLoader, { item: item, dateBucket: dateBucket, additionalProcessing: additionalProcessing, filters: appliedFilters, children: ({ isLoading, data, error, dateBucket, }) => (_jsx(ChartComponent, { report: data, error: error, onClick: () => {
|
|
409
645
|
if (!isLoading && onClickReport) {
|
|
410
646
|
handleOnClickDashboardItem({
|
|
411
647
|
...item,
|
|
412
648
|
...data,
|
|
413
649
|
});
|
|
414
650
|
}
|
|
415
|
-
}, onClickChartElement: onClickChartElement, isLoading: isLoading, dateBucket: dateBucket, children: error ? (_jsx(ErrorComponent, { label: error })) : (_jsx(
|
|
651
|
+
}, onClickChartElement: onClickChartElement, isLoading: isLoading, dateBucket: dateBucket, children: error ? (_jsx(ErrorComponent, { label: error })) : (_jsx(ChartDisplay, { reportId: data.id, config: data, loading: isLoading, containerStyle: chartContainerStyle, colors: theme.chartColors?.length
|
|
416
652
|
? theme.chartColors
|
|
417
|
-
: undefined, hideXAxis: hideXAxis, hideYAxis: hideYAxis, hideCartesianGrid: hideCartesianGrid, comparisonLineStyle: comparisonLineStyle, onClickChartElement: onClickChartElement
|
|
418
|
-
...data,
|
|
419
|
-
name: item.name,
|
|
420
|
-
}, isLoading: isLoading, error: error, onClick: !isLoading && onClickReport
|
|
653
|
+
: undefined, hideXAxis: hideXAxis, hideYAxis: hideYAxis, hideCartesianGrid: hideCartesianGrid, comparisonLineStyle: comparisonLineStyle, onClickChartElement: onClickChartElement })) }, item.name + '' + index)) }, `${item._id}${index}`))) })), tables(section).length > 0 && (_jsx(DashboardSectionComponent, { section: "tables", children: tables(section).map((item, index) => (_jsx(DataLoader, { item: item, filters: appliedFilters, children: ({ isLoading, error, onPageChange, onSortChange, data, }) => (_jsx(TableComponent, { report: data, isLoading: isLoading, error: error, onClick: !isLoading && onClickReport
|
|
421
654
|
? () => handleOnClickDashboardItem({
|
|
422
655
|
...item,
|
|
423
656
|
...data,
|
|
424
657
|
})
|
|
425
|
-
: undefined, rowCount: data?.
|
|
426
|
-
? data?.pivotRows.length
|
|
427
|
-
: data?.rowCount, onPageChange: (page) => onPageChange(page), onSortChange: (sort) => onSortChange(sort) })) }, `${item.name}${index}`))) }))] }, section + '' + sectionIndex));
|
|
658
|
+
: undefined, rowCount: data?.rowCount ? data?.rowCount : data?.rows.length, onPageChange: (page) => onPageChange(page), onSortChange: (sort) => onSortChange(sort) })) }, `${item._id}${index}`))) }))] }, section + '' + sectionIndex));
|
|
428
659
|
})] }));
|
|
429
660
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DateRangePicker.d.ts","sourceRoot":"","sources":["../../../src/DateRangePicker/DateRangePicker.tsx"],"names":[],"mappings":";AACA,OAAO,KAA2B,MAAM,OAAO,CAAC;AAGhD,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAsBvC,MAAM,MAAM,MAAM,GAAG,OAAO,IAAI,CAAC;AAEjC,MAAM,MAAM,oBAAoB,GAAG;IACjC,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;IACd,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;IACd,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CACjB,CAAC;AACF,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,CAAC,IAAI,GAAG,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC,CAAC;AAEnD,MAAM,WAAW,oBACf,SAAQ,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE,OAAO,GAAG,cAAc,CAAC;IAC5E,KAAK,CAAC,EAAE,oBAAoB,CAAC;IAC7B,YAAY,CAAC,EAAE,oBAAoB,CAAC;IACpC,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAC;IAC/C,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,CAAC,EAAE,qBAAqB,EAAE,CAAC;IACxC,OAAO,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IACtB,OAAO,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,GAAG,CAAC;CACZ;AAED,QAAA,MAAM,eAAe,
|
|
1
|
+
{"version":3,"file":"DateRangePicker.d.ts","sourceRoot":"","sources":["../../../src/DateRangePicker/DateRangePicker.tsx"],"names":[],"mappings":";AACA,OAAO,KAA2B,MAAM,OAAO,CAAC;AAGhD,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAsBvC,MAAM,MAAM,MAAM,GAAG,OAAO,IAAI,CAAC;AAEjC,MAAM,MAAM,oBAAoB,GAAG;IACjC,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;IACd,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;IACd,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CACjB,CAAC;AACF,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,IAAI,CAAC;IACjB,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,CAAC,IAAI,GAAG,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC,CAAC;AAEnD,MAAM,WAAW,oBACf,SAAQ,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE,OAAO,GAAG,cAAc,CAAC;IAC5E,KAAK,CAAC,EAAE,oBAAoB,CAAC;IAC7B,YAAY,CAAC,EAAE,oBAAoB,CAAC;IACpC,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAC;IAC/C,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,CAAC,EAAE,qBAAqB,EAAE,CAAC;IACxC,OAAO,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IACtB,OAAO,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,GAAG,CAAC;CACZ;AAED,QAAA,MAAM,eAAe,6FA6NpB,CAAC;AAEF,eAAe,eAAe,CAAC"}
|
|
@@ -54,32 +54,6 @@ const DateRangePicker = React.forwardRef((props, ref) => {
|
|
|
54
54
|
setSelectedValue([startDateInCalendar, date, null]);
|
|
55
55
|
return;
|
|
56
56
|
}
|
|
57
|
-
// if (!selectedStartDate) {
|
|
58
|
-
// console.log('1');
|
|
59
|
-
// onChangeDateRange([date, selectedEndDate]);
|
|
60
|
-
// onChangePreset(null);
|
|
61
|
-
// setSelectedValue([date, selectedEndDate, null]);
|
|
62
|
-
// } else if (selectedStartDate && !selectedEndDate) {
|
|
63
|
-
// console.log('2');
|
|
64
|
-
// if (date < selectedStartDate) {
|
|
65
|
-
// console.log('3');
|
|
66
|
-
// onChangeDateRange?.([date, selectedEndDate]);
|
|
67
|
-
// onChangePreset(null);
|
|
68
|
-
// setSelectedValue([date, selectedEndDate, null]);
|
|
69
|
-
// // Selection complete
|
|
70
|
-
// } else {
|
|
71
|
-
// console.log('4');
|
|
72
|
-
// onChangeDateRange([selectedStartDate, date]);
|
|
73
|
-
// onChangePreset(null);
|
|
74
|
-
// setSelectedValue([selectedStartDate, date, null]);
|
|
75
|
-
// setShowCalendar(false);
|
|
76
|
-
// }
|
|
77
|
-
// } else if (selectedStartDate && selectedEndDate) {
|
|
78
|
-
// console.log('5: ', { selectedStartDate, selectedEndDate });
|
|
79
|
-
// onChangeDateRange([date, null]);
|
|
80
|
-
// onChangePreset(null);
|
|
81
|
-
// setSelectedValue([date, null, null]);
|
|
82
|
-
// }
|
|
83
57
|
};
|
|
84
58
|
const handleCalendarKeyDown = (e) => {
|
|
85
59
|
if (e.key === 'Escape') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReportBuilder.d.ts","sourceRoot":"","sources":["../../src/ReportBuilder.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAEb,SAAS,EAKV,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"ReportBuilder.d.ts","sourceRoot":"","sources":["../../src/ReportBuilder.tsx"],"names":[],"mappings":"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"}
|