madmin 1.0.1 → 1.2.1

data/lib/generators/madmin/resource/templates/controller.rb.tt

@@ -1,4 +1,10 @@
 module Madmin
   class <%= class_name.pluralize %>Controller < Madmin::ResourceController
+<% if class_name == "ActiveStorage::Blob" -%>
+    def new
+      super
+      @record.assign_attributes(filename: "")
+    end
+<% end -%>
   end
 end

data/lib/generators/madmin/resource/templates/resource.rb.tt

@@ -8,4 +8,18 @@ class <%= class_name %>Resource < Madmin::Resource
 <% associations.each do |association_name| -%>
   attribute :<%= association_name %>
 <% end -%>
+
+  # Uncomment this to customize the display name of records in the admin area.
+  # def self.display_name(record)
+  #   record.name
+  # end
+
+  # Uncomment this to customize the default sort column and direction.
+  # def self.default_sort_column
+  #   "created_at"
+  # end
+  #
+  # def self.default_sort_direction
+  #   "desc"
+  # end
 end

data/lib/generators/madmin/views/javascript_generator.rb

@@ -0,0 +1,15 @@
+require "madmin/view_generator"
+
+module Madmin
+  module Generators
+    module Views
+      class JavascriptGenerator < Madmin::ViewGenerator
+        source_root template_source_path
+
+        def copy_navigation
+          copy_resource_template("_javascript")
+        end
+      end
+    end
+  end
+end

data/lib/generators/madmin/views/views_generator.rb

@@ -4,11 +4,12 @@ module Madmin
   module Generators
     class ViewsGenerator < Madmin::ViewGenerator
       def copy_templates
-        view = "madmin:views:"
-        call_generator("#{view}index", resource_path, "--namespace", namespace)
-        call_generator("#{view}show", resource_path, "--namespace", namespace)
-        call_generator("#{view}new", resource_path, "--namespace", namespace)
-        call_generator("#{view}edit", resource_path, "--namespace", namespace)
+        # Some generators duplicate templates, so not everything is present here
+        call_generator("madmin:views:edit", resource_path, "--namespace", namespace)
+        call_generator("madmin:views:index", resource_path, "--namespace", namespace)
+        call_generator("madmin:views:layout", resource_path, "--namespace", namespace)
+        call_generator("madmin:views:new", resource_path, "--namespace", namespace)
+        call_generator("madmin:views:show", resource_path, "--namespace", namespace)
       end
     end
   end

data/lib/madmin/engine.rb

@@ -6,7 +6,7 @@ module Madmin
     end
 
     config.to_prepare do
-      Madmin.resources = []
+      Madmin.reset_resources!
     end
   end
 end

data/lib/madmin/field.rb

@@ -36,5 +36,9 @@ module Madmin
     def required?
       model.validators_on(attribute_name).any? { |v| v.is_a? ActiveModel::Validations::PresenceValidator }
     end
+
+    def searchable?
+      false
+    end
   end
 end

data/lib/madmin/fields/belongs_to.rb

@@ -2,17 +2,21 @@ module Madmin
   module Fields
     class BelongsTo < Field
       def options_for_select(record)
-        association = record.class.reflect_on_association(attribute_name)
-
-        klass = association.klass
-        klass.all.map do |r|
-          ["#{klass.name} ##{r.id}", r.id]
+        if (record = record.send(attribute_name))
+          resource = Madmin.resource_for(record)
+          [[resource.display_name(record), record.id]]
+        else
+          []
         end
       end
 
       def to_param
         "#{attribute_name}_id"
       end
+
+      def index_path
+        Madmin.resource_by_name(model.reflect_on_association(attribute_name).klass).index_path(format: :json)
+      end
     end
   end
 end

data/lib/madmin/fields/has_many.rb

@@ -2,17 +2,22 @@ module Madmin
   module Fields
     class HasMany < Field
       def options_for_select(record)
-        association = record.class.reflect_on_association(attribute_name)
-
-        klass = association.klass
-        klass.all.map do |r|
-          ["#{klass.name} ##{r.id}", r.id]
+        if (records = record.send(attribute_name))
+          return [] unless records.first
+          resource = Madmin.resource_for(records.first)
+          records.map { |record| [resource.display_name(record), record.id] }
+        else
+          []
         end
       end
 
       def to_param
         {"#{attribute_name.to_s.singularize}_ids".to_sym => []}
       end
+
+      def index_path
+        Madmin.resource_by_name(model.reflect_on_association(attribute_name).klass).index_path(format: :json)
+      end
     end
   end
 end

data/lib/madmin/fields/nested_has_many.rb

