Merge branch 'main' into mantamatcher.org

# Conflicts:
#	src/main/resources/emails/en/passwordReset.html
#	src/main/webapp/images/favicon.ico
#	src/main/webapp/whoAreWe.jsp

Author: holmbergius

frontend/package-lock.json

@@ -23,17 +23,19 @@
     "react": "^18.2.0",
     "react-bootstrap": "^2.10.1",
     "react-burger-menu": "^3.0.9",
+    "react-circular-progressbar": "^2.2.0",
     "react-data-table-component": "^7.6.2",
     "react-datetime": "^3.2.0",
     "react-dom": "^18.2.0",
-    "react-hook-form": "^7.52.1",
+    "react-icons": "^4.12.0",
     "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",
     "react-scripts": "5.0.1",
     "react-select": "^5.8.0",
+    "react-window": "^1.8.11",
     "sass": "^1.71.1",
     "web-vitals": "^2.1.4",
     "webpack-merge": "^5.10.0",
@@ -80,6 +82,7 @@
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@eslint/js": "^9.9.1",
+    "@tanstack/react-table": "^8.21.3",
     "@testing-library/jest-dom": "^6.5.0",
     "@testing-library/react": "^16.0.1",
     "bootstrap-icons": "^1.11.3",
@@ -93,15 +96,17 @@
     "jest": "^27.5.1",
     "react-app-rewired": "^2.2.1",
     "react-bootstrap-icons": "^1.11.3",
+    "react-hook-form": "^7.55.0",
     "react-query": "^3.39.3",
     "style-loader": "^3.3.4",
     "styled-components": "^6.1.8",
     "terser-webpack-plugin": "^5.3.10",
+    "ts-jest": "^27.0.7",
     "unused-webpack-plugin": "^2.4.0",
     "webpack": "^5.94.0",
     "webpack-bundle-analyzer": "^4.10.1",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.1",
-    "ts-jest":"^27.0.7"
+    "xlsx": "^0.18.5"
   }
 }

frontend/package.json

@@ -1,4 +1,5 @@
 import React, { lazy, Suspense } from "react";
+
 import { Routes, Route } from "react-router-dom";
 import NotFound from "./pages/errorPages/NotFound";
 import AuthenticatedAppHeader from "./components/AuthenticatedAppHeader";
