madmin 1.2.10 → 2.0.0

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

@@ -1,32 +1,38 @@
-<div class="md:flex items-center justify-between mb-4">
-  <h1 class="text-xl">
-    <%= link_to resource.friendly_name.pluralize, resource.index_path, class: "text-blue-500" %>
+<%= content_for :title, resource.display_name(@record) %>
+
+<header class="header">
+  <h1>
+    <%= link_to resource.friendly_name.pluralize, resource.index_path %>
     /
-    <%= link_to resource.display_name(@record), resource.show_path(@record), class: "text-blue-500 font-bold" %>
+    <%= resource.display_name(@record) %>
   </h1>
 
-  <div class="flex gap-2 items-center px-4">
+  <div class="actions">
     <% resource.member_actions.each do |action| %>
-      <%= instance_eval(&action)  %>
+      <%= instance_exec(@record, &action) %>
     <% end %>
-    <%= link_to "Edit", resource.edit_path(@record), class: "block bg-white hover:bg-gray-100 text-gray-800 font-semibold py-2 px-4 border border-gray-400 rounded shadow" %>
-    <%= button_to "Delete", resource.show_path(@record), method: :delete, data: { turbo_confirm: "Are you sure?" }, class: "bg-white hover:bg-gray-100 text-red-500 font-semibold py-2 px-4 border border-red-500 rounded shadow pointer-cursor" %>
+    <%= link_to "Edit", resource.edit_path(@record), class: "btn btn-secondary" %>
+    <%= button_to "Delete", resource.show_path(@record), method: :delete, data: { turbo_confirm: "Are you sure?" }, class: "btn btn-danger" %>
   </div>
-</div>
+</header>
 
-<div class="divide-y">
-  <% resource.attributes.values.each do |attribute| %>
-    <% next if attribute.field.nil? %>
-    <% next unless attribute.field.visible?(action_name) %>
+<div class="table-scroll">
+  <table>
+    <tbody>
+    <% resource.attributes.values.each do |attribute| %>
+      <% next if attribute.field.nil? %>
+      <% next unless attribute.field.visible?(action_name) %>
 
-    <div class="px-4 py-3 md:grid md:grid-cols-4 md:gap-4 md:px-6">
-      <div class="text-sm font-medium text-gray-500">
-        <%= attribute.field.attribute_name.to_s.titleize %>
-      </div>
+      <tr>
+        <th class="label">
+          <%= attribute.field.options.label || attribute.name.to_s.titleize %>
+        </th>
 
-      <div class="md:col-span-3">
-        <%= render partial: attribute.field.to_partial_path("show"), locals: { field: attribute.field, record: @record, resource: resource } %>
-      </div>
-    </div>
-  <% end %>
+        <td>
+          <%= render partial: attribute.field.to_partial_path("show"), locals: { field: attribute.field, record: @record, resource: resource } %>
+        </td>
+      </tr>
+    <% end %>
+    </tbody>
+  </table>
 </div>

data/app/views/madmin/dashboard/show.html.erb

@@ -1 +1,4 @@
-<h1>Madmin</h1>
+<div class="prose">
+  <h1>Madmin Dashboard</h1>
+  <p>Create <code>app/views/madmin/dashboard/show.html.erb</code> to customize your dashboard.</p>
+</div>

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

@@ -1,4 +1,11 @@
-<div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
-  <%= render "madmin/shared/label", form: form, field: field %>
-</div>
-<%= form.file_field field.to_param %>
+<%= form.file_field field.to_param, class: "form-input"%>
+
+<% if form.object.persisted? %>
+  <div class="mt-2">
+    <%= render partial: field.to_partial_path("show"), locals: {field: field, record: record} %>
+
+    <% if (value = field.value(record) && value&.attached?) %>
+      <%= link_to "Remove", Madmin.resource_for(value).show_path(value), data: { turbo_method: :delete, turbo_confirm: "Are you sure? You will lose any other changes."} %>
+    <% end %>
+  </div>
+<% end %>

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

@@ -1,3 +1,7 @@
 <% if (attachment = field.value(record)) && attachment.attached? %>
