madmin 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de0ee3515b8f8689bbd5c7b6b99675c2724f0be4cf7774e97d71da99076f3b68
-  data.tar.gz: 4224940c11670cfbc2a481cc0001ad64d846595929993f5971490c1f53e0343c
+  metadata.gz: 67db829bf99130d9746ef0d3bd416f0c38e9ecaf70530db4c4066a60032e934d
+  data.tar.gz: 91694aac3e2db7fad14918af8be8ab97029ca542848e6ccc1f36d493d2bd4f1e
 SHA512:
-  metadata.gz: eaf9f28c5e3dac557dceaff92f823b3372d9c927a2c429d296da83bee28c3f14cd78b31bf198bde7d43bfc8025aaa01d96e1586edc42ebef5c49e3f827929cfc
-  data.tar.gz: e0b561bb2c7d0367238ba4c9af7794161480396ccf2bc625ffad2a3adfbeb1b6919490f59a8fc24c1eac89eec4f0162e202186dc47913f41351b893972c2fb13
+  metadata.gz: bfa374d40d58292a97885e238681bd6bfb91dbe2618f501bda0e25ada1b5490fa8a69b5e80b86cf7262fce44a501a1e1935b672bb6b46a5456e322b11939f93d
+  data.tar.gz: 2cf03a691fcda333691547743b7879495bb2de3ed8fc992761a505c154d92d81cb47d994209cca501bcf7b91f26343ccc9b9f007441f641a71440164864b80e4

data/Rakefile

@@ -20,7 +20,6 @@ require "rake/testtask"
 
 APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)
 load "rails/tasks/engine.rake"
-load "rails/tasks/statistics.rake"
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"

data/app/assets/stylesheets/madmin/buttons.css

@@ -11,10 +11,17 @@
   padding-left: 0.75rem;
   padding-right: 0.75rem;
 
