graph query fixes

Author: prakriti-solankey

frontend/src/components/Graph/GraphViewModal.tsx

@@ -110,37 +110,38 @@ const GraphViewModal: React.FunctionComponent<GraphViewModalProps> = ({
   }, [viewPoint, selectedRows, graphQuery, inspectedName, userCredentials]);
 
   // Api call to get the nodes and relations
-  const graphApi = () => {
-    fetchData()
-      .then((result) => {
-        if (result && result.data.data.nodes.length > 0) {
-          const neoNodes = result.data.data.nodes.map((f: Node) => f);
-          const neoRels = result.data.data.relationships.map((f: Relationship) => f);
-          const { finalNodes, finalRels, schemeVal } = processGraphData(neoNodes, neoRels);
-          setAllNodes(finalNodes);
-          setAllRelationships(finalRels);
-          setScheme(schemeVal);
-          setNodes(finalNodes);
-          setRelationships(finalRels);
-          setNewScheme(schemeVal);
-          setLoading(false);
-        } else {
-          setLoading(false);
-          setStatus('danger');
-          setStatusMessage(`No Nodes and Relations for the ${inspectedName} file`);
-        }
-      })
-      .catch((error: any) => {
+  const graphApi = async () => {
+    try {
+      const result = await fetchData();
+      if (result && result.data.data.nodes.length > 0) {
+        const neoNodes = result.data.data.nodes.map((f: Node) => f);
+        const neoRels = result.data.data.relationships.map((f: Relationship) => f);
+        const { finalNodes, finalRels, schemeVal } = processGraphData(neoNodes, neoRels);
+        setAllNodes(finalNodes);
+        setAllRelationships(finalRels);
+        setScheme(schemeVal);
+        setNodes(finalNodes);
+        setRelationships(finalRels);
+        setNewScheme(schemeVal);
+        setLoading(false);
+      } else {
         setLoading(false);
         setStatus('danger');
-        setStatusMessage(error.message);
-      });
+        setStatusMessage(`No Nodes and Relations for the ${inspectedName} file`);
+      }
+    } catch (error: any) {
+      setLoading(false);
+      setStatus('danger');
+      setStatusMessage(error.message);
+    }
   };
 
   useEffect(() => {
     if (open) {
       setLoading(true);
-      if (viewPoint === 'chatInfoView') {
+      if (viewPoint !== 'chatInfoView') {
+        graphApi();
+      } else {
         const { finalNodes, finalRels, schemeVal } = processGraphData(nodeValues ?? [], relationshipValues ?? []);
         setAllNodes(finalNodes);
         setAllRelationships(finalRels);
@@ -149,8 +150,6 @@ const GraphViewModal: React.FunctionComponent<GraphViewModalProps> = ({
         setRelationships(finalRels);
         setNewScheme(schemeVal);
         setLoading(false);
-      } else {
-        graphApi();
       }
     }
   }, [open]);

frontend/src/services/ChunkEntitiesInfo.ts

@@ -15,7 +15,6 @@ const chunkEntitiesAPI = async (userCredentials: UserCredentials, chunk_ids: str
         'Content-Type': 'multipart/form-data',
       },
     });
-    console.log('response api', response);
     return response;
   } catch (error) {
     console.log('Error uploading file:', error);