@quillsql/react 2.13.40 → 2.13.41
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 +5 -1
- package/dist/cjs/Chart.d.ts.map +1 -1
- package/dist/cjs/Chart.js +51 -28
- package/dist/cjs/ChartBuilder.d.ts +13 -1
- package/dist/cjs/ChartBuilder.d.ts.map +1 -1
- package/dist/cjs/ChartBuilder.js +342 -138
- package/dist/cjs/ChartEditor.d.ts.map +1 -1
- package/dist/cjs/ChartEditor.js +11 -1
- package/dist/cjs/Context.d.ts +16 -4
- package/dist/cjs/Context.d.ts.map +1 -1
- package/dist/cjs/Context.js +57 -38
- package/dist/cjs/Dashboard.d.ts +6 -3
- package/dist/cjs/Dashboard.d.ts.map +1 -1
- package/dist/cjs/Dashboard.js +70 -28
- package/dist/cjs/QuillProvider.d.ts +4 -8
- package/dist/cjs/QuillProvider.d.ts.map +1 -1
- package/dist/cjs/ReportBuilder.d.ts +1 -1
- package/dist/cjs/ReportBuilder.d.ts.map +1 -1
- package/dist/cjs/ReportBuilder.js +117 -45
- package/dist/cjs/SQLEditor.d.ts +7 -1
- package/dist/cjs/SQLEditor.d.ts.map +1 -1
- package/dist/cjs/SQLEditor.js +53 -9
- package/dist/cjs/Table.d.ts +21 -1
- package/dist/cjs/Table.d.ts.map +1 -1
- package/dist/cjs/Table.js +30 -192
- package/dist/cjs/components/Chart/BarChart.d.ts +5 -1
- package/dist/cjs/components/Chart/BarChart.d.ts.map +1 -1
- package/dist/cjs/components/Chart/BarChart.js +4 -3
- package/dist/cjs/components/Chart/CustomReferenceLine.d.ts +2 -0
- package/dist/cjs/components/Chart/CustomReferenceLine.d.ts.map +1 -0
- package/dist/cjs/components/Chart/CustomReferenceLine.js +26 -0
- package/dist/cjs/components/Chart/GaugeChart.d.ts +11 -0
- package/dist/cjs/components/Chart/GaugeChart.d.ts.map +1 -0
- package/dist/cjs/components/Chart/GaugeChart.js +198 -0
- package/dist/cjs/components/Chart/InternalChart.d.ts.map +1 -1
- package/dist/cjs/components/Chart/InternalChart.js +14 -11
- package/dist/cjs/components/Chart/LineChart.d.ts +5 -1
- package/dist/cjs/components/Chart/LineChart.d.ts.map +1 -1
- package/dist/cjs/components/Chart/LineChart.js +4 -3
- package/dist/cjs/components/Chart/MapChart.d.ts +36 -0
- package/dist/cjs/components/Chart/MapChart.d.ts.map +1 -0
- package/dist/cjs/components/Chart/MapChart.js +548 -0
- package/dist/cjs/components/Dashboard/DataLoader.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/DataLoader.js +114 -42
- package/dist/cjs/components/Dashboard/MetricComponent.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/MetricComponent.js +57 -54
- package/dist/cjs/components/Dashboard/TableComponent.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/TableComponent.js +5 -1
- package/dist/cjs/components/QuillMultiSelectWithCombo.d.ts.map +1 -1
- package/dist/cjs/components/QuillMultiSelectWithCombo.js +5 -4
- package/dist/cjs/components/QuillSelectWithCombo.d.ts.map +1 -1
- package/dist/cjs/components/QuillSelectWithCombo.js +12 -11
- package/dist/cjs/components/ReportBuilder/AddColumnModal.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/AddColumnModal.js +2 -1
- package/dist/cjs/components/ReportBuilder/FilterModal.js +13 -13
- package/dist/cjs/components/ReportBuilder/FilterStack.d.ts +2 -1
- package/dist/cjs/components/ReportBuilder/FilterStack.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/FilterStack.js +4 -4
- package/dist/cjs/components/ReportBuilder/convert.d.ts +2 -0
- package/dist/cjs/components/ReportBuilder/convert.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/convert.js +28 -7
- package/dist/cjs/components/ReportBuilder/util.d.ts +1 -1
- package/dist/cjs/components/ReportBuilder/util.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/util.js +15 -2
- package/dist/cjs/components/UiComponents.d.ts +4 -1
- package/dist/cjs/components/UiComponents.d.ts.map +1 -1
- package/dist/cjs/components/UiComponents.js +31 -5
- package/dist/cjs/hooks/useDashboard.d.ts.map +1 -1
- package/dist/cjs/hooks/useDashboard.js +11 -9
- package/dist/cjs/hooks/useExport.d.ts.map +1 -1
- package/dist/cjs/hooks/useExport.js +18 -4
- package/dist/cjs/hooks/useQuill.d.ts.map +1 -1
- package/dist/cjs/hooks/useQuill.js +16 -3
- package/dist/cjs/hooks/useReport.d.ts.map +1 -1
- package/dist/cjs/hooks/useReport.js +1 -7
- package/dist/cjs/hooks/useVirtualTables.d.ts +6 -2
- package/dist/cjs/hooks/useVirtualTables.d.ts.map +1 -1
- package/dist/cjs/hooks/useVirtualTables.js +5 -2
- package/dist/cjs/internals/ReportBuilder/PivotModal.d.ts.map +1 -1
- package/dist/cjs/internals/ReportBuilder/PivotModal.js +6 -7
- package/dist/cjs/models/Filter.d.ts +20 -13
- package/dist/cjs/models/Filter.d.ts.map +1 -1
- package/dist/cjs/models/Filter.js +161 -87
- package/dist/cjs/models/Report.d.ts +12 -1
- package/dist/cjs/models/Report.d.ts.map +1 -1
- package/dist/cjs/models/Schema.d.ts +12 -1
- package/dist/cjs/models/Schema.d.ts.map +1 -1
- package/dist/cjs/utils/astFilterProcessing.js +22 -22
- package/dist/cjs/utils/astProcessing.d.ts +2 -2
- package/dist/cjs/utils/astProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/astProcessing.js +25 -6
- package/dist/cjs/utils/axisFormatter.d.ts.map +1 -1
- package/dist/cjs/utils/axisFormatter.js +25 -0
- package/dist/cjs/utils/color.d.ts +159 -0
- package/dist/cjs/utils/color.d.ts.map +1 -1
- package/dist/cjs/utils/color.js +14 -5
- package/dist/cjs/utils/columnProcessing.js +3 -3
- package/dist/cjs/utils/constants.d.ts +1 -0
- package/dist/cjs/utils/constants.d.ts.map +1 -1
- package/dist/cjs/utils/constants.js +2 -1
- package/dist/cjs/utils/dashboard.d.ts +13 -3
- package/dist/cjs/utils/dashboard.d.ts.map +1 -1
- package/dist/cjs/utils/dashboard.js +73 -16
- package/dist/cjs/utils/dataFetcher.d.ts.map +1 -1
- package/dist/cjs/utils/dataFetcher.js +3 -1
- package/dist/cjs/utils/filterProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/filterProcessing.js +9 -9
- package/dist/cjs/utils/getDomain.d.ts +4 -1
- package/dist/cjs/utils/getDomain.d.ts.map +1 -1
- package/dist/cjs/utils/getDomain.js +11 -1
- package/dist/cjs/utils/pivotConstructor.d.ts.map +1 -1
- package/dist/cjs/utils/pivotConstructor.js +5 -5
- package/dist/cjs/utils/queryConstructor.d.ts +1 -1
- package/dist/cjs/utils/queryConstructor.d.ts.map +1 -1
- package/dist/cjs/utils/queryConstructor.js +71 -43
- package/dist/cjs/utils/report.d.ts +23 -5
- package/dist/cjs/utils/report.d.ts.map +1 -1
- package/dist/cjs/utils/report.js +28 -8
- package/dist/cjs/utils/schema.d.ts +26 -3
- package/dist/cjs/utils/schema.d.ts.map +1 -1
- package/dist/cjs/utils/schema.js +75 -43
- package/dist/cjs/utils/tableProcessing.d.ts +10 -3
- package/dist/cjs/utils/tableProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/tableProcessing.js +4 -6
- package/dist/cjs/utils/textProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/textProcessing.js +0 -1
- package/dist/esm/Chart.d.ts +5 -1
- package/dist/esm/Chart.d.ts.map +1 -1
- package/dist/esm/Chart.js +52 -29
- package/dist/esm/ChartBuilder.d.ts +13 -1
- package/dist/esm/ChartBuilder.d.ts.map +1 -1
- package/dist/esm/ChartBuilder.js +347 -143
- package/dist/esm/ChartEditor.d.ts.map +1 -1
- package/dist/esm/ChartEditor.js +11 -1
- package/dist/esm/Context.d.ts +16 -4
- package/dist/esm/Context.d.ts.map +1 -1
- package/dist/esm/Context.js +59 -40
- package/dist/esm/Dashboard.d.ts +6 -3
- package/dist/esm/Dashboard.d.ts.map +1 -1
- package/dist/esm/Dashboard.js +71 -29
- package/dist/esm/QuillProvider.d.ts +4 -8
- package/dist/esm/QuillProvider.d.ts.map +1 -1
- package/dist/esm/ReportBuilder.d.ts +1 -1
- package/dist/esm/ReportBuilder.d.ts.map +1 -1
- package/dist/esm/ReportBuilder.js +119 -47
- package/dist/esm/SQLEditor.d.ts +7 -1
- package/dist/esm/SQLEditor.d.ts.map +1 -1
- package/dist/esm/SQLEditor.js +54 -10
- package/dist/esm/Table.d.ts +21 -1
- package/dist/esm/Table.d.ts.map +1 -1
- package/dist/esm/Table.js +34 -196
- package/dist/esm/components/Chart/BarChart.d.ts +5 -1
- package/dist/esm/components/Chart/BarChart.d.ts.map +1 -1
- package/dist/esm/components/Chart/BarChart.js +5 -4
- package/dist/esm/components/Chart/CustomReferenceLine.d.ts +2 -0
- package/dist/esm/components/Chart/CustomReferenceLine.d.ts.map +1 -0
- package/dist/esm/components/Chart/CustomReferenceLine.js +23 -0
- package/dist/esm/components/Chart/GaugeChart.d.ts +11 -0
- package/dist/esm/components/Chart/GaugeChart.d.ts.map +1 -0
- package/dist/esm/components/Chart/GaugeChart.js +195 -0
- package/dist/esm/components/Chart/InternalChart.d.ts.map +1 -1
- package/dist/esm/components/Chart/InternalChart.js +14 -11
- package/dist/esm/components/Chart/LineChart.d.ts +5 -1
- package/dist/esm/components/Chart/LineChart.d.ts.map +1 -1
- package/dist/esm/components/Chart/LineChart.js +5 -4
- package/dist/esm/components/Chart/MapChart.d.ts +36 -0
- package/dist/esm/components/Chart/MapChart.d.ts.map +1 -0
- package/dist/esm/components/Chart/MapChart.js +541 -0
- package/dist/esm/components/Dashboard/DataLoader.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/DataLoader.js +114 -42
- package/dist/esm/components/Dashboard/MetricComponent.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/MetricComponent.js +57 -54
- package/dist/esm/components/Dashboard/TableComponent.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/TableComponent.js +5 -1
- package/dist/esm/components/QuillMultiSelectWithCombo.d.ts.map +1 -1
- package/dist/esm/components/QuillMultiSelectWithCombo.js +5 -4
- package/dist/esm/components/QuillSelectWithCombo.d.ts.map +1 -1
- package/dist/esm/components/QuillSelectWithCombo.js +12 -11
- package/dist/esm/components/ReportBuilder/AddColumnModal.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/AddColumnModal.js +2 -1
- package/dist/esm/components/ReportBuilder/FilterModal.js +14 -14
- package/dist/esm/components/ReportBuilder/FilterStack.d.ts +2 -1
- package/dist/esm/components/ReportBuilder/FilterStack.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/FilterStack.js +4 -4
- package/dist/esm/components/ReportBuilder/convert.d.ts +2 -0
- package/dist/esm/components/ReportBuilder/convert.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/convert.js +26 -7
- package/dist/esm/components/ReportBuilder/util.d.ts +1 -1
- package/dist/esm/components/ReportBuilder/util.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/util.js +15 -2
- package/dist/esm/components/UiComponents.d.ts +4 -1
- package/dist/esm/components/UiComponents.d.ts.map +1 -1
- package/dist/esm/components/UiComponents.js +29 -4
- package/dist/esm/hooks/useDashboard.d.ts.map +1 -1
- package/dist/esm/hooks/useDashboard.js +11 -9
- package/dist/esm/hooks/useExport.d.ts.map +1 -1
- package/dist/esm/hooks/useExport.js +19 -5
- package/dist/esm/hooks/useQuill.d.ts.map +1 -1
- package/dist/esm/hooks/useQuill.js +16 -3
- package/dist/esm/hooks/useReport.d.ts.map +1 -1
- package/dist/esm/hooks/useReport.js +1 -7
- package/dist/esm/hooks/useVirtualTables.d.ts +6 -2
- package/dist/esm/hooks/useVirtualTables.d.ts.map +1 -1
- package/dist/esm/hooks/useVirtualTables.js +6 -3
- package/dist/esm/internals/ReportBuilder/PivotModal.d.ts.map +1 -1
- package/dist/esm/internals/ReportBuilder/PivotModal.js +6 -7
- package/dist/esm/models/Filter.d.ts +20 -13
- package/dist/esm/models/Filter.d.ts.map +1 -1
- package/dist/esm/models/Filter.js +160 -86
- package/dist/esm/models/Report.d.ts +12 -1
- package/dist/esm/models/Report.d.ts.map +1 -1
- package/dist/esm/models/Schema.d.ts +12 -1
- package/dist/esm/models/Schema.d.ts.map +1 -1
- package/dist/esm/utils/astFilterProcessing.js +23 -23
- package/dist/esm/utils/astProcessing.d.ts +2 -2
- package/dist/esm/utils/astProcessing.d.ts.map +1 -1
- package/dist/esm/utils/astProcessing.js +25 -6
- package/dist/esm/utils/axisFormatter.d.ts.map +1 -1
- package/dist/esm/utils/axisFormatter.js +25 -0
- package/dist/esm/utils/color.d.ts +159 -0
- package/dist/esm/utils/color.d.ts.map +1 -1
- package/dist/esm/utils/color.js +8 -2
- package/dist/esm/utils/columnProcessing.js +3 -3
- package/dist/esm/utils/constants.d.ts +1 -0
- package/dist/esm/utils/constants.d.ts.map +1 -1
- package/dist/esm/utils/constants.js +1 -0
- package/dist/esm/utils/dashboard.d.ts +13 -3
- package/dist/esm/utils/dashboard.d.ts.map +1 -1
- package/dist/esm/utils/dashboard.js +73 -16
- package/dist/esm/utils/dataFetcher.d.ts.map +1 -1
- package/dist/esm/utils/dataFetcher.js +3 -1
- package/dist/esm/utils/filterProcessing.d.ts.map +1 -1
- package/dist/esm/utils/filterProcessing.js +10 -10
- package/dist/esm/utils/getDomain.d.ts +4 -1
- package/dist/esm/utils/getDomain.d.ts.map +1 -1
- package/dist/esm/utils/getDomain.js +11 -1
- package/dist/esm/utils/pivotConstructor.d.ts.map +1 -1
- package/dist/esm/utils/pivotConstructor.js +5 -5
- package/dist/esm/utils/queryConstructor.d.ts +1 -1
- package/dist/esm/utils/queryConstructor.d.ts.map +1 -1
- package/dist/esm/utils/queryConstructor.js +71 -43
- package/dist/esm/utils/report.d.ts +23 -5
- package/dist/esm/utils/report.d.ts.map +1 -1
- package/dist/esm/utils/report.js +29 -9
- package/dist/esm/utils/schema.d.ts +26 -3
- package/dist/esm/utils/schema.d.ts.map +1 -1
- package/dist/esm/utils/schema.js +74 -43
- package/dist/esm/utils/tableProcessing.d.ts +10 -3
- package/dist/esm/utils/tableProcessing.d.ts.map +1 -1
- package/dist/esm/utils/tableProcessing.js +4 -6
- package/dist/esm/utils/textProcessing.d.ts.map +1 -1
- package/dist/esm/utils/textProcessing.js +0 -1
- package/package.json +8 -3
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
'use client';
|
|
3
3
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
4
4
|
import { useState, useEffect, useMemo } from 'react';
|
|
5
|
-
import { NumberOperator, DateOperator, StringOperator, FieldType, NullOperator, TimeUnit,
|
|
5
|
+
import { NumberOperator, DateOperator, StringOperator, FieldType, NullOperator, TimeUnit, InternalFilterType, BoolOperator, } from '../../models/Filter';
|
|
6
6
|
import { QuillDateRangePicker } from '../../DateRangePicker/QuillDateRangePicker';
|
|
7
7
|
import { format, isValid, parse, startOfToday } from 'date-fns';
|
|
8
8
|
import { snakeAndCamelCaseToTitleCase } from '../../utils/textProcessing';
|
|
@@ -345,7 +345,7 @@ export default function FilterModal({ schema, filter, fieldValuesMap, fieldValue
|
|
|
345
345
|
}
|
|
346
346
|
onSubmitFilter({
|
|
347
347
|
field,
|
|
348
|
-
filterType:
|
|
348
|
+
filterType: InternalFilterType.DateFilter,
|
|
349
349
|
fieldType: FieldType.Date,
|
|
350
350
|
operator: operator,
|
|
351
351
|
value: { value: value, unit: unit },
|
|
@@ -359,7 +359,7 @@ export default function FilterModal({ schema, filter, fieldValuesMap, fieldValue
|
|
|
359
359
|
}
|
|
360
360
|
onSubmitFilter({
|
|
361
361
|
field,
|
|
362
|
-
filterType:
|
|
362
|
+
filterType: InternalFilterType.DateFilter,
|
|
363
363
|
fieldType: FieldType.Date,
|
|
364
364
|
operator: operator,
|
|
365
365
|
value: { value: 0, unit: unit },
|
|
@@ -373,7 +373,7 @@ export default function FilterModal({ schema, filter, fieldValuesMap, fieldValue
|
|
|
373
373
|
}
|
|
374
374
|
onSubmitFilter({
|
|
375
375
|
field,
|
|
376
|
-
filterType:
|
|
376
|
+
filterType: InternalFilterType.DateCustomFilter,
|
|
377
377
|
fieldType: FieldType.Date,
|
|
378
378
|
operator: operator,
|
|
379
379
|
value: { startDate, endDate },
|
|
@@ -394,7 +394,7 @@ export default function FilterModal({ schema, filter, fieldValuesMap, fieldValue
|
|
|
394
394
|
const normalizedDate = format(parsedDate, 'yyyy-mm-dd');
|
|
395
395
|
onSubmitFilter({
|
|
396
396
|
field,
|
|
397
|
-
filterType:
|
|
397
|
+
filterType: InternalFilterType.DateComparisonFilter,
|
|
398
398
|
fieldType: FieldType.Date,
|
|
399
399
|
operator: operator,
|
|
400
400
|
value: normalizedDate,
|
|
@@ -406,7 +406,7 @@ export default function FilterModal({ schema, filter, fieldValuesMap, fieldValue
|
|
|
406
406
|
case NullOperator.IsNull:
|
|
407
407
|
onSubmitFilter({
|
|
408
408
|
field,
|
|
409
|
-
filterType:
|
|
409
|
+
filterType: InternalFilterType.NullFilter,
|
|
410
410
|
fieldType: FieldType.Null,
|
|
411
411
|
operator: operator,
|
|
412
412
|
value: null,
|
|
@@ -425,7 +425,7 @@ export default function FilterModal({ schema, filter, fieldValuesMap, fieldValue
|
|
|
425
425
|
}
|
|
426
426
|
onSubmitFilter({
|
|
427
427
|
field,
|
|
428
|
-
filterType:
|
|
428
|
+
filterType: InternalFilterType.StringInFilter,
|
|
429
429
|
fieldType: FieldType.String,
|
|
430
430
|
operator: operator,
|
|
431
431
|
value: selectedOptions.map((val) => val.label),
|
|
@@ -436,7 +436,7 @@ export default function FilterModal({ schema, filter, fieldValuesMap, fieldValue
|
|
|
436
436
|
case NullOperator.IsNull:
|
|
437
437
|
onSubmitFilter({
|
|
438
438
|
field,
|
|
439
|
-
filterType:
|
|
439
|
+
filterType: InternalFilterType.NullFilter,
|
|
440
440
|
fieldType: FieldType.Null,
|
|
441
441
|
operator: operator,
|
|
442
442
|
value: null,
|
|
@@ -450,7 +450,7 @@ export default function FilterModal({ schema, filter, fieldValuesMap, fieldValue
|
|
|
450
450
|
}
|
|
451
451
|
onSubmitFilter({
|
|
452
452
|
field,
|
|
453
|
-
filterType:
|
|
453
|
+
filterType: InternalFilterType.StringFilter,
|
|
454
454
|
fieldType: FieldType.String,
|
|
455
455
|
operator: operator,
|
|
456
456
|
value,
|
|
@@ -464,7 +464,7 @@ export default function FilterModal({ schema, filter, fieldValuesMap, fieldValue
|
|
|
464
464
|
case NullOperator.IsNull:
|
|
465
465
|
onSubmitFilter({
|
|
466
466
|
field,
|
|
467
|
-
filterType:
|
|
467
|
+
filterType: InternalFilterType.NullFilter,
|
|
468
468
|
fieldType: FieldType.Null,
|
|
469
469
|
operator: operator,
|
|
470
470
|
value: null,
|
|
@@ -480,7 +480,7 @@ export default function FilterModal({ schema, filter, fieldValuesMap, fieldValue
|
|
|
480
480
|
}
|
|
481
481
|
onSubmitFilter({
|
|
482
482
|
field,
|
|
483
|
-
filterType:
|
|
483
|
+
filterType: InternalFilterType.NumericFilter,
|
|
484
484
|
fieldType: FieldType.Number,
|
|
485
485
|
operator: operator,
|
|
486
486
|
value,
|
|
@@ -494,7 +494,7 @@ export default function FilterModal({ schema, filter, fieldValuesMap, fieldValue
|
|
|
494
494
|
case NullOperator.IsNull:
|
|
495
495
|
onSubmitFilter({
|
|
496
496
|
field,
|
|
497
|
-
filterType:
|
|
497
|
+
filterType: InternalFilterType.NullFilter,
|
|
498
498
|
fieldType: FieldType.Null,
|
|
499
499
|
operator: operator,
|
|
500
500
|
value: null,
|
|
@@ -505,7 +505,7 @@ export default function FilterModal({ schema, filter, fieldValuesMap, fieldValue
|
|
|
505
505
|
case BoolOperator.NotEqualTo:
|
|
506
506
|
onSubmitFilter({
|
|
507
507
|
field,
|
|
508
|
-
filterType:
|
|
508
|
+
filterType: InternalFilterType.BooleanFilter,
|
|
509
509
|
fieldType: FieldType.Boolean,
|
|
510
510
|
operator: operator,
|
|
511
511
|
value: value,
|
|
@@ -520,7 +520,7 @@ export default function FilterModal({ schema, filter, fieldValuesMap, fieldValue
|
|
|
520
520
|
case NullOperator.IsNull:
|
|
521
521
|
onSubmitFilter({
|
|
522
522
|
field,
|
|
523
|
-
filterType:
|
|
523
|
+
filterType: InternalFilterType.NullFilter,
|
|
524
524
|
fieldType: FieldType.Null,
|
|
525
525
|
operator: operator,
|
|
526
526
|
value: null,
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { FilterTreeNode } from '../../utils/astFilterProcessing';
|
|
2
|
+
import { SchemaData } from '../../models/Schema';
|
|
2
3
|
interface FilterStackProps {
|
|
3
4
|
client: any;
|
|
4
5
|
filterStack: FilterTreeNode[];
|
|
@@ -8,7 +9,7 @@ interface FilterStackProps {
|
|
|
8
9
|
setBaseAst: any;
|
|
9
10
|
setFormData: any;
|
|
10
11
|
fetchSqlQuery: any;
|
|
11
|
-
schemaData:
|
|
12
|
+
schemaData: SchemaData;
|
|
12
13
|
defaultColumn: any;
|
|
13
14
|
defaultTable: any;
|
|
14
15
|
currentTable: any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FilterStack.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/FilterStack.tsx"],"names":[],"mappings":"AAGA,OAAO,EACL,cAAc,EAEf,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"FilterStack.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/FilterStack.tsx"],"names":[],"mappings":"AAGA,OAAO,EACL,cAAc,EAEf,MAAM,iCAAiC,CAAC;AASzC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,UAAU,gBAAgB;IACxB,MAAM,EAAE,GAAG,CAAC;IACZ,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B,UAAU,EAAE,cAAc,GAAG,IAAI,CAAC;IAClC,UAAU,EAAE,GAAG,CAAC;IAChB,OAAO,EAAE,GAAG,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;IAChB,WAAW,EAAE,GAAG,CAAC;IACjB,aAAa,EAAE,GAAG,CAAC;IACnB,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,GAAG,CAAC;IACnB,YAAY,EAAE,GAAG,CAAC;IAClB,YAAY,EAAE,GAAG,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,kBAAkB,EAAE,GAAG,CAAC;IACxB,2BAA2B,EAAE,OAAO,CAAC;IACrC,OAAO,EAAE,GAAG,CAAC;IACb,cAAc,EAAE,GAAG,CAAC;IACpB,iBAAiB,EAAE,GAAG,CAAC;IACvB,aAAa,EAAE,GAAG,CAAC;IACnB,sBAAsB,EAAE,GAAG,CAAC;IAC5B,WAAW,EAAE,GAAG,CAAC;IACjB,eAAe,EAAE,GAAG,CAAC;IACrB,wBAAwB,EAAE,GAAG,CAAC;IAC9B,eAAe,EAAE,GAAG,CAAC;IACrB,kBAAkB,EAAE,GAAG,CAAC;IACxB,oBAAoB,EAAE,GAAG,CAAC;IAC1B,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,MAAM,EACN,WAAW,EACX,UAAU,EACV,UAAU,EACV,OAAO,EACP,UAAU,EACV,WAAW,EACX,aAAa,EACb,UAAU,EACV,aAAa,EACb,YAAY,EACZ,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EAClB,2BAA2B,EAC3B,OAAO,EACP,cAAc,EACd,iBAAiB,EACjB,aAAa,EACb,sBAAsB,EACtB,WAAW,EACX,eAAe,EACf,wBAAwB,EACxB,eAAe,EACf,kBAAkB,EAClB,oBAAoB,EACpB,cAAqB,EACrB,aAAa,GACd,EAAE,gBAAgB,2CAiLlB"}
|
|
@@ -31,7 +31,7 @@ export default function FilterStack({ client, filterStack, filterTree, defaultAS
|
|
|
31
31
|
...defaultAST,
|
|
32
32
|
...baseAst,
|
|
33
33
|
...(!baseAst?.columns && {
|
|
34
|
-
columns: getAllPossibleColumns(baseAst, schemaData.
|
|
34
|
+
columns: getAllPossibleColumns(baseAst, schemaData.schemaWithCustomFields).map((c) => {
|
|
35
35
|
const newColumn = deepCopy(defaultColumn);
|
|
36
36
|
newColumn.expr.column = c.field;
|
|
37
37
|
return newColumn;
|
|
@@ -48,7 +48,7 @@ export default function FilterStack({ client, filterStack, filterTree, defaultAS
|
|
|
48
48
|
} }) }, index));
|
|
49
49
|
}
|
|
50
50
|
else if (item.value) {
|
|
51
|
-
return (_jsx(FilterPopoverWrapper, { schema: schemaData.
|
|
51
|
+
return (_jsx(FilterPopoverWrapper, { schema: schemaData.schemaWithCustomFields.find((s) => s.name === currentTable || s.displayName === currentTable) ?? schemaData.schemaWithCustomFields[0], filter: item.value, filterLabel: item.value ? filterSentence(item.value) : '', index: index, FilterTagComponent: FilterPopoverComponent, FilterModal: FilterModal, fieldValuesMap: globalUniqueValues, fieldValuesMapIsLoading: globalUniqueValuesIsLoading, priorFilters: filterStack.slice(0, index > 0 ? index - 1 : 0), columns: columns, client: client, customFields: schemaData.customFields, baseAst: baseAst, endpoint: QUILL_SERVER, ButtonComponent: ButtonComponent, SecondaryButtonComponent: SecondaryButtonComponent, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, MultiSelectComponent: MultiSelectComponent, handleFilterSave: (filter) => {
|
|
52
52
|
item.value = filter;
|
|
53
53
|
let newFormData = null;
|
|
54
54
|
if (filterTree) {
|
|
@@ -58,7 +58,7 @@ export default function FilterStack({ client, filterStack, filterTree, defaultAS
|
|
|
58
58
|
...defaultAST,
|
|
59
59
|
...baseAst,
|
|
60
60
|
...(!baseAst?.columns && {
|
|
61
|
-
columns: getAllPossibleColumns(baseAst, schemaData.
|
|
61
|
+
columns: getAllPossibleColumns(baseAst, schemaData.schemaWithCustomFields).map((c) => {
|
|
62
62
|
const newColumn = deepCopy(defaultColumn);
|
|
63
63
|
newColumn.expr.column = c.field;
|
|
64
64
|
return newColumn;
|
|
@@ -96,7 +96,7 @@ export default function FilterStack({ client, filterStack, filterTree, defaultAS
|
|
|
96
96
|
...defaultAST,
|
|
97
97
|
...baseAst,
|
|
98
98
|
...(!baseAst?.columns && {
|
|
99
|
-
columns: getAllPossibleColumns(baseAst, schemaData.
|
|
99
|
+
columns: getAllPossibleColumns(baseAst, schemaData.schemaWithCustomFields).map((c) => {
|
|
100
100
|
const newColumn = deepCopy(defaultColumn);
|
|
101
101
|
newColumn.expr.column = c.field;
|
|
102
102
|
return newColumn;
|
|
@@ -37,4 +37,6 @@ export declare function convertRemoveSimpleParentheses(ast: NSP.Select): NSP.Sel
|
|
|
37
37
|
*/
|
|
38
38
|
export declare function convertUnaryToBinary(ast: any): any;
|
|
39
39
|
export declare function convertOrderBy(ast: any, schema: Table[]): any;
|
|
40
|
+
export declare function isSimpleSelectStarQuery(query: string): boolean;
|
|
41
|
+
export declare function convertQueryToSelectStar(query: string): string;
|
|
40
42
|
//# sourceMappingURL=convert.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/convert.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,IAAI,GAAG,EACpB,GAAG,EASJ,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAU5C,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAuBlE;AAGD,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,QAahB;AAGD,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,QAalB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAAC,MAAM,CAoDpD;AAUD;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,GAAG,CAAC,MAAM,EACf,YAAY,EAAE,KAAK,EAAE,GACpB,GAAG,CAAC,MAAM,CA8BZ;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,gBAkBrE;
|
|
1
|
+
{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/convert.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,IAAI,GAAG,EACpB,GAAG,EASJ,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAU5C,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAuBlE;AAGD,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,QAahB;AAGD,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,QAalB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAAC,MAAM,CAoDpD;AAUD;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,GAAG,CAAC,MAAM,EACf,YAAY,EAAE,KAAK,EAAE,GACpB,GAAG,CAAC,MAAM,CA8BZ;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,gBAkBrE;AAmLD,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,GAAG,CAAC,MAAM,EACf,UAAU,EAAE,cAAc,EAAE,GAC3B,KAAK,GAAG,IAAI,CA2Hd;AAkED;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,GAAG,EACR,YAAY,EAAE,KAAK,EAAE,EACrB,SAAS,CAAC,EAAE,KAAK,EACjB,SAAS,CAAC,EAAE,MAAM;;;;;;EA6InB;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,OAyNtE;AAID,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAY1E;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,OA+C5C;AAGD,wBAAgB,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAkCvD;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAG9D;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE9D"}
|
|
@@ -183,7 +183,11 @@ function addAllPivotColumnsToColumnAST(astColumns, pivot) {
|
|
|
183
183
|
if (!pivot) {
|
|
184
184
|
return;
|
|
185
185
|
}
|
|
186
|
-
[
|
|
186
|
+
[
|
|
187
|
+
pivot.aggregations?.map((agg) => [agg.valueField, agg.valueField2])?.flat(),
|
|
188
|
+
pivot.rowField,
|
|
189
|
+
pivot.columnField,
|
|
190
|
+
]
|
|
187
191
|
.flat()
|
|
188
192
|
.filter((field) => typeof field === 'string' && field !== undefined)
|
|
189
193
|
.forEach((field) => {
|
|
@@ -381,12 +385,16 @@ export function convertASTToPivotData(ast, columnInfo) {
|
|
|
381
385
|
if (finalPivot.aggregations) {
|
|
382
386
|
finalPivot.aggregations = finalPivot.aggregations.filter((agg) => {
|
|
383
387
|
const column = columnInfo.find((c) => c.field === agg.valueField);
|
|
384
|
-
return column &&
|
|
388
|
+
return (column &&
|
|
389
|
+
(isNumericColumnType(column.fieldType) ||
|
|
390
|
+
isBoolColumnType(column.fieldType)));
|
|
385
391
|
});
|
|
386
392
|
}
|
|
387
393
|
else if (finalPivot.valueField) {
|
|
388
394
|
const column = columnInfo.find((c) => c.field === finalPivot.valueField);
|
|
389
|
-
if (!column ||
|
|
395
|
+
if (!column ||
|
|
396
|
+
!(isNumericColumnType(column.fieldType) ||
|
|
397
|
+
isBoolColumnType(column.fieldType))) {
|
|
390
398
|
finalPivot.valueField = '';
|
|
391
399
|
finalPivot.aggregationType = 'count';
|
|
392
400
|
}
|
|
@@ -444,10 +452,12 @@ function addValueFieldToPivot(newAst, pivot, columns) {
|
|
|
444
452
|
else {
|
|
445
453
|
pivot.columnField = undefined;
|
|
446
454
|
pivot.columnFieldType = undefined;
|
|
447
|
-
pivot.aggregations = [
|
|
455
|
+
pivot.aggregations = [
|
|
456
|
+
{
|
|
448
457
|
valueField: undefined,
|
|
449
458
|
aggregationType: 'count',
|
|
450
|
-
}
|
|
459
|
+
},
|
|
460
|
+
];
|
|
451
461
|
}
|
|
452
462
|
}
|
|
453
463
|
}
|
|
@@ -486,10 +496,12 @@ export function convertGroupBy(ast, schemaTables, prevPivot, prevTable) {
|
|
|
486
496
|
if (prevPivot.aggregations?.length) {
|
|
487
497
|
for (const agg of prevPivot.aggregations) {
|
|
488
498
|
if (agg.valueField) {
|
|
489
|
-
newColumns.push(columnAlreadyExists(agg.valueField) ??
|
|
499
|
+
newColumns.push(columnAlreadyExists(agg.valueField) ??
|
|
500
|
+
generateColumnExpr(agg.valueField));
|
|
490
501
|
}
|
|
491
502
|
if (agg.valueField2) {
|
|
492
|
-
newColumns.push(columnAlreadyExists(agg.valueField) ??
|
|
503
|
+
newColumns.push(columnAlreadyExists(agg.valueField) ??
|
|
504
|
+
generateColumnExpr(agg.valueField));
|
|
493
505
|
}
|
|
494
506
|
}
|
|
495
507
|
}
|
|
@@ -885,3 +897,10 @@ export function convertOrderBy(ast, schema) {
|
|
|
885
897
|
}
|
|
886
898
|
return newAst;
|
|
887
899
|
}
|
|
900
|
+
export function isSimpleSelectStarQuery(query) {
|
|
901
|
+
const regex = /^\s*SELECT\s+\*\s+FROM\s+/i;
|
|
902
|
+
return regex.test(query);
|
|
903
|
+
}
|
|
904
|
+
export function convertQueryToSelectStar(query) {
|
|
905
|
+
return query.replace(/SELECT\s+.*?\s+FROM/i, 'SELECT * FROM');
|
|
906
|
+
}
|
|
@@ -74,7 +74,7 @@ export declare function removeNonSelectedTableReferences(ast: any, table: string
|
|
|
74
74
|
[value: string]: boolean;
|
|
75
75
|
};
|
|
76
76
|
} | null): any;
|
|
77
|
-
export declare function removeTableNameAlias(ast: any): any;
|
|
77
|
+
export declare function removeTableNameAlias(ast: any, schema: any): any;
|
|
78
78
|
export declare function allNumericNodesValidInTree(node: any): boolean;
|
|
79
79
|
export declare function isIdColumn(columnName?: string): boolean | "" | undefined;
|
|
80
80
|
export declare function getCustomSentence(node: any, databaseType: string): string | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/util.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/util.ts"],"names":[],"mappings":"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"}
|
|
@@ -726,13 +726,26 @@ function recursiveRemoveTableReference(node, table, as) {
|
|
|
726
726
|
});
|
|
727
727
|
return node;
|
|
728
728
|
}
|
|
729
|
-
export function removeTableNameAlias(ast) {
|
|
729
|
+
export function removeTableNameAlias(ast, schema) {
|
|
730
730
|
if (!ast.from?.length || !ast.from) {
|
|
731
731
|
return ast;
|
|
732
732
|
}
|
|
733
733
|
const referencedTables = deepCopy(ast.from);
|
|
734
|
+
// In the context of where this function is used, (ReportBuilder AI)
|
|
735
|
+
// ast.from should only contain one table (if not, it would have triggered a retry)
|
|
734
736
|
referencedTables.forEach((from) => {
|
|
735
|
-
|
|
737
|
+
let table = from.table;
|
|
738
|
+
if (!schema.find((s) => s.name === table)) {
|
|
739
|
+
// if the table isn't actually there, replace with a table that fits columns
|
|
740
|
+
const referencedColumns = ast.columns.map((col) => getFieldFromExpression(col.expr) || getFieldFromExpression(col));
|
|
741
|
+
const schemaTable = schema.find((s) => {
|
|
742
|
+
return referencedColumns.every((col) => s.columns.find((c) => c.field === col));
|
|
743
|
+
});
|
|
744
|
+
if (schemaTable) {
|
|
745
|
+
ast = recursiveRemoveTableReference(ast, schemaTable.name, table);
|
|
746
|
+
table = schemaTable.name;
|
|
747
|
+
}
|
|
748
|
+
}
|
|
736
749
|
const as = from.as;
|
|
737
750
|
if (as) {
|
|
738
751
|
ast = recursiveRemoveTableReference(ast, table, as);
|
|
@@ -129,8 +129,10 @@ export interface CheckboxComponentProps {
|
|
|
129
129
|
isChecked: boolean;
|
|
130
130
|
label: string;
|
|
131
131
|
onChange: (event: ChangeEvent<HTMLInputElement>) => void;
|
|
132
|
+
containerStyle?: CSSProperties;
|
|
133
|
+
disabled?: boolean;
|
|
132
134
|
}
|
|
133
|
-
export declare const MemoizedCheckbox: ({ isChecked, label, onChange, }: CheckboxComponentProps) => import("react/jsx-runtime").JSX.Element;
|
|
135
|
+
export declare const MemoizedCheckbox: ({ isChecked, label, onChange, containerStyle, disabled, }: CheckboxComponentProps) => import("react/jsx-runtime").JSX.Element;
|
|
134
136
|
export declare const DEFAULT_TAB_OPTIONS: {
|
|
135
137
|
label: string;
|
|
136
138
|
value: string;
|
|
@@ -229,4 +231,5 @@ export declare const QuillToolTip: ({ children, text, enabled, containerStyle, t
|
|
|
229
231
|
containerStyle?: CSSProperties;
|
|
230
232
|
textStyle?: CSSProperties;
|
|
231
233
|
}) => string | number | boolean | Iterable<React.ReactNode> | import("react/jsx-runtime").JSX.Element | null | undefined;
|
|
234
|
+
export declare const QuillChartBuilderCheckboxComponent: ({ isChecked, label, onChange, disabled, }: CheckboxComponentProps) => import("react/jsx-runtime").JSX.Element;
|
|
232
235
|
//# sourceMappingURL=UiComponents.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UiComponents.d.ts","sourceRoot":"","sources":["../../../src/components/UiComponents.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"UiComponents.d.ts","sourceRoot":"","sources":["../../../src/components/UiComponents.tsx"],"names":[],"mappings":"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"}
|
|
@@ -146,7 +146,7 @@ export const MemoizedLabel = ({ label }) => {
|
|
|
146
146
|
margin: 0,
|
|
147
147
|
}, children: label }));
|
|
148
148
|
};
|
|
149
|
-
export const MemoizedCheckbox = ({ isChecked, label, onChange, }) => {
|
|
149
|
+
export const MemoizedCheckbox = ({ isChecked, label, onChange, containerStyle, disabled, }) => {
|
|
150
150
|
const [theme] = useContext(ThemeContext);
|
|
151
151
|
return (_jsxs("label", { style: {
|
|
152
152
|
display: 'flex',
|
|
@@ -155,7 +155,13 @@ export const MemoizedCheckbox = ({ isChecked, label, onChange, }) => {
|
|
|
155
155
|
textOverflow: 'ellipsis',
|
|
156
156
|
overflow: 'hidden',
|
|
157
157
|
gap: 4,
|
|
158
|
-
|
|
158
|
+
...containerStyle,
|
|
159
|
+
}, children: [_jsx("input", { type: "checkbox", checked: isChecked, onChange: onChange, disabled: disabled, style: {
|
|
160
|
+
width: '14px',
|
|
161
|
+
height: '14px',
|
|
162
|
+
margin: 'auto 0',
|
|
163
|
+
cursor: 'pointer',
|
|
164
|
+
} }), _jsx("span", { style: {
|
|
159
165
|
display: 'block',
|
|
160
166
|
marginTop: 'auto',
|
|
161
167
|
marginBottom: 'auto',
|
|
@@ -753,8 +759,8 @@ export const QuillToolTip = ({ children, text, enabled = true, containerStyle =
|
|
|
753
759
|
position: absolute;
|
|
754
760
|
z-index: 10;
|
|
755
761
|
bottom: 125%;
|
|
756
|
-
left: 50%;
|
|
757
|
-
transform: translateX(-50%);
|
|
762
|
+
// left: 50%;
|
|
763
|
+
// transform: translateX(-50%);
|
|
758
764
|
opacity: 0;
|
|
759
765
|
transition: opacity 0.3s;
|
|
760
766
|
font-family: ${theme?.fontFamily};
|
|
@@ -799,3 +805,22 @@ export const QuillToolTip = ({ children, text, enabled = true, containerStyle =
|
|
|
799
805
|
opacity: 1;
|
|
800
806
|
}` }), children, _jsx("div", { className: "tooltip-text", style: { ...textStyle }, children: text })] })) : (children);
|
|
801
807
|
};
|
|
808
|
+
export const QuillChartBuilderCheckboxComponent = ({ isChecked, label, onChange, disabled, }) => {
|
|
809
|
+
const [theme] = useContext(ThemeContext);
|
|
810
|
+
return (_jsx("div", { style: {
|
|
811
|
+
boxShadow: '0px 1px 4px #E7E7E705',
|
|
812
|
+
paddingTop: 4,
|
|
813
|
+
paddingBottom: 4,
|
|
814
|
+
paddingLeft: 8,
|
|
815
|
+
paddingRight: 8,
|
|
816
|
+
border: '1px solid #E7E7E7',
|
|
817
|
+
borderRadius: 4,
|
|
818
|
+
display: 'flex',
|
|
819
|
+
alignItems: 'center',
|
|
820
|
+
backgroundColor: disabled
|
|
821
|
+
? '#F5F5F5'
|
|
822
|
+
: theme?.backgroundColor || 'white',
|
|
823
|
+
opacity: disabled ? 0.6 : 1,
|
|
824
|
+
pointerEvents: disabled ? 'none' : 'auto',
|
|
825
|
+
}, children: _jsx(MemoizedCheckbox, { isChecked: isChecked, label: label, onChange: disabled ? () => { } : onChange, containerStyle: { fontSize: 14, fontWeight: 500 } }) }));
|
|
826
|
+
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useDashboard.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDashboard.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EACL,eAAe,EAEf,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAGtD,eAAO,MAAM,YAAY,kBACR,MAAM,GAAG,IAAI,kBACZ,cAAc,EAAE;;;;
|
|
1
|
+
{"version":3,"file":"useDashboard.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDashboard.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EACL,eAAe,EAEf,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAGtD,eAAO,MAAM,YAAY,kBACR,MAAM,GAAG,IAAI,kBACZ,cAAc,EAAE;;;;2CAoHc,MAAM;qCApF1B,MAAM,4CAEf;QACb,MAAM,EAAE,WAAW,GAAG;YAAE,EAAE,EAAE,MAAM,CAAA;SAAE,CAAC;QACrC,MAAM,EAAE,QAAQ,GAAG,QAAQ,CAAC;KAC7B,oBACiB;QAChB,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;KAC5B;CAyFJ,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;;;;;kEA2BrB;QACD,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,UAAU,EAAE,MAAM,EAAE,CAAC;QACrB,UAAU,CAAC,EAAE,eAAe,CAAC;KAC9B;4BAuDO,MAAM,gEAOT;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,UAAU,CAAC,EAAE,eAAe,CAAC;QAC7B,aAAa,CAAC,EAAE,cAAc,EAAE,CAAC;QACjC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;KACvB;4BAgHkC,MAAM;CA+B5C,CAAC"}
|
|
@@ -9,12 +9,14 @@ export const useDashboard = (dashboardName, customFilters) => {
|
|
|
9
9
|
//TODO: handle error states
|
|
10
10
|
// const [error, setError] = useState<any>(null);
|
|
11
11
|
const [, isClientLoading] = useContext(ClientContext);
|
|
12
|
-
const loading = useMemo(() =>
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
12
|
+
const loading = useMemo(() => {
|
|
13
|
+
return !dashboardName ||
|
|
14
|
+
isClientLoading ||
|
|
15
|
+
isDashboardsLoading ||
|
|
16
|
+
dashboardConfig[dashboardName]?.loading ||
|
|
17
|
+
(dashboardConfig[dashboardName] &&
|
|
18
|
+
!dashboardConfig[dashboardName]?.config.sections);
|
|
19
|
+
}, [isClientLoading, dashboardConfig, dashboardName]);
|
|
18
20
|
const populatedDashboardFilters = useMemo(() => {
|
|
19
21
|
return dashboardName && dashboardFilters[dashboardName] !== undefined
|
|
20
22
|
? Object.values(dashboardFilters[dashboardName] ?? {}).map((f) => f.filter)
|
|
@@ -24,7 +26,7 @@ export const useDashboard = (dashboardName, customFilters) => {
|
|
|
24
26
|
if (!dashboardName)
|
|
25
27
|
return;
|
|
26
28
|
if (overrideFilters) {
|
|
27
|
-
// Pull the date filter out of the override filters, process it, and
|
|
29
|
+
// Pull the date filter out of the override filters, process it, and prepend it to the filters
|
|
28
30
|
const dateFilter = overrideFilters.filters.find((f) => f.filterType === 'date_range');
|
|
29
31
|
loadFiltersForDashboard(dashboardName, [
|
|
30
32
|
...(dateFilter
|
|
@@ -204,8 +206,8 @@ export const useDashboards = () => {
|
|
|
204
206
|
},
|
|
205
207
|
});
|
|
206
208
|
});
|
|
207
|
-
const range = updated.data.dashboard.presetRanges?.find((range) => range.value === updated.data.dashboard.primaryRange?.value) ??
|
|
208
|
-
PRIMARY_RANGE[updated.data.dashboard.primaryRange?.value ?? 'LAST_30_DAYS'] ??
|
|
209
|
+
const range = updated.data.dashboard.dateFilter?.presetRanges?.find((range) => range.value === updated.data.dashboard.dateFilter?.primaryRange?.value) ??
|
|
210
|
+
PRIMARY_RANGE[updated.data.dashboard.dateFilter?.primaryRange?.value ?? 'LAST_30_DAYS'] ??
|
|
209
211
|
PRIMARY_RANGE['LAST_30_DAYS'];
|
|
210
212
|
const updatedDateFilter = updated.data.dashboard.dateFilter
|
|
211
213
|
? {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useExport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useExport.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"useExport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useExport.tsx"],"names":[],"mappings":"AAYA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAoE/C,eAAO,MAAM,SAAS,cACT,MAAM,mEAMd;IACD,uBAAuB,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,GAAG,CAAC,OAAO,CAAC;IAChE,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,KACA;IACD,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,YAAY,EAAE,OAAO,CAAC;CAwPvB,CAAC;AAEF,UAAU,aAAa;IACrB,MAAM,EAAE,WAAW,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;CAC5B"}
|
|
@@ -2,14 +2,14 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
|
2
2
|
import { downloadCSV } from '../utils/csv';
|
|
3
3
|
import { useContext, useMemo, useState } from 'react';
|
|
4
4
|
import { getData } from '../utils/dataFetcher';
|
|
5
|
-
import { ClientContext, DashboardContext, DashboardFiltersContext, ReportFiltersContext, TenantContext, } from '../Context';
|
|
5
|
+
import { ClientContext, DashboardContext, DashboardFiltersContext, ReportFiltersContext, SchemaDataContext, TenantContext, } from '../Context';
|
|
6
6
|
import { cleanDashboardItem } from '../utils/dashboard';
|
|
7
7
|
import { createRoot } from 'react-dom/client';
|
|
8
8
|
import { flushSync } from 'react-dom';
|
|
9
9
|
import { fetchReport } from '../utils/report';
|
|
10
10
|
import jsPDF from 'jspdf';
|
|
11
11
|
import { quillFormat } from '../utils/valueFormatter';
|
|
12
|
-
async function getExportData(client, dashboardFilters, reportId, tenants, flags) {
|
|
12
|
+
async function getExportData(client, dashboardFilters, reportId, tenants, flags, customFields) {
|
|
13
13
|
const minimalFilters = Object.values(dashboardFilters).length
|
|
14
14
|
? Object.values(dashboardFilters).map((filter) => {
|
|
15
15
|
const newFilter = { ...filter };
|
|
@@ -38,7 +38,12 @@ async function getExportData(client, dashboardFilters, reportId, tenants, flags)
|
|
|
38
38
|
useNewNodeSql: true,
|
|
39
39
|
};
|
|
40
40
|
const resp = await getData(client, 'itempost', 'same-origin', hostedBody, cloudBody);
|
|
41
|
-
const cleanedReport = await cleanDashboardItem(
|
|
41
|
+
const cleanedReport = await cleanDashboardItem({
|
|
42
|
+
item: resp,
|
|
43
|
+
dashboardFilters,
|
|
44
|
+
client,
|
|
45
|
+
customFields,
|
|
46
|
+
});
|
|
42
47
|
if (cleanedReport.chartType === 'table' && cleanedReport.pivot) {
|
|
43
48
|
cleanedReport.columns = cleanedReport.yAxisFields;
|
|
44
49
|
}
|
|
@@ -50,6 +55,7 @@ sectionField, } = {}) => {
|
|
|
50
55
|
const { dashboardFilters } = useContext(DashboardFiltersContext);
|
|
51
56
|
const [dashboard] = useContext(DashboardContext);
|
|
52
57
|
const { reportFilters } = useContext(ReportFiltersContext);
|
|
58
|
+
const [schemaData] = useContext(SchemaDataContext);
|
|
53
59
|
const { tenants, flags } = useContext(TenantContext);
|
|
54
60
|
const specificDashboardFilters = useMemo(() => {
|
|
55
61
|
if (!reportId) {
|
|
@@ -88,7 +94,7 @@ sectionField, } = {}) => {
|
|
|
88
94
|
setIsCSVLoading(true);
|
|
89
95
|
const resp = await getExportData(client, specificReportFilters.length > 0
|
|
90
96
|
? specificReportFilters
|
|
91
|
-
: specificDashboardFilters, reportId, tenants, flags);
|
|
97
|
+
: specificDashboardFilters, reportId, tenants, flags, schemaData?.customFields);
|
|
92
98
|
downloadCSV({
|
|
93
99
|
rows: resp.pivot && resp.pivotRows ? resp.pivotRows : resp.rows,
|
|
94
100
|
fields: resp.pivot && resp.pivotColumns ? resp.pivotColumns : resp.columns,
|
|
@@ -101,7 +107,15 @@ sectionField, } = {}) => {
|
|
|
101
107
|
const filters = specificReportFilters.length > 0
|
|
102
108
|
? specificReportFilters
|
|
103
109
|
: specificDashboardFilters;
|
|
104
|
-
const { report: fetchedReport } = await fetchReport(
|
|
110
|
+
const { report: fetchedReport } = await fetchReport({
|
|
111
|
+
reportId,
|
|
112
|
+
client,
|
|
113
|
+
tenants,
|
|
114
|
+
flags,
|
|
115
|
+
useReportTask: true,
|
|
116
|
+
filters,
|
|
117
|
+
customFields: schemaData?.customFields,
|
|
118
|
+
});
|
|
105
119
|
const report = fetchedReport;
|
|
106
120
|
if (report.pivot && report.pivotRows && report.pivotColumns) {
|
|
107
121
|
report.rows = report.pivotRows;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useQuill.d.ts","sourceRoot":"","sources":["../../../src/hooks/useQuill.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACL,WAAW,EAIZ,MAAM,yBAAyB,CAAC;AAIjC,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,QAAQ,cACR,MAAM,eACJ;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,KAC3D;IACD,IAAI,EAAE,WAAW,GAAG,IAAI,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACpD,SAAS,EACL,CAAC,CAAC,QAAQ,EAAE,WAAW,KAAK,MAAM,GAAG,SAAS,CAAC,GAC/C,CAAC,MAAM,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"useQuill.d.ts","sourceRoot":"","sources":["../../../src/hooks/useQuill.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACL,WAAW,EAIZ,MAAM,yBAAyB,CAAC;AAIjC,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,QAAQ,cACR,MAAM,eACJ;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,KAC3D;IACD,IAAI,EAAE,WAAW,GAAG,IAAI,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACpD,SAAS,EACL,CAAC,CAAC,QAAQ,EAAE,WAAW,KAAK,MAAM,GAAG,SAAS,CAAC,GAC/C,CAAC,MAAM,SAAS,CAAC,CAAC;CAwNvB,CAAC"}
|
|
@@ -16,7 +16,7 @@ export const useQuill = (reportId, pagination) => {
|
|
|
16
16
|
return Object.values(reportFilters[reportId] ?? []).map((f) => f.filter);
|
|
17
17
|
}, [reportFilters, reportId]);
|
|
18
18
|
const [schemaData] = useContext(SchemaDataContext);
|
|
19
|
-
const [client] = useContext(ClientContext);
|
|
19
|
+
const [client, isClientLoading] = useContext(ClientContext);
|
|
20
20
|
const { tenants } = useContext(TenantContext);
|
|
21
21
|
const [loading, setLoading] = useState(true);
|
|
22
22
|
const [error, setError] = useState(undefined);
|
|
@@ -140,7 +140,15 @@ export const useQuill = (reportId, pagination) => {
|
|
|
140
140
|
}
|
|
141
141
|
setLoading(true);
|
|
142
142
|
try {
|
|
143
|
-
await fetchIndividualReport(
|
|
143
|
+
await fetchIndividualReport({
|
|
144
|
+
reportId: curReportId,
|
|
145
|
+
initiator: 'useQuill',
|
|
146
|
+
fetchRows: true,
|
|
147
|
+
dashboardFilters: specificReportFilters || [],
|
|
148
|
+
customFilters: [],
|
|
149
|
+
additionalProcessing,
|
|
150
|
+
customFields: schemaData.customFields,
|
|
151
|
+
});
|
|
144
152
|
}
|
|
145
153
|
catch (error) {
|
|
146
154
|
setError(error.message ?? 'Error fetching report');
|
|
@@ -150,6 +158,8 @@ export const useQuill = (reportId, pagination) => {
|
|
|
150
158
|
}
|
|
151
159
|
};
|
|
152
160
|
useEffect(() => {
|
|
161
|
+
if (isClientLoading)
|
|
162
|
+
return;
|
|
153
163
|
if (reportId && specificReportFilters) {
|
|
154
164
|
fetchReportHelper(reportId, {
|
|
155
165
|
page: pagination,
|
|
@@ -168,8 +178,11 @@ export const useQuill = (reportId, pagination) => {
|
|
|
168
178
|
? Object.values(dashboardFilters[dashboardName] ?? {})
|
|
169
179
|
: [],
|
|
170
180
|
});
|
|
181
|
+
fetchReportHelper(reportId, {
|
|
182
|
+
page: pagination,
|
|
183
|
+
});
|
|
171
184
|
}
|
|
172
|
-
}, [reportId, specificReportFilters]);
|
|
185
|
+
}, [isClientLoading, reportId, specificReportFilters]);
|
|
173
186
|
return {
|
|
174
187
|
data: processedReport ?? null,
|
|
175
188
|
loading: !reportId ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useReport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useReport.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAuB,eAAe,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEhF,eAAO,MAAM,UAAU;uCAYR,CAAC,MAAM,EAAE,mBAAmB,KAAK,OAAO;CAYtD,CAAC;AAIF,eAAO,MAAM,SAAS,aAAc,MAAM;8BAIrB;QACf,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;KAC5B,kBACc,MAAM,EAAE,cACZ,OAAO,GAAG,UAAU,GAAG,WAAW;
|
|
1
|
+
{"version":3,"file":"useReport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useReport.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAuB,eAAe,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEhF,eAAO,MAAM,UAAU;uCAYR,CAAC,MAAM,EAAE,mBAAmB,KAAK,OAAO;CAYtD,CAAC;AAIF,eAAO,MAAM,SAAS,aAAc,MAAM;8BAIrB;QACf,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;KAC5B,kBACc,MAAM,EAAE,cACZ,OAAO,GAAG,UAAU,GAAG,WAAW;CA4BhD,CAAC"}
|