Merge branch 'develop' into gsheet-contentful

Author: luizrrodrigues

.circleci/config.yml

@@ -282,7 +282,7 @@ workflows:
           filters:
             branches:
               only:                
-                - gsheet-contentful
+                - free
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global      

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

@@ -10,69 +10,32 @@ exports[`renders email preferences setting page correctly 1`] = `
     E-Mail Preferences
   </h1>
   <div
-    className="src-shared-components-Settings-Preferences-Email-___styles__sub-title___2Fh1W"
+    className="src-shared-components-Settings-Preferences-Email-___styles__unsubscribed-msg___3yh6s"
   >
-    Your preferences
-  </div>
-  <div
-    className="src-shared-components-Settings-Preferences-Email-___styles__preferences-container___38AVF"
-  >
-    <ToggleableItem
-      checked={false}
-      id="Pipeline"
-      onToggle={[Function]}
-      primaryText="Challenge Pipeline"
-      secondaryText="Subscribe to this newsletter if you want to get updates on the types of challenges coming up in the future. To view these challenges at your leisure you can always visit the <a href=\\"https://www.topcoder.com/community/pipeline\\" style=\\"color:#0d61bf;text-decoration:underline\\">Challenge Pipeline</a> page."
-      value="Pipeline"
-    />
-    <ToggleableItem
-      checked={false}
-      id="Gig Work"
-      onToggle={[Function]}
-      primaryText="Gig Work"
-      secondaryText="This newsletter gets sent out at various times, specifically when we have an opportunity of mass appeal. For more information you can visit the <a href=\\"https://www.topcoder.com/community/taas\\" style=\\"color:#0d61bf;text-decoration:underline\\">Gig Work</a> page."
-      value="Gig Work"
-    />
-    <ToggleableItem
-      checked={false}
-      id="Monthly Newsletter"
-      onToggle={[Function]}
-      primaryText="Monthly Newsletter"
-      secondaryText="This newsletter gets sent out at the end of every month and contains a variety of important information across all of our tracks."
-      value="Monthly Newsletter"
-    />
-    <ToggleableItem
-      checked={false}
-      id="Marathon Match Reminders"
-      onToggle={[Function]}
-      primaryText="Marathon Match Reminders"
-      secondaryText="Receive updates whenever a new marathon match is scheduled."
-      value="Marathon Match Reminders"
-    />
-    <ToggleableItem
-      checked={false}
-      id="Single Round Match Reminders"
-      onToggle={[Function]}
-      primaryText="Single Round Match (SRM) Reminders"
-      secondaryText="Attention Competitive Programmers! If there is any newsletter you are subscribing too, it better be this one. Receive updates when a new SRM event is scheduled."
-      value="Single Round Match Reminders"
-    />
-    <ToggleableItem
-      checked={false}
-      id="TCO Tuesdays"
-      onToggle={[Function]}
-      primaryText="TCO Newsletter"
-      secondaryText="For all the latest updates surrounding the <a href=\\"https://www.topcoder.com/community/member-programs/topcoder-open\\" style=\\"color:#0d61bf;text-decoration:underline\\">Topcoder Open</a> you should definitely be subscribing to this one. Expect an update in your mailbox every Tuesday!"
-      value="TCO Tuesdays"
-    />
-    <ToggleableItem
-      checked={false}
-      id="RDM"
-      onToggle={[Function]}
-      primaryText="Rapid Development Match (RDM) Reminders"
-      secondaryText="Receive notifications of our brand new RDMs! These rated, development matches will be a fun new way to engage with us!"
-      value="RDM"
-    />
+    <h3>
+      You are not subscribed to receive Topcoder emails
+    </h3>
+    <p>
+      If this was a mistake or if you would like to resubscribe, please click the button below.
+    </p>
+    <ThemedButton
+      active={false}
+      composeAdhocTheme="deeply"
+      composeContextTheme="softly"
+      disabled={false}
+      enforceA={false}
+      mapThemrProps={[Function]}
+      onClick={[Function]}
+      onMouseDown={null}
+      openNewTab={false}
+      replace={false}
+      size={null}
+      themePriority="adhoc-context-default"
+      to={null}
+      type="button"
+    >
+      Resubscribe
+    </ThemedButton>
   </div>
 </div>
 `;

package-lock.json

