@quillsql/react 2.12.52 → 2.12.53
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.js +1 -1
- package/dist/cjs/ChartBuilder.d.ts +7 -3
- package/dist/cjs/ChartBuilder.d.ts.map +1 -1
- package/dist/cjs/ChartBuilder.js +54 -18
- package/dist/cjs/ChartEditor.d.ts +3 -1
- package/dist/cjs/ChartEditor.d.ts.map +1 -1
- package/dist/cjs/ChartEditor.js +42 -7
- package/dist/cjs/Context.d.ts +4 -5
- package/dist/cjs/Context.d.ts.map +1 -1
- package/dist/cjs/Context.js +22 -34
- package/dist/cjs/Dashboard.d.ts +4 -3
- package/dist/cjs/Dashboard.d.ts.map +1 -1
- package/dist/cjs/Dashboard.js +24 -29
- package/dist/cjs/DateRangePicker/QuillDateRangePicker.d.ts.map +1 -1
- package/dist/cjs/DateRangePicker/QuillDateRangePicker.js +8 -10
- package/dist/cjs/DateRangePicker/dateRangePickerUtils.d.ts +1 -0
- package/dist/cjs/DateRangePicker/dateRangePickerUtils.d.ts.map +1 -1
- package/dist/cjs/DateRangePicker/dateRangePickerUtils.js +1 -1
- package/dist/cjs/QuillProvider.js +1 -1
- package/dist/cjs/ReportBuilder.d.ts +8 -12
- package/dist/cjs/ReportBuilder.d.ts.map +1 -1
- package/dist/cjs/ReportBuilder.js +157 -83
- package/dist/cjs/SQLEditor.d.ts +8 -1
- package/dist/cjs/SQLEditor.d.ts.map +1 -1
- package/dist/cjs/SQLEditor.js +80 -28
- package/dist/cjs/Table.js +1 -1
- package/dist/cjs/assets/AdjustmentsIcon.d.ts +5 -0
- package/dist/cjs/assets/AdjustmentsIcon.d.ts.map +1 -0
- package/dist/cjs/assets/AdjustmentsIcon.js +5 -0
- package/dist/cjs/assets/ArrowDownHeadIcon.d.ts.map +1 -1
- package/dist/cjs/components/Chart/ChartError.js +2 -2
- package/dist/cjs/components/Dashboard/DashboardFilter.d.ts +2 -2
- package/dist/cjs/components/Dashboard/DashboardFilter.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/DashboardFilter.js +6 -6
- package/dist/cjs/components/Dashboard/DashboardTemplate.d.ts +2 -2
- package/dist/cjs/components/Dashboard/DashboardTemplate.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/DataLoader.d.ts +5 -1
- package/dist/cjs/components/Dashboard/DataLoader.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/DataLoader.js +23 -4
- package/dist/cjs/components/Dashboard/TableComponent.d.ts +2 -1
- package/dist/cjs/components/Dashboard/TableComponent.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/TableComponent.js +2 -2
- package/dist/cjs/components/Dashboard/util.d.ts +2 -2
- package/dist/cjs/components/Dashboard/util.d.ts.map +1 -1
- package/dist/cjs/components/Dashboard/util.js +2 -2
- package/dist/cjs/components/QuillMultiSelect.d.ts.map +1 -1
- package/dist/cjs/components/QuillMultiSelect.js +18 -13
- package/dist/cjs/components/QuillMultiSelectWithCombo.d.ts.map +1 -1
- package/dist/cjs/components/QuillMultiSelectWithCombo.js +67 -45
- package/dist/cjs/components/QuillSelect.d.ts +1 -1
- package/dist/cjs/components/QuillSelect.d.ts.map +1 -1
- package/dist/cjs/components/QuillSelect.js +28 -6
- package/dist/cjs/components/QuillSelectWithCombo.d.ts.map +1 -1
- package/dist/cjs/components/QuillSelectWithCombo.js +45 -24
- package/dist/cjs/components/QuillTable.d.ts +2 -1
- package/dist/cjs/components/QuillTable.d.ts.map +1 -1
- package/dist/cjs/components/QuillTable.js +7 -4
- package/dist/cjs/components/ReportBuilder/AddLimitPopover.d.ts +2 -1
- package/dist/cjs/components/ReportBuilder/AddLimitPopover.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/AddLimitPopover.js +2 -2
- package/dist/cjs/components/ReportBuilder/AddSortPopover.d.ts +2 -1
- package/dist/cjs/components/ReportBuilder/AddSortPopover.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/AddSortPopover.js +2 -2
- package/dist/cjs/components/ReportBuilder/FilterModal.d.ts +2 -1
- package/dist/cjs/components/ReportBuilder/FilterModal.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/FilterModal.js +17 -4
- package/dist/cjs/components/ReportBuilder/ui.d.ts +13 -7
- package/dist/cjs/components/ReportBuilder/ui.d.ts.map +1 -1
- package/dist/cjs/components/ReportBuilder/ui.js +14 -11
- package/dist/cjs/components/UiComponents.d.ts +15 -8
- package/dist/cjs/components/UiComponents.d.ts.map +1 -1
- package/dist/cjs/components/UiComponents.js +29 -23
- package/dist/cjs/hooks/useAstToFilterTree.d.ts +2 -2
- package/dist/cjs/hooks/useAstToFilterTree.d.ts.map +1 -1
- package/dist/cjs/hooks/useDashboard.d.ts +9 -4
- package/dist/cjs/hooks/useDashboard.d.ts.map +1 -1
- package/dist/cjs/hooks/useDashboard.js +61 -38
- package/dist/cjs/hooks/useExport.js +1 -1
- package/dist/cjs/hooks/useQuill.js +2 -2
- package/dist/cjs/hooks/useVirtualTables.d.ts +12 -3
- package/dist/cjs/hooks/useVirtualTables.d.ts.map +1 -1
- package/dist/cjs/hooks/useVirtualTables.js +105 -1
- package/dist/cjs/internals/ReportBuilder/PivotForm.d.ts +3 -1
- package/dist/cjs/internals/ReportBuilder/PivotForm.d.ts.map +1 -1
- package/dist/cjs/internals/ReportBuilder/PivotForm.js +9 -9
- package/dist/cjs/internals/ReportBuilder/PivotList.d.ts.map +1 -1
- package/dist/cjs/internals/ReportBuilder/PivotList.js +21 -15
- package/dist/cjs/internals/ReportBuilder/PivotModal.d.ts +3 -2
- package/dist/cjs/internals/ReportBuilder/PivotModal.d.ts.map +1 -1
- package/dist/cjs/internals/ReportBuilder/PivotModal.js +9 -9
- package/dist/cjs/models/Client.d.ts +10 -2
- package/dist/cjs/models/Client.d.ts.map +1 -1
- package/dist/cjs/utils/astProcessing.d.ts +3 -3
- package/dist/cjs/utils/astProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/client.d.ts.map +1 -1
- package/dist/cjs/utils/client.js +2 -7
- package/dist/cjs/utils/dashboard.d.ts +5 -5
- package/dist/cjs/utils/dashboard.d.ts.map +1 -1
- package/dist/cjs/utils/dashboard.js +87 -7
- package/dist/cjs/utils/dataFetcher.d.ts +4 -4
- package/dist/cjs/utils/dataFetcher.d.ts.map +1 -1
- package/dist/cjs/utils/dataFetcher.js +1 -1
- package/dist/cjs/utils/filterProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/filterProcessing.js +2 -8
- package/dist/cjs/utils/paginationProcessing.js +1 -1
- package/dist/cjs/utils/pivotConstructor.d.ts +2 -2
- package/dist/cjs/utils/pivotConstructor.d.ts.map +1 -1
- package/dist/cjs/utils/pivotConstructor.js +1 -1
- package/dist/cjs/utils/pivotProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/pivotProcessing.js +6 -2
- package/dist/cjs/utils/queryConstructor.d.ts.map +1 -1
- package/dist/cjs/utils/queryConstructor.js +12 -9
- package/dist/cjs/utils/report.d.ts +6 -5
- package/dist/cjs/utils/report.d.ts.map +1 -1
- package/dist/cjs/utils/report.js +69 -24
- package/dist/cjs/utils/schema.d.ts +3 -3
- package/dist/cjs/utils/schema.d.ts.map +1 -1
- package/dist/cjs/utils/schema.js +39 -35
- package/dist/cjs/utils/tableProcessing.d.ts +17 -10
- package/dist/cjs/utils/tableProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/tableProcessing.js +42 -23
- package/dist/esm/Chart.js +2 -2
- package/dist/esm/ChartBuilder.d.ts +7 -3
- package/dist/esm/ChartBuilder.d.ts.map +1 -1
- package/dist/esm/ChartBuilder.js +51 -18
- package/dist/esm/ChartEditor.d.ts +3 -1
- package/dist/esm/ChartEditor.d.ts.map +1 -1
- package/dist/esm/ChartEditor.js +43 -8
- package/dist/esm/Context.d.ts +4 -5
- package/dist/esm/Context.d.ts.map +1 -1
- package/dist/esm/Context.js +23 -35
- package/dist/esm/Dashboard.d.ts +4 -3
- package/dist/esm/Dashboard.d.ts.map +1 -1
- package/dist/esm/Dashboard.js +24 -29
- package/dist/esm/DateRangePicker/QuillDateRangePicker.d.ts.map +1 -1
- package/dist/esm/DateRangePicker/QuillDateRangePicker.js +8 -10
- package/dist/esm/DateRangePicker/dateRangePickerUtils.d.ts +1 -0
- package/dist/esm/DateRangePicker/dateRangePickerUtils.d.ts.map +1 -1
- package/dist/esm/DateRangePicker/dateRangePickerUtils.js +1 -1
- package/dist/esm/QuillProvider.js +1 -1
- package/dist/esm/ReportBuilder.d.ts +8 -12
- package/dist/esm/ReportBuilder.d.ts.map +1 -1
- package/dist/esm/ReportBuilder.js +160 -86
- package/dist/esm/SQLEditor.d.ts +8 -1
- package/dist/esm/SQLEditor.d.ts.map +1 -1
- package/dist/esm/SQLEditor.js +83 -31
- package/dist/esm/Table.js +2 -2
- package/dist/esm/assets/AdjustmentsIcon.d.ts +5 -0
- package/dist/esm/assets/AdjustmentsIcon.d.ts.map +1 -0
- package/dist/esm/assets/AdjustmentsIcon.js +3 -0
- package/dist/esm/assets/ArrowDownHeadIcon.d.ts.map +1 -1
- package/dist/esm/components/Chart/ChartError.js +2 -2
- package/dist/esm/components/Dashboard/DashboardFilter.d.ts +2 -2
- package/dist/esm/components/Dashboard/DashboardFilter.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/DashboardFilter.js +6 -6
- package/dist/esm/components/Dashboard/DashboardTemplate.d.ts +2 -2
- package/dist/esm/components/Dashboard/DashboardTemplate.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/DataLoader.d.ts +5 -1
- package/dist/esm/components/Dashboard/DataLoader.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/DataLoader.js +25 -6
- package/dist/esm/components/Dashboard/TableComponent.d.ts +2 -1
- package/dist/esm/components/Dashboard/TableComponent.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/TableComponent.js +2 -2
- package/dist/esm/components/Dashboard/util.d.ts +2 -2
- package/dist/esm/components/Dashboard/util.d.ts.map +1 -1
- package/dist/esm/components/Dashboard/util.js +2 -2
- package/dist/esm/components/QuillMultiSelect.d.ts.map +1 -1
- package/dist/esm/components/QuillMultiSelect.js +19 -14
- package/dist/esm/components/QuillMultiSelectWithCombo.d.ts.map +1 -1
- package/dist/esm/components/QuillMultiSelectWithCombo.js +68 -46
- package/dist/esm/components/QuillSelect.d.ts +1 -1
- package/dist/esm/components/QuillSelect.d.ts.map +1 -1
- package/dist/esm/components/QuillSelect.js +29 -7
- package/dist/esm/components/QuillSelectWithCombo.d.ts.map +1 -1
- package/dist/esm/components/QuillSelectWithCombo.js +46 -25
- package/dist/esm/components/QuillTable.d.ts +2 -1
- package/dist/esm/components/QuillTable.d.ts.map +1 -1
- package/dist/esm/components/QuillTable.js +7 -4
- package/dist/esm/components/ReportBuilder/AddLimitPopover.d.ts +2 -1
- package/dist/esm/components/ReportBuilder/AddLimitPopover.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/AddLimitPopover.js +2 -2
- package/dist/esm/components/ReportBuilder/AddSortPopover.d.ts +2 -1
- package/dist/esm/components/ReportBuilder/AddSortPopover.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/AddSortPopover.js +2 -2
- package/dist/esm/components/ReportBuilder/FilterModal.d.ts +2 -1
- package/dist/esm/components/ReportBuilder/FilterModal.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/FilterModal.js +17 -4
- package/dist/esm/components/ReportBuilder/ui.d.ts +13 -7
- package/dist/esm/components/ReportBuilder/ui.d.ts.map +1 -1
- package/dist/esm/components/ReportBuilder/ui.js +14 -11
- package/dist/esm/components/UiComponents.d.ts +15 -8
- package/dist/esm/components/UiComponents.d.ts.map +1 -1
- package/dist/esm/components/UiComponents.js +29 -23
- package/dist/esm/hooks/useAstToFilterTree.d.ts +2 -2
- package/dist/esm/hooks/useAstToFilterTree.d.ts.map +1 -1
- package/dist/esm/hooks/useDashboard.d.ts +9 -4
- package/dist/esm/hooks/useDashboard.d.ts.map +1 -1
- package/dist/esm/hooks/useDashboard.js +62 -39
- package/dist/esm/hooks/useExport.js +1 -1
- package/dist/esm/hooks/useQuill.js +3 -3
- package/dist/esm/hooks/useVirtualTables.d.ts +12 -3
- package/dist/esm/hooks/useVirtualTables.d.ts.map +1 -1
- package/dist/esm/hooks/useVirtualTables.js +106 -2
- package/dist/esm/internals/ReportBuilder/PivotForm.d.ts +3 -1
- package/dist/esm/internals/ReportBuilder/PivotForm.d.ts.map +1 -1
- package/dist/esm/internals/ReportBuilder/PivotForm.js +9 -9
- package/dist/esm/internals/ReportBuilder/PivotList.d.ts.map +1 -1
- package/dist/esm/internals/ReportBuilder/PivotList.js +21 -15
- package/dist/esm/internals/ReportBuilder/PivotModal.d.ts +3 -2
- package/dist/esm/internals/ReportBuilder/PivotModal.d.ts.map +1 -1
- package/dist/esm/internals/ReportBuilder/PivotModal.js +9 -9
- package/dist/esm/models/Client.d.ts +10 -2
- package/dist/esm/models/Client.d.ts.map +1 -1
- package/dist/esm/utils/astProcessing.d.ts +3 -3
- package/dist/esm/utils/astProcessing.d.ts.map +1 -1
- package/dist/esm/utils/client.d.ts.map +1 -1
- package/dist/esm/utils/client.js +2 -7
- package/dist/esm/utils/dashboard.d.ts +5 -5
- package/dist/esm/utils/dashboard.d.ts.map +1 -1
- package/dist/esm/utils/dashboard.js +87 -7
- package/dist/esm/utils/dataFetcher.d.ts +4 -4
- package/dist/esm/utils/dataFetcher.d.ts.map +1 -1
- package/dist/esm/utils/dataFetcher.js +1 -1
- package/dist/esm/utils/filterProcessing.d.ts.map +1 -1
- package/dist/esm/utils/filterProcessing.js +2 -8
- package/dist/esm/utils/paginationProcessing.js +1 -1
- package/dist/esm/utils/pivotConstructor.d.ts +2 -2
- package/dist/esm/utils/pivotConstructor.d.ts.map +1 -1
- package/dist/esm/utils/pivotConstructor.js +1 -1
- package/dist/esm/utils/pivotProcessing.d.ts.map +1 -1
- package/dist/esm/utils/pivotProcessing.js +6 -2
- package/dist/esm/utils/queryConstructor.d.ts.map +1 -1
- package/dist/esm/utils/queryConstructor.js +12 -9
- package/dist/esm/utils/report.d.ts +6 -5
- package/dist/esm/utils/report.d.ts.map +1 -1
- package/dist/esm/utils/report.js +68 -24
- package/dist/esm/utils/schema.d.ts +3 -3
- package/dist/esm/utils/schema.d.ts.map +1 -1
- package/dist/esm/utils/schema.js +39 -35
- package/dist/esm/utils/tableProcessing.d.ts +17 -10
- package/dist/esm/utils/tableProcessing.d.ts.map +1 -1
- package/dist/esm/utils/tableProcessing.js +39 -20
- package/package.json +1 -1
|
@@ -245,15 +245,19 @@ export interface ChartBuilderProps {
|
|
|
245
245
|
hideDateRangeFilter?: boolean;
|
|
246
246
|
/** Initial unique values for the pivot modal restrictions */
|
|
247
247
|
initialUniqueValues?: any;
|
|
248
|
+
/** Whether the initial unique values are loading. */
|
|
249
|
+
initialUniqueValuesIsLoading?: boolean;
|
|
248
250
|
/** Whether the PivotModal's AI features are enabled. */
|
|
249
251
|
pivotRecommendationsEnabled?: boolean;
|
|
250
|
-
/** A callback function used
|
|
252
|
+
/** A callback function used when the table page is changed */
|
|
251
253
|
onPageChange?: (page: number) => void;
|
|
252
|
-
/** A callback function used
|
|
254
|
+
/** A callback function used when the table sort is changed */
|
|
253
255
|
onSortChange?: (sort: {
|
|
254
256
|
field: string;
|
|
255
257
|
direction: string;
|
|
256
258
|
}) => void;
|
|
259
|
+
/** A callback function used when the filter preview is toggled */
|
|
260
|
+
onFilterPreviewChange?: (preview: boolean) => void;
|
|
257
261
|
/** A number used to determine the number of pages in a table for SQL pagination */
|
|
258
262
|
rowCount?: number;
|
|
259
263
|
/** Loading prop used by the table component */
|
|
@@ -315,7 +319,7 @@ export declare function ChartBuilderWithModal(props: ChartBuilderProps): import(
|
|
|
315
319
|
* ### Chart Builder API
|
|
316
320
|
* @see https://docs.quillsql.com/components/chart-builder
|
|
317
321
|
*/
|
|
318
|
-
export default function ChartBuilder({ TextInputComponent, SelectComponent, ButtonComponent, SecondaryButtonComponent, HeaderComponent, SubHeaderComponent, LabelComponent, DeleteButtonComponent, TextComponent, PopoverComponent, CardComponent, TableComponent, ModalComponent, LoadingComponent, ErrorMessageComponent, ChartBuilderInputRowContainer, ChartBuilderInputColumnContainer, PivotRowContainer, PivotColumnContainer, FormContainer, ErrorComponent, onClickChartError, isOpen, isHorizontalView, pivot, setIsOpen, rows, columns, query, queryNoDateColumn, dateRange, showTableFormatOptions, showDateFieldOptions, showAccessControlOptions, isAdmin, showDashboardDropdown, onAddToDashboardComplete, onDelete, onDiscardChanges, report, recommendedPivots: rp, createdPivots: cp, destinationDashboard, dateColumn, buttonLabel, organizationName, pivotData, hideDeleteButton, hideSubmitButton, hideDateRangeFilter, initialUniqueValues, pivotRecommendationsEnabled, onSortChange, onPageChange, rowCount, isLoading, isComparison, onClickChartElement, isEditingMode, }: ChartBuilderProps): import("react/jsx-runtime").JSX.Element | null;
|
|
322
|
+
export default function ChartBuilder({ TextInputComponent, SelectComponent, ButtonComponent, SecondaryButtonComponent, HeaderComponent, SubHeaderComponent, LabelComponent, DeleteButtonComponent, TextComponent, PopoverComponent, CardComponent, TableComponent, ModalComponent, LoadingComponent, ErrorMessageComponent, ChartBuilderInputRowContainer, ChartBuilderInputColumnContainer, PivotRowContainer, PivotColumnContainer, FormContainer, ErrorComponent, onClickChartError, isOpen, isHorizontalView, pivot, setIsOpen, rows, columns, query, queryNoDateColumn, dateRange, showTableFormatOptions, showDateFieldOptions, showAccessControlOptions, isAdmin, showDashboardDropdown, onAddToDashboardComplete, onDelete, onDiscardChanges, report, recommendedPivots: rp, createdPivots: cp, destinationDashboard, dateColumn, buttonLabel, organizationName, pivotData, hideDeleteButton, hideSubmitButton, hideDateRangeFilter, initialUniqueValues, initialUniqueValuesIsLoading, pivotRecommendationsEnabled, onFilterPreviewChange, onSortChange, onPageChange, rowCount, isLoading, isComparison, onClickChartElement, isEditingMode, }: ChartBuilderProps): import("react/jsx-runtime").JSX.Element | null;
|
|
319
323
|
export declare function DashboardFilterModal({ isOpen, setIsOpen, issues, ModalComponent, ButtonComponent, }: {
|
|
320
324
|
isOpen: boolean;
|
|
321
325
|
setIsOpen: (e: boolean) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChartBuilder.d.ts","sourceRoot":"","sources":["../../src/ChartBuilder.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAOZ,SAAS,EACT,aAAa,EACd,MAAM,OAAO,CAAC;AAkBf,OAAO,EAmBL,uBAAuB,EACxB,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAM1D,OAAO,EAAe,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAanE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"ChartBuilder.d.ts","sourceRoot":"","sources":["../../src/ChartBuilder.tsx"],"names":[],"mappings":"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"}
|
package/dist/esm/ChartBuilder.js
CHANGED
|
@@ -17,6 +17,7 @@ import { getDateBucketFromRange } from './utils/dates';
|
|
|
17
17
|
import { validateReport } from './utils/validation';
|
|
18
18
|
import { QuillChartErrorWithAction } from './components/Chart/ChartError';
|
|
19
19
|
import { convertInternalReportToReport, saveReport } from './utils/report';
|
|
20
|
+
import AdjustmentsIcon from './assets/AdjustmentsIcon';
|
|
20
21
|
const CHART_TYPES = ['column', 'line', 'table', 'metric', 'bar', 'pie'];
|
|
21
22
|
const POSTGRES_DATE_TYPES = [
|
|
22
23
|
'timestamp',
|
|
@@ -288,7 +289,7 @@ export function ChartBuilderWithModal(props) {
|
|
|
288
289
|
* ### Chart Builder API
|
|
289
290
|
* @see https://docs.quillsql.com/components/chart-builder
|
|
290
291
|
*/
|
|
291
|
-
export default function ChartBuilder({ TextInputComponent = QuillTextInput, SelectComponent = QuillSelectComponent, ButtonComponent = MemoizedButton, SecondaryButtonComponent = MemoizedSecondaryButton, HeaderComponent = MemoizedHeader, SubHeaderComponent = MemoizedSubHeader, LabelComponent = MemoizedLabel, DeleteButtonComponent = MemoizedDeleteButton, TextComponent = MemoizedText, PopoverComponent = MemoizedPopover, CardComponent = QuillCard, TableComponent = QuillTableComponent, ModalComponent = MemoizedModal, LoadingComponent = QuillLoadingComponent, ErrorMessageComponent = QuillErrorMessageComponent, ChartBuilderInputRowContainer = QuillChartBuilderInputRowContainer, ChartBuilderInputColumnContainer = QuillChartBuilderInputColumnContainer, PivotRowContainer = QuillPivotRowContainer, PivotColumnContainer = QuillPivotColumnContainer, FormContainer = QuillChartBuilderFormContainer, ErrorComponent = QuillChartErrorWithAction, onClickChartError, isOpen, isHorizontalView = true, pivot, setIsOpen, rows = [], columns = [], query, queryNoDateColumn, dateRange, showTableFormatOptions = false, showDateFieldOptions = false, showAccessControlOptions = false, isAdmin = false, showDashboardDropdown = true, onAddToDashboardComplete, onDelete, onDiscardChanges, report = undefined, recommendedPivots: rp = [], createdPivots: cp = [], destinationDashboard, dateColumn, buttonLabel, organizationName, pivotData, hideDeleteButton = false, hideSubmitButton = false, hideDateRangeFilter = false, initialUniqueValues, pivotRecommendationsEnabled = true, onSortChange, onPageChange, rowCount, isLoading, isComparison, onClickChartElement, isEditingMode = false, }) {
|
|
292
|
+
export default function ChartBuilder({ TextInputComponent = QuillTextInput, SelectComponent = QuillSelectComponent, ButtonComponent = MemoizedButton, SecondaryButtonComponent = MemoizedSecondaryButton, HeaderComponent = MemoizedHeader, SubHeaderComponent = MemoizedSubHeader, LabelComponent = MemoizedLabel, DeleteButtonComponent = MemoizedDeleteButton, TextComponent = MemoizedText, PopoverComponent = MemoizedPopover, CardComponent = QuillCard, TableComponent = QuillTableComponent, ModalComponent = MemoizedModal, LoadingComponent = QuillLoadingComponent, ErrorMessageComponent = QuillErrorMessageComponent, ChartBuilderInputRowContainer = QuillChartBuilderInputRowContainer, ChartBuilderInputColumnContainer = QuillChartBuilderInputColumnContainer, PivotRowContainer = QuillPivotRowContainer, PivotColumnContainer = QuillPivotColumnContainer, FormContainer = QuillChartBuilderFormContainer, ErrorComponent = QuillChartErrorWithAction, onClickChartError, isOpen, isHorizontalView = true, pivot, setIsOpen, rows = [], columns = [], query, queryNoDateColumn, dateRange, showTableFormatOptions = false, showDateFieldOptions = false, showAccessControlOptions = false, isAdmin = false, showDashboardDropdown = true, onAddToDashboardComplete, onDelete, onDiscardChanges, report = undefined, recommendedPivots: rp = [], createdPivots: cp = [], destinationDashboard, dateColumn, buttonLabel, organizationName, pivotData, hideDeleteButton = false, hideSubmitButton = false, hideDateRangeFilter = false, initialUniqueValues, initialUniqueValuesIsLoading, pivotRecommendationsEnabled = true, onFilterPreviewChange, onSortChange, onPageChange, rowCount, isLoading, isComparison, onClickChartElement, isEditingMode = false, }) {
|
|
292
293
|
const [client] = useContext(ClientContext);
|
|
293
294
|
const [theme] = useContext(ThemeContext);
|
|
294
295
|
const [schemaData] = useContext(SchemaDataContext);
|
|
@@ -404,9 +405,10 @@ export default function ChartBuilder({ TextInputComponent = QuillTextInput, Sele
|
|
|
404
405
|
const [defaultDashboardName, setDefaultDashboardName] = useState(destinationDashboard || report?.dashboardName || '');
|
|
405
406
|
const { dashboardFilters } = useContext(DashboardFiltersContext);
|
|
406
407
|
const [dashboardConfig] = useContext(DashboardConfigContext);
|
|
408
|
+
const [filtersActive, setFiltersActive] = useState(true);
|
|
407
409
|
const specificDashboardFilter = useMemo(() => {
|
|
408
410
|
return dashboardFilters.filter((f) => f && defaultDashboardName === f.dashboardName);
|
|
409
|
-
}, [dashboardFilters]);
|
|
411
|
+
}, [dashboardFilters, filtersActive]);
|
|
410
412
|
const [showFilterModal, setShowFilterModal] = useState(false);
|
|
411
413
|
const [filterIssues, setFilterIssues] = useState([]);
|
|
412
414
|
const [showPivotPopover, setShowPivotPopover] = useState(false);
|
|
@@ -461,7 +463,7 @@ export default function ChartBuilder({ TextInputComponent = QuillTextInput, Sele
|
|
|
461
463
|
if (!client) {
|
|
462
464
|
return;
|
|
463
465
|
}
|
|
464
|
-
const { queryEndpoint, queryHeaders, publicKey,
|
|
466
|
+
const { queryEndpoint, queryHeaders, publicKey, organizationId, withCredentials, } = client;
|
|
465
467
|
if (queryEndpoint) {
|
|
466
468
|
const response = await fetch(queryEndpoint, {
|
|
467
469
|
method: 'POST',
|
|
@@ -471,7 +473,7 @@ export default function ChartBuilder({ TextInputComponent = QuillTextInput, Sele
|
|
|
471
473
|
},
|
|
472
474
|
body: JSON.stringify({
|
|
473
475
|
metadata: {
|
|
474
|
-
orgId:
|
|
476
|
+
orgId: organizationId || '*',
|
|
475
477
|
task: 'dashboard',
|
|
476
478
|
name: dashboardName,
|
|
477
479
|
clientId: publicKey,
|
|
@@ -542,6 +544,12 @@ export default function ChartBuilder({ TextInputComponent = QuillTextInput, Sele
|
|
|
542
544
|
};
|
|
543
545
|
const [formData, setFormData] = useState(formFormDataFromReport(report));
|
|
544
546
|
const invalidColumns = useMemo(() => {
|
|
547
|
+
if (!rows || !rows.length) {
|
|
548
|
+
return [];
|
|
549
|
+
}
|
|
550
|
+
if (pivot || pivotData) {
|
|
551
|
+
return [];
|
|
552
|
+
}
|
|
545
553
|
const columnsObservedInRows = rows[0] ? Object.keys(rows[0]) : [];
|
|
546
554
|
return columns.filter((col) => !columnsObservedInRows.includes(col.field));
|
|
547
555
|
}, [rows]);
|
|
@@ -616,7 +624,9 @@ export default function ChartBuilder({ TextInputComponent = QuillTextInput, Sele
|
|
|
616
624
|
break;
|
|
617
625
|
}
|
|
618
626
|
}
|
|
619
|
-
setCustomFieldTableRef(customFieldUsage &&
|
|
627
|
+
setCustomFieldTableRef(customFieldUsage &&
|
|
628
|
+
!!client.organizationId &&
|
|
629
|
+
client.organizationId !== '*');
|
|
620
630
|
const referencedColumns = result.referencedTablesAndColumns.reduce((acc, table) => {
|
|
621
631
|
acc[table.name] = table.columns.map((col) => col.field);
|
|
622
632
|
return acc;
|
|
@@ -653,7 +663,7 @@ export default function ChartBuilder({ TextInputComponent = QuillTextInput, Sele
|
|
|
653
663
|
const [selectedPivotTable, setSelectedPivotTable] = useState(pivotData || undefined);
|
|
654
664
|
const fetchPivotData = async (pivot, uniqueValues, overrideDateRange) => {
|
|
655
665
|
if (pivot && rows) {
|
|
656
|
-
const dateFilter = report
|
|
666
|
+
const dateFilter = report && filtersActive
|
|
657
667
|
? report.filtersApplied.find((filter) => {
|
|
658
668
|
return filter.filterType === 'date_range';
|
|
659
669
|
})
|
|
@@ -895,17 +905,17 @@ export default function ChartBuilder({ TextInputComponent = QuillTextInput, Sele
|
|
|
895
905
|
if (!report?.id || !client) {
|
|
896
906
|
return;
|
|
897
907
|
}
|
|
898
|
-
const { publicKey,
|
|
908
|
+
const { publicKey, organizationId } = client;
|
|
899
909
|
const cloudBody = {
|
|
900
910
|
dashboardItemId: report.id,
|
|
901
911
|
};
|
|
902
|
-
const searchParams = new URLSearchParams(
|
|
912
|
+
const searchParams = new URLSearchParams(organizationId
|
|
903
913
|
? {
|
|
904
914
|
clientId: publicKey,
|
|
905
|
-
customerId:
|
|
915
|
+
customerId: organizationId,
|
|
906
916
|
}
|
|
907
917
|
: { clientId: publicKey }).toString();
|
|
908
|
-
const resp = await getDataFromCloud(client, `deletedash/${publicKey}/${
|
|
918
|
+
const resp = await getDataFromCloud(client, `deletedash/${publicKey}/${organizationId}/?${searchParams}`, cloudBody);
|
|
909
919
|
if (resp) {
|
|
910
920
|
if (onDelete) {
|
|
911
921
|
onDelete();
|
|
@@ -980,7 +990,7 @@ export default function ChartBuilder({ TextInputComponent = QuillTextInput, Sele
|
|
|
980
990
|
onAddToDashboardComplete({
|
|
981
991
|
...resp,
|
|
982
992
|
rows,
|
|
983
|
-
columns,
|
|
993
|
+
columns: formData.columns.filter((col) => !invalidColumns.includes(col)),
|
|
984
994
|
filtersApplied: specificDashboardFilter,
|
|
985
995
|
});
|
|
986
996
|
}
|
|
@@ -1008,23 +1018,44 @@ export default function ChartBuilder({ TextInputComponent = QuillTextInput, Sele
|
|
|
1008
1018
|
}, children: [_jsxs("div", { style: {
|
|
1009
1019
|
display: 'flex',
|
|
1010
1020
|
flexDirection: 'column',
|
|
1011
|
-
gap:
|
|
1012
|
-
overflowY: '
|
|
1021
|
+
gap: isOpen ? 16 : 20,
|
|
1022
|
+
overflowY: 'visible',
|
|
1013
1023
|
height: isHorizontalView || !isOpen ? '100%' : 800,
|
|
1014
1024
|
...(isHorizontalView && {
|
|
1015
1025
|
flexGrow: 1,
|
|
1016
1026
|
maxWidth: !isOpen ? '100%' : `calc(100% - ${formWidth}px - 20px)`, // width of left sidebar plus gap
|
|
1017
1027
|
}),
|
|
1018
1028
|
...(!isHorizontalView && isOpen && { width: formWidth }),
|
|
1019
|
-
}, children: [
|
|
1029
|
+
}, children: [onFilterPreviewChange && (_jsxs("div", { className: "filters-active-toggle", style: {
|
|
1030
|
+
cursor: 'pointer',
|
|
1031
|
+
display: isOpen ? 'flex' : 'none',
|
|
1032
|
+
flexDirection: 'row',
|
|
1033
|
+
gap: 4,
|
|
1034
|
+
marginTop: -16,
|
|
1035
|
+
userSelect: 'none',
|
|
1036
|
+
}, onClick: () => {
|
|
1037
|
+
onFilterPreviewChange && onFilterPreviewChange(!filtersActive);
|
|
1038
|
+
setFiltersActive(!filtersActive);
|
|
1039
|
+
}, children: [_jsx(AdjustmentsIcon, { style: {
|
|
1040
|
+
color: filtersActive ? '#212121' : '#9e9e9e',
|
|
1041
|
+
height: 20,
|
|
1042
|
+
width: 20,
|
|
1043
|
+
}, strokeWidth: filtersActive ? 1.5 : 1 }), _jsx("div", { style: {
|
|
1044
|
+
color: filtersActive ? '#212121' : '#9e9e9e',
|
|
1045
|
+
fontSize: 14,
|
|
1046
|
+
fontWeight: 300,
|
|
1047
|
+
userSelect: 'none',
|
|
1048
|
+
}, children: filtersActive
|
|
1049
|
+
? 'Previewing with filters'
|
|
1050
|
+
: 'Previewing without filters' })] })), !isEditingMode && (report?.adminError || report?.error) ? (_jsx(ErrorComponent, { label: report.adminError || report.error, onClick: onClickChartError })) : (((!isHorizontalView && windowWidth >= 1200) ||
|
|
1020
1051
|
formData.chartType !== 'table') && (_jsx(ChartDisplay, { reportId: report ? report.id : undefined, config: createReportFromForm(formData, report, selectedPivotTable, rows), scrollable: true, colors: theme?.chartColors, loading: false, hideDateRangeFilter: hideDateRangeFilter, containerStyle: {
|
|
1021
1052
|
width: '100%',
|
|
1022
1053
|
height: formData.chartType === 'metric'
|
|
1023
1054
|
? 100
|
|
1024
1055
|
: isHorizontalView || !isOpen
|
|
1025
1056
|
? showTableFormatOptions
|
|
1026
|
-
?
|
|
1027
|
-
:
|
|
1057
|
+
? `calc(50% - ${isOpen && onFilterPreviewChange ? '30' : '10'}px)`
|
|
1058
|
+
: `calc(100% - ${isOpen && onFilterPreviewChange ? '30' : '10'}px)`
|
|
1028
1059
|
: 400,
|
|
1029
1060
|
...(isHorizontalView && { flexGrow: 1 }),
|
|
1030
1061
|
}, onClickChartElement: onClickChartElement }))),
|
|
@@ -1032,7 +1063,9 @@ export default function ChartBuilder({ TextInputComponent = QuillTextInput, Sele
|
|
|
1032
1063
|
showTableFormatOptions &&
|
|
1033
1064
|
(isHorizontalView || (!isOpen && windowWidth < 1200)) && (_jsx("div", { style: {
|
|
1034
1065
|
width: '100%',
|
|
1035
|
-
height: isHorizontalView || !isOpen
|
|
1066
|
+
height: isHorizontalView || !isOpen
|
|
1067
|
+
? `calc(50% - ${isOpen && onFilterPreviewChange ? '30' : '10'}px)`
|
|
1068
|
+
: 400,
|
|
1036
1069
|
flexGrow: 1,
|
|
1037
1070
|
}, children: formData.chartType !== 'table' ? (_jsx(TableComponent, { rows: formattedRows, columns: formData.columns, onPageChange: (page) => {
|
|
1038
1071
|
onPageChange && onPageChange(page);
|
|
@@ -1077,7 +1110,7 @@ export default function ChartBuilder({ TextInputComponent = QuillTextInput, Sele
|
|
|
1077
1110
|
// marginTop: 6,
|
|
1078
1111
|
display: 'flex',
|
|
1079
1112
|
flexDirection: 'column',
|
|
1080
|
-
}, children: _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: selectedTable, SelectComponent: SelectComponent, ButtonComponent: ButtonComponent, CardComponent: CardComponent, SecondaryButtonComponent: SecondaryButtonComponent, PopoverComponent: PopoverComponent, LabelComponent: LabelComponent, TextComponent: TextComponent, HeaderComponent: HeaderComponent, ErrorMessageComponent: ErrorMessageComponent, PivotRowContainer: PivotRowContainer, PivotColumnContainer: PivotColumnContainer, LoadingComponent: LoadingComponent, theme: theme, isOpen: showPivotPopover, setIsOpen: setShowPivotPopover, showUpdatePivot: isEdittingPivot, setShowUpdatePivot: setIsEdittingPivot, parentRef: parentRef, data: rows, columns: processedColumns, triggerButtonText: 'Add pivot +', selectedPivotIndex: selectedPivotIndex, setSelectedPivotIndex: setSelectedPivotIndex, removePivot: handleDeletePivot, selectPivot: handleAddPivot, dateRange: dateRange, selectPivotOnEdit: true, showTrigger: !formData.pivot, query: query, pivotCountRequest: 4, initialUniqueValues: initialUniqueValues, initialSelectedPivotTable: selectedPivotTable, pivotRecommendationsEnabled: pivotRecommendationsEnabled, report: report }) }), formData.pivot && selectedPivotTable && (_jsx("div", { children: _jsx("div", { style: { width: pivotCardWidth }, children: _jsx(PivotCard, { pivotTable: {
|
|
1113
|
+
}, children: _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: selectedTable, SelectComponent: SelectComponent, ButtonComponent: ButtonComponent, CardComponent: CardComponent, SecondaryButtonComponent: SecondaryButtonComponent, PopoverComponent: PopoverComponent, LabelComponent: LabelComponent, TextComponent: TextComponent, HeaderComponent: HeaderComponent, ErrorMessageComponent: ErrorMessageComponent, PivotRowContainer: PivotRowContainer, PivotColumnContainer: PivotColumnContainer, LoadingComponent: LoadingComponent, theme: theme, isOpen: showPivotPopover, setIsOpen: setShowPivotPopover, showUpdatePivot: isEdittingPivot, setShowUpdatePivot: setIsEdittingPivot, parentRef: parentRef, data: rows, columns: processedColumns, triggerButtonText: 'Add pivot +', selectedPivotIndex: selectedPivotIndex, setSelectedPivotIndex: setSelectedPivotIndex, removePivot: handleDeletePivot, selectPivot: handleAddPivot, dateRange: dateRange, selectPivotOnEdit: true, showTrigger: !formData.pivot, query: query, pivotCountRequest: 4, initialUniqueValues: initialUniqueValues, uniqueValuesIsLoading: initialUniqueValuesIsLoading, initialSelectedPivotTable: selectedPivotTable, pivotRecommendationsEnabled: pivotRecommendationsEnabled, report: report }) }), formData.pivot && selectedPivotTable && (_jsx("div", { children: _jsx("div", { style: { width: pivotCardWidth }, children: _jsx(PivotCard, { pivotTable: {
|
|
1081
1114
|
pivot: formData.pivot,
|
|
1082
1115
|
rows: selectedPivotTable?.rows,
|
|
1083
1116
|
columns: selectedPivotTable?.columns,
|
|
@@ -12,6 +12,8 @@ export interface ChartEditorProps {
|
|
|
12
12
|
reportId: string;
|
|
13
13
|
/** Whether the editor has administrative priveleges. */
|
|
14
14
|
isAdmin?: boolean;
|
|
15
|
+
/** Whether the dashboard is loading. */
|
|
16
|
+
isDashboardLoading?: boolean;
|
|
15
17
|
/** The title of the chart builder form. */
|
|
16
18
|
chartBuilderTitle?: string;
|
|
17
19
|
/** The button label for the chart builder. */
|
|
@@ -207,5 +209,5 @@ export interface ChartEditorProps {
|
|
|
207
209
|
* ### Chart Editor API
|
|
208
210
|
* @see https://docs.quillsql.com/components/chart-editor
|
|
209
211
|
*/
|
|
210
|
-
export default function ChartEditor({ isOpen, reportId, isAdmin, destinationDashboard, chartBuilderTitle, chartBuilderButtonLabel, onAddToDashboardComplete, organizationName, isHorizontalView, onDelete, setIsOpen, SelectComponent, TextInputComponent, ButtonComponent, SecondaryButtonComponent, HeaderComponent, SubHeaderComponent, LabelComponent, TextComponent, DeleteButtonComponent, ModalComponent, CardComponent, PopoverComponent, LoadingComponent, TableComponent, ChartBuilderInputRowContainer, ChartBuilderInputColumnContainer, PivotRowContainer, PivotColumnContainer, ErrorMessageComponent, ChartBuilderFormContainer, ErrorComponent, hideDeleteButton, hideSubmitButton, hideOrganizationDetails, onClickChartElement, onClickChartError, }: ChartEditorProps): import("react/jsx-runtime").JSX.Element;
|
|
212
|
+
export default function ChartEditor({ isOpen, reportId, isAdmin, isDashboardLoading, destinationDashboard, chartBuilderTitle, chartBuilderButtonLabel, onAddToDashboardComplete, organizationName, isHorizontalView, onDelete, setIsOpen, SelectComponent, TextInputComponent, ButtonComponent, SecondaryButtonComponent, HeaderComponent, SubHeaderComponent, LabelComponent, TextComponent, DeleteButtonComponent, ModalComponent, CardComponent, PopoverComponent, LoadingComponent, TableComponent, ChartBuilderInputRowContainer, ChartBuilderInputColumnContainer, PivotRowContainer, PivotColumnContainer, ErrorMessageComponent, ChartBuilderFormContainer, ErrorComponent, hideDeleteButton, hideSubmitButton, hideOrganizationDetails, onClickChartElement, onClickChartError, }: ChartEditorProps): import("react/jsx-runtime").JSX.Element;
|
|
211
213
|
//# sourceMappingURL=ChartEditor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChartEditor.d.ts","sourceRoot":"","sources":["../../src/ChartEditor.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EACZ,SAAS,EAMV,MAAM,OAAO,CAAC;AAoBf,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"ChartEditor.d.ts","sourceRoot":"","sources":["../../src/ChartEditor.tsx"],"names":[],"mappings":"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"}
|
package/dist/esm/ChartEditor.js
CHANGED
|
@@ -4,7 +4,7 @@ import ChartBuilder from './ChartBuilder';
|
|
|
4
4
|
import { DashboardContext, DashboardFiltersContext, ClientContext, SchemaDataContext, } from './Context';
|
|
5
5
|
import { MemoizedModal, QuillChartBuilderFormContainer, QuillChartBuilderInputColumnContainer, QuillChartBuilderInputRowContainer, QuillErrorMessageComponent, QuillLoadingComponent, QuillPivotColumnContainer, QuillPivotRowContainer, QuillTableComponent, } from './components/UiComponents';
|
|
6
6
|
import { QuillCard } from './components/QuillCard';
|
|
7
|
-
import {
|
|
7
|
+
import { fetchResultsByQuery, fetchResultsByReport, } from './utils/tableProcessing';
|
|
8
8
|
import { QuillChartErrorWithAction } from './components/Chart/ChartError';
|
|
9
9
|
import { fetchReport } from './utils/report';
|
|
10
10
|
import { shouldFetchMore, DEFAULT_PAGINATION, shouldSortInMemory, } from './utils/paginationProcessing';
|
|
@@ -34,7 +34,7 @@ import { shouldFetchMore, DEFAULT_PAGINATION, shouldSortInMemory, } from './util
|
|
|
34
34
|
* ### Chart Editor API
|
|
35
35
|
* @see https://docs.quillsql.com/components/chart-editor
|
|
36
36
|
*/
|
|
37
|
-
export default function ChartEditor({ isOpen, reportId, isAdmin = false, destinationDashboard, chartBuilderTitle = 'Edit chart', chartBuilderButtonLabel, onAddToDashboardComplete, organizationName, isHorizontalView = true, onDelete, setIsOpen, SelectComponent, TextInputComponent, ButtonComponent, SecondaryButtonComponent, HeaderComponent, SubHeaderComponent, LabelComponent, TextComponent, DeleteButtonComponent, ModalComponent = MemoizedModal, CardComponent = QuillCard, PopoverComponent, LoadingComponent = QuillLoadingComponent, TableComponent = QuillTableComponent, ChartBuilderInputRowContainer = QuillChartBuilderInputRowContainer, ChartBuilderInputColumnContainer = QuillChartBuilderInputColumnContainer, PivotRowContainer = QuillPivotRowContainer, PivotColumnContainer = QuillPivotColumnContainer, ErrorMessageComponent = QuillErrorMessageComponent, ChartBuilderFormContainer = QuillChartBuilderFormContainer, ErrorComponent = QuillChartErrorWithAction, hideDeleteButton = false, hideSubmitButton = false, hideOrganizationDetails = false, onClickChartElement, onClickChartError, }) {
|
|
37
|
+
export default function ChartEditor({ isOpen, reportId, isAdmin = false, isDashboardLoading, destinationDashboard, chartBuilderTitle = 'Edit chart', chartBuilderButtonLabel, onAddToDashboardComplete, organizationName, isHorizontalView = true, onDelete, setIsOpen, SelectComponent, TextInputComponent, ButtonComponent, SecondaryButtonComponent, HeaderComponent, SubHeaderComponent, LabelComponent, TextComponent, DeleteButtonComponent, ModalComponent = MemoizedModal, CardComponent = QuillCard, PopoverComponent, LoadingComponent = QuillLoadingComponent, TableComponent = QuillTableComponent, ChartBuilderInputRowContainer = QuillChartBuilderInputRowContainer, ChartBuilderInputColumnContainer = QuillChartBuilderInputColumnContainer, PivotRowContainer = QuillPivotRowContainer, PivotColumnContainer = QuillPivotColumnContainer, ErrorMessageComponent = QuillErrorMessageComponent, ChartBuilderFormContainer = QuillChartBuilderFormContainer, ErrorComponent = QuillChartErrorWithAction, hideDeleteButton = false, hideSubmitButton = false, hideOrganizationDetails = false, onClickChartElement, onClickChartError, }) {
|
|
38
38
|
const parentRef = useRef(null);
|
|
39
39
|
const [modalWidth, setModalWidth] = useState(200);
|
|
40
40
|
const [modalHeight, setModalHeight] = useState(200);
|
|
@@ -48,11 +48,19 @@ export default function ChartEditor({ isOpen, reportId, isAdmin = false, destina
|
|
|
48
48
|
return dashboardFilters.filter((f) => f && tempReport.dashboardName === f.dashboardName);
|
|
49
49
|
}, [dashboardFilters]);
|
|
50
50
|
const [client] = useContext(ClientContext);
|
|
51
|
-
const [
|
|
52
|
-
const
|
|
51
|
+
const [isChartLoading, setIsLoading] = useState(false);
|
|
52
|
+
const isLoading = isDashboardLoading || isChartLoading;
|
|
53
|
+
const [additionalProcessing, setAdditionalProcessing] = useState({
|
|
54
|
+
page: {
|
|
55
|
+
page: 0,
|
|
56
|
+
rowsPerPage: 10,
|
|
57
|
+
rowsPerRequest: 20,
|
|
58
|
+
},
|
|
59
|
+
});
|
|
53
60
|
const [rowCount, setRowCount] = useState(undefined);
|
|
54
61
|
const [maxPage, setMaxPage] = useState(0);
|
|
55
62
|
const [schemaData] = useContext(SchemaDataContext);
|
|
63
|
+
const [overrideRows, setOverrideRows] = useState(undefined);
|
|
56
64
|
const report = useMemo(() => {
|
|
57
65
|
return dashboard?.[reportId];
|
|
58
66
|
}, [dashboard, reportId]);
|
|
@@ -80,7 +88,11 @@ export default function ChartEditor({ isOpen, reportId, isAdmin = false, destina
|
|
|
80
88
|
}, []);
|
|
81
89
|
const onPageChange = (page) => {
|
|
82
90
|
if (additionalProcessing.page &&
|
|
83
|
-
shouldFetchMore(
|
|
91
|
+
shouldFetchMore({
|
|
92
|
+
page: 0,
|
|
93
|
+
rowsPerPage: 10,
|
|
94
|
+
rowsPerRequest: 20,
|
|
95
|
+
}, page, maxPage)) {
|
|
84
96
|
const newPagination = { ...additionalProcessing.page, page };
|
|
85
97
|
const updatedProcessing = {
|
|
86
98
|
...additionalProcessing,
|
|
@@ -102,6 +114,21 @@ export default function ChartEditor({ isOpen, reportId, isAdmin = false, destina
|
|
|
102
114
|
setAdditionalProcessing(updatedProcessing);
|
|
103
115
|
setMaxPage(0);
|
|
104
116
|
};
|
|
117
|
+
const handleRunQuery = async (processing, includeFilters = false) => {
|
|
118
|
+
if (!client || !report) {
|
|
119
|
+
return;
|
|
120
|
+
}
|
|
121
|
+
try {
|
|
122
|
+
setIsLoading(true);
|
|
123
|
+
const tableInfo = await fetchResultsByQuery(report?.queryString, client, processing, schemaData.customFields, includeFilters ? dashboardFilters : undefined, includeFilters ? report.dateField : undefined);
|
|
124
|
+
setOverrideRows(tableInfo.rows);
|
|
125
|
+
setRowCount(tableInfo.rowCount);
|
|
126
|
+
setIsLoading(false);
|
|
127
|
+
}
|
|
128
|
+
catch (e) {
|
|
129
|
+
console.log(e);
|
|
130
|
+
}
|
|
131
|
+
};
|
|
105
132
|
const updateTableRows = async (processing, resetRows = false) => {
|
|
106
133
|
if (!client) {
|
|
107
134
|
return;
|
|
@@ -110,7 +137,7 @@ export default function ChartEditor({ isOpen, reportId, isAdmin = false, destina
|
|
|
110
137
|
setIsLoading(true);
|
|
111
138
|
try {
|
|
112
139
|
const updatedProcessing = { ...additionalProcessing, ...processing };
|
|
113
|
-
const paginatedRows = await
|
|
140
|
+
const paginatedRows = await fetchResultsByReport(report.id, client, updatedProcessing, specificDashboardFilter, schemaData.customFields);
|
|
114
141
|
if (paginatedRows.error) {
|
|
115
142
|
throw new Error('Error fetching chart');
|
|
116
143
|
}
|
|
@@ -191,9 +218,17 @@ export default function ChartEditor({ isOpen, reportId, isAdmin = false, destina
|
|
|
191
218
|
return (_jsx("div", { ref: parentRef, style: { height: '100%' }, children: _jsx(ModalComponent, { isOpen: isOpen, setIsOpen: setIsOpen, title: chartBuilderTitle || 'Add to dashboard',
|
|
192
219
|
// For isHorizontalView, use full viewport size minus 80px for padding,
|
|
193
220
|
// otherwise use the default layout method of the modal (contents).
|
|
194
|
-
width: isHorizontalView ? modalWidth : undefined, height: isHorizontalView ? modalHeight : undefined, children: _jsx(ChartBuilder, { report: report, rows: report.rows, isAdmin: isAdmin, columns: report.columnInternal, query: report.queryString, pivot: report.pivot || undefined, isOpen: isOpen, isComparison: dateFilter?.comparisonRange, isLoading: isLoading, setIsOpen: setIsOpen, showTableFormatOptions: isAdmin, showDateFieldOptions: isAdmin, showAccessControlOptions: isAdmin && !hideOrganizationDetails, showDashboardDropdown: isAdmin, destinationDashboard: destinationDashboard, onAddToDashboardComplete: onAddToDashboardComplete, dateRange: dateRange, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, ButtonComponent: ButtonComponent, SecondaryButtonComponent: SecondaryButtonComponent, HeaderComponent: HeaderComponent, SubHeaderComponent: SubHeaderComponent, LabelComponent: LabelComponent, TextComponent: TextComponent, DeleteButtonComponent: DeleteButtonComponent, CardComponent: CardComponent, ModalComponent: ModalComponent, isHorizontalView: isHorizontalView, PopoverComponent: PopoverComponent, TableComponent: TableComponent, ChartBuilderInputRowContainer: ChartBuilderInputRowContainer, ChartBuilderInputColumnContainer: ChartBuilderInputColumnContainer, PivotRowContainer: PivotRowContainer, PivotColumnContainer: PivotColumnContainer, ErrorMessageComponent: ErrorMessageComponent, LoadingComponent: LoadingComponent, ErrorComponent: ErrorComponent, onClickChartError: onClickChartError, onDelete: onDelete, onDiscardChanges: () => {
|
|
221
|
+
width: isHorizontalView ? modalWidth : undefined, height: isHorizontalView ? modalHeight : undefined, children: _jsx(ChartBuilder, { report: report, rows: overrideRows ?? report.rows, isAdmin: isAdmin, columns: report.columnInternal, query: report.queryString, pivot: report.pivot || undefined, isOpen: isOpen, isComparison: dateFilter?.comparisonRange, isLoading: isLoading, setIsOpen: setIsOpen, showTableFormatOptions: isAdmin || report.chartType === 'table', showDateFieldOptions: isAdmin, showAccessControlOptions: isAdmin && !hideOrganizationDetails, showDashboardDropdown: isAdmin, destinationDashboard: destinationDashboard, onAddToDashboardComplete: onAddToDashboardComplete, dateRange: dateRange, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, ButtonComponent: ButtonComponent, SecondaryButtonComponent: SecondaryButtonComponent, HeaderComponent: HeaderComponent, SubHeaderComponent: SubHeaderComponent, LabelComponent: LabelComponent, TextComponent: TextComponent, DeleteButtonComponent: DeleteButtonComponent, CardComponent: CardComponent, ModalComponent: ModalComponent, isHorizontalView: isHorizontalView, PopoverComponent: PopoverComponent, TableComponent: TableComponent, ChartBuilderInputRowContainer: ChartBuilderInputRowContainer, ChartBuilderInputColumnContainer: ChartBuilderInputColumnContainer, PivotRowContainer: PivotRowContainer, PivotColumnContainer: PivotColumnContainer, ErrorMessageComponent: ErrorMessageComponent, LoadingComponent: LoadingComponent, ErrorComponent: ErrorComponent, onClickChartError: onClickChartError, onDelete: onDelete, onDiscardChanges: () => {
|
|
195
222
|
setChartBuilderKey(chartBuilderKey + 1);
|
|
196
|
-
|
|
223
|
+
setOverrideRows(undefined);
|
|
224
|
+
}, title: chartBuilderTitle, buttonLabel: chartBuilderButtonLabel, organizationName: organizationName, hideSubmitButton: hideSubmitButton, hideDeleteButton: hideDeleteButton, FormContainer: ChartBuilderFormContainer, onPageChange: onPageChange, onSortChange: onSortChange, onFilterPreviewChange: (preview) => {
|
|
225
|
+
if (!preview) {
|
|
226
|
+
handleRunQuery({ page: DEFAULT_PAGINATION }, false);
|
|
227
|
+
}
|
|
228
|
+
else {
|
|
229
|
+
setOverrideRows(undefined);
|
|
230
|
+
}
|
|
231
|
+
}, rowCount: rowCount, onClickChartElement: onClickChartElement, pivotData: report.pivotColumns
|
|
197
232
|
? {
|
|
198
233
|
rows: report.pivotRows || [],
|
|
199
234
|
columns: report.pivotColumns,
|
package/dist/esm/Context.d.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { QuillReportInternal } from './models/Report';
|
|
3
|
-
import {
|
|
3
|
+
import { QuillProviderClient } from './models/Client';
|
|
4
4
|
import { QuillTheme } from './QuillProvider';
|
|
5
5
|
import { DashboardConfig } from './models/Dashboard';
|
|
6
6
|
import { SchemaData } from './models/Schema';
|
|
7
7
|
export declare const SchemaDataContext: React.Context<[SchemaData, (value: React.SetStateAction<SchemaData>) => void]>;
|
|
8
8
|
export declare const ThemeContext: React.Context<[QuillTheme | null, (value: React.SetStateAction<QuillTheme | null>) => void]>;
|
|
9
|
-
export declare const ClientContext: React.Context<[
|
|
9
|
+
export declare const ClientContext: React.Context<[QuillProviderClient | null, boolean, (value: React.SetStateAction<QuillProviderClient>) => void]>;
|
|
10
10
|
export declare const DashboardFiltersContext: React.Context<any>;
|
|
11
11
|
export declare const ReportFiltersContext: React.Context<any>;
|
|
12
12
|
export declare const DashboardContext: React.Context<[{
|
|
@@ -15,12 +15,11 @@ export declare const DashboardContext: React.Context<[{
|
|
|
15
15
|
export declare const DashboardConfigContext: React.Context<[{
|
|
16
16
|
[key: string]: DashboardConfig;
|
|
17
17
|
}, any]>;
|
|
18
|
-
export declare const ContextProvider: ({ children, initialTheme, publicKey,
|
|
18
|
+
export declare const ContextProvider: ({ children, initialTheme, publicKey, organizationId, queryEndpoint, queryHeaders, withCredentials, }: {
|
|
19
19
|
children: React.ReactNode;
|
|
20
20
|
initialTheme: QuillTheme;
|
|
21
21
|
publicKey: string;
|
|
22
|
-
|
|
23
|
-
userId?: string | undefined;
|
|
22
|
+
organizationId?: string | undefined;
|
|
24
23
|
queryEndpoint: string;
|
|
25
24
|
queryHeaders?: HeadersInit | undefined;
|
|
26
25
|
withCredentials?: boolean | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../src/Context.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyD,MAAM,OAAO,CAAC;AAE9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../src/Context.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyD,MAAM,OAAO,CAAC;AAE9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAI7C,eAAO,MAAM,iBAAiB,qCACP,MAAM,cAAc,CAAC,UAAU,CAAC,KAAK,IAAI,EAQ9D,CAAC;AACH,eAAO,MAAM,YAAY,4CACK,MAAM,cAAc,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,IAAI,EACxD,CAAC;AACvB,eAAO,MAAM,aAAa,8DAId,MAAM,cAAc,CAAC,mBAAmB,CAAC,KAAK,IAAI,EAEjC,CAAC;AAC9B,eAAO,MAAM,uBAAuB,oBAAwC,CAAC;AAC7E,eAAO,MAAM,oBAAoB,oBAAwC,CAAC;AAmC1E,eAAO,MAAM,gBAAgB;;QAEJ,CAAC;AAsC1B,eAAO,MAAM,sBAAsB;;QAEJ,CAAC;AAyChC,eAAO,MAAM,eAAe;cAShB,MAAM,SAAS;kBACX,UAAU;eACb,MAAM;;mBAEF,MAAM;;;oDAmNtB,CAAC"}
|
package/dist/esm/Context.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
2
|
import { useState, createContext, useEffect, useReducer } from 'react';
|
|
3
3
|
import { getSchemaInfoWithCustomFields } from './utils/schema';
|
|
4
|
-
import {
|
|
4
|
+
import { fetchClient } from './utils/client';
|
|
5
5
|
const dummySetter = () => { };
|
|
6
6
|
export const SchemaDataContext = createContext([
|
|
7
7
|
{
|
|
@@ -12,12 +12,12 @@ export const SchemaDataContext = createContext([
|
|
|
12
12
|
dummySetter,
|
|
13
13
|
]);
|
|
14
14
|
export const ThemeContext = createContext([null, dummySetter]);
|
|
15
|
-
export const ClientContext = createContext([
|
|
15
|
+
export const ClientContext = createContext([null, false, dummySetter]);
|
|
16
16
|
export const DashboardFiltersContext = createContext([[], dummySetter]);
|
|
17
17
|
export const ReportFiltersContext = createContext([{}, dummySetter]);
|
|
18
18
|
const dashboardReducer = (state = {}, action) => {
|
|
19
19
|
switch (action.type) {
|
|
20
|
-
//NOTE: Because update dashboard item doesn't overwrite the previous data, it can leave stale properties when it should be removing them
|
|
20
|
+
// NOTE: Because update dashboard item doesn't overwrite the previous data, it can leave stale properties when it should be removing them
|
|
21
21
|
// We either want to make sure we're using null instead of undefined, or use ADD_DASHBOARD_ITEM more often.
|
|
22
22
|
case 'UPDATE_DASHBOARD_ITEM':
|
|
23
23
|
if (!action.id || !action.data) {
|
|
@@ -111,11 +111,10 @@ const dashboardFiltersReducer = (state, action) => {
|
|
|
111
111
|
return state;
|
|
112
112
|
}
|
|
113
113
|
};
|
|
114
|
-
export const ContextProvider = ({ children, initialTheme, publicKey,
|
|
114
|
+
export const ContextProvider = ({ children, initialTheme, publicKey, organizationId, queryEndpoint, queryHeaders, withCredentials, }) => {
|
|
115
115
|
const [client, setClient] = useState({
|
|
116
116
|
name: '',
|
|
117
|
-
|
|
118
|
-
userId,
|
|
117
|
+
organizationId: organizationId ?? '*',
|
|
119
118
|
publicKey,
|
|
120
119
|
queryEndpoint,
|
|
121
120
|
queryHeaders,
|
|
@@ -156,8 +155,7 @@ export const ContextProvider = ({ children, initialTheme, publicKey, customerId,
|
|
|
156
155
|
useEffect(() => {
|
|
157
156
|
const initialClient = {
|
|
158
157
|
name: '',
|
|
159
|
-
|
|
160
|
-
userId,
|
|
158
|
+
organizationId: organizationId ?? '*',
|
|
161
159
|
publicKey,
|
|
162
160
|
queryEndpoint,
|
|
163
161
|
queryHeaders,
|
|
@@ -181,32 +179,22 @@ export const ContextProvider = ({ children, initialTheme, publicKey, customerId,
|
|
|
181
179
|
useEffect(() => {
|
|
182
180
|
async function fetchDatabaseType(publicKey) {
|
|
183
181
|
const newClient = await fetchClient(publicKey, queryEndpoint, withCredentials, queryHeaders);
|
|
184
|
-
if (
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
setClient({
|
|
188
|
-
...client,
|
|
189
|
-
...newClient2,
|
|
190
|
-
databaseType: newClient2.databaseType,
|
|
191
|
-
publicKey: publicKey,
|
|
192
|
-
});
|
|
193
|
-
}
|
|
194
|
-
else {
|
|
195
|
-
setClient({
|
|
196
|
-
...client,
|
|
197
|
-
...newClient,
|
|
198
|
-
publicKey: publicKey,
|
|
199
|
-
});
|
|
200
|
-
}
|
|
201
|
-
}
|
|
202
|
-
else {
|
|
203
|
-
setClient({
|
|
204
|
-
...newClient,
|
|
205
|
-
queryEndpoint: queryEndpoint,
|
|
206
|
-
withCredentials: withCredentials || false,
|
|
207
|
-
publicKey: publicKey,
|
|
208
|
-
});
|
|
182
|
+
if (!newClient.adminCustomerId && !newClient.multiTenancyDisabled) {
|
|
183
|
+
console.error('Default organization not found. Please select a default organization for this environment');
|
|
184
|
+
return;
|
|
209
185
|
}
|
|
186
|
+
setClient({
|
|
187
|
+
...client,
|
|
188
|
+
multiTenancyDisabled: newClient.multiTenancyDisabled ? true : false,
|
|
189
|
+
databaseType: newClient.databaseType,
|
|
190
|
+
name: newClient.name,
|
|
191
|
+
clientId: publicKey,
|
|
192
|
+
publicKey: publicKey,
|
|
193
|
+
organizationId: newClient.multiTenancyDisabled
|
|
194
|
+
? '*'
|
|
195
|
+
: newClient.adminCustomerId,
|
|
196
|
+
recommendedPivotsDisabled: newClient.recommendedPivotsDisabled,
|
|
197
|
+
});
|
|
210
198
|
}
|
|
211
199
|
async function fetchDashboards(publicKey) {
|
|
212
200
|
if (!publicKey) {
|
|
@@ -262,12 +250,12 @@ export const ContextProvider = ({ children, initialTheme, publicKey, customerId,
|
|
|
262
250
|
}, [client]);
|
|
263
251
|
useEffect(() => {
|
|
264
252
|
if (client) {
|
|
265
|
-
setClient({ ...client,
|
|
253
|
+
setClient({ ...client, organizationId: organizationId ?? '*' });
|
|
266
254
|
}
|
|
267
255
|
if (Object.keys(dashboard).length > 0) {
|
|
268
256
|
dispatch({ type: 'CLEAR_DASHBOARD' });
|
|
269
257
|
}
|
|
270
|
-
}, [
|
|
258
|
+
}, [organizationId]);
|
|
271
259
|
if (!theme) {
|
|
272
260
|
return null;
|
|
273
261
|
}
|
package/dist/esm/Dashboard.d.ts
CHANGED
|
@@ -57,13 +57,14 @@ export interface DashboardProps {
|
|
|
57
57
|
onClickChartElement?: (data: any) => void;
|
|
58
58
|
}) => JSX.Element;
|
|
59
59
|
/** A component that wraps a dashboard item for 'table' chart types. */
|
|
60
|
-
TableComponent?: ({ report, onClick, hoverActions, isLoading, error, rowCount, onPageChange, onSortChange, }: {
|
|
60
|
+
TableComponent?: ({ report, onClick, hoverActions, isLoading, error, rowCount, rowCountIsLoading, onPageChange, onSortChange, }: {
|
|
61
61
|
report: QuillReport;
|
|
62
62
|
onClick?: (report: QuillReport) => void;
|
|
63
63
|
hoverActions?: (report: QuillReport) => JSX.Element;
|
|
64
64
|
isLoading?: boolean;
|
|
65
65
|
error?: string;
|
|
66
66
|
rowCount?: number;
|
|
67
|
+
rowCountIsLoading?: boolean;
|
|
67
68
|
onPageChange?: (page: number) => void;
|
|
68
69
|
onSortChange?: (sort: {
|
|
69
70
|
field: string;
|
|
@@ -102,7 +103,7 @@ export interface DashboardProps {
|
|
|
102
103
|
}) => JSX.Element;
|
|
103
104
|
/** A select component. */
|
|
104
105
|
SelectComponent?: ({ label, value, options, onChange, width, }: {
|
|
105
|
-
value: string;
|
|
106
|
+
value: string | null | undefined;
|
|
106
107
|
width: number;
|
|
107
108
|
label?: string;
|
|
108
109
|
options: {
|
|
@@ -113,7 +114,7 @@ export interface DashboardProps {
|
|
|
113
114
|
}) => JSX.Element;
|
|
114
115
|
/** A multiselect component. */
|
|
115
116
|
MultiSelectComponent?: ({ label, value, options, onChange, width, }: {
|
|
116
|
-
value: string[];
|
|
117
|
+
value: (string | null)[];
|
|
117
118
|
width: number;
|
|
118
119
|
label?: string;
|
|
119
120
|
options: {
|