@quillsql/admin 1.5.2 → 1.6.1

package/dist/esm/public_components/DashboardBuilder.js

@@ -1,35 +1,18 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useEffect, useMemo, useRef, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { useAdmin } from '../AdminProvider';
-import { convertPostgresColumn } from '../Admin';
 import { EnvSelectPopover, OrgSelect } from '../components';
 import { ReportBuilder, SQLEditor } from '@quillsql/react';
-import { QUILL_SERVER } from '../utils/constants';
 import Banner from '../components/Banner';
 import DatabaseMismatchCard from '../components/DatabaseMismatchCard';
-import { ButtonPrimitive } from '../primitives';
 const modeToggleOptions = ['SQL Editor', 'Report Builder'];
 export default function DashboardBuilder({ navigateToDashboardManager, containerStyle, sqlEditor = true, }) {
     const parentRef = useRef(null);
     const { state, dispatch } = useAdmin();
-    const [customerId, setCustomerId] = useState('');
     const [isEditActive, setIsEditActive] = useState(false);
-    const [checked, setChecked] = useState(false);
-    const [selected, setSelected] = useState('');
-    const [userTyping, setUserTyping] = useState(false);
-    const inputRef = useRef(null);
-    const [filteredOptions, setFilteredOptions] = useState([]);
-    const [sqlPrompt, setSqlPrompt] = useState('');
-    const [dashboardNames, setDashboardNames] = useState([]);
-    const [selectedDashboardName, setSelectedDashboardName] = useState('');
-    const [isOpen, setIsOpen] = useState(false);
     const [query, setQuery] = useState(state.activeQuery);
-    const [rows, setRows] = useState([]);
-    const [columns, setColumns] = useState([]);
-    const [fields, setFields] = useState([]);
-    const [errorMessage, setErrorMessage] = useState('');
-    const [sqlResponseLoading, setSqlResponseLoading] = useState(false);
     const [toggleMode, setToggleMode] = useState('SQL Editor');
+    const [selectedOrgName, setSelectedOrgName] = useState('');
     useEffect(() => {
         if (state.activeQuery) {
             setIsEditActive(true);
@@ -53,75 +36,14 @@ export default function DashboardBuilder({ navigateToDashboardManager, container
         setQuery(state.activeQuery);
     }, [state.activeQuery]);
     useEffect(() => {
-        let isSubscribed = true;
-        async function getDashNames() {
-            // If you need to retrieve the JSON data from the response:
-            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: 'dashboards',
-                        databaseType: state.client.databaseType,
-                    },
-                }),
-            });
-            const data = await response.json();
-            const dashNames = data.data.dashboardNames.filter((elem) => elem !== null);
-            setDashboardNames(dashNames);
-            setSelectedDashboardName(dashNames[0]);
-        }
-        if (isSubscribed) {
-            getDashNames();
-        }
-        return () => {
-            isSubscribed = false;
-        };
-    }, [state.environment]);
-    // const navigate = useNavigate();
-    const handleRunQuery = async () => {
-        const { _id } = state.client;
-        try {
-            const response = await fetch(`${QUILL_SERVER}/dashquery?orgId=${state.organizationId || ''}&publicKey=${_id}`, {
-                method: 'POST',
-                headers: {
-                    Authorization: `Bearer `,
-                    environment: state.environment,
-                    'Content-Type': 'application/json', // Important when sending JSON
-                },
-                body: JSON.stringify({
-                    query,
-                }),
-            });
-            const responseData = await response.json();
-            if (responseData && responseData.errorMessage) {
-                setErrorMessage('Failed to run SQL query: ' + responseData.errorMessage);
-                setRows([]);
-                setColumns([]);
-                setFields([]);
-                return;
-            }
-            setErrorMessage('');
-            setRows(responseData.rows);
-            setColumns(responseData.fields.map((elem) => convertPostgresColumn(elem)));
-            setFields(responseData.fields);
-        }
-        catch (e) {
-            console.log('ERROR: ', e);
-            return;
+        const selectedOrg = state.organizations.find((org) => {
+            const orgId = org.id ? org.id : org.ID;
+            return orgId && String(orgId) === String(state.organizationId);
+        });
+        if (selectedOrg) {
+            setSelectedOrgName(selectedOrg.name ? selectedOrg.name : selectedOrg.NAME);
         }
-    };
-    const handleAddToDashboard = () => {
-        setIsOpen(true);
-    };
-    const newRows = useMemo(() => {
-        return JSON.parse(JSON.stringify(rows));
-    }, [rows]);
+    }, [state.organizations, state.organizationId]);
     /* all your useState and useContext calls and your useEffect hooks */
     // MMTODO: idk if this is needed
     // const handleSetOrganization = (org) => {
