Skip to content

Commit b855ffa

Browse files
committed
Merge branch 'vscode/next' of https://github.com/source-academy/frontend into vscode/next
2 parents 1047df1 + 631195c commit b855ffa

File tree

3 files changed

+11
-15
lines changed

3 files changed

+11
-15
lines changed

src/commons/application/Application.tsx

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import { useDispatch } from 'react-redux';
3-
import { Outlet, useNavigate } from 'react-router-dom';
3+
import { Outlet } from 'react-router-dom';
44
import Messages, {
55
MessageType,
66
MessageTypeNames,
@@ -18,7 +18,6 @@ import VscodeActions from './actions/VscodeActions';
1818
const Application: React.FC = () => {
1919
const dispatch = useDispatch();
2020
const { isLoggedIn } = useSession();
21-
const navigate = useNavigate();
2221

2322
// Used in the mobile/PWA experience (e.g. separate handling of orientation changes on Andriod & iOS due to unique browser behaviours)
2423
const isMobile = /iPhone|iPad|Android/.test(navigator.userAgent);
@@ -125,15 +124,12 @@ const Application: React.FC = () => {
125124
dispatch(WorkspaceActions.evalEditor(message.workspaceLocation));
126125
break;
127126
case MessageTypeNames.Navigate:
128-
navigate(message.route);
127+
window.location.replace(message.route);
128+
// TODO: Figure out why this doesn't work, this is faster in theory
129+
// navigate(message.route);
129130
break;
130131
case MessageTypeNames.McqQuestion:
131-
dispatch(
132-
WorkspaceActions.showMcqPane(
133-
message.workspaceLocation,
134-
message.options
135-
)
136-
);
132+
dispatch(WorkspaceActions.showMcqPane(message.workspaceLocation, message.options));
137133
break;
138134
case MessageTypeNames.McqAnswer:
139135
console.log(`FRONTEND: MCQAnswerMessage: ${message}`);

src/commons/assessment/Assessment.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@ const Assessment: React.FC = () => {
6363
const dispatch = useDispatch();
6464

6565
useEffect(() => {
66-
console.log('Iam in Assessment');
67-
console.log(assessmentOverviewsUnfiltered);
68-
if (assessmentOverviewsUnfiltered) {
66+
if (assessmentOverviewsUnfiltered && courseId) {
6967
sendToWebview(
7068
Messages.NotifyAssessmentsOverview(
7169
assessmentOverviewsUnfiltered.map(oa => ({
@@ -74,7 +72,8 @@ const Assessment: React.FC = () => {
7472
id: oa.id,
7573
isPublished: oa.isPublished,
7674
title: oa.title
77-
}))
75+
})),
76+
courseId
7877
)
7978
);
8079
}

src/features/vscode/messages.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ const Messages = createMessages({
4949
EvalEditor: (workspaceLocation: VscWorkspaceLocation) => ({
5050
workspaceLocation: workspaceLocation
5151
}),
52-
NotifyAssessmentsOverview: (assessmentOverviews: VscAssessmentOverview[]) => ({
53-
assessmentOverviews
52+
NotifyAssessmentsOverview: (assessmentOverviews: VscAssessmentOverview[], courseId: number) => ({
53+
assessmentOverviews,
54+
courseId
5455
}),
5556
Navigate: (route: string) => ({
5657
route

0 commit comments

Comments
 (0)