Merge remote-tracking branch 'origin/develop' into feature/auth0-RS256-Idtoken

Author: sushilshinde

.circleci/config.yml

@@ -230,15 +230,16 @@ workflows:
           filters:
             branches:
               only:
-                - feature-contentful
+                - milestone-20200924
+                - develop
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
           filters:
             branches:
               only:                
+                - hot-fix-ad-code
                 - feature-contentful
-                - hot-fix
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global      
@@ -247,20 +248,21 @@ workflows:
               only:
                 - hot-fix
                 - feature/auth0-RS256-Idtoken
+                - community-app-tests-poc
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global
           filters:
             branches:
               only:
+                - integration-v5-challenge-api
                 - hot-fix
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global
           filters:
             branches:
               only:
-                - feature-contentful
                 - develop
       # Production builds are exectuted 
       # when PR is merged to the master

__tests__/shared/__snapshots__/index.jsx.snap

@@ -19,6 +19,10 @@ exports[`Snapshot match 1`] = `
       href="/challenges/manifest.json"
       rel="manifest"
     />
+    <script
+      async={true}
+      src="https://43d132d5dbff47c59d9d53ad448f93c2.js.ubembed.com"
+    />
   </HelmetWrapper>
   <withRouter(Connect(Routes)) />
   <Connect(ErrorMessageContainer) />
@@ -53,6 +57,10 @@ exports[`Snapshot match 2`] = `
       href="/challenges/manifest.json"
       rel="manifest"
     />
+    <script
+      async={true}
+      src="https://43d132d5dbff47c59d9d53ad448f93c2.js.ubembed.com"
+    />
   </HelmetWrapper>
   <withRouter(Connect(Routes)) />
   <Connect(ErrorMessageContainer) />

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

@@ -202,12 +202,15 @@ exports[`renders marathon 1`] = `
       className="src-shared-components-ChallengeTile-___style__completed-challenge___3w5tT"
     >
       <header>
-        <a
+        <Link
           className="src-shared-components-ChallengeTile-___style__name___1jF7j"
-          href="https://community.topcoder.com/longcontest/stats/?module=ViewOverview&rd=17153"
+          replace={false}
+          to="/challenges/15404"
         >
-          2018 TCO Marathon
-        </a>
+          <span>
+            2018 TCO Marathon
+          </span>
+        </Link>
         <p
           className="src-shared-components-ChallengeTile-___style__subtrack-color___2AJaw"
         >

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

@@ -118,6 +118,7 @@ exports[`Default render 1`] = `
                 },
                 Object {
                   "href": "https://www.topcoder-dev.com/blog",
+                  "openNewTab": true,
                   "title": "Blog",
                 },
                 Object {

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

@@ -58,7 +58,7 @@ exports[`renders a full Profile correctly 1`] = `
               }
               onShowBadges={[Function]}
               showBadgesButton={true}
-              wins={3}
+              wins={0}
             />
           </div>
         </Sticky>

config/default.js

@@ -160,6 +160,7 @@ module.exports = {
     COMMUNITY_API: 'http://localhost:8000',
     COMMUNITY_APP_GITHUB_ISSUES: 'https://github.com/topcoder-platform/community-app/issues',
     EMAIL_VERIFY_URL: 'http://www.topcoder-dev.com/settings/account/changeEmail',
+    ABANDONMENT_EMBED: 'https://43d132d5dbff47c59d9d53ad448f93c2.js.ubembed.com',
   },
 
   /* Information about Topcoder user groups can be cached in various places.
@@ -370,6 +371,7 @@ module.exports = {
             {
               title: 'Blog',
               href: 'https://www.topcoder-dev.com/blog',
+              openNewTab: true,
             },
             {
               title: 'Thrive',
@@ -409,4 +411,5 @@ module.exports = {
   TC_EDU_SEARCH_BAR_MAX_RESULTS_EACH_GROUP: 3,
   POLICY_PAGES_PATH: '/policy',
   GIGS_PAGES_PATH: '/gigs',
+  START_PAGE_PATH: '/start',
 };

config/production.js

@@ -171,6 +171,7 @@ module.exports = {
             {
               title: 'Blog',
               href: 'https://www.topcoder.com/blog',
+              openNewTab: true,
             },
             {
               title: 'Thrive',

package-lock.json

@@ -137,8 +137,8 @@
     "tc-auth-lib": "git+https://github.com/topcoder-platform/tc-auth-lib.git#dev",
     "tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3",
     "tc-ui": "^1.0.12",
-    "topcoder-react-lib": "1.0.3",
-    "topcoder-react-ui-kit": "2.0.0",
+    "topcoder-react-lib": "1.0.5",
+    "topcoder-react-ui-kit": "2.0.1",
     "topcoder-react-utils": "0.7.8",
     "turndown": "^4.0.2",
     "url-parse": "^1.4.1",

package.json

@@ -11,7 +11,7 @@ import Routes from 'routes';
 import ErrorMessage from 'containers/ErrorMessage';
 import ErrorIcons from 'containers/ErrorIcons';
 
-import { DevTools, isomorphy } from 'topcoder-react-utils';
+import { DevTools, isomorphy, config } from 'topcoder-react-utils';
 
 import ExtendedReduxToastr from 'containers/toastr';
 
@@ -37,6 +37,7 @@ export default function App() {
       <Helmet htmlAttributes={{ lang: 'en' }}>
         <meta name="theme-color" content="#FFFFFF" />
         <link rel="manifest" href="/challenges/manifest.json" />
+        <script src={config.URL.ABANDONMENT_EMBED} async />
       </Helmet>
       <Routes />
       <ErrorMessage />

src/assets/images/gig-blob.svg

@@ -2,7 +2,6 @@
  * Challenge tile.
  */
 /* eslint-env browser */
-import _ from 'lodash';
 import React from 'react';
 import PT from 'prop-types';
 import { Link } from 'react-router-dom';
@@ -83,36 +82,27 @@ class ChallengeTile extends React.Component {
       margin: '10px 5px',
     };
 
-    const isDataScience = track === COMPETITION_TRACKS.DATA_SCIENCE;
     const isDevelopment = track === COMPETITION_TRACKS.DEVELOP;
     const isDesign = track === COMPETITION_TRACKS.DESIGN;
 
-    const roundId = isDataScience ? _.get(challenge, 'rounds.0.id') : 0;
-
     return (
       <div styleName="challenge tile" style={extraStyle}>
         <div styleName={outStyleName}>
           <div styleName="completed-challenge">
             <header>
-              { !isDataScience && (!challenge.isPrivate
+              { !challenge.isPrivate
                 ? (
                   <Link to={`/challenges/${challenge.id}`} styleName="name">
                     <span>
                       { challenge.name }
                     </span>
                   </Link>
-                ) : (
+                )
+                : (
                   <span>
                     { challenge.name }
                   </span>
-                )) }
-
-              { isDataScience
-                && (
-                <a styleName="name" href={`https://community.topcoder.com/longcontest/stats/?module=ViewOverview&rd=${roundId}`}>
-                  { challenge.name }
-                </a>
-                ) }
+                )}
 
               <p styleName="subtrack-color">
                 {underscoreReplace(type)}

