Skip to content

Commit 9f7b83b

Browse files
luizrrodriguesluizrrodrigues
authored
Merge pull request #6329 from topcoder-platform/new-challenge-listing
challenge listing
2 parents 7e01e56 + 72c56f7 commit 9f7b83b

File tree

70 files changed

+6746
-5923
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+6746
-5923
lines changed

‎.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,7 @@ workflows:
343343
branches:
344344
only:
345345
- develop
346+
- new-challenge-listing
346347
# This is alternate dev env for parallel testing
347348
- "build-test":
348349
context : org-global

‎__tests__/shared/components/SortingSelectBar.jsx

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React from 'react';
22
import Renderer from 'react-test-renderer/shallow';
3-
import TU from 'react-dom/test-utils';
43
import SortingSelectBar from 'components/SortingSelectBar';
54

65
const mockData = {
@@ -30,21 +29,3 @@ test('Matches shallow shapshot', () => {
3029
));
3130
expect(renderer.getRenderOutput()).toMatchSnapshot();
3231
});
33-
34-
class Wrapper extends React.Component {
35-
componentDidMount() {}
36-
37-
render() {
38-
return <SortingSelectBar {...this.props} />;
39-
}
40-
}
41-
42-
const instance = TU.renderIntoDocument((<Wrapper {...mockData} />));
43-
44-
test('Render properly', () => {
45-
const dropdown = TU.findAllInRenderedTree(instance, item => item && item.className && item.className.match('Select-control'));
46-
TU.Simulate.touchEnd(dropdown[0]);
47-
const options = TU.findAllInRenderedTree(instance, item => item && item.className && item.className.match('Select-option'));
48-
expect(options).toHaveLength(1);
49-
TU.Simulate.click(options[0]);
50-
});

‎__tests__/shared/components/__snapshots__/SortingSelectBar.jsx.snap

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -12,44 +12,10 @@ exports[`Matches shallow shapshot 1`] = `
1212
<div
1313
className="src-shared-components-SortingSelectBar-___style__view-options-toggle-container___1N4rY"
1414
>
15-
<p
16-
className="src-shared-components-SortingSelectBar-___style__view-options-toggle-container-label___1bC9s"
17-
>
18-
Sort by:
19-
</p>
2015
<Select
2116
arrowRenderer={[Function]}
22-
autosize={true}
23-
backspaceRemoves={true}
24-
backspaceToRemoveMessage="Press backspace to remove {label}"
25-
clearAllText="Clear all"
26-
clearRenderer={[Function]}
27-
clearValueText="Clear value"
2817
clearable={false}
29-
closeOnSelect={true}
30-
deleteRemoves={true}
31-
delimiter=","
32-
disabled={false}
33-
escapeClearsValue={true}
34-
filterOptions={[Function]}
35-
ignoreAccents={true}
36-
ignoreCase={true}
37-
inputProps={Object {}}
38-
isLoading={false}
39-
joinValues={false}
40-
labelKey="label"
41-
matchPos="any"
42-
matchProp="any"
43-
menuBuffer={0}
44-
menuRenderer={[Function]}
45-
multi={false}
46-
noResultsText="No results found"
47-
onBlurResetsInput={true}
4818
onChange={[Function]}
49-
onCloseResetsInput={true}
50-
onSelectResetsInput={true}
51-
openOnClick={true}
52-
optionComponent={[Function]}
5319
options={
5420
Array [
5521
Object {
@@ -58,19 +24,10 @@ exports[`Matches shallow shapshot 1`] = `
5824
},
5925
]
6026
}
61-
pageSize={5}
6227
placeholder="Select an option"
63-
removeSelected={true}
64-
required={false}
65-
rtl={false}
66-
scrollMenuIntoView={true}
6728
searchable={false}
68-
simpleValue={false}
69-
tabSelectsValue={true}
70-
trimFilter={true}
29+
selectRef={[Function]}
7130
value={null}
72-
valueComponent={[Function]}
73-
valueKey="value"
7431
/>
7532
</div>
7633
</div>

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@ exports[`Matches shallow shapshot 1`] = `
2525
>
2626
<ZoomIcon
2727
className="src-shared-components-challenge-listing-Filters-ChallengeSearchBar-___style__zoomIcon___3d_cL"
28-
height="16"
29-
viewBox="0 0 16 16"
30-
width="16"
28+
fill="none"
29+
height="12"
30+
viewBox="0 0 12 12"
31+
width="12"
3132
xmlns="http://www.w3.org/2000/svg"
3233
/>
3334
</span>
@@ -61,9 +62,10 @@ exports[`Matches shallow shapshot 2`] = `
6162
>
6263
<ZoomIcon
6364
className="src-shared-components-challenge-listing-Filters-ChallengeSearchBar-___style__zoomIcon___3d_cL"
64-
height="16"
65-
viewBox="0 0 16 16"
66-
width="16"
65+
fill="none"
66+
height="12"
67+
viewBox="0 0 12 12"
68+
width="12"
6769
xmlns="http://www.w3.org/2000/svg"
6870
/>
6971
</span>

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

