@quillsql/react 2.13.42 → 2.13.44

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

@@ -0,0 +1,17 @@
+interface DraggableItemProps {
+    id: string;
+    label: string;
+    onDelete: () => void;
+    DraggableColumnComponent: (props: {
+        label: string;
+        onDelete: () => void;
+        DragHandle: ({ dragIcon }: {
+            dragIcon: () => JSX.Element;
+        }) => JSX.Element;
+        deleteDisabled?: boolean;
+    }) => JSX.Element;
+    loading: boolean;
+}
+export default function DraggableItem({ id, label, onDelete, DraggableColumnComponent, loading, }: DraggableItemProps): import("react/jsx-runtime").JSX.Element;
+export {};
+//# sourceMappingURL=DraggableItem.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"DraggableItem.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/DraggableItem.tsx"],"names":[],"mappings":"AAIA,UAAU,kBAAkB;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,wBAAwB,EAAE,CAAC,KAAK,EAAE;QAChC,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,MAAM,IAAI,CAAC;QACrB,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE;YAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,OAAO,CAAA;SAAE,KAAK,GAAG,CAAC,OAAO,CAAC;QAC3E,cAAc,CAAC,EAAE,OAAO,CAAC;KAC1B,KAAK,GAAG,CAAC,OAAO,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,EACpC,EAAE,EACF,KAAK,EACL,QAAQ,EACR,wBAAwB,EACxB,OAAO,GACR,EAAE,kBAAkB,2CA6BpB"}

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

@@ -0,0 +1,14 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useSortable } from '@dnd-kit/sortable';
+import { CSS as DND_CSS } from '@dnd-kit/utilities';
+import { snakeAndCamelCaseToTitleCase } from '../../utils/textProcessing';
+export default function DraggableItem({ id, label, onDelete, DraggableColumnComponent, loading, }) {
+    const { attributes, listeners, setNodeRef, transform, transition } = useSortable({ id: id });
+    const style = {
+        transform: DND_CSS.Transform.toString(transform),
+        transition,
+    };
+    return (_jsx("div", { style: { ...style }, ref: setNodeRef, children: _jsx(DraggableColumnComponent, { label: snakeAndCamelCaseToTitleCase(label), onDelete: onDelete, DragHandle: (props) => (_jsx("div", { style: {
+                    cursor: 'grab',
+                }, ...attributes, ...listeners, children: _jsx(props.dragIcon, {}) })), deleteDisabled: loading }) }));
+}

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

@@ -1,19 +1,13 @@
 import { InternalFilter, Operator } from '../../models/Filter';
