fix: sync submissions with api changes

icpc-scu-community · Oct 25, 2021 · 9eb676b · 9eb676b
1 parent 7a853fb
commit 9eb676b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 40 deletions.
diff --git a/src/Components/Board/Board.js b/src/Components/Board/Board.js
@@ -87,10 +87,11 @@ class Board extends React.Component {
           </div>
           <div className="sheets-section">
             <div className="sheets">
-              {sheets.map(({ id, name, problems }, sheetIndex) => (
+              {sheets.map(({ id, groupId, name, problems }, sheetIndex) => (
                 <div className="sheet-collection" key={sheetIndex}>
                   <Sheet
                     id={id}
+                    groupId={groupId}
                     name={name}
                     problems={problems}
                     traineesCount={traineesCount}

diff --git a/src/Components/BoardCell/BoardCell.js b/src/Components/BoardCell/BoardCell.js
@@ -6,52 +6,27 @@ import styles from './styles';
 
 class BoardCell extends React.Component {
   render() {
-    const { sheetId, submission, ignored, right, bottom, firstColumn, firstRow } = this.props;
-    const { verdict, triesBeforeAC, list } = submission;
+    const { submission, ignored, firstColumn, firstRow } = this.props;
+    const { isAc, triesBeforeAc } = submission;
+    const isSolved = isAc !== undefined;
 
     return (
       <>
         <div
           className={cn('board-cell', {
             'first-column': firstColumn,
             'first-row': firstRow,
-            ac: verdict === 'AC',
-            'not-ac': verdict !== 'AC',
-            'not-solved': verdict === undefined,
+            ac: isAc,
+            'not-ac': !isAc,
+            'not-solved': !isSolved,
             ignored,
           })}
           style={{ width: blockSize, height: blockSize }}
         >
-          {verdict !== undefined ? (
+          {isSolved ? (
             <>
-              <div>{verdict}</div>
-              <div className="tries-before-ac">{triesBeforeAC ? `+${triesBeforeAC}` : ''}</div>
-              <div
-                className="list"
-                style={{
-                  [right ? 'right' : 'left']: blockSize / 2 - 15,
-                  [bottom ? 'bottom' : 'top']: blockSize / 2 + 15,
-                }}
-              >
-                {list.map(({ id: submissionId, message, verdict: submissionVerdict }, submissionIndex) => (
-                  <a
-                    key={submissionIndex}
-                    className="list-item"
-                    href={`https://codeforces.com/group/MWSDmqGsZm/contest/${sheetId}/submission/${submissionId}`}
-                    rel="noopener noreferrer"
-                    target="_blank"
-                  >
-                    <div
-                      className={cn('state', {
-                        ac: submissionVerdict === 'AC',
-                        'not-ac': submissionVerdict !== 'AC',
-                      })}
-                    ></div>
-                    <div>{submissionId}</div>
-                    <div>{message}</div>
-                  </a>
-                ))}
-              </div>
+              <div>{isAc ? 'AC' : ''}</div>
+              <div className="tries-before-ac">{triesBeforeAc ? `+${triesBeforeAc}` : ''}</div>
             </>
           ) : (
             <div>?</div>
@@ -64,7 +39,7 @@ class BoardCell extends React.Component {
 }
 
 BoardCell.propTypes = {
-  sheetId: PropTypes.string.isRequired,
+  sheetId: PropTypes.number.isRequired,
   submission: PropTypes.object.isRequired,
   ignored: PropTypes.bool.isRequired,
   right: PropTypes.bool.isRequired,

diff --git a/src/Components/Sheet/Sheet.js b/src/Components/Sheet/Sheet.js
@@ -6,14 +6,14 @@ import styles from './styles';
 
 class Sheet extends React.Component {
   render() {
-    const { id, name, problems, traineesCount, hovered, hoveredProblemIndex, onSheetHover, onProblemHover } =
+    const { id, groupId, name, problems, traineesCount, hovered, hoveredProblemIndex, onSheetHover, onProblemHover } =
       this.props;
 
     return (
       <>
         <div className="sheet">
           <a
-            href={`https://codeforces.com/group/MWSDmqGsZm/contest/${id}`}
+            href={`https://codeforces.com/group/${groupId}/contest/${id}`}
             rel="noopener noreferrer"
             target="_blank"
             className={cn('title', { hovered })}
@@ -27,7 +27,7 @@ class Sheet extends React.Component {
             {problems.map((problem, index) => (
               <a
                 key={index}
-                href={`https://codeforces.com/group/MWSDmqGsZm/contest/${id}/problem/${problem.id}`}
+                href={`https://codeforces.com/group/${groupId}/contest/${id}/problem/${problem.id}`}
                 rel="noopener noreferrer"
                 target="_blank"
                 className={cn('problem', {
@@ -67,7 +67,8 @@ class Sheet extends React.Component {
 }
 
 Sheet.propTypes = {
-  id: PropTypes.string.isRequired,
+  id: PropTypes.number.isRequired,
+  groupId: PropTypes.string.isRequired,
   name: PropTypes.string.isRequired,
   problems: PropTypes.arrayOf(
     PropTypes.shape({