fix(notifications): notifications with actions will no longer race to…

… submit data and clear the actions
After-the-End-of-All-Things · Aug 29, 2023 · 6293a4f · 6293a4f
1 parent 1901f37
commit 6293a4f
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/client/src/app/services/actions.service.ts b/client/src/app/services/actions.service.ts
@@ -28,7 +28,18 @@ export class ActionsService {
   doAction(action: INotificationAction, notification?: INotification) {
     if (action.url) {
       // we never send data here, it's inferred server side
-      this.http.post(`${environment.apiUrl}/${action.url}`, {}).subscribe();
+      this.http
+        .post(`${environment.apiUrl}/${action.url}`, {})
+        .subscribe(() => {
+          if (!notification) return;
+
+          this.notificationService
+            .clearActions(notification.id || '')
+            .subscribe();
+          this.store.dispatch(
+            new ClearNotificationActions(notification.id || ''),
+          );
+        });
     }
 
     if (action.clearActionsForUrl) {
@@ -37,11 +48,6 @@ export class ActionsService {
       );
     }
 
-    if (notification) {
-      this.notificationService.clearActions(notification.id || '').subscribe();
-      this.store.dispatch(new ClearNotificationActions(notification.id || ''));
-    }
-
     if (action.action === 'navigate') {
       this.router.navigate([action.actionData.url]);
     }