Merge pull request #5428 from topcoder-platform/develop

Release 2021/03/11 (v1.8.2)

Author: luizrrodrigues

.circleci/config.yml

@@ -283,14 +283,14 @@ workflows:
           filters:
             branches:
               only:                
-                - gigwork-updates
+                - route-redirects
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global      
           filters:
             branches:
               only:
-                - free
+                - tco-leaderboard-fix
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global

src/shared/actions/recruitCRM.js

@@ -1,6 +1,7 @@
 import { redux } from 'topcoder-react-utils';
 import Service from 'services/recruitCRM';
 import _ from 'lodash';
+import { getCustomField } from 'utils/gigs';
 
 /**
  * Jobs page fetch init
@@ -60,7 +61,7 @@ function normalizeRecruitPayload(job, payload) {
     `Date Available: ${new Date(payload.availFrom).toDateString()}`,
     `Heard About Gig: ${payload.reffereal}`,
     `Why fit: ${payload.whyFit}`,
-    `Able to work during timezone? ${payload.timezoneConfirm.filter(s => s.value).map(s => s.label).join(',')}`,
+    `Able to work during timezone? ${payload.timezoneConfirm.filter(s => s.value).map(() => getCustomField(job.custom_fields, 'Timezone')).join(',')}`,
     `Am I ok to work the duration? ${payload.durationConfirm.filter(s => s.value).map(s => s.label).join(',')}`,
     `Notes: ${payload.notes}`,
   ];

src/shared/components/Contentful/Route.jsx

@@ -10,9 +10,10 @@ import LoadingIndicator from 'components/LoadingIndicator';
 import MetaTags from 'components/MetaTags';
 import PT from 'prop-types';
 import React from 'react';
-import { Route, Switch } from 'react-router-dom';
+import { Route, Switch, Redirect } from 'react-router-dom';
 import Viewport from 'components/Contentful/Viewport';
 import PasswordScreen from 'components/Contentful/PasswordScreen';
+import { isomorphy } from 'topcoder-react-utils';
 
 // Concatenates a base and segment and handles optional trailing slashes
 const buildUrl = (base, segment) => `${_.trimEnd(base, '/')}/${_.trim(segment, '/')}`;
@@ -117,6 +118,29 @@ ChildRoutesLoader.propTypes = {
   url: PT.string.isRequired,
 };
 
+function RedirectWithStatus({ from, to, status }) {
+  return (
+    <Route
+      render={({ staticContext }) => {
+        if (to[0] !== '/' && isomorphy.isClientSide()) {
+          window.location.href = to;
+          return null;
+        }
+        // there is no `staticContext` on the client, so
+        // we need to guard against that here
+        if (staticContext) staticContext.status = status;
+        return <Redirect from={from} to={to} />;
+      }}
+    />
+  );
+}
+
+RedirectWithStatus.propTypes = {
+  from: PT.string.isRequired,
+  to: PT.string.isRequired,
+  status: PT.number.isRequired,
+};
+
 export default function ContentfulRoute(props) {
   const {
     baseUrl,
@@ -145,7 +169,10 @@ export default function ContentfulRoute(props) {
       render={(data) => {
         const { fields } = Object.values(data.entries.items)[0];
         const url = path || buildUrl(baseUrl, fields.url);
-        return (
+        const redirectToUrl = _.trim(fields.redirectToUrl);
+        return redirectToUrl ? (
+          <RedirectWithStatus status={301} from={url} to={redirectToUrl} />
+        ) : (
           <Route
             /* This route prevents fetching data about child routes and their
              * rendering, if they already known to not match. */

src/shared/components/Gigs/GigApply/index.jsx

@@ -121,6 +121,7 @@ export default function GigApply(props) {
                         errorMsg={formErrors.email}
                         value={formData.email}
                         required
+                        readonly
                       />
                       <TextInput
                         placeholder="Phone Including Country Code"
@@ -289,7 +290,7 @@ export default function GigApply(props) {
           <div styleName="cta-buttons">
             <Link to={`${config.URL.AUTH}/member?retUrl=${encodeURIComponent(retUrl)}`} styleName="primaryBtn">Login</Link>
           </div>
-          <p styleName="regTxt">Not a member? Register <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}`}>here</a>.</p>
+          <p styleName="regTxt">Not a member? Register <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp&utm_source=gig_listing`}>here</a>.</p>
         </div>
       </div>
     </div>

src/shared/components/Gigs/GigDetails/index.jsx

@@ -108,7 +108,7 @@ export default function GigDetails(props) {
               <div styleName="infos-item">
                 <IconTimezone />
                 <div styleName="infos-data">
-                  Timezone
+                  Working Hours
                   <strong>{getCustomField(job.custom_fields, 'Timezone')}</strong>
                 </div>
               </div>

src/shared/components/Gigs/LoginModal/index.jsx

@@ -40,7 +40,7 @@ function LoginModal({ retUrl, onCancel }) {
             LOGIN
           </PrimaryButton>
         </div>
-        <p className={modalStyle.regTxt}>Not a member? Register <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}`}>here</a>.</p>
+        <p className={modalStyle.regTxt}>Not a member? It is free to <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp&utm_source=gig_listing`}>register</a>!</p>
       </div>
     </Modal>
   );

src/shared/components/Gigs/ReferralModal/index.jsx

@@ -105,7 +105,7 @@ function ReferralModal({
               LOGIN
             </PrimaryButton>
           </div>
-          <p className={modalStyle.regTxt}>Not a member? Register <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}`}>here</a>.</p>
+          <p className={modalStyle.regTxt}>Not a member? It is free to <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp&utm_source=gig_listing`}>register</a>!</p>
         </div>
       )}
     </Modal>

src/shared/containers/tco/Leaderboard/ChallengeHistoryModal/index.jsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import ChallengeHistoryModal from 'components/Leaderboard/ChallengeHistoryModal';
 import PT from 'prop-types';
 import actions from 'actions/leaderboard';
@@ -14,9 +14,9 @@ function ChallengeHistoryModalContainer({
   isCopilot,
   isAlgo,
 }) {
-  if (!challenges && !loading) {
+  useEffect(() => {
     getChallengesHistory(dataUrl, competitor);
-  }
+  }, [competitor]);
 
   return (
     <ChallengeHistoryModal

src/shared/routes/index.jsx

@@ -97,6 +97,7 @@ function Routes({ communityId }) {
           path="/community/(competitive-programming|data-science|design|development|qa)/how-to-compete"
         />
         <Redirect
+          exact
           from="/community/gigs"
           to="/gigs"
         />

src/shared/utils/gigs.js

@@ -10,8 +10,10 @@ import _ from 'lodash';
  */
 export function getSalaryType(data) {
   switch (data.id) {
+    case 1: return 'monthly';
     case 2: return 'annual';
     case 3: return 'week';
+    case 4: return 'daily';
     case 5: return 'hourly';
     default: return 'n/a';
   }