@quillsql/admin 1.6.0 → 1.6.1

package/dist/cjs/public_components/SQLViewManager.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDuplicateColumns = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const primitives_1 = require("../primitives");
@@ -14,6 +15,28 @@ const dataEditor_1 = require("../utils/dataEditor");
 const ConnectionClient_1 = require("../api/ConnectionClient");
 const UiComponents_1 = require("../components/UiComponents");
 const DatabaseMismatchCard_1 = __importDefault(require("../components/DatabaseMismatchCard"));
+const TogglePrimitive_1 = __importDefault(require("../primitives/TogglePrimitive"));
+const SegmentedControl_1 = require("../components/SegmentedControl");
+const SqlTextEditor_1 = __importDefault(require("../components/SqlTextEditor"));
+const react_2 = require("@quillsql/react");
+const schema_1 = require("../utils/schema");
+const modals_1 = require("../modals");
+const getDuplicateColumns = (columns) => {
+    if (!columns) {
+        return [];
+    }
+    const columnCount = columns?.reduce((acc, curr) => {
+        if (acc[curr.field]) {
+            acc[curr.field] += 1;
+        }
+        else {
+            acc[curr.field] = 1;
+        }
+        return acc;
+    }, {});
+    return Object.keys(columnCount).filter((column) => columnCount[column] > 1);
+};
+exports.getDuplicateColumns = getDuplicateColumns;
 function SQLViewManager({ containerStyle, }) {
     const [tables, setTables] = (0, react_1.useState)(undefined);
     const [modalIsOpen, setIsOpen] = (0, react_1.useState)(false);
@@ -31,13 +54,17 @@ function SQLViewManager({ containerStyle, }) {
     const [allTableData, setAllTableData] = (0, react_1.useState)([]);
     const [referencedTablesMap, setReferencedTablesMap] = (0, react_1.useState)({});
     const [schemaIsLoading, setSchemaIsLoading] = (0, react_1.useState)(false);
+    const [customFieldInfo, setCustomFieldInfo] = (0, react_1.useState)(undefined);
+    const [provider, setProvider] = (0, react_1.useState)(null);
     const [initialSqlView, setInitialSqlView] = (0, react_1.useState)(undefined);
+    const [submittingView, setSubmittingView] = (0, react_1.useState)(false);
     const parentRef = (0, react_1.useRef)(null);
     const { state, dispatch } = (0, AdminProvider_1.useAdmin)();
     const closeEditModal = () => {
         setEditModalIsOpen(false);
         setEditName('');
         setEditViewQuery('');
+        setCustomFieldInfo(undefined);
     };
     const clickTableCell = (table) => {
         setEditName(table.name);
@@ -48,29 +75,18 @@ function SQLViewManager({ containerStyle, }) {
             name: table.name,
             query: table.viewQuery,
         });
+        setCustomFieldInfo(table.customFieldInfo);
         setEditModalIsOpen(true);
     };
     const getTables = async () => {
-        const response = await fetch(`${state.queryEndpoint}`, {
-            method: 'POST',
-            headers: {
-                ...state.queryHeaders,
-                'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
-                metadata: {
-                    clientId: state.client._id,
-                    publicKey: state.client._id,
-                    task: 'schema',
-                    databaseType: state.client.databaseType,
-                },
-            }),
-        });
-        if (!response.ok) {
-            throw new Error('Failed to fetch tables data');
-        }
-        const data = await response.json();
-        setTables(data.data.tables);
+        const schemaData = await (0, schema_1.getSchemaInfo)({
+            queryEndpoint: state.queryEndpoint,
+            queryHeaders: state.queryHeaders,
+            publicKey: state.client._id,
+            customerId: state.client.customerId,
+            gatherSchemaData: false,
+        }, 'svm');
+        setTables(schemaData);
     };
     const getSchemaTableDetails = async () => {
         setSchemaIsLoading(true);
@@ -111,7 +127,7 @@ function SQLViewManager({ containerStyle, }) {
             isSubscribed = false;
         };
     }, [state.client]);
