Merge pull request #7014 from topcoder-platform/develop

Remove Growsurf, fix MM display

.circleci/config.yml

@@ -359,6 +359,7 @@ workflows:
               only:
                 - develop
                 - TOP-1390
+                - PM-191-2
       # This is alternate dev env for parallel testing
       # Deprecate this workflow due to beta env shutdown
       # https://topcoder.atlassian.net/browse/CORE-251

Dockerfile

@@ -71,8 +71,6 @@ ARG GSHEETS_API_KEY
 
 # Gig work referrals
 ARG SENDGRID_API_KEY
-ARG GROWSURF_API_KEY
-ARG GROWSURF_CAMPAIGN_ID
 ARG GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY
 
 # Optimizely
@@ -141,8 +139,6 @@ ENV CONTENTFUL_EDU_PREVIEW_API_KEY=$CONTENTFUL_EDU_PREVIEW_API_KEY
 ENV RECRUITCRM_API_KEY=$RECRUITCRM_API_KEY
 ENV COMMUNITY_APP_URL=$COMMUNITY_APP_URL
 ENV SENDGRID_API_KEY=$SENDGRID_API_KEY
-ENV GROWSURF_API_KEY=$GROWSURF_API_KEY
-ENV GROWSURF_CAMPAIGN_ID=$GROWSURF_CAMPAIGN_ID
 ENV GSHEETS_API_KEY=$GSHEETS_API_KEY
 ENV GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY=$GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY
 

__tests__/shared/components/challenge-listing/Listing/Bucket.jsx

@@ -57,6 +57,9 @@ const mockDatas = [{
     }, {
       name: 'Task',
       abbreviation: 'TSK',
+    }, {
+      name: 'Marathon Match',
+      abbreviation: 'MM',
     },
   ],
   loading: false,

build.sh

@@ -50,8 +50,6 @@ docker build -t $TAG \
   --build-arg CONTENTFUL_COMCAST_PREVIEW_API_KEY=$CONTENTFUL_COMCAST_PREVIEW_API_KEY \
   --build-arg RECRUITCRM_API_KEY=$RECRUITCRM_API_KEY \
   --build-arg SENDGRID_API_KEY=$SENDGRID_API_KEY \
-  --build-arg GROWSURF_API_KEY=$GROWSURF_API_KEY \
-  --build-arg GROWSURF_CAMPAIGN_ID=$GROWSURF_CAMPAIGN_ID \
   --build-arg GSHEETS_API_KEY=$GSHEETS_API_KEY \
   --build-arg OPTIMIZELY_SDK_KEY=$OPTIMIZELY_SDK_KEY \
   --build-arg COMMUNITY_APP_URL=$COMMUNITY_APP_URL \

config/backup-default.js

@@ -257,7 +257,6 @@ module.exports = {
     },
 
     RECRUITCRM_API_KEY: '',
-    GROWSURF_API_KEY: '',
     SENDGRID_API_KEY: '',
     JWT_AUTH: {
       SECRET: 'mysecret',
@@ -266,15 +265,8 @@ module.exports = {
     },
     CHAMELEON_VERIFICATION_SECRET: 'mysecret',
   },
-  GROWSURF_CAMPAIGN_ID: '',
-  GROWSURF_COOKIE: '_tc_gigs_ref',
-  GROWSURF_COOKIE_SETTINGS: {
-    secure: true,
-    domain: '',
-    expires: 30, // days
-  },
 
-  GSHEETS_API_KEY: 'AIzaSyBRdKySN5JNCb2H6ZxJdTTvp3cWU51jiOQ',
+  GSHEETS_API_KEY: '',
   GOOGLE_SERVICE_ACCOUNT_EMAIL: 'communityappserviceacc@tc-sheets-to-contentful.iam.gserviceaccount.com',
   GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY: '',
   GIG_REFERRALS_SHEET: '1xilx7NxDAvzAzOTbPpvb3lL3RWv1VD5W24OEMAoF9HU',

config/custom-environment-variables.js

@@ -99,11 +99,9 @@ module.exports = {
     },
 
     RECRUITCRM_API_KEY: 'RECRUITCRM_API_KEY',
