Merge pull request topcoder-platform#1 from topcoder-platform/develop

Develop

Author: rashmi73

.DS_Store

@@ -43,6 +43,6 @@ workflows:
             branches:
               ignore: /.*/
             tags:
-              only: /v[0-9]+(\.[0-9]+)*/
+              only: /v[0-9]+(\.[0-9]+)*(-[0-9]+)?/
           requires:
             - test

.circleci/config.yml

@@ -1,3 +1,3 @@
 {
   "extends": "./node_modules/topcoder-react-utils/config/eslint/default.json"
-}
+}

.eslintrc

@@ -1,7 +1,7 @@
 __coverage__
 .build-info
 .sass-cache
-dist
+#dist
 node_modules
 _auto_doc_
 .vscode

.gitignore

@@ -1 +1 @@
-v8.11.1
+8.11.2

.nvmrc

@@ -1,5 +1,12 @@
 # Topcoder React Lib
 
+### v0.7.4
+- Added `getTcM2mToken()` function to API service, to facilitate handling of
+  TC M2M token;
+- Added `getGroupTreeIds(..)`, `getTokenV3()`, and `reduceGroupIds(..)`
+  functions to the Groups service, to facilitate deduction of all IDs in a group
+  (sub-)tree, rooted at a specified group.
+
 ### v0.6.0
 A few changes related to fetch of projests visitble to users, and creation of
 new challenges. Minor release to guard against any side-effects.

CHANGELOG.md

@@ -54,6 +54,8 @@ Object {
       "getLookerDone": [Function],
     },
     "lookup": Object {
+      "getCountriesDone": [Function],
+      "getCountriesInit": [Function],
       "getSkillTagsDone": [Function],
       "getSkillTagsInit": [Function],
     },
