@quillsql/admin 1.3.7 → 1.3.8

package/dist/cjs/forms/client_onboard/CreateSqlViews.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CreateSqlViews.d.ts","sourceRoot":"","sources":["../../../../src/forms/client_onboard/CreateSqlViews.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAuB,MAAM,OAAO,CAAC;AAC3D,OAAO,EAAU,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAa3D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAwB,MAAM,uBAAuB,CAAC;AAG7E,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EACrC,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,kBAAkB,EAClB,aAAa,EACb,UAAU,EACV,kBAAkB,GACnB,EAAE;IACD,cAAc,CAAC,EAAE,aAAa,CAAC;IAC/B,YAAY,CAAC,EAAE,aAAa,CAAC;IAC7B,YAAY,CAAC,EAAE,aAAa,CAAC;IAC7B,cAAc,EAAE,cAAc,EAAE,CAAC;IACjC,kBAAkB,CAAC,EAAE,cAAc,CAAC;IACpC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,kBAAkB,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;CAC3C,2CA8VA"}
+{"version":3,"file":"CreateSqlViews.d.ts","sourceRoot":"","sources":["../../../../src/forms/client_onboard/CreateSqlViews.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAuB,MAAM,OAAO,CAAC;AAC3D,OAAO,EAAU,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAa3D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAwB,MAAM,uBAAuB,CAAC;AAK7E,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EACrC,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,kBAAkB,EAClB,aAAa,EACb,UAAU,EACV,kBAAkB,EAClB,QAAQ,EACR,KAAK,GACN,EAAE;IACD,cAAc,CAAC,EAAE,aAAa,CAAC;IAC/B,YAAY,CAAC,EAAE,aAAa,CAAC;IAC7B,YAAY,CAAC,EAAE,aAAa,CAAC;IAC7B,cAAc,EAAE,cAAc,EAAE,CAAC;IACjC,kBAAkB,CAAC,EAAE,cAAc,CAAC;IACpC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,kBAAkB,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,GAAG,CAAC;CACZ,2CAmWA;AAED,wBAAgB,eAAe,CAAC,EAC9B,MAAM,EACN,SAAS,EACT,QAAQ,EACR,UAAU,EACV,SAAS,GACV,EAAE;IACD,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAChC,QAAQ,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACxC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;CAC/B,2CAiDA"}

package/dist/cjs/forms/client_onboard/CreateSqlViews.js

@@ -3,14 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ForeignKeyModal = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const primitives_1 = require("../../primitives");
-const react_2 = require("@quillsql/react");
 const ConnectionClient_1 = require("../../api/ConnectionClient");
-const databases_1 = require("../../utils/databases");
 const SqlViewTile_1 = __importDefault(require("../../components/SqlViewTile"));
-function CreateSQLViews({ containerStyle, header1Style, header2Style, columnsByTable, environmentDetails, allSchemaInfo, domainName, completeOnboarding, }) {
+const SqlTextEditor_1 = __importDefault(require("../../components/SqlTextEditor"));
+const react_2 = require("@quillsql/react");
+function CreateSQLViews({ containerStyle, header1Style, header2Style, columnsByTable, environmentDetails, allSchemaInfo, domainName, completeOnboarding, clientId, state, }) {
     const [selectedTable, setSelectedTable] = (0, react_1.useState)(undefined);
     const [queryInfo, setQueryInfo] = (0, react_1.useState)({
         name: '',
@@ -28,7 +29,7 @@ function CreateSQLViews({ containerStyle, header1Style, header2Style, columnsByT
     const addSqlView = async (override) => {
         const results = await (0, ConnectionClient_1.createSQLView)(environmentDetails, allSchemaInfo, columnsByTable, queryInfo, client, domainName, tableData, sqlTables.map((e) => {
             return e.name;
-        }), override);
+        }), override, clientId);
         if (results.throwModal) {
             setShowFKModal(true);
             return;
@@ -52,7 +53,6 @@ function CreateSQLViews({ containerStyle, header1Style, header2Style, columnsByT
             ...containerStyle,
             display: 'flex',
             flexDirection: 'column',
-            overflow: 'hidden',
         }, id: "create-sql-view", children: [(0, jsx_runtime_1.jsxs)("div", { style: {
                     padding: 20,
                     paddingBottom: 12,
@@ -81,10 +81,12 @@ function CreateSQLViews({ containerStyle, header1Style, header2Style, columnsByT
                                             setAIPrompt(e.target.value);
                                         }, placeholder: 'Describe a query...', value: aiPrompt }), (0, jsx_runtime_1.jsx)(primitives_1.ButtonPrimitive, { label: askAIButton, onClick: async () => {
                                             setAskAIButton('Loading...');
-                                            const results = await (0, ConnectionClient_1.getQueryFromAI)(aiPrompt, columnsByTable);
+                                            const results = await (0, ConnectionClient_1.getQueryFromAiWithConnection)(aiPrompt, clientId, allSchemaInfo?.selectedFields.schema
+                                                ? [allSchemaInfo?.selectedFields.schema]
+                                                : undefined);
                                             setQueryInfo({ name: queryInfo.name, query: results });
                                             setAskAIButton('Ask AI');
-                                        }, style: { width: '90px' } })] }), (0, jsx_runtime_1.jsx)(react_2.SqlTextEditor, { value: queryInfo.query, setValue: (e) => {
+                                        }, style: { width: '90px' } })] }), (0, jsx_runtime_1.jsx)(SqlTextEditor_1.default, { value: queryInfo.query, setValue: (e) => {
                                     setQueryInfo({ name: queryInfo.name, query: e });
                                 }, containerStyle: { paddingLeft: 16, paddingRight: 16 } }), (0, jsx_runtime_1.jsxs)("div", { style: {
                                     display: 'flex',
@@ -96,8 +98,7 @@ function CreateSQLViews({ containerStyle, header1Style, header2Style, columnsByT
                                     height: 70,
                                 }, children: [(0, jsx_runtime_1.jsx)(primitives_1.ButtonPrimitive, { label: runQueryButtonLabel, onClick: async () => {
                                             setRunQueryButtonLabel('Querying...');
-                                            const connectionString = (0, databases_1.formConnectionString)(environmentDetails);
-                                            const getSqlResults = await (0, ConnectionClient_1.getSqlViewData)(connectionString, queryInfo.query);
+                                            const getSqlResults = await (0, ConnectionClient_1.getSqlViewData)(clientId, queryInfo.query, environmentDetails.type, state.queryEndpoint);
                                             if (!getSqlResults.success) {
                                                 setErrorInfo({ status: true, msg: getSqlResults.error });
                                             }
@@ -115,7 +116,7 @@ function CreateSQLViews({ containerStyle, header1Style, header2Style, columnsByT
                                     paddingLeft: 16,
                                     paddingRight: 16,
                                     height: 'calc(100vh - 515px)',
-                                }, children: [(0, jsx_runtime_1.jsx)(react_2.Table, { rows: tableData.rows, columns: tableData.columns, 
+                                }, children: [(0, jsx_runtime_1.jsx)(react_2.Table, { rows: tableData.rows, columns: tableData.fields, 
                                         // height="400px"
                                         containerStyle: {
                                             height: 'calc(100vh - 589px)',
@@ -206,3 +207,4 @@ function ForeignKeyModal({ isOpen, setIsOpen, override, foreignKey, tableName, }
                                 setIsOpen(false);
                             } })] })] }) }));
 }
+exports.ForeignKeyModal = ForeignKeyModal;

package/dist/cjs/forms/sql_views/CreateEditSqlView.d.ts

@@ -0,0 +1,24 @@
+/// <reference types="react" />
+import { ButtonComponentProps, TableComponentProps, TextInputComponentProps, HeaderProps } from '@quillsql/react';
+import { ColumnsByTable } from '../../utils/table';
+interface CreateEditSqlViewProps {
+    containerStyle: React.CSSProperties;
+    initialSqlView?: {
+        id: string;
+        name: string;
+        query: string;
+    };
+    Button?: (props: ButtonComponentProps) => JSX.Element;
+    SecondaryButtonComponent?: (props: ButtonComponentProps) => JSX.Element;
+    TextInput?: (props: TextInputComponentProps) => JSX.Element;
+    TableComponent?: (props: TableComponentProps) => JSX.Element;
+    LoadingComponent?: () => JSX.Element;
+    Header?: (props: HeaderProps) => JSX.Element;
+    closeEditView: () => void;
+    addEditView: (request: string, query: string, name?: string, id?: string) => void;
+    allTableData: ColumnsByTable[];
+    schemaIsLoading: boolean;
+}
+export default function CreateEditSqlView({ containerStyle, initialSqlView, closeEditView, addEditView, SecondaryButtonComponent, TableComponent, LoadingComponent, Button, TextInput, Header, allTableData, schemaIsLoading, }: CreateEditSqlViewProps): JSX.Element;
+export {};
+//# sourceMappingURL=CreateEditSqlView.d.ts.map

package/dist/cjs/forms/sql_views/CreateEditSqlView.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"CreateEditSqlView.d.ts","sourceRoot":"","sources":["../../../../src/forms/sql_views/CreateEditSqlView.tsx"],"names":[],"mappings":";AAAA,OAAO,EACL,oBAAoB,EACpB,mBAAmB,EACnB,uBAAuB,EACvB,WAAW,EAEZ,MAAM,iBAAiB,CAAC;AAwBzB,OAAO,EAAU,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAK3D,UAAU,sBAAsB;IAC9B,cAAc,EAAE,KAAK,CAAC,aAAa,CAAC;IACpC,cAAc,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7D,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IACtD,wBAAwB,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAExE,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC5D,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC7D,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IACrC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,GAAG,CAAC,OAAO,CAAC;IAC7C,aAAa,EAAE,MAAM,IAAI,CAAC;IAC1B,WAAW,EAAE,CACX,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,IAAI,CAAC,EAAE,MAAM,EACb,EAAE,CAAC,EAAE,MAAM,KACR,IAAI,CAAC;IACV,YAAY,EAAE,cAAc,EAAE,CAAC;IAC/B,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,EACxC,cAAc,EACd,cAAc,EACd,aAAa,EACb,WAAW,EACX,wBAAwB,EACxB,cAAsB,EACtB,gBAA2C,EAC3C,MAAuB,EACvB,SAA6B,EAC7B,MAAuB,EACvB,YAAY,EACZ,eAAe,GAChB,EAAE,sBAAsB,GAAG,GAAG,CAAC,OAAO,CAsStC"}

package/dist/cjs/forms/sql_views/CreateEditSqlView.js

@@ -0,0 +1,161 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const jsx_runtime_1 = require("react/jsx-runtime");
+const react_1 = require("@quillsql/react");
+const react_2 = require("react");
+const AdminProvider_1 = require("../../AdminProvider");
+const ConnectionClient_1 = require("../../api/ConnectionClient");
+const SqlTextEditor_1 = __importDefault(require("../../components/SqlTextEditor"));
+const UiComponents_1 = require("../../components/UiComponents");
+const react_3 = require("@quillsql/react");
+const CreateSqlViews_1 = require("../client_onboard/CreateSqlViews");
+const DynamicBanner_1 = __importDefault(require("../../components/DynamicBanner"));
+function CreateEditSqlView({ containerStyle, initialSqlView, closeEditView, addEditView, SecondaryButtonComponent, TableComponent = react_1.Table, LoadingComponent = () => (0, jsx_runtime_1.jsx)(UiComponents_1.LoadingSpinner, {}), Button = UiComponents_1.MemoizedButton, TextInput = UiComponents_1.MemoizedTextInput, Header = UiComponents_1.MemoizedHeader, allTableData, schemaIsLoading, }) {
+    const [name, setName] = (0, react_2.useState)(initialSqlView?.name || '');
+    const [editViewQuery, setEditViewQuery] = (0, react_2.useState)(initialSqlView?.query || '');
+    const [ranViewQuery, setRanViewQuery] = (0, react_2.useState)(initialSqlView?.query || '');
+    const [askAIButton, setAskAIButton] = (0, react_2.useState)('Ask AI');
+    const [aiPrompt, setAIPrompt] = (0, react_2.useState)('');
+    const [runQueryButtonLabel, setRunQueryButtonLabel] = (0, react_2.useState)('Run query');
+    const [viewAddable, setViewAddable] = (0, react_2.useState)(false);
+    const [showFKModal, setShowFKModal] = (0, react_2.useState)(false);
+    const [overrideFKCheck, setOverrideFKCheck] = (0, react_2.useState)(false);
+    const [isLoading, setIsLoading] = (0, react_2.useState)(false);
+    const [tableSearchQuery, setTableSearchQuery] = (0, react_2.useState)('');
+    const [displayedTableData, setDisplayedTableData] = (0, react_2.useState)(allTableData);
+    const [errorInfo, setErrorInfo] = (0, react_2.useState)({ show: false, message: '' });
+    const [tableData, setTableData] = (0, react_2.useState)(undefined);
+    const { state, dispatch } = (0, AdminProvider_1.useAdmin)();
+    const addEditSqlView = async (override = false) => {
+        if (!override &&
+            tableData &&
+            !tableData.fields.find((col) => col.name === state.client.customerFieldName)) {
+            setShowFKModal(true);
+            return;
+        }
+        addEditView(initialSqlView ? 'edit' : 'add', ranViewQuery, name, initialSqlView ? initialSqlView.id : undefined);
+    };
+    (0, react_2.useEffect)(() => {
+        setDisplayedTableData(allTableData);
+    }, [allTableData]);
+    const handleRunSqlPrompt = async () => {
+        setErrorInfo({ show: false, message: '' });
+        setViewAddable(false);
+        setAskAIButton('Loading...');
+        const results = await (0, ConnectionClient_1.getQueryFromAiWithConnection)(aiPrompt, state.client._id, state.client.schemaNames);
+        setOverrideFKCheck(false);
+        setEditViewQuery(results);
+        setAskAIButton('Ask AI');
+    };
+    const handleRunQuery = async () => {
+        const query = editViewQuery;
+        // If this query has a limit at the end alert the user
+        if (query.toLowerCase().includes(' limit ')) {
+            setErrorInfo({
+                show: true,
+                message: 'Error: Please remove the limit on you query.',
+            });
+            return;
+        }
+        setViewAddable(false);
+        setErrorInfo({ show: false, message: '' });
+        setTableData(undefined);
+        setIsLoading(true);
+        setRunQueryButtonLabel('Querying...');
+        setOverrideFKCheck(false);
+        if (editViewQuery.length === 0) {
+            setErrorInfo({ show: true, message: 'Error: Please enter a query.' });
+            setRunQueryButtonLabel('Run query');
+            return;
+        }
+        const resp = await (0, ConnectionClient_1.getSqlViewData)(state.client._id, query, state.client.databaseType, state.queryEndpoint);
+        if (!resp.success) {
+            setErrorInfo({ show: true, message: resp.error });
+            setTableData(undefined);
+            setViewAddable(false);
+            setRunQueryButtonLabel('Run query');
+            setIsLoading(false);
+            return;
+        }
+        setRunQueryButtonLabel('Run query');
+        setErrorInfo({ show: false, message: '' });
+        setTableData(resp);
+        setViewAddable(true);
+        setRanViewQuery(query);
+        setIsLoading(false);
+    };
+    return ((0, jsx_runtime_1.jsx)("div", { style: {
+            ...containerStyle,
+            gap: 6,
+            height: 'calc(100vh - 188px)',
+        }, children: (0, jsx_runtime_1.jsxs)("div", { style: { display: 'flex', height: '100%', flexDirection: 'column' }, children: [(0, jsx_runtime_1.jsx)(DynamicBanner_1.default, { header: initialSqlView
+                        ? `Edit "${initialSqlView.name}" view`
+                        : 'Create SQL View', message: initialSqlView
+                        ? `You are currently editing the '${initialSqlView.name}' sql view.`
+                        : '', onExit: closeEditView, style: {
+                        display: 'flex',
+                        paddingTop: '0.625rem',
+                        paddingBottom: '0.625rem',
+                        paddingLeft: '24px',
+                        paddingRight: '24px',
+                        alignItems: 'center',
+                        backgroundColor: initialSqlView ? '#111827' : '#ffffff',
+                    } }), (0, jsx_runtime_1.jsxs)("div", { style: {
+                        width: '100%',
+                        display: 'flex',
+                        height: '100%',
+                        flexDirection: 'row',
+                        paddingTop: '20px',
+                    }, children: [(0, jsx_runtime_1.jsxs)("div", { style: {
+                                display: 'flex',
+                                flexDirection: 'column',
+                                gap: 20,
+                            }, children: [(0, jsx_runtime_1.jsx)("div", { style: {
+                                        paddingLeft: '20px',
+                                        paddingRight: '30px',
+                                    }, children: (0, jsx_runtime_1.jsx)(TextInput, { placeholder: "Search...", onChange: (e) => {
+                                            setTableSearchQuery(e);
+                                            setDisplayedTableData(allTableData.filter((table) => table.tableName
+                                                .toLowerCase()
+                                                .includes(e.toLowerCase().trim())));
+                                        }, value: tableSearchQuery, id: 'edit-name', width: "100%" }) }), (0, jsx_runtime_1.jsx)(react_3.SchemaListComponent, { schema: displayedTableData, theme: state.theme, LoadingComponent: LoadingComponent, loading: schemaIsLoading, width: '400px' })] }), (0, jsx_runtime_1.jsxs)("div", { style: {
+                                display: 'flex',
+                                gap: 20,
+                                flexDirection: 'column',
+                                width: 'calc(100% - 250px)',
+                                height: '100%',
+                                overflowX: 'hidden',
+                                paddingRight: '24px',
+                            }, children: [(0, jsx_runtime_1.jsxs)("div", { style: {
+                                        display: 'flex',
+                                        flexDirection: 'row',
+                                        alignItems: 'flex-start',
+                                        justifyContent: 'space-between',
+                                        gap: 20,
+                                        width: '100%',
+                                    }, children: [(0, jsx_runtime_1.jsx)(TextInput, { onChange: (e) => {
+                                                setAIPrompt(e);
+                                            }, placeholder: 'Describe a query...', value: aiPrompt, id: 'ai-prompt', width: '95%' }), (0, jsx_runtime_1.jsx)(Button, { label: askAIButton, onClick: handleRunSqlPrompt, width: "100px" })] }), (0, jsx_runtime_1.jsx)(SqlTextEditor_1.default, { value: editViewQuery, setValue: (e) => {
+                                        setErrorInfo({ show: false, message: '' });
+                                        setEditViewQuery(e);
+                                    } }), (0, jsx_runtime_1.jsx)("div", { style: { width: '200px' }, children: (0, jsx_runtime_1.jsx)(Button, { label: runQueryButtonLabel, onClick: handleRunQuery }) }), errorInfo.show ? ((0, jsx_runtime_1.jsx)("div", { style: {
+                                        fontSize: 15,
+                                        fontWeight: '400',
+                                    }, 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 }) })) : null, isLoading && ((0, jsx_runtime_1.jsx)("div", { style: {
+                                        height: 'calc(100vh - 589px)',
+                                        width: '100%',
+                                        display: 'flex',
+                                        justifyContent: 'center',
+                                        alignItems: 'center',
+                                    }, children: (0, jsx_runtime_1.jsx)(LoadingComponent, {}) })), tableData && ((0, jsx_runtime_1.jsx)(TableComponent, { rows: tableData.rows, columns: tableData.fields, height: "360px" })), viewAddable && ((0, jsx_runtime_1.jsx)("div", { style: { width: '200px' }, children: (0, jsx_runtime_1.jsx)(Button, { label: `${initialSqlView ? 'Save changes' : 'Create view'}`, onClick: () => addEditSqlView(false) }) }))] })] }), (0, jsx_runtime_1.jsx)(CreateSqlViews_1.ForeignKeyModal, { isOpen: showFKModal, setIsOpen: setShowFKModal, override: addEditSqlView, foreignKey: state.client.customerFieldName, tableName: state.client.customerTableName })] }) }));
+}
+exports.default = CreateEditSqlView;

package/dist/cjs/modals/NewDashboardModal.js

@@ -26,7 +26,7 @@ function NewDashboardModal({ isOpen, client, setIsOpen, onSave, ModalComponent,
     const [selectedTable, setSelectedTable] = (0, react_1.useState)(null);
     const [field, setField] = (0, react_1.useState)('');
     (0, react_1.useEffect)(() => {
-        if (state.tables.length) {
+        if (state.tables?.length) {
             setSelectedTable(state.tables[0]);
             setField(state.tables[0].columns.map((elem) => elem.name)[0]);
         }

package/dist/cjs/public_components/CreateEnvironment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CreateEnvironment.d.ts","sourceRoot":"","sources":["../../../src/public_components/CreateEnvironment.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,aAAa,EAAuB,MAAM,OAAO,CAAC;AAuClE,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,EACxC,0BAA0B,EAC1B,cAAc,GACf,EAAE;IACD,0BAA0B,CAAC,EAAE,MAAM,IAAI,CAAC;IACxC,cAAc,CAAC,EAAE,aAAa,CAAC;CAChC,2CA0LA"}
+{"version":3,"file":"CreateEnvironment.d.ts","sourceRoot":"","sources":["../../../src/public_components/CreateEnvironment.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,aAAa,EAAuB,MAAM,OAAO,CAAC;AAuClE,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,EACxC,0BAA0B,EAC1B,cAAc,GACf,EAAE;IACD,0BAA0B,CAAC,EAAE,MAAM,IAAI,CAAC;IACxC,cAAc,CAAC,EAAE,aAAa,CAAC;CAChC,2CAqMA"}

package/dist/cjs/public_components/CreateEnvironment.js

@@ -1,10 +1,33 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const jsx_runtime_1 = require("react/jsx-runtime");
-const react_1 = require("react");
+const react_1 = __importStar(require("react"));
 const ConnectDatabase_1 = __importDefault(require("../forms/client_onboard/ConnectDatabase"));
 const StepDisplay_1 = __importDefault(require("../components/StepDisplay"));
 const ConnectSchema_1 = __importDefault(require("../forms/client_onboard/ConnectSchema"));
@@ -25,6 +48,7 @@ const header2Style = {
     marginBottom: '6px',
 };
 function CreateEnvironment({ navigateToDashboardManager, containerStyle, }) {
+    const parentRef = react_1.default.useRef(null);
     const { state, dispatch } = (0, AdminProvider_1.useAdmin)();
     const domainName = state.domainName;
     const [createEnvSteps, setCreateEnvSteps] = (0, react_1.useState)({
@@ -44,6 +68,7 @@ function CreateEnvironment({ navigateToDashboardManager, containerStyle, }) {
             open: false,
         },
     });
+    const [clientId, setClientId] = (0, react_1.useState)('');
     const [environmentDetails, setEnvironmentDetails] = (0, react_1.useState)((0, databases_1.getDatabaseConnectionFormat)('PostgreSQL'));
     const [allSchemaInfo, setAllSchemaInfo] = (0, react_1.useState)(undefined);
     const [initialError, setInitialError] = (0, react_1.useState)();
@@ -75,7 +100,7 @@ function CreateEnvironment({ navigateToDashboardManager, containerStyle, }) {
             console.warn('navigateToDashboardManager is undefined');
         }
     }, [navigateToDashboardManager]);
-    return ((0, jsx_runtime_1.jsxs)("div", { style: {
+    return ((0, jsx_runtime_1.jsxs)("div", { ref: parentRef, style: {
             ...containerStyle,
             display: 'flex',
             flexDirection: 'column',
@@ -89,22 +114,23 @@ function CreateEnvironment({ navigateToDashboardManager, containerStyle, }) {
                     borderRadius: 6,
                     border: '1px solid #e7e7e7',
                     boxShadow: '0px 1px 12px rgba(0, 0, 0, 0.07)',
-                }, header1Style: header1Style, header2Style: header2Style, environmentDetails: environmentDetails, setEnvironmentDetails: (connectionInfo, initialSchemaRequest, initialSchemaRequestError) => {
+                }, header1Style: header1Style, header2Style: header2Style, environmentDetails: environmentDetails, setEnvironmentDetails: (connectionInfo, initialSchemaRequest, initialSchemaRequestError, clientId) => {
                     setEnvironmentDetails(connectionInfo);
                     if (initialSchemaRequestError) {
                         setInitialError(initialSchemaRequestError);
                     }
                     if (initialSchemaRequest) {
+                        setClientId(clientId);
                         setAllSchemaInfo(initialSchemaRequest);
                     }
                     const updatedSteps = { ...createEnvSteps };
                     updatedSteps.connectDB.completed = true;
                     setCreateEnvSteps(updatedSteps);
                     openStep('connectSchema');
-                } })) : ((0, jsx_runtime_1.jsx)(StepDisplay_1.default, { label: "Connect Database", completed: createEnvSteps.connectDB.completed, header1Style: header1Style, onClick: () => {
+                }, envClientId: clientId })) : ((0, jsx_runtime_1.jsx)(StepDisplay_1.default, { label: "Connect Database", completed: createEnvSteps.connectDB.completed, header1Style: header1Style, onClick: () => {
                     openStep('connectDB');
                     setInitialError(undefined);
-                } })), createEnvSteps.connectSchema.open ? ((0, jsx_runtime_1.jsx)(ConnectSchema_1.default, { containerStyle: {
+                } })), createEnvSteps.connectSchema.open ? ((0, jsx_runtime_1.jsx)(ConnectSchema_1.default, { parentRef: parentRef, containerStyle: {
                     padding: '24px',
                     // width: '50%',
                     borderRadius: 6,
@@ -114,12 +140,12 @@ function CreateEnvironment({ navigateToDashboardManager, containerStyle, }) {
                 }, header1Style: header1Style, header2Style: header2Style, propogateSchemaDetails: async (schemaDetails) => {
                     const updatedSteps = { ...createEnvSteps };
                     updatedSteps.connectSchema.completed = true;
-                    const tableSchemas = await (0, ConnectionClient_1.getTableSchema)((0, databases_1.formConnectionString)(environmentDetails), schemaDetails?.tables);
+                    const tableSchemas = await (0, ConnectionClient_1.getTableSchema)(clientId, schemaDetails?.tables, schemaDetails?.selectedFields?.schema);
                     setColumnsByTable(tableSchemas);
                     setCreateEnvSteps(updatedSteps);
                     setAllSchemaInfo(schemaDetails);
                     openStep('createSQLViews');
-                }, allSchemaInfo: allSchemaInfo, environmentDetails: environmentDetails, initialError: initialError })) : ((0, jsx_runtime_1.jsx)(StepDisplay_1.default, { label: "Connect Schema", completed: createEnvSteps.connectSchema.completed, header1Style: header1Style, onClick: () => {
+                }, allSchemaInfo: allSchemaInfo, environmentDetails: environmentDetails, initialError: initialError, clientId: clientId })) : ((0, jsx_runtime_1.jsx)(StepDisplay_1.default, { label: "Connect Schema", completed: createEnvSteps.connectSchema.completed, header1Style: header1Style, onClick: () => {
                     openStep('connectSchema');
                     setInitialError(undefined);
                 } })), createEnvSteps.createSQLViews.open ? ((0, jsx_runtime_1.jsx)(CreateSqlViews_1.default, { containerStyle: {
@@ -136,6 +162,6 @@ function CreateEnvironment({ navigateToDashboardManager, containerStyle, }) {
                     if (navigateToDashboardManager) {
                         navigateToDashboardManager();
                     }
-                }, domainName: domainName })) : ((0, jsx_runtime_1.jsx)(StepDisplay_1.default, { label: "Create SQL Views", completed: false, header1Style: header1Style }))] }));
+                }, domainName: domainName, clientId: clientId, state: state })) : ((0, jsx_runtime_1.jsx)(StepDisplay_1.default, { label: "Create SQL Views", completed: false, header1Style: header1Style }))] }));
 }
 exports.default = CreateEnvironment;

package/dist/cjs/public_components/DashboardBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DashboardBuilder.d.ts","sourceRoot":"","sources":["../../../src/public_components/DashboardBuilder.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAwC,MAAM,OAAO,CAAC;AAQ5E,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,0BAA0B,EAC1B,cAAc,EACd,SAAgB,GACjB,EAAE;IACD,0BAA0B,CAAC,EAAE,MAAM,IAAI,CAAC;IACxC,cAAc,CAAC,EAAE,aAAa,CAAC;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,2CAmSA"}
+{"version":3,"file":"DashboardBuilder.d.ts","sourceRoot":"","sources":["../../../src/public_components/DashboardBuilder.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAwC,MAAM,OAAO,CAAC;AAS5E,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,0BAA0B,EAC1B,cAAc,EACd,SAAgB,GACjB,EAAE;IACD,0BAA0B,CAAC,EAAE,MAAM,IAAI,CAAC;IACxC,cAAc,CAAC,EAAE,aAAa,CAAC;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,2CA0TA"}

package/dist/cjs/public_components/DashboardBuilder.js

@@ -11,6 +11,7 @@ const components_1 = require("../components");
 const react_2 = require("@quillsql/react");
 const constants_1 = require("../utils/constants");
 const Banner_1 = __importDefault(require("../components/Banner"));
+const DatabaseMismatchCard_1 = __importDefault(require("../components/DatabaseMismatchCard"));
 function DashboardBuilder({ navigateToDashboardManager, containerStyle, sqlEditor = true, }) {
     const parentRef = (0, react_1.useRef)(null);
     const { state, dispatch } = (0, AdminProvider_1.useAdmin)();
@@ -55,22 +56,30 @@ function DashboardBuilder({ navigateToDashboardManager, containerStyle, sqlEdito
     }, [state.activeQuery]);
     (0, react_1.useEffect)(() => {
         let isSubscribed = true;
-        async function getCustomers() {
+        async function getDashNames() {
             // If you need to retrieve the JSON data from the response:
-            const response2 = await fetch(`${constants_1.QUILL_SERVER}/dashnames/${state.client._id}/`, {
-                method: 'GET',
+            const response = await fetch(`${state.queryEndpoint}`, {
+                method: 'POST',
                 headers: {
-                    Authorization: `Bearer `,
-                    environment: state.environment,
+                    ...state.queryHeaders,
+                    'Content-Type': 'application/json',
                 },
+                body: JSON.stringify({
+                    metadata: {
+                        clientId: state.client._id,
+                        publicKey: state.client._id,
+                        task: 'dashboards',
+                        databaseType: state.client.databaseType,
+                    },
+                }),
             });
-            const response2Data = await response2.json();
-            const dashNames = response2Data.dashboardNames.filter((elem) => elem !== null);
+            const data = await response.json();
+            const dashNames = data.data.dashboardNames.filter((elem) => elem !== null);
             setDashboardNames(dashNames);
             setSelectedDashboardName(dashNames[0]);
         }
         if (isSubscribed) {
-            getCustomers();
+            getDashNames();
         }
         return () => {
             isSubscribed = false;
@@ -171,28 +180,33 @@ function DashboardBuilder({ navigateToDashboardManager, containerStyle, sqlEdito
                                             userSelect: 'none',
                                         }, children: "Environment" }), (0, jsx_runtime_1.jsx)(components_1.EnvSelectPopover, { setEnvironment: (env) => {
                                             dispatch({ type: 'SET_ENVIRONMENT', payload: env });
-                                        }, environment: state.environment, clients: state.clients, client: state.client, setClient: (client) => dispatch({ type: 'SET_CLIENT', payload: client }), theme: state.theme, showPromote: false })] }), (0, jsx_runtime_1.jsx)(components_1.OrgSelect, { environment: state.environment, setEnvironment: (env) => {
+                                        }, environment: state.environment, clients: state.clients, client: state.client, setClient: (client) => dispatch({ type: 'SET_CLIENT', payload: client }), theme: state.theme, showPromote: false })] }), !state.databaseTypeMismatch.show && ((0, jsx_runtime_1.jsx)(components_1.OrgSelect, { environment: state.environment, setEnvironment: (env) => {
                                     dispatch({ type: 'SET_ENVIRONMENT', payload: env });
                                 }, organizations: state.organizations, organizationId: state.organizationId, setOrganizationId: (orgId) => {
                                     dispatch({ type: 'SET_ORGANIZATION_ID', payload: orgId });
-                                }, theme: state.theme, parentRef: parentRef })] }) }), isEditActive && ((0, jsx_runtime_1.jsx)(Banner_1.default, { onExit: () => {
+                                }, theme: state.theme, parentRef: parentRef }))] }) }), isEditActive && ((0, jsx_runtime_1.jsx)(Banner_1.default, { onExit: () => {
                         const msg = 'Are you sure you want to exit edit mode? Your changes will not be saved.';
                         if (!confirm(msg))
                             return;
                         dispatch({ type: 'SET_ACTIVE_QUERY', payload: '' });
                         dispatch({ type: 'SET_ACTIVE_EDIT_ITEM', payload: null });
-                    } })), sqlEditor && ((0, jsx_runtime_1.jsx)(react_2.SQLEditor, { chartBuilderEnabled: true, showAccessControlOptions: true, showDateFieldOptions: true, showTableFormatOptions: true, defaultQuery: query, isEditMode: !!state.activeQuery, addToDashboardButtonLabel: state.activeQuery ? 'Save changes' : 'Add to dashboard', chartBuilderTitle: state.activeQuery ? 'Save changes' : 'Add to dashboard', dashboardItem: state.activeQuery ? state.activeEditItem : undefined, onAddToDashboardComplete: () => {
+                    } })), state.databaseTypeMismatch.show && ((0, jsx_runtime_1.jsx)(DatabaseMismatchCard_1.default, { environemntName: state.client.name, environemntDatabaseType: state.client.databaseType, backendDatabaseType: state.databaseTypeMismatch.backendDatabaseType })), sqlEditor && !state.databaseTypeMismatch.show && ((0, jsx_runtime_1.jsx)(react_2.SQLEditor, { chartBuilderEnabled: true, showAccessControlOptions: true, showDateFieldOptions: true, showTableFormatOptions: true, defaultQuery: query, isEditMode: !!state.activeQuery, addToDashboardButtonLabel: state.activeQuery ? 'Save changes' : 'Add to dashboard', chartBuilderTitle: state.activeQuery ? 'Save changes' : 'Add to dashboard', dashboardItem: state.activeQuery ? state.activeEditItem : undefined, onAddToDashboardComplete: () => {
                         dispatch({ type: 'SET_ACTIVE_QUERY', payload: '' });
                         dispatch({ type: 'SET_ACTIVE_EDIT_ITEM', payload: null });
                         if (state.navigateToDashboardManager) {
-                            dispatch({ type: 'SET_ACTIVE_COMPONENT', payload: 'Dashboards' });
+                            dispatch({
+                                type: 'SET_ACTIVE_COMPONENT',
+                                payload: 'Dashboards',
+                            });
                             state.navigateToDashboardManager();
                         }
                     }, containerStyle: {
-                        height: 'calc(100% - 138px)',
+                        height: 'calc(100% - 96px)',
                         width: '100%',
-                        paddingRight: 25,
-                        paddingTop: 25,
-                    } }))] }) }));
+                        // paddingRight: 25,
+                        // paddingTop: 25,
+                    }, organizationName: state.organizations.find((org) => {
+                        return (org.id && String(org.id) === String(state.organizationId));
+                    })?.name }))] }) }));
 }
 exports.default = DashboardBuilder;

package/dist/cjs/public_components/DashboardManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DashboardManager.d.ts","sourceRoot":"","sources":["../../../src/public_components/DashboardManager.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAA+B,MAAM,OAAO,CAAC;AA+BnE,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,0BAA0B,EAC1B,cAAc,GACf,EAAE;IACD,0BAA0B,CAAC,EAAE,MAAM,IAAI,CAAC;IACxC,cAAc,CAAC,EAAE,aAAa,CAAC;CAChC,2CA+iBA"}
+{"version":3,"file":"DashboardManager.d.ts","sourceRoot":"","sources":["../../../src/public_components/DashboardManager.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAA+B,MAAM,OAAO,CAAC;AAgCnE,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EACvC,0BAA0B,EAC1B,cAAc,GACf,EAAE;IACD,0BAA0B,CAAC,EAAE,MAAM,IAAI,CAAC;IACxC,cAAc,CAAC,EAAE,aAAa,CAAC;CAChC,2CAykBA"}