madmin 1.2.2 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '05151328dcf6fdd8c23755a1b1f3f14b9dcceadc8215e6f102e133d915e95be6'
-  data.tar.gz: 305bf51253018fa0c871d0314e9ecd69339c510160cdacf1439c2fd361a95a97
+  metadata.gz: 79be87e2c5e4bb8b7734ebfac9b623459491a836412bbd0faf077033e6a725ff
+  data.tar.gz: a5f93e689c76e156ab396b7da05d47148e19b9ed7bd1f136c4a13b3530c1852a
 SHA512:
-  metadata.gz: 625d77d1c5ee5bd30462c2609a8b53b7c5d321fb97e0951a95b852eca019189d468c596fcda77e170ed996bd25707feea787a3668faf318a542a65f03d75e488
-  data.tar.gz: b594b3c324289e44dbdeb3f0acc70a532b391f8c46faa4854ea5654e9dfe648c88062e24c29433bb476165134a0d79fdbbca526000bbf6c148e9c2c28777f0ed
+  metadata.gz: 8bde02b65e86325f630bb2de481a3612e1ae5544891ac3e77bc5ffa78eb158eb6f5603967729040ac408a47f337b42375897848ba89e38a7723ff072dbb97703
+  data.tar.gz: c709b74a65fef5383582e3577268dc61e85cb085ce233da6218b586fcf990da32ef5d60cb4991251b3a6b4485f660e018952135233ba23a3bdfeaadfcdbf459a

data/app/controllers/madmin/application_controller.rb

@@ -0,0 +1,22 @@
+module Madmin
+  class ApplicationController < Madmin::BaseController
+    before_action :authenticate_admin_user
+
+    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
+
+    # 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)
+  end
+end

data/app/controllers/madmin/dashboard_controller.rb

@@ -1,5 +1,5 @@
 module Madmin
-  class DashboardController < ApplicationController
+  class DashboardController < Madmin::ApplicationController
     def show
     end
   end

data/app/controllers/madmin/resource_controller.rb

@@ -1,5 +1,5 @@
 module Madmin
-  class ResourceController < ApplicationController
+  class ResourceController < Madmin::ApplicationController
     include SortHelper
 
     before_action :set_record, except: [:index, :new, :create]

data/app/helpers/madmin/application_helper.rb

@@ -15,7 +15,7 @@ module Madmin
     end
 
     def clear_search_params
-      params.except(:q, :_page).permit(:page, :sort, :direction)
+      resource.index_path(params.permit(:sort, :direction))
     end
   end
 end

data/app/helpers/madmin/sort_helper.rb

@@ -4,7 +4,7 @@ module Madmin
       matching_column = (column.to_s == sort_column)
       direction = sort_direction == "asc" ? "desc" : "asc"
 
-      link_to request.params.merge(sort: column, direction: direction), options do
+      link_to resource.index_path(sort: column, direction: direction), options do
         concat title
         if matching_column
           concat " "

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

@@ -3,13 +3,13 @@
 <%= stylesheet_link_tag "https://unpkg.com/tom-select/dist/css/tom-select.min.css", "data-turbo-track": "reload" %>
 
 <script type="module">
-  import { Application, Controller } from 'https://cdn.skypack.dev/stimulus'
+  import { Application, Controller } from 'https://cdn.skypack.dev/@hotwired/stimulus'
   const application = Application.start()
 
   import { Dropdown } from "https://cdn.skypack.dev/tailwindcss-stimulus-components"
   application.register("dropdown", Dropdown)
 
-  import stimulusFlatpickr from 'https://cdn.skypack.dev/stimulus-flatpickr'
+  import stimulusFlatpickr from 'https://cdn.skypack.dev/stimulus-flatpickr@3.0.0-0'
   application.register("flatpickr", stimulusFlatpickr)
 
   import TomSelect from 'https://cdn.skypack.dev/tom-select'