-  &:hover {
+  &:hover,
+  &:focus {
+    cursor: pointer;
     text-decoration: none !important;
   }
 
+  &:disabled {
+    opacity: 60%;
+    cursor: not-allowed;
+  }
+
   &.btn-primary {
     background-color: var(--primary-color);
     color: white;

data/app/assets/stylesheets/madmin/sidebar.css

@@ -39,6 +39,7 @@
 }
 
 main {
+  overflow: auto;
   padding-right: 1rem;
   padding-bottom: 1rem;
   padding-left: calc(1rem + var(--sidebar-width));
@@ -48,7 +49,8 @@ main {
 #sidebar {
   position: absolute;
   inset: 0;
-  z-index: 10; /* Ensure sidebar is above main content */
+  /* Ensure sidebar is above main content */
+  z-index: 10;
 
   border-right: 1px solid var(--border-color);
   height: 100%;

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

@@ -22,7 +22,7 @@
         <button id="hamburger-menu" type="button" data-action="click->mobile-nav#toggle" aria-label="Open menu" aria-expanded="false" aria-controls="sidebar">
           <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="size-5"> <path fill-rule="evenodd" d="M2 4.75A.75.75 0 0 1 2.75 4h14.5a.75.75 0 0 1 0 1.5H2.75A.75.75 0 0 1 2 4.75ZM2 10a.75.75 0 0 1 .75-.75h14.5a.75.75 0 0 1 0 1.5H2.75A.75.75 0 0 1 2 10Zm0 5.25a.75.75 0 0 1 .75-.75h14.5a.75.75 0 0 1 0 1.5H2.75a.75.75 0 0 1-.75-.75Z" clip-rule="evenodd" /> </svg>
         </button>
-        <%= link_to_if respond_to?(:root_url), Madmin.site_name, root_url, data: {turbo: false}  %>
+        <%= link_to Madmin.site_name, try(:root_url) || madmin_root_url, data: {turbo: false}  %>
       </div>
     </header>
 
@@ -33,7 +33,7 @@
 
       <div>
         <%= yield %>
-      </div.>
+      </div>
     </main>
 
     <div data-mobile-nav-target="overlay" data-action="click->mobile-nav#close" class="mobile-nav-overlay"></div>

data/lib/madmin/fields/belongs_to.rb

@@ -2,12 +2,8 @@ module Madmin
   module Fields
     class BelongsTo < Field
       def options_for_select(record)
-        records = if (record = record.send(attribute_name))
-          [record]
-        else
-          associated_resource.model.first(25)
-        end
-
+        current_value = record.send(attribute_name)
+        records = [current_value].compact + associated_resource.model.excluding(current_value).limit(25)
         records.map { [Madmin.resource_for(_1).display_name(_1), _1.id] }
       end
 

data/lib/madmin/fields/has_many.rb

@@ -41,7 +41,8 @@ module Madmin
           request = {
             query: {
               "#{attribute_name}_page" => [params[page_key].to_i, 1].max
-            }
+            },
+            params: params
           }
           pagy value(record), page_key: page_key, request: request
         rescue Pagy::OptionError

data/lib/madmin/resource.rb

@@ -71,8 +71,10 @@ module Madmin
         )
       end
 
+      # Returns singular name
+      # For example: "Forum::Post" -> "Forum / Post"
       def friendly_name
-        model_name.split("::").map { |part| part.underscore.humanize }.join(" / ").titlecase.pluralize
+        model_name.split("::").map { |part| part.underscore.humanize }.join(" / ").titlecase
       end
 
       # Support for isolated namespaces

data/lib/madmin/search.rb

@@ -42,7 +42,7 @@ module Madmin
       fields_count = search_attributes.sum do |attr|
         searchable_fields(attr).count
       end
-      ["%#{@query.mb_chars.downcase}%"] * fields_count
+      ["%#{@query.downcase}%"] * fields_count
     end
 
     def search_attributes

data/lib/madmin/version.rb

@@ -1,3 +1,3 @@
 module Madmin
-  VERSION = "2.1.0"
+  VERSION = "2.1.2"
 end

data/lib/madmin/view_generator.rb

@@ -5,6 +5,7 @@ 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

data/lib/madmin.rb

@@ -45,30 +45,37 @@ module Madmin
   end
 
   class << self
+    # Returns a Madmin::Resource class for the given object
     def resource_for(object)
-      if (resource_name = resource_name_for(object))
+      if (resource_name = resource_name_for(object)) && Object.const_defined?(resource_name)
         resource_name.constantize
-      end
-    rescue NameError
-      raise MissingResource, <<~MESSAGE
-        #{resource_name} is missing. Create it by running:
 
-            bin/rails generate madmin:resource #{resource_name.split("Resource").first}
-      MESSAGE
+      # STI models should look at the parent
+      elsif (resource_name = sti_resource_name_for(object)) && Object.const_defined?(resource_name)
+        resource_name.constantize
+
+      else
+        raise MissingResource, <<~MESSAGE
+          `#{object.class.name}Resource` is missing.
+
+          Create the Madmin resource by running:
+
+              bin/rails generate madmin:resource #{object.class.name}
+        MESSAGE
+      end
     end
 
     def resource_name_for(object)
       if object.is_a? ::ActiveStorage::Attached
         "ActiveStorage::AttachmentResource"
       else
-        begin
-          "#{object.class.name}Resource"
-        rescue
-          # For STI models, see if there's a superclass resource available
-          if (column = object.class.inheritance_column) && object.class.column_names.include?(column)
-            "#{object.class.superclass.base_class.name}Resource"
-          end
-        end
+        "#{object.class.name}Resource"
+      end
+    end
+
+    def sti_resource_name_for(object)
+      if (column = object.class.inheritance_column) && object.class.column_names.include?(column)
+        "#{object.class.superclass.base_class.name}Resource"
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: madmin
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Chris Oliver
@@ -257,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.1
+rubygems_version: 3.7.2
 specification_version: 4
 summary: A modern admin for Ruby on Rails apps
 test_files: []