-    const handleModalSubmit = async (submitRequest, query, name, id, columns) => {
+    const handleModalSubmit = async (submitRequest, query, name, id, columns, customFieldInfo) => {
         try {
             const prevTableName = tables?.find((table) => table._id === id)?.name;
             const isPlural = referencedTablesMap &&
@@ -119,21 +135,29 @@ function SQLViewManager({ containerStyle, }) {
                 referencedTablesMap[prevTableName].length > 1
                 ? 's'
                 : '';
+            let trimmedName = name?.trim() || undefined;
+            let submitResponse;
             switch (submitRequest) {
                 case 'add':
-                    if (!name) {
+                    if (!trimmedName) {
                         alert('No name found');
                         return;
                     }
-                    if (tables?.map((table) => table.name).includes(name)) {
+                    if (tables?.map((table) => table.name).includes(trimmedName)) {
                         alert('Name already exists');
                         return;
                     }
-                    if (!/^[a-z0-9_]+$/.test(name)) {
-                        alert('Name must be lowercase with no spaces');
+                    // determine if there are duplicate names if there are then alert the user
+                    let duplicateColumns = (0, exports.getDuplicateColumns)(columns);
+                    if (duplicateColumns.length > 0) {
+                        alert(`Ambiguous column names found. Either use aliases or remove the column to make every column name unique: \n\n${duplicateColumns.join('\n')}`);
                         return;
                     }
-                    await (0, dataEditor_1.addSqlView)(name, query, state);
+                    if (!/^[a-z0-9_]+$/.test(trimmedName)) {
+                        alert('Names can only include lowercase letters, numbers, and underscores');
+                        return;
+                    }
+                    submitResponse = await (0, dataEditor_1.addSqlView)(trimmedName, query, customFieldInfo, state);
                     break;
                 case 'edit':
                     if (!id) {
@@ -165,23 +189,29 @@ function SQLViewManager({ containerStyle, }) {
                             return;
                         }
                     }
-                    if (!name) {
+                    if (!trimmedName) {
                         alert('No name found');
                         return;
                     }
-                    if (!/^[a-z0-9_]+$/.test(name)) {
+                    if (!/^[a-z0-9_]+$/.test(trimmedName)) {
                         alert('Names can only include lowercase letters, numbers, and underscores');
                         return;
                     }
+                    // determine if there are duplicate names if there are then alert the user
+                    const duplicateColumns2 = (0, exports.getDuplicateColumns)(columns);
+                    if (duplicateColumns2.length > 0) {
+                        alert(`Ambiguous column names found. Either use aliases or remove the column to make every column name unique: \n\n${duplicateColumns2.join('\n')}`);
+                        return;
+                    }
                     // check if the tableName is present excluding the table with the same id
                     if (tables
                         ?.filter((table) => table._id !== id)
                         .map((table) => table.name)
-                        .includes(name)) {
+                        .includes(trimmedName)) {
                         alert('Name already exists');
                         return;
                     }
-                    await (0, dataEditor_1.editSQLView)(name, query, id, state);
+                    submitResponse = await (0, dataEditor_1.editSQLView)(trimmedName, query, id, customFieldInfo, state);
                     break;
                 case 'delete':
                     if (!id) {
@@ -190,10 +220,13 @@ function SQLViewManager({ containerStyle, }) {
                     }
                     // Determine if the table is referenced in other charts
                     if (referencedTablesMap && referencedTablesMap[prevTableName]) {
-                        alert(`This table is referenced in the following dashboard${isPlural}/chart${isPlural}.\n\n${referencedTablesMap[prevTableName]?.join('\n')} \n\nPlease delete those charts before deleting this table.`);
+                        const referencedTableInfo = referencedTablesMap[prevTableName].map((info) => {
+                            return `${info.dashboardName} - ${info.reportName}`;
+                        });
+                        alert(`This table is referenced in the following dashboard${isPlural}/chart${isPlural}.\n\n${referencedTableInfo.join('\n')} \n\nPlease delete those charts before deleting this table.`);
                         return;
                     }
-                    await (0, dataEditor_1.deleteSQLView)(id, state);
+                    submitResponse = await (0, dataEditor_1.deleteSQLView)(id, state);
                     break;
                 default:
                     setEditName('');
@@ -202,6 +235,10 @@ function SQLViewManager({ containerStyle, }) {
                     setEditModalIsOpen(true);
                     return;
             }
+            if (submitResponse.status !== 'success') {
+                alert(`There was an error processing your ${submitRequest} request.`);
+                return;
+            }
             await getTables();
             closeEditModal();
             setEditQueryView(false);
@@ -216,7 +253,7 @@ function SQLViewManager({ containerStyle, }) {
                 await handleModalSubmit('edit', query, name, id, columns);
                 break;
             default:
-                await handleModalSubmit('final-edit', query);
+                await handleModalSubmit('final-edit', query, undefined, undefined, columns);
                 break;
         }
     };
@@ -287,13 +324,30 @@ function SQLViewManager({ containerStyle, }) {
                                 ? tables.map((table) => ((0, jsx_runtime_1.jsx)(Admin_1.TableCell, { table: table, clickTableCell: clickTableCell }, table._id)))
                                 : null }, 'edit-view-query')) : ((0, jsx_runtime_1.jsx)(CreateEditSqlView_1.default, { containerStyle: {}, initialSqlView: initialSqlView, closeEditView: () => setEditQueryView(false), addEditView: (request, name, query, id, columns) => {
                                 handleEditAddView(request, name, query, id, columns);
-                            }, allTableData: allTableData, schemaIsLoading: schemaIsLoading })) }))] }), (0, jsx_runtime_1.jsx)(EditAddViewModal, { viewName: editName, viewQuery: editViewQuery, viewId: editViewId, editModalIsOpen: editModalIsOpen, closeEditModal: closeEditModal, submit: handleModalSubmit, state: state, onEditViewClick: () => setEditQueryView(true) })] }));
+                            }, setProvider: (provider) => { setProvider(provider); }, provider: provider, allTableData: allTableData, schemaIsLoading: schemaIsLoading })) }))] }), (0, jsx_runtime_1.jsx)(modals_1.PromoteViewModal, { clientId: state.client._id, client: state.client, clients: state.clients, isOpen: isPromoteViewModalOpen, setIsOpen: setIsPromoteViewModalOpen, ModalComponent: UiComponents_1.MemoizedModal, views: tables || [], parentRef: parentRef }), (0, jsx_runtime_1.jsx)(EditAddViewModal, { viewName: editName, viewQuery: editViewQuery, viewId: editViewId, editModalIsOpen: editModalIsOpen, customFieldInfo: customFieldInfo, closeEditModal: closeEditModal, submit: async (submitRequest, query, name, id, columns, customFieldInfo) => {
+                    if (submitRequest !== 'delete') {
+                        setSubmittingView(true);
+                    }
+                    await handleModalSubmit(submitRequest, query, name, id, columns, customFieldInfo);
+                    setSubmittingView(false);
+                }, state: state, onEditViewClick: () => setEditQueryView(true), isLoading: submittingView })] }));
 }
 exports.default = SQLViewManager;
