Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
042711c
Updates to allow for downloading marathon match submissions for all c…
jmgasper Oct 17, 2022
37d5eed
Fix up lint issue
jmgasper Oct 17, 2022
8c750b2
Ignore failing test for now - only fails on CI/CD
jmgasper Oct 17, 2022
560a27f
These test are frustrating - works fine locally, not in CI/CD
jmgasper Oct 17, 2022
ffd115c
UI updates and fixes how we use the token for downloading marathon ma…
jmgasper Oct 17, 2022
a215959
UI updates for modal display of marathon match submissions
jmgasper Oct 20, 2022
6ef811b
Fix merge issue
jmgasper Oct 20, 2022
c3f6572
Width fix
jmgasper Oct 20, 2022
6ef9813
Width fix
jmgasper Oct 20, 2022
2aedb4b
Make date and time one line on submission history popup
jmgasper Nov 1, 2022
a0c41a7
fix: navigation should not go below footer
suppermancool Nov 23, 2022
90a5b86
Merge pull request #6736 from topcoder-platform/timeline-wall-api-iss…
igoroshko Nov 28, 2022
c47731b
fix: navigation should not go below footer
suppermancool Dec 1, 2022
2e5fcfd
Merge pull request #6740 from topcoder-platform/timeline-wall-api-iss…
igoroshko Dec 1, 2022
b088319
fix: set initial value of sidebar navigation to current year
suppermancool Dec 1, 2022
6b56ed9
Merge pull request #6741 from topcoder-platform/timeline-wall-api-iss…
igoroshko Dec 1, 2022
827d2b6
fix: update error message modal
suppermancool Dec 2, 2022
d60c7bb
fix: navigation should not go below footer
suppermancool Dec 2, 2022
3cbd42a
Merge pull request #6742 from topcoder-platform/timeline-wall-api-32
igoroshko Dec 2, 2022
00bb74b
Merge pull request #6743 from topcoder-platform/timeline-wall-api-20
igoroshko Dec 2, 2022
6365625
Test fixes for 2023 footer / header dates
jmgasper Jan 3, 2023
bcf552e
add plugins to markdown renderer
nursoltan-s Jan 5, 2023
7aa7215
Merge pull request #6765 from nursoltan-s/latex_support_1
jmgasper Jan 5, 2023
f3271ed
Merge pull request #6771 from topcoder-platform/latex_support
jmgasper Jan 8, 2023
d13bbea
ci: remove develop from Dev env
luizrrodrigues Jan 10, 2023
11a5aa6
Merge pull request #6763 from topcoder-platform/feature-timeline-wall
luizrrodrigues Jan 10, 2023
ca171b8
2 Round Challenge sporadically showing as 1 round
jmgasper Jan 12, 2023
9f6f7aa
Added Spring lib
luizrrodrigues Jan 19, 2023
97f3c9a
ci: deploy sprig-lib to Dev env
luizrrodrigues Jan 19, 2023
583c53d
Merge pull request #6786 from topcoder-platform/sprig-lib
luizrrodrigues Jan 24, 2023
3dfc66a
Revert "2 Round Challenge sporadically showing as 1 round"
luizrrodrigues Jan 24, 2023
e3882c6
Revert "Revert "2 Round Challenge sporadically showing as 1 round""
luizrrodrigues Jan 24, 2023
c223484
Merge pull request #6793 from topcoder-platform/prod-3490
jmgasper Jan 24, 2023
e521d29
Merge pull request #6802 from topcoder-platform/universal_nav
jmgasper Jan 31, 2023
107e21b
Revert "PROD-3490"
luizrrodrigues Jan 31, 2023
a4fb946
Merge pull request #6804 from topcoder-platform/revert-6793-prod-3490
luizrrodrigues Jan 31, 2023
aca25b6
Merge branch 'universal_nav' into develop
jmgasper Jan 31, 2023
bccafa9
Merge branch 'develop' into marathon_match_submission_download
jmgasper Jan 31, 2023
a19c59a
Ability to download all submissions for a marathon match, after it’s …
jmgasper Jan 31, 2023
61ddfc2
Merge pull request #6808 from topcoder-platform/universal_nav
jmgasper Jan 31, 2023
3ffc427
Merge pull request #6810 from topcoder-platform/universal_nav
jmgasper Jan 31, 2023
73b19e8
Merge pull request #6811 from topcoder-platform/universal_nav
jmgasper Jan 31, 2023
d40e4aa
Compress timeline view
jmgasper Feb 1, 2023
6d9aab7
Fix failing test
jmgasper Feb 1, 2023
6108300
Revert "Fix failing test"
jmgasper Feb 1, 2023
4d359da
Ok, React is being dumb about these snapshots
jmgasper Feb 1, 2023
837e740
Merge branch 'universal_nav' into marathon_match_submission_download
jmgasper Feb 3, 2023
78961db
Updates to submission download buttons
jmgasper Feb 3, 2023
3ee73d2
Fix failing test
jmgasper Feb 3, 2023
f444233
Updated wording on time remaining in phase
jmgasper Feb 6, 2023
fbf0f2c
Simplify user handling in uninav
jmgasper Feb 7, 2023
c7d083b
Lint errors
jmgasper Feb 7, 2023
b031ad3
Lint fix
jmgasper Feb 7, 2023
eb99d69
Markdown rendering fixes
jmgasper Feb 7, 2023
b36957a
Additional download submission UAT tweaks
jmgasper Feb 9, 2023
f0f9de3
Merge pull request #6823 from topcoder-platform/marathon_match_submis…
jmgasper Feb 11, 2023
d5acd6a
Fix for grey background flashing behind “Download All” button
jmgasper Feb 13, 2023
b1a0ddf
Merge pull request #6825 from topcoder-platform/marathon_match_submis…
jmgasper Feb 13, 2023
5061db9
Only show download for MM challenge type, not tag
jmgasper Feb 14, 2023
f359796
Lint errors
jmgasper Feb 14, 2023
a7c3e22
Revert "Only show download for MM challenge type, not tag"
jmgasper Feb 14, 2023
9611beb
UN-129 - improve universal-nav ssr placeholder
vas3a Feb 16, 2023
f22b5eb
fix: add newline to TopcoderHeader file
vas3a Feb 16, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -349,8 +349,7 @@ workflows:
filters:
branches:
only:
- develop
- latex_support
- sprig-lib
# This is alternate dev env for parallel testing
- "build-test":
context : org-global
Expand All @@ -365,6 +364,7 @@ workflows:
branches:
only:
- universal_nav
- marathon_match_submission_download
- feat/badges-box
# This is beta env for production soft releases
- "build-prod-beta":
Expand All @@ -380,8 +380,6 @@ workflows:
branches:
only:
- develop
- old-mm-fix
- reskin-profile-settings
# Production builds are exectuted
# when PR is merged to the master
# Don't change anything in this configuration
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`Matches shallow shapshot shapshot 1 1`] = `
<div
className="src-shared-components-challenge-detail-Submissions-SubmissionRow-SubmissionHistoryRow-___style__container___1WzuZ"
>
<div
className="src-shared-components-challenge-detail-Submissions-SubmissionRow-SubmissionHistoryRow-___style__row___tH5eB src-shared-components-challenge-detail-Submissions-SubmissionRow-SubmissionHistoryRow-___style__no-border___1tHzW"
>
<div
className="src-shared-components-challenge-detail-Submissions-SubmissionRow-SubmissionHistoryRow-___style__col-1___3g3Tt src-shared-components-challenge-detail-Submissions-SubmissionRow-SubmissionHistoryRow-___style__col___2-hjE"
>
<div
className="src-shared-components-challenge-detail-Submissions-SubmissionRow-SubmissionHistoryRow-___style__mobile-header___3NsEQ"
>
SUBMISSION
</div>
<span>
1
</span>
</div>
<div
className="src-shared-components-challenge-detail-Submissions-SubmissionRow-SubmissionHistoryRow-___style__col-2___2KjRa src-shared-components-challenge-detail-Submissions-SubmissionRow-SubmissionHistoryRow-___style__col___2-hjE"
>
<div
className="src-shared-components-challenge-detail-Submissions-SubmissionRow-SubmissionHistoryRow-___style__mobile-header___3NsEQ"
>
FINAL SCORE
</div>
<div>
N/A
</div>
</div>
<div
className="src-shared-components-challenge-detail-Submissions-SubmissionRow-SubmissionHistoryRow-___style__col-3___3MsR- src-shared-components-challenge-detail-Submissions-SubmissionRow-SubmissionHistoryRow-___style__col___2-hjE"
>
<div
className="src-shared-components-challenge-detail-Submissions-SubmissionRow-SubmissionHistoryRow-___style__mobile-header___3NsEQ"
>
PROVISIONAL SCORE
</div>
<div>
80
</div>
</div>
<div
className="src-shared-components-challenge-detail-Submissions-SubmissionRow-SubmissionHistoryRow-___style__col-4___SJw2x src-shared-components-challenge-detail-Submissions-SubmissionRow-SubmissionHistoryRow-___style__col___2-hjE src-shared-components-challenge-detail-Submissions-SubmissionRow-SubmissionHistoryRow-___style__mm___2y_Fx"
>
<div
className="src-shared-components-challenge-detail-Submissions-SubmissionRow-SubmissionHistoryRow-___style__mobile-header___3NsEQ"
>
TIME
</div>
<div>
06 Nov 2017

15:49:35
</div>
</div>
<div
className="src-shared-components-challenge-detail-Submissions-SubmissionRow-SubmissionHistoryRow-___style__col-2___2KjRa src-shared-components-challenge-detail-Submissions-SubmissionRow-SubmissionHistoryRow-___style__col___2-hjE src-shared-components-challenge-detail-Submissions-SubmissionRow-SubmissionHistoryRow-___style__center___2l_Ch"
>
<div
className="src-shared-components-challenge-detail-Submissions-SubmissionRow-SubmissionHistoryRow-___style__mobile-header___3NsEQ"
>
Action
</div>
<button
onClick={[Function]}
type="button"
>
<DownloadIcon
fill="none"
height="18"
viewBox="0 0 18 18"
width="18"
xmlns="http://www.w3.org/2000/svg"
/>
</button>
</div>
</div>
</div>
`;
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import React from 'react';
// import ReactDOM from 'react-dom';
import Renderer from 'react-test-renderer/shallow';
import TU from 'react-dom/test-utils';
import SubmissionHistoryRow from 'components/challenge-detail/Submissions/SubmissionRow/SubmissionHistoryRow';

