fix: closed group membership fixes (#1408)

techmatters · Jan 11, 2024 · 5dde36c · 5dde36c
1 parent c9e2409
commit 5dde36c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/src/collaboration/components/MembershipCard.js b/src/collaboration/components/MembershipCard.js
@@ -84,7 +84,7 @@ const Content = props => {
     );
   }
 
-  if (!accountMembership && closedGroup) {
+  if ((!accountMembership || accountMembership.fetching) && closedGroup) {
     return (
       <CardContent>
         <Trans

diff --git a/src/group/components/GroupSharedDataVisualizationConfig.js b/src/group/components/GroupSharedDataVisualizationConfig.js
@@ -56,7 +56,7 @@ const GroupSharedDataVisualizationConfig = () => {
 
   const onCompleteSuccess = useCallback(
     configSlug => {
-      navigate(`/groups/${slug}/map/${configSlug}`);
+      navigate(`/groups/${slug}/map/${configSlug}`, { replace: true });
     },
     [navigate, slug]
   );

diff --git a/src/group/membership/components/GroupMembers.js b/src/group/membership/components/GroupMembers.js
@@ -70,6 +70,7 @@ const GroupMembers = () => {
           groupSlug: group.slug,
           userEmails: [membership.user.email],
           userRole: newRole,
+          membershipStatus: MEMBERSHIP_STATUS_APPROVED,
         })
       );
     },

diff --git a/src/group/membership/components/GroupMembers.test.js b/src/group/membership/components/GroupMembers.test.js
@@ -388,6 +388,7 @@ test('GroupMembers: Manager actions', async () => {
         userEmails: ['[email protected]'],
         groupSlug: 'test-group-slug',
         userRole: 'manager',
+        membershipStatus: 'APPROVED',
       },
     }
   );

diff --git a/src/sharedData/visualization/components/VisualizationConfigForm/index.js b/src/sharedData/visualization/components/VisualizationConfigForm/index.js
@@ -171,10 +171,13 @@ const VisualizationConfigForm = props => {
     setIsDirty(true);
   }, []);
 
-  const onCompleteSuccessWrapper = useCallback(() => {
-    onCompleteSuccess(visualizationConfig);
-    setIsDirty(false);
-  }, [onCompleteSuccess, visualizationConfig]);
+  const onCompleteSuccessWrapper = useCallback(
+    mapSlug => {
+      onCompleteSuccess(mapSlug);
+      setIsDirty(false);
+    },
+    [onCompleteSuccess]
+  );
 
   return (
     <>