-function EditAddViewModal({ viewName, viewQuery, viewId, editModalIsOpen, closeEditModal, submit, state, onEditViewClick = () => { }, }) {
+function EditAddViewModal({ viewName, viewQuery, viewId, editModalIsOpen, customFieldInfo, closeEditModal, submit, state, onEditViewClick = () => { }, isLoading, }) {
     const [name, setName] = (0, react_1.useState)(viewName);
     const [query, setQuery] = (0, react_1.useState)(viewQuery);
     const [id, setId] = (0, react_1.useState)(viewId);
+    const [useCustomField, setUseCustomField] = (0, react_1.useState)(customFieldInfo ? true : false);
+    const [customFieldType, setCustomFieldType] = (0, react_1.useState)(customFieldInfo ? customFieldInfo.type : 'eav');
+    const [customFieldQuery, setCustomFieldQuery] = (0, react_1.useState)(customFieldInfo ? customFieldInfo.query : '');
+    const [runQueryButtonLoading, setRunQueryButtonLoading] = (0, react_1.useState)(false);
+    const [tableData, setTableData] = (0, react_1.useState)(undefined);
+    const [errorInfo, setErrorInfo] = (0, react_1.useState)({ show: false, message: '' });
+    (0, react_1.useEffect)(() => {
+        setCustomFieldQuery(customFieldInfo?.query || '');
+        setCustomFieldType(customFieldInfo?.type || 'eav');
+        setUseCustomField(customFieldInfo ? true : false);
+    }, [customFieldInfo]);
     (0, react_1.useEffect)(() => {
         setName(viewName);
     }, [viewName]);
@@ -303,7 +357,15 @@ function EditAddViewModal({ viewName, viewQuery, viewId, editModalIsOpen, closeE
     (0, react_1.useEffect)(() => {
         setId(viewId);
     }, [viewId]);
-    return ((0, jsx_runtime_1.jsx)(primitives_1.ModalPrimitive, { isOpen: editModalIsOpen, close: closeEditModal, children: (0, jsx_runtime_1.jsxs)("div", { className: "flex flex-col p-[6px]", children: [(0, jsx_runtime_1.jsxs)("div", { style: {
+    return ((0, jsx_runtime_1.jsx)(primitives_1.ModalPrimitive, { isOpen: editModalIsOpen, close: () => {
+            setUseCustomField(false);
+            setCustomFieldType('eav');
+            setCustomFieldQuery('');
+            setTableData(undefined);
+            setErrorInfo({ show: false, message: '' });
+            setName('');
+            closeEditModal();
+        }, children: (0, jsx_runtime_1.jsxs)("div", { style: { height: '100%', overflow: 'scroll', width: '100%' }, children: [(0, jsx_runtime_1.jsxs)("div", { style: {
                         display: 'flex',
                         flexDirection: 'row',
                         alignItems: 'center',
@@ -336,7 +398,6 @@ function EditAddViewModal({ viewName, viewQuery, viewId, editModalIsOpen, closeE
                         fontWeight: 'medium',
                         height: '120px',
                         boxShadow: '0 1px 2px 0 rgba(0,0,0,.05)',
-                        width: '500px',
                         background: 'linear-gradient(white 50%, transparent)',
                         color: state.theme?.primaryTextColor,
                         borderWidth: '1px',
@@ -370,7 +431,81 @@ function EditAddViewModal({ viewName, viewQuery, viewId, editModalIsOpen, closeE
                             } }), viewName && ((0, jsx_runtime_1.jsx)("div", { style: { position: 'absolute', bottom: '10px', right: '10px' }, children: (0, jsx_runtime_1.jsx)(UiComponents_1.MemoizedSecondaryButton, { label: 'Edit Query   ↗', onClick: () => {
                                     closeEditModal();
                                     onEditViewClick();
-                                } }) }))] }), (0, jsx_runtime_1.jsxs)("div", { style: {
+                                } }) }))] }), (0, jsx_runtime_1.jsx)("br", {}), ['65d65b57cdd8ae70a5648d9c', '665610862cf7a3000be66453'].includes(state.client._id) &&
+                    state.client.databaseType === 'PostgreSQL' && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("h3", { style: {
+                                fontWeight: '600',
+                                fontSize: '14px',
+                                marginBottom: '6px',
+                                color: '#212121',
+                            }, children: "Custom fields" }), (0, jsx_runtime_1.jsx)(TogglePrimitive_1.default, { value: useCustomField, onClick: () => {
+                                setUseCustomField((useCustomField) => !useCustomField);
+                            } }), (0, jsx_runtime_1.jsx)("br", {}), useCustomField && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("h3", { style: {
+                                        fontWeight: '600',
+                                        fontSize: '14px',
+                                        marginBottom: '6px',
+                                        marginTop: '20px',
+                                        color: '#212121',
+                                    }, children: "Custom field type" }), (0, jsx_runtime_1.jsx)(SegmentedControl_1.SegmentedControl, { theme: state.theme, value: customFieldType, onChange: (e) => {
+                                        setCustomFieldType(e);
+                                    }, left: 'EAV', right: 'JSON' }), (0, jsx_runtime_1.jsx)("br", {}), (0, jsx_runtime_1.jsx)("h3", { style: {
+                                        fontWeight: '600',
+                                        fontSize: '14px',
+                                        marginBottom: '6px',
+                                        color: '#212121',
+                                    }, children: "Custom field query" }), (0, jsx_runtime_1.jsx)("h3", { style: {
+                                        fontWeight: '400',
+                                        fontSize: '14px',
+                                        marginBottom: '20px',
+                                        color: '#212121',
+                                    }, children: customFieldType === 'eav'
+                                        ? `A table of custom fields. It must have these columns: ref_table, ref_id, field, value, type, ${state.client.customerFieldName.replaceAll('"', '')}.`
+                                        : `A table of custom fields. It must have these columns: ref_table, ref_column, field, ${state.client.customerFieldName.replaceAll('"', '')}.` }), (0, jsx_runtime_1.jsx)(SqlTextEditor_1.default, { value: customFieldQuery, setValue: (e) => {
+                                        setCustomFieldQuery(e);
+                                    }, setEditorMounted: () => { }, containerStyle: {
+                                        width: 800,
+                                    }, previousProvider: null, height: '150px', schema: [] }), (0, jsx_runtime_1.jsx)("br", {}), (0, jsx_runtime_1.jsx)(UiComponents_1.MemoizedButton, { label: 'Run query', onClick: async () => {
+                                        if (/limit\s+\d+\s*;?\s*$/i.test(customFieldQuery)) {
+                                            setErrorInfo({
+                                                show: true,
+                                                message: 'Error: Please remove the limit at the end of your query.',
+                                            });
+                                            return;
+                                        }
+                                        setErrorInfo({ show: false, message: '' });
+                                        setRunQueryButtonLoading(true);
+                                        const getSqlResults = await (0, ConnectionClient_1.getSqlViewData)(state.client._id, customFieldQuery, state.client.databaseType, state.queryEndpoint);
+                                        if (!getSqlResults.success) {
+                                            setErrorInfo({
+                                                show: true,
+                                                message: getSqlResults.error,
+                                            });
+                                        }
+                                        else {
+                                            setErrorInfo({ show: false, message: '' });
+                                            setTableData(getSqlResults);
+                                        }
+                                        setRunQueryButtonLoading(false);
+                                    } }), (0, jsx_runtime_1.jsx)("br", {}), runQueryButtonLoading && ((0, jsx_runtime_1.jsx)("div", { style: {
+                                        height: '250px',
+                                        width: '100%',
+                                        display: 'flex',
+                                        justifyContent: 'center',
+                                        alignItems: 'center',
+                                    }, children: (0, jsx_runtime_1.jsx)(UiComponents_1.LoadingSpinner, {}) })), !errorInfo.show && tableData && !runQueryButtonLoading && ((0, jsx_runtime_1.jsx)(react_2.Table, { rows: tableData.rows, columns: tableData.fields, containerStyle: {
+                                        height: '250px',
+                                        maxWidth: '800px',
+                                        paddingTop: '20px',
+                                    }, hideCSVDownloadButton: true })), errorInfo.show && ((0, jsx_runtime_1.jsx)("div", { style: {
+                                        fontSize: 15,
+                                        fontWeight: '400',
+                                        paddingTop: '20px',
+                                    }, children: (0, jsx_runtime_1.jsx)("div", { style: {
+                                            padding: 30,
+                                            background: 'rgba(0,0,0,0.02)',
+                                            display: 'inline-block',
+                                            flex: 0,
+                                            borderRadius: 6,
+                                        }, children: errorInfo.message }) }))] }))] })), (0, jsx_runtime_1.jsxs)("div", { style: {
                         display: 'flex',
                         flexDirection: 'row',
                         alignItems: 'center',
@@ -382,6 +517,47 @@ function EditAddViewModal({ viewName, viewQuery, viewId, editModalIsOpen, closeE
                                     alert('Please enter a name');
                                     return;
                                 }
-                                submit(viewName ? 'edit' : 'add', query, name, id);
-                            }, label: viewName ? 'Save changes' : 'Create view' })] })] }) }));
+                                if (useCustomField) {
+                                    const fields = tableData?.fields.map((field) => field.field);
+                                    const missingFields = [];
+                                    if (!fields) {
+                                        alert('Custom field query is missing required columns');
+                                        return;
+                                    }
+                                    if (customFieldType === 'eav') {
+                                        // make sure the tableData has the required columns
+                                        [
+                                            'ref_table',
+                                            'ref_id',
+                                            'field',
+                                            'value',
+                                            'type',
+                                            state.client.customerFieldName.replaceAll('"', ''),
+                                        ].forEach((requiredField) => {
+                                            if (!fields.includes(requiredField)) {
+                                                missingFields.push(requiredField);
+                                            }
+                                        });
+                                    }
+                                    else {
+                                        [
+                                            'ref_table',
+                                            'field',
+                                            'ref_column',
+                                            state.client.customerFieldName.replaceAll('"', ''),
+                                        ].forEach((requiredField) => {
+                                            if (!fields.includes(requiredField)) {
+                                                missingFields.push(requiredField);
+                                            }
+                                        });
+                                    }
+                                    if (missingFields.length > 0) {
+                                        alert(`Custom field query is missing required columns: ${missingFields.join(', ')}`);
+                                        return;
+                                    }
+                                }
+                                submit(viewName ? 'edit' : 'add', query, name, id, undefined, useCustomField
+                                    ? { type: customFieldType, query: customFieldQuery }
+                                    : undefined);
+                            }, label: viewName ? 'Save changes' : 'Create view', isLoading: isLoading })] })] }) }));
 }

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

