Merge branch 'develop'

birdofpreyru · birdofpreyru · commit da9a6246ed30 · 2017-08-28T12:42:14.000+02:00
diff --git a/__tests__/shared/components/SubmissionManagement/__snapshots__/SubmissionManagement.jsx.snap b/__tests__/shared/components/SubmissionManagement/__snapshots__/SubmissionManagement.jsx.snap
@@ -61,6 +61,7 @@ exports[`Matches shallow shapshot 1`] = `
       onShowDetails={[Function]}
       onlineReviewUrl=""
       showDetails={Set {}}
+      status={undefined}
       submissionObjects={Array []}
       type="Challenge Track"
     />
diff --git a/__tests__/shared/components/SubmissionManagement/__snapshots__/SubmissionsTable.jsx.snap b/__tests__/shared/components/SubmissionManagement/__snapshots__/SubmissionsTable.jsx.snap
@@ -37,6 +37,7 @@ exports[`Matches shallow shapshot 1`] = `
         onDownload={[Function]}
         onShowDetails={[Function]}
         showScreeningDetails={true}
+        status={undefined}
         submissionObject={
           Object {
             "submissionId": 12345,
diff --git a/__tests__/shared/components/TopcoderHeader/__snapshots__/Auth.jsx.snap b/__tests__/shared/components/TopcoderHeader/__snapshots__/Auth.jsx.snap
@@ -6,13 +6,13 @@ exports[`Snapshot match 1`] = `
 >
   <a
     className="tc-btn-sm tc-btn-primary"
-    href="http://accounts-test.topcoder-dev.com/member/registration"
+    href="http://accounts.topcoder-dev.com/member/registration"
   >
     Join
   </a>
   <a
     className="tc-btn-sm tc-btn-default"
-    href="http://accounts-test.topcoder-dev.com/member"
+    href="http://accounts.topcoder-dev.com/member"
   >
     Log In
   </a>
@@ -25,13 +25,13 @@ exports[`Snapshot match 2`] = `
 >
   <a
     className="tc-btn-sm tc-btn-primary"
-    href="http://accounts-test.topcoder-dev.com/member/registration"
+    href="http://accounts.topcoder-dev.com/member/registration"
   >
     Join
   </a>
   <a
     className="tc-btn-sm tc-btn-default"
-    href="http://accounts-test.topcoder-dev.com/member"
+    href="http://accounts.topcoder-dev.com/member"
   >
     Log In
   </a>
diff --git a/__tests__/shared/components/TopcoderHeader/__snapshots__/index.jsx.snap b/__tests__/shared/components/TopcoderHeader/__snapshots__/index.jsx.snap
@@ -49,13 +49,13 @@ exports[`Default render 1`] = `
       >
         <a
           className="tc-btn-sm tc-btn-primary"
-          href="http://accounts-test.topcoder-dev.com/member/registration"
+          href="http://accounts.topcoder-dev.com/member/registration"
         >
           Join
         </a>
         <a
           className="tc-btn-sm tc-btn-default"
-          href="http://accounts-test.topcoder-dev.com/member"
+          href="http://accounts.topcoder-dev.com/member"
         >
           Log In
         </a>
@@ -232,13 +232,13 @@ exports[`Render with open menu 1`] = `
       >
         <a
           className="tc-btn-sm tc-btn-primary"
-          href="http://accounts-test.topcoder-dev.com/member/registration"
+          href="http://accounts.topcoder-dev.com/member/registration"
         >
           Join
         </a>
         <a
           className="tc-btn-sm tc-btn-default"
-          href="http://accounts-test.topcoder-dev.com/member"
+          href="http://accounts.topcoder-dev.com/member"
         >
           Log In
         </a>
diff --git a/__tests__/shared/components/challenge-listing/ChallengeCard/__snapshots__/index.jsx.snap b/__tests__/shared/components/challenge-listing/ChallengeCard/__snapshots__/index.jsx.snap
@@ -44,6 +44,7 @@ exports[`Matches shallow shapshot shapshot 1 1`] = `
         </span>
         <Tags
           onTechTagClicked={[Function]}
+          platforms=""
           technologies="Data Science"
         />
       </div>
@@ -155,6 +156,7 @@ exports[`Matches shallow shapshot shapshot 2 1`] = `
         </span>
         <Tags
           onTechTagClicked={[Function]}
+          platforms=""
           technologies="Go"
         />
       </div>
@@ -261,6 +263,7 @@ exports[`Matches shallow shapshot shapshot 3 1`] = `
         </span>
         <Tags
           onTechTagClicked={[Function]}
+          platforms=""
           technologies=""
         />
       </div>
diff --git a/__tests__/shared/components/tc-communities/__snapshots__/AccessDenied.jsx.snap b/__tests__/shared/components/tc-communities/__snapshots__/AccessDenied.jsx.snap
@@ -15,7 +15,7 @@ exports[`Matches shallow shapshot 1`] = `
   >
     <a
       className="tc-btn-md tc-btn-primary"
-      href="http://accounts-test.topcoder-dev.com/member?retUrl=null%2F"
+      href="http://accounts.topcoder-dev.com/member?retUrl=null%2F"
     >
       Log In Here
     </a>
diff --git a/config/default.json b/config/default.json
@@ -57,7 +57,7 @@
     "ACCOUNTS_APP_CONNECTOR": "https://accounts.topcoder-dev.com/connector.html",
 
     "ARENA": "https://arena.topcoder-dev.com",
-    "AUTH": "http://accounts-test.topcoder-dev.com",
+    "AUTH": "http://accounts.topcoder-dev.com",
     "BASE": "https://www.topcoder-dev.com",
     "BLOG": "https://www.topcoder-dev.com/feed",
     "COGNITIVE": "https://cognitive.topcoder.com",
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -78,6 +78,7 @@
     "react-dom": "^15.6.1",
     "react-dropdown": "^1.2.1",
     "react-hot-loader": "^3.0.0-beta.6",
+    "react-player": "^0.20.0",
     "react-redux": "^5.0.3",
     "react-router-dom": "^4.0.0",
     "react-select": "^1.0.0-rc.3",
diff --git a/src/shared/components/SubmissionManagement/Submission/index.jsx b/src/shared/components/SubmissionManagement/Submission/index.jsx
@@ -31,6 +31,7 @@ export default function Submission(props) {
     type,
     onDelete,
     onShowDetails,
+    status,
   } = props;
   const formatDate = date => moment(+new Date(date)).format('MMM DD, YYYY hh:mm A');
 
@@ -72,10 +73,12 @@ export default function Submission(props) {
             onClick={() => onDownload(submissionObject.submissionId)}
           ><DownloadIcon /></button>
           */ }
-          <button
-            styleName="delete-icon"
-            onClick={() => onDelete(submissionObject.submissionId)}
-          ><DeleteIcon /></button>
+          {status !== 'COMPLETED' &&
+            <button
+              styleName="delete-icon"
+              onClick={() => onDelete(submissionObject.submissionId)}
+            ><DeleteIcon /></button>
+          }
           <button
             styleName={`expand-icon ${(showScreeningDetails ? 'expanded' : '')}`}
             onClick={() => onShowDetails(submissionObject.submissionId)}
@@ -108,4 +111,5 @@ Submission.propTypes = {
   type: PT.string.isRequired,
   onDelete: PT.func.isRequired,
   onShowDetails: PT.func,
+  status: PT.string.isRequired,
 };
diff --git a/src/shared/components/SubmissionManagement/SubmissionManagement/index.jsx b/src/shared/components/SubmissionManagement/SubmissionManagement/index.jsx
@@ -101,6 +101,7 @@ export default function SubmissionManagement(props) {
             submissionObjects={submissions}
             showDetails={showDetails}
             type={challenge.track}
+            status={challenge.status}
             {...componentConfig}
           />
         }
diff --git a/src/shared/components/SubmissionManagement/SubmissionsTable/index.jsx b/src/shared/components/SubmissionManagement/SubmissionsTable/index.jsx
@@ -32,6 +32,7 @@ export default function SubmissionsTable(props) {
     helpPageUrl,
     onDownload,
     onShowDetails,
+    status,
   } = props;
 
   const submissionsWithDetails = [];
@@ -53,6 +54,7 @@ export default function SubmissionsTable(props) {
           onShowDetails={onShowDetails}
           onDelete={onDelete}
           onDownload={onDownload}
+          status={status}
           key={shortid.generate()}
         />
       );
@@ -125,4 +127,5 @@ SubmissionsTable.propTypes = {
   helpPageUrl: PT.string,
   onDownload: PT.func,
   onShowDetails: PT.func,
+  status: PT.string.isRequired,
 };
diff --git a/src/shared/components/TopcoderHeader/mobile/Search/style.scss b/src/shared/components/TopcoderHeader/mobile/Search/style.scss
@@ -3,7 +3,7 @@
 .icon {
   left: 18px;
   position: absolute;
-  top: 14px;
+  top: 18px;
 }
 
 .search {
@@ -26,7 +26,7 @@
     font: 16px "Sofia Pro", sans-serif;
     height: 32px;
     outline: none;
-    padding-left: 28px;
+    padding-left: 30px !important;
 
     &::placeholder {
       color: $tc-gray-60;
diff --git a/src/shared/components/challenge-detail/Header/index.jsx b/src/shared/components/challenge-detail/Header/index.jsx
@@ -161,7 +161,7 @@ export default function ChallengeHeader(props) {
                       </p> :
                       <p styleName="bonus-text">
                         <span styleName={`bonus-highlight ${trackLower}-accent-color`}>
-                          RELIABILITY BONUS: {reliabilityBonus}
+                          RELIABILITY BONUS: $ {reliabilityBonus}
                         </span>
                       </p>
                   }
diff --git a/src/shared/components/challenge-detail/Header/style.scss b/src/shared/components/challenge-detail/Header/style.scss
@@ -344,6 +344,10 @@
           font-family: roboto;
           font-weight: 400;
 
+          &:last-child {
+            border-right: none;
+          }
+
           .deadline-info {
             font-size: 13px;
             color: $tc-gray-40;
diff --git a/src/shared/components/challenge-detail/Submissions/index.jsx b/src/shared/components/challenge-detail/Submissions/index.jsx
@@ -84,7 +84,7 @@ export default function Submissions(props) {
             </div>
             <div styleName="col-2">{moment(s.submissionDate).format('MMM DD, YYYY HH:mm')} EDT</div>
             <div styleName="col-3">
-              {s.initialScore.toFixed(2)} / {s.finalScore.toFixed(2)}
+              {(s.initialScore || 0).toFixed(2)} / {(s.finalScore || 0).toFixed(2)}
             </div>
           </div>
         ))
diff --git a/src/shared/components/challenge-detail/Winners/index.jsx b/src/shared/components/challenge-detail/Winners/index.jsx
@@ -27,7 +27,9 @@ export default function Winners(props) {
     isDesign,
   } = props;
 
-  results.sort((a, b) => a.placement - b.placement);
+  const maxPlace = Number.MAX_SAFE_INTEGER;
+  results.sort((a, b) => (_.isNumber(a.placement) ? a.placement : maxPlace) -
+      (_.isNumber(b.placement) ? b.placement : maxPlace));
   const winners = results.slice(0, prizes.length);
 
   return (
diff --git a/src/shared/components/challenge-listing/ChallengeCard/index.jsx b/src/shared/components/challenge-listing/ChallengeCard/index.jsx
@@ -134,7 +134,11 @@ function ChallengeCard({
               {challenge.status === 'ACTIVE' ? 'Ends ' : 'Ended '}
               {getEndDate(challenge.submissionEndDate)}
             </span>
-            <Tags technologies={challenge.technologies} onTechTagClicked={onTechTagClicked} />
+            <Tags
+              technologies={challenge.technologies}
+              platforms={challenge.platforms}
+              onTechTagClicked={onTechTagClicked}
+            />
           </div>
         </div>
       </div>
@@ -205,7 +209,9 @@ class Tags extends React.Component {
   }
 
   renderTechnologies() {
-    const technologies = this.props.technologies ? this.props.technologies.split(',') : [];
+    let technologies = this.props.technologies ? this.props.technologies.split(',').map(item => item.trim()) : [];
+    const platforms = this.props.platforms ? this.props.platforms.split(',').map(item => item.trim()) : [];
+    technologies = _.union(technologies, platforms);
     if (technologies.length) {
       let technologyList = technologies;
       if (technologies.length > VISIBLE_TECHNOLOGIES && !this.state.expanded) {
@@ -241,11 +247,13 @@ class Tags extends React.Component {
 Tags.defaultProps = {
   onTechTagClicked: _.noop,
   technologies: '',
+  platforms: '',
 };
 
 Tags.propTypes = {
   onTechTagClicked: PT.func,
   technologies: PT.string,
+  platforms: PT.string,
 };
 
 export default ChallengeCard;
diff --git a/src/shared/components/challenge-listing/Filters/ChallengeSearchBar/index.jsx b/src/shared/components/challenge-listing/Filters/ChallengeSearchBar/index.jsx
@@ -27,14 +27,14 @@ export default function ChallengeSearchBar({
     <div styleName="ChallengeSearchBar">
       <input
         onChange={event => setQuery(event.target.value)}
-        onKeyPress={event => (event.key === 'Enter' ? onSearch(query) : null)}
+        onKeyPress={event => (event.key === 'Enter' ? onSearch(query.trim()) : null)}
         placeholder={placeholder}
         type="text"
         value={query}
       />
       <span
         styleName={`SearchButton ${query ? 'active' : ''}`}
-        onClick={() => onSearch(query)}
+        onClick={() => onSearch(query.trim())}
       >
         <ZoomIcon styleName="zoomIcon" />
       </span>
diff --git a/src/shared/components/challenge-listing/Tooltips/TrackAbbreviationTooltip/index.jsx b/src/shared/components/challenge-listing/Tooltips/TrackAbbreviationTooltip/index.jsx
@@ -27,13 +27,15 @@ const DESCRIPTION = {
   WEB_DESIGNS: 'Design UI and front end experiences for web experiences',
   WIDGET_OR_MOBILE_SCREEN_DESIGN: 'Design UI and front end experiences for mobile',
   WIREFRAMES: 'Produce the information architecture for user experiences',
+  BUG_HUNT: 'Quickly find Bugs in apps, websites',
 };
 
 const HEADER = {
   APPLICATION_FRONT_END_DESIGN: 'Application Front-End Design (AFED)',
   ARCHITECTURE: 'Architecture (Ar)',
   ASSEMBLY_COMPETITION: 'Assembly (As)',
   BANNERS_OR_ICONS: 'Banners/Icons (BI)',
+  BUG_HUNT: 'Bug Hunt (BH)',
   CODE: 'Code (Cd)',
   CONCEPTUALIZATION: 'Conceptualization (Cn)',
   DESIGN_FIRST_2_FINISH: 'Design First2Finish(DF2F)',
@@ -44,6 +46,7 @@ const HEADER = {
   UI_PROTOTYPE_COMPETITION: 'UI Prototype (Pr)',
   WEB_DESIGNS: 'Web Design (Wd)',
   WIDGET_OR_MOBILE_SCREEN_DESIGN: 'Widget or Mobile Screen Design (Wg)',
+  WIREFRAMES: 'Wireframe (Wf)',
 };
 
 const TRACK_COLOR_CLASS = {
diff --git a/src/shared/components/tc-communities/VideoCard/index.jsx b/src/shared/components/tc-communities/VideoCard/index.jsx
diff --git a/src/shared/components/tc-communities/VideoCard/style.scss b/src/shared/components/tc-communities/VideoCard/style.scss
diff --git a/src/shared/components/tc-communities/communities/wipro/FAQ/index.jsx b/src/shared/components/tc-communities/communities/wipro/FAQ/index.jsx
diff --git a/src/shared/components/tc-communities/communities/wipro/FAQ/style.scss b/src/shared/components/tc-communities/communities/wipro/FAQ/style.scss
diff --git a/src/shared/containers/challenge-detail/index.jsx b/src/shared/containers/challenge-detail/index.jsx
diff --git a/src/shared/services/.exchange-rates.cache b/src/shared/services/.exchange-rates.cache

Original file line number	Diff line number	Diff line change
@@ -6,13 +6,13 @@ exports[`Snapshot match 1`] = `
`6`	`6`	`>`
`7`	`7`	`<a`
`8`	`8`	`className="tc-btn-sm tc-btn-primary"`
`9`		`- href="http://accounts-test.topcoder-dev.com/member/registration"`
	`9`	`+ href="http://accounts.topcoder-dev.com/member/registration"`
`10`	`10`	`>`
`11`	`11`	`Join`
`12`	`12`	`</a>`
`13`	`13`	`<a`
`14`	`14`	`className="tc-btn-sm tc-btn-default"`
`15`		`- href="http://accounts-test.topcoder-dev.com/member"`
	`15`	`+ href="http://accounts.topcoder-dev.com/member"`
`16`	`16`	`>`
`17`	`17`	`Log In`
`18`	`18`	`</a>`
@@ -25,13 +25,13 @@ exports[`Snapshot match 2`] = `
`25`	`25`	`>`
`26`	`26`	`<a`
`27`	`27`	`className="tc-btn-sm tc-btn-primary"`
`28`		`- href="http://accounts-test.topcoder-dev.com/member/registration"`
	`28`	`+ href="http://accounts.topcoder-dev.com/member/registration"`
`29`	`29`	`>`
`30`	`30`	`Join`
`31`	`31`	`</a>`
`32`	`32`	`<a`
`33`	`33`	`className="tc-btn-sm tc-btn-default"`
`34`		`- href="http://accounts-test.topcoder-dev.com/member"`
	`34`	`+ href="http://accounts.topcoder-dev.com/member"`
`35`	`35`	`>`
`36`	`36`	`Log In`
`37`	`37`	`</a>`
Original file line number	Diff line number	Diff line change
@@ -49,13 +49,13 @@ exports[`Default render 1`] = `
`49`	`49`	`>`
`50`	`50`	`<a`
`51`	`51`	`className="tc-btn-sm tc-btn-primary"`
`52`		`- href="http://accounts-test.topcoder-dev.com/member/registration"`
	`52`	`+ href="http://accounts.topcoder-dev.com/member/registration"`
`53`	`53`	`>`
`54`	`54`	`Join`
`55`	`55`	`</a>`
`56`	`56`	`<a`
`57`	`57`	`className="tc-btn-sm tc-btn-default"`
`58`		`- href="http://accounts-test.topcoder-dev.com/member"`
	`58`	`+ href="http://accounts.topcoder-dev.com/member"`
`59`	`59`	`>`
`60`	`60`	`Log In`
`61`	`61`	`</a>`
@@ -232,13 +232,13 @@ exports[`Render with open menu 1`] = `
`232`	`232`	`>`
`233`	`233`	`<a`
`234`	`234`	`className="tc-btn-sm tc-btn-primary"`
`235`		`- href="http://accounts-test.topcoder-dev.com/member/registration"`
	`235`	`+ href="http://accounts.topcoder-dev.com/member/registration"`
`236`	`236`	`>`
`237`	`237`	`Join`
`238`	`238`	`</a>`
`239`	`239`	`<a`
`240`	`240`	`className="tc-btn-sm tc-btn-default"`
`241`		`- href="http://accounts-test.topcoder-dev.com/member"`
	`241`	`+ href="http://accounts.topcoder-dev.com/member"`
`242`	`242`	`>`
`243`	`243`	`Log In`
`244`	`244`	`</a>`
Original file line number	Diff line number	Diff line change
@@ -15,7 +15,7 @@ exports[`Matches shallow shapshot 1`] = `
`15`	`15`	`>`
`16`	`16`	`<a`
`17`	`17`	`className="tc-btn-md tc-btn-primary"`
`18`		`- href="http://accounts-test.topcoder-dev.com/member?retUrl=null%2F"`
	`18`	`+ href="http://accounts.topcoder-dev.com/member?retUrl=null%2F"`
`19`	`19`	`>`
`20`	`20`	`Log In Here`
`21`	`21`	`</a>`