+ {
+ isMM && (
+
+
+ Provisional Score
+
+
+ )
+ }
+
Time
{
@@ -233,6 +319,7 @@ export default function SubmissionRow({
auth={auth}
isLoggedIn={isLoggedIn}
submissionId={submissionHistory.submissionId}
+ createdAt={submissionHistory.created || submissionHistory.createdAt}
/>
))
}
@@ -257,6 +344,8 @@ SubmissionRow.defaultProps = {
provisionalRank: null,
rating: null,
isLoggedIn: false,
+ isF2F: false,
+ isBugHunt: false,
};
SubmissionRow.propTypes = {
@@ -265,6 +354,8 @@ SubmissionRow.propTypes = {
openHistory: PT.bool.isRequired,
member: PT.string.isRequired,
challengeStatus: PT.string.isRequired,
+ isF2F: PT.bool,
+ isBugHunt: PT.bool,
submissions: PT.arrayOf(PT.shape({
provisionalScore: PT.oneOfType([
PT.number,
@@ -276,12 +367,26 @@ SubmissionRow.propTypes = {
PT.string,
PT.oneOf([null]),
]),
+ initialScore: PT.oneOfType([
+ PT.number,
+ PT.string,
+ PT.oneOf([null]),
+ ]),
status: PT.string.isRequired,
+ id: PT.string.isRequired,
submissionId: PT.string.isRequired,
submissionTime: PT.oneOfType([
PT.string,
PT.oneOf([null]),
- ]).isRequired,
+ ]),
+ created: PT.oneOfType([
+ PT.string,
+ PT.oneOf([null]),
+ ]),
+ createdAt: PT.oneOfType([
+ PT.string,
+ PT.oneOf([null]),
+ ]),
})).isRequired,
rating: PT.number,
toggleHistory: PT.func,
diff --git a/src/shared/components/challenge-detail/Submissions/index.jsx b/src/shared/components/challenge-detail/Submissions/index.jsx
index c1165ac63..6082a0e94 100644
--- a/src/shared/components/challenge-detail/Submissions/index.jsx
+++ b/src/shared/components/challenge-detail/Submissions/index.jsx
@@ -41,6 +41,52 @@ const { getProvisionalScore, getFinalScore } = submissionUtils;
const { getService } = services.submissions;
+/**
+ * Groups submissions by member
+ * @param {Array} submissions all submissions
+ * @return {Array} grouped submissions by member
+ */
+function groupSubmissionsByMember(submissions) {
+ if (!Array.isArray(submissions)) {
+ return [];
+ }
+
+ const memberMap = new Map();
+
+ submissions.forEach((submission) => {
+ const memberHandle = _.get(submission, 'registrant.memberHandle', '');
+ if (!memberHandle) {
+ return;
+ }
+
+ if (!memberMap.has(memberHandle)) {
+ memberMap.set(memberHandle, {
+ member: memberHandle,
+ registrant: submission.registrant,
+ submissions: [],
+ rating: submission.rating,
+ });
+ }
+
+ const memberEntry = memberMap.get(memberHandle);
+ memberEntry.submissions.push(submission);
+ // Update rating to the latest
+ if (submission.rating !== undefined) {
+ memberEntry.rating = submission.rating;
+ }
+ });
+
+ // Convert map to array and sort submissions within each member by date (newest first)
+ return Array.from(memberMap.values()).map(memberGroup => ({
+ ...memberGroup,
+ submissions: memberGroup.submissions.sort((a, b) => {
+ const timeA = new Date(a.created || a.createdAt).getTime();
+ const timeB = new Date(b.created || b.createdAt).getTime();
+ return timeB - timeA; // Newest first
+ }),
+ }));
+}
+
class SubmissionsComponent extends React.Component {
constructor(props) {
super(props);
@@ -196,7 +242,14 @@ class SubmissionsComponent extends React.Component {
const { submissions, mmSubmissions } = this.props;
const source = isMM ? mmSubmissions : submissions;
const sourceList = Array.isArray(source) ? source : [];
- const sortedSubmissions = _.cloneDeep(sourceList);
+
+ let sortedSubmissions = _.cloneDeep(sourceList);
+
+ // Group submissions by member for non-MM challenges
+ if (!isMM) {
+ sortedSubmissions = groupSubmissionsByMember(sortedSubmissions);
+ }
+
this.sortSubmissions(sortedSubmissions);
this.setState({ sortedSubmissions });
}
@@ -212,15 +265,30 @@ class SubmissionsComponent extends React.Component {
const isMM = this.isMM();
const isReviewPhaseComplete = this.checkIsReviewPhaseComplete();
const { field, sort } = this.getSubmissionsSortParam(isMM, isReviewPhaseComplete);
- let isHaveFinalScore = false;
- if (field === 'Initial Score' || field === 'Final Score') {
- isHaveFinalScore = _.some(
+
+ // For non-MM submissions that are grouped by member, we need to adjust the sorting logic
+ const isGrouped = !isMM && submissions.length > 0 && submissions[0].submissions;
+
+ let hasFinalScore = false;
+ if (!isGrouped && (field === 'Initial Score' || field === 'Final Score')) {
+ hasFinalScore = _.some(
submissions,
s => Number.isFinite(Number(_.get(s, 'finalScore'))),
);
+ } else if (isGrouped && (field === 'Initial Score' || field === 'Final Score')) {
+ // For grouped submissions, check in the submissions array
+ hasFinalScore = _.some(
+ submissions,
+ group => _.some(
+ group.submissions,
+ s => Number.isFinite(Number(_.get(s, 'finalScore'))),
+ ),
+ );
}
+
const toSubmissionTime = (entry) => {
- const latest = _.get(entry, ['submissions', 0]);
+ const entrySubmissions = entry.submissions || [entry];
+ const latest = _.get(entrySubmissions, [0]);
if (!latest) {
return null;
}
@@ -231,15 +299,28 @@ class SubmissionsComponent extends React.Component {
const timestamp = new Date(submissionTime).getTime();
return Number.isFinite(timestamp) ? timestamp : null;
};
+
const toRankValue = rank => (_.isFinite(rank) ? rank : Number.MAX_SAFE_INTEGER);
const toScoreValue = (score) => {
const numeric = Number(score);
return Number.isFinite(numeric) ? numeric : null;
};
+
sortList(submissions, field, sort, (a, b) => {
let valueA = 0;
let valueB = 0;
let valueIsString = false;
+
+ const getPrimarySubmission = (entry) => {
+ if (isGrouped) {
+ return _.get(entry, ['submissions', 0]);
+ }
+ return entry;
+ };
+
+ const primaryA = getPrimarySubmission(a);
+ const primaryB = getPrimarySubmission(b);
+
switch (field) {
case 'Country': {
valueA = a.registrant ? a.registrant.countryCode : '';
@@ -248,12 +329,12 @@ class SubmissionsComponent extends React.Component {
break;
}
case 'Rating': {
- valueA = a.registrant ? a.registrant.rating : 0;
- valueB = b.registrant ? b.registrant.rating : 0;
+ valueA = a.rating || (a.registrant ? a.registrant.rating : 0);
+ valueB = b.rating || (b.registrant ? b.registrant.rating : 0);
break;
}
case 'Username': {
- if (isMM) {
+ if (isMM || isGrouped) {
valueA = `${a.member || ''}`.toLowerCase();
valueB = `${b.member || ''}`.toLowerCase();
} else {
@@ -268,19 +349,19 @@ class SubmissionsComponent extends React.Component {
valueB = toSubmissionTime(b);
break;
case 'Submission Date': {
- const createdA = a.created || a.createdAt;
- const createdB = b.created || b.createdAt;
+ const createdA = primaryA ? (primaryA.created || primaryA.createdAt) : null;
+ const createdB = primaryB ? (primaryB.created || primaryB.createdAt) : null;
valueA = createdA ? new Date(createdA).getTime() : null;
valueB = createdB ? new Date(createdB).getTime() : null;
break;
}
case 'Initial Score': {
- if (isHaveFinalScore) {
- valueA = toScoreValue(_.get(a, 'finalScore'));
- valueB = toScoreValue(_.get(b, 'finalScore'));
+ if (hasFinalScore) {
+ valueA = toScoreValue(_.get(primaryA, 'finalScore'));
+ valueB = toScoreValue(_.get(primaryB, 'finalScore'));
} else {
- valueA = toScoreValue(_.get(a, 'initialScore'));
- valueB = toScoreValue(_.get(b, 'initialScore'));
+ valueA = toScoreValue(_.get(primaryA, 'initialScore'));
+ valueB = toScoreValue(_.get(primaryB, 'initialScore'));
}
break;
}
@@ -297,13 +378,13 @@ class SubmissionsComponent extends React.Component {
break;
}
case 'Final Score': {
- valueA = toScoreValue(getFinalScore(a));
- valueB = toScoreValue(getFinalScore(b));
+ valueA = toScoreValue(getFinalScore(primaryA));
+ valueB = toScoreValue(getFinalScore(primaryB));
break;
}
case 'Provisional Score': {
- valueA = toScoreValue(getProvisionalScore(a));
- valueB = toScoreValue(getProvisionalScore(b));
+ valueA = toScoreValue(getProvisionalScore(primaryA));
+ valueB = toScoreValue(getProvisionalScore(primaryB));
break;
}
default:
@@ -727,6 +808,13 @@ class SubmissionsComponent extends React.Component {
>{ finalScoreClicked ?
:
}