@@ -0,0 +1,2 @@
+export declare function processJoinASTWithDuplicateColumns(duplicateColumnsNames: string[], tableNames: string[], schema: any, ast: any): any;
+//# sourceMappingURL=astProcessing.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"astProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/astProcessing.ts"],"names":[],"mappings":"AAAA,wBAAgB,kCAAkC,CAChD,qBAAqB,EAAE,MAAM,EAAE,EAC/B,UAAU,EAAE,MAAM,EAAE,EACpB,MAAM,EAAE,GAAG,EACX,GAAG,EAAE,GAAG,OAsCT"}

package/dist/cjs/utils/astProcessing.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.processJoinASTWithDuplicateColumns = void 0;
+function processJoinASTWithDuplicateColumns(duplicateColumnsNames, tableNames, schema, ast) {
+    const columns = [];
+    schema.forEach((table) => {
+        if (tableNames.includes(table.tableName)) {
+            table.columns.forEach((column) => {
+                let tableName = table.tableName;
+                if (table.tableName.includes('.')) {
+                    tableName = table.tableName.split('.')[1] || table.tableName;
+                }
+                if (duplicateColumnsNames.includes(column.columnName)) {
+                    columns.push({
+                        type: 'expr',
+                        as: `${tableName}_${column.columnName}`,
+                        expr: {
+                            type: 'column_ref',
+                            table: tableName,
+                            column: column.columnName,
+                        },
+                    });
+                }
+                else {
+                    columns.push({
+                        type: 'expr',
+                        as: null,
+                        expr: {
+                            type: 'column_ref',
+                            table: tableName,
+                            column: column.columnName,
+                        },
+                    });
+                }
+            });
+        }
+    });
+    ast.columns = columns;
+    return ast;
+}
+exports.processJoinASTWithDuplicateColumns = processJoinASTWithDuplicateColumns;

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=astProcessing.uspec.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"astProcessing.uspec.d.ts","sourceRoot":"","sources":["../../../src/utils/astProcessing.uspec.ts"],"names":[],"mappings":""}

