From 94347716deb9888b59cd321b8d88efd684925858 Mon Sep 17 00:00:00 2001
From: Aaron Chong <aaronchongth@gmail.com>
Date: Fri, 5 Jul 2024 11:09:51 +0800
Subject: [PATCH] Address comments that don't break behavior

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>
---
 packages/api-server/api_server/gateway.py                   | 6 ++----
 packages/api-server/api_server/models/__init__.py           | 4 +++-
 packages/api-server/api_server/routes/internal.py           | 2 +-
 .../src/components/{alert-store.tsx => alert-manager.tsx}   | 2 +-
 packages/dashboard/src/components/app-base.tsx              | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename packages/dashboard/src/components/{alert-store.tsx => alert-manager.tsx} (99%)

diff --git a/packages/api-server/api_server/gateway.py b/packages/api-server/api_server/gateway.py
index 410c98b2b..c13727a56 100644
--- a/packages/api-server/api_server/gateway.py
+++ b/packages/api-server/api_server/gateway.py
@@ -289,8 +289,7 @@ def convert_alert(alert: RmfAlert):
             )
 
         def handle_alert(alert: AlertRequest):
-            logging.info("Received alert:")
-            logging.info(alert)
+            logging.info(f"Received alert: {alert}")
             alert_events.alert_requests.on_next(alert)
 
         alert_sub = ros_node().create_subscription(
@@ -314,8 +313,7 @@ def convert_alert_response(alert_response: RmfAlertResponse):
             )
 
         def handle_alert_response(alert_response: AlertResponse):
-            logging.info("Received alert response:")
-            logging.info(alert_response)
+            logging.info(f"Received alert response: {alert_response}")
             alert_events.alert_responses.on_next(alert_response)
 
         alert_response_sub = ros_node().create_subscription(
diff --git a/packages/api-server/api_server/models/__init__.py b/packages/api-server/api_server/models/__init__.py
index c6df87293..d3d9eb544 100644
--- a/packages/api-server/api_server/models/__init__.py
+++ b/packages/api-server/api_server/models/__init__.py
@@ -48,7 +48,9 @@
 from .rmf_api.task_log_response import TaskLogResponse
 from .rmf_api.task_log_update import TaskEventLogUpdate
 from .rmf_api.task_request import TaskRequest
-from .rmf_api.task_state import Status, Status1, TaskState
+from .rmf_api.task_state import Status
+from .rmf_api.task_state import Status1 as DispatchStatus
+from .rmf_api.task_state import TaskState
 from .rmf_api.task_state_update import TaskStateUpdate
 from .rmf_api.undo_skip_phase_request import UndoPhaseSkipRequest
 from .rmf_api.undo_skip_phase_response import UndoPhaseSkipResponse
diff --git a/packages/api-server/api_server/routes/internal.py b/packages/api-server/api_server/routes/internal.py
index da0e1c5d4..b5d55f394 100644
--- a/packages/api-server/api_server/routes/internal.py
+++ b/packages/api-server/api_server/routes/internal.py
@@ -101,7 +101,7 @@ async def process_msg(
             errorMessage = ""
             if (
                 task_state.dispatch is not None
-                and task_state.dispatch.status == mdl.Status1.failed_to_assign
+                and task_state.dispatch.status == mdl.DispatchStatus.failed_to_assign
             ):
                 errorMessage += "Failed to assign\n"
                 if task_state.dispatch.errors is not None:
diff --git a/packages/dashboard/src/components/alert-store.tsx b/packages/dashboard/src/components/alert-manager.tsx
similarity index 99%
rename from packages/dashboard/src/components/alert-store.tsx
rename to packages/dashboard/src/components/alert-manager.tsx
index acd5de152..e0c851517 100644
--- a/packages/dashboard/src/components/alert-store.tsx
+++ b/packages/dashboard/src/components/alert-manager.tsx
@@ -256,7 +256,7 @@ const AlertDialog = React.memo((props: AlertDialogProps) => {
   );
 });
 
-export const AlertStore = React.memo(() => {
+export const AlertManager = React.memo(() => {
   const rmf = React.useContext(RmfAppContext);
   const [openAlerts, setOpenAlerts] = React.useState<Record<string, AlertRequest>>({});
 
diff --git a/packages/dashboard/src/components/app-base.tsx b/packages/dashboard/src/components/app-base.tsx
index 0e76dc200..6c3efbfcc 100644
--- a/packages/dashboard/src/components/app-base.tsx
+++ b/packages/dashboard/src/components/app-base.tsx
@@ -15,7 +15,7 @@ import { rmfDark, rmfDarkLeaflet, rmfLight } from 'react-components';
 import { loadSettings, saveSettings, Settings, ThemeMode } from '../settings';
 import { AppController, AppControllerContext, SettingsContext } from './app-contexts';
 import AppBar from './appbar';
-import { AlertStore } from './alert-store';
+import { AlertManager } from './alert-manager';
 import { AppEvents } from './app-events';
 import { DeliveryAlertStore } from './delivery-alert-store';
 
@@ -95,7 +95,7 @@ export function AppBase({ children }: React.PropsWithChildren<{}>): JSX.Element
       )}
       <SettingsContext.Provider value={settings}>
         <AppControllerContext.Provider value={appController}>
-          <AlertStore />
+          <AlertManager />
           <DeliveryAlertStore />
           <Grid
             container