Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Assessments & Grading Workspace: Add folders mode #2765

Open
wants to merge 61 commits into
base: master
Choose a base branch
from
+842 −201
Open

Assessments & Grading Workspace: Add folders mode #2765

Show file tree
Hide file tree
Changes from 60 commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
026df68
Merge branch 'master' of github.com:source-academy/frontend into read…
accountexeregister Feb 7, 2024
68abcad
Add draft read-only workspace feature
accountexeregister Feb 7, 2024
bfcc2a6
Change isEditable to true
accountexeregister Feb 7, 2024
a5395e5
Add file view to assessments
Tkaixiang Feb 8, 2024
07de9ac
Move enable read-only workspace to onEditorValueChange
accountexeregister Feb 13, 2024
4e6d2cf
Change control bar for read only mode
accountexeregister Feb 13, 2024
f410803
Add file mode control bar button
accountexeregister Feb 13, 2024
5a72759
Ignore read-only unsaved changes
accountexeregister Feb 13, 2024
b4aa8aa
Readd previous,next question button in read-only
accountexeregister Feb 13, 2024
91ac95e
Add key to fileModeButton in AssessmentWorkspace
accountexeregister Feb 13, 2024
040cbe1
Disable renaming/deleting of files
Tkaixiang Feb 15, 2024
80944df
Fix clicking on files causing crashes
Tkaixiang Feb 15, 2024
b77ebb2
Disable saving etc when not viewing question file
Tkaixiang Feb 15, 2024
ccc2edc
Disable some control bar button in readonly mode
accountexeregister Feb 15, 2024
6e5c043
Reset to original question content after disabling folder mode
Tkaixiang Feb 15, 2024
3d249db
Disable handleEval for read-only mode
accountexeregister Feb 15, 2024
2c53b09
Fix reset
Tkaixiang Feb 15, 2024
b197585
Linting
Tkaixiang Feb 15, 2024
cb937e7
Change ControlBarRunButton tooltip content when read-only
accountexeregister Feb 15, 2024
5c7f0f3
Merge branch 'read-only-workspace' of github.com:source-academy/front…
accountexeregister Feb 15, 2024
13ac129
Linting
accountexeregister Feb 15, 2024
40c9ac9
fix return to original file
Tkaixiang Feb 16, 2024
9095928
Merge branch 'master' into read-only-workspace
RichDom2185 Feb 18, 2024
cee0739
Merge branch 'read-only-workspace' of https://github.com/source-acade…
Tkaixiang Feb 22, 2024
d87fa12
Merge branch 'master' of github.com:source-academy/frontend into read…
accountexeregister Feb 22, 2024
e7a5c70
Remove save button for read-only files
accountexeregister Feb 22, 2024
79604d3
Only allow folder mode in assessments if source >= 2 selected
Tkaixiang Feb 22, 2024
d417d5e
Move read-only icons to tabs
accountexeregister Feb 22, 2024
ed3c5a0
Fix incorrect tab lock-unlock icon
accountexeregister Feb 22, 2024
d21dafb
Enable run for all files
accountexeregister Feb 22, 2024
facf6b7
Remove file mode control bar button in AssessmentWorkspace, remove logs
accountexeregister Feb 22, 2024
7a3af24
Merge branch 'read-only-workspace' of github.com:source-academy/front…
accountexeregister Feb 22, 2024
26929fd
Merge branch 'read-only-workspace' of github.com:source-academy/front…
accountexeregister Feb 22, 2024
46242dc
Add answers from other files
Tkaixiang Feb 23, 2024
8295764
Merge branch 'read-only-workspace' of https://github.com/source-acade…
Tkaixiang Feb 23, 2024
f71154a
merge fixes
Tkaixiang Feb 23, 2024
c9528aa
Linting
Tkaixiang Feb 23, 2024
d4c01ee
Automatically run question file for auto grader tab
Tkaixiang Feb 23, 2024
0695486
lint
Tkaixiang Feb 23, 2024
52ac1cb
Merge branch 'master' of https://github.com/source-academy/frontend i…
RichDom2185 Feb 23, 2024
a9ff438
Merge branch 'master' into read-only-workspace
RichDom2185 Feb 23, 2024
14b3e87
Merge branch 'master' into read-only-workspace
RichDom2185 Feb 24, 2024
f6e969a
Enable folder mode for grading workspace
JovenSoh Mar 15, 2024
4dcee99
debug
Tkaixiang Mar 28, 2024
fc6046f
remove debug
Tkaixiang Mar 31, 2024
41bc7ea
Merge branch 'master' of https://github.com/source-academy/frontend i…
Tkaixiang Mar 31, 2024
30bf558
Re-add folder functionality to workspace sagas
Tkaixiang Mar 31, 2024
04e0d76
Merge branch 'master' into read-only-workspace
martin-henz Apr 2, 2024
a5698a6
Modify evalEditor to add prepend,postpend to files
accountexeregister Apr 2, 2024
14f2069
Modify runTestCase to add prepend,postpend to files
accountexeregister Apr 2, 2024
82627fc
Merge branch 'master' of https://github.com/source-academy/frontend i…
Tkaixiang Apr 15, 2024
fe3e1c8
lint
Tkaixiang Apr 15, 2024
a31bef6
update snapshots
Tkaixiang Apr 15, 2024
41439e6
Fix types in test
Tkaixiang Apr 15, 2024
96b1ff2
fix prettier errors
Tkaixiang Apr 15, 2024
949ecd4
fix error
Tkaixiang Apr 15, 2024
87b1d0c
lint
Tkaixiang Apr 15, 2024
0739bc3
fix
Tkaixiang Apr 15, 2024
62df664
Merge branch 'master' into read-only-workspace
RichDom2185 Apr 15, 2024
6195fa7
Revert unnecessary changes
RichDom2185 Apr 15, 2024
fef24d5
Merge branch 'master' of https://github.com/source-academy/frontend i…
RichDom2185 May 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/commons/application/ApplicationTypes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,8 @@ export const createDefaultWorkspace = (workspaceLocation: WorkspaceLocation): Wo
enableDebugging: true,
debuggerContext: {} as DebuggerContext,
lastDebuggerResult: undefined,
lastNonDetResult: null
lastNonDetResult: null,
files: {}
});

