@quillsql/react 2.11.17 → 2.11.18

package/dist/esm/components/QuillCard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QuillCard.d.ts","sourceRoot":"","sources":["../../../src/components/QuillCard.tsx"],"names":[],"mappings":"AACA,OAAc,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,UAAU,cAAc;IACtB,QAAQ,EAAE,SAAS,CAAC;IACpB,KAAK,EAAE,UAAU,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAgB,SAAS,CAAC,EACxB,QAAQ,EACR,KAAK,EACL,OAAO,EACP,UAAkB,EAClB,SAAgB,EAChB,OAAO,EACP,SAAa,EACb,KAAU,GACX,EAAE,cAAc,2CAmEhB"}
+{"version":3,"file":"QuillCard.d.ts","sourceRoot":"","sources":["../../../src/components/QuillCard.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAIlC,UAAU,cAAc;IACtB,QAAQ,EAAE,SAAS,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;CACvB;AAED,wBAAgB,SAAS,CAAC,EACxB,QAAQ,EACR,OAAO,EACP,QAAQ,GACT,EAAE,cAAc,2CA4EhB"}

package/dist/esm/components/QuillCard.js

@@ -1,19 +1,19 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { XIcon } from '../assets';
-export function QuillCard({ children, theme, onClick, isSelected = false, clickable = true, onClose, minHeight = 0, style = {}, }) {
-    return (_jsxs("div", { className: clickable ? 'quill-card-hover' : '', style: {
+import { useTheme } from '../hooks';
+export function QuillCard({ children, onClick, onDelete, }) {
+    const theme = useTheme();
+    return (_jsxs("div", { className: onClick ? 'quill-card-hover' : '', style: {
             backgroundColor: theme.backgroundColor || 'white',
-            cursor: clickable ? 'pointer' : 'default',
+            cursor: onClick ? 'pointer' : 'default',
             padding: 16,
             borderRadius: 8,
             boxShadow: '0 1px 4px 0 rgba(56, 65, 81, 0.07)',
             borderWidth: theme.borderWidth,
             borderStyle: 'solid',
-            borderColor: isSelected ? '#aaaaaa' : theme.borderColor,
+            borderColor: theme.borderColor,
             overflowX: 'hidden',
             position: 'relative',
-            minHeight: minHeight,
-            ...style,
         }, onClick: onClick, children: [_jsx("style", { children: `
         .quill-card-hover:hover {
           background-color: #f9f9f9 !important;
@@ -24,9 +24,11 @@ export function QuillCard({ children, theme, onClick, isSelected = false, clicka
             background-color: #f5f5f5;
           }
         }
-      ` }), onClose && (_jsxs("button", { className: "quill-delete-button", type: "button", onClick: e => {
+      ` }), onDelete && (_jsxs("button", { className: "quill-delete-button", type: "button", onClick: (e) => {
+                    onDelete();
+                    // Since this button is inside of the card, we do not want to fire
+                    // the onClick callback as well, if we fire the onDelete callback.
                     e.stopPropagation();
-                    onClose();
                 }, style: {
                     height: 40,
                     width: 40,
@@ -46,5 +48,9 @@ export function QuillCard({ children, theme, onClick, isSelected = false, clicka
       }
       .quill-delete-button:hover {
         background-color: rgba(56, 65, 81, 0.03);
-      }` }), _jsx(XIcon, { height: "20", width: "20", fill: "#6C727F" })] })), _jsx("div", { style: { overflowX: 'scroll' }, children: children })] }));
+      }` }), _jsx(XIcon, { height: "20", width: "20", fill: "#6C727F" })] })), _jsx("div", { style: {
+                    overflowX: 'scroll',
+                    display: 'flex',
+                    height: '100%',
+                }, children: children })] }));
 }

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

@@ -1 +1 @@
-{"version":3,"file":"AddColumnPopover.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/AddColumnPopover.tsx"],"names":[],"mappings":";AAoBA,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAI1D,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,MAAM,EACN,kBAAkB,EAClB,qBAAqB,EACrB,eAAe,EACf,kBAAkB,EAClB,oBAAoB,EACpB,aAAa,EACb,YAAY,EACZ,OAAO,EACP,UAAU,EACV,KAAK,EACL,gBAAgB,EAChB,UAAU,EACV,YAAY,EACZ,QAAQ,EACR,SAAS,EACT,YAAY,EACZ,eAAe,EACf,MAAM,GACP,EAAE;IACD,MAAM,EAAE,GAAG,CAAC;IACZ,kBAAkB,EAAE,GAAG,CAAC;IACxB,qBAAqB,EAAE,GAAG,CAAC;IAC3B,eAAe,EAAE,GAAG,CAAC;IACrB,kBAAkB,EAAE,GAAG,CAAC;IACxB,oBAAoB,EAAE,GAAG,CAAC;IAC1B,aAAa,EAAE,GAAG,CAAC;IACnB,YAAY,EAAE,GAAG,CAAC;IAClB,OAAO,EAAE,GAAG,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;IAChB,KAAK,EAAE,GAAG,CAAC;IACX,gBAAgB,EAAE,GAAG,CAAC;IACtB,UAAU,EAAE,GAAG,CAAC;IAChB,YAAY,EAAE,GAAG,CAAC;IAClB,QAAQ,EAAE,GAAG,CAAC;IACd,SAAS,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC3D,YAAY,EAAE,CAAC,KAAK,EAAE;QACpB,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,EAAE,OAAO,CAAC;QACpB,WAAW,EAAE,MAAM,IAAI,CAAC;QACxB,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE;YAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,OAAO,CAAA;SAAE,KAAK,GAAG,CAAC,OAAO,CAAC;KAC5E,KAAK,GAAG,CAAC,OAAO,CAAC;IAClB,eAAe,EAAE,GAAG,CAAC;IACrB,MAAM,EAAE,GAAG,CAAC;CACb,2CAoNA"}
+{"version":3,"file":"AddColumnPopover.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/AddColumnPopover.tsx"],"names":[],"mappings":";AAoBA,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAI1D,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,MAAM,EACN,kBAAkB,EAClB,qBAAqB,EACrB,eAAe,EACf,kBAAkB,EAClB,oBAAoB,EACpB,aAAa,EACb,YAAY,EACZ,OAAO,EACP,UAAU,EACV,KAAK,EACL,gBAAgB,EAChB,UAAU,EACV,YAAY,EACZ,QAAQ,EACR,SAAS,EACT,YAAY,EACZ,eAAe,EACf,MAAM,GACP,EAAE;IACD,MAAM,EAAE,GAAG,CAAC;IACZ,kBAAkB,EAAE,GAAG,CAAC;IACxB,qBAAqB,EAAE,GAAG,CAAC;IAC3B,eAAe,EAAE,GAAG,CAAC;IACrB,kBAAkB,EAAE,GAAG,CAAC;IACxB,oBAAoB,EAAE,GAAG,CAAC;IAC1B,aAAa,EAAE,GAAG,CAAC;IACnB,YAAY,EAAE,GAAG,CAAC;IAClB,OAAO,EAAE,GAAG,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;IAChB,KAAK,EAAE,GAAG,CAAC;IACX,gBAAgB,EAAE,GAAG,CAAC;IACtB,UAAU,EAAE,GAAG,CAAC;IAChB,YAAY,EAAE,GAAG,CAAC;IAClB,QAAQ,EAAE,GAAG,CAAC;IACd,SAAS,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC3D,YAAY,EAAE,CAAC,KAAK,EAAE;QACpB,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,EAAE,OAAO,CAAC;QACpB,WAAW,EAAE,MAAM,IAAI,CAAC;QACxB,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE;YAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,OAAO,CAAA;SAAE,KAAK,GAAG,CAAC,OAAO,CAAC;KAC5E,KAAK,GAAG,CAAC,OAAO,CAAC;IAClB,eAAe,EAAE,GAAG,CAAC;IACrB,MAAM,EAAE,GAAG,CAAC;CACb,2CAqNA"}

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

@@ -24,6 +24,8 @@ export default function AddColumnPopover({ onSave, orderedColumnNames, setOrdere
     // When a drag event ends, switch the item order.
     function handleDragEnd(event) {
         const { active, over } = event;
+        if (!active || !over)
+            return;
         if (active.id !== over.id) {
             setOrderedColumnNames((orderedColumnNames) => {
                 const oldIndex = orderedColumnNames.indexOf(active.id);

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

@@ -13,7 +13,7 @@ export const LimitSentence = ({ limit, handleDelete, setOpenPopover, onSave, pop
                     onSave(column, direction);
                 }, isEdit: true, onDelete: handleClickDelete, initialLimit: limit.value[0].value, TextInput: TextInput, Button: Button, SecondaryButton: SecondaryButton }) }) }));
 };
-export const AddLimitPopover = ({ onSave, initialLimit = 0, isEdit = false, onDelete = () => { }, TextInput = QuillTextInput, Button = MemoizedButton, SecondaryButton = MemoizedSecondaryButton, }) => {
+export const AddLimitPopover = ({ onSave, initialLimit = 10, isEdit = false, onDelete = () => { }, TextInput = QuillTextInput, Button = MemoizedButton, SecondaryButton = MemoizedSecondaryButton, }) => {
     const [limit, setLimit] = useState(initialLimit);
     const [theme] = useContext(ThemeContext);
     return (_jsxs("div", { style: { display: 'flex', flexDirection: 'column', gap: 12 }, children: [_jsx("div", { style: {

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

@@ -3,6 +3,7 @@ import { Pivot } from './pivot';
 import { TableInfo } from './schema';
 export declare function convertDateComparison(node: NSP.Select): NSP.Select;
 export declare function recursiveSearchAndReplace(node: any, search: string, replace: string): void;
+export declare function recursiveSearchAndReplaceByKey(node: any, search: string, replace: string, searchKey: string): void;
 /**
  * Takes a bigquery AST as input, cleans it, and returns a Select AST.
  */

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

@@ -1 +1 @@
-{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/convert.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,IAAI,GAAG,EACpB,GAAG,EAMJ,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAc,SAAS,EAAE,MAAM,UAAU,CAAC;AASjD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAuBlE;AAGD,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,QAahB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAAC,MAAM,CAuCpD;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,GAAG,CAAC,MAAM,EACf,YAAY,EAAE,SAAS,EAAE,GACxB,GAAG,CAAC,MAAM,CAwBZ;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,GAAG,EACR,SAAS,mBAAc,EACvB,YAAY,EAAE,SAAS,EAAE;;;;;;;;;;;;;;;EAwd1B;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG;;;EA6G5D;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,OAyJtE;AAID,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAY1E"}
+{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/convert.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,IAAI,GAAG,EACpB,GAAG,EAMJ,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAc,SAAS,EAAE,MAAM,UAAU,CAAC;AASjD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAuBlE;AAGD,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,QAahB;AAGD,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,QAalB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAAC,MAAM,CA2CpD;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,GAAG,CAAC,MAAM,EACf,YAAY,EAAE,SAAS,EAAE,GACxB,GAAG,CAAC,MAAM,CAwBZ;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,GAAG,EACR,SAAS,mBAAc,EACvB,YAAY,EAAE,SAAS,EAAE;;;;;;;;;;;;;;;EAwd1B;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG;;;EA6G5D;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,OAyJtE;AAID,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAY1E"}

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

@@ -44,6 +44,20 @@ export function recursiveSearchAndReplace(node, search, replace) {
         });
     }
 }
+// THIS IS USED TO REPLACE UNITS IN INTERVALS FOR BIGQUERY
+export function recursiveSearchAndReplaceByKey(node, search, replace, searchKey) {
+    if (typeof node !== 'object') {
+        return;
+    }
+    if (node) {
+        Object.keys(node).forEach((key) => {
+            recursiveSearchAndReplaceByKey(node[key], search, replace, searchKey);
+            if (searchKey === key && node[key] === search) {
+                node[key] = replace;
+            }
+        });
+    }
+}
 /**
  * Takes a bigquery AST as input, cleans it, and returns a Select AST.
  */
@@ -66,6 +80,10 @@ export function convertBigQuery(ast) {
         recursiveSearchAndReplace(newAst.where, 'CURRENT_DATE', 'CURRENT_TIMESTAMP');
         recursiveSearchAndReplace(newAst.where, 'DATE_TRUNC', 'TIMESTAMP_TRUNC');
         recursiveSearchAndReplace(newAst.where, 'DATE', 'TIMESTAMP');
+        // JANK: If anyone is here this is how you have to do intervals in BigQuery no joke
+        recursiveSearchAndReplaceByKey(newAst.where, 'year', '* 365 DAY', 'unit');
+        recursiveSearchAndReplaceByKey(newAst.where, 'week', '* 7 DAY', 'unit');
+        recursiveSearchAndReplaceByKey(newAst.where, 'month', '* 30 DAY', 'unit');
         // TODO: handle joins nicely
         if (newAst.from?.length > 1) {
             newAst.from = [newAst.from[0]];

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

@@ -17,6 +17,8 @@ export declare const OPERATOR_GROUPS: {
     between: string;
     'IS NOT': string;
     IS: string;
+    EQUALS: string;
+    equals: string;
 };
 export declare const getDefaultOperatorSubtrees: (key: any, operator: any, left: any, right: any, databaseType: string) => any;
 export declare const DEFAULT_OPERATOR_SUBTREES: {
@@ -416,29 +418,32 @@ export declare const DEFAULT_BIG_QUERY_OPERATOR_SUBTREES: {
             name: string;
             args: {
                 type: string;
-                value: ({
-                    type: string;
-                    value: string;
-                    table?: undefined;
-                    column?: undefined;
-                } | {
+                value: {
                     type: string;
                     table: null;
                     column: string;
-                    value?: undefined;
-                })[];
+                }[];
             };
+            over: null;
         };
         right: {
             type: string;
             name: string;
             args: {
                 type: string;
-                value: {
+                value: ({
                     type: string;
                     value: string;
-                }[];
+                    table?: undefined;
+                    column?: undefined;
+                } | {
+                    type: string;
+                    table: null;
+                    column: string;
+                    value?: undefined;
+                })[];
             };
+            over: null;
         };
     };
 };

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

@@ -1 +1 @@
-{"version":3,"file":"operators.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/operators.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;CAmB3B,CAAC;AAEF,eAAO,MAAM,0BAA0B,QAChC,GAAG,YACE,GAAG,QACP,GAAG,SACF,GAAG,gBACI,MAAM,QA8DrB,CAAC;AAEF,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoQrC,CAAC;AAEF,eAAO,MAAM,mCAAmC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+L/C,CAAC"}
+{"version":3,"file":"operators.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/operators.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;CAqB3B,CAAC;AAEF,eAAO,MAAM,0BAA0B,QAChC,GAAG,YACE,GAAG,QACP,GAAG,SACF,GAAG,gBACI,MAAM,QAoErB,CAAC;AAEF,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoQrC,CAAC;AAEF,eAAO,MAAM,mCAAmC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmM/C,CAAC"}

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

@@ -21,6 +21,8 @@ export const OPERATOR_GROUPS = {
     between: 'in_the_last',
     'IS NOT': 'null_comp',
     IS: 'null_comp',
+    EQUALS: 'equals',
+    equals: 'equals',
 };
 export const getDefaultOperatorSubtrees = (key, operator, left, right, databaseType) => {
     let result = DEFAULT_OPERATOR_SUBTREES[key];
@@ -81,7 +83,14 @@ export const getDefaultOperatorSubtrees = (key, operator, left, right, databaseT
         result.left.column = left;
     }
     else if (key === 'equals') {
-        result.left.args.value[1].column = left;
+        if (databaseType === 'BigQuery') {
+            result = DEFAULT_BIG_QUERY_OPERATOR_SUBTREES['equals'];
+            result.left.args.value[0].column = left;
+            result.left.column = left;
+        }
+        else {
+            result.left.args.value[1].column = left;
+        }
     }
     else if (key === 'date') {
         result.operator = operator;
@@ -511,38 +520,42 @@ export const DEFAULT_BIG_QUERY_OPERATOR_SUBTREES = {
         operator: '=',
         left: {
             type: 'function',
-            name: 'date_trunc',
+            name: 'timestamp_trunc',
             args: {
                 type: 'expr_list',
                 value: [
                     {
-                        type: 'single_quote_string',
-                        value: 'month',
+                        type: 'column_ref',
+                        table: null,
+                        column: '',
                     },
                     {
                         type: 'column_ref',
                         table: null,
-                        column: '',
+                        column: 'YEAR',
                     },
                 ],
             },
+            over: null,
         },
         right: {
             type: 'function',
-            name: 'date_trunc',
+            name: 'timestamp_trunc',
             args: {
                 type: 'expr_list',
                 value: [
-                    {
-                        type: 'single_quote_string',
-                        value: 'month',
-                    },
                     {
                         type: 'timestamp',
                         value: '2024-01-01',
                     },
+                    {
+                        type: 'column_ref',
+                        table: null,
+                        column: 'YEAR',
+                    },
                 ],
             },
+            over: null,
         },
     },
 };

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

@@ -83,7 +83,6 @@ export interface TagWrapperProps {
     setOpenPopover: any;
     setIsPending: any;
     clearCheckboxes: any;
-    fetchSqlQuery: any;
     handleDelete: any;
     setCheckboxes: any;
     handleReplaceSubtree: any;
@@ -94,6 +93,6 @@ export interface TagWrapperProps {
     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 TagWrapper: ({ isCard, isRow, editPopoverKey, keyPrefix, formData, activeEditItem, setEditPopoverKey, setActiveEditItem, setActivePath, setOpenPopover, setIsPending, clearCheckboxes, 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":"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"}
+{"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

@@ -267,7 +267,7 @@ export const QuillLimitPopover = ({ limitLabel, onClickDelete, popoverTitle, pop
                     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, }) => {
+export const TagWrapper = ({ isCard, isRow, editPopoverKey, keyPrefix, formData, activeEditItem, setEditPopoverKey, setActiveEditItem, setActivePath, setOpenPopover, setIsPending, clearCheckboxes, handleDelete, setCheckboxes, handleReplaceSubtree, FilterPopover, getByKey, EditPopover, Button, renderNode, children, }) => {
     const [isOpen, setIsOpen] = useState(false);
     const onOpen = () => {
         setActiveEditItem(getByKey(formData, keyPrefix));
@@ -301,7 +301,6 @@ 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, onClickDelete: handleClickDelete, setIsOpen: setIsOpen, popoverChildren: _jsx(EditPopover, { Button: Button, renderNode: renderNode, activeEditItem: activeEditItem, onSave: () => {
@@ -312,7 +311,7 @@ export const TagWrapper = ({ isCard, isRow, editPopoverKey, keyPrefix, formData,
                             setOpenPopover(null);
                             setEditPopoverKey(null);
                             handleDelete(keyPrefix);
-                            fetchSqlQuery();
+                            setIsOpen(false);
                             clearCheckboxes();
                         }
                         else {
@@ -322,6 +321,7 @@ export const TagWrapper = ({ isCard, isRow, editPopoverKey, keyPrefix, formData,
                             setActiveEditItem(null);
                             setActivePath(null);
                             setOpenPopover(null);
+                            setIsOpen(false);
                             clearCheckboxes();
                         }
                     }, onDelete: () => {
@@ -330,8 +330,8 @@ export const TagWrapper = ({ isCard, isRow, editPopoverKey, keyPrefix, formData,
                         setActivePath(null);
                         setOpenPopover(null);
                         setEditPopoverKey(null);
+                        setIsOpen(false);
                         handleDelete(keyPrefix);
-                        fetchSqlQuery();
                         clearCheckboxes();
                     } }) }) })); // Make sure to close the <Tag> correctly
     }

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

@@ -21,11 +21,15 @@ export declare function formatDateComparisonNode(node: any): string | null;
 export declare function getInTheCurrentIntervalSentence(node: any, databaseType: string): string | null;
 export declare function getInTheLastIntervalSentence(node: any, databaseType: string): string | null;
 export declare function getInThePreviousIntervalSentence(node: any, databaseType: string): string | null;
+export declare function getIsEqualsSentence(node: any, databaseType: string): string | null;
+export declare function getIsAfterSentence(node: any, databaseType: string): string | null;
+export declare function getIsBeforeSentence(node: any, databaseType: string): string | null;
 export declare const isInTheLastInterval: (node: any, databaseType: string) => boolean;
-export declare const isInTheLastIntervalBigQuery: (node: any) => boolean;
+export declare const isAfter: (node: any, databaseType: string) => boolean | undefined;
+export declare const isBefore: (node: any, databaseType: string) => boolean | undefined;
 export declare const isTheCurrentInterval: (node: any, databaseType: string) => boolean;
+export declare const isEquals: (node: any, databaseType: string) => boolean;
 export declare const isThePreviousInterval: (node: any, databaseType: string) => any;
-export declare const isTheCurrentIntervalBigQuery: (node: any) => boolean;
 /**
  * Returns whether this node is the root of a binary expression
  * where the left child is a string but really should be
@@ -56,7 +60,7 @@ export declare function tryConvertDateEquality(node: any, databaseType?: string)
  * Returns whether this node is an equality of a date column with a
  * date trunc.
  */
-export declare const isDateTruncEquals: (node: any) => boolean;
+export declare const isDateTruncEquals: (node: any, databaseType?: string) => boolean;
 /**
  * Returns whether this node is an equality of a date column with extract.
  */
@@ -76,4 +80,5 @@ export declare const getDateFilterInfo: (node: 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;
+export declare function getCustomSentence(node: any, databaseType: string): string | null;
 //# 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;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"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/util.ts"],"names":[],"mappings":"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"}

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

@@ -1,7 +1,9 @@
 // A collection of reusable, pure, utility functions for the Report Builder.
-import { getQuarter } from 'date-fns';
+import { getQuarter, format, addMinutes, } from 'date-fns';
 import { DATE_DESCRIPTION_MAP } from './bigDateMap';
 import { snakeCaseToTitleCase } from '../../utils/textProcessing';
+import { isAfterBigQuery, isBeforeBigQuery, isEqualsBigQuery, isInTheLastIntervalBigQuery, isTheCurrentIntervalBigQuery, } from '../../utils/parserBigQuery';
+import { isInTheLastIntervalPostgres, isTheCurrentIntervalPostgres, } from '../../utils/parserPostgres';
 /**
  * A node that is "in" or "not in" where none of the variants are selected.
  */
@@ -134,7 +136,7 @@ const BIG_QUERY_DAY_TO_INTERVAL_MAP = {
 };
 export function getInTheLastIntervalSentence(node, databaseType) {
     if (databaseType === 'BigQuery') {
-        const dateColumn = snakeCaseToTitleCase(node.left.column);
+        const dateColumn = snakeCaseToTitleCase(node.left.column || node.left.args.value[0].columns || '');
         const amount = node.right.args.value[1].expr.value;
         let unit = node.right.args.value[1].unit.toLowerCase();
         if (unit.includes('*')) {
@@ -152,6 +154,48 @@ export function getInThePreviousIntervalSentence(node, databaseType) {
     }
     return null;
 }
+export function getIsEqualsSentence(node, databaseType) {
+    if (databaseType === 'BigQuery') {
+        const dateColumn = snakeCaseToTitleCase(node.left.args.value[1].column);
+        const type = node.right.args.value[1].column.toLowerCase();
+        const value = node.right.args.value[0].value;
+        // using date-fns can I parse the date to short month year
+        const date = new Date(value);
+        if (type === 'year') {
+            return `${dateColumn} is in ${format(addMinutes(date, date.getTimezoneOffset()), 'yyyy')}`;
+        }
+        else if (type === 'month') {
+            return `${dateColumn} is in ${format(addMinutes(date, date.getTimezoneOffset()), 'MMM yyyy')}`;
+        }
+        else if (type === 'quarter') {
+            return `${dateColumn} is in ${format(addMinutes(date, date.getTimezoneOffset()), 'QQQ yyyy')}`;
+        }
+        return `${dateColumn} is in the ${type} of ${value}`;
+    }
+    return null;
+}
+export function getIsAfterSentence(node, databaseType) {
+    if (databaseType === 'BigQuery') {
+        const dateColumn = snakeCaseToTitleCase(node.left?.column || node.left?.args?.value[0]?.columns || '');
+        const value = node.right?.value || node.right?.args?.value[0]?.value || '';
+        if (!dateColumn || !value) {
+            return null;
+        }
+        return `${dateColumn} is after ${value}`;
+    }
+    return null;
+}
+export function getIsBeforeSentence(node, databaseType) {
+    if (databaseType === 'BigQuery') {
+        const dateColumn = snakeCaseToTitleCase(node.left?.column || node.left?.args?.value[0]?.columns || '');
+        const value = node.right?.value || node.right?.args?.value[0]?.value || '';
+        if (!dateColumn || !value) {
+            return null;
+        }
+        return `${dateColumn} is before ${value}`;
+    }
+    return null;
+}
 // "created_at" >= date_trunc ('year', CURRENT_DATE) - INTERVAL '1 year'
 // or
 // "created_at" >= CURRENT_DATE - INTERVAL '1 year'
@@ -160,38 +204,17 @@ export const isInTheLastInterval = (node, databaseType) => {
     if (databaseType && databaseType.toLowerCase() === 'bigquery') {
         return isInTheLastIntervalBigQuery(node);
     }
-    const isOutsideOfDateTrunc = ['>=', '>'].includes(node.operator) &&
-        node.left.type === 'column_ref' &&
-        node.right.type === 'binary_expr' &&
-        node.right.operator === '-' &&
-        node.right.left.type === 'function' &&
-        node.right.left.name.toLowerCase() === 'date_trunc' &&
-        node.right.left.args.value[0].type === 'single_quote_string' &&
-        node.right.left.args.value[1].type === 'function' &&
-        ['current_date', 'now'].includes(node.right.left.args.value[1].name.toLowerCase()) &&
-        node.right.right.type.toLowerCase() === 'interval' &&
-        node.right.right.expr.type === 'single_quote_string';
-    const noDateTrunc = ['>=', '>'].includes(node.operator) &&
-        node.left.type === 'column_ref' &&
-        node.right.type === 'binary_expr' &&
-        node.right.operator === '-' &&
-        node.right.left.type === 'function' &&
-        ['current_date', 'now'].includes(node.right.left.name.toLowerCase()) &&
-        node.right.right.type.toLowerCase() === 'interval' &&
-        node.right.right.expr.type === 'single_quote_string';
-    return isOutsideOfDateTrunc || noDateTrunc;
+    return isInTheLastIntervalPostgres(node);
 };
-// created_at >= DATE_SUB(CURRENT_DATE(), INTERVAL 1 MONTH)
-// in the last month aka one interval from today
-export const isInTheLastIntervalBigQuery = (node) => {
-    const isOutsideOfDateTrunc = ['>=', '>'].includes(node.operator) &&
-        node.left.type === 'column_ref' &&
-        node.right.type === 'function' &&
-        node.right.name.toLowerCase() === 'timestamp_sub' &&
-        node.right.args.value[0].type === 'function' &&
-        node.right.args.value[1].type === 'interval' &&
-        ['current_timestamp'].includes(node.right.args.value[0].name.toLowerCase());
-    return isOutsideOfDateTrunc;
+export const isAfter = (node, databaseType) => {
+    if (databaseType && databaseType.toLowerCase() === 'bigquery') {
+        return isAfterBigQuery(node);
+    }
+};
+export const isBefore = (node, databaseType) => {
+    if (databaseType && databaseType.toLowerCase() === 'bigquery') {
+        return isBeforeBigQuery(node);
+    }
 };
 // "created_at" >= date_trunc ('year', CURRENT_DATE - INTERVAL '1 year')
 // this year
@@ -199,19 +222,15 @@ export const isTheCurrentInterval = (node, databaseType) => {
     if (databaseType && databaseType.toLowerCase() === 'bigquery') {
         return isTheCurrentIntervalBigQuery(node);
     }
-    const isInsideOfDateTrunc = ['AND'].includes(node.operator) &&
-        (node.left.operator === '=' || node.left.type === 'double_quote_string') &&
-        node.right.operator === '=' &&
-        node.right.name &&
-        node.right.name.toLowerCase() === 'date_trunc' &&
-        node.args.value[0].type === 'single_quote_string' &&
-        node.args.value[1].type === 'binary_expr' &&
-        node.args.value[1].operator === '-' &&
-        node.args.value[1].left.type === 'function' &&
-        ['now', 'current_date'].includes(node.args.value[1].left.name.toLowerCase()) &&
-        node.args.value[1].right.type === 'interval' &&
-        node.args.value[1].right.expr.type === 'single_quote_string';
-    return isInsideOfDateTrunc;
+    return isTheCurrentIntervalPostgres(node);
+};
+// "created_at" >= date_trunc ('year', CURRENT_DATE - INTERVAL '1 year')
+// this year
+export const isEquals = (node, databaseType) => {
+    if (databaseType && databaseType.toLowerCase() === 'bigquery') {
+        return isEqualsBigQuery(node);
+    }
+    return false;
 };
 export const isThePreviousInterval = (node, databaseType) => {
     const isInsideOfDateTrunc = ['='].includes(node.operator) &&
@@ -220,21 +239,11 @@ export const isThePreviousInterval = (node, databaseType) => {
         node.left.type === 'function' &&
         node.right.name &&
         node.right.name.toLowerCase() === 'timestamp_trunc' &&
-        node.right.args.value[0].name.toLowerCase() === 'timestamp_sub' &&
+        node.right.args.value[0]?.name?.toLowerCase() === 'timestamp_sub' &&
         node.right.args.value[0].args.value[0].name.toLowerCase() ===
             'current_timestamp';
     return isInsideOfDateTrunc;
 };
-export const isTheCurrentIntervalBigQuery = (node) => {
-    const isInsideOfDateTrunc = ['='].includes(node.operator) &&
-        node.left.type === 'function' &&
-        node.left.name &&
-        node.left.name.toLowerCase() === 'timestamp_trunc' &&
-        node.right.type === 'function' &&
-        node.right.name.toLowerCase() === 'timestamp_trunc' &&
-        node.right.args.value[0].name.toLowerCase() === 'current_timestamp';
-    return isInsideOfDateTrunc;
-};
 /**
  * Returns whether this node is the root of a binary expression
  * where the left child is a string but really should be
@@ -355,7 +364,7 @@ export function extractSuffixToString(node) {
     }
 }
 export function tryConvertDateEquality(node, databaseType) {
-    if (isDateTruncEquals(node)) {
+    if (isDateTruncEquals(node, databaseType)) {
         const columnNode = node.left.args.value[1];
         const columnName = columnNode.column ?? columnNode.value;
         const cleanColumnName = snakeCaseToTitleCase(columnName.replaceAll('_at', ''));
@@ -375,7 +384,7 @@ export function tryConvertDateEquality(node, databaseType) {
  * Returns whether this node is an equality of a date column with a
  * date trunc.
  */
-export const isDateTruncEquals = (node) => {
+export const isDateTruncEquals = (node, databaseType) => {
     return (node.type === 'binary_expr' &&
         node.operator === '=' &&
         isDateTrunc(node.left) &&
@@ -630,12 +639,21 @@ function getNodeTable(node) {
 function removeNonSelectedTableFilters(node, table, columns) {
     if (node.left.type !== 'binary_expr') {
         const referencedTable = getNodeTable(node.left);
-        const referencedColumn = node.left.column || node.left.value;
+        const referencedColumn = node.left.column ||
+            node.left.value ||
+            node.left.args?.value[0]?.column ||
+            node.left.args?.value[0]?.value;
         if ((referencedTable && referencedTable !== table) ||
             !columns.includes(referencedColumn)) {
             return null;
         }
         else {
+            if (node.left.value) {
+                node.left.column = node.left.value;
+            }
+            else if (node.left.args?.value[0].value) {
+                node.left.args.value[0].column = node.left.args.value[0].value;
+            }
             return node;
         }
     }
@@ -686,3 +704,26 @@ export function isIdColumn(columnName) {
             columnName.toLowerCase().endsWith('_id') ||
             columnName.endsWith('Id')));
 }
+// This function determines if a node is a custom node type.
+// This will parse out date filters and some numeric filters that are unique (between).
+export function getCustomSentence(node, databaseType) {
+    if (isTheCurrentInterval(node, databaseType)) {
+        return getInTheCurrentIntervalSentence(node, databaseType);
+    }
+    else if (isInTheLastInterval(node, databaseType)) {
+        return getInTheLastIntervalSentence(node, databaseType);
+    }
+    else if (isAfter(node, databaseType)) {
+        return getIsAfterSentence(node, databaseType);
+    }
+    else if (isBefore(node, databaseType)) {
+        return getIsBeforeSentence(node, databaseType);
+    }
+    else if (isThePreviousInterval(node, databaseType)) {
+        return getInThePreviousIntervalSentence(node, databaseType);
+    }
+    else if (isEquals(node, databaseType)) {
+        return getIsEqualsSentence(node, databaseType);
+    }
+    return null;
+}