Skip to content

Commit c61779d

Browse files
ccyccyccyjiayushe
ccyccyccy
authored and
jiayushe
committed
Remove console-log, reset ts-config
1 parent cbeeb8e commit c61779d

File tree

10 files changed

+5037
-456
lines changed

10 files changed

+5037
-456
lines changed

‎package-lock.json

Lines changed: 4826 additions & 272 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,11 @@
6363
"redux": "^3.7.2",
6464
"redux-mock-store": "^1.5.1",
6565
"redux-saga": "^0.15.6",
66-
"sharedb-ace": "^1.0.5",
66+
"sharedb-ace": "^1.0.9",
6767
"showdown": "^1.9.0",
6868
"typesafe-actions": "^3.2.1",
6969
"utility-types": "^2.0.0"
7070
},
71-
"resolutions": {
72-
"reconnecting-websocket": "4.1.10"
73-
},
7471
"devDependencies": {
7572
"@blueprintjs/core": "^2.1.1",
7673
"@blueprintjs/icons": "^3.6.0",

‎src/actions/workspaces.ts

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// tslint:disable:no-console
21
import { ActionCreator } from 'redux';
32

43
import { ExternalLibraryName, Library } from '../components/assessment/assessmentShape';
@@ -234,16 +233,13 @@ export const setEditorSessionId: ActionCreator<actionTypes.IAction> = (
234233
export const setWebsocketStatus: ActionCreator<actionTypes.IAction> = (
235234
workspaceLocation: WorkspaceLocations,
236235
websocketStatus: number
237-
) => {
238-
console.log('In workspace action, WS status: ' + websocketStatus);
239-
return {
240-
type: actionTypes.SET_WEBSOCKET_STATUS,
241-
payload: {
242-
workspaceLocation,
243-
websocketStatus
244-
}
245-
};
246-
};
236+
) => ({
237+
type: actionTypes.SET_WEBSOCKET_STATUS,
238+
payload: {
239+
workspaceLocation,
240+
websocketStatus
241+
}
242+
});
247243

248244
export const updateCurrentAssessmentId = (assessmentId: number, questionId: number) => ({
249245
type: actionTypes.UPDATE_CURRENT_ASSESSMENT_ID,

‎src/components/assessment/__tests__/__snapshots__/AssessmentWorkspace.tsx.snap

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,22 @@ exports[`AssessmentWorkspace page with MCQ question renders correctly 1`] = `
1010
<Blueprint2.Button className=\\"assessment-briefing-button\\" onClick={[Function: onClick]} text=\\"Continue\\" />
1111
</Blueprint2.Card>
1212
</Blueprint2.Dialog>
13+
<Blueprint2.Dialog className=\\"assessment-reset\\" icon=\\"error\\" isCloseButtonShown={false} isOpen={false} title=\\"Confirmation: Reset editor?\\" canOutsideClickClose={true}>
14+
<div className=\\"pt-dialog-body\\">
15+
<Markdown content=\\"Are you sure you want to reset the template?\\" />
16+
<Markdown content=\\"*Note this will not affect the saved copy of your code, unless you save over it.*\\" />
17+
</div>
18+
<div className=\\"pt-dialog-footer\\">
19+
<Blueprint2.ButtonGroup>
20+
<Blueprint2.Button disabled={false} fill={false} intent=\\"none\\" minimal={false} className=\\"\\" type=\\"\\" onClick={[Function]}>
21+
Cancel
22+
</Blueprint2.Button>
23+
<Blueprint2.Button disabled={false} fill={false} intent=\\"danger\\" minimal={false} className=\\"\\" type=\\"\\" onClick={[Function]}>
24+
Confirm
25+
</Blueprint2.Button>
26+
</Blueprint2.ButtonGroup>
27+
</div>
28+
</Blueprint2.Dialog>
1329
<Workspace controlBarProps={{...}} editorProps={[undefined]} editorWidth=\\"50%\\" handleEditorWidthChange={[Function: handleEditorWidthChange]} handleSideContentHeightChange={[Function: handleSideContentHeightChange]} hasUnsavedChanges={false} mcqProps={{...}} sideContentHeight={[undefined]} sideContentProps={{...}} replProps={{...}} />
1430
</div>"
1531
`;
@@ -22,6 +38,22 @@ exports[`AssessmentWorkspace page with overdue assessment renders correctly 1`]
2238
<Blueprint2.Button className=\\"assessment-briefing-button\\" onClick={[Function: onClick]} text=\\"Continue\\" />
2339
</Blueprint2.Card>
2440
</Blueprint2.Dialog>
41+
<Blueprint2.Dialog className=\\"assessment-reset\\" icon=\\"error\\" isCloseButtonShown={false} isOpen={false} title=\\"Confirmation: Reset editor?\\" canOutsideClickClose={true}>
42+
<div className=\\"pt-dialog-body\\">
43+
<Markdown content=\\"Are you sure you want to reset the template?\\" />
44+
<Markdown content=\\"*Note this will not affect the saved copy of your code, unless you save over it.*\\" />
45+
</div>
46+
<div className=\\"pt-dialog-footer\\">
47+
<Blueprint2.ButtonGroup>
48+
<Blueprint2.Button disabled={false} fill={false} intent=\\"none\\" minimal={false} className=\\"\\" type=\\"\\" onClick={[Function]}>
49+
Cancel
50+
</Blueprint2.Button>
51+
<Blueprint2.Button disabled={false} fill={false} intent=\\"danger\\" minimal={false} className=\\"\\" type=\\"\\" onClick={[Function]}>
52+
Confirm
53+
</Blueprint2.Button>
54+
</Blueprint2.ButtonGroup>
55+
</div>
56+
</Blueprint2.Dialog>
2557
<Workspace controlBarProps={{...}} editorProps={{...}} editorWidth=\\"50%\\" handleEditorWidthChange={[Function: handleEditorWidthChange]} handleSideContentHeightChange={[Function: handleSideContentHeightChange]} hasUnsavedChanges={false} mcqProps={{...}} sideContentHeight={[undefined]} sideContentProps={{...}} replProps={{...}} />
2658
</div>"
2759
`;
@@ -34,6 +66,22 @@ exports[`AssessmentWorkspace page with programming question renders correctly 1`
3466
<Blueprint2.Button className=\\"assessment-briefing-button\\" onClick={[Function: onClick]} text=\\"Continue\\" />
3567
</Blueprint2.Card>
3668
</Blueprint2.Dialog>
69+
<Blueprint2.Dialog className=\\"assessment-reset\\" icon=\\"error\\" isCloseButtonShown={false} isOpen={false} title=\\"Confirmation: Reset editor?\\" canOutsideClickClose={true}>
70+
<div className=\\"pt-dialog-body\\">
71+
<Markdown content=\\"Are you sure you want to reset the template?\\" />
72+
<Markdown content=\\"*Note this will not affect the saved copy of your code, unless you save over it.*\\" />
73+
</div>
74+
<div className=\\"pt-dialog-footer\\">
75+
<Blueprint2.ButtonGroup>
76+
<Blueprint2.Button disabled={false} fill={false} intent=\\"none\\" minimal={false} className=\\"\\" type=\\"\\" onClick={[Function]}>
77+
Cancel
78+
</Blueprint2.Button>
79+
<Blueprint2.Button disabled={false} fill={false} intent=\\"danger\\" minimal={false} className=\\"\\" type=\\"\\" onClick={[Function]}>
80+
Confirm
81+
</Blueprint2.Button>
82+
</Blueprint2.ButtonGroup>
83+
</div>
84+
</Blueprint2.Dialog>
3785
<Workspace controlBarProps={{...}} editorProps={{...}} editorWidth=\\"50%\\" handleEditorWidthChange={[Function: handleEditorWidthChange]} handleSideContentHeightChange={[Function: handleSideContentHeightChange]} hasUnsavedChanges={false} mcqProps={{...}} sideContentHeight={[undefined]} sideContentProps={{...}} replProps={{...}} />
3886
</div>"
3987
`;

‎src/components/assessment/__tests__/__snapshots__/index.tsx.snap

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -239,10 +239,10 @@ exports[`Assessment page does not show attempt Button for upcoming assessments f
239239
Due: 18th June, 13:24
240240
</div>
241241
</Text>
242-
<NavLink to=\\"/academy/missions/0/0\\" activeClassName=\\"active\\" ariaCurrent=\\"true\\">
243-
<Route path=\\"/academy/missions/0/0\\" exact={[undefined]} strict={[undefined]} location={[undefined]}>
244-
<Link to=\\"/academy/missions/0/0\\" className={[undefined]} style={[undefined]} aria-current={false} replace={false}>
245-
<a className={[undefined]} style={[undefined]} aria-current={false} onClick={[Function]} href=\\"/academy/missions/0/0\\">
242+
<NavLink to=\\"/academy/missions/0/0\\" activeClassName=\\"active\\" aria-current=\\"page\\">
243+
<Route path=\\"\\\\\\\\/academy\\\\\\\\/missions\\\\\\\\/0\\\\\\\\/0\\" exact={[undefined]} strict={[undefined]} location={[undefined]}>
244+
<Link to=\\"/academy/missions/0/0\\" className={[undefined]} style={[undefined]} aria-current={{...}} replace={false}>
245+
<a className={[undefined]} style={[undefined]} aria-current={{...}} onClick={[Function]} href=\\"/academy/missions/0/0\\">
246246
<Blueprint2.Button disabled={false} fill={false} intent=\\"none\\" minimal={true} className=\\"\\" type=\\"\\" icon={{...}}>
247247
<button type=\\"\\" disabled={[undefined]} className=\\"pt-button pt-minimal\\" onClick={[undefined]} onKeyDown={[Function]} onKeyUp={[Function]}>
248248
<Blueprint2.Icon icon={{...}}>
@@ -338,10 +338,10 @@ exports[`Assessment page does not show attempt Button for upcoming assessments f
338338
Due: 18th June, 13:24
339339
</div>
340340
</Text>
341-
<NavLink to=\\"/academy/missions/1/0\\" activeClassName=\\"active\\" ariaCurrent=\\"true\\">
342-
<Route path=\\"/academy/missions/1/0\\" exact={[undefined]} strict={[undefined]} location={[undefined]}>
343-
<Link to=\\"/academy/missions/1/0\\" className={[undefined]} style={[undefined]} aria-current={false} replace={false}>
344-
<a className={[undefined]} style={[undefined]} aria-current={false} onClick={[Function]} href=\\"/academy/missions/1/0\\">
341+
<NavLink to=\\"/academy/missions/1/0\\" activeClassName=\\"active\\" aria-current=\\"page\\">
342+
<Route path=\\"\\\\\\\\/academy\\\\\\\\/missions\\\\\\\\/1\\\\\\\\/0\\" exact={[undefined]} strict={[undefined]} location={[undefined]}>
343+
<Link to=\\"/academy/missions/1/0\\" className={[undefined]} style={[undefined]} aria-current={{...}} replace={false}>
344+
<a className={[undefined]} style={[undefined]} aria-current={{...}} onClick={[Function]} href=\\"/academy/missions/1/0\\">
345345
<Blueprint2.Button disabled={false} fill={false} intent=\\"none\\" minimal={true} className=\\"\\" type=\\"\\" icon={{...}}>
346346
<button type=\\"\\" disabled={[undefined]} className=\\"pt-button pt-minimal\\" onClick={[undefined]} onKeyDown={[Function]} onKeyUp={[Function]}>
347347
<Blueprint2.Icon icon={{...}}>
@@ -437,10 +437,10 @@ exports[`Assessment page does not show attempt Button for upcoming assessments f
437437
Due: 18th June, 13:24
438438
</div>
439439
</Text>
440-
<NavLink to=\\"/academy/quests/2/0\\" activeClassName=\\"active\\" ariaCurrent=\\"true\\">
441-
<Route path=\\"/academy/quests/2/0\\" exact={[undefined]} strict={[undefined]} location={[undefined]}>
442-
<Link to=\\"/academy/quests/2/0\\" className={[undefined]} style={[undefined]} aria-current={false} replace={false}>
443-
<a className={[undefined]} style={[undefined]} aria-current={false} onClick={[Function]} href=\\"/academy/quests/2/0\\">
440+
<NavLink to=\\"/academy/quests/2/0\\" activeClassName=\\"active\\" aria-current=\\"page\\">
441+
<Route path=\\"\\\\\\\\/academy\\\\\\\\/quests\\\\\\\\/2\\\\\\\\/0\\" exact={[undefined]} strict={[undefined]} location={[undefined]}>
442+
<Link to=\\"/academy/quests/2/0\\" className={[undefined]} style={[undefined]} aria-current={{...}} replace={false}>
443+
<a className={[undefined]} style={[undefined]} aria-current={{...}} onClick={[Function]} href=\\"/academy/quests/2/0\\">
444444
<Blueprint2.Button disabled={false} fill={false} intent=\\"none\\" minimal={true} className=\\"\\" type=\\"\\" icon={{...}}>
445445
<button type=\\"\\" disabled={[undefined]} className=\\"pt-button pt-minimal\\" onClick={[undefined]} onKeyDown={[Function]} onKeyUp={[Function]}>
446446
<Blueprint2.Icon icon={{...}}>
@@ -648,10 +648,10 @@ exports[`Assessment page with multiple loaded missions renders correctly 1`] = `
648648
Opens at: 18th June, 13:24
649649
</div>
650650
</Text>
651-
<NavLink to=\\"/academy/missions/0/0\\" activeClassName=\\"active\\" ariaCurrent=\\"true\\">
652-
<Route path=\\"/academy/missions/0/0\\" exact={[undefined]} strict={[undefined]} location={[undefined]}>
653-
<Link to=\\"/academy/missions/0/0\\" className={[undefined]} style={[undefined]} aria-current={false} replace={false}>
654-
<a className={[undefined]} style={[undefined]} aria-current={false} onClick={[Function]} href=\\"/academy/missions/0/0\\">
651+
<NavLink to=\\"/academy/missions/0/0\\" activeClassName=\\"active\\" aria-current=\\"page\\">
652+
<Route path=\\"\\\\\\\\/academy\\\\\\\\/missions\\\\\\\\/0\\\\\\\\/0\\" exact={[undefined]} strict={[undefined]} location={[undefined]}>
653+
<Link to=\\"/academy/missions/0/0\\" className={[undefined]} style={[undefined]} aria-current={{...}} replace={false}>
654+
<a className={[undefined]} style={[undefined]} aria-current={{...}} onClick={[Function]} href=\\"/academy/missions/0/0\\">
655655
<Blueprint2.Button disabled={false} fill={false} intent=\\"none\\" minimal={true} className=\\"\\" type=\\"\\" icon={{...}}>
656656
<button type=\\"\\" disabled={[undefined]} className=\\"pt-button pt-minimal\\" onClick={[undefined]} onKeyDown={[Function]} onKeyUp={[Function]}>
657657
<Blueprint2.Icon icon={{...}}>
@@ -771,10 +771,10 @@ exports[`Assessment page with multiple loaded missions renders correctly 1`] = `
771771
Due: 18th June, 13:24
772772
</div>
773773
</Text>
774-
<NavLink to=\\"/academy/missions/0/0\\" activeClassName=\\"active\\" ariaCurrent=\\"true\\">
775-
<Route path=\\"/academy/missions/0/0\\" exact={[undefined]} strict={[undefined]} location={[undefined]}>
776-
<Link to=\\"/academy/missions/0/0\\" className={[undefined]} style={[undefined]} aria-current={false} replace={false}>
777-
<a className={[undefined]} style={[undefined]} aria-current={false} onClick={[Function]} href=\\"/academy/missions/0/0\\">
774+
<NavLink to=\\"/academy/missions/0/0\\" activeClassName=\\"active\\" aria-current=\\"page\\">
775+
<Route path=\\"\\\\\\\\/academy\\\\\\\\/missions\\\\\\\\/0\\\\\\\\/0\\" exact={[undefined]} strict={[undefined]} location={[undefined]}>
776+
<Link to=\\"/academy/missions/0/0\\" className={[undefined]} style={[undefined]} aria-current={{...}} replace={false}>
777+
<a className={[undefined]} style={[undefined]} aria-current={{...}} onClick={[Function]} href=\\"/academy/missions/0/0\\">
778778
<Blueprint2.Button disabled={false} fill={false} intent=\\"none\\" minimal={true} className=\\"\\" type=\\"\\" icon={{...}}>
779779
<button type=\\"\\" disabled={[undefined]} className=\\"pt-button pt-minimal\\" onClick={[undefined]} onKeyDown={[Function]} onKeyUp={[Function]}>
780780
<Blueprint2.Icon icon={{...}}>
@@ -870,10 +870,10 @@ exports[`Assessment page with multiple loaded missions renders correctly 1`] = `
870870
Due: 18th June, 13:24
871871
</div>
872872
</Text>
873-
<NavLink to=\\"/academy/missions/1/0\\" activeClassName=\\"active\\" ariaCurrent=\\"true\\">
874-
<Route path=\\"/academy/missions/1/0\\" exact={[undefined]} strict={[undefined]} location={[undefined]}>
875-
<Link to=\\"/academy/missions/1/0\\" className={[undefined]} style={[undefined]} aria-current={false} replace={false}>
876-
<a className={[undefined]} style={[undefined]} aria-current={false} onClick={[Function]} href=\\"/academy/missions/1/0\\">
873+
<NavLink to=\\"/academy/missions/1/0\\" activeClassName=\\"active\\" aria-current=\\"page\\">
874+
<Route path=\\"\\\\\\\\/academy\\\\\\\\/missions\\\\\\\\/1\\\\\\\\/0\\" exact={[undefined]} strict={[undefined]} location={[undefined]}>
875+
<Link to=\\"/academy/missions/1/0\\" className={[undefined]} style={[undefined]} aria-current={{...}} replace={false}>
876+
<a className={[undefined]} style={[undefined]} aria-current={{...}} onClick={[Function]} href=\\"/academy/missions/1/0\\">
877877
<Blueprint2.Button disabled={false} fill={false} intent=\\"none\\" minimal={true} className=\\"\\" type=\\"\\" icon={{...}}>
878878
<button type=\\"\\" disabled={[undefined]} className=\\"pt-button pt-minimal\\" onClick={[undefined]} onKeyDown={[Function]} onKeyUp={[Function]}>
879879
<Blueprint2.Icon icon={{...}}>
@@ -969,10 +969,10 @@ exports[`Assessment page with multiple loaded missions renders correctly 1`] = `
969969
Due: 18th June, 13:24
970970
</div>
971971
</Text>
972-
<NavLink to=\\"/academy/quests/2/0\\" activeClassName=\\"active\\" ariaCurrent=\\"true\\">
973-
<Route path=\\"/academy/quests/2/0\\" exact={[undefined]} strict={[undefined]} location={[undefined]}>
974-
<Link to=\\"/academy/quests/2/0\\" className={[undefined]} style={[undefined]} aria-current={false} replace={false}>
975-
<a className={[undefined]} style={[undefined]} aria-current={false} onClick={[Function]} href=\\"/academy/quests/2/0\\">
972+
<NavLink to=\\"/academy/quests/2/0\\" activeClassName=\\"active\\" aria-current=\\"page\\">
973+
<Route path=\\"\\\\\\\\/academy\\\\\\\\/quests\\\\\\\\/2\\\\\\\\/0\\" exact={[undefined]} strict={[undefined]} location={[undefined]}>
974+
<Link to=\\"/academy/quests/2/0\\" className={[undefined]} style={[undefined]} aria-current={{...}} replace={false}>
975+
<a className={[undefined]} style={[undefined]} aria-current={{...}} onClick={[Function]} href=\\"/academy/quests/2/0\\">
976976
<Blueprint2.Button disabled={false} fill={false} intent=\\"none\\" minimal={true} className=\\"\\" type=\\"\\" icon={{...}}>
977977
<button type=\\"\\" disabled={[undefined]} className=\\"pt-button pt-minimal\\" onClick={[undefined]} onKeyDown={[Function]} onKeyUp={[Function]}>
978978
<Blueprint2.Icon icon={{...}}>

0 commit comments

Comments
 (0)