Bug fix in exercise addition

A bug has been detected in which the templates and solutions of the new exercises are not added correctly, since all the promises for the upload were introduced "all at once" as simultaneous requests to the server, which was saturated.

As a consequence, this is solved by sending the requests sequentially (one at a time).

Author: diego-guerrero

vscode4teaching-extension/resources/dashboard/dashboard.css

@@ -84,9 +84,15 @@ section.generalStatistics > .row > .col#col-2 > .rowTotals {
     margin-bottom: 0.5rem;
 }
 
+section.generalStatistics > .row > .col#col-2 .label {
+    text-align: center;
+    padding-right: 0.25rem;
+}
+
+
 section.generalStatistics > .row > .col#col-2 .value {
     font-weight: 700;
-    font-size: 1.75rem;
+    font-size: 1.5rem;
 }
 
 section.generalStatistics > .row > .col#col-2 > .rowStatus {
@@ -148,7 +154,7 @@ section.generalStatistics > .row > .col#col-3 > .rowTime:last-child {
 
 section.generalStatistics > .row > .col#col-3 .value {
     font-weight: 700;
-    font-size: 1.75rem;
+    font-size: 1.5rem;
 }
 
 /**

vscode4teaching-extension/src/components/courses/CoursesTreeProvider.ts

@@ -323,26 +323,26 @@ export class CoursesProvider implements vscode.TreeDataProvider<V4TItem> {
                         allowEditionAfterSolutionDownloaded: false
                     })));
 
-                    // 3.2: an array containing promises for sending ZIP compressed files including all the templates and solutions extracted during the previous phases is generated.
-                    const uploadFilesPromises = await Promise.all(exerciseData.data.map(async (ex, index) =>
-                        [
-                            APIClient.uploadExerciseTemplate(ex.id, await FileZipUtil.getZipFromUris([exercisesDirectories[index].paths.template]), false),
-                            (exercisesDirectories[index].paths.solution) ? APIClient.uploadExerciseSolution(ex.id, await FileZipUtil.getZipFromUris([exercisesDirectories[index].paths.solution!]), false) : undefined
-                        ]));
-
-                    // 3.3: all registered requests (as promises in previous step) are sent and, once completed, the received results are processed.
-                    Promise.all(uploadFilesPromises.flat())
-                           .catch(async (uploadError) => {
-                               // If any upload process fails, all exercises are deleted from database and error is handled (via errorCaught)
-                               errorCaught = true;
-                               v4tLogger.error(uploadError);
-                               try {
-                                   exerciseData.data.forEach(async ex => await APIClient.deleteExercise(ex.id));
-                                   APIClient.handleAxiosError(uploadError);
-                               } catch (deleteError) {
-                                   APIClient.handleAxiosError(deleteError);
-                               }
-                           }).finally(() => {
+                    // 3.2: promises are sent to server in order and one at a time due to performance reasons.
+                    try {
+                        for (const [index, exercise] of exerciseData.data.entries()) {
+                            await APIClient.uploadExerciseTemplate(exercise.id, await FileZipUtil.getZipFromUris([exercisesDirectories[index].paths.template]), false);
+
+                            if (exercise.includesTeacherSolution) {
+                                await APIClient.uploadExerciseSolution(exercise.id, await FileZipUtil.getZipFromUris([exercisesDirectories[index].paths.solution!]), false);
+                            }
+                        }
+                    } catch (uploadError) {
+                        // If any upload process fails, all exercises are deleted from database and error is handled (via errorCaught)
+                        errorCaught = true;
+                        v4tLogger.error(uploadError);
+                        try {
+                            exerciseData.data.forEach(async ex => await APIClient.deleteExercise(ex.id));
+                            APIClient.handleAxiosError(uploadError);
+                        } catch (deleteError) {
+                            APIClient.handleAxiosError(deleteError);
+                        }
+                    } finally {
                         // The user is informed of the result of this process, whether it was successful or not.
                         this.loading = false;
                         if (errorCaught) {
@@ -354,7 +354,7 @@ export class CoursesProvider implements vscode.TreeDataProvider<V4TItem> {
                             );
                         }
                         CoursesProvider.triggerTreeReload();
-                    });
+                    }
                 } catch (_) {
                     errorCaught = true;
                 }

vscode4teaching-extension/test/unitSuite/TreeView.test.ts

@@ -502,6 +502,8 @@ describe("Tree View", () => {
         expect(mockedClient.uploadExerciseTemplate).toHaveBeenCalledTimes(1);
         expect(mockedClient.uploadExerciseTemplate).toHaveBeenNthCalledWith(1, addExerciseResponseBody.id, mockBufferDoc, false);
         expect(mockedClient.uploadExerciseSolution).toHaveBeenCalledTimes(0);
+        expect(mockedVscode.window.showInformationMessage).toHaveBeenCalledTimes(1);
+        expect(mockedVscode.window.showInformationMessage).toHaveBeenNthCalledWith(1, "The new exercise was added successfully.");
     });
 
     it("should add some exercises without solution", async () => {
@@ -585,7 +587,7 @@ describe("Tree View", () => {
         await coursesProvider.addExercises(courseModel, true);
 
 
-        expect(mockedVscode.window.showInformationMessage).toHaveBeenCalledTimes(1);
+        expect(mockedVscode.window.showInformationMessage).toHaveBeenCalledTimes(2);
         expect(mockedVscode.window.showInformationMessage).toHaveBeenNthCalledWith(1, "To upload multiple exercises, prepare a directory with a folder for each exercise, each folder including the exercise's corresponding template and solution if wanted. When ready, click 'Accept'.", { title: "Accept" });
         expect(mockedVscode.window.showOpenDialog).toHaveBeenCalledTimes(1);
         expect(mockedVscode.window.showOpenDialog).toHaveBeenNthCalledWith(1, openDialogOptions);
@@ -611,6 +613,7 @@ describe("Tree View", () => {
         expect(mockedClient.uploadExerciseTemplate).toHaveBeenNthCalledWith(4, addExerciseResponseBody[3].id, mockBufferDoc, false);
         expect(mockedClient.uploadExerciseTemplate).toHaveBeenNthCalledWith(5, addExerciseResponseBody[4].id, mockBufferDoc, false);
         expect(mockedClient.uploadExerciseSolution).toHaveBeenCalledTimes(0);
+        expect(mockedVscode.window.showInformationMessage).toHaveBeenNthCalledWith(2, "5 exercises were added successfully.");
     });
 
     it("should add an exercise with solution", async () => {
@@ -707,9 +710,11 @@ describe("Tree View", () => {
         expect(mockedClient.uploadExerciseTemplate).toHaveBeenNthCalledWith(1, addExerciseResponseBody.id, mockBufferDoc, false);
         expect(mockedClient.uploadExerciseSolution).toHaveBeenCalledTimes(1);
         expect(mockedClient.uploadExerciseSolution).toHaveBeenNthCalledWith(1, addExerciseResponseBody.id, mockBufferDoc, false);
+        expect(mockedVscode.window.showInformationMessage).toHaveBeenCalledTimes(1);
+        expect(mockedVscode.window.showInformationMessage).toHaveBeenNthCalledWith(1, "The new exercise was added successfully.");
     });
 
-    it("should add some exercises without solution", async () => {
+    it("should add some exercises with solution", async () => {
         const courseModel = new V4TItem(
             teacherCourses[0].name,
             V4TItemType.CourseTeacher,
@@ -810,7 +815,7 @@ describe("Tree View", () => {
         await coursesProvider.addExercises(courseModel, true);
 
 
-        expect(mockedVscode.window.showInformationMessage).toHaveBeenCalledTimes(1);
+        expect(mockedVscode.window.showInformationMessage).toHaveBeenCalledTimes(2);
         expect(mockedVscode.window.showInformationMessage).toHaveBeenNthCalledWith(1, "To upload multiple exercises, prepare a directory with a folder for each exercise, each folder including the exercise's corresponding template and solution if wanted. When ready, click 'Accept'.", { title: "Accept" });
         expect(mockedVscode.window.showOpenDialog).toHaveBeenCalledTimes(1);
         expect(mockedVscode.window.showOpenDialog).toHaveBeenNthCalledWith(1, openDialogOptions);
@@ -851,6 +856,7 @@ describe("Tree View", () => {
         expect(mockedClient.uploadExerciseSolution).toHaveBeenNthCalledWith(3, addExerciseResponseBody[2].id, mockBufferDoc, false);
         expect(mockedClient.uploadExerciseSolution).toHaveBeenNthCalledWith(4, addExerciseResponseBody[3].id, mockBufferDoc, false);
         expect(mockedClient.uploadExerciseSolution).toHaveBeenNthCalledWith(5, addExerciseResponseBody[4].id, mockBufferDoc, false);
+        expect(mockedVscode.window.showInformationMessage).toHaveBeenNthCalledWith(2, "5 exercises were added successfully.");
     });
 
     it("should edit exercise", async () => {