@@ -23,6 +24,9 @@ const ReportConfirm = lazy(
 const ProjectList = lazy(() => import("./pages/ProjectList"));
 const ManualAnnotation = lazy(() => import("./pages/ManualAnnotation"));
 
+const BulkImport = lazy(() => import("./pages/BulkImport/BulkImport"));
+const BulkImportTask = lazy(() => import("./pages/BulkImport/BulkImportTask"));
+
 export default function AuthenticatedSwitch({
   showclassicsubmit,
   showClassicEncounterSearch,
@@ -74,6 +78,8 @@ export default function AuthenticatedSwitch({
             <Route path="/encounter-search" element={<EncounterSearch />} />
             <Route path="/admin/logs" element={<AdminLogs />} />
             <Route path="/manual-annotation" element={<ManualAnnotation />} />
+            <Route path="/bulk-import" element={<BulkImport />} />
+            <Route path="/bulk-import-task" element={<BulkImportTask />} />
             <Route path="/login" element={<Login />} />
             <Route path="/" element={<Home />} />
             <Route path="*" element={<NotFound setHeader={setHeader} />} />

frontend/src/AuthenticatedSwitch.jsx

@@ -29,15 +29,20 @@ export default function FrontDesk() {
   const showClassicEncounterSearch = data?.showClassicEncounters;
   const checkLoginStatus = () => {
     axios
-      .head("/api/v3/user")
+      .head("/api/v3/user", { timeout: 5000 })
       .then((response) => {
-        setIsLoggedIn(response.status === 200);
+        if (response.status === 200) {
+          setIsLoggedIn(true);
+        }
         setLoading(false);
       })
       .catch((error) => {
-        console.log("Error", error);
+        if (error.response?.status === 401) {
+          setIsLoggedIn(false);
+        } else {
+          console.warn("Login status check failed (non-401):", error.message);
+        }
         setLoading(false);
-        setIsLoggedIn(false);
       });
   };
 
@@ -61,6 +66,14 @@ export default function FrontDesk() {
     return () => clearInterval(intervalId);
   }, []);
 
+  useEffect(() => {
+    const handleOnline = () => {
+      checkLoginStatus();
+    };
+    window.addEventListener("online", handleOnline);
+    return () => window.removeEventListener("online", handleOnline);
+  }, []);
+
   useEffect(() => {
     if (isLoggedIn) {
       getAllNotifications();
@@ -95,18 +108,10 @@ export default function FrontDesk() {
     );
   }
 
-  if (!isLoggedIn) {
-    return (
-      <AuthContext.Provider
-        value={{
-          isLoggedIn,
-        }}
-      >
-        <GoogleTagManager />
-        <UnauthenticatedSwitch showclassicsubmit={showclassicsubmit} />
-      </AuthContext.Provider>
-    );
-  }
-
-  return <h1>Loading</h1>;
+  return (
+    <AuthContext.Provider value={{ isLoggedIn }}>
+      <GoogleTagManager />
+      <UnauthenticatedSwitch showclassicsubmit={showclassicsubmit} />
+    </AuthContext.Provider>
+  );
 }

frontend/src/FrontDesk.jsx

@@ -0,0 +1,62 @@
+import React from "react";
+import { render, screen } from "@testing-library/react";
+import ErrorSummaryBar from "../../../pages/BulkImport/BulkImportErrorSummaryBar";
+
+jest.mock("react-intl", () => ({
+  FormattedMessage: ({ id }) => <span>{id}</span>,
+}));
+
+describe("ErrorSummaryBar", () => {
+  const renderWithStore = (validationErrors, emptyFieldCount = 0) => {
+    const store = { validationErrors, emptyFieldCount };
+    render(<ErrorSummaryBar store={store} />);
+  };
+
+  test("shows zeros when there are no errors and no empty fields", () => {
+    renderWithStore({}, 0);
+
+    expect(screen.getByText(/BULK_IMPORT_ERROR/i)).toBeInTheDocument();
+    expect(screen.getByText(/BULK_IMPORT_MISSING_FIELD/i)).toBeInTheDocument();
+    expect(screen.getByText(/BULK_IMPORT_EMPTY_FIELD/i)).toBeInTheDocument();
+    const items = screen.getAllByText(/\d+/);
+    expect(items).toHaveLength(3);
+  });
+
+  test("correctly counts required vs invalid/missing errors", () => {
+    const errors = {
+      row1: {
+        colA: "This field is required",
+        colB: "Invalid format detected",
+        colC: "Value missing in submission",
+      },
+      row2: {
+        colX: "Required value not provided",
+        colY: "unexpected value",
+      },
+    };
+    renderWithStore(errors, 2);
+
+    expect(screen.getByText(/BULK_IMPORT_ERROR/i)).toBeInTheDocument();
+    expect(screen.getByText(/BULK_IMPORT_MISSING_FIELD/i)).toBeInTheDocument();
+    expect(screen.getByText(/BULK_IMPORT_EMPTY_FIELD/i)).toBeInTheDocument();
+    const items = screen.getAllByText(/\d+/);
+    expect(items).toHaveLength(3);
+  });
+
+  test("renders container with correct id and badge classes", () => {
+    const errors = {
+      r1: { a: "required" },
+    };
+    renderWithStore(errors, 5);
+
+    const container = document.querySelector("#bulk-import-error-summary-bar");
+    expect(container).toBeInTheDocument();
+    expect(container).toHaveClass("d-flex", "gap-2", "py-2");
+
+    const badges = container.querySelectorAll(".badge");
+    expect(badges.length).toBe(3);
+    expect(badges[0]).toHaveClass("bg-danger");
+    expect(badges[1]).toHaveClass("bg-danger");
+    expect(badges[2]).toHaveClass("bg-primary");
+  });
+});

frontend/src/__tests__/pages/BulkImport/BulkImortErrorSummary.test.js

@@ -0,0 +1,142 @@
+import React from "react";
+import { render, screen, waitFor } from "@testing-library/react";
+import "@testing-library/jest-dom";
+import BulkImport from "../../../pages/BulkImport/BulkImport";
+import BulkImportStore from "../../../pages/BulkImport/BulkImportStore";
+import useGetBulkImportTask from "../../../models/bulkImport/useGetBulkImportTask";
+
+jest.mock("../../../pages/BulkImport/BulkImportImageUpload", () => ({
+  BulkImportImageUpload: () => <div data-testid="image-upload" />,
+}));
+jest.mock("../../../pages/BulkImport/BulkImportUploadProgress", () => ({
+  BulkImportUploadProgress: () => <div data-testid="upload-progress" />,
+}));
+jest.mock("../../../pages/BulkImport/BulkImportSpreadsheet", () => ({
+  BulkImportSpreadsheet: () => <div data-testid="spreadsheet" />,
+}));
+jest.mock("../../../pages/BulkImport/BulkImportTableReview", () => ({
+  BulkImportTableReview: () => <div data-testid="table-review" />,
+}));
+jest.mock("../../../pages/BulkImport/BulkImportSetLocation", () => ({
+  BulkImportSetLocation: () => <div data-testid="set-location" />,
+}));
+jest.mock("../../../pages/BulkImport/BulkImportContinueModal", () => ({
+  BulkImportContinueModal: () => <div data-testid="continue-modal" />,
+}));
+jest.mock("../../../pages/BulkImport/BulkImportUnfinishedTaskModal", () => ({
+  BulkImportUnfinishedTaskModal: () => <div data-testid="unfinished-modal" />,
+}));
+
+jest.mock("../../../pages/BulkImport/BulkImportInstructionsModal", () => {
+  const MockInstructionsModal = () => <div data-testid="instructions-modal" />;
+  MockInstructionsModal.displayName = "BulkImportInstructionsModal";
+  return MockInstructionsModal;
+});
+jest.mock("../../../pages/BulkImport/BulkImportDraftSavedIndicator", () => {
+  const MockDraftIndicator = () => <div data-testid="draft-indicator" />;
+  MockDraftIndicator.displayName = "DraftSaveIndicator";
+  return MockDraftIndicator;
+});
+
+jest.mock("../../../pages/BulkImport/BulkImportStore");
+jest.mock("../../../models/bulkImport/useGetBulkImportTask");
+
+describe("BulkImport Component", () => {
+  let storeMock;
+
+  beforeEach(() => {
+    localStorage.clear();
+    jest.clearAllMocks();
+
+    storeMock = {
+      activeStep: 0,
+      uploadedImages: [],
+      spreadsheetData: [],
+      submissionId: null,
+      saveState: jest.fn(),
+    };
+    BulkImportStore.mockImplementation(() => storeMock);
+
+    useGetBulkImportTask.mockReturnValue({ task: null });
+  });
+
+  const renderComponent = () => render(<BulkImport />);
+
+  it("renders header and fixed child components", () => {
+    renderComponent();
+    expect(
+      screen.getByRole("heading", { name: /BULK_IMPORT/i }),
+    ).toBeInTheDocument();
+    expect(screen.getByTestId("upload-progress")).toBeInTheDocument();
+    expect(screen.getByTestId("draft-indicator")).toBeInTheDocument();
+    expect(screen.getByTestId("instructions-modal")).toBeInTheDocument();
+  });
+
+  it("shows only the image‐upload step when activeStep is 0", () => {
+    storeMock.activeStep = 0;
+    renderComponent();
+    expect(screen.getByTestId("image-upload")).toBeVisible();
+    expect(screen.queryByTestId("spreadsheet")).toBeNull();
+    expect(screen.queryByTestId("table-review")).toBeNull();
+    expect(screen.queryByTestId("set-location")).toBeNull();
+  });
+
+  it("shows the spreadsheet step when activeStep is 1", async () => {
+    storeMock.activeStep = 1;
+    renderComponent();
+    await waitFor(() => {
+      expect(screen.getByTestId("spreadsheet")).toBeVisible();
+    });
+    expect(screen.queryByTestId("image-upload")).not.toBeVisible();
+  });
+
+  it("shows table‐review at step 2 and set‐location at step 3", async () => {
+    storeMock.activeStep = 2;
+    renderComponent();
+    await waitFor(() => {
+      expect(screen.getByTestId("table-review")).toBeVisible();
+    });
+
+    jest.clearAllMocks();
+    storeMock.activeStep = 3;
+    renderComponent();
+    await waitFor(() => {
+      expect(screen.getByTestId("set-location")).toBeVisible();
+    });
+  });
+
+  it("displays ContinueModal when there is a saved submissionId", () => {
+    localStorage.setItem(
+      "BulkImportStore",
+      JSON.stringify({ submissionId: "abc123" }),
+    );
+    renderComponent();
+    expect(screen.getByTestId("continue-modal")).toBeInTheDocument();
+  });
+
+  it("shows UnfinishedTaskModal for an in‐progress task", () => {
+    localStorage.setItem("lastBulkImportTask", "task-xyz");
+    useGetBulkImportTask.mockReturnValue({
+      task: {
+        status: "processing",
+        sourceName: "file1",
+        dateCreated: "2025-07-02",
+      },
+    });
+    renderComponent();
+    expect(screen.getByTestId("unfinished-modal")).toBeInTheDocument();
+  });
+
+  it("does not show UnfinishedTaskModal when task is complete", () => {
+    localStorage.setItem("lastBulkImportTask", "task-xyz");
+    useGetBulkImportTask.mockReturnValue({
+      task: {
+        status: "complete",
+        sourceName: "file1",
+        dateCreated: "2025-07-02",
+      },
+    });
+    renderComponent();
+    expect(screen.queryByTestId("unfinished-modal")).toBeNull();
+  });
+});