Sort incidents on blocked page by priority in descending order

API.md

@@ -92,7 +92,8 @@ Content-Type: application/json
     "approved": false,
     "emu": true,
     "isActive": true,
-    "embargoed": false
+    "embargoed": false,
+    "priority": 500
   },
   ...
 ]
@@ -129,7 +130,8 @@ Content-Type: application/json
   "approved": false,
   "emu": true,
   "isActive": true,
-  "embargoed": false
+  "embargoed": false,
+  "priority": 500
 }
 ```
 
@@ -158,7 +160,8 @@ None
     "approved": false,
     "emu": true,
     "isActive": true,
-    "embargoed": false
+    "embargoed": false,
+    "priority": 500
   },
   ...
 ]
@@ -197,7 +200,8 @@ None
   "approved": false,
   "emu": true,
   "isActive": true,
-  "embargoed": false
+  "embargoed": false,
+  "priority": 500
 }
 ```
 

assets/vue/components/PageBlocked.vue

@@ -5,7 +5,7 @@
       <div class="col-auto my-1">
         <div class="form-check">
           <input class="form-check-input" type="checkbox" id="checkbox" v-model="groupFlavors" />
-          <label class="form-check-label" for="checkbox"> Group Flavors </label>
+          <label class="form-check-label" for="checkbox"> Group Flavors</label>
         </div>
       </div>
     </div>
@@ -99,7 +99,7 @@ export default {
         searchParams.delete('group_names');
       }
       history.pushState({}, '', url);
-      return results;
+      return results.sort((a, b) => (b.incident.priority || 0) - (a.incident.priority || 0));
     },
     smelt() {
       return this.appConfig.smeltUrl;

assets/vue/components/PageIncident.vue

@@ -36,6 +36,16 @@
       <h4>Aggregate Runs Including This Incident</h4>
       <IncidentBuildSummary v-for="build in sortedBuilds" :key="build" :build="build" :jobs="jobs[build]" />
     </div>
+
+    <div class="details">
+      <h4>Further details</h4>
+      <table>
+        <tr v-for="field in ['Approved', 'Active', 'Embargoed', 'Priority', 'Project']" :key="field">
+          <th>{{ field }}</th>
+          <td>{{ renderFieldValue(incident, field) }}</td>
+        </tr>
+      </table>
+    </div>
   </div>
   <div v-else><i class="fas fa-sync fa-spin"></i> Loading incident...</div>
 </template>
@@ -98,6 +108,12 @@ export default {
         this.summary = details.incident_summary;
         this.jobs = details.jobs;
       }
+    },
+    renderFieldValue(incident, field) {
+      const fieldName = field.toLowerCase();
+      const displayTypes = {approved: 'yesno', active: 'yesno', embargoed: 'yesno'};
+      const value = incident[fieldName];
+      return displayTypes[fieldName] === 'yesno' ? (value ? 'yes' : 'no') : value ? value : 'none';
     }
   }
 };

lib/Dashboard/Controller/API/Incidents.pm

@@ -35,7 +35,8 @@ my $INCIDENT_SPEC = {
     approved    => {type  => 'boolean'},
     emu         => {type  => 'boolean'},
     isActive    => {type  => 'boolean'},
-    embargoed   => {type  => 'boolean'}
+    embargoed   => {type  => 'boolean'},
+    priority    => {anyOf => [{type => 'integer'}, {type => 'null'}]},
   }
 };
 

lib/Dashboard/Model/Incidents.pm

