Merge branch 'develop' into stat_marathon_match_link

luizrrodrigues · web-flow · commit fc7f57faddb8 · 2022-05-05T23:14:46.000-03:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -343,28 +343,27 @@ workflows:
             branches:
               only:
                 - develop
-                - fix/infected-submission
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
           filters:
             branches:
               only:                
-                - ca-profile-bug-bash
+                - 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:
-                - new-tc-logo
+                - 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
@@ -116,8 +116,9 @@ module.exports = {
     FORUMS_VANILLA: 'https://vanilla.topcoder-dev.com',
     HELP: 'https://www.topcoder.com/thrive/tracks?track=Topcoder&tax=Help%20Articles',
     SUBMISSION_REVIEW: 'https://submission-review.topcoder-dev.com',
+    SUBMISSION_REVIEW_API_URL: 'https://submission-review-api.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
@@ -35,6 +35,7 @@ module.exports = {
     FORUMS_VANILLA: 'https://discussions.topcoder.com',
     HELP: 'https://www.topcoder.com/thrive/tracks?track=Topcoder&tax=Help%20Articles',
     SUBMISSION_REVIEW: 'https://submission-review.topcoder.com',
+    SUBMISSION_REVIEW_API_URL: 'https://submission-review-api.topcoder.com',
     MEMBER: 'https://member.topcoder.com',
     ONLINE_REVIEW: 'https://software.topcoder.com',
     PAYMENT_TOOL: 'https://payment.topcoder.com',
@@ -50,6 +51,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/server/index.js b/src/server/index.js
@@ -131,6 +131,86 @@ async function onExpressJsSetup(server) {
     return next();
   };
 
+  server.use((req, res, next) => {
+    res.header('Referrer-Policy', 'strict-origin-when-cross-origin');
+    res.header('Permissions-Policy', 'geolocation=(), microphone=(), camera=()');
+
+    if (req.url.startsWith('/__community__/veterans') || req.hostname === 'veterans.topcoder.com') {
+      res.header(
+        'Content-Security-Policy',
+        "default-src 'self';"
+        + " script-src 'report-sample' 'self' 'unsafe-inline' 'unsafe-eval'"
+          + ` ${config.CDN.PUBLIC}`
+          + ' http://www.google-analytics.com'
+          + ' https://43d132d5dbff47c59d9d53ad448f93c2.js.ubembed.com'
+          + ' https://assets.ubembed.com'
+          + ' https://assets.zendesk.com'
+          + ' https://browser.sentry-cdn.com'
+          + ' https://cdn.heapanalytics.com'
+          + ' https://cdn.segment.com'
+          + ' https://connect.facebook.net'
+          + ' https://d1of0acg2orgco.cloudfront.net'
+          + ' https://d1mwkvp2xbqfs9.cloudfront.net'
+          + ' https://d24oibycet9bsb.cloudfront.net'
+          + ' https://fast.trychameleon.com'
+          + ' https://static.zdassets.com'
+          + ' https://www.googletagmanager.com;'
+        + " style-src 'report-sample' 'self' 'unsafe-inline'"
+          + ` ${config.CDN.PUBLIC}`
+          + ' https://d1of0acg2orgco.cloudfront.net'
+          + ' https://d1mwkvp2xbqfs9.cloudfront.net'
+          + ' https://d24oibycet9bsb.cloudfront.net'
+          + ' https://d2nl5eqipnb33q.cloudfront.net;'
+        + " object-src 'none';"
+        + " base-uri 'self';"
+        + " connect-src 'self'"
+          + ` ${config.API.V2}/`
+          + ` ${config.API.V3}/`
+          + ` ${config.API.V4}/`
+          + ` ${config.API.V5}/`
+          + ` ${config.CDN.PUBLIC}`
+          + ` ${config.URL.COMMUNITY_APP}`
+          + ' https://api.segment.io'
+          + ' https://cdn.segment.com'
+          + ' https://ekr.zdassets.com'
+          + ' https://fast.trychameleon.com'
+          + ' https://topcoder.zendesk.com'
+          + ' https://stats.g.doubleclick.net'
+          + ' https://www.google-analytics.com;'
+        + " font-src 'self'"
+          + ' data:'
+          + ` ${config.CDN.PUBLIC}`
+          + ' https://d1of0acg2orgco.cloudfront.net'
+          + ' https://d24oibycet9bsb.cloudfront.net'
+          + ' https://43d132d5dbff47c59d9d53ad448f93c2.js.ubembed.com;'
+        + " frame-src 'self'"
+          + ` ${config.URL.AUTH}`
+          + ' https://www.youtube.com;'
+        + " img-src 'self'"
+          + ` ${config.CDN.PUBLIC}`
+          + ' https://cdn.segment.com'
+          + ' https://d1of0acg2orgco.cloudfront.net'
+          + ' https://d24oibycet9bsb.cloudfront.net'
+          + ' https://d2nl5eqipnb33q.cloudfront.net'
+          + ' https://images.ctfassets.net'
+          + ' https://heapanalytics.com'
+          + ' https://q.quora.com'
+          + ' https://topcoder-prod-media.s3.amazonaws.com'
+          + ' https://www.facebook.com'
+          + ' https://www.google-analytics.com'
+          + ' https://www.google.com'
+          + ' https://www.googletagmanager.com'
+          + ' https://i.ytimg.com;'
+        + " manifest-src 'self';"
+        + " media-src 'self';"
+        + ' report-uri https://623d4c23f90d055298b24042.endpoint.csper.io/?v=0;'
+        + " worker-src 'self';",
+      );
+    }
+
+    next();
+  });
+
   /* Log Entries service proxy. */
   server.use('/community-app-assets/api/logger', checkAuthorizationHeader, (req, res) => {
     logger.log(`${req.clientIp} > `, ...req.body.data);
diff --git a/src/server/services/recruitCRM.js b/src/server/services/recruitCRM.js
@@ -209,6 +209,16 @@ export default class RecruitCRMService {
         return res.send(error);
       }
       const data = await response.json();
+
+      // If job or form not open return just job status
+      if ((data.job_status && data.job_status.id !== 1)
+        || data.enable_job_application_form !== 1) {
+        return res.send({
+          job_status: data.job_status,
+          enable_job_application_form: data.enable_job_application_form,
+        });
+      }
+
       return res.send(sanitizeJob(data));
     } catch (err) {
       return next(err);
@@ -261,10 +271,18 @@ export default class RecruitCRMService {
               const pageData = await pageDataRsp.json();
               data.data = _.flatten(data.data.concat(pageData.data));
             }
+
+            // Filter by Job Application active
+            data.data = _.filter(data.data, job => job.enable_job_application_form === 1);
+
             const toSend = _.map(data.data, j => sanitizeJob(j));
             return toSend;
           });
       }
+
+      // Filter by Job Application active
+      data.data = _.filter(data.data, job => job.enable_job_application_form === 1);
+
       const toSend = _.map(data.data, j => sanitizeJob(j));
       return toSend;
     } catch (err) {
@@ -322,6 +340,10 @@ export default class RecruitCRMService {
               const pageData = await pageDataRsp.json();
               data.data = _.flatten(data.data.concat(pageData.data));
             }
+
+            // Filter by Job Application active
+            data.data = _.filter(data.data, job => job.enable_job_application_form === 1);
+
             const toSend = _.map(data.data, j => sanitizeJob(j));
             gigsCache.set(CACHE_KEY, toSend);
             return res.send(toSend);
@@ -330,6 +352,10 @@ export default class RecruitCRMService {
             error: e,
           }));
       }
