Merge branch 'release/0.0.7'

Author: Matteo Depalo

Brocfile.js

@@ -38,6 +38,7 @@ if (EmberApp.env() === 'test') {
   app.import('bower_components/jquery-simulate-ext/libs/jquery.simulate.js', { type: 'test' });
   app.import('bower_components/jquery-simulate-ext/src/jquery.simulate.ext.js', { type: 'test' });
   app.import('bower_components/jquery-simulate-ext/src/jquery.simulate.drag-n-drop.js', { type: 'test' });
+  app.import('bower_components/deep-diff/index.js', { type: 'test' });
 }
 
 module.exports = app.toTree();

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Phoenix Changelog
 
+### Release 0.0.7
+
+- [#418 BUGFIX](https://github.com/alphasights/phoenix/pull/418) Fix quick jump result links not working sometimes
+- [#414](https://github.com/alphasights/phoenix/pull/414) Add section to interaction completion form for paying/not paying advisor
+
 ### Release 0.0.6 (June 29, 2015)
 
 - [#381](https://github.com/alphasights/phoenix/pull/381) Move call completion form to nested side panel

app/controllers/quick-jump.js renamed to app/components/as-quick-jump.js

@@ -1,11 +1,18 @@
 import Ember from 'ember';
-import PromiseController from './promise';
+import PromiseController from 'phoenix/controllers/promise';
+import KeyEventsMixin from 'phoenix/mixins/key-events';
 import { request } from 'ic-ajax';
 
-export default Ember.Controller.extend({
+export default Ember.Component.extend(KeyEventsMixin, {
+  classNameBindings: [':quick-jump', 'isActive:active', 'isLoading:loading'],
+  tagName: 'section',
+
   query: null,
   results: null,
   requestPromise: null,
+  isActive: false,
+  isLoading: Ember.computed.oneWay('requestPromise.isLoading'),
+  placeholder: null,
 
   resultSectionsOrder: [
     'user', 'contact', 'advisor', 'project', 'entity', 'account', 'target'
@@ -123,9 +130,50 @@ export default Ember.Controller.extend({
     }
   },
 
+  clickEventName: Ember.computed('elementId', function() {
+    return `click.${this.get('elementId')}`;
+  }),
+
+  didInsertElement: function() {
+    this._super.apply(this, arguments);
+
+    Ember.$(document).on(this.get('clickEventName'), (event) => {
+      var $target = Ember.$(event.target);
+      var $nonBlurringElements = this.$('.bar, .results');
+
+      if ($target.closest($nonBlurringElements).length === 0) {
+        this.send('clear');
+      }
+
+      return true;
+    });
+  },
+
+  willDestroyElement: function() {
+    this._super.apply(this, arguments);
+
+    Ember.$(document).off(this.get('clickEventName'));
+  },
+
+  onIsActiveDidChange: Ember.observer('isActive', function() {
+    if (!this.get('isActive')) {
+      this.$('input').blur();
+    }
+  }),
+
+  keyEvents: {
+    esc: function() {
+      this.set('isActive', false);
+    }
+  },
+
   actions: {
     clear: function() {
       this.set('query', null);
+    },
+
+    activate: function() {
+      this.set('isActive', true);
     }
   }
 });

app/controllers/dashboard/interaction.js

@@ -56,10 +56,15 @@ export default Ember.Controller.extend(ModelsNavigationMixin, {
     chargeClient: function() {
       this.get('completionForm').save().then(() => {
         notify('The interaction has been completed.');
-        this.get('sidePanel').send('close');
       });
     },
 
+    toggleAdvisorPayment: function() {
+      this.toggleProperty('model.paymentRequired');
+
+      this.get('advisorPaymentForm').save();
+    },
+
     hideSidePanel: function() {
       this.transitionToRoute('dashboard');
     },

app/forms/advisor-payment-form.js

@@ -0,0 +1,13 @@
+import Form from 'phoenix/forms/form';
+
+export default Form.extend({
+  genericErrorMessage: 'There has been an error with the advisor payment.',
+
+  setPersistedValues: function() {
+    var model = this.get('model');
+
+    model.setProperties({
+      paymentRequired: model.get('paymentRequired')
+    });
+  }
+});

app/forms/form.js

@@ -8,7 +8,9 @@ export default Ember.Controller.extend(EmberValidations.Mixin, {
 
   init: function() {
     this._super.apply(this, arguments);
-    this.setDefaultValues();
+    if (this.setDefaultValues !== undefined) {
+      this.setDefaultValues();
+    }
   },
 
   save: function() {

app/models/interaction.js

@@ -8,6 +8,7 @@ export default DS.Model.extend({
   clientAccessNumberCountry: DS.attr('string'),
   clientContact: DS.belongsTo('clientContact'),
   additionalContactDetails: DS.attr('string'),
+  paymentRequired: DS.attr('boolean'),
   primaryContact: DS.belongsTo('user'),
   project: DS.belongsTo('project'),
   requestedAt: DS.attr('date'),

app/routes/application.js

@@ -35,6 +35,7 @@ export default Ember.Route.extend({
       } else if (error.errors[0].status === '404') {
         logError(error);
         this.render('not_found', { into: 'application' });
+        return true;
       } else {
         logError(error);
         return true;

app/routes/dashboard/interaction.js

@@ -1,5 +1,6 @@
 import Ember from 'ember';
 import SidePanelRouteMixin from 'ember-cli-paint/mixins/side-panel-route';
+import AdvisorPaymentForm from 'phoenix/forms/advisor-payment-form';
 import InteractionCompletionForm from 'phoenix/forms/interaction-completion-form';
 
 export default Ember.Route.extend(SidePanelRouteMixin, {
@@ -30,6 +31,11 @@ export default Ember.Route.extend(SidePanelRouteMixin, {
         container: this.get('container')
       }),
 
+      advisorPaymentForm: AdvisorPaymentForm.create({
+        model: models.interaction,
+        container: this.get('container')
+      }),
+
       showForm: false
     });
   }

app/styles/components/_project-history.scss

@@ -71,5 +71,9 @@ $project-history-baby-blue: #54acb0;
       margin: 0;
       min-width: $avatar-size;
     }
+
+    .occurred-at {
+      white-space: nowrap;
+    }
   }
 }