@@ -20,7 +20,7 @@ routes.post('/:listId/members', (req, res, next) => new MailchimpService().doReg
 
 routes.get('/:listId/members/:emailHash', (req, res) => new MailchimpService().checkSubscription(req).then(res.send.bind(res)));
 
-routes.put('/:listId/members/:emailHash', (req, res) => new MailchimpService().subscribeInterests(req).then(res.send.bind(res)));
+routes.put('/:listId/members/:emailHash', (req, res) => new MailchimpService().updateMember(req).then(res.send.bind(res)));
 
 routes.post('/:listId/members/:emailHash/tags', (req, res) => new MailchimpService().subscribeTags(req).then(res.send.bind(res)));
 

src/server/routes/mailchimp.js

@@ -51,7 +51,7 @@ export default class MailchimpService {
     return res.json();
   }
 
-  async subscribeInterests(req) {
+  async updateMember(req) {
     const formData = JSON.stringify(req.body);
     const res = await fetch(`${this.mailchimpBaseUrl}/lists/${req.params.listId}/members/${req.params.emailHash}`, {
       method: 'PUT',

src/server/services/mailchimp.js

@@ -35,7 +35,8 @@ async function fetchDataDone(emailHash, listId = config.NEWSLETTER_SIGNUP.DEFAUL
 
     return {
       email: emailHash,
-      preferences: subs.tags,
+      preferences: subs.interests,
+      status: subs.status,
       error,
     };
   } catch (error) {
@@ -48,26 +49,24 @@ async function fetchDataDone(emailHash, listId = config.NEWSLETTER_SIGNUP.DEFAUL
 
 // Updates member newsletter subscription
 async function updateSubscriptionsDone(
-  emailHash, tagId, status, listId = config.NEWSLETTER_SIGNUP.DEFAUL_LIST_ID,
+  emailHash, groupId, status, listId = config.NEWSLETTER_SIGNUP.DEFAUL_LIST_ID,
 ) {
   /* NOTE: In the real life in most cases you don't want to use fetch() directly
    * in an action. You want to create a service for your calls and use it here.
    * However, in this example, to keep it a bit more compact, we use fetch()
    * directly here. */
   try {
     let error = false;
-    const fetchUrl = `${PROXY_ENDPOINT}/${listId}/members/${emailHash}/tags`;
+    const fetchUrl = `${PROXY_ENDPOINT}/${listId}/members/${emailHash}`;
 
     const data = {
-      tags: [
-        { name: tagId, status: status ? 'active' : 'inactive' },
-      ],
+      interests: { [groupId]: !!status },
     };
 
     const formData = JSON.stringify(data);
     // use proxy for avoid 'Access-Control-Allow-Origin' bug
     await fetch(fetchUrl, {
-      method: 'POST',
+      method: 'PUT',
       headers: {
         'Content-Type': 'application/json',
       },
@@ -79,26 +78,68 @@ async function updateSubscriptionsDone(
       });
 
     return {
-      id: tagId,
+      id: groupId,
       checked: status,
       email: emailHash,
       error,
     };
   } catch (error) {
     return {
-      id: tagId,
+      id: groupId,
       checked: status,
       email: emailHash,
       error,
     };
   }
 }
 
+/**
+ * Resubscribe member for TC emails/list
+ * @param {string} emailHash the email
+ */
+async function resubscribeDone(emailHash, listId = config.NEWSLETTER_SIGNUP.DEFAUL_LIST_ID) {
+  try {
+    let error = false;
+    const fetchUrl = `${PROXY_ENDPOINT}/${listId}/members/${emailHash}`;
+
+    const data = {
+      status: 'subscribed',
+    };
+
+    const formData = JSON.stringify(data);
+    // use proxy for avoid 'Access-Control-Allow-Origin' bug
+    await fetch(fetchUrl, {
+      method: 'PUT',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: formData,
+    })
+      .then((result) => {
+        if (!result.ok) error = true;
+        return result.json();
+      });
+
+    return {
+      email: emailHash,
+      resubscribe: true,
+      error,
+    };
+  } catch (error) {
+    return {
+      email: emailHash,
+      error,
+    };
+  }
+}
+
 export default createActions({
   NEWSLETTER_PREFERENCES: {
     FETCH_DATA_INIT: fetchDataInit,
     FETCH_DATA_DONE: fetchDataDone,
     UPDATE_TAG_INIT: _.identity,
     UPDATE_TAG_DONE: updateSubscriptionsDone,
+    RESUBSCRIBE_INIT: _.identity,
+    RESUBSCRIBE_DONE: resubscribeDone,
   },
 });

src/shared/actions/newsletterPreferences.js

@@ -33,5 +33,9 @@
 
   button {
     margin: 24px 12px 0;
+
+    &:first-child {
+      margin-right: 12px !important;
+    }
   }
 }