queue state updates

Author: kartikpersistent

frontend/src/components/Content.tsx

@@ -31,6 +31,7 @@ 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 Queue from '../utils/Queue';
 const ConnectionModal = lazy(() => import('./Popups/ConnectionModal/ConnectionModal'));
 const ConfirmationDialog = lazy(() => import('./Popups/LargeFilePopUp/ConfirmationDialog'));
 
@@ -80,6 +81,7 @@ const Content: React.FC<ContentProps> = ({
     setSelectedRels,
     postProcessingTasks,
     queue,
+    setQueue,
     processedCount,
     setProcessedCount,
   } = useFileContext();
@@ -334,6 +336,7 @@ const Content: React.FC<ContentProps> = ({
   };
 
   const addFilesToQueue = (remainingFiles: CustomFile[]) => {
+    const newqueue = new Queue([...queue.items]);
     for (let index = 0; index < remainingFiles.length; index++) {
       const f = remainingFiles[index];
       setFilesData((prev) =>
@@ -347,8 +350,9 @@ const Content: React.FC<ContentProps> = ({
           return pf;
         })
       );
-      queue.enqueue(f);
+      newqueue.enqueue(f);
     }
+    setQueue(newqueue);
   };
 
   const scheduleBatchWiseProcess = (selectedRows: CustomFile[], isSelectedFiles: boolean) => {
@@ -473,7 +477,8 @@ const Content: React.FC<ContentProps> = ({
   };
 
   const disconnect = () => {
-    queue.clear();
+    const newemptyqueue = new Queue([]);
+    setQueue(newemptyqueue);
     setProcessedCount(0);
     setConnectionStatus(false);
     localStorage.removeItem('password');
@@ -566,7 +571,8 @@ const Content: React.FC<ContentProps> = ({
         childRef.current?.getSelectedRows() as CustomFile[],
         deleteEntities
       );
-      queue.clear();
+      const newemptyqueue = new Queue([]);
+      setQueue(newemptyqueue);
       setProcessedCount(0);
       setRowSelection({});
       setdeleteLoading(false);

frontend/src/components/FileTable.tsx

@@ -47,11 +47,21 @@ import IconButtonWithToolTip from './UI/IconButtonToolTip';
 import { batchSize, largeFileSize, llms } from '../utils/Constants';
 import IndeterminateCheckbox from './UI/CustomCheckBox';
 import { showErrorToast, showNormalToast } from '../utils/toasts';
+import Queue from '../utils/Queue';
 let onlyfortheFirstRender = true;
 const FileTable = forwardRef<ChildRef, FileTableProps>((props, ref) => {
   const { isExpanded, connectionStatus, setConnectionStatus, onInspect, onRetry } = props;
-  const { filesData, setFilesData, model, rowSelection, setRowSelection, setSelectedRows, setProcessedCount, queue } =
-    useFileContext();
+  const {
+    filesData,
+    setFilesData,
+    model,
+    rowSelection,
+    setRowSelection,
+    setSelectedRows,
+    setProcessedCount,
+    queue,
+    setQueue,
+  } = useFileContext();
   const { userCredentials } = useCredentials();
   const columnHelper = createColumnHelper<CustomFile>();
   const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);
@@ -618,13 +628,14 @@ const FileTable = forwardRef<ChildRef, FileTableProps>((props, ref) => {
         if (res.data.status !== 'Failed') {
           const prefiles: CustomFile[] = [];
           if (res.data.data.length) {
+            const tempqueue = new Queue([...queue.items]);
             res.data.data.forEach((item) => {
               if (item.fileName != undefined && item.fileName.length) {
                 const waitingFile =
                   waitingQueue.length && waitingQueue.find((f: CustomFile) => f.name === item.fileName);
                 if (isFileCompleted(waitingFile as CustomFile, item)) {
                   setProcessedCount((prev) => calculateProcessedCount(prev, batchSize));
-                  queue.remove(item.fileName);
+                  tempqueue.remove(item.fileName);
                 }
                 if (waitingFile && item.status === 'Completed') {
                   setProcessedCount((prev) => {
@@ -633,7 +644,7 @@ const FileTable = forwardRef<ChildRef, FileTableProps>((props, ref) => {
                     }
                     return prev + 1;
                   });
-                  queue.remove(item.fileName);
+                  tempqueue.remove(item.fileName);
                 }
                 prefiles.push({
                   name: item?.fileName,
@@ -674,8 +685,10 @@ const FileTable = forwardRef<ChildRef, FileTableProps>((props, ref) => {
                   : handleLargeFile(item, userCredentials as UserCredentials);
               }
             });
+            setQueue(tempqueue);
           } else {
-            queue.clear();
+            const tempemptyqueue = new Queue([]);
+            setQueue(tempemptyqueue);
           }
           setIsLoading(false);
           setFilesData(prefiles);
@@ -808,7 +821,9 @@ const FileTable = forwardRef<ChildRef, FileTableProps>((props, ref) => {
         }
         return prev + 1;
       });
-      queue.remove(fileName);
+      const tempqueue = new Queue([...queue.items]);
+      tempqueue.remove(fileName);
+      setQueue(tempqueue);
     }
   };
 

frontend/src/hooks/useSse.tsx

@@ -1,13 +1,14 @@
 import { useFileContext } from '../context/UsersFiles';
 import { eventResponsetypes } from '../types';
 import { batchSize } from '../utils/Constants';
+import Queue from '../utils/Queue';
 import { calculateProcessingTime } from '../utils/Utils';
 
 export default function useServerSideEvent(
   alertHandler: (inMinutes: boolean, minutes: number, filename: string) => void,
   errorHandler: (filename: string) => void
 ) {
-  const { setFilesData, setProcessedCount, queue } = useFileContext();
+  const { setFilesData, setProcessedCount, queue, setQueue } = useFileContext();
   function updateStatusForLargeFiles(eventSourceRes: eventResponsetypes) {
     const {
       fileName,
@@ -67,7 +68,9 @@ export default function useServerSideEvent(
         }
         return prev + 1;
       });
-      queue.remove(fileName);
+      const tempqueue = new Queue([...queue.items]);
+      tempqueue.remove(fileName);
+      setQueue(tempqueue);
     } else if (eventSourceRes.status === 'Failed') {
       setFilesData((prevfiles) => {
         return prevfiles.map((curfile) => {

frontend/src/services/CommonAPI.ts

@@ -14,9 +14,7 @@ const apiCall = async (
       formData.append(key, commonParams[key]);
     }
     for (const key in additionalParams) {
-      if (additionalParams.hasOwnProperty(key)) {
-      formData.append(key, additionalParams[key]);
-      }
+        formData.append(key, additionalParams[key]);
     }
     const response: AxiosResponse = await axios({
       method: method,

frontend/src/types.ts

@@ -37,15 +37,14 @@ export interface OptionType {
   readonly label: string;
 }
 
-
 export type UserCredentials = {
   uri: string;
   userName: string;
   password: string;
   database: string;
 } & { [key: string]: any };
 
-export interface SourceNode extends Omit<CustomFileBase,'relationshipCount'> {
+export interface SourceNode extends Omit<CustomFileBase, 'relationshipCount'> {
   fileName: string;
   fileSize: number;
   fileType: string;
@@ -61,7 +60,7 @@ export interface SourceNode extends Omit<CustomFileBase,'relationshipCount'> {
   retry_condition?: string;
 }
 
-export type ExtractParams = Pick<CustomFile,'wiki_query'|'model'|'source_url'|'language'|'access_token'>&{
+export type ExtractParams = Pick<CustomFile, 'wiki_query' | 'model' | 'source_url' | 'language' | 'access_token'> & {
   file?: File;
   aws_access_key_id?: string | null;
   aws_secret_access_key?: string | null;
@@ -75,7 +74,7 @@ export type ExtractParams = Pick<CustomFile,'wiki_query'|'model'|'source_url'|'l
   allowedRelationship?: string[];
   gcs_project_id?: string;
   retry_condition: string;
-} & { [key: string]: any }
+} & { [key: string]: any };
 
 export type UploadParams = {
   file: Blob;
@@ -106,12 +105,10 @@ export interface S3ModalProps {
   hideModal: () => void;
   open: boolean;
 }
-export interface GCSModalProps extends Omit<S3ModalProps,''>{
+export interface GCSModalProps extends Omit<S3ModalProps, ''> {
   openGCSModal: () => void;
 }
 
-
-
 export interface SideNavProps {
   isExpanded: boolean;
   position: 'left' | 'right';
@@ -235,8 +232,7 @@ export type ChatbotProps = {
   clear?: boolean;
   isFullScreen?: boolean;
 };
-export interface WikipediaModalTypes extends Omit<S3ModalProps,''> {
-}
+export interface WikipediaModalTypes extends Omit<S3ModalProps, ''> {}
 
 export interface GraphViewModalProps {
   open: boolean;
@@ -325,7 +321,7 @@ export type alertStateType = {
   alertType: OverridableStringUnion<AlertColor, AlertPropsColorOverrides> | undefined;
   alertMessage: string;
 };
-export interface BannerAlertProps extends Omit<alertStateType,'alertType'>{
+export interface BannerAlertProps extends Omit<alertStateType, 'alertType'> {
   alertType: BannerType;
 }
 export type Scheme = Record<string, string>;
@@ -423,9 +419,9 @@ export interface chatInfoMessage extends Partial<Messages> {
   error: string;
 }
 
-export interface eventResponsetypes extends Omit<SourceNode,'total_chunks'|'processingTime'> {
+export interface eventResponsetypes extends Omit<SourceNode, 'total_chunks' | 'processingTime'> {
   total_chunks: number | null;
-  processingTime:number
+  processingTime: number;
 }
 
 export type Nullable<Type> = Type | null;
@@ -649,4 +645,4 @@ export interface ContextProps {
 export interface MessageContextType {
   messages: Messages[] | [];
   setMessages: Dispatch<SetStateAction<Messages[]>>;
-}
+}