activeadmin_addons 1.4.0 → 1.8.2

data/app/assets/stylesheets/activeadmin_addons/inputs/date-time-picker-filter.scss

@@ -0,0 +1,11 @@
+.filter_date_time_picker_filter {
+  li {
+    list-style: none;
+
+    label {
+      display: none;
+    }
+
+    margin-bottom: 5px;
+  }
+}

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

@@ -0,0 +1,53 @@
+@import 'active_material';
+@import './addons/material-datepicker';
+@import './addons/material-toggle_bool';
+
+// Select
+.filter_select,
+.search_select_filter {
+  .select2.select2-container.select2-container--default {
+    width: 100% !important;
+  }
+}
+
+.select2-container .select2-selection--single {
+  height: 42px;
+
+  .select2-selection__rendered {
+    line-height: 42px;
+  }
+
+  .select2-selection__arrow {
+    height: 40px;
+  }
+}
+
+// Date Range
+.input.date_range {
+  input.datepicker {
+    background: #fff asset-url('active_material/icons/event.svg') 10px no-repeat;
+    padding-left: 40px;
+  }
+}
+
+// Numeric Range Filter
+.filter_numeric_range_filter {
+  &.input.string input,
+  &.input.stringish input,
+  &.input.numberic input {
+    width: calc(50% - 6px);
+  }
+}
+
+// Errors
+li.error {
+  .select2-selection {
+    border-color: $am-theme-error;
+  }
+}
+
+.input.string.error input,
+.input.stringish.error input,
+.input.numberic.error input {
+  border-color: $am-theme-error;
+}

data/app/inputs/active_admin/inputs/select_input.rb

@@ -0,0 +1,11 @@
+class ActiveAdmin::Inputs::SelectInput < Formtastic::Inputs::SelectInput
+  def input_html_options
+    super.merge(data: { tags: @options[:tags].present? })
+  end
+
+  def raw_collection
+    field_value = object.send(method)
+
+    @options[:tags].present? && field_value.present? ? (super.to_a << field_value).uniq : super
+  end
+end

data/app/inputs/date_range_input.rb

@@ -0,0 +1,5 @@
+class DateRangeInput < ActiveAdmin::Inputs::Filters::DateRangeInput
+  def input_html_options
+    super.except(:maxlength, :size).merge({ autocomplete: 'off' })
+  end
+end

data/app/inputs/date_time_picker_filter_input.rb

@@ -0,0 +1,26 @@
+class DateTimePickerFilterInput < ActiveAdminAddons::InputBase
+  include ActiveAdminAddons::FilterInput
+
+  def load_control_attributes
+    load_attr(:picker_options, default: {})
+  end
+
+  def render_custom_input
+    concat(label_html)
+    concat_date_time_picker_field(gteq_input_name)
+    concat_date_time_picker_field(lteq_input_name)
+  end
+
+  def concat_date_time_picker_field(control_name)
+    concat(builder.input(control_name, date_time_picker_options(control_name)))
+  end
+
+  def date_time_picker_options(input_name = gteq_input_name)
+    is_gt = (input_name == gteq_input_name)
+
+    input_html_options.merge(
+      as: :date_time_picker,
+      placeholder: is_gt ? "min" : "max"
+    )
+  end
+end

data/app/inputs/date_time_picker_input.rb

@@ -25,6 +25,7 @@ class DateTimePickerInput < ActiveAdminAddons::InputBase
     load_class(@options[:class])
     load_data_attr(:picker_options, value: datetime_picker_options)
     load_attr(:maxlength, value: 19)
+    load_attr(:autocomplete, value: 'off')
     load_attr(:value, value: formatted_input_value)
   end
 

data/app/inputs/nested_level_input.rb

@@ -17,6 +17,7 @@ class NestedLevelInput < ActiveAdminAddons::InputBase
     load_class(@options[:class])
     load_data_attr(:fields, default: ["name"], formatter: :to_json)
     load_data_attr(:predicate, default: "contains")
