Merge pull request #2744 from daostack/CW-fix-mark-as-read-unread

Fixed mark as unread FeedCardTags
daostack · Oct 14, 2024 · 05f3419 · 05f3419
2 parents 983a905 + 69b9193
commit 05f3419
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 25 deletions.
diff --git a/src/pages/common/components/DiscussionFeedCard/DiscussionFeedCard.tsx b/src/pages/common/components/DiscussionFeedCard/DiscussionFeedCard.tsx
@@ -287,8 +287,8 @@ function DiscussionFeedCard(props, ref) {
 
   useEffect(() => {
     if(item.data.lastMessage?.content && discussion?.id && isOptimisticallyCreated) {
-      // markFeedItemAsSeen({feedObjectId: item.id, commonId})
-      dispatch(commonActions.clearCreatedOptimisticFeedItem(discussion?.id));
+      markFeedItemAsSeen({feedObjectId: item.id, commonId})
+      setTimeout(() => dispatch(commonActions.clearCreatedOptimisticFeedItem(discussion?.id)), 10000);
     }
   },[item.id, item.data.lastMessage?.content, discussion?.id, isOptimisticallyCreated, commonId])
 

diff --git a/src/pages/common/components/DiscussionFeedCard/utils/getAllowedItems.ts b/src/pages/common/components/DiscussionFeedCard/utils/getAllowedItems.ts
@@ -31,26 +31,18 @@ const MENU_ITEM_TO_CHECK_FUNCTION_MAP: Record<
     );
   },
   [FeedItemMenuItem.MarkUnread]: ({ feedItemUserMetadata }) => {
-    const { count, seen, isSeenUpdating } = feedItemUserMetadata || {};
+    const { count, seen } = feedItemUserMetadata || {};
 
     if (!feedItemUserMetadata) {
       return true;
     }
 
-    if (isSeenUpdating) {
-      return false;
-    }
-
     return notEmpty(count) && notEmpty(seen) && count === 0 && seen;
   },
   [FeedItemMenuItem.MarkRead]: ({ feedItemUserMetadata }) => {
-    const { count, seenOnce, seen, isSeenUpdating } =
+    const { count, seenOnce, seen } =
       feedItemUserMetadata || {};
 
-    if (isSeenUpdating) {
-      return false;
-    }
-
     return (
       Boolean(count) ||
       (notEmpty(seen) && !seen) ||

diff --git a/src/pages/common/components/FeedCard/components/FeedCardTags/FeedCardTags.tsx b/src/pages/common/components/FeedCard/components/FeedCardTags/FeedCardTags.tsx
@@ -36,7 +36,8 @@ export const MemoizedFeedCardTags: FC<FeedCardTagsProps> = (props) => {
   const isNewTagVisible =
     notEmpty(seenOnce) && notEmpty(isOwner) && !seenOnce && !isOwner;
     const isUnseenTagVisible =
-    !isNewTagVisible && !unreadMessages && notEmpty(seen) && !seen && !isOwner;
+    !isNewTagVisible && !unreadMessages && notEmpty(seen) && !seen;
+
   return (
     <>
       {type === CommonFeedType.Proposal && (

diff --git a/src/pages/inbox/components/ChatChannelItem/utils/getAllowedItems.ts b/src/pages/inbox/components/ChatChannelItem/utils/getAllowedItems.ts
@@ -12,23 +12,17 @@ const MENU_ITEM_TO_CHECK_FUNCTION_MAP: Record<
   (options: Options) => boolean
 > = {
   [ChatChannelMenuItem.MarkUnread]: ({ chatChannelUserStatus }) => {
-    const { notSeenCount, seen, isSeenUpdating } = chatChannelUserStatus || {};
+    const { notSeenCount, seen } = chatChannelUserStatus || {};
 
-    if (isSeenUpdating) {
-      return false;
-    }
 
     return (
       notEmpty(notSeenCount) && notEmpty(seen) && notSeenCount === 0 && seen
     );
   },
   [ChatChannelMenuItem.MarkRead]: ({ chatChannelUserStatus }) => {
-    const { notSeenCount, seenOnce, seen, isSeenUpdating } =
+    const { notSeenCount, seenOnce, seen } =
       chatChannelUserStatus || {};
 
-    if (isSeenUpdating) {
-      return false;
-    }
 
     return (
       Boolean(notSeenCount) ||

diff --git a/src/shared/hooks/useCases/useUpdateFeedItemSeenState.ts b/src/shared/hooks/useCases/useUpdateFeedItemSeenState.ts
@@ -1,8 +1,9 @@
-import { useCallback } from "react";
+import { useCallback, useRef } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import { selectUser } from "@/pages/Auth/store/selectors";
 import { CommonFeedService } from "@/services";
 import { getFeedItemUserMetadataKey } from "@/shared/constants";
+import axios, { CancelTokenSource } from "axios";
 import {
   MarkCommonFeedItemAsSeenPayload,
   MarkCommonFeedItemAsUnseenPayload,
@@ -21,6 +22,9 @@ export const useUpdateFeedItemSeenState = (): Return => {
   const dispatch = useDispatch();
   const user = useSelector(selectUser());
   const userId = user?.uid;
+
+  // Ref to store the current CancelTokenSource
+  const cancelTokenRef = useRef<CancelTokenSource | null>(null);
 
   const updateSeenState = async (
     payload:
@@ -32,6 +36,15 @@ export const useUpdateFeedItemSeenState = (): Return => {
       return;
     }
 
+    // Cancel the previous request if it exists
+    if (cancelTokenRef.current) {
+      cancelTokenRef.current.cancel("Operation canceled due to a new request.");
+    }
+
+    // Create a new CancelToken for the current request
+    const cancelTokenSource = axios.CancelToken.source();
+    cancelTokenRef.current = cancelTokenSource;
+
     const { commonId, feedObjectId } = payload;
     const key = getFeedItemUserMetadataKey({
       commonId,
@@ -49,11 +62,27 @@ export const useUpdateFeedItemSeenState = (): Return => {
       );
 
       if (newSeenValue) {
-        await CommonFeedService.markCommonFeedItemAsSeen(payload);
+        await CommonFeedService.markCommonFeedItemAsSeen(payload, {
+          cancelToken: cancelTokenSource.token,
+        });
       } else {
-        await CommonFeedService.markCommonFeedItemAsUnseen(payload);
+        await CommonFeedService.markCommonFeedItemAsUnseen(payload, {
+          cancelToken: cancelTokenSource.token,
+        });
       }
-    } catch (error) {
+    } catch (error: unknown) {
+      if (error instanceof Error) {
+        if (error.name === 'AbortError') {
+          console.log('Request was aborted');
+          return;
+        }
+
+        // Handle other types of errors here, like logging or displaying a message
+        console.error("An error occurred:", error.message);
+      } else {
+        console.error("An unknown error occurred");
+      }
+
       dispatch(
         cacheActions.updateFeedItemUserSeenState({
           key,