Merge pull request #2422 from daostack/bugfix/CW-2089-stream-linking

FE add "Link stream" action #2089
daostack · Dec 26, 2023 · 77d1b18 · 77d1b18
2 parents 854bf86 + cd4518b
commit 77d1b18
Show file tree

Hide file tree

Showing 19 changed files with 63 additions and 90 deletions.
diff --git a/src/pages/common/components/DiscussionFeedCard/DiscussionFeedCard.tsx b/src/pages/common/components/DiscussionFeedCard/DiscussionFeedCard.tsx
@@ -44,7 +44,7 @@ import {
   GetLastMessageOptions,
   GetNonAllowedItemsOptions,
 } from "../FeedItem";
-import { LinkSpaceModal } from "./components";
+import { LinkStreamModal } from "./components";
 import { useMenuItems } from "./hooks";
 
 interface DiscussionFeedCardProps {
@@ -115,9 +115,9 @@ const DiscussionFeedCard = forwardRef<FeedItemRef, DiscussionFeedCardProps>(
       onClose: onDeleteModalClose,
     } = useModal(false);
     const {
-      isShowing: isLinkSpaceModalOpen,
-      onOpen: onLinkSpaceModalOpen,
-      onClose: onLinkSpaceModalClose,
+      isShowing: isLinkStreamModalOpen,
+      onOpen: onLinkStreamModalOpen,
+      onClose: onLinkStreamModalClose,
     } = useModal(false);
     const [isDeletingInProgress, setDeletingInProgress] = useState(false);
     const {
@@ -155,7 +155,7 @@ const DiscussionFeedCard = forwardRef<FeedItemRef, DiscussionFeedCardProps>(
         report: onReportModalOpen,
         share: () => onShareModalOpen(),
         remove: onDeleteModalOpen,
-        linkSpace: onLinkSpaceModalOpen,
+        linkStream: onLinkStreamModalOpen,
       },
     );
     const user = useSelector(selectUser());
@@ -390,15 +390,16 @@ const DiscussionFeedCard = forwardRef<FeedItemRef, DiscussionFeedCardProps>(
           </GlobalOverlay>
         )}
         {commonId && (
-          <LinkSpaceModal
-            isOpen={isLinkSpaceModalOpen}
-            onClose={onLinkSpaceModalClose}
+          <LinkStreamModal
+            isOpen={isLinkStreamModalOpen}
+            onClose={onLinkStreamModalClose}
             feedItemId={item.id}
             title={cardTitle || ""}
             rootCommonId={rootCommonId || commonId}
             commonId={commonId}
             originalCommonId={discussion?.commonId || ""}
             linkedCommonIds={discussion?.linkedCommonIds}
+            circleVisibility={item.circleVisibility}
           />
         )}
       </>

diff --git a/src/pages/common/components/DiscussionFeedCard/components/LinkSpaceModal/hooks/index.ts b/src/pages/common/components/DiscussionFeedCard/components/LinkSpaceModal/hooks/index.ts
diff --git a/src/pages/common/components/DiscussionFeedCard/components/LinkSpaceModal/hooks/useDMUsers.ts b/src/pages/common/components/DiscussionFeedCard/components/LinkSpaceModal/hooks/useDMUsers.ts
diff --git a/src/pages/common/components/DiscussionFeedCard/components/LinkSpaceModal/index.ts b/src/pages/common/components/DiscussionFeedCard/components/LinkSpaceModal/index.ts
diff --git a/...LinkSpaceModal/LinkSpaceModal.module.scss → ...nkStreamModal/LinkStreamModal.module.scss b/...LinkSpaceModal/LinkSpaceModal.module.scss → ...nkStreamModal/LinkStreamModal.module.scss
diff --git a/...ponents/LinkSpaceModal/LinkSpaceModal.tsx → ...nents/LinkStreamModal/LinkStreamModal.tsx b/...ponents/LinkSpaceModal/LinkSpaceModal.tsx → ...nents/LinkStreamModal/LinkStreamModal.tsx
@@ -7,9 +7,9 @@ import { useStreamLinking } from "@/shared/hooks/useCases";
 import { Button, ButtonVariant, Loader } from "@/shared/ui-kit";
 import { emptyFunction } from "@/shared/utils";
 import { Projects } from "./components";
-import styles from "./LinkSpaceModal.module.scss";
+import styles from "./LinkStreamModal.module.scss";
 