package/dist/cjs/utils/astProcessing.uspec.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const astProcessing_1 = require("./astProcessing");
+describe('astProcessing', () => {
+    describe('processJoinASTWithDuplicateColumns', () => {
+        it('should return a new ast object with unambiguous columns', () => {
+            const dummyAst = { where: 'dummy where' };
+            const tableNames = ['table1', 'table2'];
+            const duplicateColumns = ['amount'];
+            const schema = [
+                {
+                    tableName: 'table1',
+                    columns: [{ columnName: 'amount' }, { columnName: 'name' }],
+                },
+                {
+                    tableName: 'table2',
+                    columns: [{ columnName: 'amount' }, { columnName: 'other_name' }],
+                },
+            ];
+            const resultAst = (0, astProcessing_1.processJoinASTWithDuplicateColumns)(duplicateColumns, tableNames, schema, dummyAst);
+            expect(resultAst.columns.length).toEqual(4);
+            expect(resultAst.columns[0].as).toEqual('table1_amount');
+            expect(resultAst.columns[1].as).toEqual(null);
+        });
+    });
+});

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

@@ -0,0 +1,3 @@
+export declare function convertFieldTypeToJSType(fieldType: string): string;
+export declare function processColumnReference(column: string, databaseType: string): string;
+//# sourceMappingURL=columnProcessing.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"columnProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/columnProcessing.ts"],"names":[],"mappings":"AAAA,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAsBlE;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,UAa1E"}

