merge changes

Author: prakriti-solankey

frontend/src/components/Content.tsx

@@ -37,9 +37,6 @@ import FallBackDialog from './UI/FallBackDialog';
 import DeletePopUp from './Popups/DeletePopUp/DeletePopUp';
 import GraphEnhancementDialog from './Popups/GraphEnhancementDialog';
 import { tokens } from '@neo4j-ndl/base';
-import RetryConfirmationDialog from './Popups/RetryConfirmation/Index';
-import retry from '../services/retry';
-import { showErrorToast, showNormalToast, showSuccessToast } from '../utils/toasts';
 import axios from 'axios';
 import DatabaseStatusIcon from './UI/DatabaseStatusIcon';
 import RetryConfirmationDialog from './Popups/RetryConfirmation/Index';
@@ -595,42 +592,6 @@ const Content: React.FC<ContentProps> = ({
     }
   };
 
-  const retryHandler = async (filename: string, retryoption: string) => {
-    try {
-      setRetryLoading(true);
-      const response = await retry(userCredentials as UserCredentials, filename, retryoption);
-      setRetryLoading(false);
-      if (response.data.status === 'Failure') {
-        throw new Error(response.data.error);
-      }
-      const isStartFromBegining = retryoption === RETRY_OPIONS[0] || retryoption===RETRY_OPIONS[1];
-      setFilesData((prev) => {
-        return prev.map((f) => {
-          return f.name === filename
-            ? {
-                ...f,
-                status: 'Reprocess',
-                processingProgress: isStartFromBegining ? 0 : f.processingProgress,
-                NodesCount: isStartFromBegining ? 0 : f.NodesCount,
-                relationshipCount: isStartFromBegining ? 0 : f.relationshipCount,
-              }
-            : f;
-        });
-      });
-      showSuccessToast(response.data.message as string);
-      retryOnclose();
-    } catch (error) {
-      setRetryLoading(false);
-      if (error instanceof Error) {
-        setAlertStateForRetry({
-          showAlert: true,
-          alertMessage: error.message,
-          alertType: 'danger',
-        });
-      }
-    }
-  };
-
   const selectedfileslength = useMemo(
     () => childRef.current?.getSelectedRows().length,
     [childRef.current?.getSelectedRows()]
@@ -979,4 +940,4 @@ const Content: React.FC<ContentProps> = ({
   );
 };
 
-export default Content;
+export default Content;

frontend/src/components/FileTable.tsx

@@ -56,7 +56,7 @@ import { ThemeWrapperContext } from '../context/ThemeWrapper';
 let onlyfortheFirstRender = true;
 
 const FileTable = forwardRef<ChildRef, FileTableProps>((props, ref) => {
-  const { isExpanded, connectionStatus, setConnectionStatus, onInspect } = props;
+  const { isExpanded, connectionStatus, setConnectionStatus, onInspect, onRetry } = props;
   const { filesData, setFilesData, model, rowSelection, setRowSelection, setSelectedRows, setProcessedCount, queue } =
     useFileContext();
   const { userCredentials, isReadOnlyUser } = useCredentials();
@@ -946,4 +946,4 @@ const FileTable = forwardRef<ChildRef, FileTableProps>((props, ref) => {
   );
 });
 
-export default FileTable;
+export default FileTable;

frontend/src/components/Popups/ConnectionModal/ConnectionModal.tsx

@@ -84,11 +84,7 @@ export default function ConnectionModal({
               JSON.stringify({
                 uri: usercredential?.uri,
                 user: usercredential?.userName,
-<<<<<<< HEAD
-                password: usercredential?.password,
-=======
                 password: btoa(usercredential?.password),
->>>>>>> bec4bf517370161c514d6f92eaa2bcfa650e55c8
                 database: usercredential?.database,
                 userDbVectorIndex: 384,
               })
@@ -211,29 +207,20 @@ export default function ConnectionModal({
       if (response?.data?.status !== 'Success') {
         throw new Error(response.data.error);
       } else {
-<<<<<<< HEAD
-=======
         const isgdsActive = response.data.data.gds_status;
         const isReadOnlyUser = !response.data.data.write_access;
         setGdsActive(isgdsActive);
         setIsReadOnlyUser(isReadOnlyUser);
->>>>>>> bec4bf517370161c514d6f92eaa2bcfa650e55c8
         localStorage.setItem(
           'neo4j.connection',
           JSON.stringify({
             uri: connectionURI,
             user: username,
-<<<<<<< HEAD
-            password: password,
-            database: database,
-            userDbVectorIndex,
-=======
             password: btoa(password),
             database: database,
             userDbVectorIndex,
             isgdsActive,
             isReadOnlyUser,
->>>>>>> bec4bf517370161c514d6f92eaa2bcfa650e55c8
           })
         );
         setUserDbVectorIndex(response.data.data.db_vector_dimension);
@@ -473,4 +460,4 @@ export default function ConnectionModal({
       </Dialog>
     </>
   );
-}
+}