const defaultFileName = 'program.js';
Expand Down
20 changes: 10 additions & 10 deletions src/commons/assessment/__tests__/__snapshots__/Assessment.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ exports[`Assessment page does not show attempt Button for upcoming assessments f
/>
</svg>
</span>
Opens: 18th June, 13:24
Opens: 18th June, 05:24
</div>
</div>
<div
Expand Down Expand Up @@ -445,7 +445,7 @@ exports[`Assessment page does not show attempt Button for upcoming assessments f
/>
</svg>
</span>
Opened: 18th July, 13:24
Opened: 18th July, 05:24
</div>
<div
className="listing-due-date"
Expand All @@ -467,7 +467,7 @@ exports[`Assessment page does not show attempt Button for upcoming assessments f
/>
</svg>
</span>
Due: 18th June, 13:24
Due: 18th June, 05:24
</div>
</div>
<div
Expand Down Expand Up @@ -658,7 +658,7 @@ exports[`Assessment page does not show attempt Button for upcoming assessments f
/>
</svg>
</span>
Opened: 18th June, 13:24
Opened: 18th June, 05:24
</div>
<div
className="listing-due-date"
Expand All @@ -680,7 +680,7 @@ exports[`Assessment page does not show attempt Button for upcoming assessments f
/>
</svg>
</span>
Due: 18th June, 13:24
Due: 18th June, 05:24
</div>
</div>
<div
Expand Down Expand Up @@ -998,7 +998,7 @@ exports[`Assessment page with multiple loaded missions renders correctly 1`] = `
className="bp5-icon bp5-icon-calendar listing-due-icon"
data-icon="calendar"
/>
Opens: 18th June, 13:24
Opens: 18th June, 05:24
</div>
</div>
<div
Expand Down Expand Up @@ -1183,7 +1183,7 @@ exports[`Assessment page with multiple loaded missions renders correctly 1`] = `
className="bp5-icon bp5-icon-calendar listing-due-icon"
data-icon="calendar"
/>
Opened: 18th July, 13:24
Opened: 18th July, 05:24
</div>
<div
className="listing-due-date"
Expand All @@ -1193,7 +1193,7 @@ exports[`Assessment page with multiple loaded missions renders correctly 1`] = `
className="bp5-icon bp5-icon-time listing-due-icon"
data-icon="time"
/>
Due: 18th June, 13:24
Due: 18th June, 05:24
</div>
</div>
<div
Expand Down Expand Up @@ -1348,7 +1348,7 @@ exports[`Assessment page with multiple loaded missions renders correctly 1`] = `
className="bp5-icon bp5-icon-calendar listing-due-icon"
data-icon="calendar"
/>
Opened: 18th June, 13:24
Opened: 18th June, 05:24
</div>
<div
className="listing-due-date"
Expand All @@ -1358,7 +1358,7 @@ exports[`Assessment page with multiple loaded missions renders correctly 1`] = `
className="bp5-icon bp5-icon-time listing-due-icon"
data-icon="time"
/>
Due: 18th June, 13:24
Due: 18th June, 05:24
</div>
</div>
<div
Expand Down
Loading
Loading