@quillsql/admin 1.3.8 → 1.4.0

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

@@ -4,7 +4,7 @@ import { ButtonPrimitive, ModalPrimitive, TextInputPrimitive, } from '../../prim
 import { createSQLView, getQueryFromAiWithConnection, getSqlViewData, } from '../../api/ConnectionClient';
 import SqlViewTile from '../../components/SqlViewTile';
 import SqlTextEditor from '../../components/SqlTextEditor';
-import { Table } from '@quillsql/react';
+import { QuillTable } from '@quillsql/react';
 export default function CreateSQLViews({ containerStyle, header1Style, header2Style, columnsByTable, environmentDetails, allSchemaInfo, domainName, completeOnboarding, clientId, state, }) {
     const [selectedTable, setSelectedTable] = useState(undefined);
     const [queryInfo, setQueryInfo] = useState({
@@ -110,12 +110,10 @@ export default function CreateSQLViews({ containerStyle, header1Style, header2St
                                     paddingLeft: 16,
                                     paddingRight: 16,
                                     height: 'calc(100vh - 515px)',
-                                }, children: [_jsx(Table, { rows: tableData.rows, columns: tableData.fields, 
-                                        // height="400px"
-                                        containerStyle: {
+                                }, children: [_jsx(QuillTable, { rows: tableData.rows, columns: tableData.fields, containerStyle: {
                                             height: 'calc(100vh - 589px)',
                                             width: '100%',
-                                        }, showDownloadCsvButton: false }), _jsxs("div", { style: {
+                                        }, showDownloadCSVButton: true }), _jsxs("div", { style: {
                                             width: '100%',
                                             display: 'flex',
                                             justifyContent: 'space-between',

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { ButtonComponentProps, TableComponentProps, TextInputComponentProps, HeaderProps } from '@quillsql/react';
+import { ButtonComponentProps, TextInputComponentProps, HeaderProps } from '@quillsql/react';
 import { ColumnsByTable } from '../../utils/table';
 interface CreateEditSqlViewProps {
     containerStyle: React.CSSProperties;
@@ -11,7 +11,6 @@ interface CreateEditSqlViewProps {
     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;
@@ -19,6 +18,6 @@ interface CreateEditSqlViewProps {
     allTableData: ColumnsByTable[];
     schemaIsLoading: boolean;
 }
-export default function CreateEditSqlView({ containerStyle, initialSqlView, closeEditView, addEditView, SecondaryButtonComponent, TableComponent, LoadingComponent, Button, TextInput, Header, allTableData, schemaIsLoading, }: CreateEditSqlViewProps): JSX.Element;
+export default function CreateEditSqlView({ containerStyle, initialSqlView, closeEditView, addEditView, SecondaryButtonComponent, LoadingComponent, Button, TextInput, Header, allTableData, schemaIsLoading, }: CreateEditSqlViewProps): JSX.Element;
 export {};
 //# sourceMappingURL=CreateEditSqlView.d.ts.map

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

@@ -1 +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"}
+{"version":3,"file":"CreateEditSqlView.d.ts","sourceRoot":"","sources":["../../../../src/forms/sql_views/CreateEditSqlView.tsx"],"names":[],"mappings":";AAAA,OAAO,EACL,oBAAoB,EAEpB,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,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,gBAA2C,EAC3C,MAAuB,EACvB,SAA6B,EAC7B,MAAuB,EACvB,YAAY,EACZ,eAAe,GAChB,EAAE,sBAAsB,GAAG,GAAG,CAAC,OAAO,CAuStC"}

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

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Table, } from '@quillsql/react';
+import { QuillTable } from '@quillsql/react';
 import { useEffect, useState } from 'react';
 import { useAdmin } from '../../AdminProvider';
 import { getQueryFromAiWithConnection, getSqlViewData, } from '../../api/ConnectionClient';
@@ -8,7 +8,7 @@ import { LoadingSpinner, MemoizedButton, MemoizedHeader, MemoizedTextInput, } fr
 import { SchemaListComponent } from '@quillsql/react';
 import { ForeignKeyModal } from '../client_onboard/CreateSqlViews';
 import DynamicBanner from '../../components/DynamicBanner';
-export default function CreateEditSqlView({ containerStyle, initialSqlView, closeEditView, addEditView, SecondaryButtonComponent, TableComponent = Table, LoadingComponent = () => _jsx(LoadingSpinner, {}), Button = MemoizedButton, TextInput = MemoizedTextInput, Header = MemoizedHeader, allTableData, schemaIsLoading, }) {
+export default function CreateEditSqlView({ containerStyle, initialSqlView, closeEditView, addEditView, SecondaryButtonComponent, LoadingComponent = () => _jsx(LoadingSpinner, {}), Button = MemoizedButton, TextInput = MemoizedTextInput, Header = MemoizedHeader, allTableData, schemaIsLoading, }) {
     const [name, setName] = useState(initialSqlView?.name || '');
     const [editViewQuery, setEditViewQuery] = useState(initialSqlView?.query || '');
     const [ranViewQuery, setRanViewQuery] = useState(initialSqlView?.query || '');
@@ -27,7 +27,7 @@ export default function CreateEditSqlView({ containerStyle, initialSqlView, clos
     const addEditSqlView = async (override = false) => {
         if (!override &&
             tableData &&
-            !tableData.fields.find((col) => col.name === state.client.customerFieldName)) {
+            !tableData.fields.find((col) => col.name === state.client.customerFieldName.replaceAll('"', ''))) {
             setShowFKModal(true);
             return;
         }
@@ -151,5 +151,5 @@ export default function CreateEditSqlView({ containerStyle, initialSqlView, clos
                                         display: 'flex',
                                         justifyContent: 'center',
                                         alignItems: 'center',
-                                    }, children: _jsx(LoadingComponent, {}) })), tableData && (_jsx(TableComponent, { rows: tableData.rows, columns: tableData.fields, height: "360px" })), viewAddable && (_jsx("div", { style: { width: '200px' }, children: _jsx(Button, { label: `${initialSqlView ? 'Save changes' : 'Create view'}`, onClick: () => addEditSqlView(false) }) }))] })] }), _jsx(ForeignKeyModal, { isOpen: showFKModal, setIsOpen: setShowFKModal, override: addEditSqlView, foreignKey: state.client.customerFieldName, tableName: state.client.customerTableName })] }) }));
+                                    }, children: _jsx(LoadingComponent, {}) })), tableData && (_jsx(QuillTable, { rows: tableData.rows, columns: tableData.fields, containerStyle: { height: '360px' } })), viewAddable && (_jsx("div", { style: { width: '200px' }, children: _jsx(Button, { label: `${initialSqlView ? 'Save changes' : 'Create view'}`, onClick: () => addEditSqlView(false) }) }))] })] }), _jsx(ForeignKeyModal, { isOpen: showFKModal, setIsOpen: setShowFKModal, override: addEditSqlView, foreignKey: state.client.customerFieldName, tableName: state.client.customerTableName })] }) }));
 }

