Bug Fixing

frontend/src/components/ChatBot/Chatbot.tsx

@@ -249,7 +249,7 @@ const Chatbot: FC<ChatbotProps> = (props) => {
             } else {
               setListMessages((prev) =>
                 prev.map((msg) =>
-                  (msg.id === chatbotMessageId ? { ...msg, modes: { ...msg.modes, [mode]: responseMode } } : msg)
+                  msg.id === chatbotMessageId ? { ...msg, modes: { ...msg.modes, [mode]: responseMode } } : msg
                 )
               );
             }
@@ -264,7 +264,7 @@ const Chatbot: FC<ChatbotProps> = (props) => {
             } else {
               setListMessages((prev) =>
                 prev.map((msg) =>
-                  (msg.id === chatbotMessageId ? { ...msg, modes: { ...msg.modes, [mode]: responseMode } } : msg)
+                  msg.id === chatbotMessageId ? { ...msg, modes: { ...msg.modes, [mode]: responseMode } } : msg
                 )
               );
             }
@@ -273,15 +273,15 @@ const Chatbot: FC<ChatbotProps> = (props) => {
           console.error(`API call failed for mode ${mode}:`, result.reason);
           setListMessages((prev) =>
             prev.map((msg) =>
-              (msg.id === chatbotMessageId
+              msg.id === chatbotMessageId
                 ? {
                     ...msg,
                     modes: {
                       ...msg.modes,
                       [mode]: { message: 'Failed to fetch response for this mode.', error: result.reason },
                     },
                   }
-                : msg)
+                : msg
             )
           );
         }
@@ -294,7 +294,7 @@ const Chatbot: FC<ChatbotProps> = (props) => {
       if (error instanceof Error) {
         setListMessages((prev) =>
           prev.map((msg) =>
-            (msg.id === chatbotMessageId
+            msg.id === chatbotMessageId
               ? {
                   ...msg,
                   isLoading: false,
@@ -306,7 +306,7 @@ const Chatbot: FC<ChatbotProps> = (props) => {
                     },
                   },
                 }
-              : msg)
+              : msg
           )
         );
       }

frontend/src/components/Graph/GraphViewModal.tsx