package/dist/cjs/utils/columnProcessing.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.processColumnReference = exports.convertFieldTypeToJSType = void 0;
+function convertFieldTypeToJSType(fieldType) {
+    switch (fieldType) {
+        case 'bool':
+            return 'bool';
+        case 'int8':
+        case 'int2':
+        case 'int4':
+        case 'float4':
+        case 'float8':
+        case 'numeric':
+            return 'number';
+        case 'date':
+        case 'time':
+        case 'timestamptz':
+        case 'timestamp':
+            return 'date';
+        case 'interval':
+        case 'varchar':
+        case 'text':
+        default:
+            return 'string';
+    }
+}
+exports.convertFieldTypeToJSType = convertFieldTypeToJSType;
+function processColumnReference(column, databaseType) {
+    if (['postgresql', 'snowflake'].includes(databaseType.toLowerCase())) {
+        const columnParts = column.split('.');
+        if (columnParts.length > 1) {
+            return `"${columnParts[0]}"."${columnParts[1]}"`;
+        }
+        return `"${column}"`;
+    }
+    const columnParts = column.split('.');
+    if (columnParts.length > 1) {
+        return `\`${columnParts[0]}\`.\`${columnParts[1]}\``;
+    }
+    return `\`${column}\``;
+}
+exports.processColumnReference = processColumnReference;

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

