Add pagination to organization page

README.md

@@ -42,7 +42,9 @@ Start development server:
     yarn dev
 
 <!-- markdownlint-disable MD034 -->
+
 ✨ You can now login to the app at http://127.0.0.1:3000
+
 <!-- markdownlint-enable MD034 -->
 
 ## Testing
@@ -59,6 +61,8 @@ To open Cypress dashboard for interactive development:
 
     yarn e2e:dev
 
+By default, logging level in testing environment is set to 'silent'. Please refer to pino docs for the full [list of log levels](https://getpino.io/#/docs/api?id=level-string).
+
 ## API
 
 The API docs can be accessed at <http://127.0.0.1:3000/docs/api>.

app/manage/index.js

@@ -27,9 +27,7 @@ const {
   removeOwner,
   addManager,
   removeManager,
-  getOrgMembers,
   listMyOrgs,
-  getOrgStaff,
 } = require('./organizations')
 
 const {
@@ -123,16 +121,6 @@ function manageRouter(handler) {
   handler.get('/api/organizations/:id', can('public:authenticated'), getOrg)
   handler.put('/api/organizations/:id', can('organization:edit'), updateOrg)
   handler.delete('/api/organizations/:id', can('organization:edit'), destroyOrg)
-  handler.get(
-    '/api/organizations/:id/staff',
-    can('organization:view-members'),
-    getOrgStaff
-  )
-  handler.get(
-    '/api/organizations/:id/members',
-    can('organization:view-members'),
-    getOrgMembers
-  )
 
   handler.put(
     '/api/organizations/:id/addOwner/:osmId',

app/manage/organizations.js

@@ -1,6 +1,4 @@
 const organization = require('../../src/models/organization')
-const team = require('../../src/models/team')
-const { map, prop } = require('ramda')
 const Boom = require('@hapi/boom')
 
 /**
@@ -47,65 +45,18 @@ async function getOrg(req, reply) {
     throw Boom.badRequest('organization id is required')
   }
 
-  let [data, isMemberOfOrg] = await Promise.all([
+  let [data, isMember, isManager, isOwner] = await Promise.all([
     organization.get(id),
     organization.isMember(id, user_id),
+    organization.isManager(id, user_id),
+    organization.isOwner(id, user_id),
   ])
-  reply.send({ ...data, isMemberOfOrg })
-}
-
-/**
- * Get an organization's staff
- * Requires id of organization
- */
-async function getOrgStaff(req, reply) {
-  const { id } = req.params
 
-  if (!id) {
-    throw Boom.badRequest('organization id is required')
-  }
-
-  try {
-    let [owners, managers] = await Promise.all([
-      organization.getOwners(id),
-      organization.getManagers(id),
-    ])
-    const ownerIds = map(prop('osm_id'), owners)
-    const managerIds = map(prop('osm_id'), managers)
-    if (ownerIds.length > 0) {
-      owners = await team.resolveMemberNames(ownerIds)
-    }
-    if (managerIds.length > 0) {
-      managers = await team.resolveMemberNames(managerIds)
-    }
-
-    reply.send({ owners, managers })
-  } catch (err) {
-    console.log(err)
-    throw Boom.badRequest(err.message)
-  }
-}
-
-async function getOrgMembers(req, reply) {
-  const { id } = req.params
-
-  if (!id) {
-    throw Boom.badRequest('organization id is required')
-  }
-
-  let { page } = req.query
-
-  try {
-    let members = await organization.getMembers(id, page)
-    const memberIds = map(prop('osm_id'), members)
-    if (memberIds.length > 0) {
-      members = await team.resolveMemberNames(memberIds)
-    }
-
-    reply.send({ members, page })
-  } catch (err) {
-    console.log(err)
-    throw Boom.badRequest(err.message)
+  // User needs to be member or staff to access a private org
+  if (data?.privacy === 'private' && !isMember && !isManager && !isOwner) {
+    throw Boom.unauthorized()
+  } else {
+    reply.send({ ...data, isMember, isManager, isOwner })
   }
 }
 
@@ -246,6 +197,4 @@ module.exports = {
   addManager,
   removeManager,
   listMyOrgs,
-  getOrgStaff,
-  getOrgMembers,
 }

app/manage/permissions/index.js

@@ -24,7 +24,6 @@ const teamPermissions = {
 const organizationPermissions = {
   'organization:edit': require('./edit-org'),
   'organization:member': require('./member-org'),
-  'organization:view-members': require('./view-org-members'),
   'organization:view-team-keys': require('./view-org-team-keys'),
 }
 

app/manage/profiles.js

@@ -90,7 +90,7 @@ async function getTeamProfile(req, reply) {
   const { user_id: requesterId } = req.session
 
   if (!teamId) {
-    reply.boom.badRequest('teamId is required parameter')
+    return reply.boom.badRequest('teamId is required parameter')
   }
 
   // try {

app/manage/teams.js

@@ -26,7 +26,6 @@ async function listTeams(req, reply) {
     const data = await team.list({
       osmId,
       bbox: bounds,
-      disablePagination: true,
     })
     const enhancedData = await teamsMembersModeratorsHelper(data)
     reply.send(enhancedData)

cypress.config.js

@@ -18,6 +18,8 @@ module.exports = defineConfig({
         'db:reset': async () => {
           await db.raw('TRUNCATE TABLE team RESTART IDENTITY CASCADE')
           await db.raw('TRUNCATE TABLE organization RESTART IDENTITY CASCADE')
+          await db.raw('TRUNCATE TABLE users RESTART IDENTITY CASCADE')
+          await db.raw('TRUNCATE TABLE osm_users RESTART IDENTITY CASCADE')
           return null
         },
         'db:seed': async () => {
@@ -52,22 +54,47 @@ module.exports = defineConfig({
           }
           return null
         },
+        'db:seed:add-members-to-team': async ({ teamId, members }) => {
+          for (let i = 0; i < members.length; i++) {
+            const member = members[i]
+            await Team.addMember(teamId, member.id)
+          }
+          return null
+        },
         'db:seed:team-invitations': async (teamInvitations) => {
           return Promise.all(teamInvitations.map(TeamInvitation.create))
         },
-        'db:seed:organizations': async (orgs) => {
-          return Promise.all(
-            orgs.map((org) =>
-              Organization.create(pick(['name'], org), org.ownerId)
+        'db:seed:add-organizations': async (orgs) => {
+          for (let i = 0; i < orgs.length; i++) {
+            const org = orgs[i]
+            await Organization.create(
+              pick(['name', 'privacy'], org),
+              org.ownerId
             )
-          )
+          }
+          return null
         },
-        'db:seed:organization-teams': async ({ orgId, teams, managerId }) => {
-          return Promise.all(
-            teams.map((team) =>
-              Organization.createOrgTeam(orgId, pick(['name'], team), managerId)
+        'db:seed:add-organization-teams': async ({
+          orgId,
+          teams,
+          managerId,
+        }) => {
+          for (let i = 0; i < teams.length; i++) {
+            const team = teams[i]
+            await Organization.createOrgTeam(
+              orgId,
+              pick(['id', 'name', 'privacy'], team),
+              managerId
             )
-          )
+          }
+          return null
+        },
+        'db:seed:add-organization-managers': async ({ orgId, managerIds }) => {
+          for (let i = 0; i < managerIds.length; i++) {
+            const managerId = managerIds[i]
+            await Organization.addManager(orgId, managerId)
+          }
+          return null
         },
       })
     },

cypress/e2e/auth.cy.js

@@ -30,7 +30,7 @@ describe('Check protected routes', () => {
       // Authorized visit, should redirect to sign in
       cy.login({
         id: 1,
-        display_name: 'User 1',
+        display_name: 'User 001',
       })
       cy.visit(testRoute)
       cy.get('body').should('not.contain', 'Sign in')