Skip to content
Snippets Groups Projects
Commit 9671c809 authored by michael.minelli's avatar michael.minelli
Browse files

Merge branch 'gitlab_error_managment' into v3.0.0

parents 1c39ac0d b02aa6eb
No related branches found
No related tags found
No related merge requests found
Pipeline #26787 passed
......@@ -61,14 +61,15 @@ class AssignmentCreateCommand extends CommanderCommand {
// Create the assignment
{
console.log(chalk.cyan('Please wait while we are creating the assignment...'));
console.log(chalk.cyan('Please wait while we are creating the assignment (approximately 10 seconds)...'));
try {
const assignment: Assignment = await DojoBackendManager.createAssignment(options.name, members, templateIdOrNamespace);
const oraInfo = (message: string) => {
ora({
text: message, indent: 4
text : message,
indent: 4
}).start().info();
};
......
......@@ -40,7 +40,8 @@ class ExerciseCreateCommand extends CommanderCommand {
ora('Checking assignment:').start().info();
const assignmentGetSpinner: ora.Ora = ora({
text: 'Checking if assignment exists', indent: 4
text : 'Checking if assignment exists',
indent: 4
}).start();
assignment = await DojoBackendManager.getAssignment(options.assignment);
if ( !assignment ) {
......@@ -50,7 +51,8 @@ class ExerciseCreateCommand extends CommanderCommand {
assignmentGetSpinner.succeed(`Assignment "${ options.assignment }" exists`);
const assignmentPublishedSpinner: ora.Ora = ora({
text: 'Checking if assignment is published', indent: 4
text : 'Checking if assignment is published',
indent: 4
}).start();
if ( !assignment.published ) {
assignmentPublishedSpinner.fail(`Assignment "${ assignment.name }" isn't published`);
......@@ -61,14 +63,15 @@ class ExerciseCreateCommand extends CommanderCommand {
//Create the exercise
{
console.log(chalk.cyan('Please wait while we are creating the exercise...'));
console.log(chalk.cyan('Please wait while we are creating the exercise (approximately 10 seconds)...'));
try {
const exercise: Exercise = await DojoBackendManager.createExercise((assignment as Assignment).name, members);
const oraInfo = (message: string) => {
ora({
text: message, indent: 4
text : message,
indent: 4
}).start().info();
};
......
......@@ -9,6 +9,7 @@ import DojoBackendResponse from '../shared/types/Dojo/DojoBackendResponse';
import Exercise from '../sharedByClients/models/Exercise';
import GitlabToken from '../shared/types/Gitlab/GitlabToken';
import User from '../sharedByClients/models/User';
import DojoStatusCode from '../shared/types/Dojo/DojoStatusCode';
class DojoBackendManager {
......@@ -106,7 +107,11 @@ class DojoBackendManager {
if ( error.response.status === StatusCodes.CONFLICT ) {
spinner.fail(`The assignment name is already used. Please choose another one.`);
} else {
spinner.fail(`Assignment creation error: ${ error.response.statusText }`);
if ( (error.response.data as DojoBackendResponse<any>).code === DojoStatusCode.ASSIGNMENT_CREATION_GITLAB_ERROR ) {
spinner.fail(`Assignment creation error: An unknown error occurred while creating the assignment on Gitlab. Please try again later or contact an administrator.`);
} else {
spinner.fail(`Assignment creation error: An unknown error occurred while creating the assignment on Dojo server. Please try again later or contact an administrator.`);
}
}
}
} else {
......@@ -140,7 +145,11 @@ class DojoBackendManager {
if ( error.response.status === StatusCodes.CONFLICT ) {
spinner.fail(`You've already reached the max number of exercise of this assignment.`);
} else {
spinner.fail(`Exercise creation error: ${ error.response.statusText }`);
if ( (error.response.data as DojoBackendResponse<any>).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.`);
} else {
spinner.fail(`Exercise creation error: An unknown error occurred while creating the exercise on Dojo server. Please try again later or contact an administrator.`);
}
}
}
} else {
......
Subproject commit 6607858180da1c27f87f5f078e45091d45fe8caf
Subproject commit 4a5eb68209ae9204b6d4cc8020bd62cf6a5be989
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment