Merge pull request #4909 from topcoder-platform/thrive-fixes-sep20

Thrive fixes sep20

Author: kkartunov

.circleci/config.yml

@@ -230,6 +230,7 @@ workflows:
           filters:
             branches:
               only:
+                - milestone-20200917
                 - develop
       # This is alternate dev env for parallel testing
       - "build-test":
@@ -251,14 +252,15 @@ workflows:
           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
       # Don't change anything in this configuration

package.json

@@ -137,7 +137,7 @@
     "tc-accounts": "git+https://github.com/appirio-tech/accounts-app.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-lib": "1.0.4",
     "topcoder-react-ui-kit": "2.0.0",
     "topcoder-react-utils": "0.7.8",
     "turndown": "^4.0.2",

src/shared/components/Contentful/Article/Article.jsx

@@ -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/components/Contentful/SearchBar/SearchBar.jsx

@@ -56,6 +56,7 @@ export class SearchBarInner extends Component {
     this.getSuggestionList = this.getSuggestionList.bind(this);
     this.handleSearchChange = this.handleSearchChange.bind(this);
     this.handleClickOutside = this.handleClickOutside.bind(this);
+    this.onKeyDown = this.onKeyDown.bind(this);
     // using debounce to avoid processing or requesting too much
     this.updateSuggestionListWithNewSearch = _.debounce(
       this.updateSuggestionListWithNewSearch.bind(this), 400,
@@ -71,6 +72,29 @@ export class SearchBarInner extends Component {
     document.removeEventListener('mousedown', this.handleClickOutside);
   }
 
+  onKeyDown(e) {
+    const { inputlVal, selectedFilter } = this.state;
+    if (inputlVal && e.which === 13) {
+      const searchQuery = {};
+      if (this.searchFieldRef && this.searchFieldRef.value) {
+        if (selectedFilter.name === 'Tags') {
+          searchQuery.tags = [this.searchFieldRef.value];
+        }
+        if (selectedFilter.name === 'All') {
+          searchQuery.phrase = this.searchFieldRef.value;
+        }
+        if (selectedFilter.name === 'Title') {
+          searchQuery.title = this.searchFieldRef.value;
+        }
+      }
+      if (selectedFilter.name !== 'Author') {
+        window.location.href = `${config.TC_EDU_BASE_PATH}${config.TC_EDU_SEARCH_PATH}?${qs.stringify(searchQuery)}`;
+      } else {
+        window.location.href = `${config.TC_EDU_BASE_PATH}${config.TC_EDU_SEARCH_PATH}?author=${inputlVal}`;
+      }
+    }
+  }
+
   /**
    * Set the search field ref
    */
@@ -136,6 +160,7 @@ export class SearchBarInner extends Component {
       isShowSuggestion,
       suggestionList,
       selectedFilter,
+      noResults,
     } = this.state;
 
     const searchQuery = {};
@@ -151,7 +176,8 @@ export class SearchBarInner extends Component {
       }
     }
 
-    return (suggestionList && !_.isEmpty(suggestionList) && isShowSuggestion && (
+    // eslint-disable-next-line no-nested-ternary
+    return suggestionList && !_.isEmpty(suggestionList) && isShowSuggestion ? (
       <div
         className={theme['popup-search-result']}
         ref={this.setPopupSearchResultRef}
@@ -319,7 +345,14 @@ export class SearchBarInner extends Component {
           ) : null
         }
       </div>
-    ));
+    ) : noResults ? (
+      <div
+        className={theme['popup-search-result']}
+        ref={this.setPopupSearchResultRef}
+      >
+        <span>No Results</span>
+      </div>
+    ) : null;
   }
 
   handleClickOutside(e) {
@@ -379,23 +412,26 @@ export class SearchBarInner extends Component {
         .then((results) => {
           // Nothing found?
           if (!results.total) {
-            this.setState({ suggestionList: {} });
+            this.setState({
+              suggestionList: {},
+              noResults: true,
+            });
             return;
           }
           // Author query?
           if (selectedFilter.name === 'Author') {
             const suggestionList = {
               Author: _.map(results.items, item => ({ ...item.fields })),
             };
-            this.setState({ suggestionList });
+            this.setState({ suggestionList, noResults: false });
             return;
           }
           // ALL && Tags
           const suggestionList = this.groupResults(results);
           this.setState({ suggestionList });
         });
     } else {
-      this.setState({ suggestionList: {} });
+      this.setState({ suggestionList: {}, noResults: false });
     }
   }
 
@@ -419,6 +455,7 @@ export class SearchBarInner extends Component {
           contentAuthor: contentAuthor.fields,
           externalArticle: fields.externalArticle,
           contentUrl: fields.contentUrl,
+          slug: fields.slug,
         };
       }),
       'type',
@@ -471,6 +508,7 @@ export class SearchBarInner extends Component {
               document.addEventListener('mousedown', this.handleClickOutside);
             }}
             onChange={this.handleSearchChange}
+            onKeyDown={this.onKeyDown}
           />
           <div className={theme.dropdown}>
             <button

src/shared/components/Contentful/SearchBar/themes/default.scss

@@ -156,6 +156,10 @@ $link-color: #0d61bf;
   overflow-y: auto;
   box-shadow: 0 25px 50px 0 rgba(0, 0, 0, 0.15);
   z-index: 999;
