@quillsql/admin 1.6.0 → 1.6.1

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

@@ -50,6 +50,7 @@ export default function ConnectDatabase({ containerStyle, header1Style, header2S
         reader.readAsText(file);
     };
     const testConnectionAndFormClient = async () => {
+        setShowError(false);
         const connectionString = formConnectionString(databaseConnectionDetails);
         const result = await testConnectionString(connectionString, databaseConnectionDetails.type, clientId);
         if (result.success) {
@@ -164,28 +165,19 @@ export default function ConnectDatabase({ containerStyle, header1Style, header2S
                                                                 ...databaseConnectionDetails,
                                                                 [key]: e.target.value,
                                                             });
-                                                        }, value: value, disabled: key === 'type' })] }, key));
-                                    }) }) })] })) : (_jsx("div", { style: { minWidth: 790 }, children: _jsxs("div", { id: "database-details-form", style: {
+                                                        }, value: value, disabled: key === 'type', password: key === 'password' ? true : false })] }, key));
+                                    }) }) })] })) : (_jsx("div", { style: { minWidth: 790 }, children: _jsx("div", { id: "database-details-form", style: {
                                 display: 'grid',
                                 gridTemplateColumns: 'repeat(1, 1fr)',
                                 gap: '20px',
                                 justifyContent: 'space-between',
                                 marginTop: '16px',
-                            }, children: [_jsxs("div", { children: [_jsx("h2", { style: {
-                                                ...header2Style,
-                                                fontWeight: '600',
-                                            }, children: "Project ID" }), _jsx(TextInputPrimitive, { onChange: (e) => {
-                                                setConnectionDetails({
-                                                    ...databaseConnectionDetails,
-                                                    companyTag: e.target.value,
-                                                });
-                                                setCompanyTag(e.target.value);
-                                            }, value: companyTag })] }), _jsxs("div", { children: [_jsx("h2", { style: { ...header2Style, fontWeight: '600' }, children: "Submit File" }), _jsxs("div", { children: [_jsx("input", { type: "file", accept: ".json", onChange: handleFileChange, style: { display: 'none' }, id: "fileInput", ref: myInputRef }), _jsxs("div", { style: {
-                                                        display: 'flex',
-                                                        flexDirection: 'row',
-                                                        gap: 12,
-                                                        alignItems: 'center',
-                                                    }, children: [_jsx(ButtonPrimitive, { onClick: handleButtonClick, label: 'Upload JSON' }), _jsx("span", { style: { ...header2Style, fontWeight: '600' }, children: fileLabel })] })] })] })] }) })), _jsxs("div", { style: {
+                            }, children: _jsxs("div", { children: [_jsx("h2", { style: { ...header2Style, fontWeight: '600' }, children: "Service Account Json" }), _jsxs("div", { children: [_jsx("input", { type: "file", accept: ".json", onChange: handleFileChange, style: { display: 'none' }, id: "fileInput", ref: myInputRef }), _jsxs("div", { style: {
+                                                    display: 'flex',
+                                                    flexDirection: 'row',
+                                                    gap: 12,
+                                                    alignItems: 'center',
+                                                }, children: [_jsx(ButtonPrimitive, { onClick: handleButtonClick, label: 'Upload JSON' }), _jsx("span", { style: { ...header2Style, fontWeight: '600' }, children: fileLabel })] })] })] }) }) })), _jsxs("div", { style: {
                             width: '100%',
                             display: 'flex',
                             justifyContent: 'space-between',

package/dist/esm/forms/client_onboard/CreateSqlViews.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CreateSqlViews.d.ts","sourceRoot":"","sources":["../../../../src/forms/client_onboard/CreateSqlViews.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAuB,MAAM,OAAO,CAAC;AAC3D,OAAO,EAAU,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAY3D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAwB,MAAM,uBAAuB,CAAC;AAS7E,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EACrC,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,kBAAkB,EAClB,aAAa,EACb,UAAU,EACV,kBAAkB,EAClB,QAAQ,EACR,KAAK,GACN,EAAE;IACD,cAAc,CAAC,EAAE,aAAa,CAAC;IAC/B,YAAY,CAAC,EAAE,aAAa,CAAC;IAC7B,YAAY,CAAC,EAAE,aAAa,CAAC;IAC7B,cAAc,EAAE,cAAc,EAAE,CAAC;IACjC,kBAAkB,CAAC,EAAE,cAAc,CAAC;IACpC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,kBAAkB,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,GAAG,CAAC;CACZ,2CA0ZA;AAED,wBAAgB,eAAe,CAAC,EAC9B,MAAM,EACN,SAAS,EACT,QAAQ,EACR,UAAU,EACV,SAAS,GACV,EAAE;IACD,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAChC,QAAQ,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACxC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;CAC/B,2CAiDA"}
+{"version":3,"file":"CreateSqlViews.d.ts","sourceRoot":"","sources":["../../../../src/forms/client_onboard/CreateSqlViews.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAuB,MAAM,OAAO,CAAC;AAC3D,OAAO,EAAU,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAW3D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAQvD,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EACrC,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,kBAAkB,EAClB,aAAa,EACb,UAAU,EACV,kBAAkB,EAClB,QAAQ,EACR,KAAK,GACN,EAAE;IACD,cAAc,CAAC,EAAE,aAAa,CAAC;IAC/B,YAAY,CAAC,EAAE,aAAa,CAAC;IAC7B,YAAY,CAAC,EAAE,aAAa,CAAC;IAC7B,cAAc,EAAE,cAAc,EAAE,CAAC;IACjC,kBAAkB,CAAC,EAAE,cAAc,CAAC;IACpC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,kBAAkB,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,GAAG,CAAC;CACZ,2CA+aA;AAED,wBAAgB,eAAe,CAAC,EAC9B,MAAM,EACN,SAAS,EACT,QAAQ,EACR,UAAU,EACV,SAAS,GACV,EAAE;IACD,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAChC,QAAQ,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACxC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;CAC/B,2CAkDA"}

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

@@ -5,7 +5,9 @@ import { createSQLView, getQueryFromAiWithConnection, getSqlViewData, } from '..
 import SqlViewTile from '../../components/SqlViewTile';
 import SqlTextEditor from '../../components/SqlTextEditor';
 import { SchemaListComponent, Table } from '@quillsql/react';
-import { LoadingSpinner, } from '../../components/UiComponents';
+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({
@@ -42,12 +44,14 @@ export default function CreateSQLViews({ containerStyle, header1Style, header2St
     };
     const handleClickSchemaItem = async (event) => {
         const name = event.target.textContent;
-        if (queryInfo.query && queryInfo.query.length > 0) {
-            await navigator.clipboard.writeText(name || '');
+        if (!name) {
+            return;
         }
-        else {
-            setQueryInfo({ name: queryInfo.name, query: `SELECT * FROM ${name}` });
+        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({
@@ -59,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,
@@ -87,10 +92,11 @@ export default function CreateSQLViews({ containerStyle, header1Style, header2St
                                         setDisplayedTableData(columnsByTable.filter((table) => table.tableName
                                             .toLowerCase()
                                             .includes(e.target.value.toLowerCase().trim())));
-                                    }, value: tableSearchQuery, width: "100%" }) }), _jsx(SchemaListComponent, { schema: displayedTableData, theme: state.theme, width: '300px', loading: false, LoadingComponent: LoadingSpinner, onClick: handleClickSchemaItem })] }), _jsxs("div", { id: "form-editor-table", style: {
+                                    }, 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',
@@ -111,7 +117,7 @@ export default function CreateSQLViews({ containerStyle, header1Style, header2St
                                             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',
@@ -142,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%',
-                                        }, hideCSVDownloadButton: true }), _jsxs("div", { style: {
+                                        }, hideCSVDownloadButton: true, isLoading: runQueryButtonLoading }), _jsxs("div", { style: {
                                             width: '100%',
                                             display: 'flex',
                                             justifyContent: 'space-between',
@@ -153,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',
@@ -205,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 })] }));
 }
@@ -217,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,6 @@
 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 {
@@ -18,9 +19,11 @@ interface CreateEditSqlViewProps {
     }) => JSX.Element;
     closeEditView: () => 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,EAKrB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAEL,SAAS,EAKV,MAAM,OAAO,CAAC;AASf,OAAO,EAML,uBAAuB,EACxB,MAAM,+BAA+B,CAAC;AAEvC,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;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,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,CAgUtC"}
+{"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

@@ -7,7 +7,11 @@ 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 || '');
@@ -19,6 +23,7 @@ export default function CreateEditSqlView({ containerStyle, initialSqlView, clos
     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);
@@ -46,15 +51,17 @@ export default function CreateEditSqlView({ containerStyle, initialSqlView, clos
     };
     const handleClickSchemaItem = async (event) => {
         const name = event.target.textContent;
-        if (editViewQuery && editViewQuery.length > 0) {
-            await navigator.clipboard.writeText(name || '');
+        if (!name) {
+            return;
         }
-        else {
-            setEditViewQuery(`SELECT * FROM ${name}`);
+        const newQuery = `SELECT * FROM ${processColumnReference(name, state.client.databaseType)};`;
+        if (!editViewQuery || editViewQuery.length === 0) {
+            setEditViewQuery(newQuery);
         }
+        await navigator.clipboard.writeText(newQuery);
     };
-    const handleRunQuery = async () => {
-        const query = editViewQuery;
+    const handleRunQuery = async (overrideQuery) => {
+        const query = overrideQuery ? overrideQuery : editViewQuery;
         // If this query has a limit at the end alert the user
         if (/limit\s+\d+\s*;?\s*$/i.test(query)) {
             setErrorInfo({
@@ -69,7 +76,7 @@ export default function CreateEditSqlView({ containerStyle, initialSqlView, clos
         setIsLoading(true);
         setRunQueryButtonLoading(true);
         setOverrideFKCheck(false);
-        if (editViewQuery.length === 0) {
+        if (query.length === 0) {
             setErrorInfo({ show: true, message: 'Error: Please enter a query.' });
             setRunQueryButtonLoading(false);
             return;
@@ -88,13 +95,39 @@ export default function CreateEditSqlView({ containerStyle, initialSqlView, clos
         // 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);
@@ -102,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
@@ -138,34 +171,52 @@ export default function CreateEditSqlView({ containerStyle, initialSqlView, clos
                                 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, { 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);
-                                    } }), _jsx("div", { style: { width: '200px' }, children: _jsx(Button, { label: 'Run query', isLoading: runQueryButtonLoading, 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/modals/EditFiltersModal.d.ts.map

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

package/dist/esm/modals/EditFiltersModal.js

@@ -8,6 +8,7 @@ import InputLabel from '../components/InputLabel';
 import CardSection from '../components/CardSection';
 import TogglePrimitive from '../primitives/TogglePrimitive';
 import { SegmentedControl } from '../components/SegmentedControl';
+import { convertFieldTypeToJSType } from '../utils/columnProcessing';
 export function EditFiltersModal({ isOpen, dashboardData, selectedDashboard, client, setIsOpen, onSave, ModalComponent, TextInputComponent, ButtonComponent, HeaderComponent, SelectComponent, dashNames, SecondaryButtonComponent, openEditOrderModal, }) {
     const { state, dispatch } = useAdmin();
     const [selectedDashboardName, setSelectedDashboardName] = useState('');
@@ -102,6 +103,12 @@ export function EditFiltersModal({ isOpen, dashboardData, selectedDashboard, cli
                         filter: `${newDateFilter.label} (Date filter)`,
                     });
                 }
+                if (chart.chartType === 'pie' && isDateComparison) {
+                    filterProblems.push({
+                        chart: chart.name,
+                        filter: `${newDateFilter.label} (Date comparison)`,
+                    });
+                }
             });
         }
         updatedFilters.forEach((filter) => {
@@ -118,7 +125,7 @@ export function EditFiltersModal({ isOpen, dashboardData, selectedDashboard, cli
         }
         const url = `${QUILL_SERVER}/dashfilter/${client._id}/`;
         const body = {
-            newDashboardName: selectedDashboardName,
+            newDashboardName: selectedDashboardName.trim(),
             filters: updatedFilters,
             dateFilter: newDateFilter
                 ? {
@@ -127,7 +134,9 @@ export function EditFiltersModal({ isOpen, dashboardData, selectedDashboard, cli
                     primaryRange: initialRange,
                 }
                 : null,
-            name: selectedDashboard.name,
+            name: selectedDashboard.name
+                ? selectedDashboard.name.trim()
+                : selectedDashboardName.trim(),
             databaseType: state.client.databaseType,
         };
         const headers = {
@@ -167,6 +176,7 @@ export function EditFiltersModal({ isOpen, dashboardData, selectedDashboard, cli
                 body: JSON.stringify({
                     clientId: client._id,
                     databaseType: state.client.databaseType,
+                    dashboardName: selectedDashboard.name,
                 }),
             });
             setIsOpen(false);
@@ -291,7 +301,7 @@ export function EditFiltersModal({ isOpen, dashboardData, selectedDashboard, cli
                                                         ? state.tables
                                                             .find((table) => table.name === filter.table)
                                                             ?.columns.filter((column) => {
-                                                            return column.fieldType === 'varchar';
+                                                            return (convertFieldTypeToJSType(column.fieldType) === 'string');
                                                         })
                                                             .map((column) => {
                                                             return {

package/dist/esm/modals/NewDashboardModal.js

@@ -98,14 +98,14 @@ export function NewDashboardModal({ isOpen, client, setIsOpen, onSave, ModalComp
         }
         const url = `${QUILL_SERVER}/dashfilter/${client._id}/`;
         const body = {
-            newDashboardName: selectedDashboardName,
+            newDashboardName: selectedDashboardName.trim(),
             filters: updatedFilters,
             dateFilter: showDateFilter && {
                 ...newDateFilter,
                 comparison: isDateComparison,
                 primaryRange: initialRange,
             },
-            name: selectedDashboardName,
+            name: selectedDashboardName.trim(),
         };
         const headers = {
             'Content-Type': 'application/json',

package/dist/esm/modals/PromoteDashModal.js

@@ -45,7 +45,7 @@ const createStyles = (theme) => ({
         marginTop: '0px',
         marginBottom: '4px',
         fontWeight: theme.labelFontWeight,
-        color: theme.secondaryTextColor,
+        color: theme.primaryTextColor,
     },
     group: {
         display: 'flex',
@@ -105,7 +105,7 @@ export default function PromoteDashModal({ ModalComponent, isOpen, setIsOpen, cl
                             }), onChange: setModalSelectedDashboard, value: modalSelectedDashboard, theme: theme }) }) }), _jsxs("div", { style: styles.multiContainer, children: [_jsxs("div", { style: styles.group, children: [_jsx("h1", { style: styles.header, children: "From" }), _jsx("div", { style: styles.text, children: _jsx(DropDownMenu, { items: [client], setSelected: () => { }, selected: client, theme: theme, disabled: true }) })] }), _jsx("div", { style: styles.group, children: _jsx("div", { style: styles.text, children: _jsx(QuillSelectComponent, { label: "To", options: clients
                                         .filter((c) => c.name !== client.name)
                                         .map((client) => {
-                                        return { label: client.name, value: client.name };
+                                        return { label: client.name, value: client };
                                     }), onChange: setSelectedToClient, value: selectedToClient, theme: theme }) }) })] }), _jsx("div", { style: {
                         display: 'flex',
                         justifyContent: 'center',

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

@@ -7,7 +7,8 @@ interface PromoteViewModalProps {
     client: any;
     views: any[];
     clients: any[];
+    parentRef: any;
 }
-export default function PromoteViewModal({ ModalComponent, isOpen, setIsOpen, clientId, client, clients, views, }: PromoteViewModalProps): import("react/jsx-runtime").JSX.Element;
+export default function PromoteViewModal({ ModalComponent, isOpen, setIsOpen, clientId, client, clients, views, parentRef, }: PromoteViewModalProps): import("react/jsx-runtime").JSX.Element;
 export {};
 //# sourceMappingURL=PromoteViewModal.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"PromoteViewModal.d.ts","sourceRoot":"","sources":["../../../src/modals/PromoteViewModal.tsx"],"names":[],"mappings":";AAKA,UAAU,qBAAqB;IAC7B,cAAc,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACzC,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,GAAG,CAAC;IACZ,KAAK,EAAE,GAAG,EAAE,CAAC;IACb,OAAO,EAAE,GAAG,EAAE,CAAC;CAChB;AA+DD,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,cAAc,EACd,MAAM,EACN,SAAS,EACT,QAAQ,EACR,MAAM,EACN,OAAO,EACP,KAAK,GACN,EAAE,qBAAqB,2CAsGvB"}
+{"version":3,"file":"PromoteViewModal.d.ts","sourceRoot":"","sources":["../../../src/modals/PromoteViewModal.tsx"],"names":[],"mappings":";AAOA,UAAU,qBAAqB;IAC7B,cAAc,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACzC,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,GAAG,CAAC;IACZ,KAAK,EAAE,GAAG,EAAE,CAAC;IACb,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,SAAS,EAAE,GAAG,CAAC;CAChB;AAgED,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,cAAc,EACd,MAAM,EACN,SAAS,EACT,QAAQ,EACR,MAAM,EACN,OAAO,EACP,KAAK,EACL,SAAS,GACV,EAAE,qBAAqB,2CAuGvB"}