Merge pull request #217 from neo4j-labs/bug-graph-fix

graph fix

Author: kartikpersistent

frontend/src/components/ConnectionModal.tsx

@@ -80,9 +80,9 @@ export default function ConnectionModal({ open, setOpenConnection, setConnection
             return acc;
           }, {});
           parseAndSetURI(configObject.NEO4J_URI);
-          setUsername(configObject.NEO4J_USERNAME);
-          setPassword(configObject.NEO4J_PASSWORD);
-          setDatabase(configObject.NEO4J_DATABASE);
+          setUsername(configObject.NEO4J_USERNAME ?? 'neo4j');
+          setPassword(configObject.NEO4J_PASSWORD ?? '');
+          setDatabase(configObject.NEO4J_DATABASE ?? 'neo4j');
         } else {
           setMessage({ type: 'danger', content: 'Please drop a valid file' });
         }

frontend/src/components/GraphViewModal.tsx

@@ -98,16 +98,16 @@ const GraphViewModal: React.FunctionComponent<GraphViewModalProps> = ({
         graphType.length === 3
           ? queryMap.DocChunkEntities
           : graphType.includes('Entities') && graphType.includes('Chunks')
-          ? queryMap.ChunksEntities
-          : graphType.includes('Entities') && graphType.includes('Document')
-          ? queryMap.DocEntities
-          : graphType.includes('Document') && graphType.includes('Chunks')
-          ? queryMap.DocChunks
-          : graphType.includes('Entities') && graphType.length === 1
-          ? queryMap.Entities
-          : graphType.includes('Chunks') && graphType.length === 1
-          ? queryMap.Chunks
-          : queryMap.Document;
+            ? queryMap.ChunksEntities
+            : graphType.includes('Entities') && graphType.includes('Document')
+              ? queryMap.DocEntities
+              : graphType.includes('Document') && graphType.includes('Chunks')
+                ? queryMap.DocChunks
+                : graphType.includes('Entities') && graphType.length === 1
+                  ? queryMap.Entities
+                  : graphType.includes('Chunks') && graphType.length === 1
+                    ? queryMap.Chunks
+                    : queryMap.Document;
       if (viewPoint === 'showGraphView') {
         queryToRun = constructQuery(newCheck, documentNo);
         console.log('inside If QueryToRun', queryToRun);
@@ -118,7 +118,7 @@ const GraphViewModal: React.FunctionComponent<GraphViewModalProps> = ({
       const session = driver?.session();
       setLoading(true);
       session
-        ?.run(queryToRun, { document_name: inspectedName })
+        ?.run(queryToRun, { 'document_name': inspectedName })
         .then((results) => {
           if (results.records && results.records.length > 0) {
             // @ts-ignore
@@ -228,6 +228,13 @@ const GraphViewModal: React.FunctionComponent<GraphViewModalProps> = ({
   const handleZoomOut = () => {
     nvlRef.current?.setZoom(nvlRef.current.getScale() * 0.7);
   };
+
+  const onClose=()=>{
+    setStatus('unknown');
+    setStatusMessage('');
+    setGraphViewOpen(false)
+  }
+
   return (
     <>
       <Dialog
@@ -239,7 +246,7 @@ const GraphViewModal: React.FunctionComponent<GraphViewModalProps> = ({
         open={open}
         aria-labelledby='form-dialog-title'
         disableCloseButton={false}
-        onClose={() => setGraphViewOpen(false)}
+        onClose={onClose}
       >
         <Dialog.Header id='form-dialog-title'>
           {headerTitle}