Merge pull request #5155 from topcoder-platform/develop

Bug fixes

Author: sushilshinde

.circleci/config.yml

@@ -245,7 +245,7 @@ workflows:
           filters:
             branches:
               only:
-                - listing-develop-sync
+                - issue-5041
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global

__tests__/shared/components/Dashboard/SRM/__snapshots__/index.jsx.snap

@@ -49,7 +49,7 @@ exports[`Matches shallow shapshot 1`] = `
           </a>
           <a
             className="tc-btn tc-btn-s tc-btn-wide tc-btn-ghost src-shared-components-Dashboard-SRM-___styles__tc-btn___3no83"
-            href="https://www.topcoder-dev.com/member-onboarding/learning-practicing-skills/"
+            href="https://www.topcoder-dev.com/thrive/articles/How%20To%20Compete%20in%20SRMs"
           >
             Learn More
           </a>

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

@@ -16,7 +16,7 @@ exports[`renders a full Profile correctly 1`] = `
       >
         <Sticky
           activeClass="active"
-          bottomBoundary={-250}
+          bottomBoundary={0}
           enableTransforms={true}
           enabled={true}
           onStateChange={null}
@@ -630,7 +630,7 @@ exports[`renders an empty Profile correctly 1`] = `
       >
         <Sticky
           activeClass="active"
-          bottomBoundary={-250}
+          bottomBoundary={0}
           enableTransforms={true}
           enabled={true}
           onStateChange={null}

__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap

@@ -106,7 +106,7 @@ exports[`Matches shallow shapshot 1`] = `
             className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
           >
             <a
-              href="https://www.topcoder-dev.com/thrive/tracks?track=Data%20Science"
+              href="https://www.topcoder-dev.com/thrive/tracks?track=Data%20Science&tax="
             >
               Data Science
             </a>
@@ -115,7 +115,7 @@ exports[`Matches shallow shapshot 1`] = `
             className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
           >
             <a
-              href="https://www.topcoder-dev.com/thrive/tracks?track=Design"
+              href="https://www.topcoder-dev.com/thrive/tracks?track=Design&tax="
             >
               Design
             </a>
@@ -124,7 +124,7 @@ exports[`Matches shallow shapshot 1`] = `
             className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
           >
             <a
-              href="https://www.topcoder-dev.com/thrive/tracks?track=Development"
+              href="https://www.topcoder-dev.com/thrive/tracks?track=Development&tax="
             >
               Development
             </a>
@@ -133,7 +133,7 @@ exports[`Matches shallow shapshot 1`] = `
             className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
           >
             <a
-              href="https://www.topcoder-dev.com/thrive/tracks?track=QA"
+              href="https://www.topcoder-dev.com/thrive/tracks?track=QA&tax="
             >
               QA
             </a>

__tests__/shared/components/challenge-listing/Sidebar/__snapshots__/index.jsx.snap

@@ -16,7 +16,7 @@ exports[`Matches shallow shapshot 1`] = `
     />
   </div>
   <Footer
-    hideTcLinksInFooter={false}
+    hideTcLinksInFooter={true}
   />
 </div>
 `;
@@ -37,7 +37,7 @@ exports[`Matches shallow shapshot 2`] = `
     />
   </div>
   <Footer
