on the contributors page, only lists the closed PRs and the last date (#281)

* on the contributors page, only lists the closed PRs and the last date

* test fix

* test fix

Author: deniak

application/contributors-list.jsx

@@ -64,7 +64,7 @@ export default class ContributorsList extends React.Component {
                                             <td>
                                                 <ul>
                                                     {st.substantiveContributors[i].prs.map((pr) => {
-                                                        return <li key={pr}><a href={`https://github.com/${st.owner}/${st.shortName}/pull/${pr}`}>PR #{pr}</a></li>
+                                                        return <li key={pr.num}><a href={`https://github.com/${st.owner}/${st.shortName}/pull/${pr.num}`}>PR #{pr.num}</a> (closed on {pr.lastUpdated})</li>
                                                     })}
                                                 </ul>
                                             </td>

server.js

@@ -690,23 +690,25 @@ router.get("/api/repos/:owner/:shortName/contributors", function (req, res) {
         if (err) return error(res, err);
         const substantiveContributors = {};
         const nonSubstantiveContributors = {};
-        docs.forEach(function (doc) {
-            if (doc.markedAsNonSubstantiveBy) {
-                for (const contributor of doc.contributors) {
-                    if (!nonSubstantiveContributors[contributor]) {
-                        nonSubstantiveContributors[contributor] = { name: contributor, prs: []};
+        docs
+            .filter(doc => doc.status === "closed")
+            .forEach(function (doc) {
+                if (doc.markedAsNonSubstantiveBy) {
+                    for (const contributor of doc.contributors) {
+                        if (!nonSubstantiveContributors[contributor]) {
+                            nonSubstantiveContributors[contributor] = { name: contributor, prs: []};
+                        }
+                        nonSubstantiveContributors[contributor].prs.push({num: doc.num, lastUpdated: new Date(...doc.lastUpdated).toDateString()});
                     }
-                    nonSubstantiveContributors[contributor].prs.push(doc.num);
-                }
-            } else {
-                for (const affiliationId in doc.affiliations) {
-                    if (!substantiveContributors[affiliationId]) {
-                        substantiveContributors[affiliationId] = { name: doc.affiliations[affiliationId], prs: []};
+                } else {
+                    for (const affiliationId in doc.affiliations) {
+                        if (!substantiveContributors[affiliationId]) {
+                            substantiveContributors[affiliationId] = { name: doc.affiliations[affiliationId], prs: []};
+                        }
+                        substantiveContributors[affiliationId].prs.push({num: doc.num, lastUpdated: new Date(...doc.lastUpdated).toDateString()});
                     }
-                    substantiveContributors[affiliationId].prs.push(doc.num);
                 }
-            }
-        });
+            });
         res.json({substantiveContributors, nonSubstantiveContributors});
     });
 });

test/server-spec.js

@@ -408,7 +408,7 @@ describe('Server starts and responds with no login', function () {
             "shortName": "existingrepo",
             "owner": "acme",
             "num": "42",
-            "status": "opened",
+            "status": "closed",
             "contributors": [
                 "--ghtest"
             ],
@@ -421,7 +421,7 @@ describe('Server starts and responds with no login', function () {
             "shortName": "existingrepo",
             "owner": "acme",
             "num": "43",
-            "status": "opened",
+            "status": "closed",
             "contributors": [
                 "--ghtest"
             ],
@@ -442,15 +442,17 @@ describe('Server starts and responds with no login', function () {
             });
         });
 
-        it('responds with an empty list of contributors', function testProtectedPOSTRoutes(done) {
+        it('responds with an empty list of contributors', function testContributorsList(done) {
             req
                 .get('/api/repos/acme/newrepo/contributors')
                 .expect(200, {substantiveContributors: {}, nonSubstantiveContributors:{}}, done);
         });
-        it('responds with the list of contributors', function testProtectedPOSTRoutes(done) {
+        it('responds with the list of contributors', function testContributorsList(done) {
+            const currentDate = new Date();
+            currentDate.setMonth(currentDate.getMonth() + 1); // to match couchNow in store.js
             req
                 .get('/api/repos/acme/existingrepo/contributors')
-                .expect(200, {substantiveContributors: {"456": {"name": "ACME Inc", "prs": ["42"]}}, nonSubstantiveContributors:{"--ghtest": {"name": "--ghtest", "prs": ["43"]}}}, done);
+                .expect(200, {substantiveContributors: {"456": {"name": "ACME Inc", "prs": [{"num":"42", "lastUpdated": currentDate.toDateString()}]}}, nonSubstantiveContributors:{"--ghtest": {"name": "--ghtest", "prs": [{"num":"43", "lastUpdated": currentDate.toDateString()}]}}}, done);
         });
     });
 });