Fixed: getResolved yields before state is updated (#10)

* fix editor config * add timer hack to the facade * reduce to 1 ms
acandylevey · Aug 17, 2023 · 76e4097 · 76e4097
1 parent b9dfe4c
commit 76e4097
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 17 deletions.
diff --git a/ngrx-http-tracking/.editorconfig b/ngrx-http-tracking/.editorconfig
@@ -7,6 +7,7 @@ indent_style = space
 indent_size = 2
 insert_final_newline = true
 trim_trailing_whitespace = true
+end_of_line = crlf
 
 [*.ts]
 quote_type = single

diff --git a/ngrx-http-tracking/projects/ngrx-http-tracking/src/lib/+state/http-tracking.facade.ts b/ngrx-http-tracking/projects/ngrx-http-tracking/src/lib/+state/http-tracking.facade.ts
@@ -2,9 +2,9 @@ import * as HttpTrackingActions from './http-tracking.actions';
 import * as HttpTrackingSelectors from './http-tracking.selectors';
 import { Action, Store } from '@ngrx/store';
 import { HttpTrackingEntity } from '../model/http-tracking-entity';
-import { debounceTime, filter, map, take } from 'rxjs/operators';
+import { debounceTime, filter, map, switchMap, take } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { forkJoin, Observable } from 'rxjs';
+import { forkJoin, Observable, timer } from 'rxjs';
 import { isError } from '../function/is-error';
 import { mapActionTypeToId } from '../function/map-action-typ-to-id';
 import { TrackingAction } from '../function/http-tracking-actions.factory';
@@ -77,21 +77,27 @@ export class HttpTrackingFacade {
     }
 
     public getResolved<T1, T2>(action: TrackingAction<T1, T2>): Observable<HttpTrackingResult<T1, T2>> {
-        return this.getTracking(action).pipe(
-            filter(tracking => !!tracking),
-            map(tracking => (<HttpTrackingEntity>tracking).httpStatus),
-            filter(httpStatus => httpStatus === LoadingState.LOADED || isError(httpStatus)),
-            take(1),
-            map(httpStatus => {
-                const retVal = <HttpTrackingResult<T1, T2>>{
-                    action,
-                    success: httpStatus === LoadingState.LOADED,
-                };
-                if (isError(httpStatus)) {
-                    retVal.error = httpStatus;
-                }
-                return retVal;
-            })
+        // this timer is here to prevent an issue with retrieving the state before
+        // the reducer is updated on a second call to the same tracked action
+        return timer(1).pipe(
+            switchMap(() =>
+                this.getTracking(action).pipe(
+                    filter(tracking => !!tracking),
+                    map(tracking => (<HttpTrackingEntity>tracking).httpStatus),
+                    filter(httpStatus => httpStatus === LoadingState.LOADED || isError(httpStatus)),
+                    take(1),
+                    map(httpStatus => {
+                        const retVal = <HttpTrackingResult<T1, T2>>{
+                            action,
+                            success: httpStatus === LoadingState.LOADED,
+                        };
+                        if (isError(httpStatus)) {
+                            retVal.error = httpStatus;
+                        }
+                        return retVal;
+                    })
+                )
+            )
         );
     }