Remove local fetch caching

packages/graph-explorer/src/connector/gremlin/useGremlin.ts

@@ -46,14 +46,13 @@ const useGremlin = () => {
 
   const fetchSchemaFunc = useCallback(
     async options => {
-      const ops = { ...options, disableCache: true };
       let summary;
       try {
         const response = await useFetch.request(
           `${url}/pg/statistics/summary?mode=detailed`,
           {
             method: "GET",
-            ...ops,
+            ...options,
           }
         );
         summary = (response.payload.graphSummary as GraphSummary) || undefined;
@@ -62,7 +61,7 @@ const useGremlin = () => {
           console.error("[Summary API]", e);
         }
       }
-      return fetchSchema(_gremlinFetch(ops), summary);
+      return fetchSchema(_gremlinFetch(options), summary);
     },
     [_gremlinFetch, url, useFetch]
   );

packages/graph-explorer/src/connector/openCypher/useOpenCypher.ts

@@ -26,7 +26,6 @@ const useOpenCypher = () => {
             "Content-Type": "application/json",
           },
           body: JSON.stringify({ query: queryTemplate }),
-          disableCache: options?.disableCache,
           ...options,
         });
       };
@@ -36,8 +35,6 @@ const useOpenCypher = () => {
 
   const fetchSchemaFunc = useCallback(
     async (options: any) => {
-      const ops = { ...options, disableCache: true };
-
       let summary;
       try {
         const endpoint =
@@ -46,7 +43,7 @@ const useOpenCypher = () => {
             : `${url}/summary?mode=detailed`;
         const response = await useFetch.request(endpoint, {
           method: "GET",
-          ...ops,
+          ...options,
         });
 
         summary =
@@ -58,7 +55,7 @@ const useOpenCypher = () => {
           console.error("[Summary API]", e);
         }
       }
-      return fetchSchema(_openCypherFetch(ops), summary);
+      return fetchSchema(_openCypherFetch(options), summary);
     },
     [_openCypherFetch, url, useFetch, serviceType]
   );

packages/graph-explorer/src/connector/sparql/useSPARQL.ts

@@ -160,14 +160,13 @@ const useSPARQL = (blankNodes: BlankNodesMap) => {
 
   const fetchSchemaFunc = useCallback(
     async options => {
-      const ops = { ...options, disableCache: true };
       let summary;
       try {
         const response = await useFetch.request(
           `${url}/rdf/statistics/summary?mode=detailed`,
           {
             method: "GET",
-            ...ops,
+            ...options,
           }
         );
         summary = (response.payload.graphSummary as GraphSummary) || undefined;
@@ -176,7 +175,7 @@ const useSPARQL = (blankNodes: BlankNodesMap) => {
           console.error("[Summary API]", e);
         }
       }
-      return fetchSchema(_sparqlFetch(ops), summary);
+      return fetchSchema(_sparqlFetch(options), summary);
     },
     [_sparqlFetch, url, useFetch]
   );

packages/graph-explorer/src/connector/useGEFetch.ts

@@ -1,19 +1,8 @@
 import { useCallback } from "react";
-import localforage from "localforage";
-import { CacheItem } from "./useGEFetchTypes";
 import { useConfiguration, type ConnectionConfig } from "../core";
 import { DEFAULT_SERVICE_TYPE } from "../utils/constants";
 import { anySignal } from "./utils/anySignal";
 
-// 10 minutes
-const CACHE_TIME_MS = 10 * 60 * 1000;
-
-const localforageCache = localforage.createInstance({
-  name: "ge",
-  version: 1.0,
-  storeName: "connector-cache",
-});
-
 /**
  * Attempts to decode the error response into a JSON object.
  *
@@ -58,49 +47,8 @@ const useGEFetch = () => {
   const connection = useConfiguration()?.connection as
     | ConnectionConfig
     | undefined;
-  const _getFromCache = useCallback(
-    async key => {
-      if (!connection?.enableCache) {
-        return;
-      }
-
-      return localforageCache.getItem(key) as Promise<CacheItem | undefined>;
-    },
-    [connection?.enableCache]
-  );
-
-  const _setToCache = useCallback(
-    async (key, value) => {
-      if (connection?.enableCache) {
-        return;
-      }
-
-      return localforageCache.setItem(key, value);
-    },
-    [connection?.enableCache]
-  );
-
-  const _requestAndCache = useCallback(
-    async (
-      url: URL,
-      options: (RequestInit & { disableCache: boolean }) | undefined
-    ) => {
-      const response = await fetch(url, options);
-      if (!response.ok) {
-        const error = await decodeErrorSafely(response);
-        throw new Error("Network response was not OK", { cause: error });
-      }
-
-      // A successful response is assumed to be JSON
-      const data = await response.json();
-      if (options?.disableCache !== true) {
-        _setToCache(url, { data, updatedAt: new Date().getTime() });
-      }
-      return data as any;
-    },
-    [_setToCache]
-  );
 
+  // Construct the request headers based on the connection settings
   const getAuthHeaders = useCallback(
     typeHeaders => {
       const headers: HeadersInit = {};
@@ -124,41 +72,40 @@ const useGEFetch = () => {
     ]
   );
 
-  const request = useCallback(
-    async (uri, options) => {
-      const cachedResponse = await _getFromCache(uri);
-      if (
-        cachedResponse &&
-        cachedResponse.updatedAt + (connection?.cacheTimeMs ?? CACHE_TIME_MS) >
-          new Date().getTime()
-      ) {
-        return cachedResponse.data;
-      }
+  // Construct an AbortSignal for the fetch timeout if configured
+  const getFetchTimeoutSignal = useCallback(() => {
+    if (!connection?.fetchTimeoutMs) {
+      return null;
+    }
 
+    if (connection.fetchTimeoutMs <= 0) {
+      return null;
+    }
+
+    return AbortSignal.timeout(connection.fetchTimeoutMs);
+  }, [connection?.fetchTimeoutMs]);
+
+  const request = useCallback(
+    async (uri: URL | RequestInfo, options: RequestInit) => {
+      // Apply connection settings to fetch options
       const fetchOptions: RequestInit = {
+        ...options,
         headers: getAuthHeaders(options.headers),
+        signal: anySignal(getFetchTimeoutSignal(), options.signal),
       };
 
-      const connectionFetchTimeout = connection?.fetchTimeoutMs;
+      const response = await fetch(uri, fetchOptions);
 
-      if (connectionFetchTimeout && connectionFetchTimeout > 0) {
-        const timeoutSignal = AbortSignal.timeout(connectionFetchTimeout);
-
-        fetchOptions.signal = anySignal(timeoutSignal, options.signal);
+      if (!response.ok) {
+        const error = await decodeErrorSafely(response);
+        throw new Error("Network response was not OK", { cause: error });
       }
 
-      return _requestAndCache(uri, {
-        ...options,
-        ...fetchOptions,
-      }) as Promise<any>;
+      // A successful response is assumed to be JSON
+      const data = await response.json();
+      return data;
     },
-    [
-      _getFromCache,
-      _requestAndCache,
-      connection?.cacheTimeMs,
-      connection?.fetchTimeoutMs,
-      getAuthHeaders,
-    ]
+    [getAuthHeaders, getFetchTimeoutSignal]
   );
 
   return {

packages/graph-explorer/src/connector/useGEFetchTypes.ts

@@ -6,9 +6,7 @@ import {
 } from "../core";
 
 export type QueryOptions = RequestInit & {
-  disableCache?: boolean;
   queryId?: string;
-  successCallback?: (queryId: string) => void;
 };
 
 export type VertexSchemaResponse = Pick<
@@ -190,8 +188,3 @@ export type ConfigurationWithConnection = Omit<
   "connection"
 > &
   Required<Pick<ConfigurationContextProps, "connection">>;
-
-export type CacheItem = {
-  updatedAt: number;
-  data: any;
-};

packages/graph-explorer/src/core/ConfigurationProvider/types.ts

@@ -140,16 +140,6 @@ export type ConnectionConfig = {
    * It is needed to sign requests.
    */
   awsRegion?: string;
-  /**
-   * Enable or disable connector cache.
-   * By default, it's enabled.
-   */
-  enableCache?: boolean;
-  /**
-   * Number of milliseconds before expiring a cached request.
-   * By default, 10 minutes.
-   */
-  cacheTimeMs?: number;
   /**
    * Number of milliseconds before aborting a request.
    * By default, 60 seconds.

packages/graph-explorer/src/core/ConnectorProvider/ConnectorProvider.tsx

@@ -43,8 +43,6 @@ const ConnectorProvider = ({ children }: PropsWithChildren<any>) => {
         "graphDbUrl",
         "awsAuthEnabled",
         "awsRegion",
-        "enableCache",
-        "cacheTimeMs",
         "fetchTimeoutMs",
       ] as const,
     []

packages/graph-explorer/src/modules/CreateConnection/CreateConnection.tsx

@@ -31,8 +31,6 @@ type ConnectionForm = {
   awsAuthEnabled?: boolean;
   serviceType?: "neptune-db" | "neptune-graph";
   awsRegion?: string;
-  enableCache?: boolean;
-  cacheTimeMs?: number;
   fetchTimeMs?: number;
 };
 
@@ -78,8 +76,6 @@ const CreateConnection = ({
               awsAuthEnabled: data.awsAuthEnabled,
               serviceType: data.serviceType,
               awsRegion: data.awsRegion,
-              enableCache: data.enableCache,
-              cacheTimeMs: data.cacheTimeMs * 60 * 1000,
               fetchTimeoutMs: data.fetchTimeMs,
             },
           };
@@ -108,7 +104,6 @@ const CreateConnection = ({
               awsAuthEnabled: data.awsAuthEnabled,
               serviceType: data.serviceType,
               awsRegion: data.awsRegion,
-              cacheTimeMs: data.cacheTimeMs * 60 * 1000,
               fetchTimeoutMs: data.fetchTimeMs,
             },
           });
@@ -150,8 +145,6 @@ const CreateConnection = ({
     awsAuthEnabled: initialData?.awsAuthEnabled || false,
     serviceType: initialData?.serviceType || "neptune-db",
     awsRegion: initialData?.awsRegion || "",
-    enableCache: true,
-    cacheTimeMs: (initialData?.cacheTimeMs ?? 10 * 60 * 1000) / 60000,
     fetchTimeMs: initialData?.fetchTimeMs,
   });
 
@@ -316,48 +309,6 @@ const CreateConnection = ({
           </>
         )}
       </div>
-      <div className={pfx("configuration-form")}>
-        <Checkbox
-          value={"enableCache"}
-          checked={form.enableCache}
-          onChange={e => {
-            onFormChange("enableCache")(e.target.checked);
-          }}
-          styles={{
-            label: {
-              display: "block",
-            },
-          }}
-          label={
-            <div style={{ display: "flex", alignItems: "center", gap: 2 }}>
-              Enable Cache
-              <Tooltip
-                text={
-                  <div style={{ maxWidth: 300 }}>
-                    Requests made by the Graph Explorer can be temporarily
-                    stored in the browser cache for quick access to the data.
-                  </div>
-                }
-              >
-                <div>
-                  <InfoIcon style={{ width: 18, height: 18 }} />
-                </div>
-              </Tooltip>
-            </div>
-          }
-        />
-        {form.enableCache && (
-          <div className={pfx("input-url")}>
-            <Input
-              label="Cache Time (minutes)"
-              type={"number"}
-              value={form.cacheTimeMs}
-              onChange={onFormChange("cacheTimeMs")}
-              min={0}
-            />
-          </div>
-        )}
-      </div>
       <div className={pfx("configuration-form")}>
         <Checkbox
           value={"fetchTimeoutMs"}