commit a43f4d30ac91dd7117e6b07ae62c32989a15a609
author Jonathan Amsterdam <jba@google.com> Thu Oct 01 07:53:22 2020 -0400
committer Jonathan Amsterdam <jba@google.com> Fri Oct 09 18:50:57 2020 +0000
tree 96ddb60d2d3d99042309ea78eb48a0454e12dca0
parent 74e01920644f9b5ee7cfa81a7db0ee31f3d833e6

content/static/html/worker: remove finished fetches from home page

Show only fetches in progress on the worker home page.

Change-Id: If0d963bffa4edb80199e817a38d7e89530fedd31
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/260938
Trust: Jonathan Amsterdam <jba@google.com>
Run-TryBot: Jonathan Amsterdam <jba@google.com>
TryBot-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Julie Qiu <julie@golang.org>

content/static/html/worker/index.tmpl

diff --git a/content/static/html/worker/index.tmpl b/content/static/html/worker/index.tmpl
index f7346e2..fc7ccde 100644
--- a/content/static/html/worker/index.tmpl
+++ b/content/static/html/worker/index.tmpl
@@ -109,24 +109,6 @@
   </div>
 
   <div>
-    <h3>Load Shedding</h3>
-    <table>
-      <tr><td>Fetches In Flight</td><td>{{.LoadShedStats.RequestsInFlight}}</td></tr>
-      <tr>
-        <td>Zip Bytes In Flight</td>
-        <td>{{.LoadShedStats.SizeInFlight | bytesToMi}} /
-          {{.LoadShedStats.MaxSizeInFlight | bytesToMi}} Mi
-          ({{pct .LoadShedStats.SizeInFlight .LoadShedStats.MaxSizeInFlight}}%) </td>
-      </tr>
-      <tr>
-        <td>Shedded Requests</td>
-        <td>{{.LoadShedStats.RequestsShed}} / {{.LoadShedStats.RequestsTotal}}
-          ({{pct .LoadShedStats.RequestsShed .LoadShedStats.RequestsTotal}}%)</td>
-      </tr>
-    </table>
-  </div>
-
-  <div>
     <h3>Memory (all values in Mi)</h3>
     <table>
       <tr>
@@ -151,7 +133,25 @@
   </div>
 
   <div>
-    <h3>Fetches</h3>
+    <h3>Load Shedding</h3>
+    <table>
+      <tr><td>Fetches In Flight</td><td>{{.LoadShedStats.RequestsInFlight}}</td></tr>
+      <tr>
+        <td>Zip Bytes In Flight</td>
+        <td>{{.LoadShedStats.SizeInFlight | bytesToMi}} /
+          {{.LoadShedStats.MaxSizeInFlight | bytesToMi}} Mi
+          ({{pct .LoadShedStats.SizeInFlight .LoadShedStats.MaxSizeInFlight}}%) </td>
+      </tr>
+      <tr>
+        <td>Shedded Requests</td>
+        <td>{{.LoadShedStats.RequestsShed}} / {{.LoadShedStats.RequestsTotal}}
+          ({{pct .LoadShedStats.RequestsShed .LoadShedStats.RequestsTotal}}%)</td>
+      </tr>
+    </table>
+  </div>
+
+  <div>
+    <h3>Fetches In Flight</h3>
     <table>
       <thead>
         <tr>
@@ -159,26 +159,18 @@
           <th>Version</th>
           <th>Zip Size (Mi)</th>
           <th>Age</th>
-          <th>Status</th>
-          <th>Error</th>
         </tr>
       </thead>
       <tbody>
         {{range .Fetches}}
-          <tr>
-            <td>{{.ModulePath}}</td>
-            <td>{{.Version}}</td>
-            <td>{{.ZipSize | bytesToMi}}</td>
-            <td>
-              {{if eq .Status 0}}
-                {{timeSince .Start}}
-              {{else}}
-                {{timeSub .Finish .Start}}
-              {{end}}
-            </td>
-            <td>{{if ne .Status 0}}{{.Status}}{{end}}</td>
-            <td>{{if ge .Status 500}}{{.Error}}{{end}}</td>
-          </tr>
+          {{if eq .Status 0}}
+            <tr>
+              <td>{{.ModulePath}}</td>
+              <td>{{.Version}}</td>
+              <td>{{.ZipSize | bytesToMi}}</td>
+              <td>{{timeSince .Start}}</td>
+            </tr>
+          {{end}}
         {{end}}
       </tbody>
     </table>