@@ -0,0 +1,40 @@
+module Madmin
+  module Fields
+    class NestedHasMany < Field
+      DEFAULT_ATTRIBUTES = %w[_destroy id].freeze
+      def nested_attributes
+        resource.attributes.reject { |i| skipped_fields.include?(i[:name]) }
+      end
+
+      def resource
+        "#{to_model.name}Resource".constantize
+      end
+
+      def to_param
+        {"#{attribute_name}_attributes": permitted_fields}
+      end
+
+      def to_partial_path(name)
+        unless %w[index show form fields].include? name
+          raise ArgumentError, "`partial` must be 'index', 'show', 'form' or 'fields'"
+        end
+
+        "/madmin/fields/#{self.class.field_type}/#{name}"
+      end
+
+      def to_model
+        attribute_name.to_s.singularize.classify.constantize
+      end
+
+      private
+
+      def permitted_fields
+        (resource.permitted_params - skipped_fields + DEFAULT_ATTRIBUTES).uniq
+      end
+
+      def skipped_fields
+        options[:skip] || []
+      end
+    end
+  end
+end

data/lib/madmin/fields/password.rb

@@ -0,0 +1,6 @@
+module Madmin
+  module Fields
+    class Password < Field
+    end
+  end
+end

data/lib/madmin/fields/string.rb

@@ -1,6 +1,9 @@
 module Madmin
   module Fields
     class String < Field
+      def searchable?
+        options.fetch(:searchable, model.column_names.include?(attribute_name.to_s))
+      end
     end
   end
 end

data/lib/madmin/fields/text.rb

@@ -1,6 +1,9 @@
 module Madmin
   module Fields
     class Text < Field
+      def searchable?
+        options.fetch(:searchable, model.column_names.include?(attribute_name.to_s))
+      end
     end
   end
 end

data/lib/madmin/generator_helpers.rb

@@ -1,24 +1,30 @@
 module Madmin
   module GeneratorHelpers
+    ROUTES_FILE = {default: "config/routes.rb", separated: "config/routes/madmin.rb"}.freeze
+
     def call_generator(generator, *args)
       Rails::Generators.invoke(generator, args, generator_options)
     end
 
     def route_namespace_exists?
-      File.readlines(Rails.root.join("config/routes.rb")).grep(/namespace :madmin/).size > 0
+      File.readlines(Rails.root.join(default_routes_file)).grep(/namespace :madmin/).size > 0
+    end
+
+    def rails6_1_and_up?
+      Gem.loaded_specs["rails"].version >= Gem::Version.new(6.1)
     end
 
     # Method copied from Rails 6.1 master
-    def route(routing_code, namespace: nil, sentinel: nil, indentation: 2)
+    def route(routing_code, namespace: nil, sentinel: nil, indentation: 2, file: default_routes_file)
       routing_code = Array(namespace).reverse.reduce(routing_code) { |code, ns|
         "namespace :#{ns} do\n#{indent(code, 2)}\nend"
       }
 
       log :route, routing_code
-      sentinel ||= /\.routes\.draw do\s*\n/m
+      sentinel ||= default_sentinel(file)
 
       in_root do
-        inject_into_file "config/routes.rb", optimize_indentation(routing_code, indentation), after: sentinel, verbose: false, force: false
+        inject_into_file file, optimize_indentation(routing_code, indentation), after: sentinel, verbose: false, force: false
       end
     end
 
@@ -30,6 +36,18 @@ module Madmin
 
     private
 
+    def separated_routes_file?
+      default_routes_file.eql?(ROUTES_FILE[:separated])
+    end
+
+    def default_sentinel(file)
+      file.eql?(ROUTES_FILE[:default]) ? /\.routes\.draw do\s*\n/m : /namespace :madmin do\s*\n/m
+    end
+
+    def default_routes_file
+      rails6_1_and_up? ? ROUTES_FILE[:separated] : ROUTES_FILE[:default]
+    end
+
     def generator_options
       {behavior: behavior}
     end

data/lib/madmin/resource.rb

@@ -1,14 +1,10 @@
 module Madmin
   class Resource
-    class_attribute :attributes, default: []
+    class_attribute :attributes, default: ActiveSupport::OrderedHash.new
     class_attribute :scopes, default: []
 
     class << self
       def inherited(base)
-        # Remove any old references
-        Madmin.resources.delete(base)
-        Madmin.resources << base
-
         base.attributes = attributes.dup
         base.scopes = scopes.dup
         super
@@ -18,6 +14,10 @@ module Madmin
         model_name.constantize
       end
 
+      def model_find(id)
+        friendly_model? ? model.friendly.find(id) : model.find(id)
+      end
+
       def model_name
         to_s.chomp("Resource").classify
       end
@@ -26,11 +26,19 @@ module Madmin
         scopes << name
       end
 
+      def get_attribute(name)
+        attributes[name]
+      end
+
       def attribute(name, type = nil, **options)
