fix(refetching): refetch messages when last message is archived, save…

… search params
trycourier · May 22, 2024 · 7c5c547 · 7c5c547
1 parent a8c48f3
commit 7c5c547
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 3 deletions.
diff --git a/packages/react-hooks/src/inbox/__tests__/reducer.spec.ts b/packages/react-hooks/src/inbox/__tests__/reducer.spec.ts
@@ -185,10 +185,13 @@ describe("inbox reducer", () => {
 
         expect(state).toEqual({
           ...initialState,
-          pinned: [],
+          isLoading: false,
           lastMessagesFetched: mockDate,
           messages: [mockGraphMessage],
-          isLoading: false,
+          pinned: [],
+          searchParams: {
+            filters: {},
+          },
         });
       });
 
@@ -217,6 +220,9 @@ describe("inbox reducer", () => {
           lastMessagesFetched: mockDate,
           messages: [mockGraphMessage, mockGraphMessage2],
           isLoading: false,
+          searchParams: {
+            filters: {},
+          },
         });
       });
     });

diff --git a/packages/react-hooks/src/inbox/reducer.ts b/packages/react-hooks/src/inbox/reducer.ts
@@ -171,6 +171,7 @@ export default (state: IInbox = initialState, action?: InboxAction): IInbox => {
       return {
         ...state,
         isLoading: false,
+        searchParams: action.meta.searchParams,
         lastMessagesFetched: new Date().getTime(),
         messages: newMessages as IInboxMessagePreview[],
         pinned: action.payload?.appendMessages
@@ -355,6 +356,11 @@ export default (state: IInbox = initialState, action?: InboxAction): IInbox => {
     }
 
     case INBOX_NEW_MESSAGE: {
+      if (state?.searchParams?.archived && !action.payload.archived) {
+        // don't add new message if we are on an archived list
+        return state;
+      }
+
       const newMessage = {
         ...action.payload,
         created: new Date().toISOString(),

diff --git a/packages/react-hooks/src/inbox/types.ts b/packages/react-hooks/src/inbox/types.ts
@@ -1,3 +1,4 @@
+import { IGetInboxMessagesParams } from "@trycourier/client-graphql";
 import {
   Brand,
   IInboxMessagePreview,
@@ -13,6 +14,7 @@ export interface IInbox<T = IInboxMessagePreview> {
   lastMessagesFetched?: number;
   messages?: Array<T>;
   onEvent?: OnEvent;
+  searchParams?: IGetInboxMessagesParams;
   pinned?: Array<T>;
   startCursor?: string;
   unreadMessageCount?: number;

diff --git a/packages/react-hooks/src/inbox/use-inbox-actions.ts b/packages/react-hooks/src/inbox/use-inbox-actions.ts
@@ -56,14 +56,14 @@ export interface IInboxActions {
 
 const useInboxActions = (): IInboxActions => {
   const {
-    tenantId,
     apiUrl,
     authorization,
     clientKey,
     clientSourceId,
     dispatch,
     inbox,
     inboxApiUrl,
+    tenantId,
     userId,
     userSignature,
   } =
@@ -244,6 +244,17 @@ const useInboxActions = (): IInboxActions => {
           event: "archive",
         });
       }
+
+      const messageLength = inbox?.messages?.length ?? 0;
+      if (messageLength <= 1 && inbox.searchParams) {
+        dispatch({
+          meta: {
+            searchParams: inbox.searchParams,
+          },
+          payload: () => inboxClient.getMessages(inbox.searchParams),
+          type: "inbox/FETCH_MESSAGES",
+        });
+      }
     },
     addTag: async (messageId, tag, fromWS) => {
       dispatch(addTag(messageId, tag));