+    load_data_attr(:filters)
     load_data_attr(:model, value: model_name)
     load_data_attr(:display_name, default: "name")
     load_data_attr(:minimum_input_length, default: 1)

data/app/inputs/nested_select_input.rb

@@ -81,7 +81,8 @@ class NestedSelectInput < ActiveAdminAddons::InputBase
   end
 
   def build_virtual_attr(attribute_name)
-    fail "#{attribute_name} is already defined" if @object.respond_to?(attribute_name)
-    @object.singleton_class.send(:attr_accessor, attribute_name)
+    if !@object.respond_to?(attribute_name) && !@object.respond_to?("#{attribute_name}=")
+      @object.singleton_class.send(:attr_accessor, attribute_name)
+    end
   end
 end

data/app/{assets/javascripts → javascript}/activeadmin_addons/addons/interactive_select_tag.js

@@ -1,4 +1,4 @@
-$(function() {
+var initializer = function() {
   configureInteractiveSelect(document);
 
   $(document).on('has_many_add:after', function(event, container) {
@@ -68,6 +68,7 @@ $(function() {
         url: url,
         data: data,
         dataType: 'json',
+        headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') },
         error: function() {
           var errorMsg = 'Error: Update Unsuccessful';
           console.log(errorMsg);
@@ -88,4 +89,7 @@ $(function() {
       });
     }
   });
-});
+};
+
+$(initializer);
+$(document).on('turbolinks:load', initializer);

data/app/{assets/javascripts → javascript}/activeadmin_addons/addons/toggle_bool.js

@@ -1,36 +1,39 @@
-$(function() {
+var initializer = function() {
   $('.toggle-bool-switch').click(function(e) {
     var boolSwitch = $(e.target);
-    var model = boolSwitch.data('model');
+
     var objectId = boolSwitch.data('object_id');
+    var model = boolSwitch.data('model');
     var field = boolSwitch.data('field');
-    var value = boolSwitch.data('value');
-    var otherValue = String(value) !== 'true';
-    var switchId = boolSwitch.attr('id');
-    var otherSwitch = $('#' + switchId.substr(0, switchId.lastIndexOf('-') + 1) + otherValue);
+
     var url = boolSwitch.data('url');
+    var value = boolSwitch.data('value');
     var successMessage = boolSwitch.data('success_message');
     var data = { id: objectId };
     data[model] = {};
-    data[model][field] = otherValue;
+    data[model][field] = !value;
+
     $.ajax({
       url: url,
       data: data,
       dataType: 'json',
+      headers : {'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')},
       error: function() {
         var errorMsg = 'Error: Update Unsuccessful';
         alert(errorMsg);
       },
       success: function() {
-        boolSwitch.addClass('hidden-switch');
-        otherSwitch.removeClass('hidden-switch');
+        boolSwitch.data('value', !value);
+        boolSwitch.toggleClass('on');
         if (!boolSwitch.hasClass('notify-success')) return;
         $(function() {
-          var successMsg = 'Update Successful!';
           setTimeout(alert(successMessage), 500);
         });
       },
       type: 'PATCH',
     });
   });
-});
+};
+
+$(initializer);
+$(document).on('turbolinks:load', initializer);

data/app/javascript/activeadmin_addons/all.js

@@ -0,0 +1,14 @@
+import 'select2';
+import 'jquery-datetimepicker';
+import './vendor/jquery_palette_color_picker/palette-color-picker';
+
+import './config';
+import './inputs/select2';
+import './inputs/search-select';
+import './inputs/nested-select';
+import './inputs/tags';
+import './inputs/selected-list';
+import './inputs/date-time-picker';
+import './inputs/color-picker';
+import './addons/toggle_bool';
+import './addons/interactive_select_tag';

data/app/javascript/activeadmin_addons/config.js

@@ -0,0 +1,10 @@
+var initializer = function() {
+  window.ActiveadminAddons = {
+    config: {
+      defaultSelect: $('body').data('default-select'),
+    },
+  };
+};
+
+$(initializer);
+$(document).on('turbolinks:load', initializer);

data/app/{assets/javascripts → javascript}/activeadmin_addons/inputs/color-picker.js

@@ -1,4 +1,4 @@
-$(function() {
+var initializer = function() {
   setupColorPicker();
 
   $(document).on('has_many_add:after', setupColorPicker);
@@ -10,4 +10,7 @@ $(function() {
       });
     });
   }
-});
+};
+
+$(initializer);
+$(document).on('turbolinks:load', initializer);

