Skip to content

Commit d55912f

Browse files
issue 4552 fix
1 parent ad26fae commit d55912f

File tree

4 files changed

+48
-9
lines changed

4 files changed

+48
-9
lines changed

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

Lines changed: 4 additions & 5 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,15 @@ 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
8182
styleName="col"
8283
href={`${window.origin}/members/${member}`}
8384
target={`${_.includes(window.origin, 'www') ? '_self' : '_blank'}`}
8485
rel="noopener noreferrer"
85-
style={colorStyle}
86+
styleName={`level-${getRatingLevel(rating)}`}
8687
>
8788
{member || '-'}
8889
</a>
@@ -164,7 +165,6 @@ export default function SubmissionRow({
164165

165166
SubmissionRow.defaultProps = {
166167
toggleHistory: () => {},
167-
colorStyle: {},
168168
score: {},
169169
isReviewPhaseComplete: false,
170170
finalRank: null,
@@ -205,7 +205,6 @@ SubmissionRow.propTypes = {
205205
}),
206206
rating: PT.number,
207207
toggleHistory: PT.func,
208-
colorStyle: PT.shape(),
209208
isReviewPhaseComplete: PT.bool,
210209
finalRank: PT.number,
211210
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 & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import React from 'react';
77
import PT from 'prop-types';
88
import moment from 'moment';
99
import { isMM as checkIsMM } from 'utils/challenge';
10+
import { getRatingLevel } from 'utils/tc';
1011
import _ from 'lodash';
1112
import { connect } from 'react-redux';
1213
import { config } from 'topcoder-react-utils';
@@ -316,7 +317,7 @@ class SubmissionsComponent extends React.Component {
316317
href={`${window.origin}/members/${s.createdBy}`}
317318
target={`${_.includes(window.origin, 'www') ? '_self' : '_blank'}`}
318319
rel="noopener noreferrer"
319-
style={_.get(s, 'colorStyle')}
320+
styleName={`level-${getRatingLevel(_.get(s.registrant, 'rating', 0))}`}
320321
>
321322
{s.createdBy}
322323
</a>
@@ -707,7 +708,7 @@ class SubmissionsComponent extends React.Component {
707708
<div key={s.createdBy + s.created} styleName="row">
708709
{
709710
!isF2F && !isBugHunt && (
710-
<div styleName="col-2" style={s.colorStyle}>
711+
<div styleName={`col-2 level-${getRatingLevel(_.get(s.registrant, 'rating', 0))}`} >
711712
{ (s.registrant && !_.isNil(s.registrant.rating)) ? s.registrant.rating : '-'}
712713
</div>
713714
)
@@ -717,8 +718,7 @@ class SubmissionsComponent extends React.Component {
717718
href={`${window.origin}/members/${s.createdBy}`}
718719
target={`${_.includes(window.origin, 'www') ? '_self' : '_blank'}`}
719720
rel="noopener noreferrer"
720-
styleName="handle"
721-
style={s.colorStyle}
721+
styleName={`handle level-${getRatingLevel(_.get(s.registrant, 'rating', 0))}`}
722722
>
723723
{s.createdBy}
724724
</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)