Merge pull request #5100 from topcoder-platform/develop

Release 2020-10-13

Author: mtwomey

.circleci/config.yml

@@ -236,15 +236,15 @@ workflows:
           context : org-global      
           filters:
             branches:
-              only:
-                - develop
+              only:                
+                - hot-fix
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global      
           filters:
             branches:
               only:
-                - develop
+                - listing-develop-sync
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global
@@ -260,6 +260,7 @@ workflows:
             branches:
               only:
                 - develop
+                - listing-develop-sync
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration

__tests__/shared/reducers/challenge-listing/sidebar.js

@@ -1,7 +1,7 @@
 const defaultReducer = require('reducers/challenge-listing/sidebar').default;
 
 const expectedState = {
-  activeBucket: 'all',
+  activeBucket: 'openForRegistration',
 };
 
 function testReducer(reducer) {

package.json

@@ -140,7 +140,7 @@
     "tc-accounts": "git+https://github.com/appirio-tech/accounts-app.git#dev",
     "tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3",
     "tc-ui": "^1.0.12",
-    "topcoder-react-lib": "1000.24.6",
+    "topcoder-react-lib": "1.0.8",
     "topcoder-react-ui-kit": "2.0.1",
     "topcoder-react-utils": "0.7.8",
     "turndown": "^4.0.2",

src/server/index.js

@@ -27,6 +27,7 @@ import cdnRouter from './routes/cdn';
 import mailChimpRouter from './routes/mailchimp';
 import mockDocuSignFactory from './__mocks__/docu-sign-mock';
 import recruitCRMRouter from './routes/recruitCRM';
+import mmLeaderboardRouter from './routes/mmLeaderboard';
 
 /* Dome API for topcoder communities */
 import tcCommunitiesDemoApi from './tc-communities';
@@ -135,6 +136,7 @@ async function onExpressJsSetup(server) {
   server.use('/api/cdn', cdnRouter);
   server.use('/api/mailchimp', mailChimpRouter);
   server.use('/api/recruit', recruitCRMRouter);
+  server.use('/api/mml', mmLeaderboardRouter);
 
   // serve demo api
   server.use(

src/server/routes/mmLeaderboard.js

@@ -0,0 +1,19 @@
+/**
+ * The routes related to MMLeaderboard integration
+ */
+
+import express from 'express';
+import MMLService from '../services/mmLeaderboard';
+
+const cors = require('cors');
+
+const routes = express.Router();
+
+// Enables CORS on those routes according config above
+// ToDo configure CORS for set of our trusted domains
+routes.use(cors());
+routes.options('*', cors());
+
+routes.get('/:id', (req, res, next) => new MMLService().getLeaderboard(req, res, next));
+
+export default routes;

src/server/services/mmLeaderboard.js

@@ -0,0 +1,34 @@
+/* eslint-disable class-methods-use-this */
+/**
+ * Server-side functions necessary for effective integration with MMLeaderboard
+ */
+import { services } from 'topcoder-react-lib';
+
+const { api, submissions } = services;
+
+/**
+ * Auxiliary class that handles communication with MMLeaderboard
+ */
+export default class MMLService {
+  /**
+   * getLeaderboard endpoint.
+   * @return {Promise}
+   * @param {Object} the request.
+   */
+  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/server/tc-communities/blockchain/metadata.json

@@ -5,6 +5,9 @@
       "tags": ["Blockchain", "Ethereum"]
     }]
   },
+  "challengeListing": {
+    "ignoreCommunityFilterByDefault": true
+  },
   "communityId": "blockchain",
   "communityName": "Blockchain Community",
   "groupIds": ["20000010"],

src/server/tc-communities/cognitive/metadata.json

@@ -6,6 +6,7 @@
     }]
   },
   "challengeListing": {
+    "ignoreCommunityFilterByDefault": true,
     "openChallengesInNewTabs": false
   },
   "communityId": "cognitive",

src/shared/actions/mmLeaderboard.js