-  <%= link_to attachment.filename, main_app.url_for(attachment), target: :_blank %>
+  <% if attachment.variable? %>
+    <%= image_tag main_app.url_for(attachment), class: "max-h-8" %>
+  <% else %>
+    <%= attachment.filename %>
+  <% end %>
 <% end %>

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

@@ -1,9 +1,9 @@
 <% if (attachment = field.value(record)) && attachment.attached? %>
   <% if attachment.variable? %>
-    <%= link_to main_app.url_for(attachment), target: :_blank do %>
-      <%= image_tag main_app.url_for(attachment), class: "max-h-32" %>
-    <% end %>
+    <%= image_tag main_app.url_for(attachment), class: "max-h-32" %>
   <% else %>
     <%= link_to attachment.filename, main_app.url_for(attachment), target: :_blank, class: "text-blue-500 underline" %>
   <% end %>
-<% end %>
+
+  <%= link_to "Remove", Madmin.resource_for(attachment).show_path(attachment), data: { turbo_method: :delete, turbo_confirm: "Are you sure? You will lose any other changes."} %>
+<% end %>

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

@@ -1,4 +1 @@
-<div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
-  <%= render "madmin/shared/label", form: form, field: field %>
-</div>
-<%= form.file_field field.attribute_name, multiple: true %>
+<%= form.file_field field.attribute_name, multiple: true, class: "form-input" %>

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

@@ -1,4 +1 @@
-<div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
-  <%= render "madmin/shared/label", form: form, field: field %>
-</div>
-<%= form.select field.to_param, field.options_for_select(record), { prompt: true }, { class: "form-select", data: { controller: "select", select_url_value: field.index_path } } %>
+<%= form.select field.to_param, field.options_for_select(record), { prompt: true }, { data: { controller: "select", select_url_value: field.index_path } } %>

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

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

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

@@ -1,4 +1,3 @@
-<div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
-  <%= render "madmin/shared/label", form: form, field: field %>
-</div>
-<%= form.check_box field.attribute_name, class: "form-input" %>
+<div class="form-input">
+  <%= form.check_box field.attribute_name %>
+ </div>

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

@@ -0,0 +1 @@
+<%= form.number_field field.attribute_name, class: "form-input" %>

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

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

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

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

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

@@ -1,4 +1 @@
-<div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
-  <%= render "madmin/shared/label", form: form, field: field %>
-</div>
-<%= form.text_field field.attribute_name, { class: "form-select", data: { controller: "flatpickr" } } %>
+<%= form.date_field field.attribute_name, class: "form-input" %>

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

@@ -1,4 +1 @@
-<div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
-  <%= render "madmin/shared/label", form: form, field: field %>
-</div>
-<%= form.text_field field.attribute_name, data: { controller: "flatpickr", flatpickr_enable_time: true } %>
+<%= form.datetime_field field.attribute_name, class: "form-input" %>

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

@@ -1,4 +1 @@
-<div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
-  <%= render "madmin/shared/label", form: form, field: field %>
-</div>
 <%= form.number_field field.attribute_name, step: :any, class: "form-input" %>

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

@@ -1,4 +1 @@
-<div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
-  <%= render "madmin/shared/label", form: form, field: field %>
-</div>
-<%= form.select field.attribute_name, field.options_for_select(record), { prompt: true }, { class: "form-select", data: { controller: "select" } } %>
+<%= form.select field.attribute_name, field.options_for_select(record), { prompt: true }, { data: { controller: "select" } } %>

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

@@ -1,4 +1 @@
-<div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
-  <%= render "madmin/shared/label", form: form, field: field %>
-</div>
 <%= form.file_field field.attribute_name, class: "form-input" %>

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

@@ -1,4 +1 @@
-<div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
-  <%= render "madmin/shared/label", form: form, field: field %>
-</div>
 <%= form.number_field field.attribute_name, step: :any, class: "form-input" %>

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

@@ -1,4 +1 @@
-<div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
-  <%= render "madmin/shared/label", form: form, field: field %>
-</div>
-<%= form.select "#{field.attribute_name.to_s.singularize}_ids", field.options_for_select(record), { prompt: true }, { multiple: true, class: "form-select", data: { controller: "select", select_url_value: field.index_path } } %>
+<%= form.select "#{field.attribute_name.to_s.singularize}_ids", field.options_for_select(record), { prompt: true }, { multiple: true, data: { controller: "select", select_url_value: field.index_path } } %>

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

