Merge pull request #6323 from topcoder-platform/develop

Release v1.15.12
topcoder-platform · Apr 28, 2022 · f7b8420 · f7b8420
2 parents 4e3281b + 967e5fc
commit f7b8420
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 49 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -349,21 +349,21 @@ workflows:
           filters:
             branches:
               only:                
-                - csp-headers
+                - free
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global      
           filters:
             branches:
               only:
-                - thrive-rss
+                - free
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global
           filters:
             branches:
               only:
-                - csp-headers
+                - free
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global         

diff --git a/config/default.js b/config/default.js
@@ -117,7 +117,7 @@ module.exports = {
     HELP: 'https://www.topcoder.com/thrive/tracks?track=Topcoder&tax=Help%20Articles',
     SUBMISSION_REVIEW: 'https://submission-review.topcoder-dev.com',
 
-    THRIVE: 'https://www.topcoder.com/thrive',
+    THRIVE: 'https://community-app.topcoder-dev.com/thrive',
 
     COMMUNITIES: {
       BLOCKCHAIN: 'https://blockchain.topcoder-dev.com',

diff --git a/config/production.js b/config/production.js
@@ -50,6 +50,8 @@ module.exports = {
 
     COMMUNITY_API: 'http://localhost:8000',
 
+    THRIVE: 'https://www.topcoder.com/thrive',
+
     COMMUNITIES: {
       BLOCKCHAIN: 'https://blockchain.topcoder.com',
       COGNITIVE: 'https://cognitive.topcoder.com',

diff --git a/package.json b/package.json
@@ -153,7 +153,7 @@
     "supertest": "^3.1.0",
     "tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3",
     "tc-ui": "^1.0.12",
-    "topcoder-react-lib": "1.2.5",
+    "topcoder-react-lib": "1.2.6",
     "topcoder-react-ui-kit": "2.0.1",
     "topcoder-react-utils": "0.7.8",
     "turndown": "^4.0.2",

diff --git a/src/shared/components/Settings/Account/MyAccount/index.jsx b/src/shared/components/Settings/Account/MyAccount/index.jsx
@@ -782,7 +782,7 @@ export default class MyAccount extends ConsentComponent {
                           <div styleName="field col-2">
                             <div styleName="validation-bar" className="form-field">
                               <div styleName={`password toggle-password ${focus['new-password-input'] ? 'focus' : ''}`}>
-                                <input id="new-password-input" styleName="password-input" ref={this.newPasswordRef} onChange={this.checkPassword} onFocus={this.onPasswordFocus} onBlur={this.onPasswordBlur} name="password" type={passwordInputType['new-password-input']} placeholder="RE-TYPE YOUR NEW PASSWORD" minLength="8" maxLength="64" required />
+                                <input id="new-password-input" styleName="password-input" ref={this.newPasswordRef} onChange={this.checkPassword} onFocus={this.onPasswordFocus} onBlur={this.onPasswordBlur} name="password" type={passwordInputType['new-password-input']} placeholder="TYPE YOUR NEW PASSWORD" minLength="8" maxLength="64" required />
                                 <label htmlFor="newPasswordCheckbox" styleName="passwordCheckbox">
                                   <input type="checkbox" id="newPasswordCheckbox" styleName="newPasswordCheckbox" onChange={() => this.toggleTypeAttribute('new-password-input')} />
                                   Show
@@ -818,7 +818,7 @@ export default class MyAccount extends ConsentComponent {
                           <div styleName="field col-2">
                             <div styleName="validation-bar" className="form-field">
                               <div styleName={`password toggle-password ${focus['re-new-password-input'] ? 'focus' : ''}`}>
-                                <input id="re-new-password-input" styleName="password-input" ref={this.reNewPasswordRef} onChange={this.checkPassword} onFocus={this.onPasswordFocus} onBlur={this.onPasswordBlur} name="re-password" type={passwordInputType['re-new-password-input']} placeholder="TYPE YOUR NEW PASSWORD" minLength="8" maxLength="64" required />
+                                <input id="re-new-password-input" styleName="password-input" ref={this.reNewPasswordRef} onChange={this.checkPassword} onFocus={this.onPasswordFocus} onBlur={this.onPasswordBlur} name="re-password" type={passwordInputType['re-new-password-input']} placeholder="RE-TYPE YOUR NEW PASSWORD" minLength="8" maxLength="64" required />
                                 <label htmlFor="reNewPasswordCheckbox" styleName="passwordCheckbox">
                                   <input type="checkbox" id="reNewPasswordCheckbox" styleName="newPasswordCheckbox" onChange={() => this.toggleTypeAttribute('re-new-password-input')} />
                                   Show

diff --git a/src/shared/components/challenge-detail/Specification/index.jsx b/src/shared/components/challenge-detail/Specification/index.jsx
@@ -363,53 +363,37 @@ export default function ChallengeDetailsView(props) {
                   </div>
                 )
             }
-            <article>
-              <h2>
-                Payments
-              </h2>
-              {
-                isWipro ? (
-                  <div>
-                    <p>
-                      For employees of Wipro Technologies, following are the
-                      payment terms. Winner/s would be awarded the prize money on
-                      successful completion and acceptance of the submission by
-                      the stakeholder. Accumulated prize money for the month will
-                      be paid through Wipro payroll as part of subsequent month’s
-                      salary (eg. Aug month challenge winners payment will be
-                      credited as part Sept month salary). For payment of prize
-                      money, respective country currency conversion shall be
-                      considered as per Wipro standard currency conversion
-                      guidelines. Please refer to policy document at
-                      &zwnj;
-                      <a
-                        href="https://wipro365.sharepoint.com/sites/wipro-people-policies/wipro%20policies/TopGear-RewardPoints-Policy.pdf"
-                        rel="noopener noreferrer"
-                        target="_blank"
-                      >
-                        https://wipro365.sharepoint.com/sites/wipro-people-policies/wipro%20policies/TopGear-RewardPoints-Policy.pdf
-                      </a>
-                      &zwnj;
-                      for details regarding the policy.
-                    </p>
-                  </div>
-                ) : (
+            {isWipro && (
+              <article>
+                <h2>
+                  Payments
+                </h2>
+                <div>
                   <p>
-                    Topcoder will compensate members in accordance with our standard payment policies, unless
-                    otherwise specified in this challenge. For information on payment policies, setting up your profile to
-                    receive payments, and general payment questions, please refer to
+                    For employees of Wipro Technologies, following are the
+                    payment terms. Winner/s would be awarded the prize money on
+                    successful completion and acceptance of the submission by
+                    the stakeholder. Accumulated prize money for the month will
+                    be paid through Wipro payroll as part of subsequent month’s
+                    salary (eg. Aug month challenge winners payment will be
+                    credited as part Sept month salary). For payment of prize
+                    money, respective country currency conversion shall be
+                    considered as per Wipro standard currency conversion
+                    guidelines. Please refer to policy document at
                     &zwnj;
                     <a
-                      href="https://www.topcoder.com/thrive/articles/Payment%20Policies%20and%20Instructions"
+                      href="https://wipro365.sharepoint.com/sites/wipro-people-policies/wipro%20policies/TopGear-RewardPoints-Policy.pdf"
                       rel="noopener noreferrer"
                       target="_blank"
                     >
-                      Payment Policies and Instructions
-                    </a>.
+                      https://wipro365.sharepoint.com/sites/wipro-people-policies/wipro%20policies/TopGear-RewardPoints-Policy.pdf
+                    </a>
+                    &zwnj;
+                    for details regarding the policy.
                   </p>
-                )
-              }
-            </article>
+                </div>
+              </article>
+            )}
           </div>
         </div>
         <SideBar

diff --git a/src/shared/components/challenge-detail/Specification/styles.scss b/src/shared/components/challenge-detail/Specification/styles.scss
@@ -421,6 +421,7 @@ $tc-link-visited: #0c4e98;
 .challenge-specs-main {
   @include roboto-regular;
 
+  width: 100%;
   padding: 0 20px;
   max-width: 720px;
   align-self: center;

diff --git a/src/shared/components/challenge-detail/ThriveArticles/index.jsx b/src/shared/components/challenge-detail/ThriveArticles/index.jsx
@@ -20,7 +20,7 @@ export default function ThriveArticles({ articles }) {
 
   const getPageUrl = article => (article.externalArticle && article.contentUrl
     ? article.contentUrl
-    : `${config.TC_EDU_BASE_PATH}${config.TC_EDU_ARTICLES_PATH}/${article.slug || article.title}`);
+    : `${config.URL.THRIVE}${config.TC_EDU_ARTICLES_PATH}/${article.slug || article.title}`);
 
   const items = map(articles, (a, idx) => (
     <div styleName="article" key={idx}>

diff --git a/src/shared/containers/Profile.jsx b/src/shared/containers/Profile.jsx
@@ -96,7 +96,7 @@ class ProfileContainer extends React.Component {
       handleParam,
     } = this.props;
 
-    if (loadingError) {
+    if (loadingError || (info && info.status !== 'ACTIVE')) {
       return <Error404 />;
     }