-        attributes << {
+        type ||= infer_type(name)
+        field = options[:field] || field_for_type(type)
+
+        attributes[name] = OpenStruct.new(
           name: name,
-          field: field_for_type(name, type).new(**options.merge(attribute_name: name, model: model))
-        }
+          type: type,
+          field: field.new(**options.merge(attribute_name: name, model: model))
+        )
       end
 
       def friendly_name
@@ -38,21 +46,27 @@ module Madmin
       end
 
       def index_path(options = {})
-        path = "/madmin/#{model.model_name.collection}"
-        path += "?#{options.to_param}" if options.any?
-        path
+        route_name = "madmin_#{model.model_name.plural}_path"
+
+        url_helpers.send(route_name, options)
       end
 
       def new_path
-        "/madmin/#{model.model_name.collection}/new"
+        route_name = "new_madmin_#{model.model_name.singular}_path"
+
+        url_helpers.send(route_name)
       end
 
       def show_path(record)
-        "/madmin/#{model.model_name.collection}/#{record.id}"
+        route_name = "madmin_#{model.model_name.singular}_path"
+
+        url_helpers.send(route_name, record.to_param)
       end
 
       def edit_path(record)
-        "/madmin/#{model.model_name.collection}/#{record.id}/edit"
+        route_name = "edit_madmin_#{model.model_name.singular}_path"
+
+        url_helpers.send(route_name, record.to_param)
       end
 
       def param_key
@@ -60,18 +74,28 @@ module Madmin
       end
 
       def permitted_params
-        attributes.map { |a| a[:field].to_param }
+        attributes.values.filter_map { |a| a.field.to_param if a.field.visible?(:form) }
       end
 
       def display_name(record)
         "#{record.class} ##{record.id}"
       end
 
-      private
+      def friendly_model?
+        model.respond_to? :friendly
+      end
 
-      def field_for_type(name, type)
-        type ||= infer_type(name)
+      def sortable_columns
+        model.column_names
+      end
+
+      def searchable_attributes
+        attributes.values.select { |a| a.field.searchable? }
+      end
 
+      private
+
+      def field_for_type(type)
         {
           binary: Fields::String,
           blob: Fields::Text,
@@ -90,6 +114,7 @@ module Madmin
           text: Fields::Text,
           time: Fields::Time,
           timestamp: Fields::Time,
+          password: Fields::Password,
 
           # Postgres specific types
           bit: Fields::String,
@@ -126,7 +151,8 @@ module Madmin
           polymorphic: Fields::Polymorphic,
           has_many: Fields::HasMany,
           has_one: Fields::HasOne,
-          rich_text: Fields::RichText
+          rich_text: Fields::RichText,
+          nested_has_many: Fields::NestedHasMany
         }.fetch(type)
       rescue
         raise ArgumentError, <<~MESSAGE
@@ -157,6 +183,10 @@ module Madmin
           :attachment
         elsif model.reflect_on_association(:"#{name_string}_attachments")
           :attachments
+
+        # has_secure_password
+        elsif model.attribute_types.include?("#{name_string}_digest") || name_string.ends_with?("_confirmation")
+          :password
         end
       end
 
@@ -171,6 +201,10 @@ module Madmin
           :belongs_to
         end
       end
+
+      def url_helpers
+        @url_helpers ||= Rails.application.routes.url_helpers
+      end
     end
   end
 end

data/lib/madmin/search.rb

@@ -0,0 +1,60 @@
+# based on Administrate Search: https://github.com/thoughtbot/administrate/blob/main/lib/administrate/search.rb
+
+module Madmin
+  class Search
+    attr_reader :query
+
+    def initialize(scoped_resource, resource, term)
+      @resource = resource
+      @scoped_resource = scoped_resource
+      @query = term
+    end
+
+    def run
+      if query.blank?
+        @scoped_resource.all
+      else
+        search_results(@scoped_resource)
+      end
+    end
+
+    private
+
+    def search_results(resources)
+      resources.where(query_template, *query_values)
+    end
+
+    def query_template
+      search_attributes.map do |attr|
+        table_name = query_table_name(attr)
+        searchable_fields(attr).map do |field|
+          column_name = column_to_query(field)
+          "LOWER(CAST(#{table_name}.#{column_name} AS CHAR(256))) LIKE ?"
+        end.join(" OR ")
+      end.join(" OR ")
+    end
+
+    def searchable_fields(attr)
+      [attr[:name]]
+    end
+
+    def query_values
+      fields_count = search_attributes.sum do |attr|
+        searchable_fields(attr).count
+      end
+      ["%#{@query.mb_chars.downcase}%"] * fields_count
+    end
+
+    def search_attributes
+      @resource.searchable_attributes
+    end
+
+    def query_table_name(attr)
+      ActiveRecord::Base.connection.quote_column_name(@scoped_resource.table_name)
+    end
+
+    def column_to_query(attr)
+      ActiveRecord::Base.connection.quote_column_name(attr)
+    end
+  end
+end