@quillsql/admin 1.3.7 → 1.3.9

package/dist/esm/AdminProvider.js

@@ -1,8 +1,9 @@
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useReducer, createContext, useEffect, useContext, } from 'react';
 import { theme } from './Admin';
 import { QuillProvider } from '@quillsql/react';
 import { QUILL_SERVER } from './utils/constants';
+import CreateEnvironment from './public_components/CreateEnvironment';
 const AdminContext = createContext(undefined);
 function reducer(state, action) {
     switch (action.type) {
@@ -22,8 +23,6 @@ function reducer(state, action) {
             return { ...state, clients: [...state.clients, action.payload] };
         case 'SET_ENVIRONMENT':
             return { ...state, environment: action.payload };
-        case 'SET_ORGANIZATION':
-            return { ...state, organization: action.payload };
         case 'SET_ORGANIZATIONS':
             return { ...state, organizations: action.payload };
         case 'SET_ORGANIZATION_ID':
@@ -56,8 +55,8 @@ function reducer(state, action) {
             return { ...state, navigateToDashboardManager: action.payload };
         case 'SET_NAVIGATE_TO_DASHBOARD_BUILDER':
             return { ...state, navigateToDashboardBuilder: action.payload };
-        case 'SET_ORGANIZATION_ID_SET':
-            return { ...state, organizationIdSet: action.payload };
+        case 'SET_DATABASE_TYPE_MISMATCH':
+            return { ...state, databaseTypeMismatch: action.payload };
         default:
             return state;
     }
@@ -82,13 +81,10 @@ function AdminProvider({ children, publicKey, queryEndpoint, queryHeaders, withC
                 return {};
             }
             return {
-                activeComponent: savedState.activeComponent || 'Dashboards',
                 selectedDashboard: savedState.selectedDashboard || null,
                 organizationId: savedState.organizationId || null,
-                organizationIdSet: savedState.organizationIdSet || false,
-                organizations: savedState.organizations || [],
-                organization: savedState.organization || null,
                 client: savedState.client || null,
+                publicKey: savedState.publicKey || null,
             };
         }
         catch (err) {
@@ -121,21 +117,17 @@ function AdminProvider({ children, publicKey, queryEndpoint, queryHeaders, withC
         organizationIdSet: false,
         dateFilter: {},
         domainName: domainName || '',
+        databaseTypeMismatch: { show: false, backendDatabaseType: '' },
         ...loadState(),
     };
     const [state, dispatch] = useReducer(reducer, initialState);
     useEffect(() => {
         try {
             const stateToSave = {
-                activeComponent: state.activeComponent,
                 selectedDashboard: state.selectedDashboard,
                 organizationId: state.organizationId,
-                organizationIdSet: state.organizationIdSet,
-                organizations: state.organizations,
-                organization: state.organization,
                 publicKey: state.publicKey,
                 client: state.client,
-                domainName: state.domainName,
             };
             const serializedState = JSON.stringify(stateToSave);
             sessionStorage.setItem('adminState', serializedState);
@@ -144,15 +136,10 @@ function AdminProvider({ children, publicKey, queryEndpoint, queryHeaders, withC
             console.warn('Error writing state to session storage');
         }
     }, [
-        state.activeComponent,
         state.selectedDashboard,
         state.organizationId,
         state.client,
-        state.organizationIdSet,
-        state.organizations,
-        state.organization,
         state.publicKey,
-        state.domainName,
     ]);
     useEffect(() => {
         async function fetchClient(publicKey) {
@@ -160,14 +147,26 @@ function AdminProvider({ children, publicKey, queryEndpoint, queryHeaders, withC
                 return;
             }
             try {
-                const response = await fetch(`${QUILL_SERVER}/client/${publicKey}/`, {
-                    method: 'GET',
-                    headers: { Authorization: `Bearer ` },
+                const response = await fetch(`${queryEndpoint}`, {
+                    method: 'POST',
+                    headers: {
+                        ...queryHeaders,
+                        'Content-Type': 'application/json',
+                    },
+                    body: JSON.stringify({
+                        metadata: {
+                            clientId: publicKey,
+                            publicKey,
+                            task: 'client',
+                        },
+                    }),
                 });
                 const data = await response.json();
-                if (!state.client) {
-                    dispatch({ type: 'SET_CLIENT', payload: data.client });
-                }
+                dispatch({
+                    type: 'SET_CLIENT',
+                    payload: initialState.client || data.data.client,
+                });
+                dispatch({ type: 'SET_CLIENTS', payload: data.data.clients });
             }
             catch (error) {
                 console.error('ERROR:', error);
@@ -181,16 +180,27 @@ function AdminProvider({ children, publicKey, queryEndpoint, queryHeaders, withC
                 return;
             }
             try {
-                const response = await fetch(`${QUILL_SERVER}/schema2/${clientId}/`, {
-                    method: 'GET',
-                    headers: { Authorization: `Bearer ` },
+                const response = await fetch(`${queryEndpoint}`, {
+                    method: 'POST',
+                    headers: {
+                        ...queryHeaders,
+                        'Content-Type': 'application/json',
+                    },
+                    body: JSON.stringify({
+                        metadata: {
+                            clientId: publicKey,
+                            publicKey,
+                            task: 'schema',
+                            databaseType: state.client.databaseType,
+                        },
+                    }),
                 });
                 if (!response.ok) {
                     throw new Error('Failed to fetch tables data');
                 }
                 const data = await response.json();
-                dispatch({ type: 'SET_TABLES', payload: data.tables });
-                dispatch({ type: 'SET_SCHEMA', payload: data.tables });
+                dispatch({ type: 'SET_TABLES', payload: data.data.tables });
+                dispatch({ type: 'SET_SCHEMA', payload: data.data.tables });
             }
             catch (error) {
                 console.error('ERROR:', error);
@@ -200,31 +210,6 @@ function AdminProvider({ children, publicKey, queryEndpoint, queryHeaders, withC
             fetchSchemaAndTables(state.client._id);
         }
     }, [state?.client, publicKey]);
-    useEffect(() => {
-        if (publicKey === '' || publicKey === undefined || publicKey === null) {
-            throw new Error('publicKey is required');
-        }
-        const getClients = async () => {
-            try {
-                const url = `${QUILL_SERVER}/clients/${publicKey}/`;
-                const response = await fetch(url, {
-                    method: 'GET',
-                    headers: {
-                        Authorization: `Bearer `,
-                    },
-                });
-                if (!response.ok) {
-                    throw new Error(`HTTP error! status: ${response.status}`);
-                }
-                const data = await response.json();
-                dispatch({ type: 'SET_CLIENTS', payload: data });
-            }
-            catch (error) {
-                console.error('Error fetching clients:', error);
-            }
-        };
-        getClients();
-    }, [publicKey]);
     useEffect(() => {
         let isSubscribed = true;
         async function getCustomers() {
@@ -237,6 +222,7 @@ function AdminProvider({ children, publicKey, queryEndpoint, queryHeaders, withC
             };
             try {
                 let response;
+                dispatch({ type: 'SET_LOADING', payload: true });
                 if (state.queryEndpoint) {
                     response = await fetch(state.queryEndpoint, {
                         method: 'POST',
@@ -245,7 +231,11 @@ function AdminProvider({ children, publicKey, queryEndpoint, queryHeaders, withC
                             'Content-Type': 'application/json',
                         },
                         body: JSON.stringify({
-                            metadata: { clientId: state.client._id, task: 'orgs' },
+                            metadata: {
+                                clientId: state.client._id,
+                                task: 'orgs',
+                                databaseType: state.client.databaseType,
+                            },
                         }),
                         credentials: state.withCredentials ? 'include' : 'omit', // If withCredentials is true, set to 'include'. Otherwise, set to 'omit'.
                     });
@@ -258,38 +248,45 @@ function AdminProvider({ children, publicKey, queryEndpoint, queryHeaders, withC
                 }
                 const data = await response.json();
                 if (data.status === 'error') {
+                    dispatch({ type: 'SET_LOADING', payload: false });
                     throw new Error(data.error);
                 }
+                if (data.queries.dbMismatched) {
+                    dispatch({
+                        type: 'SET_DATABASE_TYPE_MISMATCH',
+                        payload: {
+                            show: true,
+                            backendDatabaseType: data.queries.backendDatbaseType, // TYPO NEED TO FIX IN NODE and Python SDK
+                        },
+                    });
+                    dispatch({ type: 'SET_LOADING', payload: false });
+                    return;
+                }
                 if (state.queryEndpoint) {
                     dispatch({
                         type: 'SET_ORGANIZATIONS',
-                        payload: [...data.data.rows, { id: '', name: 'All Organizations' }],
+                        payload: [...data.data.rows],
                     });
                 }
                 else {
                     dispatch({
                         type: 'SET_ORGANIZATIONS',
-                        payload: [...data.orgs, { id: '', name: 'All Organizations' }],
+                        payload: [...data.orgs],
                     });
                 }
-                if (!state.organizationIdSet) {
-                    if (state.environment === 'STAGING') {
-                        dispatch({
-                            type: 'SET_ORGANIZATION_ID',
-                            payload: state.client.stagingAdminCustomerId,
-                        });
-                    }
-                    else {
-                        dispatch({
-                            type: 'SET_ORGANIZATION_ID',
-                            payload: state.client.adminCustomerId,
-                        });
-                    }
-                    dispatch({ type: 'SET_ORGANIZATION_ID_SET', payload: true });
-                }
+                dispatch({
+                    type: 'SET_DATABASE_TYPE_MISMATCH',
+                    payload: { show: false, backendDatabaseType: '' },
+                });
+                dispatch({
+                    type: 'SET_ORGANIZATION_ID',
+                    payload: state.organizationId || state.client.adminCustomerId,
+                });
+                dispatch({ type: 'SET_LOADING', payload: false });
             }
             catch (error) {
                 console.error('Error fetching data:', error);
+                dispatch({ type: 'SET_LOADING', payload: false });
             }
         }
         if (isSubscribed && state.client) {
@@ -299,17 +296,6 @@ function AdminProvider({ children, publicKey, queryEndpoint, queryHeaders, withC
             isSubscribed = false;
         };
     }, [state.environment, state.client, state.organizationId, publicKey]);
-    useEffect(() => {
-        if (state.client &&
-            state.clients &&
-            state.organizations &&
-            state.organizationIdSet) {
-            dispatch({ type: 'SET_LOADING', payload: false });
-        }
-        else {
-            dispatch({ type: 'SET_LOADING', payload: true });
-        }
-    }, [state.client, state.clients, state.organizations, state.organizationId]);
-    return (_jsx(AdminContext.Provider, { value: { state, dispatch }, children: !state.loading && (_jsx(QuillProvider, { organizationId: state.organizationId, queryEndpoint: state.queryEndpoint ?? '', withCredentials: state.withCredentials, queryHeaders: state.queryHeaders ?? {}, publicKey: state.client._id, environment: state.environment, theme: state.theme, children: children })) }));
+    return (_jsxs(AdminContext.Provider, { value: { state, dispatch }, children: [!state.client && !state.loading && _jsx(CreateEnvironment, {}), state.client && (_jsx(QuillProvider, { organizationId: state.organizationId, queryEndpoint: state.queryEndpoint ?? '', withCredentials: state.withCredentials, queryHeaders: state.queryHeaders ?? {}, publicKey: state.client._id, environment: state.environment, theme: state.theme, children: children }))] }));
 }
 export { AdminProvider, useAdmin };

package/dist/esm/api/ConnectionClient.d.ts

@@ -1,24 +1,26 @@
 import { ConnectionError, ConnectionType } from '../utils/databases';
 import { SchemaDetails } from '../utils/schema';
 import { Column, ColumnsByTable } from '../utils/table';
-export declare function testConnectionString(connectionString: string): Promise<any>;
-export declare function getSchemaTableInfo(connectionString: string, schema: string): Promise<SchemaDetails | ConnectionError>;
-export declare function getTablesBySchema(connectionString: string, schema: string): Promise<string[] | undefined>;
-export declare function getTableInfo(connectionString: string, schema: string, table: string): Promise<SchemaDetails>;
-export declare function getOrgInfo(connectionString: string, schema: string, table: string, orgIdColumn: string, orgColumn: string): Promise<{
+export declare function testConnectionString(connectionString: string, databaseType: string, clientId?: string): Promise<any>;
+export declare function getSchemaTableInfo(clientId: string, schema: string, databaseType: string): Promise<SchemaDetails | ConnectionError>;
+export declare function getTablesBySchema(clientId: string, schema: string): Promise<string[] | undefined>;
+export declare function getTableInfo(clientId: string, schema: string, table: string): Promise<SchemaDetails>;
+export declare function getOrgInfo(clientId: string, schema: string, table: string, orgIdColumn: string, orgColumn: string): Promise<{
     name: string;
     id: any;
 }[]>;
-export declare function getFKInfo(connectionString: string, schema: string, table: string, primaryKey: string): Promise<string[]>;
-export declare function getTableSchema(connectionString: string, tables: string[]): Promise<ColumnsByTable[]>;
+export declare function getFKInfo(clientId: string, schema: string, table: string, primaryKey: string): Promise<string[]>;
+export declare function getTableSchema(clientId: string, tables: string[], schemaName: string): Promise<ColumnsByTable[]>;
+export declare function getTableColumnsBySchema(clientId: string, schemaNames: string[], databaseType: string, queryEndpoint?: string): Promise<ColumnsByTable[]>;
 export declare function getSQLViews(tableSchemas: any, customerNameField: string): Promise<any>;
-export declare function getSqlViewData(connectionString: string, query: string): Promise<any>;
+export declare function getSqlViewData(clientId: string, query: string, databaseType: string, queryEndpoint?: string): Promise<any>;
 export declare function getQueryFromAI(aiPrompt: string, columnsByTable: ColumnsByTable[]): Promise<string>;
+export declare function getQueryFromAiWithConnection(aiPrompt: string, clientId: string, schemaNames?: string[]): Promise<string>;
 export declare function createSQLView(connectionType: ConnectionType, allSchemaInfo: SchemaDetails, columnsByTable: ColumnsByTable[], viewInfo: {
     name: string;
     query: string;
 }, client: any, domainName: string | undefined, tableData: {
     rows: object[];
-    columns: Column[];
-} | undefined, currentTableNames: string[], override?: boolean): Promise<any>;
+    fields: Column[];
+} | undefined, currentTableNames: string[], override: boolean | undefined, clientId: string): Promise<any>;
 //# sourceMappingURL=ConnectionClient.d.ts.map

package/dist/esm/api/ConnectionClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConnectionClient.d.ts","sourceRoot":"","sources":["../../../src/api/ConnectionClient.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EACf,cAAc,EAEf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAExD,wBAAsB,oBAAoB,CAAC,gBAAgB,EAAE,MAAM,gBAclE;AAED,wBAAsB,kBAAkB,CACtC,gBAAgB,EAAE,MAAM,EACxB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,aAAa,GAAG,eAAe,CAAC,CAe1C;AACD,wBAAsB,iBAAiB,CACrC,gBAAgB,EAAE,MAAM,EACxB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAe/B;AAED,wBAAsB,YAAY,CAChC,gBAAgB,EAAE,MAAM,EACxB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,aAAa,CAAC,CAgBxB;AAED,wBAAsB,UAAU,CAC9B,gBAAgB,EAAE,MAAM,EACxB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,GAAG,CAAA;CAAE,EAAE,CAAC,CAkBtC;AAED,wBAAsB,SAAS,CAC7B,gBAAgB,EAAE,MAAM,EACxB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC,CA6BnB;AAED,wBAAsB,cAAc,CAClC,gBAAgB,EAAE,MAAM,EACxB,MAAM,EAAE,MAAM,EAAE,GACf,OAAO,CAAC,cAAc,EAAE,CAAC,CAe3B;AAED,wBAAsB,WAAW,CAC/B,YAAY,EAAE,GAAG,EACjB,iBAAiB,EAAE,MAAM,GACxB,OAAO,CAAC,GAAG,CAAC,CAqBd;AAED,wBAAsB,cAAc,CAClC,gBAAgB,EAAE,MAAM,EACxB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,GAAG,CAAC,CAed;AAED,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,cAAc,EAAE,GAC/B,OAAO,CAAC,MAAM,CAAC,CAejB;AAED,wBAAsB,aAAa,CACjC,cAAc,EAAE,cAAc,EAC9B,aAAa,EAAE,aAAa,EAC5B,cAAc,EAAE,cAAc,EAAE,EAChC,QAAQ,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EACzC,MAAM,EAAE,GAAG,EACX,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,SAAS,EACL;IACE,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,GACD,SAAS,EACb,iBAAiB,EAAE,MAAM,EAAE,EAC3B,QAAQ,UAAQ,GACf,OAAO,CAAC,GAAG,CAAC,CAuEd"}
+{"version":3,"file":"ConnectionClient.d.ts","sourceRoot":"","sources":["../../../src/api/ConnectionClient.ts"],"names":[],"mappings":"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"}

package/dist/esm/api/ConnectionClient.js

@@ -1,6 +1,5 @@
 import { QUILL_SERVER } from '../utils/constants';
-import { formConnectionString, } from '../utils/databases';
-export async function testConnectionString(connectionString) {
+export async function testConnectionString(connectionString, databaseType, clientId) {
     const localURL = `${QUILL_SERVER}/sdk/test-connection`;
     const response = await fetch(localURL, {
         method: 'POST',
@@ -9,13 +8,15 @@ export async function testConnectionString(connectionString) {
         },
         body: JSON.stringify({
             connectionString,
+            clientId,
+            databaseType,
             task: 'test-connection',
         }),
     });
     const results = await response.json();
-    return results.success;
+    return results;
 }
-export async function getSchemaTableInfo(connectionString, schema) {
+export async function getSchemaTableInfo(clientId, schema, databaseType) {
     const localURL = `${QUILL_SERVER}/sdk/schema-info`;
     const response = await fetch(localURL, {
         method: 'POST',
@@ -23,15 +24,16 @@ export async function getSchemaTableInfo(connectionString, schema) {
             'Content-Type': 'application/json',
         },
         body: JSON.stringify({
-            connectionString,
+            clientId,
             schema,
+            databaseType,
             task: 'schema-info',
         }),
     });
     const results = await response.json();
     return results;
 }
-export async function getTablesBySchema(connectionString, schema) {
+export async function getTablesBySchema(clientId, schema) {
     const localURL = `${QUILL_SERVER}/sdk/tables-by-schema`;
     const response = await fetch(localURL, {
         method: 'POST',
@@ -39,15 +41,15 @@ export async function getTablesBySchema(connectionString, schema) {
             'Content-Type': 'application/json',
         },
         body: JSON.stringify({
-            connectionString,
-            schema,
+            clientId,
+            schemaNames: [schema],
             task: 'tables-by-schema',
         }),
     });
     const results = await response.json();
     return results.tables;
 }
-export async function getTableInfo(connectionString, schema, table) {
+export async function getTableInfo(clientId, schema, table) {
     const localURL = `${QUILL_SERVER}/sdk/table-info`;
     const response = await fetch(localURL, {
         method: 'POST',
@@ -55,7 +57,7 @@ export async function getTableInfo(connectionString, schema, table) {
             'Content-Type': 'application/json',
         },
         body: JSON.stringify({
-            connectionString,
+            clientId,
             schema,
             table,
             task: 'table-info',
@@ -64,7 +66,7 @@ export async function getTableInfo(connectionString, schema, table) {
     const results = await response.json();
     return results;
 }
-export async function getOrgInfo(connectionString, schema, table, orgIdColumn, orgColumn) {
+export async function getOrgInfo(clientId, schema, table, orgIdColumn, orgColumn) {
     const localURL = `${QUILL_SERVER}/sdk/org-info`;
     const response = await fetch(localURL, {
         method: 'POST',
@@ -72,7 +74,7 @@ export async function getOrgInfo(connectionString, schema, table, orgIdColumn, o
             'Content-Type': 'application/json',
         },
         body: JSON.stringify({
-            connectionString,
+            clientId,
             schema,
             table,
             orgColumn,
@@ -83,7 +85,7 @@ export async function getOrgInfo(connectionString, schema, table, orgIdColumn, o
     const results = await response.json();
     return results.orgStrings;
 }
-export async function getFKInfo(connectionString, schema, table, primaryKey) {
+export async function getFKInfo(clientId, schema, table, primaryKey) {
     const localURL = `${QUILL_SERVER}/sdk/fk-info`;
     const response = await fetch(localURL, {
         method: 'POST',
@@ -91,7 +93,7 @@ export async function getFKInfo(connectionString, schema, table, primaryKey) {
             'Content-Type': 'application/json',
         },
         body: JSON.stringify({
-            connectionString,
+            clientId,
             schema,
             table,
             primaryKey,
@@ -110,7 +112,7 @@ export async function getFKInfo(connectionString, schema, table, primaryKey) {
     }
     return results.foreignKeysString;
 }
-export async function getTableSchema(connectionString, tables) {
+export async function getTableSchema(clientId, tables, schemaName) {
     const localURL = `${QUILL_SERVER}/sdk/table-schemas`;
     const response = await fetch(localURL, {
         method: 'POST',
@@ -118,14 +120,44 @@ export async function getTableSchema(connectionString, tables) {
             'Content-Type': 'application/json',
         },
         body: JSON.stringify({
-            connectionString,
+            clientId,
             tables,
+            schemaName,
             task: 'table-schemas',
         }),
     });
     const results = await response.json();
     return results;
 }
+export async function getTableColumnsBySchema(clientId, schemaNames, databaseType, queryEndpoint) {
+    const localURL = queryEndpoint ?? `${QUILL_SERVER}/table-info-by-schema`;
+    const response = await fetch(localURL, {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+            clientId,
+            schemaNames,
+            task: 'table-schemas',
+            metadata: {
+                task: 'table-schemas',
+                preQueries: ['temp'],
+                clientId,
+                runQueryConfig: {
+                    overridePost: true,
+                    convertDatatypes: true,
+                    getTables: true,
+                    schema: schemaNames[0],
+                    schemaNames: schemaNames,
+                },
+                databaseType: databaseType,
+            },
+        }),
+    });
+    const results = await response.json();
+    return queryEndpoint ? results.data.queryResults : results;
+}
 export async function getSQLViews(tableSchemas, customerNameField) {
     const localURL = `${QUILL_SERVER}/sqlviewai`;
     const response = await fetch(localURL, {
@@ -148,21 +180,40 @@ export async function getSQLViews(tableSchemas, customerNameField) {
     }
     return results.notSureWhatThisIs.sqlQueries;
 }
-export async function getSqlViewData(connectionString, query) {
-    const localURL = `${QUILL_SERVER}/sdk/query-view`;
-    const response = await fetch(localURL, {
+export async function getSqlViewData(clientId, query, databaseType, queryEndpoint) {
+    const url = queryEndpoint ?? `${QUILL_SERVER}/sdk/query-view`;
+    const response = await fetch(url, {
         method: 'POST',
         headers: {
             'Content-Type': 'application/json',
         },
         body: JSON.stringify({
-            connectionString,
+            clientId,
             query,
+            metadata: {
+                task: 'query-view',
+                preQueries: [query],
+                clientId,
+                runQueryConfig: {
+                    overridePost: true,
+                    convertDatatypes: true,
+                    limitThousand: true,
+                },
+                databaseType: databaseType,
+            },
             task: 'query-view',
         }),
     });
     const results = await response.json();
-    return results;
+    if (results.status === 'error') {
+        return { ...results, success: false };
+    }
+    return queryEndpoint
+        ? {
+            ...results.data.queryResults[0],
+            success: results.status === 'success' ? true : false,
+        }
+        : results;
 }
 export async function getQueryFromAI(aiPrompt, columnsByTable) {
     const localURL = `${QUILL_SERVER}/sdk/sql-generator`;
@@ -180,7 +231,24 @@ export async function getQueryFromAI(aiPrompt, columnsByTable) {
     const results = await response.json();
     return results.message;
 }
-export async function createSQLView(connectionType, allSchemaInfo, columnsByTable, viewInfo, client, domainName, tableData, currentTableNames, override = false) {
+export async function getQueryFromAiWithConnection(aiPrompt, clientId, schemaNames) {
+    const localURL = `${QUILL_SERVER}/ai-from-client-schema`;
+    const response = await fetch(localURL, {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+            prompt: aiPrompt,
+            clientId,
+            schemaNames,
+            task: 'sql-generator',
+        }),
+    });
+    const results = await response.json();
+    return results.message;
+}
+export async function createSQLView(connectionType, allSchemaInfo, columnsByTable, viewInfo, client, domainName, tableData, currentTableNames, override = false, clientId) {
     let queryName = viewInfo.name;
     let validQuery = false;
     let localURL = `${QUILL_SERVER}/astify`;
@@ -191,8 +259,9 @@ export async function createSQLView(connectionType, allSchemaInfo, columnsByTabl
         },
         body: JSON.stringify({ query: viewInfo.query }),
     });
-    tableData?.columns.forEach((column) => {
-        if (column.name === allSchemaInfo.selectedFields.foreignKey) {
+    tableData?.fields.forEach((column) => {
+        if (column.name ===
+            allSchemaInfo.selectedFields.foreignKey.replaceAll('"', '')) {
             validQuery = true;
         }
     });
@@ -210,27 +279,28 @@ export async function createSQLView(connectionType, allSchemaInfo, columnsByTabl
     if (currentTableNames.includes(queryName)) {
         return { success: false, message: 'Query name already exists' };
     }
-    const columns = columnsByTable.find((table) => table.tableName === allSchemaInfo.selectedFields.table).columns;
+    const columns = columnsByTable.find((table) => table.tableName === `${allSchemaInfo.selectedFields.schema}.${allSchemaInfo.selectedFields.table}`).columns;
     const customerFieldType = columns.find((column) => column.columnName === allSchemaInfo.selectedFields.organizationIdField).fieldType;
     const fuzzyType = customerFieldType === 'string' || customerFieldType === 'uuid'
         ? 'text'
         : 'number';
     localURL = `${QUILL_SERVER}/sdk/create-environment`;
     const payload = {
-        databaseConnectionString: formConnectionString(connectionType),
-        databaseType: connectionType.type,
         customerFieldName: allSchemaInfo.selectedFields.foreignKey,
-        customerTableName: allSchemaInfo.selectedFields.table,
+        customerTableName: `${allSchemaInfo.selectedFields.schema}.${allSchemaInfo.selectedFields.table}`,
         customerTableFieldName: allSchemaInfo.selectedFields.organizationIdField,
         adminCustomerId: allSchemaInfo.selectedFields.defaultOrg?.id,
         customerTableTitleFieldName: allSchemaInfo.selectedFields.customerNameField,
-        columns: tableData?.columns,
+        columns: tableData?.fields,
         task: 'create-environment',
         viewQuery: viewInfo.query,
         customerFieldType: fuzzyType,
         name: queryName,
         client,
         domainName,
+        schemaName: allSchemaInfo.selectedFields.schema,
+        schemaNames: [allSchemaInfo.selectedFields.schema],
+        clientId,
     };
     const response = await fetch(localURL, {
         method: 'POST',

package/dist/esm/assets/ArrowDownHeadIcon.d.ts

@@ -0,0 +1,5 @@
+declare const ArrowDownHeadIcon: ({ ...props }: {
+    [x: string]: any;
+}) => import("react/jsx-runtime").JSX.Element;
+export default ArrowDownHeadIcon;
+//# sourceMappingURL=ArrowDownHeadIcon.d.ts.map

package/dist/esm/assets/ArrowDownHeadIcon.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ArrowDownHeadIcon.d.ts","sourceRoot":"","sources":["../../../src/assets/ArrowDownHeadIcon.tsx"],"names":[],"mappings":"AAGA,QAAA,MAAM,iBAAiB;;6CAKtB,CAAC;AAEF,eAAe,iBAAiB,CAAC"}

package/dist/esm/assets/ArrowDownHeadIcon.js

@@ -0,0 +1,3 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+const ArrowDownHeadIcon = ({ ...props }) => (_jsx("svg", { ...props, xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 24 24", width: "24", height: "24", children: _jsx("path", { fill: "currentColor", d: "M12 13.172l4.95-4.95 1.414 1.414L12 16 5.636 9.636 7.05 8.222z" }) }));
+export default ArrowDownHeadIcon;

package/dist/esm/assets/XIcon.d.ts

@@ -0,0 +1,5 @@
+declare const XIcon: ({ ...props }: {
+    [x: string]: any;
+}) => import("react/jsx-runtime").JSX.Element;
+export default XIcon;
+//# sourceMappingURL=XIcon.d.ts.map

package/dist/esm/assets/XIcon.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"XIcon.d.ts","sourceRoot":"","sources":["../../../src/assets/XIcon.tsx"],"names":[],"mappings":"AAGA,QAAA,MAAM,KAAK;;6CAcV,CAAC;AACF,eAAe,KAAK,CAAC"}

package/dist/esm/assets/XIcon.js

@@ -0,0 +1,3 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+const XIcon = ({ ...props }) => (_jsx("svg", { ...props, xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 24 24", height: "20", width: "20", children: _jsx("path", { fillRule: "evenodd", d: "M5.47 5.47a.75.75 0 011.06 0L12 10.94l5.47-5.47a.75.75 0 111.06 1.06L13.06 12l5.47 5.47a.75.75 0 11-1.06 1.06L12 13.06l-5.47 5.47a.75.75 0 01-1.06-1.06L10.94 12 5.47 6.53a.75.75 0 010-1.06z", clipRule: "evenodd" }) }));
+export default XIcon;

package/dist/esm/assets/index.d.ts

@@ -0,0 +1,3 @@
+export { default as ArrowDownHeadIcon } from './ArrowDownHeadIcon';
+export { default as XIcon } from './XIcon';
+//# sourceMappingURL=index.d.ts.map

package/dist/esm/assets/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/assets/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,SAAS,CAAC"}

package/dist/esm/assets/index.js

@@ -0,0 +1,2 @@
+export { default as ArrowDownHeadIcon } from './ArrowDownHeadIcon';
+export { default as XIcon } from './XIcon';