activeadmin_addons 1.7.0 → 1.9.0

data/app/inputs/nested_select_input.rb

@@ -15,6 +15,7 @@ class NestedSelectInput < ActiveAdminAddons::InputBase
   def hierarchy
     data = get_levels_data
     raise("Undefined levels on nested_select") if data.empty?
+
     set_parent_attributes(data)
     data.reverse
   end
@@ -67,17 +68,26 @@ class NestedSelectInput < ActiveAdminAddons::InputBase
     parent_attribute = level_data[:parent_attribute]
     build_virtual_attr(parent_attribute)
     instance = instance_from_attribute_name(level_data[:attribute])
-    if instance && instance.respond_to?(parent_attribute)
+    if instance&.respond_to?(parent_attribute)
       @object.send("#{parent_attribute}=", instance.send(parent_attribute))
     end
   end
 
   def instance_from_attribute_name(attribute)
     return unless attribute
+
     attribute_value = @object.send(attribute)
     return unless attribute_value
-    klass = attribute.to_s.chomp("_id").camelize.constantize
-    klass.find_by_id(attribute_value)
+
+    klass = class_from_attribute(attribute)
+    klass.find_by(id: attribute_value)
+  end
+
+  def class_from_attribute(attribute)
+    association_name = attribute.to_s.chomp("_id")
+    association_name.camelize.constantize
+  rescue NameError
+    object_class.reflect_on_association(association_name).klass
   end
 
   def build_virtual_attr(attribute_name)

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

@@ -68,6 +68,7 @@ var initializer = 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);

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/{assets/javascripts → javascript}/activeadmin_addons/config.js

@@ -1,5 +1,5 @@
 var initializer = function() {
-  ActiveadminAddons = {
+  window.ActiveadminAddons = {
     config: {
       defaultSelect: $('body').data('default-select'),
     },

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

@@ -69,6 +69,7 @@ var initializer = 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 @@ var initializer = function() {
               query.q[parent + '_eq'] = parentId;
             }
 
+            Object.assign(query.q, filters);
+
             return query;
           },
           processResults: function(data) {
@@ -151,6 +154,9 @@ var initializer = 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);

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

@@ -6,7 +6,7 @@ var initializer = 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);
       });

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/tag_builder.rb

@@ -45,7 +45,7 @@ module ActiveAdminAddons
         'data-model' => class_name,
         'data-object_id' => model.id,
         'data-field' => attribute,
-        'data-url' => context.resource_path(model),
+        'data-url' => resource_url,
         'data-value' => data
       }
     end

data/lib/activeadmin_addons/addons/toggle_bool_builder.rb

@@ -3,6 +3,7 @@ module ActiveAdminAddons
     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
         context.span toggle
       end
@@ -12,6 +13,7 @@ module ActiveAdminAddons
       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.span(
         '',
@@ -21,7 +23,7 @@ module ActiveAdminAddons
         'data-object_id' => model.id,
         'data-field' => attribute,
         'data-value' => data,
-        'data-url' => context.auto_url_for(model),
+        'data-url' => resource_url,
         'data-success_message' => options[:success_message]
       )
     end
@@ -30,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

data/lib/activeadmin_addons/engine.rb

@@ -1,17 +1,8 @@
 module ActiveAdminAddons
   module Rails
     class Engine < ::Rails::Engine
-      require "select2-rails"
-      require "sass"
-      begin
-        require 'sassc-rails'
-      rescue LoadError
-        begin
-          require 'sass-rails'
-        rescue LoadError
-          raise "Couldn't find 'sass-rails' or 'sassc-rails' gems in your application."
-        end
-      end
+      require 'sassc'
+      require 'sassc-rails'
       require "xdan-datetimepicker-rails"
       require "require_all"
       require "active_material"

data/lib/activeadmin_addons/support/custom_builder.rb

@@ -36,6 +36,26 @@ module ActiveAdminAddons
 
     protected
 
+    def resource_url
+      admin_resource&.route_instance_path(model, {})
+    end
+
+    def enabled_controller_action?(action)
+      admin_controller_actions.include?(action)
+    end
+
+    def admin_controller_actions
+      (admin_controller&.action_methods&.to_a || []).map(&:to_sym)
+    end
+
+    def admin_controller
+      context&.controller
+    end
+
+    def admin_resource
+      context.active_admin_resource_for(model.class)
+    end
+
     def data
       @data ||= block ? block.call(model) : model.send(attribute)
     end
@@ -45,7 +65,7 @@ module ActiveAdminAddons
     end
 
     def class_name
-      model.class.base_class.name.demodulize.underscore
+      model.model_name.param_key
     end
 
     # attachment_column :foto

data/lib/activeadmin_addons/support/input_base.rb

@@ -1,3 +1,7 @@
+require_relative "input_helpers/input_options_handler"
+require_relative "input_helpers/input_methods"
+require_relative "input_helpers/input_html_helpers"
+
 module ActiveAdminAddons
   class InputBase < Formtastic::Inputs::StringInput
     include InputOptionsHandler
@@ -16,7 +20,10 @@ module ActiveAdminAddons
     end
 
     def input_html_options
