@quillsql/admin 1.6.3 → 1.7.0

package/dist/cjs/public_components/__tests__/CreateEnvironment.test.js

@@ -12,6 +12,7 @@ const AdminProvider_1 = require("../../AdminProvider");
 const dataFetcher_1 = require("../../utils/dataFetcher");
 const dotenv_1 = __importDefault(require("dotenv"));
 const path_1 = __importDefault(require("path"));
+const Admin_1 = require("../../Admin");
 // Load environment variables from .env.local
 dotenv_1.default.config({ path: path_1.default.resolve(__dirname, '../../../.env.local') });
 // Mock necessary modules
@@ -233,6 +234,33 @@ const testDatabases = [
         },
         virtualTableQuery: 'SELECT amount, customer_id FROM `transactions`.`transactions`;',
     },
+    {
+        databaseType: 'Databricks',
+        databaseLabel: 'Databricks',
+        databaseConnectionString: null,
+        databaseCredentials: {
+            host: process.env.TEST_DATABRICKS_HOST,
+            path: process.env.TEST_DATABRICKS_PATH,
+            token: process.env.TEST_DATABRICKS_TOKEN,
+            database: null,
+            user: null,
+            password: null,
+            port: null,
+            warehouse: null,
+        },
+        jsonString: null,
+        schemaName: 'default',
+        tenant: {
+            name: 'Test Tenant',
+            tenantField: 'customer_id',
+            tenantTable: 'default.customers',
+            idField: 'id',
+            nameField: 'name',
+            tagField: 'id',
+            defaultTenant: 'John Doe',
+        },
+        virtualTableQuery: 'SELECT * FROM default.transactions;',
+    },
 ];
 describe('CreateEnvironment', () => {
     const mockOnOnboardComplete = jest.fn();
@@ -247,7 +275,8 @@ describe('CreateEnvironment', () => {
         // mockQuillFetch = jest.fn((args) => quillFetch(args));
         mockState = {
             queryEndpoint: 'http://localhost:8080/cloud',
-            domainName: 'test-domain',
+            clerkOrgId: 'test-domain',
+            theme: Admin_1.defaultTheme,
         };
         AdminProvider_1.useAdmin.mockReturnValue({
             state: mockState,
@@ -376,6 +405,16 @@ describe('CreateEnvironment', () => {
                         .querySelector('input'), { target: { value: database.databaseCredentials.warehouse } });
                 });
             }
+            if (database.databaseCredentials?.path) {
+                await (0, react_1.act)(async () => {
+                    react_2.fireEvent.change(react_2.screen.getByTestId('quill-input-path').querySelector('input'), { target: { value: database.databaseCredentials.path } });
+                });
+            }
+            if (database.databaseCredentials?.token) {
+                await (0, react_1.act)(async () => {
+                    react_2.fireEvent.change(react_2.screen.getByTestId('quill-input-token').querySelector('input'), { target: { value: database.databaseCredentials.token } });
+                });
+            }
             // Verify Connect button is enabled
             expect(react_2.screen.getByTestId('quill-connect-button').querySelector('button')
                 .className).not.toContain('quill-button-disabled');
@@ -448,7 +487,7 @@ describe('CreateEnvironment', () => {
         newClient = JSON.parse(element.getAttribute('data-new-client') || '{}');
         // Verify database schema was set
         expect(environmentDetails.databaseSchema).toBeInstanceOf(Array);
-        // Client should have databaseType, schemaNames (non empty array), and domainName
+        // Client should have databaseType, schemaNames (non empty array), and clerkOrgId
         expect(newClient.schemaNames).toBeInstanceOf(Array);
         expect(newClient.schemaNames.length).toBeGreaterThan(0);
         expect(newClient.databaseType).toBe(database.databaseType);

package/dist/cjs/utils/astProcessing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"astProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/astProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAG/C,wBAAgB,kCAAkC,CAChD,qBAAqB,EAAE,MAAM,EAAE,EAC/B,SAAS,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAAE,EACjD,MAAM,EAAE,GAAG,EACX,GAAG,EAAE,GAAG,OAqDT;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,OAQxC;AAED,eAAO,MAAM,YAAY,WACf,WAAW,UACX,mBAAmB,YACjB,MAAM,OAAO,CAAC,MAAM,CAAC,KAC9B,OAAO,CAAC;IAAE,GAAG,EAAE,GAAG,CAAA;CAAE,CAyBtB,CAAC;AAEF;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM,GAAG,SAAS,CAYpE"}
+{"version":3,"file":"astProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/astProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAG/C,wBAAgB,kCAAkC,CAChD,qBAAqB,EAAE,MAAM,EAAE,EAC/B,SAAS,EAAE;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAAE,EACjD,MAAM,EAAE,GAAG,EACX,GAAG,EAAE,GAAG,OAqDT;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,OAQxC;AAED,eAAO,MAAM,YAAY,GACvB,QAAQ,WAAW,EACnB,QAAQ,mBAAmB,EAC3B,UAAU,MAAM,OAAO,CAAC,MAAM,CAAC,KAC9B,OAAO,CAAC;IAAE,GAAG,EAAE,GAAG,CAAA;CAAE,CAyBtB,CAAC;AAEF;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM,GAAG,SAAS,CAYpE"}

package/dist/cjs/utils/columnProcessing.d.ts

@@ -7,6 +7,7 @@ export type ColumnInfo = {
     isVisible: true;
 };
 export declare function convertFieldTypeToJSType(fieldType: string): string;
+export declare function fieldTypeToDataTypeID(fieldType: string): number;
 export declare function processColumnReference(column: string, databaseType: string): string;
 export declare function convertColumnInfoToColumnInternal(columnInfo: ColumnInfo): ColumnInternal;
 export declare function isStringType(fieldType: string): boolean;

package/dist/cjs/utils/columnProcessing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"columnProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/columnProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,cAAc,EAAE,MAAM,SAAS,CAAC;AAErD,MAAM,MAAM,UAAU,GAAG;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,IAAI,CAAC;CACjB,CAAC;AAEF,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAwDlE;AAsED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,UAuB1E;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,UAAU,GACrB,cAAc,CAShB;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAYvD;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CASrD;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAwBvD"}
+{"version":3,"file":"columnProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/columnProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,cAAc,EAAE,MAAM,SAAS,CAAC;AAErD,MAAM,MAAM,UAAU,GAAG;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,IAAI,CAAC;CACjB,CAAC;AAEF,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAwDlE;AAED,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CA0C/D;AA0BD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,UA0B1E;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,UAAU,GACrB,cAAc,CAShB;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAYvD;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CASrD;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAyBvD"}

package/dist/cjs/utils/columnProcessing.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertFieldTypeToJSType = convertFieldTypeToJSType;
+exports.fieldTypeToDataTypeID = fieldTypeToDataTypeID;
 exports.processColumnReference = processColumnReference;
 exports.convertColumnInfoToColumnInternal = convertColumnInfoToColumnInternal;
 exports.isStringType = isStringType;
@@ -143,7 +144,11 @@ function processColumnReference(column, databaseType) {
         return `[${column}]`;
     }
     const columnParts = column.split('.');
-    if (columnParts.length > 1) {
+    if (columnParts.length > 2) {
+        // databricks
+        return `\`${columnParts[0]}\`.\`${columnParts[1]}\`.\`${columnParts[2]}\``;
+    }
+    else if (columnParts.length > 1) {
         return `\`${columnParts[0]}\`.\`${columnParts[1]}\``;
     }
     return `\`${column}\``;
@@ -204,5 +209,6 @@ function isNumberType(fieldType) {
         'uint32',
         'uint16',
         'uint8',
+        'long',
     ].includes(fieldType.toLowerCase());
 }

package/dist/cjs/utils/constants.d.ts

@@ -6,4 +6,5 @@ export declare const SINGLE_TENANT = "QUILL_SINGLE_TENANT";
 export declare const SAVED_QUERIES_DASHBOARD = "quill-saved-queries";
 export declare const QUILL_SERVER: string;
 export declare const QUILL_QUERY_ENDPOINT: string;
+export declare const QUILL_ENDPOINTS: string[];
 //# sourceMappingURL=constants.d.ts.map

package/dist/cjs/utils/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":"AAAA;;GAEG;AAWH,eAAO,MAAM,WAAW,sBAAsB,CAAC;AAC/C,eAAO,MAAM,aAAa,wBAAwB,CAAC;AACnD,eAAO,MAAM,uBAAuB,wBAAwB,CAAC;AAE7D,eAAO,MAAM,YAAY,QAGoB,CAAC;AAC9C,eAAO,MAAM,oBAAoB,QAGnB,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":"AAAA;;GAEG;AAWH,eAAO,MAAM,WAAW,sBAAsB,CAAC;AAC/C,eAAO,MAAM,aAAa,wBAAwB,CAAC;AACnD,eAAO,MAAM,uBAAuB,wBAAwB,CAAC;AAE7D,eAAO,MAAM,YAAY,QAGoB,CAAC;AAC9C,eAAO,MAAM,oBAAoB,QAGnB,CAAC;AAEf,eAAO,MAAM,eAAe,UAG3B,CAAC"}

package/dist/cjs/utils/constants.js

@@ -12,7 +12,7 @@
 // export type DateRangeOption = (typeof InitialDateRangeOptions)[number];
 // export const defaultDateRange = InitialDateRangeOptions[1];
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QUILL_QUERY_ENDPOINT = exports.QUILL_SERVER = exports.SAVED_QUERIES_DASHBOARD = exports.SINGLE_TENANT = exports.ALL_TENANTS = void 0;
+exports.QUILL_ENDPOINTS = exports.QUILL_QUERY_ENDPOINT = exports.QUILL_SERVER = exports.SAVED_QUERIES_DASHBOARD = exports.SINGLE_TENANT = exports.ALL_TENANTS = void 0;
 exports.ALL_TENANTS = 'QUILL_ALL_TENANTS';
 exports.SINGLE_TENANT = 'QUILL_SINGLE_TENANT';
 exports.SAVED_QUERIES_DASHBOARD = 'quill-saved-queries';
@@ -22,3 +22,7 @@ exports.QUILL_SERVER = typeof process !== 'undefined' && process.env
 exports.QUILL_QUERY_ENDPOINT = typeof process !== 'undefined' && process.env
     ? (process.env.QUILL_QUERY_ENDPOINT ?? '/cloud')
     : '/cloud';
+exports.QUILL_ENDPOINTS = [
+    'https://quill-344421.uc.r.appspot.com/cloud',
+    'https://quill-ruby-server.onrender.com/cloud',
+];

package/dist/cjs/utils/dataEditor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataEditor.d.ts","sourceRoot":"","sources":["../../../src/utils/dataEditor.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAGzC,eAAO,MAAM,gBAAgB,aACjB,MAAM,iBACD,MAAM,cACT,MAAM,mBACD,GAAG,SACb,KAAK,qBACO,MAAM,EAAE,YACjB,MAAM,OAAO,CAAC,MAAM,CAAC,oBACb,OAAO,8DAqC1B,CAAC;AAEF,eAAO,MAAM,eAAe,SACpB,MAAM,iBACG,MAAM,mBACJ,GAAG,SACb,KAAK,qBACO,MAAM,EAAE,YACjB,MAAM,OAAO,CAAC,MAAM,CAAC,oBACb,OAAO,8DAgC1B,CAAC;AAEF,eAAO,MAAM,kBAAkB,OACzB,MAAM,SACH,KAAK,YACF,MAAM,OAAO,CAAC,MAAM,CAAC,kDAoBhC,CAAC"}
+{"version":3,"file":"dataEditor.d.ts","sourceRoot":"","sources":["../../../src/utils/dataEditor.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAGzC,eAAO,MAAM,gBAAgB,GAC3B,UAAU,MAAM,EAChB,eAAe,MAAM,EACrB,YAAY,MAAM,EAClB,iBAAiB,GAAG,EACpB,OAAO,KAAK,EACZ,mBAAmB,MAAM,EAAE,EAC3B,UAAU,MAAM,OAAO,CAAC,MAAM,CAAC,EAC/B,kBAAkB,OAAO,8DAqC1B,CAAC;AAEF,eAAO,MAAM,eAAe,GAC1B,MAAM,MAAM,EACZ,eAAe,MAAM,EACrB,iBAAiB,GAAG,EACpB,OAAO,KAAK,EACZ,mBAAmB,MAAM,EAAE,EAC3B,UAAU,MAAM,OAAO,CAAC,MAAM,CAAC,EAC/B,kBAAkB,OAAO,8DAgC1B,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAC7B,IAAI,MAAM,EACV,OAAO,KAAK,EACZ,UAAU,MAAM,OAAO,CAAC,MAAM,CAAC,kDAoBhC,CAAC"}

package/dist/cjs/utils/dataFetcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAG/C,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,IAAI,CACV,mBAAmB,EACnB,UAAU,GAAG,eAAe,GAAG,cAAc,GAAG,iBAAiB,CAClE,CAAC;IACF,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,GAAG,CAAC;IACd,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAChC,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,UAAU,2FASpB,iBAAiB,KAAG,OAAO,CAAC,YAAY,CAwD1C,CAAC"}
+{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAG/C,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,IAAI,CACV,mBAAmB,EACnB,UAAU,GAAG,eAAe,GAAG,cAAc,GAAG,iBAAiB,CAClE,CAAC;IACF,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,GAAG,CAAC;IACd,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAChC,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,UAAU,GAAU,wFAS9B,iBAAiB,KAAG,OAAO,CAAC,YAAY,CAuD1C,CAAC"}

package/dist/cjs/utils/dataFetcher.js

@@ -15,7 +15,6 @@ const quillFetch = async ({ client, task, method = 'POST', metadata, abortSignal
                 ...(token ? { Authorization: `Bearer ${token}` } : {}),
                 ...client.queryHeaders,
                 'Content-Type': 'application/json',
-                'Vercel-Env': process.env.NEXT_PUBLIC_VERCEL_ENV ?? 'production',
             },
             body: JSON.stringify({
                 metadata: {

package/dist/cjs/utils/databases.d.ts

@@ -44,7 +44,12 @@ export interface SnowflakeConnection extends DatabaseConnection {
 export interface BigQueryConnection extends DatabaseConnection {
     jsonString: string;
 }
-export type ConnectionType = DatabaseConnection | PostgresConnection | MySQLConnection | SnowflakeConnection | BigQueryConnection | ClickHouseConnection | SQLServerConnection;
+export interface DatabricksConnection extends DatabaseConnection {
+    host: string;
+    path: string;
+    token: string;
+}
+export type ConnectionType = DatabaseConnection | PostgresConnection | MySQLConnection | SnowflakeConnection | BigQueryConnection | ClickHouseConnection | SQLServerConnection | DatabricksConnection;
 export interface DatabaseDefaultInfo {
     label: string;
     value: string;

package/dist/cjs/utils/databases.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"databases.d.ts","sourceRoot":"","sources":["../../../src/utils/databases.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,kBAAmB,SAAQ,kBAAkB;IAC5D,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,oBAAqB,SAAQ,kBAAkB;IAC9D,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,eAAgB,SAAQ,kBAAkB;IACzD,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,mBAAoB,SAAQ,kBAAkB;IAC7D,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,mBAAoB,SAAQ,kBAAkB;IAC7D,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,kBAAmB,SAAQ,kBAAkB;IAC5D,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,cAAc,GACtB,kBAAkB,GAClB,kBAAkB,GAClB,eAAe,GACf,mBAAmB,GACnB,kBAAkB,GAClB,oBAAoB,GACpB,mBAAmB,CAAC;AAExB,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,qBAAqB,EAAE,mBAAmB,EAoCtD,CAAC;AAEF,wBAAgB,2BAA2B,CACzC,YAAY,EAAE,MAAM,GACnB,cAAc,CA0DhB;AAED,wBAAgB,oBAAoB,CAAC,UAAU,CAAC,EAAE,kBAAkB,UA6CnE"}
+{"version":3,"file":"databases.d.ts","sourceRoot":"","sources":["../../../src/utils/databases.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,kBAAmB,SAAQ,kBAAkB;IAC5D,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,oBAAqB,SAAQ,kBAAkB;IAC9D,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,eAAgB,SAAQ,kBAAkB;IACzD,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,mBAAoB,SAAQ,kBAAkB;IAC7D,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,mBAAoB,SAAQ,kBAAkB;IAC7D,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,kBAAmB,SAAQ,kBAAkB;IAC5D,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,oBAAqB,SAAQ,kBAAkB;IAC9D,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,MAAM,cAAc,GACtB,kBAAkB,GAClB,kBAAkB,GAClB,eAAe,GACf,mBAAmB,GACnB,kBAAkB,GAClB,oBAAoB,GACpB,mBAAmB,GACnB,oBAAoB,CAAC;AAEzB,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,qBAAqB,EAAE,mBAAmB,EA0CtD,CAAC;AAEF,wBAAgB,2BAA2B,CACzC,YAAY,EAAE,MAAM,GACnB,cAAc,CAkEhB;AAED,wBAAgB,oBAAoB,CAAC,UAAU,CAAC,EAAE,kBAAkB,UAmDnE"}

package/dist/cjs/utils/databases.js

@@ -34,9 +34,14 @@ exports.DATABASE_DEFAULT_INFO = [
         value: 'BigQuery',
         imageUrl: 'https://www.gstatic.com/bricks/image/702bc723dcfcddf8942bb459be20163106a5f64ed91404df38c73ca955f96260.svg',
     },
+    {
+        label: 'Databricks',
+        value: 'Databricks',
+        imageUrl: 'https://cdn.bfldr.com/9AYANS2F/at/k8bgnnxhb4bggjk88r4x9snf/databricks-symbol-color.svg?auto=webp&format=png',
+    },
 ];
 function getDatabaseConnectionFormat(databaseName) {
-    if (databaseName === 'MySQL') {
+    if (databaseName.toLowerCase() === 'mysql') {
         return {
             user: '',
             password: '',
@@ -47,7 +52,7 @@ function getDatabaseConnectionFormat(databaseName) {
             connectionString: '',
         };
     }
-    else if (databaseName === 'Snowflake') {
+    else if (databaseName.toLowerCase() === 'snowflake') {
         return {
             user: '',
             password: '',
@@ -58,14 +63,14 @@ function getDatabaseConnectionFormat(databaseName) {
             connectionString: '',
         };
     }
-    else if (databaseName === 'BigQuery') {
+    else if (databaseName.toLowerCase() === 'bigquery') {
         return {
             type: 'BigQuery',
             connectionString: '',
             jsonString: '',
         };
     }
-    else if (databaseName === 'ClickHouse') {
+    else if (databaseName.toLowerCase() === 'clickhouse') {
         return {
             user: '',
             password: '',
@@ -75,7 +80,7 @@ function getDatabaseConnectionFormat(databaseName) {
             connectionString: '',
         };
     }
-    else if (databaseName === 'MSSQL') {
+    else if (databaseName.toLowerCase() === 'mssql') {
         return {
             user: '',
             password: '',
@@ -86,6 +91,15 @@ function getDatabaseConnectionFormat(databaseName) {
             connectionString: '',
         };
     }
+    else if (databaseName.toLowerCase() === 'databricks') {
+        return {
+            host: '',
+            path: '',
+            token: '',
+            type: 'Databricks',
+            connectionString: '',
+        };
+    }
     else {
         // Postgres by default
         return {
@@ -133,5 +147,9 @@ function formConnectionString(connection) {
         const typedConnection = connection;
         return `mssql://${typedConnection.user}:${typedConnection.password}@${typedConnection.host}:${typedConnection.port}/${typedConnection.databaseName}`.replaceAll(' ', '');
     }
+    else if (connection.type === 'Databricks') {
+        const typedConnection = connection;
+        return `databricks://databricks:${typedConnection.token}@${typedConnection.host}/${typedConnection.path.replace(/^\//, '')}`.replaceAll(' ', '');
+    }
     return '';
 }

package/dist/cjs/utils/delay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delay.d.ts","sourceRoot":"","sources":["../../../src/utils/delay.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,KAAK,OAAQ,MAAM,qBAE/B,CAAC"}
+{"version":3,"file":"delay.d.ts","sourceRoot":"","sources":["../../../src/utils/delay.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,KAAK,GAAI,IAAI,MAAM,qBAE/B,CAAC"}

package/dist/cjs/utils/filter.d.ts

@@ -87,22 +87,22 @@ export interface Filter {
     field?: string;
     table?: string;
 }
-export interface StringFilter extends BaseFilter {
+export interface InternalStringFilter extends BaseFilter {
     filterType: InternalFilterType.StringFilter;
     fieldType: FieldType.String;
     value: string;
 }
-export interface StringInFilter extends BaseFilter {
+export interface InternalStringInFilter extends BaseFilter {
     filterType: InternalFilterType.StringInFilter;
     fieldType: FieldType.String;
     value: string[];
 }
-export interface NumericFilter extends BaseFilter {
+export interface InternalNumericFilter extends BaseFilter {
     filterType: InternalFilterType.NumericFilter;
     fieldType: FieldType.Number;
     value: number;
 }
-export interface DateFilter extends BaseFilter {
+export interface InternalDateFilter extends BaseFilter {
     filterType: InternalFilterType.DateFilter;
     fieldType: FieldType.Date;
     value: {
@@ -110,7 +110,7 @@ export interface DateFilter extends BaseFilter {
         unit: TimeUnit;
     };
 }
-export interface DateCustomFilter extends BaseFilter {
+export interface InternalDateCustomFilter extends BaseFilter {
     filterType: InternalFilterType.DateCustomFilter;
     fieldType: FieldType.Date;
     value: {
@@ -118,26 +118,22 @@ export interface DateCustomFilter extends BaseFilter {
         endDate: string;
     };
 }
-export interface DateComparisonFilter extends BaseFilter {
+export interface InternalDateComparisonFilter extends BaseFilter {
     filterType: InternalFilterType.DateComparisonFilter;
     fieldType: FieldType.Date;
     value: string;
 }
-export interface BooleanFilter extends BaseFilter {
+export interface InternalBooleanFilter extends BaseFilter {
     filterType: InternalFilterType.BooleanFilter;
     fieldType: FieldType.Boolean;
     value: boolean;
 }
-export interface NullFilter extends BaseFilter {
+export interface InternalNullFilter extends BaseFilter {
     filterType: InternalFilterType.NullFilter;
     fieldType: FieldType.Null;
     value: null;
 }
-export interface UserFilter extends BaseFilter {
-    isUserFilter: boolean;
-    dashboardName: string;
-}
-export type InternalFilter = BaseFilter | StringFilter | StringInFilter | NumericFilter | DateFilter | DateCustomFilter | DateComparisonFilter | BooleanFilter | NullFilter;
+export type InternalFilter = BaseFilter | InternalStringFilter | InternalStringInFilter | InternalNumericFilter | InternalDateFilter | InternalDateCustomFilter | InternalDateComparisonFilter | InternalBooleanFilter | InternalNullFilter;
 export type FilterInfo = {
     filter?: InternalFilter;
     conditional?: string;
@@ -150,7 +146,7 @@ export type Filters = [InternalFilter] | [
     InternalFilter
 ];
 /** Dashboard filters are filters that persist with the dashboard */
-export declare enum DashboardFilterType {
+export declare enum InternalDashboardFilterType {
     String = "string",
     Date = "date_range"
 }
@@ -158,18 +154,18 @@ declare enum StringFilterType {
     Default = "default",
     Multiselect = "multiselect"
 }
-export type DashboardFilter = DashboardStringFilter | DashboardDateFilter;
-export interface DashboardBaseFilter {
-    filterType: DashboardFilterType;
+export type InternalDashboardFilter = InternalDashboardStringFilter | InternalDashboardDateFilter;
+export interface InternalDashboardBaseFilter {
+    filterType: InternalDashboardFilterType;
     label: string;
     field: string;
     dashboardName: string;
     isUserFilter?: boolean;
 }
-export interface DashboardStringFilter extends DashboardBaseFilter {
+export interface InternalDashboardStringFilter extends InternalDashboardBaseFilter {
     table: string;
     labelField: string;
-    filterType: DashboardFilterType.String;
+    filterType: InternalDashboardFilterType.String;
     stringFilterType: StringFilterType;
     options: {
         [fieldName: string]: string;
@@ -177,8 +173,8 @@ export interface DashboardStringFilter extends DashboardBaseFilter {
     selectedValue?: string;
     values?: string[];
 }
-export interface DashboardDateFilter extends DashboardBaseFilter {
-    filterType: DashboardFilterType.Date;
+export interface InternalDashboardDateFilter extends InternalDashboardBaseFilter {
+    filterType: InternalDashboardFilterType.Date;
     comparison?: boolean;
     defaultComparisonRange?: string;
     options: {

package/dist/cjs/utils/filter.d.ts.map

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

package/dist/cjs/utils/filter.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PRIMARY_RANGE = exports.convertCustomFilter = exports.DashboardFilterType = exports.FilterType = exports.InternalFilterType = exports.FieldType = exports.TimeUnit = exports.BoolOperator = exports.NullOperator = exports.NumberOperator = exports.DateOperator = exports.StringOperator = void 0;
+exports.PRIMARY_RANGE = exports.convertCustomFilter = exports.InternalDashboardFilterType = exports.FilterType = exports.InternalFilterType = exports.FieldType = exports.TimeUnit = exports.BoolOperator = exports.NullOperator = exports.NumberOperator = exports.DateOperator = exports.StringOperator = void 0;
 const date_fns_1 = require("date-fns");
 const IS_EXACTLY = 'is exactly';
 const IS_NOT_EXACTLY = 'is not exactly';
@@ -107,11 +107,11 @@ var FilterType;
     FilterType["Null"] = "null";
 })(FilterType || (exports.FilterType = FilterType = {}));
 /** Dashboard filters are filters that persist with the dashboard */
-var DashboardFilterType;
-(function (DashboardFilterType) {
-    DashboardFilterType["String"] = "string";
-    DashboardFilterType["Date"] = "date_range";
-})(DashboardFilterType || (exports.DashboardFilterType = DashboardFilterType = {}));
+var InternalDashboardFilterType;
+(function (InternalDashboardFilterType) {
+    InternalDashboardFilterType["String"] = "string";
+    InternalDashboardFilterType["Date"] = "date_range";
+})(InternalDashboardFilterType || (exports.InternalDashboardFilterType = InternalDashboardFilterType = {}));
 var StringFilterType;
 (function (StringFilterType) {
     StringFilterType["Default"] = "default";

package/dist/cjs/utils/report.d.ts

@@ -1,5 +1,5 @@
 import { InternalFilter } from '@quillsql/react';
-import { AxisFormat, Column, ColumnInternal, Pagination, Pivot } from './table';
+import { AxisFormat, Column, ColumnInternal, Pagination, Pivot, Table } from './table';
 /**
  * ## QuillReport
  * Represents an individual item on a dashboard.
@@ -83,8 +83,6 @@ export interface QuillReport {
             field: string;
         };
     };
-}
-export interface QuillReportInternal extends QuillReport {
     /** The pivot row info. */
     pivotRows?: {
         [key: string]: string;
@@ -92,7 +90,9 @@ export interface QuillReportInternal extends QuillReport {
     /**
      * A list of metadata about the pivot yAxes of this report.
      */
-    pivotColumns?: Column[];
+    pivotColumns?: ColumnInternal[];
+}
+export interface QuillReportInternal extends QuillReport {
     /** An array of queries that are used to construct the unprocessed report  THIS WILL BE REMOVED SOON */
     itemQuery?: string[];
     /** An array of tables referenced by the report used */
@@ -116,5 +116,5 @@ export interface QuillReportInternal extends QuillReport {
         [tenantField: string]: string[] | 'QUILL_ALL_TENANTS';
     };
 }
-export declare function parseQuillReportToQuillReportInternal(report: QuillReport, client: any, tables: any[], getToken: () => Promise<string>): Promise<QuillReportInternal>;
+export declare function parseQuillReportToQuillReportInternal(report: QuillReport, client: any, tables: Table[], getToken: () => Promise<string>): Promise<QuillReportInternal>;
 //# sourceMappingURL=report.d.ts.map

package/dist/cjs/utils/report.d.ts.map

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

package/dist/cjs/utils/schema.d.ts

@@ -1,5 +1,7 @@
+import { EventTracking } from '@quillsql/react';
 import { QuillProviderClient } from '../Admin';
 import { QuillTenant } from './tenants';
+import { Table } from './table';
 export type DatabaseSchema = {
     [schema: string]: string[];
 };
@@ -22,22 +24,23 @@ export declare const getSchemaForeignKeyMapping: (schema: any[]) => {
         foreignKey: string;
     }[];
 };
-export declare const getCustomFieldInfo: ({ client, getToken, tenants, caller, }: {
+export declare const getCustomFieldInfo: ({ client, getToken, tenants, eventTracking, caller, }: {
     client: QuillProviderClient;
     getToken: () => Promise<string>;
     tenants: {
         tenantField: string;
         tenantIds: (string | number)[];
     }[] | (string | number)[];
+    eventTracking: EventTracking | null;
     caller?: string;
 }) => Promise<{
     [tableName: string]: CustomField[];
 } | null>;
-export declare const getSchemaInfo: (client: QuillProviderClient, caller: string | undefined, getToken: () => Promise<string>, tenants?: {
+export declare const getSchemaInfo: (client: QuillProviderClient, caller: string | undefined, getToken: () => Promise<string>, eventTracking: EventTracking | null, tenants?: {
     tenantField: string;
     tenantIds: (string | number)[];
 }[] | (string | number)[]) => Promise<{
-    schemaData: any;
+    schemaData: Table[];
     customFieldsByTable: {
         [tableName: string]: CustomField[];
     } | null;

package/dist/cjs/utils/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAExC,MAAM,MAAM,cAAc,GAAG;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,CAAC;AAC5D,MAAM,WAAW,UAAU;IACzB,WAAW,EAAE,WAAW,CAAC;IACzB,aAAa,CAAC,EAAE,WAAW,EAAE,CAAC;CAC/B;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AA2BF,eAAO,MAAM,0BAA0B,WAC7B,GAAG,EAAE,KACZ;IACD,CAAC,KAAK,EAAE,MAAM,GAAG;QACf,YAAY,EAAE,MAAM,CAAC;QACrB,sBAAsB,EAAE,MAAM,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,EAAE,CAAC;CAwCL,CAAC;AAEF,eAAO,MAAM,kBAAkB,2CAK5B;IACD,MAAM,EAAE,mBAAmB,CAAC;IAC5B,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAChC,OAAO,EACH;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,KAAG,OAAO,CAAC;IAAE,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;CAAE,GAAG,IAAI,CAiFxD,CAAC;AAEF,eAAO,MAAM,aAAa,WAChB,mBAAmB,wCAEjB,MAAM,OAAO,CAAC,MAAM,CAAC,YAE3B;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE;;;;;EAgDxB,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAKxC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,MAAM,MAAM,cAAc,GAAG;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,CAAC;AAC5D,MAAM,WAAW,UAAU;IACzB,WAAW,EAAE,WAAW,CAAC;IACzB,aAAa,CAAC,EAAE,WAAW,EAAE,CAAC;CAC/B;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AA2BF,eAAO,MAAM,0BAA0B,GACrC,QAAQ,GAAG,EAAE,KACZ;IACD,CAAC,KAAK,EAAE,MAAM,GAAG;QACf,YAAY,EAAE,MAAM,CAAC;QACrB,sBAAsB,EAAE,MAAM,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,EAAE,CAAC;CAwCL,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAU,uDAMtC;IACD,MAAM,EAAE,mBAAmB,CAAC;IAC5B,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAChC,OAAO,EACH;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACxB,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,KAAG,OAAO,CAAC;IAAE,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;CAAE,GAAG,IAAI,CA4FxD,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,QAAQ,mBAAmB,EAC3B,0BAAa,EACb,UAAU,MAAM,OAAO,CAAC,MAAM,CAAC,EAC/B,eAAe,aAAa,GAAG,IAAI,EACnC,UACI;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,KACtB,OAAO,CAAC;IACT,UAAU,EAAE,KAAK,EAAE,CAAC;IACpB,mBAAmB,EAAE;QAAE,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;KAAE,GAAG,IAAI,CAAC;CACpE,CAkDA,CAAC"}

package/dist/cjs/utils/schema.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSchemaInfo = exports.getCustomFieldInfo = exports.getSchemaForeignKeyMapping = void 0;
 const dataFetcher_1 = require("./dataFetcher");
+const columnProcessing_1 = require("./columnProcessing");
 const parseResponse = (results) => {
     if (results.data?.data) {
         if (results.data.data.queries &&
@@ -56,7 +57,7 @@ const getSchemaForeignKeyMapping = (schema) => {
     return map;
 };
 exports.getSchemaForeignKeyMapping = getSchemaForeignKeyMapping;
-const getCustomFieldInfo = async ({ client, getToken, tenants, caller = 'se', }) => {
+const getCustomFieldInfo = async ({ client, getToken, tenants, eventTracking, caller = 'se', }) => {
     let customFieldsByTableUniqueRows = [];
     try {
         const { publicKey, databaseType } = client;
@@ -115,6 +116,17 @@ const getCustomFieldInfo = async ({ client, getToken, tenants, caller = 'se', })
         });
     }
     catch (e) {
+        eventTracking?.logError?.({
+            type: 'bug', // TODO: determine type
+            severity: 'high',
+            message: 'Error fetching custom fields',
+            errorMessage: e.message,
+            errorStack: e.stack,
+            errorData: {
+                caller: 'getCustomFieldInfo',
+                function: 'getCustomFieldInfo',
+            },
+        });
         return null;
     }
     const customFieldsByTableUnique = customFieldsByTableUniqueRows
@@ -129,7 +141,7 @@ const getCustomFieldInfo = async ({ client, getToken, tenants, caller = 'se', })
     return customFieldsByTableUnique;
 };
 exports.getCustomFieldInfo = getCustomFieldInfo;
-const getSchemaInfo = async (client, caller = 'se', getToken, tenants) => {
+const getSchemaInfo = async (client, caller = 'se', getToken, eventTracking, tenants) => {
     const { publicKey,
     // databaseType,
      } = client;
@@ -148,6 +160,7 @@ const getSchemaInfo = async (client, caller = 'se', getToken, tenants) => {
                 getToken,
                 tenants,
                 caller,
+                eventTracking,
             });
         }
         catch (e) {
@@ -169,9 +182,35 @@ const getSchemaInfo = async (client, caller = 'se', getToken, tenants) => {
         getToken,
         urlParameters: `caller=${caller}&task=schema`,
     });
+    const parsedData = parseResponse(result);
+    const converted = convertSchemaInfoToTable(parsedData);
     return {
-        schemaData: parseResponse(result),
+        schemaData: converted,
         customFieldsByTable: customFieldsByTableUnique,
     };
 };
 exports.getSchemaInfo = getSchemaInfo;
+// Used to convert backend data to front end data
+function convertSchemaInfoToTable(schemaData) {
+    const tables = [];
+    schemaData.forEach((table) => {
+        const columnInternal = table.columns.map((column) => {
+            return (0, columnProcessing_1.convertColumnInfoToColumnInternal)(column);
+        });
+        const newTable = {
+            name: table.name,
+            columns: columnInternal,
+            rowCount: table.rowCount,
+            isSelectStar: table.isSelectStar,
+            viewQuery: table.viewQuery,
+            _id: table._id,
+            customFieldInfo: table.customFieldInfo,
+            displayName: table.displayName,
+            broken: table.broken,
+            error: table.error,
+            ownerTenantFields: table.ownerTenantFields,
+        };
+        tables.push(newTable);
+    });
+    return tables;
+}