@@ -48,10 +48,10 @@ sub build_nr ($self, $inc) {
 
 sub find ($self, $options = {}) {
   my $incidents = $self->pg->db->query(
-    'SELECT number, project, packages, rr_number, review, review_qam, approved, emu, embargoed, ARRAY_AGG(c.name) as channels
+    'SELECT number, project, packages, rr_number, review, review_qam, approved, emu, embargoed, priority, ARRAY_AGG(c.name) as channels
      FROM incidents i INNER JOIN incident_channels ic ON ic.incident = i.id INNER JOIN channels c ON ic.channel = c.id
      WHERE number = COALESCE(?, number) AND active = TRUE
-     GROUP BY number, project, packages, rr_number, review, review_qam, approved, emu, active, embargoed ORDER BY number',
+     GROUP BY number, project, packages, rr_number, review, review_qam, approved, emu, active, embargoed, priority ORDER BY number',
     $options->{number}
   )->hashes->to_array;
   @{$_}{qw(isActive inReview inReviewQAM)} = (1, delete $_->{review}, delete $_->{review_qam}) for @$incidents;
@@ -256,9 +256,9 @@ sub _update ($self, $db, $incident) {
 
   $db->query(
     'UPDATE incidents SET packages = ?, rr_number = ?, review = ?, review_qam = ?, approved = ?, emu = ?, active = ?,
-       embargoed = ? WHERE id = ?', $incident->{packages}, $incident->{rr_number}, $incident->{inReview},
+       embargoed = ?, priority = ? WHERE id = ?', $incident->{packages}, $incident->{rr_number}, $incident->{inReview},
     $incident->{inReviewQAM}, $incident->{approved}, $incident->{emu}, $incident->{isActive}, $incident->{embargoed},
-    $id
+    $incident->{priority},    $id
   );
 
   # Remove old jobs after release request number changed (because incidents might be reused)

migrations/dashboard.sql

@@ -105,3 +105,6 @@ ALTER TABLE openqa_jobs ADD COLUMN obsolete BOOLEAN DEFAULT FALSE;
 
 --6 up
 ALTER TABLE incidents ADD COLUMN embargoed BOOLEAN DEFAULT FALSE;
+
+--7 up
+ALTER TABLE incidents ADD COLUMN priority INTEGER;

t/api.t

@@ -32,8 +32,8 @@ $dashboard_test->no_fixtures($t->app);
 my $auth_headers = {Authorization => 'Token test_token', Accept => 'application/json'};
 
 subtest 'Migrations' => sub {
-  is $t->app->pg->migrations->latest, 6, 'latest version';
-  is $t->app->pg->migrations->active, 6, 'active version';
+  is $t->app->pg->migrations->latest, 7, 'latest version';
+  is $t->app->pg->migrations->active, 7, 'active version';
 };
 
 subtest 'Unknown endpoint' => sub {
@@ -68,7 +68,8 @@ subtest 'JSON schema validation failed' => sub {
         approved    => false,
         emu         => true,
         isActive    => true,
-        embargoed   => true
+        embargoed   => true,
+        priority    => undef,
       }
     ]
   )->status_is(400);
@@ -86,7 +87,8 @@ subtest 'JSON schema validation failed' => sub {
       approved    => false,
       emu         => true,
       isActive    => true,
-      embargoed   => false
+      embargoed   => false,
+      priority    => undef,
     }
   )->status_is(400);
   like $t->tx->res->json('/error'), qr/Incident does not match the JSON schema:.+/, 'right error';
@@ -105,7 +107,8 @@ subtest 'JSON schema validation failed' => sub {
         approved    => false,
         emu         => true,
         isActive    => true,
-        embargoed   => false
+        embargoed   => false,
+        priority    => undef,
       }
     ]
   )->status_is(400);
@@ -123,7 +126,8 @@ subtest 'JSON schema validation failed' => sub {
       approved    => false,
       emu         => false,
       isActive    => true,
-      embargoed   => false
+      embargoed   => false,
+      priority    => undef,
     }
   )->status_is(400);
   like $t->tx->res->json('/error'), qr/Expected boolean - got array/, 'right error';
@@ -144,7 +148,8 @@ subtest 'Add incident' => sub {
         approved    => false,
         emu         => true,
         isActive    => true,
-        embargoed   => false
+        embargoed   => false,
+        priority    => 123,
       }
     ]
   )->status_is(200)->json_is({message => 'Ok'});
@@ -163,7 +168,8 @@ subtest 'Add incident' => sub {
         approved    => false,
         emu         => true,
         isActive    => true,
-        embargoed   => false
+        embargoed   => false,
+        priority    => 123,
       }
     ]
   );
@@ -181,7 +187,8 @@ subtest 'Add incident' => sub {
       approved    => false,
       emu         => true,
       isActive    => true,
-      embargoed   => false
+      embargoed   => false,
+      priority    => 123,
     }
   );
   $t->get_ok('/api/incidents/1' => $auth_headers)->status_is(404)->json_is({error => 'Incident not found'});
@@ -201,7 +208,8 @@ subtest 'Update incident' => sub {
         approved    => false,
         emu         => false,
         isActive    => true,
-        embargoed   => true
+        embargoed   => true,
+        priority    => 456,
       }
     ]
   )->status_is(200)->json_is({message => 'Ok'});
@@ -219,7 +227,8 @@ subtest 'Update incident' => sub {
         approved    => false,
         emu         => false,
         isActive    => true,
-        embargoed   => true
+        embargoed   => true,
+        priority    => 456,
       }
     ]
   );