-import { ColumnInternal } from '../../models/Columns';
+import { UniqueValuesByTable, Table, UniqueValuesByColumn } from '../../models/Tables';
 interface FilterModalProps {
-    schema?: {
-        columns: ColumnInternal[];
-    };
+    schema: Table[];
+    tables?: string[];
     filter?: InternalFilter;
-    fieldValuesMap: {
-        [key: string]: string[];
-    } | {
-        [key: string]: {
-            [key: string]: string[];
-        };
-    };
+    fieldValuesMap: UniqueValuesByColumn | UniqueValuesByTable;
     fieldValuesMapIsLoading?: boolean;
     customOperatorOptions?: OperatorOptionsMap;
+    hideTableName?: boolean;
     onSubmitFilter: (filter: InternalFilter) => void;
     onDeleteFilter: () => void;
     ButtonComponent: React.ComponentType<any>;
@@ -28,6 +22,6 @@ type OperatorOptionsMap = {
 /**
  * Modal for adding, editing, and deleting Filters
  */
-export default function FilterModal({ schema, filter, fieldValuesMap, fieldValuesMapIsLoading, customOperatorOptions, onSubmitFilter, onDeleteFilter, ButtonComponent, SelectComponent, TextInputComponent, SecondaryButtonComponent, MultiSelectComponent, }: FilterModalProps): import("react/jsx-runtime").JSX.Element | null;
+export default function FilterModal({ schema, tables, filter, fieldValuesMap, fieldValuesMapIsLoading, customOperatorOptions, hideTableName, onSubmitFilter, onDeleteFilter, ButtonComponent, SelectComponent, TextInputComponent, SecondaryButtonComponent, MultiSelectComponent, }: FilterModalProps): import("react/jsx-runtime").JSX.Element | null;
 export {};
 //# sourceMappingURL=FilterModal.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"FilterModal.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/FilterModal.tsx"],"names":[],"mappings":"AAIA,OAAO,EACL,cAAc,EAId,QAAQ,EAMT,MAAM,qBAAqB,CAAC;AAM7B,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,UAAU,gBAAgB;IACxB,MAAM,CAAC,EAAE;QAAE,OAAO,EAAE,cAAc,EAAE,CAAA;KAAE,CAAC;IACvC,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,cAAc,EACZ;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,GACzB;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG;YAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;SAAE,CAAA;KAAE,CAAC;IACnD,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,qBAAqB,CAAC,EAAE,kBAAkB,CAAC;IAC3C,cAAc,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAC;IACjD,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,kBAAkB,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC7C,wBAAwB,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACpD,oBAAoB,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;CAChD;AAQD,KAAK,kBAAkB,GAAG;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,EAAE,CAAC;CAC3B,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,MAAM,EACN,MAAM,EACN,cAAc,EACd,uBAAuB,EACvB,qBAAqB,EACrB,cAAc,EACd,cAAc,EACd,eAAe,EACf,eAAe,EACf,kBAAkB,EAClB,wBAAwB,EACxB,oBAAoB,GACrB,EAAE,gBAAgB,kDAi3BlB"}
+{"version":3,"file":"FilterModal.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/FilterModal.tsx"],"names":[],"mappings":"AAIA,OAAO,EACL,cAAc,EAId,QAAQ,EAMT,MAAM,qBAAqB,CAAC;AAO7B,OAAO,EACL,mBAAmB,EACnB,KAAK,EACL,oBAAoB,EACrB,MAAM,qBAAqB,CAAC;AAC7B,UAAU,gBAAgB;IACxB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,cAAc,EACZ,oBAAoB,GAClB,mBAAmB,CAAC;IACxB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,qBAAqB,CAAC,EAAE,kBAAkB,CAAC;IAC3C,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAC;IACjD,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,kBAAkB,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC7C,wBAAwB,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACpD,oBAAoB,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;CAChD;AAQD,KAAK,kBAAkB,GAAG;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,EAAE,CAAC;CAC3B,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,MAAM,EACN,MAAM,EACN,MAAM,EACN,cAAc,EACd,uBAAuB,EACvB,qBAAqB,EACrB,aAAa,EACb,cAAc,EACd,cAAc,EACd,eAAe,EACf,eAAe,EACf,kBAAkB,EAClB,wBAAwB,EACxB,oBAAoB,GACrB,EAAE,gBAAgB,kDAk4BlB"}

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

@@ -10,7 +10,7 @@ import { getType } from '../../utils/filterProcessing';
 /**
  * Modal for adding, editing, and deleting Filters
  */
-export default function FilterModal({ schema, filter, fieldValuesMap, fieldValuesMapIsLoading, customOperatorOptions, onSubmitFilter, onDeleteFilter, ButtonComponent, SelectComponent, TextInputComponent, SecondaryButtonComponent, MultiSelectComponent, }) {
+export default function FilterModal({ schema, tables, filter, fieldValuesMap, fieldValuesMapIsLoading, customOperatorOptions, hideTableName, onSubmitFilter, onDeleteFilter, ButtonComponent, SelectComponent, TextInputComponent, SecondaryButtonComponent, MultiSelectComponent, }) {
     const [field, setField] = useState('');
     const [fieldOptions, setFieldOptions] = useState([]);
     const [fieldValues, setFieldValues] = useState([]);
@@ -29,7 +29,7 @@ export default function FilterModal({ schema, filter, fieldValuesMap, fieldValue
     const memoizedFilter = useMemo(() => filter, [JSON.stringify(filter)]);
     useEffect(() => {
         if (!filter) {
-            onFieldChange(field, fieldOptions);
+            onFieldChange(field, fieldOptions, table);
         }
     }, [memoizedFieldValuesMap]);
     // Define all supported operator options for each field type
@@ -77,7 +77,8 @@ export default function FilterModal({ schema, filter, fieldValuesMap, fieldValue
     useEffect(() => {
         if (filter) {
             setField(filter.field);
-            onFieldChange(filter.field, fieldOptions);
+            setTable(filter.table);
+            onFieldChange(filter.field, fieldOptions, filter.table);
             setType(filter.fieldType);
             onTypeChange(filter.fieldType);
             setValue(filter.filterType === 'date-filter' ? filter.value.value : filter.value);
@@ -99,21 +100,26 @@ export default function FilterModal({ schema, filter, fieldValuesMap, fieldValue
     }, [memoizedFilter]);
     // Given the schema, set the options for the field
     useEffect(() => {
-        if (schema && schema.columns) {
-            const fo = schema.columns.map((column) => {
-                return {
-                    name: column.field,
-                    type: column.fieldType,
-                    table: column.table ?? '',
-                };
+        if (schema) {
+            const fo = schema.flatMap((table) => {
+                if (tables && !tables.includes(table.name)) {
+                    return [];
+                }
+                return table.columns.map((column) => {
+                    return {
+                        name: column.field,
+                        type: column.fieldType,
+                        table: table.name,
+                    };
+                });
             });
             setFieldOptions(fo);
             if (!filter && fo.length > 0 && fo[0]) {
                 setField(fo[0].name);
-                onFieldChange(fo[0].name, fo);
+                onFieldChange(fo[0].name, fo, fo[0].table);
             }
             else {
-                onFieldChange(field !== '' ? field : (filter?.field ?? ''), fo);
+                onFieldChange(field !== '' ? field : (filter?.field ?? ''), fo, table ?? filter?.table);
             }
         }
     }, [schema]);
@@ -206,9 +212,9 @@ export default function FilterModal({ schema, filter, fieldValuesMap, fieldValue
             setUnit('');
         }
     }
-    function onFieldChange(field, fieldOptions) {
+    function onFieldChange(field, fieldOptions, table) {
         if (field !== '') {
-            const selectedOption = fieldOptions.find((option) => option.name === field);
+            const selectedOption = fieldOptions.find((option) => option.name === field && (!table || option.table === table));
             if (selectedOption) {
                 const fieldValues = getFieldValues(selectedOption.name, selectedOption.table);
                 if (filterInitialized || !filter) {
@@ -298,10 +304,13 @@ export default function FilterModal({ schema, filter, fieldValuesMap, fieldValue
         }
     };
     const handleFieldChange = (event) => {
-        const newField = event.target.value;
-        if (typeof newField === 'string' && newField !== field) {
+        const value = event.target.value;
+        if (typeof value === 'string') {
+            const [_table, _field] = value.split(':');
+            const newField = _field;
+            const newTable = _table !== '' ? _table : undefined;
             setField(newField);
-            onFieldChange(newField, fieldOptions);
+            onFieldChange(newField, fieldOptions, newTable);
         }
     };
     // Handler for date range selection
@@ -555,10 +564,10 @@ export default function FilterModal({ schema, filter, fieldValuesMap, fieldValue
                         gap: '20px',
                         flexDirection: 'row',
                         width: '100%',
-                    }, children: [_jsx("div", { style: { display: 'flex', gap: 20 }, children: _jsx(SelectComponent, { value: field, width: 200, onChange: handleFieldChange, options: [
+                    }, children: [_jsx("div", { style: { display: 'flex', gap: 20 }, children: _jsx(SelectComponent, { value: `${table ?? ''}:${field}`, width: 200, onChange: handleFieldChange, options: [
                                     ...fieldOptions.map((option) => ({
-                                        value: option.name,
-                                        label: option.table !== ''
+                                        value: `${option.table}:${option.name}`,
+                                        label: option.table !== '' && !hideTableName
                                             ? `${snakeAndCamelCaseToTitleCase(option.name)} (${option.table})`
                                             : snakeAndCamelCaseToTitleCase(option.name),
                                     })),

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

@@ -1,24 +1,15 @@
 import { FilterTreeNode } from '../../utils/astFilterProcessing';
 import { SchemaData } from '../../models/Schema';
+import { ReportBuilderTable } from '../../models/ReportBuilder';
+import { UniqueValuesByTable } from '../../models/Tables';
 interface FilterStackProps {
     client: any;
     filterStack: FilterTreeNode[];
-    filterTree: FilterTreeNode | null;
-    defaultAST: any;
-    baseAst: any;
-    setBaseAst: any;
-    setFormData: any;
-    fetchSqlQuery: any;
+    handleFilterStackChange: (newStack: FilterTreeNode[], fetchData?: boolean) => void;
     schemaData: SchemaData;
-    defaultColumn: any;
-    defaultTable: any;
-    currentTable: any;
-    initialTableName: string;
-    globalUniqueValues: any;
-    globalUniqueValuesIsLoading: boolean;
-    columns: any;
-    removingFilter: any;
-    setRemovingFilter: any;
+    uniqueValues: UniqueValuesByTable;
+    uniqueValuesIsLoading: boolean;
+    tables: ReportBuilderTable[];
     TabsComponent: any;
     FilterPopoverComponent: any;
     FilterModal: any;
@@ -28,8 +19,8 @@ interface FilterStackProps {
     TextInputComponent: any;
     MultiSelectComponent: any;
     actionsEnabled: boolean;
-    dashboardName?: string;
+    dashboardName: string;
 }
-export default function FilterStack({ client, filterStack, filterTree, defaultAST, baseAst, setBaseAst, setFormData, fetchSqlQuery, schemaData, defaultColumn, defaultTable, currentTable, initialTableName, globalUniqueValues, globalUniqueValuesIsLoading, columns, removingFilter, setRemovingFilter, TabsComponent, FilterPopoverComponent, FilterModal, ButtonComponent, SecondaryButtonComponent, SelectComponent, TextInputComponent, MultiSelectComponent, actionsEnabled, dashboardName, }: FilterStackProps): import("react/jsx-runtime").JSX.Element;
+export default function FilterStack({ client, filterStack, handleFilterStackChange, schemaData, uniqueValues, uniqueValuesIsLoading, tables, TabsComponent, FilterPopoverComponent, FilterModal, ButtonComponent, SecondaryButtonComponent, SelectComponent, TextInputComponent, MultiSelectComponent, actionsEnabled, dashboardName, }: FilterStackProps): import("react/jsx-runtime").JSX.Element;
 export {};
 //# sourceMappingURL=FilterStack.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"FilterStack.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/FilterStack.tsx"],"names":[],"mappings":"AAGA,OAAO,EACL,cAAc,EAEf,MAAM,iCAAiC,CAAC;AASzC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,UAAU,gBAAgB;IACxB,MAAM,EAAE,GAAG,CAAC;IACZ,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B,UAAU,EAAE,cAAc,GAAG,IAAI,CAAC;IAClC,UAAU,EAAE,GAAG,CAAC;IAChB,OAAO,EAAE,GAAG,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;IAChB,WAAW,EAAE,GAAG,CAAC;IACjB,aAAa,EAAE,GAAG,CAAC;IACnB,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,GAAG,CAAC;IACnB,YAAY,EAAE,GAAG,CAAC;IAClB,YAAY,EAAE,GAAG,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,kBAAkB,EAAE,GAAG,CAAC;IACxB,2BAA2B,EAAE,OAAO,CAAC;IACrC,OAAO,EAAE,GAAG,CAAC;IACb,cAAc,EAAE,GAAG,CAAC;IACpB,iBAAiB,EAAE,GAAG,CAAC;IACvB,aAAa,EAAE,GAAG,CAAC;IACnB,sBAAsB,EAAE,GAAG,CAAC;IAC5B,WAAW,EAAE,GAAG,CAAC;IACjB,eAAe,EAAE,GAAG,CAAC;IACrB,wBAAwB,EAAE,GAAG,CAAC;IAC9B,eAAe,EAAE,GAAG,CAAC;IACrB,kBAAkB,EAAE,GAAG,CAAC;IACxB,oBAAoB,EAAE,GAAG,CAAC;IAC1B,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,MAAM,EACN,WAAW,EACX,UAAU,EACV,UAAU,EACV,OAAO,EACP,UAAU,EACV,WAAW,EACX,aAAa,EACb,UAAU,EACV,aAAa,EACb,YAAY,EACZ,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EAClB,2BAA2B,EAC3B,OAAO,EACP,cAAc,EACd,iBAAiB,EACjB,aAAa,EACb,sBAAsB,EACtB,WAAW,EACX,eAAe,EACf,wBAAwB,EACxB,eAAe,EACf,kBAAkB,EAClB,oBAAoB,EACpB,cAAqB,EACrB,aAAa,GACd,EAAE,gBAAgB,2CAiLlB"}
+{"version":3,"file":"FilterStack.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/FilterStack.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAKjE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE1D,UAAU,gBAAgB;IACxB,MAAM,EAAE,GAAG,CAAC;IACZ,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B,uBAAuB,EAAE,CACvB,QAAQ,EAAE,cAAc,EAAE,EAC1B,SAAS,CAAC,EAAE,OAAO,KAChB,IAAI,CAAC;IACV,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,mBAAmB,CAAC;IAClC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,MAAM,EAAE,kBAAkB,EAAE,CAAC;IAC7B,aAAa,EAAE,GAAG,CAAC;IACnB,sBAAsB,EAAE,GAAG,CAAC;IAC5B,WAAW,EAAE,GAAG,CAAC;IACjB,eAAe,EAAE,GAAG,CAAC;IACrB,wBAAwB,EAAE,GAAG,CAAC;IAC9B,eAAe,EAAE,GAAG,CAAC;IACrB,kBAAkB,EAAE,GAAG,CAAC;IACxB,oBAAoB,EAAE,GAAG,CAAC;IAC1B,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,MAAM,EACN,WAAW,EACX,uBAAuB,EACvB,UAAU,EACV,YAAY,EACZ,qBAAqB,EACrB,MAAM,EACN,aAAa,EACb,sBAAsB,EACtB,WAAW,EACX,eAAe,EACf,wBAAwB,EACxB,eAAe,EACf,kBAAkB,EAClB,oBAAoB,EACpB,cAAqB,EACrB,aAAa,GACd,EAAE,gBAAgB,2CAoFlB"}

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

@@ -1,12 +1,10 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { QUILL_SERVER } from '../../utils/constants';
-import { filterTreeToAst, } from '../../utils/astFilterProcessing';
-import { getAllPossibleColumns } from '../../utils/astProcessing';
-import { filterSentence, filterStackToFilterTree, } from '../../utils/filterProcessing';
+import { filterSentence } from '../../utils/filterProcessing';
 import { DEFAULT_TAB_OPTIONS } from '../UiComponents';
 import { FilterPopoverWrapper } from './ui';
 import { deepCopy } from './util';
-export default function FilterStack({ client, filterStack, filterTree, defaultAST, baseAst, setBaseAst, setFormData, fetchSqlQuery, schemaData, defaultColumn, defaultTable, currentTable, initialTableName, globalUniqueValues, globalUniqueValuesIsLoading, columns, removingFilter, setRemovingFilter, TabsComponent, FilterPopoverComponent, FilterModal, ButtonComponent, SecondaryButtonComponent, SelectComponent, TextInputComponent, MultiSelectComponent, actionsEnabled = true, dashboardName, }) {
+export default function FilterStack({ client, filterStack, handleFilterStackChange, schemaData, uniqueValues, uniqueValuesIsLoading, tables, TabsComponent, FilterPopoverComponent, FilterModal, ButtonComponent, SecondaryButtonComponent, SelectComponent, TextInputComponent, MultiSelectComponent, actionsEnabled = true, dashboardName, }) {
     return (_jsx("div", { style: {
             display: 'flex',
             flexDirection: 'column',
@@ -17,101 +15,37 @@ export default function FilterStack({ client, filterStack, filterTree, defaultAS
                         marginBottom: '8px',
                         marginTop: '8px',
                     }, children: _jsx(TabsComponent, { value: item.operator.toUpperCase(), options: DEFAULT_TAB_OPTIONS, onChange: () => {
+                            const newItem = { ...item };
                             if (item.operator === 'and') {
-                                item.operator = 'or';
+                                newItem.operator = 'or';
                             }
                             else {
-                                item.operator = 'and';
+                                newItem.operator = 'and';
                             }
-                            let newFormData = null;
-                            if (filterTree) {
-                                newFormData = filterTreeToAst(filterTree, client.databaseType.toLowerCase());
-                            }
-                            const newAst = deepCopy({
-                                ...defaultAST,
-                                ...baseAst,
-                                ...(!baseAst?.columns && {
-                                    columns: getAllPossibleColumns(baseAst, schemaData.schemaWithCustomFields).map((c) => {
-                                        const newColumn = deepCopy(defaultColumn);
-                                        newColumn.expr.column = c.field;
-                                        return newColumn;
-                                    }),
-                                }),
-                                ...(!baseAst?.from && {
-                                    from: [{ ...defaultTable, table: initialTableName }],
-                                }),
-                                where: newFormData,
-                            });
-                            setBaseAst(newAst);
-                            setFormData(newFormData);
-                            fetchSqlQuery(newAst, newFormData);
+                            const newStack = deepCopy(filterStack);
+                            newStack[index] = { ...newItem };
+                            handleFilterStackChange(newStack, true);
                         } }) }, index));
             }
             else if (item.value) {
-                return (_jsx(FilterPopoverWrapper, { schema: schemaData.schemaWithCustomFields.find((s) => s.name === currentTable || s.displayName === currentTable) ?? schemaData.schemaWithCustomFields[0], filter: item.value, filterLabel: item.value ? filterSentence(item.value) : '', index: index, FilterTagComponent: FilterPopoverComponent, FilterModal: FilterModal, fieldValuesMap: globalUniqueValues, fieldValuesMapIsLoading: globalUniqueValuesIsLoading, priorFilters: filterStack.slice(0, index > 0 ? index - 1 : 0), columns: columns, client: client, customFields: schemaData.customFields, baseAst: baseAst, endpoint: QUILL_SERVER, ButtonComponent: ButtonComponent, SecondaryButtonComponent: SecondaryButtonComponent, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, MultiSelectComponent: MultiSelectComponent, handleFilterSave: (filter) => {
-                        item.value = filter;
-                        let newFormData = null;
-                        if (filterTree) {
-                            newFormData = filterTreeToAst(filterTree, client.databaseType.toLowerCase());
-                        }
-                        const newAst = deepCopy({
-                            ...defaultAST,
-                            ...baseAst,
-                            ...(!baseAst?.columns && {
-                                columns: getAllPossibleColumns(baseAst, schemaData.schemaWithCustomFields).map((c) => {
-                                    const newColumn = deepCopy(defaultColumn);
-                                    newColumn.expr.column = c.field;
-                                    return newColumn;
-                                }),
-                            }),
-                            ...(!baseAst?.from && {
-                                from: [{ ...defaultTable, table: initialTableName }],
-                            }),
-                            where: newFormData,
-                        });
-                        setBaseAst(newAst);
-                        setFormData(newFormData);
-                        fetchSqlQuery(newAst, newFormData);
+                return (_jsx(FilterPopoverWrapper, { schema: schemaData.schemaWithCustomFields, filter: item.value, filterLabel: item.value ? filterSentence(item.value) : '', index: index, FilterTagComponent: FilterPopoverComponent, FilterModal: FilterModal, fieldValuesMap: uniqueValues, fieldValuesMapIsLoading: uniqueValuesIsLoading, priorFilters: filterStack.slice(0, index > 0 ? index - 1 : 0), tables: tables, client: client, customFields: schemaData.customFields, endpoint: QUILL_SERVER, ButtonComponent: ButtonComponent, SecondaryButtonComponent: SecondaryButtonComponent, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, MultiSelectComponent: MultiSelectComponent, handleFilterSave: (filter) => {
+                        const newStack = deepCopy(filterStack);
+                        newStack[index] = { ...item, value: filter };
+                        handleFilterStackChange(newStack, true);
                     }, handleFilterDelete: (i) => {
-                        if (!removingFilter) {
-                            setRemovingFilter(true);
-                            const newStack = filterStack;
-                            if (i > 0) {
-                                newStack.splice(i - 1, 2);
+                        const newStack = deepCopy(filterStack);
+                        if (i > 0) {
+                            newStack.splice(i - 1, 2);
+                        }
+                        else {
+                            if (filterStack.length > 1) {
+                                newStack.splice(i, 2);
                             }
                             else {
-                                if (filterStack.length > 1) {
-                                    newStack.splice(i, 2);
-                                }
-                                else {
-                                    newStack.splice(i, 1);
-                                }
-                            }
-                            const tree = filterStackToFilterTree(newStack);
-                            let newFormData = null;
-                            if (tree) {
-                                newFormData = filterTreeToAst(tree, client.databaseType.toLowerCase());
+                                newStack.splice(i, 1);
                             }
-                            const newAst = deepCopy({
-                                ...defaultAST,
-                                ...baseAst,
-                                ...(!baseAst?.columns && {
-                                    columns: getAllPossibleColumns(baseAst, schemaData.schemaWithCustomFields).map((c) => {
-                                        const newColumn = deepCopy(defaultColumn);
-                                        newColumn.expr.column = c.field;
-                                        return newColumn;
-                                    }),
-                                }),
-                                ...(!baseAst?.from && {
-                                    from: [{ ...defaultTable, table: initialTableName }],
-                                }),
-                                where: newFormData,
-                            });
-                            setBaseAst(newAst);
-                            setFormData(newFormData);
-                            fetchSqlQuery(newAst, newFormData);
-                            setRemovingFilter(false);
                         }
+                        handleFilterStackChange(newStack, true);
                     }, disabled: !actionsEnabled, dashboardName: dashboardName }, `filter_${index}_${item.value ? filterSentence(item.value) : ''}`));
             }
         }) }));

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

@@ -89,9 +89,9 @@ export function convertBigQuery(ast) {
         recursiveSearchAndReplaceByKey(newAst.where, 'week', '* 7 DAY', 'unit');
         recursiveSearchAndReplaceByKey(newAst.where, 'month', '* 30 DAY', 'unit');
         // TODO: handle joins nicely
-        if (newAst.from && newAst.from.length > 1) {
-            newAst.from = [newAst.from[0]];
-        }
+        // if (newAst.from && newAst.from.length > 1) {
+        //   newAst.from = [newAst.from![0]!];
+        // }
         // TODO: handle UNION ALL joins
         if (newAst._next) {
             delete newAst._next;
@@ -100,9 +100,9 @@ export function convertBigQuery(ast) {
     }
     else {
         // TODO: handle joins nicely
-        if (ast.from && ast.from.length > 1) {
-            ast.from = [ast.from[0]];
-        }
+        // if (ast.from && ast.from.length > 1) {
+        //   ast.from = [ast.from![0]!];
+        // }
         // TODO: handle UNION ALL joins
         if (ast._next) {
             delete ast._next;

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

@@ -1,9 +1,10 @@
 import { ReactNode } from 'react';
 import { SidebarComponentProps, ContainerComponentProps } from '../UiComponents';
 import { InternalFilter } from '../../models/Filter';
-import { ColumnInternal } from '../../models/Columns';
 import { FilterTreeNode } from '../../utils/astFilterProcessing';
 import { QuillProviderClient } from '../../models/Client';
+import { ReportBuilderState, ReportBuilderTable } from '../../models/ReportBuilder';
+import { UniqueValuesByTable, Table } from '../../models/Tables';
 /**
  * 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
@@ -104,21 +105,19 @@ export interface TagWrapperProps {
 export declare const TagWrapper: ({ isCard, isRow, editPopoverKey, keyPrefix, formData, activeEditItem, setEditPopoverKey, setActiveEditItem, setActivePath, setOpenPopover, setIsPending, clearCheckboxes, handleDelete, setCheckboxes, handleReplaceSubtree, FilterPopover, getByKey, EditPopover, Button, SecondaryButton, renderNode, children, }: TagWrapperProps) => import("react/jsx-runtime").JSX.Element;
 export declare const AddFilterPopover: ({ onSave, Button, renderNode, activeEditItem, }: any) => import("react/jsx-runtime").JSX.Element;
 export interface FilterPopoverWrapperProps {
-    schema?: {
-        columns: ColumnInternal[];
-    };
+    reportBuilderState?: ReportBuilderState;
+    schema: Table[];
     filter: InternalFilter;
     filterLabel: string;
     index: number;
     FilterTagComponent: any;
     FilterModal: any;
-    fieldValuesMap: any;
+    fieldValuesMap: UniqueValuesByTable;
     fieldValuesMapIsLoading?: boolean;
     priorFilters?: FilterTreeNode[];
-    columns?: ColumnInternal[];
+    tables?: ReportBuilderTable[];
     client?: QuillProviderClient;
     customFields?: any;
-    baseAst?: any;
     endpoint?: string;
     customOperatorOptions?: any;
     ButtonComponent: any;
@@ -130,7 +129,7 @@ export interface FilterPopoverWrapperProps {
     handleFilterSave: (filter: InternalFilter) => void;
     disabled?: boolean;
     containerStyle?: any;
-    dashboardName?: string;
+    dashboardName: string;
 }
-export declare const FilterPopoverWrapper: ({ schema, filter, filterLabel, index, FilterTagComponent, FilterModal, fieldValuesMap, fieldValuesMapIsLoading, priorFilters, columns, client, customFields, baseAst, endpoint, customOperatorOptions, ButtonComponent, SecondaryButtonComponent, SelectComponent, TextInputComponent, MultiSelectComponent, handleFilterDelete, handleFilterSave, disabled, containerStyle, dashboardName, }: FilterPopoverWrapperProps) => import("react/jsx-runtime").JSX.Element;
+export declare const FilterPopoverWrapper: ({ reportBuilderState, schema, filter, filterLabel, index, FilterTagComponent, FilterModal, fieldValuesMap, fieldValuesMapIsLoading, priorFilters, tables, client, endpoint, customOperatorOptions, ButtonComponent, SecondaryButtonComponent, SelectComponent, TextInputComponent, MultiSelectComponent, handleFilterDelete, handleFilterSave, disabled, containerStyle, dashboardName, }: FilterPopoverWrapperProps) => 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

@@ -1,10 +1,10 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { forwardRef, useContext, useEffect, useRef, useState, } from 'react';
+import { forwardRef, useContext, useEffect, useMemo, useRef, useState, } from 'react';
 import { MemoizedCheckbox, LoadingSpinner, MemoizedPopover, } from '../UiComponents';
 import { TenantContext, ThemeContext } from '../../Context';
 import { isNodeEmptyCollection, allNumericNodesValidInTree } from './util';
-import { buildQueryFromFilters, uniqueValuesToStringMap, } from '../../utils/filterProcessing';
-import { getRelevantInfoFromQuery } from '../../utils/tableProcessing';
+import { buildQueryFromFilters } from '../../utils/filterProcessing';
+import { getUniqueStringValuesByTable } from '../../utils/tableProcessing';
 /**
  * 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
@@ -364,13 +364,27 @@ export const AddFilterPopover = ({ onSave, Button, renderNode, activeEditItem, }
                     justifyContent: 'end',
                 }, children: _jsx(Button, { onClick: handleOnClick, label: 'Add filter' }) })] }));
 };
-export const FilterPopoverWrapper = ({ schema, filter, filterLabel, index, FilterTagComponent, FilterModal, fieldValuesMap, fieldValuesMapIsLoading, priorFilters, columns, client, customFields, baseAst, endpoint, customOperatorOptions, ButtonComponent, SecondaryButtonComponent, SelectComponent, TextInputComponent, MultiSelectComponent, handleFilterDelete, handleFilterSave, disabled, containerStyle, dashboardName, }) => {
+export const FilterPopoverWrapper = ({ reportBuilderState, schema, filter, filterLabel, index, FilterTagComponent, FilterModal, fieldValuesMap, fieldValuesMapIsLoading, priorFilters, tables, client, endpoint, customOperatorOptions, ButtonComponent, SecondaryButtonComponent, SelectComponent, TextInputComponent, MultiSelectComponent, handleFilterDelete, handleFilterSave, disabled, containerStyle, dashboardName, }) => {
     const { tenants } = useContext(TenantContext);
     const [isOpen, setIsOpen] = useState(false);
     const [uniqueValues, setUniqueValues] = useState(undefined);
     const [uniqueValuesIsLoading, setUniqueValuesIsLoading] = useState(false);
     // Use a ref to store the previous value of priorFilters
     const prevFiltersRef = useRef('');
+    const columnInternals = useMemo(() => {
+        if (!tables) {
+            return null;
+        }
+        const relevantColumns = tables.flatMap((table) => {
+            const schemaTable = schema.find((s) => s.name === table.name);
+            const columns = schemaTable ? schemaTable.columns : [];
+            return columns.map((column) => ({
+                ...column,
+                table: table.name,
+            }));
+        });
+        return relevantColumns;
+    }, [schema, tables]);
     useEffect(() => {
         const currentFiltersString = JSON.stringify(priorFilters);
         if (currentFiltersString !== prevFiltersRef.current) {
@@ -382,17 +396,25 @@ export const FilterPopoverWrapper = ({ schema, filter, filterLabel, index, Filte
     }, [priorFilters]);
     // This function retrieves the appropriate unique values given a set of filters
     async function getFieldValuesMapByFilters(filters) {
-        if (!columns || !client || !endpoint || !baseAst) {
+        if (!columnInternals ||
+            !tables ||
+            !client ||
+            !endpoint ||
+            !reportBuilderState) {
             return;
         }
         else {
             setUniqueValuesIsLoading(true);
-            const { query, success, error } = await buildQueryFromFilters(baseAst, filters, endpoint, client);
+            const { query, success, error } = await buildQueryFromFilters(reportBuilderState, filters, endpoint, client);
             if (success && query) {
-                const { uniqueStrings } = await getRelevantInfoFromQuery(columns, client, tenants, query, customFields, dashboardName);
-                const fieldValues = uniqueStrings && Object.keys(uniqueStrings).length !== 0
-                    ? uniqueValuesToStringMap(uniqueStrings)
-                    : fieldValuesMap; // Fallback in case Promise comes up empty
+                const uniqueStrings = await getUniqueStringValuesByTable({
+                    tables: tables.map((table) => table.name),
+                    columns: columnInternals,
+                    client,
+                    tenants,
+                    dashboardName,
+                });
+                const fieldValues = uniqueStrings ? uniqueStrings : fieldValuesMap; // Fallback in case Promise comes up empty
                 setUniqueValues(fieldValues);
             }
             else if (error) {
@@ -404,7 +426,7 @@ export const FilterPopoverWrapper = ({ schema, filter, filterLabel, index, Filte
     function handleClickDelete() {
         handleFilterDelete(index);
     }
-    return (_jsx("div", { style: containerStyle, children: _jsx(FilterTagComponent, { isOpen: isOpen, popoverTitle: "Edit Filter", filterLabel: filterLabel, onClickDelete: handleClickDelete, disabled: disabled, setIsOpen: setIsOpen, popoverChildren: _jsx(FilterModal, { schema: schema, filter: filter, fieldValuesMap: uniqueValues ?? fieldValuesMap, fieldValuesMapIsLoading: fieldValuesMapIsLoading && uniqueValuesIsLoading, customOperatorOptions: customOperatorOptions, onSubmitFilter: (filter) => {
+    return (_jsx("div", { style: containerStyle, children: _jsx(FilterTagComponent, { isOpen: isOpen, popoverTitle: "Edit Filter", filterLabel: filterLabel, onClickDelete: handleClickDelete, disabled: disabled, setIsOpen: setIsOpen, popoverChildren: _jsx(FilterModal, { schema: schema, tables: tables?.map((table) => table.name), filter: filter, fieldValuesMap: uniqueValues ?? fieldValuesMap, fieldValuesMapIsLoading: fieldValuesMapIsLoading && uniqueValuesIsLoading, customOperatorOptions: customOperatorOptions, hideTableName: tables?.length === 1, onSubmitFilter: (filter) => {
                     handleFilterSave(filter);
                     setIsOpen(false);
                 }, onDeleteFilter: handleClickDelete, ButtonComponent: ButtonComponent, SelectComponent: SelectComponent, TextInputComponent: TextInputComponent, SecondaryButtonComponent: SecondaryButtonComponent ?? undefined, MultiSelectComponent: MultiSelectComponent }) }) }));

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

@@ -1,3 +1,4 @@
+import { UniqueValuesByColumn } from '../../models/Tables';
 /**
  * A node that is "in" or "not in" where none of the variants are selected.
  */
@@ -69,11 +70,7 @@ export declare const getDateFilterInfo: (node: any) => {
     intervalType: any;
     intervalPaths: any;
 };
-export declare function removeNonSelectedTableReferences(ast: any, table: string, columns: string[], uniqueValues: {
-    [column: string]: {
-        [value: string]: boolean;
-    };
-} | null): any;
+export declare function removeNonSelectedTableReferences(ast: any, table: string, columns: string[], uniqueValues: UniqueValuesByColumn | null): any;
 export declare function removeTableNameAlias(ast: any, schema: any): any;
 export declare function allNumericNodesValidInTree(node: any): boolean;
 export declare function isIdColumn(columnName?: string): boolean | "" | undefined;

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":"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"}
+{"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

@@ -648,7 +648,7 @@ function removeNonSelectedTableFilters(node, table, columns, uniqueValues) {
                 const field = getFieldFromExpression(value);
                 const check = field &&
                     uniqueValues[referencedColumn] &&
-                    Object.keys(uniqueValues[referencedColumn]).includes(field);
+                    uniqueValues[referencedColumn].includes(field);
                 return check;
             });
             if (!node.right.value || !node.right.value.length) {