-interface DirectMessageModalProps {
+interface LinkStreamModalProps {
   isOpen: boolean;
   onClose: () => void;
   feedItemId: string;
@@ -18,9 +18,10 @@ interface DirectMessageModalProps {
   commonId: string;
   originalCommonId: string;
   linkedCommonIds?: string[];
+  circleVisibility: string[];
 }
 
-const LinkSpaceModal: FC<DirectMessageModalProps> = (props) => {
+const LinkStreamModal: FC<LinkStreamModalProps> = (props) => {
   const {
     isOpen,
     onClose,
@@ -30,6 +31,7 @@ const LinkSpaceModal: FC<DirectMessageModalProps> = (props) => {
     commonId,
     originalCommonId,
     linkedCommonIds = [],
+    circleVisibility,
   } = props;
   const { notify } = useNotification();
   const { isStreamLinking, isStreamLinked, linkStream } = useStreamLinking();
@@ -64,6 +66,7 @@ const LinkSpaceModal: FC<DirectMessageModalProps> = (props) => {
           onActiveItemId={setActiveItemId}
           originalCommonId={originalCommonId}
           linkedCommonIds={linkedCommonIds}
+          circleVisibility={circleVisibility}
         />
         <div className={styles.submitButtonWrapper}>
           <Button
@@ -107,4 +110,4 @@ const LinkSpaceModal: FC<DirectMessageModalProps> = (props) => {
   );
 };
 
-export default LinkSpaceModal;
+export default LinkStreamModal;
diff --git a/.../components/Projects/Projects.module.scss → .../components/Projects/Projects.module.scss b/.../components/Projects/Projects.module.scss → .../components/Projects/Projects.module.scss
diff --git a/...aceModal/components/Projects/Projects.tsx → ...eamModal/components/Projects/Projects.tsx b/...aceModal/components/Projects/Projects.tsx → ...eamModal/components/Projects/Projects.tsx
@@ -13,6 +13,7 @@ interface ProjectsProps {
   onActiveItemId: (activeItemId: string) => void;
   originalCommonId: string;
   linkedCommonIds: string[];
+  circleVisibility: string[];
   renderNoItemsInfo?: () => ReactNode;
 }
 
@@ -23,6 +24,7 @@ const Projects: FC<ProjectsProps> = (props) => {
     renderNoItemsInfo,
     originalCommonId,
     linkedCommonIds,
+    circleVisibility,
   } = props;
   const [currentCommonId, setCurrentCommonId] = useState(props.rootCommonId);
   const {
@@ -35,9 +37,11 @@ const Projects: FC<ProjectsProps> = (props) => {
     parentItemIds,
   } = useProjectsData({
     currentCommonId,
+    currentCommonRootCommonId: props.rootCommonId,
     activeItemId,
     originalCommonId,
     linkedCommonIds,
+    circleVisibility,
   });
   const treeItemTriggerStyles = useMemo<TreeItemTriggerStyles>(
     () => ({

diff --git a/...RightContent/NameRightContent.module.scss → ...RightContent/NameRightContent.module.scss b/...RightContent/NameRightContent.module.scss → ...RightContent/NameRightContent.module.scss
diff --git a/...nts/NameRightContent/NameRightContent.tsx → ...nts/NameRightContent/NameRightContent.tsx b/...nts/NameRightContent/NameRightContent.tsx → ...nts/NameRightContent/NameRightContent.tsx
diff --git a/...ooks/components/NameRightContent/index.ts → ...ooks/components/NameRightContent/index.ts b/...ooks/components/NameRightContent/index.ts → ...ooks/components/NameRightContent/index.ts
diff --git a/...onents/Projects/hooks/components/index.ts → ...onents/Projects/hooks/components/index.ts b/...onents/Projects/hooks/components/index.ts → ...onents/Projects/hooks/components/index.ts
diff --git a/...eModal/components/Projects/hooks/index.ts → ...mModal/components/Projects/hooks/index.ts b/...eModal/components/Projects/hooks/index.ts → ...mModal/components/Projects/hooks/index.ts
diff --git a/...onents/Projects/hooks/useProjectsData.tsx → ...onents/Projects/hooks/useProjectsData.tsx b/...onents/Projects/hooks/useProjectsData.tsx → ...onents/Projects/hooks/useProjectsData.tsx
@@ -18,9 +18,11 @@ import { NameRightContent } from "./components";
 
 interface ProjectsInfo {
   currentCommonId: string;
+  currentCommonRootCommonId: string;
   activeItemId: string;
   originalCommonId: string;
   linkedCommonIds: string[];
+  circleVisibility: string[];
 }
 
 interface Return {
@@ -36,8 +38,14 @@ interface Return {
 const generateItemCommonPagePath = () => "";
 
 export const useProjectsData = (projectsInfo: ProjectsInfo): Return => {
-  const { currentCommonId, activeItemId, originalCommonId, linkedCommonIds } =
-    projectsInfo;
+  const {
+    currentCommonId,
+    currentCommonRootCommonId,
+    activeItemId,
+    originalCommonId,
+    linkedCommonIds,
+    circleVisibility,
+  } = projectsInfo;
   const currentCommonIdRef = useRef(currentCommonId);
   currentCommonIdRef.current = currentCommonId;
   const { commons, areCommonsLoading } = useSelector(
@@ -52,20 +60,33 @@ export const useProjectsData = (projectsInfo: ProjectsInfo): Return => {
   );
 
   const getAdditionalItemData = useCallback(
-    (projectsStateItem: ProjectsStateItem): Partial<Item> => ({
-      disabled:
-        !projectsStateItem.hasPermissionToLinkToHere ||
-        projectsStateItem.commonId === originalCommonId ||
-        linkedCommonIds.includes(projectsStateItem.commonId),
-      nameRightContent: (
-        <NameRightContent
-          projectsStateItem={projectsStateItem}
-          originalCommonId={originalCommonId}
-          linkedCommonIds={linkedCommonIds}
-        />
-      ),
-    }),
-    [originalCommonId, linkedCommonIds],
+    (projectsStateItem: ProjectsStateItem): Partial<Item> => {
+      const isAllowedToLink =
+        circleVisibility.length === 0 ||
+        projectsStateItem.commonId === currentCommonRootCommonId ||
+        projectsStateItem.rootCommonId === currentCommonRootCommonId;
+
+      return {
+        disabled:
+          !isAllowedToLink ||
+          !projectsStateItem.hasPermissionToLinkToHere ||
+          projectsStateItem.commonId === originalCommonId ||
+          linkedCommonIds.includes(projectsStateItem.commonId),
+        nameRightContent: (
+          <NameRightContent
+            projectsStateItem={projectsStateItem}
+            originalCommonId={originalCommonId}
+            linkedCommonIds={linkedCommonIds}
+          />
+        ),
+      };
+    },
+    [
+      originalCommonId,
+      linkedCommonIds,
+      currentCommonRootCommonId,
+      circleVisibility,
+    ],
   );
 
   const parentItem = useMemo(

diff --git a/...nkSpaceModal/components/Projects/index.ts → ...kStreamModal/components/Projects/index.ts b/...nkSpaceModal/components/Projects/index.ts → ...kStreamModal/components/Projects/index.ts
diff --git a/...onents/LinkSpaceModal/components/index.ts → ...nents/LinkStreamModal/components/index.ts b/...onents/LinkSpaceModal/components/index.ts → ...nents/LinkStreamModal/components/index.ts
diff --git a/src/pages/common/components/DiscussionFeedCard/components/LinkStreamModal/index.ts b/src/pages/common/components/DiscussionFeedCard/components/LinkStreamModal/index.ts
@@ -0,0 +1 @@
+export { default as LinkStreamModal } from "./LinkStreamModal";
diff --git a/src/pages/common/components/DiscussionFeedCard/components/index.ts b/src/pages/common/components/DiscussionFeedCard/components/index.ts
@@ -1 +1 @@
-export * from "./LinkSpaceModal";
+export * from "./LinkStreamModal";
diff --git a/src/pages/common/components/DiscussionFeedCard/hooks/useMenuItems.tsx b/src/pages/common/components/DiscussionFeedCard/hooks/useMenuItems.tsx
@@ -27,7 +27,7 @@ interface Actions {
   report: () => void;
   share: () => void;
   remove?: () => void;
-  linkSpace?: () => void;
+  linkStream?: () => void;
 }
 
 export const useMenuItems = (
@@ -42,7 +42,7 @@ export const useMenuItems = (
     feedItemFollow,
     feedItemUserMetadata,
   } = options;
-  const { report, share, remove, linkSpace } = actions;
+  const { report, share, remove, linkStream } = actions;
   const allowedMenuItems = getAllowedItems({ ...options, feedItemFollow });
   const items: Item[] = [
     {
@@ -148,11 +148,11 @@ export const useMenuItems = (
         feedItemFollow.onFollowToggle(FollowFeedItemAction.Unfollow),
       icon: <UnfollowIcon />,
     },
-    linkSpace
+    linkStream
       ? {
           id: FeedItemMenuItem.LinkTo,
           text: "Link to...",
-          onClick: linkSpace,
+          onClick: linkStream,
           icon: <LinkIcon />,
         }
       : undefined,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export { default as LinkStreamModal } from "./LinkStreamModal";
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export * from "./LinkSpaceModal";
		export * from "./LinkStreamModal";