@quillsql/react 2.11.15 → 2.11.17

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AddFilterPopover = exports.TagWrapper = exports.QuillSortPopover = exports.QuillFilterPopover = exports.EditPopover = exports.QuillTabs = exports.DEFAULT_TAB_OPTIONS = exports.QuillTableLoadingState = exports.QuillButtonLoadingState = exports.QuillDraggableColumn = exports.QuillSelectColumn = exports.QuillHandleButton = exports.QuillPopover = exports.MemoizedPopover = exports.QuillSelect = exports.CustomContainer = exports.QuillSidebar = exports.QuillSidebarSubHeading = exports.QuillSidebarHeading = exports.QuillTag = exports.QuillReportBuilderTable = exports.QuillTextInput = exports.QuillSecondaryButton = exports.QuillButton = void 0;
+exports.AddFilterPopover = exports.TagWrapper = exports.QuillLimitPopover = exports.QuillSortPopover = exports.QuillFilterPopover = exports.EditPopover = exports.QuillTableLoadingState = exports.QuillButtonLoadingState = exports.QuillDraggableColumn = exports.QuillSelectColumn = exports.QuillHandleButton = exports.CustomContainer = exports.QuillSidebar = exports.QuillSidebarHeading = exports.QuillTag = exports.QuillReportBuilderTable = exports.QuillSecondaryButton = exports.QuillButton = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const UiComponents_1 = require("../UiComponents");
@@ -60,25 +60,7 @@ const QuillSecondaryButton = ({ children, ...props }) => {
         }, children: children }));
 };
 exports.QuillSecondaryButton = QuillSecondaryButton;
