Merge #1057

1057: Frontend page for listing pending owner invites r=carols10cents

This implements the last checkbox in Deployable chunk 1: Listing invitations of issue #924. The frontend route created, `/me/pending-invites`, calls the API route previously created and will list all current invitations associated with the user's account. Although the buttons for accepting/denying invitations have been added, they do not currently do anything as that chunk has not been implemented yet (Deployable chunks 2 & 3). It was easier to add them now for styling purposes. The page isn't linked to anywhere but can be accessed via `crates.io/me/pending-invites` if logged in.

Author: bors-voyager[bot]

app/adapters/crate-owner-invite.js

@@ -0,0 +1,8 @@
+import DS from 'ember-data';
+
+export default DS.RESTAdapter.extend({
+    namespace: 'api/v1/me',
+    pathForType() {
+        return 'crate_owner_invitations';
+    }
+});

app/models/crate-owner-invite.js

@@ -0,0 +1,8 @@
+import DS from 'ember-data';
+
+export default DS.Model.extend({
+    invited_by_username: DS.attr('string'),
+    crate_name: DS.attr('string'),
+    crate_id: DS.attr('number'),
+    created_at: DS.attr('date')
+});

app/router.js

@@ -28,6 +28,7 @@ Router.map(function() {
     this.route('me', function() {
         this.route('crates');
         this.route('following');
+        this.route('pending-invites');
     });
     this.route('user', { path: '/users/:user_id' });
     this.route('install');

app/routes/me/pending-invites.js

@@ -0,0 +1,9 @@
+import Ember from 'ember';
+
+import AuthenticatedRoute from '../../mixins/authenticated-route';
+
+export default Ember.Route.extend(AuthenticatedRoute, {
+    model() {
+        return this.get('store').findAll('crate-owner-invite');
+    }
+});

app/serializers/crate-owner-invite.js

@@ -0,0 +1,8 @@
+import DS from 'ember-data';
+
+export default DS.RESTSerializer.extend({
+    primaryKey: 'crate_id',
+    modelNameFromPayloadKey() {
+        return 'crate-owner-invite';
+    }
+});

app/styles/me.scss

@@ -138,6 +138,7 @@
         #my-crates, #my-following { margin: 0; }
     }
 }
+
 #my-feed {
     @include flex-grow(5);
     h2 { font-size: 105%; }
@@ -170,6 +171,23 @@
     }
 }
 
+#my-invites {
+    @include flex-grow(5);
+
+    .row {
+        @include display-flex;
+        @include flex-direction(column);
+    }
+
+    .info {
+        @include display-flex;
+        @include align-items(baseline);
+        @include justify-content(space-between);
+
+        .date { @include flex-grow(2); text-align: right; }
+    }
+}
+
 #stats {
     margin-left: auto;
     padding: 10px;

app/templates/me/pending-invites.hbs

@@ -0,0 +1,38 @@
+{{ title 'Pending Invites' }}
+
+<div id='crates-heading'>
+    {{svg-jar "gear"}}
+    <h1>Pending Owner Invites</h1>
+</div>
+
+<div id='my-invites'>
+    <div class='white-rows'>
+        {{#each model as |invite|}}
+            <div class='row'>
+                <div class='info'>
+                    <div class='name'>
+                        <h3>
+                            {{#link-to 'crate' invite.crate_name}}
+                                {{invite.crate_name}}
+                            {{/link-to}}
+                        </h3>
+                    </div>
+                    <div class='invite'>
+                        <p>Invited by: 
+                            {{#link-to 'user' invite.invited_by_username}}
+                                {{invite.invited_by_username}}
+                            {{/link-to}}
+                        </p>
+                    </div>
+                    <div class='sent'>
+                        <span class='small'>{{moment-from-now invite.created_at}}</span>
+                    </div>
+                    <div class='actions'>
+                        <button class='small yellow-button'>Accept</button>
+                        <button class='small yellow-button'>Deny</button>
+                    </div>
+                </div>
+            </div>
+        {{/each}}
+    </div>
+</div>

src/crate_owner_invitation.rs

@@ -67,7 +67,7 @@ pub fn list(req: &mut Request) -> CargoResult<Response> {
     let conn = &*req.db_conn()?;
     let user_id = req.user()?.id;
 
-    let invitations = crate_owner_invitations::table
+    let crate_owner_invitations = crate_owner_invitations::table
         .filter(crate_owner_invitations::invited_user_id.eq(user_id))
         .load::<CrateOwnerInvitation>(&*conn)?
         .into_iter()
@@ -76,7 +76,7 @@ pub fn list(req: &mut Request) -> CargoResult<Response> {
 
     #[derive(Serialize)]
     struct R {
-        invitations: Vec<EncodableCrateOwnerInvitation>,
+        crate_owner_invitations: Vec<EncodableCrateOwnerInvitation>,
     }
-    Ok(req.json(&R { invitations }))
+    Ok(req.json(&R { crate_owner_invitations }))
 }

src/tests/owners.rs

@@ -301,7 +301,7 @@ fn check_ownership_one_crate() {
 fn invitations_are_empty_by_default() {
     #[derive(Deserialize)]
     struct R {
-        invitations: Vec<EncodableCrateOwnerInvitation>,
+        crate_owner_invitations: Vec<EncodableCrateOwnerInvitation>,
     }
 
     let (_b, app, middle) = ::app();
@@ -322,14 +322,14 @@ fn invitations_are_empty_by_default() {
     let mut response = ok_resp!(middle.call(&mut req));
     let json: R = ::json(&mut response);
 
-    assert_eq!(json.invitations.len(), 0);
+    assert_eq!(json.crate_owner_invitations.len(), 0);
 }
 
 #[test]
 fn invitations_list() {
     #[derive(Deserialize)]
     struct R {
-        invitations: Vec<EncodableCrateOwnerInvitation>,
+        crate_owner_invitations: Vec<EncodableCrateOwnerInvitation>,
     }
 
     let (_b, app, middle) = ::app();
@@ -362,8 +362,11 @@ fn invitations_list() {
     let mut response = ok_resp!(middle.call(&mut req));
     let json: R = ::json(&mut response);
 
-    assert_eq!(json.invitations.len(), 1);
-    assert_eq!(json.invitations[0].invited_by_username, "inviting_user");
-    assert_eq!(json.invitations[0].crate_name, "invited_crate");
-    assert_eq!(json.invitations[0].crate_id, krate.id);
+    assert_eq!(json.crate_owner_invitations.len(), 1);
+    assert_eq!(
+        json.crate_owner_invitations[0].invited_by_username,
+        "inviting_user"
+    );
+    assert_eq!(json.crate_owner_invitations[0].crate_name, "invited_crate");
+    assert_eq!(json.crate_owner_invitations[0].crate_id, krate.id);
 }