add global toggle to find challenge page

src/components/ChallengePane/ChallengePane.jsx

@@ -31,7 +31,7 @@
 import StartVirtualChallenge from './StartVirtualChallenge/StartVirtualChallenge'
 import messages from './Messages'
 
-const ShowArchivedToggleInternal = (props) => {
+const ShowChallengeListTogglesInternal = (props) => {
   return (
     <div className="mr-flex">
       <input
@@ -43,11 +43,20 @@
         }}
       />
       <div className="mr-text-sm mr-mx-1"><FormattedMessage {...messages.showArchivedLabel} /></div>
+      <input
+        type="checkbox"
+        className="mr-checkbox-toggle mr-mr-1 mr-mb-6 mr-ml-4"
+        checked={props.showingGlobal}
+        onChange={() => {
+          props.setSearchFilters({ global: !props.showingGlobal })
+        }}
+      />
+      <div className="mr-text-sm mr-mx-1"><FormattedMessage {...messages.showGlobalLabel} /></div>
     </div>
   )
 }
 
-const ShowArchivedToggle = WithChallengeSearch(ShowArchivedToggleInternal);
+const ShowChallengeListToggles = WithChallengeSearch(ShowChallengeListTogglesInternal);
 
 // Setup child components with necessary HOCs
 const ChallengeResults = WithStatus(ChallengeResultList)
@@ -118,6 +127,7 @@
 
   render() {
     const showingArchived = this.props.history.location.search.includes("archived=true");
+    const showingGlobal = this.props.history.location.search.includes("global=true")
     const challengeStatus = [ChallengeStatus.ready,
                              ChallengeStatus.partiallyLoaded,
                              ChallengeStatus.none,
@@ -156,7 +166,7 @@
         <div className="mr-p-6 lg:mr-flex mr-cards-inverse">
           <div className="mr-flex-0">
             <LocationFilter {...this.props} />
-            <ShowArchivedToggle showingArchived={showingArchived} {...this.props} />
+            <ShowChallengeListToggles showingArchived={showingArchived} showingGlobal={showingGlobal} {...this.props} />
             <ChallengeResults {...this.props} />
           </div>
           <div className="mr-flex-1">

src/components/ChallengePane/Messages.js

@@ -37,5 +37,10 @@ export default defineMessages({
   showArchivedLabel: {
     id: "ChallengePane.controls.showArchived.label",
     defaultMessage: "Show Archived"
+  },
+
+  showGlobalLabel: {
+    id: "ChallengePane.controls.showGlobal.label",
+    defaultMessage: "Show Global Challenges"
   }
 })

src/components/HOCs/WithFilteredChallenges/WithFilteredChallenges.jsx

@@ -13,11 +13,14 @@ import { challengePassesLocationFilter }
        from '../../../services/Challenge/ChallengeLocation/ChallengeLocation'
 import { challengePassesArchivedFilter }
        from '../../../services/Challenge/ChallengeArchived/ChallengeArchived'
+import { challengePassesGlobalFilter }
+       from '../../../services/Challenge/ChallengeGlobal/ChallengeGlobal'
 import { challengePassesProjectFilter }
        from '../../../services/Challenge/ChallengeProject/ChallengeProject'
 
 const allFilters = [
   challengePassesArchivedFilter,
+  challengePassesGlobalFilter,
   challengePassesDifficultyFilter,
   challengePassesKeywordFilter,
   challengePassesCategorizationKeywordsFilter,

src/components/HOCs/WithSearchRoute/WithSearchRoute.jsx

@@ -37,7 +37,8 @@ export const WithSearchRoute = function(WrappedComponent, searchGroup) {
        project: param => this.props.setSearchFilters({project: param, searchType: SEARCH_TYPE_PROJECT}),
        query: param => this.props.setSearch(param),
        challengeSearch: param => this.props.setChallengeSearchMapBounds(toLatLngBounds(param), true),
-       archived: param => this.props.setSearchFilters({ archived: param === "true" })
+       archived: param => this.props.setSearchFilters({ archived: param === "true" }),
+       global: param => this.props.setSearchFilters({ global: param === "true" })
     }
 
     state = {

src/services/Challenge/Challenge.js

@@ -443,6 +443,10 @@
       queryParams.ca = filters.archived;
     }
 
+    if (filters.global) {
+      queryParams.cg = filters.global;
+    }
+
     // Keywords/tags can come from both the the query and the filter, so we need to
     // combine them into a single keywords array.
     const keywords = queryParts.tagTokens.concat(

src/services/Challenge/ChallengeArchived/ChallengeArchived.js

@@ -1,7 +1,7 @@
 export const challengePassesArchivedFilter = function(filter, challenge) {
-    if (!filter.archived) {
-      return challenge.isArchived === false
-    }
-
-    return true
+  if (!filter.archived) {
+    return challenge.isArchived === false
   }
+
+  return true
+}

src/services/Challenge/ChallengeGlobal/ChallengeGlobal.js

@@ -0,0 +1,7 @@
+export const challengePassesGlobalFilter = function(filter, challenge) {
+  if (filter.global) {
+    return challenge.isGlobal === false
+  }
+
+  return true
+}

src/services/Search/Search.js

@@ -95,7 +95,8 @@
   difficulty: 'cd',
   tags: 'tt',
   excludeTasks: 'tExcl',
-  archived: "ca"
+  archived: "ca",
+  global: "cg"
 }
 
 
@@ -158,6 +159,9 @@
   if (filters.archived) {
     searchParameters[PARAMS_MAP.archived] = filters.archived;
   }
+  if (filters.global) {
+    searchParameters[PARAMS_MAP.global] = filters.global;
+  }
   if (filters.reviewRequestedBy) {
     searchParameters[PARAMS_MAP.reviewRequestedBy] = filters.reviewRequestedBy
     if (invertFields.reviewRequestedBy) {