Merge branch 'listing-develop-sync' into issue-5003

Author: luizrrodrigues

.circleci/config.yml

@@ -237,14 +237,15 @@ workflows:
           filters:
             branches:
               only:
-                - listing-develop-sync
+                - develop
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global      
           filters:
             branches:
               only:
-                - gig-application
+                - develop
+                - listing-develop-sync
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global

__tests__/shared/components/GUIKit/TextInput/__snapshots__/index.jsx.snap

@@ -7,6 +7,7 @@ exports[`Default render 1`] = `
   <input
     className=""
     defaultValue=""
+    onBlur={[Function]}
     onChange={[Function]}
     placeholder=""
     type="text"

__tests__/shared/components/challenge-listing/Filters/FiltersPanel.jsx

@@ -15,8 +15,12 @@ const mockDatas = [{
     {
       communityId: '123',
       communityName: 'Sample community',
+      groupIds: ['123'],
     },
   ],
+  challengeFilter: {
+    groupIds: ['123'],
+  },
   filterState: {
     groups: [],
   },
@@ -34,8 +38,12 @@ const mockDatas = [{
     {
       communityId: '123',
       communityName: 'Sample community',
+      groupIds: ['123'],
     },
   ],
+  challengeFilter: {
+    groupIds: ['123'],
+  },
   filterState: {
     groups: [],
   },

__tests__/shared/components/challenge-listing/Filters/__snapshots__/FiltersPanel.jsx.snap

@@ -82,7 +82,18 @@ exports[`Matches shallow shapshot 1`] = `
           clearable={false}
           id="community-select"
           onChange={[Function]}
-          options={Array []}
+          options={
+            Array [
+              Object {
+                "data": <div>
+                  Sample community
+                </div>,
+                "label": "Sample community",
+                "name": "Sample community",
+                "value": "123",
+              },
+            ]
+          }
           selectRef={[Function]}
           simpleValue={true}
           value=""
@@ -267,7 +278,18 @@ exports[`Matches shallow shapshot 2`] = `
           clearable={false}
           id="community-select"
           onChange={[Function]}
-          options={Array []}
+          options={
+            Array [
+              Object {
+                "data": <div>
+                  Sample community
+                </div>,
+                "label": "Sample community",
+                "name": "Sample community",
+                "value": "123",
+              },
+            ]
+          }
           selectRef={[Function]}
           simpleValue={true}
           value=""

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

@@ -28,6 +28,7 @@ exports[`Matches shallow shapshot 1 shapshot 1 1`] = `
       expanding={false}
       filterState={Object {}}
       loadMoreActive={null}
+      loadMoreAll={null}
       loadMoreMy={null}
       loadMoreOnGoing={null}
       loadMoreOpenForRegistration={null}
