Merge pull request #2356 from topcoder-platform/develop

develop

Author: sushilshinde

.circleci/config.yml

@@ -181,7 +181,8 @@ workflows:
           filters:
             branches:
                 only:
-                  - legacy-tco
+                - hot-fixes
+                - legacy-tco
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global

package-lock.json

@@ -107,7 +107,7 @@
     "slick-carousel": "^1.8.1",
     "supertest": "^3.1.0",
     "tc-accounts": "git+https://github.com/appirio-tech/accounts-app.git#dev",
-    "topcoder-react-lib": "^0.7.11",
+    "topcoder-react-lib": "^0.7.14",
     "topcoder-react-ui-kit": "^0.5.10",
     "topcoder-react-utils": "0.7.8",
     "turndown": "^4.0.2",

package.json

@@ -77,22 +77,23 @@ $contentWrapperPadding: 0;
       }
 
       p {
-        font-size: 20px;
+        font-size: 15px;
         margin-bottom: 1em;
         line-height: 25px;
+
+        strong {
+          font-weight: bold;
+        }
+
+        em {
+          font-style: italic;
+        }
       }
 
       ul {
         list-style: disc;
         margin-bottom: 1em;
         margin-left: 20px;
-
-        li {
-          p {
-            font-size: 16px;
-            line-height: 27px;
-          }
-        }
       }
 
       input {

src/shared/components/Contentful/Banner/themes/tco19.scss

@@ -110,13 +110,22 @@
   td {
     @include roboto-regular;
 
-    font-size: 20px;
-    line-height: 70px;
+    font-size: 15px;
+    line-height: 25px;
     text-align: left;
     color: $tc-gray-80;
     border-top: 1px solid #ededf2;
     border-bottom: 1px solid #ededf2;
-    padding: 0 10px;
+    padding: 10px 0;
+    min-height: 51px;
+
+    &:first-child {
+      padding-left: 10px;
+    }
+
+    &:last-child {
+      padding-right: 10px;
+    }
   }
 
   ul,

src/shared/components/Contentful/ContentBlock/themes/TCO19.scss

@@ -71,9 +71,9 @@ export default function Looker(props) {
               cols.map((c) => {
                 const name = c.headerName;
                 const { styles } = c;
-                return (
+                return name ? (
                   <th key={name} style={styles}>{ name }</th>
-                );
+                ) : null;
               })
 
            }
@@ -82,7 +82,7 @@ export default function Looker(props) {
 
       const bodyRow = (record, cols, i) => (
         <tr key={Object.values(record)}>
-          { (countRows && (limit <= 0 || i < limit)) ? <td> {i + 1}. </td> : ' ' }
+          { (countRows && (limit <= 0 || i < limit)) ? <td style={{ borderTop: '1px solid #D5D5D5' }}> {i + 1}. </td> : ' ' }
           {
             cols.map((c) => {
               const prop = c.property;
@@ -96,11 +96,11 @@ export default function Looker(props) {
                   value = record[prop].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
                 }
               }
-              return (
+              return value ? (
                 <td key={record[prop]} style={styles} title={value}>
                   {value}
                 </td>
-              );
+              ) : null;
             })
           }
         </tr>

src/shared/components/Looker/index.jsx

@@ -133,7 +133,7 @@ class ProfilePage extends React.Component {
         ? _.get(info, 'competitionCountryCode') : _.get(info, 'homeCountryCode');
 
       const result = _.find(lookupData.countries,
-        c => c.countryCode === countryCode.toUpperCase());
+        c => countryCode && c.countryCode === countryCode.toUpperCase());
       country = _.isEmpty(result) ? '' : result.country;
     }
 

src/shared/components/ProfilePage/index.jsx

@@ -7,7 +7,7 @@
 /* eslint-disable no-undef */
 import React from 'react';
 import PT from 'prop-types';
-import { omit } from 'lodash';
+import { omit, get } from 'lodash';
 import ConsentComponent from 'components/Settings/ConsentComponent';
 import { Modal, PrimaryButton } from 'topcoder-react-ui-kit';
 import Personalization from 'components/Settings/Preferences/Personalization';
@@ -57,7 +57,6 @@ export default class MyAccount extends ConsentComponent {
       reNewPassword: '',
       isMobileView: false,
       screenSM: 767,
-      ssoUser: false,
       isSent: false,
       isOpen: false,
     };
@@ -175,12 +174,8 @@ export default class MyAccount extends ConsentComponent {
   }
 
   onChangeEmail() {
-    const { profile } = this.props;
-    if (profile.withSSO !== null && profile.withSSO !== undefined && profile.withSSO) {
-      this.setState({
-        ssoUser: true,
-      });
-    } else {
+    const { profileState } = this.props;
+    if (get(profileState, 'credential.hasPassword')) {
       const newState = { ...this.state };
       newState.btnChangeEmailVisible = false;
       newState.btnVerifiEmailVisible = true;
@@ -383,7 +378,6 @@ export default class MyAccount extends ConsentComponent {
       showRePasswordTips,
       rePasswordValid,
       isValidEmail,
-      ssoUser,
       isOpen,
     } = this.state;
 
@@ -479,7 +473,7 @@ export default class MyAccount extends ConsentComponent {
                     </div>
                   </div>
                   {
-                    ssoUser && (
+                    get(profileState, 'credential.hasPassword', false) === false && (
                       <div styleName="error-message">
                         Since you joined Topcoder using your &lt;SSO Service&gt; account,
                         any email updates will need to be handled by logging in to
@@ -573,7 +567,7 @@ export default class MyAccount extends ConsentComponent {
                     </div>
                   </div>
                   {
-                    ssoUser && (
+                    get(profileState, 'credential.hasPassword', false) === false && (
                       <div styleName="error-message">
                         Since you joined Topcoder using your &lt;SSO Service&gt; account,
                         any email updates will need to be handled by logging in to

src/shared/components/Settings/Account/MyAccount/index.jsx

@@ -17,17 +17,17 @@ const newsletters = [
   //   desc: 'News summary from all tracks and programs',
   // },
   {
-    id: 'TOPCODER_NL_DESIGN',
+    id: 'Design Newsletter',
     name: 'Design Newsletter',
     desc: 'Website, mobile and product design; UI and UX',
   },
   {
-    id: 'TOPCODER_NL_DEV',
+    id: 'Dev Newsletter',
     name: 'Development Newsletter',
     desc: 'Software architecture, component assembly, application development, and bug hunting',
   },
   {
-    id: 'TOPCODER_NL_DATA',
+    id: 'Data Science Newsletter',
     name: 'Data Science Newsletter',
     desc: 'Algorithm and data structures, statistical analysis',
   },
@@ -107,8 +107,11 @@ export default class EmailPreferences extends ConsentComponent {
 
   onChange(id, checked) {
     document.querySelectorAll(`#pre-onoffswitch-${id}`).forEach((el) => { el.checked = checked; }); // eslint-disable-line no-param-reassign
-    const { emailPreferences } = this.state;
-    emailPreferences[id] = checked;
+    let { emailPreferences } = this.state;
+    emailPreferences = {
+      ...emailPreferences,
+      [id]: checked,
+    };
     this.setState({
       emailPreferences,
     }, () => this.saveEmailPreferences());

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

@@ -100,7 +100,9 @@ export default class BasicInfo extends ConsentComponent {
     let invalid = false;
     let errorMessage = '';
     let dateError = '';
+    let zipError = '';
     let birthDateInvalid = false;
+    let zipInvalid = false;
     const invalidFields = [];
 
     if (!_.trim(newBasicInfo.firstName).length) {
@@ -123,6 +125,13 @@ export default class BasicInfo extends ConsentComponent {
       errorMessage += ' cannot be empty';
     }
 
+    _.forEach(newBasicInfo.addresses, (address) => {
+      if (!(/^[0-9-]*$/.test(address.zip))) {
+        zipError = 'You must enter a valid zip code';
+        zipInvalid = true;
+      }
+    });
+
     if (_.trim(newBasicInfo.birthDate).length > 0) {
       if (!moment().isAfter(newBasicInfo.birthDate)) {
         dateError = 'You must enter a valid date for Birth Date';
@@ -137,6 +146,13 @@ export default class BasicInfo extends ConsentComponent {
       invalid = birthDateInvalid;
     }
 
+    if (errorMessage.length > 0) {
+      errorMessage = `${errorMessage}. ${zipError}`;
+    } else if (zipError.length > 0) {
+      errorMessage = zipError;
+      invalid = zipInvalid;
+    }
+
     this.setState({ errorMessage, formInvalid: invalid });
     return invalid;
   }

src/shared/components/Settings/Profile/BasicInfo/index.jsx

@@ -341,6 +341,7 @@ export default class Hobby extends ConsentComponent {
                 <div styleName="field row-1">
                   <label htmlFor="hobby">
                     Hobby
+                    <span styleName="text-required">* Required</span>
                     <input type="hidden" />
                   </label>
                   <input disabled={!canModifyTrait} id="hobby" name="hobby" type="text" placeholder="Hobby" onChange={this.onUpdateInput} value={newHobby.hobby} maxLength="128" required />
@@ -351,6 +352,7 @@ export default class Hobby extends ConsentComponent {
                   <label styleName="description-label" htmlFor="description">
                     <span>
                       Description
+                      <span styleName="text-required">* Required</span>
                     </span>
                     {' '}
                     <span styleName="description-counts">

src/shared/components/Settings/Profile/Hobby/index.jsx

@@ -180,6 +180,12 @@ textarea {
         line-height: 15px;
         font-weight: 500;
         color: $tc-gray-80;
+
+        .text-required {
+          font-size: 10px;
+          color: $tc-red-110;
+          margin-left: 5px;
+        }
       }
 
       &.col-1 {

src/shared/components/Settings/Profile/Hobby/styles.scss

@@ -590,6 +590,7 @@ export default class Skills extends ConsentComponent {
                 <div styleName="field">
                   <label htmlFor="skills">
                     Skill
+                    <span styleName="text-required">* Required</span>
                     <input type="hidden" />
                   </label>
                   <Select

src/shared/components/Settings/Profile/Skills/index.jsx

@@ -165,6 +165,12 @@
         line-height: 15px;
         color: $tc-gray-80;
         margin-bottom: 6px;
+
+        .text-required {
+          font-size: 10px;
+          color: $tc-red-110;
+          margin-left: 5px;
+        }
       }
 
       .col-1,

src/shared/components/Settings/Profile/Skills/styles.scss

@@ -252,7 +252,12 @@ Toggle navigation
         <div className={isMobileOpen ? theme.menuWrapOpen : theme.menuWrap}>
           {
             menuItems[0] && menuItems[0].navigationMenu ? (
-              <Menu id={menuItems[0].navigationMenu} baseUrl={baseUrl} />
+              <Menu
+                id={menuItems[0].navigationMenu}
+                baseUrl={baseUrl}
+                spaceName={menuItems[0].spaceName}
+                environment={menuItems[0].environment}
+              />
             ) : (
               <ul className={theme.menu}>
                 {_.map(menuItems, menuIterator)}

src/shared/components/tc-communities/Header/index.jsx

@@ -25,7 +25,7 @@ export default function TCO03({ base }) {
             <ContentfulRoute
               baseUrl={base}
               error404={<Error404 />}
-              id="4mKZxfgAi6Us6dRS4Hy2Ab"
+              id="2MKnrhssyBHnKH2wuV9Ate"
             />
             <Route
               component={Error404}

src/shared/routes/Communities/TCO03/Routes.jsx

@@ -25,7 +25,7 @@ export default function TCO07({ base }) {
             <ContentfulRoute
               baseUrl={base}
               error404={<Error404 />}
-              id="2XWcxVALvInOlAOfROErKS"
+              id="52NfYmZnxLnJXKpIQXwnzC"
             />
             <Route
               component={Error404}

src/shared/routes/Communities/TCO07/Routes.jsx

@@ -71,7 +71,7 @@ export default function Topcoder() {
               <Route
                 component={Profile}
                 exact
-                path="/members/:handle([\w\-\[\].{}]{2,15})"
+                path="/members/:handle([\w\-\[\].{} ]{2,15})"
               />
               <Route
                 component={() => <Settings base="/settings" />}
@@ -80,7 +80,7 @@ export default function Topcoder() {
               <Route
                 component={ProfileStats}
                 exact
-                path="/members/:handle([\w\-\[\].{}]{2,15})/details"
+                path="/members/:handle([\w\-\[\].{} ]{2,15})/details"
               />
               <Error404 />
             </Switch>