@@ -1,4 +1 @@
-<div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
-  <%= render "madmin/shared/label", form: form, field: field %>
-</div>
 <%= field.value(record) %>

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

@@ -1,4 +1 @@
-<div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
-  <%= render "madmin/shared/label", form: form, field: field %>
-</div>
 <%= form.number_field field.attribute_name, class: "form-input" %>

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

@@ -1,5 +1 @@
-<% if field.attribute_name == :id %>
-  <%= link_to field.value(record), resource.show_path(record), class: "text-blue-500 underline" %>
-<% else %>
-  <%= field.value(record) %>
-<% end %>
+<%= link_to_if field.attribute_name.to_s == resource.model.primary_key, field.value(record), resource.show_path(record) %>

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

@@ -1,4 +1 @@
-<div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
-  <%= render "madmin/shared/label", form: form, field: field %>
-</div>
 <%= form.text_area field.attribute_name, class: "form-input" %>

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

@@ -1,10 +1,9 @@
 <%= content_tag :div, class: "nested-fields border border-gray-200 rounded-lg p-5", data: { new_record: f.object.new_record? } do %>
   <% field.nested_attributes.each do |name, 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] %>
+    <% nested_field = nested_attribute.field %>
+    <% next if nested_field.nil? %>
+    <% next unless nested_field.visible?(action_name) %>
+    <% next unless nested_field.visible?(:form) %>
 
     <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 } %>

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

@@ -1,7 +1,3 @@
-<div class="block md:inline-block w-32 flex-shrink-0">
-  <%= render "madmin/shared/label", form: form, field: field %>
-</div>
-
 <div class="container space-y-8" data-controller="nested-form">
   <template data-target="nested-form.template">
 

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

@@ -1,4 +1 @@
-<div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
-  <%= render "madmin/shared/label", form: form, field: field %>
-</div>
 <%= form.password_field field.attribute_name, class: "form-input" %>

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

@@ -1,7 +1,4 @@
 <%= form.fields_for field.attribute_name do |pf| %>
-  <div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
-    <%= render "madmin/shared/label", form: pf, field: field %>
-  </div>
-  <%= pf.select :value, field.options_for_select(record).map(&:to_global_id), { selected: field.value(record)&.to_global_id, prompt: true }, { class: "form-select", data: { controller: "slimselect" } } %>
+  <%= pf.select :value, field.options_for_select(record).map(&:to_global_id), { selected: field.value(record)&.to_global_id, prompt: true }, { data: { controller: "select" } } %>
   <%= pf.hidden_field :type, value: "polymorphic" %>
 <% end %>

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

@@ -1,6 +1 @@
-<div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
-  <%= render "madmin/shared/label", form: form, field: field %>
-</div>
-<div class="flex-1">
-  <%= form.rich_text_area field.attribute_name, class: "form-input block" %>
-</div>
+<%= form.rich_text_area field.attribute_name, class: "form-input" %>

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

@@ -0,0 +1 @@
+<%= form.select field.attribute_name, field.options_for_select(record), { prompt: true }, { data: { controller: "select" } } %>

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

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

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

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

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

@@ -1,4 +1 @@
-<div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
-  <%= render "madmin/shared/label", form: form, field: field %>
-</div>
-<%= form.text_field field.attribute_name, class: "form-input" %>
+<%= form.text_field field.attribute_name, class: "form-input", placeholder: field.options.placeholder %>

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

@@ -1,4 +1 @@
-<div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
-  <%= render "madmin/shared/label", form: form, field: field %>
-</div>
 <%= form.text_area field.attribute_name, class: "form-input" %>

data/app/views/madmin/shared/_label.html.erb

@@ -1,4 +1,4 @@
-<%= form.label field.attribute_name %>
+<%= form.label field.attribute_name, field.options.label %>
 <% if field.required? %>
-  <span class="text-red-500">*</span>
+  <span class="required">*</span>
 <% end %>

data/config/importmap.rb

