Merge branch 'develop' into support_for_job_description

Author: luizrrodrigues

__tests__/__snapshots__/index.js.snap

@@ -305,6 +305,7 @@ Object {
         "SUBMISSION_END_DATE": "submissionEndDate",
       },
       "default": undefined,
+      "getFilterUrl": [Function],
       "getService": [Function],
       "normalizeChallenge": [Function],
     },
@@ -373,10 +374,16 @@ Object {
     "processMMSubmissions": [Function],
   },
   "tc": Object {
+    "CHALLENGE_STATUS": Object {
+      "ACTIVE": "Active",
+      "CANCELLED": "Cancelled",
+      "COMPLETED": "Completed",
+      "DRAFT": "Draft",
+    },
     "COMPETITION_TRACKS": Object {
-      "DATA_SCIENCE": "Data Science",
-      "DESIGN": "Design",
-      "DEVELOP": "Development",
+      "DES": "Design",
+      "DEV": "Development",
+      "DS": "Data Science",
       "QA": "Quality Assurance",
     },
     "OLD_COMPETITION_TRACKS": Object {

__tests__/reducers/auth.js

@@ -20,7 +20,7 @@ const mockActions = {
 jest.setMock(require.resolve('actions/auth'), mockActions);
 jest.setMock(require.resolve('actions/profile'), mockActions);
 
-jest.setMock('tc-accounts', {
+jest.setMock('@topcoder-platform/tc-auth-lib', {
   decodeToken: () => 'User object',
   isTokenExpired: () => false,
 });

__tests__/reducers/challenge.js

@@ -44,7 +44,7 @@ const mockSmpActions = {
 };
 _.merge(actions, mockSmpActions);
 
-jest.setMock('tc-accounts', {
+jest.setMock('@topcoder-platform/tc-auth-lib', {
   decodeToken: () => 'User object',
   isTokenExpired: () => false,
 });

config/jest/setup.js

@@ -1,7 +1,7 @@
 /* global jest */
 require('topcoder-react-utils/config/jest/setup');
 
-jest.setMock('tc-accounts', {
+jest.setMock('@topcoder-platform/tc-auth-lib', {
   decodeToken: token => (token ? {
     handle: 'username12345',
     userId: '12345',

config/webpack/default.js

@@ -22,7 +22,7 @@ module.exports = {
     'redux',
     'redux-actions',
     'isomorphic-fetch',
-    'tc-accounts',
+    '@topcoder-platform/tc-auth-lib',
     'to-capital-case',
     'topcoder-react-utils',
     'tc-core-library-js',

package.json

@@ -47,10 +47,10 @@
     "react-redux": "^6.0.1",
     "redux": "^3.7.2",
     "redux-actions": "^2.4.0",
-    "tc-accounts": "https://github.com/appirio-tech/accounts-app.git#dev",
     "tc-core-library-js": "appirio-tech/tc-core-library-js.git#v2.6",
     "to-capital-case": "^1.0.0",
-    "topcoder-react-utils": "0.7.5"
+    "topcoder-react-utils": "0.7.5",
+    "@topcoder-platform/tc-auth-lib": "git+https://github.com/topcoder-platform/tc-auth-lib.git#1.0.1"
   },
   "devDependencies": {
     "autoprefixer": "^8.6.4",

src/actions/auth.js

@@ -4,8 +4,32 @@
  */
 
 import { createActions } from 'redux-actions';
-import { decodeToken } from 'tc-accounts';
+import { decodeToken } from '@topcoder-platform/tc-auth-lib';
 import { getApiV3, getApiV5 } from '../services/api';
+import { setErrorIcon, ERROR_ICON_TYPES } from '../utils/errors';
+
+/**
+ * Helper method that checks for HTTP error response v5 and throws Error in this case.
+ * @param {Object} res HTTP response object
+ * @return {Object} API JSON response object
+ * @private
+ */
+async function checkErrorV5(res) {
+  if (!res.ok) {
+    if (res.status === 403) {
+      setErrorIcon(ERROR_ICON_TYPES.API, 'Auth0', res.statusText);
+    }
+    throw new Error(res.statusText);
+  }
+  const jsonRes = (await res.json());
+  if (jsonRes.message) {
+    throw new Error(res.message);
+  }
+  return {
+    result: jsonRes,
+    headers: res.headers,
+  };
+}
 
 /**
  * @static
@@ -22,8 +46,7 @@ function loadProfileDone(userTokenV3) {
     apiV3.get(`/members/${user.handle}`)
       .then(res => res.json()).then(res => (res.result.status === 200 ? res.result.content : {})),
     apiV5.get(`/groups?memberId=${user.userId}&membershipType=user`)
-      .then(res => (res.ok ? res.json() : new Error(res.statusText)))
-      .then(res => (res.message ? new Error(res.message) : res)),
+      .then(checkErrorV5).then(res => res.result || []),
   ]).then(([profile, groups]) => ({ ...profile, groups }));
 }
 

src/actions/challenge.js

@@ -7,7 +7,7 @@
 import _ from 'lodash';
 import { config } from 'topcoder-react-utils';
 import { createActions } from 'redux-actions';
-import { decodeToken } from 'tc-accounts';
+import { decodeToken } from '@topcoder-platform/tc-auth-lib';
 import { getService as getChallengesService } from '../services/challenges';
 import { getService as getSubmissionService } from '../services/submissions';
 import { getApi } from '../services/api';
@@ -248,7 +248,7 @@ function loadResultsInit(challengeId) {
  * @return {Action}
  */
 function loadResultsDone(auth, challengeId, type) {
-  return getApi('V2', auth.tokenV2)
+  return getApi('V2')
     .fetch(`/${type}/challenges/result/${challengeId}`)
     .then(response => response.json())
     .then(response => ({
@@ -273,7 +273,7 @@ function fetchCheckpointsInit() {}
  */
 function fetchCheckpointsDone(tokenV2, challengeId) {
   const endpoint = `/design/challenges/checkpoint/${challengeId}`;
-  return getApi('V2', tokenV2).fetch(endpoint)
+  return getApi('V2').fetch(endpoint)
     .then((response) => {
       if (response.status !== 200) {
         throw response.status;

src/reducers/auth.js

@@ -13,7 +13,7 @@
  */
 
 import _ from 'lodash';
-import { decodeToken } from 'tc-accounts';
+import { decodeToken } from '@topcoder-platform/tc-auth-lib';
 import { redux } from 'topcoder-react-utils';
 import actions from '../actions/auth';
 import profileActions from '../actions/profile';

src/reducers/challenge.js

@@ -173,7 +173,7 @@ function onFetchCheckpointsDone(state, action) {
       loadingCheckpoints: false,
     };
   }
-  if (state.details && state.details.legacyId === action.payload.challengeId) {
+  if (state.details && `${state.details.legacyId}` === `${action.payload.challengeId}`) {
     return {
       ...state,
       checkpoints: action.payload.checkpoints,
@@ -471,7 +471,7 @@ export function factory(options = {}) {
       const challengeDetails = _.get(res, 'payload', {});
       const track = _.get(challengeDetails, 'track', '');
       let checkpointsPromise = null;
-      if (track === COMPETITION_TRACKS.DESIGN) {
+      if (track === COMPETITION_TRACKS.DES) {
         const p = _.get(challengeDetails, 'phases', [])
           .filter(x => x.name === 'Checkpoint Review');
         if (p.length && !p[0].isOpen) {

src/reducers/direct.js

@@ -6,7 +6,7 @@
 
 import _ from 'lodash';
 import { handleActions } from 'redux-actions';
-import { decodeToken } from 'tc-accounts';
+import { decodeToken } from '@topcoder-platform/tc-auth-lib';
 import actions from '../actions/direct';
 import logger from '../utils/logger';
 import { fireErrorMessage } from '../utils/errors';

src/services/challenges.js

@@ -7,14 +7,51 @@
 import _ from 'lodash';
 import moment from 'moment';
 import qs from 'qs';
-import { decodeToken } from 'tc-accounts';
+import { decodeToken } from '@topcoder-platform/tc-auth-lib';
 import logger from '../utils/logger';
 import { setErrorIcon, ERROR_ICON_TYPES } from '../utils/errors';
 import { COMPETITION_TRACKS, getApiResponsePayload } from '../utils/tc';
 import { getApi } from './api';
 import { getService as getMembersService } from './members';
 import { getService as getSubmissionsService } from './submissions';
 
+export function getFilterUrl(backendFilter, frontFilter) {
+  const ff = _.clone(frontFilter);
+  // eslint-disable-next-line object-curly-newline
+  const { tags, tracks, types, groups, events } = ff;
+  delete ff.tags;
+  delete ff.tracks;
+  delete ff.types;
+  delete ff.communityId;
+  delete ff.groups;
+  delete ff.events;
+
+  // console.log(ff);
+
+  let urlFilter = qs.stringify(_.reduce(ff, (result, value, key) => {
+    // eslint-disable-next-line no-param-reassign
+    if (value) result[key] = value;
+    return result;
+  }, {}));
+  // console.log(urlFilter);
+
+  const ftags = _.map(tags, val => `tags[]=${val}`).join('&');
+  const ftracks = _.map(_.reduce(tracks, (result, value, key) => {
+    // eslint-disable-next-line no-unused-expressions
+    tracks[key] && result.push(key);
+    return result;
+  }, []), val => `tracks[]=${val}`).join('&');
+  const ftypes = _.map(types, val => `types[]=${val}`).join('&');
+  const fgroups = _.map(groups, val => `groups[]=${val}`).join('&');
+  const fevents = _.map(events, val => `events[]=${val}`).join('&');
+  if (ftags.length > 0) urlFilter += `&${ftags}`;
+  if (ftracks.length > 0) urlFilter += `&${ftracks}`;
+  if (ftypes.length > 0) urlFilter += `&${ftypes}`;
+  if (fgroups.length > 9) urlFilter += `&${fgroups}`;
+  if (fevents.length > 0) urlFilter += `&${fevents}`;
+  return urlFilter;
+}
+
 export const ORDER_BY = {
   SUBMISSION_END_DATE: 'submissionEndDate',
 };
@@ -133,27 +170,42 @@ class ChallengesService {
      */
     const getChallenges = async (
       endpoint,
-      filters = {},
-      params = {},
+      filter,
     ) => {
-      const query = {
-        ...filters,
-        ...params,
-      };
-      const url = `${endpoint}?${qs.stringify(query)}`;
-      const res = await this.private.apiV5.get(url).then(checkErrorV5);
+      let res = {};
+      if (_.some(filter.frontFilter.tracks, val => val)) {
+        const query = getFilterUrl(filter.backendFilter, filter.frontFilter);
+        const url = `${endpoint}?${query}`;
+        res = await this.private.apiV5.get(url).then(checkErrorV5);
+      }
       return {
         challenges: res.result || [],
-        totalCount: res.headers.get('x-total'),
+        totalCount: res.headers ? res.headers.get('x-total') : 0,
         meta: {
-          allChallengesCount: res.headers.get('x-total'),
+          allChallengesCount: res.headers ? res.headers.get('x-total') : 0,
           myChallengesCount: 0,
           ongoingChallengesCount: 0,
           openChallengesCount: 0,
-          totalCount: res.headers.get('x-total'),
+          totalCount: res.headers ? res.headers.get('x-total') : 0,
         },
       };
     };
+
+    const getChallengeDetails = async (
+      endpoint,
+      legacyInfo,
+    ) => {
+      let query = '';
+      if (legacyInfo) {
+        query = `legacyId=${legacyInfo.legacyId}`;
+      }
+      const url = `${endpoint}?${query}`;
+      const res = await this.private.apiV5.get(url).then(checkErrorV5);
+      return {
+        challenges: res.result || [],
+      };
+    };
+
     /**
      * Private function being re-used in all methods related to getting
      * challenges. It handles query-related arguments in the uniform way:
@@ -189,6 +241,7 @@ class ChallengesService {
       apiV2: getApi('V2', tokenV2),
       apiV3: getApi('V3', tokenV3),
       getChallenges,
+      getChallengeDetails,
       getMemberChallenges,
       tokenV2,
       tokenV3,
@@ -327,10 +380,10 @@ class ChallengesService {
     // condition based on ROUTE used for Review Opportunities, change if needed
     if (/^[\d]{5,8}$/.test(challengeId)) {
       isLegacyChallenge = true;
-      challenge = await this.private.getChallenges('/challenges/', { legacyId: challengeId })
+      challenge = await this.private.getChallengeDetails('/challenges/', { legacyId: challengeId })
         .then(res => res.challenges[0] || {});
     } else {
-      challenge = await this.private.getChallenges(`/challenges/${challengeId}`)
+      challenge = await this.private.getChallengeDetails(`/challenges/${challengeId}`)
         .then(res => res.challenges);
     }
 
@@ -464,8 +517,8 @@ class ChallengesService {
    * @param {Object} params Optional.
    * @return {Promise} Resolves to the api response.
    */
-  async getChallenges(filters, params) {
-    return this.private.getChallenges('/challenges/', filters, params)
+  async getChallenges(filter) {
+    return this.private.getChallenges('/challenges/', filter)
       .then((res) => {
         res.challenges.forEach(item => normalizeChallenge(item));
         return res;
@@ -642,7 +695,7 @@ class ChallengesService {
     let contentType;
     let url;
 
-    if (track === COMPETITION_TRACKS.DESIGN) {
+    if (track === COMPETITION_TRACKS.DES) {
       ({ api } = this.private);
       contentType = 'application/json';
       url = '/submissions/'; // The submission info is contained entirely in the JSON body
@@ -660,7 +713,7 @@ class ChallengesService {
     }, onProgress).then((res) => {
       const jres = JSON.parse(res);
       // Return result for Develop submission
-      if (track === COMPETITION_TRACKS.DEVELOP) {
+      if (track === COMPETITION_TRACKS.DEV) {
         return jres;
       }
       // Design Submission requires an extra "Processing" POST

src/services/members.js

@@ -7,7 +7,7 @@
 /* global XMLHttpRequest */
 import _ from 'lodash';
 import qs from 'qs';
-import { decodeToken } from 'tc-accounts';
+import { decodeToken } from '@topcoder-platform/tc-auth-lib';
 import logger from '../utils/logger';
 import { getApiResponsePayload } from '../utils/tc';
 import { getApi } from './api';

src/services/reviewOpportunities.js

@@ -17,18 +17,18 @@ export function normalizeChallenges(opportunities) {
      * until receive API V5 update. */
     _.map(opportunities, (opportunity) => {
       const { challenge } = opportunity;
-      challenge.track = COMPETITION_TRACKS.DEVELOP;
+      challenge.track = COMPETITION_TRACKS.DEV;
       if (challenge.technologies) {
-        if (challenge.technologies.includes(COMPETITION_TRACKS.DATA_SCIENCE)) {
-          challenge.track = COMPETITION_TRACKS.DATA_SCIENCE;
+        if (challenge.technologies.includes(COMPETITION_TRACKS.DS)) {
+          challenge.track = COMPETITION_TRACKS.DS;
         }
       } else if (challenge.subTrack === OLD_SUBTRACKS.TEST_SUITES
           || challenge.subTrack === OLD_SUBTRACKS.BUG_HUNT
           || challenge.subTrack === OLD_COMPETITION_TRACKS.TEST_SCENARIOS
           || challenge.subTrack === OLD_COMPETITION_TRACKS.TESTING_COMPETITION) {
         challenge.track = COMPETITION_TRACKS.QA;
       } else if (challenge.track === OLD_COMPETITION_TRACKS.DESIGN) {
-        challenge.track = COMPETITION_TRACKS.DESIGN;
+        challenge.track = COMPETITION_TRACKS.DES;
       }
       return _.defaults(opportunity, { challenge });
     });