Move FCP dashboard to an overview, rather than a list of team members.

Closes #90.

Author: anp

front/app/routes/fcp-user.js

@@ -3,7 +3,7 @@ import ENV from 'rust-dashboard/config/environment';
 
 export default Ember.Route.extend({
   model(params) {
-    const url = `${ENV.apiBaseURL}nag/` + params.username;
+    const url = `${ENV.apiBaseURL}fcp/` + params.username;
 
     return fetch(url)
       .then(response => response.json())

front/app/routes/fcp.js

@@ -3,9 +3,57 @@ import ENV from 'rust-dashboard/config/environment';
 
 export default Ember.Route.extend({
   model() {
-    const url = `${ENV.apiBaseURL}nag/users`;
+    const url = `${ENV.apiBaseURL}fcp/all`;
     return fetch(url)
       .then(response => response.json())
-      .then(({ users }) => ({ users }));
+      .then((fcps) => {
+        var teams = new Map();
+
+        // go over each FCP proposal
+        for (let fcp of fcps) {
+
+            var missingReviews = [];
+
+            for (let review of fcp.reviews) {
+                if (!review[1]) {
+                    missingReviews.push(review[0].login);
+                }
+            }
+
+            missingReviews.sort();
+
+            var record = {
+                disposition: fcp.fcp.disposition,
+                issue: fcp.issue,
+                statusComment: fcp.status_comment,
+                pendingReviewers: missingReviews
+            };
+
+            // insert this record for all the teams
+            for (let label of fcp.issue.labels) {
+
+                // we only care about team labels
+                if (label.startsWith("T-")) {
+
+                    if (!teams.has(label)) {
+                        teams.set(label, []);
+                    }
+
+                    teams.get(label).push(record);
+                }
+            }
+        }
+
+        var toReturn = [];
+
+        for (let pair of teams) {
+            toReturn.push({
+                team: pair[0],
+                fcps: pair[1]
+            });
+        }
+
+        return { fcps: toReturn };
+      });
   }
 });

front/app/templates/fcp.hbs

@@ -1,24 +1,21 @@
 {{outlet}}
 
-<h3>Team Members:</h3>
+<h3>FCP/Merge Proposals:</h3>
 
-<div class="container">
-    {{#groups-of
-            tagName="div"
-            groupsOf=2
-            groupTag="div"
-            groupClass="row"
-            items=model.users
-            as |u isFirst isLast|
-        }}
-        <div class="six columns">
-          {{#link-to "fcp_user" u}}
-            <img style="width:50px; height: auto" src="https://avatars.githubusercontent.com/{{u}}" />
-          {{/link-to}}
+{{#each model.fcps as |f| }}
+    <h5><code>{{ f.team }}</code></h5>
 
-          {{#link-to "fcp_user" u}}
-            <strong>{{u}}</strong>
-          {{/link-to}}
-        </div>
-      {{/groups-of}}
-</div>
+    <ul>
+        {{#each f.fcps as |fcp| }}
+            <li>
+                <a
+                href="https://github.com/{{ fcp.issue.repository }}/issues/{{ fcp.issue.number }}#issuecomment-{{ fcp.statusComment.id }}"
+                target="_blank">
+                {{ fcp.issue.repository }} #{{ fcp.issue.number }}</a>: waiting for
+            {{#each fcp.pendingReviewers as |r| }}
+                <a href="/fcp/{{r}}">{{ r }}</a>&nbsp;
+            {{/each}}
+            </li>
+        {{/each}}
+    </ul>
+{{/each}}

src/reports/nag.rs

@@ -1,24 +1,56 @@
-use diesel::expression::dsl::*;
 use diesel::prelude::*;
-use diesel::select;
-use diesel::types::VarChar;
 
 use DB_POOL;
-use domain::github::{GitHubUser, Issue};
+use domain::github::{GitHubUser, Issue, IssueComment};
 use domain::rfcbot::{FcpProposal, FcpReviewRequest};
 use error::DashResult;
 
-pub fn all_team_members() -> DashResult<Vec<String>> {
-    let conn = try!(DB_POOL.get());
+#[derive(Serialize)]
+pub struct FcpWithInfo {
+    fcp: FcpProposal,
+    reviews: Vec<(GitHubUser, bool)>,
+    issue: Issue,
+    status_comment: IssueComment,
+}
+
+pub fn all_fcps() -> DashResult<Vec<FcpWithInfo>> {
+    use domain::schema::{fcp_proposal, fcp_review_request, githubuser, issue, issuecomment};
+
+    let conn = &*DB_POOL.get()?;
+
+    let proposals = fcp_proposal::table.filter(fcp_proposal::fcp_start.is_null())
+        .load::<FcpProposal>(conn)?;
+
+    let mut all_fcps = Vec::new();
+
+    for fcp in proposals {
+        let reviews = fcp_review_request::table.filter(fcp_review_request::fk_proposal.eq(fcp.id))
+            .load::<FcpReviewRequest>(conn)?;
 
-    // waiting on associations to get this into proper typed queries
+        let mut reviews_with_users = Vec::new();
+
+        for review in reviews {
+            let user = githubuser::table.filter(githubuser::id.eq(review.fk_reviewer)).first(conn)?;
+            reviews_with_users.push((user, review.reviewed));
+        }
+
+        let status_comment =
+            issuecomment::table.filter(issuecomment::id.eq(fcp.fk_bot_tracking_comment))
+                .first::<IssueComment>(conn)?;
+
+        let issue = issue::table.filter(issue::id.eq(fcp.fk_issue)).first::<Issue>(conn)?;
+
+        let fcp_with_info = FcpWithInfo {
+            fcp: fcp,
+            reviews: reviews_with_users,
+            issue: issue,
+            status_comment: status_comment,
+        };
+
+        all_fcps.push(fcp_with_info);
+    }
 
-    Ok(try!(select(sql::<VarChar>("\
-        DISTINCT u.login \
-        FROM githubuser u, memberships m \
-        WHERE u.id = m.fk_member \
-        ORDER BY u.login"))
-        .load(&*conn)))
+    Ok(all_fcps)
 }
 
 #[derive(Queryable, Serialize)]

src/server/handlers.rs

@@ -1,4 +1,3 @@
-use std::collections::BTreeMap;
 use std::error::Error;
 use std::fmt;
 
@@ -12,17 +11,13 @@ use urlencoded::{UrlDecodingError, UrlEncodedQuery};
 use error::DashError;
 use reports;
 
-pub fn team_members(_: &mut Request) -> IronResult<Response> {
-    let members = try!(reports::nag::all_team_members());
+pub fn list_fcps(_: &mut Request) -> IronResult<Response> {
+    let nag_report = reports::nag::all_fcps()?;
 
-    let mut resp = BTreeMap::new();
-    resp.insert("users", members);
-
-    Ok(Response::with((status::Ok,
-                       try!(ser::to_string(&resp).map_err(|e| {
+    Ok(Response::with((status::Ok, ser::to_string(&nag_report).map_err(|e| {
         let e: DashError = e.into();
         e
-    })))))
+    })?)))
 }
 
 pub fn member_nags(req: &mut Request) -> IronResult<Response> {

src/server/mod.rs

@@ -15,9 +15,9 @@ pub fn serve() {
     mount.mount("/releases/", router!(get "/" => handlers::releases));
     mount.mount("/hot-issues/", router!(get "/" => handlers::hot_issues));
 
-    mount.mount("/nag/",
+    mount.mount("/fcp/",
                 router!(
-        get "/users" => handlers::team_members,
+        get "/all" => handlers::list_fcps,
         get "/:username" => handlers::member_nags
     ));