madmin 1.0.0.beta2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e0427cd7d7dd77a86ef9b7cfd6b08af93cc2f6f542a7992b69d63328c483e26
-  data.tar.gz: f85af965580b168e7efa890049ca58a46d9710ab3484ed99b45acf7267a7859c
+  metadata.gz: e868d17abd508729232e7ebeebd4b79a8e69545b853276a700c60e61e5d6348c
+  data.tar.gz: b19043a0a2e7dd0ad6392f995b76812b434e54f73682eb163ca28e1aaeb4ad34
 SHA512:
-  metadata.gz: b63ca0956bd1a730d686b7f35252e951f0bb88743df2a2d9fa025120a82647a141e1e20dae3052f889e4d1db7bbf69328ab26e1285d1c602a58b0e625f084eed
-  data.tar.gz: 11783c59ee3445c594dd2ce51ea5b24ee5942d59f59a2ae6f444ff8991f353e298473f6dfcf8e38c923248458dd38957cd3d8aead6e4c18d1821abcce023a10e
+  metadata.gz: '09b7ec920a1c8ae8a1429db77cff71ca45574e379563db5a06648d5cd5434950597b99eed5b836f7834cdc5c71e9d68411f064cc78d363da848efde9a0ef1b1a'
+  data.tar.gz: 51b2b25ddabe18e8777c9eab9e34dd1b8afd74a05aae5671f2f94c85cb404043bcde8423d996033a9dd4fa07ee672ad36240e65e195166586afabc02d756237a

data/README.md

@@ -7,9 +7,12 @@
 Why another Ruby on Rails admin? We wanted an admin that was:
 
 * Familiar and customizable like Rails scaffolds (less DSL)
-* Supports all the Rails features out of the box (ActionText, ActionMailbox, etc)
+* Supports all the Rails features out of the box (ActionText, ActionMailbox, has_secure_password, etc)
 * Stimulus / Turbolinks / Hotwire ready
 
+![Madmin Screenshot](docs/images/screenshot.png)
+_We're still working on the design!_
+
 ## Installation
 Add `madmin` to your application's Gemfile:
 
