code simplification and warning fix

Author: kartikpersistent

frontend/src/components/BreakDownPopOver.tsx

@@ -1,5 +1,4 @@
 import CustomPopOver from './UI/CustomPopOver';
-import { IconButton } from '@neo4j-ndl/react';
 import { InformationCircleIconOutline } from '@neo4j-ndl/react/icons';
 import { CustomFileBase } from '../types';
 import { useCredentials } from '../context/UserCredentials';
@@ -8,13 +7,7 @@ export default function BreakDownPopOver({ file, isNodeCount = true }: { file: C
   const { isGdsActive } = useCredentials();
 
   return (
-    <CustomPopOver
-      Trigger={
-        <IconButton isClean ariaLabel='infoicon'>
-          <InformationCircleIconOutline className='n-size-token-3' />
-        </IconButton>
-      }
-    >
+    <CustomPopOver Trigger={<InformationCircleIconOutline className='n-size-token-6' />}>
       {isNodeCount ? (
         <ul className='p-2'>
           <li>Chunk Nodes: {file.chunkNodeCount}</li>

frontend/src/components/Content.tsx

@@ -4,7 +4,15 @@ import { Button, Typography, Flex, StatusIndicator, useMediaQuery } from '@neo4j
 import { useCredentials } from '../context/UserCredentials';
 import { useFileContext } from '../context/UsersFiles';
 import { extractAPI } from '../utils/FileAPI';
-import { BannerAlertProps, ChildRef, ContentProps, CustomFile, OptionType, UserCredentials, chunkdata } from '../types';
+import {
+  BannerAlertProps,
+  ContentProps,
+  CustomFile,
+  OptionType,
+  UserCredentials,
+  chunkdata,
+  FileTableHandle,
+} from '../types';
 import deleteAPI from '../services/DeleteFiles';
 import { postProcessing } from '../services/PostProcessing';
 import { triggerStatusUpdateAPI } from '../services/ServerSideStatusUpdateAPI';
@@ -35,7 +43,7 @@ import { useMessageContext } from '../context/UserMessages';
 import PostProcessingToast from './Popups/GraphEnhancementDialog/PostProcessingCheckList/PostProcessingToast';
 import { getChunkText } from '../services/getChunkText';
 import ChunkPopUp from './Popups/ChunkPopUp';
-import { isExpired } from '../utils/Utils';
+import { isExpired, isFileReadyToProcess } from '../utils/Utils';
 
 const ConfirmationDialog = lazy(() => import('./Popups/LargeFilePopUp/ConfirmationDialog'));
 
@@ -106,7 +114,7 @@ const Content: React.FC<ContentProps> = ({
       showErrorToast(`${fileName} Failed to process`);
     }
   );
-  const childRef = useRef<ChildRef>(null);
+  const childRef = useRef<FileTableHandle>(null);
 
   const incrementPage = async () => {
     setCurrentPage((prev) => prev + 1);
@@ -665,74 +673,38 @@ const Content: React.FC<ContentProps> = ({
   const onClickHandler = () => {
     const selectedRows = childRef.current?.getSelectedRows();
     if (selectedRows?.length) {
-      const selectedLargeFiles: CustomFile[] = [];
-      const expiredFiles: CustomFile[] = [];
-      for (let index = 0; index < selectedRows.length; index++) {
-        const parsedData: CustomFile = selectedRows[index];
-        if (
-          parsedData.fileSource === 'local file' &&
-          typeof parsedData.size === 'number' &&
-          (parsedData.status === 'New' || parsedData.status == 'Ready to Reprocess') &&
-          parsedData.size > largeFileSize
-        ) {
-          selectedLargeFiles.push(parsedData);
-        }
-        if (
-          parsedData.fileSource === 'local file' &&
-          (parsedData.status === 'New' || parsedData.status == 'Ready to Reprocess') &&
-          isExpired(parsedData?.createdAt as Date)
-        ) {
-          expiredFiles.push(parsedData);
-        }
-      }
-      if (selectedLargeFiles.length) {
+      const expiredFilesExists = selectedRows.some(
+        (c) => isFileReadyToProcess(c, true) && isExpired(c?.createdAt as Date)
+      );
+      const largeFileExists = selectedRows.some(
+        (c) => isFileReadyToProcess(c, true) && typeof c.size === 'number' && c.size > largeFileSize
+      );
+      if (expiredFilesExists) {
         setshowConfirmationModal(true);
-      } else if (expiredFiles.length && isGCSActive) {
+      } else if (largeFileExists && isGCSActive) {
         setshowExpirationModal(true);
       } else {
-        handleGenerateGraph(selectedRows.filter((f) => f.status === 'New' || f.status === 'Ready to Reprocess'));
+        handleGenerateGraph(selectedRows.filter((f) => isFileReadyToProcess(f, false)));
       }
     } else if (filesData.length) {
-      const largefiles = filesData.filter((f) => {
-        if (
-          typeof f.size === 'number' &&
-          (f.status === 'New' || f.status == 'Ready to Reprocess') &&
-          f.size > largeFileSize
-        ) {
-          return true;
-        }
-        return false;
-      });
-      const expiredFiles = filesData.filter((f) => {
-        console.log(
-          f.fileSource === 'local file'
-            ? { isExpired: isExpired(f?.createdAt as Date), name: f.name, createdAt: f.createdAt }
-            : 'Not Local File'
-        );
-        if (
-          f.fileSource === 'local file' &&
-          (f.status === 'New' || f.status == 'Ready to Reprocess') &&
-          isExpired(f?.createdAt as Date)
-        ) {
-          return true;
-        }
-        return false;
-      });
-      const selectAllNewFiles = filesData.filter((f) => f.status === 'New' || f.status === 'Ready to Reprocess');
+      const expiredFileExists = filesData.some((c) => isFileReadyToProcess(c, true) && isExpired(c.createdAt as Date));
+      const largeFileExists = filesData.some(
+        (c) => isFileReadyToProcess(c, true) && typeof c.size === 'number' && c.size > largeFileSize
+      );
+      const selectAllNewFiles = filesData.filter((f) => isFileReadyToProcess(f, false));
       const stringified = selectAllNewFiles.reduce((accu, f) => {
         const key = f.id;
         // @ts-ignore
         accu[key] = true;
         return accu;
       }, {});
-      console.log(expiredFiles);
       setRowSelection(stringified);
-      if (largefiles.length) {
+      if (largeFileExists) {
         setshowConfirmationModal(true);
-      } else if (expiredFiles.length && isGCSActive) {
+      } else if (expiredFileExists && isGCSActive) {
         setshowExpirationModal(true);
       } else {
-        handleGenerateGraph(filesData.filter((f) => f.status === 'New' || f.status === 'Ready to Reprocess'));
+        handleGenerateGraph(filesData.filter((f) => isFileReadyToProcess(f, false)));
       }
     }
   };

frontend/src/components/FileTable.tsx

@@ -11,7 +11,16 @@ import {
   Checkbox,
   useMediaQuery,
 } from '@neo4j-ndl/react';
-import { forwardRef, useContext, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
+import {
+  forwardRef,
+  useContext,
+  useEffect,
+  useImperativeHandle,
+  useMemo,
+  useRef,
+  useState,
+  ForwardRefRenderFunction,
+} from 'react';
 import {
   useReactTable,
   getCoreRowModel,
@@ -59,7 +68,7 @@ import BreakDownPopOver from './BreakDownPopOver';
 
 let onlyfortheFirstRender = true;
 
-const FileTable = forwardRef<ChildRef, FileTableProps>((props, ref) => {
+const FileTable: ForwardRefRenderFunction<ChildRef, FileTableProps> = (props, ref) => {
   const { connectionStatus, setConnectionStatus, onInspect, onRetry, onChunkView } = props;
   const { filesData, setFilesData, model, rowSelection, setRowSelection, setSelectedRows, setProcessedCount, queue } =
     useFileContext();
@@ -1035,6 +1044,6 @@ const FileTable = forwardRef<ChildRef, FileTableProps>((props, ref) => {
       ) : null}
     </>
   );
-});
+};
 
-export default FileTable;
+export default forwardRef(FileTable);

frontend/src/types.ts

@@ -6,6 +6,7 @@ import type { Node, Relationship } from '@neo4j-nvl/base';
 import { NonOAuthError } from '@react-oauth/google';
 import { BannerType } from '@neo4j-ndl/react';
 import Queue from './utils/Queue';
+import FileTable from './components/FileTable';
 
 export interface CustomFileBase extends Partial<globalThis.File> {
   processingTotalTime: number | string;
@@ -933,3 +934,4 @@ export interface filedate {
     _Time__tzinfo: null;
   };
 }
+export type FileTableHandle = React.ElementRef<typeof FileTable>;

frontend/src/utils/Utils.ts

@@ -538,3 +538,10 @@ export function isExpired(itemdate: Date) {
   const daysdifference = timedifference / (1000 * 3600 * 24);
   return daysdifference > EXPIRATION_DAYS;
 }
+
+export function isFileReadyToProcess(file: CustomFile, withLocalCheck: boolean) {
+  if (withLocalCheck) {
+    return file.fileSource === 'local file' && (file.status === 'New' || file.status == 'Ready to Reprocess');
+  }
+  return file.status === 'New' || file.status == 'Ready to Reprocess';
+}