@quillsql/react 2.11.16 → 2.11.17

package/dist/esm/components/ReportBuilder/convert.js

@@ -1,5 +1,5 @@
 import { extractColumnish, isSelect, isLogicalBinaryExpr, isBigQuery, isNumericColumnType, } from './ast';
-import { generateColumnExpr, isColumnDateish } from './util';
+import { generateColumnExpr, isColumnDateish, isIdColumn } from './util';
 // Helper functions that preprocess the AST.
 // Find and replace certain pre-set date comparison queries with their
 // more stable counterparts.
@@ -175,6 +175,9 @@ export function convertGroupBy(ast, prevPivot = null, schemaTables) {
                 }
                 if (column.expr.type === 'aggr_func' && !isIdColumn(columnName)) {
                     pivot.aggregationType = column.expr.name.toLowerCase();
+                    if (pivot.aggregationType === 'avg') {
+                        pivot.aggregationType = 'average';
+                    }
                     pivot.valueField =
                         column.expr.args?.expr?.value || column.expr.args?.expr?.column;
                     if (column.expr.args.expr.type === 'column_ref') {
@@ -190,15 +193,23 @@ export function convertGroupBy(ast, prevPivot = null, schemaTables) {
                 }
             }
             if (columnName === '*') {
-                // TODO: make valueField be a number
+                // Use the first numeric column found, if none found, use the first column
+                let columnForValueField = columns.find((c) => {
+                    return isNumericColumnType(c.fieldType) && !isIdColumn(c.field);
+                });
+                if (!columnForValueField) {
+                    columnForValueField = columns[0];
+                }
                 for (let i = 0; i < columns.length; i++) {
                     if (!isIdColumn(columns[i]?.field) &&
                         isNumericColumnType(columns[i]?.fieldType)) {
-                        pivot.valueField = columns[i].field;
-                        columnName = columns[i].field;
+                        columnForValueField = columns[i];
                         break;
                     }
                 }
+                pivot.valueField = columnForValueField.field;
+                pivot.valueFieldType = 'number';
+                columnName = columnForValueField.field;
             }
             newColumns.push({
                 type: 'expr',
@@ -230,6 +241,9 @@ export function convertGroupBy(ast, prevPivot = null, schemaTables) {
                 if (!isIdColumn(columnName)) {
                     pivot.valueField = columnName;
                     pivot.aggregationType = column?.expr?.name?.toLowerCase();
+                    if (pivot.aggregationType === 'avg') {
+                        pivot.aggregationType = 'average';
+                    }
                 }
                 const findByName = (x) => [x.expr?.value, x.expr?.column].includes(columnName);
                 if (!newColumns.find(findByName)) {
@@ -276,19 +290,27 @@ export function convertGroupBy(ast, prevPivot = null, schemaTables) {
                 const columnName = columnNode?.value || columnNode?.column;
                 // if count(*), make the value field an actual column
                 if (columnName === '*') {
-                    const numericColumn = columns.find((c) => {
+                    let columnForValueField = columns.find((c) => {
                         return isNumericColumnType(c.fieldType) && !isIdColumn(c.field);
                     });
-                    pivot.valueField = numericColumn?.field;
+                    // if there aren't any numeric columns use the first column
+                    if (!column) {
+                        columnForValueField = columns[0];
+                    }
+                    pivot.valueField = columnForValueField?.field;
+                    pivot.valueFieldType = 'number';
                     pivot.aggregationType = column?.expr?.name.toLowerCase();
-                    const findByName = (x) => [x.expr?.value, x.expr?.column].includes(numericColumn.field);
+                    if (pivot.aggregationType === 'avg') {
+                        pivot.aggregationType = 'average';
+                    }
+                    const findByName = (x) => [x.expr?.value, x.expr?.column].includes(columnForValueField.field);
                     if (!newColumns.find(findByName)) {
                         newColumns.push({
                             type: 'expr',
                             expr: {
                                 type: 'column_ref',
                                 table: null,
-                                column: numericColumn?.field || '',
+                                column: columnForValueField?.field || '',
                             },
                             as: null,
                         });
@@ -300,6 +322,9 @@ export function convertGroupBy(ast, prevPivot = null, schemaTables) {
                         !isIdColumn(columnName)) {
                         pivot.valueField = columnName;
                         pivot.aggregationType = column?.expr?.name.toLowerCase();
+                        if (pivot.aggregationType === 'avg') {
+                            pivot.aggregationType = 'average';
+                        }
                     }
                     const findByName = (x) => [x.expr?.value, x.expr?.column].includes(columnName);
                     if (!newColumns.find(findByName)) {
@@ -771,8 +796,3 @@ export function convertRemoveSimpleParentheses(ast) {
     }
     return { ...ast, where: node };
 }
-function isIdColumn(columnName) {
-    return (columnName &&
-        (columnName.toLowerCase() === 'id' ||
-            columnName.toLowerCase().endsWith('_id')));
-}

package/dist/esm/components/ReportBuilder/pivot.d.ts

@@ -2,8 +2,9 @@
  * Represents the metadata of a pivot table.
  */
 export type Pivot = {
-    aggregationType: 'sum' | 'average' | 'min' | 'max' | 'count';
+    aggregationType: 'sum' | 'average' | 'min' | 'max' | 'count' | 'avg';
     valueField: string;
+    valueFieldType?: string;
     rowField?: string;
     rowFieldType?: string;
     columnField?: string;

package/dist/esm/components/ReportBuilder/pivot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pivot.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/pivot.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,MAAM,KAAK,GAAG;IAClB,eAAe,EAAE,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,KAAK,GAAG,OAAO,CAAC;IAC7D,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,OAAO,CAAC;IACd,aAAa,EAAE,KAAK,GAAG,MAAM,CAAC;CAC/B,GAAG,IAAI,CAAC"}
+{"version":3,"file":"pivot.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/pivot.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,MAAM,KAAK,GAAG;IAClB,eAAe,EAAE,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,KAAK,GAAG,OAAO,GAAG,KAAK,CAAC;IACrE,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,OAAO,CAAC;IACd,aAAa,EAAE,KAAK,GAAG,MAAM,CAAC;CAC/B,GAAG,IAAI,CAAC"}

package/dist/esm/components/ReportBuilder/ui.d.ts

@@ -1,4 +1,5 @@
-/// <reference types="react" />
+import { ReactNode } from 'react';
+import { SidebarComponentProps, ContainerComponentProps } from '../UiComponents';
 /**
  * This file is a collection of basic UI components that conform to the shape
  * expected by the Report Builder. Where possible, we use our existing
@@ -9,26 +10,90 @@ export declare const QuillButton: ({ children, ...props }: any) => import("react
 export declare const QuillSecondaryButton: ({ children, ...props }: any) => import("react/jsx-runtime").JSX.Element;
 export declare const QuillReportBuilderTable: ({ rows, columns, error, ...props }: any) => import("react/jsx-runtime").JSX.Element;
 export declare const QuillTag: import("react").ForwardRefExoticComponent<Omit<any, "ref"> & import("react").RefAttributes<unknown>>;
-export declare const QuillSidebarHeading: ({ label }: any) => import("react/jsx-runtime").JSX.Element;
-export declare const QuillSidebarSubHeading: ({ label }: any) => import("react/jsx-runtime").JSX.Element;
-export declare const QuillSidebar: import("react").ForwardRefExoticComponent<Omit<any, "ref"> & import("react").RefAttributes<unknown>>;
-export declare const CustomContainer: import("react").ForwardRefExoticComponent<Omit<any, "ref"> & import("react").RefAttributes<unknown>>;
-export declare const QuillSelect: ({ onChange, ...props }: any) => import("react/jsx-runtime").JSX.Element;
-export declare function MemoizedPopover({ onClose, children, style, trigger, isOpen, }: any): import("react/jsx-runtime").JSX.Element;
-export declare const QuillPopover: import("react").ForwardRefExoticComponent<Omit<any, "ref"> & import("react").RefAttributes<unknown>>;
+export interface SidebarHeadingComponentProps {
+    label: string;
+}
+export declare const QuillSidebarHeading: ({ label, }: SidebarHeadingComponentProps) => import("react/jsx-runtime").JSX.Element;
+export declare const QuillSidebar: ({ children }: SidebarComponentProps) => import("react/jsx-runtime").JSX.Element;
+export declare const CustomContainer: ({ children }: ContainerComponentProps) => import("react/jsx-runtime").JSX.Element;
 export declare const QuillHandleButton: () => import("react/jsx-runtime").JSX.Element;
-export declare const QuillSelectColumn: ({ label, selected, setSelected, children, }: any) => import("react/jsx-runtime").JSX.Element;
-export declare const QuillDraggableColumn: ({ label, children, onDelete }: any) => import("react/jsx-runtime").JSX.Element;
+export interface SelectColumnComponentProps {
+    label: string;
+    isSelected: boolean;
+    setSelected: () => void;
+    DragHandle: ({ dragIcon }: {
+        dragIcon: () => JSX.Element;
+    }) => JSX.Element;
+}
+export declare const QuillSelectColumn: ({ label, isSelected, setSelected, DragHandle, }: SelectColumnComponentProps) => import("react/jsx-runtime").JSX.Element;
+/**
+ * Props for a draggable card with a grab-handle and a column name.
+ */
+export interface DraggableColumnComponentProps {
+    label: string;
+    onDelete: () => void;
+    DragHandle: ({ dragIcon }: {
+        dragIcon: () => JSX.Element;
+    }) => JSX.Element;
+}
+/**
+ * A draggable card with a grab-handle and a column name
+ */
+export declare const QuillDraggableColumn: ({ label, onDelete, DragHandle, }: DraggableColumnComponentProps) => import("react/jsx-runtime").JSX.Element;
 export declare const QuillButtonLoadingState: () => import("react/jsx-runtime").JSX.Element;
 export declare const QuillTableLoadingState: () => import("react/jsx-runtime").JSX.Element;
-export declare const DEFAULT_TAB_OPTIONS: {
-    label: string;
-    value: string;
-}[];
-export declare const QuillTabs: import("react").ForwardRefExoticComponent<Omit<any, "ref"> & import("react").RefAttributes<unknown>>;
 export declare const EditPopover: ({ onSave, onDelete, Button, renderNode, activeEditItem, }: any) => import("react/jsx-runtime").JSX.Element;
-export declare const QuillFilterPopover: ({ filterLabel, onClickDeleteFilter, popoverTitle, popoverChildren, isOpen, setIsOpen, }: any) => import("react/jsx-runtime").JSX.Element;
-export declare const QuillSortPopover: ({ filterLabel, onClickDelete, popoverTitle, popoverChildren, isOpen, setIsOpen, }: any) => import("react/jsx-runtime").JSX.Element;
-export declare const TagWrapper: ({ isCard, isRow, editPopoverKey, keyPrefix, formData, activeEditItem, setEditPopoverKey, setActiveEditItem, setActivePath, setOpenPopover, setIsPending, clearCheckboxes, fetchSqlQuery, handleDelete, setCheckboxes, handleReplaceSubtree, FilterPopover, getByKey, EditPopover, Button, renderNode, children, }: any) => import("react/jsx-runtime").JSX.Element;
+export interface FilterPopoverComponentProps {
+    isOpen: boolean;
+    setIsOpen: (isOpen: boolean) => void;
+    popoverTitle?: string;
+    popoverChildren: ReactNode;
+    filterLabel: string;
+    onClickDelete: (e: React.MouseEvent<HTMLElement>) => void;
+}
+export declare const QuillFilterPopover: ({ filterLabel, onClickDelete, popoverTitle, popoverChildren, isOpen, setIsOpen, }: FilterPopoverComponentProps) => import("react/jsx-runtime").JSX.Element;
+export interface SortPopoverComponentProps {
+    isOpen: boolean;
+    setIsOpen: (isOpen: boolean) => void;
+    popoverTitle?: string;
+    popoverChildren: ReactNode;
+    sortLabel: string;
+    onClickDelete: (e: React.MouseEvent<HTMLElement>) => void;
+}
+export declare const QuillSortPopover: ({ sortLabel, onClickDelete, popoverTitle, popoverChildren, isOpen, setIsOpen, }: SortPopoverComponentProps) => import("react/jsx-runtime").JSX.Element;
+export interface LimitPopoverComponentProps {
+    isOpen: boolean;
+    setIsOpen: (isOpen: boolean) => void;
+    popoverTitle?: string;
+    popoverChildren: ReactNode;
+    limitLabel: string;
+    onClickDelete: (e: React.MouseEvent<HTMLElement>) => void;
+}
+export declare const QuillLimitPopover: ({ limitLabel, onClickDelete, popoverTitle, popoverChildren, isOpen, setIsOpen, }: LimitPopoverComponentProps) => import("react/jsx-runtime").JSX.Element;
+export interface TagWrapperProps {
+    isCard: boolean;
+    isRow: boolean;
+    editPopoverKey: string;
+    keyPrefix: string;
+    formData: any;
+    activeEditItem: any;
+    setEditPopoverKey: any;
+    setActiveEditItem: any;
+    setActivePath: any;
+    setOpenPopover: any;
+    setIsPending: any;
+    clearCheckboxes: any;
+    fetchSqlQuery: any;
+    handleDelete: any;
+    setCheckboxes: any;
+    handleReplaceSubtree: any;
+    FilterPopover: (props: FilterPopoverComponentProps) => JSX.Element;
+    getByKey: any;
+    EditPopover: any;
+    Button: any;
+    renderNode: any;
+    children: any;
+}
+export declare const TagWrapper: ({ isCard, isRow, editPopoverKey, keyPrefix, formData, activeEditItem, setEditPopoverKey, setActiveEditItem, setActivePath, setOpenPopover, setIsPending, clearCheckboxes, fetchSqlQuery, handleDelete, setCheckboxes, handleReplaceSubtree, FilterPopover, getByKey, EditPopover, Button, renderNode, children, }: TagWrapperProps) => import("react/jsx-runtime").JSX.Element;
 export declare const AddFilterPopover: ({ onSave, Button, renderNode, activeEditItem, }: any) => import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=ui.d.ts.map

package/dist/esm/components/ReportBuilder/ui.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/ui.tsx"],"names":[],"mappings":";AAiBA;;;;;GAKG;AAEH,eAAO,MAAM,WAAW,2BAA4B,GAAG,4CA2BtD,CAAC;AAEF,eAAO,MAAM,oBAAoB,2BAA4B,GAAG,4CA2B/D,CAAC;AAEF,eAAO,MAAM,uBAAuB,uCAKjC,GAAG,4CAiBL,CAAC;AAEF,eAAO,MAAM,QAAQ,sGAoFpB,CAAC;AAGF,eAAO,MAAM,mBAAmB,cAAe,GAAG,4CAEjD,CAAC;AAGF,eAAO,MAAM,sBAAsB,cAAe,GAAG,4CAEpD,CAAC;AAGF,eAAO,MAAM,YAAY,sGAiBxB,CAAC;AAGF,eAAO,MAAM,eAAe,sGAuB3B,CAAC;AAEF,eAAO,MAAM,WAAW,2BAA4B,GAAG,4CAUtD,CAAC;AAEF,wBAAgB,eAAe,CAAC,EAC9B,OAAO,EACP,QAAQ,EACR,KAAU,EACV,OAAO,EACP,MAAM,GACP,EAAE,GAAG,2CAgDL;AAED,eAAO,MAAM,YAAY,sGAkCxB,CAAC;AAGF,eAAO,MAAM,iBAAiB,+CAwE7B,CAAC;AAEF,eAAO,MAAM,iBAAiB,gDAK3B,GAAG,4CA6CL,CAAC;AAGF,eAAO,MAAM,oBAAoB,kCAAmC,GAAG,4CAiDtE,CAAC;AAGF,eAAO,MAAM,uBAAuB,+CAMnC,CAAC;AAGF,eAAO,MAAM,sBAAsB,+CAMlC,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;GAG/B,CAAC;AAEF,eAAO,MAAM,SAAS,sGAIrB,CAAC;AAEF,eAAO,MAAM,WAAW,8DAMrB,GAAG,4CA+BL,CAAC;AAEF,eAAO,MAAM,kBAAkB,4FAO5B,GAAG,4CAqBL,CAAC;AAEF,eAAO,MAAM,gBAAgB,sFAO1B,GAAG,4CAqBL,CAAC;AAEF,eAAO,MAAM,UAAU,sTAuBpB,GAAG,4CAqFL,CAAC;AAEF,eAAO,MAAM,gBAAgB,oDAK1B,GAAG,4CAsBL,CAAC"}
+{"version":3,"file":"ui.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/ui.tsx"],"names":[],"mappings":"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"}

package/dist/esm/components/ReportBuilder/ui.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { forwardRef, useContext, useEffect, useRef, useState } from 'react';
-import { MemoizedSelect, MemoizedCheckbox, MemoizedHeader, MemoizedLabel, MemoizedTabs, LoadingSpinner, MemoizedSecondaryButton, } from '../UiComponents';
+import { forwardRef, useContext, useEffect, useState } from 'react';
+import { MemoizedCheckbox, MemoizedHeader, LoadingSpinner, MemoizedSecondaryButton, MemoizedPopover, } from '../UiComponents';
 import MemoizedQuillTable from '../QuillTable';
 import { ThemeContext } from '../../Context';
 import { isNodeEmptyCollection, allNumericNodesValidInTree } from './util';
@@ -52,6 +52,7 @@ export const QuillSecondaryButton = ({ children, ...props }) => {
             ...props.style,
         }, children: children }));
 };
+// TODO: remove this, I think it is unused.
 export const QuillReportBuilderTable = ({ rows, columns, error, ...props }) => {
     const reformattedColumns = columns.map((c) => ({ label: c, field: c }));
     return (_jsx("div", { style: { height: '100%', overflow: 'auto' }, children: _jsx(MemoizedQuillTable, { rows: rows, columns: reformattedColumns, rowsPerPage: 10, showDownloadCSVButton: rows?.length > 0, downloadCSV: () => downloadCSV({ rows, fields: reformattedColumns, name: 'my_report' }), emptyStateLabel: error || 'No results', ...props }) }));
@@ -96,20 +97,18 @@ export const QuillTag = forwardRef(({ label, onClick, children, onClickDelete, h
                     }, children: _jsx("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 20 20", fill: theme?.secondaryButtonColor || 'currentColor', style: { width: 16, height: 16 }, children: _jsx("path", { d: "M6.28 5.22a.75.75 0 0 0-1.06 1.06L8.94 10l-3.72 3.72a.75.75 0 1 0 1.06 1.06L10 11.06l3.72 3.72a.75.75 0 1 0 1.06-1.06L11.06 10l3.72-3.72a.75.75 0 0 0-1.06-1.06L10 8.94 6.28 5.22Z" }) }) }) }))] }));
 });
 // A heading element in the sidebar (eg. "Filters")
