Merge pull request #6947 from topcoder-platform/develop

IC-28 Production releas -> master

.circleci/config.yml

@@ -353,14 +353,17 @@ workflows:
                 - PROD-4183
                 - changelog
                 - remove_submission_review
+                - standardised_skills
+                - TSJR-275
                 - skills_updates
+                - IC-15
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global
           filters:
             branches:
               only:
-                - PROD-4251
+                - IC-13
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global

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

@@ -7,10 +7,12 @@ exports[`Matches shallow shapshot 1 shapshot 1 1`] = `
 >
   <ChallengeTab
     activeBucket="abc"
+    filterState={Object {}}
     location={Object {}}
     previousBucketOfActiveTab={null}
     previousBucketOfPastChallengesTab={null}
     selectBucket={[MockFunction]}
+    setFilterState={[MockFunction]}
     setPreviousBucketOfActiveTab={[Function]}
     setPreviousBucketOfPastChallengesTab={[Function]}
   />
@@ -70,10 +72,12 @@ exports[`Matches shallow shapshot 2 shapshot 2 1`] = `
 >
   <ChallengeTab
     activeBucket="abc"
+    filterState={Object {}}
     location={Object {}}
     previousBucketOfActiveTab={null}
     previousBucketOfPastChallengesTab={null}
     selectBucket={[MockFunction]}
+    setFilterState={[MockFunction]}
     setPreviousBucketOfActiveTab={[Function]}
     setPreviousBucketOfPastChallengesTab={[Function]}
   />

config/default.js

@@ -476,4 +476,5 @@ module.exports = {
   MEMBER_PROFILE_REDIRECT_URL: 'https://profiles.topcoder-dev.com',
   MEMBER_SEARCH_REDIRECT_URL: 'https://talent-search.topcoder-dev.com',
   ACCOUNT_SETTINGS_REDIRECT_URL: 'https://account-settings.topcoder-dev.com',
+  INNOVATION_CHALLENGES_TAG: 'Innovation Challenge',
 };

src/shared/actions/challenge-listing/index.js

