Merge pull request #135 from topcoder-platform/develop-mm-sub-merge-fix

Develop mm sub merge fix for prod release

Author: sushilshinde

.circleci/config.yml

@@ -28,8 +28,8 @@ jobs:
       - attach_workspace:
           at: .
       - run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
-      - run: npm publish
-
+      - run: npm publish --tag test-release
+# dont change anything
 workflows:
   version: 2
   build:

README.md

@@ -10,6 +10,10 @@ The [Topcoder](https://www.topcoder.com) lib for internal ReactJS projects.
 
 Change the property in `AV_SCAN_SCORER_REVIEW_TYPE_ID` in config.
 
+### Configuration for AV-Scan scorer review type ID
+
+Change the property in `PROVISIONAL_SCORING_COMPLETED_REVIEW_TYPE_ID` in config.
+
 ### Development
 ```shell
 # Install dependencies
@@ -19,7 +23,7 @@ npm install
 npm test
 npm run build
 
-# Go to other project which depends on the topcoder-react-lib, config its package.json so 
+# Go to other project which depends on the topcoder-react-lib, config its package.json so
 # that the 'topcoder-react-lib' points to the local foler path of topcoder-react-lib:
 #
 # "dependencies": {

__tests__/__snapshots__/index.js.snap

@@ -62,6 +62,8 @@ Object {
       "getAllCountriesInit": [Function],
       "getCountriesDone": [Function],
       "getCountriesInit": [Function],
+      "getReviewTypesDone": [Function],
+      "getReviewTypesInit": [Function],
       "getSkillTagsDone": [Function],
       "getSkillTagsInit": [Function],
     },

__tests__/actions/__snapshots__/lookup.js.snap

@@ -7,6 +7,8 @@ Object {
     "getAllCountriesInit": [Function],
     "getCountriesDone": [Function],
     "getCountriesInit": [Function],
+    "getReviewTypesDone": [Function],
+    "getReviewTypesInit": [Function],
     "getSkillTagsDone": [Function],
     "getSkillTagsInit": [Function],
   },

__tests__/reducers/__snapshots__/lookup.js.snap

@@ -11,6 +11,7 @@ Object {
   ],
   "loadingCountriesError": false,
   "loadingSkillTagsError": true,
+  "reviewTypes": Array [],
   "skillTags": Array [
     Object {
       "domain": "SKILLS",
@@ -33,6 +34,7 @@ Object {
   ],
   "loadingCountriesError": true,
   "loadingSkillTagsError": true,
+  "reviewTypes": Array [],
   "skillTags": Array [
     Object {
       "domain": "SKILLS",
@@ -49,6 +51,7 @@ Object {
   "allCountries": Array [],
   "countries": Array [],
   "loadingSkillTagsError": false,
+  "reviewTypes": Array [],
   "skillTags": Array [
     Object {
       "domain": "SKILLS",
@@ -65,6 +68,7 @@ Object {
   "allCountries": Array [],
   "countries": Array [],
   "loadingSkillTagsError": true,
+  "reviewTypes": Array [],
   "skillTags": Array [
     Object {
       "domain": "SKILLS",
@@ -80,6 +84,7 @@ exports[`Default reducer Initial state 1`] = `
 Object {
   "allCountries": Array [],
   "countries": Array [],
+  "reviewTypes": Array [],
   "skillTags": Array [],
 }
 `;
@@ -95,6 +100,7 @@ Object {
   ],
   "loadingCountriesError": false,
   "loadingSkillTagsError": true,
+  "reviewTypes": Array [],
   "skillTags": Array [
     Object {
       "domain": "SKILLS",
@@ -117,6 +123,7 @@ Object {
   ],
   "loadingCountriesError": true,
   "loadingSkillTagsError": true,
+  "reviewTypes": Array [],
   "skillTags": Array [
     Object {
       "domain": "SKILLS",
@@ -133,6 +140,7 @@ Object {
   "allCountries": Array [],
   "countries": Array [],
   "loadingSkillTagsError": false,
+  "reviewTypes": Array [],
   "skillTags": Array [
     Object {
       "domain": "SKILLS",
@@ -149,6 +157,7 @@ Object {
   "allCountries": Array [],
   "countries": Array [],
   "loadingSkillTagsError": true,
+  "reviewTypes": Array [],
   "skillTags": Array [
     Object {
       "domain": "SKILLS",
@@ -164,6 +173,7 @@ exports[`Factory without server side rendering Initial state 1`] = `
 Object {
   "allCountries": Array [],
   "countries": Array [],
+  "reviewTypes": Array [],
   "skillTags": Array [],
 }
 `;

config/default.json

@@ -1,5 +1,6 @@
 {
   "AV_SCAN_SCORER_REVIEW_TYPE_ID": "",
+  "PROVISIONAL_SCORING_COMPLETED_REVIEW_TYPE_ID": "",
   "PAGE_SIZE": 50,
   "REVIEW_OPPORTUNITY_PAGE_SIZE": 1000
 }

config/development.json

@@ -1,3 +1,4 @@
 {
-  "AV_SCAN_SCORER_REVIEW_TYPE_ID": "68c5a381-c8ab-48af-92a7-7a869a4ee6c3"
+  "AV_SCAN_SCORER_REVIEW_TYPE_ID": "68c5a381-c8ab-48af-92a7-7a869a4ee6c3",
+  "PROVISIONAL_SCORING_COMPLETED_REVIEW_TYPE_ID": "52c91e85-745f-4e62-b592-9879a2dfe9fd"
 }

config/production.json

@@ -1,3 +1,4 @@
 {
-  "AV_SCAN_SCORER_REVIEW_TYPE_ID": "55bbb17d-aac2-45a6-89c3-a8d102863d05"
+  "AV_SCAN_SCORER_REVIEW_TYPE_ID": "55bbb17d-aac2-45a6-89c3-a8d102863d05",
+  "PROVISIONAL_SCORING_COMPLETED_REVIEW_TYPE_ID": "df51ca7d-fb0a-4147-9569-992fcf5aae48"
 }

config/test.js

@@ -4,4 +4,12 @@ module.exports = {
     V3: 'https://api.topcoder-dev.com/v3',
   },
   dummyConfigKey: 'Dummy config value',
+  SECRET: {
+    TC_M2M: {
+      AUTH0_URL: '',
+      AUTH0_AUDIENCE: '',
+      TOKEN_CACHE_TIME: '',
+      AUTH0_PROXY_SERVER_URL: '',
+    },
+  },
 };

config/webpack/default.js

@@ -2,10 +2,11 @@
 const webpack = require('webpack');
 
 module.exports = {
-  plugins: [
-    // eslint-disable-next-line global-require
-    new webpack.DefinePlugin({ CONFIG: JSON.stringify(require('config')) }),
-  ],
+  node: {
+    tls: 'empty',
+    fs: 'empty',
+    net: 'empty',
+  },
   // Don't include the dependencies to keep built bundle small,
   // they will be provided by the app using this lib
   externals: [
@@ -24,8 +25,10 @@ module.exports = {
     'tc-accounts',
     'to-capital-case',
     'topcoder-react-utils',
+    'tc-core-library-js',
+  ],
+  plugins: [
+    // eslint-disable-next-line global-require
+    new webpack.DefinePlugin({ CONFIG: JSON.stringify(require('config')) }),
   ],
-  node: {
-    fs: 'empty',
-  },
 };