const mockData = {
isMM: true,
submission: 1,
finalScore: 80,
provisionalScore: 80,
submissionTime: '2017-11-06T15:49:35.000Z',
isReviewPhaseComplete: false,
status: 'completed',
numWinners: 1,
challengeStatus: 'Completed',
auth: {
tokenV3: 'tokenV3',
},
submissionId: '1',
isLoggedIn: true,
};

describe('Matches shallow shapshot', () => {
test('shapshot 1', () => {
const renderer = new Renderer();

renderer.render((
<SubmissionHistoryRow {...mockData} />
));
expect(renderer.getRenderOutput()).toMatchSnapshot();
});
});

class Wrapper extends React.Component {
componentDidMount() {}

render() {
return <SubmissionHistoryRow {...this.props} />;
}
}

describe('render properly', () => {
test('click', () => {
const instance = TU.renderIntoDocument((<Wrapper {...mockData} />));
const matches = TU.scryRenderedDOMComponentsWithTag(instance, 'button');
expect(matches).toHaveLength(1);
TU.Simulate.click(matches[0]);
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`Matches shallow shapshot shapshot 1 1`] = `
<div
className="src-shared-components-challenge-detail-Winners-Winner-___style__winner___GzUxl"
>
<div
className="src-shared-components-challenge-detail-Winners-Winner-___style__left___3hdSd"
>
<div
className="src-shared-components-challenge-detail-Winners-Winner-___style__placement___Qyy47 src-shared-components-challenge-detail-Winners-Winner-___style__placement-1___1LrAQ"
>
<span>
1th
</span>
</div>
<div
className="src-shared-components-challenge-detail-Winners-Winner-___style__info___37iL7"
>
<div
className="src-shared-components-challenge-detail-Winners-Winner-___style__avatar-prize___1LtwD"
>
<ThemedAvatar
composeAdhocTheme="deeply"
composeContextTheme="softly"
mapThemrProps={[Function]}
theme={
Object {
"avatar": "src-shared-components-challenge-detail-Winners-Winner-style___avatar___18tFlU",
}
}
themePriority="adhoc-context-default"
/>
<div>
<a
className="src-shared-components-challenge-detail-Winners-Winner-___style__handle___2klay"
href="undefined/members/test"
target="_blank"
>
test
</a>
</div>
</div>
</div>
</div>
<div
className="src-shared-components-challenge-detail-Winners-Winner-___style__right___1SPxZ"
>
<div
className="src-shared-components-challenge-detail-Winners-Winner-___style__prize___1snZ8"
>
$
200
</div>
</div>
<div
className="src-shared-components-challenge-detail-Winners-Winner-___style__download-container___OXVza"
>
<button
onClick={[Function]}
type="button"
>
<DownloadIcon
fill="none"
height="18"
viewBox="0 0 18 18"
width="18"
xmlns="http://www.w3.org/2000/svg"
/>
</button>
</div>
</div>
`;
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
import React from 'react';
// import ReactDOM from 'react-dom';
import Renderer from 'react-test-renderer/shallow';
import TU from 'react-dom/test-utils';
import Winner from 'components/challenge-detail/Winners/Winner';

const mockData = {
isDesign: false,
isMM: true,
prizes: [
{ value: 200, type: 'USD' },
{ value: 100, type: 'USD' },
],
submissions: [
{
placement: 1,
createdBy: 'test',
created: '2017-11-06T15:49:35.000Z',
id: '1',
},
{
placement: 1,
createdBy: 'test',
created: '2017-12-06T15:49:35.000Z',
id: '2',
},
{
placement: 1,
createdBy: 'test2',
created: '2017-11-06T15:49:35.000Z',
id: '3',
},
],
viewable: false,
winner: {
handle: 'test',
placement: 1,
},
isLoggedIn: true,
auth: {
tokenV3: 'tokenV3',
},
};

describe('Matches shallow shapshot', () => {
test('shapshot 1', () => {
const renderer = new Renderer();

renderer.render((
<Winner {...mockData} />
));
expect(renderer.getRenderOutput()).toMatchSnapshot();
});
});

class Wrapper extends React.Component {
componentDidMount() {}

render() {
return <Winner {...this.props} />;
}
}

describe('render properly', () => {
test('click', () => {
const instance = TU.renderIntoDocument((<Wrapper {...mockData} />));
const matches = TU.scryRenderedDOMComponentsWithTag(instance, 'button');
expect(matches).toHaveLength(1);
TU.Simulate.click(matches[0]);
});
});
Loading