+
+      // Filter by Job Application active
+      data.data = _.filter(data.data, job => job.enable_job_application_form === 1);
+
       const toSend = _.map(data.data, j => sanitizeJob(j));
       gigsCache.set(CACHE_KEY, toSend);
       return res.send(toSend);
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 />;
     }
 
diff --git a/src/shared/containers/SubmissionManagement/index.jsx b/src/shared/containers/SubmissionManagement/index.jsx
@@ -15,13 +15,11 @@ import PT from 'prop-types';
 import { connect } from 'react-redux';
 import { Modal } from 'topcoder-react-ui-kit';
 import { config } from 'topcoder-react-utils';
-import { actions, services } from 'topcoder-react-lib';
+import { actions } from 'topcoder-react-lib';
 
 import './styles.scss';
 import smpActions from '../../actions/page/submission_management';
 
-const { getService } = services.submissions;
-
 // The container component
 class SubmissionManagementPageContainer extends React.Component {
   componentDidMount() {
@@ -70,17 +68,16 @@ class SubmissionManagementPageContainer extends React.Component {
       onShowDetails,
       onDelete: onSubmissionDelete,
       onDownload: (challengeType, submissionId) => {
-        const submissionsService = getService(authTokens.tokenV3);
-        submissionsService.downloadSubmission(submissionId)
-          .then((blob) => {
-            const url = window.URL.createObjectURL(new Blob([blob]));
-            const link = document.createElement('a');
-            link.href = url;
-            link.setAttribute('download', `submission-${challengeType}-${submissionId}.zip`);
-            document.body.appendChild(link);
-            link.click();
-            link.parentNode.removeChild(link);
-          });
+        // download large file using stream method
+        const downloadSubmissionURL = `${config.URL.SUBMISSION_REVIEW_API_URL}/challengeSubmissions/${submissionId}/download?token=${authTokens.tokenV3}`;
+
+        const link = document.createElement('a');
+        link.href = downloadSubmissionURL;
+        link.setAttribute('download', `submission-${challengeType}-${submissionId}.zip`);
+
+        document.body.appendChild(link);
+        link.click();
+        link.parentNode.removeChild(link);
       },
       onlineReviewUrl: `${config.URL.ONLINE_REVIEW}/review/actions/ViewProjectDetails?pid=${challengeId}`,
       challengeUrl: `${challengesUrl}/${challengeId}`,
diff --git a/src/shared/reducers/recruitCRM.js b/src/shared/reducers/recruitCRM.js
@@ -26,7 +26,7 @@ function onDone(state, { payload }) {
   return {
     ...state,
     loading: false,
-    jobs: _.filter(payload.data, job => job.enable_job_application_form === 1),
+    jobs: payload.data,
   };
 }
 

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ class ProfileContainer extends React.Component {`
`96`	`96`	`handleParam,`
`97`	`97`	`} = this.props;`
`98`	`98`
`99`		`- if (loadingError) {`
	`99`	`+ if (loadingError \|\| (info && info.status !== 'ACTIVE')) {`
`100`	`100`	`return <Error404 />;`
`101`	`101`	`}`
`102`	`102`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ function onDone(state, { payload }) {`
`26`	`26`	`return {`
`27`	`27`	`...state,`
`28`	`28`	`loading: false,`
`29`		`- jobs: _.filter(payload.data, job => job.enable_job_application_form === 1),`
	`29`	`+ jobs: payload.data,`
`30`	`30`	`};`
`31`	`31`	`}`
`32`	`32`