fix(reminderCountdown): not reacting right away to skipped reminders

johannesjo · Feb 1, 2024 · b8ef950 · b8ef950
1 parent 60a3423
commit b8ef950
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/app/features/reminder/store/reminder-countdown.effects.ts b/src/app/features/reminder/store/reminder-countdown.effects.ts
@@ -21,7 +21,7 @@ import { Store } from '@ngrx/store';
 import { BannerService } from '../../../core/banner/banner.service';
 import { Reminder } from '../reminder.model';
 import { selectReminderConfig } from '../../config/store/global-config.reducer';
-import { EMPTY, timer } from 'rxjs';
+import { BehaviorSubject, combineLatest, EMPTY, timer } from 'rxjs';
 import { DataInitService } from '../../../core/data-init/data-init.service';
 import { TaskService } from '../../tasks/task.service';
 import { Task, TaskWithReminder } from '../../tasks/task.model';
@@ -40,16 +40,19 @@ export class ReminderCountdownEffects {
         concatMap(() => this._store.select(selectReminderConfig)),
         switchMap((reminderCfg) =>
           reminderCfg.isCountdownBannerEnabled
-            ? this._reminderService.reminders$.pipe(
-                map((reminders) => {
+            ? combineLatest([
+                this._reminderService.reminders$,
+                this._skippedReminderIds$,
+              ]).pipe(
+                map(([reminders, skippedReminderIds]) => {
                   const now = Date.now();
                   return reminders.filter(
                     (reminder) =>
                       reminder.type === 'TASK' &&
                       reminder.remindAt - reminderCfg.countdownDuration < now &&
                       // reminders due will show as an alert anyway
                       reminder.remindAt > now &&
-                      !this._skippedReminderIds.includes(reminder.id),
+                      !skippedReminderIds.includes(reminder.id),
                   );
                 }),
                 switchMap((dueReminders) =>
@@ -82,7 +85,7 @@ export class ReminderCountdownEffects {
     },
   );
 
-  private _skippedReminderIds: string[] = [];
+  private _skippedReminderIds$ = new BehaviorSubject<string[]>([]);
   private _currentBannerReminder?: Reminder;
 
   constructor(
@@ -98,7 +101,7 @@ export class ReminderCountdownEffects {
   ) {}
 
   private _skipReminder(reminderId: string): void {
-    this._skippedReminderIds.push(reminderId);
+    this._skippedReminderIds$.next([...this._skippedReminderIds$.getValue(), reminderId]);
   }
 
   private async _showBanner(