feat(module-programming): show edulint messages directly

fi-ksi · Sep 4, 2024 · d1a3bab · d1a3bab
1 parent fef63e5
commit d1a3bab
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/src/api/backend/model/moduleProgramming.ts b/src/api/backend/model/moduleProgramming.ts
@@ -22,6 +22,7 @@ export interface ModuleProgramming {
     score: number;
     code: string;
     default_code: string;
+    edulint_source_id: string;
     last_time?: string;
     last_origin?: string;
 }

diff --git a/...mponents/tasks/task-module/task-module-programming/task-module-programming.component.html b/...mponents/tasks/task-module/task-module-programming/task-module-programming.component.html
@@ -29,6 +29,15 @@ <h6 class="report-heading">{{'tasks.module.programming.run-result'|translate}}</
         <div class="problems">
           {{'tasks.module.programming.lint.problems-found'|translate:{count: lintReport.problems.length} }}
         </div>
+        <div>
+          <ul>
+            <li *ngFor="let problem of lintReport.problems">
+              <div class="problem">
+                line {{problem.line}}: {{problem.text}}
+              </div>
+            </li>
+          </ul>
+        </div>
         <div>
           <a
             class="btn btn-ksi w-100"

diff --git a/...mponents/tasks/task-module/task-module-programming/task-module-programming.component.scss b/...mponents/tasks/task-module/task-module-programming/task-module-programming.component.scss
@@ -21,7 +21,7 @@
   }
 
   .lint-result {
-    text-align: center;
+    text-align: left;
 
     .problems {
       padding-bottom: $ksi-margin-small;

diff --git a/...components/tasks/task-module/task-module-programming/task-module-programming.component.ts b/...components/tasks/task-module/task-module-programming/task-module-programming.component.ts
@@ -192,7 +192,7 @@ export class TaskModuleProgrammingComponent implements OnInit, OnDestroy {
 
   lintCode(): void {
     this.linting$ = null;
-    this.linting$ = this.lint.analyzeCode(this.code.value).pipe(distinct());
+    this.linting$ = this.lint.analyzeCode(this.code.value, this.module.edulint_source_id).pipe(distinct());
     this.linting$.subscribe();
   }
 }
diff --git a/src/app/services/tasks/edulint.service.ts b/src/app/services/tasks/edulint.service.ts
@@ -27,10 +27,10 @@ export class EdulintService {
     this.editor = new WebService(this.httpClient, this.url, new Configuration());
   }
 
-  analyzeCode(code: string): Observable<EdulintReport> {
+  analyzeCode(code: string, source_id?: string): Observable<EdulintReport> {
     code += `\n# edulint: config=${this.config}\n`;
 
-    return this.linter.apiCodePost({code}).pipe(
+    return this.linter.apiCodePost({code, source_id}).pipe(
       take(1),
       shareReplay(1),
       catchError((e) => {