Merge pull request #2063 from daostack/bugfix/CW-1990-select-created-…

…item when create a new discussion/proposal- the chat remains open with previews channel details #1990
daostack · Sep 12, 2023 · 6e6f57e · 6e6f57e
2 parents ace6922 + 872ce68
commit 6e6f57e
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 42 deletions.
diff --git a/src/pages/common/components/ChatComponent/context.ts b/src/pages/common/components/ChatComponent/context.ts
@@ -11,7 +11,7 @@ export interface ChatItem {
   proposal?: Proposal;
   discussion?: Discussion;
   chatChannel?: ChatChannel;
-  circleVisibility: string[];
+  circleVisibility?: string[];
   lastSeenItem?: CommonFeedObjectUserUnique["lastSeen"];
   lastSeenAt?: CommonFeedObjectUserUnique["lastSeenAt"];
   seenOnce?: boolean;

diff --git a/src/pages/common/components/CommonTabPanels/components/FeedTab/utils/checkHasAccessToChat.ts b/src/pages/common/components/CommonTabPanels/components/FeedTab/utils/checkHasAccessToChat.ts
@@ -8,10 +8,10 @@ export const checkHasAccessToChat = (
     return false;
   }
 
+  const { circleVisibility = [] } = chatItem;
+
   return (
-    !chatItem.circleVisibility.length ||
-    chatItem.circleVisibility.some((circleId) =>
-      userCircleIds.includes(circleId),
-    )
+    !circleVisibility.length ||
+    circleVisibility.some((circleId) => userCircleIds.includes(circleId))
   );
 };
diff --git a/src/pages/commonFeed/CommonFeed.tsx b/src/pages/commonFeed/CommonFeed.tsx
@@ -253,8 +253,10 @@ const CommonFeedComponent: FC<CommonFeedProps> = (props) => {
       checkIsFeedItemFollowLayoutItem(firstItem) &&
       recentStreamId === firstItem.feedItem.data.id
     ) {
-      feedLayoutRef?.setShouldAllowChatAutoOpen(true);
-      feedLayoutRef?.setExpandedFeedItemId(firstItem.feedItem.id);
+      feedLayoutRef?.setActiveItem({
+        feedItemId: firstItem.feedItem.id,
+      });
+      dispatch(commonActions.setRecentStreamId(""));
     }
   }, [feedLayoutRef, recentStreamId, firstItem]);
 

diff --git a/src/pages/commonFeed/components/FeedLayout/FeedLayout.tsx b/src/pages/commonFeed/components/FeedLayout/FeedLayout.tsx
@@ -10,7 +10,7 @@ import React, {
   useRef,
   useState,
 } from "react";
-import { useDispatch, useSelector } from "react-redux";
+import { useSelector } from "react-redux";
 import { useHistory } from "react-router-dom";
 import { useWindowSize } from "react-use";
 import classNames from "classnames";
@@ -66,7 +66,6 @@ import {
   getParamsFromOneOfRoutes,
   getUserName,
 } from "@/shared/utils";
