Merge pull request #6759 from topcoder-platform/develop

Release v1.20.0

Author: luizrrodrigues

.circleci/config.yml

@@ -12,7 +12,7 @@ parameters:
 
 defaults: &defaults
     docker:
-      - image: docker:17.11.0-ce-git
+      - image: docker:20.10.21-git
         environment:
           ENV: $BASH_ENV
 
@@ -28,7 +28,7 @@ install_dependency: &install_dependency
 install_deploysuite: &install_deploysuite
           name: Installation of install_deploysuite.
           command: |
-            git clone --branch dev_comm https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
+            git clone --branch v1.4.14 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
             cp ./../buildscript/master_deploy.sh .
             cp ./../buildscript/buildenv.sh .
             cp ./../buildscript/awsconfiguration.sh .
@@ -63,7 +63,7 @@ jobs:
           name: "configuring environment"
           command: |
             ./awsconfiguration.sh DEV
-            ./buildenv.sh -e DEV -b dev_communityapp_buildvar,dev_communityapp_deployvar
+            ./buildenv.sh -e DEV -b dev_communityapp_buildvar,dev_communityapp_deployvar -l dev_communityapp_buildvar_ps
       - run: *build_docker_image
       # Caching node modules.
       - save_cache: *save_cache_settings
@@ -90,7 +90,7 @@ jobs:
           name: "configuring environment"
           command: |
             ./awsconfiguration.sh DEV
-            ./buildenv.sh -e DEV -b test_communityapp_buildvar,test_communityapp_deployvar
+            ./buildenv.sh -e DEV -b test_communityapp_buildvar,test_communityapp_deployvar -l dev_communityapp_buildvar_ps
       # Build of Docker image.
       - run: *build_docker_image
       # Caching node modules.
@@ -118,7 +118,7 @@ jobs:
           name: "configuring environment"
           command: |
             ./awsconfiguration.sh DEV
-            ./buildenv.sh -e DEV -b qa_communityapp_buildvar,qa_communityapp_deployvar
+            ./buildenv.sh -e DEV -b qa_communityapp_buildvar,qa_communityapp_deployvar -l dev_communityapp_buildvar_ps
       # Build of Docker image.
       - run: *build_docker_image
       # Caching node modules.
@@ -146,7 +146,7 @@ jobs:
           name: "configuring environment"
           command: |
             ./awsconfiguration.sh PROD
-            ./buildenv.sh -e PROD -b beta_communityapp_buildvar,beta_communityapp_deployvar
+            ./buildenv.sh -e PROD -b beta_communityapp_buildvar,beta_communityapp_deployvar -l prod_communityapp_buildvar_ps
       # Build of Docker image.
       - run: *build_docker_image
       # Caching node modules.
@@ -174,7 +174,7 @@ jobs:
           name: "configuring environment"
           command: |
             ./awsconfiguration.sh PROD
-            ./buildenv.sh -e PROD -b staging_communityapp_buildvar,staging_communityapp_deployvar
+            ./buildenv.sh -e PROD -b staging_communityapp_buildvar,staging_communityapp_deployvar -l prod_communityapp_buildvar_ps
       # Build of Docker image.
       - run: *build_docker_image
       # Caching node modules.
@@ -207,7 +207,7 @@ jobs:
           name: "configuring environment"
           command: |
             ./awsconfiguration.sh PROD
-            ./buildenv.sh -e PROD -b prod_communityapp_buildvar,prod_communityapp_deployvar
+            ./buildenv.sh -e PROD -b prod_communityapp_buildvar,prod_communityapp_deployvar -l prod_communityapp_buildvar_ps
       # Build of Docker image.
       - run: *build_docker_image
       # Caching node modules.
@@ -349,7 +349,7 @@ workflows:
           filters:
             branches:
               only:
-                - TCA-539_tca-certifications-update-badges
+                - develop
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global

__tests__/shared/components/Settings/Preferences/Email/__snapshots__/index.jsx.snap

@@ -7,11 +7,14 @@ exports[`renders email preferences setting page correctly 1`] = `
   <Item
     description="If this was a mistake or if you would like to resubscribe, please click the “Subscribe” button."
     email="[email protected]"
-    id="email"
-    isSubscribeForm={true}
+    formLink="https://topcoder.us13.list-manage.com/subscribe/post?u=65bd5a1857b73643aad556093&id=28bfd3c062"
+    icon="email"
+    isForm={true}
     link=""
     linkTitle="SUBSCRIBE"
+    status={null}
     title="You are not subscribed to receive topcoder emails"
+    value="subscribe"
   />
 </div>
 `;

