@quillsql/admin 1.8.0 → 1.8.2

package/dist/index.cjs

@@ -69,10 +69,10 @@ var ALL_TENANTS = "QUILL_ALL_TENANTS";
 var SINGLE_TENANT = "QUILL_SINGLE_TENANT";
 var SAVED_QUERIES_DASHBOARD = "quill-saved-queries";
 var QUILL_SERVER = typeof process !== "undefined" && process.env ? process.env.QUILL_SERVER_HOST ?? "https://quill-344421.uc.r.appspot.com" : "https://quill-344421.uc.r.appspot.com";
-var QUILL_QUERY_ENDPOINT = typeof process !== "undefined" && process.env ? process.env.QUILL_QUERY_ENDPOINT ?? "/cloud" : "/cloud";
+var QUILL_QUERY_ENDPOINT = "/cloud/engine";
 var QUILL_ENDPOINTS = [
-  "https://quill-344421.uc.r.appspot.com/cloud",
-  "https://quill-ruby-server.onrender.com/cloud"
+  "https://quill-344421.uc.r.appspot.com/cloud/engine",
+  "https://quill-ruby-server.onrender.com/cloud/engine"
 ];
 
 // src/public_components/CreateEnvironment.tsx
@@ -2186,7 +2186,7 @@ async function getVirtualTableData(clientId, query, databaseType, queryEndpoint,
     },
     task: "query-view",
     metadata: {
-      preQueries: [query],
+      view: query,
       clientId,
       runQueryConfig: {
         convertDatatypes: true,
@@ -2248,7 +2248,7 @@ async function getVirtualTableData(clientId, query, databaseType, queryEndpoint,
     }
   }
   return queryEndpoint ? {
-    ...results.data.queryResults[0],
+    ...results.queries.queryResults[0],
     ...queryAst,
     success: results.status === "success" ? true : false
   } : { ...results, ...queryAst };
@@ -8267,15 +8267,7 @@ function AdminProvider({
     }
     return adminState;
   };
-  const initialState = (0, import_react23.useMemo)(() => {
-    const localState = JSON.parse(
-      sessionStorage.getItem("quill-adminState") ?? "null"
-    );
-    if (clerkOrgId && localState?.clerkOrgId === clerkOrgId) {
-      return parsedSessionStorageAdminState(localState);
-    }
-    sessionStorage.removeItem("quill-adminState");
-    sessionStorage.removeItem("quill-client");
+  const buildDefaultState = () => {
     const populatedTheme = {
       ...theme,
       fontFamily: theme?.fontFamily ?? defaultTheme.fontFamily,
@@ -8305,20 +8297,15 @@ function AdminProvider({
       withCredentials,
       client: null,
       clients: [],
-      organization: null,
-      organizations: [],
-      organizationId: null,
       activeQuery: "",
       activeEditItem: void 0,
       tables: [],
       schema: [],
       activeComponent: "Dashboards",
-      dashboards: [],
       selectedDashboard: null,
       reportId: null,
       report: null,
       theme: populatedTheme,
-      organizationIdSet: false,
       dateFilter: {},
       clerkOrgId: clerkOrgId || "",
       databaseTypeMismatch: { show: false, backendDatabaseType: "" },
@@ -8326,6 +8313,30 @@ function AdminProvider({
       databaseSchema: void 0,
       AskAIButton
     };
+  };
+  const hydrateStateFromSessionStorage = () => {
+    if (typeof window === "undefined") {
+      return null;
+    }
+    try {
+      const localState = JSON.parse(
+        window.sessionStorage.getItem("quill-adminState") ?? "null"
+      );
+      if (clerkOrgId && localState?.clerkOrgId === clerkOrgId) {
+        return parsedSessionStorageAdminState(localState);
+      }
+    } catch (error2) {
+      console.warn(
+        "AdminProvider: unable to parse quill-adminState from sessionStorage",
+        error2
+      );
+    }
+    window.sessionStorage.removeItem("quill-adminState");
+    window.sessionStorage.removeItem("quill-client");
+    return null;
+  };
+  const initialState = (0, import_react23.useMemo)(() => {
+    return hydrateStateFromSessionStorage() ?? buildDefaultState();
   }, []);
   const [state, dispatch] = (0, import_react23.useReducer)(reducer, initialState);
   const stateWithFlagsList = (0, import_react23.useMemo)(() => {
@@ -8539,11 +8550,16 @@ function AdminProvider({
     }
   }, [clerkOrgId]);
   (0, import_react23.useEffect)(() => {
+    if (typeof window === "undefined") {
+      return;
+    }
     if (publicKeyRef.current !== publicKey) {
       dispatch({ type: "SET_ALL_STATE", payload: initialState });
       publicKeyRef.current = publicKey;
     }
-    const client = JSON.parse(sessionStorage.getItem("quill-client") || "null");
+    const client = JSON.parse(
+      window.sessionStorage.getItem("quill-client") ?? "null"
+    );
     let overridePublicKey = null;
     if (client && client.clerkOrgId === clerkOrgId) {
       overridePublicKey = client.id || client._id || client.publicKey;
@@ -8558,7 +8574,10 @@ function AdminProvider({
     }
   }, [publicKey]);
   (0, import_react23.useEffect)(() => {
-    sessionStorage.setItem(
+    if (typeof window === "undefined") {
+      return;
+    }
+    window.sessionStorage.setItem(
       "quill-adminState",
       JSON.stringify({
         ...state,
@@ -8568,7 +8587,6 @@ function AdminProvider({
         },
         clients: [],
         tables: [],
-        dashboards: [],
         allTenantTypes: void 0,
         selectedTenantValues: void 0,
         selectedDashboardTenantIds: void 0,
@@ -15909,9 +15927,6 @@ function EditFiltersModal({
     ),
     [state.client?.allTenantTypes, state.client?.ownerTenantFields]
   );
-  (0, import_react40.useEffect)(() => {
-    console.log("New tenant filters:", newTenantFilters);
-  }, [newTenantFilters]);
   const assignDefaultInterval = (label, set2, loopStart, loopEnd) => {
     if (!newDateFilter) return;
     if (set2) {
@@ -19862,7 +19877,6 @@ function ChartQueryBuilder({
           import_react46.SQLEditor,
           {
             isAdminEnabled: true,
-            showTableFormatOptions: true,
             showAccessControlOptions: true,
             showDateFieldOptions: true,
             defaultQuery: query,

package/dist/index.js

@@ -29,10 +29,10 @@ var ALL_TENANTS = "QUILL_ALL_TENANTS";
 var SINGLE_TENANT = "QUILL_SINGLE_TENANT";
 var SAVED_QUERIES_DASHBOARD = "quill-saved-queries";
 var QUILL_SERVER = typeof process !== "undefined" && process.env ? process.env.QUILL_SERVER_HOST ?? "https://quill-344421.uc.r.appspot.com" : "https://quill-344421.uc.r.appspot.com";
-var QUILL_QUERY_ENDPOINT = typeof process !== "undefined" && process.env ? process.env.QUILL_QUERY_ENDPOINT ?? "/cloud" : "/cloud";
+var QUILL_QUERY_ENDPOINT = "/cloud/engine";
 var QUILL_ENDPOINTS = [
-  "https://quill-344421.uc.r.appspot.com/cloud",
-  "https://quill-ruby-server.onrender.com/cloud"
+  "https://quill-344421.uc.r.appspot.com/cloud/engine",
+  "https://quill-ruby-server.onrender.com/cloud/engine"
 ];
 
 // src/public_components/CreateEnvironment.tsx
@@ -2160,7 +2160,7 @@ async function getVirtualTableData(clientId, query, databaseType, queryEndpoint,
     },
     task: "query-view",
     metadata: {
-      preQueries: [query],
+      view: query,
       clientId,
       runQueryConfig: {
         convertDatatypes: true,
@@ -2222,7 +2222,7 @@ async function getVirtualTableData(clientId, query, databaseType, queryEndpoint,
     }
   }
   return queryEndpoint ? {
-    ...results.data.queryResults[0],
+    ...results.queries.queryResults[0],
     ...queryAst,
     success: results.status === "success" ? true : false
   } : { ...results, ...queryAst };
@@ -8255,15 +8255,7 @@ function AdminProvider({
     }
     return adminState;
   };
-  const initialState = useMemo7(() => {
-    const localState = JSON.parse(
-      sessionStorage.getItem("quill-adminState") ?? "null"
-    );
-    if (clerkOrgId && localState?.clerkOrgId === clerkOrgId) {
-      return parsedSessionStorageAdminState(localState);
-    }
-    sessionStorage.removeItem("quill-adminState");
-    sessionStorage.removeItem("quill-client");
+  const buildDefaultState = () => {
     const populatedTheme = {
       ...theme,
       fontFamily: theme?.fontFamily ?? defaultTheme.fontFamily,
@@ -8293,20 +8285,15 @@ function AdminProvider({
       withCredentials,
       client: null,
       clients: [],
-      organization: null,
-      organizations: [],
-      organizationId: null,
       activeQuery: "",
       activeEditItem: void 0,
       tables: [],
       schema: [],
       activeComponent: "Dashboards",
-      dashboards: [],
       selectedDashboard: null,
       reportId: null,
       report: null,
       theme: populatedTheme,
-      organizationIdSet: false,
       dateFilter: {},
       clerkOrgId: clerkOrgId || "",
       databaseTypeMismatch: { show: false, backendDatabaseType: "" },
@@ -8314,6 +8301,30 @@ function AdminProvider({
       databaseSchema: void 0,
       AskAIButton
     };
+  };
+  const hydrateStateFromSessionStorage = () => {
+    if (typeof window === "undefined") {
+      return null;
+    }
+    try {
+      const localState = JSON.parse(
+        window.sessionStorage.getItem("quill-adminState") ?? "null"
+      );
+      if (clerkOrgId && localState?.clerkOrgId === clerkOrgId) {
+        return parsedSessionStorageAdminState(localState);
+      }
+    } catch (error2) {
+      console.warn(
+        "AdminProvider: unable to parse quill-adminState from sessionStorage",
+        error2
+      );
+    }
+    window.sessionStorage.removeItem("quill-adminState");
+    window.sessionStorage.removeItem("quill-client");
+    return null;
+  };
+  const initialState = useMemo7(() => {
+    return hydrateStateFromSessionStorage() ?? buildDefaultState();
   }, []);
   const [state, dispatch] = useReducer(reducer, initialState);
   const stateWithFlagsList = useMemo7(() => {
@@ -8527,11 +8538,16 @@ function AdminProvider({
     }
   }, [clerkOrgId]);
   useEffect15(() => {
+    if (typeof window === "undefined") {
+      return;
+    }
     if (publicKeyRef.current !== publicKey) {
       dispatch({ type: "SET_ALL_STATE", payload: initialState });
       publicKeyRef.current = publicKey;
     }
-    const client = JSON.parse(sessionStorage.getItem("quill-client") || "null");
+    const client = JSON.parse(
+      window.sessionStorage.getItem("quill-client") ?? "null"
+    );
     let overridePublicKey = null;
     if (client && client.clerkOrgId === clerkOrgId) {
       overridePublicKey = client.id || client._id || client.publicKey;
@@ -8546,7 +8562,10 @@ function AdminProvider({
     }
   }, [publicKey]);
   useEffect15(() => {
-    sessionStorage.setItem(
+    if (typeof window === "undefined") {
+      return;
+    }
+    window.sessionStorage.setItem(
       "quill-adminState",
       JSON.stringify({
         ...state,
@@ -8556,7 +8575,6 @@ function AdminProvider({
         },
         clients: [],
         tables: [],
-        dashboards: [],
         allTenantTypes: void 0,
         selectedTenantValues: void 0,
         selectedDashboardTenantIds: void 0,
@@ -15912,9 +15930,6 @@ function EditFiltersModal({
     ),
     [state.client?.allTenantTypes, state.client?.ownerTenantFields]
   );
-  useEffect22(() => {
-    console.log("New tenant filters:", newTenantFilters);
-  }, [newTenantFilters]);
   const assignDefaultInterval = (label, set2, loopStart, loopEnd) => {
     if (!newDateFilter) return;
     if (set2) {
@@ -19869,7 +19884,6 @@ function ChartQueryBuilder({
           SQLEditor2,
           {
             isAdminEnabled: true,
-            showTableFormatOptions: true,
             showAccessControlOptions: true,
             showDateFieldOptions: true,
             defaultQuery: query,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/admin",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "description": "Admin tools for Quill",
   "type": "module",
   "exports": {