fix(lib): fixed polling middleware

SaulMoro · May 26, 2021 · 4b49a90 · 4b49a90
1 parent 7581a55
commit 4b49a90
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 23 deletions.
diff --git a/projects/ngrx-rtk-query/src/lib/build-metareducer.ts b/projects/ngrx-rtk-query/src/lib/build-metareducer.ts
@@ -5,34 +5,24 @@ import { AngularHooksModule, AngularHooksModuleOptions } from './module';
 
 export function buildMetaReducer({
  api,
- moduleOptions: { useDispatch: dispatch, getState },
+ moduleOptions: { useDispatch: dispatch },
 }: {
  api: any;
- moduleOptions: Required<Pick<AngularHooksModuleOptions, 'useDispatch' | 'getState'>>;
+ moduleOptions: Required<Pick<AngularHooksModuleOptions, 'useDispatch'>>;
 }): MetaReducer<any> {
  const anyApi = api as Api<any, Record<string, any>, string, string, AngularHooksModule | CoreModule>;
- const { unsubscribeQueryResult } = anyApi.internalActions;
 
- return function (reducer: ActionReducer<any>): ActionReducer<any> {
- return function (state: any, action: Action) {
- const nextState = reducer(state, action);
- let getNextState = () => nextState;
-
- // Query inside forFeature (Code splitting)
- if (!nextState[anyApi.reducerPath]) {
- getNextState = () => ({ [anyApi.reducerPath]: nextState });
- }
+ let nextState: any;
+ const getState = () =>
+ // Query inside forFeature (Code splitting)
+ !nextState || nextState[anyApi.reducerPath] ? nextState : { [anyApi.reducerPath]: nextState };
 
- anyApi.middleware({
- dispatch,
- /**
- * The unsuscriptQueryResult Action to remove unsubscriptions (handleUnsubscribe)
- * dispatch a function with setTimeout. This function needs the state of the store after the
- * tiemout so we have to pass the reference of the state with getState.
- */
- getState: unsubscribeQueryResult.match(action) ? getState : getNextState,
- })(getNextState)(action);
+ const middleware = anyApi.middleware({ dispatch, getState })(getState);
 
+ return function (reducer: ActionReducer<any>): ActionReducer<any> {
+ return function (state: any, action: Action) {
+ nextState = reducer(state, action);
+ middleware(action);
  return nextState;
  };
  };

diff --git a/projects/ngrx-rtk-query/src/lib/module.ts b/projects/ngrx-rtk-query/src/lib/module.ts
@@ -88,7 +88,7 @@ export const angularHooksModule = ({
  api,
  moduleOptions: { useDispatch, useSelector, getState },
  });
- const metareducer: MetaReducer<any> = buildMetaReducer({ api, moduleOptions: { useDispatch, getState } });
+ const metareducer: MetaReducer<any> = buildMetaReducer({ api, moduleOptions: { useDispatch } });
  safeAssign(anyApi, { usePrefetch });
  safeAssign(anyApi, { metareducer });
 

diff --git a/src/app/features/posts/post-detail/post-detail.component.ts b/src/app/features/posts/post-detail/post-detail.component.ts
@@ -53,7 +53,7 @@ import { useDeletePostMutation, useGetPostQuery, useUpdatePostMutation } from '.
  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class PostDetailComponent {
- postQuery$ = useGetPostQuery(+this.route.snapshot.params.id).pipe(
+ postQuery$ = useGetPostQuery(+this.route.snapshot.params.id, { pollingInterval: 5000 }).pipe(
  tap((result) => this.postFormControl.setValue(result.data?.name ?? '')),
  );
  updatePostMutation = useUpdatePostMutation();