@@ -93,6 +94,7 @@ exports[`Matches shallow shapshot 2 shapshot 2 1`] = `
       expanding={false}
       filterState={Object {}}
       loadMoreActive={null}
+      loadMoreAll={null}
       loadMoreMy={null}
       loadMoreOnGoing={null}
       loadMoreOpenForRegistration={null}

package.json

@@ -140,7 +140,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": "1000.24.3",
+    "topcoder-react-lib": "1000.24.5",
     "topcoder-react-ui-kit": "2.0.1",
     "topcoder-react-utils": "0.7.8",
     "turndown": "^4.0.2",

src/server/services/recruitCRM.js

@@ -288,6 +288,29 @@ export default class RecruitCRMService {
           errObj,
         });
       }
+      // Set hired-stage
+      const hireStageResponse = await fetch(`${this.private.baseUrl}/v1/candidates/${candidateData.slug}/hiring-stages/${id}`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          Authorization: this.private.authorization,
+        },
+        body: JSON.stringify({
+          candidate_slug: candidateData.slug,
+          job_slug: id,
+          status_id: '10',
+        }),
+      });
+      if (hireStageResponse.status >= 400) {
+        return res.send({
+          error: true,
+          status: hireStageResponse.status,
+          url: `$${this.private.baseUrl}/v1/candidates/${candidateData.slug}/hiring-stages/${id}`,
+          form,
+          errObj: await hireStageResponse.json(),
+        });
+      }
+      // respond to API call
       const data = await applyResponse.json();
       return res.send(data);
     } catch (err) {

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

@@ -87,6 +87,10 @@ function getMyChallengesInit(uuid, page, frontFilter) {
   return { uuid, page, frontFilter };
 }
 
+function getAllChallengesInit(uuid, page, frontFilter) {
+  return { uuid, page, frontFilter };
+}
+
 /**
  * Get all challenges and match with user challenges
  * @param {String} uuid progress id
@@ -270,6 +274,31 @@ function getMyChallengesDone(uuid, page, backendFilter, tokenV3, frontFilter = {
   }));
 }
 
+function getAllChallengesDone(uuid, page, backendFilter, tokenV3, frontFilter = {}) {
+  const { sorts, status } = frontFilter;
+  const filter = {
+    backendFilter,
+    frontFilter: {
+      ...frontFilter,
+      perPage: PAGE_SIZE,
+      page: page + 1,
+      sortBy: sorts[BUCKETS.ALL],
+      sortOrder: SORT[sorts[BUCKETS.ALL]].order,
+    },
+  };
+  delete filter.frontFilter.sorts;
+  if (status === 'All') {
+    delete filter.frontFilter.status;
+  }
+  const service = getService(tokenV3);
+  return service.getChallenges(filter).then(ch => ({
+    uuid,
+    allChallenges: ch.challenges,
+    meta: ch.meta,
+    frontFilter,
+  }));
+}
+
 function getTotalChallengesCountInit(uuid) {
   return { uuid };
 }
@@ -463,6 +492,7 @@ export default createActions({
     DROP_ACTIVE_CHALLENGES: _.noop,
     DROP_OPEN_FOR_REGISTRATION_CHALLENGES: _.noop,
     DROP_MY_CHALLENGES: _.noop,
+    DROP_ALL_CHALLENGES: _.noop,
     DROP_PAST_CHALLENGES: _.noop,
 
     // GET_ALL_ACTIVE_CHALLENGES_INIT: getAllActiveChallengesInit,
@@ -474,6 +504,9 @@ export default createActions({
     // GET_ALL_RECOMMENDED_CHALLENGES_INIT: getAllRecommendedChallengesInit,
     // GET_ALL_RECOMMENDED_CHALLENGES_DONE: getAllRecommendedChallengesDone,
 
+    GET_ALL_CHALLENGES_INIT: getAllChallengesInit,
+    GET_ALL_CHALLENGES_DONE: getAllChallengesDone,
+
     GET_ACTIVE_CHALLENGES_INIT: getActiveChallengesInit,
     GET_ACTIVE_CHALLENGES_DONE: getActiveChallengesDone,
 

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

@@ -35,6 +35,10 @@ function TextInput({
           delayedOnChange(e.target.value, onChange);
           setVal(e.target.value);
         }}
+        onBlur={(e) => {
+          delayedOnChange(e.target.value, onChange);
+          setVal(e.target.value);
+        }}
       />
       {label ? (
         <label htmlFor="textBoxInput">

src/shared/components/challenge-detail/Header/ChallengeTags.jsx

@@ -63,10 +63,10 @@ export default function ChallengeTags(props) {
         && (
           <TrackTag
             onClick={() => (
-              setImmediate(() => setChallengeListingFilter({ types: [challengeType.id] }))
+              setImmediate(() => setChallengeListingFilter({ types: [challengeType.abbreviation] }))
             )
             }
-            to={`${challengesUrl}?filter[types][0]=${encodeURIComponent(challengeType.id)}`}
+            to={`${challengesUrl}?types[]=${encodeURIComponent(challengeType.abbreviation)}`}
           >
             {challengeType.name}
           </TrackTag>
@@ -90,7 +90,7 @@ export default function ChallengeTags(props) {
                 key={tag}
                 onClick={() => setImmediate(() => setChallengeListingFilter({ tags: [tag] }))
                 }
-                to={`${challengesUrl}?filter[tags][0]=${
+                to={`${challengesUrl}?tags[]=${
                   encodeURIComponent(tag)}`}
               >
                 {tag}

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

@@ -204,7 +204,7 @@ export default function ChallengeHeader(props) {
     }
   }
 
