flapjack 0.8.4 → 0.8.5

data/lib/flapjack/gateways/jsonapi/entity_methods.rb

@@ -131,11 +131,6 @@ module Flapjack
             '{"entities":[' + entities_json + ']}'
           end
 
-          app.get '/checks/:entity' do
-            content_type :json
-            entity = find_entity(params[:entity])
-            entity.check_list.to_json
-          end
 
           app.get %r{/status#{ENTITY_CHECK_FRAGMENT}} do
             content_type :json
@@ -316,29 +311,6 @@ module Flapjack
             errors.empty? ? 204 : err(403, *errors)
           end
 
-          app.post '/entities/:entity/tags' do
-            content_type :json
-
-            tags = find_tags(params[:tag])
-            entity = find_entity(params[:entity])
-            entity.add_tags(*tags)
-            entity.tags.to_json
-          end
-
-          app.delete '/entities/:entity/tags' do
-            tags = find_tags(params[:tag])
-            entity = find_entity(params[:entity])
-            entity.delete_tags(*tags)
-            status 204
-          end
-
-          app.get '/entities/:entity/tags' do
-            content_type :json
-
-            entity = find_entity(params[:entity])
-            entity.tags.to_json
-          end
-
         end
 
       end

data/lib/flapjack/gateways/jsonapi/rack/json_params_parser.rb

@@ -8,11 +8,15 @@ module Flapjack
       module Rack
         class JsonParamsParser < Struct.new(:app)
           def call(env)
-            if env['rack.input'] and not input_parsed?(env) and type_match?(env)
+            t = type(env)
+            if env['rack.input'] and not input_parsed?(env) and type_match?(t)
               env['rack.request.form_input'] = env['rack.input']
-              data = env['rack.input'].read
+              json_data = env['rack.input'].read
               env['rack.input'].rewind
-              env['rack.request.form_hash'] = data.empty? ? {} : Oj.load(data)
+
+              data = Oj.load(json_data)
+              env['rack.request.form_hash'] = data.empty? ? {} :
+                (('application/json-patch+json'.eql?(t)) ? {'ops' => data} : data)
             end
             app.call(env)
           end
@@ -21,9 +25,13 @@ module Flapjack
             env['rack.request.form_input'].eql? env['rack.input']
           end
 
-          def type_match? env
-            type = env['CONTENT_TYPE'] and
-              Flapjack::Gateways::JSONAPI::JSON_REQUEST_MIME_TYPES.include?(type.split(/\s*[;,]\s*/, 2).first.downcase)
+          def type(env)
+            return unless env['CONTENT_TYPE']
+            env['CONTENT_TYPE'].split(/\s*[;,]\s*/, 2).first.downcase
+          end
+
+          def type_match?(t)
+            Flapjack::Gateways::JSONAPI::JSON_REQUEST_MIME_TYPES.include?(t)
           end
         end
       end

data/lib/flapjack/gateways/web.rb

@@ -441,6 +441,7 @@ module Flapjack
       def require_js(*js)
         @required_js ||= []
         @required_js += js
+        @required_js.uniq!
       end
 
       def include_required_js

data/lib/flapjack/gateways/web/public/js/backbone.jsonapi.js

@@ -73,3 +73,61 @@ Backbone.Model.prototype.parse = function (response) {
   return obj;
 };
 
+toolbox.savePatch = function(model, attrs, patch) {
+  var patch_json = JSON.stringify(patch);
+  return model.save(attrs, {
+    data: patch_json,
+    patch: true,
+    contentType: 'application/json-patch+json'
+  });
+};
+
+// makes sense to call this with model.patch(model.changedAttributes),
+// if that value isn't false
+Backbone.Model.prototype.patch = function(attrs) {
+  if (attrs == null) {
+    attrs = {};
+  }
+
+  var context = this;
+
+  var patch = _.inject(attrs, function(memo, val, key) {
+    // skip if not a simple attribute value
+    if ( (key == 'links') || _.isObject(val) || _.isArray(val) ) {
+      return memo;
+    }
+
+    memo.push({
+      op: 'replace',
+      path: '/' + context.urlType + '/0/' + key,
+      value: val
+    });
+
+    return memo;
+  }, new Array());
+
+  toolbox.savePatch(this, attrs, patch);
+};
+
+// singular operation only -- TODO batch up and submit en masse
+Backbone.Model.prototype.addLinked = function(type, obj) {
+  var patch = [{
+    op: 'add',
+    path: '/' + this.urlType + '/0/links/' + type + '/-',
+    value: obj.get('id')
+  }];
+
+  toolbox.savePatch(this, {}, patch);
+  this.get('links')[type].add(obj);
+};
+
+// singular operation only -- TODO batch up and submit en masse
+Backbone.Model.prototype.removeLinked = function(type, obj) {
+  var patch = [{
+    op: 'remove',
+    path: '/' + this.urlType + '/0/links/' + type + '/' + obj.get('id'),
+  }];
+
+  toolbox.savePatch(this, {}, patch);
+  this.get('links')[type].remove(obj);
+};

data/lib/flapjack/gateways/web/public/js/contacts.js

@@ -1,5 +1,8 @@
 $(document).ready(function() {
 
+  // fix select2 with modal
+  $.fn.modal.Constructor.prototype.enforceFocus = function() {};
+
   var app = {
     api_url: $('div#data-api-url').data('api-url')
   };
@@ -19,13 +22,38 @@ $(document).ready(function() {
     toJSON: function() {
       return { entities: [ _.clone( this.attributes ) ] }
     },
-    urlRoot: app.api_url + "/entities"
+    urlType: 'entities',
+    urlRoot: function() { return app.api_url + "/" + this.urlType; }
   });
 
   app.EntityCollection = Backbone.Collection.extend({
     model:      app.Entity,
     comparator: 'name',
-    url:        app.api_url + "/entities"
+    urlType: 'entities',
+    url: function() { return app.api_url + "/" + this.urlType; }
+  });
+
+  app.Medium = Backbone.Model.extend({
+    name: 'media',
+    defaults: {
+      address: '',
+      interval: 60,
+      rollup_threshold: 3,
+      id: null,
+      contact_id: null,
+    },
+    toJSON: function() {
+      return { media: [ _.clone( this.attributes ) ] }
+    },
+    urlType: 'media',
+    urlRoot: function() { return app.api_url + "/" + this.urlType; }
+  });
+
+  app.MediumCollection = Backbone.Collection.extend({
+    model:      app.Medium,
+    comparator: 'type',
+    urlType:    'media',
+    url: function() { return app.api_url + "/" + this.urlType; }
   });
 
   app.Contact = Backbone.Model.extend({
@@ -43,18 +71,24 @@ $(document).ready(function() {
     // TODO how will we handle circular references? make it a string and eval it?
     linkages: {
       entity: app.Entity,
-      entities: app.EntityCollection
+      entities: app.EntityCollection,
+      medium: app.Medium,
+      media: app.MediumCollection
     },
-    urlRoot : app.api_url + "/contacts"
+    urlType: 'contacts',
+    urlRoot: function() { return app.api_url + "/" + this.urlType; }
   });
 
   app.ContactCollection = Backbone.Collection.extend({
     model: app.Contact,
-    url: app.api_url + "/contacts",
     linkages: {
       entity: app.Entity,
-      entities: app.EntityCollection
+      entities: app.EntityCollection,
+      medium: app.Medium,
+      media: app.MediumCollection
     },
+    urlType: 'contacts',
+    url: function() { return app.api_url + "/" + this.urlType; }
   });
 
   app.ActionsView = Backbone.View.extend({
@@ -69,17 +103,53 @@ $(document).ready(function() {
       if ( $('#contactModal').hasClass('in') ) { return; }
 
       $('#contactModal h4#contactModalLabel').text('New Contact');
-      $('#contactModal button.btn.btn-success').text('Create Contact');
+      $('#contactModal button#contactAccept').text('Create Contact');
+
+      var context = this;
+
+      // TODO if validating or leaving modal open, re-establish the event
+      $('#contactModal button#contactAccept').one('click', function() { context.save(); });
+
+      this.model = new app.Contact();
+      this.model.set('links', {entities: new app.EntityCollection(), media: new app.MediumCollection()});
+
+      var contactView = new app.ContactView({model: this.model});
+
+      $('#contactModal div.modal-footer').siblings().remove();
+      $('#contactModal div.modal-footer').before(contactView.render().$el);
+
+      var currentEntities = this.model.get('links')['entities'];
+
+      var contactEntityList = new app.ContactEntityList({collection: currentEntities, contact: this.model});
+      $('#contactModal tbody#contactEntityList').replaceWith( contactEntityList.render().$el );
+
+      var entityChooser = new app.EntityChooser({model: this.model, currentEntities: currentEntities});
+      entityChooser.render();
+
+      var context = this;
+
+      // Setup contact media
+      var contactMediaList = new app.ContactMediaList({
+        collection: this.model.get('links')['media'],
+        contact: this.model
+      });
+
+      $('#contactModal tbody#contactMediaList')
+        .replaceWith( contactMediaList.render().$el )
 
-      $('#contactModal input[name=contact_id]').val('');
-      $('#contactModal input[name=contact_first_name]').val('');
-      $('#contactModal input[name=contact_last_name]').val('');
-      $('#contactModal input[name=contact_email]').val('');
       $('#contactModal').modal('show');
     },
     render: function() {
       this.$el.html(this.template({}));
       return this;
+    },
+    save: function() {
+      data = {'first_name': $('#contactModal input[name=contact_first_name]').val(),
+              'last_name': $('#contactModal input[name=contact_last_name]').val(),
+              'email': $('#contactModal input[name=contact_email]').val()};
+      this.model.save(data, {type: 'POST', contentType: 'application/vnd.api+json'});
+      contacts.add(this.model);
+      $('#contactModal').modal('hide');
     }
   });
 
@@ -87,73 +157,111 @@ $(document).ready(function() {
   // this.collection == duplicate of entities with
   //     entities enabled for this contact removed
   app.EntityChooser = Backbone.View.extend({
-    tagName: 'input',
-    attributes: {type: 'hidden'},
-    className: 'entityChooser',
-    initialize: function() {
-      var contact_entity_ids = this.model.get('links')['entities'].pluck('id');
+    template: _.template($('#contact-entity-chooser').html()),
+    el: $("#entityAdd"),
+    events: {
+      'click button#add-contact-entity' : 'addEntities',
+    },
+    initialize: function(options) {
+      this.options = options || {};
+      this.listenTo(options.currentEntities, 'add',    this.refresh);
+      this.listenTo(options.currentEntities, 'remove', this.refresh);
+    },
+    render: function() {
 
-      var someEntities = allEntities.reject(function(item, context) {
-        return _.contains(contact_entity_ids, item.get('id'));
-      });
+      this.calculate();
 
-      this.collection = new app.EntityCollection(someEntities);
-    },
-   render: function() {
-      var jqel = $(this.el);
+      // clear array
+      this.entityIdsToAdd = new Array();
 
-      var results = this.collection.map( function(item) {
-        return item.attributes;
+      this.$el.html(this.template({}));
+
+      var jqel = $(this.el).find('input#entityChooser');
+
+      var context = this;
+      jqel.on('change', function(e) {
+        if ( !_.isArray(e.removed) && _.isObject(e.removed) ) {
+          context.entityIdsToAdd = _.without(context.entityIdsToAdd, e.removed.id);
+        }
+
+        if (  !_.isArray(e.added) && _.isObject(e.added) && (context.entityIdsToAdd.indexOf(e.added.id) == -1) ) {
+          context.entityIdsToAdd.push(e.added.id);
+        }
       });
 
       var format = function(item) { return item.name; }
+      var context = this;
 
       jqel.select2({
-        placeholder: "Select an Entity",
-        data: { results: results, text: 'name'},
+        placeholder: "Select Entities",
+        data: {results: context.results, text: 'name'},
         formatSelection: format,
-        formatResult: format
+        formatResult: format,
+        multiple: true,
+        width: 'off',
       });
 
       return this;
     },
+    calculate: function() {
+      var contact_entity_ids = this.options.currentEntities.pluck('id');
 
-  });
+      var someEntities = allEntities.reject(function(item, context) {
+        return _.contains(contact_entity_ids, item.get('id'));
+      });
+
+      this.collection = new app.EntityCollection(someEntities);
 
-  app.EntitiesEnabled = Backbone.View.extend({
-    tagName: 'select',
-    className: 'entityList',
-    attributes: {
-      size: "12",
-      multiple: "multiple"
+      this.results = this.collection.map( function(item) {
+        return item.attributes;
+      });
     },
-    initialize: function() {
-      this.collection.on('add', this.render, this);
+    refresh: function(model, collection, options) {
+      this.calculate();
+      var jqel = $(this.el).find('input#entityChooser');
+      var context = this;
+      var format = function(item) { return item.name; }
+      jqel.select2({
+        placeholder: "Select Entities",
+        data: {results: context.results, text: 'name'},
+        formatSelection: format,
+        formatResult: format,
+        multiple: true,
+        width: 'off',
+      });
     },
-    render: function() {
-      var jqel = $(this.el);
-
-      jqel.find('option').remove();
-
-      this.collection.each(function(entity) {
-         var item = new app.EntityListItem({ model: entity });
-         jqel.append(item.render().el);
+    addEntities: function() {
+      var jqel = $(this.el).find('input#entityChooser');
+      jqel.select2("val", null);
+      var context = this;
+      _.each(this.entityIdsToAdd, function(entity_id) {
+        var newEntity = allEntities.find(function(entity) { return entity.id == entity_id; });
+        context.model.addLinked('entities', newEntity);
       });
+      this.entityIdsToAdd.length = 0;
+    },
+  });
 
+  app.ContactView = Backbone.View.extend({
+    template: _.template($('#contact-template').html()),
+    id: 'contactView',
+    render: function() {
+      var template_values = _.clone(this.model.attributes);
+      this.$el.html(this.template(template_values));
       return this;
-    },
+    }
   });
 
   app.ContactList = Backbone.View.extend({
-    tagName: 'table',
-    className: 'table contactList',
+    tagName: 'tbody',
+    el: $('#contactList'),
     initialize: function() {
       this.collection.on('add', this.render, this);
     },
     render: function() {
       var jqel = $(this.el);
       jqel.empty();
-
+      var context = this;
       this.collection.each(function(contact) {
         var item = new app.ContactListItem({ model: contact });
         jqel.append($(item.render().el));
@@ -163,15 +271,45 @@ $(document).ready(function() {
     },
   });
 
-  app.EntityListItem = Backbone.View.extend({
-    tagName: 'option',
+  app.ContactEntityList = Backbone.View.extend({
+    tagName: 'tbody',
+    id: 'contactEntityList',
+    initialize: function(options) {
+      this.options = options || {};
+      this.collection.on('add', this.render, this);
+      this.collection.on('remove', this.render, this);
+    },
     render: function() {
+      var jqel = $(this.el);
+      jqel.empty();
+      var contact = this.options.contact;
+      this.collection.each(function(entity) {
+         var item = new app.ContactEntityListItem({ model: entity, contact: contact });
+         jqel.append(item.render().el);
+      });
 
-      // TODO piggyback data from model record
-      this.$el.html('<option>' + this.model.escape('name')  + '</option>');
+      return this;
+    },
+  });
 
+  app.ContactEntityListItem = Backbone.View.extend({
+    tagName: 'tr',
+    template: _.template($('#contact-entities-list-item-template').html()),
+    events: {
+      'click button.delete-entity' : 'removeEntity',
+    },
+    initialize: function(options) {
+      this.options = options || {};
+    },
+    render: function() {
+      var template_values = _.clone(this.model.attributes);
+      this.$el.html(this.template(template_values));
       return this;
-    }
+    },
+    removeEntity: function() {
+      this.options.contact.removeLinked('entities', this.model);
+      this.$el.remove();
+    },
   });
 
   app.ContactListItem = Backbone.View.extend({
@@ -179,7 +317,12 @@ $(document).ready(function() {
     className: 'contact_list_item',
     template: _.template($('#contact-list-item-template').html()),
     events: {
-      "click" : "editContact",
+      'click .button.delete-contact': 'removeContact',
+      'click':                        'editContact',
+    },
+    initialize: function() {
+      // causes an unnecessary render on create, but required for update TODO cleanup
+      this.listenTo(this.model, "sync", this.render);
     },
 
     render: function() {
@@ -193,16 +336,151 @@ $(document).ready(function() {
       if ( $('#contactModal').hasClass('in') ) { return; }
 
       $('#contactModal h4#contactModalLabel').text('Edit Contact');
-      $('#contactModal button.btn.btn-success').text('Update Contact');
+      $('#contactModal button#contactAccept').text('Update Contact');
+
+      var context = this;
+
+      // TODO if validating or leaving modal open, re-establish the event
+      $('#contactModal button#contactAccept').one('click', function() { context.save(); });
+
+      var contactView = new app.ContactView({model: this.model});
+
+      $('#contactModal div.modal-footer').siblings().remove();
+      $('#contactModal div.modal-footer').before(contactView.render().$el);
+
+      var currentEntities = this.model.get('links')['entities'];
+
+      var contactEntityList = new app.ContactEntityList({collection: currentEntities, contact: this.model});
+      $('#contactModal tbody#contactEntityList').replaceWith( contactEntityList.render().$el );
+
+      var entityChooser = new app.EntityChooser({model: this.model, currentEntities: currentEntities});
+      entityChooser.render();
+
+      // Setup contact media
+      var contactMediaList = new app.ContactMediaList({
+        collection: this.model.get('links')['media'],
+        contact: this.model
+      });
 
-      $('#contactModal input[name=contact_id]').val(this.model.get('id'));
-      $('#contactModal input[name=contact_first_name]').val(this.model.get('first_name'));
-      $('#contactModal input[name=contact_last_name]').val(this.model.get('last_name'));
-      $('#contactModal input[name=contact_email]').val(this.model.get('email'));
+      $('#contactModal tbody#contactMediaList')
+        .replaceWith( contactMediaList.render().$el )
 
       $('#contactModal').modal('show');
     },
 
+    save: function() {
+      data = {'first_name': $('#contactModal input[name=contact_first_name]').val(),
+              'last_name': $('#contactModal input[name=contact_last_name]').val(),
+              'email': $('#contactModal input[name=contact_email]').val()};
+      this.model.save(data, {type: 'PUT', contentType: 'application/vnd.api+json'});
+      $('#contactModal').modal('hide');
+    },
+
+    removeContact: function(e) {
+      e.stopImmediatePropagation();
+
+      var context = this;
+
+      context.model.destroy({
+        success: function() {
+          context.remove()
+        }
+      });
+    },
+  });
+
+  app.ContactMediaList = Backbone.View.extend({
+    tagName: 'tbody',
+    id: 'contactMediaList',
+    initialize: function(options) {
+      var context = this;
+      _.each(['email', 'sms', 'jabber'], function(type) {
+        var medium = context.collection.find(function(cm) {
+          return cm.get('type') == type;
+        });
+
+        if ( _.isUndefined(medium) ) {
+          medium = new app.Medium({
+            type: type,
+            address: '',
+            interval: 15,
+            rollup_threshold: 3,
+            contact_id: options.contact.get('id')
+          });
+          context.collection.add(medium);
+        }
+      });
+    },
+    render: function() {
+      var jqel = $(this.el);
+      jqel.empty();
+
+      this.collection.each(function(medium) {
+        var item = new app.ContactMediaListItem({ model: medium });
+        jqel.append(item.render().el);
+      });
+
+      return this;
+    },
+  });
+
+  app.ContactMediaListItem = Backbone.View.extend({
+    tagName: 'tr',
+    template: _.template($('#contact-media-list-item-template').html()),
+    events: {
+      // scoped to this view's el
+      'change input' : 'updateMedium'
+    },
+    render: function() {
+      var template_values = _.clone(this.model.attributes);
+      template_values['labels'] = {
+        'email'  : 'Email',
+        'sms'    : 'SMS',
+        'jabber' : 'Jabber'
+      };
+      this.$el.html(this.template(template_values));
+      return this;
+    },
+    updateMedium: function(event) {
+      var address =  $(event.target).parent('td')
+                      .siblings().addBack().find('input[data-attr=address]');
+      var interval = $(event.target).parent('td')
+                      .siblings().addBack().find('input[data-attr=interval]');
+      var rollupThreshold =
+                     $(event.target).parent('td')
+                      .siblings().addBack().find('input[data-attr=rollup_threshold]');
+
+      var addressVal = address.val();
+      var intervalVal = interval.val();
+      var rollupThresholdVal = rollupThreshold.val();
+
+      var numRE = /^[0-9]+$/;
+
+      if ( !numRE.test(intervalVal) || !numRE.test(rollupThresholdVal) ) {
+        // only save if numeric fields have acceptable values
+        return;
+      }
+
+      if ( _.isUndefined(addressVal) || (addressVal.length == 0) ) {
+        // only save if address not blank
+        return;
+      }
+
+      // TODO visually highlight error
+
+      var attrName = event.target.getAttribute('data-attr');
+      var value = event.target.value;
+
+      var attrs = {};
+      attrs[attrName] = value;
+
+      if ( this.model.isNew() ) {
+        this.model.save(attrs);
+        this.model.set('id', this.model.get('contact_id') + '_' + this.model.get('type'));
+      } else {
+        this.model.patch(attrs);
+      }
+    }
   });
 
   var allEntities = new app.EntityCollection();
@@ -215,8 +493,7 @@ $(document).ready(function() {
           var actionsView = new app.ActionsView({collection: collection});
           var contactList = new app.ContactList({collection: collection});
           $('#container').append(actionsView.render().el);
-
-          $('#contactList').append($(contactList.render().el).find('tr'));
+          contactList.render();
         }
       });
     }