Merge branch 'bug-bash' into issue-5088-gets0ul

luizrrodrigues · luizrrodrigues · commit 5017bdbfcfd9 · 2020-10-18T04:49:43.000-03:00
diff --git a/__tests__/shared/components/Dashboard/SRM/__snapshots__/index.jsx.snap b/__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>
diff --git a/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap b/__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>
diff --git a/__tests__/shared/components/challenge-listing/Sidebar/__snapshots__/index.jsx.snap b/__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>
 `;
diff --git a/src/shared/components/Dashboard/SRM/index.jsx b/src/shared/components/Dashboard/SRM/index.jsx
@@ -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>
diff --git a/src/shared/components/TopcoderFooter/index.jsx b/src/shared/components/TopcoderFooter/index.jsx
@@ -54,10 +54,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">
diff --git a/src/shared/components/challenge-detail/Header/DeadlinesPanel/Card/index.jsx b/src/shared/components/challenge-detail/Header/DeadlinesPanel/Card/index.jsx
@@ -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>
   );
diff --git a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx
@@ -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;
   }
diff --git a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
@@ -359,7 +359,7 @@ export default function FiltersPanel({
                   }}
                   options={['Active', 'Completed', 'All'].map(mapOps)}
                   simpleValue
-                  value={filterState.status || 'Active'}
+                  value={filterState.status || 'All'}
                 />
               </div>
             ) : null
@@ -433,6 +433,7 @@ export default function FiltersPanel({
               events: [],
               endDateStart: null,
               startDateEnd: null,
+              status: 'All',
             });
             selectCommunity(defaultCommunityId);
             setSearchText('');
diff --git a/src/shared/components/challenge-listing/Listing/Bucket/index.jsx b/src/shared/components/challenge-listing/Listing/Bucket/index.jsx
@@ -184,7 +184,7 @@ export default function Bucket({
       {placeholders}
       {
       // (expandable || loadMore) && (expandable || !keepPlaceholders) && !loading && !expanded ? (
-        (expanding || expandable || loadMore) && !loading && (expandable ? expanded : !expanded) ? (
+        (expanding || expandable) && !loading && loadMore && (expandable ? expanded : !expanded) ? (
           <a
             // href={`${challengesUrl}?${bucketQuery}`}
             href={`${challengesUrl}`}
diff --git a/src/shared/components/challenge-listing/Sidebar/index.jsx b/src/shared/components/challenge-listing/Sidebar/index.jsx
@@ -39,7 +39,7 @@ export default function SideBarFilters({
   // editSavedFiltersMode,
   // extraBucket,
   // filterState,
-  hideTcLinksInFooter,
+  // hideTcLinksInFooter,
   isAuth,
   // resetFilterName,
   // savedFilters,
@@ -84,7 +84,7 @@ export default function SideBarFilters({
         />
         {/* )} */}
       </div>
-      <Footer hideTcLinksInFooter={hideTcLinksInFooter} />
+      <Footer hideTcLinksInFooter />
     </div>
   );
 }
@@ -94,7 +94,7 @@ SideBarFilters.defaultProps = {
   disabled: false,
   // dragState: {},
   // extraBucket: null,
-  hideTcLinksInFooter: false,
+  // hideTcLinksInFooter: false,
   isAuth: false,
   expanding: false,
 };
@@ -116,7 +116,7 @@ SideBarFilters.propTypes = {
   // editSavedFiltersMode: PT.bool.isRequired,
   // extraBucket: PT.string,
   // filterState: PT.shape().isRequired,
-  hideTcLinksInFooter: PT.bool,
+  // hideTcLinksInFooter: PT.bool,
   isAuth: PT.bool,
   // resetFilterName: PT.func.isRequired,
   // savedFilters: PT.arrayOf(PT.shape()).isRequired,

Original file line number	Diff line number	Diff line change
@@ -49,7 +49,7 @@ exports[`Matches shallow shapshot 1`] = `
`49`	`49`	`</a>`
`50`	`50`	`<a`
`51`	`51`	`className="tc-btn tc-btn-s tc-btn-wide tc-btn-ghost src-shared-components-Dashboard-SRM-___styles__tc-btn___3no83"`
`52`		`- href="https://www.topcoder-dev.com/member-onboarding/learning-practicing-skills/"`
	`52`	`+ href="https://www.topcoder-dev.com/thrive/articles/How%20To%20Compete%20in%20SRMs"`
`53`	`53`	`>`
`54`	`54`	`Learn More`
`55`	`55`	`</a>`
Original file line number	Diff line number	Diff line change
@@ -106,7 +106,7 @@ exports[`Matches shallow shapshot 1`] = `
`106`	`106`	`className="src-shared-components-TopcoderFooter-___style__link___3-nzm"`
`107`	`107`	`>`
`108`	`108`	`<a`
`109`		`- href="https://www.topcoder-dev.com/thrive/tracks?track=Data%20Science"`
	`109`	`+ href="https://www.topcoder-dev.com/thrive/tracks?track=Data%20Science&tax="`
`110`	`110`	`>`
`111`	`111`	`Data Science`
`112`	`112`	`</a>`
@@ -115,7 +115,7 @@ exports[`Matches shallow shapshot 1`] = `
`115`	`115`	`className="src-shared-components-TopcoderFooter-___style__link___3-nzm"`
`116`	`116`	`>`
`117`	`117`	`<a`
`118`		`- href="https://www.topcoder-dev.com/thrive/tracks?track=Design"`
	`118`	`+ href="https://www.topcoder-dev.com/thrive/tracks?track=Design&tax="`
`119`	`119`	`>`
`120`	`120`	`Design`
`121`	`121`	`</a>`
@@ -124,7 +124,7 @@ exports[`Matches shallow shapshot 1`] = `
`124`	`124`	`className="src-shared-components-TopcoderFooter-___style__link___3-nzm"`
`125`	`125`	`>`
`126`	`126`	`<a`
`127`		`- href="https://www.topcoder-dev.com/thrive/tracks?track=Development"`
	`127`	`+ href="https://www.topcoder-dev.com/thrive/tracks?track=Development&tax="`
`128`	`128`	`>`
`129`	`129`	`Development`
`130`	`130`	`</a>`
@@ -133,7 +133,7 @@ exports[`Matches shallow shapshot 1`] = `
`133`	`133`	`className="src-shared-components-TopcoderFooter-___style__link___3-nzm"`
`134`	`134`	`>`
`135`	`135`	`<a`
`136`		`- href="https://www.topcoder-dev.com/thrive/tracks?track=QA"`
	`136`	`+ href="https://www.topcoder-dev.com/thrive/tracks?track=QA&tax="`
`137`	`137`	`>`
`138`	`138`	`QA`
`139`	`139`	`</a>`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ export default function Bucket({`
`184`	`184`	`{placeholders}`
`185`	`185`	`{`
`186`	`186`	`// (expandable \|\| loadMore) && (expandable \|\| !keepPlaceholders) && !loading && !expanded ? (`
`187`		`- (expanding \|\| expandable \|\| loadMore) && !loading && (expandable ? expanded : !expanded) ? (`
	`187`	`+ (expanding \|\| expandable) && !loading && loadMore && (expandable ? expanded : !expanded) ? (`
`188`	`188`	`<a`
`189`	`189`	// href={`${challengesUrl}?${bucketQuery}`}
`190`	`190`	href={`${challengesUrl}`}