@@ -37,6 +40,50 @@ To generate a resource for a model, you can run:
 rails g madmin:resource ActionText::RichText
 ```
 
+## Configuring Views
+
+The views packaged within the gem are a great starting point, but inevitably people will need to be able to customize those views.
+
+You can use the included generator to create the appropriate view files, which can then be customized.
+
+For example, running the following will copy over all of the views into your application that will be used for every resource:
+```bash
+rails generate madmin:views
+```
+
+The view files that are copied over in this case includes all of the standard Rails action views (index, new, edit, show, and _form), as well as:
+* `application.html.erb` (layout file)
+* `_javascript.html.erb` (default JavaScript setup)
+* `_navigation.html.erb` (renders the navigation/sidebar menu)
+
+As with the other views, you can specifically run the views generator for only the navigation or application layout views:
+```bash
+rails g madmin:views:navigation
+ # -> app/views/madmin/_navigation.html.erb
+
+rails g madmin:views:layout  # Note the layout generator includes the layout, javascript, and navigation files.
+ # -> app/views/madmin/application.html.erb
+ # -> app/views/madmin/_javascript.html.erb
+ # -> app/views/madmin/_navigation.html.erb
+```
+
+If you only need to customize specific views, you can restrict which views are copied by the generator:
+```bash
+rails g madmin:views:index
+ # -> app/views/madmin/application/index.html.erb
+```
+
+You can also scope the copied view(s) to a specific Resource/Model:
+```bash
+rails generate madmin:views:index Book
+ # -> app/views/madmin/books/index.html.erb
+```
+
+## Authentication
+
+You can use a couple of strategies to authenticate users who are trying to
+access your madmin panel: [Authentication Docs](docs/authentication.md)
+
 ## 🙏 Contributing
 
 This project uses Standard for formatting Ruby code. Please make sure to run standardrb before submitting pull requests.

data/app/controllers/madmin/resource_controller.rb

@@ -1,5 +1,7 @@
 module Madmin
   class ResourceController < ApplicationController
+    include SortHelper
+
     before_action :set_record, except: [:index, :new, :create]
 
     def index
@@ -41,7 +43,7 @@ module Madmin
     private
 
     def set_record
-      @record = resource.model.find(params[:id])
+      @record = resource.model_find(params[:id])
     end
 
     def resource
@@ -54,7 +56,7 @@ module Madmin
     end
 
     def scoped_resources
-      resource.model.send(valid_scope)
+      resource.model.send(valid_scope).order(sort_column => sort_direction)
     end
 
     def valid_scope

data/app/helpers/madmin/sort_helper.rb

@@ -0,0 +1,31 @@
+module Madmin
+  module SortHelper
+    def sortable(column, title, options = {})
+      matching_column = (column.to_s == sort_column)
+
+      link_to request.params.merge(sort: column, direction: sort_direction), options do
+        concat title
+        if matching_column
+          concat " "
+          concat tag.i(sort_direction == "asc" ? "▲" : "▼")
+        end
+      end
+    end
+
+    def sort_column
+      resource.sortable_columns.include?(params[:sort]) ? params[:sort] : default_sort_column
+    end
+
+    def sort_direction
+      ["asc", "desc"].include?(params[:direction]) ? params[:direction] : default_sort_direction
+    end
+
+    def default_sort_column
+      resource.try(:default_sort_column) || "created_at"
+    end
+
+    def default_sort_direction
+      resource.try(:default_sort_direction) || "desc"
+    end
+  end
+end

data/app/views/madmin/application/_javascript.html.erb

@@ -1,9 +1,9 @@
-<%= stylesheet_link_tag "https://cdn.skypack.dev/flatpickr/dist/flatpickr.min.css", "data-turbo-track": "reload" %>
-<%= stylesheet_link_tag "https://cdn.skypack.dev/slim-select/dist/slimselect.min.css", "data-turbo-track": "reload" %>
-<%= stylesheet_link_tag "https://cdn.skypack.dev/trix/dist/trix.css", "data-turbo-track": "reload" %>
+<%= stylesheet_link_tag "https://unpkg.com/flatpickr/dist/flatpickr.min.css", "data-turbo-track": "reload" %>
+<%= stylesheet_link_tag "https://unpkg.com/trix/dist/trix.css", "data-turbo-track": "reload" %>
+<%= stylesheet_link_tag "https://unpkg.com/slim-select@1.27.0/dist/slimselect.min.css", "data-turbo-track": "reload" %>
 
 <script type="module">
-  import { Application } from 'https://cdn.skypack.dev/stimulus'
+  import { Application, Controller } from 'https://cdn.skypack.dev/stimulus'
   const application = Application.start()
 
   import stimulusFlatpickr from 'https://cdn.skypack.dev/stimulus-flatpickr'
@@ -17,8 +17,43 @@
   import 'https://cdn.skypack.dev/trix'
   import 'https://cdn.skypack.dev/@rails/actiontext@<%= npm_rails_version %>'
 
-  Rails.start()
+  if (!window._rails_loaded) { Rails.start() }
   ActiveStorage.start()
 
   import * as Turbo from "https://cdn.skypack.dev/@hotwired/turbo"
+
+  (() => {
+    application.register('nested-form', class extends Controller {
+      static get targets() {
+        return [ "links", "template" ]
+      }
+
+      connect() {
+        this.wrapperClass = this.data.get("wrapperClass") || "nested-fields"
+      }
+
+      add_association(event) {
+        event.preventDefault()
+
+        var content = this.templateTarget.innerHTML.replace(/NEW_RECORD/g, new Date().getTime())
+        this.linksTarget.insertAdjacentHTML('beforebegin', content)
+      }
+
+      remove_association(event) {
+        event.preventDefault()
+
+        let wrapper = event.target.closest("." + this.wrapperClass)
+
+        // New records are simply removed from the page
+        if (wrapper.dataset.newRecord == "true") {
+          wrapper.remove()
+
+        // Existing records are hidden and flagged for deletion
+        } else {
+          wrapper.querySelector("input[name*='_destroy']").value = 1
+          wrapper.style.display = 'none'
+        }
+      }
+    })
+  })()
 </script>

data/app/views/madmin/application/index.html.erb

@@ -20,7 +20,7 @@
         <% next if attribute[:field].nil? %>
         <% next unless attribute[:field].visible?(action_name) %>
 
-        <th><%= attribute[:name].to_s.titleize %></th>
+        <th><%= sortable attribute[:name], attribute[:name].to_s.titleize %></th>
       <% end %>
       <th>Actions</th>
     </tr>

data/app/views/madmin/fields/belongs_to/_index.html.erb

@@ -1,2 +1,3 @@
-<% object = field.value(record) %>
-<%= link_to Madmin.resource_for(object).display_name(object), Madmin.resource_for(object).show_path(object) %>
+<% if (object = field.value(record)) %>
+  <%= link_to Madmin.resource_for(object).display_name(object), Madmin.resource_for(object).show_path(object) %>
+<% end %>

data/app/views/madmin/fields/belongs_to/_show.html.erb

@@ -1,2 +1,3 @@
-<% object = field.value(record) %>
-<%= link_to Madmin.resource_for(object).display_name(object), Madmin.resource_for(object).show_path(object) %>
+<% if (object = field.value(record)) %>
+  <%= link_to Madmin.resource_for(object).display_name(object), Madmin.resource_for(object).show_path(object) %>
+<% end %>

data/app/views/madmin/fields/enum/_form.html.erb

@@ -1,3 +1,2 @@
-ENUM
 <%= form.label field.attribute_name, class: "inline-block w-32 flex-shrink-0" %>
-<%= field.value(record) %>
+<%= form.select field.attribute_name, field.options_for_select(record), { prompt: true }, { class: "form-select" } %>

data/app/views/madmin/fields/nested_has_many/_fields.html.erb

@@ -0,0 +1,18 @@
+<%= content_tag :div, class: "nested-fields bg-gray-100 rounded-t-xl p-5", data: { new_record: f.object.new_record? } do %>
+  <% field.nested_attributes.each do |nested_attribute| %>
+    <% next if nested_attribute[:field].nil? %>
+    <% next unless nested_attribute[:field].visible?(action_name) %>
+    <% next unless nested_attribute[:field].visible?(:form) %>
+
+    <% nested_field = nested_attribute[:field] %>
+
+    <div class="mb-4 flex">
+      <%= render partial: nested_field.to_partial_path("form"), locals: { field: nested_field, record: f.object, form: f, resource: field.resource } %>
+    </div>
+  <% end %>
+
+  <small><%= link_to "Remove", "#", data: { action: "click->nested-form#remove_association" } %></small>
+
+  <%= f.hidden_field :_destroy %>
+
+<% end %>

data/app/views/madmin/fields/nested_has_many/_form.html.erb

@@ -0,0 +1,30 @@
+<%= form.label field.attribute_name, class: "inline-block w-32 flex-shrink-0" %>
+
+<div class="container space-y-8" data-controller="nested-form">
+  <template data-target="nested-form.template">
+
+    <%= form.fields_for field.attribute_name, field.to_model.new, child_index: 'NEW_RECORD' do |nested_form| %>
+      <%= render(
+        partial: field.to_partial_path('fields'),
+        locals: {
+          f: nested_form,
+          field: field
+        }
+      ) %>
+  <% end %>
+  </template>
+
+    <%= form.fields_for field.attribute_name do |nested_form| %>
+      <%= render(
+        partial: field.to_partial_path('fields'),
+        locals: {
+          f: nested_form,
+          field: field
+        }
+      ) %>
+  <% end %>
+
+  <%= content_tag :div, class: '', data: { target:"nested-form.links" } do %>
+    <%= link_to "+ Add new", "#",  data: { action: "click->nested-form#add_association" } %>
+  <% end %>
+</div>

data/app/views/madmin/fields/nested_has_many/_index.html.erb

@@ -0,0 +1 @@
+<%= pluralize field.value(record).count, field.attribute_name.to_s %>

data/app/views/madmin/fields/nested_has_many/_show.html.erb

@@ -0,0 +1,5 @@
+<% field.value(record).each do |object| %>
+  <div>
+    <%= link_to Madmin.resource_for(object).display_name(object), Madmin.resource_for(object).show_path(object) %>
+  </div>
+<% end %>

data/app/views/madmin/fields/password/_form.html.erb

@@ -0,0 +1,2 @@
+<%= form.label field.attribute_name, class: "inline-block w-32 flex-shrink-0" %>
+<%= form.password_field field.attribute_name, class: "form-input" %>

data/app/views/madmin/fields/password/_index.html.erb

@@ -0,0 +1 @@
+<%= field.value(record) %>

data/app/views/madmin/fields/password/_show.html.erb

@@ -0,0 +1 @@
+<%= field.value(record) %>

data/lib/generators/madmin/resource/resource_generator.rb

@@ -46,6 +46,10 @@ module Madmin
       def virtual_attributes
         virtual = []
 
+        # has_secure_password columns
+        password_attributes = model.attribute_types.keys.select { |k| k.ends_with?("_digest") }.map { |k| k.delete_suffix("_digest") }
+        virtual += password_attributes.map { |attr| [attr, "#{attr}_confirmation"] }.flatten
+
         # Add virtual attributes for ActionText and ActiveStorage
         model.reflections.each do |name, association|
           if name.starts_with?("rich_text")
@@ -63,6 +67,9 @@ module Madmin
       def redundant_attributes
         redundant = []
 
+        # has_secure_password columns
+        redundant += model.attribute_types.keys.select { |k| k.ends_with?("_digest") }
+
         model.reflections.each do |name, association|
           if association.has_one?
             next
@@ -98,13 +105,17 @@ module Madmin
         if %w[id created_at updated_at].include?(name)
           {form: false}
 
-        # Attributes without a database column
-        elsif !model.column_names.include?(name)
-          {index: false}
+        # has_secure_passwords should only show on forms
+        elsif name.ends_with?("_confirmation") || virtual_attributes.include?("#{name}_confirmation")
+          {index: false, show: false}
 
         # Counter cache columns are typically not editable
         elsif name.ends_with?("_count")
           {form: false}
+
+        # Attributes without a database column
+        elsif !model.column_names.include?(name)
+          {index: false}
         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/edit_generator.rb

@@ -0,0 +1,16 @@
+require "madmin/view_generator"
+
+module Madmin
+  module Generators
+    module Views
+      class EditGenerator < Madmin::ViewGenerator
+        source_root template_source_path
+
+        def copy_edit
+          copy_resource_template("edit")
+          copy_resource_template("_form")
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -0,0 +1,15 @@
+require "madmin/view_generator"
+
+module Madmin
+  module Generators
+    module Views
+      class IndexGenerator < Madmin::ViewGenerator
+        source_root template_source_path
+
+        def copy_template
+          copy_resource_template("index")
+        end
+      end
+    end
+  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/layout_generator.rb

@@ -0,0 +1,21 @@
+require "madmin/view_generator"
+
+module Madmin
+  module Generators
+    module Views
+      class LayoutGenerator < Madmin::ViewGenerator
+        source_root template_source_path
+
+        def copy_template
+          copy_file(
+            "../../layouts/madmin/application.html.erb",
+            "app/views/layouts/madmin/application.html.erb"
+          )
+
+          call_generator("madmin:views:navigation")
+          copy_resource_template("_javascript")
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -0,0 +1,16 @@
+require "madmin/view_generator"
+
+module Madmin
+  module Generators
+    module Views
+      class NewGenerator < Madmin::ViewGenerator
+        source_root template_source_path
+
+        def copy_new
+          copy_resource_template("new")
+          copy_resource_template("_form")
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -0,0 +1,16 @@
+require "madmin/view_generator"
+
+module Madmin
+  module Generators
+    class ViewsGenerator < Madmin::ViewGenerator
+      def copy_templates
+        # 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
+end

data/lib/madmin.rb

@@ -8,24 +8,26 @@ module Madmin
   autoload :Resource, "madmin/resource"
 
   module Fields
+    autoload :Attachment, "madmin/fields/attachment"
+    autoload :Attachments, "madmin/fields/attachments"
+    autoload :BelongsTo, "madmin/fields/belongs_to"
     autoload :Boolean, "madmin/fields/boolean"
-    autoload :Integer, "madmin/fields/integer"
-    autoload :String, "madmin/fields/string"
-    autoload :Text, "madmin/fields/text"
     autoload :Date, "madmin/fields/date"
     autoload :DateTime, "madmin/fields/date_time"
     autoload :Decimal, "madmin/fields/decimal"
-    autoload :Json, "madmin/fields/json"
     autoload :Enum, "madmin/fields/enum"
     autoload :Float, "madmin/fields/float"
-    autoload :Time, "madmin/fields/time"
-    autoload :BelongsTo, "madmin/fields/belongs_to"
-    autoload :Polymorphic, "madmin/fields/polymorphic"
     autoload :HasMany, "madmin/fields/has_many"
     autoload :HasOne, "madmin/fields/has_one"
+    autoload :Integer, "madmin/fields/integer"
+    autoload :Json, "madmin/fields/json"
+    autoload :NestedHasMany, "madmin/fields/nested_has_many"
+    autoload :Password, "madmin/fields/password"
+    autoload :Polymorphic, "madmin/fields/polymorphic"
     autoload :RichText, "madmin/fields/rich_text"
-    autoload :Attachment, "madmin/fields/attachment"
-    autoload :Attachments, "madmin/fields/attachments"
+    autoload :String, "madmin/fields/string"
+    autoload :Text, "madmin/fields/text"
+    autoload :Time, "madmin/fields/time"
   end
 
   mattr_accessor :resources, default: []

data/lib/madmin/fields/belongs_to.rb

@@ -3,10 +3,11 @@ module Madmin
     class BelongsTo < Field
       def options_for_select(record)
         association = record.class.reflect_on_association(attribute_name)
-
         klass = association.klass
+        resource = nil
         klass.all.map do |r|
-          ["#{klass.name} ##{r.id}", r.id]
+          resource ||= Madmin.resource_for(r)
+          [resource.display_name(r), r.id]
         end
       end
 

data/lib/madmin/fields/enum.rb

@@ -1,6 +1,9 @@
 module Madmin
   module Fields
     class Enum < Field
+      def options_for_select(record)
+        model.defined_enums[attribute_name.to_s].keys
+      end
     end
   end
 end

data/lib/madmin/fields/has_many.rb

@@ -3,10 +3,11 @@ module Madmin
     class HasMany < Field
       def options_for_select(record)
         association = record.class.reflect_on_association(attribute_name)
-
         klass = association.klass
+        resource = nil
         klass.all.map do |r|
-          ["#{klass.name} ##{r.id}", r.id]
+          resource ||= Madmin.resource_for(r)
+          [resource.display_name(r), r.id]
         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/namespace.rb

@@ -0,0 +1,35 @@
+module Madmin
+  class Namespace
+    def initialize(namespace)
+      @namespace = namespace
+    end
+
+    def resources
+      @resources ||= routes.map(&:first).uniq.map { |path|
+        Resource.new(namespace, path)
+      }
+    end
+
+    def routes
+      @routes ||= all_routes.select { |controller, _action|
+        controller.starts_with?("#{namespace}/")
+      }.map { |controller, action|
+        [controller.gsub(/^#{namespace}\//, ""), action]
+      }
+    end
+
+    def resources_with_index_route
+      routes.select { |_resource, route| route == "index" }.map(&:first).uniq
+    end
+
+    private
+
+    attr_reader :namespace
+
+    def all_routes
+      Rails.application.routes.routes.map do |route|
+        route.defaults.values_at(:controller, :action).map(&:to_s)
+      end
+    end
+  end
+end

data/lib/madmin/resource.rb

@@ -18,6 +18,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
@@ -38,21 +42,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.table_name}_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,13 +70,21 @@ module Madmin
       end
 
       def permitted_params
-        attributes.map { |a| a[:field].to_param }
+        attributes.filter_map { |a| a[:field].to_param if a[:field].visible?(:form) }
       end
 
       def display_name(record)
         "#{record.class} ##{record.id}"
       end
 
+      def friendly_model?
+        model.respond_to? :friendly
+      end
+
+      def sortable_columns
+        model.column_names
+      end
+
       private
 
       def field_for_type(name, type)
@@ -90,6 +108,7 @@ module Madmin
           text: Fields::Text,
           time: Fields::Time,
           timestamp: Fields::Time,
+          password: Fields::Password,
 
           # Postgres specific types
           bit: Fields::String,
@@ -126,7 +145,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
@@ -143,7 +163,12 @@ module Madmin
         name_string = name.to_s
 
         if model.attribute_types.include?(name_string)
-          model.attribute_types[name_string].type || :string
+          column_type = model.attribute_types[name_string]
+          if column_type.is_a? ActiveRecord::Enum::EnumType
+            :enum
+          else
+            column_type.type || :string
+          end
         elsif (association = model.reflect_on_association(name))
           type_for_association(association)
         elsif model.reflect_on_association(:"rich_text_#{name_string}")
@@ -152,6 +177,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
 
@@ -166,6 +195,10 @@ module Madmin
           :belongs_to
         end
       end
+
+      def url_helpers
+        @url_helpers ||= Rails.application.routes.url_helpers
+      end
     end
   end
 end

data/lib/madmin/version.rb

@@ -1,3 +1,3 @@
 module Madmin
-  VERSION = "1.0.0.beta2"
+  VERSION = "1.2.0"
 end

data/lib/madmin/view_generator.rb

@@ -0,0 +1,42 @@
+require "rails/generators/base"
+require "madmin/generator_helpers"
+require "madmin/namespace"
+
+module Madmin
+  class ViewGenerator < Rails::Generators::Base
+    include Madmin::GeneratorHelpers
+    class_option :namespace, type: :string, default: "madmin"
+
+    def self.template_source_path
+      File.expand_path(
+        "../../../app/views/madmin/application",
+        __FILE__
+      )
+    end
+
+    private
+
+    def namespace
+      options[:namespace]
+    end
+
+    def copy_resource_template(template_name)
+      template_file = "#{template_name}.html.erb"
+
+      copy_file(
+        template_file,
+        "app/views/#{namespace}/#{resource_path}/#{template_file}"
+      )
+    end
+
+    def resource_path
+      args.first.try(:underscore).try(:pluralize) || BaseResourcePath.new
+    end
+
+    class BaseResourcePath
+      def to_s
+        "application"
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: madmin
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.2.0
 platform: ruby
 authors:
 - Chris Oliver
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-05 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -63,6 +63,7 @@ files:
 - app/controllers/madmin/dashboard_controller.rb
 - app/controllers/madmin/resource_controller.rb
 - app/helpers/madmin/application_helper.rb
+- app/helpers/madmin/sort_helper.rb
 - app/views/layouts/madmin/application.html.erb
 - app/views/madmin/application/_form.html.erb
 - app/views/madmin/application/_javascript.html.erb
@@ -111,6 +112,13 @@ files:
 - app/views/madmin/fields/json/_form.html.erb
 - app/views/madmin/fields/json/_index.html.erb
 - app/views/madmin/fields/json/_show.html.erb
+- app/views/madmin/fields/nested_has_many/_fields.html.erb
+- app/views/madmin/fields/nested_has_many/_form.html.erb
+- app/views/madmin/fields/nested_has_many/_index.html.erb
+- app/views/madmin/fields/nested_has_many/_show.html.erb
+- app/views/madmin/fields/password/_form.html.erb
+- app/views/madmin/fields/password/_index.html.erb
+- app/views/madmin/fields/password/_show.html.erb
 - app/views/madmin/fields/polymorphic/_form.html.erb
 - app/views/madmin/fields/polymorphic/_index.html.erb
 - app/views/madmin/fields/polymorphic/_show.html.erb
@@ -131,6 +139,15 @@ files:
 - lib/generators/madmin/resource/resource_generator.rb
 - lib/generators/madmin/resource/templates/controller.rb.tt
 - lib/generators/madmin/resource/templates/resource.rb.tt
+- lib/generators/madmin/views/edit_generator.rb
+- lib/generators/madmin/views/form_generator.rb
+- lib/generators/madmin/views/index_generator.rb
+- lib/generators/madmin/views/javascript_generator.rb
+- lib/generators/madmin/views/layout_generator.rb
+- lib/generators/madmin/views/navigation_generator.rb
+- lib/generators/madmin/views/new_generator.rb
+- lib/generators/madmin/views/show_generator.rb
+- lib/generators/madmin/views/views_generator.rb
 - lib/madmin.rb
 - lib/madmin/engine.rb
 - lib/madmin/field.rb
@@ -147,14 +164,18 @@ files:
 - lib/madmin/fields/has_one.rb
 - lib/madmin/fields/integer.rb
 - lib/madmin/fields/json.rb
+- lib/madmin/fields/nested_has_many.rb
+- lib/madmin/fields/password.rb
 - lib/madmin/fields/polymorphic.rb
 - lib/madmin/fields/rich_text.rb
 - lib/madmin/fields/string.rb
 - lib/madmin/fields/text.rb
 - lib/madmin/fields/time.rb
 - lib/madmin/generator_helpers.rb
+- lib/madmin/namespace.rb
 - lib/madmin/resource.rb
 - lib/madmin/version.rb
+- lib/madmin/view_generator.rb
 - lib/tasks/madmin_tasks.rake
 homepage: https://github.com/excid3/madmin
 licenses:
@@ -171,9 +192,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.3
 signing_key: