Merge pull request #50 from exacaster/update_deps

Update dependencies, add missing status filters
exacaster · Jun 15, 2022 · 5e25b61 · 5e25b61
2 parents e37ba42 + 14ec16f
commit 5e25b61
Show file tree

Hide file tree

Showing 6 changed files with 1,112 additions and 1,068 deletions.
diff --git a/frontend/package.json b/frontend/package.json
@@ -19,23 +19,23 @@
     "react-moment": "^1.1.1",
     "react-query": "^3.16.0",
     "react-router-dom": "^6.3.0",
-    "react-scripts": "^5.0.0",
     "sass": "^1.34.0",
     "typescript": "^4.1.2",
     "web-vitals": "^2.1.4"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^5.11.4",
     "@testing-library/react": "^13.1.1",
-    "@types/jest": "^27.4.1",
+    "@types/jest": "^28.1.1",
     "@types/node": "^17.0.23",
     "@types/react": "^18.0.9",
     "@types/react-dom": "^18.0.2",
     "@types/react-router-dom": "^5.1.7",
     "dotenv": "^16.0.0",
     "http-proxy-middleware": "^2.0.0",
     "prettier": "^2.3.1",
-    "prop-types": "^15.8.1"
+    "prop-types": "^15.8.1",
+    "react-scripts": "^5.0.0"
   },
   "resolutions": {
     "@types/react": "^18.0.9"

diff --git a/frontend/src/components/AppStatus.tsx b/frontend/src/components/AppStatus.tsx
@@ -2,11 +2,11 @@ import {Badge, BadgeProps} from '@chakra-ui/react';
 import React, {ReactNode} from 'react';
 
 export const statusMap: {[key: string]: BadgeProps['colorScheme']} = {
-  NOT_STARTED: 'purple',
-  // STARTING: '',
-  // IDLE: '',
-  // BUSY: '',
-  // SHUTTING_DOWN: '',
+  NOT_STARTED: 'gray',
+  STARTING: 'gray',
+  IDLE: 'blue',
+  BUSY: 'blue',
+  SHUTTING_DOWN: 'purple',
   ERROR: 'red',
   DEAD: 'red',
   KILLED: 'red',
@@ -20,7 +20,7 @@ interface Props {
 
 const AppStatus: React.FC<Props> = ({status, prefix}) => {
   return (
-    <Badge colorScheme={statusMap[status.toUpperCase()]}>
+    <Badge colorScheme={statusMap[status.toUpperCase()] || 'white'}>
       {prefix}
       {status}
     </Badge>