Merge pull request #25 from ConnerWithAnE/frontend-main

Frontend main

Author: liminalities

server/src/index.ts

@@ -4,7 +4,7 @@ import cors from "cors";
 import bodyParser from "body-parser";
 import { open, Database } from "sqlite";
 import dotenv from "dotenv";
-import fs from 'fs';
+import fs from "fs";
 
 import { initializeDatabase } from "./database-init";
 

server/src/routes/admin-router.ts

@@ -90,8 +90,15 @@ export default function adminRouter(
     upload.array("pdfs"),
     async (req: Request, res: Response) => {
       try {
-        // TODO
-        if (config.MockData) {
+        if (
+          !config.MockData &&
+          (req.files === undefined || req.files.length === 0)
+        ) {
+          res.status(400).send({
+            message: "No files uploaded.",
+          });
+          return;
+        } else if (config.MockData) {
           import("../../test/testfiles/parse_response.json").then((module) => {
             console.log("Sending mock data...");
             res.send(module.default);
@@ -100,7 +107,7 @@ export default function adminRouter(
           await parsePapers(req.files, gptController).then(
             (result: ai_GPTResponse[]) => {
               console.log(responseToJSON(result));
-              res.send(responseToJSON(result));
+              res.json(result);
             },
           );
         }

web/package-lock.json

@@ -16,15 +16,17 @@
     "@nextui-org/system": "^2.2.6",
     "@nextui-org/theme": "^2.2.11",
     "@types/react-icons": "^3.0.0",
+    "fastest-levenshtein": "^1.0.16",
     "framer-motion": "^11.13.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
+    "react-icons": "^5.4.0",
     "react-router-dom": "^7.0.1",
-    "reacticons": "^0.0.1",
-    "react-icons": "^5.4.0"
+    "reacticons": "^0.0.1"
   },
   "devDependencies": {
     "@eslint/js": "^9.15.0",
+    "@types/node": "^22.13.13",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
     "@vitejs/plugin-react": "^4.3.4",

web/package.json

@@ -5,37 +5,49 @@ import {
   ReactNode,
   useEffect,
 } from "react";
-import { GPTResponse } from "./types/types";
-import { UpdateData } from "./types/types";
+import { GPTResponse, FullDataType, Conflict } from "./types/types";
 
 // Define the shape of the data
 
+type RedConflicts = {
+  id: number;
+  fields: string[];
+};
+
 //updateContact<K extends keyof Contact>(id: number, field: K, value: Contact[K])
 interface TableDataContextType {
-  initialGPTPasses: GPTResponse[]; // Adjust the type of `data` based on your use case
+  initialGPTPasses: GPTResponse[];
   setInitialGPTPasses: (data: GPTResponse[]) => void; // Function to update the data
-  tableEntries: UpdateData[]; // Adjust the type of `data` based on your use case
-  updateEntry: <K extends keyof UpdateData>(
-    id: number,
-    key: string,
-    value: UpdateData[K]
-  ) => void;
-  updateEntry2: (id: number, value: UpdateData) => void;
-  addEntry: (entry: UpdateData) => void;
+  tableEntries: FullDataType[];
+  updateEntry: (id: number, value: FullDataType) => void;
+  addEntry: (entry: FullDataType) => void;
+  removePass: (id: number) => GPTResponse[];
   removeEntry: (id: number) => void;
-  retrieveEntry: (id: number) => UpdateData | undefined;
+  redConflicts: RedConflicts[];
+  setRedConflict: (id: number, fields: string[]) => void;
+  removeRedConflict: (id: number) => void;
+  allConflicts: Conflict[];
+  addConflict: (conflicts: Conflict) => void;
+  removeConflict: (id: number) => void;
+  updateConflict: (id: number, fields: Conflict) => void;
 }
 
 // Define the default value of the context
 const defaultValue: TableDataContextType = {
   initialGPTPasses: [],
   setInitialGPTPasses: () => {},
   updateEntry: () => {},
-  updateEntry2: () => {},
-  addEntry: () => {},
   removeEntry: () => {},
+  addEntry: () => {},
+  removePass: () => [],
   tableEntries: [],
-  retrieveEntry: () => undefined,
+  redConflicts: [],
+  setRedConflict: () => {},
+  removeRedConflict: () => {},
+  allConflicts: [],
+  addConflict: () => {},
+  removeConflict: () => {},
+  updateConflict: () => {},
 };
 
 // Create the context
@@ -48,34 +60,52 @@ export const TableDataFormProvider = ({
   children: ReactNode;
 }) => {
   const [initialGPTPasses, setInitialGPTPasses] = useState<GPTResponse[]>([]);
-  const [tableEntries, setTableEntries] = useState<UpdateData[]>([]);
+  const [tableEntries, setTableEntries] = useState<FullDataType[]>([]);
+  const [redConflicts, setRedConflicts] = useState<RedConflicts[]>([]);
+  const [allConflicts, setAllConflicts] = useState<Conflict[]>(
+    [] as Conflict[]
+  );
 
   useEffect(() => {
-    console.log("Updated contacts:", tableEntries);
-  }, [tableEntries]);
-
-  function updateEntry<K extends keyof UpdateData>(
-    id: number,
-    key: string,
-    value: UpdateData[K]
-  ) {
-    setTableEntries((prev) =>
-      prev.map((entry) =>
-        entry.ROWID === id ? { ...entry, [key]: value } : entry
-      )
-    );
+    console.log("addconflicts", allConflicts);
+  }, [allConflicts]);
+
+  function addConflict(conflicts: Conflict) {
+    setAllConflicts((prev) => {
+      const newConflicts = [...prev];
+      newConflicts.push(conflicts);
+      return newConflicts;
+    });
   }
 
-  function updateEntry2(id: number, value: UpdateData) {
-    setTableEntries((prev) =>
-      prev.map((entry) => (entry.ROWID === id ? { ...value } : entry))
-    );
+  function removeConflict(id: number) {
+    console.log("id", id);
+    setAllConflicts((prev) => {
+      const newConflicts = [...prev];
+      newConflicts.splice(id, 1);
+      return newConflicts;
+    });
+  }
+
+  function updateConflict(id: number, fields: Conflict) {
+    setAllConflicts((prev) => {
+      const updatedConflicts = [...prev];
+      updatedConflicts[id] = fields;
+      return updatedConflicts;
+    });
   }
 
-  function addEntry(entry: UpdateData) {
-    console.log("entry", entry);
+  function updateEntry(id: number, value: FullDataType) {
     setTableEntries((prev) => {
-      const newEntry: UpdateData = {
+      const updatedEntries = [...prev];
+      updatedEntries[id] = value;
+      return updatedEntries;
+    });
+  }
+
+  function addEntry(entry: FullDataType) {
+    setTableEntries((prev) => {
+      const newEntry: FullDataType = {
         ...entry,
       };
 
@@ -84,12 +114,54 @@ export const TableDataFormProvider = ({
     console.log("tableEntries", tableEntries);
   }
 
+  function removePass(id: number) {
+    const updatedPasses: GPTResponse[] = [];
+    for (let i = 0; i < initialGPTPasses.length; i++) {
+      if (i !== id) {
+        updatedPasses.push(initialGPTPasses[i]);
+      }
+    }
+    return updatedPasses;
+  }
+
   function removeEntry(id: number) {
-    setTableEntries((prev) => prev.filter((entry) => entry.ROWID !== id));
+    const newEntries = tableEntries.filter(
+      (entry) => tableEntries[id] !== entry
+    );
+    setTableEntries(newEntries);
+  }
+
+  function setRedConflict(id: number, fields: string[]) {
+    if (!redConflicts.find((conflict) => conflict.id === id)) {
+      setRedConflicts((prev) => {
+        const newConflict: RedConflicts = {
+          id: id,
+          fields: [...fields],
+        };
+        return [...prev, newConflict];
+      });
+    } else {
+      setRedConflicts((prev) => {
+        const newConflicts = prev.map((conflict) => {
+          if (conflict.id === id) {
+            return {
+              id: id,
+              fields: [...fields],
+            };
+          }
+          return conflict;
+        });
+        return newConflicts.filter((conflict) => conflict.fields.length > 0);
+      });
+    }
   }
 
-  function retrieveEntry(id: number) {
-    return tableEntries.find((entry) => entry.ROWID === id);
+  function removeRedConflict(id: number) {
+    setRedConflicts((prev) => {
+      const newConflicts = prev.filter((conflict) => conflict.id !== id);
+      console.log("newConflicts", newConflicts);
+      return newConflicts;
+    });
   }
 
   return (
@@ -98,11 +170,17 @@ export const TableDataFormProvider = ({
         initialGPTPasses,
         setInitialGPTPasses,
         tableEntries,
-        updateEntry,
         addEntry,
+        removePass,
+        updateEntry,
+        redConflicts,
+        setRedConflict,
+        removeRedConflict,
         removeEntry,
-        retrieveEntry,
-        updateEntry2,
+        allConflicts,
+        addConflict,
+        removeConflict,
+        updateConflict,
       }}
     >
       {children}