move fetching parent common member logic to the useCommonData hook

daostack · Sep 13, 2023 · 6f949b0 · 6f949b0
1 parent 03278bf
commit 6f949b0
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 25 deletions.
diff --git a/src/pages/commonFeed/CommonFeed.tsx b/src/pages/commonFeed/CommonFeed.tsx
@@ -38,7 +38,6 @@ import {
   selectRecentStreamId,
   selectSharedFeedItem,
 } from "@/store/states";
-import { useCommonMember } from "../OldCommon/hooks";
 import {
   NewDiscussionCreation,
   NewProposalCreation,
@@ -99,6 +98,7 @@ const CommonFeedComponent: FC<CommonFeedProps> = (props) => {
     fetchCommonData,
   } = useCommonData(userId);
   const parentCommonId = commonData?.common.directParent?.commonId;
+  const parentCommonMember = commonData?.parentCommonMember;
   const isRootCommon = !parentCommonId;
   const isRootCommonMember = Boolean(commonData?.rootCommonMember);
   const anotherCommonId =
@@ -121,11 +121,6 @@ const CommonFeedComponent: FC<CommonFeedProps> = (props) => {
     loading: areCommonPinnedFeedItemsLoading,
     fetch: fetchCommonPinnedFeedItems,
   } = useCommonPinnedFeedItems(commonId, pinnedItemIds);
-  const {
-    data: parentCommonMember,
-    fetched: isParentCommonMemberFetched,
-    fetchCommonMember: fetchParentCommonMember,
-  } = useCommonMember();
 
   const commonFeedItemIdsForNotListening = useMemo(() => {
     const items: string[] = [];
@@ -165,9 +160,7 @@ const CommonFeedComponent: FC<CommonFeedProps> = (props) => {
     return items;
   }, [sharedFeedItem, sharedFeedItemId, commonPinnedFeedItems]);
   const firstItem = commonFeedItems?.[0];
-  const isDataFetched =
-    isCommonDataFetched &&
-    (parentCommonId ? isParentCommonMemberFetched : true);
+  const isDataFetched = isCommonDataFetched;
   const hasPublicItem = true;
 
   const fetchData = () => {
@@ -202,16 +195,10 @@ const CommonFeedComponent: FC<CommonFeedProps> = (props) => {
   );
 
   useEffect(() => {
-    if (parentCommonId) {
-      fetchParentCommonMember(parentCommonId, {}, true);
-    }
-  }, [parentCommonId]);
-
-  useEffect(() => {
-    if (isParentCommonMemberFetched && !parentCommonMember) {
+    if (isCommonDataFetched && parentCommonId && !parentCommonMember) {
       history.replace(getCommonPageAboutTabPath(commonId));
     }
-  }, [parentCommonMember?.id, isParentCommonMemberFetched, commonId]);
+  }, [isCommonDataFetched, parentCommonMember?.id, commonId]);
 
   useEffect(() => {
     if (!isCommonDataFetched || !isGlobalDataFetched || commonMember) {

diff --git a/src/pages/commonFeed/hooks/useCommonData/index.ts b/src/pages/commonFeed/hooks/useCommonData/index.ts
@@ -65,14 +65,24 @@ export const useCommonData = (userId?: string): Return => {
           }
 
           const rootCommonId = common.directParent?.commonId;
-          const [parentCommons, subCommons, rootCommonMember] =
-            await Promise.all([
-              CommonService.getAllParentCommonsForCommon(common),
-              CommonService.getCommonsByDirectParentIds([common.id]),
-              rootCommonId && userId
-                ? CommonService.getCommonMemberByUserId(rootCommonId, userId)
-                : null,
-            ]);
+          const [
+            parentCommons,
+            subCommons,
+            rootCommonMember,
+            parentCommonMember,
+          ] = await Promise.all([
+            CommonService.getAllParentCommonsForCommon(common),
+            CommonService.getCommonsByDirectParentIds([common.id]),
+            rootCommonId && userId
+              ? CommonService.getCommonMemberByUserId(rootCommonId, userId)
+              : null,
+            common.directParent?.commonId && userId
+              ? CommonService.getCommonMemberByUserId(
+                  common.directParent.commonId,
+                  userId,
+                )
+              : null,
+          ]);
 
           setState({
             loading: false,
@@ -85,6 +95,7 @@ export const useCommonData = (userId?: string): Return => {
               commonMembersAmount,
               sharedFeedItem,
               rootCommonMember,
+              parentCommonMember,
               parentCommon: last(parentCommons),
             },
           });

diff --git a/src/pages/commonFeed/hooks/useCommonData/types.ts b/src/pages/commonFeed/hooks/useCommonData/types.ts
@@ -9,6 +9,7 @@ export interface Data {
   commonMembersAmount: number;
   sharedFeedItem: CommonFeed | null;
   rootCommonMember: CommonMember | null;
+  parentCommonMember: CommonMember | null;
   parentCommon?: Common;
 }