@quillsql/react 2.13.2 → 2.13.3
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 +3 -13
- package/dist/cjs/ChartBuilder.d.ts +1 -1
- package/dist/cjs/ChartBuilder.d.ts.map +1 -1
- package/dist/cjs/ChartBuilder.js +2 -2
- package/dist/cjs/ChartEditor.d.ts.map +1 -1
- package/dist/cjs/ChartEditor.js +1 -3
- package/dist/cjs/Context.d.ts +51 -15
- package/dist/cjs/Context.d.ts.map +1 -1
- package/dist/cjs/Context.js +30 -23
- package/dist/cjs/Dashboard.d.ts +1 -1
- package/dist/cjs/Dashboard.d.ts.map +1 -1
- package/dist/cjs/Dashboard.js +39 -39
- package/dist/cjs/DateRangePicker/QuillDateRangePicker.js +1 -1
- package/dist/cjs/ReportBuilder.d.ts.map +1 -1
- package/dist/cjs/ReportBuilder.js +179 -114
- package/dist/cjs/SQLEditor.d.ts.map +1 -1
- package/dist/cjs/SQLEditor.js +18 -11
- package/dist/cjs/Table.js +1 -1
- package/dist/cjs/components/Dashboard/DashboardFilter.js +1 -1
- package/dist/cjs/components/Dashboard/DataLoader.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/DataLoader.js +4 -3
- package/dist/cjs/components/Dashboard/MetricComponent.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/MetricComponent.js +14 -3
- package/dist/cjs/components/QuillMultiSelectWithCombo.d.ts +1 -1
- package/dist/cjs/components/QuillMultiSelectWithCombo.d.ts.map +1 -1
- package/dist/cjs/components/QuillMultiSelectWithCombo.js +6 -2
- package/dist/cjs/components/QuillSelect.js +3 -3
- package/dist/cjs/components/QuillSelectWithCombo.d.ts +1 -1
- package/dist/cjs/components/QuillSelectWithCombo.d.ts.map +1 -1
- package/dist/cjs/components/QuillSelectWithCombo.js +13 -3
- package/dist/cjs/components/ReportBuilder/FilterStack.d.ts +33 -0
- package/dist/cjs/components/ReportBuilder/FilterStack.d.ts.map +1 -0
- package/dist/cjs/components/ReportBuilder/FilterStack.js +121 -0
- package/dist/cjs/components/UiComponents.d.ts +1 -0
- package/dist/cjs/components/UiComponents.d.ts.map +1 -1
- package/dist/cjs/hooks/useDashboard.d.ts.map +1 -1
- package/dist/cjs/hooks/useDashboard.js +41 -46
- package/dist/cjs/hooks/useExport.d.ts +14 -1
- package/dist/cjs/hooks/useExport.d.ts.map +1 -1
- package/dist/cjs/hooks/useExport.js +120 -38
- package/dist/cjs/models/Client.d.ts +2 -0
- package/dist/cjs/models/Client.d.ts.map +1 -1
- package/dist/cjs/models/Filter.d.ts +1 -1
- package/dist/cjs/models/Filter.d.ts.map +1 -1
- package/dist/cjs/utils/client.d.ts.map +1 -1
- package/dist/cjs/utils/client.js +1 -0
- package/dist/cjs/utils/dashboard.d.ts.map +1 -1
- package/dist/cjs/utils/dashboard.js +3 -1
- package/dist/cjs/utils/filterProcessing.d.ts +1 -1
- package/dist/cjs/utils/filterProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/filterProcessing.js +3 -3
- package/dist/esm/Chart.d.ts.map +1 -1
- package/dist/esm/Chart.js +3 -13
- package/dist/esm/ChartBuilder.d.ts +1 -1
- package/dist/esm/ChartBuilder.d.ts.map +1 -1
- package/dist/esm/ChartBuilder.js +2 -2
- package/dist/esm/ChartEditor.d.ts.map +1 -1
- package/dist/esm/ChartEditor.js +1 -3
- package/dist/esm/Context.d.ts +51 -15
- package/dist/esm/Context.d.ts.map +1 -1
- package/dist/esm/Context.js +29 -22
- package/dist/esm/Dashboard.d.ts +1 -1
- package/dist/esm/Dashboard.d.ts.map +1 -1
- package/dist/esm/Dashboard.js +41 -41
- package/dist/esm/DateRangePicker/QuillDateRangePicker.js +1 -1
- package/dist/esm/ReportBuilder.d.ts.map +1 -1
- package/dist/esm/ReportBuilder.js +182 -117
- package/dist/esm/SQLEditor.d.ts.map +1 -1
- package/dist/esm/SQLEditor.js +18 -11
- package/dist/esm/Table.js +1 -1
- package/dist/esm/components/Dashboard/DashboardFilter.js +1 -1
- package/dist/esm/components/Dashboard/DataLoader.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/DataLoader.js +4 -3
- package/dist/esm/components/Dashboard/MetricComponent.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/MetricComponent.js +14 -3
- package/dist/esm/components/QuillMultiSelectWithCombo.d.ts +1 -1
- package/dist/esm/components/QuillMultiSelectWithCombo.d.ts.map +1 -1
- package/dist/esm/components/QuillMultiSelectWithCombo.js +6 -2
- package/dist/esm/components/QuillSelect.js +3 -3
- package/dist/esm/components/QuillSelectWithCombo.d.ts +1 -1
- package/dist/esm/components/QuillSelectWithCombo.d.ts.map +1 -1
- package/dist/esm/components/QuillSelectWithCombo.js +13 -3
- package/dist/esm/components/ReportBuilder/FilterStack.d.ts +33 -0
- package/dist/esm/components/ReportBuilder/FilterStack.d.ts.map +1 -0
- package/dist/esm/components/ReportBuilder/FilterStack.js +118 -0
- package/dist/esm/components/UiComponents.d.ts +1 -0
- package/dist/esm/components/UiComponents.d.ts.map +1 -1
- package/dist/esm/hooks/useDashboard.d.ts.map +1 -1
- package/dist/esm/hooks/useDashboard.js +41 -46
- package/dist/esm/hooks/useExport.d.ts +14 -1
- package/dist/esm/hooks/useExport.d.ts.map +1 -1
- package/dist/esm/hooks/useExport.js +122 -40
- package/dist/esm/models/Client.d.ts +2 -0
- package/dist/esm/models/Client.d.ts.map +1 -1
- package/dist/esm/models/Filter.d.ts +1 -1
- package/dist/esm/models/Filter.d.ts.map +1 -1
- package/dist/esm/utils/client.d.ts.map +1 -1
- package/dist/esm/utils/client.js +1 -0
- package/dist/esm/utils/dashboard.d.ts.map +1 -1
- package/dist/esm/utils/dashboard.js +3 -1
- package/dist/esm/utils/filterProcessing.d.ts +1 -1
- package/dist/esm/utils/filterProcessing.d.ts.map +1 -1
- package/dist/esm/utils/filterProcessing.js +3 -3
- package/package.json +3 -3
|
@@ -63,8 +63,8 @@ export function QuillSelectComponent({ options, value, width, onChange, label, i
|
|
|
63
63
|
}, className: "quill-select-button", onClick: () => setShowModal((showModal) => !showModal), disabled: disabled, children: [_jsx("style", { children: `
|
|
64
64
|
.quill-select-button { background: ${theme?.backgroundColor}; }
|
|
65
65
|
.quill-select-button:hover { background: ${theme?.hoverBackgroundColor}; }
|
|
66
|
-
.quill-select-button:disabled {
|
|
67
|
-
|
|
66
|
+
.quill-select-button:disabled, {
|
|
67
|
+
background: ${theme?.hoverBackgroundColor};
|
|
68
68
|
cursor: not-allowed;
|
|
69
69
|
}
|
|
70
70
|
` }), _jsx("span", { style: {
|
|
@@ -91,7 +91,7 @@ export function QuillSelectComponent({ options, value, width, onChange, label, i
|
|
|
91
91
|
fontFamily: theme?.fontFamily,
|
|
92
92
|
maxHeight: '50vh',
|
|
93
93
|
overflow: 'scroll',
|
|
94
|
-
}, children: [!isLoading && !hideEmptyOption && (_jsxs("button", { style: {
|
|
94
|
+
}, children: [!isLoading && (!hideEmptyOption || !options.length) && (_jsxs("button", { style: {
|
|
95
95
|
display: 'flex',
|
|
96
96
|
alignItems: 'center',
|
|
97
97
|
justifyContent: 'space-between',
|
|
@@ -2,5 +2,5 @@ import { SelectComponentProps } from './UiComponents';
|
|
|
2
2
|
/**
|
|
3
3
|
* A robust select component that implements the new minimal Select interface.
|
|
4
4
|
*/
|
|
5
|
-
export declare function QuillSelectComponentWithCombo({ options, value, width, onChange, label, isLoading, hideEmptyOption, }: SelectComponentProps): import("react/jsx-runtime").JSX.Element;
|
|
5
|
+
export declare function QuillSelectComponentWithCombo({ options, value, width, onChange, label, isLoading, hideEmptyOption, disabled, }: SelectComponentProps): import("react/jsx-runtime").JSX.Element;
|
|
6
6
|
//# sourceMappingURL=QuillSelectWithCombo.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QuillSelectWithCombo.d.ts","sourceRoot":"","sources":["../../../src/components/QuillSelectWithCombo.tsx"],"names":[],"mappings":"AACA,OAAO,EAAkB,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAWtE;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,EAC5C,OAAO,EACP,KAAK,EACL,KAAK,EACL,QAAQ,EACR,KAAK,EACL,SAAS,EACT,eAAe,
|
|
1
|
+
{"version":3,"file":"QuillSelectWithCombo.d.ts","sourceRoot":"","sources":["../../../src/components/QuillSelectWithCombo.tsx"],"names":[],"mappings":"AACA,OAAO,EAAkB,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAWtE;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,EAC5C,OAAO,EACP,KAAK,EACL,KAAK,EACL,QAAQ,EACR,KAAK,EACL,SAAS,EACT,eAAe,EACf,QAAQ,GACT,EAAE,oBAAoB,2CAyRtB"}
|
|
@@ -7,7 +7,7 @@ import { ListboxTextInput } from './QuillMultiSelectWithCombo';
|
|
|
7
7
|
/**
|
|
8
8
|
* A robust select component that implements the new minimal Select interface.
|
|
9
9
|
*/
|
|
10
|
-
export function QuillSelectComponentWithCombo({ options, value, width, onChange, label, isLoading, hideEmptyOption, }) {
|
|
10
|
+
export function QuillSelectComponentWithCombo({ options, value, width, onChange, label, isLoading, hideEmptyOption, disabled, }) {
|
|
11
11
|
const [theme] = useContext(ThemeContext);
|
|
12
12
|
const [showModal, setShowModal] = useState(false);
|
|
13
13
|
const modalRef = useRef(null);
|
|
@@ -90,7 +90,15 @@ export function QuillSelectComponentWithCombo({ options, value, width, onChange,
|
|
|
90
90
|
height: 40,
|
|
91
91
|
minHeight: 40,
|
|
92
92
|
maxHeight: 40,
|
|
93
|
-
}, className:
|
|
93
|
+
}, className: 'quill-select-button', onClick: () => setShowModal((showModal) => !showModal), disabled: disabled, children: [_jsx("style", { children: `
|
|
94
|
+
.quill-select-button { background: ${theme?.backgroundColor}; }
|
|
95
|
+
.quill-select-button:hover { background: ${theme?.hoverBackgroundColor}; }
|
|
96
|
+
.quill-select-button:disabled {
|
|
97
|
+
cursor: not-allowed;
|
|
98
|
+
background: ${theme?.hoverBackgroundColor};
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
` }), _jsx("span", { style: {
|
|
94
102
|
textOverflow: 'ellipsis',
|
|
95
103
|
whiteSpace: 'nowrap',
|
|
96
104
|
overflow: 'hidden',
|
|
@@ -117,7 +125,9 @@ export function QuillSelectComponentWithCombo({ options, value, width, onChange,
|
|
|
117
125
|
fontSize: 14,
|
|
118
126
|
}, children: [options && options.length > 20 && !isLoading && (_jsx(ListboxTextInput, { value: searchQuery, placeholder: "Search", onChange: (value) => {
|
|
119
127
|
setSearchQuery(value);
|
|
120
|
-
} })), searchQuery === '' &&
|
|
128
|
+
} })), searchQuery === '' &&
|
|
129
|
+
!isLoading &&
|
|
130
|
+
(!hideEmptyOption || !options.length) && (_jsxs("button", { style: {
|
|
121
131
|
display: 'flex',
|
|
122
132
|
alignItems: 'center',
|
|
123
133
|
justifyContent: 'space-between',
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { FilterTreeNode } from '../../utils/astFilterProcessing';
|
|
2
|
+
interface FilterStackProps {
|
|
3
|
+
client: any;
|
|
4
|
+
filterStack: FilterTreeNode[];
|
|
5
|
+
filterTree: FilterTreeNode | null;
|
|
6
|
+
defaultAST: any;
|
|
7
|
+
baseAst: any;
|
|
8
|
+
setBaseAst: any;
|
|
9
|
+
setFormData: any;
|
|
10
|
+
fetchSqlQuery: any;
|
|
11
|
+
schemaData: any;
|
|
12
|
+
defaultColumn: any;
|
|
13
|
+
defaultTable: any;
|
|
14
|
+
currentTable: any;
|
|
15
|
+
initialTableName: string;
|
|
16
|
+
globalUniqueValues: any;
|
|
17
|
+
globalUniqueValuesIsLoading: boolean;
|
|
18
|
+
columns: any;
|
|
19
|
+
removingFilter: any;
|
|
20
|
+
setRemovingFilter: any;
|
|
21
|
+
TabsComponent: any;
|
|
22
|
+
FilterPopoverComponent: any;
|
|
23
|
+
FilterModal: any;
|
|
24
|
+
ButtonComponent: any;
|
|
25
|
+
SecondaryButtonComponent: any;
|
|
26
|
+
SelectComponent: any;
|
|
27
|
+
TextInputComponent: any;
|
|
28
|
+
MultiSelectComponent: any;
|
|
29
|
+
actionsEnabled: boolean;
|
|
30
|
+
}
|
|
31
|
+
export default function FilterStack({ client, filterStack, filterTree, defaultAST, baseAst, setBaseAst, setFormData, fetchSqlQuery, schemaData, defaultColumn, defaultTable, currentTable, initialTableName, globalUniqueValues, globalUniqueValuesIsLoading, columns, removingFilter, setRemovingFilter, TabsComponent, FilterPopoverComponent, FilterModal, ButtonComponent, SecondaryButtonComponent, SelectComponent, TextInputComponent, MultiSelectComponent, actionsEnabled, }: FilterStackProps): import("react/jsx-runtime").JSX.Element;
|
|
32
|
+
export {};
|
|
33
|
+
//# sourceMappingURL=FilterStack.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"FilterStack.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/FilterStack.tsx"],"names":[],"mappings":"AAGA,OAAO,EACL,cAAc,EAEf,MAAM,iCAAiC,CAAC;AAUzC,UAAU,gBAAgB;IACxB,MAAM,EAAE,GAAG,CAAC;IACZ,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B,UAAU,EAAE,cAAc,GAAG,IAAI,CAAC;IAClC,UAAU,EAAE,GAAG,CAAC;IAChB,OAAO,EAAE,GAAG,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;IAChB,WAAW,EAAE,GAAG,CAAC;IACjB,aAAa,EAAE,GAAG,CAAC;IACnB,UAAU,EAAE,GAAG,CAAC;IAChB,aAAa,EAAE,GAAG,CAAC;IACnB,YAAY,EAAE,GAAG,CAAC;IAClB,YAAY,EAAE,GAAG,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,kBAAkB,EAAE,GAAG,CAAC;IACxB,2BAA2B,EAAE,OAAO,CAAC;IACrC,OAAO,EAAE,GAAG,CAAC;IACb,cAAc,EAAE,GAAG,CAAC;IACpB,iBAAiB,EAAE,GAAG,CAAC;IACvB,aAAa,EAAE,GAAG,CAAC;IACnB,sBAAsB,EAAE,GAAG,CAAC;IAC5B,WAAW,EAAE,GAAG,CAAC;IACjB,eAAe,EAAE,GAAG,CAAC;IACrB,wBAAwB,EAAE,GAAG,CAAC;IAC9B,eAAe,EAAE,GAAG,CAAC;IACrB,kBAAkB,EAAE,GAAG,CAAC;IACxB,oBAAoB,EAAE,GAAG,CAAC;IAC1B,cAAc,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,MAAM,EACN,WAAW,EACX,UAAU,EACV,UAAU,EACV,OAAO,EACP,UAAU,EACV,WAAW,EACX,aAAa,EACb,UAAU,EACV,aAAa,EACb,YAAY,EACZ,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EAClB,2BAA2B,EAC3B,OAAO,EACP,cAAc,EACd,iBAAiB,EACjB,aAAa,EACb,sBAAsB,EACtB,WAAW,EACX,eAAe,EACf,wBAAwB,EACxB,eAAe,EACf,kBAAkB,EAClB,oBAAoB,EACpB,cAAqB,GACtB,EAAE,gBAAgB,2CAgLlB"}
|
|
@@ -0,0 +1,118 @@
|
|
|
1
|
+
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
+
import { QUILL_SERVER } from '../../ReportBuilder';
|
|
3
|
+
import { filterTreeToAst, } from '../../utils/astFilterProcessing';
|
|
4
|
+
import { getAllPossibleColumns } from '../../utils/astProcessing';
|
|
5
|
+
import { filterSentence, filterStackToFilterTree, } from '../../utils/filterProcessing';
|
|
6
|
+
import { DEFAULT_TAB_OPTIONS } from '../UiComponents';
|
|
7
|
+
import { FilterPopoverWrapper } from './ui';
|
|
8
|
+
import { deepCopy } from './util';
|
|
9
|
+
export default function FilterStack({ client, filterStack, filterTree, defaultAST, baseAst, setBaseAst, setFormData, fetchSqlQuery, schemaData, defaultColumn, defaultTable, currentTable, initialTableName, globalUniqueValues, globalUniqueValuesIsLoading, columns, removingFilter, setRemovingFilter, TabsComponent, FilterPopoverComponent, FilterModal, ButtonComponent, SecondaryButtonComponent, SelectComponent, TextInputComponent, MultiSelectComponent, actionsEnabled = true, }) {
|
|
10
|
+
return (_jsx("div", { style: {
|
|
11
|
+
display: 'flex',
|
|
12
|
+
flexDirection: 'column',
|
|
13
|
+
}, children: filterStack.map((item, index) => {
|
|
14
|
+
if (!item.leaf && (item.operator === 'and' || item.operator === 'or')) {
|
|
15
|
+
return (_jsx("div", { style: {
|
|
16
|
+
width: 'fit-content',
|
|
17
|
+
marginBottom: '8px',
|
|
18
|
+
marginTop: '8px',
|
|
19
|
+
}, children: _jsx(TabsComponent, { value: item.operator.toUpperCase(), options: DEFAULT_TAB_OPTIONS, onChange: () => {
|
|
20
|
+
if (item.operator === 'and') {
|
|
21
|
+
item.operator = 'or';
|
|
22
|
+
}
|
|
23
|
+
else {
|
|
24
|
+
item.operator = 'and';
|
|
25
|
+
}
|
|
26
|
+
let newFormData = null;
|
|
27
|
+
if (filterTree) {
|
|
28
|
+
newFormData = filterTreeToAst(filterTree, client.databaseType.toLowerCase());
|
|
29
|
+
}
|
|
30
|
+
const newAst = deepCopy({
|
|
31
|
+
...defaultAST,
|
|
32
|
+
...baseAst,
|
|
33
|
+
...(!baseAst?.columns && {
|
|
34
|
+
columns: getAllPossibleColumns(baseAst, schemaData.schema).map((c) => {
|
|
35
|
+
const newColumn = deepCopy(defaultColumn);
|
|
36
|
+
newColumn.expr.column = c.field;
|
|
37
|
+
return newColumn;
|
|
38
|
+
}),
|
|
39
|
+
}),
|
|
40
|
+
...(!baseAst?.from && {
|
|
41
|
+
from: [{ ...defaultTable, table: initialTableName }],
|
|
42
|
+
}),
|
|
43
|
+
where: newFormData,
|
|
44
|
+
});
|
|
45
|
+
setBaseAst(newAst);
|
|
46
|
+
setFormData(newFormData);
|
|
47
|
+
fetchSqlQuery(newAst, newFormData);
|
|
48
|
+
} }) }, index));
|
|
49
|
+
}
|
|
50
|
+
else if (item.value) {
|
|
51
|
+
return (_jsx(FilterPopoverWrapper, { schema: schemaData.schema.find((s) => s.name === currentTable || s.displayName === currentTable) ?? schemaData.schema[0], filter: item.value, filterLabel: item.value ? filterSentence(item.value) : '', index: index, FilterTagComponent: FilterPopoverComponent, FilterModal: FilterModal, fieldValuesMap: globalUniqueValues, fieldValuesMapIsLoading: globalUniqueValuesIsLoading, priorFilters: filterStack.slice(0, index > 0 ? index - 1 : 0), columns: columns, client: client, customFields: schemaData.customFields, baseAst: baseAst, endpoint: QUILL_SERVER, ButtonComponent: ButtonComponent, SecondaryButtonComponent: SecondaryButtonComponent, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, MultiSelectComponent: MultiSelectComponent, handleFilterSave: (filter) => {
|
|
52
|
+
item.value = filter;
|
|
53
|
+
let newFormData = null;
|
|
54
|
+
if (filterTree) {
|
|
55
|
+
newFormData = filterTreeToAst(filterTree, client.databaseType.toLowerCase());
|
|
56
|
+
}
|
|
57
|
+
const newAst = deepCopy({
|
|
58
|
+
...defaultAST,
|
|
59
|
+
...baseAst,
|
|
60
|
+
...(!baseAst?.columns && {
|
|
61
|
+
columns: getAllPossibleColumns(baseAst, schemaData.schema).map((c) => {
|
|
62
|
+
const newColumn = deepCopy(defaultColumn);
|
|
63
|
+
newColumn.expr.column = c.field;
|
|
64
|
+
return newColumn;
|
|
65
|
+
}),
|
|
66
|
+
}),
|
|
67
|
+
...(!baseAst?.from && {
|
|
68
|
+
from: [{ ...defaultTable, table: initialTableName }],
|
|
69
|
+
}),
|
|
70
|
+
where: newFormData,
|
|
71
|
+
});
|
|
72
|
+
setBaseAst(newAst);
|
|
73
|
+
setFormData(newFormData);
|
|
74
|
+
fetchSqlQuery(newAst, newFormData);
|
|
75
|
+
}, handleFilterDelete: (i) => {
|
|
76
|
+
if (!removingFilter) {
|
|
77
|
+
setRemovingFilter(true);
|
|
78
|
+
const newStack = filterStack;
|
|
79
|
+
if (i > 0) {
|
|
80
|
+
newStack.splice(i - 1, 2);
|
|
81
|
+
}
|
|
82
|
+
else {
|
|
83
|
+
if (filterStack.length > 1) {
|
|
84
|
+
newStack.splice(i, 2);
|
|
85
|
+
}
|
|
86
|
+
else {
|
|
87
|
+
newStack.splice(i, 1);
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
const tree = filterStackToFilterTree(newStack);
|
|
91
|
+
let newFormData = null;
|
|
92
|
+
if (tree) {
|
|
93
|
+
newFormData = filterTreeToAst(tree, client.databaseType.toLowerCase());
|
|
94
|
+
}
|
|
95
|
+
const newAst = deepCopy({
|
|
96
|
+
...defaultAST,
|
|
97
|
+
...baseAst,
|
|
98
|
+
...(!baseAst?.columns && {
|
|
99
|
+
columns: getAllPossibleColumns(baseAst, schemaData.schema).map((c) => {
|
|
100
|
+
const newColumn = deepCopy(defaultColumn);
|
|
101
|
+
newColumn.expr.column = c.field;
|
|
102
|
+
return newColumn;
|
|
103
|
+
}),
|
|
104
|
+
}),
|
|
105
|
+
...(!baseAst?.from && {
|
|
106
|
+
from: [{ ...defaultTable, table: initialTableName }],
|
|
107
|
+
}),
|
|
108
|
+
where: newFormData,
|
|
109
|
+
});
|
|
110
|
+
setBaseAst(newAst);
|
|
111
|
+
setFormData(newFormData);
|
|
112
|
+
fetchSqlQuery(newAst, newFormData);
|
|
113
|
+
setRemovingFilter(false);
|
|
114
|
+
}
|
|
115
|
+
}, disabled: !actionsEnabled }, `filter_${index}_${item.value ? filterSentence(item.value) : ''}`));
|
|
116
|
+
}
|
|
117
|
+
}) }));
|
|
118
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UiComponents.d.ts","sourceRoot":"","sources":["../../../src/components/UiComponents.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"UiComponents.d.ts","sourceRoot":"","sources":["../../../src/components/UiComponents.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useDashboard.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDashboard.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAOpE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGnD,eAAO,MAAM,UAAU;gDAYC,mBAAmB,KAAK,OAAO;CAYtD,CAAC;AAEF,eAAO,MAAM,YAAY,kBAAmB,MAAM;;;;
|
|
1
|
+
{"version":3,"file":"useDashboard.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDashboard.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAOpE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGnD,eAAO,MAAM,UAAU;gDAYC,mBAAmB,KAAK,OAAO;CAYtD,CAAC;AAEF,eAAO,MAAM,YAAY,kBAAmB,MAAM;;;;2CA0PF,MAAM;;qCApO1B,MAAM,4CAEf;QACb,MAAM,EAAE,WAAW,GAAG;YAAE,EAAE,EAAE,MAAM,CAAA;SAAE,CAAC;QACrC,MAAM,EAAE,QAAQ,GAAG,QAAQ,CAAC;KAC7B,oBACiB;QAAE,OAAO,EAAE,eAAe,EAAE,CAAC;QAAC,iBAAiB,EAAE,MAAM,CAAA;KAAE;CA8O9E,CAAC"}
|
|
@@ -9,7 +9,7 @@ export const useReports = () => {
|
|
|
9
9
|
dispatch({
|
|
10
10
|
type: 'UPDATE_DASHBOARD_ITEM',
|
|
11
11
|
id: id,
|
|
12
|
-
data: {
|
|
12
|
+
data: { triggerReload: true },
|
|
13
13
|
});
|
|
14
14
|
};
|
|
15
15
|
const reloadFilteredReports = (predicate) => {
|
|
@@ -35,8 +35,6 @@ export const useDashboard = (dashboardName) => {
|
|
|
35
35
|
(dashboardConfig[dashboardName] &&
|
|
36
36
|
!dashboardConfig[dashboardName]?.sections), [isLoading, isClientLoading, dashboardConfig, dashboardName]);
|
|
37
37
|
const handleReload = async (overrideDashboardName, fetchFromServer = false, reportAction, overrideFilters) => {
|
|
38
|
-
if (!fetchFromServer && isLoading)
|
|
39
|
-
return;
|
|
40
38
|
if (overrideFilters) {
|
|
41
39
|
// Pull the date filter out of the override filters, process it, and append it to the filters
|
|
42
40
|
const dateFilter = overrideFilters.filters.find((f) => f.filterType === 'date_range');
|
|
@@ -114,56 +112,53 @@ export const useDashboard = (dashboardName) => {
|
|
|
114
112
|
]);
|
|
115
113
|
};
|
|
116
114
|
async function getDashboards(dashboardName, fetchFromServer = false, reportAction) {
|
|
117
|
-
|
|
115
|
+
let curDashboardConfig = dashboardConfig[dashboardName];
|
|
118
116
|
if (!fetchFromServer && curDashboardConfig?.sections) {
|
|
119
117
|
if (reportAction?.action === 'delete') {
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
reports.filter((report) => report.id !== reportAction.report.id),
|
|
128
|
-
])),
|
|
129
|
-
},
|
|
130
|
-
});
|
|
118
|
+
curDashboardConfig = {
|
|
119
|
+
...curDashboardConfig,
|
|
120
|
+
sections: Object.fromEntries(Object.entries(curDashboardConfig?.sections ?? {}).map(([sectionKey, reports]) => [
|
|
121
|
+
sectionKey,
|
|
122
|
+
reports.filter((report) => report.id !== reportAction.report.id),
|
|
123
|
+
])),
|
|
124
|
+
};
|
|
131
125
|
}
|
|
132
126
|
else if (reportAction?.action === 'upsert') {
|
|
133
127
|
const containsReport = Object.values(curDashboardConfig?.sections ?? {})
|
|
134
128
|
.flat()
|
|
135
|
-
.some((report) =>
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
report,
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
...
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
],
|
|
163
|
-
])),
|
|
164
|
-
},
|
|
165
|
-
});
|
|
129
|
+
.some((report) => report.id === reportAction?.report.id);
|
|
130
|
+
curDashboardConfig = {
|
|
131
|
+
...curDashboardConfig,
|
|
132
|
+
sections: Object.fromEntries(Object.entries(curDashboardConfig?.sections ?? {}).map(([sectionKey, reports]) => [
|
|
133
|
+
sectionKey,
|
|
134
|
+
containsReport
|
|
135
|
+
? reports.map((report) => {
|
|
136
|
+
return {
|
|
137
|
+
report,
|
|
138
|
+
...(reportAction?.report.id === report.id
|
|
139
|
+
? reportAction?.report
|
|
140
|
+
: dashboard[report.id]),
|
|
141
|
+
_id: report.id,
|
|
142
|
+
id: report.id,
|
|
143
|
+
};
|
|
144
|
+
})
|
|
145
|
+
: [
|
|
146
|
+
...(reports ?? []),
|
|
147
|
+
{
|
|
148
|
+
report: reportAction?.report,
|
|
149
|
+
...dashboard[reportAction?.report.id],
|
|
150
|
+
id: reportAction?.report.id,
|
|
151
|
+
_id: reportAction?.report.id,
|
|
152
|
+
},
|
|
153
|
+
],
|
|
154
|
+
])),
|
|
155
|
+
};
|
|
166
156
|
}
|
|
157
|
+
dashboardConfigContext({
|
|
158
|
+
type: 'UPDATE_DASHBOARD',
|
|
159
|
+
id: dashboardName,
|
|
160
|
+
data: curDashboardConfig,
|
|
161
|
+
});
|
|
167
162
|
setIsLoading(false);
|
|
168
163
|
return curDashboardConfig;
|
|
169
164
|
}
|
|
@@ -1,6 +1,19 @@
|
|
|
1
|
-
|
|
1
|
+
/// <reference types="react" />
|
|
2
|
+
import { QuillReport } from '../models/Report';
|
|
3
|
+
export declare const useExport: (reportId?: string, { CustomDocumentComponent, maximumRowsPerPage, sectionField, }?: {
|
|
4
|
+
CustomDocumentComponent?: ((props: QuillPDFProps) => JSX.Element) | undefined;
|
|
5
|
+
maximumRowsPerPage?: number | undefined;
|
|
6
|
+
sectionField?: string | undefined;
|
|
7
|
+
}) => {
|
|
2
8
|
downloadCSV: () => void;
|
|
3
9
|
downloadPDF: () => void;
|
|
4
10
|
isLoading: boolean;
|
|
5
11
|
};
|
|
12
|
+
interface QuillPDFProps {
|
|
13
|
+
report: QuillReport;
|
|
14
|
+
pageNumber: number;
|
|
15
|
+
numberOfPages: number;
|
|
16
|
+
maximumRowsPerPage: number;
|
|
17
|
+
}
|
|
18
|
+
export {};
|
|
6
19
|
//# sourceMappingURL=useExport.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useExport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useExport.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"useExport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useExport.tsx"],"names":[],"mappings":";AASA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAwD/C,eAAO,MAAM,SAAS,cACT,MAAM;uCAOmB,aAAa,KAAK,WAAW;;;;;;;CA2LlE,CAAC;AAEF,UAAU,aAAa;IACrB,MAAM,EAAE,WAAW,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;CAC5B"}
|
|
@@ -1,13 +1,16 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
import { downloadCSV } from '../utils/csv';
|
|
3
|
-
import { useContext,
|
|
3
|
+
import { useContext, useMemo, useState } from 'react';
|
|
4
4
|
import { getData } from '../utils/dataFetcher';
|
|
5
|
-
import { ClientContext,
|
|
6
|
-
import ReactDOM from 'react-dom';
|
|
7
|
-
import { quillFormat } from '../utils/valueFormatter';
|
|
5
|
+
import { ClientContext, DashboardContext, DashboardFiltersContext, } from '../Context';
|
|
8
6
|
import { cleanDashboardItem } from '../utils/dashboard';
|
|
9
|
-
import {
|
|
7
|
+
import { defaultQuillTheme } from '../QuillProvider';
|
|
8
|
+
import { createRoot } from 'react-dom/client';
|
|
9
|
+
import { flushSync } from 'react-dom';
|
|
10
10
|
import { ChartDisplay } from '../Chart';
|
|
11
|
+
import { fetchReport } from '../utils/report';
|
|
12
|
+
import jsPDF from 'jspdf';
|
|
13
|
+
import { quillFormat } from '../utils/valueFormatter';
|
|
11
14
|
async function getExportData(client, dashboardFilters, reportId) {
|
|
12
15
|
const minimalFilters = Object.values(dashboardFilters).length
|
|
13
16
|
? Object.values(dashboardFilters).map((filter) => {
|
|
@@ -42,18 +45,21 @@ async function getExportData(client, dashboardFilters, reportId) {
|
|
|
42
45
|
}
|
|
43
46
|
return cleanedReport;
|
|
44
47
|
}
|
|
45
|
-
export const useExport = (reportId
|
|
48
|
+
export const useExport = (reportId, { CustomDocumentComponent = QuillCustomDocumentComponent, maximumRowsPerPage = 20,
|
|
49
|
+
// if sectionKeyField is passed, then we will group by that field
|
|
50
|
+
sectionField, } = {}) => {
|
|
46
51
|
const { dashboardFilters } = useContext(DashboardFiltersContext);
|
|
52
|
+
const [dashboard] = useContext(DashboardContext);
|
|
47
53
|
const specificDashboardFilters = useMemo(() => {
|
|
48
54
|
//FIXME: Pretty sure this won't work with multiple dashboards
|
|
49
55
|
Object.values(dashboardFilters).map((dashboardFilter) => {
|
|
50
56
|
return dashboardFilter.filter;
|
|
51
57
|
});
|
|
52
58
|
}, [dashboardFilters]);
|
|
53
|
-
const [theme] = useContext(ThemeContext);
|
|
59
|
+
// const [theme] = useContext(ThemeContext);
|
|
54
60
|
const [client] = useContext(ClientContext);
|
|
55
61
|
const [isLoading, setIsLoading] = useState(false);
|
|
56
|
-
if (!reportId) {
|
|
62
|
+
if (!reportId || !client) {
|
|
57
63
|
return { downloadCSV: () => { }, downloadPDF: () => { }, isLoading: false };
|
|
58
64
|
}
|
|
59
65
|
return {
|
|
@@ -71,48 +77,124 @@ export const useExport = (reportId) => {
|
|
|
71
77
|
setIsLoading(false);
|
|
72
78
|
},
|
|
73
79
|
downloadPDF: async () => {
|
|
74
|
-
if (!client) {
|
|
75
|
-
return;
|
|
76
|
-
}
|
|
77
80
|
setIsLoading(true);
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
81
|
+
// @ts-ignore
|
|
82
|
+
let report;
|
|
83
|
+
if (reportId &&
|
|
84
|
+
dashboard[reportId] &&
|
|
85
|
+
dashboardFilters &&
|
|
86
|
+
// @ts-ignore
|
|
87
|
+
dashboardFilters[dashboard[reportId].dashboardName]) {
|
|
88
|
+
const { report: fetchedReport } = await fetchReport(reportId, client, true, Object.values(
|
|
89
|
+
// @ts-ignore
|
|
90
|
+
dashboardFilters[dashboard[reportId].dashboardName]).map((elem) => elem.filter));
|
|
91
|
+
report = fetchedReport;
|
|
83
92
|
}
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
}
|
|
88
|
-
|
|
93
|
+
else {
|
|
94
|
+
const { report: fetchedReport } = await fetchReport(reportId, client, true, []);
|
|
95
|
+
report = fetchedReport;
|
|
96
|
+
}
|
|
97
|
+
let groupedRows = {};
|
|
98
|
+
if (sectionField) {
|
|
99
|
+
groupedRows = (report?.rows || []).reduce((acc, row) => {
|
|
100
|
+
const key = row[sectionField];
|
|
101
|
+
if (key !== undefined) {
|
|
102
|
+
if (!acc[key]) {
|
|
103
|
+
acc[key] = [];
|
|
104
|
+
}
|
|
105
|
+
acc[key].push(row);
|
|
106
|
+
}
|
|
107
|
+
return acc;
|
|
108
|
+
}, {});
|
|
109
|
+
}
|
|
110
|
+
// report.rows
|
|
111
|
+
const numberOfPages = Math.ceil(report.rows.length / maximumRowsPerPage);
|
|
112
|
+
let html = '';
|
|
113
|
+
let currentPage = {};
|
|
114
|
+
let currentCount = 0;
|
|
115
|
+
let pageNumber = 1;
|
|
116
|
+
// Iterate over each group of rows
|
|
117
|
+
for (const groupKey in groupedRows) {
|
|
118
|
+
// @ts-ignore
|
|
119
|
+
const rows = groupedRows[groupKey];
|
|
120
|
+
let groupIndex = 0;
|
|
121
|
+
while (groupIndex < rows.length) {
|
|
122
|
+
const remainingRows = rows.length - groupIndex;
|
|
123
|
+
const availableSpace = maximumRowsPerPage - currentCount;
|
|
124
|
+
const rowsToAdd = Math.min(remainingRows, availableSpace);
|
|
125
|
+
// @ts-ignore
|
|
126
|
+
currentPage[groupKey] = (currentPage[groupKey] || []).concat(rows.slice(groupIndex, groupIndex + rowsToAdd));
|
|
127
|
+
currentCount += rowsToAdd;
|
|
128
|
+
groupIndex += rowsToAdd;
|
|
129
|
+
if (currentCount === maximumRowsPerPage) {
|
|
130
|
+
if (Object.keys(currentPage).length > 0) {
|
|
131
|
+
pageNumber++;
|
|
132
|
+
const div = document.createElement('div');
|
|
133
|
+
const root = createRoot(div);
|
|
134
|
+
flushSync(() => {
|
|
135
|
+
root.render(_jsx(CustomDocumentComponent, { report: {
|
|
136
|
+
// @ts-ignore
|
|
137
|
+
...report,
|
|
138
|
+
// @ts-ignore
|
|
139
|
+
sections: currentPage,
|
|
140
|
+
filters: Object.values(
|
|
141
|
+
// @ts-ignore
|
|
142
|
+
dashboardFilters[report.dashboardName]).map((elem) => elem.filter),
|
|
143
|
+
}, pageNumber: pageNumber, numberOfPages: numberOfPages, maximumRowsPerPage: maximumRowsPerPage }));
|
|
144
|
+
});
|
|
145
|
+
// const divContentBuffer = Buffer.from(div.innerHTML, 'utf-8');
|
|
146
|
+
// htmlBuffer = Buffer.concat([htmlBuffer, divContentBuffer]);
|
|
147
|
+
html += div.innerHTML;
|
|
148
|
+
currentPage = {};
|
|
149
|
+
currentCount = 0;
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
// Add the last page if it has remaining rows
|
|
155
|
+
if (Object.keys(currentPage).length > 0) {
|
|
156
|
+
pageNumber++;
|
|
157
|
+
const div = document.createElement('div');
|
|
158
|
+
const root = createRoot(div);
|
|
159
|
+
flushSync(() => {
|
|
160
|
+
root.render(_jsx(CustomDocumentComponent, { report: {
|
|
161
|
+
// @ts-ignore
|
|
162
|
+
...report,
|
|
163
|
+
// @ts-ignore
|
|
164
|
+
sections: currentPage,
|
|
165
|
+
filters: Object.values(
|
|
166
|
+
// @ts-ignore
|
|
167
|
+
dashboardFilters[report.dashboardName]).map((elem) => elem.filter),
|
|
168
|
+
}, pageNumber: pageNumber, numberOfPages: numberOfPages, maximumRowsPerPage: maximumRowsPerPage }));
|
|
169
|
+
});
|
|
170
|
+
// const divContentBuffer = Buffer.from(div.innerHTML, 'utf-8');
|
|
171
|
+
// htmlBuffer = Buffer.concat([htmlBuffer, divContentBuffer]);
|
|
172
|
+
html += div.innerHTML;
|
|
173
|
+
currentPage = {};
|
|
174
|
+
currentCount = 0;
|
|
175
|
+
}
|
|
176
|
+
const doc = new jsPDF('landscape', 'pt', 'a4');
|
|
177
|
+
// const htmlStringFromBuffer = htmlBuffer.toString('utf-8');
|
|
178
|
+
doc.html(html, {
|
|
179
|
+
callback: function (doc) {
|
|
180
|
+
// @ts-ignore
|
|
181
|
+
doc.save(`${report.name}.pdf`);
|
|
182
|
+
setIsLoading(false);
|
|
183
|
+
},
|
|
184
|
+
});
|
|
89
185
|
},
|
|
90
186
|
isLoading,
|
|
91
187
|
};
|
|
92
188
|
};
|
|
93
|
-
function
|
|
94
|
-
const
|
|
95
|
-
|
|
96
|
-
content: () => componentRef.current,
|
|
97
|
-
pageStyle: `@page {
|
|
98
|
-
size: letter;
|
|
99
|
-
margin: 0;
|
|
100
|
-
}
|
|
101
|
-
|
|
102
|
-
body {
|
|
103
|
-
margin: 2rem;
|
|
104
|
-
}`,
|
|
105
|
-
});
|
|
106
|
-
useLayoutEffect(() => {
|
|
107
|
-
setTimeout(() => handlePrint(), 1500);
|
|
108
|
-
}, []);
|
|
109
|
-
return (_jsxs("div", { ref: componentRef, style: { display: 'flex', flexDirection: 'column', margin: '2rem' }, children: [_jsx("div", { style: { display: 'flex', flexDirection: 'row', alignItems: 'center' }, children: _jsx("h2", { style: {
|
|
189
|
+
function QuillCustomDocumentComponent({ report }) {
|
|
190
|
+
// const [theme] = useContext(ThemeContext);
|
|
191
|
+
return (_jsxs("div", { style: { display: 'flex', flexDirection: 'column', margin: '2rem' }, children: [_jsx("div", { style: { display: 'flex', flexDirection: 'row', alignItems: 'center' }, children: _jsx("h2", { style: {
|
|
110
192
|
fontSize: 18,
|
|
111
193
|
fontWeight: '600',
|
|
112
194
|
textAlign: 'left',
|
|
113
195
|
paddingLeft: 10,
|
|
114
|
-
color: theme?.primaryTextColor,
|
|
115
|
-
}, children: report.name }) }), _jsxs("div", { style: { paddingLeft: 20, paddingRight: 20 }, children: [report.chartType !== 'table' && (_jsx(ChartDisplay, { overrideTheme:
|
|
196
|
+
// color: theme?.primaryTextColor,
|
|
197
|
+
}, children: report.name }) }), _jsxs("div", { style: { paddingLeft: 20, paddingRight: 20 }, children: [report.chartType !== 'table' && (_jsx(ChartDisplay, { overrideTheme: defaultQuillTheme, config: report, containerStyle: {
|
|
116
198
|
display: 'flex',
|
|
117
199
|
height: 400,
|
|
118
200
|
}, loading: false, isAnimationActive: false })), _jsx("div", { style: {
|
|
@@ -8,6 +8,7 @@ export type Client = {
|
|
|
8
8
|
featureFlags?: {
|
|
9
9
|
[key: string]: boolean;
|
|
10
10
|
};
|
|
11
|
+
domainName: string;
|
|
11
12
|
};
|
|
12
13
|
export type QuillProviderClient = {
|
|
13
14
|
organizationId?: string;
|
|
@@ -24,5 +25,6 @@ export type QuillProviderClient = {
|
|
|
24
25
|
featureFlags?: {
|
|
25
26
|
[key: string]: boolean;
|
|
26
27
|
};
|
|
28
|
+
domainName: string;
|
|
27
29
|
};
|
|
28
30
|
//# sourceMappingURL=Client.d.ts.map
|