-      super.merge(control_attributes)
+      # maxwidth and size are added by Formtastic::Inputs::StringInput
+      # but according to the HTML standard these are not valid attributes
+      # on the inputs provided by this module
+      super.except(:maxlength, :size).merge(control_attributes)
     end
 
     def parts_to_html

data/lib/activeadmin_addons/support/input_helpers/filter_input.rb

@@ -1,3 +1,5 @@
+require_relative "filter_input_methods"
+
 module ActiveAdminAddons
   module FilterInput
     include ActiveAdmin::Inputs::Filters::Base

data/lib/activeadmin_addons/support/input_helpers/filter_input_methods.rb

@@ -1,3 +1,5 @@
+require_relative "input_methods"
+
 module ActiveAdminAddons
   module FilterInputMethods
     include InputMethods

data/lib/activeadmin_addons/support/input_helpers/input_html_helpers.rb

@@ -16,6 +16,7 @@ module ActiveAdminAddons
 
     def method_to_input_id(id)
       raise "invalid input id" if id.blank?
+
       "#{prefixed_method}_#{id}"
     end
 

data/lib/activeadmin_addons/support/input_helpers/input_methods.rb

@@ -6,11 +6,13 @@ module ActiveAdminAddons
 
     def valid_method
       raise "invalid method given" if method.blank?
+
       method
     end
 
     def valid_object
       raise "blank object given" if @object.blank?
+
       @object
     end
 
@@ -23,7 +25,8 @@ module ActiveAdminAddons
     end
 
     def method_model
-      object_class.reflect_on_association(association_name).try(:klass) ||
+      @options[:method_model] ||
+        object_class.reflect_on_association(association_name).try(:klass) ||
         association_name.classify.constantize
     end
 
@@ -41,6 +44,10 @@ module ActiveAdminAddons
       @input_value ||= valid_object.send(valid_method)
     end
 
+    def input_association_value
+      @input_association_value ||= valid_object.send(association_name)
+    end
+
     def translated_method
       valid_object.class.human_attribute_name(valid_method)
     end
@@ -59,6 +66,7 @@ module ActiveAdminAddons
     def build_virtual_attr
       attribute_name = "virtual_#{valid_method}_attr"
       fail "#{attribute_name} is already defined" if valid_object.respond_to?(attribute_name)
+
       valid_object.singleton_class.send(:attr_accessor, attribute_name)
       attribute_name
     end

data/lib/activeadmin_addons/support/input_helpers/input_options_handler.rb

@@ -41,6 +41,7 @@ module ActiveAdminAddons
     def load_class(class_attr)
       @css_classes ||= []
       return if class_attr.blank?
+
       class_attr = class_attr.strip
       @css_classes << class_attr
       class_attr
@@ -49,6 +50,7 @@ module ActiveAdminAddons
     def get_data_attr_value(attr_name)
       item = data_attr_options[attr_name.to_sym]
       return unless item
+
       item[:value]
     end
 
@@ -56,13 +58,14 @@ module ActiveAdminAddons
 
     def formatted_option_value(item)
       return item[:value].send(item[:formatter]) if item[:formatter]
+
       item[:value]
     end
 
     def load_option_attr(attr_name, options)
       value = calculate_attr_value(attr_name, options)
       item = { value: value }
-      item[:formatter] = options[:formatter] unless options[:formatter].blank?
+      item[:formatter] = options[:formatter] if options[:formatter].present?
       item
     end
 
@@ -80,6 +83,7 @@ module ActiveAdminAddons
       default_value = attr_options[:default]
       return unless default_value
       return default_value.call if default_value.is_a?(Proc)
+
       default_value
     end
 

data/lib/activeadmin_addons/support/input_helpers/select_helpers.rb

@@ -42,6 +42,7 @@ module ActiveAdminAddons
 
     def item_to_select_option(item)
       return unless item
