feat: add more job updating stuff

BUAA-SE-Compiling · Oct 15, 2020 · 5bc9fff · 5bc9fff
1 parent a5744a9
commit 5bc9fff
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 14 deletions.
diff --git a/web/src/components/item-components/job-item/job-item.component.ts b/web/src/components/item-components/job-item/job-item.component.ts
@@ -1,5 +1,10 @@
 import { Component, OnInit, Input } from '@angular/core';
-import { JobItem, dashboardTypeToSlider } from 'src/models/job-items';
+import {
+  JobItem,
+  dashboardTypeToSlider,
+  Job,
+  JobToJobItem,
+} from 'src/models/job-items';
 import { SliderItem } from 'src/components/base-components/slider-view/slider-view.component';
 import { Dayjs } from 'dayjs';
 
@@ -9,11 +14,15 @@ import { Dayjs } from 'dayjs';
   styleUrls: ['./job-item.component.styl'],
 })
 export class JobItemComponent implements OnInit {
-  @Input() item: JobItem;
+  @Input() job: Job;
   @Input() compact: boolean = false;
 
   constructor() {}
 
+  public get item(): JobItem {
+    return JobToJobItem(this.job);
+  }
+
   public get slider(): SliderItem[] {
     return this.item.status.map<SliderItem>((st) => {
       return {

diff --git a/web/src/services/test_suite_cacher.ts b/web/src/services/test_suite_cacher.ts
@@ -113,7 +113,10 @@ export class TestSuiteAndJobCache {
         job.stage = msg.stage;
       }
       if (msg.testResult !== undefined) {
-        assign(job.results, msg.testResult);
+        Object.assign(job.results, msg.testResult);
+      }
+      if (msg.buildOutputFile !== undefined) {
+        job.buildOutputFile = msg.buildOutputFile;
       }
     }
   }
@@ -182,12 +185,12 @@ export class TestSuiteAndJobCache {
       .pipe(
         tap({
           next: (jobs) => {
-            if (opt.tracking) {
-              this.startTrackingJob(...jobs.map((j) => j.id));
-            }
             if (opt.tracking || opt.cache) {
               jobs.forEach((j) => this.cacheJob(j));
             }
+            if (opt.tracking) {
+              this.startTrackingJob(...jobs.map((j) => j.id));
+            }
           },
         })
       );

diff --git a/web/src/views/default/test-suite-view/test-suite-view.component.html b/web/src/views/default/test-suite-view/test-suite-view.component.html
@@ -60,20 +60,20 @@ <h2>提交评测</h2>
         </app-collapse-box>
       </div>
     </div>
-    <div class="rblk" id="job-list" [@staggerLoadJobs]="items && items.length">
+    <div class="rblk" id="job-list" [@staggerLoadJobs]="jobs && jobs.length">
       <h2>评测记录</h2>
       <ng-template
-        [ngIf]="items === undefined || items.length === 0"
+        [ngIf]="jobs === undefined || jobs.length === 0"
         [ngIfElse]="jobLog"
       >
         <div class="no-list">没有评测记录</div>
       </ng-template>
       <ng-template #jobLog>
         <app-job-item
           class="test-item"
-          *ngFor="let item of items; trackBy: trackBy"
-          [item]="item"
-          (click)="gotoJob(item.id)"
+          *ngFor="let job of jobs; trackBy: trackBy"
+          [job]="job"
+          (click)="gotoJob(job.id)"
         ></app-job-item>
         <div
           class="btn secondary"

diff --git a/web/src/views/default/test-suite-view/test-suite-view.component.ts b/web/src/views/default/test-suite-view/test-suite-view.component.ts
@@ -84,9 +84,6 @@ export class TestSuiteViewComponent implements OnInit {
 
   descCollapsed: boolean = false;
 
-  get items(): JobItem[] | undefined {
-    return this.jobs?.map(jobToJobItem);
-  }
   loadMore() {
     if (this.jobs === undefined || this.jobs.length === 0) {
       this.fetchJobs(this.id).subscribe();