Merge pull request #2034 from daostack/bugfix/CW-1994-new-counters

FE activate new counters #1994

src/pages/common/components/FeedItem/components/ProjectFeedItem/ProjectFeedItem.tsx

@@ -1,14 +1,14 @@
 import React, { FC, ReactNode, useEffect } from "react";
 import { useHistory } from "react-router-dom";
 import classNames from "classnames";
-import { useCommonMember } from "@/pages/OldCommon/hooks";
 import { useFeedItemContext } from "@/pages/common";
 import { useRoutesContext } from "@/shared/contexts";
 import { useCommon } from "@/shared/hooks/useCases";
 import { OpenIcon } from "@/shared/icons";
 import { CommonFeed } from "@/shared/models";
 import { CommonAvatar, parseStringToTextEditorValue } from "@/shared/ui-kit";
 import { checkIsProject } from "@/shared/utils";
+import { useFeedItemCounters } from "../../hooks";
 import styles from "./ProjectFeedItem.module.scss";
 
 interface ProjectFeedItemProps {
@@ -22,16 +22,13 @@ export const ProjectFeedItem: FC<ProjectFeedItemProps> = (props) => {
   const { getCommonPagePath } = useRoutesContext();
   const { renderFeedItemBaseContent } = useFeedItemContext();
   const { data: common, fetched: isCommonFetched, fetchCommon } = useCommon();
-  const {
-    fetched: isCommonMemberFetched,
-    data: commonMember,
-    fetchCommonMember,
-  } = useCommonMember();
+  const { unreadStreamsCount, unreadMessages } = useFeedItemCounters(
+    item.id,
+    common?.directParent?.commonId,
+  );
   const commonId = item.data.id;
-  const unreadStreamsCount =
-    commonMember?.streamsUnreadCountByProjectStream[item.id] ?? null;
   const lastMessage = parseStringToTextEditorValue(
-    unreadStreamsCount !== null
+    Number.isInteger(unreadStreamsCount)
       ? `${unreadStreamsCount} updated stream${
           unreadStreamsCount === 1 ? "" : "s"
         }`
@@ -65,24 +62,19 @@ export const ProjectFeedItem: FC<ProjectFeedItemProps> = (props) => {
     fetchCommon(commonId);
   }, [commonId]);
 
-  useEffect(() => {
-    fetchCommonMember(item.commonId);
-  }, [fetchCommonMember, item.commonId]);
-
   return (
     (
       <>
         {renderFeedItemBaseContent?.({
           className: styles.container,
           titleWrapperClassName: styles.titleWrapper,
           lastActivity: item.updatedAt.seconds * 1000,
-          unreadMessages:
-            commonMember?.unreadCountByProjectStream[item.id] ?? 0,
           isMobileView: isMobileVersion,
           title: titleEl,
           onClick: handleClick,
           seenOnce: true,
-          isLoading: !isCommonFetched || !isCommonMemberFetched,
+          isLoading: !isCommonFetched,
+          unreadMessages,
           lastMessage,
           renderLeftContent,
           shouldHideBottomContent: !lastMessage,

src/pages/common/components/FeedItem/hooks/index.ts

@@ -0,0 +1 @@
+export * from "./useFeedItemCounters";

src/pages/common/components/FeedItem/hooks/useFeedItemCounters.ts

@@ -0,0 +1,34 @@
+import { useEffect } from "react";
+import { useCommonMember } from "@/pages/OldCommon/hooks";
+import { useGovernanceByCommonId } from "@/shared/hooks/useCases";
+
+interface Return {
+  unreadStreamsCount?: number;
+  unreadMessages?: number;
+}
+
+export const useFeedItemCounters = (
+  feedItemId: string,
+  commonId?: string,
+): Return => {
+  const { data: governance, fetchGovernance } = useGovernanceByCommonId();
+  const { data: commonMember } = useCommonMember({
+    shouldAutoReset: false,
+    withSubscription: true,
+    governanceCircles: governance?.circles,
+    commonId,
+  });
+  const { streamsUnreadCountByProjectStream, unreadCountByProjectStream } =
+    commonMember || {};
+
+  useEffect(() => {
+    if (commonId) {
+      fetchGovernance(commonId);
+    }
+  }, [fetchGovernance, commonId]);
+
+  return {
+    unreadStreamsCount: streamsUnreadCountByProjectStream?.[feedItemId],
+    unreadMessages: unreadCountByProjectStream?.[feedItemId],
+  };
+};

src/shared/models/Common.tsx

@@ -144,8 +144,8 @@ export interface CommonMember {
   rulesAccepted?: boolean;
   joinedAt: firebase.firestore.Timestamp;
   circleIds: string[];
-  streamsUnreadCountByProjectStream: Record<string, number>;
-  unreadCountByProjectStream: Record<string, number>;
+  streamsUnreadCountByProjectStream?: Record<string, number>;
+  unreadCountByProjectStream?: Record<string, number>;
 }
 
 export interface CirclesPermissions {

src/shared/models/CommonFeed.tsx

@@ -14,7 +14,6 @@ export enum CommonFeedType {
 
 export interface CommonFeed extends BaseEntity, SoftDeleteEntity {
   userId: string;
-  commonId: string;
   data: Record<string, unknown> & {
     type: CommonFeedType;
     id: string;