-  const checkpointCount = checkpoints && checkpoints.numberOfUniqueSubmitters;
+  const checkpointCount = checkpoints && checkpoints.numberOfPassedScreeningSubmissions;
 
   let nextDeadlineMsg;
   switch ((status || '').toLowerCase()) {

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

@@ -61,7 +61,7 @@ export default function ChallengeDetailsView(props) {
   let stockArtValue = '';
   const allowStockArt = _.find(metadata, { name: 'allowStockArt' });
   if (allowStockArt) {
-    stockArtValue = allowStockArt.value;
+    stockArtValue = allowStockArt.value === 'true';
   }
 
   let environment = '';

src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx

@@ -4,7 +4,7 @@
 import React from 'react';
 import PT from 'prop-types';
 import SwitchWithLabel from 'components/SwitchWithLabel';
-// import { challenge as challengeUtils } from 'topcoder-react-lib';
+import { challenge as challengeUtils } from 'topcoder-react-lib';
 // import { COMPETITION_TRACKS as TRACKS } from 'utils/tc';
 import _ from 'lodash';
 
@@ -17,7 +17,7 @@ import FiltersSwitch from './FiltersSwitch';
 
 import './ChallengeFilters.scss';
 
-// const Filter = challengeUtils.filter;
+const Filter = challengeUtils.filter;
 
 export default function ChallengeFilters({
   communityFilters,
@@ -30,6 +30,7 @@ export default function ChallengeFilters({
   auth,
   // isCardTypeSet,
   isReviewOpportunitiesBucket,
+  activeBucket,
   // saveFilter,
   searchText,
   selectCommunity,
@@ -45,17 +46,20 @@ export default function ChallengeFilters({
 }) {
   let filterRulesCount = 0;
   if (filterState.groups && filterState.groups.length) filterRulesCount += 1;
+  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 (filterState.endDateEnd || filterState.startDateStart) filterRulesCount += 1;
+  if (filterState.endDateStart || filterState.startDateEnd) {
+    filterRulesCount += 1;
+  }
   if (isReviewOpportunitiesBucket && filterState.reviewOpportunityType) filterRulesCount += 1;
   if (selectedCommunityId !== '' && selectedCommunityId !== 'All') filterRulesCount += 1;
-  const isTrackOn = track => filterState.tracks[track];
+  const isTrackOn = track => filterState.tracks && filterState.tracks[track];
 
   const switchTrack = (track, on) => {
-    const newFilter = _.cloneDeep(filterState);
-    newFilter.tracks[track] = on;
-    setFilterState({ ...newFilter });
+    const act = on ? Filter.addTrack : Filter.removeTrack;
+    const filterObj = act(filterState, track);
+    setFilterState({ ...filterObj });
   };
 
   const clearSearch = () => {
@@ -168,6 +172,7 @@ export default function ChallengeFilters({
         isAuth={isAuth}
         auth={auth}
         isReviewOpportunitiesBucket={isReviewOpportunitiesBucket}
+        activeBucket={activeBucket}
         filterState={filterState}
         onClose={() => setExpanded(false)}
         // onSaveFilter={saveFilter}
@@ -209,6 +214,7 @@ ChallengeFilters.propTypes = {
   communityFilters: PT.arrayOf(PT.shape()).isRequired,
   communityName: PT.string,
   defaultCommunityId: PT.string.isRequired,
+  activeBucket: PT.string.isRequired,
   // challenges: PT.arrayOf(PT.shape()),
   expanded: PT.bool.isRequired,
   filterState: PT.shape().isRequired,