Tests all pass

apdavison · apdavison · commit 10fdb85b5292 · 2024-01-27T16:22:42.000+01:00
diff --git a/.eslintrc b/.eslintrc
@@ -17,6 +17,7 @@
     "es2020": true
   },
   "rules": {
-    "react/react-in-jsx-scope": "off"
+    "react/react-in-jsx-scope": "off",
+    "react/prop-types": "off"
   }
 }
diff --git a/__tests__/auth.test.js b/__tests__/auth.test.js
@@ -1,7 +1,7 @@
-import { describe, expect, test, vi } from "vitest";
-import { render, screen, getByRole, fireEvent, waitFor } from "@testing-library/react";
+import { describe, test } from "vitest";
+//import { render, screen, getByRole, fireEvent, waitFor } from "@testing-library/react";
 
-import { checkAuth } from "../src/auth";
+//import { checkAuth } from "../src/auth";
 
 describe("checkAuth", () => {
   test("placeholder", () => {});
diff --git a/__tests__/components/CodePanel.test.jsx b/__tests__/components/CodePanel.test.jsx
@@ -1,5 +1,5 @@
-import { describe, expect, test, vi } from "vitest";
-import { render, screen, getByRole, fireEvent, waitFor } from "@testing-library/react";
+import { describe, test } from "vitest";
+import { render } from "@testing-library/react";
 
 import CodePanel from "../../src/components/CodePanel";
 
diff --git a/__tests__/components/CodeWidget.test.jsx b/__tests__/components/CodeWidget.test.jsx
@@ -1,5 +1,5 @@
-import { describe, expect, test, vi } from "vitest";
-import { render, screen, getByRole, fireEvent, waitFor } from "@testing-library/react";
+import { describe, test } from "vitest";
+import { render } from "@testing-library/react";
 
 import CodeWidget from "../../src/components/CodeWidget";
 
diff --git a/__tests__/components/CommentsPanel.test.jsx b/__tests__/components/CommentsPanel.test.jsx
@@ -1,5 +1,5 @@
-import { describe, expect, test, vi } from "vitest";
-import { render, screen, getByRole, fireEvent, waitFor } from "@testing-library/react";
+import { describe, test } from "vitest";
+import { render } from "@testing-library/react";
 import { createMemoryRouter, RouterProvider } from "react-router-dom";
 
 import CommentsPanel from "../../src/components/CommentsPanel";
diff --git a/__tests__/components/CreateJobDialog.test.jsx b/__tests__/components/CreateJobDialog.test.jsx
@@ -1,7 +1,7 @@
-import { describe, expect, test, vi } from "vitest";
-import { render, screen, getByRole, fireEvent, waitFor } from "@testing-library/react";
+import { describe, test } from "vitest";
+//import { render, screen, getByRole, fireEvent, waitFor } from "@testing-library/react";
 
-import CreateJobForm from "../../src/components/CreateJobForm";
+//import CreateJobForm from "../../src/components/CreateJobForm";
 
 describe("CreateJobForm", () => {
   test("placeholder", () => {});
diff --git a/__tests__/components/FilesPanel.test.jsx b/__tests__/components/FilesPanel.test.jsx
@@ -1,5 +1,5 @@
-import { describe, expect, test, vi } from "vitest";
-import { render, screen, getByRole, fireEvent, waitFor } from "@testing-library/react";
+import { describe, test } from "vitest";
+import { render } from "@testing-library/react";
 import { createMemoryRouter, RouterProvider } from "react-router-dom";
 
 import FilesPanel from "../../src/components/FilesPanel";
diff --git a/__tests__/components/JobDetail.test.jsx b/__tests__/components/JobDetail.test.jsx
@@ -1,5 +1,5 @@
-import { describe, expect, test, vi } from "vitest";
-import { render, screen, getByRole, fireEvent, waitFor } from "@testing-library/react";
+import { describe, test } from "vitest";
+import { render } from "@testing-library/react";
 import { createMemoryRouter, RouterProvider } from "react-router-dom";
 
 import JobDetailRoute from "../../src/routes/job-detail";
diff --git a/__tests__/components/JobList.test.jsx b/__tests__/components/JobList.test.jsx
@@ -1,5 +1,5 @@
-import { describe, expect, test, vi } from "vitest";
-import { render, screen, getByRole, fireEvent, waitFor } from "@testing-library/react";
+import { describe, test } from "vitest";
+import { render } from "@testing-library/react";
 import { createMemoryRouter, RouterProvider } from "react-router-dom";
 
 import JobListRoute from "../../src/routes/jobs";
diff --git a/__tests__/components/KeyValueTable.test.jsx b/__tests__/components/KeyValueTable.test.jsx
@@ -1,5 +1,5 @@
-import { describe, expect, test, vi } from "vitest";
-import { render, screen, getByRole, fireEvent, waitFor } from "@testing-library/react";
+import { describe, test } from "vitest";
+import { render } from "@testing-library/react";
 
 import KeyValueTable from "../../src/components/KeyValueTable";
 
diff --git a/__tests__/components/LogPanel.test.jsx b/__tests__/components/LogPanel.test.jsx
@@ -5,7 +5,7 @@ import LogPanel from "../../src/components/LogPanel";
 import { getLog } from "../../src/datastore";
 
 function wait(time) {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     setTimeout(() => {
       resolve("finished");
     }, time);
@@ -26,7 +26,7 @@ describe("LogPanel", () => {
 
   test("should show the content on click", async () => {
     vi.mock("../../src/datastore.js", () => {
-      const promise = new Promise((resolve, reject) => {
+      const promise = new Promise((resolve) => {
         setTimeout(() => {
           resolve("This is the first line of the log.\nThis is the second line.");
         }, 100);
diff --git a/__tests__/components/Panel.test.jsx b/__tests__/components/Panel.test.jsx
@@ -1,17 +1,14 @@
-import { describe, expect, test, vi } from "vitest";
-import { render, screen, getByRole, fireEvent, waitFor } from "@testing-library/react";
+import { describe, test } from "vitest";
+import { render } from "@testing-library/react";
 
 import Panel from "../../src/components/Panel";
 
 describe("Panel", () => {
   test("placeholder", () => {
     render(
-      <Panel
-        label="This is a generic accordion-based panel"
-        children="children"
-        icon="icon"
-        defaultExpanded={true}
-      />
+      <Panel label="This is a generic accordion-based panel" icon="icon" defaultExpanded={true}>
+        children
+      </Panel>
     );
   });
 });
diff --git a/__tests__/components/ProgressIndicator.test.jsx b/__tests__/components/ProgressIndicator.test.jsx
@@ -1,5 +1,5 @@
-import { describe, expect, test, vi } from "vitest";
-import { render, screen, getByRole, fireEvent, waitFor } from "@testing-library/react";
+import { describe, test } from "vitest";
+import { render } from "@testing-library/react";
 
 import ProgressIndicator from "../../src/components/ProgressIndicator";
 
diff --git a/__tests__/components/ProjectList.test.jsx b/__tests__/components/ProjectList.test.jsx
@@ -1,5 +1,5 @@
-import { describe, expect, test, vi } from "vitest";
-import { render, screen, getByRole, fireEvent, waitFor } from "@testing-library/react";
+import { describe, test } from "vitest";
+import { render } from "@testing-library/react";
 import { createMemoryRouter, RouterProvider } from "react-router-dom";
 
 import ProjectListRoute from "../../src/routes/projects";
diff --git a/__tests__/components/Toolbar.test.jsx b/__tests__/components/Toolbar.test.jsx
@@ -1,5 +1,7 @@
-import { describe, expect, test, vi } from "vitest";
-import { render, screen, getByRole, fireEvent, waitFor } from "@testing-library/react";
+// import { describe, expect, test, vi } from "vitest";
+// import { render, screen, getByRole, fireEvent, waitFor } from "@testing-library/react";
+import { describe, test } from "vitest";
+import { render } from "@testing-library/react";
 
 import { BrowserRouter } from "react-router-dom";
 
diff --git a/__tests__/datastore.test.js b/__tests__/datastore.test.js
@@ -1,14 +1,14 @@
-import { describe, expect, test, vi } from "vitest";
-import { render, screen, getByRole, fireEvent, waitFor } from "@testing-library/react";
+import { describe, test } from "vitest";
+//import { render, screen, getByRole, fireEvent, waitFor } from "@testing-library/react";
 
-import {
-  listCollabs,
-  queryJobs,
-  getJob,
-  getLog,
-  getComments,
-  queryProjects,
-} from "../src/datastore";
+// import {
+//   listCollabs,
+//   queryJobs,
+//   getJob,
+//   getLog,
+//   getComments,
+//   queryProjects,
+// } from "../src/datastore";
 
 describe("listCollabs", () => {
   test("placeholder", () => {});
diff --git a/src/components/CodePanel.jsx b/src/components/CodePanel.jsx
@@ -1,6 +1,5 @@
 import SyntaxHighlighter from "react-syntax-highlighter";
 import { docco } from "react-syntax-highlighter/dist/cjs/styles/hljs";
-import { Typography } from "@mui/material";
 import { Code as CodeIcon } from "@mui/icons-material";
 
 import Panel from "./Panel";
diff --git a/src/components/CommentsPanel.jsx b/src/components/CommentsPanel.jsx
@@ -56,7 +56,9 @@ function CommentsPanel(props) {
         </Typography>
       </AccordionSummary>
       <AccordionDetails>
-        {comments.length > 0 ? comments.map((comment) => <Comment {...comment} />) : "No comments"}
+        {comments.length > 0
+          ? comments.map((comment) => <Comment key={comment.comment_id} {...comment} />)
+          : "No comments"}
         <CommentForm job={jobId} onSubmit={handleSubmit} />
       </AccordionDetails>
     </Accordion>
diff --git a/src/components/FileBrowser.jsx b/src/components/FileBrowser.jsx
@@ -70,20 +70,24 @@ function Breadcrumbs(props) {
     const fullPath = fullPaths[index];
     if (fullPath) {
       return (
-        <Link href="#" onClick={() => props.onChangePath(fullPath)}>
+        <Link href="#" onClick={() => props.onChangePath(fullPath)} key={index}>
           <Typography variant="body2">{part}</Typography>
         </Link>
       );
     } else {
-      return <Typography variant="body2">{part}</Typography>;
+      return (
+        <Typography variant="body2" key={index}>
+          {part}
+        </Typography>
+      );
     }
   });
   return (
     <MUIBreadcrumbs sx={{ padding: 1 }}>
       <IconButton onClick={() => props.onChangePath("")}>
         <HomeIcon size="small" color="disabled" />
       </IconButton>
-      {...links}
+      {links}
     </MUIBreadcrumbs>
   );
 }
diff --git a/src/components/FilesPanel.jsx b/src/components/FilesPanel.jsx
@@ -2,7 +2,6 @@ import { useState, useEffect } from "react";
 import { useSubmit } from "react-router-dom";
 
 import {
-  Box,
   Button,
   Card,
   CardContent,
@@ -27,18 +26,6 @@ function removePrefixFromPath(prefix, path) {
   return path.slice(prefix.length);
 }
 
-function formatContentType(contentType) {
-  if (contentType) {
-    return (
-      <Typography variant="body2" color="gray" sx={{ lineHeight: "24px" }} noWrap>
-        {contentType}
-      </Typography>
-    );
-  } else {
-    return "";
-  }
-}
-
 function formatFileSize(size) {
   if (size) {
     let text = `${size} bytes`;
diff --git a/src/components/JobList.jsx b/src/components/JobList.jsx
@@ -113,7 +113,7 @@ function JobList(props) {
       return () => clearInterval(intervalID);
     }
     setFilteredJobs(filterJobs(props.jobs, statusFilter, hardwareFilter, tagFilter));
-  }, [props.jobs, statusFilter, hardwareFilter, tagFilter]);
+  }, [props.jobs, statusFilter, hardwareFilter, tagFilter, revalidator]);
 
   const handleChangeToStatusFilter = (event) => {
     setStatusFilter(event.target.value);
@@ -215,7 +215,7 @@ function JobList(props) {
             </TableRow>
           </TableHead>
           <TableBody>
-            {filteredJobs.map((job, index) => (
+            {filteredJobs.map((job) => (
               <TableRow
                 key={job.id}
                 sx={{
diff --git a/src/components/ProjectList.jsx b/src/components/ProjectList.jsx
@@ -1,4 +1,4 @@
-import { useState, useEffect, Fragment } from "react";
+import { useState, useEffect } from "react";
 
 import { useFetcher } from "react-router-dom";
 
@@ -8,7 +8,6 @@ import Card from "@mui/material/Card";
 import CardContent from "@mui/material/CardContent";
 import Container from "@mui/material/Container";
 import Grid from "@mui/material/Grid";
-import Stack from "@mui/material/Stack";
 import Typography from "@mui/material/Typography";
 
 import EditProjectDialog from "./EditProjectDialog";
diff --git a/src/components/QuotaSelector.jsx b/src/components/QuotaSelector.jsx
@@ -1,4 +1,4 @@
-import { useState, Fragment } from "react";
+import { Fragment } from "react";
 
 import Box from "@mui/material/Box";
 import Checkbox from "@mui/material/Checkbox";
@@ -49,7 +49,7 @@ function QuotaField(props) {
 }
 
 function QuotaSelector(props) {
-  const toggleQuota = (event) => {
+  const toggleQuota = () => {
     if (props.quota) {
       props.setQuota(0);
     } else {
diff --git a/src/datastore.js b/src/datastore.js
@@ -1,5 +1,5 @@
 import { jobQueueServer } from "./globals";
-import { isEmpty, isAlmostEmpty, jobIsIncomplete } from "./utils";
+import { isAlmostEmpty, jobIsIncomplete } from "./utils";
 
 let cache = {
   jobs: {},
diff --git a/src/routes/jobs.jsx b/src/routes/jobs.jsx
@@ -34,7 +34,7 @@ export function submitJob(auth) {
   return wrappedSubmitJob;
 }
 
-function JobListRoute(props) {
+function JobListRoute() {
   const { data } = useLoaderData();
   let { collabId } = useParams();
 
diff --git a/src/routes/projects.jsx b/src/routes/projects.jsx
@@ -17,7 +17,7 @@ export function getLoader(auth) {
   return loader;
 }
 
-function ProjectListRoute(props) {
+function ProjectListRoute() {
   const data = useLoaderData();
   let { collabId } = useParams();
 

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`"es2020": true`
`18`	`18`	`},`
`19`	`19`	`"rules": {`
`20`		`- "react/react-in-jsx-scope": "off"`
	`20`	`+ "react/react-in-jsx-scope": "off",`
	`21`	`+ "react/prop-types": "off"`
`21`	`22`	`}`
`22`	`23`	`}`