Updated API, renamed event to pushAlert, filter before

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>
open-rmf · Jul 9, 2024 · 6494c01 · 6494c01
1 parent 2e78fde
commit 6494c01
Show file tree

Hide file tree

Showing 7 changed files with 326 additions and 14 deletions.
diff --git a/packages/api-client/lib/openapi/api.ts b/packages/api-client/lib/openapi/api.ts
diff --git a/packages/api-client/lib/version.ts b/packages/api-client/lib/version.ts
@@ -3,6 +3,6 @@ import { version as rmfModelVer } from 'rmf-models';
 
 export const version = {
   rmfModels: rmfModelVer,
-  rmfServer: '06e5475f096ec8f2eae05aae7c939a612aaa11e6',
+  rmfServer: '2e78fded62245f24a712e0c34127cc28d0b36aad',
   openapiGenerator: '6.2.1',
 };
diff --git a/packages/api-client/schema/index.ts b/packages/api-client/schema/index.ts
diff --git a/packages/api-server/api_server/repositories/alerts.py b/packages/api-server/api_server/repositories/alerts.py
@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import List, Optional
+from typing import List
 
 from api_server.exceptions import AlreadyExistsError, InvalidInputError, NotFoundError
 from api_server.models import AlertRequest, AlertResponse, Pagination
@@ -80,7 +80,7 @@ async def get_alerts_of_task(
         return alert_models
 
     async def get_unresponded_alerts(
-        self, pagination: Optional[Pagination]
+        self, pagination: Pagination | None
     ) -> List[AlertRequest]:
         query = ttm.AlertRequest.filter(alert_response=None, response_expected=True)
         if pagination:

diff --git a/packages/dashboard/src/components/alert-manager.tsx b/packages/dashboard/src/components/alert-manager.tsx
@@ -303,9 +303,18 @@ export const AlertManager = React.memo(() => {
     const subs: Subscription[] = [];
 
     subs.push(
-      rmf.alertRequestsObsStore.subscribe((alertRequest) =>
-        AppEvents.alertListOpenedAlert.next(alertRequest),
-      ),
+      rmf.alertRequestsObsStore.subscribe((alertRequest) => {
+        if (!alertRequest.display) {
+          setOpenAlerts((prev) => {
+            const filteredAlerts = Object.fromEntries(
+              Object.entries(prev).filter(([key]) => key !== alertRequest.id),
+            );
+            return filteredAlerts;
+          });
+          return;
+        }
+        AppEvents.pushAlert.next(alertRequest);
+      }),
     );
 
     subs.push(
@@ -319,7 +328,7 @@ export const AlertManager = React.memo(() => {
     );
 
     subs.push(
-      AppEvents.alertListOpenedAlert.subscribe(async (alertRequest) => {
+      AppEvents.pushAlert.subscribe(async (alertRequest) => {
         if (!alertRequest) {
           return;
         }

diff --git a/packages/dashboard/src/components/app-events.ts b/packages/dashboard/src/components/app-events.ts
@@ -13,7 +13,7 @@ export const AppEvents = {
   refreshTaskApp: new Subject<void>(),
   refreshFavoriteTasks: new Subject<void>(),
   refreshTaskSchedule: new Subject<void>(),
-  alertListOpenedAlert: new Subject<AlertRequest | null>(),
+  pushAlert: new Subject<AlertRequest | null>(),
   disabledLayers: new ReplaySubject<Record<string, boolean>>(),
   zoom: new BehaviorSubject<number | null>(null),
   cameraPosition: new BehaviorSubject<Vector3 | null>(null),

diff --git a/packages/dashboard/src/components/appbar.tsx b/packages/dashboard/src/components/appbar.tsx
@@ -335,7 +335,7 @@ export const AppBar = React.memo(({ extraToolbarItems }: AppBarProps): React.Rea
   };
 
   const openAlertDialog = (alert: AlertRequest) => {
-    AppEvents.alertListOpenedAlert.next(alert);
+    AppEvents.pushAlert.next(alert);
   };
 
   const timeDistance = (time: number) => {