Merge branch 'release-0.2.17' into main

Author: entrotech

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "client",
-  "version": "0.2.16",
+  "version": "0.2.17",
   "private": true,
   "proxy": "http://localhost:5000",
   "scripts": {

client/src/components/ProjectWizard/TdmCalculationWizard.js

@@ -155,7 +155,13 @@ const TdmCalculationWizard = props => {
     } else if (
       // Redirect to Summary Page if project exists,
       // but does not belong to logged-in user
+      // Note: For an existing project, this effect
+      // gets called once with loginId = 0 before the
+      // component is re-created with the correct loginId,
+      // so we only want to re-direct after the loginId
+      // is properly set.
       projectId &&
+      loginId &&
       !(account.isAdmin || account.id === loginId)
     ) {
       history.push(`/calculation/6/${projectId}`);

client/src/contexts/Toast/Toast.js

@@ -14,7 +14,7 @@ const useStyles = createUseStyles({
     display: "flex",
     justifyContent: "space-between",
     position: "fixed",
-    bottom: "4em",
+    top: "6em",
     cursor: "pointer"
   },
   container: {
@@ -38,7 +38,7 @@ const Toast = ({ children, remove }) => {
   removeRef.current = remove;
 
   useEffect(() => {
-    const duration = 5000;
+    const duration = 8000;
     const id = setTimeout(() => removeRef.current(), duration);
 
     return () => clearTimeout(id);

client/src/contexts/Toast/withToastProvider.js

@@ -6,9 +6,9 @@ import Toast from "./Toast";
 
 const useStyles = createUseStyles({
   root: {
-    position: "absolute",
-    bottom: "20px",
-    left: "50%"
+    alignItems: "center",
+    display: "flex",
+    justifyContent: "center"
   }
 });
 

cypress/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "tdm-calculator",
-  "version": "0.2.16",
+  "version": "0.2.17",
   "description": "Traffic Data Management Calculator",
   "repository": {
     "type": "git",