Merge pull request #2068 from daostack/feature/CW-1940-change-join-co…

…mmon-flow

Change the Join common\space flow #1940

src/pages/OldCommon/components/CommonDetailContainer/EmptyTabContent/EmptyTabComponent.tsx

@@ -93,7 +93,7 @@ export default function EmptyTabComponent({
                 className="button-blue empty-tab-content-wrapper__button"
                 onClick={handleModalOpen}
               >
-                Join the effort
+                Join
               </button>
             )}
           </div>

src/pages/common/components/ChatComponent/ChatComponent.tsx

@@ -577,7 +577,7 @@ export default function ChatComponent({
 
     return (
       <span className={styles.permissionsText} onClick={onJoinCommon}>
-        {directParent ? "Join the space" : "Join the effort"}
+        Join
       </span>
     );
   };

src/pages/common/components/CommonHeader/CommonHeader.tsx

@@ -25,7 +25,7 @@ const CommonHeader: FC<CommonHeaderProps> = (props) => {
     details = [],
     isProject = false,
     withJoin = true,
-    joinButtonText = isProject ? "Join the space" : "Join the effort",
+    joinButtonText = "Join",
   } = props;
   const { isJoinAllowed, onJoinCommon } = useCommonDataContext();
   const isTabletView = useIsTabletView();

src/pages/common/components/CommonTabPanels/components/AboutTab/components/CommonEntranceInfo/components/CommonEntranceJoin/CommonEntranceJoin.tsx

@@ -44,7 +44,7 @@ const CommonEntranceJoin: FC<CommonEntranceJoinProps> = (props) => {
               : onJoinCommon
           }
         >
-          Join the {isProject ? "space" : "effort"}
+          Join
         </Button>
       )}
     </>

src/pages/common/components/JoinProjectModal/components/JoinProjectForm/JoinProjectForm.tsx

@@ -42,7 +42,7 @@ const JoinProjectForm: FC<PropsWithChildren<JoinProjectFormProps>> = (
           disabled={!message}
           onClick={handleRequestToJoin}
         >
-          {isJoinMemberAdmittanceRequest ? "Request to join" : "Join space"}
+          {isJoinMemberAdmittanceRequest ? "Request to join" : "Join"}
         </Button>
       </div>
     </>

src/pages/commonFeed/CommonFeed.tsx

@@ -98,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 =
@@ -193,6 +194,12 @@ const CommonFeedComponent: FC<CommonFeedProps> = (props) => {
     [dispatch],
   );
 
+  useEffect(() => {
+    if (isCommonDataFetched && parentCommonId && !parentCommonMember) {
+      history.replace(getCommonPageAboutTabPath(commonId));
+    }
+  }, [isCommonDataFetched, parentCommonMember?.id, commonId]);
+
   useEffect(() => {
     if (!isCommonDataFetched || !isGlobalDataFetched || commonMember) {
       return;

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),
             },
           });

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;
 }