activeadmin_addons 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91d4876ea2cb7334f8c2dbc40fb17e5823478982
-  data.tar.gz: cde3168fdf880d9a82405bbd390387bb51bbfff4
+  metadata.gz: f7b657178df2d8d9aa225ff46d4cd07e178a82e1
+  data.tar.gz: c439b4bb6dc8835f8264d80f9bad2e9786860551
 SHA512:
-  metadata.gz: bbedf34cd625f6c3379730abd2b1b9055b044080fc4c5d6b77499a02f1c61a49441c1d82c834de2971caa554df7908fcf0c55bca452ac28aa43583500131af60
-  data.tar.gz: e27cbfb2b0272abe956a1f4fed8520a5e8ee898ec838d7837ad98af96d75f35bd76789377e484a4a700984114fa47ed52a829a3f7cac8526d589c1ab4ebc5ace
+  metadata.gz: a3f1a38e47deaac87e470163dc80056f89cb1b446cc5c834f94883d541ce3d757041ed2dea7bbdf619f8ff5eb7005bbc3fc0f3e36c781d49eea612ec87fa89a2
+  data.tar.gz: 355f3a995e4771798d5ac0667037b45e356cab4541a98545587f7e33013f4b3886e137d147f586699ac9a8d8b2a444d9e85176457a2f2b32e2f646d9aff26310

data/app/assets/javascripts/activeadmin_addons/all.js.coffee

@@ -1,4 +1,5 @@
 #= require ./config
 #= require ./select2
+#= require ./selected-list
 #= require ./date-time-picker
 #= require ./color-picker

data/app/assets/javascripts/activeadmin_addons/selected-list.js

@@ -0,0 +1,110 @@
+//= require select2
+//= require_self
+
+$(function() {
+  setupSelectedList(document);
+
+  $(document).on('has_many_add:after', function(event, container){
+    setupSelectedList(container);
+  });
+
+  function setupSelectedList(container) {
+    $('.selected-list-container').click(function(event) {
+      var item = $(event.target);
+      if (item.hasClass('selected-item')) {
+        item.remove();
+      }
+    });
+
+    $('.selected-list', container).each(function(i, el) {
+      var url = $(el).data('url'),
+          fields = $(el).data('fields'),
+          displayName = $(el).data('display_name'),
+          width = $(el).data('width') || '100%',
+          method = $(el).data('method'),
+          model = $(el).data('model'),
+          prefix = model + '_' + method,
+          responseRoot = $(el).data('response_root'),
+          minimumInputLength = $(el).data('minimum_input_length'),
+          order = $(el).data('order') || (fields[0] + '_desc');
+
+
+      var selectOptions = {
+        width: width,
+        minimumInputLength: minimumInputLength,
+        allowClear: true,
+        multiple: true,
+        createSearchChoice: function() { return null; },
+        ajax: {
+          url: url,
+          dataType: 'json',
+          delay: 250,
+          cache: true,
+          data: function(term) {
+            var textQuery = { m: 'or' };
+            fields.forEach(function(field) {
+              textQuery[field + '_contains'] = term;
+            });
+
+            var query =  {
+              order: order,
+              q: {
+                groupings: [textQuery],
+                combinator: 'and'
+              }
+            };
+
+            return query;
+          },
+          results: function(data, page) {
+            if(data.constructor == Object) {
+              data = data[responseRoot];
+            }
+
+            return {
+              results: jQuery.map(data, function(resource) {
+                return {
+                  id: resource.id,
+                  text: resource[displayName].toString()
+                };
+              })
+            };
+          },
+        },
+      };
+
+      function onItemSelected(event) {
+        var selectedItemsContainer = $("[id='" + prefix + "_selected_values']"),
+          itemName = model + '[' + method + '][]',
+          itemId = prefix + '_' + event.val;
+
+        if ($("#" + itemId).length > 0) {
+          return;
+        }
+
+        var item = $('<div>' + event.object.text + '</div>').attr({
+          class: 'selected-item',
+          id: itemId,
+        });
+
+        var hidden_input = $('<input>').attr({
+          name: itemName,
+          type: 'hidden',
+          value: event.val
+        });
+
+        item.appendTo(selectedItemsContainer);
+        hidden_input.appendTo(item);
+      }
+
+      function onSelectClosed() {
+        $(el).select2('val', '');
+      }
+
+      $(el).on('select2-selecting', onItemSelected);
+      $(el).on('select2-close', onSelectClosed);
+
+      $(el).select2(selectOptions);
+    });
+  }
+});

data/app/assets/stylesheets/activeadmin_addons/all.scss

@@ -1,6 +1,7 @@
 @import "select2";
 @import "jquery.xdan.datetimepicker";
 @import "../palette-color-picker";
