Allow users to create deliveries

app/adapters/duke-ds-project-permission.js

@@ -0,0 +1,9 @@
+import ApplicationAdapter from './application';
+
+export default ApplicationAdapter.extend({
+  urlForQuery(query) {
+    const projectId = query.project;
+    delete query.project; // remove project from query so it will not be appended to the url
+    return this.buildURL('duke-ds-project') + projectId + '/permissions/';
+  }
+});

app/components/duke-ds-user-list.js

@@ -12,8 +12,14 @@ const DukeDSUserList = Ember.Component.extend({
       mayBeHidden: false,
       className: "select-row-checkbox-column",
     },
-    { propertyName: "fullName", title: "Name", className: "duke-ds-user-fullName"},
-    { propertyName: "email", title: "Email", className: "duke-ds-user-email"}
+    { propertyName: "fullName",
+      title: "Name",
+      className: "duke-ds-user-fullName",
+      sortPrecedence: 0
+    },
+    { propertyName: "email",
+      title: "Email",
+      className: "duke-ds-user-email"}
   ],
   actions: {
     displayDataChanged: function (e) {

app/controllers/deliveries/new/enter-user-message.js

@@ -1,10 +1,9 @@
 import Ember from 'ember';
 
 export default Ember.Controller.extend({
-  queryParams: ['projectId', 'toUserId', 'shareUserIds'],
+  queryParams: ['projectId', 'toUserId'],
   projectId: null,
   toUserId: null,
-  shareUserIds: null,
   userMessage: null,
   application: Ember.inject.controller(),
   currentDukeDsUser: Ember.computed.alias('application.currentDukeDsUser'),
@@ -15,36 +14,35 @@ export default Ember.Controller.extend({
   toUser: Ember.computed('toUserId', function () {
     return this.get('store').findRecord('duke-ds-user', this.get('toUserId'));
   }),
-  shareUsers: Ember.computed('shareUserIds', function () {
-    const store = this.get('store');
-    const shareUserIds = this.get('shareUserIds');
-    if (!shareUserIds) {
-      return [];
-    }
-    return shareUserIds
-        .split(',')
-        .map(userId => store.findRecord('duke-ds-user', userId));
-  }),
+  errors: null,
+  errorMessages: Ember.computed.mapBy('errors', 'detail'),
+  disableNext: false,
   actions: {
     back() {
       const projectId = this.get('projectId');
       this.transitionToRoute('deliveries.new.select-recipient', { queryParams: { projectId: projectId }});
     },
     saveAndSend() {
-      // shareUsers returns a javascript array of promises, these promises need to be resolved
-      // into models before we can use them in saving the delivery
-      return Ember.RSVP.all(this.get('shareUsers')).then((shareUsers) => {
-        const delivery = this.get('store').createRecord('delivery', {
-          project: this.get('project'),
-          fromUser: this.get('fromUser'),
-          shareUsers: shareUsers,
-          toUser: this.get('toUser'),
-          userMessage: this.get('userMessage')
-        });
-        return delivery.save();
-      }).then(savedDelivery => {
+      this.setProperties({
+        disableNext: true,
+        errorMessage: null
+      });
+      const delivery = this.get('store').createRecord('delivery', {
+        project: this.get('project'),
+        fromUser: this.get('fromUser'),
+        toUser: this.get('toUser'),
+        userMessage: this.get('userMessage')
+      });
+      return delivery.save().then(
+        savedDelivery => {
           return savedDelivery.send();
-      }).then(sentDelivery => {
+        },
+        errorResponse => {
+          this.setProperties({
+            errors: errorResponse.errors,
+            disableNext: false
+          });
+        }).then(sentDelivery => {
         this.transitionToRoute('deliveries.show', sentDelivery.get('transfer'));
       });
     }

app/controllers/deliveries/new/select-project.js

@@ -1,5 +1,7 @@
 import Ember from 'ember';
 
+const PROJECT_ADMIN_AUTH_ROLE = 'project_admin';
+
 export default Ember.Controller.extend({
   project: null,
   application: Ember.inject.controller(),
@@ -24,7 +26,7 @@ export default Ember.Controller.extend({
     }
   }),
   currentUserCanDeliver: Ember.computed('currentUserProjectAuthRole', function () {
-    return this.get('currentUserProjectAuthRole') == 'project_admin';
+    return this.get('currentUserProjectAuthRole') == PROJECT_ADMIN_AUTH_ROLE;
   }),
   disableNext: Ember.computed.not('currentUserCanDeliver'),
   showUserMissingPrivilegesError: Ember.computed('project.id', 'currentUserProjectAuthRole', function () {
@@ -35,7 +37,7 @@ export default Ember.Controller.extend({
     if (!authRole) {
       return false; //do not show error while we are fetching users auth role for this project
     }
-    return authRole != 'project_admin';
+    return authRole != PROJECT_ADMIN_AUTH_ROLE;
   }),
   actions: {
     projectSelectionChanged(actionData) {
@@ -44,7 +46,6 @@ export default Ember.Controller.extend({
         selectedItem = actionData.selectedItems[0];
       }
       this.set('project', selectedItem);
-      this.set('showMissingPrivilegesError', false);
     },
     back() {
       this.transitionToRoute('deliveries');
@@ -54,8 +55,6 @@ export default Ember.Controller.extend({
       if (projectId) {
         if (this.get('currentUserCanDeliver')) {
           this.transitionToRoute('deliveries.new.select-recipient', { queryParams: { projectId: projectId }})
-        } else {
-          this.set('showMissingPrivilegesError', true);
         }
       }
     }

app/controllers/deliveries/new/select-recipient.js

@@ -8,16 +8,21 @@ export default Ember.Controller.extend({
   }),
   application: Ember.inject.controller(),
   currentDukeDsUser: Ember.computed.alias('application.currentDukeDsUser'),
-  otherUsersList: Ember.computed('model.[]', 'currentDukeDsUser', function () {
+  validUsersList: Ember.computed('model.[]', function () {
+    // remove users with invalid fullName values
+    return this.get('model')
+      .rejectBy('fullName', null)
+      .rejectBy('fullName', '(null)');
+  }),
+  otherUsersList: Ember.computed('validUsersList.[]', 'currentDukeDsUser', function () {
     const currentDukeDSUser = this.get('currentDukeDsUser');
     if (currentDukeDSUser) {
-      return this.get('model').rejectBy('id', currentDukeDSUser.get('id'));
+      return this.get('validUsersList').rejectBy('id', currentDukeDSUser.get('id'));
     } else {
-      return this.get('model');
+      return this.get('validUsersList');
     }
   }),
   toUser: null,
-  shareUsers: null,
   disableNext: Ember.computed.not('toUser'),
   actions: {
     toUserSelectionChanged(actionData) {
@@ -27,25 +32,16 @@ export default Ember.Controller.extend({
       }
       this.set('toUser', selectedItem);
     },
-    shareUsersSelectionChanged(actionData) {
-      this.set('shareUsers', actionData.selectedItems);
-    },
     back() {
       this.transitionToRoute('deliveries.new.select-project');
     },
     next() {
       const projectId = this.get('projectId');
       const toUserId = this.get('toUser.id');
-      const shareUsers = this.get('shareUsers');
-      var shareUserIds = null;
-      if (shareUsers) {
-        shareUserIds = shareUsers.mapBy('id').join(',');
-      }
       this.transitionToRoute('deliveries.new.enter-user-message', {
           queryParams: {
             projectId: projectId,
             toUserId: toUserId,
-            shareUserIds: shareUserIds
           }
       });
     }

app/routes/deliveries/new/enter-user-message.js

@@ -1,4 +1,9 @@
 import Ember from 'ember';
 
 export default Ember.Route.extend({
+  resetController(controller, isExiting) {
+    if (isExiting) {
+      controller.set('errors', null);
+    }
+  }
 });

app/routes/deliveries/new/select-recipient.js

@@ -2,7 +2,6 @@ import Ember from 'ember';
 
 export default Ember.Route.extend({
   model() {
-    // force loading all list of users so they don't start filling in after a few seconds
-    return this.get('store').findAll('duke-ds-user', {reload: true});
+    return this.get('store').findAll('duke-ds-user');
   }
 });

app/templates/components/delivery-table.hbs

@@ -19,5 +19,5 @@
   showColumnsDropdown=false
   showGlobalFilter=false
   showPageSize=false
-  pageSize=12
+  pageSize=20
 }}

app/templates/components/duke-ds-project-list.hbs

@@ -6,6 +6,7 @@
   showGlobalFilter=false
   showPageSize=false
   pageSize=12
+  filteringIgnoreCase=true
   displayDataChangedAction=(action "displayDataChanged")
 }}
 

app/templates/components/duke-ds-user-list.hbs

@@ -6,6 +6,7 @@
   showGlobalFilter=false
   showPageSize=false
   pageSize=pageSize
+  filteringIgnoreCase=true
   displayDataChangedAction=(action "displayDataChanged")
   multipleSelect=multipleSelect
 }}

app/templates/components/select-row-checkbox.hbs

@@ -1 +1 @@
-<span class="{{if isSelected themeInstance.select-row themeInstance.deselect-row}}" onclick={{action "clickOnRow" index record}}></span>
+<span class="{{if isSelected themeInstance.select-row themeInstance.deselect-row}}" onclick={{action "clickOnRow" index record}}></span>

app/templates/deliveries/index.hbs

@@ -1,4 +1,4 @@
 {{delivery-breadcrumbs selectedRouteName="deliveries.index"}}
 <h2>All Deliveries</h2>
 
-{{delivery-table model currentDukeDsUser}}
+{{delivery-table model currentDukeDsUser}}

app/templates/deliveries/new/enter-user-message.hbs

@@ -1,23 +1,21 @@
 {{delivery-breadcrumbs selectedRouteName="deliveries.new"}}
 <h3>New Delivery</h3>
-<p class="body">
-  Click the <strong>Send Delivery</strong> button to begin delivery of
-  <b>{{project.name}}</b> to <b>{{toUser.fullName}}</b>.
-</p>
+<h4>
+  Click <strong>Send Delivery</strong> to begin transferring ownership of your project.
+</h4>
 <p class="body">
   This will send an email to the recipient that includes a link for the recipient to accept or delcine the delivery.
   If the user accepts the delivery they will take ownership of the project.
   Once the delivery is accepted you will retain read-only permissions.
   If you wish to add or edit a custom message (e.g. details about this specific delivery), please enter those notes in the
-  <strong>User Message</strong> area.
+  <strong>User Message</strong> area below.
 </p>
 <div class="panel panel-default">
   <div class="panel-heading">
     <h3 class="panel-title">Project: {{project.name}} </h3>
   </div>
   <div class="panel-body">
     <dl class="dl-horizontal">
-
       {{#detail-label-value label="From"}}{{fromUser.fullName}}{{/detail-label-value}}
       {{#detail-label-value label="To"}}{{toUser.fullName}}{{/detail-label-value}}
       {{#each shareUsers as |shareUser index|}}
@@ -28,16 +26,15 @@
         {{/if}}
       {{/each}}
       {{#detail-label-value label="User Message"}}{{user-message-textarea value=userMessage readonly=false}}{{/detail-label-value}}
-
     </dl>
   </div>
 </div>
 
 {{error-message-alert errorMessages}}
 
 {{#bs-button type="default" onClick=(action 'back') class="back-button"}}Back{{/bs-button}}
-
 {{#bs-button type="primary" disabled=disableNext onClick=(action 'saveAndSend') class="pull-right next-button"}}
   Send Delivery
 {{/bs-button}}
+
 {{outlet}}

app/templates/deliveries/new/select-project.hbs

@@ -1,8 +1,6 @@
 {{delivery-breadcrumbs selectedRouteName="deliveries.new"}}
 <h1>New Delivery</h1>
-<p class="body">
-  Select a project to deliver to another user.
-</p>
+<h4>Select a project to deliver to another user.</h4>
 <p class="body">
   This will transfer ownership of the project to another user.
   Once the recipient accepts the delivery you will retain read-only permissions.
@@ -17,7 +15,6 @@
 {{duke-ds-project-list model selectionChanged=(action 'projectSelectionChanged')}}
 
 {{#bs-button type="default" onClick=(action 'back') class="back-button"}}Back{{/bs-button}}
-
 {{#bs-button type="primary" disabled=disableNext onClick=(action 'next') class="pull-right next-button"}}Next{{/bs-button}}
 
 {{outlet}}

app/templates/deliveries/new/select-recipient.hbs

@@ -1,19 +1,13 @@
 {{delivery-breadcrumbs selectedRouteName="deliveries.new"}}
 <h1>New Delivery</h1>
-
-<p class="body">
-  Select the recipient you wish to transfer ownership of <b>{{project.name}}</b> to.
-</p>
+<h4>
+  Select the user you wish to transfer ownership of <b>{{project.name}}</b> to.
+</h4>
 <p class="body">
-  This selected user will take ownership of the project once the delivery is accepted.
+  The selected user will take ownership of the project once the delivery is accepted.
   Once the delivery is accepted you will retain read-only permissions.
 </p>
-{{duke-ds-user-list otherUsersList pageSize=6 selectionChanged=(action 'toUserSelectionChanged')}}
-
-<p class="body">
-  Select additional users to share project.
-</p>
-{{duke-ds-user-list otherUsersList pageSize=6 multipleSelect=true selectionChanged=(action 'shareUsersSelectionChanged')}}
+{{duke-ds-user-list otherUsersList pageSize=12 selectionChanged=(action 'toUserSelectionChanged')}}
 
 {{#bs-button type="default" onClick=(action 'back') class="back-button"}}Back{{/bs-button}}
 {{#bs-button type="primary" disabled=disableNext onClick=(action 'next') class="pull-right next-button"}}Next{{/bs-button}}

tests/integration/components/duke-ds-user-list-test.js

@@ -5,21 +5,22 @@ moduleForComponent('duke-ds-user-list', 'Integration | Component | duke ds user
   integration: true
 });
 
-test('it renders a list of users', function(assert) {
+test('it renders a list of users sorted by fullName', function(assert) {
   this.set('users', [
-    {fullName: 'Joe', email: 'joe@joe.org'},
-    {fullName: 'Jim', email: 'jim@jim.org'},
+    {id:'1', fullName: 'Joe', email: 'joe@joe.org'},
+    {id:'2', fullName: 'Jim', email: 'jim@jim.org'},
   ]);
+  this.set('externalAction', function () {});
+  this.render(hbs`{{duke-ds-user-list users selectionChanged=(action externalAction)}}`);
 
-  this.render(hbs`{{duke-ds-user-list users}}`);
   //assert.equal(this.$().html().trim(), 'Project Name');
   assert.equal(this.$('.duke-ds-user-fullName').eq(0).text().trim(), 'Name'); //header
   assert.equal(this.$('.duke-ds-user-email').eq(0).text().trim(), 'Email'); //header
   // index 1 is the search box
-  assert.equal(this.$('.duke-ds-user-fullName').eq(2).text().trim(), 'Joe');
-  assert.equal(this.$('.duke-ds-user-email').eq(2).text().trim(), 'joe@joe.org');
-  assert.equal(this.$('.duke-ds-user-fullName').eq(3).text().trim(), 'Jim');
-  assert.equal(this.$('.duke-ds-user-email').eq(3).text().trim(), 'jim@jim.org');
+  assert.equal(this.$('.duke-ds-user-fullName').eq(2).text().trim(), 'Jim');
+  assert.equal(this.$('.duke-ds-user-email').eq(2).text().trim(), 'jim@jim.org');
+  assert.equal(this.$('.duke-ds-user-fullName').eq(3).text().trim(), 'Joe');
+  assert.equal(this.$('.duke-ds-user-email').eq(3).text().trim(), 'joe@joe.org');
 });
 
 test('it sends selected project to selectionChanged action', function(assert) {
@@ -28,7 +29,11 @@ test('it sends selected project to selectionChanged action', function(assert) {
     {fullName: 'Joe', email: 'joe@joe.org'},
     {fullName: 'Jim', email: 'jim@jim.org'},
   ]);
-  this.set('externalAction', (actionData) => assert.equal(actionData.selectedItems[0].fullName, 'Jim'));
+  this.set('externalAction', function (actionData) {
+    if (actionData.selectedItems[0]) {
+      assert.equal(actionData.selectedItems[0].fullName, 'Jim');
+    }
+  });
   this.render(hbs`{{duke-ds-user-list users selectionChanged=(action externalAction)}}`);
-  this.$('.duke-ds-user-fullName').eq(3).click(); //click Jim row
+  this.$('.duke-ds-user-fullName').eq(2).click(); //click Jim row
 });

tests/unit/adapters/duke-ds-project-permission-test.js

@@ -0,0 +1,12 @@
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('adapter:duke-ds-project-permission', 'Unit | Adapter | duke ds project permission', {
+  // Specify the other units that are required for this test.
+  needs: ['service:session']
+});
+
+test('it returns duke-ds-project permisions sub route for urlForQuery', function(assert) {
+  let adapter = this.subject();
+  let url = adapter.urlForQuery({project: 'project1'}, 'duke-ds-project-permission');
+  assert.equal(url, 'http://testhost/duke-ds-projects/project1/permissions/')
+});