@@ -0,0 +1,10 @@
+pin "application", to: "madmin/application.js", preload: true
+pin "@hotwired/turbo-rails", to: "turbo.min.js", preload: true
+pin "@hotwired/stimulus", to: "stimulus.min.js", preload: true
+pin "@hotwired/stimulus-loading", to: "stimulus-loading.js", preload: true
+pin "trix"
+pin "@rails/actiontext", to: "actiontext.esm.js"
+pin_all_from Madmin::Engine.root.join("app/javascript/madmin/controllers"), under: "controllers", to: "madmin/controllers"
+
+pin "tom-select", to: "https://ga.jspm.io/npm:tom-select@2.4.1/dist/js/tom-select.complete.js"
+pin "tailwindcss-stimulus-components", to: "https://ga.jspm.io/npm:tailwindcss-stimulus-components@6.1.2/dist/tailwindcss-stimulus-components.module.js"

data/lib/generators/madmin/field/templates/_form.html.erb

@@ -1,4 +1 @@
-<div class="block md:inline-block md:w-32 flex-shrink-0 text-gray-700">
-  <%= render "madmin/shared/label", form: form, field: field %>
-</div>
 <%= form.text_field field.attribute_name, class: "form-input" %>

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

@@ -5,18 +5,11 @@ module Madmin
     def authenticate_admin_user
       # TODO: Add your authentication logic here
 
-      # For example, we could redirect if the user isn't an admin
-      # redirect_to "/", alert: "Not authorized." unless user_signed_in? && current_user.admin?
-    end
-
-    # Authenticate with Clearance
-    # include Clearance::Controller
-    # before_action :require_login
+      # For example, with Rails 8 authentication
+      # redirect_to "/", alert: "Not authorized." unless authenticated? && Current.user.admin?
 
-    # Authenticate with Devise
-    # before_action :authenticate_user!
-
-    # Authenticate with Basic Auth
-    # http_basic_authenticate_with(name: Rails.application.credentials.admin_username, password: Rails.application.credentials.admin_password)
+      # Or with Devise
+      # redirect_to "/", alert: "Not authorized." unless current_user&.admin?
+    end
   end
 end

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

@@ -9,17 +9,19 @@ class <%= class_name %>Resource < Madmin::Resource
   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
+  # Add scopes to easily filter records
+  # scope :published
 
-  # Uncomment this to customize the default sort column and direction.
-  # def self.default_sort_column
-  #   "created_at"
+  # Add actions to the resource's show page
+  # member_action do |record|
+  #   link_to "Do Something", some_path
   # end
+
+  # Customize the display name of records in the admin area.
+  # def self.display_name(record) = record.name
+
+  # Customize the default sort column and direction.
+  # def self.default_sort_column = "created_at"
   #
-  # def self.default_sort_direction
-  #   "desc"
-  # end
+  # def self.default_sort_direction = "desc"
 end

data/lib/madmin/engine.rb

@@ -1,3 +1,5 @@
+require "importmap-rails"
+
 module Madmin
   class Engine < ::Rails::Engine
     isolate_namespace Madmin
@@ -9,6 +11,24 @@ module Madmin
 
     config.to_prepare do
       Madmin.reset_resources!
+      Madmin.site_name ||= Rails.application.class.module_parent_name
+    end
+
+    initializer "madmin.assets" do |app|
+      if app.config.respond_to?(:assets)
+        app.config.assets.paths << root.join("app/assets/stylesheets")
+        app.config.assets.paths << root.join("app/javascript")
+        app.config.assets.precompile += %w[madmin_manifest]
+      end
+    end
+
+    initializer "madmin.importmap", before: "importmap" do |app|
+      Madmin.importmap.draw root.join("config/importmap.rb")
+      Madmin.importmap.cache_sweeper watches: root.join("app/javascript")
+
+      ActiveSupport.on_load(:action_controller_base) do
+        before_action { Madmin.importmap.cache_sweeper.execute_if_updated }
+      end
     end
   end
 end

data/lib/madmin/field.rb

@@ -6,8 +6,8 @@ module Madmin
       to_s.split("::").last.underscore
     end
 
-    def initialize(attribute_name:, model:, resource:, **options)
-      @attribute_name = attribute_name
+    def initialize(attribute_name:, model:, resource:, options:)
+      @attribute_name = attribute_name.to_sym
       @model = model
       @resource = resource
       @options = options