-    hideTcLinksInFooter={false}
+    hideTcLinksInFooter={true}
   />
 </div>
 `;

config/default.js

@@ -135,6 +135,9 @@ module.exports = {
       STUDIO_FONTS_POLICY:
         'http://help.topcoder.com/hc/en-us/articles/217959447-Font-Policy-for-Design-Challenges',
       TOPCODER_TERMS: 'https://www.topcoder.com/community/how-it-works/terms/',
+      HOWTOCOMPETEINMARATHON: 'https://www.topcoder.com/thrive/articles/How%20To%20Compete%20in%20a%20Marathon%20Match',
+      USABLECODEDEV: 'https://www.topcoder.com/thrive/articles/Usable%20Code%20in%20Dev%20Challenges',
+      EXTENSIONVSCODE: 'https://marketplace.visualstudio.com/items?itemName=Topcoder.topcoder-workflow&ssr=false#overview',
     },
 
     IOS: 'https://ios.topcoder-dev.com',

src/assets/themes/tco/TCO20.svg

@@ -35,7 +35,7 @@ const SRM = (props) => {
               <a href={`${config.URL.COMMUNITY}/tc?module=ProblemArchive`} className="tc-btn tc-btn-s tc-btn-wide tc-btn-ghost" styleName="tc-btn">
                 Problem Archive
               </a>
-              <a href={`${config.URL.BASE}/member-onboarding/learning-practicing-skills/`} className="tc-btn tc-btn-s tc-btn-wide tc-btn-ghost" styleName="tc-btn">
+              <a href={`${config.URL.BASE}/thrive/articles/How%20To%20Compete%20in%20SRMs`} className="tc-btn tc-btn-s tc-btn-wide tc-btn-ghost" styleName="tc-btn">
                 Learn More
               </a>
             </div>

src/shared/components/Dashboard/SRM/index.jsx

@@ -35,7 +35,10 @@ class ProfileHeader extends React.Component {
     const {
       info,
     } = this.props;
-    const { photoURL } = info;
+    let photoURL = '';
+    if (isomorphy.isClientSide()) {
+      ({ photoURL } = info);
+    }
     this.state = {
       imageUrl: photoURL,
     };

src/shared/components/ProfilePage/Header/index.jsx

@@ -8,6 +8,7 @@ import React from 'react';
 import PT from 'prop-types';
 import { PrimaryButton } from 'topcoder-react-ui-kit';
 import Sticky from 'react-stickynode';
+import { isomorphy } from 'topcoder-react-utils';
 
 import Robot from 'assets/images/robot-happy.svg';
 
@@ -55,11 +56,15 @@ class ProfilePage extends React.Component {
 
   componentDidMount() {
     this.handleResize();
-    window.addEventListener('resize', this.handleResize);
+    if (isomorphy.isClientSide()) {
+      window.addEventListener('resize', this.handleResize);
+    }
   }
 
   componentWillUnmount() {
-    window.removeEventListener('resize', this.handleResize);
+    if (isomorphy.isClientSide()) {
+      window.removeEventListener('resize', this.handleResize);
+    }
   }
 
   getActiveTracks() {
@@ -181,7 +186,7 @@ class ProfilePage extends React.Component {
           <div styleName="about-container">
             <div styleName="profile-header-container">
               <Sticky
-                bottomBoundary={document.body.scrollHeight - 250}
+                bottomBoundary={isomorphy.isClientSide() ? document.body.scrollHeight - 250 : 0}
                 enabled={!isMobile}
                 top={10}
               >

src/shared/components/ProfilePage/index.jsx

@@ -58,10 +58,10 @@ export default function TopcoderFooter() {
             <div styleName="sep-line" />
             <ul styleName="navi-col-links">
               <Link to={`${base}/thrive/tracks?track=Competitive%20Programming`}>Competitive Programming</Link>
-              <Link to={`${base}/thrive/tracks?track=Data%20Science`}>Data Science</Link>
-              <Link to={`${base}/thrive/tracks?track=Design`}>Design</Link>
-              <Link to={`${base}/thrive/tracks?track=Development`}>Development</Link>
-              <Link to={`${base}/thrive/tracks?track=QA`}>QA</Link>
+              <Link to={`${base}/thrive/tracks?track=Data%20Science&tax=`}>Data Science</Link>
+              <Link to={`${base}/thrive/tracks?track=Design&tax=`}>Design</Link>
+              <Link to={`${base}/thrive/tracks?track=Development&tax=`}>Development</Link>
+              <Link to={`${base}/thrive/tracks?track=QA&tax=`}>QA</Link>
             </ul>
           </div>
           <div styleName="navi-col">

src/shared/components/TopcoderFooter/index.jsx

@@ -7,6 +7,7 @@
   text-decoration: none !important;
   text-transform: uppercase !important;
   margin: 0 !important;
+  white-space: nowrap !important;
 }
 
 @mixin primary-green {
@@ -107,6 +108,7 @@
   text-decoration: none !important;
   text-transform: uppercase !important;
   margin: 0 !important;
+  white-space: nowrap !important;
 }
 
 @mixin secondary-gray {
@@ -133,6 +135,7 @@
   font-weight: 700 !important;
   text-transform: uppercase !important;
   margin: 0 !important;
+  white-space: nowrap !important;
 }
 
 @mixin warn-red {

src/shared/components/buttons/themed/tc.scss

@@ -10,6 +10,7 @@ import './style.scss';
 
 /* Date/time format to use in the card. */
 const FORMAT = 'MMM DD, HH:mm';
+const FORMAT_YEAR = 'MMM DD YYYY, HH:mm';
 
 export default function Card({ past, time, title }) {
   const time2 = moment(time);
@@ -20,7 +21,7 @@ export default function Card({ past, time, title }) {
         {title}
       </p>
       <p styleName="date">
-        {time2.format(FORMAT)}
+        {time2.format(time2.year() !== moment().year() ? FORMAT_YEAR : FORMAT)}
       </p>
     </div>
   );

src/shared/components/challenge-detail/Header/DeadlinesPanel/Card/index.jsx

@@ -88,6 +88,28 @@ export default function SideBar({
     </div>
   );
 
+  const usableCodeArticle = (
+    <div styleName="tctooltiptext tooltiptextapproval">
+      <h4>
+        Useable Code Rules
+      </h4>
+      <p>
+        A set of guidelines to help determine if code is acceptable or not.
+      </p>
+    </div>
+  );
+
+  const vscodeTip = (
+    <div styleName="tctooltiptext tooltiptextapproval">
+      <h4>
+        Topcoder Extension for VSCode
+      </h4>
+      <p>
+        Shortcuts to perform actions related to Topcoder platform without having to open a browser
+      </p>
+    </div>
+  );
+
   return (
     <div styleName="challenge-spec-sidebar">
       <div styleName="challenge-sidebar-inner">
@@ -197,9 +219,45 @@ export default function SideBar({
               </span>
               )
             }
+            {
+              !isDesign && (
+              <span styleName="link-like-paragraph tooltip-container">
+                <a
+                  href={config.URL.INFO.USABLECODEDEV}
+                  title="Useable Code Rules"
+                  target="_blank"
+                  rel="noreferrer"
+                >
+                  Useable Code Rules
+                </a>
+                <Tooltip id="usablecode-tip" content={usableCodeArticle} className={styles['tooltip-overlay']} trigger={['hover', 'focus']}>
+                  <div styleName="tctooltip" tabIndex="0" role="button" aria-describedby="usablecode-tip">
+                    ?
+                  </div>
+                </Tooltip>
+              </span>
+              )
+            }
           </div>
           )
         }
+        { isMM && (
+          <div>
+            <h2>
+              CHALLENGE LINKS:
+            </h2>
+            <p styleName="link-like-paragraph">
+              <a
+                href={config.URL.INFO.HOWTOCOMPETEINMARATHON}
+                title="How To Compete in a Marathon Match"
+                target="_blank"
+                rel="noreferrer"
+              >
+                How To Compete in a Marathon Match
+              </a>
+            </p>
+          </div>
+        )}
         {
           isDesign
           && (
@@ -331,6 +389,26 @@ export default function SideBar({
           </div>
           )
         }
+        <div>
+          <h2>
+            TOOLBOX:
+          </h2>
+          <span styleName="link-like-paragraph tooltip-container">
+            <a
+              href={config.URL.INFO.EXTENSIONVSCODE}
+              title="Topcoder Extension for VSCode"
+              target="_blank"
+              rel="noreferrer"
+            >
+              Topcoder Extension <br /> for VSCode
+            </a>
+            <Tooltip id="vscode-tip" content={vscodeTip} className={styles['tooltip-overlay']} trigger={['hover', 'focus']}>
+              <div styleName="tctooltip" tabIndex="0" role="button" aria-describedby="vscode-tip">
+                ?
+              </div>
+            </Tooltip>
+          </span>
+        </div>
         { shareable && (
           <div>
             <h2>

src/shared/components/challenge-detail/Specification/SideBar/index.jsx

@@ -1,5 +1,9 @@
 @import "mixins";
 
+.no-margin-top {
+  margin-top: -10px !important;
+}
+
 .challenge-spec-sidebar {
   background: $tc-dark-blue-10;
   width: 245px;

src/shared/components/challenge-detail/Specification/SideBar/styles.scss

@@ -7,6 +7,7 @@ import SwitchWithLabel from 'components/SwitchWithLabel';
 import { challenge as challengeUtils } from 'topcoder-react-lib';
 // import { COMPETITION_TRACKS as TRACKS } from 'utils/tc';
 import _ from 'lodash';
+import { BUCKETS } from 'utils/challenge-listing/buckets';
 
 // import localStorage from 'localStorage';
 import ChallengeSearchBar from './ChallengeSearchBar';
@@ -49,6 +50,7 @@ export default function ChallengeFilters({
   if (filterState.events && filterState.events.length) filterRulesCount += 1;
   if (filterState.tags && filterState.tags.length) filterRulesCount += 1;
   if (filterState.types && filterState.types.length) filterRulesCount += 1;
+  if (activeBucket === BUCKETS.ALL && filterState.status && filterState.status !== 'All') filterRulesCount += 1;
   if (filterState.endDateStart || filterState.startDateEnd) {
     filterRulesCount += 1;
   }