-import { commonActions, selectRecentStreamId } from "@/store/states";
 import { MIN_CHAT_WIDTH } from "../../constants";
 import {
   DesktopChat,
@@ -169,15 +168,13 @@ const FeedLayout: ForwardRefRenderFunction<FeedLayoutRef, FeedLayoutProps> = (
     outerStyles,
     settings,
   } = props;
-  const dispatch = useDispatch();
   const { getCommonPagePath } = useRoutesContext();
   const refsByItemId = useRef<Record<string, FeedItemRef | null>>({});
   const { width: windowWidth } = useWindowSize();
   const history = useHistory();
   const queryParams = useQueryParams();
   const isTabletView = useIsTabletView();
   const user = useSelector(selectUser());
-  const recentStreamId = useSelector(selectRecentStreamId);
   const userId = user?.uid;
   const [chatItem, setChatItem] = useState<ChatItem | null>();
   const [isShowFeedItemDetailsModal, setIsShowFeedItemDetailsModal] =
@@ -270,19 +267,9 @@ const FeedLayout: ForwardRefRenderFunction<FeedLayoutRef, FeedLayoutProps> = (
     ) {
       return;
     }
-    if (recentStreamId) {
-      const foundItem = allFeedItems.find(
-        (item) =>
-          checkIsFeedItemFollowLayoutItem(item) &&
-          item.feedItem.data.id === recentStreamId,
-      );
-      return foundItem?.itemId;
-    }
-
     if (sharedFeedItemId) {
       return sharedFeedItemId;
     }
-
     if (chatItem?.feedItemId) {
       return;
     }
@@ -300,7 +287,6 @@ const FeedLayout: ForwardRefRenderFunction<FeedLayoutRef, FeedLayoutProps> = (
     chatChannelItemForProfile?.itemId,
     allFeedItems,
     chatItem?.feedItemId,
-    recentStreamId,
     sharedFeedItemId,
     userForProfile.userForProfileData,
     shouldAllowChatAutoOpen,
@@ -506,10 +492,7 @@ const FeedLayout: ForwardRefRenderFunction<FeedLayoutRef, FeedLayoutProps> = (
       return;
     }
 
-    setActiveChatItem({
-      feedItemId,
-      circleVisibility: [],
-    });
+    setActiveChatItem({ feedItemId });
 
     const itemExists = allFeedItems.some((item) => item.itemId === feedItemId);
 
@@ -633,18 +616,6 @@ const FeedLayout: ForwardRefRenderFunction<FeedLayoutRef, FeedLayoutProps> = (
     }
   }, [isTabletView, shouldAutoExpandItem, activeFeedItemId]);
 
-  useEffect(() => {
-    if (!recentStreamId || !selectedFeedItem) {
-      return;
-    }
-    if (
-      !checkIsFeedItemFollowLayoutItem(selectedFeedItem) ||
-      recentStreamId === selectedFeedItem?.feedItem.data.id
-    ) {
-      dispatch(commonActions.setRecentStreamId(""));
-    }
-  }, [recentStreamId, selectedFeedItem]);
-
   useImperativeHandle(
     ref,
     () => ({

diff --git a/src/pages/commonFeed/components/FeedLayout/components/DesktopProfile/DesktopProfile.tsx b/src/pages/commonFeed/components/FeedLayout/components/DesktopProfile/DesktopProfile.tsx
@@ -46,7 +46,6 @@ const DesktopProfile: FC<DesktopProfileProps> = (props) => {
           chatChannel: chatChannel,
           discussion:
             ChatChannelToDiscussionConverter.toTargetEntity(chatChannel),
-          circleVisibility: [],
         }}
         governanceCircles={governanceCircles}
         commonId={""}

diff --git a/src/pages/commonFeed/components/FeedLayout/components/MobileProfile/MobileProfile.tsx b/src/pages/commonFeed/components/FeedLayout/components/MobileProfile/MobileProfile.tsx
@@ -37,7 +37,6 @@ const MobileProfile: FC<MobileProfileProps> = (props) => {
           chatChannel: chatChannel,
           discussion:
             ChatChannelToDiscussionConverter.toTargetEntity(chatChannel),
-          circleVisibility: [],
         }}
         commonId={""}
         commonName={""}

diff --git a/src/pages/inbox/BaseInbox.tsx b/src/pages/inbox/BaseInbox.tsx
@@ -199,7 +199,6 @@ const InboxPage: FC<InboxPageProps> = (props) => {
       discussion: ChatChannelToDiscussionConverter.toTargetEntity(
         chatChannelItem.chatChannel,
       ),
-      circleVisibility: [],
     });
   }, [nextChatChannelItemId, feedLayoutRef]);
 

diff --git a/src/pages/inbox/components/ChatChannelItem/ChatChannelItem.tsx b/src/pages/inbox/components/ChatChannelItem/ChatChannelItem.tsx
@@ -47,7 +47,6 @@ export const ChatChannelItem: FC<ChatChannelFeedLayoutItemProps> = (props) => {
       feedItemId: chatChannel.id,
       discussion: ChatChannelToDiscussionConverter.toTargetEntity(chatChannel),
       chatChannel,
-      circleVisibility: [],
       lastSeenItem: chatChannelUserStatus?.lastSeenChatMessageId
         ? {
             type: LastSeenEntity.DiscussionMessage,