src/assets/images/img-gig-work.png

@@ -15,7 +15,10 @@ import LoadingIndicator from 'components/LoadingIndicator';
 import YouTubeVideo from 'components/YouTubeVideo';
 import moment from 'moment';
 import localStorage from 'localStorage';
-import { config, Link, isomorphy } from 'topcoder-react-utils';
+import { Helmet } from 'react-helmet';
+import {
+  config, Link, isomorphy,
+} from 'topcoder-react-utils';
 import qs from 'qs';
 // SVGs and assets
 import GestureIcon from 'assets/images/icon-gesture.svg';
@@ -110,9 +113,27 @@ export default class Article extends React.Component {
     if (isomorphy.isClientSide()) {
       shareUrl = encodeURIComponent(window.location.href);
     }
+    const description = htmlToText.fromString(
+      ReactDOMServer.renderToString(markdown(fields.content)),
+      {
+        ignoreHref: true,
+        ignoreImage: true,
+        singleNewLineParagraphs: true,
+        uppercaseHeadings: false,
+      },
+    ).substring(0, CONTENT_PREVIEW_LENGTH);
 
     return (
       <React.Fragment>
+        <Helmet>
+          <title>{fields.title}</title>
+          <meta name="title" property="og:title" content={fields.title} />
+          <meta name="description" property="og:description" content={description} />
+          <meta name="description" property="description" content={description} />
+          <meta name="twitter:description" content={description} />
+          <meta name="image" property="og:image" content={fields.featuredImage ? `https:${subData.assets.items[fields.featuredImage.sys.id].fields.file.url}` : null} />
+          <meta name="twitter:image" content={fields.featuredImage ? `https:${subData.assets.items[fields.featuredImage.sys.id].fields.file.url}` : null} />
+        </Helmet>
         {/* Banner */}
         {
           fields.featuredImage ? (

src/shared/app.jsx

@@ -14,6 +14,7 @@ import { errors } from 'topcoder-react-lib';
 import { themr } from 'react-css-super-themr';
 import classnames from 'classnames';
 
+import defaultModalTheme from 'components/Leaderboard/ChallengeHistoryModal/styles.scss';
 import defaultStyle from './style.scss';
 
 const { fireErrorMessage } = errors;
@@ -102,7 +103,10 @@ class ContentfulModal extends React.Component {
                 className: classnames(theme.modalTrigger, child.props.className),
               }))}
               {isOpen && (
-              <Modal onCancel={this.onCloseModal}>
+              <Modal
+                onCancel={this.onCloseModal}
+                theme={defaultModalTheme}
+              >
                 <div
                   className={theme.dismissButton}
                   onClick={this.onCloseModal}