Merge branch 'master' into lib

Author: SebastienTainon

frontend/submission/task_platform.ts

@@ -11,6 +11,8 @@ import {CodecastPlatform} from '../stepper/codecast_platform';
 import {delay} from '../player/sagas';
 import {BlockDocument, BufferType} from '../buffers/buffer_types';
 import {getBlocklyCodeFromXml} from '../stepper/js';
+import {extractTestsFromTask} from './tests';
+import {currentTaskChange, updateTaskTests} from '../task/task_slice';
 
 export function* getTaskFromId(taskId: string, token: string, platform: string): Generator<any, TaskServer|null> {
     const state = yield* appSelect();
@@ -146,8 +148,15 @@ export function* longPollServerSubmissionResults(submissionId: string, submissio
     const state = yield* appSelect();
     const {taskPlatformUrl} = state.options;
 
+    const hasTests = state.task.currentTask.tests?.length;
+    const totalUrl = `${taskPlatformUrl}/submissions/${submissionId}?longPolling${!hasTests ? '&withTests' : ''}`;
+
+    const newCurrentTask = {...state.task.currentTask};
+    newCurrentTask.tests = [...state.task.currentTask.tests];
+    let needUpdateTests = false;
+
     while (true) {
-        const result = (yield* call(asyncGetJson, taskPlatformUrl + '/submissions/' + submissionId + '?longPolling')) as TaskSubmissionServerResult|null;
+        const result = (yield* call(asyncGetJson, totalUrl)) as TaskSubmissionServerResult|null;
         if (result.evaluated) {
             for (let test of result.tests) {
                 test.score = test.score / 100;
@@ -156,16 +165,28 @@ export function* longPollServerSubmissionResults(submissionId: string, submissio
                 }
 
                 // If the test has a clientId, change the id of the test to use the client id
-                if (test?.test?.clientId) {
+                if (test.test?.clientId) {
                     const userTest = state.task.taskTests.find(otherTest => otherTest.id === test.test.clientId);
                     if (userTest) {
                         test.test.id = userTest.id;
                         test.testId = userTest.id;
                     }
                 }
+                if (test.test?.id && !state.task.currentTask.tests.find(otherTest => otherTest.id === test.test.id)) {
+                    newCurrentTask.tests.push(test.test);
+                    needUpdateTests = true;
+                }
+            }
+
+            if (needUpdateTests) {
+                const taskVariant = state.options.taskVariant;
+                const tests = extractTestsFromTask(newCurrentTask, taskVariant);
+                yield* put(currentTaskChange(newCurrentTask));
+                yield* put(updateTaskTests(tests));
             }
 
             yield* put(submissionUpdateTaskSubmission({id: submissionIndex, submission: {...serverSubmission, evaluated: true, result}}));
+
             callback(result);
 
             return;

frontend/submission/task_submission.tsx

@@ -25,7 +25,7 @@ import {getTaskPlatformMode, recordingProgressSteps, TaskPlatformMode} from '../
 import {TaskActionTypes, updateCurrentTestId} from '../task/task_slice';
 import {LibraryTestResult} from '../task/libs/library_test_result';
 import {DeferredPromise} from '../utils/app';
-import {getTaskLevelTests, selectSubmissionsPaneEnabled} from './submission_selectors';
+import {getTaskLevelTests, selectSubmissionsPaneEnabled, selectTaskTests} from './submission_selectors';
 import {isServerTask, isTestPublic, TaskAnswer, TaskTestGroupType} from '../task/task_types';
 import {platformAnswerGraded} from '../task/platform/actionTypes';
 import {getMessage} from '../lang';
@@ -217,7 +217,7 @@ class TaskSubmissionExecutor {
     }
 
     *gradeAnswerServer(parameters: PlatformTaskGradingParameters): Generator<any, PlatformTaskGradingResult, any> {
-        const {level, answer, answerToken, scope} = parameters;
+        const {answer, answerToken, scope} = parameters;
         const state = yield* appSelect();
         const platform = answer.platform;
         const userTests = SubmissionExecutionScope.MyTests === scope ? getTaskLevelTests(state).filter(test => TaskTestGroupType.User === test.groupType) : [];
@@ -253,7 +253,7 @@ class TaskSubmissionExecutor {
             const submissionId = submissionData.submissionId;
             submissionExecutionTasks[submissionIndex] = yield* fork([this, this.gradeAnswerLongPolling], submissionIndex, serverSubmission, submissionId);
 
-            return submissionExecutionTasks[submissionIndex].result();
+            return submissionExecutionTasks[submissionIndex].toPromise();
         } catch (ex: any) {
             yield* put(submissionUpdateTaskSubmission({
                 id: submissionIndex,
@@ -288,8 +288,30 @@ class TaskSubmissionExecutor {
                 if (submissionResult.compilationError) {
                     yield* put(submissionChangeDisplayedError(SubmissionErrorType.CompilationError));
                 } else {
-                    const selectedTestId = yield* appSelect(state => state.task.currentTestId);
-                    // Refresh display by showing the test id that was previously selected
+                    let selectedTestId = yield* appSelect(state => state.task.currentTestId);
+
+                    // Refresh display by showing the first test of the submission that is failing
+                    if (submissionResult.tests?.length) {
+                        const newTaskTests = yield* appSelect(selectTaskTests);
+                        let newTestId = null;
+                        for (let i = 0; i < newTaskTests.length; i++) {
+                            const submissionTestResult = submissionResult.tests.find(test => test.testId === newTaskTests[i].id);
+                            if (submissionTestResult) {
+                                if (null === newTestId) {
+                                    newTestId = i;
+                                }
+                                if (submissionResult?.score < 1) {
+                                    newTestId = i;
+                                    break;
+                                }
+                            }
+                        }
+
+                        if (null !== newTestId) {
+                            selectedTestId = newTestId
+                        }
+                    }
+
                     if (null !== selectedTestId) {
                         yield* put(updateCurrentTestId({testId: selectedTestId}));
                     }

frontend/task/platform/platform.ts

@@ -484,7 +484,7 @@ export function* taskGradeAnswerEventSaga ({payload: {answer, answerToken, succe
                 log.getLogger('tests').debug('info answer', level);
 
                 // Score is between 0 and 1
-                const {score, message, scoreToken} = yield* call([taskGrader, taskGrader.gradeAnswer],{level, answer: answerObject[level]});
+                const {score, message, scoreToken} = yield* call([taskGrader, taskGrader.gradeAnswer], {level, answer: answerObject[level]});
 
                 versionsScore[level] = score;
                 if (level === currentLevel) {