@quillsql/react 2.12.46 → 2.12.47
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 +16 -7
- package/dist/cjs/ChartBuilder.d.ts +10 -11
- package/dist/cjs/ChartBuilder.d.ts.map +1 -1
- package/dist/cjs/ChartBuilder.js +78 -81
- package/dist/cjs/ChartEditor.d.ts +3 -1
- package/dist/cjs/ChartEditor.d.ts.map +1 -1
- package/dist/cjs/ChartEditor.js +26 -10
- package/dist/cjs/Context.d.ts +2 -3
- package/dist/cjs/Context.d.ts.map +1 -1
- package/dist/cjs/Context.js +42 -28
- package/dist/cjs/Dashboard.d.ts +12 -12
- package/dist/cjs/Dashboard.d.ts.map +1 -1
- package/dist/cjs/Dashboard.js +61 -69
- package/dist/cjs/QuillProvider.d.ts +2 -0
- package/dist/cjs/QuillProvider.d.ts.map +1 -1
- package/dist/cjs/QuillProvider.js +1 -15
- package/dist/cjs/ReportBuilder.d.ts +9 -9
- package/dist/cjs/ReportBuilder.d.ts.map +1 -1
- package/dist/cjs/ReportBuilder.js +116 -179
- package/dist/cjs/SQLEditor.d.ts +20 -11
- package/dist/cjs/SQLEditor.d.ts.map +1 -1
- package/dist/cjs/SQLEditor.js +157 -90
- package/dist/cjs/Table.js +3 -3
- package/dist/cjs/components/Chart/BarChart.d.ts.map +1 -1
- package/dist/cjs/components/Chart/BarChart.js +6 -25
- package/dist/cjs/components/Chart/BarList.js +1 -1
- package/dist/cjs/components/Chart/ChartError.d.ts +5 -2
- package/dist/cjs/components/Chart/ChartError.d.ts.map +1 -1
- package/dist/cjs/components/Chart/ChartError.js +7 -10
- package/dist/cjs/components/Chart/LineChart.d.ts.map +1 -1
- package/dist/cjs/components/Chart/LineChart.js +16 -1
- package/dist/cjs/components/Chart/PieChart.js +1 -1
- 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 +46 -47
- package/dist/cjs/components/Dashboard/DashboardFilter.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/DashboardFilter.js +2 -1
- package/dist/cjs/components/Dashboard/DataLoader.d.ts +2 -2
- package/dist/cjs/components/Dashboard/DataLoader.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/DataLoader.js +19 -13
- package/dist/cjs/components/Dashboard/MetricComponent.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/MetricComponent.js +16 -26
- package/dist/cjs/components/Dashboard/TableComponent.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/TableComponent.js +16 -25
- package/dist/cjs/components/QuillMultiSelectWithCombo.d.ts.map +1 -1
- package/dist/cjs/components/QuillMultiSelectWithCombo.js +31 -1
- package/dist/cjs/components/QuillSelect.js +1 -1
- package/dist/cjs/components/QuillTable.d.ts +1 -1
- package/dist/cjs/components/QuillTable.d.ts.map +1 -1
- package/dist/cjs/components/QuillTable.js +115 -105
- package/dist/cjs/components/ReportBuilder/AddColumnModal.d.ts +3 -3
- package/dist/cjs/components/ReportBuilder/AddColumnModal.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/AddColumnModal.js +2 -2
- package/dist/cjs/components/ReportBuilder/AddLimitPopover.d.ts +2 -2
- package/dist/cjs/components/ReportBuilder/AddLimitPopover.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/AddLimitPopover.js +28 -9
- package/dist/cjs/components/ReportBuilder/FilterModal.d.ts +1 -1
- package/dist/cjs/components/ReportBuilder/FilterModal.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/FilterModal.js +178 -114
- package/dist/cjs/components/ReportBuilder/convert.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/convert.js +1 -2
- package/dist/cjs/components/ReportBuilder/ui.d.ts +9 -1
- package/dist/cjs/components/ReportBuilder/ui.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/ui.js +37 -3
- package/dist/cjs/components/ReportBuilder/util.d.ts +5 -1
- package/dist/cjs/components/ReportBuilder/util.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/util.js +26 -12
- package/dist/cjs/components/UiComponents.d.ts +17 -3
- package/dist/cjs/components/UiComponents.d.ts.map +1 -1
- package/dist/cjs/components/UiComponents.js +160 -29
- package/dist/cjs/hooks/useAskQuill.d.ts.map +1 -1
- package/dist/cjs/hooks/useAskQuill.js +7 -7
- package/dist/cjs/hooks/useAstToFilterTree.d.ts +4 -1
- package/dist/cjs/hooks/useAstToFilterTree.d.ts.map +1 -1
- package/dist/cjs/hooks/useAstToFilterTree.js +4 -1
- package/dist/cjs/hooks/useDashboard.d.ts +5 -1
- package/dist/cjs/hooks/useDashboard.d.ts.map +1 -1
- package/dist/cjs/hooks/useDashboard.js +28 -4
- package/dist/cjs/hooks/useOnClickOutside.js +2 -2
- package/dist/cjs/hooks/useQuill.js +4 -4
- package/dist/cjs/hooks/useVirtualTables.d.ts +10 -0
- package/dist/cjs/hooks/useVirtualTables.d.ts.map +1 -0
- package/dist/cjs/hooks/useVirtualTables.js +29 -0
- package/dist/cjs/index.d.ts +2 -1
- package/dist/cjs/index.d.ts.map +1 -1
- package/dist/cjs/index.js +4 -1
- package/dist/cjs/internals/ReportBuilder/PivotModal.d.ts.map +1 -1
- package/dist/cjs/internals/ReportBuilder/PivotModal.js +45 -21
- package/dist/cjs/models/Client.d.ts +3 -0
- package/dist/cjs/models/Client.d.ts.map +1 -1
- package/dist/cjs/models/Report.d.ts +2 -0
- package/dist/cjs/models/Report.d.ts.map +1 -1
- package/dist/cjs/models/Schema.d.ts +7 -0
- package/dist/cjs/models/Schema.d.ts.map +1 -0
- package/dist/cjs/models/Schema.js +2 -0
- package/dist/cjs/models/Tables.d.ts +2 -0
- package/dist/cjs/models/Tables.d.ts.map +1 -1
- package/dist/cjs/utils/astFilterProcessing.d.ts +4 -0
- package/dist/cjs/utils/astFilterProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/astFilterProcessing.js +47 -44
- package/dist/cjs/utils/astProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/astProcessing.js +8 -8
- package/dist/cjs/utils/client.d.ts.map +1 -1
- package/dist/cjs/utils/client.js +1 -0
- package/dist/cjs/utils/columnProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/columnProcessing.js +88 -5
- package/dist/cjs/utils/dataFetcher.d.ts.map +1 -1
- package/dist/cjs/utils/dataFetcher.js +7 -3
- package/dist/cjs/utils/filterProcessing.d.ts +25 -0
- package/dist/cjs/utils/filterProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/filterProcessing.js +121 -1
- package/dist/cjs/utils/paginationProcessing.js +2 -2
- package/dist/cjs/utils/pivotConstructor.d.ts.map +1 -1
- package/dist/cjs/utils/pivotConstructor.js +10 -6
- package/dist/cjs/utils/queryConstructor.d.ts +1 -0
- package/dist/cjs/utils/queryConstructor.d.ts.map +1 -1
- package/dist/cjs/utils/queryConstructor.js +37 -11
- package/dist/cjs/utils/report.d.ts +5 -0
- package/dist/cjs/utils/report.d.ts.map +1 -1
- package/dist/cjs/utils/report.js +63 -9
- package/dist/cjs/utils/schema.js +22 -20
- package/dist/cjs/utils/tableProcessing.d.ts +1 -0
- package/dist/cjs/utils/tableProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/tableProcessing.js +22 -1
- package/dist/cjs/utils/validation.d.ts.map +1 -1
- package/dist/cjs/utils/validation.js +4 -0
- package/dist/esm/Chart.d.ts.map +1 -1
- package/dist/esm/Chart.js +17 -8
- package/dist/esm/ChartBuilder.d.ts +10 -11
- package/dist/esm/ChartBuilder.d.ts.map +1 -1
- package/dist/esm/ChartBuilder.js +81 -84
- package/dist/esm/ChartEditor.d.ts +3 -1
- package/dist/esm/ChartEditor.d.ts.map +1 -1
- package/dist/esm/ChartEditor.js +27 -11
- package/dist/esm/Context.d.ts +2 -3
- package/dist/esm/Context.d.ts.map +1 -1
- package/dist/esm/Context.js +42 -28
- package/dist/esm/Dashboard.d.ts +12 -12
- package/dist/esm/Dashboard.d.ts.map +1 -1
- package/dist/esm/Dashboard.js +63 -71
- package/dist/esm/QuillProvider.d.ts +2 -0
- package/dist/esm/QuillProvider.d.ts.map +1 -1
- package/dist/esm/QuillProvider.js +2 -16
- package/dist/esm/ReportBuilder.d.ts +9 -9
- package/dist/esm/ReportBuilder.d.ts.map +1 -1
- package/dist/esm/ReportBuilder.js +122 -185
- package/dist/esm/SQLEditor.d.ts +20 -11
- package/dist/esm/SQLEditor.d.ts.map +1 -1
- package/dist/esm/SQLEditor.js +160 -93
- package/dist/esm/Table.js +4 -4
- package/dist/esm/components/Chart/BarChart.d.ts.map +1 -1
- package/dist/esm/components/Chart/BarChart.js +7 -26
- package/dist/esm/components/Chart/BarList.js +1 -1
- package/dist/esm/components/Chart/ChartError.d.ts +5 -2
- package/dist/esm/components/Chart/ChartError.d.ts.map +1 -1
- package/dist/esm/components/Chart/ChartError.js +7 -10
- package/dist/esm/components/Chart/LineChart.d.ts.map +1 -1
- package/dist/esm/components/Chart/LineChart.js +16 -1
- package/dist/esm/components/Chart/PieChart.js +1 -1
- 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 +46 -47
- package/dist/esm/components/Dashboard/DashboardFilter.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/DashboardFilter.js +2 -1
- package/dist/esm/components/Dashboard/DataLoader.d.ts +2 -2
- package/dist/esm/components/Dashboard/DataLoader.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/DataLoader.js +20 -14
- package/dist/esm/components/Dashboard/MetricComponent.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/MetricComponent.js +16 -26
- package/dist/esm/components/Dashboard/TableComponent.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/TableComponent.js +16 -25
- package/dist/esm/components/QuillMultiSelectWithCombo.d.ts.map +1 -1
- package/dist/esm/components/QuillMultiSelectWithCombo.js +31 -1
- package/dist/esm/components/QuillSelect.js +1 -1
- package/dist/esm/components/QuillTable.d.ts +1 -1
- package/dist/esm/components/QuillTable.d.ts.map +1 -1
- package/dist/esm/components/QuillTable.js +115 -105
- package/dist/esm/components/ReportBuilder/AddColumnModal.d.ts +3 -3
- package/dist/esm/components/ReportBuilder/AddColumnModal.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/AddColumnModal.js +2 -2
- package/dist/esm/components/ReportBuilder/AddLimitPopover.d.ts +2 -2
- package/dist/esm/components/ReportBuilder/AddLimitPopover.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/AddLimitPopover.js +28 -9
- package/dist/esm/components/ReportBuilder/FilterModal.d.ts +1 -1
- package/dist/esm/components/ReportBuilder/FilterModal.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/FilterModal.js +178 -114
- package/dist/esm/components/ReportBuilder/convert.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/convert.js +1 -2
- package/dist/esm/components/ReportBuilder/ui.d.ts +9 -1
- package/dist/esm/components/ReportBuilder/ui.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/ui.js +38 -4
- package/dist/esm/components/ReportBuilder/util.d.ts +5 -1
- package/dist/esm/components/ReportBuilder/util.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/util.js +26 -12
- package/dist/esm/components/UiComponents.d.ts +17 -3
- package/dist/esm/components/UiComponents.d.ts.map +1 -1
- package/dist/esm/components/UiComponents.js +158 -28
- package/dist/esm/hooks/useAskQuill.d.ts.map +1 -1
- package/dist/esm/hooks/useAskQuill.js +8 -8
- package/dist/esm/hooks/useAstToFilterTree.d.ts +4 -1
- package/dist/esm/hooks/useAstToFilterTree.d.ts.map +1 -1
- package/dist/esm/hooks/useAstToFilterTree.js +4 -1
- package/dist/esm/hooks/useDashboard.d.ts +5 -1
- package/dist/esm/hooks/useDashboard.d.ts.map +1 -1
- package/dist/esm/hooks/useDashboard.js +28 -5
- package/dist/esm/hooks/useOnClickOutside.js +2 -2
- package/dist/esm/hooks/useQuill.js +5 -5
- package/dist/esm/hooks/useVirtualTables.d.ts +10 -0
- package/dist/esm/hooks/useVirtualTables.d.ts.map +1 -0
- package/dist/esm/hooks/useVirtualTables.js +25 -0
- package/dist/esm/index.d.ts +2 -1
- package/dist/esm/index.d.ts.map +1 -1
- package/dist/esm/index.js +2 -1
- package/dist/esm/internals/ReportBuilder/PivotModal.d.ts.map +1 -1
- package/dist/esm/internals/ReportBuilder/PivotModal.js +44 -23
- package/dist/esm/models/Client.d.ts +3 -0
- package/dist/esm/models/Client.d.ts.map +1 -1
- package/dist/esm/models/Report.d.ts +2 -0
- package/dist/esm/models/Report.d.ts.map +1 -1
- package/dist/esm/models/Schema.d.ts +7 -0
- package/dist/esm/models/Schema.d.ts.map +1 -0
- package/dist/esm/models/Schema.js +1 -0
- package/dist/esm/models/Tables.d.ts +2 -0
- package/dist/esm/models/Tables.d.ts.map +1 -1
- package/dist/esm/utils/astFilterProcessing.d.ts +4 -0
- package/dist/esm/utils/astFilterProcessing.d.ts.map +1 -1
- package/dist/esm/utils/astFilterProcessing.js +45 -43
- package/dist/esm/utils/astProcessing.d.ts.map +1 -1
- package/dist/esm/utils/astProcessing.js +8 -8
- package/dist/esm/utils/client.d.ts.map +1 -1
- package/dist/esm/utils/client.js +1 -0
- package/dist/esm/utils/columnProcessing.d.ts.map +1 -1
- package/dist/esm/utils/columnProcessing.js +88 -5
- package/dist/esm/utils/dataFetcher.d.ts.map +1 -1
- package/dist/esm/utils/dataFetcher.js +7 -3
- package/dist/esm/utils/filterProcessing.d.ts +25 -0
- package/dist/esm/utils/filterProcessing.d.ts.map +1 -1
- package/dist/esm/utils/filterProcessing.js +116 -0
- package/dist/esm/utils/paginationProcessing.js +2 -2
- package/dist/esm/utils/pivotConstructor.d.ts.map +1 -1
- package/dist/esm/utils/pivotConstructor.js +10 -6
- package/dist/esm/utils/queryConstructor.d.ts +1 -0
- package/dist/esm/utils/queryConstructor.d.ts.map +1 -1
- package/dist/esm/utils/queryConstructor.js +35 -10
- package/dist/esm/utils/report.d.ts +5 -0
- package/dist/esm/utils/report.d.ts.map +1 -1
- package/dist/esm/utils/report.js +61 -8
- package/dist/esm/utils/schema.js +22 -20
- package/dist/esm/utils/tableProcessing.d.ts +1 -0
- package/dist/esm/utils/tableProcessing.d.ts.map +1 -1
- package/dist/esm/utils/tableProcessing.js +21 -1
- package/dist/esm/utils/validation.d.ts.map +1 -1
- package/dist/esm/utils/validation.js +4 -0
- package/package.json +3 -1
package/dist/esm/SQLEditor.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import React, { ReactNode } from 'react';
|
|
2
|
+
import { TextInputComponentProps } from './components/UiComponents';
|
|
2
3
|
import { QuillReport } from './models/Report';
|
|
3
4
|
/**
|
|
4
5
|
* Props for the Quill SQLEditor component.
|
|
@@ -12,6 +13,7 @@ export interface SQLEditorProps {
|
|
|
12
13
|
label: string;
|
|
13
14
|
disabled?: boolean;
|
|
14
15
|
icon?: ReactNode;
|
|
16
|
+
tooltipText?: string;
|
|
15
17
|
}) => JSX.Element;
|
|
16
18
|
/**
|
|
17
19
|
* A secondary button component.
|
|
@@ -29,14 +31,7 @@ export interface SQLEditorProps {
|
|
|
29
31
|
/**
|
|
30
32
|
* A input element for getting text from the user.
|
|
31
33
|
*/
|
|
32
|
-
TextInputComponent?: (props:
|
|
33
|
-
id: string;
|
|
34
|
-
width: number;
|
|
35
|
-
value: string;
|
|
36
|
-
label?: string;
|
|
37
|
-
placeholder?: string;
|
|
38
|
-
onChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
|
|
39
|
-
}) => JSX.Element;
|
|
34
|
+
TextInputComponent?: ((props: TextInputComponentProps) => JSX.Element) | React.ForwardRefExoticComponent<TextInputComponentProps & React.RefAttributes<HTMLInputElement>>;
|
|
40
35
|
/** A select component. */
|
|
41
36
|
SelectComponent?: (props: {
|
|
42
37
|
value: string;
|
|
@@ -66,6 +61,7 @@ export interface SQLEditorProps {
|
|
|
66
61
|
field: string;
|
|
67
62
|
direction: string;
|
|
68
63
|
}) => void;
|
|
64
|
+
containerStyle?: React.CSSProperties;
|
|
69
65
|
}) => JSX.Element;
|
|
70
66
|
/**
|
|
71
67
|
* A component to show while the query results are loading.
|
|
@@ -164,6 +160,10 @@ export interface SQLEditorProps {
|
|
|
164
160
|
* A callback that is fired when the data columns change.
|
|
165
161
|
*/
|
|
166
162
|
onChangeColumns?: (columns: object[]) => void;
|
|
163
|
+
/** A callback function triggered when changes are discarded. */
|
|
164
|
+
onDiscardChanges?: () => void;
|
|
165
|
+
/** A callback function triggered when changes are saved. */
|
|
166
|
+
onSaveChanges?: () => void;
|
|
167
167
|
/**
|
|
168
168
|
* A callback that is fired when a report has been added to a dashboard.
|
|
169
169
|
*/
|
|
@@ -186,6 +186,10 @@ export interface SQLEditorProps {
|
|
|
186
186
|
* Whether the "new query" button is enabled.
|
|
187
187
|
*/
|
|
188
188
|
isNewQueryEnabled?: boolean;
|
|
189
|
+
/**
|
|
190
|
+
* Whether the user is an admin.
|
|
191
|
+
*/
|
|
192
|
+
isAdminEnabled?: boolean;
|
|
189
193
|
/**
|
|
190
194
|
* Whether to show table format options.
|
|
191
195
|
*/
|
|
@@ -207,13 +211,17 @@ export interface SQLEditorProps {
|
|
|
207
211
|
*/
|
|
208
212
|
defaultQuery?: string;
|
|
209
213
|
/**
|
|
210
|
-
* The default dashboard to
|
|
214
|
+
* The default dashboard to add the query to.
|
|
211
215
|
*/
|
|
212
216
|
destinationDashboard?: string;
|
|
213
217
|
/**
|
|
214
218
|
* The title of the ChartBuilder dialog.
|
|
215
219
|
*/
|
|
216
220
|
chartBuilderTitle?: string;
|
|
221
|
+
/**
|
|
222
|
+
* Whether to automatically run the query when the component mounts.
|
|
223
|
+
*/
|
|
224
|
+
runQueryOnMount?: boolean;
|
|
217
225
|
/**
|
|
218
226
|
* The label of the button to add the current query to a dashboard.
|
|
219
227
|
*
|
|
@@ -260,13 +268,14 @@ export interface SQLEditorProps {
|
|
|
260
268
|
* ### SQLEditor API
|
|
261
269
|
* @see https://docs.quillsql.com/components/sql-editor
|
|
262
270
|
*/
|
|
263
|
-
export default function SQLEditor({ ButtonComponent, SecondaryButtonComponent, DeleteButtonComponent, TextInputComponent, SelectComponent, TableComponent, isNewQueryEnabled, LoadingComponent, ModalComponent, PopoverComponent, CardComponent, LabelComponent, HeaderComponent, SubHeaderComponent, TextComponent, ErrorMessageComponent, ChartBuilderInputRowContainer, ChartBuilderInputColumnContainer, PivotRowContainer, PivotColumnContainer, ChartBuilderFormContainer, defaultQuery, onChangeQuery, onChangeData, onChangeColumns, onChangeFields, isChartBuilderEnabled, showTableFormatOptions, showDateFieldOptions, showAccessControlOptions,
|
|
264
|
-
export declare const SchemaListComponent: ({ schema, theme, loading, LoadingComponent, width, onClick, }: {
|
|
271
|
+
export default function SQLEditor({ ButtonComponent, SecondaryButtonComponent, DeleteButtonComponent, TextInputComponent, SelectComponent, TableComponent, isNewQueryEnabled, LoadingComponent, ModalComponent, PopoverComponent, CardComponent, LabelComponent, HeaderComponent, SubHeaderComponent, TextComponent, ErrorMessageComponent, ChartBuilderInputRowContainer, ChartBuilderInputColumnContainer, PivotRowContainer, PivotColumnContainer, ChartBuilderFormContainer, defaultQuery, destinationDashboard, onChangeQuery, onChangeData, onChangeColumns, onChangeFields, onDiscardChanges, onSaveChanges, isChartBuilderEnabled, showTableFormatOptions, showDateFieldOptions, showAccessControlOptions, isAdminEnabled, chartBuilderTitle, runQueryOnMount, onAddToDashboardComplete, addToDashboardButtonLabel, report, organizationName, isChartBuilderHorizontalView, containerStyle, className, onClickChartElement, }: SQLEditorProps): import("react/jsx-runtime").JSX.Element;
|
|
272
|
+
export declare const SchemaListComponent: ({ schema, theme, loading, LoadingComponent, width, onClick, style, }: {
|
|
265
273
|
schema: any;
|
|
266
274
|
theme: any;
|
|
267
275
|
loading: boolean;
|
|
268
276
|
LoadingComponent?: any;
|
|
269
277
|
width?: any;
|
|
270
278
|
onClick: (event: React.MouseEvent<HTMLDivElement>) => void;
|
|
279
|
+
style?: React.CSSProperties | undefined;
|
|
271
280
|
}) => import("react/jsx-runtime").JSX.Element;
|
|
272
281
|
//# sourceMappingURL=SQLEditor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SQLEditor.d.ts","sourceRoot":"","sources":["../../src/SQLEditor.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAMZ,SAAS,
|
|
1
|
+
{"version":3,"file":"SQLEditor.d.ts","sourceRoot":"","sources":["../../src/SQLEditor.tsx"],"names":[],"mappings":"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"}
|
package/dist/esm/SQLEditor.js
CHANGED
|
@@ -1,17 +1,16 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
/* eslint-disable no-unused-vars */
|
|
3
3
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
4
|
-
import { useState, useContext, useEffect, useRef, } from 'react';
|
|
4
|
+
import { useState, useContext, useEffect, useRef, useMemo, } from 'react';
|
|
5
5
|
import MonacoEditor from '@monaco-editor/react';
|
|
6
|
-
import { ClientContext,
|
|
6
|
+
import { ClientContext, SchemaDataContext, ThemeContext } from './Context';
|
|
7
7
|
import { getDataFromCloud } from './utils/dataFetcher';
|
|
8
8
|
import { ChartBuilderWithModal, createInitialFormData } from './ChartBuilder';
|
|
9
|
-
import { MemoizedButton, MemoizedDeleteButton, MemoizedHeader, MemoizedLabel, MemoizedModal, MemoizedPopover, MemoizedSecondaryButton, MemoizedSubHeader, MemoizedText, QuillChartBuilderFormContainer, QuillChartBuilderInputColumnContainer, QuillChartBuilderInputRowContainer, QuillErrorMessageComponent, QuillLoadingComponent, QuillPivotColumnContainer, QuillPivotRowContainer, QuillTableSQLEditorComponent, } from './components/UiComponents';
|
|
9
|
+
import { MemoizedButton, MemoizedDeleteButton, MemoizedHeader, MemoizedLabel, MemoizedModal, MemoizedPopover, MemoizedSecondaryButton, MemoizedSubHeader, MemoizedText, OverflowContainer, QuillChartBuilderFormContainer, QuillChartBuilderInputColumnContainer, QuillChartBuilderInputRowContainer, QuillErrorMessageComponent, QuillLoadingComponent, QuillPivotColumnContainer, QuillPivotRowContainer, QuillTableSQLEditorComponent, } from './components/UiComponents';
|
|
10
10
|
import { QuillTextInput } from './components/UiComponents';
|
|
11
11
|
import { updateFirstChildWidth } from './utils/width';
|
|
12
12
|
import { QuillCard } from './components/QuillCard';
|
|
13
13
|
import { QuillSelectComponent } from './components/QuillSelect';
|
|
14
|
-
import { getSchemaInfoWithCustomFields } from './utils/schema';
|
|
15
14
|
import { fetchTableByQuery, } from './utils/tableProcessing';
|
|
16
15
|
import { processColumnReference } from './utils/queryConstructor';
|
|
17
16
|
import { generateSuggestionsByDatasource, generateSuggestionsBySchema, QUILL_LANGUAGE, } from './utils/monacoConfig';
|
|
@@ -82,26 +81,28 @@ function setEditorTheme(_editor, monaco, schema, databaseType, clientName) {
|
|
|
82
81
|
* ### SQLEditor API
|
|
83
82
|
* @see https://docs.quillsql.com/components/sql-editor
|
|
84
83
|
*/
|
|
85
|
-
export default function SQLEditor({ ButtonComponent = MemoizedButton, SecondaryButtonComponent = MemoizedSecondaryButton, DeleteButtonComponent = MemoizedDeleteButton, TextInputComponent = QuillTextInput, SelectComponent = QuillSelectComponent, TableComponent = QuillTableSQLEditorComponent, isNewQueryEnabled = false, LoadingComponent = QuillLoadingComponent, ModalComponent = MemoizedModal, PopoverComponent = MemoizedPopover, CardComponent = QuillCard, LabelComponent = MemoizedLabel, HeaderComponent = MemoizedHeader, SubHeaderComponent = MemoizedSubHeader, TextComponent = MemoizedText, ErrorMessageComponent = QuillErrorMessageComponent, ChartBuilderInputRowContainer = QuillChartBuilderInputRowContainer, ChartBuilderInputColumnContainer = QuillChartBuilderInputColumnContainer, PivotRowContainer = QuillPivotRowContainer, PivotColumnContainer = QuillPivotColumnContainer, ChartBuilderFormContainer = QuillChartBuilderFormContainer, defaultQuery, onChangeQuery, onChangeData, onChangeColumns, onChangeFields, isChartBuilderEnabled = false, showTableFormatOptions = false, showDateFieldOptions = false, showAccessControlOptions = false,
|
|
84
|
+
export default function SQLEditor({ ButtonComponent = MemoizedButton, SecondaryButtonComponent = MemoizedSecondaryButton, DeleteButtonComponent = MemoizedDeleteButton, TextInputComponent = QuillTextInput, SelectComponent = QuillSelectComponent, TableComponent = QuillTableSQLEditorComponent, isNewQueryEnabled = false, LoadingComponent = QuillLoadingComponent, ModalComponent = MemoizedModal, PopoverComponent = MemoizedPopover, CardComponent = QuillCard, LabelComponent = MemoizedLabel, HeaderComponent = MemoizedHeader, SubHeaderComponent = MemoizedSubHeader, TextComponent = MemoizedText, ErrorMessageComponent = QuillErrorMessageComponent, ChartBuilderInputRowContainer = QuillChartBuilderInputRowContainer, ChartBuilderInputColumnContainer = QuillChartBuilderInputColumnContainer, PivotRowContainer = QuillPivotRowContainer, PivotColumnContainer = QuillPivotColumnContainer, ChartBuilderFormContainer = QuillChartBuilderFormContainer, defaultQuery, destinationDashboard, onChangeQuery, onChangeData, onChangeColumns, onChangeFields, onDiscardChanges, onSaveChanges, isChartBuilderEnabled = false, showTableFormatOptions = false, showDateFieldOptions = false, showAccessControlOptions = false, isAdminEnabled = false, chartBuilderTitle, runQueryOnMount = false, onAddToDashboardComplete, addToDashboardButtonLabel = 'Add to dashboard', report = undefined, organizationName = undefined, isChartBuilderHorizontalView = true, containerStyle = { height: '100vh' }, className, onClickChartElement, }) {
|
|
86
85
|
const [sqlPrompt, setSqlPrompt] = useState('');
|
|
87
86
|
const [client] = useContext(ClientContext);
|
|
88
87
|
const [theme] = useContext(ThemeContext);
|
|
89
88
|
const [query, setQuery] = useState(defaultQuery);
|
|
90
89
|
const [rows, setRows] = useState([]);
|
|
91
90
|
const [columns, setColumns] = useState([]);
|
|
92
|
-
const [
|
|
93
|
-
const [customFields, setCustomFields] = useContext(CustomFieldContext);
|
|
91
|
+
const [schemaData] = useContext(SchemaDataContext);
|
|
94
92
|
const [errorMessage, setErrorMessage] = useState('');
|
|
95
93
|
const [sqlResponseLoading, setSqlResponseLoading] = useState(false);
|
|
96
94
|
const [sqlQueryLoading, setSqlQueryLoading] = useState(false);
|
|
97
|
-
const [schemaLoading, setSchemaLoading] = useState(false);
|
|
98
95
|
const [isChartBuilderOpen, setIsChartBuilderOpen] = useState(false);
|
|
99
96
|
const [displayTable, setDisplayTable] = useState(false);
|
|
100
97
|
const formRef = useRef(null);
|
|
98
|
+
const sidebarRef = useRef(null);
|
|
101
99
|
const [searchBarWidth, setSearchBarWidth] = useState(200);
|
|
100
|
+
const [filterBarWidth, setFilterBarWidth] = useState(200);
|
|
102
101
|
const [formattedRows, setFormattedRows] = useState([]);
|
|
103
102
|
const [rowCount, setRowCount] = useState(undefined);
|
|
104
103
|
const [maxPage, setMaxPage] = useState(1);
|
|
104
|
+
const [tableSearchQuery, setTableSearchQuery] = useState('');
|
|
105
|
+
const [lastSuccessfulQuery, setLastSuccessfulQuery] = useState('');
|
|
105
106
|
const [tempReport, setTempReport] = useState({
|
|
106
107
|
...EMPTY_INTERNAL_REPORT,
|
|
107
108
|
...report,
|
|
@@ -109,11 +110,22 @@ export default function SQLEditor({ ButtonComponent = MemoizedButton, SecondaryB
|
|
|
109
110
|
const [currentProcessing, setCurrentProcessing] = useState({
|
|
110
111
|
page: DEFAULT_PAGINATION,
|
|
111
112
|
});
|
|
113
|
+
const displayedTableData = useMemo(() => {
|
|
114
|
+
return (schemaData?.schema?.filter((table) => {
|
|
115
|
+
return (table.name
|
|
116
|
+
?.toLowerCase()
|
|
117
|
+
?.includes(tableSearchQuery.toLowerCase().trim()) ||
|
|
118
|
+
table.columns.some((col) => col.field
|
|
119
|
+
?.toLowerCase()
|
|
120
|
+
?.includes(tableSearchQuery.toLowerCase().trim())));
|
|
121
|
+
}) ?? []);
|
|
122
|
+
}, [tableSearchQuery, schemaData.schema]);
|
|
112
123
|
useEffect(() => {
|
|
113
124
|
// Since the TextInput component takes a required numeric width parameter,
|
|
114
125
|
// we dynamically calculate the width of this component here.
|
|
115
126
|
function handleResize() {
|
|
116
127
|
updateFirstChildWidth(formRef, setSearchBarWidth, { gap: 12 });
|
|
128
|
+
updateFirstChildWidth(sidebarRef, setFilterBarWidth, { gap: 12 });
|
|
117
129
|
}
|
|
118
130
|
handleResize();
|
|
119
131
|
window.addEventListener('resize', handleResize);
|
|
@@ -121,20 +133,8 @@ export default function SQLEditor({ ButtonComponent = MemoizedButton, SecondaryB
|
|
|
121
133
|
window.removeEventListener('resize', handleResize);
|
|
122
134
|
};
|
|
123
135
|
}, []);
|
|
124
|
-
const getSchema = async () => {
|
|
125
|
-
if (!client) {
|
|
126
|
-
setSchemaLoading(false);
|
|
127
|
-
return;
|
|
128
|
-
}
|
|
129
|
-
const { schemaData, customFieldsByTable } = await getSchemaInfoWithCustomFields(client);
|
|
130
|
-
setSchema(schemaData);
|
|
131
|
-
setCustomFields(customFieldsByTable);
|
|
132
|
-
setSchemaLoading(false);
|
|
133
|
-
};
|
|
134
136
|
useEffect(() => {
|
|
135
|
-
if (client
|
|
136
|
-
setSchemaLoading(true);
|
|
137
|
-
getSchema();
|
|
137
|
+
if (client) {
|
|
138
138
|
setRows([]);
|
|
139
139
|
setColumns([]);
|
|
140
140
|
setDisplayTable(false);
|
|
@@ -186,7 +186,7 @@ export default function SQLEditor({ ButtonComponent = MemoizedButton, SecondaryB
|
|
|
186
186
|
setDisplayTable(true);
|
|
187
187
|
setSqlQueryLoading(true);
|
|
188
188
|
setErrorMessage('');
|
|
189
|
-
const tableInfo = await fetchTableByQuery(query, client, processing, customFields);
|
|
189
|
+
const tableInfo = await fetchTableByQuery(query, client, processing, schemaData.customFields);
|
|
190
190
|
if (!!tableInfo.error) {
|
|
191
191
|
throw new Error(tableInfo.error);
|
|
192
192
|
}
|
|
@@ -226,6 +226,7 @@ export default function SQLEditor({ ButtonComponent = MemoizedButton, SecondaryB
|
|
|
226
226
|
rows: tempRows,
|
|
227
227
|
columns: tableInfo.columns,
|
|
228
228
|
});
|
|
229
|
+
setLastSuccessfulQuery(query);
|
|
229
230
|
}
|
|
230
231
|
catch (e) {
|
|
231
232
|
setErrorMessage(e.message);
|
|
@@ -271,87 +272,153 @@ export default function SQLEditor({ ButtonComponent = MemoizedButton, SecondaryB
|
|
|
271
272
|
}
|
|
272
273
|
}, [query]);
|
|
273
274
|
return (_jsxs("div", { style: { backgroundColor: theme?.backgroundColor, ...containerStyle }, className: className, children: [(!isChartBuilderHorizontalView ||
|
|
274
|
-
(isChartBuilderHorizontalView && !isChartBuilderOpen)) &&
|
|
275
|
+
(isChartBuilderHorizontalView && !isChartBuilderOpen)) &&
|
|
276
|
+
!schemaData.isSchemaLoading && (_jsx("div", { style: {
|
|
275
277
|
height: '100%',
|
|
276
278
|
display: 'flex',
|
|
277
279
|
flexDirection: 'column',
|
|
278
280
|
padding: 0,
|
|
279
|
-
}, children: _jsx("div", { style: {
|
|
281
|
+
}, children: _jsx("div", { style: {
|
|
282
|
+
height: '100%',
|
|
283
|
+
display: 'flex',
|
|
284
|
+
flexDirection: 'column',
|
|
285
|
+
}, children: _jsxs("div", { style: {
|
|
280
286
|
width: '100%',
|
|
281
287
|
display: 'flex',
|
|
282
288
|
height: '100%',
|
|
283
289
|
flexDirection: 'row',
|
|
284
290
|
gap: 20,
|
|
285
|
-
}, children: [
|
|
291
|
+
}, children: [_jsxs("div", { style: {
|
|
292
|
+
display: 'flex',
|
|
293
|
+
flexDirection: 'column',
|
|
294
|
+
gap: 20,
|
|
295
|
+
}, children: [_jsx("div", { style: {
|
|
296
|
+
paddingTop: 16,
|
|
297
|
+
paddingLeft: '20px',
|
|
298
|
+
paddingRight: '30px',
|
|
299
|
+
}, children: _jsx(TextInputComponent, { placeholder: "Filter tables...", onChange: (e) => {
|
|
300
|
+
setTableSearchQuery(e.target.value);
|
|
301
|
+
}, value: tableSearchQuery, id: 'edit-name', width: filterBarWidth }) }), _jsx(SchemaListComponent, { schema: displayedTableData, theme: theme, LoadingComponent: LoadingComponent, loading: schemaData.isSchemaLoading, onClick: handleClickSchemaItem })] }), _jsxs("div", { style: {
|
|
286
302
|
display: 'flex',
|
|
287
303
|
// gap: 12,
|
|
288
304
|
flexDirection: 'column',
|
|
305
|
+
justifyContent: 'space-between',
|
|
289
306
|
width: 'calc(100% - 290px)',
|
|
290
307
|
height: '100%',
|
|
291
308
|
overflowX: 'hidden',
|
|
292
|
-
}, children: [
|
|
293
|
-
e.preventDefault();
|
|
294
|
-
handleRunSqlPrompt();
|
|
295
|
-
}, style: {
|
|
296
|
-
display: 'flex',
|
|
297
|
-
flexDirection: 'row',
|
|
298
|
-
gap: 12,
|
|
299
|
-
paddingTop: 16,
|
|
300
|
-
paddingBottom: 16,
|
|
301
|
-
}, children: [_jsx(TextInputComponent, { id: "ai-search", value: sqlPrompt, width: searchBarWidth, onChange: (e) => setSqlPrompt(e.target.value), placeholder: "Ask a question..." }), _jsx(ButtonComponent, { onClick: handleRunSqlPrompt, label: "Ask AI" })] }), _jsx("div", { style: { height: 'calc(50% - 40px)' }, children: _jsx(SQLEditorComponent, { query: query || '', schema: schema, databaseType: client?.databaseType ?? 'postgresql', clientName: client?.publicKey || '', setQuery: setQuery, handleRunQuery: () => {
|
|
302
|
-
handleRunQuery(currentProcessing, true);
|
|
303
|
-
}, handleFixWithAI: handleFixWithAI, isNewQueryEnabled: isNewQueryEnabled, handleClearQuery: handleClearQuery, theme: theme, defineEditorTheme: defineEditorTheme, setEditorTheme: setEditorTheme, setEditorMounted: () => { }, ButtonComponent: ButtonComponent, SecondaryButtonComponent: SecondaryButtonComponent, loading: sqlResponseLoading, LoadingComponent: LoadingComponent }) }), _jsxs("div", { style: {
|
|
309
|
+
}, children: [_jsx("div", { style: {
|
|
304
310
|
display: 'flex',
|
|
305
311
|
flexDirection: 'column',
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
fontFamily: theme?.fontFamily,
|
|
313
|
-
color: theme?.primaryTextColor,
|
|
314
|
-
fontSize: 15,
|
|
315
|
-
fontWeight: '400',
|
|
316
|
-
width: '100%',
|
|
317
|
-
}, children: _jsxs("div", { style: {
|
|
312
|
+
overflow: 'auto',
|
|
313
|
+
height: '100%',
|
|
314
|
+
}, children: _jsxs(OverflowContainer, { children: [_jsxs("form", { ref: formRef, onSubmit: (e) => {
|
|
315
|
+
e.preventDefault();
|
|
316
|
+
handleRunSqlPrompt();
|
|
317
|
+
}, style: {
|
|
318
318
|
display: 'flex',
|
|
319
319
|
flexDirection: 'row',
|
|
320
|
-
justifyContent: 'space-between',
|
|
321
320
|
gap: 12,
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
321
|
+
paddingTop: 16,
|
|
322
|
+
paddingBottom: 16,
|
|
323
|
+
}, children: [_jsx(TextInputComponent, { id: "ai-search", value: sqlPrompt, width: searchBarWidth, onChange: (e) => setSqlPrompt(e.target.value), placeholder: "Ask a question..." }), _jsx(ButtonComponent, { onClick: handleRunSqlPrompt, label: "Ask AI" })] }), _jsx("div", { style: {
|
|
324
|
+
minHeight: 210,
|
|
325
|
+
maxHeight: '30vh',
|
|
326
|
+
height: '30%',
|
|
327
|
+
}, children: _jsx(SQLEditorComponent, { query: query || '', schema: schemaData.schema, databaseType: client?.databaseType ?? 'postgresql', clientName: client?.publicKey || '', setQuery: setQuery, handleRunQuery: () => {
|
|
328
|
+
handleRunQuery(currentProcessing, true);
|
|
329
|
+
}, handleFixWithAI: handleFixWithAI, isNewQueryEnabled: isNewQueryEnabled, runQueryOnMount: runQueryOnMount, handleClearQuery: handleClearQuery, theme: theme, defineEditorTheme: defineEditorTheme, setEditorTheme: setEditorTheme, setEditorMounted: () => { }, ButtonComponent: ButtonComponent, SecondaryButtonComponent: SecondaryButtonComponent, loading: sqlResponseLoading && schemaData.isSchemaLoading, LoadingComponent: LoadingComponent }) }), _jsx("div", { style: {
|
|
330
|
+
display: 'flex',
|
|
331
|
+
flexDirection: 'row',
|
|
327
332
|
width: '100%',
|
|
328
|
-
|
|
329
|
-
|
|
333
|
+
justifyContent: addToDashboardButtonLabel === 'Add to dashboard'
|
|
334
|
+
? 'flex-end'
|
|
335
|
+
: 'flex-start',
|
|
336
|
+
}, children: _jsx("div", { style: {
|
|
337
|
+
display: 'flex',
|
|
338
|
+
flexDirection: 'row',
|
|
339
|
+
alignItems: 'center',
|
|
340
|
+
height: 70,
|
|
341
|
+
}, children: _jsxs("div", { style: { display: 'flex', gap: 12 }, children: [addToDashboardButtonLabel ===
|
|
342
|
+
'Add to dashboard' ? (_jsx(SecondaryButtonComponent, { onClick: () => {
|
|
343
|
+
handleRunQuery(currentProcessing, true);
|
|
344
|
+
}, label: "Run query" })) : (_jsx(ButtonComponent, { onClick: () => {
|
|
345
|
+
handleRunQuery(currentProcessing, true);
|
|
346
|
+
}, label: "Run query" })), isNewQueryEnabled && (_jsx(SecondaryButtonComponent, { onClick: handleClearQuery, label: "Clear query" })), addToDashboardButtonLabel ===
|
|
347
|
+
'Add to dashboard' && (_jsx(ButtonComponent, { onClick: () => {
|
|
348
|
+
onSaveChanges && onSaveChanges();
|
|
349
|
+
setIsChartBuilderOpen(true);
|
|
350
|
+
}, label: addToDashboardButtonLabel, disabled: !!errorMessage ||
|
|
351
|
+
!(rows.length > 0 &&
|
|
352
|
+
lastSuccessfulQuery === query), tooltipText: !!errorMessage ||
|
|
353
|
+
!(rows.length > 0 &&
|
|
354
|
+
lastSuccessfulQuery === query)
|
|
355
|
+
? 'Please run a query'
|
|
356
|
+
: '' }))] }) }) }), _jsxs("div", { style: {
|
|
357
|
+
display: 'flex',
|
|
358
|
+
flexDirection: 'column',
|
|
359
|
+
// height: '100%',
|
|
360
|
+
padding: 0,
|
|
361
|
+
margin: 0,
|
|
362
|
+
border: 'none',
|
|
363
|
+
outline: 'none',
|
|
364
|
+
}, children: [errorMessage && (_jsx("div", { style: {
|
|
365
|
+
fontFamily: theme?.fontFamily,
|
|
366
|
+
color: theme?.primaryTextColor,
|
|
367
|
+
fontSize: 15,
|
|
368
|
+
fontWeight: '400',
|
|
369
|
+
width: '100%',
|
|
370
|
+
}, children: _jsxs("div", { style: {
|
|
371
|
+
display: 'flex',
|
|
372
|
+
flexDirection: 'row',
|
|
373
|
+
justifyContent: 'space-between',
|
|
374
|
+
gap: 12,
|
|
375
|
+
background: 'rgba(0,0,0,0.02)', // TODO: change color
|
|
376
|
+
color: theme?.primaryTextColor,
|
|
377
|
+
fontFamily: theme?.fontFamily,
|
|
378
|
+
borderRadius: 6,
|
|
379
|
+
padding: 20,
|
|
380
|
+
marginBottom: 15,
|
|
381
|
+
width: '100%',
|
|
382
|
+
alignItems: 'center',
|
|
383
|
+
}, children: [errorMessage, errorMessage !== 'No data found' &&
|
|
384
|
+
errorMessage !== 'No query found' && (_jsx(SecondaryButtonComponent, { onClick: handleFixWithAI, label: "Fix with AI" }))] }) })), errorMessage || !displayTable ? null : (_jsx(TableComponent, { isLoading: sqlQueryLoading, rows: formattedRows, columns: columns, rowCount: rowCount, onPageChange: onPageChange, onSortChange: onSortChange, containerStyle: {
|
|
385
|
+
maxHeight: Math.max(window.innerHeight * 0.7, 75 +
|
|
386
|
+
Math.min(Math.max(10, rows.length), 10) * 37),
|
|
387
|
+
} }))] })] }) }), isChartBuilderEnabled && (_jsxs("div", { style: {
|
|
330
388
|
display: 'flex',
|
|
331
389
|
flexDirection: 'row',
|
|
332
390
|
alignItems: 'center',
|
|
333
391
|
justifyContent: 'flex-end',
|
|
334
392
|
width: '100%',
|
|
335
|
-
|
|
336
|
-
|
|
393
|
+
gap: 12,
|
|
394
|
+
marginTop: 15,
|
|
395
|
+
marginBottom: 5,
|
|
396
|
+
}, children: [onDiscardChanges && (_jsx(SecondaryButtonComponent, { onClick: onDiscardChanges, label: "Discard changes" })), addToDashboardButtonLabel !== 'Add to dashboard' && (_jsx(ButtonComponent, { onClick: () => {
|
|
397
|
+
onSaveChanges && onSaveChanges();
|
|
398
|
+
setIsChartBuilderOpen(true);
|
|
399
|
+
}, label: addToDashboardButtonLabel, disabled: !!errorMessage ||
|
|
400
|
+
!(rows.length > 0 && lastSuccessfulQuery === query) }))] }))] })] }) }) })), (!isChartBuilderHorizontalView || isChartBuilderOpen) && (_jsx(ChartBuilderWithModal, { rows: rows, columns: columns, query: query, isHorizontalView: isChartBuilderHorizontalView, isOpen: isChartBuilderOpen, setIsOpen: setIsChartBuilderOpen, onAddToDashboardComplete: onAddToDashboardComplete, showTableFormatOptions: showTableFormatOptions, showDateFieldOptions: showDateFieldOptions, showAccessControlOptions: showAccessControlOptions, isAdmin: isAdminEnabled, destinationDashboard: destinationDashboard, title: chartBuilderTitle, buttonLabel: addToDashboardButtonLabel, report: tempReport ?? report, pivot: tempReport?.pivot ?? undefined, pivotData: tempReport?.pivotRows && tempReport?.pivotColumns
|
|
337
401
|
? {
|
|
338
402
|
rows: tempReport.pivotRows,
|
|
339
403
|
columns: tempReport.pivotColumns,
|
|
340
404
|
}
|
|
341
|
-
: undefined, organizationName: organizationName, CardComponent: CardComponent, TableComponent: TableComponent, ModalComponent: ModalComponent, ButtonComponent: ButtonComponent, TextInputComponent: TextInputComponent, SelectComponent: SelectComponent, SecondaryButtonComponent: SecondaryButtonComponent, HeaderComponent: HeaderComponent, SubHeaderComponent: SubHeaderComponent, LabelComponent: LabelComponent, TextComponent: TextComponent, PopoverComponent: PopoverComponent, DeleteButtonComponent: DeleteButtonComponent, LoadingComponent: LoadingComponent, ChartBuilderInputRowContainer: ChartBuilderInputRowContainer, ChartBuilderInputColumnContainer: ChartBuilderInputColumnContainer, ErrorMessageComponent: ErrorMessageComponent, PivotRowContainer: PivotRowContainer, PivotColumnContainer: PivotColumnContainer, FormContainer: ChartBuilderFormContainer, hideDateRangeFilter: true, onClickChartElement: onClickChartElement, rowCount: rowCount, onPageChange: onPageChange, onSortChange: onSortChange, isLoading: sqlQueryLoading })] }));
|
|
405
|
+
: undefined, organizationName: organizationName, CardComponent: CardComponent, TableComponent: TableComponent, ModalComponent: ModalComponent, ButtonComponent: ButtonComponent, TextInputComponent: TextInputComponent, SelectComponent: SelectComponent, SecondaryButtonComponent: SecondaryButtonComponent, HeaderComponent: HeaderComponent, SubHeaderComponent: SubHeaderComponent, LabelComponent: LabelComponent, TextComponent: TextComponent, PopoverComponent: PopoverComponent, DeleteButtonComponent: DeleteButtonComponent, LoadingComponent: LoadingComponent, ChartBuilderInputRowContainer: ChartBuilderInputRowContainer, ChartBuilderInputColumnContainer: ChartBuilderInputColumnContainer, ErrorMessageComponent: ErrorMessageComponent, PivotRowContainer: PivotRowContainer, PivotColumnContainer: PivotColumnContainer, FormContainer: ChartBuilderFormContainer, hideDateRangeFilter: true, onClickChartElement: onClickChartElement, rowCount: rowCount, onPageChange: onPageChange, onSortChange: onSortChange, isLoading: sqlQueryLoading, isEditingMode: true }))] }));
|
|
342
406
|
}
|
|
343
|
-
const SQLEditorComponent = ({ query, schema, databaseType, clientName, setQuery, setEditorMounted, handleRunQuery,
|
|
407
|
+
const SQLEditorComponent = ({ query, schema, databaseType, clientName, setQuery, setEditorMounted, handleRunQuery, defineEditorTheme, setEditorTheme, runQueryOnMount = false, theme, loading, LoadingComponent = QuillLoadingComponent, }) => {
|
|
344
408
|
const [editorKey, setEditorKey] = useState(0);
|
|
345
|
-
const
|
|
409
|
+
const currentProvider = useRef(null);
|
|
346
410
|
useEffect(() => {
|
|
347
|
-
if (currentProvider) {
|
|
348
|
-
currentProvider.dispose();
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
411
|
+
if (currentProvider.current) {
|
|
412
|
+
currentProvider.current.dispose();
|
|
413
|
+
if (schema && schema.length !== 0) {
|
|
414
|
+
setEditorKey((prevKey) => prevKey + 1);
|
|
415
|
+
}
|
|
352
416
|
}
|
|
353
|
-
|
|
354
|
-
|
|
417
|
+
return () => {
|
|
418
|
+
currentProvider.current?.dispose();
|
|
419
|
+
};
|
|
420
|
+
}, [schema, clientName, databaseType]);
|
|
421
|
+
return (_jsx("div", { style: {
|
|
355
422
|
// maxHeight: 700,
|
|
356
423
|
width: '100%',
|
|
357
424
|
height: '100%',
|
|
@@ -366,31 +433,29 @@ const SQLEditorComponent = ({ query, schema, databaseType, clientName, setQuery,
|
|
|
366
433
|
borderTopRightRadius: 0,
|
|
367
434
|
borderBottomRightRadius: 0,
|
|
368
435
|
overflow: 'hidden',
|
|
369
|
-
}, children:
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
height: 70,
|
|
391
|
-
}, children: _jsxs("div", { style: { display: 'flex', gap: 12 }, children: [_jsx(ButtonComponent, { onClick: handleRunQuery, label: "Run query" }), isNewQueryEnabled && (_jsx(SecondaryButtonComponent, { onClick: handleClearQuery, label: "Clear query" }))] }) })] }));
|
|
436
|
+
}, children: loading ? (_jsx("div", { style: {
|
|
437
|
+
height: '100%',
|
|
438
|
+
width: '100%',
|
|
439
|
+
display: 'flex',
|
|
440
|
+
alignItems: 'center',
|
|
441
|
+
justifyContent: 'center',
|
|
442
|
+
background: '#F9F9F9',
|
|
443
|
+
}, children: _jsx(LoadingComponent, {}) })) : (_jsx(MonacoEditor, { height: "100%", width: "100%", defaultLanguage: clientName, defaultValue: "", language: clientName, value: query, loading: _jsx("div", {}), options: {
|
|
444
|
+
wordWrap: 'on',
|
|
445
|
+
minimap: {
|
|
446
|
+
enabled: false,
|
|
447
|
+
},
|
|
448
|
+
padding: { top: 16 },
|
|
449
|
+
}, onChange: (query) => setQuery(query || ''), beforeMount: (monaco) => defineEditorTheme(monaco, theme), onMount: (_editor, monaco) => {
|
|
450
|
+
currentProvider.current = setEditorTheme(_editor, monaco, schema, databaseType, clientName);
|
|
451
|
+
setEditorMounted();
|
|
452
|
+
if (runQueryOnMount) {
|
|
453
|
+
handleRunQuery();
|
|
454
|
+
}
|
|
455
|
+
_editor.focus();
|
|
456
|
+
} }, editorKey)) }));
|
|
392
457
|
};
|
|
393
|
-
export const SchemaListComponent = ({ schema, theme, loading, LoadingComponent, width, onClick, }) => {
|
|
458
|
+
export const SchemaListComponent = ({ schema, theme, loading, LoadingComponent, width, onClick, style, }) => {
|
|
394
459
|
if (loading) {
|
|
395
460
|
return (_jsxs("div", { style: {
|
|
396
461
|
// maxHeight: 700,
|
|
@@ -405,11 +470,13 @@ export const SchemaListComponent = ({ schema, theme, loading, LoadingComponent,
|
|
|
405
470
|
display: 'flex',
|
|
406
471
|
// alignItems: 'center',
|
|
407
472
|
justifyContent: 'center',
|
|
473
|
+
...style,
|
|
408
474
|
}, children: [_jsx("div", { style: { height: 100 } }), LoadingComponent && _jsx(LoadingComponent, {}), !LoadingComponent && (_jsxs("svg", { width: "24", height: "24", children: [_jsx("circle", { cx: "12", cy: "12", r: "9.375", strokeWidth: "3.75", strokeDasharray: "calc(2 * 3.14 * 9.375 / 3) calc(2 * 3.14 * 9.375 * 2 / 3)", strokeDashoffset: "calc(2 * 3.14 * 9.375 / 6)", stroke: theme?.primaryTextColor || '#364153', fill: "none", transform: "rotate(-90 12 12)", children: _jsx("animateTransform", { attributeName: "transform", attributeType: "XML", type: "rotate", from: "-180 12 12", to: "180 12 12", dur: "0.8s", repeatCount: "indefinite" }) }), _jsx("circle", { cx: "12", cy: "12", r: "9.375", strokeWidth: "3.75", strokeDasharray: "calc(2 * 3.14 * 9.375 / 3) calc(2 * 3.14 * 9.375 * 1 / 3)", strokeDashoffset: "calc(2 * 3.14 * 9.375 / 3) calc(2 * 3.14 * 9.375 * 2 / 3)", stroke: '#ADB1B9', fill: "none", transform: "rotate(90 12 12)", children: _jsx("animateTransform", { attributeName: "transform", attributeType: "XML", type: "rotate", from: "0 12 12", to: "360 12 12", dur: "0.8s", repeatCount: "indefinite" }) })] }))] }));
|
|
409
475
|
}
|
|
410
476
|
return (_jsx("div", { style: {
|
|
411
477
|
// maxHeight: 700,
|
|
412
478
|
width: width || 250,
|
|
479
|
+
maxWidth: 350,
|
|
413
480
|
minWidth: 250,
|
|
414
481
|
overflowY: 'auto',
|
|
415
482
|
height: '100%',
|
package/dist/esm/Table.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
import { useContext, useEffect, useState, } from 'react';
|
|
3
|
-
import { ClientContext,
|
|
3
|
+
import { ClientContext, DashboardContext, ReportFiltersContext, SchemaDataContext, ThemeContext, } from './Context';
|
|
4
4
|
import QuillTable from './components/QuillTable';
|
|
5
5
|
import { useExport } from './hooks/useExport';
|
|
6
6
|
import { processFilterFromBackend, updateFilter, } from './utils/filterProcessing';
|
|
@@ -59,7 +59,7 @@ const ChartUpdater = ({ reportId, containerStyle, className, dashboardContext, c
|
|
|
59
59
|
const [loading, setLoading] = useState(false);
|
|
60
60
|
const [initialLoad, setInitialLoad] = useState(true);
|
|
61
61
|
const { downloadCSV } = useExport(reportId);
|
|
62
|
-
const [
|
|
62
|
+
const [schemaData] = useContext(SchemaDataContext);
|
|
63
63
|
const [rows, setRows] = useState([]);
|
|
64
64
|
const [columns, setColumns] = useState([]);
|
|
65
65
|
const [tableFilters, setTableFilters] = useState([]);
|
|
@@ -98,7 +98,7 @@ const ChartUpdater = ({ reportId, containerStyle, className, dashboardContext, c
|
|
|
98
98
|
setLoading(true);
|
|
99
99
|
try {
|
|
100
100
|
const updatedProcessing = { ...currentProcessing, ...processing };
|
|
101
|
-
const paginatedRows = await fetchTableByReport(reportId, client, updatedProcessing, tableFilters, customFields);
|
|
101
|
+
const paginatedRows = await fetchTableByReport(reportId, client, updatedProcessing, tableFilters, schemaData.customFields);
|
|
102
102
|
if (paginatedRows.error) {
|
|
103
103
|
throw new Error('Error fetching chart');
|
|
104
104
|
}
|
|
@@ -120,7 +120,7 @@ const ChartUpdater = ({ reportId, containerStyle, className, dashboardContext, c
|
|
|
120
120
|
};
|
|
121
121
|
const fetchReportHelper = async (useReportTask = true, reportFilters, processing) => {
|
|
122
122
|
setLoading(true);
|
|
123
|
-
const { report, error } = await fetchReport(reportId, client, useReportTask, reportFilters ? reportFilters.filters : [], processing, undefined, customFields);
|
|
123
|
+
const { report, error } = await fetchReport(reportId, client, useReportTask, reportFilters ? reportFilters.filters : [], processing, undefined, schemaData.customFields);
|
|
124
124
|
if (error) {
|
|
125
125
|
setLoading(false);
|
|
126
126
|
setInitialLoad(false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BarChart.d.ts","sourceRoot":"","sources":["../../../../src/components/Chart/BarChart.tsx"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"BarChart.d.ts","sourceRoot":"","sources":["../../../../src/components/Chart/BarChart.tsx"],"names":[],"mappings":";AAcA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAG7C,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,EAC/B,MAAM,EACN,QAAQ,EACR,WAAW,EACX,IAAI,EACJ,cAAc,EACd,SAAS,EACT,UAAU,EACV,WAAW,EACX,KAAK,EACL,UAAU,EACV,SAAS,EACT,iBAAwB,EACxB,SAAiB,EACjB,SAAiB,EACjB,iBAAyB,EACzB,mBAAmB,EACnB,UAAU,GACX,EAAE;IACD,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,WAAW,EAAE,GAAG,EAAE,CAAC;IACnB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,UAAU,CAAC;IACxB,KAAK,EAAE,GAAG,CAAC;IACX,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,mBAAmB,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IACvC,UAAU,CAAC,EAAE,GAAG,CAAC;CAClB,2CAmMA"}
|