Lines changed: 48 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`Matches shallow shapshot 1`] = `
4-
<div
4+
<Button
55
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filter-btn___1f3VV"
6+
disabled={false}
7+
isInverted={false}
8+
isPrimary={false}
69
onClick={[Function]}
710
onKeyDown={[Function]}
811
role="button"
912
tabIndex={0}
1013
>
11-
<FiltersIcon
12-
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__FiltersIcon___taLss"
13-
height="16"
14-
viewBox="0 0 16 16"
15-
width="16"
16-
/>
17-
More Filters
18-
</div>
14+
More Filters
15+
</Button>
1916
`;
2017

2118
exports[`Matches shallow shapshot 2`] = `
@@ -47,6 +44,31 @@ exports[`Matches shallow shapshot 2`] = `
4744
<div
4845
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filters___3um3W"
4946
>
47+
<div
48+
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filter-row___2Vfd_"
49+
>
50+
<div
51+
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__search-bar___15MSx"
52+
>
53+
<Connect(Container)
54+
setFilterState={[MockFunction]}
55+
/>
56+
</div>
57+
</div>
58+
<div
59+
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filter-row___2Vfd_"
60+
>
61+
<div
62+
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__bucket-selector-mobile___JbE2n"
63+
>
64+
<BucketSelector
65+
disabled={false}
66+
expanding={false}
67+
isAuth={false}
68+
past={false}
69+
/>
70+
</div>
71+
</div>
5072
<div
5173
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filter-row___2Vfd_"
5274
>
@@ -56,7 +78,7 @@ exports[`Matches shallow shapshot 2`] = `
5678
<span
5779
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__label___3W9TU"
5880
>
59-
Track
81+
Challenge Category
6082
</span>
6183
<div
6284
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__switches___10Wrx"
@@ -70,8 +92,8 @@ exports[`Matches shallow shapshot 2`] = `
7092
composeAdhocTheme="deeply"
7193
composeContextTheme="softly"
7294
enabled={false}
73-
labelAfter=""
74-
labelBefore="Design"
95+
labelAfter="Design"
96+
labelBefore=""
7597
mapThemrProps={[Function]}
7698
onSwitch={[Function]}
7799
themePriority="adhoc-context-default"
@@ -86,8 +108,8 @@ exports[`Matches shallow shapshot 2`] = `
86108
composeAdhocTheme="deeply"
87109
composeContextTheme="softly"
88110
enabled={false}
89-
labelAfter=""
90-
labelBefore="Development"
111+
labelAfter="Development"
112+
labelBefore=""
91113
mapThemrProps={[Function]}
92114
onSwitch={[Function]}
93115
themePriority="adhoc-context-default"
@@ -102,8 +124,8 @@ exports[`Matches shallow shapshot 2`] = `
102124
composeAdhocTheme="deeply"
103125
composeContextTheme="softly"
104126
enabled={false}
105-
labelAfter=""
106-
labelBefore="Data Science"
127+
labelAfter="Data Science"
128+
labelBefore=""
107129
mapThemrProps={[Function]}
108130
onSwitch={[Function]}
109131
themePriority="adhoc-context-default"
@@ -118,8 +140,8 @@ exports[`Matches shallow shapshot 2`] = `
118140
composeAdhocTheme="deeply"
119141
composeContextTheme="softly"
120142
enabled={false}
121-
labelAfter=""
122-
labelBefore="QA"
143+
labelAfter="QA"
144+
labelBefore=""
123145
mapThemrProps={[Function]}
124146
onSwitch={[Function]}
125147
themePriority="adhoc-context-default"
@@ -137,7 +159,7 @@ exports[`Matches shallow shapshot 2`] = `
137159
<span
138160
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__label___3W9TU"
139161
>
140-
Type
162+
Challenge Type
141163
</span>
142164
<div
143165
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__checkboxes___3ukXp"
@@ -154,12 +176,13 @@ exports[`Matches shallow shapshot 2`] = `
154176
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__label___3W9TU"
155177
htmlFor="community-select"
156178
>
157-
Sub community
179+
Sub communities
158180
<input
159181
type="hidden"
160182
/>
161183
</label>
162184
<Select
185+
arrowRenderer={[Function]}
163186
autoBlur={true}
164187
clearable={false}
165188
id="community-select"
@@ -187,29 +210,21 @@ exports[`Matches shallow shapshot 2`] = `
187210
<div
188211
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__buttons___2r3xW"
189212
>
190-
<ThemedButton
191-
active={false}
192-
composeAdhocTheme="deeply"
213+
<Button
193214
composeContextTheme="softly"
194215
disabled={false}
195-
enforceA={false}
196-
mapThemrProps={[Function]}
216+
isInverted={false}
217+
isPrimary={false}
197218
onClick={[Function]}
198-
onMouseDown={null}
199-
openNewTab={false}
200-
replace={false}
201-
size="sm"
202219
theme={
203220
Object {
204221
"button": undefined,
205222
}
206223
}
207224
themePriority="adhoc-default-context"
208-
to={null}
209-
type="button"
210225
>
211-
Clear filters
212-
</ThemedButton>
226+
RESET FILTERS
227+
</Button>
213228
</div>
214229
</div>
215230
`;

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

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,10 @@ exports[`Matches shallow shapshot 1`] = `
44
<div
55
className="src-shared-components-challenge-listing-Sidebar-___style__SideBarFilters___3XfDi"
66
>
7-
<ul
8-
className="src-shared-components-challenge-listing-Sidebar-___style__StatusBar___3d-0u"
9-
>
10-
<li
11-
className="src-shared-components-challenge-listing-Sidebar-___style__Status___2_KAp src-shared-components-challenge-listing-Sidebar-___style__active___2oOZN"
12-
onClick={[Function]}
13-
onKeyDown={[Function]}
14-
role="presentation"
15-
>
16-
Active
17-
</li>
18-
<li
19-
className="src-shared-components-challenge-listing-Sidebar-___style__Status___2_KAp"
20-
onClick={[Function]}
21-
onKeyDown={[Function]}
22-
role="presentation"
23-
>
24-
Past Challenges
25-
</li>
26-
</ul>
277
<div
288
className="src-shared-components-challenge-listing-Sidebar-___style__FilterBox___2Fea8"
299
>
10+
<Connect(Container) />
3011
<BucketSelector
3112
activeBucket="activeBucket"
3213
disabled={false}
@@ -43,29 +24,10 @@ exports[`Matches shallow shapshot 2`] = `
4324
<div
4425
className="src-shared-components-challenge-listing-Sidebar-___style__SideBarFilters___3XfDi"
4526
>
46-
<ul
47-
className="src-shared-components-challenge-listing-Sidebar-___style__StatusBar___3d-0u"
48-
>
49-
<li
50-
className="src-shared-components-challenge-listing-Sidebar-___style__Status___2_KAp src-shared-components-challenge-listing-Sidebar-___style__active___2oOZN"
51-
onClick={[Function]}
52-
onKeyDown={[Function]}
53-
role="presentation"
54-
>
55-
Active
56-
</li>
57-
<li
58-
className="src-shared-components-challenge-listing-Sidebar-___style__Status___2_KAp"
59-
onClick={[Function]}
60-
onKeyDown={[Function]}
61-
role="presentation"
62-
>
63-
Past Challenges
64-
</li>
65-
</ul>
6627
<div
6728
className="src-shared-components-challenge-listing-Sidebar-___style__FilterBox___2Fea8"
6829
>
30+
<Connect(Container) />
6931
<BucketSelector
7032
activeBucket="activeBucket"
7133
disabled={false}

‎__tests__/shared/components/challenge-listing/__snapshots__/LeaderboardAvatar.jsx.snap

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ exports[`Matches shallow shapshot 1`] = `
3030
}
3131
}
3232
onClick={null}
33-
plusOne={false}
3433
url="url"
3534
/>
3635
</Router>

0 commit comments

Comments
 (0)