Resolve changes from review

Author: bncer

src/templates.rs

@@ -79,11 +79,5 @@ pub fn get_pending_build(pr: &PullRequestModel) -> Option<&BuildModel> {
     {
         return Some(auto_build);
     }
-
-    if let Some(try_build) = &pr.try_build
-        && try_build.status == BuildStatus::Pending
-    {
-        return Some(try_build);
-    }
     None
 }

templates/queue.html

@@ -7,20 +7,20 @@
 <link rel="stylesheet" href="https://cdn.datatables.net/rowgroup/1.5.1/css/rowGroup.dataTables.min.css" />
 <style>
     @keyframes barber-pole {
-	/* This animation is used to make the status indicator next to
-	   pending pulls look like a barber poll. We do that with a
-	   diagonal linear gradient. CSS does not allow us to animate a
-	   gradient, so instead we make the indicator a little taller
-	   than shown, and then animate the whole thing upward. */
-	from{
-	    transform: translate(0, 0);
-	}
-	to {
-	    /* The magic number 11.314 is sqrt(8^2 + 8^2), based on how
-	       far vertically it takes to repeat a 45 degree gradient
-	       that is 8 pixels long before it repeats. */
-	    transform: translate(0, -11.314px);
-	}
+        /* This animation is used to make the status indicator next to
+           pending pulls look like a barber poll. We do that with a
+           diagonal linear gradient. CSS does not allow us to animate a
+           gradient, so instead we make the indicator a little taller
+           than shown, and then animate the whole thing upward. */
+        from{
+            transform: translate(0, 0);
+        }
+        to {
+            /* The magic number 11.314 is sqrt(8^2 + 8^2), based on how
+               far vertically it takes to repeat a 45 degree gradient
+               that is 8 pixels long before it repeats. */
+            transform: translate(0, -11.314px);
+        }
     }
     main {
         max-width: 100rem;
@@ -51,28 +51,28 @@
         width: 2.5rem;
     }
     table.dataTable > tbody > tr > td.status {
-	position: relative;
-	overflow: hidden;
-	padding-left: 16px;
-	white-space: nowrap;
+        position: relative;
+        overflow: hidden;
+        padding-left: 16px;
+        white-space: nowrap;
     }
     td.status:before {
-	content: " ";
-	position: absolute;
-	display: block;
-	left: 6px;
-	width: 6px;
-	top: 0;
-	bottom: 0;
+        content: " ";
+        position: absolute;
+        display: block;
+        left: 6px;
+        width: 6px;
+        top: 0;
+        bottom: 0;
     }
     td.status[data-status="pending"]:before {
-	/* Give the pending state a little bit of animation to make it
-	   clear that these items are the ones that are being tested
-	   right now. */
-	bottom: -20px;
-	background-color: #F0DE57;
-	background-image: repeating-linear-gradient(135deg, #F0DE57 0, #F0DE57 4px, #FBEE97 4px, #FBEE97 8px, #F0DE57 0);
-	animation: barber-pole 1s linear infinite;
+        /* Give the pending state a little bit of animation to make it
+           clear that these items are the ones that are being tested
+           right now. */
+        bottom: -20px;
+        background-color: #F0DE57;
+        background-image: repeating-linear-gradient(135deg, #F0DE57 0, #F0DE57 4px, #FBEE97 4px, #FBEE97 8px, #F0DE57 0);
+        animation: barber-pole 1s linear infinite;
     }
 
     #rollupModal {
@@ -156,9 +156,9 @@ <h1>
                 </td>
                 {% let pending_build = crate::templates::get_pending_build(pr) %}
                 <td class="status" data-status="{{ crate::templates::status_text(pr) }}"
-                    data-created-at="{% if let Some(build) = pending_build %}
-                    {{ build.created_at.timestamp_millis() }}
-                    {% endif %}">
+                    {% if let Some(build) = pending_build %}
+                    data-created-at="{{ build.created_at.timestamp_millis() }}"
+                    {% endif %}>
 
                     {% if let Some(try_build) = pr.try_build %}
                     <a href="../results/{{ repo_name }}/{{ pr.number }}">{{ crate::templates::status_text(pr) }}</a> (try)
@@ -423,6 +423,9 @@ <h1>
         }
 
         if (minutes > 0) {
+            if (output.length > 0) {
+                output += ' ';
+            }
             output += `${minutes}m`;
         }
         if (output.length > 0) {
@@ -434,7 +437,7 @@ <h1>
     function updateElapsedTimes() {
         const now = Date.now();
         document.querySelectorAll('[data-created-at]').forEach(td => {
-            const createdAtMs = parseInt(td.getAttribute('data-created-at'), 10);
+            const createdAtMs = parseInt(td.dataset.createdAt, 10);
             if (createdAtMs > 0) {
                 const elapsedMs = now - createdAtMs;
                 const formattedTime = formatElapsedTime(elapsedMs);
@@ -445,5 +448,6 @@ <h1>
     }
 
     updateElapsedTimes();
+    setInterval(updateElapsedTimes, 1000);
 </script>
 {% endblock %}