data/app/{assets/javascripts → javascript}/activeadmin_addons/inputs/date-time-picker.js

@@ -1,4 +1,4 @@
-$(function() {
+var initializer = function() {
   setupDateTimePicker(document);
 
   $(document).on('has_many_add:after', '.has_many_container', function(event, fieldset) {
@@ -22,4 +22,7 @@ $(function() {
       return $(entry).datetimepicker(mixedOptions);
     });
   }
-});
+};
+
+$(initializer);
+$(document).on('turbolinks:load', initializer);

data/app/{assets/javascripts → javascript}/activeadmin_addons/inputs/nested-select.js

@@ -54,7 +54,7 @@ $.fn.select2.amd.define('select2/data/nestedCustomAdapter', ['select2/data/array
   return CustomData;
 });
 
-$(function() {
+var initializer = function() {
   configureSelect2(document);
 
   $(document).on('has_many_add:after', function(event, container) {
@@ -69,6 +69,7 @@ $(function() {
       var url = element.data('url');
       var fields = element.data('fields');
       var predicate = element.data('predicate');
+      var filters = element.data('filters');
       var displayName = element.data('display-name');
       var parent = element.data('parent');
       var width = element.data('width');
@@ -117,6 +118,8 @@ $(function() {
               query.q[parent + '_eq'] = parentId;
             }
 
+            Object.assign(query.q, filters);
+
             return query;
           },
           processResults: function(data) {
@@ -151,6 +154,9 @@ $(function() {
 
       if (!!parent) {
         var parentSelectorId = '#' + model + '_' + parent;
+        if (!$(parentSelectorId).length) {
+          parentSelectorId = $(container).find('*[id*=' + parent + ']')[0];
+        }
         var parentSelector = $(parentSelectorId)[0];
 
         $(parentSelector).on('select2:select', setParentValue);
@@ -158,4 +164,7 @@ $(function() {
       }
     });
   }
-});
+};
+
+$(initializer);
+$(document).on('turbolinks:load', initializer);

data/app/{assets/javascripts → javascript}/activeadmin_addons/inputs/search-select.js

@@ -1,4 +1,4 @@
-$(function() {
+var initializer = function() {
   setupSearchSelect(document);
 
   $(document).on('has_many_add:after', function(event, container) {
@@ -70,4 +70,7 @@ $(function() {
       $(el).select2(selectOptions);
     });
   }
-});
+};
+
+$(initializer);
+$(document).on('turbolinks:load', initializer);

data/app/{assets/javascripts → javascript}/activeadmin_addons/inputs/select2.js

@@ -1,4 +1,4 @@
-$(function() {
+var initializer = function() {
   configureSelect2(document);
 
   $(document).on('has_many_add:after', function(event, container) {
@@ -6,7 +6,7 @@ $(function() {
   });
 
   function configureSelect2(container) {
-    if (ActiveadminAddons.config.defaultSelect == 'select2') {
+    if (window.ActiveadminAddons.config.defaultSelect == 'select2') {
       $('select:not(.default-select)', container).each(function(i, el) {
         setupSelect2(el);
       });
@@ -46,4 +46,7 @@ $(function() {
       });
     }
   }
-});
+};
+
+$(initializer);
+$(document).on('turbolinks:load', initializer);

data/app/{assets/javascripts → javascript}/activeadmin_addons/inputs/selected-list.js

@@ -1,4 +1,4 @@
-$(function() {
+var initializer = function() {
   setupSelectedList(document);
 
   $(document).on('has_many_add:after', function(event, container) {
@@ -101,4 +101,7 @@ $(function() {
       }
     });
   }
-});
+};
+
+$(initializer);
+$(document).on('turbolinks:load', initializer);

data/app/{assets/javascripts → javascript}/activeadmin_addons/inputs/tags.js

@@ -1,4 +1,4 @@
-$(function() {
+var initializer = function() {
   setupTags(document);
 
   $(document).on('has_many_add:after', function(event, container) {
@@ -70,4 +70,7 @@ $(function() {
       }
     });
   }
-});
+};
+
+$(initializer);
+$(document).on('turbolinks:load', initializer);

data/lib/activeadmin_addons/active_admin_config.rb

@@ -3,6 +3,7 @@ class ActiveAdmin::Views::Pages::Base
 
   def build(*args)
     original_build(args)
+    body = get_elements_by_tag_name("body").first
     body.set_attribute "data-default-select", ActiveadminAddons.default_select
   end
 end

data/lib/activeadmin_addons/addons/attachment_builder.rb

@@ -47,7 +47,7 @@ module ActiveAdminAddons
     def render
       raise "you need to pass a paperclip attribute" unless file.respond_to?(:url)
       options[:truncate] = options.fetch(:truncate, true)
-      return nil unless file.exists?
+      return nil unless file.file?
       context.link_to(build_label, file.url, target: "_blank", class: "attachment-link")
     end
 

data/lib/activeadmin_addons/addons/image_builder.rb

@@ -4,7 +4,7 @@ module ActiveAdminAddons
       return nil if data.nil?
       raise "you need to pass a paperclip image attribute" unless data.respond_to?(:url)
       style = options.fetch(:style, :original)
-      context.image_tag(data.url(style)) if data.exists?
+      context.image_tag(data.url(style)) if data.file?
     end
   end
 end

data/lib/activeadmin_addons/addons/toggle_bool_builder.rb

@@ -1,32 +1,29 @@
 module ActiveAdminAddons
   class ToggleBoolBuilder < CustomBuilder
-    SWITCHES_IMAGES_SIZE = "40x16"
-
     def render
       raise ArgumentError, 'Block should not be used in toggle bool columns' if block
       return if conditional_eval_hide?
+
       context.div class: 'toggle-bool-switches-container' do
-        [true, false].each do |value|
-          context.span switch_image_for value
-        end
+        context.span toggle
       end
     end
 
-    def switch_image_for(value)
-      img_tag_class = 'toggle-bool-switch'
-      img_tag_class += ' hidden-switch' if value == !data
-      img_tag_class += ' notify-success' if options[:success_message]
+    def toggle
+      toggle_classes = 'toggle-bool-switch'
+      toggle_classes += ' on' if data
+      toggle_classes += ' notify-success' if options[:success_message]
+      return unless enabled_controller_action?(:update)
 
-      context.image_tag(
-        "switches/switch_#{value ? :on : :off}.png",
-        size: SWITCHES_IMAGES_SIZE,
-        id: "toggle-#{class_name}-#{model.id}-#{attribute}-#{value}",
-        class: img_tag_class,
+      context.span(
+        '',
+        id: "toggle-#{class_name}-#{model.id}-#{attribute}",
+        class: toggle_classes,
         'data-model' => class_name,
         'data-object_id' => model.id,
         'data-field' => attribute,
-        'data-value' => value,
-        'data-url' => context.resource_path(model),
+        'data-value' => data,
+        'data-url' => resource_url,
         'data-success_message' => options[:success_message]
       )
     end
@@ -35,6 +32,7 @@ module ActiveAdminAddons
       [:if, :unless].any? do |cond|
         if options[cond]
           raise ArgumentError, "'#{cond}' option should be a proc" unless options[cond].is_a?(Proc)
+
           result = options[cond].call(model)
           cond == :if ? !result : result
         end