@@ -156,6 +156,27 @@ function getMyPastChallengesInit(uuid, page, frontFilter) {
 //   return getAllActiveChallengesWithUsersDone(uuid, tokenV3, filter);
 // }
 
+/**
+ * Extract search from front filter
+ *
+ * @param {Object} frontFilter
+ * @returns
+ */
+function extractSearchFilter(frontFilter = {}) {
+  const searchs = [];
+  if (frontFilter.search) {
+    searchs.push(frontFilter.search);
+  }
+  if (frontFilter.isInnovationChallenge === 'true') {
+    searchs.push('Innovation Challenge');
+  }
+
+  return {
+    search: _.uniq(searchs).join(' '),
+    isInnovationChallenge: '', // remove isInnovationChallenge from challenges query
+  };
+}
+
 /**
  * Gets 1 page of active challenges (including marathon matches) from the backend.
  * Once this action is completed any active challenges saved to the state before
@@ -178,6 +199,7 @@ function getActiveChallengesDone(uuid, page, backendFilter, tokenV3, frontFilter
     backendFilter,
     frontFilter: {
       ...frontFilter,
+      ...extractSearchFilter(frontFilter),
       status: 'Active',
       currentPhaseName: 'Submission',
       registrationEndDateEnd: new Date().toISOString(),
@@ -240,6 +262,7 @@ function getOpenForRegistrationChallengesDone(uuid, page, backendFilter,
     backendFilter,
     frontFilter: {
       ...frontFilter,
+      ...extractSearchFilter(frontFilter),
       status: 'Active',
       currentPhaseName: 'Registration',
       perPage: PAGE_SIZE,
@@ -275,6 +298,7 @@ function getMyChallengesDone(uuid, page, backendFilter, tokenV3, frontFilter = {
     backendFilter,
     frontFilter: {
       ...frontFilter,
+      ...extractSearchFilter(frontFilter),
       status: 'Active',
       memberId: userId,
       perPage: PAGE_SIZE,
@@ -300,6 +324,7 @@ function getAllChallengesDone(uuid, page, backendFilter, tokenV3, frontFilter =
     backendFilter,
     frontFilter: {
       ...frontFilter,
+      ...extractSearchFilter(frontFilter),
       status: 'Active',
       perPage: PAGE_SIZE,
       page: page + 1,
@@ -325,6 +350,7 @@ function getMyPastChallengesDone(uuid, page, backendFilter, tokenV3, frontFilter
     backendFilter,
     frontFilter: {
       ...frontFilter,
+      ...extractSearchFilter(frontFilter),
       status: 'Completed',
       memberId: userId,
       perPage: PAGE_SIZE,
@@ -352,6 +378,7 @@ function getTotalChallengesCountDone(uuid, tokenV3, frontFilter = {}) {
     backendFilter: {},
     frontFilter: {
       ...frontFilter,
+      ...extractSearchFilter(frontFilter),
       status: 'Active',
       isLightweight: true,
       perPage: 1,
@@ -434,6 +461,7 @@ function getPastChallengesDone(uuid, page, backendFilter, tokenV3, frontFilter =
     backendFilter,
     frontFilter: {
       ...frontFilter,
+      ...extractSearchFilter(frontFilter),
       status: 'Completed',
       perPage: PAGE_SIZE,
       page: page + 1,

src/shared/actions/dashboard.js

@@ -1,16 +1,24 @@
-import _ from 'lodash';
 import { createActions } from 'redux-actions';
 import { getService } from '../services/dashboard';
 
 const service = getService();
 
-function fetchChallenges(query) {
-  return service.getChallenges(query);
+function fetchChallengesInit(title) {
+  return title;
+}
+
+async function fetchChallenges(title, query) {
+  const challenges = await service.getChallenges(query);
+
+  return {
+    challenges,
+    title,
+  };
 }
 
 export default createActions({
   DASHBOARD: {
-    FETCH_CHALLENGES_INIT: _.noop,
+    FETCH_CHALLENGES_INIT: fetchChallengesInit,
     FETCH_CHALLENGES_DONE: fetchChallenges,
   },
 });

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

@@ -2,6 +2,7 @@ import _ from 'lodash';
 import LoadingIndicator from 'components/LoadingIndicator';
 import PT from 'prop-types';
 import React from 'react';
+import qs from 'qs';
 
 import { config } from 'topcoder-react-utils';
 
@@ -11,22 +12,24 @@ export default function ChallengesFeed({
   challenges,
   loading,
   theme,
+  title,
+  challengeListingQuery,
 }) {
-  return (
+  return challenges && challenges.length ? (
     <div styleName={`container ${theme}`}>
       <div styleName="header">
-        <span styleName="title">CHALLENGES</span>
+        <span styleName="title">{title}</span>
         <a
           styleName="allLink"
-          href={`${config.URL.CHALLENGES_URL}`}
+          href={`${config.URL.CHALLENGES_URL}${challengeListingQuery ? `?${qs.stringify(challengeListingQuery)}` : ''}`}
           target="_blank"
           rel="noreferrer"
         >View all <span>challenges</span>
         </a>
       </div>
       <div styleName="challenges">
         {loading ? <div styleName="loading"><LoadingIndicator /></div>
-          : challenges.map(challenge => (
+          : (challenges || []).map(challenge => (
             <div styleName="row" key={challenge.id}>
               <a
                 href={`/challenges/${challenge.id}`}
@@ -46,16 +49,20 @@ export default function ChallengesFeed({
           ))}
       </div>
     </div>
-  );
+  ) : null;
 }
 
 ChallengesFeed.defaultProps = {
   challenges: [],
   theme: 'light',
+  title: 'CHALLENGES',
+  challengeListingQuery: undefined,
 };
 
 ChallengesFeed.propTypes = {
   challenges: PT.arrayOf(PT.shape()),
   loading: PT.bool.isRequired,
   theme: PT.oneOf(['dark', 'light']),
+  title: PT.string,
+  challengeListingQuery: PT.shape(),
 };

src/shared/components/GUIKit/DropdownSkills/index.jsx

@@ -90,7 +90,7 @@ function DropdownSkills({
       className="dropdownContainer"
       styleName={`container ${
         selectedOption && !!selectedOption.length ? 'haveValue' : ''
-      } ${errorMsg ? 'haveError' : ''} ${_.every(internalTerms, { selected: true }) ? 'isEmptySelectList' : ''}`}
+      } ${errorMsg ? 'haveError' : ''}`}
     >
       <div styleName="relative">
         <Async

src/shared/components/GUIKit/DropdownSkills/style.scss

@@ -119,15 +119,6 @@
       border-bottom-left-radius: 0 !important;
     }
   }
-
-  &.isEmptySelectList {
-    :global {
-      .Select-menu-outer {
-        border: none !important;
-        padding-bottom: 10px !important;
-      }
-    }
-  }
 }
 
 .addAnotherSkill {