Merge branch 'develop-auth0-sync' into feature/auth0-RS256-Idtoken

Author: sushilshinde

package.json

@@ -140,7 +140,7 @@
     "supertest": "^3.1.0",
     "tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3",
     "tc-ui": "^1.0.12",
-    "topcoder-react-lib": "1000.23.1",
+    "topcoder-react-lib": "1000.23.2",
     "topcoder-react-ui-kit": "2.0.1",
     "topcoder-react-utils": "0.7.8",
     "turndown": "^4.0.2",

src/server/services/mmLeaderboard.js

@@ -4,7 +4,7 @@
  */
 import { services } from 'topcoder-react-lib';
 
-const { api } = services;
+const { api, submissions } = services;
 
 /**
  * Auxiliary class that handles communication with MMLeaderboard
@@ -18,11 +18,14 @@ export default class MMLService {
   async getLeaderboard(req, res, next) {
     try {
       const m2mToken = await api.getTcM2mToken();
+      const subSrv = submissions.getService(m2mToken);
+      const reviewIds = await subSrv.getScanReviewIds();
       const v5api = api.getApiV5(m2mToken);
       const subs = await v5api.get(`/submissions?challengeId=${req.params.id}&page=1&perPage=500`);
       return res.send({
         id: req.params.id,
         subs: await subs.json(),
+        reviewIds,
       });
     } catch (err) {
       return next(err);

src/shared/actions/mmLeaderboard.js

@@ -19,7 +19,13 @@ async function getMMLeaderboardDone(id) {
   if (res) {
     const groupedData = _.groupBy(res.subs, 'createdBy');
     _.each(groupedData, (subs, handle) => {
-      const sortedSubs = _.orderBy(subs, ['updated'], ['desc']);
+      // filter member subs from reviewIds
+      const filteredSubs = _.map(subs, (sub) => {
+        // eslint-disable-next-line no-param-reassign
+        sub.review = _.filter(sub.review, r => res.reviewIds.indexOf(r.typeId) === -1);
+        return sub;
+      });
+      const sortedSubs = _.orderBy(filteredSubs, ['updated'], ['desc']);
       const scores = _.orderBy(_.compact(sortedSubs[0].review), ['updated'], ['desc']);
       data.push({
         createdBy: handle,
@@ -28,7 +34,7 @@ async function getMMLeaderboardDone(id) {
         score: scores && scores.length ? scores[0].score : '...',
       });
     });
-    data = _.orderBy(data, ['score', 'updated'], ['desc']).map((r, i) => ({
+    data = _.orderBy(data, [d => (Number(d.score) ? Number(d.score) : 0)], ['desc']).map((r, i) => ({
       ...r,
       rank: i + 1,
       score: r.score % 1 ? Number(r.score).toFixed(5) : r.score,

src/shared/components/MMatchLeaderboard/index.jsx

@@ -68,7 +68,10 @@ export default class MMLeaderboard extends Component {
 
     if (sortParam.field) {
       // Use Lodash to sort array
-      data = _.orderBy(data, [d => (typeof d[sortParam.field] === 'string' ? d[sortParam.field].toLowerCase() : d[sortParam.field])], [sortParam.order]);
+      data = _.orderBy(
+        data,
+        [d => String(d[sortParam.field]).toLowerCase()], [sortParam.order],
+      );
     }
 
     const renderData = () => {
@@ -217,7 +220,7 @@ export default class MMLeaderboard extends Component {
     };
     return (
       <React.Fragment>
-        { data.length ? renderData() : <h4>No data available yet.</h4> }
+        { data.length ? renderData() : <h4 styleName="no-data-title">No data available yet.</h4> }
       </React.Fragment>
     );
   }

src/shared/components/MMatchLeaderboard/style.scss

@@ -2,7 +2,7 @@
 
 $light-gray: #d4d4d4;
 
-h4 {
+.no-data-title {
   text-align: center;
 }