Skip to content

Commit 179e4f4

Browse files
committed
Merge branch 'vscode/next' of github.com:source-academy/frontend into vscode/next
2 parents c122be5 + 7067588 commit 179e4f4

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

src/commons/application/Application.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ const Application: React.FC = () => {
124124
dispatch(WorkspaceActions.evalEditor(message.workspaceLocation));
125125
break;
126126
case MessageTypeNames.Navigate:
127-
window.location.replace(message.route);
127+
window.location.pathname = message.route;
128128
// TODO: Figure out why this doesn't work, this is faster in theory
129129
// navigate(message.route);
130130
break;

src/commons/assessment/Assessment.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ const Assessment: React.FC = () => {
7777
)
7878
);
7979
}
80-
}, [assessmentOverviewsUnfiltered]);
80+
}, [assessmentOverviewsUnfiltered, courseId]);
8181

8282
const toggleClosedAssessments = () => setShowClosedAssessments(!showClosedAssessments);
8383
const toggleOpenAssessments = () => setShowOpenedAssessments(!showOpenedAssessments);

src/commons/assessmentWorkspace/AssessmentWorkspace.tsx

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -455,11 +455,11 @@ const AssessmentWorkspace: React.FC<AssessmentWorkspaceProps> = props => {
455455
`submission${_submissionId}`,
456456
questionId,
457457
question.library.chapter,
458-
"",
458+
'',
459459
answer
460460
)
461461
);
462-
//
462+
//
463463
};
464464

465465
const tabs: SideContentTab[] = [
@@ -780,9 +780,10 @@ const AssessmentWorkspace: React.FC<AssessmentWorkspaceProps> = props => {
780780
);
781781

782782
return {
783-
editorButtons: (!isMobileBreakpoint || isVscode)
784-
? [runButton, saveButton, resetButton, chapterSelect]
785-
: [saveButton, resetButton],
783+
editorButtons:
784+
!isMobileBreakpoint || isVscode
785+
? [runButton, saveButton, resetButton, chapterSelect]
786+
: [saveButton, resetButton],
786787
flowButtons: [previousButton, questionView, nextButton]
787788
};
788789
};
@@ -930,9 +931,12 @@ It is safe to close this window.`}
930931
);
931932
handleUpdateHasUnsavedChanges(true);
932933
if (isVscode) {
933-
934-
sendToWebview(Messages.ResetEditor(workspaceLocation,
935-
(assessment!.questions[questionId] as IProgrammingQuestion).solutionTemplate));
934+
sendToWebview(
935+
Messages.ResetEditor(
936+
workspaceLocation,
937+
(assessment!.questions[questionId] as IProgrammingQuestion).solutionTemplate
938+
)
939+
);
936940
}
937941
}}
938942
options={{ minimal: false, intent: Intent.DANGER }}

0 commit comments

Comments
 (0)