Release 2020/11/10

.circleci/config.yml

@@ -231,14 +231,13 @@ workflows:
             branches:
               only:
                 - develop
-                - auth0-hotfix-v3
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
           filters:
             branches:
               only:                
-                - apollo-site
+                - free
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global      

__tests__/shared/components/ChallengeTile/__snapshots__/index.jsx.snap

@@ -241,9 +241,6 @@ exports[`renders marathon 1`] = `
             </p>
           </div>
         </div>
-        <p
-          className="src-shared-components-ChallengeTile-___style__roles___1V-WA"
-        />
       </div>
     </div>
   </div>

__tests__/shared/components/GUIKit/TextInput/__snapshots__/index.jsx.snap

@@ -9,6 +9,7 @@ exports[`Default render 1`] = `
     defaultValue=""
     onBlur={[Function]}
     onChange={[Function]}
+    onKeyPress={[Function]}
     placeholder=""
     type="text"
   />

__tests__/shared/components/SubmissionManagement/Submission.jsx

@@ -4,6 +4,7 @@ import Submission from 'components/SubmissionManagement/Submission';
 import TU from 'react-dom/test-utils';
 
 const mockOnDelete = jest.fn();
+const mockOnDownload = jest.fn();
 const mockOnShowDetails = jest.fn();
 
 const rnd = new Rnd();
