Merge branch 'develop' into main

Author: codeafix

docker.compose docker-compose.ymldocker.compose renamed to docker-compose.yml

@@ -9,18 +9,18 @@
     "@types/node": "^20.11.19",
     "@types/react": "^18.2.55",
     "@types/react-dom": "^18.2.19",
-    "@vitejs/plugin-react": "^4.2.1",
-    "bootstrap": "5.0.0",
-    "d3": "^7.8.5",
-    "jquery": "^3.6.0",
+    "@vitejs/plugin-react": "^4.3.0",
+    "bootstrap": "5.3.8",
+    "d3": "7.9.0",
+    "jquery": "4.0.0",
     "react": "^18.2.0",
     "react-bootstrap": "^1.5.2",
     "react-bootstrap-icons": "^1.4.0",
     "react-dom": "^18.2.0",
-    "react-router-dom": "^5.3.3",
+    "react-router-dom": "7.13.2",
     "typescript": "^5.3.3",
     "underscore": "^1.13.8",
-    "vite": "^5.4.21",
+    "vite": "^6.0.0",
     "vite-tsconfig-paths": "^4.3.1"
   },
   "scripts": {
@@ -45,9 +45,8 @@
   "devDependencies": {
     "@testing-library/react": "^14.2.1",
     "@types/jsdom": "^21.1.6",
-    "@types/react-router-dom": "^5.3.3",
-    "@vitest/coverage-v8": "^1.3.1",
+    "@vitest/coverage-v8": "4.1.2",
     "jsdom": "^24.0.0",
-    "vitest": "^1.3.1"
+    "vitest": "4.1.2"
   }
 }

web/package-lock.json

@@ -6,21 +6,20 @@ import { test, expect } from 'vitest'
 import { vi } from 'vitest'
 import { act } from 'react-dom/test-utils';
 import Simulation from './Simulation';
