madmin 1.0.1 → 1.2.1

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

@@ -1,3 +1,7 @@
-<h1><%= link_to resource.friendly_name.pluralize, resource.index_path %> / New <%= resource.friendly_name %></h1>
+<h1 class="text-xl mb-4">
+  <%= link_to resource.friendly_name.pluralize, resource.index_path, class: "text-indigo-500" %>
+  /
+  <strong>New <%= resource.friendly_name %></strong>
+</h1>
 
 <%= render partial: "form", locals: { record: @record, resource: resource } %>

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

@@ -1,24 +1,31 @@
-<div class="flex justify-between">
-  <h1><%= link_to resource.friendly_name.pluralize, resource.index_path %> / <%= resource.model.name.singularize %> #<%= @record.id %></h1>
+<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-indigo-500" %>
+    /
+    <%= link_to resource.display_name(@record), resource.show_path(@record), class: "text-indigo-500 font-bold" %>
+  </h1>
 
-  <div class="flex px-4">
-    <%= link_to "Edit", resource.edit_path(@record), class: "mr-2" %>
-    <%= button_to "Delete", resource.show_path(@record), method: :delete, data: { confirm: "Are you sure?" }, class: "inline-block" %>
+  <div class="flex items-center px-4">
+    <div class="mr-2">
+      <%= 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" %>
+    </div>
+    <%= button_to "Delete", resource.show_path(@record), method: :delete, data: { 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" %>
   </div>
 </div>
 
-<% resource.attributes.each do |attribute| %>
-  <% next if attribute[:field].nil? %>
-  <% next unless attribute[:field].visible?(action_name) %>
-  <% field = attribute[:field] %>
+<div class="divide-y">
+  <% resource.attributes.values.each do |attribute| %>
+    <% next if attribute.field.nil? %>
+    <% next unless attribute.field.visible?(action_name) %>
 
-  <div class="flex py-2">
-    <div class="w-32 flex-shrink-0 text-gray-700 uppercase tracking-wide text-sm">
-      <%= field.attribute_name.to_s.titleize %>
-    </div>
+    <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>
 
-    <div>
-      <%= render partial: field.to_partial_path("show"), locals: { field: field, record: @record } %>
+      <div class="md:col-span-3">
+        <%= render partial: attribute.field.to_partial_path("show"), locals: { field: attribute.field, record: @record } %>
+      </div>
     </div>
-  </div>
-<% end %>
+  <% end %>
+</div>

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

@@ -1,2 +1,4 @@
-<%= form.label field.attribute_name, class: "inline-block w-32 flex-shrink-0" %>
+<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 %>

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

@@ -1,3 +1,9 @@
 <% if (attachment = field.value(record)) && attachment.attached? %>
-  <%= link_to attachment.filename, attachment, target: :_blank %>
+  <% if attachment.variable? %>
+    <%= link_to attachment, target: :_blank do %>
+      <%= image_tag attachment, class: "max-h-32" %>
+    <% end %>
+  <% else %>
+    <%= link_to attachment.filename, attachment, target: :_blank, class: "text-indigo-500 underline" %>
+  <% end %>
 <% end %>

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

@@ -1,2 +1,4 @@
-<%= form.label field.attribute_name, class: "inline-block w-32 flex-shrink-0" %>
+<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 %>

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

@@ -1,7 +1,11 @@
 <% if (attachments = field.value(record)) && attachments.attached? %>
   <% attachments.each do |attachment| %>
-    <div>
-      <%= link_to attachment.filename, attachment, target: :_blank %>
-    </div>
+    <% if attachment.variable? %>
+      <%= link_to attachment, target: :_blank do %>
+        <%= image_tag attachment, class: "max-h-32" %>
+      <% end %>
+    <% else %>
+      <%= link_to attachment.filename, attachment, target: :_blank, class: "text-indigo-500 underline" %>
+    <% end %>
   <% end %>
 <% end %>

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

@@ -1,2 +1,4 @@
-<%= form.label field.attribute_name, class: "inline-block w-32 flex-shrink-0" %>
-<%= form.select field.to_param, field.options_for_select(record), { prompt: true }, { class: "form-select", data: { controller: "slimselect", data: { controller: "slimselect" } } } %>
+<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 } } %>

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

@@ -1,3 +1,3 @@
 <% if (object = field.value(record)) %>
-  <%= link_to Madmin.resource_for(object).display_name(object), Madmin.resource_for(object).show_path(object) %>
+  <%= link_to Madmin.resource_for(object).display_name(object), Madmin.resource_for(object).show_path(object), class: "text-indigo-500 underline" %>
 <% end %>

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

@@ -1,2 +1,4 @@
-<%= form.label field.attribute_name, class: "inline-block w-32 flex-shrink-0" %>
+<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" %>

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

@@ -1,2 +1,4 @@
-<%= form.label field.attribute_name, class: "inline-block w-32 flex-shrink-0" %>
+<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" } } %>

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

@@ -1,2 +1,4 @@
-<%= form.label field.attribute_name, class: "inline-block w-32 flex-shrink-0" %>
+<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 } %>

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

@@ -1,2 +1,4 @@
-<%= form.label field.attribute_name, class: "inline-block w-32 flex-shrink-0" %>
+<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,2 +1,4 @@
-<%= form.label field.attribute_name, class: "inline-block w-32 flex-shrink-0" %>
-<%= form.select field.attribute_name, field.options_for_select(record), { prompt: true }, { class: "form-select" } %>
+<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" } } %>

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

