Skip to content

Commit 9379004

Browse files
authored
Merge pull request #4670 from PrakashDurlabhji/issue_4552
Issue 4552 fix
2 parents 1a1aa8d + b6b7aed commit 9379004

File tree

4 files changed

+48
-11
lines changed

4 files changed

+48
-11
lines changed

src/shared/components/challenge-detail/Submissions/SubmissionRow/index.jsx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import React from 'react';
77
import PT from 'prop-types';
88
import _ from 'lodash';
9+
import { getRatingLevel } from 'utils/tc';
910
import moment from 'moment';
1011

1112
import ArrowNext from '../../../../../assets/images/arrow-next.svg';
@@ -17,7 +18,7 @@ import SubmissionHistoryRow from './SubmissionHistoryRow';
1718
import './style.scss';
1819

1920
export default function SubmissionRow({
20-
isMM, openHistory, member, submissions, score, toggleHistory, colorStyle,
21+
isMM, openHistory, member, submissions, score, toggleHistory,
2122
isReviewPhaseComplete, finalRank, provisionalRank, onShowPopup, rating,
2223
}) {
2324
const {
@@ -74,15 +75,14 @@ export default function SubmissionRow({
7475
) : null
7576
}
7677
<div styleName="col-2 col">
77-
<span styleName="col" style={colorStyle}>
78+
<span styleName={`col level-${getRatingLevel(rating)}`}>
7879
{rating || '-'}
7980
</span>
8081
<a
81-
styleName="col"
8282
href={`${window.origin}/members/${member}`}
8383
target={`${_.includes(window.origin, 'www') ? '_self' : '_blank'}`}
8484
rel="noopener noreferrer"
85-
style={colorStyle}
85+
styleName={`col level-${getRatingLevel(rating)}`}
8686
>
8787
{member || '-'}
8888
</a>
@@ -164,7 +164,6 @@ export default function SubmissionRow({
164164

165165
SubmissionRow.defaultProps = {
166166
toggleHistory: () => {},
167-
colorStyle: {},
168167
score: {},
169168
isReviewPhaseComplete: false,
170169
finalRank: null,
@@ -205,7 +204,6 @@ SubmissionRow.propTypes = {
205204
}),
206205
rating: PT.number,
207206
toggleHistory: PT.func,
208-
colorStyle: PT.shape(),
209207
isReviewPhaseComplete: PT.bool,
210208
finalRank: PT.number,
211209
provisionalRank: PT.number,

src/shared/components/challenge-detail/Submissions/SubmissionRow/style.scss

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,3 +193,23 @@
193193
margin: 10px 10px 0 10px;
194194
padding-top: 5px;
195195
}
196+
197+
.level-1 {
198+
color: $member-gray !important;
199+
}
200+
201+
.level-2 {
202+
color: $member-green !important;
203+
}
204+
205+
.level-3 {
206+
color: $member-blue !important;
207+
}
208+
209+
.level-4 {
210+
color: $member-yellow !important;
211+
}
212+
213+
.level-5 {
214+
color: $member-red !important;
215+
}

src/shared/components/challenge-detail/Submissions/index.jsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { PrimaryButton } from 'topcoder-react-ui-kit';
1818
import sortList from 'utils/challenge-detail/sort';
1919
import challengeDetailsActions from 'actions/page/challenge-details';
2020
import LoadingIndicator from 'components/LoadingIndicator';
21-
import { goToLogin } from 'utils/tc';
21+
import { goToLogin, getRatingLevel } from 'utils/tc';
2222
import Lock from '../icons/lock.svg';
2323
import SubmissionRow from './SubmissionRow';
2424
import SubmissionInformationModal from './SubmissionInformationModal';
@@ -316,7 +316,7 @@ class SubmissionsComponent extends React.Component {
316316
href={`${window.origin}/members/${s.createdBy}`}
317317
target={`${_.includes(window.origin, 'www') ? '_self' : '_blank'}`}
318318
rel="noopener noreferrer"
319-
style={_.get(s, 'colorStyle')}
319+
styleName={`level-${getRatingLevel(_.get(s.registrant, 'rating', 0))}`}
320320
>
321321
{s.createdBy}
322322
</a>
@@ -707,7 +707,7 @@ class SubmissionsComponent extends React.Component {
707707
<div key={s.createdBy + s.created} styleName="row">
708708
{
709709
!isF2F && !isBugHunt && (
710-
<div styleName="col-2" style={s.colorStyle}>
710+
<div styleName={`col-2 level-${getRatingLevel(_.get(s.registrant, 'rating', 0))}`}>
711711
{ (s.registrant && !_.isNil(s.registrant.rating)) ? s.registrant.rating : '-'}
712712
</div>
713713
)
@@ -717,8 +717,7 @@ class SubmissionsComponent extends React.Component {
717717
href={`${window.origin}/members/${s.createdBy}`}
718718
target={`${_.includes(window.origin, 'www') ? '_self' : '_blank'}`}
719719
rel="noopener noreferrer"
720-
styleName="handle"
721-
style={s.colorStyle}
720+
styleName={`handle level-${getRatingLevel(_.get(s.registrant, 'rating', 0))}`}
722721
>
723722
{s.createdBy}
724723
</a>

src/shared/components/challenge-detail/Submissions/style.scss

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,3 +355,23 @@
355355
margin-top: 25px !important;
356356
align-self: center;
357357
}
358+
359+
.level-1 {
360+
color: $member-gray !important;
361+
}
362+
363+
.level-2 {
364+
color: $member-green !important;
365+
}
366+
367+
.level-3 {
368+
color: $member-blue !important;
369+
}
370+
371+
.level-4 {
372+
color: $member-yellow !important;
373+
}
374+
375+
.level-5 {
376+
color: $member-red !important;
377+
}

0 commit comments

Comments
 (0)