madmin 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea857d0e707bca79172d1bcbecb72cfb939724279ab3f2c08546ff279fd38d03
-  data.tar.gz: c886c8ad0c5d0a11c81f1aecf45463e29205e9bf29dfe00fae4fc94466988ee0
+  metadata.gz: 79be87e2c5e4bb8b7734ebfac9b623459491a836412bbd0faf077033e6a725ff
+  data.tar.gz: a5f93e689c76e156ab396b7da05d47148e19b9ed7bd1f136c4a13b3530c1852a
 SHA512:
-  metadata.gz: 65e7522be423638030455299a70bfdd21cc706e75a5b6624f7a41f869250517474b00dd514551914e86bb3b7e7dac31aa812826461a634649caba8456b73f5c8
-  data.tar.gz: faea74829b0c7e307960dcbe006986f51c064e147c00b17f1234bfc6b72246511c1d206d4891fd773f3f97ea05b96a87dbcdd3e9b709aac1141407a580529b26
+  metadata.gz: 8bde02b65e86325f630bb2de481a3612e1ae5544891ac3e77bc5ffa78eb158eb6f5603967729040ac408a47f337b42375897848ba89e38a7723ff072dbb97703
+  data.tar.gz: c709b74a65fef5383582e3577268dc61e85cb085ce233da6218b586fcf990da32ef5d60cb4991251b3a6b4485f660e018952135233ba23a3bdfeaadfcdbf459a

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/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

@@ -9,7 +9,7 @@
   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/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/text/_index.html.erb

@@ -1 +1 @@
-<%= truncate 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/resource.rb

@@ -55,7 +55,7 @@ module Madmin
       end
 
       def friendly_name
-        model_name.gsub("::", " / ")
+        model_name.gsub("::", " / ").split(/(?=[A-Z])/).join(" ")
       end
 
       # Support for isolated namespaces
@@ -89,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)

data/lib/madmin/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: madmin
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Chris Oliver
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-25 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
@@ -211,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