From 222548c677c84b3f4c4579a0f3814f8172332156 Mon Sep 17 00:00:00 2001
From: Rynco Maekawa <lynzrand@outlook.com>
Date: Mon, 12 Apr 2021 21:15:54 +0800
Subject: [PATCH] fix: exceptions thrown in web

---
 .../default/job-view/job-view.component.ts    |   2 +-
 .../test-suite-view.component.html            | 161 +++++++++---------
 2 files changed, 84 insertions(+), 79 deletions(-)

diff --git a/web/src/views/default/job-view/job-view.component.ts b/web/src/views/default/job-view/job-view.component.ts
index f68112c0..be13c9d1 100644
--- a/web/src/views/default/job-view/job-view.component.ts
+++ b/web/src/views/default/job-view/job-view.component.ts
@@ -161,7 +161,7 @@ export class JobViewComponent implements OnInit, OnChanges, OnDestroy {
       .map(([key, val]) => [
         key,
         val,
-        this.flatCaseMap?.get(key).baseScore ?? 1,
+        this.flatCaseMap?.get(key)?.baseScore ?? 1,
       ]);
   }
 
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
index 1215009c..76aaa6f9 100644
--- 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
@@ -14,90 +14,95 @@ <h1>{{ suite?.title }}</h1>
       </span>
     </div>
   </div>
-  <div class="row top">
-    <div class="lblk">
-      <div id="job-submit">
-        <h2>提交评测</h2>
-        <div class="input-list">
-          <textbox
-            class="repo-input"
-            type="text"
-            placeholder="https://my-git.com/my-repo.git"
-            caption="仓库地址"
-            [icon]="repoIcon"
-            [(value)]="repo"
-            [message]="this.repoMessage"
-          ></textbox>
-          <textbox
-            class="branch-input"
-            type="text"
-            placeholder="master"
-            caption="分支"
-            [icon]="branchIcon"
-            [(value)]="branch"
-          ></textbox>
-        </div>
-        <div class="section" *ngIf="testGroups?.length > 1">
-          <h3>参与的测试组</h3>
-          <div class="row">
-            <div class="group" *ngFor="let group of testGroups">
-              <app-toggle-button
-                [active]="usingTestGroup.has(group.key)"
-                (activeChanged)="changeGroupActivation(group.key, $event)"
-              >
-                {{ group.key }}
-              </app-toggle-button>
+  <ng-template [ngIf]="suite" [ngIfElse]="loading">
+    <div class="row top">
+      <div class="lblk">
+        <div id="job-submit">
+          <h2>提交评测</h2>
+          <div class="input-list">
+            <textbox
+              class="repo-input"
+              type="text"
+              placeholder="https://my-git.com/my-repo.git"
+              caption="仓库地址"
+              [icon]="repoIcon"
+              [(value)]="repo"
+              [message]="this.repoMessage"
+            ></textbox>
+            <textbox
+              class="branch-input"
+              type="text"
+              placeholder="master"
+              caption="分支"
+              [icon]="branchIcon"
+              [(value)]="branch"
+            ></textbox>
+          </div>
+          <div class="section" *ngIf="testGroups?.length > 1">
+            <h3>参与的测试组</h3>
+            <div class="row">
+              <div class="group" *ngFor="let group of testGroups">
+                <app-toggle-button
+                  [active]="usingTestGroup.has(group.key)"
+                  (activeChanged)="changeGroupActivation(group.key, $event)"
+                >
+                  {{ group.key }}
+                </app-toggle-button>
+              </div>
             </div>
           </div>
-        </div>
-        <div class="row submit-btn-row text">
-          <!-- <div class="ghost-btn">添加 Webhook</div> -->
-          <div
-            class="btn dark test-"
-            (click)="submitTest()"
-            [ngClass]="{ disabled: submittingTest }"
-          >
-            提交
+          <div class="row submit-btn-row text">
+            <!-- <div class="ghost-btn">添加 Webhook</div> -->
+            <div
+              class="btn dark test-"
+              (click)="submitTest()"
+              [ngClass]="{ disabled: submittingTest }"
+            >
+              提交
+            </div>
           </div>
         </div>
-      </div>
-      <div
-        id="section"
-        *ngIf="suite?.description !== undefined && jobs !== undefined"
-      >
-        <app-collapse-box [initialState]="descCollapsed">
-          <h2 title>测试描述</h2>
-          <div body class="markdown-wrapper">
-            <markdown [data]="suite?.description"></markdown>
-          </div>
-        </app-collapse-box>
-      </div>
-    </div>
-    <div class="rblk" id="job-list" [@staggerLoadJobs]="jobs && jobs.length">
-      <h2>评测记录</h2>
-      <ng-template
-        [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 job of jobs; trackBy: trackBy"
-          [job]="job"
-          [testSuite]="suite"
-          (click)="gotoJob(job.id)"
-        ></app-job-item>
         <div
-          class="btn secondary"
-          *ngIf="!allJobsFinished"
-          (click)="loadMore()"
+          id="section"
+          *ngIf="suite?.description !== undefined && jobs !== undefined"
         >
-          加载更多
+          <app-collapse-box [initialState]="descCollapsed">
+            <h2 title>测试描述</h2>
+            <div body class="markdown-wrapper">
+              <markdown [data]="suite?.description"></markdown>
+            </div>
+          </app-collapse-box>
         </div>
-        <div class="" *ngIf="allJobsFinished">没了</div>
-      </ng-template>
+      </div>
+      <div class="rblk" id="job-list" [@staggerLoadJobs]="jobs && jobs.length">
+        <h2>评测记录</h2>
+        <ng-template
+          [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 job of jobs; trackBy: trackBy"
+            [job]="job"
+            [testSuite]="suite"
+            (click)="gotoJob(job.id)"
+          ></app-job-item>
+          <div
+            class="btn secondary"
+            *ngIf="!allJobsFinished"
+            (click)="loadMore()"
+          >
+            加载更多
+          </div>
+          <div class="" *ngIf="allJobsFinished">没了</div>
+        </ng-template>
+      </div>
     </div>
-  </div>
+  </ng-template>
+  <ng-template #loading>
+    <div class="row">正在加载测试集 {{ id }}</div>
+  </ng-template>
 </div>