@@ -127,6 +129,8 @@ Object {
       "updateProfileInit": [Function],
       "uploadPhotoDone": [Function],
       "uploadPhotoInit": [Function],
+      "verifyMemberNewEmailDone": [Function],
+      "verifyMemberNewEmailInit": [Function],
     },
     "reviewOpportunity": Object {
       "cancelApplicationsDone": [Function],
@@ -237,9 +241,11 @@ Object {
   "services": Object {
     "api": Object {
       "default": [Function],
+      "getApi": [Function],
       "getApiV2": [Function],
       "getApiV3": [Function],
       "getApiV4": [Function],
+      "getTcM2mToken": [Function],
     },
     "billing": Object {
       "default": [Function],
@@ -253,7 +259,6 @@ Object {
       "getService": [Function],
       "normalizeChallenge": [Function],
       "normalizeChallengeDetails": [Function],
-      "normalizeMarathonMatch": [Function],
     },
     "communities": Object {
       "default": undefined,
@@ -269,6 +274,7 @@ Object {
       "checkUserGroups": [Function],
       "default": undefined,
       "getService": [Function],
+      "reduceGroupIds": [Function],
     },
     "lookup": Object {
       "default": undefined,
@@ -310,8 +316,8 @@ Object {
       "Iterative Review": "Iterative Review",
       "Spec Review": "Specification Review",
     },
-    "getApiResponsePayloadV3": [Function],
-    "getApiResponsePayloadV4": [Function],
+    "getApiResponsePayload": [Function],
+    "getLookerApiResponsePayload": [Function],
   },
   "time": Object {
     "default": undefined,

__tests__/__snapshots__/index.js.snap

@@ -3,12 +3,32 @@
 exports[`Module exports 1`] = `
 Object {
   "lookup": Object {
+    "getCountriesDone": [Function],
+    "getCountriesInit": [Function],
     "getSkillTagsDone": [Function],
     "getSkillTagsInit": [Function],
   },
 }
 `;
 
+exports[`lookup.getCountriesDone 1`] = `
+Object {
+  "payload": Array [
+    Object {
+      "country": "Afghanistan",
+      "countryCode": "AFG",
+    },
+  ],
+  "type": "LOOKUP/GET_COUNTRIES_DONE",
+}
+`;
+
+exports[`lookup.getCountriesInit 1`] = `
+Object {
+  "type": "LOOKUP/GET_COUNTRIES_INIT",
+}
+`;
+
 exports[`lookup.getSkillTagsDone 1`] = `
 Object {
   "payload": Array [

__tests__/actions/__snapshots__/lookup.js.snap

@@ -45,6 +45,8 @@ Object {
     "updateProfileInit": [Function],
     "uploadPhotoDone": [Function],
     "uploadPhotoInit": [Function],
+    "verifyMemberNewEmailDone": [Function],
+    "verifyMemberNewEmailInit": [Function],
   },
 }
 `;

__tests__/actions/__snapshots__/profile.js.snap

@@ -10,9 +10,15 @@ const tag = {
   status: 'APPROVED',
 };
 
+const country = {
+  country: 'Afghanistan',
+  countryCode: 'AFG',
+};
+
 // Mock services
 const mockLookupService = {
   getTags: jest.fn().mockReturnValue(Promise.resolve([tag])),
+  getCountries: jest.fn().mockReturnValue(Promise.resolve([country])),
 };
 LookupService.getService = jest.fn().mockReturnValue(mockLookupService);
 
@@ -28,3 +34,14 @@ test('lookup.getSkillTagsDone', async () => {
   expect(actionResult).toMatchSnapshot();
   expect(mockLookupService.getTags).toBeCalled();
 });
+
+test('lookup.getCountriesInit', async () => {
+  const actionResult = actions.lookup.getCountriesInit();
+  expect(actionResult).toMatchSnapshot();
+});
+
+test('lookup.getCountriesDone', async () => {
+  const actionResult = await redux.resolveAction(actions.lookup.getCountriesDone());
+  expect(actionResult).toMatchSnapshot();
+  expect(mockLookupService.getCountries).toBeCalled();
+});

__tests__/actions/lookup.js

@@ -1,7 +1,50 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`Default reducer Get countries 1`] = `
+Object {
+  "countries": Array [
+    Object {
+      "country": "Afghanistan",
+      "countryCode": "AFG",
+    },
+  ],
+  "loadingCountriesError": false,
+  "loadingSkillTagsError": true,
+  "skillTags": Array [
+    Object {
+      "domain": "SKILLS",
+      "id": 251,
+      "name": "Jekyll",
+      "status": "APPROVED",
+    },
+  ],
+}
+`;
+
+exports[`Default reducer Get countries error 1`] = `
+Object {
+  "countries": Array [
+    Object {
+      "country": "Afghanistan",
+      "countryCode": "AFG",
+    },
+  ],
+  "loadingCountriesError": true,
+  "loadingSkillTagsError": true,
+  "skillTags": Array [
+    Object {
+      "domain": "SKILLS",
+      "id": 251,
+      "name": "Jekyll",
+      "status": "APPROVED",
+    },
+  ],
+}
+`;
+
 exports[`Default reducer Get skill tags 1`] = `
 Object {
+  "countries": Array [],
   "loadingSkillTagsError": false,
   "skillTags": Array [
     Object {
@@ -16,6 +59,7 @@ Object {
 
 exports[`Default reducer Get skill tags error 1`] = `
 Object {
+  "countries": Array [],
   "loadingSkillTagsError": true,
   "skillTags": Array [
     Object {
@@ -30,12 +74,56 @@ Object {
 
 exports[`Default reducer Initial state 1`] = `
 Object {
+  "countries": Array [],
   "skillTags": Array [],
 }
 `;
 
+exports[`Factory without server side rendering Get countries 1`] = `
+Object {
+  "countries": Array [
+    Object {
+      "country": "Afghanistan",
+      "countryCode": "AFG",
+    },
+  ],
+  "loadingCountriesError": false,
+  "loadingSkillTagsError": true,
+  "skillTags": Array [
+    Object {
+      "domain": "SKILLS",
+      "id": 251,
+      "name": "Jekyll",
+      "status": "APPROVED",
+    },
+  ],
+}
+`;
+
+exports[`Factory without server side rendering Get countries error 1`] = `
+Object {
+  "countries": Array [
+    Object {
+      "country": "Afghanistan",
+      "countryCode": "AFG",
+    },
+  ],
+  "loadingCountriesError": true,
+  "loadingSkillTagsError": true,
+  "skillTags": Array [
+    Object {
+      "domain": "SKILLS",
+      "id": 251,
+      "name": "Jekyll",
+      "status": "APPROVED",
+    },
+  ],
+}
+`;
+
 exports[`Factory without server side rendering Get skill tags 1`] = `
 Object {
+  "countries": Array [],
   "loadingSkillTagsError": false,
   "skillTags": Array [
     Object {
@@ -50,6 +138,7 @@ Object {
 
 exports[`Factory without server side rendering Get skill tags error 1`] = `
 Object {
+  "countries": Array [],
   "loadingSkillTagsError": true,
   "skillTags": Array [
     Object {
@@ -64,6 +153,7 @@ Object {
 
 exports[`Factory without server side rendering Initial state 1`] = `
 Object {
+  "countries": Array [],
   "skillTags": Array [],
 }
 `;