@quillsql/react 2.11.17 → 2.11.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/Chart.d.ts +0 -8
- package/dist/cjs/Chart.d.ts.map +1 -1
- package/dist/cjs/ChartBuilder.d.ts +11 -1
- package/dist/cjs/ChartBuilder.d.ts.map +1 -1
- package/dist/cjs/ChartBuilder.js +6 -5
- package/dist/cjs/ChartEditor.d.ts +11 -3
- package/dist/cjs/ChartEditor.d.ts.map +1 -1
- package/dist/cjs/ChartEditor.js +3 -3
- package/dist/cjs/Dashboard.d.ts.map +1 -1
- package/dist/cjs/Dashboard.js +7 -9
- package/dist/cjs/ReportBuilder.d.ts +7 -1
- package/dist/cjs/ReportBuilder.d.ts.map +1 -1
- package/dist/cjs/ReportBuilder.js +112 -37
- package/dist/cjs/SQLEditor.d.ts +7 -5
- package/dist/cjs/SQLEditor.d.ts.map +1 -1
- package/dist/cjs/SQLEditor.js +3 -2
- package/dist/cjs/Table.d.ts +2 -2
- package/dist/cjs/Table.d.ts.map +1 -1
- package/dist/cjs/components/QuillCard.d.ts +2 -7
- package/dist/cjs/components/QuillCard.d.ts.map +1 -1
- package/dist/cjs/components/QuillCard.js +15 -9
- package/dist/cjs/components/ReportBuilder/AddColumnPopover.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/AddColumnPopover.js +2 -0
- package/dist/cjs/components/ReportBuilder/AddLimitPopover.js +1 -1
- package/dist/cjs/components/ReportBuilder/convert.d.ts +1 -0
- package/dist/cjs/components/ReportBuilder/convert.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/convert.js +20 -1
- package/dist/cjs/components/ReportBuilder/operators.d.ts +15 -10
- package/dist/cjs/components/ReportBuilder/operators.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/operators.js +23 -10
- package/dist/cjs/components/ReportBuilder/ui.d.ts +1 -2
- package/dist/cjs/components/ReportBuilder/ui.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/ui.js +4 -4
- package/dist/cjs/components/ReportBuilder/util.d.ts +8 -3
- package/dist/cjs/components/ReportBuilder/util.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/util.js +110 -64
- package/dist/cjs/components/UiComponents.d.ts +0 -6
- package/dist/cjs/components/UiComponents.d.ts.map +1 -1
- package/dist/cjs/components/UiComponents.js +2 -44
- package/dist/cjs/internals/ReportBuilder/PivotList.d.ts +5 -2
- package/dist/cjs/internals/ReportBuilder/PivotList.d.ts.map +1 -1
- package/dist/cjs/internals/ReportBuilder/PivotList.js +11 -11
- package/dist/cjs/internals/ReportBuilder/PivotModal.d.ts +2 -1
- package/dist/cjs/internals/ReportBuilder/PivotModal.d.ts.map +1 -1
- package/dist/cjs/internals/ReportBuilder/PivotModal.js +4 -3
- package/dist/cjs/utils/parserBigQuery.d.ts +6 -0
- package/dist/cjs/utils/parserBigQuery.d.ts.map +1 -0
- package/dist/cjs/utils/parserBigQuery.js +60 -0
- package/dist/cjs/utils/parserPostgres.d.ts +3 -0
- package/dist/cjs/utils/parserPostgres.d.ts.map +1 -0
- package/dist/cjs/utils/parserPostgres.js +42 -0
- package/dist/esm/Chart.d.ts +0 -8
- package/dist/esm/Chart.d.ts.map +1 -1
- package/dist/esm/ChartBuilder.d.ts +11 -1
- package/dist/esm/ChartBuilder.d.ts.map +1 -1
- package/dist/esm/ChartBuilder.js +6 -5
- package/dist/esm/ChartEditor.d.ts +11 -3
- package/dist/esm/ChartEditor.d.ts.map +1 -1
- package/dist/esm/ChartEditor.js +3 -3
- package/dist/esm/Dashboard.d.ts.map +1 -1
- package/dist/esm/Dashboard.js +8 -10
- package/dist/esm/ReportBuilder.d.ts +7 -1
- package/dist/esm/ReportBuilder.d.ts.map +1 -1
- package/dist/esm/ReportBuilder.js +113 -38
- package/dist/esm/SQLEditor.d.ts +7 -5
- package/dist/esm/SQLEditor.d.ts.map +1 -1
- package/dist/esm/SQLEditor.js +3 -2
- package/dist/esm/Table.d.ts +2 -2
- package/dist/esm/Table.d.ts.map +1 -1
- package/dist/esm/components/QuillCard.d.ts +2 -7
- package/dist/esm/components/QuillCard.d.ts.map +1 -1
- package/dist/esm/components/QuillCard.js +15 -9
- package/dist/esm/components/ReportBuilder/AddColumnPopover.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/AddColumnPopover.js +2 -0
- package/dist/esm/components/ReportBuilder/AddLimitPopover.js +1 -1
- package/dist/esm/components/ReportBuilder/convert.d.ts +1 -0
- package/dist/esm/components/ReportBuilder/convert.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/convert.js +18 -0
- package/dist/esm/components/ReportBuilder/operators.d.ts +15 -10
- package/dist/esm/components/ReportBuilder/operators.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/operators.js +23 -10
- package/dist/esm/components/ReportBuilder/ui.d.ts +1 -2
- package/dist/esm/components/ReportBuilder/ui.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/ui.js +4 -4
- package/dist/esm/components/ReportBuilder/util.d.ts +8 -3
- package/dist/esm/components/ReportBuilder/util.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/util.js +101 -60
- package/dist/esm/components/UiComponents.d.ts +0 -6
- package/dist/esm/components/UiComponents.d.ts.map +1 -1
- package/dist/esm/components/UiComponents.js +3 -44
- package/dist/esm/internals/ReportBuilder/PivotList.d.ts +5 -2
- package/dist/esm/internals/ReportBuilder/PivotList.d.ts.map +1 -1
- package/dist/esm/internals/ReportBuilder/PivotList.js +11 -11
- package/dist/esm/internals/ReportBuilder/PivotModal.d.ts +2 -1
- package/dist/esm/internals/ReportBuilder/PivotModal.d.ts.map +1 -1
- package/dist/esm/internals/ReportBuilder/PivotModal.js +4 -3
- package/dist/esm/utils/parserBigQuery.d.ts +6 -0
- package/dist/esm/utils/parserBigQuery.d.ts.map +1 -0
- package/dist/esm/utils/parserBigQuery.js +52 -0
- package/dist/esm/utils/parserPostgres.d.ts +3 -0
- package/dist/esm/utils/parserPostgres.d.ts.map +1 -0
- package/dist/esm/utils/parserPostgres.js +37 -0
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Dashboard.d.ts","sourceRoot":"","sources":["../../src/Dashboard.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAMZ,SAAS,EACT,WAAW,EACZ,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"Dashboard.d.ts","sourceRoot":"","sources":["../../src/Dashboard.tsx"],"names":[],"mappings":"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"}
|
package/dist/esm/Dashboard.js
CHANGED
|
@@ -15,8 +15,9 @@ import { styleToProps } from './utils/styles';
|
|
|
15
15
|
import { cleanDashboardItem } from './utils/dashboard';
|
|
16
16
|
import { QuillDateRangePicker } from './DateRangePicker/QuillDateRangePicker';
|
|
17
17
|
import DataLoader from './components/Dashboard/DataLoader';
|
|
18
|
-
import {
|
|
18
|
+
import { QuillEmptyDashboardComponent } from './components/UiComponents';
|
|
19
19
|
import { DashboardFilter } from './components/Dashboard/DashboardFilter';
|
|
20
|
+
import { QuillSelectComponent } from './components/QuillSelect';
|
|
20
21
|
const defaultChartContainerStyles = {
|
|
21
22
|
display: 'flex',
|
|
22
23
|
width: '100%',
|
|
@@ -54,7 +55,7 @@ const defaultChartContainerStyles = {
|
|
|
54
55
|
* ### API Reference
|
|
55
56
|
* @see https://docs.quillsql.com/components/dashboard
|
|
56
57
|
*/
|
|
57
|
-
export default function Dashboard({ name, SelectComponent =
|
|
58
|
+
export default function Dashboard({ name, SelectComponent = QuillSelectComponent, EmptyDashboardComponent = QuillEmptyDashboardComponent, DateRangePickerComponent = QuillDateRangePicker, MetricComponent = QuillMetricComponent, ChartComponent = QuillChartComponent, TableComponent = QuillTableComponent, DashboardSectionComponent = DashboardSection, DashboardSectionContainerComponent = DashboardSectionContainer, onClickDashboardItem, onChangeLoading, hideFilters, hideDateRangeFilter = false, hideXAxis = false, hideYAxis = false, hideCartesianGrid = false, comparisonLineStyle = 'solid', containerStyle, className, chartContainerStyle = defaultChartContainerStyles, }) {
|
|
58
59
|
const { dispatch } = useContext(DashboardContext);
|
|
59
60
|
const { isLoading: isDataLoading, data, reload, } = useDashboard(name);
|
|
60
61
|
const [dashboardSections, setDashboardSections] = useState(null);
|
|
@@ -163,8 +164,11 @@ export default function Dashboard({ name, SelectComponent = QuillDropdownCompone
|
|
|
163
164
|
}
|
|
164
165
|
};
|
|
165
166
|
const handleOnClickDashboardItem = (elem) => {
|
|
167
|
+
const cleanedItem = cleanDashboardItem(dashboard[elem._id] ?? elem, dashboardFilters);
|
|
166
168
|
if (dashboard[elem._id]?._id && onClickDashboardItem) {
|
|
167
|
-
|
|
169
|
+
// The _id add-on is a patch for backwards compatability
|
|
170
|
+
// TODO: remove all _id references from the codebase (admin and react)
|
|
171
|
+
onClickDashboardItem({ ...cleanedItem, _id: elem._id });
|
|
168
172
|
}
|
|
169
173
|
else if (onClickDashboardItem) {
|
|
170
174
|
dispatch({
|
|
@@ -172,13 +176,7 @@ export default function Dashboard({ name, SelectComponent = QuillDropdownCompone
|
|
|
172
176
|
id: elem._id,
|
|
173
177
|
data: { ...elem, filtersApplied: dashboardFilters },
|
|
174
178
|
});
|
|
175
|
-
onClickDashboardItem({
|
|
176
|
-
...dashboard[elem._id],
|
|
177
|
-
_id: elem._id,
|
|
178
|
-
error_id: elem._id,
|
|
179
|
-
name: elem.name,
|
|
180
|
-
query: elem.queryString,
|
|
181
|
-
});
|
|
179
|
+
onClickDashboardItem({ ...cleanedItem, _id: elem._id });
|
|
182
180
|
}
|
|
183
181
|
};
|
|
184
182
|
function removeQuotes(str) {
|
|
@@ -143,6 +143,12 @@ export interface ReportBuilderProps {
|
|
|
143
143
|
SidebarHeadingComponent?: (props: {
|
|
144
144
|
label: string;
|
|
145
145
|
}) => JSX.Element;
|
|
146
|
+
/** A card component used as a dismissable container of pivot information. */
|
|
147
|
+
CardComponent?: (props: {
|
|
148
|
+
children: ReactNode;
|
|
149
|
+
onClick?: () => void;
|
|
150
|
+
onDelete?: () => void;
|
|
151
|
+
}) => JSX.Element;
|
|
146
152
|
/** A label component. */
|
|
147
153
|
LabelComponent?: (props: {
|
|
148
154
|
label: string;
|
|
@@ -193,5 +199,5 @@ export interface ReportBuilderProps {
|
|
|
193
199
|
* ### Report Builder API
|
|
194
200
|
* @see https://docs.quillsql.com/components/report-builder
|
|
195
201
|
*/
|
|
196
|
-
export default function ReportBuilder({ initialTableName, onSubmitChartBuilder, destinationDashboard, organizationName, ButtonComponent, SecondaryButtonComponent, DeleteButtonComponent, ModalComponent, TextInputComponent, SelectComponent, TableComponent, PopoverComponent, TabsComponent, CheckboxComponent, SidebarComponent, ContainerComponent, SelectColumnComponent, DraggableColumnComponent, SidebarHeadingComponent, FilterPopoverComponent, SortPopoverComponent, LimitPopoverComponent, LabelComponent, HeaderComponent, TextComponent, isAdminEnabled, isAIEnabled, containerStyle, }: ReportBuilderProps): import("react/jsx-runtime").JSX.Element;
|
|
202
|
+
export default function ReportBuilder({ initialTableName, onSubmitChartBuilder, destinationDashboard, organizationName, ButtonComponent, SecondaryButtonComponent, DeleteButtonComponent, ModalComponent, TextInputComponent, SelectComponent, TableComponent, PopoverComponent, TabsComponent, CheckboxComponent, SidebarComponent, ContainerComponent, SelectColumnComponent, DraggableColumnComponent, SidebarHeadingComponent, FilterPopoverComponent, SortPopoverComponent, LimitPopoverComponent, CardComponent, LabelComponent, HeaderComponent, TextComponent, isAdminEnabled, isAIEnabled, containerStyle, }: ReportBuilderProps): import("react/jsx-runtime").JSX.Element;
|
|
197
203
|
//# sourceMappingURL=ReportBuilder.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReportBuilder.d.ts","sourceRoot":"","sources":["../../src/ReportBuilder.tsx"],"names":[],"mappings":"AACA,OAAO,EAEL,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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"}
|
|
@@ -13,7 +13,7 @@ import { QuillTextInput } from './components/UiComponents';
|
|
|
13
13
|
import { QuillSidebar, CustomContainer, QuillSelectColumn, QuillDraggableColumn, QuillSidebarHeading, QuillFilterPopover, QuillSortPopover, TagWrapper, EditPopover, AddFilterPopover, QuillLimitPopover, } from './components/ReportBuilder/ui';
|
|
14
14
|
import { generateCurrentPeriodPostgres, generateEqualsPostgres, generateLastNPeriodsPostgres, generatePreviousPeriodPostgres, } from './components/ReportBuilder/postgres';
|
|
15
15
|
import { convertBigQuery, convertGroupBy, convertRemoveSimpleParentheses, convertStringComparison, convertWildcardColumns, } from './components/ReportBuilder/convert';
|
|
16
|
-
import { deepCopy, formatDateComparisonNode, getDateFilterInfo,
|
|
16
|
+
import { deepCopy, formatDateComparisonNode, getDateFilterInfo, getPostgresBasicType, isColumnComparison, isDateTruncEquals, isInTheLastInterval, isNodeEmptyCollection, isTheCurrentInterval, isThePreviousInterval, isTopLevelBoolean, showNodeAsRow, tryConvertDateEquality, removeNonSelectedTableReferences, getCustomSentence, isEquals, } from './components/ReportBuilder/util';
|
|
17
17
|
import { getDefaultOperatorSubtrees, OPERATOR_GROUPS, } from './components/ReportBuilder/operators';
|
|
18
18
|
import { hashCode } from './utils/crypto';
|
|
19
19
|
import { DATE_FMT, DAY_OF_WEEK, defaultAST, defaultColumn, defaultEntry, defaultNumericComparison, defaultTable, defaultVariant, MONTH_OF_YEAR, } from './components/ReportBuilder/constants';
|
|
@@ -25,6 +25,7 @@ import { snakeCaseToTitleCase } from './utils/textProcessing';
|
|
|
25
25
|
import { AddLimitPopover, LimitSentence, } from './components/ReportBuilder/AddLimitPopover';
|
|
26
26
|
import { updateFirstChildWidth } from './utils/width';
|
|
27
27
|
import { QuillSelectComponent } from './components/QuillSelect';
|
|
28
|
+
import { QuillCard } from './components/QuillCard';
|
|
28
29
|
/**
|
|
29
30
|
* Quill Report Builder
|
|
30
31
|
*
|
|
@@ -56,13 +57,14 @@ import { QuillSelectComponent } from './components/QuillSelect';
|
|
|
56
57
|
* ### Report Builder API
|
|
57
58
|
* @see https://docs.quillsql.com/components/report-builder
|
|
58
59
|
*/
|
|
59
|
-
export default function ReportBuilder({ initialTableName = '', onSubmitChartBuilder = () => void null, destinationDashboard = undefined, organizationName = '', ButtonComponent = MemoizedButton, SecondaryButtonComponent = MemoizedSecondaryButton, DeleteButtonComponent = MemoizedDeleteButton, ModalComponent = MemoizedModal, TextInputComponent = QuillTextInput, SelectComponent = QuillSelectComponent, TableComponent = QuillTableComponent, PopoverComponent = MemoizedPopover, TabsComponent = QuillTabs, CheckboxComponent = MemoizedCheckbox, SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectColumnComponent = QuillSelectColumn, DraggableColumnComponent = QuillDraggableColumn, SidebarHeadingComponent = QuillSidebarHeading, FilterPopoverComponent = QuillFilterPopover, SortPopoverComponent = QuillSortPopover, LimitPopoverComponent = QuillLimitPopover, LabelComponent = MemoizedLabel, HeaderComponent = MemoizedHeader, TextComponent = MemoizedText, isAdminEnabled = false, isAIEnabled = true, containerStyle, }) {
|
|
60
|
+
export default function ReportBuilder({ initialTableName = '', onSubmitChartBuilder = () => void null, destinationDashboard = undefined, organizationName = '', ButtonComponent = MemoizedButton, SecondaryButtonComponent = MemoizedSecondaryButton, DeleteButtonComponent = MemoizedDeleteButton, ModalComponent = MemoizedModal, TextInputComponent = QuillTextInput, SelectComponent = QuillSelectComponent, TableComponent = QuillTableComponent, PopoverComponent = MemoizedPopover, TabsComponent = QuillTabs, CheckboxComponent = MemoizedCheckbox, SidebarComponent = QuillSidebar, ContainerComponent = CustomContainer, SelectColumnComponent = QuillSelectColumn, DraggableColumnComponent = QuillDraggableColumn, SidebarHeadingComponent = QuillSidebarHeading, FilterPopoverComponent = QuillFilterPopover, SortPopoverComponent = QuillSortPopover, LimitPopoverComponent = QuillLimitPopover, CardComponent = QuillCard, LabelComponent = MemoizedLabel, HeaderComponent = MemoizedHeader, TextComponent = MemoizedText, isAdminEnabled = false, isAIEnabled = true, containerStyle, }) {
|
|
60
61
|
const [aiPrompt, setAiPrompt] = useState('');
|
|
61
62
|
const [errorMessage, setErrorMessage] = useState('');
|
|
62
63
|
const [baseAst, setBaseAst] = useState(null);
|
|
63
64
|
const [formData, setFormData] = useState(null);
|
|
64
65
|
const [orderedColumnNames, setOrderedColumnNames] = useState([]);
|
|
65
66
|
const [selectedColumns, setSelectedColumns] = useState([]);
|
|
67
|
+
const [selectedOrderedColumns, setSelectedOrderedColumns] = useState([]);
|
|
66
68
|
const [schemaTables, setSchemaTables] = useState([]);
|
|
67
69
|
const [activeQuery, setActiveQuery] = useState('');
|
|
68
70
|
const [activeEditItem, setActiveEditItem] = useState(null);
|
|
@@ -122,7 +124,9 @@ export default function ReportBuilder({ initialTableName = '', onSubmitChartBuil
|
|
|
122
124
|
.sort(sortFn)
|
|
123
125
|
.filter((c) => columnsInPivot.includes(c));
|
|
124
126
|
}
|
|
125
|
-
|
|
127
|
+
// make the columnNames match the order of the selectedOrderedColumns
|
|
128
|
+
return columnNames.sort((a, b) => selectedOrderedColumns.indexOf(a) - selectedOrderedColumns.indexOf(b));
|
|
129
|
+
// return columnNames;
|
|
126
130
|
};
|
|
127
131
|
/**
|
|
128
132
|
* Transforms an array of column names into an array of columnInfo objects
|
|
@@ -226,23 +230,28 @@ export default function ReportBuilder({ initialTableName = '', onSubmitChartBuil
|
|
|
226
230
|
}
|
|
227
231
|
setUniqueValues(newValues);
|
|
228
232
|
};
|
|
229
|
-
const fetchSqlQuery = async (ast, formData) => {
|
|
230
|
-
|
|
233
|
+
const fetchSqlQuery = async (ast, formData, fetchData = true) => {
|
|
234
|
+
if (fetchData) {
|
|
235
|
+
setLoading(true);
|
|
236
|
+
}
|
|
231
237
|
setErrorMessage('');
|
|
232
238
|
try {
|
|
239
|
+
const where = formData ? formData : ast?.where || null;
|
|
233
240
|
const response = await fetch(`https://quill-344421.uc.r.appspot.com/sqlify`, {
|
|
234
241
|
method: 'POST',
|
|
235
242
|
headers: {
|
|
236
243
|
'Content-Type': 'application/json',
|
|
237
244
|
},
|
|
238
245
|
body: JSON.stringify({
|
|
239
|
-
ast: { ...ast, where
|
|
246
|
+
ast: { ...ast, where },
|
|
240
247
|
publicKey: client.publicKey,
|
|
241
248
|
}),
|
|
242
249
|
});
|
|
243
250
|
const data = await response.json();
|
|
244
251
|
setActiveQuery(data.query);
|
|
245
|
-
|
|
252
|
+
if (fetchData) {
|
|
253
|
+
fetchUponChange(ast, formData);
|
|
254
|
+
}
|
|
246
255
|
}
|
|
247
256
|
catch (error) {
|
|
248
257
|
setLoading(false);
|
|
@@ -310,8 +319,14 @@ export default function ReportBuilder({ initialTableName = '', onSubmitChartBuil
|
|
|
310
319
|
.find((t) => t.name === initialTableName)
|
|
311
320
|
?.columns.map((c) => c.name)
|
|
312
321
|
.sort((a, b) => {
|
|
313
|
-
const aIsId = a.endsWith('.id') ||
|
|
314
|
-
|
|
322
|
+
const aIsId = a.endsWith('.id') ||
|
|
323
|
+
a.endsWith('_id') ||
|
|
324
|
+
a.endsWith('Id') ||
|
|
325
|
+
a === 'id';
|
|
326
|
+
const bIsId = b.endsWith('.id') ||
|
|
327
|
+
b.endsWith('_id') ||
|
|
328
|
+
b.endsWith('Id') ||
|
|
329
|
+
b === 'id';
|
|
315
330
|
if (aIsId && !bIsId)
|
|
316
331
|
return 1;
|
|
317
332
|
if (bIsId && !aIsId)
|
|
@@ -346,8 +361,14 @@ export default function ReportBuilder({ initialTableName = '', onSubmitChartBuil
|
|
|
346
361
|
setOrderedColumnNames((tables ?? []).flatMap((table) => table.columns
|
|
347
362
|
.map((c) => `${table.name}.${c.name}`)
|
|
348
363
|
.sort((a, b) => {
|
|
349
|
-
const aIsId = a.endsWith('.id') ||
|
|
350
|
-
|
|
364
|
+
const aIsId = a.endsWith('.id') ||
|
|
365
|
+
a.endsWith('_id') ||
|
|
366
|
+
a.endsWith('Id') ||
|
|
367
|
+
a === 'id';
|
|
368
|
+
const bIsId = b.endsWith('.id') ||
|
|
369
|
+
b.endsWith('_id') ||
|
|
370
|
+
b.endsWith('Id') ||
|
|
371
|
+
b === 'id';
|
|
351
372
|
if (aIsId && !bIsId)
|
|
352
373
|
return 1;
|
|
353
374
|
if (bIsId && !aIsId)
|
|
@@ -365,9 +386,7 @@ export default function ReportBuilder({ initialTableName = '', onSubmitChartBuil
|
|
|
365
386
|
};
|
|
366
387
|
if (schemaTables.length === 0) {
|
|
367
388
|
fetchSchema();
|
|
368
|
-
|
|
369
|
-
else if (initialLoad && initialTableName) {
|
|
370
|
-
loadTable(schemaTables);
|
|
389
|
+
setInitialLoad(false);
|
|
371
390
|
}
|
|
372
391
|
}, [schemaTables, initialTableName]);
|
|
373
392
|
const updateFormData = (updates, { isDeletion = false, isInsertion = false, isReplaceSubtree = false, isAddVariant = false, isDeleteVariant = false, topLevelBinOp = 'OR', isCondition = undefined, }) => {
|
|
@@ -934,6 +953,7 @@ export default function ReportBuilder({ initialTableName = '', onSubmitChartBuil
|
|
|
934
953
|
{ label: 'in the last', value: 'IN_THE_LAST' },
|
|
935
954
|
{ label: 'in the previous', value: 'IN_THE_PREVIOUS' },
|
|
936
955
|
{ label: 'in the current', value: 'IN_THE_CURRENT' },
|
|
956
|
+
{ label: 'equals', value: 'EQUALS' },
|
|
937
957
|
{ label: 'is not null', value: 'IS NOT' },
|
|
938
958
|
{ label: 'is null', value: 'IS' },
|
|
939
959
|
// { label: 'equals', value: 'equals' },
|
|
@@ -989,6 +1009,7 @@ export default function ReportBuilder({ initialTableName = '', onSubmitChartBuil
|
|
|
989
1009
|
{ label: 'in the last', value: 'IN_THE_LAST' },
|
|
990
1010
|
{ label: 'in the previous', value: 'IN_THE_PREVIOUS' },
|
|
991
1011
|
{ label: 'in the current', value: 'IN_THE_CURRENT' },
|
|
1012
|
+
{ label: 'equals', value: 'EQUALS' },
|
|
992
1013
|
{ label: 'is not null', value: 'IS NOT' },
|
|
993
1014
|
{ label: 'is null', value: 'IS' },
|
|
994
1015
|
// { label: 'equals', value: 'equals' },
|
|
@@ -1042,6 +1063,7 @@ export default function ReportBuilder({ initialTableName = '', onSubmitChartBuil
|
|
|
1042
1063
|
{ label: 'in the last', value: 'IN_THE_LAST' },
|
|
1043
1064
|
{ label: 'in the previous', value: 'IN_THE_PREVIOUS' },
|
|
1044
1065
|
{ label: 'in the current', value: 'IN_THE_CURRENT' },
|
|
1066
|
+
{ label: 'equals', value: 'EQUALS' },
|
|
1045
1067
|
{ label: 'is not null', value: 'IS NOT' },
|
|
1046
1068
|
{ label: 'is null', value: 'IS' },
|
|
1047
1069
|
// { label: 'equals', value: 'equals' },
|
|
@@ -1073,6 +1095,65 @@ export default function ReportBuilder({ initialTableName = '', onSubmitChartBuil
|
|
|
1073
1095
|
{ label: `week`, value: 'WEEK' },
|
|
1074
1096
|
] })] }));
|
|
1075
1097
|
}
|
|
1098
|
+
else if (isEquals(node, client.databaseType)) {
|
|
1099
|
+
const options = getAllPossibleColumns().map((column) => ({
|
|
1100
|
+
label: snakeCaseToTitleCase(column.displayName),
|
|
1101
|
+
value: column.name,
|
|
1102
|
+
}));
|
|
1103
|
+
return (_jsxs("div", { style: {
|
|
1104
|
+
display: 'flex',
|
|
1105
|
+
flexDirection: 'row',
|
|
1106
|
+
alignItems: 'center',
|
|
1107
|
+
gap: 20,
|
|
1108
|
+
}, children: [_jsx(SelectComponent, { value: node.left.column, onChange: (event) => {
|
|
1109
|
+
const columnType = getColumnTypeByName(event.target.value);
|
|
1110
|
+
if (isDateishColumnType(columnType)) {
|
|
1111
|
+
// handleChange(value, keyPrefix + dateColumnPath, "text");
|
|
1112
|
+
handleOperatorChange('IN_THE_LAST', node, keyPrefix, event.target.value);
|
|
1113
|
+
}
|
|
1114
|
+
else if (isNumericColumnType(columnType)) {
|
|
1115
|
+
const newSubtree = deepCopy(defaultNumericComparison);
|
|
1116
|
+
newSubtree.left.column = event.target.value;
|
|
1117
|
+
handleReplaceSubtree(keyPrefix, newSubtree);
|
|
1118
|
+
}
|
|
1119
|
+
else {
|
|
1120
|
+
const newSubtree = deepCopy(defaultEntry);
|
|
1121
|
+
newSubtree.left.args.value[0].column = event.target.value;
|
|
1122
|
+
handleReplaceSubtree(keyPrefix, newSubtree);
|
|
1123
|
+
}
|
|
1124
|
+
}, options: options }), _jsx(SelectComponent, { value: 'EQUALS', onChange: (event) => {
|
|
1125
|
+
handleOperatorChange(event.target.value, node, keyPrefix, node.left.column);
|
|
1126
|
+
}, options: [
|
|
1127
|
+
{ label: 'in the last', value: 'IN_THE_LAST' },
|
|
1128
|
+
{ label: 'in the previous', value: 'IN_THE_PREVIOUS' },
|
|
1129
|
+
{ label: 'in the current', value: 'IN_THE_CURRENT' },
|
|
1130
|
+
{ label: 'equals', value: 'EQUALS' },
|
|
1131
|
+
{ label: 'is not null', value: 'IS NOT' },
|
|
1132
|
+
{ label: 'is null', value: 'IS' },
|
|
1133
|
+
// { label: 'equals', value: 'equals' },
|
|
1134
|
+
] }), _jsx(SelectComponent, { value: node.right.args.value[1].column, onChange: (event) => {
|
|
1135
|
+
handleChange([
|
|
1136
|
+
{
|
|
1137
|
+
value: event.target.value,
|
|
1138
|
+
path: 'right.args.value||1.column',
|
|
1139
|
+
},
|
|
1140
|
+
{
|
|
1141
|
+
value: event.target.value,
|
|
1142
|
+
path: 'left.args.value||1.column',
|
|
1143
|
+
},
|
|
1144
|
+
]);
|
|
1145
|
+
}, options: [
|
|
1146
|
+
{ label: `year`, value: 'YEAR' },
|
|
1147
|
+
{ label: `quarter`, value: 'QUARTER' },
|
|
1148
|
+
{ label: `month`, value: 'MONTH' },
|
|
1149
|
+
{ label: `week`, value: 'WEEK' },
|
|
1150
|
+
] }), _jsx(TextInputComponent, { id: 'quoted_string', value: node.right.args.value[0].value, width: 120, onChange: (e) => handleChange([
|
|
1151
|
+
{
|
|
1152
|
+
value: e.target.value,
|
|
1153
|
+
path: 'right.args.value||0.value',
|
|
1154
|
+
},
|
|
1155
|
+
]) })] }));
|
|
1156
|
+
}
|
|
1076
1157
|
else if (isColumnComparison(node)) {
|
|
1077
1158
|
const options = getAllPossibleColumns().map((column) => ({
|
|
1078
1159
|
label: snakeCaseToTitleCase(column.displayName),
|
|
@@ -1124,10 +1205,6 @@ export default function ReportBuilder({ initialTableName = '', onSubmitChartBuil
|
|
|
1124
1205
|
]
|
|
1125
1206
|
: []),
|
|
1126
1207
|
];
|
|
1127
|
-
if (client.databaseType === 'BigQuery' &&
|
|
1128
|
-
isDateishColumnType(columnType)) {
|
|
1129
|
-
operatorOptions = operatorOptions.filter((option) => option.value !== 'equals');
|
|
1130
|
-
}
|
|
1131
1208
|
return (_jsxs("div", { style: {
|
|
1132
1209
|
display: 'flex',
|
|
1133
1210
|
gap: 12,
|
|
@@ -1167,7 +1244,8 @@ export default function ReportBuilder({ initialTableName = '', onSubmitChartBuil
|
|
|
1167
1244
|
}, children: uniqueValues[table] &&
|
|
1168
1245
|
Object.keys(uniqueValues[table][leftChildValue] ?? {}).map((key) => (_jsxs("label", { style: { display: 'flex', gap: 4 }, children: [_jsx(CheckboxComponent, { isChecked: uniqueValues[table][leftChildValue][key], onChange: (event) => {
|
|
1169
1246
|
const newValues = deepCopy(uniqueValues);
|
|
1170
|
-
newValues[table][leftChildValue][key] =
|
|
1247
|
+
newValues[table][leftChildValue][key] =
|
|
1248
|
+
event.target.checked;
|
|
1171
1249
|
setUniqueValues(newValues);
|
|
1172
1250
|
if (event.target.checked) {
|
|
1173
1251
|
handleInsertVariant(keyPrefix + 'right.' + 'value', key);
|
|
@@ -1222,6 +1300,7 @@ export default function ReportBuilder({ initialTableName = '', onSubmitChartBuil
|
|
|
1222
1300
|
{ label: 'in the last', value: 'IN_THE_LAST' },
|
|
1223
1301
|
{ label: 'in the previous', value: 'IN_THE_PREVIOUS' },
|
|
1224
1302
|
{ label: 'in the current', value: 'IN_THE_CURRENT' },
|
|
1303
|
+
{ label: 'equals', value: 'EQUALS' },
|
|
1225
1304
|
{ label: 'is not null', value: 'IS NOT' },
|
|
1226
1305
|
{ label: 'is null', value: 'IS' },
|
|
1227
1306
|
]
|
|
@@ -1319,15 +1398,7 @@ export default function ReportBuilder({ initialTableName = '', onSubmitChartBuil
|
|
|
1319
1398
|
// @depreciated TODO: remove next update
|
|
1320
1399
|
// eslint-disable-next-line no-unused-vars
|
|
1321
1400
|
isTopLevelAnd = false, isParentRow = false) => {
|
|
1322
|
-
const
|
|
1323
|
-
? getInTheCurrentIntervalSentence(node, client.databaseType)
|
|
1324
|
-
: null;
|
|
1325
|
-
const isInTheLastIntervalSentence = isInTheLastInterval(node, client.databaseType)
|
|
1326
|
-
? getInTheLastIntervalSentence(node, client.databaseType)
|
|
1327
|
-
: null;
|
|
1328
|
-
const isInThePreviousIntervalSentence = isThePreviousInterval(node, client.databaseType)
|
|
1329
|
-
? getInThePreviousIntervalSentence(node, client.databaseType)
|
|
1330
|
-
: null;
|
|
1401
|
+
const uniqueSentence = getCustomSentence(node, client.databaseType);
|
|
1331
1402
|
let dateComparisonPartialMatch = null;
|
|
1332
1403
|
let dateEqualityPartialMatch = null;
|
|
1333
1404
|
if (client.databaseType !== 'BigQuery') {
|
|
@@ -1357,11 +1428,9 @@ export default function ReportBuilder({ initialTableName = '', onSubmitChartBuil
|
|
|
1357
1428
|
};
|
|
1358
1429
|
switch (node.type) {
|
|
1359
1430
|
case 'binary_expr':
|
|
1360
|
-
return (_jsx(TagWrapper, { keyPrefix: keyPrefix, formData: formData, activeEditItem: activeEditItem, setEditPopoverKey: setEditPopoverKey, setActiveEditItem: setActiveEditItem, setCheckboxes: setCheckboxes, handleReplaceSubtree: handleReplaceSubtree, FilterPopover: FilterPopoverComponent, setActivePath: setActivePath, setOpenPopover: setOpenPopover, setIsPending: setIsPending, clearCheckboxes: clearCheckboxes,
|
|
1431
|
+
return (_jsx(TagWrapper, { keyPrefix: keyPrefix, formData: formData, activeEditItem: activeEditItem, setEditPopoverKey: setEditPopoverKey, setActiveEditItem: setActiveEditItem, setCheckboxes: setCheckboxes, handleReplaceSubtree: handleReplaceSubtree, FilterPopover: FilterPopoverComponent, setActivePath: setActivePath, setOpenPopover: setOpenPopover, setIsPending: setIsPending, clearCheckboxes: clearCheckboxes, handleDelete: handleDelete, editPopoverKey: editPopoverKey, isCard: isCard, isRow: isRow, getByKey: getByKey, EditPopover: EditPopover, Button: ButtonComponent, renderNode: renderNode, children: dateComparisonPartialMatch ??
|
|
1361
1432
|
dateEqualityPartialMatch ??
|
|
1362
|
-
|
|
1363
|
-
isInTheLastIntervalSentence ??
|
|
1364
|
-
isInThePreviousIntervalSentence ?? (_jsxs(_Fragment, { children: [node.left &&
|
|
1433
|
+
uniqueSentence ?? (_jsxs(_Fragment, { children: [node.left &&
|
|
1365
1434
|
renderSentence(formData, node.left, keyPrefix + 'left.', false, false, isRow), isRow ? (' ' + OPS[node.operator] + ' ') : isTopLevel || topLevelBinaryOperator === 'OR' ? (_jsx(TopLevelBooleanSwitch, { node: node, keyPrefix: keyPrefix, handleOperatorChange: handleOperatorChange, Select: SelectComponent })) : null, node.right &&
|
|
1366
1435
|
renderSentence(formData, node.right, keyPrefix + 'right.', false, false, isRow)] })) }));
|
|
1367
1436
|
case 'column_ref':
|
|
@@ -1890,6 +1959,8 @@ export default function ReportBuilder({ initialTableName = '', onSubmitChartBuil
|
|
|
1890
1959
|
// When a drag event ends, switch the item order.
|
|
1891
1960
|
function handleDragEnd(event) {
|
|
1892
1961
|
const { active, over } = event;
|
|
1962
|
+
if (!active || !over)
|
|
1963
|
+
return;
|
|
1893
1964
|
if (active.id !== over.id) {
|
|
1894
1965
|
const oldIndex = orderedColumnNames.findIndex((c) => c.endsWith(`${currentTable}.${active.id}`));
|
|
1895
1966
|
const newIndex = orderedColumnNames.findIndex((c) => c.endsWith(`${currentTable}.${over.id}`));
|
|
@@ -1902,6 +1973,7 @@ export default function ReportBuilder({ initialTableName = '', onSubmitChartBuil
|
|
|
1902
1973
|
orderedSelectedColumns.push(column);
|
|
1903
1974
|
}
|
|
1904
1975
|
}
|
|
1976
|
+
setSelectedOrderedColumns(orderedSelectedColumns);
|
|
1905
1977
|
// If there is already an AST saved in state, only update the columns
|
|
1906
1978
|
// otherwise fill in the defaultAST shape and also update columns.
|
|
1907
1979
|
const fallbackAST = {
|
|
@@ -1917,7 +1989,7 @@ export default function ReportBuilder({ initialTableName = '', onSubmitChartBuil
|
|
|
1917
1989
|
};
|
|
1918
1990
|
const newAst = baseAst ? newBaseAst : fallbackAST;
|
|
1919
1991
|
setBaseAst(newAst);
|
|
1920
|
-
fetchSqlQuery(newAst);
|
|
1992
|
+
fetchSqlQuery(newAst, undefined, false);
|
|
1921
1993
|
}
|
|
1922
1994
|
}
|
|
1923
1995
|
const columnNamesInAst = baseAst?.columns.map((col) => {
|
|
@@ -2070,7 +2142,7 @@ export default function ReportBuilder({ initialTableName = '', onSubmitChartBuil
|
|
|
2070
2142
|
setOpenPopover(null);
|
|
2071
2143
|
clearCheckboxes();
|
|
2072
2144
|
}
|
|
2073
|
-
} }) })] }))] }), _jsx("div", { style: { height: 28, width: '100%' } }), _jsx(SidebarHeadingComponent, { label: "Pivot" }), _jsx("div", { style: { height: 4, width: '100%' } }), _jsx(PivotModal, { pivotRowField: pivotRowField, setPivotRowField: setPivotRowField, pivotColumnField: pivotColumnField, setPivotColumnField: setPivotColumnField, pivotValueField: pivotValueField, setPivotValueField: setPivotValueField, pivotAggregation: pivotAggregation, setPivotAggregation: setPivotAggregation, createdPivots: createdPivots, setCreatedPivots: setCreatedPivots, recommendedPivots: recommendedPivots, setRecommendedPivots: setRecommendedPivots, popUpTitle: pivotPopUpTitle, setPopUpTitle: setPivotPopUpTitle, selectedTable: initialTableName, SelectComponent: SelectComponent, ButtonComponent: ButtonComponent, PopoverComponent: PopoverComponent, TextComponent: TextComponent, isOpen: showPivotPopover, setIsOpen: setShowPivotPopover, showUpdatePivot: isEdittingPivot, setShowUpdatePivot: setIsEdittingPivot, parentRef: parentRef, data: rows, columns: processColumnsForChartBuilder(Object.keys(rows[0] ?? {})), triggerButtonText: 'Add pivot', selectedPivotIndex: selectedPivotIndex, setSelectedPivotIndex: setSelectedPivotIndex, removePivot: () => {
|
|
2145
|
+
} }) })] }))] }), _jsx("div", { style: { height: 28, width: '100%' } }), _jsx(SidebarHeadingComponent, { label: "Pivot" }), _jsx("div", { style: { height: 4, width: '100%' } }), _jsx(PivotModal, { pivotRowField: pivotRowField, setPivotRowField: setPivotRowField, pivotColumnField: pivotColumnField, setPivotColumnField: setPivotColumnField, pivotValueField: pivotValueField, setPivotValueField: setPivotValueField, pivotAggregation: pivotAggregation, setPivotAggregation: setPivotAggregation, createdPivots: createdPivots, setCreatedPivots: setCreatedPivots, recommendedPivots: recommendedPivots, setRecommendedPivots: setRecommendedPivots, popUpTitle: pivotPopUpTitle, setPopUpTitle: setPivotPopUpTitle, selectedTable: initialTableName, CardComponent: CardComponent, SelectComponent: SelectComponent, ButtonComponent: ButtonComponent, PopoverComponent: PopoverComponent, TextComponent: TextComponent, isOpen: showPivotPopover, setIsOpen: setShowPivotPopover, showUpdatePivot: isEdittingPivot, setShowUpdatePivot: setIsEdittingPivot, parentRef: parentRef, data: rows, columns: processColumnsForChartBuilder(Object.keys(rows[0] ?? {})), triggerButtonText: 'Add pivot', selectedPivotIndex: selectedPivotIndex, setSelectedPivotIndex: setSelectedPivotIndex, removePivot: () => {
|
|
2074
2146
|
setPivot(null);
|
|
2075
2147
|
setPivotData(null);
|
|
2076
2148
|
},
|
|
@@ -2096,7 +2168,7 @@ export default function ReportBuilder({ initialTableName = '', onSubmitChartBuil
|
|
|
2096
2168
|
setPivotValueField(pivot?.valueField);
|
|
2097
2169
|
setPivotAggregation(pivot?.aggregationType);
|
|
2098
2170
|
setPivotPopUpTitle('Edit Pivot');
|
|
2099
|
-
}, selectedPivotIndex: -1, onEditPivot: () => { }, ButtonComponent: ButtonComponent, HeaderComponent: HeaderComponent, showEdit: false, onClose: () => {
|
|
2171
|
+
}, selectedPivotIndex: -1, onEditPivot: () => { }, CardComponent: CardComponent, ButtonComponent: ButtonComponent, HeaderComponent: HeaderComponent, showEdit: false, onClose: () => {
|
|
2100
2172
|
setPivot(null);
|
|
2101
2173
|
setPivotData(null);
|
|
2102
2174
|
setBaseAst(deepCopy(baseAst)); // trigger refetch
|
|
@@ -2225,6 +2297,9 @@ export default function ReportBuilder({ initialTableName = '', onSubmitChartBuil
|
|
|
2225
2297
|
boxSizing: 'border-box',
|
|
2226
2298
|
...containerStyle,
|
|
2227
2299
|
}, children: [_jsxs(SidebarComponent, { children: [_jsx(SidebarHeadingComponent, { label: "Columns" }), _jsx("div", { style: { height: 4, width: '100%' } }), _jsx(DraggableColumns, {}), _jsx(SecondaryButtonComponent, { onClick: () => {
|
|
2300
|
+
if (!orderedColumnNames) {
|
|
2301
|
+
return;
|
|
2302
|
+
}
|
|
2228
2303
|
if (!openPopover) {
|
|
2229
2304
|
setOpenPopover('AddColumnPopover');
|
|
2230
2305
|
}
|
|
@@ -2348,7 +2423,7 @@ export default function ReportBuilder({ initialTableName = '', onSubmitChartBuil
|
|
|
2348
2423
|
setOpenPopover(null);
|
|
2349
2424
|
clearCheckboxes();
|
|
2350
2425
|
}
|
|
2351
|
-
} }) })] }))] }), _jsx("div", { style: { height: 28, width: '100%' } }), _jsx(SidebarHeadingComponent, { label: "Pivot" }), _jsx("div", { style: { height: 4, width: '100%' } }), _jsx(PivotModal, { pivotRowField: pivotRowField, setPivotRowField: setPivotRowField, pivotColumnField: pivotColumnField, setPivotColumnField: setPivotColumnField, pivotValueField: pivotValueField, setPivotValueField: setPivotValueField, pivotAggregation: pivotAggregation, setPivotAggregation: setPivotAggregation, createdPivots: createdPivots, setCreatedPivots: setCreatedPivots, recommendedPivots: recommendedPivots, setRecommendedPivots: setRecommendedPivots, popUpTitle: pivotPopUpTitle, setPopUpTitle: setPivotPopUpTitle, selectedTable: initialTableName, SelectComponent: SelectComponent, ButtonComponent: ButtonComponent, SecondaryButtonComponent: SecondaryButtonComponent, PopoverComponent: PopoverComponent, TextComponent: TextComponent, isOpen: showPivotPopover, setIsOpen: setShowPivotPopover, showUpdatePivot: isEdittingPivot, setShowUpdatePivot: setIsEdittingPivot, parentRef: parentRef, data: rows, columns: processColumnsForChartBuilder(Object.keys(rows[0] ?? {})), triggerButtonText: 'Add pivot', selectedPivotIndex: selectedPivotIndex, setSelectedPivotIndex: setSelectedPivotIndex, removePivot: () => {
|
|
2426
|
+
} }) })] }))] }), _jsx("div", { style: { height: 28, width: '100%' } }), _jsx(SidebarHeadingComponent, { label: "Pivot" }), _jsx("div", { style: { height: 4, width: '100%' } }), _jsx(PivotModal, { pivotRowField: pivotRowField, setPivotRowField: setPivotRowField, pivotColumnField: pivotColumnField, setPivotColumnField: setPivotColumnField, pivotValueField: pivotValueField, setPivotValueField: setPivotValueField, pivotAggregation: pivotAggregation, setPivotAggregation: setPivotAggregation, createdPivots: createdPivots, setCreatedPivots: setCreatedPivots, recommendedPivots: recommendedPivots, setRecommendedPivots: setRecommendedPivots, popUpTitle: pivotPopUpTitle, setPopUpTitle: setPivotPopUpTitle, selectedTable: initialTableName, SelectComponent: SelectComponent, ButtonComponent: ButtonComponent, CardComponent: CardComponent, SecondaryButtonComponent: SecondaryButtonComponent, PopoverComponent: PopoverComponent, TextComponent: TextComponent, isOpen: showPivotPopover, setIsOpen: setShowPivotPopover, showUpdatePivot: isEdittingPivot, setShowUpdatePivot: setIsEdittingPivot, parentRef: parentRef, data: rows, columns: processColumnsForChartBuilder(Object.keys(rows[0] ?? {})), triggerButtonText: 'Add pivot', selectedPivotIndex: selectedPivotIndex, setSelectedPivotIndex: setSelectedPivotIndex, removePivot: () => {
|
|
2352
2427
|
setPivot(null);
|
|
2353
2428
|
setPivotData(null);
|
|
2354
2429
|
}, selectPivot: (pivot) => {
|
|
@@ -2376,7 +2451,7 @@ export default function ReportBuilder({ initialTableName = '', onSubmitChartBuil
|
|
|
2376
2451
|
setPivotValueField(pivot?.valueField);
|
|
2377
2452
|
setPivotAggregation(pivot?.aggregationType);
|
|
2378
2453
|
setPivotPopUpTitle('Edit Pivot');
|
|
2379
|
-
}, selectedPivotIndex: -1, onEditPivot: () => { }, ButtonComponent: ButtonComponent, HeaderComponent: HeaderComponent, showEdit: false, onClose: () => {
|
|
2454
|
+
}, selectedPivotIndex: -1, onEditPivot: () => { }, ButtonComponent: ButtonComponent, HeaderComponent: HeaderComponent, CardComponent: CardComponent, showEdit: false, onClose: () => {
|
|
2380
2455
|
setPivot(null);
|
|
2381
2456
|
setPivotData(null);
|
|
2382
2457
|
setBaseAst(deepCopy(baseAst));
|
|
@@ -2568,5 +2643,5 @@ export default function ReportBuilder({ initialTableName = '', onSubmitChartBuil
|
|
|
2568
2643
|
whiteSpace: 'nowrap',
|
|
2569
2644
|
}, children: errorMessage })), _jsx("div", { style: { width: '100%' } }), baseAst && (_jsxs(_Fragment, { children: [_jsx(SecondaryButtonComponent, { label: isCopying ? '✅ Copied' : 'Copy SQL', onClick: () => copyToClipboard(activeQuery) }), _jsx(ButtonComponent, { onClick: () => {
|
|
2570
2645
|
setIsChartBuilderOpen(true);
|
|
2571
|
-
}, label: 'Add to dashboard' })] }))] })] }), _jsx("style", { children: `body{margin:0;}` }), _jsx(ChartBuilderWithModal, { rows: rows, columns: processColumnsForChartBuilder(Object.keys(rows[0] ?? {})), fields: fields, pivot: pivot, query: activeQuery, showTableFormatOptions: isAdminEnabled, showDateFieldOptions: isAdminEnabled, showAccessControlOptions: isAdminEnabled, title: "Add to dashboard", isOpen: isChartBuilderOpen, setIsOpen: setIsChartBuilderOpen, onAddToDashboardComplete: onSubmitChartBuilder, destinationDashboard: destinationDashboard, organizationName: organizationName, pivotData: pivotData, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, ButtonComponent: ButtonComponent, SecondaryButtonComponent: SecondaryButtonComponent, HeaderComponent: HeaderComponent, LabelComponent: LabelComponent, TextComponent: TextComponent, ModalComponent: ModalComponent, PopoverComponent: PopoverComponent, DeleteButtonComponent: DeleteButtonComponent })] }));
|
|
2646
|
+
}, label: 'Add to dashboard' })] }))] })] }), _jsx("style", { children: `body{margin:0;}` }), _jsx(ChartBuilderWithModal, { rows: rows, columns: processColumnsForChartBuilder(Object.keys(rows[0] ?? {})), fields: fields, pivot: pivot, query: activeQuery, showTableFormatOptions: isAdminEnabled, showDateFieldOptions: isAdminEnabled, showAccessControlOptions: isAdminEnabled, title: "Add to dashboard", isOpen: isChartBuilderOpen, setIsOpen: setIsChartBuilderOpen, onAddToDashboardComplete: onSubmitChartBuilder, destinationDashboard: destinationDashboard, organizationName: organizationName, pivotData: pivotData, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, ButtonComponent: ButtonComponent, SecondaryButtonComponent: SecondaryButtonComponent, HeaderComponent: HeaderComponent, LabelComponent: LabelComponent, TextComponent: TextComponent, CardComponent: CardComponent, ModalComponent: ModalComponent, PopoverComponent: PopoverComponent, DeleteButtonComponent: DeleteButtonComponent })] }));
|
|
2572
2647
|
}
|
package/dist/esm/SQLEditor.d.ts
CHANGED
|
@@ -51,6 +51,12 @@ export interface SQLEditorProps {
|
|
|
51
51
|
* A component to show while the query results are loading.
|
|
52
52
|
*/
|
|
53
53
|
LoadingComponent?: () => JSX.Element;
|
|
54
|
+
/** A card component used as a dismissable container of pivot information. */
|
|
55
|
+
CardComponent?: (props: {
|
|
56
|
+
children: ReactNode;
|
|
57
|
+
onClick?: () => void;
|
|
58
|
+
onDelete?: () => void;
|
|
59
|
+
}) => JSX.Element;
|
|
54
60
|
/**
|
|
55
61
|
* A modal component to use to open the add to dashboard dialog.
|
|
56
62
|
*/
|
|
@@ -98,10 +104,6 @@ export interface SQLEditorProps {
|
|
|
98
104
|
* Whether the "new query" button is enabled.
|
|
99
105
|
*/
|
|
100
106
|
isNewQueryEnabled?: boolean;
|
|
101
|
-
/**
|
|
102
|
-
* Whether the SQLEditor is in edit mode.
|
|
103
|
-
*/
|
|
104
|
-
isEditMode?: boolean;
|
|
105
107
|
/**
|
|
106
108
|
* Whether to show table format options.
|
|
107
109
|
*/
|
|
@@ -174,7 +176,7 @@ export interface SQLEditorProps {
|
|
|
174
176
|
* ### SQLEditor API
|
|
175
177
|
* @see https://docs.quillsql.com/components/sql-editor
|
|
176
178
|
*/
|
|
177
|
-
export default function SQLEditor({ ButtonComponent, SecondaryButtonComponent, TextInputComponent, TableComponent, isNewQueryEnabled, LoadingComponent, ModalComponent, defaultQuery, onChangeQuery, onChangeData, onChangeColumns, onChangeFields,
|
|
179
|
+
export default function SQLEditor({ ButtonComponent, SecondaryButtonComponent, TextInputComponent, TableComponent, isNewQueryEnabled, LoadingComponent, ModalComponent, CardComponent, defaultQuery, onChangeQuery, onChangeData, onChangeColumns, onChangeFields, isChartBuilderEnabled, showTableFormatOptions, showDateFieldOptions, showAccessControlOptions, destinationDashboard, chartBuilderTitle, chartBuilderButtonLabel, onAddToDashboardComplete, addToDashboardButtonLabel, dashboardItem, organizationName, isChartBuilderHorizontalView, containerStyle, }: SQLEditorProps): import("react/jsx-runtime").JSX.Element;
|
|
178
180
|
export declare const SchemaListComponent: ({ schema, theme, loading, LoadingComponent, width, onClick, }: {
|
|
179
181
|
schema: any;
|
|
180
182
|
theme: any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SQLEditor.d.ts","sourceRoot":"","sources":["../../src/SQLEditor.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,EAMZ,SAAS,EACV,MAAM,OAAO,CAAC;AAcf,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"SQLEditor.d.ts","sourceRoot":"","sources":["../../src/SQLEditor.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,EAMZ,SAAS,EACV,MAAM,OAAO,CAAC;AAcf,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG5C,wBAAgB,qBAAqB,CAAC,MAAM,KAAA;;;;;EAwE3C;AAgCD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE;QACxB,OAAO,EAAE,MAAM,IAAI,CAAC;QACpB,KAAK,EAAE,MAAM,CAAC;KACf,KAAK,GAAG,CAAC,OAAO,CAAC;IAElB;;OAEG;IACH,wBAAwB,CAAC,EAAE,CAAC,KAAK,EAAE;QACjC,OAAO,EAAE,MAAM,IAAI,CAAC;QACpB,KAAK,EAAE,MAAM,CAAC;KACf,KAAK,GAAG,CAAC,OAAO,CAAC;IAElB;;OAEG;IACH,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE;QAC3B,EAAE,EAAE,MAAM,CAAC;QACX,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,WAAW,CAAC,gBAAgB,CAAC,KAAK,IAAI,CAAC;KAChE,KAAK,GAAG,CAAC,OAAO,CAAC;IAElB;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE;QACvB,IAAI,EAAE;YAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;SAAE,EAAE,CAAC;QAC/B,OAAO,EAAE;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QAC5C,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB,KAAK,GAAG,CAAC,OAAO,CAAC;IAElB;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IAErC,6EAA6E;IAC7E,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE;QACtB,QAAQ,EAAE,SAAS,CAAC;QACpB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;QACrB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;KACvB,KAAK,GAAG,CAAC,OAAO,CAAC;IAElB;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE;QACvB,MAAM,EAAE,OAAO,CAAC;QAChB,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;QACrC,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,SAAS,CAAC;QACpB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,KAAK,GAAG,CAAC,OAAO,CAAC;IAElB;;OAEG;IACH,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAExC;;OAEG;IACH,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAExC;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAE5C;;OAEG;IACH,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAE9C;;OAEG;IACH,wBAAwB,CAAC,EAAE,MAAM,IAAI,CAAC;IAEtC;;;;;;OAMG;IACH,4BAA4B,CAAC,EAAE,OAAO,CAAC;IAEvC;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;OAEG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAEjC;;OAEG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAE/B;;OAEG;IACH,wBAAwB,CAAC,EAAE,OAAO,CAAC;IAEnC;;OAEG;IACH,aAAa,CAAC,EAAE,aAAa,GAAG,GAAG,CAAC;IAEpC;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAE9B;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B;;OAEG;IACH,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAEjC;;;;OAIG;IACH,yBAAyB,CAAC,EAAE,MAAM,CAAC;IAEnC;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;OAEG;IACH,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;CACtC;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAChC,eAAgC,EAChC,wBAAkD,EAClD,kBAAmC,EACnC,cAAoC,EACpC,iBAAyB,EACzB,gBAAgB,EAChB,cAA8B,EAC9B,aAAyB,EACzB,YAAY,EACZ,aAAa,EACb,YAAY,EACZ,eAAe,EACf,cAAc,EACd,qBAA6B,EAC7B,sBAA8B,EAC9B,oBAA4B,EAC5B,wBAAgC,EAChC,oBAAoB,EACpB,iBAAiB,EACjB,uBAAuB,EACvB,wBAAwB,EACxB,yBAA8C,EAC9C,aAAyB,EACzB,gBAA4B,EAC5B,4BAAmC,EACnC,cAAoC,GACrC,EAAE,cAAc,2CAqWhB;AA0ID,eAAO,MAAM,mBAAmB;;;;;;;6CAuG/B,CAAC"}
|
package/dist/esm/SQLEditor.js
CHANGED
|
@@ -10,6 +10,7 @@ import { ChartBuilderWithModal } from './ChartBuilder';
|
|
|
10
10
|
import { MemoizedButton, MemoizedModal, MemoizedSecondaryButton, QuillTableComponent, } from './components/UiComponents';
|
|
11
11
|
import { QuillTextInput } from './components/UiComponents';
|
|
12
12
|
import { updateFirstChildWidth } from './utils/width';
|
|
13
|
+
import { QuillCard } from './components/QuillCard';
|
|
13
14
|
export function convertPostgresColumn(column) {
|
|
14
15
|
let format;
|
|
15
16
|
let fieldType;
|
|
@@ -130,7 +131,7 @@ function setEditorTheme(editor, monaco) {
|
|
|
130
131
|
* ### SQLEditor API
|
|
131
132
|
* @see https://docs.quillsql.com/components/sql-editor
|
|
132
133
|
*/
|
|
133
|
-
export default function SQLEditor({ ButtonComponent = MemoizedButton, SecondaryButtonComponent = MemoizedSecondaryButton, TextInputComponent = QuillTextInput, TableComponent = QuillTableComponent, isNewQueryEnabled = false, LoadingComponent, ModalComponent = MemoizedModal, defaultQuery, onChangeQuery, onChangeData, onChangeColumns, onChangeFields,
|
|
134
|
+
export default function SQLEditor({ ButtonComponent = MemoizedButton, SecondaryButtonComponent = MemoizedSecondaryButton, TextInputComponent = QuillTextInput, TableComponent = QuillTableComponent, isNewQueryEnabled = false, LoadingComponent, ModalComponent = MemoizedModal, CardComponent = QuillCard, defaultQuery, onChangeQuery, onChangeData, onChangeColumns, onChangeFields, isChartBuilderEnabled = false, showTableFormatOptions = false, showDateFieldOptions = false, showAccessControlOptions = false, destinationDashboard, chartBuilderTitle, chartBuilderButtonLabel, onAddToDashboardComplete, addToDashboardButtonLabel = 'Add to dashboard', dashboardItem = undefined, organizationName = undefined, isChartBuilderHorizontalView = true, containerStyle = { height: '100vh' }, }) {
|
|
134
135
|
const [sqlPrompt, setSqlPrompt] = useState('');
|
|
135
136
|
const [client] = useContext(ClientContext);
|
|
136
137
|
const [theme] = useContext(ThemeContext);
|
|
@@ -349,7 +350,7 @@ export default function SQLEditor({ ButtonComponent = MemoizedButton, SecondaryB
|
|
|
349
350
|
justifyContent: 'flex-end',
|
|
350
351
|
width: '100%',
|
|
351
352
|
height: '70px',
|
|
352
|
-
}, children: _jsx(ButtonComponent, { onClick: () => setIsChartBuilderOpen(true), label: addToDashboardButtonLabel }) }))] })] }) }) })), _jsx(ChartBuilderWithModal, { rows: rows, columns: columns, fields: fields, query: query, horizontalView: isChartBuilderHorizontalView,
|
|
353
|
+
}, children: _jsx(ButtonComponent, { onClick: () => setIsChartBuilderOpen(true), label: addToDashboardButtonLabel }) }))] })] }) }) })), _jsx(ChartBuilderWithModal, { rows: rows, columns: columns, fields: fields, query: query, horizontalView: isChartBuilderHorizontalView, isOpen: isChartBuilderOpen, setIsOpen: setIsChartBuilderOpen, onAddToDashboardComplete: onAddToDashboardComplete, showTableFormatOptions: showTableFormatOptions, showDateFieldOptions: showDateFieldOptions, showAccessControlOptions: showAccessControlOptions, destinationDashboard: destinationDashboard, title: chartBuilderTitle, button: chartBuilderButtonLabel, buttonLabel: addToDashboardButtonLabel, dashboardItem: dashboardItem, organizationName: organizationName, CardComponent: CardComponent, Modal: ModalComponent, Button: ButtonComponent })] }));
|
|
353
354
|
}
|
|
354
355
|
const SQLEditorComponent = ({ query, setQuery, handleRunQuery, handleFixWithAI, handleClearQuery, defineEditorTheme, setEditorTheme, ButtonComponent, SecondaryButtonComponent, isNewQueryEnabled, theme, loading, LoadingComponent, }) => {
|
|
355
356
|
return (_jsxs("div", { style: {
|
package/dist/esm/Table.d.ts
CHANGED
|
@@ -40,7 +40,7 @@ export interface TableProps {
|
|
|
40
40
|
* ]}'
|
|
41
41
|
* ```
|
|
42
42
|
*/
|
|
43
|
-
rows
|
|
43
|
+
rows?: {
|
|
44
44
|
[key: string]: any;
|
|
45
45
|
}[];
|
|
46
46
|
/**
|
|
@@ -66,7 +66,7 @@ export interface TableProps {
|
|
|
66
66
|
* ]}'
|
|
67
67
|
* ```
|
|
68
68
|
*/
|
|
69
|
-
columns
|
|
69
|
+
columns?: {
|
|
70
70
|
label: string;
|
|
71
71
|
field: string;
|
|
72
72
|
}[];
|
package/dist/esm/Table.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Table.d.ts","sourceRoot":"","sources":["../../src/Table.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAgC,MAAM,OAAO,CAAC;AAYrD,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAuBD;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB;;;;;;;;OAQG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"Table.d.ts","sourceRoot":"","sources":["../../src/Table.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAgC,MAAM,OAAO,CAAC;AAYrD,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAuBD;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB;;;;;;;;OAQG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,IAAI,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,CAAC;IAEhC;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,OAAO,CAAC,EAAE;QACR,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACf,EAAE,CAAC;IAEJ;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IAEzB;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IAErC;;OAEG;IACH,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;CACtC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,QAAA,MAAM,KAAK,UAAW,UAAU,4CAiC/B,CAAC;AA8FF,eAAe,KAAK,CAAC"}
|
|
@@ -1,14 +1,9 @@
|
|
|
1
1
|
import { ReactNode } from 'react';
|
|
2
|
-
import { QuillTheme } from '../QuillProvider';
|
|
3
2
|
interface QuillCardProps {
|
|
4
3
|
children: ReactNode;
|
|
5
|
-
theme: QuillTheme;
|
|
6
4
|
onClick?: () => void;
|
|
7
|
-
|
|
8
|
-
isSelected?: boolean;
|
|
9
|
-
clickable?: boolean;
|
|
10
|
-
minHeight?: number;
|
|
5
|
+
onDelete?: () => void;
|
|
11
6
|
}
|
|
12
|
-
export declare function QuillCard({ children,
|
|
7
|
+
export declare function QuillCard({ children, onClick, onDelete, }: QuillCardProps): import("react/jsx-runtime").JSX.Element;
|
|
13
8
|
export {};
|
|
14
9
|
//# sourceMappingURL=QuillCard.d.ts.map
|