neo4j-labs
diff --git a/‎frontend/src/API/Index.ts‎
Lines changed: 15 additions & 5 deletions b/‎frontend/src/API/Index.ts‎
Lines changed: 15 additions & 5 deletions
diff --git a/‎frontend/src/components/ChatBot/ChatInfoModal.tsx‎
Lines changed: 3 additions & 6 deletions b/‎frontend/src/components/ChatBot/ChatInfoModal.tsx‎
Lines changed: 3 additions & 6 deletions
diff --git a/‎frontend/src/components/ChatBot/ChatOnlyComponent.tsx‎
Lines changed: 1 addition & 2 deletions b/‎frontend/src/components/ChatBot/ChatOnlyComponent.tsx‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎frontend/src/components/Content.tsx‎
Lines changed: 16 additions & 17 deletions b/‎frontend/src/components/Content.tsx‎
Lines changed: 16 additions & 17 deletions
diff --git a/‎frontend/src/components/Dropdown.tsx‎
Lines changed: 10 additions & 1 deletion b/‎frontend/src/components/Dropdown.tsx‎
Lines changed: 10 additions & 1 deletion
diff --git a/‎frontend/src/components/FileTable.tsx‎
Lines changed: 2 additions & 11 deletions b/‎frontend/src/components/FileTable.tsx‎
Lines changed: 2 additions & 11 deletions
diff --git a/‎frontend/src/components/Graph/GraphViewModal.tsx‎
Lines changed: 10 additions & 2 deletions b/‎frontend/src/components/Graph/GraphViewModal.tsx‎
Lines changed: 10 additions & 2 deletions
diff --git a/‎frontend/src/components/Layout/PageLayout.tsx‎
Lines changed: 5 additions & 8 deletions b/‎frontend/src/components/Layout/PageLayout.tsx‎
Lines changed: 5 additions & 8 deletions
diff --git a/‎frontend/src/components/Popups/ConnectionModal/ConnectionModal.tsx‎
Lines changed: 1 addition & 1 deletion b/‎frontend/src/components/Popups/ConnectionModal/ConnectionModal.tsx‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎frontend/src/components/Popups/GraphEnhancementDialog/Deduplication/index.tsx‎
Lines changed: 6 additions & 1 deletion b/‎frontend/src/components/Popups/GraphEnhancementDialog/Deduplication/index.tsx‎
Lines changed: 6 additions & 1 deletion
@@ -9,11 +9,21 @@ const api = axios.create({
 
 export const createDefaultFormData = (userCredentials: UserCredentials) => {
   const formData = new FormData();
-  if (userCredentials?.uri) formData.append('uri', userCredentials?.uri);
-  if (userCredentials?.database) formData.append('database', userCredentials?.database);
-  if (userCredentials?.userName) formData.append('userName', userCredentials?.userName);
-  if (userCredentials?.password) formData.append('password', userCredentials?.password);
-  if (userCredentials?.email) formData.append('email', userCredentials?.email);
+  if (userCredentials?.uri) {
+    formData.append('uri', userCredentials?.uri);
+  }
+  if (userCredentials?.database) {
+    formData.append('database', userCredentials?.database);
+  }
+  if (userCredentials?.userName) {
+    formData.append('userName', userCredentials?.userName);
+  }
+  if (userCredentials?.password) {
+    formData.append('password', userCredentials?.password);
+  }
+  if (userCredentials?.email) {
+    formData.append('email', userCredentials?.email);
+  }
   api.interceptors.request.use(
     (config) => {
       if (config.data instanceof FormData) {
 
@@ -107,7 +107,6 @@ const ChatInfoModal: React.FC<chatInfoMessage> = ({
         ? false
         : null
   );
-
   const actions: React.ComponentProps<typeof IconButton<'button'>>[] = useMemo(
     () => [
       {
@@ -132,18 +131,15 @@ const ChatInfoModal: React.FC<chatInfoMessage> = ({
   );
 
   useEffect(() => {
+    const abortcontroller = new AbortController();
     if (
       (mode != chatModeLables.graph || error?.trim() !== '') &&
       (!nodes.length || !infoEntities.length || !chunks.length)
     ) {
       (async () => {
         toggleInfoLoading();
         try {
-          const response = await chunkEntitiesAPI(
-            nodeDetails,
-            entities_ids,
-            mode,
-          );
+          const response = await chunkEntitiesAPI(nodeDetails, entities_ids, mode, abortcontroller.signal);
           if (response.data.status === 'Failure') {
             throw new Error(response.data.error);
           }
@@ -195,6 +191,7 @@ const ChatInfoModal: React.FC<chatInfoMessage> = ({
       if (metricsLoading) {
         toggleMetricsLoading();
       }
+      abortcontroller.abort();
     };
   }, [nodeDetails, mode, error, metricsLoading]);
 
 
@@ -43,8 +43,7 @@ const ChatContent: React.FC<ChatProps> = ({ chatMessages }) => {
       } else {
         setOpenConnection((prev) => ({ ...prev, openPopUp: true }));
       }
-    }
-    else {
+    } else {
       const credentialsForAPI: UserCredentials = {
         uri,
         userName: user,
 
@@ -72,6 +72,7 @@ const Content: React.FC<ContentProps> = ({
   const [currentPage, setCurrentPage] = useState<number>(0);
   const [totalPageCount, setTotalPageCount] = useState<number | null>(null);
   const [textChunks, setTextChunks] = useState<chunkdata[]>([]);
+  const chunksTextAbortController = useRef<AbortController>();
 
   const [alertStateForRetry, setAlertStateForRetry] = useState<BannerAlertProps>({
     showAlert: false,
@@ -103,9 +104,9 @@ const Content: React.FC<ContentProps> = ({
     additionalInstructions,
     setAdditionalInstructions,
   } = useFileContext();
-  const [viewPoint, setViewPoint] = useState<'tableView' | 'showGraphView' | 'chatInfoView' | 'neighborView'|'showSchemaView'>(
-    'tableView'
-  );
+  const [viewPoint, setViewPoint] = useState<
+    'tableView' | 'showGraphView' | 'chatInfoView' | 'neighborView' | 'showSchemaView'
+  >('tableView');
   const [showDeletePopUp, setShowDeletePopUp] = useState<boolean>(false);
   const [deleteLoading, setIsDeleteLoading] = useState<boolean>(false);
 
@@ -221,8 +222,9 @@ const Content: React.FC<ContentProps> = ({
     });
   };
   const getChunks = async (name: string, pageNo: number) => {
+    chunksTextAbortController.current = new AbortController();
     toggleChunksLoading();
-    const response = await getChunkText(name, pageNo);
+    const response = await getChunkText(name, pageNo, chunksTextAbortController.current.signal);
     setTextChunks(response.data.data.pageitems);
     if (!totalPageCount) {
       setTotalPageCount(response.data.data.total_pages);
@@ -271,11 +273,7 @@ const Content: React.FC<ContentProps> = ({
       });
       if (fileItem.name != undefined && userCredentials != null) {
         const { name } = fileItem;
-        triggerStatusUpdateAPI(
-          name as string,
-          userCredentials,
-          updateStatusForLargeFiles
-        );
+        triggerStatusUpdateAPI(name as string, userCredentials, updateStatusForLargeFiles);
       }
 
       const apiResponse = await extractAPI(
@@ -544,12 +542,14 @@ const Content: React.FC<ContentProps> = ({
     let finalUrl = bloomUrl;
     if (userCredentials?.database && userCredentials.uri && userCredentials.userName) {
       const uriCoded = userCredentials.uri.replace(/:\d+$/, '');
-      const connectURL = `${uriCoded.split('//')[0]}//${userCredentials.userName}@${uriCoded.split('//')[1]}:${userCredentials.port ?? '7687'}`;
+      const connectURL = `${uriCoded.split('//')[0]}//${userCredentials.userName}@${uriCoded.split('//')[1]}:${
+        userCredentials.port ?? '7687'
+      }`;
       const encodedURL = encodeURIComponent(connectURL);
       finalUrl = bloomUrl?.replace('{CONNECT_URL}', encodedURL);
     }
     window.open(finalUrl, '_blank');
-   };
+  };
 
   const handleGraphView = () => {
     setOpenGraphView(true);
@@ -855,7 +855,10 @@ const Content: React.FC<ContentProps> = ({
       {showChunkPopup && (
         <ChunkPopUp
           chunksLoading={chunksLoading}
-          onClose={() => toggleChunkPopup()}
+          onClose={() => {
+            chunksTextAbortController.current?.abort();
+            toggleChunkPopup();
+          }}
           showChunkPopup={showChunkPopup}
           chunks={textChunks}
           incrementPage={incrementPage}
@@ -885,11 +888,7 @@ const Content: React.FC<ContentProps> = ({
           <div className='connectionstatus__container'>
             <span className='h6 px-1'>Neo4j connection {isReadOnlyUser ? '(Read only Mode)' : ''}</span>
             <Typography variant='body-medium'>
-              <DatabaseStatusIcon
-                isConnected={connectionStatus}
-                isGdsActive={isGdsActive}
-                uri={userCredentials?.uri}
-              />
+              <DatabaseStatusIcon isConnected={connectionStatus} isGdsActive={isGdsActive} uri={userCredentials?.uri} />
               <div className='pt-1 flex gap-1 items-center'>
                 <div>{!hasSelections ? <StatusIndicator type='danger' /> : <StatusIndicator type='success' />}</div>
                 <div>
 
@@ -3,6 +3,8 @@ import { OptionType, ReusableDropdownProps } from '../types';
 import { memo, useMemo } from 'react';
 import { capitalize, capitalizeWithUnderscore } from '../utils/Utils';
 import { prodllms } from '../utils/Constants';
+import { InformationCircleIconOutline } from '@neo4j-ndl/react/icons';
+
 const DropdownComponent: React.FC<ReusableDropdownProps> = ({
   options,
   placeholder,
@@ -29,7 +31,14 @@ const DropdownComponent: React.FC<ReusableDropdownProps> = ({
         <Select
           type='select'
           label='LLM Models'
-          helpText={<div className='!w-max'> LLM Model used for Extraction & Chat</div>}
+          helpText={
+            <div className='!w-max flex gap-1 items-center'>
+              <span>
+                <InformationCircleIconOutline title='info' aria-label='infoicon' className='n-size-token-6' />
+              </span>
+              <span>LLM Model used for Extraction & Chat</span>
+            </div>
+          }
           selectProps={{
             onChange: handleChange,
             // @ts-ignore
 
@@ -683,20 +683,11 @@ const FileTable: ForwardRefRenderFunction<ChildRef, FileTableProps> = (props, re
   };
 
   const handleSmallFile = (item: SourceNode, userCredentials: UserCredentials) => {
-    subscribe(
-      item.fileName,
-      userCredentials,
-      updatestatus,
-      updateProgress
-    ).catch(handleFileUploadError);
+    subscribe(item.fileName, userCredentials, updatestatus, updateProgress).catch(handleFileUploadError);
   };
 
   const handleLargeFile = (item: SourceNode, userCredentials: UserCredentials) => {
-    triggerStatusUpdateAPI(
-      item.fileName,
-      userCredentials,
-      updateStatusForLargeFiles
-    );
+    triggerStatusUpdateAPI(item.fileName, userCredentials, updateStatusForLargeFiles);
   };
   useEffect(() => {
     const waitingQueue: CustomFile[] = JSON.parse(
 
@@ -58,6 +58,7 @@ const GraphViewModal: React.FunctionComponent<GraphViewModalProps> = ({
   const [disableRefresh, setDisableRefresh] = useState<boolean>(false);
   const [selected, setSelected] = useState<{ type: EntityType; id: string } | undefined>(undefined);
   const [mode, setMode] = useState<boolean>(false);
+  const graphQueryAbortControllerRef = useRef<AbortController>();
 
   const graphQuery: string =
     graphType.includes('DocumentChunk') && graphType.includes('Entities')
@@ -109,17 +110,23 @@ const GraphViewModal: React.FunctionComponent<GraphViewModalProps> = ({
   }, [allNodes]);
 
   const fetchData = useCallback(async () => {
+    graphQueryAbortControllerRef.current = new AbortController();
     try {
       let nodeRelationshipData;
       if (viewPoint === graphLabels.showGraphView) {
         nodeRelationshipData = await graphQueryAPI(
           graphQuery,
-          selectedRows?.map((f) => f.name)
+          selectedRows?.map((f) => f.name),
+          graphQueryAbortControllerRef.current.signal
         );
       } else if (viewPoint === graphLabels.showSchemaView) {
         nodeRelationshipData = await getGraphSchema();
       } else {
-        nodeRelationshipData = await graphQueryAPI(graphQuery, [inspectedName ?? '']);
+        nodeRelationshipData = await graphQueryAPI(
+          graphQuery,
+          [inspectedName ?? ''],
+          graphQueryAbortControllerRef.current.signal
+        );
       }
       return nodeRelationshipData;
     } catch (error: any) {
@@ -310,6 +317,7 @@ const GraphViewModal: React.FunctionComponent<GraphViewModalProps> = ({
 
   // when modal closes reset all states to default
   const onClose = () => {
+    graphQueryAbortControllerRef?.current?.abort();
     setStatus('unknown');
     setStatusMessage('');
     setGraphViewOpen(false);
 
@@ -115,22 +115,21 @@ const PageLayout: React.FC = () => {
             email: user?.email ?? '',
             connection: 'backendApi',
           };
-          //setChunksToBeProces(credentials.chunksTobeProcess);
+          // setChunksToBeProces(credentials.chunksTobeProcess);
           setIsGCSActive(credentials.isGCSActive);
           setUserCredentials(credentials);
           createDefaultFormData({ uri: credentials.uri, email: credentials.email ?? '' });
           setGdsActive(credentials.isgdsActive);
           setConnectionStatus(Boolean(connectionData.data.graph_connection));
           setIsReadOnlyUser(connectionData.data.isReadonlyUser);
           handleDisconnectButtonState(false);
-        }
-        else if (!connectionData.data && connectionData.status === 'Success') {
+        } else if (!connectionData.data && connectionData.status === 'Success') {
           const storedCredentials = localStorage.getItem('neo4j.connection');
           if (storedCredentials) {
             const credentials = JSON.parse(storedCredentials);
             setUserCredentials({ ...credentials, password: atob(credentials.password) });
             createDefaultFormData({ ...credentials, password: atob(credentials.password) });
-            //setChunksToBeProces(credentials.chunksTobeProcess);
+            // setChunksToBeProces(credentials.chunksTobeProcess);
             setIsGCSActive(credentials.isGCSActive);
             setGdsActive(credentials.isgdsActive);
             setConnectionStatus(Boolean(credentials.connection === 'connectAPI'));
@@ -144,7 +143,7 @@ const PageLayout: React.FC = () => {
           setErrorMessage(backendApiResponse?.data?.error);
           setOpenConnection((prev) => ({ ...prev, openPopUp: true }));
           handleDisconnectButtonState(true);
-          console.log('from else cndition error is there')
+          console.log('from else cndition error is there');
         }
       } catch (error) {
         if (error instanceof Error) {
@@ -160,9 +159,7 @@ const PageLayout: React.FC = () => {
       setClearHistoryData(true);
       setIsDeleteChatLoading(true);
       cancel();
-      const response = await clearChatAPI(
-        sessionStorage.getItem('session_id') ?? ''
-      );
+      const response = await clearChatAPI(sessionStorage.getItem('session_id') ?? '');
       setIsDeleteChatLoading(false);
       if (response.data.status === 'Success') {
         const date = new Date();
 
@@ -255,7 +255,7 @@ export default function ConnectionModal({
             isGCSActive,
             chunksTobeProcess,
             email: user?.email ?? '',
-            connection:'connectAPI',
+            connection: 'connectAPI',
           })
         );
         setUserDbVectorIndex(response.data.data.db_vector_dimension);
 
@@ -48,11 +48,12 @@ export default function DeduplicationTab() {
   const [viewPoint, setViewPoint] = useState('');
   const [nodesCount, setNodesCount] = useState<number>(0);
   const { colorMode } = useContext(ThemeWrapperContext);
+  const abortRef = useRef<AbortController>();
 
   const fetchDuplicateNodes = useCallback(async () => {
     try {
       setLoading(true);
-      const duplicateNodesData = await getDuplicateNodes();
+      const duplicateNodesData = await getDuplicateNodes(abortRef?.current?.signal as AbortSignal);
       setLoading(false);
       if (duplicateNodesData.data.status === 'Failed') {
         throw new Error(duplicateNodesData.data.error);
@@ -71,11 +72,15 @@ export default function DeduplicationTab() {
   }, [userCredentials]);
 
   useEffect(() => {
+    abortRef.current = new AbortController();
     if (userCredentials != null) {
       (async () => {
         await fetchDuplicateNodes();
       })();
     }
+    return () => {
+      abortRef.current?.abort();
+    };
   }, [userCredentials]);
 
   const clickHandler = async () => {