Merge dev to v6

.circleci/config.yml

@@ -358,6 +358,8 @@ workflows:
             branches:
               only:
                 - develop
+                - pm-1346
+                - pm-1358_1
       # This is alternate dev env for parallel testing
       # Deprecate this workflow due to beta env shutdown
       # https://topcoder.atlassian.net/browse/CORE-251

Dockerfile

@@ -86,6 +86,9 @@ ARG GAMIFICATION_ORG_ID
 # Universal Nav
 ARG UNIVERSAL_NAV_URL
 
+# Topgear submissions allowed domains
+ARG TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS
+
 ################################################################################
 # Setting of environment variables in the Docker image.
 
@@ -154,6 +157,9 @@ ENV GAMIFICATION_ORG_ID=$GAMIFICATION_ORG_ID
 # Universal nav
 ENV UNIVERSAL_NAV_URL=$UNIVERSAL_NAV_URL
 
+# Topgear submissions allowed domains
+ENV TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS=$TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS
+
 ################################################################################
 # Testing and build of the application inside the container.
 

__tests__/shared/components/challenge-listing/__snapshots__/index.jsx.snap

@@ -38,12 +38,14 @@ exports[`Matches shallow shapshot 1 shapshot 1 1`] = `
       auth={Object {}}
       challenges={Array []}
       communityName={null}
+      copilotOpportunities={Array []}
       expandTag={null}
       expandedTags={Array []}
       expanding={false}
       filterState={Object {}}
       loadMoreActive={null}
       loadMoreAll={null}
+      loadMoreCopilotOpportunities={null}
       loadMoreMy={null}
       loadMoreMyPast={null}
       loadMoreOnGoing={null}
@@ -103,12 +105,14 @@ exports[`Matches shallow shapshot 2 shapshot 2 1`] = `
       auth={Object {}}
       challenges={Array []}
       communityName={null}
+      copilotOpportunities={Array []}
       expandTag={null}
       expandedTags={Array []}
       expanding={false}
       filterState={Object {}}
       loadMoreActive={null}
       loadMoreAll={null}
+      loadMoreCopilotOpportunities={null}
       loadMoreMy={null}
       loadMoreMyPast={null}
       loadMoreOnGoing={null}

build.sh

@@ -29,6 +29,7 @@ docker build -t $TAG \
   --build-arg CONTENTFUL_EDU_CDN_API_KEY=$CONTENTFUL_EDU_CDN_API_KEY \
   --build-arg CONTENTFUL_EDU_PREVIEW_API_KEY=$CONTENTFUL_EDU_PREVIEW_API_KEY \
   --build-arg FILESTACK_API_KEY=$FILESTACK_API_KEY \
+  --build-arg TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS=$TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS \
   --build-arg FILESTACK_SUBMISSION_CONTAINER=$FILESTACK_SUBMISSION_CONTAINER \
   --build-arg MAILCHIMP_API_KEY=$MAILCHIMP_API_KEY \
   --build-arg MAILCHIMP_BASE_URL=$MAILCHIMP_BASE_URL \

config/backup-default.js

@@ -102,6 +102,7 @@ module.exports = {
     /* This is the same value as above, but it is used by topcoder-react-lib,
      * as a more verbose name for the param. */
     COMMUNITY_APP: 'https://community-app.topcoder-dev.com',
+    COPILOTS_URL: 'https://copilots.topcoder-dev.com',
     CHALLENGES_URL: 'https://www.topcoder-dev.com/challenges',
     TCO_OPEN_URL: 'https://www.topcoder-dev.com/community/member-programs/topcoder-open',
     ARENA: 'https://arena.topcoder-dev.com',

config/custom-environment-variables.js

@@ -117,4 +117,5 @@ module.exports = {
     ORG_ID: 'GAMIFICATION_ORG_ID',
     ENABLE_BADGE_UI: 'GAMIFICATION_ENABLE_BADGE_UI',
   },
+  TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS: 'TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS',
 };

config/default.js

@@ -104,6 +104,7 @@ module.exports = {
      * as a more verbose name for the param. */
     COMMUNITY_APP: 'https://community-app.topcoder-dev.com',
     CHALLENGES_URL: 'https://www.topcoder-dev.com/challenges',
+    COPILOTS_URL: 'https://copilots.topcoder-dev.com',
     TCO_OPEN_URL: 'https://www.topcoder-dev.com/community/member-programs/topcoder-open',
     ARENA: 'https://arena.topcoder-dev.com',
     AUTH: 'https://accounts-auth0.topcoder-dev.com',
@@ -472,5 +473,5 @@ module.exports = {
   ACCOUNT_SETTINGS_REDIRECT_URL: 'https://account-settings.topcoder-dev.com',
   INNOVATION_CHALLENGES_TAG: 'Innovation Challenge',
   PLATFORM_SITE_URL: 'https://platform.topcoder-dev.com',
-  TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS: ['wipro365.sharepoint.com', 'wipro365-my.sharepoint.com', 'wipro365-my.sharepoint.com.mcas.ms'],
+  TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS: 'wipro365.sharepoint.com|wipro365-my.sharepoint.com|wipro365-my.sharepoint.com.mcas.ms',
 };

config/production.js

@@ -26,6 +26,7 @@ module.exports = {
      * as a more verbose name for the param. */
     COMMUNITY_APP: 'https://community-app.topcoder.com',
     CHALLENGES_URL: 'https://www.topcoder.com/challenges',
+    COPILOTS_URL: 'https://copilots.topcoder.com',
     TCO_OPEN_URL: 'https://www.topcoder.com/community/member-programs/topcoder-open',
 
     AUTH: 'https://accounts-auth0.topcoder.com',