@quillsql/admin 1.3.7 → 1.3.9

package/dist/esm/public_components/DashboardManager.js

@@ -1,4 +1,4 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useEffect, useRef, useState } from 'react';
 import { useAdmin } from '../AdminProvider';
 import { OrgSelect, EnvSelectPopover, DashboardSelectPopover, } from '../components';
@@ -9,9 +9,11 @@ import { ButtonPrimitive, HeaderPrimitive, ModalPrimitive, SecondaryButtonPrimit
 import { NewDashboardModal } from '../modals/NewDashboardModal';
 import { QUILL_SERVER } from '../utils/constants';
 import EmptyDashboardComponent from '../components/EmptyDashboardComponent';
+import DatabaseMismatchCard from '../components/DatabaseMismatchCard';
 export default function DashboardManager({ navigateToDashboardBuilder, containerStyle, }) {
     const { state, dispatch } = useAdmin();
     const parentRef = useRef(null);
+    const [initialLoad, setInitialLoad] = useState(true);
     const [dashboards, setDashboards] = useState([]);
     const [reloadFlag, setReloadFlag] = useState(false);
     const [selectedEditDashboard, setSelectedEditDashboard] = useState('');
@@ -36,20 +38,28 @@ export default function DashboardManager({ navigateToDashboardBuilder, container
         }
     }, [reloadFlag]);
     async function getDashNames() {
-        const url = `${QUILL_SERVER}/dashnames/${state.client._id}/`;
-        const response2 = await fetch(url, {
-            method: 'GET',
+        const response = await fetch(`${state.queryEndpoint}`, {
+            method: 'POST',
             headers: {
-                Authorization: 'Bearer ', // Ensure you append your token after 'Bearer ' if needed
-                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,
+                },
+            }),
         });
         // If you need to retrieve the JSON data from the response:
-        const data = await response2.json();
-        if (!data.dashboardNames || !data.dashboardNames.length) {
+        const data = await response.json();
+        setInitialLoad(false);
+        if (!data.data.dashboardNames || !data.data.dashboardNames.length) {
             return;
         }
-        const dashNames = data.dashboardNames.map((elem) => {
+        const dashNames = data.data.dashboardNames.map((elem) => {
             if (!elem) {
                 return { name: 'null' };
             }
@@ -99,16 +109,13 @@ export default function DashboardManager({ navigateToDashboardBuilder, container
                         ...state.queryHeaders,
                         'Content-Type': 'application/json',
                     },
-                    body: JSON.stringify({
-                        metadata: state.organizationId
-                            ? {
-                                orgId: state.organizationId,
-                                task: 'config',
-                                name: dashboard,
-                                clientId: state.client._id,
-                            }
-                            : { task: 'config', name: dashboard, clientId: state.client._id },
-                    }),
+                    body: JSON.stringify({ metadata: {
+                            orgId: state.organizationId || '*',
+                            task: 'config',
+                            name: dashboard,
+                            clientId: state.client._id,
+                            databaseType: state.client.databaseType,
+                        } }),
                     credentials: state.withCredentials ? 'include' : 'omit', // If withCredentials is true, set to 'include'. Otherwise, set to 'omit'.
                 });
                 responseData = (await response.json()).data;
@@ -117,7 +124,7 @@ export default function DashboardManager({ navigateToDashboardBuilder, container
                 const url = new URL(`${QUILL_SERVER}/dashconfig`);
                 // Setting the search parameters for the URL
                 url.search = new URLSearchParams({
-                    orgId: state.organizationId ? state.organizationId : '',
+                    orgId: state.organizationId,
                     publicKey: state.client._id,
                     name: dashboard,
                 }).toString();
@@ -161,7 +168,7 @@ export default function DashboardManager({ navigateToDashboardBuilder, container
                         display: 'flex',
                         position: 'sticky',
                         backgroundColor: 'white',
-                        zIndex: 1,
+                        zIndex: 3,
                         left: 0,
                         right: 0,
                         top: 0,
@@ -222,91 +229,94 @@ export default function DashboardManager({ navigateToDashboardBuilder, container
                                                     color: state.theme.secondaryTextColor,
                                                     fontFamily: state.theme.fontFamily,
                                                     userSelect: 'none',
-                                                }, children: "Environment" }), _jsx(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: true, handlePromote: () => setIsPromoteDashModalOpen(true) })] })] }), !!state.dashboards.length && (_jsx(OrgSelect, { parentRef: parentRef, environment: state.environment, setEnvironment: (env) => dispatch({ type: 'SET_ENVIRONMENT', payload: env }), organizations: state.organizations, theme: state.theme, organizationId: state.organizationId, setOrganizationId: (id) => dispatch({ type: 'SET_ORGANIZATION_ID', payload: id }) }))] }) }), _jsxs("div", { style: { display: 'inline-block' }, children: [!state.dashboards.length && (_jsx("div", { style: {
-                                width: '100%',
-                                display: 'flex',
-                                flexDirection: 'column',
-                                alignItems: 'center',
-                            }, children: _jsxs("div", { style: {
-                                    height: 80,
-                                    width: 260,
-                                    borderRadius: 6,
-                                    marginTop: 100,
-                                    display: 'flex',
-                                    flexDirection: 'column',
-                                    alignItems: 'center',
-                                    justifyContent: 'center',
-                                    gap: 20,
-                                }, className: "hover-dash-rect", onClick: () => {
-                                    setNewDashboardModalIsOpen(true);
-                                }, children: [_jsx("style", { children: ` .hover-dash-rect { background: white; border: 1px dashed #e7e7e7; } .hover-dash-rect:hover { background: white; box-shadow: 0px 1px 24px 0px rgba(0, 0, 0, 0.07); border: 1px solid #e7e7e7; } ` }), _jsxs("div", { style: {
+                                                }, children: "Environment" }), _jsx(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: true, handlePromote: () => setIsPromoteDashModalOpen(true) })] })] }), !!state.dashboards.length && !state.databaseTypeMismatch.show && (_jsx(OrgSelect, { parentRef: parentRef, environment: state.environment, setEnvironment: (env) => dispatch({ type: 'SET_ENVIRONMENT', payload: env }), organizations: state.organizations, theme: state.theme, organizationId: state.organizationId, setOrganizationId: (id) => dispatch({ type: 'SET_ORGANIZATION_ID', payload: id }) }))] }) }), state.databaseTypeMismatch.show ? (_jsx(DatabaseMismatchCard, { environemntName: state.client.name, environemntDatabaseType: state.client.databaseType, backendDatabaseType: state.databaseTypeMismatch.backendDatabaseType })) : (_jsxs(_Fragment, { children: [_jsxs("div", { style: { display: 'inline-block' }, children: [!state.dashboards.length && !initialLoad && (_jsx("div", { style: {
+                                        width: '100%',
+                                        display: 'flex',
+                                        flexDirection: 'column',
+                                        alignItems: 'center',
+                                    }, children: _jsxs("div", { style: {
+                                            height: 80,
+                                            width: 260,
+                                            borderRadius: 6,
+                                            marginTop: 100,
                                             display: 'flex',
-                                            flexDirection: 'row',
+                                            flexDirection: 'column',
                                             alignItems: 'center',
                                             justifyContent: 'center',
-                                            width: 260,
-                                        }, children: [_jsxs("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 24 24", fill: "#565656", height: 26, width: 26, children: [_jsx("path", { fillRule: "evenodd", d: "M2.25 13.5a8.25 8.25 0 0 1 8.25-8.25.75.75 0 0 1 .75.75v6.75H18a.75.75 0 0 1 .75.75 8.25 8.25 0 0 1-16.5 0Z", clipRule: "evenodd" }), _jsx("path", { fillRule: "evenodd", d: "M12.75 3a.75.75 0 0 1 .75-.75 8.25 8.25 0 0 1 8.25 8.25.75.75 0 0 1-.75.75h-7.5a.75.75 0 0 1-.75-.75V3Z", clipRule: "evenodd" })] }), _jsx("div", { style: {
-                                                    fontSize: 14,
-                                                    fontWeight: 500,
-                                                    color: '#565656',
-                                                    // border: '1px solid #e7e7e7',
-                                                    paddingTop: 8,
-                                                    paddingBottom: 8,
-                                                    paddingRight: 12,
-                                                    paddingLeft: 12,
-                                                    borderRadius: 4,
-                                                    cursor: 'pointer',
-                                                }, className: "quill-hover-button", children: "Create new dashboard" })] })] }) })), reloadFlag ? null : (_jsx(Dashboard, { name: state.selectedDashboard, containerStyle: {
-                                paddingRight: 25,
-                                paddingLeft: 25,
-                                paddingTop: 30,
-                            }, onClickDashboardItem: (elem) => {
-                                dispatch({ type: 'SET_REPORT_ID', payload: elem._id });
-                                dispatch({ type: 'SET_ACTIVE_COMPONENT', payload: 'Report' });
-                            }, EmptyDashboardComponent: EmptyDashboardComponent }))] }), _jsx(EditDashboardsModal, { clientId: state.client._id, isOpen: isEditDashboardModalOpen, setIsOpen: setIsEditDashboardModalOpen, ModalComponent: ModalPrimitive, ButtonComponent: ButtonPrimitive, SecondaryButtonComponent: SecondaryButtonPrimitive, TextInputComponent: TextInputPrimitive, openEditFilterModal: (dashboardName) => {
-                        dispatch({
-                            type: 'SET_SELECTED_EDIT_DASHBOARD',
-                            payload: dashboardName,
-                        });
-                        setEditFilterModalIsOpen(true);
-                        // setIsEditDashboardModalOpen(false);
-                    }, openAddDashboardModal: () => {
-                        setIsAddDashboardModalOpen(true);
-                        // setIsEditDashboardModalOpen(false);
-                    }, openEditOrderModal: (dashboardName) => {
-                        setSelectedReorderDashboard(dashboardName);
-                        setIsReorderDashboardModalOpen(true);
-                    }, HeaderComponent: HeaderPrimitive, setDashboardData: setDashboardData, dashboards: state.dashboards, getDashNames: getDashNames }), _jsx(PromoteDashModal, { clientId: state.client._id, client: state.client, clients: state.clients, isOpen: isPromoteDashModalOpen, setIsOpen: setIsPromoteDashModalOpen, ModalComponent: ModalPrimitive, dashboards: state.dashboards, selectedDashboard: state.selectedDashboard, theme: state.theme, ButtonComponent: ButtonPrimitive }), _jsx(EditFiltersModal, { selectedDashboard: state.selectedDashboard, dashboardData: state.editDashboardData, isOpen: editFilterModalIsOpen, setIsOpen: setEditFilterModalIsOpen, openAddFilterModal: () => {
-                        setAddFilterModalIsOpen(true);
-                        // setEditFilterModalIsOpen(false);
-                    }, openEditOrderModal: (dashboardName) => {
-                        setSelectedReorderDashboard(dashboardName);
-                        setIsReorderDashboardModalOpen(true);
-                    }, onSave: async () => {
-                        await getDashNames();
-                        setReloadFlag(true);
-                        reloadDashboard();
-                    }, client: state.client, ModalComponent: ModalPrimitive, ButtonComponent: ButtonPrimitive, SecondaryButtonComponent: SecondaryButtonPrimitive, TextInputComponent: TextInputPrimitive, HeaderComponent: HeaderPrimitive, SelectComponent: SelectPrimitive, dashNames: state.dashboards, setSelectedEditDashboard: (d) => dispatch({ type: 'SET_SELECTED_EDIT_DASHBOARD', payload: d }) }), _jsx(NewDashboardModal, { isOpen: newDashboardModalIsOpen, setIsOpen: setNewDashboardModalIsOpen, openEditOrderModal: (dashboardName) => {
-                        setSelectedReorderDashboard(dashboardName);
-                        setIsReorderDashboardModalOpen(true);
-                    }, onSave: (name) => {
-                        dispatch({ type: 'SET_SELECTED_DASHBOARD', payload: name });
-                        dispatch({
-                            type: 'SET_DASHBOARDS',
-                            payload: [...state.dashboards, { name }],
-                        });
-                        setReloadFlag(true);
-                        reloadDashboard();
-                    }, client: state.client, ModalComponent: ModalPrimitive, ButtonComponent: ButtonPrimitive, SecondaryButtonComponent: SecondaryButtonPrimitive, TextInputComponent: TextInputPrimitive, HeaderComponent: HeaderPrimitive, SelectComponent: SelectPrimitive, dashNames: state.dashboards, setSelectedEditDashboard: (d) => dispatch({ type: 'SET_SELECTED_EDIT_DASHBOARD', payload: d }) }), _jsx(ReorderDashboardModal, { organizationId: state.organizationId, isOpen: isReorderDashboardModalOpen, client: state.client, onSave: () => {
-                        setReloadFlag(true);
-                        reloadDashboard();
-                    }, setIsOpen: setIsReorderDashboardModalOpen, ModalComponent: ModalPrimitive, ButtonComponent: ButtonPrimitive, selectedDashboard: selectedReorderDashboard }), _jsx(AddFilterModal, { selectedDashboard: state.selectedEditDashboard, isOpen: addFilterModalIsOpen, setIsOpen: setAddFilterModalIsOpen, client: state.client, ModalComponent: ModalPrimitive, TextInputComponent: TextInputPrimitive, SelectComponent: SelectPrimitive, HeaderComponent: HeaderPrimitive, ButtonComponent: ButtonPrimitive, openAddDashboardModal: () => {
-                        setIsAddDashboardModalOpen(true);
-                        // setAddFilterModalIsOpen(false);
-                    } }), _jsx(AddDashboardModal, { selectedDashboard: state.selectedDashboard, isOpen: isAddDashboardModalOpen, setIsOpen: setIsAddDashboardModalOpen, client: state.client, ModalComponent: ModalPrimitive, TextInputComponent: TextInputPrimitive, SelectComponent: SelectPrimitive, HeaderComponent: HeaderPrimitive, ButtonComponent: ButtonPrimitive, dashNames: state.dashboards, 
-                    // @ts-ignore
-                    openAddFilterModal: () => {
-                        setAddFilterModalIsOpen(true);
-                        // setIsAddDashboardModalOpen(false);
-                    }, organizationId: state.organizationId, getDashNames: getDashNames })] }) }));
+                                            gap: 20,
+                                        }, className: "hover-dash-rect", onClick: () => {
+                                            setNewDashboardModalIsOpen(true);
+                                        }, children: [_jsx("style", { children: ` .hover-dash-rect { background: white; border: 1px dashed #e7e7e7; } .hover-dash-rect:hover { background: white; box-shadow: 0px 1px 24px 0px rgba(0, 0, 0, 0.07); border: 1px solid #e7e7e7; } ` }), _jsxs("div", { style: {
+                                                    display: 'flex',
+                                                    flexDirection: 'row',
+                                                    alignItems: 'center',
+                                                    justifyContent: 'center',
+                                                    width: 260,
+                                                }, children: [_jsxs("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 24 24", fill: "#565656", height: 26, width: 26, children: [_jsx("path", { fillRule: "evenodd", d: "M2.25 13.5a8.25 8.25 0 0 1 8.25-8.25.75.75 0 0 1 .75.75v6.75H18a.75.75 0 0 1 .75.75 8.25 8.25 0 0 1-16.5 0Z", clipRule: "evenodd" }), _jsx("path", { fillRule: "evenodd", d: "M12.75 3a.75.75 0 0 1 .75-.75 8.25 8.25 0 0 1 8.25 8.25.75.75 0 0 1-.75.75h-7.5a.75.75 0 0 1-.75-.75V3Z", clipRule: "evenodd" })] }), _jsx("div", { style: {
+                                                            fontSize: 14,
+                                                            fontWeight: 500,
+                                                            color: '#565656',
+                                                            // border: '1px solid #e7e7e7',
+                                                            paddingTop: 8,
+                                                            paddingBottom: 8,
+                                                            paddingRight: 12,
+                                                            paddingLeft: 12,
+                                                            borderRadius: 4,
+                                                            cursor: 'pointer',
+                                                        }, className: "quill-hover-button", children: "Create new dashboard" })] })] }) })), reloadFlag ? null : (_jsx(Dashboard, { name: state.selectedDashboard, containerStyle: {
+                                        paddingRight: 25,
+                                        paddingLeft: 25,
+                                        paddingTop: 30,
+                                    }, onClickDashboardItem: (elem) => {
+                                        dispatch({ type: 'SET_REPORT_ID', payload: elem._id });
+                                        dispatch({
+                                            type: 'SET_ACTIVE_COMPONENT',
+                                            payload: 'Report',
+                                        });
+                                    }, EmptyDashboardComponent: EmptyDashboardComponent }))] }), _jsx(EditDashboardsModal, { clientId: state.client._id, isOpen: isEditDashboardModalOpen, setIsOpen: setIsEditDashboardModalOpen, ModalComponent: ModalPrimitive, ButtonComponent: ButtonPrimitive, SecondaryButtonComponent: SecondaryButtonPrimitive, TextInputComponent: TextInputPrimitive, openEditFilterModal: (dashboardName) => {
+                                dispatch({
+                                    type: 'SET_SELECTED_EDIT_DASHBOARD',
+                                    payload: dashboardName,
+                                });
+                                setEditFilterModalIsOpen(true);
+                                // setIsEditDashboardModalOpen(false);
+                            }, openAddDashboardModal: () => {
+                                setIsAddDashboardModalOpen(true);
+                                // setIsEditDashboardModalOpen(false);
+                            }, openEditOrderModal: (dashboardName) => {
+                                setSelectedReorderDashboard(dashboardName);
+                                setIsReorderDashboardModalOpen(true);
+                            }, HeaderComponent: HeaderPrimitive, setDashboardData: setDashboardData, dashboards: state.dashboards, getDashNames: getDashNames }), _jsx(PromoteDashModal, { clientId: state.client._id, client: state.client, clients: state.clients, isOpen: isPromoteDashModalOpen, setIsOpen: setIsPromoteDashModalOpen, ModalComponent: ModalPrimitive, dashboards: state.dashboards, selectedDashboard: state.selectedDashboard, theme: state.theme, ButtonComponent: ButtonPrimitive }), _jsx(EditFiltersModal, { selectedDashboard: state.selectedDashboard, dashboardData: state.editDashboardData, isOpen: editFilterModalIsOpen, setIsOpen: setEditFilterModalIsOpen, openAddFilterModal: () => {
+                                setAddFilterModalIsOpen(true);
+                                // setEditFilterModalIsOpen(false);
+                            }, openEditOrderModal: (dashboardName) => {
+                                setSelectedReorderDashboard(dashboardName);
+                                setIsReorderDashboardModalOpen(true);
+                            }, onSave: async () => {
+                                await getDashNames();
+                                setReloadFlag(true);
+                                reloadDashboard();
+                            }, client: state.client, ModalComponent: ModalPrimitive, ButtonComponent: ButtonPrimitive, SecondaryButtonComponent: SecondaryButtonPrimitive, TextInputComponent: TextInputPrimitive, HeaderComponent: HeaderPrimitive, SelectComponent: SelectPrimitive, dashNames: state.dashboards, setSelectedEditDashboard: (d) => dispatch({ type: 'SET_SELECTED_EDIT_DASHBOARD', payload: d }) }), _jsx(NewDashboardModal, { isOpen: newDashboardModalIsOpen, setIsOpen: setNewDashboardModalIsOpen, openEditOrderModal: (dashboardName) => {
+                                setSelectedReorderDashboard(dashboardName);
+                                setIsReorderDashboardModalOpen(true);
+                            }, onSave: (name) => {
+                                dispatch({ type: 'SET_SELECTED_DASHBOARD', payload: name });
+                                dispatch({
+                                    type: 'SET_DASHBOARDS',
+                                    payload: [...state.dashboards, { name }],
+                                });
+                                setReloadFlag(true);
+                                reloadDashboard();
+                            }, client: state.client, ModalComponent: ModalPrimitive, ButtonComponent: ButtonPrimitive, SecondaryButtonComponent: SecondaryButtonPrimitive, TextInputComponent: TextInputPrimitive, HeaderComponent: HeaderPrimitive, SelectComponent: SelectPrimitive, dashNames: state.dashboards, setSelectedEditDashboard: (d) => dispatch({ type: 'SET_SELECTED_EDIT_DASHBOARD', payload: d }) }), _jsx(ReorderDashboardModal, { organizationId: state.organizationId, isOpen: isReorderDashboardModalOpen, client: state.client, onSave: () => {
+                                setReloadFlag(true);
+                                reloadDashboard();
+                            }, setIsOpen: setIsReorderDashboardModalOpen, ModalComponent: ModalPrimitive, ButtonComponent: ButtonPrimitive, selectedDashboard: selectedReorderDashboard }), _jsx(AddFilterModal, { selectedDashboard: state.selectedEditDashboard, isOpen: addFilterModalIsOpen, setIsOpen: setAddFilterModalIsOpen, client: state.client, ModalComponent: ModalPrimitive, TextInputComponent: TextInputPrimitive, SelectComponent: SelectPrimitive, HeaderComponent: HeaderPrimitive, ButtonComponent: ButtonPrimitive, openAddDashboardModal: () => {
+                                setIsAddDashboardModalOpen(true);
+                                // setAddFilterModalIsOpen(false);
+                            } }), _jsx(AddDashboardModal, { selectedDashboard: state.selectedDashboard, isOpen: isAddDashboardModalOpen, setIsOpen: setIsAddDashboardModalOpen, client: state.client, ModalComponent: ModalPrimitive, TextInputComponent: TextInputPrimitive, SelectComponent: SelectPrimitive, HeaderComponent: HeaderPrimitive, ButtonComponent: ButtonPrimitive, dashNames: state.dashboards, 
+                            // @ts-ignore
+                            openAddFilterModal: () => {
+                                setAddFilterModalIsOpen(true);
+                                // setIsAddDashboardModalOpen(false);
+                            }, organizationId: state.organizationId, getDashNames: getDashNames })] }))] }) }));
 }

package/dist/esm/public_components/SQLViewManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SQLViewManager.d.ts","sourceRoot":"","sources":["../../../src/public_components/SQLViewManager.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAA+B,MAAM,OAAO,CAAC;AAenE,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EACrC,cAAc,GACf,EAAE;IACD,cAAc,CAAC,EAAE,aAAa,CAAC;CAChC,2CAknBA"}
+{"version":3,"file":"SQLViewManager.d.ts","sourceRoot":"","sources":["../../../src/public_components/SQLViewManager.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAA+B,MAAM,OAAO,CAAC;AA0BnE,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EACrC,cAAc,GACf,EAAE;IACD,cAAc,CAAC,EAAE,aAAa,CAAC;CAChC,2CAqUA"}