@@ -236,7 +245,8 @@ subtest 'Update incident' => sub {
       approved    => false,
       emu         => false,
       isActive    => true,
-      embargoed   => true
+      embargoed   => true,
+      priority    => 456,
     }
   );
   $t->get_ok('/api/incidents/1' => $auth_headers)->status_is(404)->json_is({error => 'Incident not found'});
@@ -274,7 +284,8 @@ subtest 'Obsolete incident' => sub {
         approved    => false,
         emu         => false,
         isActive    => true,
-        embargoed   => false
+        embargoed   => false,
+        priority    => undef,
       }
     ]
   );
@@ -291,7 +302,8 @@ subtest 'Obsolete incident' => sub {
       approved    => false,
       emu         => false,
       isActive    => true,
-      embargoed   => false
+      embargoed   => false,
+      priority    => undef,
     }
   );
   $t->get_ok('/api/incidents/16860' => $auth_headers)->status_is(404)->json_is({error => 'Incident not found'});
@@ -310,7 +322,8 @@ subtest 'Update individual incidents' => sub {
       approved    => false,
       emu         => false,
       isActive    => true,
-      embargoed   => false
+      embargoed   => false,
+      priority    => undef,
     }
   )->status_is(200)->json_is({message => 'Ok'});
 
@@ -326,7 +339,8 @@ subtest 'Update individual incidents' => sub {
       approved    => false,
       emu         => false,
       isActive    => true,
-      embargoed   => false
+      embargoed   => false,
+      priority    => undef,
     }
   );
   $t->get_ok('/api/incidents/16862' => $auth_headers)->status_is(200)->json_is(
@@ -341,7 +355,8 @@ subtest 'Update individual incidents' => sub {
       approved    => false,
       emu         => false,
       isActive    => true,
-      embargoed   => false
+      embargoed   => false,
+      priority    => undef,
     }
   );
 
@@ -357,7 +372,8 @@ subtest 'Update individual incidents' => sub {
       approved    => false,
       emu         => false,
       isActive    => true,
-      embargoed   => true
+      embargoed   => true,
+      priority    => undef,
     }
   )->status_is(200)->json_is({message => 'Ok'});
 
@@ -374,7 +390,8 @@ subtest 'Update individual incidents' => sub {
         approved    => false,
         emu         => false,
         isActive    => true,
-        embargoed   => false
+        embargoed   => false,
+        priority    => undef,
       },
       {
         number      => 16862,
@@ -387,7 +404,8 @@ subtest 'Update individual incidents' => sub {
         approved    => false,
         emu         => false,
         isActive    => true,
-        embargoed   => true
+        embargoed   => true,
+        priority    => undef,
       }
     ]
   );
@@ -404,7 +422,8 @@ subtest 'Update individual incidents' => sub {
       approved    => false,
       emu         => false,
       isActive    => false,
-      embargoed   => false
+      embargoed   => false,
+      priority    => undef,
     }
   )->status_is(200)->json_is({message => 'Ok'});
   $t->get_ok('/api/incidents/16862' => $auth_headers)->status_is(404)->json_is({error => 'Incident not found'});
@@ -764,7 +783,8 @@ subtest 'Authentication' => sub {
         approved    => false,
         emu         => true,
         isActive    => true,
-        embargoed   => true
+        embargoed   => true,
+        priority    => undef,
       }
     ]
   )->status_is(403)->json_is({error => 'Permission denied'});
@@ -782,7 +802,8 @@ subtest 'Authentication' => sub {
         approved    => false,
         emu         => true,
         isActive    => true,
-        embargoed   => false
+        embargoed   => false,
+        priority    => undef,
       }
     ]
   )->status_is(200)->json_is({message => 'Ok'});

t/api_cleanup.t

@@ -97,7 +97,8 @@ subtest 'Clean up jobs after rr_number change (during sync)' => sub {
         approved    => false,
         emu         => true,
         isActive    => true,
-        embargoed   => true
+        embargoed   => true,
+        priority    => undef,
       }
     ]
   )->status_is(200)->json_is({message => 'Ok'});
@@ -131,7 +132,8 @@ subtest 'Clean up jobs after rr_number change (during sync)' => sub {
         approved    => false,
         emu         => true,
         isActive    => true,
-        embargoed   => false
+        embargoed   => false,
+        priority    => undef,
       }
     ]
   )->status_is(200)->json_is({message => 'Ok'});