-export const QuillSidebarHeading = ({ label }) => (_jsx(MemoizedHeader, { children: label }));
-// A sub-heading element in the sidebar (eg. "Filters")
-export const QuillSidebarSubHeading = ({ label }) => (_jsx(MemoizedLabel, { children: label }));
+export const QuillSidebarHeading = ({ label, }) => _jsx(MemoizedHeader, { label: label });
 // The gray thing on the left.
-export const QuillSidebar = forwardRef(({ children, ...props }, forwardedRef) => (_jsx("div", { style: {
+export const QuillSidebar = ({ children }) => (_jsx("div", { style: {
         overflowX: 'visible',
         padding: '12px',
         width: '25%',
         height: '100%',
         maxWidth: '300px',
         boxSizing: 'border-box',
-    }, ref: forwardedRef, ...props, children: children })));
+    }, children: children }));
 // A big wrapper around the main content (ie. Input, Button, and Table)
-export const CustomContainer = forwardRef(({ children, ...props }, forwardedRef) => (_jsx("div", { style: {
+export const CustomContainer = ({ children }) => (_jsx("div", { style: {
         position: 'sticky',
         top: 0,
         display: 'flex',
@@ -122,59 +121,7 @@ export const CustomContainer = forwardRef(({ children, ...props }, forwardedRef)
         width: '75%',
         height: '100%',
         boxSizing: 'border-box',
-    }, ref: forwardedRef, ...props, children: children })));
-export const QuillSelect = ({ onChange, ...props }) => {
-    const handleOnChange = (value) => {
-        if (!onChange)
-            return;
-        const option = props.options.find((opt) => opt.value === value);
-        if (option) {
-            onChange(option.value);
-        }
-    };
-    return _jsx(MemoizedSelect, { ...props, onChange: handleOnChange });
-};
-export function MemoizedPopover({ onClose, children, style = {}, trigger, isOpen, }) {
-    const modalRef = useRef(null);
-    const [theme] = useContext(ThemeContext);
-    useEffect(() => {
-        const listener = (event) => {
-            if (modalRef?.current && !modalRef?.current?.contains(event.target)) {
-                onClose(event);
-            }
-        };
-        document.addEventListener('mousedown', listener);
-        return () => {
-            document.removeEventListener('mousedown', listener);
-        };
-    }, [modalRef, onClose]);
-    return (_jsxs("div", { children: [trigger, isOpen && (_jsx("div", { id: "quill-popover-modal", ref: modalRef, style: { position: 'relative' }, children: _jsx("div", { style: {
-                        background: theme?.backgroundColor || 'white',
-                        position: 'absolute',
-                        boxShadow: '0px 1px 12px 0px rgba(56, 65, 81, 0.1)',
-                        border: theme
-                            ? `${theme.borderWidth || 1}px solid ${theme.borderColor || '#e7e7e7'}`
-                            : '1px solid #e7e7e7',
-                        boxSizing: 'content-box',
-                        zIndex: 999,
-                        top: 12,
-                        borderRadius: 6,
-                        padding: 20,
-                        ...style,
-                    }, children: children }) }))] }));
-}
-export const QuillPopover = forwardRef(({ children, trigger, isOpen, onClose = () => { }, title = undefined }, ref) => {
-    const [theme] = useContext(ThemeContext);
-    return (_jsxs(MemoizedPopover, { isOpen: isOpen, onClose: onClose, trigger: trigger, parentRef: ref, ref: ref, children: [title && (_jsx("h1", { style: {
-                    fontWeight: '600',
-                    fontSize: 18,
-                    margin: 0,
-                    textAlign: 'left',
-                    marginBottom: 5,
-                    color: theme?.primaryTextColor,
-                    fontFamily: theme?.fontFamily,
-                }, children: title })), children] }));
-});
+    }, children: children }));
 // The six-dot grab-handle icon.
 export const QuillHandleButton = () => {
     const [theme] = useContext(ThemeContext);
@@ -219,7 +166,7 @@ export const QuillHandleButton = () => {
                             background: '#9CA0A7',
                         } })] })] }));
 };