@@ -12,6 +13,7 @@ test('Snapshot match', () => {
   rnd.render((
     <Submission
       onDelete={mockOnDelete}
+      onDownload={mockOnDownload}
       onShowDetails={mockOnShowDetails}
       showScreeningDetails
       type="develop"
@@ -21,6 +23,7 @@ test('Snapshot match', () => {
   rnd.render((
     <Submission
       onDelete={mockOnDelete}
+      onDownload={mockOnDownload}
       onShowDetails={mockOnShowDetails}
       submissionObject={{
         id: '12345',
@@ -49,6 +52,7 @@ class Wrapper extends React.Component {
 const page = TU.renderIntoDocument((
   <Wrapper
     onDelete={mockOnDelete}
+    onDownload={mockOnDownload}
     onShowDetails={mockOnShowDetails}
     submissionObject={{
       id: '12345',

__tests__/shared/components/SubmissionManagement/__snapshots__/Submission.jsx.snap

@@ -21,14 +21,17 @@ exports[`Snapshot match 1`] = `
     className="src-shared-components-SubmissionManagement-Submission-___styles__action-col___2M1RY"
   >
     <div>
-      <a>
+      <button
+        onClick={[Function]}
+        type="button"
+      >
         <DownloadIcon
           height="16"
           viewBox="0 0 16 16"
           width="16"
           xmlns="http://www.w3.org/2000/svg"
         />
-      </a>
+      </button>
       <button
         className="src-shared-components-SubmissionManagement-Submission-___styles__delete-icon___2M67z"
         disabled={true}
@@ -81,14 +84,17 @@ exports[`Snapshot match 2`] = `
     className="src-shared-components-SubmissionManagement-Submission-___styles__action-col___2M1RY"
   >
     <div>
-      <a>
+      <button
+        onClick={[Function]}
+        type="button"
+      >
         <DownloadIcon
           height="16"
           viewBox="0 0 16 16"
           width="16"
           xmlns="http://www.w3.org/2000/svg"
         />
-      </a>
+      </button>
       <button
         className="src-shared-components-SubmissionManagement-Submission-___styles__delete-icon___2M67z"
         disabled={true}

package.json

@@ -140,7 +140,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.1.1",
+    "topcoder-react-lib": "1.1.2",
     "topcoder-react-ui-kit": "2.0.1",
     "topcoder-react-utils": "0.7.8",
     "turndown": "^4.0.2",

src/shared/actions/page/challenge-details.js

@@ -59,7 +59,7 @@ function setSpecsTabState(state) {
  * @param {Boolean} open
  * @return {Object}
  */
-function toggleCheckpointFeedback(id, open) {
+function toggleCheckpointFeedback(id, open = false) {
   return { id, open };
 }
 

src/shared/components/ChallengeTile/index.jsx

@@ -2,6 +2,7 @@
  * Challenge tile.
  */
 /* eslint-env browser */
+import _ from 'lodash';
 import React from 'react';
 import PT from 'prop-types';
 import { Link } from 'react-router-dom';
@@ -74,6 +75,7 @@ class ChallengeTile extends React.Component {
     } = this.props;
 
     const { track, type } = challenge;
+    const roles = _.get(challenge, 'userDetails.roles');
 
     const outStyleName = `challenge tile-view ${track.replace(' ', '-').toLowerCase()}`;
     const extraStyle = {
@@ -307,19 +309,22 @@ class ChallengeTile extends React.Component {
                 ) }
               </div>
 
-              <p styleName="roles">
-                { track !== COMPETITION_TRACKS.DS
+              { !_.isEmpty(roles)
+                && (
+                <p styleName="roles">
+                  { track !== COMPETITION_TRACKS.DS
                   && (
                   <span>
                     <span>
                       Role: &nbsp;
                     </span>
                     <span>
-                      { listRoles(challenge.userDetails.roles) }
+                      { listRoles(roles) }
                     </span>
                   </span>
                   ) }
-              </p>
+                </p>
+                ) }
             </div>
           </div>
         </div>

src/shared/components/Contentful/PasswordScreen/index.jsx

@@ -21,10 +21,12 @@ export default class PasswordScreen extends React.Component {
 
   onSubmit() {
     const { password } = this.props;
-    const { inputVal } = this.state;
-    this.setState({
-      authorized: password === inputVal,
-      errorMsg: password === inputVal ? '' : 'Password incorrect',
+    this.setState((state) => {
+      const { inputVal } = state;
+      return {
+        authorized: password === inputVal,
+        errorMsg: password === inputVal ? '' : 'Password incorrect',
+      };
     });
   }
 
@@ -41,7 +43,7 @@ export default class PasswordScreen extends React.Component {
       authorized, errorMsg, inputVal,
     } = this.state;
     const {
-      viewPortId, preview, spaceName, environment, baseUrl, title,
+      viewPortId, preview, spaceName, environment, baseUrl, title, btnText, content,
     } = this.props;
     return authorized ? (
       <Viewport
@@ -62,11 +64,24 @@ export default class PasswordScreen extends React.Component {
             onChange={val => this.onPasswordInput(val)}
             errorMsg={errorMsg}
             required
+            type="password"
+            onEnterKey={this.onSubmit}
           />
           <div styleName="cta">
-            <button type="button" styleName="submit" onClick={this.onSubmit} disabled={!inputVal}>SUBMIT</button>
+            <button type="button" styleName="submit" onClick={this.onSubmit} disabled={!inputVal}>{btnText}</button>
           </div>
         </div>
+        {
+          content ? (
+            <Viewport
+              id={content.sys.id}
+              preview={preview}
+              spaceName={spaceName}
+              environment={environment}
+              baseUrl={baseUrl}
+            />
+          ) : null
+        }
       </div>
     );
   }
@@ -78,6 +93,8 @@ PasswordScreen.defaultProps = {
   environment: null,
   baseUrl: '',
   title: 'GET ACCESS WITH PASSWORD',
+  btnText: 'SUBMIT',
+  content: null,
 };
 
 PasswordScreen.propTypes = {
@@ -88,4 +105,6 @@ PasswordScreen.propTypes = {
   environment: PT.string,
   baseUrl: PT.string,
   title: PT.string,
+  btnText: PT.string,
+  content: PT.shape(),
 };

src/shared/components/Contentful/Route.jsx

@@ -71,6 +71,8 @@ function ChildRoutesLoader(props) {
                         environment={environment}
                         baseUrl={url}
                         title={fields.passwordScreenTitle}
+                        btnText={fields.passwordScreenButtonText}
+                        content={fields.passwordScreenContent}
                       />
                     )
                     ) : <Error404 />

src/shared/components/GUIKit/TextInput/index.jsx

@@ -17,6 +17,8 @@ function TextInput({
   onChange,
   required,
   size,
+  type,
+  onEnterKey,
 }) {
   const [val, setVal] = useState(value);
   const delayedOnChange = useRef(
@@ -28,7 +30,7 @@ function TextInput({
     <div className="textInputContainer" styleName={`container ${sizeStyle}`}>
       <input
         defaultValue={value}
-        type="text"
+        type={type}
         placeholder={`${placeholder}${placeholder && required ? ' *' : ''}`}
         styleName={`${value || val ? 'haveValue' : ''} ${errorMsg ? 'haveError' : ''}`}
         onChange={(e) => {
@@ -39,6 +41,11 @@ function TextInput({
           delayedOnChange(e.target.value, onChange);
           setVal(e.target.value);
         }}
+        onKeyPress={(e) => {
+          if (e.key === 'Enter') {
+            onEnterKey();
+          }
+        }}
       />
       {label ? (
         <label htmlFor="textBoxInput">
@@ -58,6 +65,8 @@ TextInput.defaultProps = {
   onChange: () => {},
   required: false,
   size: 'lg',
+  type: 'text',
+  onEnterKey: () => {},
 };
 
 TextInput.propTypes = {
@@ -68,6 +77,8 @@ TextInput.propTypes = {
   onChange: PT.func,
   required: PT.bool,
   size: PT.oneOf(['xs', 'lg']),
+  type: PT.string,
+  onEnterKey: PT.func,
 };
 
 export default TextInput;

src/shared/components/Leaderboard/ChallengeHistoryModal/index.jsx

@@ -116,7 +116,7 @@ class ChallengeHistoryModal extends Component {
               challengesOrdered.map(challenge => (
                 <tr styleName="row" key={`${challenge['tco_leaderboard.challenge_id'] || challenge.challenge_id}`}>
                   <td styleName="name">
-                    <a href={`${config.URL.BASE}/challenges/${challenge['tco_leaderboard.challenge_id'] || challenge.challenge_id}/`} styleName="link" target="_blank" rel="noopener noreferrer">
+                    <a href={`${config.URL.BASE}/challenges/${challenge['tco_leaderboard.challenge_id'] || challenge['challenge.challenge_id'] || challenge.challenge_id}/`} styleName="link" target="_blank" rel="noopener noreferrer">
                       {challenge.challenge_name || challenge['challenge.challenge_name'] || challenge['tco_leaderboard.challenge_id'] || challenge.challenge_id}
                     </a>
                   </td>

src/shared/components/Leaderboard/LeaderboardTable/index.jsx

@@ -65,6 +65,9 @@ export default function LeaderboardTable(props) {
         photoUrl = `${config.CDN.PUBLIC}/avatar/${
           encodeURIComponent(photoUrl)}?size=40`;
       }
+      const fulfillment = competitor['tco_leaderboard.fulfillment']
+        ? (parseFloat(competitor['tco_leaderboard.fulfillment']) * 100).toFixed(2).replace(/[.,]00$/, '')
+        : competitor.fulfillment;
       return (
         <tr key={competitor.rank}>
           <td styleName={`${stylesName}.col-rank`}>{competitor.rank}</td>
@@ -105,7 +108,7 @@ export default function LeaderboardTable(props) {
           </td>
           {
             isCopilot ? (
-              <td styleName={`${stylesName}.col-fulfillment`}>{competitor.fulfillment}</td>
+              <td styleName={`${stylesName}.col-fulfillment`}>{fulfillment}</td>
             ) : null
           }
           <td styleName={`${stylesName}.col-challenges`}>{competitor['tco_leaderboard.challenge_count'] || competitor.challengecount}</td>
@@ -122,7 +125,7 @@ export default function LeaderboardTable(props) {
           }
           {
             isAlgo ? (
-              <td styleName={`${stylesName}.col-points`}>{competitor['srm_tco19.score']}</td>
+              <td styleName={`${stylesName}.col-points`}>{competitor['tco_leaderboard.total_score'] || competitor['srm_tco19.score']}</td>
             ) : null
           }
         </tr>
@@ -141,7 +144,13 @@ export default function LeaderboardTable(props) {
               <th styleName={`${stylesName}.col-fulfillment`}>Fulfillment</th>
             ) : null
           }
-          <th styleName={`${stylesName}.col-challenges`}># of Challenges</th>
+          {
+            isAlgo ? (
+              <th styleName={`${stylesName}.col-challenges`}># of Matches</th>
+            ) : (
+              <th styleName={`${stylesName}.col-challenges`}># of Challenges</th>
+            )
+          }
           <th styleName={`${stylesName}.col-points`}>Points</th>
           {
             isTopGear ? (

src/shared/components/Leaderboard/PodiumSpot/index.jsx

@@ -107,6 +107,9 @@ export default function PodiumSpot(props) {
   }
   let rootStyle = `${stylesName}.PodiumSpot`;
   if (PODIUM_ITEM_MODIFIER[competitor.rank]) rootStyle += ` ${stylesName}.PodiumSpot--${PODIUM_ITEM_MODIFIER[competitor.rank]}`;
+  const fulfillment = competitor['tco_leaderboard.fulfillment']
+    ? (parseFloat(competitor['tco_leaderboard.fulfillment']) * 100).toFixed(2).replace(/[.,]00$/, '')
+    : competitor.fulfillment;
 
   return (
     <div styleName={rootStyle}>
@@ -175,14 +178,20 @@ export default function PodiumSpot(props) {
         {
           isCopilot ? (
             <div styleName={`${stylesName}.stats`}>
-              <span styleName={`${stylesName}.value`}>{competitor.fulfillment}</span>
+              <span styleName={`${stylesName}.value`}>{fulfillment}</span>
               <span styleName={`${stylesName}.value-title`}>fulfillment</span>
             </div>
           ) : null
         }
         <div styleName={`${stylesName}.stats`}>
           <span styleName={`${stylesName}.value`}>{competitor['tco_leaderboard.challenge_count'] || competitor.challengecount}</span>
-          <span styleName={`${stylesName}.value-title`}>challenges</span>
+          {
+            isAlgo ? (
+              <span styleName={`${stylesName}.value-title`}># of matches</span>
+            ) : (
+              <span styleName={`${stylesName}.value-title`}>challenges</span>
+            )
+          }
         </div>
         <div styleName={`${stylesName}.stats`}>
           <span styleName={`${stylesName}.value`}>{formatPoints(competitor['tco_leaderboard.tco_points'] || competitor.points)}</span>
@@ -207,7 +216,7 @@ export default function PodiumSpot(props) {
         {
           isAlgo ? (
             <div styleName={`${stylesName}.stats`}>
-              <span styleName={`${stylesName}.value`}>{competitor['srm_tco19.score']}</span>
+              <span styleName={`${stylesName}.value`}>{competitor['tco_leaderboard.total_score'] || competitor['srm_tco19.score']}</span>
               <span styleName={`${stylesName}.value-title`}>total score</span>
             </div>
           ) : null