@quillsql/admin 1.6.2 → 1.6.4

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

@@ -11,6 +11,7 @@ import { QuillMultiSelectComponentWithCombo } from '../../components/QuillMultiS
 import CardSection from '../../components/CardSection';
 // import InputLabel from '../../components/InputLabel';
 import { useAdmin } from '../../AdminProvider';
+import { quillFetch } from '../../utils/dataFetcher';
 export default function ConnectDatabase({ containerStyle, header1Style, header2Style, environmentDetails, setEnvironmentDetails, fetchSchemasLoading, onConnectDatabase, }) {
     const { state, getToken } = useAdmin();
     const [error, setError] = useState(undefined);
@@ -120,8 +121,8 @@ export default function ConnectDatabase({ containerStyle, header1Style, header2S
         }
         try {
             setIsConnecting(true);
-            await setSchemaNames(state.queryEndpoint, clientId, selectedSchemas, getToken);
-            const databaseSchema = await getTableColumnsBySchema(state.queryEndpoint, clientId, getToken, selectedSchemas).then((res) => res.columnsByTable);
+            await setSchemaNames(state.queryEndpoint, clientId, selectedSchemas, getToken, state.queryHeaders);
+            const databaseSchema = await getTableColumnsBySchema(state.isSelfHosted, state.queryEndpoint, clientId, databaseConnectionDetails.type, getToken, selectedSchemas, state.queryHeaders).then((res) => res.columnsByTable);
             setEnvironmentDetails(databaseConnectionDetails, databaseSchema, selectedSchemas, clientId);
         }
         catch (e) {
@@ -133,11 +134,38 @@ export default function ConnectDatabase({ containerStyle, header1Style, header2S
             }, 1000);
         }
     };
+    const getSchemaNames = async () => {
+        setIsConnecting(true);
+        const tempClientId = clientId ?? state.client?.clientId;
+        const { data, status, queries } = await quillFetch({
+            client: {
+                queryEndpoint: state.queryEndpoint,
+                queryHeaders: state.queryHeaders,
+                withCredentials: !!state.withCredentials,
+                clientId: tempClientId,
+            },
+            task: 'get-schema-names',
+            metadata: {
+                databaseType: databaseConnectionDetails.type,
+                newClientId: clientId,
+            },
+            getToken: getToken,
+        });
+        if (status !== 'success') {
+            setIsConnecting(false);
+            setError('Error fetching schemas');
+            return;
+        }
+        const schemas = queries?.queryResults?.[0]?.rows?.map((row) => row['schema_name'] || row['SCHEMA_NAME']);
+        setClientId(data?.clientId);
+        setAllSchemas(schemas);
+        setIsConnecting(false);
+    };
     const testConnectionAndFormClient = async () => {
         setError(undefined);
         const connectionString = formConnectionString(databaseConnectionDetails);
         setIsConnecting(true);
-        const result = await testConnectionString(state.queryEndpoint, connectionString, databaseConnectionDetails.type, getToken, clientId);
+        const result = await testConnectionString(state.queryEndpoint, connectionString, databaseConnectionDetails.type, getToken, clientId, state.queryHeaders);
         if (result.success) {
             try {
                 setConnectionDetails({
@@ -170,50 +198,75 @@ export default function ConnectDatabase({ containerStyle, header1Style, header2S
                     display: 'flex',
                     flexDirection: 'row',
                     justifyContent: 'space-between',
-                }, children: [_jsx("h1", { style: header1Style, children: "Connect Database" }), clientId && !!selectedSchemas?.length && (_jsx("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 20 20", fill: "currentColor", width: "24px", height: "24px", children: _jsx("path", { fillRule: "evenodd", d: "M10 18a8 8 0 1 0 0-16 8 8 0 0 0 0 16Zm3.857-9.809a.75.75 0 0 0-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 1 0-1.06 1.061l2.5 2.5a.75.75 0 0 0 1.137-.089l4-5.5Z", clipRule: "evenodd" }) }))] }), _jsxs("div", { style: { marginTop: 12 }, children: [_jsx("h2", { style: { ...header2Style, fontWeight: 600, color: '#565656' }, children: "Database type" }), _jsx("div", { style: { display: 'flex', gap: 10, userSelect: 'none' }, children: DATABASE_DEFAULT_INFO.map((database) => {
-                            return (_jsx(DatabaseSelector, { onDatabaseSelect: onDatabaseSelect, databaseType: databaseConnectionDetails?.type || '', containerStyle: { marginBottom: '12px' }, label: database.label, value: database.value, imageUrl: database.imageUrl }, database.label));
-                        }) })] }), databaseConnectionDetails && (_jsxs("div", { children: [databaseConnectionDetails.type !== 'BigQuery' ? (_jsxs("div", { children: [['MySQL', 'PostgreSQL'].includes(databaseConnectionDetails.type) && (_jsxs("div", { style: { marginTop: 16, marginBottom: 24 }, children: [_jsx("h2", { style: {
-                                            ...header2Style,
-                                            fontWeight: 600,
-                                            marginBottom: 8,
-                                        }, children: "Connection Method" }), _jsx(QuillTab, { width: "486px", modeToggleOptions: credentialTabOptions, toggleMode: credentialTab, setToggleMode: setCredentialTab })] })), credentialTab === 'Database Credentials' ? (_jsx("div", { id: "database-details-form", children: _jsx("div", { style: {
-                                        display: 'grid',
-                                        gridTemplateColumns: 'repeat(3, 1fr)',
-                                        gap: '20px',
-                                        justifyContent: 'space-between',
-                                        marginTop: '16px',
-                                    }, children: 
-                                    // get a list of types in the databaseConnectionDetails object and create a form for each
-                                    Object.entries(databaseConnectionDetails).map(([key, value]) => {
-                                        if (key !== 'connectionString' && key !== 'type')
-                                            return (_jsxs("div", { "data-testid": `quill-input-${key}`, children: [_jsx("h2", { style: {
-                                                            ...header2Style,
-                                                            fontWeight: '600',
-                                                        }, children: key
-                                                            .split(/(?=[A-Z])/)
-                                                            .map((word) => word.charAt(0).toUpperCase() +
-                                                            word.slice(1))
-                                                            .join(' ') }), _jsx(TextInputPrimitive, { onChange: (e) => {
-                                                            setConnectionDetails({
-                                                                ...databaseConnectionDetails,
-                                                                [key]: e.target.value,
-                                                                connectionString: '',
-                                                            });
-                                                        }, value: value, disabled: key === 'type', password: key === 'password' ? true : false })] }, key));
-                                    }) }) })) : (_jsxs("div", { "data-testid": "quill-input-connectionString", children: [_jsx("h2", { style: { ...header2Style, fontWeight: 600 }, children: "Connection String" }), _jsx(TextInputPrimitive, { onChange: (e) => {
-                                            updateConnectionString(e.target.value);
-                                        }, value: databaseConnectionDetails.connectionString })] }))] })) : (_jsx("div", { style: { minWidth: 790 }, children: _jsx("div", { id: "database-details-form-bq", 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: "Service Account Json" }), _jsxs("div", { children: [_jsx("input", { title: "Upload JSON", type: "file", accept: ".json", onChange: handleFileChange, style: { display: 'none' }, id: "fileInput", "data-testid": "quill-input-fileInput", ref: myInputRef }), _jsxs("div", { style: {
-                                                    display: 'flex',
-                                                    flexDirection: 'row',
-                                                    gap: 12,
-                                                    alignItems: 'center',
-                                                }, children: [_jsx(ButtonPrimitive, { onClick: handleButtonClick, label: 'Upload JSON' }), _jsx("span", { "data-testid": "quill-file-label", style: { ...header2Style, fontWeight: '600' }, children: fileLabel })] })] })] }) }) })), _jsxs("div", { style: {
+                }, children: [_jsx("h1", { style: header1Style, children: "Connect Database" }), clientId && !!selectedSchemas?.length && (_jsx("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 20 20", fill: "currentColor", width: "24px", height: "24px", children: _jsx("path", { fillRule: "evenodd", d: "M10 18a8 8 0 1 0 0-16 8 8 0 0 0 0 16Zm3.857-9.809a.75.75 0 0 0-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 1 0-1.06 1.061l2.5 2.5a.75.75 0 0 0 1.137-.089l4-5.5Z", clipRule: "evenodd" }) }))] }), !state.isSelfHosted && (_jsxs("div", { style: { marginTop: 12 }, children: [_jsx("h2", { style: { ...header2Style, fontWeight: 600 }, children: "Database type" }), _jsx("div", { style: { display: 'flex', gap: 10, userSelect: 'none' }, children: DATABASE_DEFAULT_INFO.map((database) => {
+                            return (_jsx(DatabaseSelector, { onDatabaseSelect: onDatabaseSelect, databaseType: databaseConnectionDetails?.type || '', containerStyle: {
+                                    marginBottom: '12px',
+                                    ...(state.isSelfHosted && {
+                                        cursor: 'not-allowed',
+                                        pointerEvents: 'none',
+                                    }),
+                                    ...(state.isSelfHosted &&
+                                        database.value.toLowerCase() !==
+                                            environmentDetails.connection.type.toLowerCase() && {
+                                        backgroundColor: '#f5f5f5',
+                                    }),
+                                }, label: database.label, value: database.value, imageUrl: database.imageUrl, theme: state.theme }, database.label));
+                        }) })] })), databaseConnectionDetails && (_jsxs("div", { children: [!state.isSelfHosted && (_jsx("div", { children: databaseConnectionDetails.type !== 'BigQuery' ? (_jsxs("div", { children: [['MySQL', 'PostgreSQL'].includes(databaseConnectionDetails.type) && (_jsxs("div", { style: { marginTop: 16, marginBottom: 24 }, children: [_jsx("h2", { style: {
+                                                ...header2Style,
+                                                fontWeight: 600,
+                                                marginBottom: 8,
+                                            }, children: "Connection Method" }), _jsx(QuillTab, { width: "486px", modeToggleOptions: credentialTabOptions, toggleMode: credentialTab, setToggleMode: setCredentialTab })] })), credentialTab === 'Database Credentials' ? (_jsx("div", { id: "database-details-form", children: _jsx("div", { style: {
+                                            display: 'grid',
+                                            gridTemplateColumns: 'repeat(3, 1fr)',
+                                            gap: '20px',
+                                            justifyContent: 'space-between',
+                                            marginTop: '16px',
+                                        }, children: 
+                                        // get a list of types in the databaseConnectionDetails object and create a form for each
+                                        Object.entries(databaseConnectionDetails).map(([key, value]) => {
+                                            if (key !== 'connectionString' && key !== 'type')
+                                                return (_jsxs("div", { "data-testid": `quill-input-${key}`, children: [_jsx("h2", { style: {
+                                                                ...header2Style,
+                                                                fontWeight: '600',
+                                                            }, children: key
+                                                                .split(/(?=[A-Z])/)
+                                                                .map((word) => word.charAt(0).toUpperCase() +
+                                                                word.slice(1))
+                                                                .join(' ') }), _jsx(TextInputPrimitive, { onChange: (e) => {
+                                                                setConnectionDetails({
+                                                                    ...databaseConnectionDetails,
+                                                                    [key]: e.target.value,
+                                                                    connectionString: '',
+                                                                });
+                                                            }, value: value, disabled: key === 'type', password: key === 'password' ? true : false })] }, key));
+                                        }) }) })) : (_jsxs("div", { "data-testid": "quill-input-connectionString", children: [_jsx("h2", { style: { ...header2Style, fontWeight: 600 }, children: "Connection String" }), _jsx(TextInputPrimitive, { onChange: (e) => {
+                                                updateConnectionString(e.target.value);
+                                            }, value: databaseConnectionDetails.connectionString })] }))] })) : (_jsx("div", { style: { minWidth: 790 }, children: _jsx("div", { id: "database-details-form-bq", 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: "Service Account Json" }), _jsxs("div", { children: [_jsx("input", { title: "Upload JSON", type: "file", accept: ".json", onChange: handleFileChange, style: { display: 'none' }, id: "fileInput", "data-testid": "quill-input-fileInput", ref: myInputRef }), _jsxs("div", { style: {
+                                                        display: 'flex',
+                                                        flexDirection: 'row',
+                                                        gap: 12,
+                                                        alignItems: 'center',
+                                                    }, children: [_jsx(ButtonPrimitive, { onClick: handleButtonClick, label: 'Upload JSON' }), _jsx("span", { "data-testid": "quill-file-label", style: { ...header2Style, fontWeight: '600' }, children: fileLabel })] })] })] }) }) })) })), state.isSelfHosted ? (_jsxs("div", { style: {
+                            borderRadius: 6,
+                            padding: 12,
+                            background: '#f5f5f5',
+                            marginBottom: 18,
+                            marginTop: 18,
+                            fontSize: 14,
+                        }, children: [_jsx("h2", { style: { ...header2Style, fontWeight: 600 }, children: "Self-hosted Database Connection" }), _jsx("div", { style: {
+                                    display: 'flex',
+                                    flexDirection: 'row',
+                                    alignItems: 'center',
+                                    gap: 4,
+                                    color: state.theme?.secondaryTextColor,
+                                    fontFamily: state.theme?.fontFamily,
+                                }, children: `Using the database credentials passed into the Quill Server SDK at this endpoint: ${state.queryEndpoint}.` })] })) : (_jsxs("div", { style: {
                             borderRadius: 6,
                             padding: 12,
                             background: '#f5f5f5',
@@ -225,6 +278,8 @@ export default function ConnectDatabase({ containerStyle, header1Style, header2S
                                     flexDirection: 'row',
                                     alignItems: 'center',
                                     gap: 4,
+                                    color: state.theme?.secondaryTextColor,
+                                    fontFamily: state.theme?.fontFamily,
                                 }, children: ["Ensure Quill's IP is allowed to connect to your database", ' ', _jsx(ExternalLink, { href: databaseConnectionDetails.type.toLowerCase() === 'bigquery'
                                             ? 'https://cloud.google.com/access-context-manager/docs/overview#ip-address'
                                             : databaseConnectionDetails.type.toLowerCase() === 'mysql'
@@ -240,18 +295,26 @@ export default function ConnectDatabase({ containerStyle, header1Style, header2S
                                                             ? 'https://clickhouse.com/docs/cloud/security/setting-ip-filters/'
                                                             : 'https://www.postgresql.org/docs/current/auth-pg-hba-conf.html' })] }), _jsx(ClipboardButton, { text: "34.133.137.225", containerStyle: {
                                     marginTop: 12,
-                                } })] }), _jsx("div", { style: {
+                                } })] })), _jsx("div", { style: {
                             width: '100%',
                             display: 'flex',
                             justifyContent: 'space-between',
                             alignItems: 'center',
                             marginTop: '24px',
-                        }, "data-testid": "quill-connect-button", children: _jsx(ButtonPrimitive, { label: 'Connect', onClick: testConnectionAndFormClient, disabled: isButtonDisabled, isLoading: isConnecting }) })] })), _jsx(ModalPrimitive, { isOpen: !!error, onClose: () => setError(undefined), style: {
+                        }, "data-testid": "quill-connect-button", children: _jsx(ButtonPrimitive, { label: 'Connect', onClick: () => {
+                                if (state.isSelfHosted) {
+                                    getSchemaNames();
+                                }
+                                else {
+                                    testConnectionAndFormClient();
+                                }
+                            }, disabled: isButtonDisabled && !state.isSelfHosted, isLoading: isConnecting }) })] })), _jsx(ModalPrimitive, { isOpen: !!error, onClose: () => setError(undefined), style: {
                     width: 420,
                 }, children: _jsxs("div", { style: {
                         display: 'flex',
                         flexDirection: 'column',
                         gap: 20,
+                        fontFamily: state.theme?.fontFamily,
                         width: '100%',
                     }, children: [_jsx(CardSection, { children: "Failed to Connect" }), _jsxs("div", { style: { display: 'flex', flexDirection: 'column', gap: 5 }, children: [_jsx("div", { style: {
                                         color: 'red',
@@ -280,6 +343,7 @@ export default function ConnectDatabase({ containerStyle, header1Style, header2S
                         flexDirection: 'column',
                         gap: 20,
                         width: '100%',
+                        fontFamily: state.theme?.fontFamily,
                     }, children: [_jsx(CardSection, { children: "Connection Successful" }), _jsx("h2", { style: {
                                 fontSize: 15,
                                 fontWeight: 500,

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

@@ -1 +1 @@
-{"version":3,"file":"ConnectSchema.d.ts","sourceRoot":"","sources":["../../../../src/forms/client_onboard/ConnectSchema.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAgC,MAAM,OAAO,CAAC;AAOpE,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,EAAY,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAMhD,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,EACpC,cAAc,EACd,YAAY,EAEZ,cAAc,EACd,UAAU,EACV,UAAU,EACV,gBAAgB,EAChB,QAAQ,EACR,eAAe,EACf,KAAK,EACL,KAAK,EACL,uBAAuB,GACxB,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,UAAU,EAAE,cAAc,CAAC;IAC3B,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAChC,gBAAgB,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,CAAC;IACnD,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,KAAK,EAAE,KAAK,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,uBAAuB,EAAE,MAAM,IAAI,CAAC;CACrC,2CA0SA"}
+{"version":3,"file":"ConnectSchema.d.ts","sourceRoot":"","sources":["../../../../src/forms/client_onboard/ConnectSchema.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAgC,MAAM,OAAO,CAAC;AAOpE,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,EAAY,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAMhD,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,EACpC,cAAc,EACd,YAAY,EAEZ,cAAc,EACd,UAAU,EACV,UAAU,EACV,gBAAgB,EAChB,QAAQ,EACR,eAAe,EACf,KAAK,EACL,KAAK,EACL,uBAAuB,GACxB,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,UAAU,EAAE,cAAc,CAAC;IAC3B,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAChC,gBAAgB,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,CAAC;IACnD,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,KAAK,EAAE,KAAK,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,uBAAuB,EAAE,MAAM,IAAI,CAAC;CACrC,2CA4SA"}

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

@@ -123,7 +123,8 @@ databaseSchema, connection, tenantInit, onTenantCreation, clientId, selectedSche
                         }, children: [_jsx("h2", { style: {
                                     fontSize: 15,
                                     fontWeight: 500,
-                                    color: '#6e6e6e',
+                                    color: state.theme?.secondaryTextColor,
+                                    fontFamily: state.theme?.fontFamily,
                                     paddingBottom: 20,
                                 }, children: `How do you represent your customers in your database?` }), _jsx(EditTenant, { tenant: tenantToEdit, setTenant: (tenant) => setTenantToEdit(tenant), setCreateNewTenant: () => { }, onSubmitEditTenant: onSubmitEditTenant, onValidateEditTenant: onValidateEditTenant, SecondaryButtonComponent: SecondaryButtonPrimitive, TextInputComponent: TextInputPrimitive, ButtonComponent: MemoizedButton, isSubmitTenantLoading: isSubmitTenantLoading, client: {
                                     id: clientId,
@@ -138,6 +139,7 @@ databaseSchema, connection, tenantInit, onTenantCreation, clientId, selectedSche
                         display: 'flex',
                         flexDirection: 'column',
                         gap: 20,
+                        fontFamily: state.theme?.fontFamily,
                         width: '100%',
                     }, children: [_jsx(CardSection, { children: noTables ? 'Schema Issue' : 'Tenant Issue' }), _jsxs("div", { style: { display: 'flex', flexDirection: 'column', gap: 5 }, children: [_jsx("div", { style: {
                                         color: 'red',

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

@@ -1 +1 @@
-{"version":3,"file":"CreateVirtualTables.d.ts","sourceRoot":"","sources":["../../../../src/forms/client_onboard/CreateVirtualTables.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAA+B,MAAM,OAAO,CAAC;AACnE,OAAO,EAAU,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAY3D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAOvD,OAAO,EAAE,KAAK,EAAY,MAAM,qBAAqB,CAAC;AAGtD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,EAC1C,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,kBAAkB,EAClB,cAAc,EACd,kBAAkB,EAClB,MAAM,EACN,KAAK,EACL,UAAU,EACV,SAAS,EACT,SAAS,EACT,YAAY,GACb,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,kBAAkB,EAAE,MAAM,IAAI,CAAC;IAC/B,MAAM,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACrC,KAAK,EAAE,KAAK,CAAC;IACb,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAChC,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACjD,YAAY,EAAE,CAAC,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,EAAE,KAAK,IAAI,CAAC;CAClE,2CAoiBA;AAED,wBAAgB,iBAAiB,CAAC,EAChC,MAAM,EACN,SAAS,EACT,SAAS,EACT,YAAY,EACZ,eAAe,GAChB,EAAE;IACD,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAChC,SAAS,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3C,YAAY,EAAE,CAAC,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAC3D,eAAe,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAChD,2CAqHA;AAED,wBAAgB,gBAAgB,CAAC,EAC/B,MAAM,EACN,SAAS,EACT,MAAM,EACN,UAAU,GACX,EAAE;IACD,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;CACzB,2CA8EA"}
+{"version":3,"file":"CreateVirtualTables.d.ts","sourceRoot":"","sources":["../../../../src/forms/client_onboard/CreateVirtualTables.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAA+B,MAAM,OAAO,CAAC;AACnE,OAAO,EAAU,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAY3D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAOvD,OAAO,EAAE,KAAK,EAAY,MAAM,qBAAqB,CAAC;AAGtD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,EAC1C,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,kBAAkB,EAClB,cAAc,EACd,kBAAkB,EAClB,MAAM,EACN,KAAK,EACL,UAAU,EACV,SAAS,EACT,SAAS,EACT,YAAY,GACb,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,kBAAkB,EAAE,MAAM,IAAI,CAAC;IAC/B,MAAM,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACrC,KAAK,EAAE,KAAK,CAAC;IACb,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAChC,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACjD,YAAY,EAAE,CAAC,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,EAAE,KAAK,IAAI,CAAC;CAClE,2CAwiBA;AAED,wBAAgB,iBAAiB,CAAC,EAChC,MAAM,EACN,SAAS,EACT,SAAS,EACT,YAAY,EACZ,eAAe,GAChB,EAAE;IACD,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAChC,SAAS,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3C,YAAY,EAAE,CAAC,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAC3D,eAAe,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAChD,2CA2HA;AAED,wBAAgB,gBAAgB,CAAC,EAC/B,MAAM,EACN,SAAS,EACT,MAAM,EACN,UAAU,GACX,EAAE;IACD,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;CACzB,2CA8EA"}

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

@@ -152,7 +152,7 @@ export default function CreateVirtualTables({ containerStyle, header1Style, head
                                             whiteSpace: 'normal',
                                         }, displayBelow: true, children: _jsx(ButtonPrimitive, { label: 'Ask AI', isLoading: askAIButtonLoading, onClick: async () => {
                                                 setAskAIButtonLoading(true);
-                                                const results = await getQueryFromAiWithConnection(state.queryEndpoint, aiPrompt, client.clientId, getToken, client.schemaNames);
+                                                const results = await getQueryFromAiWithConnection(state.isSelfHosted, databaseSchema, state.queryEndpoint, aiPrompt, client.clientId, getToken, client.schemaNames, state.queryHeaders);
                                                 setQueryInfo({ name: queryInfo.name, query: results });
                                                 setAskAIButtonLoading(false);
                                             }, style: { width: '90px' }, disabled: aiPrompt.trim().length > 500 }) })] }), _jsx("div", { "data-testid": "quill-sql-text-editor", children: _jsx(SqlTextEditor, { value: queryInfo.query, setValue: (e) => {
@@ -170,7 +170,7 @@ export default function CreateVirtualTables({ containerStyle, header1Style, head
                                     height: 70,
                                 }, children: [_jsx(ButtonPrimitive, { label: 'Run query', isLoading: runQueryButtonLoading, onClick: async () => {
                                             setRunQueryButtonLoading(true);
-                                            const getSqlResults = await getVirtualTableData(client.clientId, queryInfo.query, environmentDetails.type, state.queryEndpoint, getToken);
+                                            const getSqlResults = await getVirtualTableData(client.clientId, queryInfo.query, environmentDetails.type, state.queryEndpoint, getToken, client.queryHeaders);
                                             if (!getSqlResults.success) {
                                                 setErrorInfo({ status: true, msg: getSqlResults.error });
                                             }
@@ -307,15 +307,18 @@ export default function CreateVirtualTables({ containerStyle, header1Style, head
                                     }, isLoading: isLoading }) })) : null] })] }), _jsx(TenantFieldModal, { isOpen: !!failingTenant, setClosed: () => setFailingTenant(undefined), tenant: failingTenant, onOverride: () => addVirtualTable(true) }), _jsx(VirtualTableModal, { isOpen: virtualTableModalOpen, setIsOpen: setVirtualTableModalOpen, queryInfo: queryInfo, setQueryInfo: setQueryInfo, addVirtualTable: () => addVirtualTable(false) })] }));
 }
 export function VirtualTableModal({ isOpen, setIsOpen, queryInfo, setQueryInfo, addVirtualTable, }) {
+    const { state: { theme }, } = useAdmin();
     return (_jsx(ModalPrimitive, { isOpen: isOpen, onClose: () => {
             setIsOpen(false);
         }, children: _jsxs("div", { style: { display: 'flex', flexDirection: 'column', width: '100%' }, children: [_jsx("h1", { style: {
                         fontSize: 24,
+                        fontFamily: theme.fontFamily,
                         fontWeight: 600,
                         color: '#212121',
                         paddingBottom: 20,
                     }, children: "Add Virtual Table" }), _jsx("h3", { style: {
                         fontWeight: '600',
+                        fontFamily: theme.fontFamily,
                         fontSize: '14px',
                         marginBottom: '6px',
                         color: '#212121',
@@ -325,6 +328,7 @@ export function VirtualTableModal({ isOpen, setIsOpen, queryInfo, setQueryInfo,
                         setQueryInfo({ name: e.target.value, query: queryInfo.query });
                     }, placeholder: "Name..." }), _jsx("h3", { style: {
                         fontWeight: '600',
+                        fontFamily: theme.fontFamily,
                         fontSize: '14px',
                         marginBottom: '6px',
                         marginTop: '12px',

package/dist/esm/forms/client_onboard/__tests__/ConnectSchema.test.js

@@ -64,6 +64,7 @@ describe('ConnectSchema', () => {
     const mockGetToken = jest.fn();
     const mockQuillFetchWithToken = jest.fn();
     const mockState = {
+        isSelfHosted: false,
         queryEndpoint: 'http://test-endpoint',
         loading: true,
         publicKey: 'test-key',

package/dist/esm/forms/client_onboard/__tests__/CreateVirtualTables.test.js

@@ -47,6 +47,7 @@ describe('CreateVirtualTables', () => {
     const mockGetToken = jest.fn();
     const mockQuillFetchWithToken = jest.fn();
     const mockState = {
+        isSelfHosted: false,
         queryEndpoint: 'http://test-endpoint',
         loading: true,
         publicKey: 'test-key',

package/dist/esm/forms/virtual_tables/CreateEditVirtualTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CreateEditVirtualTable.d.ts","sourceRoot":"","sources":["../../../../src/forms/virtual_tables/CreateEditVirtualTable.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EAGrB,MAAM,iBAAiB,CAAC;AAQzB,OAAO,EAOL,uBAAuB,EACxB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAU,cAAc,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAO/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAIlD,UAAU,2BAA2B;IACnC,cAAc,EAAE,KAAK,CAAC,aAAa,CAAC;IACpC,mBAAmB,CAAC,EAAE,SAAS,CAAC;IAChC,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC/D,wBAAwB,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IACxE,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC5D,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IACrC,qBAAqB,EAAE,MAAM,IAAI,CAAC;IAClC,mBAAmB,EAAE,CACnB,OAAO,EAAE,KAAK,GAAG,MAAM,EACvB,KAAK,EAAE,MAAM,EACb,iBAAiB,EAAE,MAAM,EAAE,EAC3B,IAAI,CAAC,EAAE,MAAM,EACb,EAAE,CAAC,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,GAAG,EAAE,EACf,QAAQ,CAAC,EAAE,OAAO,KACf,IAAI,CAAC;IACV,YAAY,EAAE,cAAc,EAAE,CAAC;IAC/B,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,EAAE,mBAAmB,CAAC;CAC7B;AAED,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,EAC7C,cAAc,EACd,mBAAmB,EACnB,qBAAqB,EAAE,qBAAqB,EAC5C,mBAAmB,EAAE,mBAAmB,EACxC,gBAA2C,EAC3C,eAAgC,EAChC,wBAAkD,EAClD,SAA6B,EAC7B,YAAY,EACZ,eAAe,EACf,MAAM,GACP,EAAE,2BAA2B,GAAG,GAAG,CAAC,OAAO,CAqgB3C"}
+{"version":3,"file":"CreateEditVirtualTable.d.ts","sourceRoot":"","sources":["../../../../src/forms/virtual_tables/CreateEditVirtualTable.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EAGrB,MAAM,iBAAiB,CAAC;AAQzB,OAAO,EAOL,uBAAuB,EACxB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAU,cAAc,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAO/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAIlD,UAAU,2BAA2B;IACnC,cAAc,EAAE,KAAK,CAAC,aAAa,CAAC;IACpC,mBAAmB,CAAC,EAAE,SAAS,CAAC;IAChC,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC/D,wBAAwB,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IACxE,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC5D,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IACrC,qBAAqB,EAAE,MAAM,IAAI,CAAC;IAClC,mBAAmB,EAAE,CACnB,OAAO,EAAE,KAAK,GAAG,MAAM,EACvB,KAAK,EAAE,MAAM,EACb,iBAAiB,EAAE,MAAM,EAAE,EAC3B,IAAI,CAAC,EAAE,MAAM,EACb,EAAE,CAAC,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,GAAG,EAAE,EACf,QAAQ,CAAC,EAAE,OAAO,KACf,IAAI,CAAC;IACV,YAAY,EAAE,cAAc,EAAE,CAAC;IAC/B,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,EAAE,mBAAmB,CAAC;CAC7B;AAED,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,EAC7C,cAAc,EACd,mBAAmB,EACnB,qBAAqB,EAAE,qBAAqB,EAC5C,mBAAmB,EAAE,mBAAmB,EACxC,gBAA2C,EAC3C,eAAgC,EAChC,wBAAkD,EAClD,SAA6B,EAC7B,YAAY,EACZ,eAAe,EACf,MAAM,GACP,EAAE,2BAA2B,GAAG,GAAG,CAAC,OAAO,CA+gB3C"}

package/dist/esm/forms/virtual_tables/CreateEditVirtualTable.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Table, SchemaListComponent, } from '@quillsql/react';
-import { useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
 import { useAdmin } from '../../AdminProvider';
 import { getQueryFromAiWithConnection, getVirtualTableData, } from '../../api/ConnectionClient';
 import SqlTextEditor from '../../components/SqlTextEditor';
@@ -32,6 +32,7 @@ export default function CreateEditVirtualTable({ containerStyle, initialVirtualT
     const [tableData, setTableData] = useState(undefined);
     const [runningQuery, setRunningQuery] = useState(false);
     const { state, getToken, quillFetchWithToken } = useAdmin();
+    const containerRef = useRef(null);
     const addEditProcessVirtualTable = async (override = false) => {
         const failingTenant = virtualTableOwners?.find((field) => tableData &&
             !tableData.fields.find((col) => col.name === field?.replaceAll('"', '')));
@@ -60,7 +61,7 @@ export default function CreateEditVirtualTable({ containerStyle, initialVirtualT
         setErrorInfo({ show: false, message: '' });
         setVirtualTableAddable(false);
         setAskAIButtonLoading(true);
-        const results = await getQueryFromAiWithConnection(state.queryEndpoint, aiPrompt, state.client._id, getToken, state.client.schemaNames);
+        const results = await getQueryFromAiWithConnection(state.isSelfHosted, allTableData, state.queryEndpoint, aiPrompt, state.client._id, getToken, state.client.schemaNames, state.queryHeaders);
         setEditVirtualTableQuery(results);
         setAskAIButtonLoading(false);
     };
@@ -105,7 +106,7 @@ export default function CreateEditVirtualTable({ containerStyle, initialVirtualT
             return;
         }
         setIsLoading(true);
-        const resp = await getVirtualTableData(state.client._id, query, state.client.databaseType, state.queryEndpoint, getToken);
+        const resp = await getVirtualTableData(state.client._id, query, state.client.databaseType, state.queryEndpoint, getToken, state.queryHeaders);
         if (!resp.success) {
             setErrorInfo({ show: true, message: resp.error });
             setTableData(undefined);
@@ -169,13 +170,16 @@ export default function CreateEditVirtualTable({ containerStyle, initialVirtualT
         setIsLoading(false);
         setRunningQuery(false);
     };
-    return (_jsx("div", { style: {
-            ...containerStyle,
+    return (_jsx("div", { ref: containerRef, style: {
             gap: 6,
-            height: 'calc(100vh - 130px)',
+            height: containerRef.current
+                ? `calc(100vh - ${containerRef.current.getBoundingClientRect().top ?? 0}px - 80px)`
+                : '100%',
+            // overflow: 'scroll',
+            ...containerStyle,
         }, children: _jsxs("div", { style: { display: 'flex', height: '100%', flexDirection: 'column' }, children: [_jsx(DynamicBanner, { header: initialVirtualTable
                         ? `Edit "${initialVirtualTable.name}" Virtual Table`
-                        : 'Create Virtual Table', onExit: initialVirtualTable ? undefined : closeEditVirtualTable }), _jsxs("div", { style: {
+                        : 'Create Virtual Table', onExit: initialVirtualTable ? undefined : closeEditVirtualTable, theme: state.theme }), _jsxs("div", { style: {
                         width: '100%',
                         display: 'flex',
                         height: '100%',

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

@@ -1 +1 @@
-{"version":3,"file":"useDatabaseSchema.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDatabaseSchema.tsx"],"names":[],"mappings":"AAIA,eAAO,MAAM,iBAAiB;;;CAuD7B,CAAC"}
+{"version":3,"file":"useDatabaseSchema.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDatabaseSchema.tsx"],"names":[],"mappings":"AAIA,eAAO,MAAM,iBAAiB;;;CAgE7B,CAAC"}

package/dist/esm/hooks/useDatabaseSchema.js

@@ -1,15 +1,20 @@
 import { useAdmin } from '../AdminProvider';
-import { useEffect, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { getTableColumnsBySchema } from '../api/ConnectionClient';
 export const useDatabaseSchema = () => {
     const { state, dispatch, getToken } = useAdmin();
     const [isLoading, setIsLoading] = useState(state.databaseSchema?.id !== state.client.id);
+    const idRef = useRef(null);
     useEffect(() => {
         const fetchSchema = async () => {
             if ((state.databaseSchema?.schema?.length ||
                 state.databaseSchema?.loading) &&
                 state.databaseSchema?.id === state.client.id)
                 return;
+            if (idRef.current === state.client.id) {
+                return;
+            }
+            idRef.current = state.client.id;
             try {
                 dispatch({
                     type: 'SET_DATABASE_SCHEMA',
@@ -20,7 +25,7 @@ export const useDatabaseSchema = () => {
                     },
                 });
                 setIsLoading(true);
-                const schema = await getTableColumnsBySchema(state.queryEndpoint, state.client.id, getToken);
+                const schema = await getTableColumnsBySchema(state.isSelfHosted, state.queryEndpoint, state.client.id, state.client.databaseType, getToken, state.client.schemaNames ?? [], state.queryHeaders);
                 dispatch({
                     type: 'SET_DATABASE_SCHEMA',
                     payload: {

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

@@ -1 +1 @@
-{"version":3,"file":"EditEnvironmentModal.d.ts","sourceRoot":"","sources":["../../../src/modals/EditEnvironmentModal.tsx"],"names":[],"mappings":"AAAA,OAAc,EACZ,yBAAyB,EACzB,aAAa,EAGd,MAAM,OAAO,CAAC;AAGf,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAQ3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAsB1E,wBAAgB,oBAAoB,CAAC,EACnC,MAAM,EACN,SAAS,EACT,MAAM,EACN,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,eAAe,EACf,wBAAwB,GACzB,EAAE;IACD,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACrC,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,cAAc,EAAE,GAAG,CAAC;IACpB,kBAAkB,EACd,yBAAyB,CACvB,uBAAuB,GAAG,aAAa,CAAC,gBAAgB,CAAC,CAC1D,GACD,CAAC,CAAC,KAAK,EAAE,uBAAuB,KAAK,GAAG,CAAC,OAAO,CAAC,CAAC;IACtD,eAAe,EAAE,GAAG,CAAC;IACrB,eAAe,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC9D,eAAe,EAAE,GAAG,CAAC;IACrB,wBAAwB,EAAE,GAAG,CAAC;CAC/B,2CAg4BA"}
+{"version":3,"file":"EditEnvironmentModal.d.ts","sourceRoot":"","sources":["../../../src/modals/EditEnvironmentModal.tsx"],"names":[],"mappings":"AAAA,OAAc,EACZ,yBAAyB,EACzB,aAAa,EAGd,MAAM,OAAO,CAAC;AAGf,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAQ3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAsB1E,wBAAgB,oBAAoB,CAAC,EACnC,MAAM,EACN,SAAS,EACT,MAAM,EACN,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,eAAe,EACf,wBAAwB,GACzB,EAAE;IACD,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACrC,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,cAAc,EAAE,GAAG,CAAC;IACpB,kBAAkB,EACd,yBAAyB,CACvB,uBAAuB,GAAG,aAAa,CAAC,gBAAgB,CAAC,CAC1D,GACD,CAAC,CAAC,KAAK,EAAE,uBAAuB,KAAK,GAAG,CAAC,OAAO,CAAC,CAAC;IACtD,eAAe,EAAE,GAAG,CAAC;IACrB,eAAe,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC9D,eAAe,EAAE,GAAG,CAAC;IACrB,wBAAwB,EAAE,GAAG,CAAC;CAC/B,2CAy4BA"}

package/dist/esm/modals/EditEnvironmentModal.js

@@ -268,7 +268,7 @@ export function EditEnvironmentModal({ isOpen, setIsOpen, onSave, ModalComponent
                     loading: true,
                 },
             });
-            const schema = await getTableColumnsBySchema(state.queryEndpoint, state.client._id, getToken);
+            const schema = await getTableColumnsBySchema(state.isSelfHosted, state.queryEndpoint, state.client._id, state.client.databaseType, getToken, state.client.schemaNames ?? [], state.queryHeaders);
             // If any of the tenants point to a table that no longer exists, throw an error
             const tenantTables = state.client.allTenantTypes?.filter((t) => t.tenantTable !== undefined);
             const tables = schema.columnsByTable.map((t) => t.tableName);
@@ -346,6 +346,10 @@ export function EditEnvironmentModal({ isOpen, setIsOpen, onSave, ModalComponent
         }
     };
     const handleDeleteEnvironment = async () => {
+        if (state.clients.length === 1) {
+            alert('You cannot delete the only environment');
+            return;
+        }
         if (confirm('Are you sure? All dashboards in this environment will also be deleted. This action cannot be undone.')) {
             await quillFetchWithToken({
                 client: {
@@ -365,7 +369,7 @@ export function EditEnvironmentModal({ isOpen, setIsOpen, onSave, ModalComponent
                 payload: state.clients.filter((c) => c._id !== state.client._id),
             });
             setSelectedDashboard(null);
-            setClient(state.clients[0]);
+            setClient(state.clients.filter((c) => c._id !== state.client._id)[0]);
             setIsOpen(false);
             onSave();
         }
@@ -407,6 +411,7 @@ export function EditEnvironmentModal({ isOpen, setIsOpen, onSave, ModalComponent
                                             // padding: '2px 8px',
                                             fontSize: 12,
                                             font: 'monospace',
+                                            fontFamily: state.theme.fontFamily,
                                             fontWeight: 300,
                                             width: 'fit-content',
                                         }, children: "Dashboard Owner" })), _jsx("div", { style: {

package/dist/esm/modals/EditFiltersModal.js

@@ -8,7 +8,7 @@ import { SAVED_QUERIES_DASHBOARD,
 SINGLE_TENANT,
 // defaultDateRange,
  } from '../utils/constants';
-import { defaultTheme, getPostgresBasicType } from '../Admin';
+import { getPostgresBasicType } from '../Admin';
 import InputLabel from '../components/InputLabel';
 import CardSection from '../components/CardSection';
 import { SegmentedControl } from '../components/SegmentedControl';
@@ -632,7 +632,7 @@ export function EditFiltersModal({ isOpen, selectedDashboardName, setIsOpen, onS
                                                                             // ) ?? initialRange,
                                                                             selectablePresetOptions.find((option) => option.value === e) ??
                                                                                 initialRange);
-                                                                        }, options: selectablePresetOptions, theme: defaultTheme, hideEmptyOption: true })] }) }), _jsx("div", { style: {
+                                                                        }, options: selectablePresetOptions, theme: state.theme, hideEmptyOption: true })] }) }), _jsx("div", { style: {
                                                                 display: 'flex',
                                                                 flexDirection: 'row',
                                                                 gap: '10px',
@@ -673,12 +673,12 @@ export function EditFiltersModal({ isOpen, selectedDashboardName, setIsOpen, onS
                                                     }, children: _jsxs("div", { style: {
                                                             display: 'flex',
                                                             flexDirection: 'column',
-                                                            fontFamily: defaultTheme.fontFamily,
+                                                            fontFamily: state.theme.fontFamily,
                                                             gap: 8,
                                                         }, children: [_jsx("h3", { style: {
                                                                     fontSize: 14,
                                                                     fontWeight: 600,
-                                                                    color: defaultTheme.primaryTextColor,
+                                                                    color: state.theme.primaryTextColor,
                                                                 }, children: "Recurring" }), _jsxs("div", { style: {
                                                                     display: 'flex',
                                                                     flexDirection: 'row',
@@ -762,7 +762,7 @@ export function EditFiltersModal({ isOpen, selectedDashboardName, setIsOpen, onS
                                                                                 }, width: "78px", number: true, max: 9999, min: 0, step: 1 })] }))] }), _jsx("h3", { style: {
                                                                     fontSize: 14,
                                                                     fontWeight: 600,
-                                                                    color: defaultTheme.primaryTextColor,
+                                                                    color: state.theme.primaryTextColor,
                                                                 }, children: "Standard" }), _jsxs("div", { style: {
                                                                     display: 'flex',
                                                                     flexDirection: 'row',
@@ -872,7 +872,7 @@ export function EditFiltersModal({ isOpen, selectedDashboardName, setIsOpen, onS
                                                                                     ...newDateFilter,
                                                                                     presetOptions: updatedOptions,
                                                                                 });
-                                                                            }, theme: defaultTheme, hideEmptyOption: true })] }), _jsxs("div", { style: {
+                                                                            }, theme: state.theme, hideEmptyOption: true })] }), _jsxs("div", { style: {
                                                                         display: 'flex',
                                                                         flexDirection: 'column',
                                                                     }, children: [index === 0 && _jsx(InputLabel, { children: "Value" }), interval.type === 'week' && (_jsx("div", { style: { width: 200, visibility: 'hidden' } })), interval.type === 'relative' && (_jsxs("div", { style: {
@@ -926,7 +926,7 @@ export function EditFiltersModal({ isOpen, selectedDashboardName, setIsOpen, onS
                                                                                             ...newDateFilter,
                                                                                             presetOptions: updatedOptions,
                                                                                         });
-                                                                                    }, theme: defaultTheme, hideEmptyOption: true, style: {
+                                                                                    }, theme: state.theme, hideEmptyOption: true, style: {
                                                                                         width: 120,
                                                                                         maxWidth: 120,
                                                                                         minWidth: 120,
@@ -1270,7 +1270,7 @@ export function EditFiltersModal({ isOpen, selectedDashboardName, setIsOpen, onS
                                                                         alignItems: 'center',
                                                                         width: '100%',
                                                                         gap: 10,
-                                                                    }, children: _jsx(SegmentedControl, { theme: defaultTheme, value: filter && filter.stringFilterType
+                                                                    }, children: _jsx(SegmentedControl, { theme: state.theme, value: filter && filter.stringFilterType
                                                                             ? filter.stringFilterType
                                                                             : 'default', onChange: (e) => {
                                                                             const updatedFilters = newFilters.map((otherFilter, i) => index === i

package/dist/esm/primitives/ButtonPrimitive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ButtonPrimitive.d.ts","sourceRoot":"","sources":["../../../src/primitives/ButtonPrimitive.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAgB,MAAM,UAAU,CAAC;AAGpD,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,iBAAiB,EAAE,UAAU,CAAC,KAAK,IAAI,CAAC;IAC1E,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B,OAAO,CAAC,EAAE,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;IAC7C,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC;CACtC,CAAC;AAEF,QAAA,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAC7B,oBAAoB,GAAG;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAgGF,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"ButtonPrimitive.d.ts","sourceRoot":"","sources":["../../../src/primitives/ButtonPrimitive.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAItC,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,iBAAiB,EAAE,UAAU,CAAC,KAAK,IAAI,CAAC;IAC1E,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC5B,OAAO,CAAC,EAAE,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;IAC7C,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC;CACtC,CAAC;AAEF,QAAA,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAC7B,oBAAoB,GAAG;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAsGF,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/dist/esm/primitives/ButtonPrimitive.js

@@ -1,7 +1,9 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { defaultTheme } from '../Admin';
 import { LoadingSpinner } from '../components/UiComponents';
-const ButtonPrimitive = ({ onClick, isLoading = false, label, theme = defaultTheme, style, disabled, variant = 'primary', type = 'submit', }) => {
+import { useAdmin } from '../AdminProvider';
+const ButtonPrimitive = ({ onClick, isLoading = false, label, theme, style, disabled, variant = 'primary', type = 'submit', }) => {
+    const { state: { theme: stateTheme }, } = useAdmin();
+    theme = theme ?? stateTheme;
     if (variant === 'danger') {
         return (_jsx("button", { type: type, style: {
                 height: 40,
@@ -24,7 +26,6 @@ const ButtonPrimitive = ({ onClick, isLoading = false, label, theme = defaultThe
     }
     return (_jsxs("button", { className: disabled ? 'quill-button-disabled' : 'quill-button', type: type, style: {
             height: 40,
-            color: theme?.backgroundColor ?? 'white',
             display: 'flex',
             borderRadius: 6,
             alignItems: 'center',
@@ -43,13 +44,16 @@ const ButtonPrimitive = ({ onClick, isLoading = false, label, theme = defaultThe
             ...style,
         }, onClick: disabled || isLoading ? () => { } : onClick, children: [_jsx("style", { children: `
       .quill-button {
-        background-color: #212121;
+        background-color: ${theme?.primaryButtonColor ?? '#212121'};
+        color: ${theme?.primaryButtonTextColor ?? 'white'}
       }
       .quill-button-disabled {
-        background-color: rgba(56, 65, 81, 0.9);
+        background-color: ${theme?.primaryButtonColor ?? '#212121'};
+        color: ${theme?.primaryButtonTextColor ?? 'white'}
       }
       .quill-button:hover {
-        background-color: rgba(56, 65, 81, 0.9);
+        background-color: ${theme?.hoverPrimaryButtonColor ?? 'rgba(56, 65, 81, 0.9)'};
+        color: ${theme?.hoverPrimaryButtonTextColor ?? 'white'}
       }` }), isLoading ? (_jsx("div", { style: { position: 'absolute' }, children: _jsx(LoadingSpinner, {}) })) : null, _jsx("div", { style: {
                     visibility: isLoading ? 'hidden' : 'visible',
                 }, children: label })] }));