Merge branch 'main' into import-task-complete-exception-handling

WildMeOrg · Jan 31, 2025 · 24eda3c · 24eda3c
2 parents 6a8c8ab + 961a7b5
commit 24eda3c
Show file tree

Hide file tree

Showing 20 changed files with 1,155 additions and 11 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -28,6 +28,7 @@
     "react-dom": "^18.2.0",
     "react-hook-form": "^7.52.1",
     "react-intl": "^6.6.2",
+    "react-konva": "^18.2.10",
     "react-paginate": "^8.2.0",
     "react-router-bootstrap": "^0.26.2",
     "react-router-dom": "^6.22.0",
@@ -100,10 +101,13 @@
     "webpack-bundle-analyzer": "^4.10.1",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.1"
-     },
-    "jest":{
+  },
+  "jest": {
     "collectCoverage": true,
-    "coverageReporters": ["lcov", "text"],
+    "coverageReporters": [
+      "lcov",
+      "text"
+    ],
     "coverageDirectory": "./coverage"
   }
 }
diff --git a/frontend/src/AuthenticatedSwitch.jsx b/frontend/src/AuthenticatedSwitch.jsx
@@ -14,6 +14,7 @@ import AdminLogs from "./pages/AdminLogs";
 import ReportEncounter from "./pages/ReportsAndManagamentPages/ReportEncounter";
 import ReportConfirm from "./pages/ReportsAndManagamentPages/ReportConfirm";
 import ProjectList from "./pages/ProjectList";
+import ManualAnnotation from "./pages/ManualAnnotation";
 
 export default function AuthenticatedSwitch({
   showAlert,
@@ -67,6 +68,10 @@ export default function AuthenticatedSwitch({
           <Route path="/reportConfirm" element={<ReportConfirm />} />
           <Route path="/encounter-search" element={<EncounterSearch />} />
           <Route path="/admin/logs" element={<AdminLogs />} />
+          <Route path="/manual-annotation" element={<ManualAnnotation 
+
+          />} />
+
           <Route path="/login" element={<Login />} />
           <Route path="/" element={<Home />} />
           <Route path="*" element={<NotFound setHeader={setHeader} />} />

diff --git a/frontend/src/components/AddAnnotationModal.jsx b/frontend/src/components/AddAnnotationModal.jsx
@@ -0,0 +1,58 @@
+import React from "react";
+import { Button, Modal } from "react-bootstrap";
+import { FormattedMessage } from "react-intl";
+import { useIntl } from "react-intl";
+
+export default function AddAnnotationModal({
+  showModal,
+  setShowModal,
+  incomplete,
+  error,
+}) {
+  const intl = useIntl();
+
+  console.log("error",error)
+
+  return (
+    <Modal show={showModal} onHide={() => setShowModal(false)}>
+      <Modal.Header closeButton>
+        <Modal.Title>
+          <FormattedMessage id="SUBMISSION_FAILED" />
+        </Modal.Title>
+      </Modal.Header>
+      <Modal.Body>
+        {incomplete && intl.formatMessage({ id: "MISSING_REQUIRED_FIELDS" })}
+        {error &&
+          (Array.isArray(error) ? error : [error]).map((error, index) => {
+            return (
+              <div key={index} className="d-flex flex-column">
+                {error.code === "INVALID" && (
+                  <p>
+                    <FormattedMessage id="BEERROR_INVALID" />
+                    {error.fieldName}{" "}
+                  </p>
+                )}
+                {error.code === "REQUIRED" && (
+                  <p>
+                    <FormattedMessage id="BEERROR_REQUIRED" />
+                    {error.fieldName}{" "}
+                  </p>
+                )}
+                {!error.code && (
+                  <p>
+                    <FormattedMessage id="BEERROR_UNKNOWN" />
+                    {error.fieldName}{" "}
+                  </p>
+                )}
+              </div>
+            );
+          })}
+      </Modal.Body>
+      <Modal.Footer>
+        <Button variant="secondary" onClick={() => setShowModal(false)}>
+          <FormattedMessage id="SESSION_CLOSE" />
+        </Button>
+      </Modal.Footer>
+    </Modal>
+  );
+}