@quillsql/admin 1.5.2 → 1.6.1

package/dist/esm/forms/client_onboard/CreateSqlViews.js

@@ -4,7 +4,10 @@ import { ButtonPrimitive, ModalPrimitive, TextInputPrimitive, } from '../../prim
 import { createSQLView, getQueryFromAiWithConnection, getSqlViewData, } from '../../api/ConnectionClient';
 import SqlViewTile from '../../components/SqlViewTile';
 import SqlTextEditor from '../../components/SqlTextEditor';
-import { Table } from '@quillsql/react';
+import { SchemaListComponent, Table } from '@quillsql/react';
+import { LoadingSpinner } from '../../components/UiComponents';
+import { getDuplicateColumns } from '../../public_components/SQLViewManager';
+import { processColumnReference } from '../../utils/columnProcessing';
 export default function CreateSQLViews({ containerStyle, header1Style, header2Style, columnsByTable, environmentDetails, allSchemaInfo, domainName, completeOnboarding, clientId, state, }) {
     const [selectedTable, setSelectedTable] = useState(undefined);
     const [queryInfo, setQueryInfo] = useState({
@@ -17,9 +20,11 @@ export default function CreateSQLViews({ containerStyle, header1Style, header2St
     const [tableData, setTableData] = useState(undefined);
     const [client, setClient] = useState(undefined);
     const [sqlTables, setSqlTables] = useState([]);
-    const [askAIButton, setAskAIButton] = useState('Ask AI');
-    const [runQueryButtonLabel, setRunQueryButtonLabel] = useState('Run query');
+    const [askAIButtonLoading, setAskAIButtonLoading] = useState(false);
+    const [runQueryButtonLoading, setRunQueryButtonLoading] = useState(false);
     const [showFKModal, setShowFKModal] = useState(false);
+    const [tableSearchQuery, setTableSearchQuery] = useState('');
+    const [displayedTableData, setDisplayedTableData] = useState(columnsByTable);
     const addSqlView = async (override) => {
         const results = await createSQLView(environmentDetails, allSchemaInfo, columnsByTable, queryInfo, client, domainName, tableData, sqlTables.map((e) => {
             return e.name;
@@ -37,6 +42,17 @@ export default function CreateSQLViews({ containerStyle, header1Style, header2St
             setSqlQueryInfo({ msg: results.message, status: true });
         }
     };
+    const handleClickSchemaItem = async (event) => {
+        const name = event.target.textContent;
+        if (!name) {
+            return;
+        }
+        const newQuery = `SELECT * FROM ${processColumnReference(name, environmentDetails?.type)};`;
+        if (!queryInfo.query || queryInfo.query.length === 0) {
+            setQueryInfo({ name: queryInfo.name, query: newQuery });
+        }
+        await navigator.clipboard.writeText(newQuery);
+    };
     useEffect(() => {
         window.scrollTo({
             behavior: 'smooth',
@@ -47,6 +63,7 @@ export default function CreateSQLViews({ containerStyle, header1Style, header2St
             ...containerStyle,
             display: 'flex',
             flexDirection: 'column',
+            minWidth: 900,
         }, id: "create-sql-view", children: [_jsxs("div", { style: {
                     padding: 20,
                     paddingBottom: 12,
@@ -58,10 +75,28 @@ export default function CreateSQLViews({ containerStyle, header1Style, header2St
                     flexDirection: 'row',
                     borderTop: 'solid 1px #e7e7e7',
                     height: 'calc(100vh - 143px)',
-                }, children: [_jsxs("div", { id: "form-editor-table", style: {
+                }, children: [_jsxs("div", { style: {
+                            display: 'flex',
+                            flexDirection: 'column',
+                        }, children: [_jsx("div", { style: {
+                                    paddingLeft: '20px',
+                                    paddingRight: '30px',
+                                    height: 70,
+                                    minHeight: 70,
+                                    display: 'flex',
+                                    alignItems: 'center',
+                                }, children: _jsx(TextInputPrimitive, { placeholder: "Search...", 
+                                    // @ts-ignore
+                                    onChange: (e) => {
+                                        setTableSearchQuery(e.target.value);
+                                        setDisplayedTableData(columnsByTable.filter((table) => table.tableName
+                                            .toLowerCase()
+                                            .includes(e.target.value.toLowerCase().trim())));
+                                    }, value: tableSearchQuery, width: "180px" }) }), _jsx(SchemaListComponent, { schema: displayedTableData, theme: state.theme, width: '300px', loading: false, LoadingComponent: LoadingSpinner, onClick: handleClickSchemaItem })] }), _jsxs("div", { id: "form-editor-table", style: {
                             display: 'flex',
                             flexDirection: 'column',
-                            width: 'calc(100% - 300px)',
+                            width: 'calc(100% - 600px)',
+                            minWidth: 300,
                         }, children: [_jsxs("div", { style: {
                                     display: 'flex',
                                     flexDirection: 'row',
@@ -73,16 +108,16 @@ export default function CreateSQLViews({ containerStyle, header1Style, header2St
                                     height: 70,
                                 }, children: [_jsx(TextInputPrimitive, { onChange: (e) => {
                                             setAIPrompt(e.target.value);
-                                        }, placeholder: 'Describe a query...', value: aiPrompt }), _jsx(ButtonPrimitive, { label: askAIButton, onClick: async () => {
-                                            setAskAIButton('Loading...');
+                                        }, placeholder: 'Describe a query...', value: aiPrompt }), _jsx(ButtonPrimitive, { label: 'Ask AI', isLoading: askAIButtonLoading, onClick: async () => {
+                                            setAskAIButtonLoading(true);
                                             const results = await getQueryFromAiWithConnection(aiPrompt, clientId, allSchemaInfo?.selectedFields.schema
                                                 ? [allSchemaInfo?.selectedFields.schema]
                                                 : undefined);
                                             setQueryInfo({ name: queryInfo.name, query: results });
-                                            setAskAIButton('Ask AI');
+                                            setAskAIButtonLoading(false);
                                         }, style: { width: '90px' } })] }), _jsx(SqlTextEditor, { value: queryInfo.query, setValue: (e) => {
                                     setQueryInfo({ name: queryInfo.name, query: e });
-                                }, containerStyle: { paddingLeft: 16, paddingRight: 16 } }), _jsxs("div", { style: {
+                                }, setEditorMounted: () => { }, containerStyle: { paddingLeft: 16, paddingRight: 16 }, schema: displayedTableData, databaseType: environmentDetails?.type, previousProvider: null }), _jsxs("div", { style: {
                                     display: 'flex',
                                     flexDirection: 'row',
                                     justifyContent: 'space-between',
@@ -90,8 +125,8 @@ export default function CreateSQLViews({ containerStyle, header1Style, header2St
                                     paddingLeft: 16,
                                     paddingRight: 16,
                                     height: 70,
-                                }, children: [_jsx(ButtonPrimitive, { label: runQueryButtonLabel, onClick: async () => {
-                                            setRunQueryButtonLabel('Querying...');
+                                }, children: [_jsx(ButtonPrimitive, { label: 'Run query', onClick: async () => {
+                                            setRunQueryButtonLoading(true);
                                             const getSqlResults = await getSqlViewData(clientId, queryInfo.query, environmentDetails.type, state.queryEndpoint);
                                             if (!getSqlResults.success) {
                                                 setErrorInfo({ status: true, msg: getSqlResults.error });
@@ -100,7 +135,7 @@ export default function CreateSQLViews({ containerStyle, header1Style, header2St
                                                 setErrorInfo({ status: false, msg: '' });
                                                 setTableData(getSqlResults);
                                             }
-                                            setRunQueryButtonLabel('Run query');
+                                            setRunQueryButtonLoading(false);
                                         } }), errorInfo.status ? (_jsx("h2", { style: {
                                             ...header2Style,
                                             color: 'red',
@@ -113,7 +148,7 @@ export default function CreateSQLViews({ containerStyle, header1Style, header2St
                                 }, children: [_jsx(Table, { rows: tableData.rows, columns: tableData.fields, containerStyle: {
                                             height: 'calc(100vh - 589px)',
                                             width: '100%',
-                                        }, showDownloadCSVButton: true }), _jsxs("div", { style: {
+                                        }, hideCSVDownloadButton: true, isLoading: runQueryButtonLoading }), _jsxs("div", { style: {
                                             width: '100%',
                                             display: 'flex',
                                             justifyContent: 'space-between',
@@ -124,7 +159,14 @@ export default function CreateSQLViews({ containerStyle, header1Style, header2St
                                                     color: 'red',
                                                     paddingTop: '12px',
                                                     // textTransform: 'capitalize',
-                                                }, children: sqlQueryError.msg })) : (_jsx("div", {})), _jsx(ButtonPrimitive, { label: "Add SQL View", onClick: () => addSqlView(false) })] })] }))] }), _jsxs("div", { style: {
+                                                }, children: sqlQueryError.msg })) : (_jsx("div", {})), _jsx(ButtonPrimitive, { label: "Add SQL View", onClick: () => {
+                                                    const duplicateColumns2 = getDuplicateColumns(tableData?.fields);
+                                                    if (duplicateColumns2.length > 0) {
+                                                        alert(`Ambiguous column names found. Either use aliases or remove the column to make every column name unique: \n\n${duplicateColumns2.join('\n')}`);
+                                                        return;
+                                                    }
+                                                    addSqlView(false);
+                                                } })] })] }))] }), _jsxs("div", { style: {
                             // width: '30%',
                             background: '#fafafa',
                             borderLeft: 'solid 1px #e7e7e7',
@@ -176,7 +218,7 @@ export default function CreateSQLViews({ containerStyle, header1Style, header2St
                                     paddingRight: 12,
                                     background: 'white',
                                     borderTop: 'solid 1px #e7e7e7',
-                                }, children: _jsx(ButtonPrimitive, { label: "Go to dashboard", onClick: () => {
+                                }, children: _jsx(ButtonPrimitive, { label: "Looks good", onClick: () => {
                                         completeOnboarding(client);
                                     }, style: { width: 276 } }) })) : null] })] }), _jsx(ForeignKeyModal, { isOpen: showFKModal, setIsOpen: setShowFKModal, override: addSqlView, foreignKey: allSchemaInfo?.selectedFields.foreignKey, tableName: allSchemaInfo?.selectedFields.table })] }));
 }
@@ -188,7 +230,7 @@ export function ForeignKeyModal({ isOpen, setIsOpen, override, foreignKey, table
                         fontWeight: 600,
                         color: '#212121',
                         paddingBottom: 14,
-                    }, children: `Organization Foreign Key "${foreignKey}" Not Found` }), _jsxs("div", { style: { marginBottom: '12px' }, children: [`Your organization table `, _jsx("strong", { children: `"${tableName}"` }), ` foreign key  `, _jsx("strong", { children: `"${foreignKey}"` }), " is not present in the current query. If this query will never have organization specific data on it (this is rare), override this message.`"] }), _jsx("br", {}), _jsxs("div", { style: {
+                    }, children: `Organization Foreign Key "${foreignKey?.replaceAll('"', '')}" Not Found` }), _jsxs("div", { style: { marginBottom: '12px' }, children: [`Your organization table `, _jsx("strong", { children: `"${tableName?.replaceAll('"', '')}"` }), ` foreign key  `, _jsx("strong", { children: `"${foreignKey?.replaceAll('"', '')}"` }), " is not present in the current query. If this query will never have organization specific data on it (this is rare), override this message.`"] }), _jsx("br", {}), _jsxs("div", { style: {
                         display: 'flex',
                         flexDirection: 'row',
                         gap: '12px',

package/dist/esm/forms/sql_views/CreateEditSqlView.d.ts

@@ -1,5 +1,7 @@
-/// <reference types="react" />
-import { ButtonComponentProps, TextInputComponentProps, HeaderProps } from '@quillsql/react';
+import { ButtonComponentProps } from '@quillsql/react';
+import { ReactNode } from 'react';
+import { IDisposable } from 'monaco-editor';
+import { TextInputComponentProps } from '../../components/UiComponents';
 import { ColumnsByTable } from '../../utils/table';
 interface CreateEditSqlViewProps {
     containerStyle: React.CSSProperties;
@@ -12,12 +14,16 @@ interface CreateEditSqlViewProps {
     SecondaryButtonComponent?: (props: ButtonComponentProps) => JSX.Element;
     TextInput?: (props: TextInputComponentProps) => JSX.Element;
     LoadingComponent?: () => JSX.Element;
-    Header?: (props: HeaderProps) => JSX.Element;
+    Header?: (props: {
+        children: ReactNode;
+    }) => JSX.Element;
     closeEditView: () => void;
-    addEditView: (request: string, query: string, name?: string, id?: string) => void;
+    addEditView: (request: string, query: string, name?: string, id?: string, columns?: any[]) => void;
+    setProvider: (provider: IDisposable | null) => void;
+    provider: IDisposable | null;
     allTableData: ColumnsByTable[];
     schemaIsLoading: boolean;
 }
-export default function CreateEditSqlView({ containerStyle, initialSqlView, closeEditView, addEditView, SecondaryButtonComponent, LoadingComponent, Button, TextInput, Header, allTableData, schemaIsLoading, }: CreateEditSqlViewProps): JSX.Element;
+export default function CreateEditSqlView({ containerStyle, initialSqlView, closeEditView, addEditView, setProvider, provider, SecondaryButtonComponent, LoadingComponent, Button, TextInput, Header, allTableData, schemaIsLoading, }: CreateEditSqlViewProps): JSX.Element;
 export {};
 //# sourceMappingURL=CreateEditSqlView.d.ts.map

package/dist/esm/forms/sql_views/CreateEditSqlView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CreateEditSqlView.d.ts","sourceRoot":"","sources":["../../../../src/forms/sql_views/CreateEditSqlView.tsx"],"names":[],"mappings":";AAAA,OAAO,EACL,oBAAoB,EAEpB,uBAAuB,EACvB,WAAW,EAGZ,MAAM,iBAAiB,CAAC;AAwBzB,OAAO,EAAU,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAI3D,UAAU,sBAAsB;IAC9B,cAAc,EAAE,KAAK,CAAC,aAAa,CAAC;IACpC,cAAc,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7D,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IACtD,wBAAwB,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAExE,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC5D,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IACrC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,GAAG,CAAC,OAAO,CAAC;IAC7C,aAAa,EAAE,MAAM,IAAI,CAAC;IAC1B,WAAW,EAAE,CACX,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,IAAI,CAAC,EAAE,MAAM,EACb,EAAE,CAAC,EAAE,MAAM,KACR,IAAI,CAAC;IACV,YAAY,EAAE,cAAc,EAAE,CAAC;IAC/B,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,EACxC,cAAc,EACd,cAAc,EACd,aAAa,EACb,WAAW,EACX,wBAAwB,EACxB,gBAA2C,EAC3C,MAAuB,EACvB,SAA6B,EAC7B,MAAuB,EACvB,YAAY,EACZ,eAAe,GAChB,EAAE,sBAAsB,GAAG,GAAG,CAAC,OAAO,CAiTtC"}
+{"version":3,"file":"CreateEditSqlView.d.ts","sourceRoot":"","sources":["../../../../src/forms/sql_views/CreateEditSqlView.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EAKrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAEL,SAAS,EAKV,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAQ5C,OAAO,EAML,uBAAuB,EACxB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAU,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAQ3D,UAAU,sBAAsB;IAC9B,cAAc,EAAE,KAAK,CAAC,aAAa,CAAC;IACpC,cAAc,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7D,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IACtD,wBAAwB,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAExE,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC5D,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IACrC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,CAAC;IACzD,aAAa,EAAE,MAAM,IAAI,CAAC;IAC1B,WAAW,EAAE,CACX,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,IAAI,CAAC,EAAE,MAAM,EACb,EAAE,CAAC,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,GAAG,EAAE,KACZ,IAAI,CAAC;IACV,WAAW,EAAE,CAAC,QAAQ,EAAE,WAAW,GAAG,IAAI,KAAK,IAAI,CAAC;IACpD,QAAQ,EAAE,WAAW,GAAG,IAAI,CAAC;IAC7B,YAAY,EAAE,cAAc,EAAE,CAAC;IAC/B,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,EACxC,cAAc,EACd,cAAc,EACd,aAAa,EACb,WAAW,EACX,WAAW,EACX,QAAQ,EACR,wBAAwB,EACxB,gBAA2C,EAC3C,MAAuB,EACvB,SAA6B,EAC7B,MAAuB,EACvB,YAAY,EACZ,eAAe,GAChB,EAAE,sBAAsB,GAAG,GAAG,CAAC,OAAO,CAmYtC"}

package/dist/esm/forms/sql_views/CreateEditSqlView.js

@@ -1,24 +1,29 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Table, SchemaListComponent, } from '@quillsql/react';
-import { useEffect, useState } from 'react';
+import { useEffect, useState, } from 'react';
 import { useAdmin } from '../../AdminProvider';
 import { getQueryFromAiWithConnection, getSqlViewData, } from '../../api/ConnectionClient';
 import SqlTextEditor from '../../components/SqlTextEditor';
 import { LoadingSpinner, MemoizedButton, MemoizedHeader, MemoizedTextInput, } from '../../components/UiComponents';
 import { ForeignKeyModal } from '../client_onboard/CreateSqlViews';
 import DynamicBanner from '../../components/DynamicBanner';
-export default function CreateEditSqlView({ containerStyle, initialSqlView, closeEditView, addEditView, SecondaryButtonComponent, LoadingComponent = () => _jsx(LoadingSpinner, {}), Button = MemoizedButton, TextInput = MemoizedTextInput, Header = MemoizedHeader, allTableData, schemaIsLoading, }) {
+import { getDuplicateColumns } from '../../public_components/SQLViewManager';
+import { processColumnReference } from '../../utils/columnProcessing';
+import { processJoinASTWithDuplicateColumns } from '../../utils/astProcessing';
+import { QUILL_SERVER } from '../../utils/constants';
+export default function CreateEditSqlView({ containerStyle, initialSqlView, closeEditView, addEditView, setProvider, provider, SecondaryButtonComponent, LoadingComponent = () => _jsx(LoadingSpinner, {}), Button = MemoizedButton, TextInput = MemoizedTextInput, Header = MemoizedHeader, allTableData, schemaIsLoading, }) {
     const [name, setName] = useState(initialSqlView?.name || '');
     const [editViewQuery, setEditViewQuery] = useState(initialSqlView?.query || '');
     const [ranViewQuery, setRanViewQuery] = useState(initialSqlView?.query || '');
-    const [askAIButton, setAskAIButton] = useState('Ask AI');
+    const [askAIButtonLoading, setAskAIButtonLoading] = useState(false);
+    const [runQueryButtonLoading, setRunQueryButtonLoading] = useState(false);
     const [aiPrompt, setAIPrompt] = useState('');
-    const [runQueryButtonLabel, setRunQueryButtonLabel] = useState('Run query');
     const [viewAddable, setViewAddable] = useState(false);
     const [showFKModal, setShowFKModal] = useState(false);
     const [overrideFKCheck, setOverrideFKCheck] = useState(false);
     const [isLoading, setIsLoading] = useState(false);
     const [tableSearchQuery, setTableSearchQuery] = useState('');
+    const [editorMounted, setEditorMounted] = useState(false);
     const [displayedTableData, setDisplayedTableData] = useState(allTableData);
     const [errorInfo, setErrorInfo] = useState({ show: false, message: '' });
     const [tableData, setTableData] = useState(undefined);
@@ -30,7 +35,7 @@ export default function CreateEditSqlView({ containerStyle, initialSqlView, clos
             setShowFKModal(true);
             return;
         }
-        addEditView(initialSqlView ? 'edit' : 'add', ranViewQuery, name, initialSqlView ? initialSqlView.id : undefined);
+        addEditView(initialSqlView ? 'edit' : 'add', ranViewQuery, name, initialSqlView ? initialSqlView.id : undefined, tableData?.fields || []);
     };
     useEffect(() => {
         setDisplayedTableData(allTableData);
@@ -38,19 +43,30 @@ export default function CreateEditSqlView({ containerStyle, initialSqlView, clos
     const handleRunSqlPrompt = async () => {
         setErrorInfo({ show: false, message: '' });
         setViewAddable(false);
-        setAskAIButton('Loading...');
+        setAskAIButtonLoading(true);
         const results = await getQueryFromAiWithConnection(aiPrompt, state.client._id, state.client.schemaNames);
         setOverrideFKCheck(false);
         setEditViewQuery(results);
-        setAskAIButton('Ask AI');
+        setAskAIButtonLoading(false);
     };
-    const handleRunQuery = async () => {
-        const query = editViewQuery;
+    const handleClickSchemaItem = async (event) => {
+        const name = event.target.textContent;
+        if (!name) {
+            return;
+        }
+        const newQuery = `SELECT * FROM ${processColumnReference(name, state.client.databaseType)};`;
+        if (!editViewQuery || editViewQuery.length === 0) {
+            setEditViewQuery(newQuery);
+        }
+        await navigator.clipboard.writeText(newQuery);
+    };
+    const handleRunQuery = async (overrideQuery) => {
+        const query = overrideQuery ? overrideQuery : editViewQuery;
         // If this query has a limit at the end alert the user
-        if (query.toLowerCase().includes(' limit ')) {
+        if (/limit\s+\d+\s*;?\s*$/i.test(query)) {
             setErrorInfo({
                 show: true,
-                message: 'Error: Please remove the limit on you query.',
+                message: 'Error: Please remove the limit at the end of your query.',
             });
             return;
         }
@@ -58,11 +74,11 @@ export default function CreateEditSqlView({ containerStyle, initialSqlView, clos
         setErrorInfo({ show: false, message: '' });
         setTableData(undefined);
         setIsLoading(true);
-        setRunQueryButtonLabel('Querying...');
+        setRunQueryButtonLoading(true);
         setOverrideFKCheck(false);
-        if (editViewQuery.length === 0) {
+        if (query.length === 0) {
             setErrorInfo({ show: true, message: 'Error: Please enter a query.' });
-            setRunQueryButtonLabel('Run query');
+            setRunQueryButtonLoading(false);
             return;
         }
         const resp = await getSqlViewData(state.client._id, query, state.client.databaseType, state.queryEndpoint);
@@ -70,22 +86,48 @@ export default function CreateEditSqlView({ containerStyle, initialSqlView, clos
             setErrorInfo({ show: true, message: resp.error });
             setTableData(undefined);
             setViewAddable(false);
-            setRunQueryButtonLabel('Run query');
+            setRunQueryButtonLoading(false);
             setIsLoading(false);
             return;
         }
-        setRunQueryButtonLabel('Run query');
+        setRunQueryButtonLoading(false);
         setErrorInfo({ show: false, message: '' });
         // stringify all rows that are either jsonb or json
         resp.rows = resp.rows.map((row) => {
             for (const key in row) {
-                if (typeof row[key] === 'object') {
+                if (row[key] !== null && typeof row[key] === 'object') {
                     row[key] = JSON.stringify(row[key]);
                 }
             }
             return row;
         });
-        setTableData(resp);
+        const duplicateColumns = getDuplicateColumns(resp.fields);
+        if (duplicateColumns.length > 0) {
+            let parsedAST = resp.ast;
+            if (Array.isArray(resp.ast)) {
+                parsedAST = [0];
+            }
+            const tableNames = parsedAST.from.map((table) => {
+                const db = table.db ? `${table.db}.` : '';
+                return `${db}${table.table}`;
+            });
+            const newAst = processJoinASTWithDuplicateColumns(duplicateColumns, tableNames, allTableData, parsedAST);
+            const response = await fetch(`${QUILL_SERVER}/sqlify`, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({
+                    ast: { ...newAst },
+                    publicKey: state.client._id,
+                }),
+            });
+            const jsonResponse = await response.json();
+            setEditViewQuery(jsonResponse.query);
+            await handleRunQuery(jsonResponse.query);
+            return;
+        }
+        setTableData({ fields: resp.fields, rows: resp.rows });
         setViewAddable(true);
         setRanViewQuery(query);
         setIsLoading(false);
@@ -93,7 +135,7 @@ export default function CreateEditSqlView({ containerStyle, initialSqlView, clos
     return (_jsx("div", { style: {
             ...containerStyle,
             gap: 6,
-            height: 'calc(100vh - 188px)',
+            height: 'calc(100vh - 130px)',
         }, children: _jsxs("div", { style: { display: 'flex', height: '100%', flexDirection: 'column' }, children: [_jsx(DynamicBanner, { header: initialSqlView
                         ? `Edit "${initialSqlView.name}" view`
                         : 'Create SQL View', message: initialSqlView
@@ -119,50 +161,62 @@ export default function CreateEditSqlView({ containerStyle, initialSqlView, clos
                             }, children: [_jsx("div", { style: {
                                         paddingLeft: '20px',
                                         paddingRight: '30px',
-                                    }, children: _jsx(TextInput, { placeholder: "Search...", 
-                                        // @ts-ignore
-                                        onChange: (e) => {
-                                            setTableSearchQuery(e);
+                                    }, children: _jsx(TextInput, { placeholder: "Search...", onChange: (e) => {
+                                            setTableSearchQuery(e.target.value);
                                             setDisplayedTableData(allTableData.filter((table) => table.tableName
                                                 .toLowerCase()
-                                                .includes(e.toLowerCase().trim())));
-                                        }, value: tableSearchQuery, id: 'edit-name', width: "100%" }) }), _jsx(SchemaListComponent, { schema: displayedTableData, theme: state.theme, LoadingComponent: LoadingComponent, loading: schemaIsLoading, width: '400px' })] }), _jsxs("div", { style: {
+                                                .includes(e.target.value.toLowerCase().trim())));
+                                        }, value: tableSearchQuery, id: 'edit-name', width: '100%' }) }), _jsx(SchemaListComponent, { schema: displayedTableData, theme: state.theme, LoadingComponent: LoadingComponent, loading: schemaIsLoading, width: '400px', onClick: handleClickSchemaItem })] }), _jsxs("div", { style: {
                                 display: 'flex',
                                 gap: 20,
                                 flexDirection: 'column',
                                 width: 'calc(100% - 250px)',
-                                height: '100%',
+                                maxHeight: '100%',
                                 overflowX: 'hidden',
                                 paddingRight: '24px',
                             }, children: [_jsxs("div", { style: {
-                                        display: 'flex',
-                                        flexDirection: 'row',
-                                        alignItems: 'flex-start',
-                                        justifyContent: 'space-between',
+                                        overflow: 'auto',
                                         gap: 20,
-                                        width: '100%',
-                                    }, children: [_jsx(TextInput
-                                        // @ts-ignore
-                                        , { 
-                                            // @ts-ignore
-                                            onChange: (e) => {
-                                                setAIPrompt(e);
-                                            }, placeholder: 'Describe a query...', value: aiPrompt, id: 'ai-prompt', width: '95%' }), _jsx(Button, { label: askAIButton, onClick: handleRunSqlPrompt, width: "100px" })] }), _jsx(SqlTextEditor, { value: editViewQuery, setValue: (e) => {
-                                        setEditViewQuery(e);
-                                    } }), _jsx("div", { style: { width: '200px' }, children: _jsx(Button, { label: runQueryButtonLabel, onClick: handleRunQuery }) }), errorInfo.show ? (_jsx("div", { style: {
-                                        fontSize: 15,
-                                        fontWeight: '400',
-                                    }, children: _jsx("div", { style: {
-                                            padding: 30,
-                                            background: 'rgba(0,0,0,0.02)',
-                                            display: 'inline-block',
-                                            flex: 0,
-                                            borderRadius: 6,
-                                        }, children: errorInfo.message }) })) : null, isLoading && (_jsx("div", { style: {
-                                        height: 'calc(100vh - 589px)',
-                                        width: '100%',
                                         display: 'flex',
-                                        justifyContent: 'center',
-                                        alignItems: 'center',
-                                    }, children: _jsx(LoadingComponent, {}) })), tableData && (_jsx(Table, { rows: tableData.rows, columns: tableData.fields, containerStyle: { height: '360px' } })), viewAddable && (_jsx("div", { style: { width: '200px' }, children: _jsx(Button, { label: `${initialSqlView ? 'Save changes' : 'Create view'}`, onClick: () => addEditSqlView(false) }) }))] })] }), _jsx(ForeignKeyModal, { isOpen: showFKModal, setIsOpen: setShowFKModal, override: addEditSqlView, foreignKey: state.client.customerFieldName, tableName: state.client.customerTableName })] }) }));
+                                        flexDirection: 'column',
+                                    }, children: [_jsxs("div", { style: {
+                                                display: 'flex',
+                                                flexDirection: 'row',
+                                                alignItems: 'flex-start',
+                                                justifyContent: 'space-between',
+                                                gap: 20,
+                                                width: '100%',
+                                            }, children: [_jsx(TextInput, { onChange: (e) => {
+                                                        setAIPrompt(e.target.value);
+                                                    }, placeholder: 'Describe a query...', value: aiPrompt, id: 'ai-prompt', width: '100%' }), _jsx(Button, { label: 'Ask AI', isLoading: askAIButtonLoading, onClick: handleRunSqlPrompt })] }), _jsx(SqlTextEditor, { value: editViewQuery, setValue: (e) => {
+                                                setEditViewQuery(e);
+                                            }, setEditorMounted: (didMount) => {
+                                                setEditorMounted(didMount);
+                                            }, setPreviousProvier: (provider) => {
+                                                setProvider(provider);
+                                            }, previousProvider: provider, schema: displayedTableData, databaseType: state.client.databaseType }), editorMounted && (_jsx("div", { style: { width: '200px' }, children: _jsx(Button, { label: 'Run query', onClick: () => {
+                                                    handleRunQuery();
+                                                } }) })), errorInfo.show ? (_jsx("div", { style: {
+                                                fontSize: 15,
+                                                fontWeight: '400',
+                                            }, children: _jsx("div", { style: {
+                                                    padding: 30,
+                                                    background: 'rgba(0,0,0,0.02)',
+                                                    display: 'inline-block',
+                                                    flex: 0,
+                                                    borderRadius: 6,
+                                                }, children: errorInfo.message }) })) : null, isLoading && (_jsx("div", { style: {
+                                                height: 'calc(100vh - 589px)',
+                                                width: '100%',
+                                                display: 'flex',
+                                                justifyContent: 'center',
+                                                alignItems: 'center',
+                                            }, children: _jsx(LoadingComponent, {}) })), tableData && (_jsx(Table, { rows: tableData.rows, columns: tableData.fields, containerStyle: { height: '360px', minHeight: 250 } }))] }), viewAddable && (_jsx("div", { style: { width: '200px' }, children: _jsx(Button, { label: `${initialSqlView ? 'Save changes' : 'Create view'}`, onClick: () => {
+                                            const duplicateColumns2 = getDuplicateColumns(tableData?.fields);
+                                            if (duplicateColumns2.length > 0) {
+                                                alert(`Ambiguous column names found. Either use aliases or remove the column to make every column name unique: \n\n${duplicateColumns2.join('\n')}`);
+                                                return;
+                                            }
+                                            addEditSqlView(false);
+                                        } }) }))] })] }), _jsx(ForeignKeyModal, { isOpen: showFKModal, setIsOpen: setShowFKModal, override: addEditSqlView, foreignKey: state.client.customerFieldName, tableName: state.client.customerTableName })] }) }));
 }

package/dist/esm/hooks/useOnClickOutside.d.ts

@@ -0,0 +1,3 @@
+declare const useOnClickOutside: (ref: React.RefObject<HTMLDivElement>, handler: (event: any) => void) => void;
+export default useOnClickOutside;
+//# sourceMappingURL=useOnClickOutside.d.ts.map

package/dist/esm/hooks/useOnClickOutside.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useOnClickOutside.d.ts","sourceRoot":"","sources":["../../../src/hooks/useOnClickOutside.tsx"],"names":[],"mappings":"AAEA,QAAA,MAAM,iBAAiB,QAChB,MAAM,SAAS,CAAC,cAAc,CAAC,mBACjB,GAAG,KAAG,IAAI,SAgB9B,CAAC;AAEF,eAAe,iBAAiB,CAAC"}

package/dist/esm/hooks/useOnClickOutside.js

@@ -0,0 +1,18 @@
+import { useEffect } from "react";
+const useOnClickOutside = (ref, handler) => {
+    useEffect(() => {
+        const listener = (event) => {
+            if (!ref.current || ref.current.contains(event.target)) {
+                return;
+            }
+            handler(event);
+        };
+        document.addEventListener("mousedown", listener);
+        document.addEventListener("touchstart", listener);
+        return () => {
+            document.removeEventListener("mousedown", listener);
+            document.removeEventListener("touchstart", listener);
+        };
+    }, [ref, handler]);
+};
+export default useOnClickOutside;

package/dist/esm/modals/EditFiltersModal.d.ts

@@ -0,0 +1,17 @@
+export declare function EditFiltersModal({ isOpen, dashboardData, selectedDashboard, client, setIsOpen, onSave, ModalComponent, TextInputComponent, ButtonComponent, HeaderComponent, SelectComponent, dashNames, SecondaryButtonComponent, openEditOrderModal, }: {
+    isOpen: boolean;
+    dashboardData: any;
+    selectedDashboard: any;
+    client: any;
+    setIsOpen: any;
+    onSave: any;
+    openEditOrderModal: any;
+    ModalComponent: any;
+    TextInputComponent: any;
+    ButtonComponent: any;
+    HeaderComponent: any;
+    SelectComponent: any;
+    dashNames: any;
+    SecondaryButtonComponent: any;
+}): import("react/jsx-runtime").JSX.Element;
+//# sourceMappingURL=EditFiltersModal.d.ts.map

package/dist/esm/modals/EditFiltersModal.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"EditFiltersModal.d.ts","sourceRoot":"","sources":["../../../src/modals/EditFiltersModal.tsx"],"names":[],"mappings":"AAgBA,wBAAgB,gBAAgB,CAAC,EAC/B,MAAM,EACN,aAAa,EACb,iBAAiB,EACjB,MAAM,EACN,SAAS,EACT,MAAM,EACN,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,eAAe,EACf,eAAe,EACf,SAAS,EACT,wBAAwB,EACxB,kBAAkB,GACnB,EAAE;IACD,MAAM,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,GAAG,CAAC;IACnB,iBAAiB,EAAE,GAAG,CAAC;IACvB,MAAM,EAAE,GAAG,CAAC;IACZ,SAAS,EAAE,GAAG,CAAC;IACf,MAAM,EAAE,GAAG,CAAC;IACZ,kBAAkB,EAAE,GAAG,CAAC;IACxB,cAAc,EAAE,GAAG,CAAC;IACpB,kBAAkB,EAAE,GAAG,CAAC;IACxB,eAAe,EAAE,GAAG,CAAC;IACrB,eAAe,EAAE,GAAG,CAAC;IACrB,eAAe,EAAE,GAAG,CAAC;IACrB,SAAS,EAAE,GAAG,CAAC;IACf,wBAAwB,EAAE,GAAG,CAAC;CAC/B,2CA2nBA"}