-import { BrowserRouter } from 'react-router-dom';
+import { MemoryRouter, Route, Routes } from 'react-router-dom';
 
 vi.mock('../API/api');
 
 test('renders without crashing', async () => {
     var result:any;
     await act(async () => {
         result = render(
-            <BrowserRouter>
-                <Simulation match={{
-                        params: {
-                            id: ''
-                        }
-                    }}/>
-            </BrowserRouter>
+            <MemoryRouter initialEntries={['/simulation/']}>
+                <Routes>
+                    <Route path='/simulation/:id' element={<Simulation/>}/>
+                    <Route path='/simulation/' element={<Simulation/>}/>
+                </Routes>
+            </MemoryRouter>
         );
     });
     expect(result).toBeDefined();

web/package.json

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import API from '../API/api';
-import {Link} from 'react-router-dom';
+import {Link, useParams} from 'react-router-dom';
 import {ArrowLeftCircle} from 'react-bootstrap-icons';
 import {Card, Button, Row, Col, Container} from 'react-bootstrap'
 import EditNameDescModal from '../Home/EditNameDescModal'
@@ -10,28 +10,21 @@ import StepsCard from './StepsCard'
 import { SimInfo } from '../API/SimInfo';
 import { Step } from '../API/Step';
 
-type SimulationProps = {
-    match: {
-        params: {
-            id: string;
-        }
-    }
-}
-
-const Simulation = (props:SimulationProps) => {
+const Simulation = () => {
+    const { id = '' } = useParams<{ id: string }>();
     const [sim, setSim] = useState<SimInfo>(API.emptySim());
     const [simsteps, setSimsteps] = useState<Array<Step>>([]);
     const [showsimeditmodal, setShowsimeditmodal] = useState<boolean>(false);
 
     useEffect(() => {
-        readsim(props.match.params.id);
-      }, [props.match.params.id]);
+        readsim(id);
+      }, [id]);
 
     const handlesimeditshow = () => setShowsimeditmodal(true);
     const handlesimeditclose = () => setShowsimeditmodal(false);
 
-    const readsim = (id:string) => {
-        API.get(id).then(sresp => {
+    const readsim = (simid:string) => {
+        API.get(simid).then(sresp => {
             setSim(sresp);
             API.getSteps(sresp).then(steps => {
                 setSimsteps(steps);

web/src/Simulation/Simulation.test.tsx

@@ -10,6 +10,7 @@ exports[`renders without crashing 1`] = `
     >
       <a
         class="btn btn-outline-secondary mr-3 mt-n2 mb-2"
+        data-discover="true"
         href="/"
         role="button"
       >

web/src/Simulation/Simulation.tsx

@@ -11,7 +11,7 @@ exports[`renders without crashing 1`] = `
         <h1>
           <img
             alt="logo"
-            src="/src/logo.svg"
+            src="data:image/svg+xml,%3csvg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='0%200%2060%2060'%3e%3cg%20class='links'%3e%3cline%20x1='29.47845386204116'%20y1='30.2993068845328'%20x2='5'%20y2='22.76864355842357'%20style='stroke:%20lightgray;'%3e%3c/line%3e%3cline%20x1='29.47845386204116'%20y1='30.2993068845328'%20x2='14.07820565912296'%20y2='51.53600876990375'%20style='stroke:%20lightgray;'%3e%3c/line%3e%3cline%20x1='43.86203789162526'%20y1='52.0669709714013'%20x2='5'%20y2='22.76864355842357'%20style='stroke:%20lightgray;'%3e%3c/line%3e%3cline%20x1='43.86203789162526'%20y1='52.0669709714013'%20x2='54.36201579120926'%20y2='23.96621520614607'%20style='stroke:%20lightgray;'%3e%3c/line%3e%3cline%20x1='43.86203789162526'%20y1='52.0669709714013'%20x2='14.07820565912296'%20y2='51.53600876990375'%20style='stroke:%20lightgray;'%3e%3c/line%3e%3cline%20x1='43.86203789162526'%20y1='52.0669709714013'%20x2='30.07898864117986'%20y2='5'%20style='stroke:%20lightgray;'%3e%3c/line%3e%3cline%20x1='5'%20y1='22.76864355842357'%20x2='54.36201579120926'%20y2='23.96621520614607'%20style='stroke:%20lightgray;'%3e%3c/line%3e%3cline%20x1='5'%20y1='22.76864355842357'%20x2='14.07820565912296'%20y2='51.53600876990375'%20style='stroke:%20lightgray;'%3e%3c/line%3e%3cline%20x1='5'%20y1='22.76864355842357'%20x2='30.07898864117986'%20y2='5'%20style='stroke:%20lightgray;'%3e%3c/line%3e%3cline%20x1='54.36201579120926'%20y1='23.96621520614607'%20x2='14.07820565912296'%20y2='51.53600876990375'%20style='stroke:%20lightgray;'%3e%3c/line%3e%3cline%20x1='54.36201579120926'%20y1='23.96621520614607'%20x2='30.07898864117986'%20y2='5'%20style='stroke:%20lightgray;'%3e%3c/line%3e%3cline%20x1='14.07820565912296'%20y1='51.53600876990375'%20x2='30.07898864117986'%20y2='5'%20style='stroke:%20lightgray;'%3e%3c/line%3e%3cline%20x1='29.47845386204116'%20y1='30.2993068845328'%20x2='54.36201579120926'%20y2='23.96621520614607'%20style='stroke:%20blue;'%3e%3c/line%3e%3cline%20x1='29.47845386204116'%20y1='30.2993068845328'%20x2='43.86203789162526'%20y2='52.0669709714013'%20style='stroke:%20blue;'%3e%3c/line%3e%3cline%20x1='29.47845386204116'%20y1='30.2993068845328'%20x2='30.07898864117986'%20y2='5'%20style='stroke:%20blue;'%3e%3c/line%3e%3c/g%3e%3cg%20class='nodes'%3e%3ccircle%20r='5'%20cx='29.47845386204116'%20cy='30.2993068845328'%20style='fill:%20blue;'%3e%3ctitle%3eLead%3c/title%3e%3c/circle%3e%3ccircle%20r='5'%20cx='14.07820565912296'%20cy='51.53600876990375'%20style='fill:%20slategray;'%3e%3ctitle%3eDev_1%3c/title%3e%3c/circle%3e%3ccircle%20r='5'%20cx='30.07898864117986'%20cy='5'%20style='fill:%20blue;'%3e%3ctitle%3eDev_2%3c/title%3e%3c/circle%3e%3ccircle%20r='5'%20cx='43.86203789162526'%20cy='52.0669709714013'%20style='fill:%20blue;'%3e%3ctitle%3eDev_3%3c/title%3e%3c/circle%3e%3ccircle%20r='5'%20cx='5'%20cy='22.76864355842357'%20style='fill:%20slategray;'%3e%3ctitle%3eDev_4%3c/title%3e%3c/circle%3e%3ccircle%20r='5'%20cx='54.36201579120926'%20cy='23.96621520614607'%20style='fill:%20blue;'%3e%3ctitle%3eDev_5%3c/title%3e%3c/circle%3e%3c/g%3e%3c/svg%3e"
             style="height: 60px; width: 60px;"
           />
           Simulation Set
@@ -89,6 +89,7 @@ exports[`renders without crashing 1`] = `
               >
                 <a
                   class="btn btn-primary"
+                  data-discover="true"
                   href="/simulation/1"
                   role="button"
                 >
@@ -155,6 +156,7 @@ exports[`renders without crashing 1`] = `
               >
                 <a
                   class="btn btn-primary"
+                  data-discover="true"
                   href="/simulation/2"
                   role="button"
                 >