config/default.js

@@ -471,4 +471,6 @@ module.exports = {
     FETCHING_PENDING_APPROVAL_EVENTS_INTERVAL: 5 * 60 * 1000, // 5 minutes
     FORUM_LINK: 'https://discussions.topcoder.com/discussion/24281/add-your-memory-to-the-topcoder-timeline-wall',
   },
+  /* development id - makes surveys have warning about environment */
+  SPRIG_ENVIRONMENT_ID: 'bUcousVQ0-yF',
 };

config/production.js

@@ -234,4 +234,6 @@ module.exports = {
   PLATFORM_SITE_URL: 'https://platform.topcoder.com',
   PLATFORMUI_SITE_URL: 'https://platform-ui.topcoder.com',
   DICE_VERIFY_URL: 'https://accounts-auth0.topcoder.com',
+  /* development id - makes surveys have warning about environment */
+  SPRIG_ENVIRONMENT_ID: 'a-IZBZ6-r7bU',
 };

package-lock.json

@@ -38,6 +38,7 @@
   "dependencies": {
     "@hapi/joi": "^16.1.4",
     "@optimizely/react-sdk": "^2.5.0",
+    "@sprig-technologies/sprig-browser": "^2.20.1",
     "@topcoder-platform/tc-auth-lib": "topcoder-platform/tc-auth-lib#1.0.4",
     "aos": "^2.3.4",
     "atob": "^2.1.1",

package.json

@@ -1,11 +1,20 @@
-import email from 'assets/images/preferences/email.svg';
 
-const data = {
-  id: 'email',
-  icon: email,
+export const subscribe = {
+  id: 'subscribe',
+  icon: 'email',
   name: 'You are not subscribed to receive topcoder emails',
   description: 'If this was a mistake or if you would like to resubscribe, please click the “Subscribe” button.',
   linkTitle: 'SUBSCRIBE',
+  formLink: 'https://topcoder.us13.list-manage.com/subscribe/post?u=65bd5a1857b73643aad556093&id=28bfd3c062',
+  value: 'subscribe',
 };
 
-export default data;
+export const unsubscribe = {
+  id: 'unsubscribe',
+  icon: 'email',
+  name: 'You are currently subscribed to receive topcoder emails',
+  description: 'If this was a mistake or if you would like to unsubscribe, please click the “Unsubscribe” button.',
+  linkTitle: 'UNSUBSCRIBE',
+  formLink: 'https://topcoder.us13.list-manage.com/unsubscribe?u=65bd5a1857b73643aad556093&id=28bfd3c062',
+  value: 'unsubscribe',
+};

src/shared/components/Settings/Preferences/Email/data.jsx

@@ -8,7 +8,7 @@ import PT from 'prop-types';
 import { toastr } from 'react-redux-toastr';
 import ToggleableItem from 'components/Settings/ToggleableItem';
 import Item from '../List/Item';
-import subscribe from './data';
+import { subscribe, unsubscribe } from './data';
 
 import './styles.scss';
 
@@ -128,16 +128,31 @@ export default class EmailPreferences extends React.Component {
         {
           status !== 'subscribed' ? (
             <Item
-              isSubscribeForm
+              status={status}
               email={email}
               key={subscribe.id}
-              id={subscribe.id}
+              icon={subscribe.icon}
               title={subscribe.name}
               description={subscribe.description}
               linkTitle={subscribe.linkTitle}
+              formLink={subscribe.formLink}
+              value={subscribe.value}
+              isForm
             />
           ) : (
             <React.Fragment>
+              <Item
+                status={status}
+                email={email}
+                key={unsubscribe.id}
+                icon={unsubscribe.icon}
+                title={unsubscribe.name}
+                description={unsubscribe.description}
+                linkTitle={unsubscribe.linkTitle}
+                formLink={unsubscribe.formLink}
+                value={unsubscribe.value}
+                isForm
+              />
               {
                   map(newsletters, (newsletter) => {
                     const checked = emailPreferences[newsletter.id];