+
+  > span {
+    margin-left: 15px;
+  }
 }
 
 .icon-search {

src/shared/components/ProfilePage/Stats/HistoryGraph/index.jsx

@@ -211,7 +211,7 @@ export default class HistoryGraph extends React.Component {
       }
       if (track === 'DATA_SCIENCE') {
         if (subTrack === 'MARATHON_MATCH') {
-          return `/challenges/${challengeId}`;
+          return `${config.URL.COMMUNITY}/tc?module=MatchDetails&rd=${challengeId}`;
         }
         if (subTrack === 'SRM') {
           return `${config.URL.COMMUNITY}/stat?c=round_overview&rd=${challengeId}`;

src/shared/components/SubmissionManagement/SubmissionManagement/index.jsx

@@ -19,6 +19,7 @@ import React from 'react';
 import PT from 'prop-types';
 import moment from 'moment';
 import { PrimaryButton } from 'topcoder-react-ui-kit';
+import { phaseEndDate } from 'utils/challenge-listing/helper';
 import SubmissionsTable from '../SubmissionsTable';
 
 import style from './styles.scss';
@@ -47,9 +48,11 @@ export default function SubmissionManagement(props) {
   const currentPhase = challenge.phases
     .filter(p => p.name !== 'Registration' && p.isOpen)
     .sort((a, b) => moment(a.scheduledEndDate).diff(b.scheduledEndDate))[0];
+  const submissionPhase = challenge.phases.filter(p => p.name === 'Submission')[0];
+  const submissionEndDate = submissionPhase && phaseEndDate(submissionPhase);
 
   const now = moment();
-  const end = moment(currentPhase.scheduledEndDate);
+  const end = moment(currentPhase && currentPhase.scheduledEndDate);
   const diff = end.isAfter(now) ? end.diff(now) : 0;
   const timeLeft = moment.duration(diff);
 
@@ -78,11 +81,15 @@ export default function SubmissionManagement(props) {
           </a>
         </div>
         <div styleName="right-col">
-          <p styleName="round">
-            {currentPhase.name}
-          </p>
           {
-            challenge.status !== 'COMPLETED' ? (
+            currentPhase && (
+            <p styleName="round">
+              {currentPhase.name}
+            </p>
+            )
+          }
+          {
+            challenge.status !== 'Completed' ? (
               <div>
                 <p styleName="time-left">
                   {days > 0 && (`${days}D`)}
@@ -111,7 +118,7 @@ export default function SubmissionManagement(props) {
             Manage your submissions
           </p>
           {
-            isDesign && (
+            isDesign && currentPhase && (
               <p styleName="round-ends">
                 <span styleName="ends-label">
                   {currentPhase.name}
@@ -159,7 +166,7 @@ export default function SubmissionManagement(props) {
           )
         }
       </div>
-      {now.isBefore(challenge.submissionEndDate) && (
+      {now.isBefore(submissionEndDate) && (
         <div styleName="btn-wrap">
           <PrimaryButton
             theme={{

src/shared/components/SubmissionPage/Submit/index.jsx

@@ -150,8 +150,8 @@ class Submit extends React.Component {
         const topGearCommunity = _.find(communitiesList.data, { mainSubdomain: 'topgear' });
         if (topGearCommunity) {
           // check the group info match with group list
-          _.forOwn(groups, (value, key) => {
-            if (value && _.includes(topGearCommunity.groupIds, key)) {
+          _.forOwn(groups, (value) => {
+            if (value && _.includes(topGearCommunity.groupIds, value)) {
               isChallengeBelongToTopgearGroup = true;
               return false;
             }

src/shared/components/tc-communities/communities/cognitive/GetStarted/index.jsx

@@ -20,8 +20,6 @@ import cardImg02 from
 
 import MarchMadnessBanner from '../MarchMadnessBanner';
 
-import NewsSignup from '../NewsSignup';
-
 import style from './style.scss';
 
 export default function GetStarted({ baseUrl }) {
@@ -88,7 +86,6 @@ export default function GetStarted({ baseUrl }) {
           />
         </ImageText>
       </div>
-      <NewsSignup />
     </main>
   );
 }

src/shared/components/tc-communities/communities/cognitive/Home/index.jsx

@@ -16,7 +16,6 @@ import { config, Link } from 'topcoder-react-utils';
 import davePhotoUrl from 'assets/images/communities/cognitive/home/dave.jpg';
 
 import IbmCloudBanner from '../IbmCloudBanner';
-import NewsletterSignup from '../NewsSignup';
 
 import style from './style.scss';
 
@@ -317,8 +316,6 @@ export default function Home({
           </div>
         </div>
       </div>
-
-      <NewsletterSignup />
     </main>
   );
 }

src/shared/components/tc-communities/communities/cognitive/IbmCloudPage/index.jsx

@@ -4,7 +4,6 @@ import React from 'react';
 import Differences from './Differences';
 import HeadBanner from './HeadBanner';
 import JoinBlock from './JoinBlock';
-import NewsSignup from '../NewsSignup';
 
 export default function IbmCloudPage() {
   return (
@@ -16,8 +15,6 @@ export default function IbmCloudPage() {
       {/* Hidden by the request from Trevor: the transition process won't start
         * until Feb 12. */}
       {/* <AutoTransition /> */}
-
-      <NewsSignup />
     </div>
   );
 }