Skip to content

Commit c111eb1

Browse files
Merge pull request #3570 from topcoder-platform/issue2632
fix issue 2632
2 parents 7383ef8 + 8c29858 commit c111eb1

File tree

4 files changed

+3
-26
lines changed

4 files changed

+3
-26
lines changed

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

-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ afterAll(() => {
1616

1717
const saveFilter = jest.fn();
1818
const selectCommunity = jest.fn();
19-
const setCardType = jest.fn();
2019
const setExpanded = jest.fn();
2120
const setFilterState = jest.fn();
2221
const setSearchText = jest.fn();
@@ -33,7 +32,6 @@ const mockDatas = [{
3332
saveFilter,
3433
selectCommunity,
3534
selectedCommunityId: '3',
36-
setCardType,
3735
setExpanded,
3836
setFilterState,
3937
searchText: '',
@@ -54,7 +52,6 @@ const mockDatas = [{
5452
saveFilter,
5553
selectCommunity,
5654
selectedCommunityId: '3',
57-
setCardType,
5855
setExpanded,
5956
setFilterState,
6057
searchText: '',

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

-8
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ exports[`Matches shallow shapshot shapshot 1`] = `
77
<div
88
className="src-shared-components-challenge-listing-Filters-___ChallengeFilters__filter-header___2l3Jh"
99
>
10-
<FiltersCardsType
11-
isCardTypeSet="type"
12-
setCardType={[MockFunction]}
13-
/>
1410
<ChallengeSearchBar
1511
label="Search Challenges:"
1612
onSearch={[Function]}
@@ -97,10 +93,6 @@ exports[`Matches shallow shapshot shapshot 2`] = `
9793
<div
9894
className="src-shared-components-challenge-listing-Filters-___ChallengeFilters__filter-header___2l3Jh"
9995
>
100-
<FiltersCardsType
101-
isCardTypeSet="Challenges"
102-
setCardType={[MockFunction]}
103-
/>
10496
<ChallengeSearchBar
10597
label="Search Challenges:"
10698
onSearch={[Function]}

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

-13
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
/**
22
* Challenge search & filters panel.
33
*/
4-
5-
import _ from 'lodash';
64
import React from 'react';
75
import PT from 'prop-types';
86
import SwitchWithLabel from 'components/SwitchWithLabel';
@@ -14,7 +12,6 @@ import EditTrackPanel from './EditTrackPanel';
1412
import FiltersIcon from './FiltersSwitch/filters-icon.svg';
1513
import FiltersPanel from './FiltersPanel';
1614
import FiltersSwitch from './FiltersSwitch';
17-
import FiltersCardsType from './FiltersCardsType';
1815

1916
import './ChallengeFilters.scss';
2017

@@ -29,14 +26,12 @@ export default function ChallengeFilters({
2926
filterState,
3027
isAuth,
3128
auth,
32-
hideSrm,
3329
isCardTypeSet,
3430
isReviewOpportunitiesBucket,
3531
saveFilter,
3632
searchText,
3733
selectCommunity,
3834
selectedCommunityId,
39-
setCardType,
4035
setExpanded,
4136
setFilterState,
4237
setSearchText,
@@ -61,11 +56,6 @@ export default function ChallengeFilters({
6156
return (
6257
<div styleName="challenge-filters">
6358
<div styleName="filter-header">
64-
<FiltersCardsType
65-
hideSrm={hideSrm}
66-
isCardTypeSet={isCardTypeSet}
67-
setCardType={setCardType}
68-
/>
6959
<ChallengeSearchBar
7060
onSearch={text => setFilterState(Filter.setText(filterState, text))}
7161
label={isReviewOpportunitiesBucket ? 'Search Review Opportunities:' : 'Search Challenges:'}
@@ -187,7 +177,6 @@ ChallengeFilters.defaultProps = {
187177
isCardTypeSet: '',
188178
isReviewOpportunitiesBucket: false,
189179
isSavingFilter: false,
190-
setCardType: _.noop,
191180
challenges: [],
192181
};
193182

@@ -200,14 +189,12 @@ ChallengeFilters.propTypes = {
200189
filterState: PT.shape().isRequired,
201190
isAuth: PT.bool,
202191
auth: PT.shape().isRequired,
203-
hideSrm: PT.bool.isRequired,
204192
isCardTypeSet: PT.string,
205193
isSavingFilter: PT.bool,
206194
isReviewOpportunitiesBucket: PT.bool,
207195
saveFilter: PT.func.isRequired,
208196
selectCommunity: PT.func.isRequired,
209197
selectedCommunityId: PT.string.isRequired,
210-
setCardType: PT.func,
211198
setExpanded: PT.func.isRequired,
212199
setFilterState: PT.func.isRequired,
213200
searchText: PT.string.isRequired,

src/shared/components/challenge-listing/Filters/ChallengeSearchBar/style.scss

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,16 @@ $challenge-radius-4: $corner-radius * 2;
99

1010
/* -100px is necessary to compensate for the temporarly added `Alpha preview`
1111
* banner. Should be modified / removed together with banner. */
12-
$search-bar-width: '100% - 705px';
12+
$search-bar-width: '100% - 475px';
1313
$search-input-width: '100% - 56px';
1414

1515
.ChallengeSearchBar {
1616
display: inline-block;
1717
vertical-align: middle;
1818
margin-right: 40px;
1919
position: relative;
20-
top: 1px;
20+
top: 10px;
21+
height: 60px;
2122

2223
label {
2324
font-size: 12px;

0 commit comments

Comments
 (0)