+@import "../selected-list";
 
 .filter_range_select {
   input[type=number] {

data/app/assets/stylesheets/selected-list.scss

@@ -0,0 +1,31 @@
+$selected-list-btn-color: #AAA;
+$selected-list-btn-hover-color: #333;
+
+.selected-list-label {
+  display: inline-block;
+}
+
+.selected-list-container {
+  display: inline-block;
+  width: 80%;
+
+  .selected-item {
+    height: 25px;
+  }
+}
+
+.selected-item {
+  display: table;
+  cursor: pointer;
+
+  &::before {
+    color: $selected-list-btn-color;
+    content: '\2716\00a0\00a0';
+  }
+
+  &:hover {
+    &::before {
+      color: $selected-list-btn-hover-color;
+    }
+  }
+}

data/app/inputs/ajax_filter_input.rb

@@ -31,7 +31,13 @@ class AjaxFilterInput < Formtastic::Inputs::StringInput
 
   # rubocop:disable Style/RescueModifier
   def get_selected_value(display_name)
-    filter_class = method.to_s.chomp("_id").classify.constantize rescue @object.klass
+    association_name = method.to_s.chomp("_id")
+    association = @object.klass.reflect_on_association(association_name)
+    if association.options && association.options.keys.include?(:class_name)
+      filter_class = association.options[:class_name].constantize rescue @object.klass
+    else
+      filter_class = association_name.classify.constantize rescue @object.klass
+    end
     selected_value = @object.conditions.find { |c| c.attributes.map(&:name).include?(method.to_s) }.values.first.value rescue nil
     filter_class.find(selected_value).send(display_name) if !!selected_value
   end

data/app/inputs/selected_list_input.rb

@@ -0,0 +1,94 @@
+class SelectedListInput < Formtastic::Inputs::StringInput
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+  def input_html_options
+    opts = {}
+    opts[:class] = ["selected-list"].concat([@options[:class]] || []).join(' ')
+    opts["data-model"] = model_name
+    opts["data-method"] = method
+    opts["data-url"] = @options[:url] || build_url
+    opts["data-response_root"] = @options[:response_root] || opts["data-url"].split('/').last
+    opts["data-fields"] = (@options[:fields] || ["name"]).to_json
+    opts["data-display_name"] = @options[:display_name] || "name"
+    opts["data-minimum_input_length"] = @options[:minimum_input_length] || 1
+    opts["data-width"] = @options[:width] if @options[:width]
+    opts["data-order"] = @options[:order_by] if @options[:order_by]
+    super.merge(opts)
+  end
+
+  def to_html
+    input_wrapping do
+      [
+        builder.label(translated_attribute(method), class: "selected-list-label"),
+        render_control_wrapper
+      ].flatten.join("\n").html_safe
+    end
+  end
+
+  def render_control_wrapper
+    template.content_tag(:div, class: "selected-list-container") do
+      template.content_tag(label_html)
+      template.concat(render_items_list)
+      template.concat(builder.text_field(virtual_attr, input_html_options))
+    end
+  end
+
+  def render_items_list
+    prefix = "#{model_name}_#{method}"
+    attr_name = "#{model_name}[#{method}][]"
+    template.content_tag(:div, id: "#{prefix}_selected_values", class: "selected-values") do
+      template.concat(
+        builder.hidden_field(method, id: "#{prefix}_empty", name: attr_name, value: nil)
+      )
+      @object.send(method).each do |item_id|
+        template.concat(render_item_label(prefix, attr_name, item_id))
+      end
+    end
+  end
+
+  def render_item_label(prefix, attr_name, item_id)
+    attr_id = "#{prefix}_#{item_id}"
+    div_config = { id: attr_id, class: "selected-item" }
+    template.content_tag(:div, div_config) do
+      template.concat(item_label(item_id))
+      template.concat(builder.hidden_field(nil, id: nil, name: attr_name, value: item_id))
+    end
+  end
+
+  def item_label(item_id)
+    selected_items.find { |item| item.id == item_id }.send(@options[:display_name] || "name")
+  end
+
+  def selected_items
+    @selected_items ||= @object.send(relation_name)
+  end
+
+  def translated_attribute(attribute)
+    @object.class.human_attribute_name(attribute)
+  end
+
+  def model_name
+    @object.class.to_s.underscore.tr('/', '_')
+  end
+
+  def virtual_attr
+    attr_name = "#{method}_str".to_sym
+    @object.singleton_class.send(:attr_accessor, attr_name) unless @object.respond_to?(attr_name)
+    attr_name
+  end
+
+  def build_url
+    url = ["/"]
+
+    if ActiveAdmin.application.default_namespace.present?
+      url << "#{ActiveAdmin.application.default_namespace}/"
+    end
+
+    url << relation_name
+
+    url.join("")
+  end
+
+  def relation_name
+    method.to_s.chomp("_ids").tableize
+  end
+end

data/app/inputs/tags_input.rb

@@ -30,7 +30,7 @@ class TagsInput < Formtastic::Inputs::StringInput
     input_wrapping do
       [
         label_html,
-        render_hidden_items,
+        render_selected_hidden_items,
         builder.text_field(virtual_input_name, relation_tag_options)
       ].flatten.join("\n").html_safe
     end
@@ -68,7 +68,7 @@ class TagsInput < Formtastic::Inputs::StringInput
     attr_name.to_sym
   end
 
-  def render_hidden_items
+  def render_selected_hidden_items
     prefix = "#{model_name}_#{method}"
     attr_name = "#{model_name}[#{method}][]"
     template.content_tag(:div, id: "#{prefix}_selected_values") do

data/lib/activeadmin_addons/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminAddons
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_addons
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Platanus
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-01 00:00:00.000000000 Z
+date: 2017-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -373,15 +373,18 @@ files:
 - app/assets/javascripts/activeadmin_addons/config.js
 - app/assets/javascripts/activeadmin_addons/date-time-picker.js
 - app/assets/javascripts/activeadmin_addons/select2.js
+- app/assets/javascripts/activeadmin_addons/selected-list.js
 - app/assets/javascripts/palette-color-picker.js
 - app/assets/stylesheets/activeadmin_addons/all.scss
 - app/assets/stylesheets/palette-color-picker.scss
+- app/assets/stylesheets/selected-list.scss
 - app/inputs/ajax_filter_input.rb
 - app/inputs/color_picker_input.rb
 - app/inputs/date_time_picker_input.rb
 - app/inputs/nested_select_input.rb
 - app/inputs/range_select_input.rb
 - app/inputs/search_select_input.rb
+- app/inputs/selected_list_input.rb
 - app/inputs/tags_input.rb
 - lib/activeadmin_addons.rb
 - lib/activeadmin_addons/active_admin_config.rb
@@ -420,7 +423,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Set of addons to help with the activeadmin ui