From 1a4923cbdfefe1bba5eb22ac8fc15cf83a9f66f0 Mon Sep 17 00:00:00 2001
From: Alex G Rice <agr@developmentseed.org>
Date: Mon, 13 Apr 2020 16:38:30 -0600
Subject: [PATCH 1/5] Table.js throw exception when headers are missing from
 i18n glossary.

- previously the exception was TypeError: column.Header is undefined
---
 components/common/Table.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/components/common/Table.js b/components/common/Table.js
index 0069635f7..47872c8f5 100644
--- a/components/common/Table.js
+++ b/components/common/Table.js
@@ -80,7 +80,11 @@ function selectCellFormatter (datatype, idMap, countryMap, campaignMap) {
 }
 
 function prepareAllHeaders (table) {
-  const headers = glossary.filter(term => Object.keys(table.headers).includes(term.id))
+  const tableHeaders = Object.keys(table.headers)
+  const headers = glossary.filter(term => tableHeaders.includes(term.id))
+  if (headers.length !== tableHeaders.length) {
+    throw new Error('Header(s) are missing from the i18n glossary')
+  }
   // appends a boolean property to headers to indicate whether the tooltip is showing
   headers.map(header => (
     table.displaysTooltip.includes(header.id) ? (

From 04cd526919ccce0fa61f457ebbcc02740b159552 Mon Sep 17 00:00:00 2001
From: Alex G Rice <agr@developmentseed.org>
Date: Mon, 13 Apr 2020 17:01:05 -0600
Subject: [PATCH 2/5] Remove normalizeHashtag()

- the format of hashtags should be enforced by the api and database, not as a formatting task.
- opened issue https://github.com/developmentseed/osm-teams/issues/174
- we prefer to display hashtags without # prefix.
---
 lib/utils/format.js | 13 -------------
 pages/team.js       |  4 ++--
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/lib/utils/format.js b/lib/utils/format.js
index 7ebabae8c..2a38dfb24 100644
--- a/lib/utils/format.js
+++ b/lib/utils/format.js
@@ -49,16 +49,3 @@ export function formatEditTimeDescription (timeVar) {
 export function formatUpdateDescription (timeVar) {
   return `${distanceInWords(timeVar, new Date())} ago`
 }
-
-/**
- * Prefix with '#' for consistent display of hashtag.
- *
- * @param {string} hashtag
- * @returns {string}
- */
-export function normalizeHashtag (hashtag) {
-  if (/^#/.test(hashtag)) {
-    return hashtag
-  }
-  return `#${hashtag}`
-}
diff --git a/pages/team.js b/pages/team.js
index 7ae12de08..235bb2768 100644
--- a/pages/team.js
+++ b/pages/team.js
@@ -9,7 +9,7 @@ import TeamStatsTable from '../components/campaign/CampaignTable'
 import Table from '../components/common/Table'
 import Blurb from '../components/teams/TeamBlurb'
 import Link from '../components/Link'
-import { formatDecimal, normalizeHashtag } from '../lib/utils/format'
+import { formatDecimal } from '../lib/utils/format'
 import { actions } from '../lib/store'
 import {
   calculateBlurbStats,
@@ -113,7 +113,7 @@ export class Team extends Component {
               <ul className='list--two-column'>
                 <li>
                   <span className='list-label'>hashtag</span>
-                  <strong>{ normalizeHashtag(hashtag) }</strong>
+                  <strong>{ hashtag }</strong>
                 </li>
                 <li>
                   <span className='list-label'>created</span>

From afd80bfd4391224a9aa89efda88fbbdf2ae5229d Mon Sep 17 00:00:00 2001
From: Alex G Rice <agr@developmentseed.org>
Date: Mon, 13 Apr 2020 17:28:17 -0600
Subject: [PATCH 3/5] Add missing columns to Teams index table (wip)

---
 lib/i18n/glossary_en.json | 20 ++++++++++++++++++++
 pages/teams.js            | 13 ++++++++-----
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/lib/i18n/glossary_en.json b/lib/i18n/glossary_en.json
index b01126c6f..9b9d10265 100644
--- a/lib/i18n/glossary_en.json
+++ b/lib/i18n/glossary_en.json
@@ -118,5 +118,25 @@
         "id": "campaign-priority",
         "name": "Priority",
         "description": "Priority of campaign for mappers on team (High/Medium/Low)"
+    },
+    {
+        "id": "team-name",
+        "name": "Team Name",
+        "description": "Team Name"
+    },
+    {
+        "id": "#-members",
+        "name": "# of Members",
+        "description": "Number of Members"
+    },
+    {
+        "id": "moderator-names",
+        "name": "Moderator Names",
+        "description": "Moderator Names"
+    },
+    {
+        "id":"team-hashtag",
+        "name":"Hashtag",
+        "description":"Hashtag for this team"
     }
 ]
diff --git a/pages/teams.js b/pages/teams.js
index 4900492f7..81d43ba4a 100644
--- a/pages/teams.js
+++ b/pages/teams.js
@@ -4,17 +4,18 @@ import { actions } from '../lib/store'
 import join from 'url-join'
 import Table from '../components/common/Table'
 import TeamsConnectBanner from '../components/TeamConnectBanner'
-
 import { APP_URL_PREFIX } from '../api/src/config'
 
 const tableSchema = {
   'headers': {
-    'name': { type: 'teamlink', accessor: 'name' },
-    'hashtags': { type: 'string', accessor: 'hashtag' }
+    'team-name': { type: 'teamlink', accessor: 'name' },
+    '#-members': { type: 'number', accessor: 'memberCount' },
+    'team-hashtag': { type: 'string', accessor: 'hashtag' },
+    'moderator-names': { type: 'string', accessor: 'moderatorNames' }
   },
-  columnOrder: [ 'name', 'hashtags' ],
+  columnOrder: [ 'team-name', '#-of-members', 'team-hashtag', 'moderator-names' ],
   'displaysTooltip': [
-    'hashtags'
+    'team-hashtag'
   ]
 }
 
@@ -55,6 +56,7 @@ class Teams extends Component {
     const { teams: prevTeams } = prevProps
     const { teams, authenticatedUser } = this.props
     if (prevTeams.records.length !== teams.records.length) {
+      console.log(teams.records)
       this.setState({
         user: authenticatedUser,
         teams: teams.records
@@ -75,6 +77,7 @@ class Teams extends Component {
 
   renderList () {
     const { teams } = this.state
+    // console.log( teams )
 
     if (!teams || !teams.length) return
 

From ea81c37f8b5b273000f46a290b9c1439ee9aba3b Mon Sep 17 00:00:00 2001
From: Alex G Rice <agr@developmentseed.org>
Date: Thu, 16 Apr 2020 16:58:27 -0600
Subject: [PATCH 4/5] Number of members column and moderator names column shown
 in Teams index.

---
 api/src/routes/index.js    |  1 +
 api/src/routes/users.js    | 30 +++++++++++++++++++++++++++++-
 lib/store/actions/teams.js | 25 +++++++++++++++++++++++--
 pages/teams.js             | 15 ++++++++++-----
 4 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/api/src/routes/index.js b/api/src/routes/index.js
index 941b676a8..4acd3377e 100644
--- a/api/src/routes/index.js
+++ b/api/src/routes/index.js
@@ -20,6 +20,7 @@ const settings = require('./settings')
  */
 router.get('/users', users.list)
 router.get('/users/stats', users.stats)
+router.post('/users/names', users.getNames)
 router.get('/users/:id', user.get)
 router.put('/users/:id', user.put)
 router.get('/campaigns/:tasker_id-:tm_id', campaign)
diff --git a/api/src/routes/users.js b/api/src/routes/users.js
index f50047986..3a4d3cef0 100644
--- a/api/src/routes/users.js
+++ b/api/src/routes/users.js
@@ -165,7 +165,35 @@ async function list (req, res) {
   }
 }
 
+/**
+ * Get names route
+ * /users/names
+ *
+ * List the osm names for a set of osm ids. This is a helper route that is used by
+ * getAllTeams action.
+ *
+ * @param req
+ * @param res
+ * @returns {Promise<*>}
+ * @async
+ */
+async function getNames (req, res) {
+  const { body } = req
+  try {
+    const { ids } = body
+    const data = await db
+      .select('osm_id', 'full_name')
+      .from('users')
+      .whereIn('osm_id', ids)
+    res.send(data)
+  } catch (err) {
+    console.error(err)
+    return res.boom.badRequest('Could not get user names')
+  }
+}
+
 module.exports = {
   stats,
-  list
+  list,
+  getNames
 }
diff --git a/lib/store/actions/teams.js b/lib/store/actions/teams.js
index e2956bc43..b6d8bb776 100644
--- a/lib/store/actions/teams.js
+++ b/lib/store/actions/teams.js
@@ -1,10 +1,31 @@
+import { flatten, fromPairs } from 'ramda'
 import fetch from '../../utils/api'
 
 export default store => ({
   getAllTeams (state) {
     return fetch('/api/teams')
-      .then(async res => {
-        const records = await res.json()
+      .then(res => res.json())
+      .then(async teams => {
+        // enhance the teams listing with moderator names
+        const moderatorIds = new Set(flatten(teams.map(team => team.moderators)))
+        const fetchParams = { ids: Array.from(moderatorIds) }
+        const fetchInit = {
+          method: 'POST',
+          credentials: 'include',
+          headers: {
+            'Content-Type': 'application/json; charset=utf-8'
+          },
+          body: JSON.stringify(fetchParams)
+        }
+        const moderatorNames = await fetch('/api/users/names', fetchInit)
+          .then(res => res.json())
+          .then(records => fromPairs(records.map(({ osm_id, full_name }) => [osm_id, full_name])))
+        return teams.map(team => ({
+          ...team,
+          moderators: fromPairs(team.moderators.map(osmId => [osmId, moderatorNames[osmId]]))
+        }))
+      })
+      .then(records => {
         store.setState({ teams: { records } })
       })
       .catch(err => {
diff --git a/pages/teams.js b/pages/teams.js
index 81d43ba4a..e59f8347c 100644
--- a/pages/teams.js
+++ b/pages/teams.js
@@ -56,7 +56,6 @@ class Teams extends Component {
     const { teams: prevTeams } = prevProps
     const { teams, authenticatedUser } = this.props
     if (prevTeams.records.length !== teams.records.length) {
-      console.log(teams.records)
       this.setState({
         user: authenticatedUser,
         teams: teams.records
@@ -77,14 +76,20 @@ class Teams extends Component {
 
   renderList () {
     const { teams } = this.state
-    // console.log( teams )
-
     if (!teams || !teams.length) return
-
+    const tableData = teams.map(team => {
+      const memberCount = team.members.length
+      const moderatorNames = Object.values(team.moderators).join(', ')
+      return {
+        ...team,
+        memberCount,
+        moderatorNames
+      }
+    })
     let idMap = Object.assign(...teams.map(({ id, name }) => ({ [name]: id })))
     return (
       <div>
-        <Table tableSchema={tableSchema} data={teams} idMap={idMap} />
+        <Table tableSchema={tableSchema} data={tableData} idMap={idMap} />
       </div>
     )
   }

From 0f226a98f9619bea42fde73555c8e9ef6341b171 Mon Sep 17 00:00:00 2001
From: Alex G Rice <agr@developmentseed.org>
Date: Fri, 17 Apr 2020 15:20:08 -0600
Subject: [PATCH 5/5] Unit test /api/users/names route.

---
 api/tests/api/users.test.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/api/tests/api/users.test.js b/api/tests/api/users.test.js
index 4c0127f90..8f4c3b0b5 100644
--- a/api/tests/api/users.test.js
+++ b/api/tests/api/users.test.js
@@ -38,6 +38,22 @@ test('Pull all users with stats', async (t) => {
   t.false(Number.isNaN(response.body.records[0].edit_count))
 })
 
+test.serial('Get user names from osm ids', async (t) => {
+  const allUsersResponse = await request(app)
+    .get('/scoreboard/api/users/stats')
+  const ids = allUsersResponse.body.records.map(prop('osm_id'))
+  const params = { ids }
+  const response = await request(app)
+    .post('/scoreboard/api/users/names').send(params)
+    .expect(200)
+  const records = response.body
+  t.is(records.length, ids.length)
+  records.forEach(({ osm_id, full_name }) => {
+    t.truthy(osm_id)
+    t.truthy(full_name)
+  })
+})
+
 test('Sort users by most recently active', async (t) => {
   const response = await request(app)
     .get('/scoreboard/api/users/stats/?q=&page=1&sortType=Most%20recent&active=false')