@@ -38,7 +38,8 @@
           labelField: 'name',
           searchField: 'name',
           load: (search, callback) => {
-            fetch(this.urlValue)
+            let url = search ? `${this.urlValue}?q=${search}` : this.urlValue;
+            fetch(url)
               .then(response => response.json())
               .then(json => {
                 callback(json);

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

@@ -27,33 +27,36 @@
     <%= link_to scope.to_s.humanize, resource.index_path(scope: scope), class: class_names("p-2 rounded", {"bg-gray-100" => params[:scope] == scope.to_s}) %>
   <% end %>
 </div>
-
-<table class="min-w-full divide-y divide-gray-200">
-  <thead>
-    <tr class="border-b border-gray-200">
-      <% resource.attributes.values.each do |attribute| %>
-        <% next if attribute.field.nil? %>
-        <% next unless attribute.field.visible?(action_name) %>
-
-        <th class="py-2 px-4 text-left text-xs text-gray-500 font-medium uppercase whitespace-nowrap"><%= sortable attribute.name, attribute.name.to_s.titleize %></th>
-      <% end %>
-      <th class="py-2 px-4 text-left text-xs text-gray-500 font-medium uppercase">Actions</th>
-    </tr>
-  </thead>
-
-  <tbody class="text-sm divide-y">
-    <% @records.each do |record| %>
-      <tr>
+<div class="min-w-full max-w-xl overflow-x-auto pb-4">
+  <table class="min-w-full divide-y divide-gray-200">
+    <thead>
+      <tr class="border-b border-gray-200">
         <% resource.attributes.values.each do |attribute| %>
           <% next if attribute.field.nil? %>
           <% next unless attribute.field.visible?(action_name) %>
-          <td class="px-4 py-2"><%= render partial: attribute.field.to_partial_path("index"), locals: { field: attribute.field, record: record } %></td>
-        <% end %>
 
-        <td class="px-4 py-2 text-center"><%= link_to "View", resource.show_path(record), class: "text-indigo-500" %></td>
+          <th class="py-2 px-4 text-left text-xs text-gray-500 font-medium uppercase whitespace-nowrap"><%= sortable attribute.name, attribute.name.to_s.titleize %></th>
+        <% end %>
+        <th class="py-2 px-4 text-left text-xs text-gray-500 font-medium uppercase">Actions</th>
       </tr>
-    <% end %>
-  </tbody>
-</table>
-
+    </thead>
+
+    <tbody class="text-sm divide-y">
+      <% @records.each do |record| %>
+        <tr>
+          <% resource.attributes.values.each do |attribute| %>
+            <% next if attribute.field.nil? %>
+            <% next unless attribute.field.visible?(action_name) %>
+            <td class="px-4 py-2"><%= render partial: attribute.field.to_partial_path("index"), locals: { field: attribute.field, record: record, resource: resource } %></td>
+          <% end %>
+
+          <td class="px-4 py-2 text-center">
+            <%= link_to "View", resource.show_path(record), class: "text-indigo-500" %>
+            <%= link_to "Edit", resource.edit_path(record), class: "text-indigo-500" %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
 <%== pagy_nav(@pagy) if @pagy.pages > 1 %>

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

@@ -24,7 +24,7 @@
       </div>
 
       <div class="md:col-span-3">
-        <%= render partial: attribute.field.to_partial_path("show"), locals: { field: attribute.field, record: @record } %>
+        <%= render partial: attribute.field.to_partial_path("show"), locals: { field: attribute.field, record: @record, resource: resource } %>
       </div>
     </div>
   <% end %>

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

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

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

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

data/app/views/madmin/fields/file/_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.file_field field.attribute_name, class: "form-input" %>

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

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

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

@@ -0,0 +1,6 @@
+<% value = field.value(record) %>
+<% if value.respond_to?(:url) %>
+  <%= link_to value.url, value.url, target: :_blank, class: "text-indigo-500 underline" %>
+<% else %>
+  <%= value %>
+<% end %>

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

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

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

@@ -1,5 +1,5 @@
-<%= 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| %>
+<%= 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) %>
@@ -14,5 +14,4 @@
   <small><%= link_to "Remove", "#", data: { action: "click->nested-form#remove_association" } %></small>
 
   <%= f.hidden_field :_destroy %>
-
 <% end %>

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

@@ -1 +1 @@
-<%= field.value(record) %>
+<%= truncate field.value(record).to_s %>

data/lib/generators/madmin/field/templates/_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/lib/madmin/engine.rb

@@ -1,8 +1,10 @@
 module Madmin
   class Engine < ::Rails::Engine
+    isolate_namespace Madmin
+
     config.before_configuration do |app|
-      app.config.autoload_paths << File.expand_path("app/madmin/resources", Rails.root)
-      app.config.autoload_paths << File.expand_path("app/madmin/fields", Rails.root)
+      app.config.eager_load_paths << File.expand_path("app/madmin/resources", Rails.root)
+      app.config.eager_load_paths << File.expand_path("app/madmin/fields", Rails.root)
     end
 
     config.to_prepare do

data/lib/madmin/field.rb

@@ -1,14 +1,15 @@
 module Madmin
   class Field
-    attr_reader :attribute_name, :model, :options
+    attr_reader :attribute_name, :model, :options, :resource
 
     def self.field_type
       to_s.split("::").last.underscore
     end
 
-    def initialize(attribute_name:, model:, **options)
+    def initialize(attribute_name:, model:, resource:, **options)
       @attribute_name = attribute_name
       @model = model
+      @resource = resource
       @options = options
     end
 

data/lib/madmin/fields/file.rb

@@ -0,0 +1,9 @@
+module Madmin
+  module Fields
+    class File < Field
+      def searchable?
+        false
+      end
+    end
+  end
+end

data/lib/madmin/fields/nested_has_many.rb

@@ -3,7 +3,7 @@ module Madmin
     class NestedHasMany < Field
       DEFAULT_ATTRIBUTES = %w[_destroy id].freeze
       def nested_attributes
-        resource.attributes.reject { |i| skipped_fields.include?(i[:name]) }
+        resource.attributes.reject { |name, attribute| skipped_fields.include?(name) }
       end
 
       def resource

data/lib/madmin/resource.rb

@@ -11,7 +11,7 @@ module Madmin
       end
 
       def model
-        model_name.constantize
+        @model ||= model_name.constantize
       end
 
       def model_find(id)
@@ -37,7 +37,7 @@ module Madmin
         attributes[name] = OpenStruct.new(
           name: name,
           type: type,
-          field: field.new(**options.merge(attribute_name: name, model: model))
+          field: field.new(**options.merge(attribute_name: name, model: model, resource: self))
         )
       rescue => e
         builder = ResourceBuilder.new(model)
@@ -55,31 +55,33 @@ module Madmin
       end
 
       def friendly_name
-        model_name.gsub("::", " / ")
+        model_name.gsub("::", " / ").split(/(?=[A-Z])/).join(" ")
       end
 
-      def index_path(options = {})
-        route_name = "madmin_#{model.model_name.plural}_path"
+      # Support for isolated namespaces
+      # Finds parent module class to include in polymorphic urls
+      def route_namespace
+        return @route_namespace if instance_variable_defined?(:@route_namespace)
+        namespace = model.module_parents.detect do |n|
+          n.respond_to?(:use_relative_model_naming?) && n.use_relative_model_naming?
+        end
+        @route_namespace = (namespace ? namespace.name.singularize.underscore.to_sym : nil)
+      end
 
-        url_helpers.send(route_name, options)
+      def index_path(options = {})
+        url_helpers.polymorphic_path([:madmin, route_namespace, model], options)
       end
 
       def new_path
-        route_name = "new_madmin_#{model.model_name.singular}_path"
-
-        url_helpers.send(route_name)
+        url_helpers.polymorphic_path([:madmin, route_namespace, model], action: :new)
       end
 
       def show_path(record)
-        route_name = "madmin_#{model.model_name.singular}_path"
-
-        url_helpers.send(route_name, record.to_param)
+        url_helpers.polymorphic_path([:madmin, route_namespace, record])
       end
 
       def edit_path(record)
-        route_name = "edit_madmin_#{model.model_name.singular}_path"
-
-        url_helpers.send(route_name, record.to_param)
+        url_helpers.polymorphic_path([:madmin, route_namespace, record], action: :edit)
       end
 
       def param_key
@@ -87,7 +89,7 @@ module Madmin
       end
 
       def permitted_params
-        attributes.values.filter_map { |a| a.field.to_param if a.field.visible?(:form) }
+        attributes.values.filter { |a| a.field.visible?(:form) }.map { |a| a.field.to_param }
       end
 
       def display_name(record)
@@ -128,6 +130,7 @@ module Madmin
           time: Fields::Time,
           timestamp: Fields::Time,
           password: Fields::Password,
+          file: Fields::File,
 
           # Postgres specific types
           bit: Fields::String,

data/lib/madmin/version.rb

@@ -1,3 +1,3 @@
 module Madmin
-  VERSION = "1.2.2"
+  VERSION = "1.2.6"
 end

data/lib/madmin.rb

@@ -18,6 +18,7 @@ module Madmin
     autoload :DateTime, "madmin/fields/date_time"
     autoload :Decimal, "madmin/fields/decimal"
     autoload :Enum, "madmin/fields/enum"
+    autoload :File, "madmin/fields/file"
     autoload :Float, "madmin/fields/float"
     autoload :HasMany, "madmin/fields/has_many"
     autoload :HasOne, "madmin/fields/has_one"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: madmin
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.6
 platform: ruby
 authors:
 - Chris Oliver
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-23 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -34,7 +34,7 @@ dependencies:
         version: '3.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
         version: '3.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 description: It's an admin, obviously.
 email:
 - excid3@gmail.com
@@ -59,6 +59,7 @@ files:
 - app/assets/config/manifest.js
 - app/assets/stylesheets/actiontext.scss
 - app/assets/stylesheets/application.css
+- app/controllers/madmin/application_controller.rb
 - app/controllers/madmin/base_controller.rb
 - app/controllers/madmin/dashboard_controller.rb
 - app/controllers/madmin/resource_controller.rb
@@ -98,6 +99,9 @@ files:
 - app/views/madmin/fields/enum/_form.html.erb
 - app/views/madmin/fields/enum/_index.html.erb
 - app/views/madmin/fields/enum/_show.html.erb
+- app/views/madmin/fields/file/_form.html.erb
+- app/views/madmin/fields/file/_index.html.erb
+- app/views/madmin/fields/file/_show.html.erb
 - app/views/madmin/fields/float/_form.html.erb
 - app/views/madmin/fields/float/_index.html.erb
 - app/views/madmin/fields/float/_show.html.erb
@@ -167,6 +171,7 @@ files:
 - lib/madmin/fields/date_time.rb
 - lib/madmin/fields/decimal.rb
 - lib/madmin/fields/enum.rb
+- lib/madmin/fields/file.rb
 - lib/madmin/fields/float.rb
 - lib/madmin/fields/has_many.rb
 - lib/madmin/fields/has_one.rb
@@ -206,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: A modern admin for Ruby on Rails apps