Minor dashboard fixes (#989)

* Fix icon path Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Turn off minify for debugging Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Make trajectory server connection optional Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Remove minify:false block Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Use BASE_URL Signed-off-by: Aaron Chong <aaronchongth@gmail.com> --------- Signed-off-by: Aaron Chong <aaronchongth@gmail.com>
open-rmf · Aug 7, 2024 · 2e4b44c · 2e4b44c
1 parent 16c2dbe
commit 2e4b44c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/packages/dashboard/index.html b/packages/dashboard/index.html
@@ -2,13 +2,13 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="/favicon.ico" />
+    <link rel="icon" href="%BASE_URL%favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta
       name="description"
       content="Web application that provides overall visualization and control over the RMF system"
     />
-    <link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
+    <link rel="shortcut icon" type="image/x-icon" href="%BASE_URL%favicon.ico" />
     <title>RMF Dashboard</title>
   </head>
   <body>

diff --git a/packages/dashboard/src/components/rmf-app/rmf-ingress.ts b/packages/dashboard/src/components/rmf-app/rmf-ingress.ts
@@ -59,8 +59,8 @@ export class RmfIngress {
   alertsApi: AlertsApi;
   adminApi: AdminApi;
   deliveryAlertsApi: DeliveryAlertsApi;
-  negotiationStatusManager: NegotiationStatusManager;
-  trajectoryManager: RobotTrajectoryManager;
+  negotiationStatusManager?: NegotiationStatusManager;
+  trajectoryManager?: RobotTrajectoryManager;
 
   constructor(appConfig: AppConfig, authenticator: Authenticator) {
     if (!authenticator.user) {
@@ -128,9 +128,17 @@ export class RmfIngress {
     this.adminApi = new AdminApi(apiConfig, undefined, axiosInst);
     this.deliveryAlertsApi = new DeliveryAlertsApi(apiConfig, undefined, axiosInst);
 
-    const ws = new WebSocket(appConfig.trajectoryServerUrl);
-    this.trajectoryManager = new DefaultTrajectoryManager(ws, authenticator);
-    this.negotiationStatusManager = new NegotiationStatusManager(ws, authenticator);
+    try {
+      const ws = new WebSocket(appConfig.trajectoryServerUrl);
+      this.trajectoryManager = new DefaultTrajectoryManager(ws, authenticator);
+      this.negotiationStatusManager = new NegotiationStatusManager(ws, authenticator);
+    } catch (e) {
+      const errorMessage = `Failed to connect to trajectory server at [${appConfig.trajectoryServerUrl}], ${
+        (e as Error).message
+      }`;
+      console.error(errorMessage);
+      return;
+    }
   }
 
   private _convertSioToRxObs<T>(