@@ -18,7 +18,7 @@ module Madmin
     end
 
     def to_partial_path(name)
-      unless %w[index show form].include? name
+      unless %w[index show form].include? name.to_s
         raise ArgumentError, "`partial` must be 'index', 'show', or 'form'"
       end
 
@@ -30,8 +30,20 @@ module Madmin
     end
 
     # Used for checking visibility of attribute on an view
-    def visible?(action, default: true)
-      options.fetch(action.to_sym, default)
+    def visible?(action)
+      action = action.to_sym
+      options.fetch(action) do
+        case action
+        when :index
+          default_index_attributes.include?(attribute_name)
+        else
+          true
+        end
+      end
+    end
+
+    def default_index_attributes
+      [model.primary_key.to_sym, :avatar, :title, :name, :user, :created_at]
     end
 
     def required?

data/lib/madmin/fields/belongs_to.rb

@@ -2,12 +2,13 @@ module Madmin
   module Fields
     class BelongsTo < Field
       def options_for_select(record)
-        if (record = record.send(attribute_name))
-          resource = Madmin.resource_for(record)
-          [[resource.display_name(record), record.id]]
+        records = if (record = record.send(attribute_name))
+          [record]
         else
-          []
+          associated_resource.model.first(25)
         end
+
+        records.map { [Madmin.resource_for(_1).display_name(_1), _1.id] }
       end
 
       def to_param
@@ -15,7 +16,11 @@ module Madmin
       end
 
       def index_path
-        Madmin.resource_by_name(model.reflect_on_association(attribute_name).klass).index_path(format: :json)
+        associated_resource.index_path(format: :json)
+      end
+
+      def associated_resource
+        Madmin.resource_by_name(model.reflect_on_association(attribute_name).klass)
       end
     end
   end

data/lib/madmin/fields/currency.rb

@@ -0,0 +1,15 @@
+module Madmin
+  module Fields
+    class Currency < Field
+      def value(record)
+        value = record.public_send(attribute_name)
+        value /= 100.0 if value && options.minor_units
+        value
+      end
+
+      def searchable?
+        options.fetch(:searchable, model.column_names.include?(attribute_name.to_s))
+      end
+    end
+  end
+end

data/lib/madmin/fields/polymorphic.rb

@@ -5,7 +5,7 @@ module Madmin
         if (collection = options[:collection])
           collection.call
         else
-          []
+          [value(record)].compact
         end
       end
 

data/lib/madmin/fields/select.rb

@@ -0,0 +1,9 @@
+module Madmin
+  module Fields
+    class Select < Field
+      def options_for_select(record)
+        options.collection
+      end
+    end
+  end
+end

data/lib/madmin/menu.rb

@@ -0,0 +1,70 @@
+module Madmin
+  class Menu
+    def initialize
+      @children = {}
+    end
+
+    def reset
+      @children = {}
+    end
+
+    def before_render(&block)
+      if block_given?
+        @before_render = block
+      else
+        @before_render
+      end
+    end
+
+    def render(&block)
+      instance_eval(&@before_render) if @before_render
+
+      # Ensure all the resources have been added to the menu
+      Madmin.resources.each do |resource|
+        next if resource.menu_options == false
+        add resource.menu_options
+      end
+
+      items.each(&block)
+    end
+
+    module Node
+      def add(options)
+        options = options.dup
+
+        if (parent = options.delete(:parent))
+          @children[parent] ||= Item.new(label: parent)
+          @children[parent].add options
+        else
+          item = Item.new(**options)
+          @children[item.label] = item
+        end
+      end
+
+      def items
+        @children.values.sort do |a, b|
+          result = a.position <=> b.position
+          result = a.label <=> b.label if result == 0 # sort alphabetically for the same position
+          result
+        end
+      end
+    end
+
+    include Node
+
+    class Item
+      include Node
+
+      attr_reader :label, :url, :position, :parent, :children
+
+      def initialize(label:, url: nil, position: 99, parent: nil, **options)
+        @label = label
+        @url = url
+        @position = position
+        @parent = parent
+        @if = options.delete(:if)
+        @children = {}
+      end
+    end
+  end
+end