-    GROWSURF_API_KEY: 'GROWSURF_API_KEY',
     SENDGRID_API_KEY: 'SENDGRID_API_KEY',
     CHAMELEON_VERIFICATION_SECRET: 'CHAMELEON_VERIFICATION_SECRET',
   },
-  GROWSURF_CAMPAIGN_ID: 'GROWSURF_CAMPAIGN_ID',
   AUTH_CONFIG: {
     AUTH0_URL: 'TC_M2M_AUTH0_URL',
     AUTH0_AUDIENCE: 'TC_M2M_AUDIENCE',

config/default.js

@@ -258,7 +258,6 @@ module.exports = {
     },
 
     RECRUITCRM_API_KEY: '',
-    GROWSURF_API_KEY: '',
     SENDGRID_API_KEY: '',
     JWT_AUTH: {
       SECRET: 'mysecret',
@@ -267,15 +266,8 @@ module.exports = {
     },
     CHAMELEON_VERIFICATION_SECRET: 'mysecret',
   },
-  GROWSURF_CAMPAIGN_ID: '',
-  GROWSURF_COOKIE: '_tc_gigs_ref',
-  GROWSURF_COOKIE_SETTINGS: {
-    secure: true,
-    domain: '',
-    expires: 30, // days
-  },
 
-  GSHEETS_API_KEY: 'AIzaSyBRdKySN5JNCb2H6ZxJdTTvp3cWU51jiOQ',
+  GSHEETS_API_KEY: '',
   GOOGLE_SERVICE_ACCOUNT_EMAIL: 'communityappserviceacc@tc-sheets-to-contentful.iam.gserviceaccount.com',
   GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY: '',
   GIG_REFERRALS_SHEET: '1xilx7NxDAvzAzOTbPpvb3lL3RWv1VD5W24OEMAoF9HU',

docs/postman/Community APP.postman_environment.json

@@ -9,17 +9,17 @@
         },
         {
             "key": "token",
-            "value": "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik5VSkZORGd4UlRVME5EWTBOVVkzTlRkR05qTXlRamxETmpOQk5UYzVRVUV3UlRFeU56TTJRUSJ9.eyJodHRwczovL3RvcGNvZGVyLWRldi5jb20vcm9sZXMiOlsiVG9wY29kZXIgVXNlciJdLCJodHRwczovL3RvcGNvZGVyLWRldi5jb20vdXNlcklkIjoiODg3NzQ2MzQiLCJodHRwczovL3RvcGNvZGVyLWRldi5jb20vaGFuZGxlIjoiaXNiaWxpciIsImh0dHBzOi8vdG9wY29kZXItZGV2LmNvbS91c2VyX2lkIjoiYXV0aDB8ODg3NzQ2MzQiLCJodHRwczovL3RvcGNvZGVyLWRldi5jb20vdGNzc28iOiI4ODc3NDYzNHw0ZDczMWRjODNiZTk5OThkOWE1MmUyOTA2OThmNGIwNGZiMmVjNjE1OTliODIxZmYxNjRjYWEzYzhhNmU3IiwiaHR0cHM6Ly90b3Bjb2Rlci1kZXYuY29tL2FjdGl2ZSI6dHJ1ZSwibmlja25hbWUiOiJpc2JpbGlyIiwibmFtZSI6ImVtcmUuaXNiaWxpckBnbWFpbC5jb20iLCJwaWN0dXJlIjoiaHR0cHM6Ly9zLmdyYXZhdGFyLmNvbS9hdmF0YXIvODE3NjNjMzE0ZGU0Y2ZiNGUxNDRhYzU3M2U1NmMxZjY_cz00ODAmcj1wZyZkPWh0dHBzJTNBJTJGJTJGY2RuLmF1dGgwLmNvbSUyRmF2YXRhcnMlMkZlbS5wbmciLCJ1cGRhdGVkX2F0IjoiMjAyMS0wNi0xOVQxNzowNjoyMi4yMzVaIiwiZW1haWwiOiJlbXJlLmlzYmlsaXJAZ21haWwuY29tIiwiZW1haWxfdmVyaWZpZWQiOnRydWUsImlzcyI6Imh0dHBzOi8vYXV0aC50b3Bjb2Rlci1kZXYuY29tLyIsInN1YiI6ImF1dGgwfDg4Nzc0NjM0IiwiYXVkIjoiQlhXWFVXbmlsVlVQZE4wMXQyU2UyOVR3MlpZTkdadkgiLCJpYXQiOjE2MjQxMjUzMzYsImV4cCI6MTYyNDEyODMzNiwibm9uY2UiOiJjVE5DTFVwRlpXMVJhMm94WkhSdE5WaGpVbk5IVkZGVFdWTjRiRzFCYVVaQ1dHZGpSVWhZVTB0RVZnPT0ifQ.SfKTYecx7A2qbqM3v8lJaC1GSdctNhkTx6laAhe2BJYVX5LdVL82ZM3_9yWqqZDPWHS9ku408Jt1DUMo5vRev34Av0iwJpYIT_4BbmMLeWQGQ3aRB78zp_emkZ5TE1vOnfSJvfsPoQoiLIwohyOUaDzz9MGdjrgYuSEAA1RGdjhVcamFlNNbR-lNMffnWYs0oWi89N5kgvv37JZjpDPAvQbotNT80Vs0JrLr1p71JLFcLFTQJ-bthFmt0922dj47-1MSjUQgOzFMN4JNjZKGtExyLGR7s_ipCQxg9lxHjMD-JNwg0liI20YGfTXZv9QQQ_K2jPkXiatHBQq_v2_Qjg",
+            "value": "",
             "enabled": true
         },
         {
             "key": "invalid_token_1",
-            "value": "eyJ",
+            "value": "",
             "enabled": true
         },
         {
             "key": "invalid_token_2",
-            "value": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyb2xlcyI6WyJjb3BpbG90IiwiQ29ubmVjdCBTdXBwb3J0Il0sImlzcyI6Imh0dHBzOi8vYXBpLnRvcGNvZGVyLWRldi5jb20iLCJoYW5kbGUiOiJHaG9zdGFyIiwiZXhwIjoxNTQ5ODAwMDc3LCJ1c2VySWQiOiIxNTE3NDMiLCJpYXQiOjE1NDk3OTk0NzcsImVtYWlsIjoiZW1haWxAZG9tYWluLmNvbS56IiwianRpIjoiMTJjMWMxMGItOTNlZi00NTMxLTgzMDUtYmE2NjVmYzRlMWI0In0.2n8k9pb16sE7LOLF_7mjAvEVKgggzS-wS3_8n2-R4RU",
+            "value": "",
             "enabled": true
         },
         {
@@ -29,7 +29,7 @@
         },
         {
             "key": "invalid_token_4",
-            "value": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyb2xlcyI6WyJjb3BpbG90IiwiQ29ubmVjdCBTdXBwb3J0Il0sImlzcyI6Imh0dHBzOi8vYXBpLnRvcGNvZGVyLWRldi5jb20iLCJoYW5kbGUiOiJHaG9zdGFyIiwiZXhwIjoxNTQ5ODAwMDc3LCJ1c2VySWQiOiIxNTE3NDMiLCJpYXQiOjE1NDk3OTk0NzcsImVtYWlsIjoiZW1haWxAZG9tYWluLmNvbS56IiwianRpIjoiMTJjMWMxMGItOTNlZi00NTMxLTgzMDUtYmE2NjVmYzRlMWI0In0.2n8k9pb16sE7LOLF_7mjAvEVKgggzS-wS3_8n2-R4RU",
+            "value": "",
             "enabled": true
         }
     ],

src/server/index.js

@@ -28,7 +28,6 @@ import mailChimpRouter from './routes/mailchimp';
 import mockDocuSignFactory from './__mocks__/docu-sign-mock';
 import recruitCRMRouter from './routes/recruitCRM';
 import mmLeaderboardRouter from './routes/mmLeaderboard';
-import growsurfRouter from './routes/growsurf';
 import gSheetsRouter from './routes/gSheet';
 import blogRouter from './routes/blog';
 import feedsRouter from './routes/feeds';
@@ -247,7 +246,6 @@ async function onExpressJsSetup(server) {
   server.use('/api/mailchimp', mailChimpRouter);
   server.use('/api/recruit', recruitCRMRouter);
   server.use('/api/mml', mmLeaderboardRouter);
-  server.use('/api/growsurf', growsurfRouter);
   server.use('/api/gsheets', gSheetsRouter);
   server.use('/api/blog', blogRouter);
   server.use('/api/feeds', feedsRouter);