407 remove driver from frontend

frontend/src/components/ConnectionModal.tsx

@@ -2,8 +2,6 @@ import { Button, Dialog, TextInput, Dropdown, Banner, Dropzone, Typography, Text
 import { Dispatch, SetStateAction, useCallback, useEffect, useMemo, useState } from 'react';
 import connectAPI from '../services/ConnectAPI';
 import { useCredentials } from '../context/UserCredentials';
-import { initialiseDriver } from '../utils/Driver';
-import { Driver } from 'neo4j-driver';
 import { useSearchParams } from 'react-router-dom';
 
 interface Message {
@@ -33,7 +31,6 @@ export default function ConnectionModal({ open, setOpenConnection, setConnection
     initialport = initialuri.split(':')[1];
     initialprotocol = urisplit[0];
   }
-
   const protocols = ['neo4j', 'neo4j+s', 'neo4j+ssc', 'bolt', 'bolt+s', 'bolt+ssc'];
   const [protocol, setProtocol] = useState<string>(initialprotocol ?? 'neo4j+s');
   const [URI, setURI] = useState<string>(initialuri ?? '');
@@ -42,7 +39,7 @@ export default function ConnectionModal({ open, setOpenConnection, setConnection
   const [username, setUsername] = useState<string>(initialusername ?? 'neo4j');
   const [password, setPassword] = useState<string>('');
   const [connectionMessage, setMessage] = useState<Message | null>({ type: 'unknown', content: '' });
-  const { setUserCredentials, setDriver } = useCredentials();
+  const { setUserCredentials } = useCredentials();
   const [isLoading, setIsLoading] = useState<boolean>(false);
   const [searchParams, setSearchParams] = useSearchParams();
 
@@ -132,39 +129,29 @@ export default function ConnectionModal({ open, setOpenConnection, setConnection
     const connectionURI = `${protocol}://${URI}${URI.split(':')[1] ? '' : `:${port}`}`;
     setUserCredentials({ uri: connectionURI, userName: username, password: password, database: database, port: port });
     setIsLoading(true);
-    await connectAPI(connectionURI, username, password, database).then((response: any) => {
-      if (response?.data?.status === 'Success') {
-        setConnectionStatus(true);
-        setMessage({
-          type: 'success',
-          content: response.data.message,
-        });
-        driverSetting(connectionURI, username, password, database);
-        setOpenConnection(false);
-      } else {
-        setMessage({ type: 'danger', content: response.data.error });
-        setOpenConnection(true);
-        setPassword('');
-        setConnectionStatus(false);
-      }
-      setIsLoading(false);
-      setTimeout(() => {
-        setMessage({ type: 'unknown', content: '' });
-        setPassword('');
-      }, 3000);
-    });
-  };
-
-  const driverSetting = (connectionURI: string, username: string, password: string, database: string) => {
-    initialiseDriver(connectionURI, username, password, database).then((driver: Driver) => {
-      if (driver) {
-        setConnectionStatus(true);
-        setDriver(driver);
-        localStorage.setItem('alertShown', JSON.stringify(false));
-      } else {
-        setConnectionStatus(false);
-      }
-    });
+    const response = await connectAPI(connectionURI, username, password, database);
+    if (response?.data?.status === 'Success') {
+      localStorage.setItem(
+        'neo4j.connection',
+        JSON.stringify({ uri: connectionURI, user: username, password: password, database: database })
+      );
+      setConnectionStatus(true);
+      setMessage({
+        type: 'success',
+        content: response.data.message,
+      });
+      setOpenConnection(false);
+    } else {
+      setMessage({ type: 'danger', content: response.data.error });
+      setOpenConnection(true);
+      setPassword('');
+      setConnectionStatus(false);
+    }
+    setIsLoading(false);
+    setTimeout(() => {
+      setMessage({ type: 'unknown', content: '' });
+      setPassword('');
+    }, 3000);
   };
 
   const onClose = useCallback(() => {

frontend/src/components/Content.tsx

@@ -10,23 +10,22 @@ import { extractAPI } from '../utils/FileAPI';
 import { ContentProps, CustomFile, OptionType, UserCredentials, alertStateType } from '../types';
 import { updateGraphAPI } from '../services/UpdateGraph';
 import GraphViewModal from './GraphViewModal';
-import { initialiseDriver } from '../utils/Driver';
-import Driver from 'neo4j-driver/types/driver';
 import deleteAPI from '../services/deleteFiles';
 import DeletePopUp from './DeletePopUp';
 import { triggerStatusUpdateAPI } from '../services/ServerSideStatusUpdateAPI';
 import useServerSideEvent from '../hooks/useSse';
 import { useSearchParams } from 'react-router-dom';
 import ConfirmationDialog from './ConfirmationDialog';
 import { chunkSize } from '../utils/Constants';
+import connectAPI from '../services/ConnectAPI';
 
 const Content: React.FC<ContentProps> = ({ isLeftExpanded, isRightExpanded }) => {
   const [init, setInit] = useState<boolean>(false);
   const [openConnection, setOpenConnection] = useState<boolean>(false);
   const [openGraphView, setOpenGraphView] = useState<boolean>(false);
   const [inspectedName, setInspectedName] = useState<string>('');
   const [connectionStatus, setConnectionStatus] = useState<boolean>(false);
-  const { setUserCredentials, userCredentials, driver, setDriver } = useCredentials();
+  const { setUserCredentials, userCredentials } = useCredentials();
   const [showConfirmationModal, setshowConfirmationModal] = useState<boolean>(false);
   const [extractLoading, setextractLoading] = useState<boolean>(false);
 
@@ -81,20 +80,6 @@ const Content: React.FC<ContentProps> = ({ isLeftExpanded, isRightExpanded }) =>
           database: neo4jConnection.database,
           port: neo4jConnection.uri.split(':')[2],
         });
-        initialiseDriver(
-          neo4jConnection.uri,
-          neo4jConnection.user,
-          neo4jConnection.password,
-          neo4jConnection.database
-        ).then((driver: Driver) => {
-          if (driver) {
-            localStorage.setItem('alertShown', JSON.stringify(false));
-            setConnectionStatus(true);
-            setDriver(driver);
-          } else {
-            setConnectionStatus(false);
-          }
-        });
       } else {
         setOpenConnection(true);
       }
@@ -294,7 +279,6 @@ const Content: React.FC<ContentProps> = ({ isLeftExpanded, isRightExpanded }) =>
   };
 
   const disconnect = () => {
-    driver?.close();
     setConnectionStatus(false);
     localStorage.removeItem('password');
     setUserCredentials({ uri: '', password: '', userName: '', database: '' });
@@ -377,6 +361,23 @@ const Content: React.FC<ContentProps> = ({ isLeftExpanded, isRightExpanded }) =>
     }
     setshowDeletePopUp(false);
   };
+  useEffect(() => {
+    const connection = localStorage.getItem('neo4j.connection');
+    if (connection != null) {
+      (async () => {
+        const parsedData = JSON.parse(connection);
+        console.log(parsedData.uri);
+        const response = await connectAPI(parsedData.uri, parsedData.user, parsedData.password, parsedData.database);
+        if (response?.data?.status === 'Success') {
+          setConnectionStatus(true);
+          setOpenConnection(false);
+        } else {
+          setOpenConnection(true);
+          setConnectionStatus(false);
+        }
+      })();
+    }
+  }, []);
 
   return (
     <>

frontend/src/context/UserCredentials.tsx

@@ -1,6 +1,5 @@
-import { createContext, useState, useContext, FunctionComponent, ReactNode, Dispatch, SetStateAction } from 'react';
+import { createContext, useState, useContext, FunctionComponent, ReactNode } from 'react';
 import { UserCredentials } from '../types';
-import { Driver } from 'neo4j-driver';
 
 type Props = {
   children: ReactNode;
@@ -9,27 +8,20 @@ type Props = {
 interface ContextProps {
   userCredentials: UserCredentials | null;
   setUserCredentials: (UserCredentials: UserCredentials) => void;
-  driver: Driver | null;
-  setDriver: Dispatch<SetStateAction<Driver | null>>;
 }
 export const UserConnection = createContext<ContextProps>({
   userCredentials: null,
   setUserCredentials: () => null,
-  driver: null,
-  setDriver: () => null,
 });
 export const useCredentials = () => {
   const userCredentials = useContext(UserConnection);
   return userCredentials;
 };
 const UserCredentialsWrapper: FunctionComponent<Props> = (props) => {
   const [userCredentials, setUserCredentials] = useState<UserCredentials | null>(null);
-  const [driver, setDriver] = useState<Driver | null>(null);
   const value = {
     userCredentials,
     setUserCredentials,
-    driver,
-    setDriver,
   };
   return <UserConnection.Provider value={value}>{props.children}</UserConnection.Provider>;
 };