@@ -1,4 +1,4 @@
-export declare const editSQLView: (editName: string, editViewQuery: string, editViewId: string, state: any) => Promise<any>;
-export declare const addSqlView: (name: string, editViewQuery: string, state: any) => Promise<any>;
+export declare const editSQLView: (editName: string, editViewQuery: string, editViewId: string, customFieldInfo: any, state: any) => Promise<any>;
+export declare const addSqlView: (name: string, editViewQuery: string, customFieldInfo: any, state: any) => Promise<any>;
 export declare const deleteSQLView: (id: string, state: any) => Promise<any>;
 //# sourceMappingURL=dataEditor.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"dataEditor.d.ts","sourceRoot":"","sources":["../../../src/utils/dataEditor.tsx"],"names":[],"mappings":"AAEA,eAAO,MAAM,WAAW,aACZ,MAAM,iBACD,MAAM,cACT,MAAM,SACX,GAAG,iBAsDX,CAAC;AAEF,eAAO,MAAM,UAAU,SACf,MAAM,iBACG,MAAM,SACd,GAAG,iBA+CX,CAAC;AAEF,eAAO,MAAM,aAAa,OAAc,MAAM,SAAS,GAAG,iBAmCzD,CAAC"}
+{"version":3,"file":"dataEditor.d.ts","sourceRoot":"","sources":["../../../src/utils/dataEditor.tsx"],"names":[],"mappings":"AAEA,eAAO,MAAM,WAAW,aACZ,MAAM,iBACD,MAAM,cACT,MAAM,mBACD,GAAG,SACb,GAAG,iBAuDX,CAAC;AAEF,eAAO,MAAM,UAAU,SACf,MAAM,iBACG,MAAM,mBACJ,GAAG,SACb,GAAG,iBAgDX,CAAC;AAEF,eAAO,MAAM,aAAa,OAAc,MAAM,SAAS,GAAG,iBAmCzD,CAAC"}

package/dist/cjs/utils/dataEditor.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteSQLView = exports.addSqlView = exports.editSQLView = void 0;
 const constants_1 = require("./constants");
