@quillsql/react 2.13.44 → 2.13.46

package/dist/cjs/components/QuillTable.js

@@ -112,7 +112,7 @@ function QuillTable({ rows, rowCount, rowCountIsLoading, columns, isLoading, cur
         }, className: className, children: (0, jsx_runtime_1.jsx)("div", { style: {
                 height: '100%',
                 width: '100%',
-                overflow: 'auto',
+                overflow: 'flex',
                 borderRadius: 6,
                 border: '1px solid #E7E7E7',
                 padding: 0,
@@ -127,66 +127,68 @@ function QuillTable({ rows, rowCount, rowCountIsLoading, columns, isLoading, cur
                     width: '100%',
                     height: '100%',
                     minHeight: '260px',
-                }, children: [(0, jsx_runtime_1.jsx)("div", { style: { overflow: 'auto', flexGrow: 1 }, children: (0, jsx_runtime_1.jsxs)("div", { style: { minWidth: '100%', display: 'inline-block' }, children: [(0, jsx_runtime_1.jsx)("div", { className: "thead", style: {
-                                        position: 'sticky',
-                                        top: 0,
-                                        zIndex: 1,
-                                        background: 'white',
-                                    }, children: (0, jsx_runtime_1.jsx)("div", { role: "row", className: "tr", style: {
-                                            display: 'flex',
-                                            flex: '1 0 auto',
-                                            minWidth: '100px',
+                }, children: [(0, jsx_runtime_1.jsx)("div", { className: "thead-container", style: {
+                            width: '100%',
+                            background: 'white',
+                        }, children: (0, jsx_runtime_1.jsx)("div", { className: "thead", children: (0, jsx_runtime_1.jsx)("div", { role: "row", className: "tr", style: {
+                                    display: 'flex',
+                                    flex: '1 0 auto',
+                                    minWidth: '100px',
+                                    boxSizing: 'border-box',
+                                    marginBottom: '-1px',
+                                }, children: columns &&
+                                    columns.map((column, index) => ((0, jsx_runtime_1.jsxs)("div", { onClick: (e) => {
+                                            toggleSort(column);
+                                            e.stopPropagation();
+                                        }, style: {
                                             boxSizing: 'border-box',
-                                            marginBottom: '-1px', // avoid double border
-                                        }, children: columns &&
-                                            columns.map((column, index) => ((0, jsx_runtime_1.jsxs)("div", { onClick: (e) => {
-                                                    toggleSort(column);
-                                                    e.stopPropagation();
-                                                }, style: {
-                                                    boxSizing: 'border-box',
-                                                    flex: '150 0 auto',
-                                                    minWidth: '50px',
-                                                    width: '150px',
-                                                    position: 'relative',
-                                                    cursor: 'pointer',
-                                                    background: 'rgb(249, 250, 251)',
-                                                    borderRight: index + 1 === columns.length
-                                                        ? '0px solid #E7E7E7'
-                                                        : '1px solid #E7E7E7',
-                                                    borderBottom: '1px solid #E7E7E7',
-                                                    whiteSpace: 'nowrap',
-                                                    alignItems: 'center',
-                                                    overflowX: 'visible',
-                                                    margin: '0px',
+                                            flex: '150 0 auto',
+                                            minWidth: '50px',
+                                            width: '150px',
+                                            position: 'relative',
+                                            cursor: 'pointer',
+                                            background: 'rgb(249, 250, 251)',
+                                            borderRight: index + 1 === columns.length
+                                                ? '0px solid #E7E7E7'
+                                                : '1px solid #E7E7E7',
+                                            borderBottom: '1px solid #E7E7E7',
+                                            whiteSpace: 'nowrap',
+                                            alignItems: 'center',
+                                            overflowX: 'visible',
+                                            margin: '0px',
+                                            textOverflow: 'ellipsis',
+                                            minHeight: '36px',
+                                            userSelect: 'none',
+                                            paddingLeft: 16,
+                                            paddingRight: 16,
+                                            display: 'flex',
+                                            flexDirection: 'row',
+                                            justifyContent: 'space-between',
+                                        }, children: [(0, jsx_runtime_1.jsx)("div", { "aria-haspopup": "dialog", "aria-expanded": "false", "aria-controls": "mantine-r6-dropdown", style: {
+                                                    // fontFamily:
+                                                    //   'Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"',
+                                                    WebkitTapHighlightColor: 'transparent',
+                                                    fontFamily: theme?.fontFamily,
+                                                    // color: 'rgb(55, 65, 81)',
+                                                    color: theme?.primaryTextColor,
+                                                    textDecoration: 'none',
+                                                    fontSize: theme?.fontSizeSmall || '14px',
+                                                    fontWeight: theme?.fontWeightMedium || '500',
+                                                    lineHeight: '20px', // 1.25rem * 16px = 20px
                                                     textOverflow: 'ellipsis',
-                                                    minHeight: '36px',
-                                                    userSelect: 'none',
-                                                    paddingLeft: 16,
-                                                    paddingRight: 16,
-                                                    display: 'flex',
-                                                    flexDirection: 'row',
-                                                    justifyContent: 'space-between',
-                                                }, children: [(0, jsx_runtime_1.jsx)("div", { "aria-haspopup": "dialog", "aria-expanded": "false", "aria-controls": "mantine-r6-dropdown", style: {
-                                                            // fontFamily:
-                                                            //   'Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"',
-                                                            WebkitTapHighlightColor: 'transparent',
-                                                            fontFamily: theme?.fontFamily,
-                                                            // color: 'rgb(55, 65, 81)',
-                                                            color: theme?.primaryTextColor,
-                                                            textDecoration: 'none',
-                                                            fontSize: theme?.fontSizeSmall || '14px',
-                                                            fontWeight: theme?.fontWeightMedium || '500',
-                                                            lineHeight: '20px', // 1.25rem * 16px = 20px
-                                                            textOverflow: 'ellipsis',
-                                                            whiteSpace: 'nowrap',
-                                                            overflow: 'hidden',
-                                                        }, children: hideLabels || !column.label
-                                                            ? column.field
-                                                            : column.label }), column.field === sortColumn && ((0, jsx_runtime_1.jsx)("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 20 20", fill: theme?.primaryTextColor, height: "14px", width: "14px", style: {
-                                                            transform: sortDirection === 'desc'
-                                                                ? 'rotate(180deg)'
-                                                                : undefined,
-                                                        }, children: (0, jsx_runtime_1.jsx)("path", { fillRule: "evenodd", d: "M10 3a.75.75 0 01.75.75v10.638l3.96-4.158a.75.75 0 111.08 1.04l-5.25 5.5a.75.75 0 01-1.08 0l-5.25-5.5a.75.75 0 111.08-1.04l3.96 4.158V3.75A.75.75 0 0110 3z", clipRule: "evenodd" }) }))] }, 'sqlcol' + index))) }) }), (isPaginating || isLoading) && ((0, jsx_runtime_1.jsx)("div", { className: className, style: { position: 'absolute', width: '100%' }, children: (0, jsx_runtime_1.jsx)(LoadingComponent, {}) })), (activeRows && activeRows.length === 0) ||
+                                                    whiteSpace: 'nowrap',
+                                                    overflow: 'hidden',
+                                                }, children: hideLabels || !column.label
+                                                    ? column.field
+                                                    : column.label }), column.field === sortColumn && ((0, jsx_runtime_1.jsx)("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 20 20", fill: theme?.primaryTextColor, height: "14px", width: "14px", style: {
+                                                    transform: sortDirection === 'desc'
+                                                        ? 'rotate(180deg)'
+                                                        : undefined,
+                                                }, children: (0, jsx_runtime_1.jsx)("path", { fillRule: "evenodd", d: "M10 3a.75.75 0 01.75.75v10.638l3.96-4.158a.75.75 0 111.08 1.04l-5.25 5.5a.75.75 0 01-1.08 0l-5.25-5.5a.75.75 0 111.08-1.04l3.96 4.158V3.75A.75.75 0 0110 3z", clipRule: "evenodd" }) }))] }, 'sqlcol' + index))) }) }) }), (0, jsx_runtime_1.jsx)("div", { style: {
+                            overflow: 'auto',
+                            flexGrow: 1,
+                            position: 'relative',
+                        }, children: (0, jsx_runtime_1.jsxs)("div", { style: { minWidth: '100%' }, children: [(isPaginating || isLoading) && ((0, jsx_runtime_1.jsx)("div", { className: className, style: { position: 'absolute', width: '100%' }, children: (0, jsx_runtime_1.jsx)(LoadingComponent, {}) })), (activeRows && activeRows.length === 0) ||
                                     (columns && columns.length === 0) ? ((0, jsx_runtime_1.jsx)("div", { style: {
                                         padding: '30px 0',
                                         display: isPaginating || isLoading ? 'none' : 'flex',

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

@@ -2,11 +2,14 @@ import React from 'react';
 import { TextInputComponentProps } from '../UiComponents';
 import { Table } from '../../models/Tables';
 import { ReportBuilderColumn, ReportBuilderTable } from '../../models/ReportBuilder';
-export default function AddColumnModal({ onSave, selectedColumns, schema, schemaLoading, TextInputComponent, SelectColumn, SecondaryButton, Button, ColumnSearchEmptyState, LoadingComponent, }: {
+import { ForeignKeyMap } from './schema';
+export default function AddColumnModal({ onSave, selectedTables, selectedColumns, schema, schemaLoading, foreignKeyMap, TextInputComponent, SelectColumn, SecondaryButton, Button, ColumnSearchEmptyState, LoadingComponent, }: {
     onSave: (newTables: ReportBuilderTable[], newColumns: ReportBuilderColumn[]) => void;
+    selectedTables: ReportBuilderTable[];
     selectedColumns: ReportBuilderColumn[];
     schema: Table[];
     schemaLoading?: boolean;
+    foreignKeyMap: ForeignKeyMap;
     TextInputComponent: ((props: TextInputComponentProps) => JSX.Element) | React.ForwardRefExoticComponent<TextInputComponentProps & React.RefAttributes<HTMLInputElement>>;
     SelectColumn: (props: {
         label: string;

package/dist/cjs/components/ReportBuilder/AddColumnModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AddColumnModal.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/AddColumnModal.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA+C,MAAM,OAAO,CAAC;AAiBpE,OAAO,EAGL,uBAAuB,EACxB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EAEL,mBAAmB,EACnB,kBAAkB,EACnB,MAAM,4BAA4B,CAAC;AAGpC,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EACrC,MAAM,EAEN,eAAe,EACf,MAAM,EACN,aAAa,EACb,kBAAkB,EAClB,YAAY,EACZ,eAAe,EACf,MAAM,EACN,sBAAoD,EACpD,gBAAwC,GACzC,EAAE;IACD,MAAM,EAAE,CACN,SAAS,EAAE,kBAAkB,EAAE,EAC/B,UAAU,EAAE,mBAAmB,EAAE,KAC9B,IAAI,CAAC;IAEV,eAAe,EAAE,mBAAmB,EAAE,CAAC;IACvC,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,kBAAkB,EACd,CAAC,CAAC,KAAK,EAAE,uBAAuB,KAAK,GAAG,CAAC,OAAO,CAAC,GACjD,KAAK,CAAC,yBAAyB,CAC7B,uBAAuB,GAAG,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAChE,CAAC;IACN,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;IACZ,sBAAsB,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IAC1C,gBAAgB,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;CACrC,2CA0UA"}
+{"version":3,"file":"AddColumnModal.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/AddColumnModal.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA+C,MAAM,OAAO,CAAC;AAiBpE,OAAO,EAGL,uBAAuB,EACxB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EAEL,mBAAmB,EACnB,kBAAkB,EACnB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EACrC,MAAM,EACN,cAAc,EACd,eAAe,EACf,MAAM,EACN,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,YAAY,EACZ,eAAe,EACf,MAAM,EACN,sBAAoD,EACpD,gBAAwC,GACzC,EAAE;IACD,MAAM,EAAE,CACN,SAAS,EAAE,kBAAkB,EAAE,EAC/B,UAAU,EAAE,mBAAmB,EAAE,KAC9B,IAAI,CAAC;IACV,cAAc,EAAE,kBAAkB,EAAE,CAAC;IACrC,eAAe,EAAE,mBAAmB,EAAE,CAAC;IACvC,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,aAAa,CAAC;IAC7B,kBAAkB,EACd,CAAC,CAAC,KAAK,EAAE,uBAAuB,KAAK,GAAG,CAAC,OAAO,CAAC,GACjD,KAAK,CAAC,yBAAyB,CAC7B,uBAAuB,GAAG,KAAK,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAChE,CAAC;IACN,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;IACZ,sBAAsB,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IAC1C,gBAAgB,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;CACrC,2CAgUA"}

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

@@ -9,62 +9,50 @@ const utilities_1 = require("@dnd-kit/utilities");
 const UiComponents_1 = require("../UiComponents");
 const textProcessing_1 = require("../../utils/textProcessing");
 const ReportBuilder_1 = require("../../models/ReportBuilder");
-const schema_1 = require("../../utils/schema");
-function AddColumnModal({ onSave, 
-// selectedTables,
-selectedColumns, schema, schemaLoading, TextInputComponent, SelectColumn, SecondaryButton, Button, ColumnSearchEmptyState = UiComponents_1.QuillColumnSearchEmptyState, LoadingComponent = UiComponents_1.QuillLoadingComponent, }) {
-    const [primaryTable, setPrimaryTable] = (0, react_1.useState)(undefined);
+function AddColumnModal({ onSave, selectedTables, selectedColumns, schema, schemaLoading, foreignKeyMap, TextInputComponent, SelectColumn, SecondaryButton, Button, ColumnSearchEmptyState = UiComponents_1.QuillColumnSearchEmptyState, LoadingComponent = UiComponents_1.QuillLoadingComponent, }) {
+    const [primaryTable, setPrimaryTable] = (0, react_1.useState)(selectedTables[0]?.name);
     const [search, setSearch] = (0, react_1.useState)('');
     const textInputContainerRef = (0, react_1.useRef)(null);
     const [modalSelectedColumns, setModalSelectedColumns] = (0, react_1.useState)(selectedColumns.map((col) => `${col.table}.${col.field}`));
-    const foreignKeyMap = (0, react_1.useMemo)(() => {
-        return (0, schema_1.getSchemaForeignKeyMapping)(schema);
-    }, [schema]);
-    const columnOptions = schema
-        .filter((table) => {
-        if (!primaryTable)
-            return true;
-        return (table.name === primaryTable ||
-            foreignKeyMap[primaryTable]?.some((tableInfo) => tableInfo.foreignTable === table.name) ||
-            foreignKeyMap[table.name]?.some((tableInfo) => tableInfo.foreignTable === primaryTable));
-    })
-        .sort((a, b) => {
-        // Ensure primaryTable is always first, this is essential for SELECT ALL
-        if (primaryTable) {
-            if (a.name === primaryTable)
-                return -1;
-            if (b.name === primaryTable)
+    const columnOptions = (0, react_1.useMemo)(() => {
+        return schema
+            .filter((table) => {
+            if (!primaryTable)
+                return true;
+            return (table.name === primaryTable ||
+                foreignKeyMap[primaryTable]?.some((tableInfo) => tableInfo.foreignTable === table.name) ||
+                foreignKeyMap[table.name]?.some((tableInfo) => tableInfo.foreignTable === primaryTable));
+        })
+            .sort((a, b) => {
+            // Ensure primaryTable is always first, this is essential for SELECT ALL
+            if (primaryTable) {
+                if (a.name === primaryTable)
+                    return -1;
+                if (b.name === primaryTable)
+                    return 1;
+            }
+            return 0; // Keep original order otherwise
+        })
+            .flatMap((table) => table.columns
+            .map((col) => `${table.name}.${col.field}`)
+            .sort((a, b) => {
+            const aIsId = a.endsWith('.id') ||
+                a.endsWith('_id') ||
+                a.endsWith('Id') ||
+                a === 'id';
+            const bIsId = b.endsWith('.id') ||
+                b.endsWith('_id') ||
+                b.endsWith('Id') ||
+                b === 'id';
+            if (aIsId && !bIsId)
                 return 1;
-        }
-        return 0; // Keep original order otherwise
-    })
-        .flatMap((table) => table.columns
-        .map((col) => `${table.name}.${col.field}`)
-        .sort((a, b) => {
-        const aIsId = a.endsWith('.id') ||
-            a.endsWith('_id') ||
-            a.endsWith('Id') ||
-            a === 'id';
-        const bIsId = b.endsWith('.id') ||
-            b.endsWith('_id') ||
-            b.endsWith('Id') ||
-            b === 'id';
-        if (aIsId && !bIsId)
-            return 1;
-        if (bIsId && !aIsId)
-            return -1;
-        return 0;
-    }));
-    const [orderedColumnNames, setOrderedColumnNames] = (0, react_1.useState)(columnOptions);
+            if (bIsId && !aIsId)
+                return -1;
+            return 0;
+        }));
+    }, [schema, primaryTable]);
+    const [orderedColumnNames, setOrderedColumnNames] = (0, react_1.useState)([]);
     const isSelectedAllColumns = columnOptions.length === modalSelectedColumns.length;
-    const duplicateColumnNames = (0, react_1.useMemo)(() => {
-        const columnNames = modalSelectedColumns.map((col) => {
-            const [, ...rest] = col.split('.');
-            return rest.join('.');
-        });
-        const duplicates = columnNames.filter((name, i) => columnNames.indexOf(name) !== i);
-        return duplicates;
-    }, [modalSelectedColumns, schema]);
     const searchResults = (0, react_1.useMemo)(() => {
         return orderedColumnNames.filter((column) => {
             return (columnOptions.includes(column) &&
@@ -76,13 +64,11 @@ selectedColumns, schema, schemaLoading, TextInputComponent, SelectColumn, Second
         });
     }, [search, columnOptions, orderedColumnNames]);
     (0, react_1.useEffect)(() => {
-        if (modalSelectedColumns.length === 0) {
-            setPrimaryTable(undefined);
-        }
-        else {
-            setPrimaryTable(modalSelectedColumns[0]?.split('.')[0]);
-        }
-    }, [modalSelectedColumns]);
+        // Start with selected columns in their current order
+        // Add remaining columns from columnOptions that aren't already included
+        const remainingColumns = columnOptions.filter((col) => !modalSelectedColumns.includes(col));
+        setOrderedColumnNames([...modalSelectedColumns, ...remainingColumns]);
+    }, [columnOptions]);
     const sensors = (0, core_1.useSensors)((0, core_1.useSensor)(core_1.PointerSensor), (0, core_1.useSensor)(core_1.KeyboardSensor, {
         coordinateGetter: sortable_1.sortableKeyboardCoordinates,
     }));
@@ -125,6 +111,7 @@ selectedColumns, schema, schemaLoading, TextInputComponent, SelectColumn, Second
                                 return ((0, jsx_runtime_1.jsx)(SortableItem, { selectedColumns: modalSelectedColumns, setSelectedColumns: (newSelectedColumns) => {
                                         if (!primaryTable) {
                                             setModalSelectedColumns(newSelectedColumns);
+                                            setPrimaryTable(newSelectedColumns[0]?.split('.')[0]);
                                         }
                                         else {
                                             // need to check if primary table is in selected columns
@@ -157,7 +144,10 @@ selectedColumns, schema, schemaLoading, TextInputComponent, SelectColumn, Second
                     gap: 8,
                     justifyContent: 'end',
                     marginTop: 12,
-                }, children: [modalSelectedColumns.length > 0 && ((0, jsx_runtime_1.jsx)(SecondaryButton, { onClick: () => setModalSelectedColumns([]), label: "Clear" })), modalSelectedColumns.length > 0 && !isSelectedAllColumns && ((0, jsx_runtime_1.jsx)(SecondaryButton, { onClick: () => setModalSelectedColumns(columnOptions), label: "Select all" })), (0, jsx_runtime_1.jsx)(Button, { onClick: () => {
+                }, children: [modalSelectedColumns.length > 0 && ((0, jsx_runtime_1.jsx)(SecondaryButton, { onClick: () => {
+                            setModalSelectedColumns([]);
+                            setPrimaryTable(undefined);
+                        }, label: "Clear" })), modalSelectedColumns.length > 0 && !isSelectedAllColumns && ((0, jsx_runtime_1.jsx)(SecondaryButton, { onClick: () => setModalSelectedColumns(columnOptions), label: "Select all" })), (0, jsx_runtime_1.jsx)(Button, { onClick: () => {
                             const newTableNames = [
                                 ...new Set(modalSelectedColumns
                                     .map((col) => {
@@ -203,7 +193,14 @@ selectedColumns, schema, schemaLoading, TextInputComponent, SelectColumn, Second
                                     return { name: table };
                                 }
                             })
-                                .filter((table) => table !== null);
+                                .filter((table) => table !== null)
+                                .sort((table1, table2) => {
+                                if (table1.name === primaryTable)
+                                    return -1;
+                                if (table2.name === primaryTable)
+                                    return 1;
+                                return 0;
+                            });
                             const sortedSelectedColumns = orderedColumnNames.filter((col) => modalSelectedColumns.includes(col));
                             const newColumns = sortedSelectedColumns
                                 .map((col) => {
@@ -215,12 +212,11 @@ selectedColumns, schema, schemaLoading, TextInputComponent, SelectColumn, Second
                                     return null;
                                 }
                                 else {
+                                    const alias = newTables.length > 1 ? `${table}_${field}` : undefined;
                                     return {
                                         table: table || '',
                                         field: field || '',
-                                        alias: duplicateColumnNames.includes(field)
-                                            ? `${table}_${field}`
-                                            : undefined,
+                                        alias,
                                     };
                                 }
                             })

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

@@ -20,4 +20,11 @@ export type TableInfo = {
     columns: ColumnInfo[];
     viewQuery: string;
 };
+export type ForeignKeyMap = {
+    [table: string]: {
+        foreignTable: string;
+        foreignTablePrimaryKey: string;
+        foreignKey: string;
+    }[];
+};
 //# sourceMappingURL=schema.d.ts.map

package/dist/cjs/components/ReportBuilder/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/schema.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,IAAI,CAAC;CACjB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,IAAI,CAAC;IAChB,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/schema.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,IAAI,CAAC;CACjB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,IAAI,CAAC;IAChB,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,CAAC,KAAK,EAAE,MAAM,GAAG;QACf,YAAY,EAAE,MAAM,CAAC;QACrB,sBAAsB,EAAE,MAAM,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,EAAE,CAAC;CACL,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"UiComponents.d.ts","sourceRoot":"","sources":["../../../src/components/UiComponents.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"UiComponents.d.ts","sourceRoot":"","sources":["../../../src/components/UiComponents.tsx"],"names":[],"mappings":"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"}

package/dist/cjs/components/UiComponents.js

@@ -143,14 +143,22 @@ const MemoizedSecondaryButton = ({ label, onClick, icon, disabled, tooltipText,
       .quill-secondary-button:disabled {
         opacity: 0.5;
         background-color: white;
-      }    
-      ` }), icon, (0, jsx_runtime_1.jsx)("span", { style: {
+      }
+      .icon-container {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 24px;
+        height: 24px;
+        flex-shrink: 0;
+      }
+      ` }), icon && (0, jsx_runtime_1.jsx)("div", { className: "icon-container", children: icon }), label && ((0, jsx_runtime_1.jsx)("span", { style: {
                         flexGrow: 1,
                         minWidth: 0,
                         whiteSpace: 'nowrap',
                         textOverflow: 'ellipsis',
                         overflow: 'hidden',
-                    }, children: label })] }) }));
+                    }, children: label }))] }) }));
 };
 exports.MemoizedSecondaryButton = MemoizedSecondaryButton;
 const MemoizedHeader = ({ label }) => {

package/dist/cjs/hooks/useDashboard.d.ts

@@ -1,4 +1,4 @@
-import { QuillReport } from '../models/Report';
+import { QuillReport, QuillReportInternal } from '../models/Report';
 import { DashboardFilter, InternalFilter } from '../models/Filter';
 import { DashboardConfig } from '../models/Dashboard';
 export declare const useDashboard: (dashboardName: string | null, customFilters?: InternalFilter[]) => {
@@ -15,6 +15,23 @@ export declare const useDashboard: (dashboardName: string | null, customFilters?
         filters: DashboardFilter[];
         editedFilterLabel?: string;
     }) => Promise<void>;
+    setSectionOrder: (sectionOrder: {
+        section: string;
+        _id?: string;
+        reportOrder: string[];
+    }[]) => Promise<void>;
+};
+export declare const useDashboardReports: (dashboardName?: string) => {
+    dashboardReports: {
+        [key: string]: QuillReportInternal;
+    };
+    updateReport: (data: Partial<QuillReportInternal>) => void;
+    addReport: (data: QuillReportInternal) => void;
+};
+export declare const useAllReports: () => {
+    allReportsById: {
+        [key: string]: QuillReportInternal;
+    };
 };
 export declare const useDashboards: () => {
     dashboards: {
@@ -23,7 +40,11 @@ export declare const useDashboards: () => {
         reports: QuillReport[];
         tenantKeys: string[] | undefined;
         createdAt: Date;
-        sectionOrder: string[] | undefined;
+        sectionOrder: {
+            _id: string;
+            section: string;
+            reportOrder: string[];
+        }[] | undefined;
     }[] | null;
     isLoading: boolean;
     createDashboard: ({ name, filters, dateFilter, dashboardOwners, }: {

package/dist/cjs/hooks/useDashboard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useDashboard.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDashboard.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EACL,eAAe,EAEf,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAGtD,eAAO,MAAM,YAAY,kBACR,MAAM,GAAG,IAAI,kBACZ,cAAc,EAAE;;;;2CAoHc,MAAM;qCApF1B,MAAM,4CAEf;QACb,MAAM,EAAE,WAAW,GAAG;YAAE,EAAE,EAAE,MAAM,CAAA;SAAE,CAAC;QACrC,MAAM,EAAE,QAAQ,GAAG,QAAQ,CAAC;KAC7B,oBACiB;QAChB,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;KAC5B;CAyFJ,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;;;;;;uEA4BrB;QACD,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,eAAe,EAAE,MAAM,EAAE,CAAC;QAC1B,UAAU,CAAC,EAAE,eAAe,CAAC;KAC9B;4BAuDO,MAAM,8EAQT;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,UAAU,CAAC,EAAE,eAAe,CAAC;QAC7B,aAAa,CAAC,EAAE,cAAc,EAAE,CAAC;QACjC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;QACtB,YAAY,EAAE,MAAM,EAAE,CAAC;KACxB;4BAiHkC,MAAM;CA+B5C,CAAC"}
+{"version":3,"file":"useDashboard.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDashboard.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEpE,OAAO,EACL,eAAe,EAEf,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAGtD,eAAO,MAAM,YAAY,kBACR,MAAM,GAAG,IAAI,kBACZ,cAAc,EAAE;;;;2CAyLc,MAAM;qCAvJ1B,MAAM,4CAEf;QACb,MAAM,EAAE,WAAW,GAAG;YAAE,EAAE,EAAE,MAAM,CAAA;SAAE,CAAC;QACrC,MAAM,EAAE,QAAQ,GAAG,QAAQ,CAAC;KAC7B,oBACiB;QAChB,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;KAC5B;oCA2E0C;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,EAAE,CAAA;KAAC,EAAE;CAkFtG,CAAC;AAEF,eAAO,MAAM,mBAAmB,mBAAoB,MAAM;;;;yBAK5B,OAAO,CAAC,mBAAmB,CAAC;sBAe/B,mBAAmB;CAmB7C,CAAC;AAEF,eAAO,MAAM,aAAa;;;;CAkBzB,CAAA;AAED,eAAO,MAAM,aAAa;;;;;;;;;;;;;;uEA4BrB;QACD,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,eAAe,EAAE,MAAM,EAAE,CAAC;QAC1B,UAAU,CAAC,EAAE,eAAe,CAAC;KAC9B;4BAuDO,MAAM,8EAQT;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,UAAU,CAAC,EAAE,eAAe,CAAC;QAC7B,aAAa,CAAC,EAAE,cAAc,EAAE,CAAC;QACjC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;QACtB,YAAY,EAAE,MAAM,EAAE,CAAC;KACxB;4BAkHkC,MAAM;CA+B5C,CAAC"}