+
       {
         id: item.send((valid_options[:value] || :id)),
         text: item.send((valid_options[:display_name] || :name))
@@ -66,19 +67,26 @@ module ActiveAdminAddons
     end
 
     def selected_item
-      @selected_item ||= selected_collection.first
+      @selected_item ||= begin
+                           input_association_value
+                         rescue NoMethodError
+                           selected_collection.first
+                         end
     end
 
     private
 
     def active_record_relation?(value)
       klass = value.class.name
-      klass == "ActiveRecord::Relation" ||
-        klass == "ActiveRecord::Associations::CollectionProxy"
+      [
+        "ActiveRecord::Relation",
+        "ActiveRecord::Associations::CollectionProxy"
+      ].include?(klass)
     end
 
     def valid_options
       raise "missing @options hash" unless !!@options
+
       @options
     end
 

data/lib/activeadmin_addons/support/set_datepicker.rb

@@ -5,9 +5,19 @@ module ::Formtastic
 
       def default_input_type(method, options = {})
         input_type = original_default_input_type(method, options)
-        input_type = :datepicker if input_type == :date_select
+
+        if input_type == :date_select && active_admin_context?
+          input_type = :datepicker
+        end
+
         input_type
       end
+
+      def active_admin_context?
+        options[:builder] == ::ActiveAdmin::FormBuilder
+      rescue NameError
+        false
+      end
     end
   end
 end

data/lib/activeadmin_addons/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminAddons
-  VERSION = "1.7.0"
+  VERSION = "1.9.0"
 end

data/lib/generators/activeadmin_addons/assets/assets_generator.rb

@@ -0,0 +1,53 @@
+module ActiveadminAddons
+  module Generators
+    class AssetsGenerator < Rails::Generators::Base
+      class_option :theme, type: :string, default: '', desc: "Use default or 'material' theme"
+
+      def add_javascripts
+        file_path = 'app/assets/javascripts/active_admin'
+        reference = "#= require active_admin/base\n"
+
+        begin
+          inject_into_file("#{file_path}.js.coffee", coffee_assets, after: reference)
+        rescue
+          reference = "//= require active_admin/base\n"
+          inject_into_file("#{file_path}.js", js_assets, after: reference)
+        end
+      end
+
+      def add_stylesheets
+        file_path = 'app/assets/stylesheets/active_admin'
+
+        begin
+          prepend_file("#{file_path}.scss", css_assets)
+        rescue
+          prepend_file("#{file_path}.css.scss", css_assets)
+        end
+      end
+
+      private
+
+      def js_assets
+        to_add = "//= require activeadmin_addons/all\n"
+        to_add += "//= require active_material\n" if options['theme'] == "material"
+        to_add
+      end
+
+      def coffee_assets
+        to_add = "#= require activeadmin_addons/all\n"
+        to_add += "#= require active_material\n" if options['theme'] == "material"
+        to_add
+      end
+
+      def css_assets
+        if options['theme'] == "material"
+          to_add = "$am-theme-primary: #342e48;\n"
+          to_add += "@import 'activeadmin_addons/all';\n"
+          to_add + "@import 'activeadmin_addons/material';\n"
+        else
+          "@import 'activeadmin_addons/all';\n"
+        end
+      end
+    end
+  end
+end

data/lib/generators/activeadmin_addons/install/install_generator.rb

@@ -1,57 +1,26 @@
 module ActiveadminAddons
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path('../templates', __FILE__)
-      class_option :theme, type: :string, default: '', desc: "Use default or 'material' theme"
+      source_root File.expand_path('templates', __dir__)
 
       def create_initializer
         template "initializer.rb", "config/initializers/activeadmin_addons.rb"
       end
 
-      def add_javascripts
-        file_path = 'app/assets/javascripts/active_admin'
-        reference = "#= require active_admin/base\n"
-
-        begin
-          inject_into_file("#{file_path}.js.coffee", coffee_assets, after: reference)
-        rescue
-          reference = "//= require active_admin/base\n"
-          inject_into_file("#{file_path}.js", js_assets, after: reference)
-        end
-      end
-
-      def add_stylesheets
-        file_path = 'app/assets/stylesheets/active_admin'
-
-        begin
-          prepend_file("#{file_path}.scss", css_assets)
-        rescue
-          prepend_file("#{file_path}.css.scss", css_assets)
+      def setup_assets
+        if use_webpacker?
+          generate "activeadmin_addons:webpacker"
+        else
+          generate "activeadmin_addons:assets"
         end
       end
 
       private
 
-      def js_assets
-        to_add = "//= require activeadmin_addons/all\n"
-        to_add += "//= require active_material\n" if options['theme'] == "material"
-        to_add
-      end
-
-      def coffee_assets
-        to_add = "#= require activeadmin_addons/all\n"
-        to_add += "#= require active_material\n" if options['theme'] == "material"
-        to_add
-      end
-
-      def css_assets
-        if options['theme'] == "material"
-          to_add = "$am-theme-primary: #342e48;\n"
-          to_add += "@import 'activeadmin_addons/all';\n"
-          to_add + "@import 'activeadmin_addons/material';\n"
-        else
-          "@import 'activeadmin_addons/all';\n"
-        end
+      def use_webpacker?
+        ActiveAdmin.application.use_webpacker
+      rescue NoMethodError
+        false
       end
     end
   end

data/lib/generators/activeadmin_addons/webpacker/webpacker_generator.rb

@@ -0,0 +1,35 @@
+module ActiveadminAddons
+  module Generators
+    class WebpackerGenerator < Rails::Generators::Base
+      def add_javascripts
+        file_path = 'app/javascript/packs/active_admin.js'
+        reference = "import \"@activeadmin/activeadmin\";\n"
+
+        inject_into_file(file_path, js_assets, after: reference)
+      end
+
+      def add_stylesheets
+        file_path = 'app/javascript/stylesheets/active_admin.scss'
+
+        begin
+          prepend_file(file_path, css_assets)
+        end
+      end
+
+      def install_package
+        run "yarn add activeadmin_addons"
+      end
+
+      private
+
+      def js_assets
+        to_add = "import \"activeadmin_addons\"\n"
+        to_add
+      end
+
+      def css_assets
+        "@import 'activeadmin_addons/src/stylesheets/all';\n"
+      end
+    end
+  end
+end