package/dist/esm/primitives/TextInputPrimitive.d.ts

@@ -6,6 +6,7 @@ interface TextInputPrimitiveProps {
     placeholder?: string;
     theme?: QuillTheme;
     disabled?: boolean;
+    width?: string;
 }
 declare const TextInputPrimitive: React.FC<TextInputPrimitiveProps>;
 export default TextInputPrimitive;

package/dist/esm/primitives/TextInputPrimitive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TextInputPrimitive.d.ts","sourceRoot":"","sources":["../../../src/primitives/TextInputPrimitive.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAyB,MAAM,UAAU,CAAC;AAE7D,UAAU,uBAAuB;IAC/B,QAAQ,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,QAAA,MAAM,kBAAkB,EAAE,KAAK,CAAC,EAAE,CAAC,uBAAuB,CAkCzD,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"TextInputPrimitive.d.ts","sourceRoot":"","sources":["../../../src/primitives/TextInputPrimitive.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAyB,MAAM,UAAU,CAAC;AAE7D,UAAU,uBAAuB;IAC/B,QAAQ,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,QAAA,MAAM,kBAAkB,EAAE,KAAK,CAAC,EAAE,CAAC,uBAAuB,CAmCzD,CAAC;AAEF,eAAe,kBAAkB,CAAC"}

package/dist/esm/primitives/TextInputPrimitive.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { theme as defaultTheme } from '../Admin';
-const TextInputPrimitive = ({ onChange, value, placeholder, theme = defaultTheme, disabled = false, }) => {
+const TextInputPrimitive = ({ onChange, value, placeholder, theme = defaultTheme, disabled = false, width = '250px', }) => {
     return (_jsx("input", { style: {
             display: 'flex',
             flexDirection: 'row',
@@ -9,7 +9,7 @@ const TextInputPrimitive = ({ onChange, value, placeholder, theme = defaultTheme
             paddingRight: '12px',
             fontWeight: 'medium',
             height: 38,
-            minWidth: 250,
+            minWidth: width,
             boxShadow: '0 1px 2px 0 rgba(0,0,0,.05)',
             width: '100%',
             backgroundColor: theme?.backgroundColor || 'white',

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;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"}
+{"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,2CAkkBA"}

package/dist/esm/public_components/DashboardManager.js

@@ -13,6 +13,7 @@ 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('');
@@ -54,6 +55,7 @@ export default function DashboardManager({ navigateToDashboardBuilder, container
         });
         // If you need to retrieve the JSON data from the response:
         const data = await response.json();
+        setInitialLoad(false);
         if (!data.data.dashboardNames || !data.data.dashboardNames.length) {
             return;
         }
@@ -107,22 +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,
-                                databaseType: state.client.databaseType,
-                            }
-                            : {
-                                task: 'config',
-                                name: dashboard,
-                                clientId: state.client._id,
-                                databaseType: state.client.databaseType,
-                            },
-                    }),
+                    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;
@@ -131,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();
@@ -175,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,
@@ -236,7 +229,7 @@ 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 && !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 && (_jsx("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',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/admin",
-  "version": "1.3.8",
+  "version": "1.4.0",
   "description": "Admin tools for Quill",
   "exports": {
     ".": {