Merge pull request #4711 from topcoder-platform/issue-4706

Issue#4706 : Track and Subtrack enhancements

Author: sushilshinde

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

@@ -7,7 +7,7 @@ exports[`Matches shallow shapshot 1`] = `
   <div
     className="src-shared-components-TrackIcon-___style__develop___3v4fM src-shared-components-TrackIcon-___style__main-icon___1q-1_"
   >
-    Cd
+    CH
   </div>
   <a
     href="https://www.topcoder-dev.com/tco"
@@ -26,15 +26,15 @@ exports[`Matches shallow shapshot 2`] = `
   className="src-shared-components-TrackIcon-___style__trackIcon___3gJ9l"
 >
   <div
-    className="src-shared-components-TrackIcon-___style__data_science___3YlDf src-shared-components-TrackIcon-___style__main-icon___1q-1_"
+    className="src-shared-components-TrackIcon-___style__develop___3v4fM src-shared-components-TrackIcon-___style__main-icon___1q-1_"
   >
-    Cd
+    CH
   </div>
   <a
     href="https://www.topcoder-dev.com/tco"
   >
     <div
-      className="src-shared-components-TrackIcon-___style__data_science___3YlDf src-shared-components-TrackIcon-___style__tco-icon___18ZV7"
+      className="src-shared-components-TrackIcon-___style__develop___3v4fM src-shared-components-TrackIcon-___style__tco-icon___18ZV7"
     >
       TCO
     </div>
@@ -49,7 +49,7 @@ exports[`Matches shallow shapshot 3`] = `
   <div
     className="src-shared-components-TrackIcon-___style__develop___3v4fM src-shared-components-TrackIcon-___style__main-icon___1q-1_"
   >
-    Cd
+    CH
   </div>
   <a
     href="https://www.topcoder-dev.com/tco"

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

@@ -18,7 +18,6 @@ exports[`Matches shallow shapshot shapshot 1 1`] = `
           "eventName": "Submit",
         },
       ],
-      "isDataScience": true,
       "legacy": Object {
         "track": "DEVELOP",
       },

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