-export const QuillSelectColumn = ({ label, selected, setSelected, children, }) => {
+export const QuillSelectColumn = ({ label, isSelected, setSelected, DragHandle, }) => {
     const [theme] = useContext(ThemeContext);
     return (_jsxs("div", { title: label, style: {
             boxShadow: '0px 1px 4px #e2e8f005',
@@ -231,13 +178,13 @@ export const QuillSelectColumn = ({ label, selected, setSelected, children, }) =
             display: 'flex',
             alignItems: 'center',
             backgroundColor: theme?.backgroundColor || 'white',
-        }, children: [_jsx("div", { children: children }), _jsxs("label", { style: {
+        }, children: [_jsx(DragHandle, { dragIcon: QuillHandleButton }), _jsxs("label", { style: {
                     display: 'flex',
                     gap: 2,
                     whiteSpace: 'nowrap',
                     textOverflow: 'ellipsis',
                     overflow: 'hidden',
-                }, children: [_jsx(MemoizedCheckbox, { checked: selected, onChange: () => setSelected() }), _jsx("span", { style: {
+                }, children: [_jsx(MemoizedCheckbox, { isChecked: isSelected, onChange: () => setSelected() }), _jsx("span", { style: {
                             marginLeft: 6,
                             display: 'block',
                             whiteSpace: 'nowrap',
@@ -247,8 +194,10 @@ export const QuillSelectColumn = ({ label, selected, setSelected, children, }) =
                             color: theme?.primaryTextColor,
                         }, children: snakeCaseToTitleCase(label) })] })] }));
 };
-// A draggable card with a grab-handle and a column name
-export const QuillDraggableColumn = ({ label, children, onDelete }) => {
+/**
+ * A draggable card with a grab-handle and a column name
+ */
+export const QuillDraggableColumn = ({ label, onDelete, DragHandle, }) => {
     const [theme] = useContext(ThemeContext);
     return (_jsxs("div", { style: {
             boxShadow: '0px 1px 4px #e2e8f005',
@@ -257,13 +206,14 @@ export const QuillDraggableColumn = ({ label, children, onDelete }) => {
             display: 'flex',
             alignItems: 'center',
             backgroundColor: theme?.backgroundColor || 'white',
-        }, children: [_jsx("div", { children: children }), _jsx("div", { style: {
+        }, children: [_jsx(DragHandle, { dragIcon: QuillHandleButton }), _jsx("div", { style: {
                     marginLeft: 2,
                     marginRight: 'auto',
                     fontSize: 14,
                     display: 'block',
                     whiteSpace: 'nowrap',
                     textOverflow: 'ellipsis',
+                    overflow: 'hidden',
                     fontFamily: theme?.fontFamily,
                 }, children: label }), _jsx("button", { onClick: onDelete, style: {
                     paddingRight: 4,
@@ -281,11 +231,6 @@ export const QuillButtonLoadingState = () => {
 export const QuillTableLoadingState = () => {
     return (_jsx("div", { style: { display: 'flex', flexDirection: 'column', margin: 'auto' }, children: _jsx(LoadingSpinner, {}) }));
 };
-export const DEFAULT_TAB_OPTIONS = [
-    { label: 'or', value: 'OR' },
-    { label: 'and', value: 'AND' },
-];
-export const QuillTabs = forwardRef(({ options = DEFAULT_TAB_OPTIONS, ...props }, ref) => (_jsx(MemoizedTabs, { ref: ref, options: options, ...props })));
 export const EditPopover = ({ onSave, onDelete, Button, renderNode, activeEditItem, }) => {
     const handleOnClick = () => {
         if (!allNumericNodesValidInTree(activeEditItem)) {
@@ -306,39 +251,45 @@ export const EditPopover = ({ onSave, onDelete, Button, renderNode, activeEditIt
                     width: '100%',
                 }, children: [_jsx(MemoizedSecondaryButton, { onClick: onDelete, label: "Delete" }), _jsx(Button, { onClick: handleOnClick, label: "Save" })] })] }));
 };
-export const QuillFilterPopover = ({ filterLabel, onClickDeleteFilter, popoverTitle, popoverChildren, isOpen, setIsOpen, }) => {
-    return (_jsx(QuillPopover, { isOpen: isOpen, title: popoverTitle, trigger: _jsx(QuillTag, { label: filterLabel, onClickDelete: onClickDeleteFilter, onClick: () => {
-                setIsOpen((isOpen) => !isOpen);
-            } }), onClose: () => {
-            setIsOpen(false);
-        }, children: popoverChildren }));
+export const QuillFilterPopover = ({ filterLabel, onClickDelete, popoverTitle, popoverChildren, isOpen, setIsOpen, }) => {
+    const handleSetIsOpen = (isOpen) => {
+        setIsOpen(isOpen);
+    };
+    return (_jsxs(_Fragment, { children: [_jsx(QuillTag, { label: filterLabel, onClickDelete: onClickDelete, onClick: () => setIsOpen(!isOpen) }), _jsx(MemoizedPopover, { isOpen: isOpen, setIsOpen: handleSetIsOpen, popoverTitle: popoverTitle, popoverChildren: popoverChildren })] }));
+};
+export const QuillSortPopover = ({ sortLabel, onClickDelete, popoverTitle, popoverChildren, isOpen, setIsOpen, }) => {
+    return (_jsxs(_Fragment, { children: [_jsx(QuillTag, { label: sortLabel, onClickDelete: onClickDelete, onClick: () => {
+                    setIsOpen(!isOpen);
+                } }), _jsx(MemoizedPopover, { isOpen: isOpen, popoverTitle: popoverTitle, setIsOpen: setIsOpen, popoverChildren: popoverChildren })] }));
 };
-export const QuillSortPopover = ({ filterLabel, onClickDelete, popoverTitle, popoverChildren, isOpen, setIsOpen, }) => {
-    return (_jsx(QuillPopover, { isOpen: isOpen, title: popoverTitle, trigger: _jsx(QuillTag, { label: filterLabel, onClickDelete: onClickDelete, onClick: () => {
-                setIsOpen((isOpen) => !isOpen);
-            } }), onClose: () => {
-            setIsOpen(false);
-        }, children: popoverChildren }));
+export const QuillLimitPopover = ({ limitLabel, onClickDelete, popoverTitle, popoverChildren, isOpen, setIsOpen, }) => {
+    return (_jsxs(_Fragment, { children: [_jsx(QuillTag, { label: limitLabel, onClickDelete: onClickDelete, onClick: () => {
+                    setIsOpen(!isOpen);
+                } }), _jsx(MemoizedPopover, { isOpen: isOpen, popoverTitle: popoverTitle, setIsOpen: setIsOpen, popoverChildren: popoverChildren })] }));
 };
 export const TagWrapper = ({ isCard, isRow, editPopoverKey, keyPrefix, formData, activeEditItem, setEditPopoverKey, setActiveEditItem, setActivePath, setOpenPopover, setIsPending, clearCheckboxes, fetchSqlQuery, handleDelete, setCheckboxes, handleReplaceSubtree, FilterPopover, getByKey, EditPopover, Button, renderNode, children, }) => {
     const [isOpen, setIsOpen] = useState(false);
+    const onOpen = () => {
+        setActiveEditItem(getByKey(formData, keyPrefix));
+        setActivePath(keyPrefix);
+        setIsPending(true);
+        setEditPopoverKey(keyPrefix);
+        setCheckboxes(getByKey(formData, keyPrefix));
+    };
+    const onClose = () => {
+        setEditPopoverKey(null);
+        setIsPending(false);
+        setActiveEditItem(null);
+        setActivePath(null);
+        setOpenPopover(null);
+        clearCheckboxes();
+    };
     useEffect(() => {
         if (isOpen) {
-            // open
-            setActiveEditItem(getByKey(formData, keyPrefix));
-            setActivePath(keyPrefix);
-            setIsPending(true);
-            setEditPopoverKey(keyPrefix);
-            setCheckboxes(getByKey(formData, keyPrefix));
+            onOpen();
         }
         else {
-            // closed
-            setEditPopoverKey(null);
-            setIsPending(false);
-            setActiveEditItem(null);
-            setActivePath(null);
-            setOpenPopover(null);
-            clearCheckboxes();
+            onClose();
         }
     }, [isOpen]);
     if (isCard && isRow) {
@@ -350,9 +301,10 @@ export const TagWrapper = ({ isCard, isRow, editPopoverKey, keyPrefix, formData,
             setActivePath(null);
             setOpenPopover(null);
             setEditPopoverKey(null);
+            fetchSqlQuery();
             clearCheckboxes();
         };
-        return (_jsx("div", { style: { width: '100%' }, children: _jsx(FilterPopover, { isOpen: editPopoverKey === keyPrefix, popoverTitle: "Edit Filter", filterLabel: children, onClickDeleteFilter: handleClickDelete, setIsOpen: setIsOpen, popoverChildren: _jsx(EditPopover, { Button: Button, renderNode: renderNode, activeEditItem: activeEditItem, onSave: () => {
+        return (_jsx("div", { style: { width: '100%' }, children: _jsx(FilterPopover, { isOpen: editPopoverKey === keyPrefix, popoverTitle: "Edit Filter", filterLabel: children, onClickDelete: handleClickDelete, setIsOpen: setIsOpen, popoverChildren: _jsx(EditPopover, { Button: Button, renderNode: renderNode, activeEditItem: activeEditItem, onSave: () => {
                         if (isNodeEmptyCollection(activeEditItem)) {
                             setIsPending(false);
                             setActiveEditItem(null);

package/dist/esm/components/ReportBuilder/util.d.ts

@@ -73,6 +73,7 @@ export declare const getDateFilterInfo: (node: any) => {
     intervalType: any;
     intervalPaths: any;
 };
-export declare function removeNonSelectedTableReferences(ast: any, table: string): any;
+export declare function removeNonSelectedTableReferences(ast: any, table: string, columns: string[]): any;
 export declare function allNumericNodesValidInTree(node: any): boolean;
+export declare function isIdColumn(columnName?: string): boolean | "" | undefined;
 //# sourceMappingURL=util.d.ts.map

package/dist/esm/components/ReportBuilder/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/util.ts"],"names":[],"mappings":"AAOA;;GAEG;AACH,eAAO,MAAM,qBAAqB,SAAU,GAAG,YAW9C,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,WAa1C;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,WAK5C;AAGD,eAAO,MAAM,WAAW,SAAU,GAAG,YAuBpC,CAAC;AAKF,eAAO,MAAM,oBAAoB,SAAU,GAAG,QAE7C,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,GAAG;;;;;;;;EAU3C;AAKD,eAAO,MAAM,eAAe,QAAS,GAAG,QAMvC,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,WAiBvD;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,GAAG,iBAQjD;AAED,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,MAAM,GACnB,MAAM,GAAG,IAAI,CAOf;AAQD,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,MAAM,GACnB,MAAM,GAAG,IAAI,CAWf;AAED,wBAAgB,gCAAgC,CAC9C,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,MAAM,GACnB,MAAM,GAAG,IAAI,CAOf;AAMD,eAAO,MAAM,mBAAmB,SAAU,GAAG,gBAAgB,MAAM,YA4BlE,CAAC;AAIF,eAAO,MAAM,2BAA2B,SAAU,GAAG,YAUpD,CAAC;AAIF,eAAO,MAAM,oBAAoB,SACzB,GAAG,gBACK,MAAM,KACnB,OAoBF,CAAC;AAEF,eAAO,MAAM,qBAAqB,SAAU,GAAG,gBAAgB,MAAM,QAYpE,CAAC;AAEF,eAAO,MAAM,4BAA4B,SAAU,GAAG,KAAG,OAUxD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,SAAU,GAAG,QA4B3C,CAAC;AAGF,eAAO,MAAM,UAAU,eAAgB,MAAM,SAe5C,CAAC;AAmBF;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,MAAM,UAsBvE;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,UAgB9C;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,MAAM,sBAmBtE;AAED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,SAAU,GAAG,YAU1C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe,SAAU,GAAG,YAOxC,CAAC;AAEF,wBAAgB,aAAa,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,WAehD;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,GAAG,GACV,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,SAAS,CAyB1C;AAED,eAAO,MAAM,QAAQ,QAAS,GAAG,QAAoC,CAAC;AAEtE,eAAO,MAAM,QAAQ,MAAO,MAAM,WAA2C,CAAC;AA4L9E,eAAO,MAAM,iBAAiB,SAAU,GAAG;;;;;;;CAc1C,CAAC;AAqCF,wBAAgB,gCAAgC,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,OAQvE;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAe7D"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/util.ts"],"names":[],"mappings":"AAOA;;GAEG;AACH,eAAO,MAAM,qBAAqB,SAAU,GAAG,YAW9C,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,WAa1C;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,WAK5C;AAGD,eAAO,MAAM,WAAW,SAAU,GAAG,YAuBpC,CAAC;AAKF,eAAO,MAAM,oBAAoB,SAAU,GAAG,QAE7C,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,GAAG;;;;;;;;EAU3C;AAKD,eAAO,MAAM,eAAe,QAAS,GAAG,QAMvC,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,WAiBvD;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,GAAG,iBAQjD;AAED,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,MAAM,GACnB,MAAM,GAAG,IAAI,CAOf;AAQD,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,MAAM,GACnB,MAAM,GAAG,IAAI,CAWf;AAED,wBAAgB,gCAAgC,CAC9C,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,MAAM,GACnB,MAAM,GAAG,IAAI,CAOf;AAMD,eAAO,MAAM,mBAAmB,SAAU,GAAG,gBAAgB,MAAM,YA4BlE,CAAC;AAIF,eAAO,MAAM,2BAA2B,SAAU,GAAG,YAUpD,CAAC;AAIF,eAAO,MAAM,oBAAoB,SACzB,GAAG,gBACK,MAAM,KACnB,OAoBF,CAAC;AAEF,eAAO,MAAM,qBAAqB,SAAU,GAAG,gBAAgB,MAAM,QAYpE,CAAC;AAEF,eAAO,MAAM,4BAA4B,SAAU,GAAG,KAAG,OAUxD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,SAAU,GAAG,QA4B3C,CAAC;AAGF,eAAO,MAAM,UAAU,eAAgB,MAAM,SAe5C,CAAC;AAmBF;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,MAAM,UAsBvE;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,UAgB9C;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,MAAM,sBAmBtE;AAED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,SAAU,GAAG,YAU1C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe,SAAU,GAAG,YAOxC,CAAC;AAEF,wBAAgB,aAAa,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,WAehD;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,GAAG,GACV,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,SAAS,CAyB1C;AAED,eAAO,MAAM,QAAQ,QAAS,GAAG,QAAoC,CAAC;AAEtE,eAAO,MAAM,QAAQ,MAAO,MAAM,WAA2C,CAAC;AA4L9E,eAAO,MAAM,iBAAiB,SAAU,GAAG;;;;;;;CAc1C,CAAC;AA6CF,wBAAgB,gCAAgC,CAC9C,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EAAE,OAQlB;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAc7D;AAED,wBAAgB,UAAU,CAAC,UAAU,CAAC,EAAE,MAAM,4BAO7C"}

package/dist/esm/components/ReportBuilder/util.js

@@ -627,18 +627,20 @@ function getNodeTable(node) {
     return null;
 }
 // Recursively remove filters that don't apply to the given table
-function removeNonSelectedTableFilters(node, table) {
+function removeNonSelectedTableFilters(node, table, columns) {
     if (node.left.type !== 'binary_expr') {
         const referencedTable = getNodeTable(node.left);
-        if (referencedTable && referencedTable !== table) {
+        const referencedColumn = node.left.column || node.left.value;
+        if ((referencedTable && referencedTable !== table) ||
+            !columns.includes(referencedColumn)) {
             return null;
         }
         else {
             return node;
         }
     }
-    node.left = removeNonSelectedTableFilters(node.left, table);
-    node.right = removeNonSelectedTableFilters(node.right, table);
+    node.left = removeNonSelectedTableFilters(node.left, table, columns);
+    node.right = removeNonSelectedTableFilters(node.right, table, columns);
     if (node.left && node.right) {
         return node;
     }
@@ -652,14 +654,13 @@ function removeNonSelectedTableFilters(node, table) {
         return null;
     }
 }
-export function removeNonSelectedTableReferences(ast, table) {
+export function removeNonSelectedTableReferences(ast, table, columns) {
     ast.columns = ast.columns.filter((col) => {
         return col.table === table || col.expr.table === table || !col.expr.table;
     });
     if (!ast.where)
         return ast;
-    ast.where = removeNonSelectedTableFilters(ast.where, table);
-    console.log(ast);
+    ast.where = removeNonSelectedTableFilters(ast.where, table, columns);
     return ast;
 }
 export function allNumericNodesValidInTree(node) {
@@ -667,7 +668,6 @@ export function allNumericNodesValidInTree(node) {
         return true;
     if (node.type === 'number') {
         const value = parseFloat(node.value);
-        console.log(node.value, value);
         if (Number.isNaN(value)) {
             return false;
         }
@@ -680,3 +680,9 @@ export function allNumericNodesValidInTree(node) {
     const isRightValid = allNumericNodesValidInTree(node.right);
     return isLeftValid && isRightValid;
 }
+export function isIdColumn(columnName) {
+    return (columnName &&
+        (columnName.toLowerCase() === 'id' ||
+            columnName.toLowerCase().endsWith('_id') ||
+            columnName.endsWith('Id')));
+}