diff --git a/src/components/ChallengePane/ChallengePane.js b/src/components/ChallengePane/ChallengePane.js index 46c6d9346..ec468d87b 100644 --- a/src/components/ChallengePane/ChallengePane.js +++ b/src/components/ChallengePane/ChallengePane.js @@ -46,7 +46,7 @@ const ShowChallengeListTogglesInternal = (props) => { { props.setSearchFilters({ filterGlobal: !props.filteringGlobal }) }} @@ -127,7 +127,7 @@ export class ChallengePane extends Component { render() { const showingArchived = this.props.history.location.search.includes("archived=true"); - const filteringGlobal = this.props.history.location.search.includes("filterGlobal") ? this.props.history.location.search.includes("filterGlobal=true") : true; + const filteringGlobal = this.props.history.location.search.includes("filterGlobal=true") const challengeStatus = [ChallengeStatus.ready, ChallengeStatus.partiallyLoaded, ChallengeStatus.none, diff --git a/src/components/HOCs/WithFilteredChallenges/WithFilteredChallenges.js b/src/components/HOCs/WithFilteredChallenges/WithFilteredChallenges.js index 81ffcd003..e7c607539 100644 --- a/src/components/HOCs/WithFilteredChallenges/WithFilteredChallenges.js +++ b/src/components/HOCs/WithFilteredChallenges/WithFilteredChallenges.js @@ -13,14 +13,11 @@ import { challengePassesLocationFilter } from '../../../services/Challenge/ChallengeLocation/ChallengeLocation' import { challengePassesGlobalFilter } from '../../../services/Challenge/ChallengeGlobal/ChallengeGlobal' -import { challengePassesArchivedFilter } - from '../../../services/Challenge/ChallengeArchived/ChallengeArchived' import { challengePassesProjectFilter } from '../../../services/Challenge/ChallengeProject/ChallengeProject' const allFilters = [ challengePassesGlobalFilter, - challengePassesArchivedFilter, challengePassesDifficultyFilter, challengePassesKeywordFilter, challengePassesCategorizationKeywordsFilter, diff --git a/src/services/Challenge/ChallengeArchived/ChallengeArchived.js b/src/services/Challenge/ChallengeArchived/ChallengeArchived.js deleted file mode 100644 index 2f48987af..000000000 --- a/src/services/Challenge/ChallengeArchived/ChallengeArchived.js +++ /dev/null @@ -1,7 +0,0 @@ -export const challengePassesArchivedFilter = function(filter, challenge) { - if (!filter.archived) { - return challenge.isArchived === false - } - - return true -}