-const QuillTextInput = (props) => {
-    const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
-    return ((0, jsx_runtime_1.jsx)("input", { ...props, style: {
-            color: theme?.primaryTextColor,
-            backgroundColor: theme?.backgroundColor || 'white',
-            fontFamily: theme?.fontFamily,
-            fontWeight: 'medium',
-            borderWidth: '1px',
-            borderColor: theme?.borderColor || '#E7E7E7',
-            borderStyle: 'solid',
-            borderRadius: '6px',
-            boxShadow: 'rgba(0, 0, 0, 0.1) 0px 1px 5px 0px',
-            padding: '0 12px',
-            display: 'block',
-            minHeight: 32,
-            ...props.style,
-        } }));
-};
-exports.QuillTextInput = QuillTextInput;
+// TODO: remove this, I think it is unused.
 const QuillReportBuilderTable = ({ rows, columns, error, ...props }) => {
     const reformattedColumns = columns.map((c) => ({ label: c, field: c }));
     return ((0, jsx_runtime_1.jsx)("div", { style: { height: '100%', overflow: 'auto' }, children: (0, jsx_runtime_1.jsx)(QuillTable_1.default, { rows: rows, columns: reformattedColumns, rowsPerPage: 10, showDownloadCSVButton: rows?.length > 0, downloadCSV: () => (0, csv_1.downloadCSV)({ rows, fields: reformattedColumns, name: 'my_report' }), emptyStateLabel: error || 'No results', ...props }) }));
@@ -124,22 +106,20 @@ exports.QuillTag = (0, react_1.forwardRef)(({ label, onClick, children, onClickD
                     }, children: (0, jsx_runtime_1.jsx)("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 20 20", fill: theme?.secondaryButtonColor || 'currentColor', style: { width: 16, height: 16 }, children: (0, jsx_runtime_1.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")
-const QuillSidebarHeading = ({ label }) => ((0, jsx_runtime_1.jsx)(UiComponents_1.MemoizedHeader, { children: label }));
+const QuillSidebarHeading = ({ label, }) => (0, jsx_runtime_1.jsx)(UiComponents_1.MemoizedHeader, { label: label });
 exports.QuillSidebarHeading = QuillSidebarHeading;
-// A sub-heading element in the sidebar (eg. "Filters")
-const QuillSidebarSubHeading = ({ label }) => ((0, jsx_runtime_1.jsx)(UiComponents_1.MemoizedLabel, { children: label }));
-exports.QuillSidebarSubHeading = QuillSidebarSubHeading;
 // The gray thing on the left.
-exports.QuillSidebar = (0, react_1.forwardRef)(({ children, ...props }, forwardedRef) => ((0, jsx_runtime_1.jsx)("div", { style: {
+const QuillSidebar = ({ children }) => ((0, jsx_runtime_1.jsx)("div", { style: {
         overflowX: 'visible',
         padding: '12px',
         width: '25%',
         height: '100%',
         maxWidth: '300px',
         boxSizing: 'border-box',
-    }, ref: forwardedRef, ...props, children: children })));
+    }, children: children }));
+exports.QuillSidebar = QuillSidebar;
 // A big wrapper around the main content (ie. Input, Button, and Table)
-exports.CustomContainer = (0, react_1.forwardRef)(({ children, ...props }, forwardedRef) => ((0, jsx_runtime_1.jsx)("div", { style: {
+const CustomContainer = ({ children }) => ((0, jsx_runtime_1.jsx)("div", { style: {
         position: 'sticky',
         top: 0,
         display: 'flex',
@@ -152,61 +132,8 @@ exports.CustomContainer = (0, react_1.forwardRef)(({ children, ...props }, forwa
         width: '75%',
         height: '100%',
         boxSizing: 'border-box',
-    }, ref: forwardedRef, ...props, children: children })));
-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 (0, jsx_runtime_1.jsx)(UiComponents_1.MemoizedSelect, { ...props, onChange: handleOnChange });
-};
-exports.QuillSelect = QuillSelect;
-function MemoizedPopover({ onClose, children, style = {}, trigger, isOpen, }) {
-    const modalRef = (0, react_1.useRef)(null);
-    const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
-    (0, react_1.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 ((0, jsx_runtime_1.jsxs)("div", { children: [trigger, isOpen && ((0, jsx_runtime_1.jsx)("div", { id: "quill-popover-modal", ref: modalRef, style: { position: 'relative' }, children: (0, jsx_runtime_1.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 }) }))] }));
-}
-exports.MemoizedPopover = MemoizedPopover;
-exports.QuillPopover = (0, react_1.forwardRef)(({ children, trigger, isOpen, onClose = () => { }, title = undefined }, ref) => {
-    const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
-    return ((0, jsx_runtime_1.jsxs)(MemoizedPopover, { isOpen: isOpen, onClose: onClose, trigger: trigger, parentRef: ref, ref: ref, children: [title && ((0, jsx_runtime_1.jsx)("h1", { style: {
-                    fontWeight: '600',
-                    fontSize: 18,
-                    margin: 0,
-                    textAlign: 'left',
-                    marginBottom: 5,
-                    color: theme?.primaryTextColor,
-                    fontFamily: theme?.fontFamily,
-                }, children: title })), children] }));
-});
+    }, children: children }));
+exports.CustomContainer = CustomContainer;
 // The six-dot grab-handle icon.
 const QuillHandleButton = () => {
     const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
@@ -252,7 +179,7 @@ const QuillHandleButton = () => {
                         } })] })] }));
 };
 exports.QuillHandleButton = QuillHandleButton;
