Merge pull request #415 from developmentseed/feature/team-badge-column

Display organization badges on Team page

Author: kamicut

app/manage/index.js

@@ -3,15 +3,10 @@ const {
   addMember,
   assignModerator,
   createTeam,
-  destroyTeam,
-  getTeam,
-  getTeamMembers,
   joinTeam,
   listTeams,
   removeMember,
   removeModerator,
-  updateMembers,
-  updateTeam,
   getJoinInvitations,
   createJoinInvitation,
   deleteJoinInvitation,
@@ -66,17 +61,8 @@ function manageRouter(handler) {
    */
   handler.get('/api/teams', listTeams)
   handler.post('/api/teams', can('public:authenticated'), createTeam)
-  handler.get('/api/teams/:id', can('team:view'), getTeam)
-  handler.get(
-    '/api/teams/:id/members',
-    can('team:view-members'),
-    getTeamMembers
-  )
-  handler.put('/api/teams/:id', can('team:edit'), updateTeam)
-  handler.delete('/api/teams/:id', can('team:edit'), destroyTeam)
   handler.put('/api/teams/add/:id/:osmId', can('team:edit'), addMember)
   handler.put('/api/teams/remove/:id/:osmId', can('team:edit'), removeMember)
-  handler.patch('/api/teams/:id/members', can('team:edit'), updateMembers)
   handler.put('/api/teams/:id/join', can('team:join'), joinTeam)
   handler.put(
     '/api/teams/:id/assignModerator/:osmId',

app/manage/permissions/edit-org.js

@@ -12,6 +12,9 @@ const { isOwner } = require('../../../src/models/organization')
  * @returns {Promise<boolean>}
  */
 async function editOrg(uid, { id }) {
+  if (!uid) {
+    return false
+  }
   return isOwner(id, uid)
 }
 

app/manage/permissions/index.js

@@ -15,8 +15,6 @@ const keyPermissions = {
 
 const teamPermissions = {
   'team:edit': require('./edit-team'),
-  'team:view': require('./view-team'),
-  'team:view-members': require('./view-team-members'),
   'team:join': require('./join-team'),
   'team:member': require('./member-team'),
 }

app/manage/permissions/view-team-members.js

@@ -3,14 +3,10 @@ const db = require('../../src/lib/db')
 const yup = require('yup')
 const crypto = require('crypto')
 const { routeWrapper } = require('./utils')
-const { prop, map, dissoc } = require('ramda')
 const urlRegex = require('url-regex')
-const profile = require('../../src/models/profile')
 const Boom = require('@hapi/boom')
 const logger = require('../../src/lib/logger')
-
 const isUrl = urlRegex({ exact: true })
-const getOsmId = prop('osm_id')
 
 async function listTeams(req, res) {
   const { osmId, bbox } = req.query
@@ -29,58 +25,6 @@ async function listTeams(req, res) {
   return res.send(data)
 }
 
-async function getTeam(req, reply) {
-  const { id } = req.params
-
-  if (!id) {
-    throw Boom.badRequest('Team id is required')
-  }
-
-  try {
-    const teamData = await team.get(id)
-    const associatedOrg = await team.associatedOrg(id)
-
-    if (!teamData) {
-      throw Boom.notFound()
-    }
-
-    return reply.send(Object.assign({}, teamData, { org: associatedOrg }))
-  } catch (err) {
-    logger.error(err)
-    throw Boom.badRequest(err.message)
-  }
-}
-
-const getTeamMembers = routeWrapper({
-  validate: {
-    params: yup
-      .object({
-        id: yup.number().required().positive().integer(),
-      })
-      .required(),
-  },
-  handler: async (req, reply) => {
-    const { id } = req.params
-
-    if (!id) {
-      throw Boom.badRequest('team id is required')
-    }
-
-    try {
-      const memberIds = map(getOsmId, await team.getMembers(id))
-      const members = await team.resolveMemberNames(memberIds)
-      const moderators = await team.getModerators(id)
-
-      return reply.send(
-        Object.assign({}, { teamId: id }, { members, moderators })
-      )
-    } catch (err) {
-      logger.error(err)
-      throw Boom.badRequest(err.message)
-    }
-  },
-})
-
 async function createTeam(req, reply) {
   const { body } = req
   const { user_id } = req.session
@@ -97,35 +41,6 @@ async function createTeam(req, reply) {
   }
 }
 
-async function updateTeam(req, reply) {
-  const { id } = req.params
-  const { body } = req
-
-  if (!id) {
-    throw Boom.badRequest('team id is required')
-  }
-
-  if (body.editing_policy && !isUrl.test(body.editing_policy)) {
-    throw Boom.badRequest('editing_policy must be a valid url')
-  }
-
-  try {
-    const tags = prop('tags', body)
-    if (tags) {
-      await profile.setProfile(tags, 'team', id)
-    }
-    const teamData = dissoc('tags', body)
-    let updatedTeam = {}
-    if (teamData) {
-      updatedTeam = await team.update(id, teamData)
-    }
-    reply.send(updatedTeam)
-  } catch (err) {
-    logger.error(err)
-    throw Boom.badRequest(err.message)
-  }
-}
-
 async function assignModerator(req, reply) {
   const { id: teamId, osmId } = req.params
 
@@ -170,22 +85,6 @@ async function removeModerator(req, reply) {
   }
 }
 
-async function destroyTeam(req, reply) {
-  const { id } = req.params
-
-  if (!id) {
-    throw Boom.badRequest('team id is required')
-  }
-
-  try {
-    await team.destroy(id)
-    return reply.status(200).send()
-  } catch (err) {
-    logger.error(err)
-    throw Boom.badRequest(err.message)
-  }
-}
-
 async function addMember(req, reply) {
   const { id, osmId } = req.params
 
@@ -206,37 +105,6 @@ async function addMember(req, reply) {
   }
 }
 
-async function updateMembers(req, reply) {
-  const { id } = req.params
-  const { add, remove } = req.body
-
-  if (!id) {
-    throw Boom.badRequest('team id is required')
-  }
-
-  if (!add && !remove) {
-    throw Boom.badRequest('osm ids are required')
-  }
-
-  try {
-    let members = []
-    if (add) {
-      members = members.concat(add)
-    }
-    if (remove) {
-      members = members.concat(remove)
-    }
-    // Check if these are OSM users
-    await team.resolveMemberNames(members)
-
-    await team.updateMembers(id, add, remove)
-    return reply.status(200).send()
-  } catch (err) {
-    logger.error(err)
-    throw Boom.badRequest(err.message)
-  }
-}
-
 async function removeMember(req, reply) {
   const { id, osmId } = req.params
 
@@ -386,15 +254,10 @@ module.exports = {
   addMember,
   assignModerator,
   createTeam,
-  destroyTeam,
-  getTeam,
-  getTeamMembers,
   joinTeam,
   listTeams,
   removeMember,
   removeModerator,
-  updateMembers,
-  updateTeam,
   getJoinInvitations,
   createJoinInvitation,
   deleteJoinInvitation,

app/manage/permissions/view-team.js

@@ -93,13 +93,13 @@ describe('Organization page', () => {
     cy.visit('/organizations/1')
 
     cy.get('[data-cy=org-members-table]')
-      .find('tbody tr:nth-child(6) td:nth-child(3)')
+      .find('tbody tr:nth-child(6) td:nth-child(2)')
       .contains('Badge 002')
     cy.get('[data-cy=org-members-table]')
-      .find('tbody tr:nth-child(6) td:nth-child(3)')
+      .find('tbody tr:nth-child(6) td:nth-child(2)')
       .contains('Badge 003')
     cy.get('[data-cy=org-members-table]')
-      .find('tbody tr:nth-child(10) td:nth-child(3)')
+      .find('tbody tr:nth-child(10) td:nth-child(2)')
       .contains('Badge 005')
   })
 })

app/manage/teams.js

@@ -17,7 +17,7 @@ export default function Badge({ color, dot, children }) {
       color={color}
       bg={`rgba(${hexToRgb(color)}, 0.125)`}
       size='sm'
-      borderRadius={'full'}
+      borderRadius={dot ? 'full' : 'sm'}
       boxShadow={`0 0 0 1px rgba(${hexToRgb(color)}, 0.25)`}
       mr={2}
       overflow='hidden'

cypress/e2e/organizations/badges.cy.js

@@ -43,7 +43,7 @@ const ExternalProfileButton = ({ type, userId }) => {
       title = 'View profile on OSMCha'
       label = 'OSMCha'
       altText = 'OSMCha Logo'
-      logoImg = 'icon-osmcha-logo.svg'
+      logoImg = 'osmcha-logo.svg'
       break
     default:
       return null
@@ -60,6 +60,7 @@ const ExternalProfileButton = ({ type, userId }) => {
       target='_blank'
       title={title}
       size='sm'
+      bg='white'
       variant='ghost'
     >
       <img

public/static/osmcha-logo.svg

@@ -51,9 +51,10 @@ function listPageOptions(page, lastPage) {
 }
 
 function Pagination({ pagination, setPage, 'data-cy': dataCy }) {
-  const { perPage, total, currentPage } = pagination
+  let { perPage, total, currentPage, lastPage } = pagination
+  currentPage = Number(currentPage)
 
-  const maxPages = perPage ? Math.ceil(total / perPage) : 0
+  const maxPages = Number(lastPage)
   const pages = listPageOptions(currentPage + 1, maxPages)
 
   return (
@@ -117,7 +118,9 @@ function Pagination({ pagination, setPage, 'data-cy': dataCy }) {
       <Text flexBasis='100%' width='100%' textAlign={'center'}>
         Showing {(currentPage - 1) * perPage + 1}-
         {Intl.NumberFormat().format(
-          currentPage === maxPages ? total : currentPage * perPage
+          Number(currentPage) === Number(maxPages)
+            ? total
+            : currentPage * perPage
         )}{' '}
         of {Intl.NumberFormat().format(total)}
       </Text>