@quillsql/admin 1.6.4 → 1.7.1

package/dist/cjs/AdminProvider.js

@@ -3,12 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useAdmin = void 0;
 exports.getClientTenantIds = getClientTenantIds;
 exports.AdminProvider = AdminProvider;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
-const Admin_1 = require("./Admin");
+const Provider_1 = require("./models/Provider");
 const react_2 = require("@quillsql/react");
 const constants_1 = require("./utils/constants");
 const CreateEnvironment_1 = __importDefault(require("./public_components/CreateEnvironment"));
@@ -16,7 +15,7 @@ const schema_1 = require("./utils/schema");
 const primitives_1 = require("./primitives");
 const fast_deep_equal_1 = __importDefault(require("fast-deep-equal"));
 const dataFetcher_1 = require("./utils/dataFetcher");
-const AdminContext = (0, react_1.createContext)(undefined);
+const AdminContext_1 = require("./models/AdminContext");
 function reducer(state, action) {
     switch (action.type) {
         case 'SET_CLIENT':
@@ -109,23 +108,22 @@ function reducer(state, action) {
             return { ...state, currentTenantIdentity: action.payload };
         case 'SET_QUERY_HEADERS':
             return { ...state, queryHeaders: action.payload };
+        case 'SET_PUBLIC_KEY':
+            return { ...state, publicKey: action.payload };
+        case 'SET_CLERK_ORG_ID':
+            return { ...state, clerkOrgId: action.payload };
+        case 'SET_ALL_STATE':
+            return { ...state, ...action.payload };
         default:
             return state;
     }
 }
-const useAdmin = () => {
-    const context = (0, react_1.useContext)(AdminContext);
-    if (context === undefined) {
-        throw new Error('useAdmin must be used within an AdminProvider');
-    }
-    return { ...context, clientLoading: context.loading };
-};
-exports.useAdmin = useAdmin;
-function AdminProvider({ children, publicKey, queryEndpoint = `${constants_1.QUILL_SERVER}${constants_1.QUILL_QUERY_ENDPOINT}`, queryHeaders, withCredentials, domainName, onOnboardComplete, flagsList, getAuthorizationToken = async () => '', theme, }) {
-    const [clientLoading, setClientLoading] = (0, react_1.useState)(false);
-    const [currentFetchingClient, setCurrentFetchingClient] = (0, react_1.useState)(undefined);
+function AdminProvider({ children, publicKey, queryEndpoint = `${constants_1.QUILL_SERVER}${constants_1.QUILL_QUERY_ENDPOINT}`, queryHeaders, withCredentials, clerkOrgId, onOnboardComplete, flagsList, getAuthorizationToken = async () => '', theme, eventTracking = null, onRequestAddVirtualTable, }) {
+    const [clientLoading, setClientLoading] = (0, react_1.useState)(true);
+    const currentFetchingClientRef = (0, react_1.useRef)(undefined);
     const [schemaLoading, setSchemaLoading] = (0, react_1.useState)(false);
     const [error, setError] = (0, react_1.useState)(null);
+    const publicKeyRef = (0, react_1.useRef)(undefined);
     const parsedSessionStorageAdminState = (adminState) => {
         // We store things using JSON.strigify and then restore them with JSON.parse
         // But certain objects, such as Dates, don't stringify/parse correctly
@@ -146,11 +144,31 @@ function AdminProvider({ children, publicKey, queryEndpoint = `${constants_1.QUI
     };
     const initialState = (0, react_1.useMemo)(() => {
         const localState = JSON.parse(sessionStorage.getItem('quill-adminState') ?? 'null');
-        if (localState?.domainName === domainName && domainName) {
+        if (clerkOrgId && localState?.clerkOrgId === clerkOrgId) {
             return parsedSessionStorageAdminState(localState);
         }
         sessionStorage.removeItem('quill-adminState');
         sessionStorage.removeItem('quill-client');
+        const populatedTheme = {
+            ...theme,
+            fontFamily: theme?.fontFamily ?? Provider_1.defaultTheme.fontFamily,
+            backgroundColor: theme?.backgroundColor ?? Provider_1.defaultTheme.backgroundColor,
+            primaryTextColor: theme?.primaryTextColor ?? Provider_1.defaultTheme.primaryTextColor,
+            secondaryTextColor: theme?.secondaryTextColor ?? Provider_1.defaultTheme.secondaryTextColor,
+            chartLabelFontFamily: theme?.chartLabelFontFamily ?? Provider_1.defaultTheme.chartLabelFontFamily,
+            chartLabelColor: theme?.chartLabelColor ?? Provider_1.defaultTheme.chartLabelColor,
+            chartTickColor: theme?.chartTickColor ?? Provider_1.defaultTheme.chartTickColor,
+            chartColors: theme?.chartColors ?? Provider_1.defaultTheme.chartColors,
+            borderColor: theme?.borderColor ?? Provider_1.defaultTheme.borderColor,
+            primaryButtonColor: theme?.primaryButtonColor ?? Provider_1.defaultTheme.primaryButtonColor,
+            borderWidth: theme?.borderWidth ?? Provider_1.defaultTheme.borderWidth,
+            buttonFontWeight: theme?.buttonFontWeight ?? Provider_1.defaultTheme.buttonFontWeight,
+            labelFontWeight: theme?.labelFontWeight ?? Provider_1.defaultTheme.labelFontWeight,
+            fontSize: theme?.fontSize ?? Provider_1.defaultTheme.fontSize,
+            primaryButtonTextColor: theme?.primaryButtonTextColor ??
+                Provider_1.defaultTheme.primaryButtonTextColor,
+            hoverBackgroundColor: theme?.hoverBackgroundColor ?? Provider_1.defaultTheme.hoverBackgroundColor,
+        };
         return {
             loading: true,
             publicKey: publicKey || '',
@@ -172,11 +190,13 @@ function AdminProvider({ children, publicKey, queryEndpoint = `${constants_1.QUI
             selectedDashboard: null,
             reportId: null,
             report: null,
-            theme: theme ?? Admin_1.defaultTheme,
+            theme: populatedTheme,
             organizationIdSet: false,
             dateFilter: {},
-            domainName: domainName || '',
+            clerkOrgId: clerkOrgId || '',
             databaseTypeMismatch: { show: false, backendDatabaseType: '' },
+            activeSavedQueryReportId: '',
+            databaseSchema: undefined,
         };
     }, []);
     const [state, dispatch] = (0, react_1.useReducer)(reducer, initialState);
@@ -201,9 +221,11 @@ function AdminProvider({ children, publicKey, queryEndpoint = `${constants_1.QUI
             ],
         };
     }, [state, flagsList, state.client]);
-    const setClient = (client, setLoadingImmediately = false) => {
-        if (setLoadingImmediately) {
+    const setClient = (client, fetchTenantInfo) => {
+        if (fetchTenantInfo) {
             setClientLoading(true);
+            fetchClient(client.clientId, false);
+            return;
         }
         dispatch({ type: 'SET_CLIENT_AND_TENANTS', payload: client });
     };
@@ -231,72 +253,74 @@ function AdminProvider({ children, publicKey, queryEndpoint = `${constants_1.QUI
                 throw e;
             }
             console.error('Failed to fetch:', e);
+            eventTracking?.logError?.({
+                type: 'network',
+                severity: 'medium',
+                message: 'Failed to fetch data',
+                errorMessage: e.message,
+                errorStack: e.stack,
+                errorData: {
+                    task: task,
+                },
+            });
             return { error: 'Failed to fetch data' };
         }
     }
-    // queryHeaders prop can change dynamically, need to stay updated
-    (0, react_1.useEffect)(() => {
-        dispatch({ type: 'SET_QUERY_HEADERS', payload: queryHeaders });
-    }, [queryHeaders]);
-    (0, react_1.useEffect)(() => {
-        const client = JSON.parse(sessionStorage.getItem('quill-client') || 'null');
-        if (client?.id === publicKey) {
-            dispatch({
-                type: 'SET_CLIENT',
-                payload: { ...client, _id: publicKey },
+    async function fetchClient(publicKey, fetchAllClients = false) {
+        setClientLoading(true);
+        currentFetchingClientRef.current = publicKey;
+        try {
+            const data = await quillFetchWithToken({
+                client: {
+                    queryEndpoint,
+                    queryHeaders: queryHeaders,
+                    withCredentials: !!state.withCredentials,
+                    clientId: publicKey,
+                },
+                task: 'client',
+                metadata: {
+                    clientId: publicKey,
+                    fetchDefaultDashboard: true,
+                },
+                adminMode: true,
             });
-        }
-        async function fetchClient(publicKey) {
-            if (!publicKey) {
+            if (data.status === 'error') {
+                throw new Error(data.error);
+            }
+            const result = data.data || data;
+            if (!result.client) {
+                console.error('Client not found.');
                 return;
             }
-            setClientLoading(true);
-            setCurrentFetchingClient(publicKey);
-            try {
-                const data = await quillFetchWithToken({
-                    client: {
-                        queryEndpoint,
-                        queryHeaders: queryHeaders,
-                        withCredentials: !!state.withCredentials,
-                        clientId: publicKey,
-                    },
-                    task: 'client',
-                    metadata: {
-                        clientId: publicKey,
-                        fetchDefaultDashboard: true,
-                    },
-                    adminMode: true,
+            const allClientTenantIds = await Promise.all(result.client.allTenantTypes?.map(async (tenant) => {
+                return await getClientTenantIds({
+                    queryEndpoint,
+                    queryHeaders: state.queryHeaders,
+                    withCredentials: state.withCredentials,
+                    tenant,
+                    clientId: result.client._id,
+                    getToken: getAuthorizationToken,
                 });
-                if (data.status === 'error') {
-                    throw new Error(data.error);
-                }
-                const result = data.data || data;
-                if (!result.client) {
-                    console.error('Client not found.');
-                    return;
-                }
-                const allClientTenantIds = await Promise.all(result.client.allTenantTypes?.map(async (tenant) => {
-                    return await getClientTenantIds({
-                        queryEndpoint,
-                        queryHeaders: state.queryHeaders,
-                        withCredentials: state.withCredentials,
-                        tenant,
-                        clientId: result.client._id,
-                        getToken: getAuthorizationToken,
-                    });
-                }) ?? []);
-                const mappedTenantIds = allClientTenantIds.reduce((acc, curr) => {
-                    acc[curr.id] = curr.tenantIds;
-                    return acc;
-                }, {});
-                setClient({
-                    ...result.client,
-                    queryEndpoint: result.client.queryEndpoint ?? queryEndpoint,
-                    allTenantTypes: result.client.allTenantTypes?.map((tenant) => ({
-                        ...tenant,
-                        tenantIds: mappedTenantIds?.[tenant.id],
-                    })),
+            }) ?? []);
+            const mappedTenantIds = allClientTenantIds.reduce((acc, curr) => {
+                acc[curr.id] = curr.tenantIds;
+                return acc;
+            }, {});
+            if (result.client._id !== state.client?._id) {
+                dispatch({
+                    type: 'SET_SELECTED_DASHBOARD_NAME',
+                    payload: null,
                 });
+            }
+            setClient({
+                ...result.client,
+                queryEndpoint: result.client.queryEndpoint ?? queryEndpoint,
+                allTenantTypes: result.client.allTenantTypes?.map((tenant) => ({
+                    ...tenant,
+                    tenantIds: mappedTenantIds?.[tenant.id],
+                })),
+            });
+            if (fetchAllClients) {
                 const allClientsData = await quillFetchWithToken({
                     client: {
                         queryEndpoint,
@@ -331,21 +355,59 @@ function AdminProvider({ children, publicKey, queryEndpoint = `${constants_1.QUI
                     payload: allClients,
                 });
             }
-            catch (error) {
-                console.error('ERROR:', error);
-            }
-            finally {
-                // We want this to trigger after the schema loading effect runs so the loading state doesn't flicker
-                setTimeout(() => {
-                    setClientLoading(false);
-                    setCurrentFetchingClient(undefined);
-                }, 200);
-            }
         }
-        if (currentFetchingClient === (state.client?.id ?? publicKey))
-            return;
-        fetchClient(state?.client?.id ?? publicKey);
-    }, [publicKey, state?.client?.id]);
+        catch (error) {
+            console.error('ERROR:', error);
+            eventTracking?.logError?.({
+                type: 'bug', // TODO: determine type
+                severity: 'high',
+                message: 'Error fetching client',
+                errorMessage: error.message,
+                errorStack: error.stack,
+                errorData: {
+                    caller: 'AdminProvider',
+                    function: 'fetchClient',
+                },
+            });
+        }
+        finally {
+            // We want this to trigger after the schema loading effect runs so the loading state doesn't flicker
+            setTimeout(() => {
+                setClientLoading(false);
+                currentFetchingClientRef.current = undefined;
+            }, 200);
+        }
+    }
+    // queryHeaders prop can change dynamically, need to stay updated
+    (0, react_1.useEffect)(() => {
+        dispatch({ type: 'SET_QUERY_HEADERS', payload: queryHeaders });
+    }, [queryHeaders]);
+    (0, react_1.useEffect)(() => {
+        if (clerkOrgId) {
+            dispatch({ type: 'SET_CLERK_ORG_ID', payload: clerkOrgId });
+        }
+    }, [clerkOrgId]);
+    (0, react_1.useEffect)(() => {
+        if (publicKeyRef.current !== publicKey) {
+            dispatch({ type: 'SET_ALL_STATE', payload: initialState });
+            publicKeyRef.current = publicKey;
+        }
+        const client = JSON.parse(sessionStorage.getItem('quill-client') || 'null');
+        let overridePublicKey = null;
+        if (client && client.clerkOrgId === clerkOrgId) {
+            overridePublicKey = client.id || client._id || client.publicKey;
+        }
+        const fetchPublicKey = overridePublicKey || publicKey;
+        if (!fetchPublicKey) {
+            setClientLoading(false);
+            currentFetchingClientRef.current = undefined;
+        }
+        else {
+            if (currentFetchingClientRef.current === fetchPublicKey)
+                return;
+            fetchClient(fetchPublicKey, true);
+        }
+    }, [publicKey]);
     // Session storage
     (0, react_1.useEffect)(() => {
         // Overwrite the large collections to save performance
@@ -382,11 +444,22 @@ function AdminProvider({ children, publicKey, queryEndpoint = `${constants_1.QUI
                     publicKey: clientId,
                     clientId: clientId,
                     withCredentials: state.withCredentials || false,
-                }, 'svm', getAuthorizationToken, tenants);
+                }, 'svm', getAuthorizationToken, eventTracking, tenants);
                 dispatch({ type: 'SET_TABLES', payload: schema });
             }
             catch (error) {
                 console.error('ERROR:', error);
+                eventTracking?.logError?.({
+                    type: 'bug', // TODO: determine type
+                    severity: 'high',
+                    message: 'Error fetching schema',
+                    errorMessage: error.message,
+                    errorStack: error.stack,
+                    errorData: {
+                        caller: 'AdminProvider',
+                        function: 'fetchSchemaAndTables',
+                    },
+                });
             }
             finally {
                 setSchemaLoading(false);
@@ -407,17 +480,23 @@ function AdminProvider({ children, publicKey, queryEndpoint = `${constants_1.QUI
             ? state.selectedTenantValues?.map((value) => value.toString())
             : undefined;
     }, [state.selectedTenantValues, state.client?.id]);
-    if (!state.client || !state.tables) {
-        return null;
-    }
-    return ((0, jsx_runtime_1.jsxs)(AdminContext.Provider, { value: {
+    // if (!state.client || !state.tables) {
+    //   return null;
+    // }
+    return ((0, jsx_runtime_1.jsxs)(AdminContext_1.AdminContext.Provider, { value: {
             state: stateWithFlagsList,
             dispatch,
             loading: clientLoading || schemaLoading,
             setClient,
             getToken: getAuthorizationToken,
             quillFetchWithToken,
-        }, children: [!state.client && !clientLoading && ((0, jsx_runtime_1.jsx)(CreateEnvironment_1.default, { onOnboardComplete: onOnboardComplete })), state.client && ((0, jsx_runtime_1.jsxs)(react_2.QuillProvider, { tenants: tenants, flags: flags, queryEndpoint: state.queryEndpoint, withCredentials: state.withCredentials, queryHeaders: state.queryHeaders, publicKey: state.client._id, theme: state.theme, isAdmin: true, getAuthorizationToken: getAuthorizationToken, children: [children, (0, jsx_runtime_1.jsx)(ErrorModal, { error: error, setError: setError })] })), (0, jsx_runtime_1.jsx)("style", { children: `/* For WebKit-based browsers (Chrome, Safari, Opera) */
+            onOnboardComplete,
+            onRequestAddVirtualTable,
+            eventTracking,
+        }, children: [!state.client && !clientLoading && ((0, jsx_runtime_1.jsx)(CreateEnvironment_1.default, { onOnboardComplete: (client) => {
+                    fetchClient(client._id);
+                    onOnboardComplete?.(client);
+                } })), state.client && ((0, jsx_runtime_1.jsxs)(react_2.QuillProvider, { tenants: tenants, flags: flags, queryEndpoint: state.queryEndpoint, withCredentials: state.withCredentials, queryHeaders: state.queryHeaders, publicKey: state.client._id, theme: state.theme, isAdmin: true, getAuthorizationToken: getAuthorizationToken, eventTracking: eventTracking, children: [children, (0, jsx_runtime_1.jsx)(ErrorModal, { error: error, setError: setError })] })), (0, jsx_runtime_1.jsx)("style", { children: `/* For WebKit-based browsers (Chrome, Safari, Opera) */
         ::-webkit-scrollbar {
           width: 0;
           height: 0;

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

@@ -1,6 +1,7 @@
+import { EventTracking } from '@quillsql/react';
 import { DatabaseSchema } from '../utils/schema';
-import { Column, ColumnsByTable } from '../utils/table';
-import { QuillTenant } from '../utils/tenants';
+import { ColumnInternal, ColumnsByTable } from '../utils/table';
+import { QuillTenant } from '../models/Tenant';
 export declare function testConnectionString(queryEndpoint: string, connectionString: string, databaseType: string, getToken: () => Promise<string>, clientId?: string, queryHeaders?: HeadersInit): Promise<any>;
 export declare function getTablesBySchema(queryEndpoint: string, clientId: string, schema: string, getToken: () => Promise<string>, queryHeaders?: HeadersInit): Promise<string[] | undefined>;
 export declare function setSchemaNames(queryEndpoint: string, clientId: string, schemaNames: string[], getToken: () => Promise<string>, queryHeaders?: HeadersInit): Promise<void>;
@@ -15,13 +16,14 @@ export declare function getSchemaTables(schemas: string[], databaseType: string,
 export declare function getTableColumns(tables: {
     tableName: string;
     schemaName: string;
+    catalogName?: string;
 }[], databaseType: string, queryEndpoint: string, clientId: string, getToken: () => Promise<string>, queryHeaders?: HeadersInit): Promise<ColumnsByTable[]>;
 export declare function getTableColumnsBySchema(isSelfHosted: boolean, queryEndpoint: string, clientId: string, databaseType: string, getToken: () => Promise<string>, schemas: string[], queryHeaders?: HeadersInit): Promise<{
     columnsByTable: ColumnsByTable[];
     schema: DatabaseSchema;
 }>;
 export declare function getVirtualTables(queryEndpoint: string, tableSchemas: any, customerNameField: string, clientId: string, getToken: () => Promise<string>, queryHeaders?: HeadersInit): Promise<any>;
-export declare function getVirtualTableData(clientId: string, query: string, databaseType: string, queryEndpoint: string, getToken: () => Promise<string>, queryHeaders?: HeadersInit): Promise<any>;
+export declare function getVirtualTableData(clientId: string, query: string, databaseType: string, queryEndpoint: string, getToken: () => Promise<string>, eventTracking: EventTracking | null, queryHeaders?: HeadersInit): Promise<any>;
 export declare function getAST(query: string, clientId: string, queryEndpoint: string, getToken: () => Promise<string>, queryHeaders?: HeadersInit): Promise<any>;
 export declare function getQueryFromAI(aiPrompt: string, columnsByTable: ColumnsByTable[], queryEndpoint: string, clientId: string, getToken: () => Promise<string>, queryHeaders?: HeadersInit): Promise<string>;
 export declare function getQueryFromAiWithConnection(isSelfHosted: boolean, databaseSchema: ColumnsByTable[], queryEndpoint: string, aiPrompt: string, clientId: string, getToken: () => Promise<string>, schemaNames?: string[], queryHeaders?: HeadersInit): Promise<string>;
@@ -30,9 +32,10 @@ export declare function createVirtualTable(viewInfo: {
     query: string;
 }, client: any, tableData: {
     rows: object[];
-    fields: Column[];
+    fields: ColumnInternal[];
 } | undefined, currentTableNames: string[], clientId: string, ownerTenantFields: string[], queryEndpoint: string, queryHeaders: any, getToken: () => Promise<string>): Promise<{
     success: boolean;
     failingTenant?: QuillTenant;
+    failingTenantErrorType?: 'missing' | 'type_mismatch';
 } | any>;
 //# sourceMappingURL=ConnectionClient.d.ts.map

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

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

package/dist/cjs/api/ConnectionClient.js

@@ -159,7 +159,11 @@ async function getSchemaTables(schemas, databaseType, queryEndpoint, clientId, g
                 schemaMap[schema] = [];
             }
             schemaMap[schema].push(row['table_name'] || row['TABLE_NAME']);
-            return { tableName: row['table_name'], schemaName: row['table_schema'] };
+            return {
+                tableName: row['table_name'] || row['TABLE_NAME'],
+                schemaName: row['table_schema'] || row['TABLE_SCHEMA'],
+                catalogName: row['table_catalog'] || row['TABLE_CATALOG'],
+            };
         });
         allTables.push(...tables);
     }
@@ -194,13 +198,13 @@ async function getTableColumns(tables, databaseType, queryEndpoint, clientId, ge
                 columnName: row['columnName'],
                 displayName: row['columnName'],
                 fieldType: fieldType,
-                dataTypeId: (0, columnProcessing_1.fieldTypeToDataTypeID)(fieldType),
+                dataTypeId: (0, columnProcessing_1.fieldTypeToDataTypeID)(fieldType?.toLowerCase()),
                 field: row['columnName'],
             };
         });
         columnsByTable.push({
-            tableName: `${table.schemaName}.${table.tableName}`,
-            displayName: `${table.schemaName}.${table.tableName}`,
+            tableName: `${table.catalogName ? `${table.catalogName}.` : ''}${table.schemaName}.${table.tableName}`,
+            displayName: `${table.catalogName ? `${table.catalogName}.` : ''}${table.schemaName}.${table.tableName}`,
             columns,
         });
     }
@@ -235,7 +239,7 @@ async function getTableColumnsBySchema(isSelfHosted, queryEndpoint, clientId, da
         const formattedResults = results.data.columnsByTable.map((table) => {
             return {
                 tableName: table.tableName,
-                displayName: table.displayName,
+                displayName: table.displayName || table.tableName,
                 columns: table.columns.map((column) => {
                     return {
                         columnName: column.columnName,
@@ -276,7 +280,7 @@ async function getVirtualTables(queryEndpoint, tableSchemas, customerNameField,
     return results.notSureWhatThisIs.sqlQueries;
 }
 // TODO: Check that works with self-hosted
-async function getVirtualTableData(clientId, query, databaseType, queryEndpoint, getToken, queryHeaders) {
+async function getVirtualTableData(clientId, query, databaseType, queryEndpoint, getToken, eventTracking, queryHeaders) {
     let queryAst = undefined;
     try {
         const { data } = await (0, dataFetcher_1.quillFetch)({
@@ -303,6 +307,16 @@ async function getVirtualTableData(clientId, query, databaseType, queryEndpoint,
         }
     }
     catch (e) {
+        eventTracking?.logError?.({
+            type: 'network',
+            severity: 'medium',
+            message: 'Error getting AST',
+            errorMessage: e.message,
+            errorStack: e.stack,
+            errorData: {
+                function: 'getVirtualTableData',
+            },
+        });
         return {
             success: false,
             error: 'Invalid SQL Query',
@@ -468,6 +482,7 @@ async function createVirtualTable(viewInfo, client, tableData, currentTableNames
         },
         getToken,
     });
+    // Check for missing tenant field
     const missingField = ownerTenantFields.find((field) => tableData &&
         !tableData.fields.find((col) => col.name === field?.replaceAll('"', '')));
     const failingTenant = client.allTenantTypes.find((tenant) => tenant.tenantField === missingField);
@@ -475,8 +490,28 @@ async function createVirtualTable(viewInfo, client, tableData, currentTableNames
         return {
             success: false,
             failingTenant,
+            failingTenantErrorType: 'missing',
         };
     }
+    // Check for type mismatches
+    if (tableData) {
+        const typeMismatchedTenant = ownerTenantFields.find((owner) => {
+            const tenant = client.allTenantTypes?.find((t) => t.tenantField === owner);
+            const tableDataField = tableData.fields.find((col) => col.name === owner?.replaceAll('"', ''));
+            return ((tenant?.fieldType === 'string' &&
+                isNumberType(tableDataField?.fieldType ?? '')) ||
+                (tenant?.fieldType === 'number' &&
+                    isStringType(tableDataField?.fieldType ?? '')));
+        });
+        if (typeMismatchedTenant) {
+            const tenant = client.allTenantTypes?.find((t) => t.tenantField === typeMismatchedTenant);
+            return {
+                success: false,
+                failingTenant: tenant,
+                failingTenantErrorType: 'type_mismatch',
+            };
+        }
+    }
     if (!queryAstRaw || queryAstRaw.success === false) {
         return {
             success: false,
@@ -513,3 +548,28 @@ async function createVirtualTable(viewInfo, client, tableData, currentTableNames
     });
     return { ...results.data, success: true };
 }
+// Helper functions for type checking
+function isNumberType(type) {
+    const numberTypes = [
+        'int',
+        'integer',
+        'bigint',
+        'smallint',
+        'decimal',
+        'numeric',
+        'float',
+        'double',
+        'real',
+    ];
+    return numberTypes.some((t) => type.toLowerCase().includes(t));
+}
+function isStringType(type) {
+    const stringTypes = [
+        'char',
+        'varchar',
+        'text',
+        'string',
+        'character varying',
+    ];
+    return stringTypes.some((t) => type.toLowerCase().includes(t));
+}

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

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

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

@@ -1 +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"}
+{"version":3,"file":"XIcon.d.ts","sourceRoot":"","sources":["../../../src/assets/XIcon.tsx"],"names":[],"mappings":"AAGA,QAAA,MAAM,KAAK,GAAI;;CAAY,4CAc1B,CAAC;AACF,eAAe,KAAK,CAAC"}

package/dist/cjs/components/Banner/index.js

@@ -5,10 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Banner;
 const jsx_runtime_1 = require("react/jsx-runtime");
-const AdminProvider_1 = require("../../AdminProvider");
+const useAdmin_1 = require("../../hooks/useAdmin");
 const XMarkIcon_1 = __importDefault(require("../../icons/XMarkIcon"));
 function Banner({ onExit }) {
-    const { state } = (0, AdminProvider_1.useAdmin)();
+    const { state } = (0, useAdmin_1.useAdmin)();
     if (!state.activeEditItem)
         return null;
     return ((0, jsx_runtime_1.jsxs)("div", { id: "quill-edit-banner", style: {

package/dist/cjs/components/CardSection.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = CardSection;
 const jsx_runtime_1 = require("react/jsx-runtime");
-const AdminProvider_1 = require("../AdminProvider");
+const useAdmin_1 = require("../hooks/useAdmin");
 function CardSection(props) {
-    const { state: { theme }, } = (0, AdminProvider_1.useAdmin)();
+    const { state: { theme }, } = (0, useAdmin_1.useAdmin)();
     return ((0, jsx_runtime_1.jsx)("div", { style: {
             fontFamily: theme?.fontFamily,
             color: theme?.primaryTextColor,

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

@@ -1 +1 @@
-{"version":3,"file":"ClipboardButton.d.ts","sourceRoot":"","sources":["../../../src/components/ClipboardButton.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,aAAa,EAAY,MAAM,OAAO,CAAC;AAGvD,QAAA,MAAM,eAAe,qCAIlB;IACD,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,aAAa,CAAC;IAC9B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,4CAsHA,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"ClipboardButton.d.ts","sourceRoot":"","sources":["../../../src/components/ClipboardButton.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,aAAa,EAAY,MAAM,OAAO,CAAC;AAGvD,QAAA,MAAM,eAAe,GAAI,kCAItB;IACD,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,aAAa,CAAC;IAC9B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,4CAsHA,CAAC;AAEF,eAAe,eAAe,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"DashboardSelectPopover.d.ts","sourceRoot":"","sources":["../../../src/components/DashboardSelectPopover.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAG7C,UAAU,2BAA2B;IACnC,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,YAAY,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,EAAE,UAAU,CAAC;IAClB,wBAAwB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACtD,mBAAmB,EAAE,MAAM,IAAI,CAAC;IAChC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC3C,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,EAC7C,UAAU,EACV,YAAY,EACZ,SAAS,EACT,KAAK,EACL,wBAAwB,EACxB,mBAAmB,EACnB,SAAS,EACT,SAAS,GACV,EAAE,2BAA2B,2CAyK7B"}
+{"version":3,"file":"DashboardSelectPopover.d.ts","sourceRoot":"","sources":["../../../src/components/DashboardSelectPopover.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAI7C,UAAU,2BAA2B;IACnC,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,YAAY,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,EAAE,UAAU,CAAC;IAClB,wBAAwB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACtD,mBAAmB,EAAE,MAAM,IAAI,CAAC;IAChC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC3C,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,EAC7C,UAAU,EACV,YAAY,EACZ,SAAS,EACT,KAAK,EACL,wBAAwB,EACxB,mBAAmB,EACnB,SAAS,EACT,SAAS,GACV,EAAE,2BAA2B,2CAsM7B"}