@@ -1,2 +1,4 @@
-<%= form.label field.attribute_name, class: "inline-block w-32 flex-shrink-0" %>
+<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,2 +1,4 @@
-<%= form.label field.attribute_name, class: "inline-block w-32 flex-shrink-0" %>
-<%= form.select "#{field.attribute_name.to_s.singularize}_ids", field.options_for_select(record), { prompt: true }, { multiple: true, class: "form-select", data: { controller: "slimselect" } } %>
+<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 } } %>

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

@@ -1,5 +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) %>
+    <%= link_to Madmin.resource_for(object).display_name(object), Madmin.resource_for(object).show_path(object), class: "text-indigo-500 underline" %>
   </div>
 <% end %>

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

@@ -1,3 +1,4 @@
-HAS ONE
-<%= form.label field.attribute_name, class: "inline-block w-32 flex-shrink-0" %>
+<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,2 +1,4 @@
-<%= form.label field.attribute_name, class: "inline-block w-32 flex-shrink-0" %>
+<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/json/_form.html.erb

@@ -1,2 +1,4 @@
-<%= form.label field.attribute_name, class: "inline-block w-32 flex-shrink-0" %>
+<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

@@ -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,32 @@
+<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">
+
+    <%= 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), class: "text-indigo-500 underline" %>
+  </div>
+<% end %>

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

@@ -0,0 +1,4 @@
+<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/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/app/views/madmin/fields/polymorphic/_form.html.erb

@@ -1,5 +1,7 @@
 <%= form.fields_for field.attribute_name do |pf| %>
-  <%= pf.label field.attribute_name, class: "inline-block w-32 flex-shrink-0" %>
+  <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.hidden_field :type, value: "polymorphic" %>
 <% end %>

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

@@ -1,3 +1,3 @@
 <% if (object = field.value(record)) %>
-  <%= link_to Madmin.resource_for(object).display_name(object), Madmin.resource_for(object).show_path(object) %>
+  <%= link_to Madmin.resource_for(object).display_name(object), Madmin.resource_for(object).show_path(object), class: "text-indigo-500 underline" %>
 <% end %>

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

@@ -1,4 +1,6 @@
-<%= form.label field.attribute_name, class: "inline-block w-32 flex-shrink-0" %>
+<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>

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

@@ -1,2 +1,4 @@
-<%= form.label field.attribute_name, class: "inline-block w-32 flex-shrink-0" %>
+<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/app/views/madmin/fields/text/_form.html.erb

@@ -1,2 +1,4 @@
-<%= form.label field.attribute_name, class: "inline-block w-32 flex-shrink-0" %>
+<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/time/_form.html.erb

@@ -1,2 +1,4 @@
-<%= form.label field.attribute_name, class: "inline-block w-32 flex-shrink-0" %>
+<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.time_select field.attribute_name, {}, { class: "form-select" } %>

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

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

data/lib/generators/madmin/field/field_generator.rb

@@ -0,0 +1,31 @@
+module Madmin
+  module Generators
+    class FieldGenerator < Rails::Generators::NamedBase
+      include Madmin::GeneratorHelpers
+
+      source_root File.expand_path("../templates", __FILE__)
+
+      def eager_load
+        Rails.application.eager_load!
+      end
+
+      def generate_field
+        template "field.rb", "app/madmin/fields/#{file_path}_field.rb"
+        copy_resource_template "_form"
+        copy_resource_template "_index"
+        copy_resource_template "_show"
+      end
+
+      private
+
+      def copy_resource_template(template_name)
+        template_file = "#{template_name}.html.erb"
+
+        copy_file(
+          template_file,
+          "app/views/madmin/fields/#{file_path}_field/#{template_file}"
+        )
+      end
+    end
+  end
+end

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

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

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

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

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

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

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

@@ -0,0 +1,26 @@
+class <%= class_name %>Field < Madmin::Field
+  # def value(record)
+  #   record.public_send(attribute_name)
+  # end
+
+  # def to_partial_path(name)
+  #   unless %w[index show form].include? name
+  #     raise ArgumentError, "`partial` must be 'index', 'show', or 'form'"
+  #  end
+  #
+  #   "/madmin/fields/#{self.class.field_type}/#{name}"
+  # end
+
+  # def to_param
+  #   attribute_name
+  # end
+
+  # # Used for checking visibility of attribute on an view
+  # def visible?(action, default: true)
+  #   options.fetch(action.to_sym, default)
+  # end
+
+  # def required?
+  #   model.validators_on(attribute_name).any? { |v| v.is_a? ActiveModel::Validations::PresenceValidator }
+  # end
+end

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

@@ -16,8 +16,13 @@ module Madmin
       end
 
       def generate_routes
+        if rails6_1_and_up?
+          route "draw :madmin", file: ROUTES_FILE[:default]
+          template("routes.rb.tt", "config/routes/madmin.rb")
+        end
+
         if route_namespace_exists?
-          route "root to: \"dashboard#show\"", indentation: 4, sentinel: /namespace :madmin do\s*\n/m
+          route "root to: \"dashboard#show\"", indentation: separated_routes_file? ? 2 : 4, sentinel: /namespace :madmin do\s*\n/m
         else
           route "root to: \"dashboard#show\"", namespace: [:madmin]
         end

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

@@ -0,0 +1,3 @@
+# Below are the routes for madmin
+namespace :madmin do
+end

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

@@ -20,7 +20,7 @@ module Madmin
 
       def generate_route
         if route_namespace_exists?
-          route "resources :#{plural_name}", namespace: class_path, indentation: 4, sentinel: /namespace :madmin do\s*\n/m
+          route "resources :#{plural_name}", namespace: class_path, indentation: separated_routes_file? ? 2 : 4, sentinel: /namespace :madmin do\s*\n/m
         else
           route "resources :#{plural_name}", namespace: [:madmin] + class_path
         end
@@ -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