Address comments that don't break behavior

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>
open-rmf · Jul 5, 2024 · 9434771 · 9434771
1 parent 2bfd484
commit 9434771
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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/.../dashboard/src/components/alert-store.tsx → ...ashboard/src/components/alert-manager.tsx b/.../dashboard/src/components/alert-store.tsx → ...ashboard/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
@@ -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