diff --git a/NodeApp/package-lock.json b/NodeApp/package-lock.json index c857217e35d5bbe6de7114234a06b39c97f7872e..5fa193f14e3e973eddca8cf7af8fcac0e7b1c0ea 100644 --- a/NodeApp/package-lock.json +++ b/NodeApp/package-lock.json @@ -1,12 +1,12 @@ { "name": "dojo_cli", - "version": "3.4.0", + "version": "3.4.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "dojo_cli", - "version": "3.4.0", + "version": "3.4.1", "license": "AGPLv3", "dependencies": { "appdata-path": "^1.0.0", diff --git a/NodeApp/package.json b/NodeApp/package.json index 4a5c1cf1490822713c51e05bb15ac6957e5e49d0..fe5466e2f44a52dcf09f8bd37b9ee203d6b3cb1f 100644 --- a/NodeApp/package.json +++ b/NodeApp/package.json @@ -1,7 +1,7 @@ { "name" : "dojo_cli", "description" : "CLI of the Dojo project", - "version" : "3.4.0", + "version" : "3.4.1", "license" : "AGPLv3", "author" : "Michaƫl Minelli <dojo@minelli.me>", "main" : "dist/app.js", diff --git a/NodeApp/src/managers/DojoBackendManager.ts b/NodeApp/src/managers/DojoBackendManager.ts index d3711009cf433867a339eb495161397d895a0fd4..b8e8a41ec1beb1172244b281c61d658dc2c923ec 100644 --- a/NodeApp/src/managers/DojoBackendManager.ts +++ b/NodeApp/src/managers/DojoBackendManager.ts @@ -142,8 +142,12 @@ class DojoBackendManager { if ( verbose ) { if ( error instanceof AxiosError ) { if ( error.response ) { - if ( error.response.status === StatusCodes.CONFLICT ) { - spinner.fail(`You've already reached the max number of exercise of this assignment.`); + if ( error.response.status === StatusCodes.INSUFFICIENT_SPACE_ON_RESOURCE ) { + if ( error.response.data && (error.response.data as DojoBackendResponse<Array<GitlabUser>>).code === DojoStatusCode.MAX_EXERCISE_PER_ASSIGNMENT_REACHED ) { + spinner.fail(`The following users have reached the maximum number of exercise of this assignment : ${ ((error.response.data as DojoBackendResponse<Array<GitlabUser>>).data as Array<GitlabUser>).map(user => user.name).join(', ') }.`); + } else { + spinner.fail(`You've already reached the max number of exercise of this assignment.`); + } } else { if ( (error.response.data as DojoBackendResponse<unknown>).code === DojoStatusCode.EXERCISE_CREATION_GITLAB_ERROR ) { spinner.fail(`Exercise creation error: An unknown error occurred while creating the exercise on Gitlab. Please try again later or contact an administrator.`); diff --git a/NodeApp/src/shared b/NodeApp/src/shared index 89f3579ca9009f793742170928d808ab4c35d931..75f67b647da34337f3b220cacf78b2115d6022bc 160000 --- a/NodeApp/src/shared +++ b/NodeApp/src/shared @@ -1 +1 @@ -Subproject commit 89f3579ca9009f793742170928d808ab4c35d931 +Subproject commit 75f67b647da34337f3b220cacf78b2115d6022bc