@@ -0,0 +1,54 @@
+import { redux } from 'topcoder-react-utils';
+import Service from 'services/mmLeaderboard';
+import _ from 'lodash';
+
+/**
+ * Fetch init
+ */
+function getMMLeaderboardInit(id) {
+  return { id };
+}
+
+/**
+ * Fetch done
+ */
+async function getMMLeaderboardDone(id) {
+  const ss = new Service();
+  const res = await ss.getMMLeaderboard(id);
+  let data = [];
+  if (res) {
+    const groupedData = _.groupBy(res.subs, 'createdBy');
+    _.each(groupedData, (subs, handle) => {
+      // 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,
+        updated: sortedSubs[0].submittedDate,
+        id: sortedSubs[0].id,
+        score: scores && scores.length ? scores[0].score : '...',
+      });
+    });
+    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,
+    }));
+  }
+  return {
+    id,
+    data,
+  };
+}
+
+export default redux.createActions({
+  MMLEADERBOARD: {
+    GET_MML_INIT: getMMLeaderboardInit,
+    GET_MML_DONE: getMMLeaderboardDone,
+  },
+});

src/shared/components/Contentful/AppComponent/index.jsx

@@ -10,6 +10,8 @@ import React from 'react';
 import { errors } from 'topcoder-react-lib';
 import Leaderboard from 'containers/tco/Leaderboard';
 import RecruitCRMJobs from 'containers/Gigs/RecruitCRMJobs';
+import EmailSubscribeForm from 'containers/EmailSubscribeForm';
+
 
 const { fireErrorMessage } = errors;
 
@@ -34,6 +36,9 @@ export function AppComponentSwitch(appComponent) {
   if (appComponent.fields.type === 'RecruitCRM-Jobs') {
     return <RecruitCRMJobs {...appComponent.fields.props} key={appComponent.sys.id} />;
   }
+  if (appComponent.fields.type === 'EmailSubscribeForm') {
+    return <EmailSubscribeForm {...appComponent.fields.props} key={appComponent.sys.id} />;
+  }
   fireErrorMessage('Unsupported app component type from contentful', '');
   return null;
 }

src/shared/components/Gigs/GigDetails/index.jsx

@@ -43,6 +43,8 @@ export default function GigDetails(props) {
   }
   let skills = getCustomField(job.custom_fields, 'Technologies Required');
   if (skills !== 'n/a') skills = skills.split(',').join(', ');
+  const hPerW = getCustomField(job.custom_fields, 'Hours per week');
+  const compens = job.min_annual_salary === job.max_annual_salary ? job.max_annual_salary : `${job.min_annual_salary} - ${job.max_annual_salary}`;
 
   return (
     <div styleName="container">
@@ -70,7 +72,7 @@ export default function GigDetails(props) {
                 <IconMoney />
                 <div styleName="infos-data">
                   Compensation
-                  <strong>${job.min_annual_salary} - ${job.max_annual_salary} / {getSalaryType(job.salary_type)}</strong>
+                  <strong>${compens} / {getSalaryType(job.salary_type)}</strong>
                 </div>
               </div>
               <div styleName="infos-item">
@@ -84,7 +86,7 @@ export default function GigDetails(props) {
                 <IconHours />
                 <div styleName="infos-data">
                   Hours
-                  <strong>{getCustomField(job.custom_fields, 'Hours per week')} hours / week</strong>
+                  <strong>{hPerW === 'n/a' ? hPerW : `${hPerW} hours / week`}</strong>
                 </div>
               </div>
               <div styleName="infos-item">
@@ -108,7 +110,10 @@ export default function GigDetails(props) {
                     * Topcoder does not provide visa sponsorship nor will we work with Staffing Agencies.
                   </strong>
                   <strong>
-                    ** Topcoder and Wipro employees are not eligible for Gig work opportunities. Do not apply and send questions to <a href="mailto:support@topcoder.com">support@topcoder.com</a>.
+                    ** USA Visa Holders - Please consult an attorney before applying to any Topcoder Gig. Some visa statuses will or will not allow you to conduct freelance work with Topcoder.
+                  </strong>
+                  <strong>
+                    *** Topcoder and Wipro employees are not eligible for Gig work opportunities. Do not apply and send questions to <a href="mailto:support@topcoder.com">support@topcoder.com</a>.
                   </strong>
                 </div>
                 <div styleName="cta-buttons">