Skip to content

Commit

Permalink
Merge b97ec07 into ec217a1
Browse files Browse the repository at this point in the history
  • Loading branch information
@angelsl
angelsl committed Jun 10, 2021
2 parents ec217a1 + b97ec07 commit c50e7a9
Show file tree
Hide file tree
Showing 8 changed files with 1,517 additions and 1,621 deletions.
48 changes: 24 additions & 24 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,37 +28,37 @@
}
},
"dependencies": {
"@blueprintjs/core": "^3.44.2",
"@blueprintjs/datetime": "^3.23.2",
"@blueprintjs/icons": "^3.26.0",
"@blueprintjs/popover2": "^0.8.0",
"@blueprintjs/select": "^3.16.2",
"@octokit/rest": "^18.5.3",
"@sentry/browser": "^6.3.6",
"@blueprintjs/core": "^3.45.0",
"@blueprintjs/datetime": "^3.23.4",
"@blueprintjs/icons": "^3.26.1",
"@blueprintjs/popover2": "^0.10.1",
"@blueprintjs/select": "^3.16.4",
"@octokit/rest": "^18.5.6",
"@sentry/browser": "^6.6.0",
"@sourceacademy/sharedb-ace": "^2.0.2",
"@sourceacademy/sling-client": "^0.0.1",
"@testing-library/user-event": "^13.1.9",
"@types/uuid": "^8.3.0",
"ace-builds": "^1.4.12",
"acorn": "^8.2.4",
"ag-grid-community": "^25.2.1",
"ag-grid-react": "^25.2.0",
"acorn": "^8.3.0",
"ag-grid-community": "^25.3.0",
"ag-grid-react": "^25.3.0",
"array-move": "^3.0.1",
"classnames": "^2.3.1",
"connected-react-router": "^6.9.1",
"flexboxgrid": "^6.3.1",
"flexboxgrid-helpers": "^1.1.3",
"js-slang": "^0.5.0",
"js-slang": "^0.5.1",
"konva": "^7.2.5",
"lodash": "^4.17.21",
"lz-string": "^1.4.4",
"moment": "^2.29.1",
"normalize.css": "^8.0.1",
"phaser": "^3.54.0",
"phaser": "^3.55.2",
"query-string": "^7.0.0",
"re-resizable": "^6.9.0",
"react": "^17.0.2",
"react-ace": "^9.4.0",
"react-ace": "^9.4.1",
"react-copy-to-clipboard": "^5.0.3",
"react-dom": "^17.0.2",
"react-draggable": "^4.4.3",
Expand All @@ -70,9 +70,9 @@
"react-responsive": "^8.2.0",
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0",
"react-simple-keyboard": "^3.1.36",
"react-simple-keyboard": "^3.1.42",
"react-sortable-hoc": "^1.11.0",
"react-textarea-autosize": "^8.3.2",
"react-textarea-autosize": "^8.3.3",
"redux": "^4.1.0",
"redux-mock-store": "^1.5.4",
"redux-saga": "^1.1.3",
Expand All @@ -88,7 +88,7 @@
"@testing-library/react": "^11.2.7",
"@types/acorn": "^4.0.5",
"@types/common-tags": "^1.8.0",
"@types/draft-js": "^0.11.2",
"@types/draft-js": "^0.11.3",
"@types/enzyme": "3.10.8",
"@types/enzyme-adapter-react-16": "^1.0.6",
"@types/estree": "0.0.45",
Expand All @@ -99,15 +99,15 @@
"@types/google.picker": "^0.0.36",
"@types/invariant": "^2.2.34",
"@types/jest": "^26.0.23",
"@types/lodash": "^4.14.169",
"@types/lodash": "^4.14.170",
"@types/lz-string": "^1.3.34",
"@types/node": "^15.12.1",
"@types/react": "^17.0.5",
"@types/node": "^15.12.2",
"@types/react": "^17.0.11",
"@types/react-copy-to-clipboard": "^5.0.0",
"@types/react-dom": "^17.0.5",
"@types/react-dom": "^17.0.7",
"@types/react-redux": "^7.1.16",
"@types/react-responsive": "^8.0.2",
"@types/react-router": "^5.1.14",
"@types/react-router": "^5.1.15",
"@types/react-router-dom": "^5.1.7",
"@types/react-router-redux": "^5.0.18",
"@types/react-test-renderer": "^17.0.1",
Expand All @@ -127,12 +127,12 @@
"jest-canvas-mock": "^2.3.1",
"konva-node": "^0.11.2",
"npm-run-all": "^4.1.5",
"prettier": "^2.3.0",
"prettier": "^2.3.1",
"react-scripts": "^4.0.3",
"react-test-renderer": "^17.0.2",
"redux-saga-test-plan": "^4.0.1",
"sass": "^1.32.13",
"typescript": "^4.2.4"
"sass": "^1.34.1",
"typescript": "~4.2"
},
"browserslist": {
"production": [
Expand Down
108 changes: 56 additions & 52 deletions src/commons/assessment/__tests__/__snapshots__/Assessment.tsx.snap
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/commons/notificationBadge/__tests__/__snapshots__/NotificationBadge.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ exports[`Badge renders properly with notifications 1`] = `
<Manager>
<Reference>
<Blueprint3.ResizeSensor2 targetRef={[Function (anonymous)]} onResize={[Function (anonymous)]}>
<span className=\\"bp3-popover2-target\\" onBlur={[Function (anonymous)]} onFocus={[Function (anonymous)]} onMouseEnter={[Function (anonymous)]} onMouseLeave={[Function (anonymous)]}>
<span className=\\"bp3-popover2-target\\" onBlur={[Function (anonymous)]} onContextMenu={[Function (anonymous)]} onFocus={[Function (anonymous)]} onMouseEnter={[Function (anonymous)]} onMouseLeave={[Function (anonymous)]}>
<Blueprint3.Tag intent=\\"danger\\" round={true} large={[undefined]} className=\\"\\" disabled={[undefined]} tabIndex={0}>
<span disabled={[undefined]} className=\\"bp3-tag bp3-intent-danger bp3-round\\" tabIndex={[undefined]}>
<Blueprint3.Icon icon={[undefined]} />
Expand Down Expand Up @@ -37,7 +37,7 @@ exports[`Badge with filter, filterNotificationsByAssessment renders properly 1`]
<Manager>
<Reference>
<Blueprint3.ResizeSensor2 targetRef={[Function (anonymous)]} onResize={[Function (anonymous)]}>
<span className=\\"bp3-popover2-target\\" onBlur={[Function (anonymous)]} onFocus={[Function (anonymous)]} onMouseEnter={[Function (anonymous)]} onMouseLeave={[Function (anonymous)]}>
<span className=\\"bp3-popover2-target\\" onBlur={[Function (anonymous)]} onContextMenu={[Function (anonymous)]} onFocus={[Function (anonymous)]} onMouseEnter={[Function (anonymous)]} onMouseLeave={[Function (anonymous)]}>
<Blueprint3.Tag intent=\\"danger\\" round={true} large={[undefined]} className=\\"\\" disabled={[undefined]} tabIndex={0}>
<span disabled={[undefined]} className=\\"bp3-tag bp3-intent-danger bp3-round\\" tabIndex={[undefined]}>
<Blueprint3.Icon icon={[undefined]} />
Expand Down Expand Up @@ -66,7 +66,7 @@ exports[`Badge with filter, filterNotificationsByAssessment renders properly 2`]
<Manager>
<Reference>
<Blueprint3.ResizeSensor2 targetRef={[Function (anonymous)]} onResize={[Function (anonymous)]}>
<span className=\\"bp3-popover2-target\\" onBlur={[Function (anonymous)]} onFocus={[Function (anonymous)]} onMouseEnter={[Function (anonymous)]} onMouseLeave={[Function (anonymous)]}>
<span className=\\"bp3-popover2-target\\" onBlur={[Function (anonymous)]} onContextMenu={[Function (anonymous)]} onFocus={[Function (anonymous)]} onMouseEnter={[Function (anonymous)]} onMouseLeave={[Function (anonymous)]}>
<Blueprint3.Tag intent=\\"danger\\" round={true} large={[undefined]} className=\\"\\" disabled={[undefined]} tabIndex={0}>
<span disabled={[undefined]} className=\\"bp3-tag bp3-intent-danger bp3-round\\" tabIndex={[undefined]}>
<Blueprint3.Icon icon={[undefined]} />
Expand Down
3 changes: 2 additions & 1 deletion src/commons/sideContent/SideContentContestVotingContainer.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ const SideContentContestVotingContainer: React.FunctionComponent<SideContentCont
*/
const isSubmissionValid = (votingSubmission: ContestEntry[]) => {
return votingSubmission.reduce((isValid, vote) => {
return isValid && vote.rank! >= 1 && vote.rank! <= contestEntries.length;
const rank = vote.rank!;
return isValid && rank >= 1 && rank <= contestEntries.length;
}, true);
};

Expand Down

0 comments on commit c50e7a9

Please sign in to comment.