Aaron/react 18

packages/dashboard/src/components/admin/tests/permissions-card.test.tsx

@@ -4,10 +4,13 @@ import React from 'react';
 import { getActionText, RmfAction } from '../../permissions';
 import { PermissionsCard } from '../permissions-card';
 
+// TODO(AA): To remove after
+// https://github.com/testing-library/react-testing-library/issues/1216
+// has been resolved.
+// Workaround for "Warning: An update to ComponentName inside a test was not
+// wrapped in act(...)."
 const originalError = console.error;
 beforeAll(() => {
-  // this is just a little hack to silence
-  // Warning: An update to ComponentName inside a test was not wrapped in act(...).
   console.error = (...args) => {
     if (/Warning.*not wrapped in act/.test(args[0])) {
       return;

packages/dashboard/src/components/appbar.tsx

@@ -70,6 +70,7 @@ export type TabValue = 'infrastructure' | 'robots' | 'tasks' | 'custom1' | 'cust
 
 const locationToTabValue = (pathname: string): TabValue | undefined => {
   const routes: { prefix: string; tabValue: TabValue }[] = [
+    { prefix: DashboardRoute, tabValue: 'infrastructure' },
     { prefix: RobotsRoute, tabValue: 'robots' },
     { prefix: TasksRoute, tabValue: 'tasks' },
     { prefix: CustomRoute1, tabValue: 'custom1' },
@@ -79,7 +80,7 @@ const locationToTabValue = (pathname: string): TabValue | undefined => {
 
   // `DashboardRoute` being the root, it is a prefix to all routes, so we need to check exactly.
   const matchingRoute = routes.find((route) => pathname.startsWith(route.prefix));
-  return pathname === DashboardRoute ? 'infrastructure' : matchingRoute?.tabValue;
+  return matchingRoute?.tabValue;
 };
 
 function AppSettings() {