@@ -58,15 +58,16 @@ const GraphViewModal: React.FunctionComponent<GraphViewModalProps> = ({
   const [graphType, setGraphType] = useState<GraphType[]>([]);
   const [disableRefresh, setDisableRefresh] = useState<boolean>(false);
   const [selected, setSelected] = useState<{ type: EntityType; id: string } | undefined>(undefined);
+  const [mode, setMode] = useState<boolean>(false);
 
   const graphQuery: string =
     graphType.includes('DocumentChunk') && graphType.includes('Entities')
       ? queryMap.DocChunkEntities
       : graphType.includes('DocumentChunk')
-      ? queryMap.DocChunks
-      : graphType.includes('Entities')
-      ? queryMap.Entities
-      : '';
+        ? queryMap.DocChunks
+        : graphType.includes('Entities')
+          ? queryMap.Entities
+          : '';
 
   // fit graph to original position
   const handleZoomToFit = () => {
@@ -97,7 +98,12 @@ const GraphViewModal: React.FunctionComponent<GraphViewModalProps> = ({
   }, []);
 
   useEffect(() => {
-    const updateGraphType = graphTypeFromNodes(allNodes);
+    let updateGraphType;
+    if (mode) {
+      updateGraphType = graphTypeFromNodes(nodes);
+    } else {
+      updateGraphType = graphTypeFromNodes(allNodes);
+    }
     if (Array.isArray(updateGraphType)) {
       setGraphType(updateGraphType);
     }
@@ -108,10 +114,10 @@ const GraphViewModal: React.FunctionComponent<GraphViewModalProps> = ({
       const nodeRelationshipData =
         viewPoint === graphLabels.showGraphView
           ? await graphQueryAPI(
-              userCredentials as UserCredentials,
-              graphQuery,
-              selectedRows?.map((f) => f.name)
-            )
+            userCredentials as UserCredentials,
+            graphQuery,
+            selectedRows?.map((f) => f.name)
+          )
           : await graphQueryAPI(userCredentials as UserCredentials, graphQuery, [inspectedName ?? '']);
       return nodeRelationshipData;
     } catch (error: any) {
@@ -260,11 +266,10 @@ const GraphViewModal: React.FunctionComponent<GraphViewModalProps> = ({
     const newGraphSelected = [...graphType];
     if (currentIndex === -1) {
       newGraphSelected.push(graph);
-      initGraph(newGraphSelected, allNodes, allRelationships, scheme);
     } else {
       newGraphSelected.splice(currentIndex, 1);
-      initGraph(newGraphSelected, allNodes, allRelationships, scheme);
     }
+    initGraph(newGraphSelected, allNodes, allRelationships, scheme);
     setSearchQuery('');
     setGraphType(newGraphSelected);
     setSelected(undefined);
@@ -295,11 +300,8 @@ const GraphViewModal: React.FunctionComponent<GraphViewModalProps> = ({
   // Refresh the graph with nodes and relations if file is processing
   const handleRefresh = () => {
     setDisableRefresh(true);
+    setMode(true);
     graphApi('refreshMode');
-    setGraphType(graphType);
-    setNodes(nodes);
-    setRelationships(relationships);
-    setScheme(newScheme);
   };
 
   // when modal closes reset all states to default

frontend/src/components/Layout/PageLayout.tsx

@@ -14,14 +14,12 @@ import useSpeechSynthesis from '../../hooks/useSpeech';
 import FallBackDialog from '../UI/FallBackDialog';
 import { envConnectionAPI } from '../../services/ConnectAPI';
 import { healthStatus } from '../../services/HealthStatus';
+import { useNavigate } from 'react-router';
 
 const ConnectionModal = lazy(() => import('../Popups/ConnectionModal/ConnectionModal'));
 
-interface PageLayoutProp {
-  isChatOnly?: boolean;
-}
 
-const PageLayout: React.FC<PageLayoutProp> = () => {
+const PageLayout: React.FC = () => {
   const [openConnection, setOpenConnection] = useState<connectionState>({
     openPopUp: false,
     chunksExists: false,
@@ -38,6 +36,8 @@ const PageLayout: React.FC<PageLayoutProp> = () => {
   const [shows3Modal, toggleS3Modal] = useReducer((s) => !s, false);
   const [showGCSModal, toggleGCSModal] = useReducer((s) => !s, false);
   const [showGenericModal, toggleGenericModal] = useReducer((s) => !s, false);
+  const navigate = useNavigate();
+
   const toggleLeftDrawer = () => {
     if (largedesktops) {
       setIsLeftExpanded(!isLeftExpanded);
@@ -87,6 +87,7 @@ const PageLayout: React.FC<PageLayoutProp> = () => {
       const setUserCredentialsFromSession = (neo4jConnection: string) => {
         if (!neo4jConnection) {
           console.error('Invalid session data:', neo4jConnection);
+          setOpenConnection((prev) => ({ ...prev, openPopUp: true }));
           return;
         }
         try {
@@ -138,87 +139,73 @@ const PageLayout: React.FC<PageLayoutProp> = () => {
           return false;
         }
       };
+      // Handle case where session exists
+      let backendApiResponse;
       try {
-        // Handle case where session exists
-        if (session && isDev) {
-          let backendApiResponse;
-          try {
-            backendApiResponse = await envConnectionAPI();
-            const connectionData = backendApiResponse.data;
-            const envCredentials = {
-              uri: connectionData.data.uri,
-              password: atob(connectionData.data.password),
-              userName: connectionData.data.user_name,
-              database: connectionData.data.database,
-              isReadonlyUser: !connectionData.data.write_access,
-              isGds: connectionData.data.gds_status,
-            };
+        if (isDev) {
+          backendApiResponse = await envConnectionAPI();
+          const connectionData = backendApiResponse.data;
+          const envCredentials = {
+            uri: connectionData.data.uri,
+            password: atob(connectionData.data.password),
+            userName: connectionData.data.user_name,
+            database: connectionData.data.database,
+            isReadonlyUser: !connectionData.data.write_access,
+            isGds: connectionData.data.gds_status,
+          };
+          if (session && isDev) {
             const updated = updateSessionIfNeeded(envCredentials, session);
             if (!updated) {
               setUserCredentialsFromSession(session); // Using stored session if no update is needed
             }
             setConnectionStatus(Boolean(connectionData.data.graph_connection));
             setIsBackendConnected(true);
             handleDisconnectButtonState(false);
-          } catch (error) {
-            console.error('Error in DEV session handling:', error);
-            handleDisconnectButtonState(true);
-            setOpenConnection((prev) => ({ ...prev, openPopUp: true }));
-            setErrorMessage(backendApiResponse?.data.error);
           }
-        } else {
-          // For PROD, picking the session values
-          setUserCredentialsFromSession(session as string);
-          setConnectionStatus(true);
-          setIsBackendConnected(true);
-          handleDisconnectButtonState(true);
-          return;
-        }
-        // Handle case where no session exists
-        if (isDev) {
-          let envAPiResponse;
-          try {
-            envAPiResponse = await envConnectionAPI();
-            const connectionData = envAPiResponse.data.data;
-            const credentials = {
-              uri: connectionData.uri,
-              password: atob(connectionData.password),
-              userName: connectionData.user_name,
-              database: connectionData.database,
-              isReadonlyUser: !connectionData.write_access,
-              isGds: connectionData.gds_status,
-            };
-            setUserCredentials(credentials);
+          else if (!session) {
+            setUserCredentials(envCredentials);
             localStorage.setItem(
               'neo4j.connection',
               JSON.stringify({
-                uri: credentials.uri,
-                user: credentials.userName,
-                password: btoa(credentials.password),
-                database: credentials.database,
+                uri: envCredentials.uri,
+                user: envCredentials.userName,
+                password: btoa(envCredentials.password),
+                database: envCredentials.database,
                 userDbVectorIndex: 384,
-                isReadOnlyUser: credentials.isReadonlyUser,
-                isGDS: credentials.isGds,
+                isReadOnlyUser: envCredentials.isReadonlyUser,
+                isGDS: envCredentials.isGds,
               })
             );
-            setConnectionStatus(Boolean(connectionData.graph_connection));
-            setIsBackendConnected(true);
+            setConnectionStatus(true);
+            setGdsActive(envCredentials.isGds);
+            setIsReadOnlyUser(envCredentials.isReadonlyUser);
             handleDisconnectButtonState(false);
-          } catch (error) {
-            console.error('Error in DEV no-session handling:', error);
+          }
+        }
+        else {
+          if (session && !isDev) {
+            // For PROD, picking the session values
+            setUserCredentialsFromSession(session as string);
+            setConnectionStatus(true);
             handleDisconnectButtonState(true);
+            return;
+          }
+          else {
             setOpenConnection((prev) => ({ ...prev, openPopUp: true }));
-            setErrorMessage(envAPiResponse?.data.error);
+            handleDisconnectButtonState(true);
           }
-        } else {
-          // For PROD: Open modal to manually connect
-          handleDisconnectButtonState(true);
-          setOpenConnection((prev) => ({ ...prev, openPopUp: true }));
-          setIsBackendConnected(false);
         }
       } catch (error) {
-        console.error('Error in initializeConnection:', error);
-        setIsBackendConnected(false);
+        console.error('Error in DEV session handling:', error);
+        if (session) {
+          setUserCredentialsFromSession(session as string);
+          setConnectionStatus(true);
+        }
+        else {
+          setErrorMessage(backendApiResponse?.data.error);
+          setOpenConnection((prev) => ({ ...prev, openPopUp: true }));
+        }
+        handleDisconnectButtonState(true);
       }
     }
     initializeConnection();
@@ -249,6 +236,7 @@ const PageLayout: React.FC<PageLayoutProp> = () => {
             currentMode: 'graph+vector+fulltext',
           },
         ]);
+        navigate('.', { replace: true, state: null });
       }
     } catch (error) {
       console.log(error);

frontend/src/components/Popups/GraphEnhancementDialog/Deduplication/index.tsx

@@ -104,12 +104,12 @@ export default function DeduplicationTab() {
   const onRemove = (nodeid: string, similarNodeId: string) => {
     setDuplicateNodes((prev) => {
       return prev.map((d) =>
-        (d.e.elementId === nodeid
+        d.e.elementId === nodeid
           ? {
               ...d,
               similar: d.similar.filter((n) => n.elementId != similarNodeId),
             }
-          : d)
+          : d
       );
     });
   };

frontend/src/components/Popups/GraphEnhancementDialog/PostProcessingCheckList/SelectedJobList.tsx

@@ -11,11 +11,11 @@ export default function SelectedJobList({
 }) {
   const ongoingPostProcessingTasks = useMemo(
     () =>
-      (isGdsActive
+      isGdsActive
         ? postProcessingTasks.includes('enable_communities')
           ? postProcessingTasks
           : postProcessingTasks.filter((s) => s != 'enable_communities')
-        : postProcessingTasks.filter((s) => s != 'enable_communities')),
+        : postProcessingTasks.filter((s) => s != 'enable_communities'),
     [isGdsActive, postProcessingTasks]
   );
   return (

frontend/src/utils/Constants.ts

@@ -307,7 +307,7 @@ export const graphLabels = {
   community: 'Communities',
   noNodesRels: 'No Nodes and No relationships',
   neighborView: 'neighborView',
-  chunksInfo: 'We are processing 50 chunks at a time',
+  chunksInfo: 'We are visualizing 50 chunks at a time',
 };
 
 export const RESULT_STEP_SIZE = 25;

frontend/src/utils/Utils.ts

@@ -395,7 +395,7 @@ export const isFileCompleted = (waitingFile: CustomFile, item: SourceNode) =>
   waitingFile && item.status === 'Completed';
 
 export const calculateProcessedCount = (prev: number, batchSize: number) =>
-  (prev === batchSize ? batchSize - 1 : prev + 1);
+  prev === batchSize ? batchSize - 1 : prev + 1;
 
 export const isProcessingFileValid = (item: SourceNode, userCredentials: UserCredentials) => {
   return item.status === 'Processing' && item.fileName != undefined && userCredentials && userCredentials.database;