Skip to content

Commit 46d11e6

Browse files
Fix issues for:
#4966 #4967 #4968
1 parent 69030c7 commit 46d11e6

File tree

4 files changed

+33
-10
lines changed

4 files changed

+33
-10
lines changed

src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import Tooltip from 'components/Tooltip';
3232
import { config, Link } from 'topcoder-react-utils';
3333
import { COMPOSE, PRIORITY } from 'react-css-super-themr';
3434
import { REVIEW_OPPORTUNITY_TYPES } from 'utils/tc';
35+
import { isFilterEmpty } from 'utils/challenge-listing/buckets';
3536
import CheckmarkIcon from './CheckmarkIcon';
3637
import DateRangePicker from '../DateRangePicker';
3738
import style from './style.scss';
@@ -187,11 +188,12 @@ export default function FiltersPanel({
187188
data: getLabel(community),
188189
}));
189190

190-
const disableClearSaveFilterButtons = false;
191+
// const disableClearSaveFilterButtons = false;
191192
// const disableClearSaveFilterButtons = isSavingFilter || (
192193
// selectedCommunityId === defaultCommunityId
193194
// && _.isEmpty(filterState)
194195
// );
196+
const disableClearSaveFilterButtons = isFilterEmpty(filterState);
195197

196198
const mapOps = item => ({ label: item, value: item });
197199
const mapTypes = item => ({ label: item.name, value: item.abbreviation });

src/shared/components/challenge-listing/Listing/Bucket/index.jsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export default function Bucket({
3232
challengesUrl,
3333
expanded,
3434
expand,
35-
// filterState,
35+
filterState,
3636
// keepPlaceholders,
3737
loading,
3838
loadMore,
@@ -108,7 +108,7 @@ export default function Bucket({
108108
challengeType={_.find(challengeTypes, { name: challenge.type })}
109109
challengesUrl={challengesUrl}
110110
newChallengeDetails={newChallengeDetails}
111-
onTechTagClicked={tag => setFilterState({ tags: [tag] })}
111+
onTechTagClicked={tag => setFilterState({ ..._.clone(filterState), tags: [tag] })}
112112
openChallengesInNewTabs={openChallengesInNewTabs}
113113
prizeMode={prizeMode}
114114
key={challenge.id}
@@ -213,7 +213,7 @@ Bucket.propTypes = {
213213
challenges: PT.arrayOf(PT.shape()).isRequired,
214214
challengeTypes: PT.arrayOf(PT.shape()),
215215
challengesUrl: PT.string.isRequired,
216-
// filterState: PT.shape().isRequired,
216+
filterState: PT.shape().isRequired,
217217
// keepPlaceholders: PT.bool,
218218
loading: PT.bool,
219219
loadMore: PT.func,

src/shared/containers/challenge-listing/Listing/index.jsx

+10-6
Original file line numberDiff line numberDiff line change
@@ -254,12 +254,16 @@ export class ListingContainer extends React.Component {
254254
auth.tokenV3,
255255
f.front,
256256
);
257-
getMyChallenges(
258-
0,
259-
f.back,
260-
auth.tokenV3,
261-
f.front,
262-
);
257+
258+
// Only retrieve my challenge only when user has login
259+
if (auth.user) {
260+
getMyChallenges(
261+
0,
262+
f.back,
263+
auth.tokenV3,
264+
f.front,
265+
);
266+
}
263267
// getPastChallenges(
264268
// 0,
265269
// f.back,

src/shared/utils/challenge-listing/buckets.js

+17
Original file line numberDiff line numberDiff line change
@@ -190,4 +190,21 @@ export function sortChangedBucket(sorts, prevSorts) {
190190
return '';
191191
}
192192

193+
export function isFilterEmpty(filter) {
194+
return _.isEqual(filter, {
195+
tracks: {
196+
Dev: true,
197+
Des: true,
198+
DS: true,
199+
QA: true,
200+
},
201+
name: '',
202+
tags: [],
203+
types: [],
204+
groups: [],
205+
startDateStart: null,
206+
endDateEnd: null,
207+
});
208+
}
209+
193210
export default undefined;

0 commit comments

Comments
 (0)