@@ -39,14 +39,14 @@ const mockDatas = [{
   showTrackModal,
   trackModalShown: true,
   validKeywords: [''],
-  validSubtracks: [''],
+  validTypes: [''],
 }, {
   challengeGroupId: '1',
   communityFilters: [{ filter: {} }],
   communityName: 'name',
   expanded: false,
   filterState: {
-    tags: ['abc'], subtracks: ['CODE'], endDate: moment('2019-12-31T23:00:00.000Z'), startDate: moment('2019-12-31T23:00:00.000Z'), tracks: ['tracks'],
+    tags: ['abc'], types: ['927abff4-7af9-4145-8ba1-577c16e64e2e'], endDate: moment('2019-12-31T23:00:00.000Z'), startDate: moment('2019-12-31T23:00:00.000Z'), tracks: ['tracks'],
   },
   isCardTypeSet: 'Challenges',
   saveFilter,
@@ -59,7 +59,7 @@ const mockDatas = [{
   showTrackModal,
   trackModalShown: true,
   validKeywords: [''],
-  validSubtracks: [''],
+  validTypes: [''],
 }];
 
 describe('Matches shallow shapshot', () => {

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

@@ -25,7 +25,7 @@ const mockDatas = [{
   setFilterState,
   setSearchText,
   validKeywords: ['key', 'word'],
-  validSubtracks: [{ name: 'sub', subTrack: 'sub' }, { name: 'track', subTrack: 'track' }],
+  validTypes: [{ name: 'sub', subTrack: 'sub' }, { name: 'track', subTrack: 'track' }],
   onClose,
 }, {
   communityFilters: [
@@ -42,7 +42,7 @@ const mockDatas = [{
   setFilterState,
   setSearchText,
   validKeywords: [],
-  validSubtracks: [],
+  validTypes: [],
   onClose,
 }];
 

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

@@ -73,7 +73,7 @@ exports[`Matches shallow shapshot shapshot 1`] = `
         "",
       ]
     }
-    validSubtracks={
+    validTypes={
       Array [
         "",
       ]
@@ -85,9 +85,11 @@ exports[`Matches shallow shapshot shapshot 1`] = `
     devEnabled={true}
     onClose={[Function]}
     opened={true}
+    qaEnabled={true}
     switchDataScience={[Function]}
     switchDesign={[Function]}
     switchDev={[Function]}
+    switchQA={[Function]}
   />
 </div>
 `;
@@ -159,6 +161,23 @@ exports[`Matches shallow shapshot shapshot 2`] = `
           themePriority="adhoc-context-default"
         />
       </span>
+      <span
+        aria-checked={false}
+        aria-label="QA toggle button pressed Off"
+        className="src-shared-components-challenge-listing-Filters-___ChallengeFilters__filter-switch-with-label___21Ups"
+        role="switch"
+      >
+        <ThemedSwitchWithLabel
+          composeAdhocTheme="deeply"
+          composeContextTheme="softly"
+          enabled={false}
+          labelAfter=""
+          labelBefore="QA"
+          mapThemrProps={[Function]}
+          onSwitch={[Function]}
+          themePriority="adhoc-context-default"
+        />
+      </span>
     </span>
     <span
       className="src-shared-components-challenge-listing-Filters-___ChallengeFilters__pulled-right___bfsMZ"
@@ -216,15 +235,15 @@ exports[`Matches shallow shapshot shapshot 2`] = `
       Object {
         "endDate": "2019-12-31T23:00:00.000Z",
         "startDate": "2019-12-31T23:00:00.000Z",
-        "subtracks": Array [
-          "CODE",
-        ],
         "tags": Array [
           "abc",
         ],
         "tracks": Array [
           "tracks",
         ],
+        "types": Array [
+          "927abff4-7af9-4145-8ba1-577c16e64e2e",
+        ],
       }
     }
     hidden={true}
@@ -242,7 +261,7 @@ exports[`Matches shallow shapshot shapshot 2`] = `
         "",
       ]
     }
-    validSubtracks={
+    validTypes={
       Array [
         "",
       ]
@@ -254,9 +273,11 @@ exports[`Matches shallow shapshot shapshot 2`] = `
     devEnabled={false}
     onClose={[Function]}
     opened={true}
+    qaEnabled={false}
     switchDataScience={[Function]}
     switchDesign={[Function]}
     switchDev={[Function]}
+    switchQA={[Function]}
   />
 </div>
 `;

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

@@ -109,15 +109,15 @@ exports[`Matches shallow shapshot 1`] = `
       >
         <label
           className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__left-label___15kRu"
-          htmlFor="track-select"
+          htmlFor="type-select"
         >
-          Subtrack
+          Type
           <input
             type="hidden"
           />
         </label>
         <Select
-          id="track-select"
+          id="type-select"
           multi={true}
           onChange={[Function]}
           options={
@@ -132,7 +132,7 @@ exports[`Matches shallow shapshot 1`] = `
               },
             ]
           }
-          placeholder="Select Subtrack"
+          placeholder="Select Type"
           selectRef={[Function]}
           simpleValue={true}
           value={null}
@@ -304,19 +304,19 @@ exports[`Matches shallow shapshot 2`] = `
       >
         <label
           className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__left-label___15kRu"
-          htmlFor="track-select"
+          htmlFor="type-select"
         >
-          Subtrack
+          Type
           <input
             type="hidden"
           />
         </label>
         <Select
-          id="track-select"
+          id="type-select"
           multi={true}
           onChange={[Function]}
           options={Array []}
-          placeholder="Select Subtrack"
+          placeholder="Select Type"
           selectRef={[Function]}
           simpleValue={true}
           value={null}

__tests__/shared/components/challenge-listing/Listing/__snapshots__/Bucket.jsx.snap

@@ -47,7 +47,6 @@ exports[`Matches shallow shapshot 1`] = `
             },
           ],
           "id": "2",
-          "isDataScience": false,
           "legacy": Object {
             "track": "DEVELOP",
           },

__tests__/shared/containers/challenge-listing/FilterPanel.jsx

@@ -23,7 +23,7 @@ describe('shallow render connnected component', () => {
       loadingChallengeTags: false,
       loadingChallengeTypes: false,
       challengeTags: [],
-      challengeSubtracks: [],
+      challengeTypes: [],
       selectedCommunityId: '1',
     },
     auth: {
@@ -68,9 +68,9 @@ describe('full render pure component', () => {
     filterState: {},
     getAvailableFilterName: jest.fn(),
     loadingKeywords: false,
-    loadingSubtracks: false,
+    loadingTypes: false,
     validKeywords: [],
-    validSubtracks: [],
+    validTypes: [],
     selectedCommunityId: '1',
     tokenV2: 'tokenV2',
     getTypes: jest.fn(),
@@ -117,7 +117,7 @@ describe('full render pure component', () => {
     instance = mount(<FilterPanel
       {...initialProps}
       challengeGroupId="1"
-      loadingSubtracks
+      loadingTypes
       loadingKeywords
     />);
 
@@ -183,7 +183,7 @@ describe('full render connnected component and dispatch actions', () => {
       loadingChallengeTags: true,
       loadingChallengeTypes: true,
       challengeTags: [],
-      challengeSubtracks: [],
+      challengeTypes: [],
       selectedCommunityId: '1',
     },
     auth: {

__tests__/shared/containers/challenge-listing/Listing.jsx

@@ -40,7 +40,7 @@ describe('full render pure component', () => {
     allDraftChallengesLoaded: false,
     allPastChallengesLoaded: false,
     challenges: [],
-    challengeSubtracks: [],
+    challengeTypes: [],
     challengeTags: [],
     getCommunitiesList: () => {},
     communityFilters: [{ communityId: '1', name: 'My Filter', filter: {} }],
@@ -177,7 +177,7 @@ describe('full render connnected component and dispatch actions', () => {
       allDraftChallengesLoaded: false,
       allPastChallengesLoaded: false,
       challenges: [{ id: '1' }],
-      challengeSubtracks: [],
+      challengeTypes: [],
       challengeTags: [],
       // communityFilters: [{ id: '1', name: 'My Filter', filter: {} }],
       dropChallenges: jest.fn(),

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

@@ -46,7 +46,7 @@ function getAll(getter, page = 0, prev) {
 }
 
 /**
- * Gets possible challenge subtracks.
+ * Gets possible challenge types.
  * @return {Promise}
  */
 function getChallengeTypesDone() {