-const editSQLView = async (editName, editViewQuery, editViewId, state) => {
+const editSQLView = async (editName, editViewQuery, editViewId, customFieldInfo, state) => {
     if (!editName.length) {
         alert('Please enter a table name.');
         return;
@@ -27,6 +27,7 @@ const editSQLView = async (editName, editViewQuery, editViewId, state) => {
                 metadata: {
                     preQueries: [editViewQuery.replace(/;/, '')],
                     name: editName,
+                    customFieldInfo: customFieldInfo,
                     task: 'view',
                     id: editViewId,
                     clientId: state.client._id,
@@ -56,7 +57,7 @@ const editSQLView = async (editName, editViewQuery, editViewId, state) => {
     return await response.json();
 };
 exports.editSQLView = editSQLView;
-const addSqlView = async (name, editViewQuery, state) => {
+const addSqlView = async (name, editViewQuery, customFieldInfo, state) => {
     if (!name.length) {
         alert('Please enter a table name.');
         return;
@@ -76,6 +77,7 @@ const addSqlView = async (name, editViewQuery, state) => {
             body: JSON.stringify({
                 metadata: {
                     preQueries: [editViewQuery.replace(/;/, '')],
+                    customFieldInfo: customFieldInfo,
                     name: name,
                     task: 'view',
                     clientId: state.client._id,

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

@@ -29,7 +29,6 @@ interface SnowflakeConnection extends DatabaseConnection {
     port: string;
 }
 interface BigQueryConnection extends DatabaseConnection {
-    companyTag: string;
     jsonString: string;
 }
 export type ConnectionType = DatabaseConnection | PostgresConnection | MySQLConnection | SnowflakeConnection | BigQueryConnection;

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,UAAU,kBAAmB,SAAQ,kBAAkB;IACrD,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,UAAU,eAAgB,SAAQ,kBAAkB;IAClD,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,UAAU,mBAAoB,SAAQ,kBAAkB;IACtD,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,UAAU,kBAAmB,SAAQ,kBAAkB;IACrD,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,cAAc,GACtB,kBAAkB,GAClB,kBAAkB,GAClB,eAAe,GACf,mBAAmB,GACnB,kBAAkB,CAAC;AAEvB,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,EAyBtD,CAAC;AAEF,wBAAgB,2BAA2B,CACzC,YAAY,EAAE,MAAM,GACnB,cAAc,GAAG,SAAS,CAwC5B;AAED,wBAAgB,oBAAoB,CAClC,UAAU,CAAC,EAAE,kBAAkB,EAC/B,QAAQ,CAAC,EAAE,IAAI,UAyBhB"}
+{"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,UAAU,kBAAmB,SAAQ,kBAAkB;IACrD,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,UAAU,eAAgB,SAAQ,kBAAkB;IAClD,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,UAAU,mBAAoB,SAAQ,kBAAkB;IACtD,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,UAAU,kBAAmB,SAAQ,kBAAkB;IACrD,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,cAAc,GACtB,kBAAkB,GAClB,kBAAkB,GAClB,eAAe,GACf,mBAAmB,GACnB,kBAAkB,CAAC;AAEvB,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,EAyBtD,CAAC;AAEF,wBAAgB,2BAA2B,CACzC,YAAY,EAAE,MAAM,GACnB,cAAc,GAAG,SAAS,CAuC5B;AAED,wBAAgB,oBAAoB,CAClC,UAAU,CAAC,EAAE,kBAAkB,EAC/B,QAAQ,CAAC,EAAE,IAAI,UAkChB"}

package/dist/cjs/utils/databases.js

@@ -61,7 +61,6 @@ function getDatabaseConnectionFormat(databaseName) {
         return {
             type: 'BigQuery',
             connectionString: '',
-            companyTag: '',
             jsonString: '',
         };
     }
@@ -73,26 +72,26 @@ function formConnectionString(connection, jsonFile) {
         return 'There is no connection info';
     }
     if (connection.connectionString !== '') {
-        return connection.connectionString;
+        return connection.connectionString.replaceAll(' ', '');
     }
     if (connection.type === 'PostgreSQL') {
         const typedConnection = connection;
-        return `postgres://${typedConnection.user}:${typedConnection.password}@${typedConnection.host}:${typedConnection.port}/${typedConnection.databaseName}`;
+        return `postgres://${typedConnection.user}:${typedConnection.password}@${typedConnection.host}:${typedConnection.port}/${typedConnection.databaseName}`.replaceAll(' ', '');
     }
     else if (connection.type === 'mysql') {
         const typedConnection = connection;
-        return `mysql://${typedConnection.user}:${typedConnection.password}@${typedConnection.host}:${typedConnection.port}`;
+        return `mysql://${typedConnection.user}:${typedConnection.password}@${typedConnection.host}:${typedConnection.port}`.replaceAll(' ', '');
     }
     else if (connection.type === 'snowflake') {
         const typedConnection = connection;
-        return `mysql://${typedConnection.user}:${typedConnection.password}@${typedConnection.host}:${typedConnection.port}`;
+        return `mysql://${typedConnection.user}:${typedConnection.password}@${typedConnection.host}:${typedConnection.port}`.replaceAll(' ', '');
     }
     else if (connection.type === 'BigQuery') {
         const typedConnection = connection;
         const cleanedJsonString = typedConnection.jsonString
             .replace(/\\(?![n"])/g, '')
             .replace(/\n/g, '');
-        return `${typedConnection.companyTag}${cleanedJsonString}`;
+        return cleanedJsonString;
     }
     return '';
 }