fix: Added error message when user can't approve membership

techmatters · Oct 2, 2023 · 6c67b19 · 6c67b19
1 parent 7b10b77
commit 6c67b19
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 38 deletions.
diff --git a/src/localization/locales/en-US.json b/src/localization/locales/en-US.json
@@ -1014,7 +1014,8 @@
         "addMemberships.unique": "One or more users are already collaborators of this story map.",
         "approved_membership": "You have been added to “{{storyMapTitle}}”",
         "approve_invite_success": "You have been added to “{{storyMapTitle}}”",
-        "approve_invite_error": "Failed to accept Story Map invite",
+        "approveMembership.update_not_allowed": "Failed to accept Story Map invite",
+        "approveMembership.update_not_allowed_permissions_validation": "You do not have permission to accept this Story Map invite",
         "invite_document_title": "Story Map Invite"
     },
     "site": {

diff --git a/src/localization/locales/es-ES.json b/src/localization/locales/es-ES.json
@@ -1021,7 +1021,8 @@
         "addMemberships.unique": "Uno o más usuarios ya son colaboradores de este story map.",
         "approved_membership": "Te han agregado a “{{storyMapTitle}}”",
         "approve_invite_success": "Te han agregado a “{{storyMapTitle}}”",
-        "approve_invite_error": "No se pudo aceptar la invitación al Story Map",
+        "approveMembership.update_not_allowed": "No se pudo aceptar la invitación al Story Map",
+        "approveMembership.update_not_allowed_permissions_validation": "No tienes permiso para aceptar esta invitación de Story Map",
         "invite_document_title": "Invitación a Story Map"
     },
     "site": {

diff --git a/src/navigation/components/Routes.js b/src/navigation/components/Routes.js
@@ -193,11 +193,7 @@ const paths = [
       isEmbedded: true,
     },
   }),
-  path('/tools/story-maps/accept', StoryMapInvite, {
-    optionalAuth: {
-      enabled: true,
-    },
-  }),
+  path('/tools/story-maps/accept', StoryMapInvite),
   path('*', NotFound),
 ];
 

diff --git a/src/storyMap/components/StoryMapInvite.js b/src/storyMap/components/StoryMapInvite.js
@@ -52,44 +52,26 @@ const StoryMapInvite = () => {
     }, [token, decodedToken, membershipId])
   );
 
-  useEffect(() => {
-    if (!success && !error) {
-      return;
-    }
-
-    if (success) {
-      dispatch(
-        addMessage({
-          severity: 'success',
-          content: 'storyMap.approve_invite_success',
-          params: {
-            storyMapTitle: storyMap.title,
-          },
-        })
-      );
-    }
-
-    if (error) {
-      dispatch(
-        addMessage({
-          severity: 'error',
-          content: 'storyMap.approve_invite_error',
-        })
-      );
-    }
-  }, [success, error, storyMap, dispatch, navigate]);
-
   useEffect(() => {
     if (!success) {
       return;
     }
     navigate(`/tools/story-maps/${storyMap.storyMapId}/${storyMap.slug}/edit`);
     trackEvent('storymap.share.accept');
-  }, [success, navigate, trackEvent, storyMap]);
+    dispatch(
+      addMessage({
+        severity: 'success',
+        content: 'storyMap.approve_invite_success',
+        params: {
+          storyMapTitle: storyMap.title,
+        },
+      })
+    );
+  }, [success, navigate, trackEvent, dispatch, storyMap]);
 
   useDocumentTitle(t('storyMap.invite_document_title'));
 
-  if (processing || !storyMap) {
+  if (processing) {
     return <PageLoader />;
   }
 
@@ -99,7 +81,11 @@ const StoryMapInvite = () => {
 
   return (
     <PageContainer>
-      <Alert severity="error">{t('storyMap.approve_invite_error')}</Alert>
+      {error?.parsedErrors.map((error, index) => (
+        <Alert key={index} severity={error.severity}>
+          {t(error.content, error.params)}
+        </Alert>
+      ))}
     </PageContainer>
   );
 };

diff --git a/src/storyMap/components/StoryMapInvite.test.js b/src/storyMap/components/StoryMapInvite.test.js
@@ -123,3 +123,33 @@ test('StoryMapInvite: Invalid token', async () => {
     ).toBeInTheDocument()
   );
 });
+
+test('StoryMapInvite: Different user token', async () => {
+  const navigate = jest.fn();
+  useNavigate.mockReturnValue(navigate);
+
+  const searchParams = new URLSearchParams();
+  searchParams.set('token', TOKEN);
+  useSearchParams.mockReturnValue([searchParams]);
+
+  mockTerrasoAPIrequestGraphQL({
+    'mutation approveMembershipToken': Promise.reject({
+      content: 'update_not_allowed_permissions_validation',
+    }),
+  });
+
+  await setup({
+    user: {
+      id: 'user-id-2',
+      email: '',
+    },
+  });
+
+  expect(
+    within(screen.getByRole('alert')).getByText(
+      /You do not have permission to accept this Story Map invite/i
+    )
+  ).toBeInTheDocument();
+
+  expect(navigate).not.toHaveBeenCalled();
+});
diff --git a/src/storyMap/storyMapSlice.js b/src/storyMap/storyMapSlice.js
@@ -363,7 +363,7 @@ const storyMapSlice = createSlice({
           ...state.memberships.approve,
           [action.meta.arg.membership.membershipId]: {
             processing: false,
-            error: true,
+            error: action.payload,
           },
         },
       },