Merge branch 'deploy/hammer' into hammer/fix-delivery-desc

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>
open-rmf · Sep 20, 2023 · 7045716 · 7045716
2 parents 39d340e + b556e98
commit 7045716
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/packages/dashboard/package.json b/packages/dashboard/package.json
@@ -4,11 +4,11 @@
   "private": true,
   "scripts": {
     "analyze": "source-map-explorer 'build/static/js/*.js'",
-    "start": "pnpm run --filter {.}^... build && concurrently npm:start:rmf-server npm:start:react",
+    "start": "concurrently npm:start:rmf-server npm:start:react",
     "start:sim": "concurrently npm:start:rmf-server npm:start:rmf npm:start:react",
     "start:clinic": "RMF_DASHBOARD_DEMO_MAP=clinic.launch.xml pnpm run start:sim",
     "start:airport": "RMF_DASHBOARD_DEMO_MAP=airport_terminal.launch.xml pnpm run start:sim",
-    "start:react": "react-scripts start",
+    "start:react": "pnpm run --filter {.}^... build && react-scripts start",
     "start:rmf": "node scripts/start-rmf.js",
     "start:rmf-server": "RMF_SERVER_USE_SIM_TIME=true npm --prefix ../api-server start",
     "start:rmf-server:psql": "RMF_SERVER_USE_SIM_TIME=true npm run --prefix ../api-server start:psql",

diff --git a/packages/dashboard/src/components/app-base.tsx b/packages/dashboard/src/components/app-base.tsx
@@ -103,7 +103,7 @@ export function AppBase({ children }: React.PropsWithChildren<{}>): JSX.Element
             title: 'Message',
             value:
               'To ensure maximum compatibility, please reduce the zoom ' +
-              'level in the browser (Ctrl+Minus) or display settings, ' +
+              'level in the browser (Ctrl-Minus) or display settings, ' +
               'or change to a higher resolution display device.',
           },
         ]}

diff --git a/packages/react-components/lib/alert-dialog.tsx b/packages/react-components/lib/alert-dialog.tsx
@@ -135,11 +135,11 @@ export const AlertDialog = React.memo((props: DialogAlertProps) => {
             Inspect
           </Button>
         ) : null}
-        {acknowledged || onAcknowledge === undefined ? (
+        {acknowledged ? (
           <Button size="small" variant="contained" disabled={true} autoFocus>
             {acknowledgedBy ? `Acknowledged by ${acknowledgedBy}` : 'Acknowledged'}
           </Button>
-        ) : (
+        ) : onAcknowledge === undefined ? null : (
           <Button
             size="small"
             variant="contained"