fix: Fixed landscape connect label, fixed groups and landscapes cards…

… link (#107)
techmatters · Dec 21, 2021 · a634e93 · a634e93
1 parent 5b7ef40
commit a634e93
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/src/group/components/GroupList.js b/src/group/components/GroupList.js
@@ -112,9 +112,14 @@ const GroupCards = ({ groups }) => {
                 <Typography variant="caption">
                   {t('group.list_column_name')}
                 </Typography>
-                <Typography variant="body1">
+                <Link
+                  variant="body1"
+                  display="block"
+                  component={RouterLink}
+                  to={`/groups/${group.slug}`}
+                >
                   {group.name}
-                </Typography>
+                </Link>
               </Grid>
               {group.email && (
                 <Grid item xs={12}>

diff --git a/src/landscape/components/LandscapeList.js b/src/landscape/components/LandscapeList.js
@@ -106,9 +106,14 @@ const LandscapeCards = ({ landscapes }) => {
                 <Typography variant="caption">
                   {t('landscape.list_column_name')}
                 </Typography>
-                <Typography variant="body1">
+                <Link
+                  variant="body1"
+                  display="block"
+                  component={RouterLink}
+                  to={`/landscapes/${landscape.slug}`}
+                >
                   {landscape.name}
-                </Typography>
+                </Link>
               </Grid>
               {landscape.location && (
                 <Grid item xs={12}>

diff --git a/src/landscape/components/LandscapeList.test.js b/src/landscape/components/LandscapeList.test.js
@@ -93,7 +93,7 @@ test('LandscapeList: Display list', async () => {
   expect(rows.length).toBe(11) // 10 displayed + header
   expect(within(rows[2]).getByRole('cell', { name: 'Landscape Name 1' })).toHaveAttribute('data-field', 'name')
   expect(within(rows[2]).getByRole('cell', { name: '23' })).toHaveAttribute('data-field', 'members')
-  expect(within(rows[2]).getByRole('cell', { name: 'Join' })).toHaveAttribute('data-field', 'actions')
+  expect(within(rows[2]).getByRole('cell', { name: 'Connect' })).toHaveAttribute('data-field', 'actions')
   expect(within(rows[9]).getByRole('cell', { name: 'MEMBER' })).toHaveAttribute('data-field', 'actions')
 })
 test('LandscapeList: List sort', async () => {
@@ -229,6 +229,6 @@ test('LandscapeList: Display list (small screen)', async () => {
   expect(within(rows[1]).getByText('Landscape Name 1')).toBeInTheDocument()
   expect(within(rows[1]).getByText('https://www.landscape.org')).toBeInTheDocument()
   expect(within(rows[1]).getByText('23')).toBeInTheDocument()
-  expect(within(rows[1]).getByText('Join')).toBeInTheDocument()
+  expect(within(rows[1]).getByText('Connect')).toBeInTheDocument()
   expect(within(rows[8]).getByText('MEMBER')).toBeInTheDocument()
 })
diff --git a/src/localization/locales/en-US.json b/src/localization/locales/en-US.json
@@ -87,7 +87,7 @@
         "view_leave_label": "Leave Landscape",
         "list_title": "Landscapes",
         "list_description": "View the list of Landscapes in Terraso. Follow the landscape name link to learn more from their landscape profile.",
-        "list_join_button": "Join",
+        "list_join_button": "Connect",
         "list_leave_button": "Member",
         "list_column_name": "Landscape Name",
         "list_column_location": "Location",