feat(reducers): create new status state object if none exists

Pixeladed · Oct 21, 2020 · 629fcd6 · 629fcd6
1 parent 745fe35
commit 629fcd6
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 5 deletions.
diff --git a/src/reducers.ts b/src/reducers.ts
@@ -8,7 +8,11 @@ import { getSettings } from './settings';
  */
 export const handlePending = <Data, Returned, ThunkArg, ThunkApiConfig>(
   asyncThunk: AsyncThunk<Returned, ThunkArg, ThunkApiConfig>
-) => (state: AsyncState<Data>) => {
+) => (state: Partial<AsyncState<Data>>) => {
+  if (!state.status) {
+    state.status = {};
+  }
+
   const { typePrefix } = asyncThunk;
   const currentStatus =
     state.status[typePrefix] || getDefaultStatus(typePrefix);
@@ -27,7 +31,11 @@ export const handlePending = <Data, Returned, ThunkArg, ThunkApiConfig>(
  */
 export const handleFulfilled = <Data, Returned, ThunkArg, ThunkApiConfig>(
   asyncThunk: AsyncThunk<Returned, ThunkArg, ThunkApiConfig>
-) => (state: AsyncState<Data>) => {
+) => (state: Partial<AsyncState<Data>>) => {
+  if (!state.status) {
+    state.status = {};
+  }
+
   const { typePrefix } = asyncThunk;
   const currentStatus =
     state.status[typePrefix] || getDefaultStatus(typePrefix);
@@ -48,9 +56,13 @@ export const handleFulfilled = <Data, Returned, ThunkArg, ThunkApiConfig>(
 export const handleRejected = <Data, Returned, ThunkArg, ThunkApiConfig>(
   asyncThunk: AsyncThunk<Returned, ThunkArg, ThunkApiConfig>
 ) => (
-  state: AsyncState<Data>,
+  state: Partial<AsyncState<Data>>,
   action: ReturnType<typeof asyncThunk['rejected']>
 ) => {
+  if (!state.status) {
+    state.status = {};
+  }
+
   const { typePrefix } = asyncThunk;
   const currentStatus =
     state.status[typePrefix] || getDefaultStatus(typePrefix);
@@ -72,7 +84,11 @@ export const handleRejected = <Data, Returned, ThunkArg, ThunkApiConfig>(
  */
 export const handleReset = <Data, Returned, ThunkArg, ThunkApiConfig>(
   asyncThunk: AsyncThunk<Returned, ThunkArg, ThunkApiConfig>
-) => (state: AsyncState<Data>) => {
+) => (state: Partial<AsyncState<Data>>) => {
+  if (!state.status) {
+    state.status = {};
+  }
+
   const { typePrefix } = asyncThunk;
   const newStatus = getDefaultStatus(typePrefix);
   state.status[typePrefix] = newStatus;
@@ -81,6 +97,6 @@ export const handleReset = <Data, Returned, ThunkArg, ThunkApiConfig>(
 /**
  * Reset the status of all async thunks
  */
-export const resetAllStatuses = <Data>(state: AsyncState<Data>) => {
+export const resetAllStatuses = <Data>(state: Partial<AsyncState<Data>>) => {
   state.status = {};
 };
diff --git a/test/reducers/handleFulfilled.test.ts b/test/reducers/handleFulfilled.test.ts
@@ -101,4 +101,16 @@ describe('handleFulfilled', () => {
       Date.parse(state.status[thunk.typePrefix]?.lastLoaded!)
     ).toBeTruthy();
   });
+
+  it('creates a status state object is none exist', () => {
+    const adapter = createAsyncAdapter();
+    const thunk = createAsyncThunk('thunk', () => {});
+
+    const state: Partial<AsyncState<{}>> = {
+      data: {},
+    };
+
+    adapter.handleFulfilled(thunk)(state);
+    expect(state.status[thunk.typePrefix]).toBeTruthy();
+  });
 });
diff --git a/test/reducers/handlePending.test.ts b/test/reducers/handlePending.test.ts
@@ -100,4 +100,16 @@ describe('handlePending', () => {
     adapter.handlePending(thunk)(state);
     expect(state.status[thunk.typePrefix]?.lastLoaded).toBe(lastLoaded);
   });
+
+  it('creates a status state object is none exist', () => {
+    const adapter = createAsyncAdapter();
+    const thunk = createAsyncThunk('thunk', () => {});
+
+    const state: Partial<AsyncState<{}>> = {
+      data: {},
+    };
+
+    adapter.handlePending(thunk)(state);
+    expect(state.status[thunk.typePrefix]).toBeTruthy();
+  });
 });
diff --git a/test/reducers/handleRejected.test.ts b/test/reducers/handleRejected.test.ts
@@ -112,4 +112,18 @@ describe('handleRejected', () => {
     adapter.handleRejected(thunk)(state, action);
     expect(state.status[thunk.typePrefix]?.lastLoaded).toBeUndefined();
   });
+
+  it('creates a status state object is none exist', () => {
+    const adapter = createAsyncAdapter();
+    const thunk = createAsyncThunk('thunk', () => {});
+    const error = new Error();
+    const action = thunk.rejected(error, 'request id');
+
+    const state: Partial<AsyncState<{}>> = {
+      data: {},
+    };
+
+    adapter.handleRejected(thunk)(state, action);
+    expect(state.status[thunk.typePrefix]).toBeTruthy();
+  });
 });
diff --git a/test/reducers/handleReset.test.ts b/test/reducers/handleReset.test.ts
@@ -41,4 +41,16 @@ describe('handleReset', () => {
       getDefaultStatus(thunk.typePrefix)
     );
   });
+
+  it('creates a status state object is none exist', () => {
+    const adapter = createAsyncAdapter();
+    const thunk = createAsyncThunk('thunk', () => {});
+
+    const state: Partial<AsyncState<{}>> = {
+      data: {},
+    };
+
+    adapter.handleReset(thunk)(state);
+    expect(state.status[thunk.typePrefix]).toBeTruthy();
+  });
 });