-const QuillSelectColumn = ({ label, selected, setSelected, children, }) => {
+const QuillSelectColumn = ({ label, isSelected, setSelected, DragHandle, }) => {
     const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
     return ((0, jsx_runtime_1.jsxs)("div", { title: label, style: {
             boxShadow: '0px 1px 4px #e2e8f005',
@@ -264,13 +191,13 @@ const QuillSelectColumn = ({ label, selected, setSelected, children, }) => {
             display: 'flex',
             alignItems: 'center',
             backgroundColor: theme?.backgroundColor || 'white',
-        }, children: [(0, jsx_runtime_1.jsx)("div", { children: children }), (0, jsx_runtime_1.jsxs)("label", { style: {
+        }, children: [(0, jsx_runtime_1.jsx)(DragHandle, { dragIcon: exports.QuillHandleButton }), (0, jsx_runtime_1.jsxs)("label", { style: {
                     display: 'flex',
                     gap: 2,
                     whiteSpace: 'nowrap',
                     textOverflow: 'ellipsis',
                     overflow: 'hidden',
-                }, children: [(0, jsx_runtime_1.jsx)(UiComponents_1.MemoizedCheckbox, { checked: selected, onChange: () => setSelected() }), (0, jsx_runtime_1.jsx)("span", { style: {
+                }, children: [(0, jsx_runtime_1.jsx)(UiComponents_1.MemoizedCheckbox, { isChecked: isSelected, onChange: () => setSelected() }), (0, jsx_runtime_1.jsx)("span", { style: {
                             marginLeft: 6,
                             display: 'block',
                             whiteSpace: 'nowrap',
@@ -281,8 +208,10 @@ const QuillSelectColumn = ({ label, selected, setSelected, children, }) => {
                         }, children: (0, textProcessing_1.snakeCaseToTitleCase)(label) })] })] }));
 };
 exports.QuillSelectColumn = QuillSelectColumn;
-// A draggable card with a grab-handle and a column name
-const QuillDraggableColumn = ({ label, children, onDelete }) => {
+/**
+ * A draggable card with a grab-handle and a column name
+ */
+const QuillDraggableColumn = ({ label, onDelete, DragHandle, }) => {
     const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
     return ((0, jsx_runtime_1.jsxs)("div", { style: {
             boxShadow: '0px 1px 4px #e2e8f005',
@@ -291,13 +220,14 @@ const QuillDraggableColumn = ({ label, children, onDelete }) => {
             display: 'flex',
             alignItems: 'center',
             backgroundColor: theme?.backgroundColor || 'white',
-        }, children: [(0, jsx_runtime_1.jsx)("div", { children: children }), (0, jsx_runtime_1.jsx)("div", { style: {
+        }, children: [(0, jsx_runtime_1.jsx)(DragHandle, { dragIcon: exports.QuillHandleButton }), (0, jsx_runtime_1.jsx)("div", { style: {
                     marginLeft: 2,
                     marginRight: 'auto',
                     fontSize: 14,
                     display: 'block',
                     whiteSpace: 'nowrap',
                     textOverflow: 'ellipsis',
+                    overflow: 'hidden',
                     fontFamily: theme?.fontFamily,
                 }, children: label }), (0, jsx_runtime_1.jsx)("button", { onClick: onDelete, style: {
                     paddingRight: 4,
@@ -318,12 +248,14 @@ const QuillTableLoadingState = () => {
     return ((0, jsx_runtime_1.jsx)("div", { style: { display: 'flex', flexDirection: 'column', margin: 'auto' }, children: (0, jsx_runtime_1.jsx)(UiComponents_1.LoadingSpinner, {}) }));
 };
 exports.QuillTableLoadingState = QuillTableLoadingState;
-exports.DEFAULT_TAB_OPTIONS = [
-    { label: 'or', value: 'OR' },
-    { label: 'and', value: 'AND' },
-];
-exports.QuillTabs = (0, react_1.forwardRef)(({ options = exports.DEFAULT_TAB_OPTIONS, ...props }, ref) => ((0, jsx_runtime_1.jsx)(UiComponents_1.MemoizedTabs, { ref: ref, options: options, ...props })));
 const EditPopover = ({ onSave, onDelete, Button, renderNode, activeEditItem, }) => {
+    const handleOnClick = () => {
+        if (!(0, util_1.allNumericNodesValidInTree)(activeEditItem)) {
+            alert('Please input a number.');
+            return;
+        }
+        onSave();
+    };
     return ((0, jsx_runtime_1.jsxs)("div", { style: {
             display: 'flex',
             flexDirection: 'column',
@@ -334,44 +266,51 @@ const EditPopover = ({ onSave, onDelete, Button, renderNode, activeEditItem, })
                     justifyContent: 'end',
                     gap: 8,
                     width: '100%',
-                }, children: [(0, jsx_runtime_1.jsx)(UiComponents_1.MemoizedSecondaryButton, { onClick: onDelete, label: "Delete" }), (0, jsx_runtime_1.jsx)(Button, { onClick: onSave, label: "Save" })] })] }));
+                }, children: [(0, jsx_runtime_1.jsx)(UiComponents_1.MemoizedSecondaryButton, { onClick: onDelete, label: "Delete" }), (0, jsx_runtime_1.jsx)(Button, { onClick: handleOnClick, label: "Save" })] })] }));
 };
 exports.EditPopover = EditPopover;
-const QuillFilterPopover = ({ filterLabel, onClickDeleteFilter, popoverTitle, popoverChildren, isOpen, setIsOpen, }) => {
-    return ((0, jsx_runtime_1.jsx)(exports.QuillPopover, { isOpen: isOpen, title: popoverTitle, trigger: (0, jsx_runtime_1.jsx)(exports.QuillTag, { label: filterLabel, onClickDelete: onClickDeleteFilter, onClick: () => {
-                setIsOpen((isOpen) => !isOpen);
-            } }), onClose: () => {
-            setIsOpen(false);
-        }, children: popoverChildren }));
+const QuillFilterPopover = ({ filterLabel, onClickDelete, popoverTitle, popoverChildren, isOpen, setIsOpen, }) => {
+    const handleSetIsOpen = (isOpen) => {
+        setIsOpen(isOpen);
+    };
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(exports.QuillTag, { label: filterLabel, onClickDelete: onClickDelete, onClick: () => setIsOpen(!isOpen) }), (0, jsx_runtime_1.jsx)(UiComponents_1.MemoizedPopover, { isOpen: isOpen, setIsOpen: handleSetIsOpen, popoverTitle: popoverTitle, popoverChildren: popoverChildren })] }));
 };
 exports.QuillFilterPopover = QuillFilterPopover;
-const QuillSortPopover = ({ filterLabel, onClickDelete, popoverTitle, popoverChildren, isOpen, setIsOpen, }) => {
-    return ((0, jsx_runtime_1.jsx)(exports.QuillPopover, { isOpen: isOpen, title: popoverTitle, trigger: (0, jsx_runtime_1.jsx)(exports.QuillTag, { label: filterLabel, onClickDelete: onClickDelete, onClick: () => {
-                setIsOpen((isOpen) => !isOpen);
-            } }), onClose: () => {
-            setIsOpen(false);
-        }, children: popoverChildren }));
+const QuillSortPopover = ({ sortLabel, onClickDelete, popoverTitle, popoverChildren, isOpen, setIsOpen, }) => {
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(exports.QuillTag, { label: sortLabel, onClickDelete: onClickDelete, onClick: () => {
+                    setIsOpen(!isOpen);
+                } }), (0, jsx_runtime_1.jsx)(UiComponents_1.MemoizedPopover, { isOpen: isOpen, popoverTitle: popoverTitle, setIsOpen: setIsOpen, popoverChildren: popoverChildren })] }));
 };
 exports.QuillSortPopover = QuillSortPopover;
+const QuillLimitPopover = ({ limitLabel, onClickDelete, popoverTitle, popoverChildren, isOpen, setIsOpen, }) => {
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(exports.QuillTag, { label: limitLabel, onClickDelete: onClickDelete, onClick: () => {
+                    setIsOpen(!isOpen);
+                } }), (0, jsx_runtime_1.jsx)(UiComponents_1.MemoizedPopover, { isOpen: isOpen, popoverTitle: popoverTitle, setIsOpen: setIsOpen, popoverChildren: popoverChildren })] }));
+};
+exports.QuillLimitPopover = QuillLimitPopover;
 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] = (0, react_1.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();
+    };
     (0, react_1.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) {
@@ -383,9 +322,10 @@ const TagWrapper = ({ isCard, isRow, editPopoverKey, keyPrefix, formData, active
             setActivePath(null);
             setOpenPopover(null);
             setEditPopoverKey(null);
+            fetchSqlQuery();
             clearCheckboxes();
         };
-        return ((0, jsx_runtime_1.jsx)("div", { style: { width: '100%' }, children: (0, jsx_runtime_1.jsx)(FilterPopover, { isOpen: editPopoverKey === keyPrefix, popoverTitle: "Edit Filter", filterLabel: children, onClickDeleteFilter: handleClickDelete, setIsOpen: setIsOpen, popoverChildren: (0, jsx_runtime_1.jsx)(EditPopover, { Button: Button, renderNode: renderNode, activeEditItem: activeEditItem, onSave: () => {
+        return ((0, jsx_runtime_1.jsx)("div", { style: { width: '100%' }, children: (0, jsx_runtime_1.jsx)(FilterPopover, { isOpen: editPopoverKey === keyPrefix, popoverTitle: "Edit Filter", filterLabel: children, onClickDelete: handleClickDelete, setIsOpen: setIsOpen, popoverChildren: (0, jsx_runtime_1.jsx)(EditPopover, { Button: Button, renderNode: renderNode, activeEditItem: activeEditItem, onSave: () => {
                         if ((0, util_1.isNodeEmptyCollection)(activeEditItem)) {
                             setIsPending(false);
                             setActiveEditItem(null);
@@ -425,10 +365,17 @@ const TagWrapper = ({ isCard, isRow, editPopoverKey, keyPrefix, formData, active
 };
 exports.TagWrapper = TagWrapper;
 const AddFilterPopover = ({ onSave, Button, renderNode, activeEditItem, }) => {
+    const handleOnClick = () => {
+        if (!(0, util_1.allNumericNodesValidInTree)(activeEditItem)) {
+            alert('Please input a number.');
+            return;
+        }
+        onSave();
+    };
     return ((0, jsx_runtime_1.jsxs)("div", { style: { display: 'flex', flexDirection: 'column', gap: 12 }, children: [activeEditItem && renderNode(activeEditItem), (0, jsx_runtime_1.jsx)("div", { style: {
                     display: 'flex',
                     flexDirection: 'row',
                     justifyContent: 'end',
-                }, children: (0, jsx_runtime_1.jsx)(Button, { onClick: onSave, label: 'Add filter' }) })] }));
+                }, children: (0, jsx_runtime_1.jsx)(Button, { onClick: handleOnClick, label: 'Add filter' }) })] }));
 };
 exports.AddFilterPopover = AddFilterPopover;

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

@@ -73,5 +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/cjs/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"}
+{"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/cjs/components/ReportBuilder/util.js

@@ -1,7 +1,7 @@
 "use strict";
 // A collection of reusable, pure, utility functions for the Report Builder.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeNonSelectedTableReferences = exports.getDateFilterInfo = exports.trimEndS = exports.deepCopy = exports.getPostgresBasicType = exports.showNodeAsRow = exports.isExtractEquals = exports.isDateTruncEquals = exports.tryConvertDateEquality = exports.extractSuffixToString = exports.dateTruncSuffixToString = exports.newUTCDate = exports.isColumnComparison = exports.isTheCurrentIntervalBigQuery = exports.isThePreviousInterval = exports.isTheCurrentInterval = exports.isInTheLastIntervalBigQuery = exports.isInTheLastInterval = exports.getInThePreviousIntervalSentence = exports.getInTheLastIntervalSentence = exports.getInTheCurrentIntervalSentence = exports.formatDateComparisonNode = exports.areObjectsEqualish = exports.isColumnDateish = exports.generateColumnExpr = exports.isColumnReferenceish = exports.isDateTrunc = exports.hasTopLevelOrBoolean = exports.isTopLevelBoolean = exports.isNodeEmptyCollection = void 0;
+exports.isIdColumn = exports.allNumericNodesValidInTree = exports.removeNonSelectedTableReferences = exports.getDateFilterInfo = exports.trimEndS = exports.deepCopy = exports.getPostgresBasicType = exports.showNodeAsRow = exports.isExtractEquals = exports.isDateTruncEquals = exports.tryConvertDateEquality = exports.extractSuffixToString = exports.dateTruncSuffixToString = exports.newUTCDate = exports.isColumnComparison = exports.isTheCurrentIntervalBigQuery = exports.isThePreviousInterval = exports.isTheCurrentInterval = exports.isInTheLastIntervalBigQuery = exports.isInTheLastInterval = exports.getInThePreviousIntervalSentence = exports.getInTheLastIntervalSentence = exports.getInTheCurrentIntervalSentence = exports.formatDateComparisonNode = exports.areObjectsEqualish = exports.isColumnDateish = exports.generateColumnExpr = exports.isColumnReferenceish = exports.isDateTrunc = exports.hasTopLevelOrBoolean = exports.isTopLevelBoolean = exports.isNodeEmptyCollection = void 0;
 const date_fns_1 = require("date-fns");
 const bigDateMap_1 = require("./bigDateMap");
 const textProcessing_1 = require("../../utils/textProcessing");
@@ -659,18 +659,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;
     }
@@ -684,14 +686,38 @@ function removeNonSelectedTableFilters(node, table) {
         return null;
     }
 }
-function removeNonSelectedTableReferences(ast, table) {
+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;
 }
 exports.removeNonSelectedTableReferences = removeNonSelectedTableReferences;
+function allNumericNodesValidInTree(node) {
+    if (!node)
+        return true;
+    if (node.type === 'number') {
+        const value = parseFloat(node.value);
+        if (Number.isNaN(value)) {
+            return false;
+        }
+        else {
+            node.value = value;
+            return true;
+        }
+    }
+    const isLeftValid = allNumericNodesValidInTree(node.left);
+    const isRightValid = allNumericNodesValidInTree(node.right);
+    return isLeftValid && isRightValid;
+}
+exports.allNumericNodesValidInTree = allNumericNodesValidInTree;
+function isIdColumn(columnName) {
+    return (columnName &&
+        (columnName.toLowerCase() === 'id' ||
+            columnName.toLowerCase().endsWith('_id') ||
+            columnName.endsWith('Id')));
+}
+exports.isIdColumn = isIdColumn;

package/dist/cjs/components/UiComponents.d.ts

@@ -1,15 +1,14 @@
-import React from 'react';
+import React, { ChangeEvent, ReactNode } from 'react';
 export interface Option {
     value: string;
     label: string;
 }
-export interface SelectComponentProps {
-    onChange: (value: string) => void;
-    value: string;
-    options: Option[];
-    disabled?: boolean;
-    label?: string;
-    theme: any;
+export interface PopoverComponentProps {
+    isOpen: boolean;
+    setIsOpen: (isOpen: boolean) => void;
+    triggerLabel?: string;
+    popoverTitle?: string;
+    popoverChildren: ReactNode;
 }
 export interface ButtonComponentProps {
     onClick: () => void;
@@ -18,29 +17,21 @@ export interface ButtonComponentProps {
     primary?: boolean;
     width?: string;
 }
-export interface TableComponentProps {
-    rows: any[];
-    columns: any[];
-    containerStyle?: React.CSSProperties;
-    loading?: boolean;
-    showDownloadCSVButton?: boolean;
-    downloadFileName?: string;
-    downloadCSV?: () => void;
-    LoadingComponent?: () => JSX.Element;
-    DownloadCSVButtonComponent?: (props: ButtonComponentProps) => JSX.Element;
-    rowsPerPage?: number;
-    emptyStateLabel?: string;
+export interface DeleteButtonComponentProps {
+    onClick: () => void;
 }
+/**
+ * An input element used to accept data from the user.
+ */
 export interface TextInputComponentProps {
-    onChange: (e: any) => void;
-    value: string;
     id: string;
-    placeholder: string;
-    theme?: any;
-    width?: string;
+    width: number;
+    value: string;
+    placeholder?: string;
+    onChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
 }
 export interface ModalComponentProps {
-    children: any;
+    children: ReactNode;
     isOpen: boolean;
     onClose?: () => void;
     title?: string;
@@ -49,25 +40,25 @@ export interface ModalComponentProps {
     style?: any;
 }
 export interface HeaderProps {
-    children: any;
+    label: string;
 }
 export interface LabelProps {
-    children: any;
+    label: string;
 }
 export interface TextProps {
-    children: any;
+    label: string;
 }
-export interface DeleteButtonProps {
-    onClick: () => void;
-    style: any;
-}
-export declare const QuillTextInput: ({ value, onChange, placeholder, id, theme, }: TextInputComponentProps) => import("react/jsx-runtime").JSX.Element;
-export declare const MemoizedTextInput: ({ value, onChange, placeholder, id }: {
-    value: any;
-    onChange: any;
-    placeholder: any;
-    id: any;
-}) => import("react/jsx-runtime").JSX.Element;
+export interface SidebarComponentProps {
+    children: ReactNode;
+}
+export interface ContainerComponentProps {
+    children: ReactNode;
+}
+/**
+ * The fallback TextInput element for Quill.
+ */
+export declare const QuillTextInput: ({ id, value, width, placeholder, onChange, }: TextInputComponentProps) => import("react/jsx-runtime").JSX.Element;
+export declare const MemoizedTextInput: ({ value, onChange, placeholder, id, }: TextInputComponentProps) => import("react/jsx-runtime").JSX.Element;
 export declare const MemoizedButton: ({ label, onClick, primary, isLoading, }: {
     label: any;
     onClick: any;
@@ -78,65 +69,75 @@ export declare const MemoizedSecondaryButton: ({ label, onClick }: {
     label: any;
     onClick: any;
 }) => import("react/jsx-runtime").JSX.Element;
-export declare const MemoizedSelect: ({ value, onChange, options, disabled, style, }: {
-    value: any;
-    onChange: any;
-    options: any;
-    disabled?: boolean | undefined;
-    style?: {} | undefined;
-}) => import("react/jsx-runtime").JSX.Element;
-export declare const MemoizedHeader: ({ children }: {
-    children: any;
-}) => import("react/jsx-runtime").JSX.Element;
-export declare const MemoizedLabel: ({ children }: {
-    children: any;
-}) => import("react/jsx-runtime").JSX.Element;
-export declare const MemoizedCheckbox: ({ checked, onChange, style, ...props }: {
-    [x: string]: any;
-    checked: any;
-    onChange: any;
-    style?: {} | undefined;
-}) => import("react/jsx-runtime").JSX.Element;
-export declare const MemoizedTabs: ({ defaultValue, options, onValueChange }: {
-    defaultValue: any;
-    options: any;
-    onValueChange: any;
-}) => import("react/jsx-runtime").JSX.Element;
-export declare const MemoizedText: ({ children }: {
-    children: any;
-}) => import("react/jsx-runtime").JSX.Element;
-export interface PopoverComponentProps {
-    isOpen: boolean;
-    setIsOpen: () => void;
-    onClose: () => void;
-    triggerLabel: string;
-    popoverTitle: string;
-    popoverChildren: any;
-}
-export interface MemoizedPopoverProps {
-    children: any;
-    onClose?: () => void;
-    parentRef?: any;
-    style?: any;
-    onClick?: () => void;
-    showTrigger?: boolean;
-    isOpen: boolean;
+export interface SelectComponentProps {
+    value: string;
+    label?: string;
+    options: {
+        value: string;
+        label: string;
+    }[];
+    onChange: (event: React.ChangeEvent<HTMLSelectElement>) => void;
+}
+export interface HeaderComponentProps {
+    label: string;
+}
+export declare const MemoizedHeader: ({ label }: HeaderComponentProps) => import("react/jsx-runtime").JSX.Element;
+export interface LabelComponentProps {
+    label: string;
+}
+export declare const MemoizedLabel: ({ label }: LabelComponentProps) => import("react/jsx-runtime").JSX.Element;
+export interface CheckboxComponentProps {
+    isChecked: boolean;
+    onChange: (event: ChangeEvent<HTMLInputElement>) => void;
+}
+export declare const MemoizedCheckbox: ({ isChecked, onChange, }: CheckboxComponentProps) => import("react/jsx-runtime").JSX.Element;
+export declare const DEFAULT_TAB_OPTIONS: {
     label: string;
+    value: string;
+}[];
+export interface TabsComponentProps {
+    options: {
+        label: string;
+        value: string;
+    }[];
+    value: string;
+    onChange: (event: ChangeEvent<HTMLSelectElement>) => void;
+}
+export declare const QuillTabs: ({ options, value, onChange, }: TabsComponentProps) => import("react/jsx-runtime").JSX.Element;
+export interface TextComponentProps {
+    label: string;
+}
+export declare const MemoizedText: ({ label }: TextComponentProps) => import("react/jsx-runtime").JSX.Element;
+/**
+ * The one, true Quill popover component.
+ */
+export declare const MemoizedPopover: ({ isOpen, setIsOpen, triggerLabel, popoverTitle, popoverChildren, }: PopoverComponentProps) => import("react/jsx-runtime").JSX.Element;
+export declare function MemoizedModal({ isOpen, setIsOpen, title, children, width, height, }: {
+    isOpen: boolean;
     setIsOpen: (isOpen: boolean) => void;
+    title?: string;
+    children: ReactNode;
+    width?: number;
+    height?: number;
+}): JSX.Element;
+export declare const MemoizedDeleteButton: ({ onClick, }: DeleteButtonComponentProps) => import("react/jsx-runtime").JSX.Element;
+export declare const LoadingSpinner: () => import("react/jsx-runtime").JSX.Element;
+export interface TableComponentProps {
+    rows: {
+        [key: string]: any;
+    }[];
+    columns: {
+        field: string;
+        label: string;
+    }[];
+    isLoading?: boolean;
 }
-export declare function MemoizedPopover({ onClose, parentRef, children, style, onClick, showTrigger, isOpen, label, setIsOpen, }: MemoizedPopoverProps): import("react/jsx-runtime").JSX.Element;
-export declare function MemoizedModal({ isOpen, onClose, setIsOpen, title, children, theme, style, }: {
-    isOpen: any;
-    onClose: any;
-    setIsOpen: any;
-    title: any;
-    children: any;
-    theme: any;
-    style?: {} | undefined;
-}): import("react/jsx-runtime").JSX.Element | null;
-export declare const MemoizedDeleteButton: ({ onClick, style }: {
-    onClick: any;
-    style: any;
+export declare const QuillTableComponent: ({ rows, columns, isLoading, }: TableComponentProps) => import("react/jsx-runtime").JSX.Element;
+export declare const QuillDropdownComponent: ({ onChange, value, label, options, }: {
+    onChange: (event: ChangeEvent<HTMLSelectElement>) => void;
+    value: string;
+    options: Option[];
+    label?: string | undefined;
 }) => import("react/jsx-runtime").JSX.Element;
-export declare const LoadingSpinner: () => import("react/jsx-runtime").JSX.Element;
+export declare const QuillEmptyDashboardComponent: () => import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=UiComponents.d.ts.map