Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • ask-user-to-delete-exercises-on-duplicates
  • jw_sonar
  • jw_sonar_backup
  • main
  • move-to-esm-only
  • open_tool_for_self_hosting
  • v5.0
  • v6.0
  • v4.1
  • v4.2
10 results

Target

Select target project
  • dojo_project/projects/shared/nodeclientsharedcode
1 result
Select Git revision
  • ask-user-to-delete-exercises-on-duplicates
  • jw_sonar
  • jw_sonar_backup
  • main
  • move-to-esm-only
  • open_tool_for_self_hosting
  • v5.0
  • v6.0
  • v4.1
  • v4.2
10 results
Show changes
Commits on Source (3)
...@@ -26,6 +26,7 @@ class AssignmentValidator { ...@@ -26,6 +26,7 @@ class AssignmentValidator {
public isFinished: boolean = false; public isFinished: boolean = false;
public success: boolean = false; public success: boolean = false;
public exitCode: number = -1; public exitCode: number = -1;
public fatalErrorMessage: string = '';
constructor(private folderAssignment: string) { constructor(private folderAssignment: string) {
this.events.on('logs', (log: string, _error: boolean, displayable: boolean) => { this.events.on('logs', (log: string, _error: boolean, displayable: boolean) => {
...@@ -46,6 +47,8 @@ class AssignmentValidator { ...@@ -46,6 +47,8 @@ class AssignmentValidator {
let assignmentFile: AssignmentFile; let assignmentFile: AssignmentFile;
const emitError = (subStepName: string, subStepMessage: string, stepName: string, stepMessage: string, code: AssignmentCheckerError) => { const emitError = (subStepName: string, subStepMessage: string, stepName: string, stepMessage: string, code: AssignmentCheckerError) => {
this.fatalErrorMessage = stepMessage;
this.events.emit('endSubStep', subStepName, subStepMessage, true); this.events.emit('endSubStep', subStepName, subStepMessage, true);
this.events.emit('endStep', stepName, stepMessage, true); this.events.emit('endStep', stepName, stepMessage, true);
this.events.emit('finished', false, code); this.events.emit('finished', false, code);
...@@ -240,8 +243,10 @@ class AssignmentValidator { ...@@ -240,8 +243,10 @@ class AssignmentValidator {
exerciseDockerCompose.run(doDown); exerciseDockerCompose.run(doDown);
}); });
} catch ( error ) { } catch ( error ) {
this.events.emit('endStep', 'ASSIGNMENT_RUN', 'Assignment is already solved', true); this.fatalErrorMessage = 'Assignment is already solved';
this.events.emit('endStep', 'ASSIGNMENT_RUN', this.fatalErrorMessage, true);
this.events.emit('finished', false, AssignmentCheckerError.COMPOSE_RUN_SUCCESSFULLY); this.events.emit('finished', false, AssignmentCheckerError.COMPOSE_RUN_SUCCESSFULLY);
return;
} }
......
import chalk from 'chalk';
import boxen from 'boxen';
import Icon from '../../types/Icon';
import AssignmentValidator from './AssignmentValidator';
class ClientsSharedAssignmentHelper {
displayExecutionResults(validator: AssignmentValidator, successMessage: string, Style: { INFO: chalk.Chalk, SUCCESS: chalk.Chalk, FAILURE: chalk.Chalk }) {
const finalLogGlobalResult = `${ Style.INFO('Global result') } : ${ validator.success ? Style.SUCCESS(`${ Icon.SUCCESS } Success`) : Style.FAILURE(`${ Icon.FAILURE } Failure`) }`;
const finalLogSuccessMessage = validator.success ? `${ successMessage }` : '';
const finalLogErrorMessage = !validator.success ? `${ Style.INFO('Error message') } :\n${ Style.FAILURE(validator.fatalErrorMessage) }` : '';
console.log(boxen(`${ finalLogGlobalResult }\n\n${ finalLogSuccessMessage }${ finalLogErrorMessage }`, {
title : 'Results',
titleAlignment: 'center',
borderColor : validator.success ? 'green' : 'red',
borderStyle : 'bold',
margin : 1,
padding : 1,
textAlignment : 'left'
}));
}
}
export default new ClientsSharedAssignmentHelper();
\ No newline at end of file
interface AssignmentValidatorEvents { interface AssignmentValidatorEvents {
step: (name: string, message: string) => void; step: (name: string, message: string) => void;
subStep: (name: string, message: string) => void; subStep: (name: string, message: string) => void;
endStep: (subStepName: string, message: string, error: boolean) => void; endStep: (stepName: string, message: string, error: boolean) => void;
endSubStep: (subStepName: string, message: string, error: boolean) => void; endSubStep: (subStepName: string, message: string, error: boolean) => void;
logs: (log: string, error: boolean, displayable: boolean) => void; logs: (log: string, error: boolean, displayable: boolean) => void;
finished: (success: boolean, exitCode: number) => void; finished: (success: boolean, exitCode: number) => void;
......