@@ -155,7 +77,7 @@ export default function DashboardBuilder({ navigateToDashboardManager, container
                         borderLeftWidth: 0,
                         borderRightWidth: 0,
                         borderStyle: 'solid',
-                        borderColor: state.theme.borderColor,
+                        borderColor: state.theme?.borderColor,
                         paddingBottom: 20,
                         // boxShadow: "0px 1px 4px 0px rgba(0, 0, 0, 0.07)",
                         //   paddingRight: '50px',
@@ -227,42 +149,66 @@ export default function DashboardBuilder({ navigateToDashboardManager, container
                             return;
                         dispatch({ type: 'SET_ACTIVE_QUERY', payload: '' });
                         dispatch({ type: 'SET_ACTIVE_EDIT_ITEM', payload: null });
-                    } })), state.databaseTypeMismatch.show && (_jsx(DatabaseMismatchCard, { environemntName: state.client.name, environemntDatabaseType: state.client.databaseType, backendDatabaseType: state.databaseTypeMismatch.backendDatabaseType })), _jsx("div", { style: {
-                        // Toggle the height of the container so they both stay in the DOM
-                        // and don't refetch when switching back and forth.
-                        height: toggleMode === 'Report Builder' ? '100%' : 0,
-                        overflow: 'hidden',
-                    }, children: _jsx(ReportBuilder, { admin: true, initialTableName: state.tables.length > 0 && state.tables[0].name, 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',
-                                });
-                                state.navigateToDashboardManager();
-                            }
-                        }, organizationName: state.organizations.find((org) => {
-                            return (org.id && String(org.id) === String(state.organizationId));
-                        })?.name }) }), sqlEditor && !state.databaseTypeMismatch.show && (_jsx("div", { style: {
-                        height: toggleMode === 'SQL Editor' ? '100%' : 0,
-                        overflow: 'hidden',
-                    }, children: _jsx(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',
-                                });
-                                state.navigateToDashboardManager();
-                            }
-                        }, containerStyle: {
-                            height: '100%',
-                            width: '100%',
-                            // paddingRight: 25,
-                            // paddingTop: 25,
-                        }, organizationName: state.organizations.find((org) => {
-                            return (org.id && String(org.id) === String(state.organizationId));
-                        })?.name, ButtonComponent: ButtonPrimitive }) }))] }) }));
+                    } })), state.databaseTypeMismatch.show && (_jsx(DatabaseMismatchCard, { environemntName: state.client.name, environemntDatabaseType: state.client.databaseType, backendDatabaseType: state.databaseTypeMismatch.backendDatabaseType })), toggleMode === 'Report Builder' ? (_jsx(ReportBuilder, { isAdminEnabled: true, 
+                    // initialTableName={state.tables.length > 0 && state.tables[0]!.name}
+                    onSubmitCreateReport: (report) => {
+                        const dashboard = state.dashboards.find((dash) => {
+                            return dash.name === report.dashboardName;
+                        });
+                        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_SELECTED_DASHBOARD',
+                                payload: dashboard,
+                            });
+                            state.navigateToDashboardManager();
+                        }
+                    }, onSubmitEditReport: (report) => {
+                        const dashboard = state.dashboards.find((dash) => {
+                            return dash.name === report.dashboardName;
+                        });
+                        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_SELECTED_DASHBOARD',
+                                payload: dashboard,
+                            });
+                            state.navigateToDashboardManager();
+                        }
+                    }, organizationName: selectedOrgName, containerStyle: {
+                        height: '100%',
+                        width: '100%',
+                    } })) : (_jsx(SQLEditor, { isChartBuilderEnabled: true, showAccessControlOptions: true, showDateFieldOptions: true, showTableFormatOptions: true, defaultQuery: query, addToDashboardButtonLabel: state.activeQuery ? 'Save changes' : 'Add to dashboard', chartBuilderTitle: state.activeQuery ? 'Save changes' : 'Add to dashboard', report: state.activeQuery ? state.activeEditItem : undefined, onAddToDashboardComplete: (report) => {
+                        const dashboard = state.dashboards.find((dash) => {
+                            return dash.name === report.dashboardName;
+                        });
+                        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_SELECTED_DASHBOARD',
+                                payload: dashboard,
+                            });
+                            state.navigateToDashboardManager();
+                        }
+                    }, containerStyle: {
+                        height: '100%',
+                        width: '100%',
+                        // paddingRight: 25,
+                        // paddingTop: 25,
+                    }, organizationName: selectedOrgName }))] }) }));
 }

package/dist/esm/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;AAiCnE,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,2CAukBA"}
+{"version":3,"file":"DashboardManager.d.ts","sourceRoot":"","sources":["../../../src/public_components/DashboardManager.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAA+B,MAAM,OAAO,CAAC;AA2BnE,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+hBA"}