madmin 2.0.5 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: effe2cef8e6d737651ad3f18b60445620d28b3f8cbadedf8981e866d27a087ca
-  data.tar.gz: 97b00adc461c766b00ee2bae3df3c950d04a44a41fc654e93553ee4a5f8dc8f1
+  metadata.gz: a081ce47d7f266c588a04f1998b1156b859e15526677b5b6ba39e5315efbdf45
+  data.tar.gz: 8533a2223231ba545b8a4935ea6b29ca06e3043888f41248bc096162b93f8dd3
 SHA512:
-  metadata.gz: e052d7299477fc54e9c3a8713de32f6c995a58794eaa3a3458dcd3fd48b642ee75dec8aa1ae4e8a8a8f8985994695f2830c3bdb8db0e35158126e03f6acbf79a
-  data.tar.gz: e00c4c786ccb379546abef4c07d4b4405a7df23d5da382bbfec2032c29b320dd44a80026705d2a2f43bca3afc647ce9e2b2bbfabc758ec5c42c0e27ec2dc51a2
+  metadata.gz: a369a69825063d843569625485adf3f46102b31697195abcdb68bc674e23bff86a0208957e502061742947809236da0ae9a2628324aee4f91c9c5a410618d32d
+  data.tar.gz: a7e3acacc31d419440774347c2d571a84e4ff182b1a6e885e73437ec01d76cbe92bb5b7ddf1c66393f4fde6d03c1cc7bfdf819aae7898bda3601e4d1e2de7689

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

@@ -35,7 +35,7 @@
     cursor: default;
   }
 
-  a.current {
+  a[aria-current="page"] {
     color: #ffffff;
     background-color: var(--primary-color);
   }

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/controllers/madmin/base_controller.rb

@@ -1,7 +1,12 @@
 module Madmin
   class BaseController < ActionController::Base
     include ::ActiveStorage::SetCurrent if defined?(::ActiveStorage)
-    include Pagy::Backend
+
+    if Gem::Version.new(Pagy::VERSION) >= Gem::Version.new("43.0.0.rc")
+      include Pagy::Method
+    else
+      include Pagy::Backend
+    end
 
     protect_from_forgery with: :exception
   end

data/app/controllers/madmin/resource_controller.rb

@@ -16,9 +16,6 @@ module Madmin
           render json: @records.map { |r| {name: @resource.display_name(r), id: r.id} }
         }
       end
-    rescue Pagy::OverflowError
-      params[:page] = 1
-      retry
     end
 
     def show

data/app/helpers/madmin/application_helper.rb

@@ -1,6 +1,6 @@
 module Madmin
   module ApplicationHelper
-    include Pagy::Frontend
+    include Pagy::Frontend if defined? Pagy::Frontend
     include Rails.application.routes.url_helpers
 
     def clear_search_params

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

@@ -65,6 +65,11 @@
 </div>
 
 <div class="pagination">
-  <%== pagy_nav @pagy if @pagy.pages > 1 %>
-  <%== pagy_info @pagy %>
+  <% if @pagy.respond_to?(:series_nav) %>
+    <%== @pagy.series_nav if @pagy.last > 1 %>
+    <%== @pagy.info_tag %>
+  <% else %>
+    <%== pagy_nav @pagy if @pagy.last > 1 %>
+    <%== pagy_info @pagy %>
+  <% end %>
 </div>

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

@@ -8,6 +8,11 @@
 <% end %>
 
 <div class="pagination">
-  <%== pagy_nav pagy if pagy.pages > 1 %>
-  <%== pagy_info pagy %>
+  <% if pagy.respond_to?(:series_nav) %>
+    <%== pagy.series_nav if pagy.last > 1 %>
+    <%== pagy.info_tag %>
+  <% else %>
+    <%== pagy_nav pagy if pagy.last > 1 %>
+    <%== pagy_info pagy %>
+  <% end %>
 </div>

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

@@ -8,6 +8,11 @@
 <% end %>
 
 <div class="pagination">
-  <%== pagy_nav pagy if pagy.pages > 1 %>
-  <%== pagy_info pagy %>
+  <% if pagy.respond_to?(:series_nav) %>
+    <%== pagy.series_nav if pagy.last > 1 %>
+    <%== pagy.info_tag %>
+  <% else %>
+    <%== pagy_nav pagy if pagy.last > 1 %>
+    <%== pagy_info pagy %>
+  <% end %>
 </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

@@ -1,8 +1,6 @@
 module Madmin
   module Fields
     class HasMany < Field
-      include Pagy::Backend
-
       def options_for_select(record)
         if (records = record.send(attribute_name))
           return [] unless records.first
@@ -35,11 +33,29 @@ module Madmin
         true
       end
 
-      def paginated_value(record, params)
-        param_name = "#{attribute_name}_page"
-        pagy value(record), page: params[param_name].to_i, page_param: param_name
-      rescue Pagy::OverflowError, Pagy::VariableError
-        pagy value(record), page: 1, page_param: param_name
+      if Gem::Version.new(Pagy::VERSION) >= Gem::Version.new("43.0.0.rc")
+        include Pagy::Method
+
+        def paginated_value(record, params)
+          page_key = "#{attribute_name}_page"
+          request = {
+            query: {
+              "#{attribute_name}_page" => [params[page_key].to_i, 1].max
+            }
+          }
+          pagy value(record), page_key: page_key, request: request
+        rescue Pagy::OptionError
+        end
+      else
+        include Pagy::Backend
+
+        def paginated_value(record, params)
+          page_key = "#{attribute_name}_page"
+          page = [params[page_key].to_i, 1].max
+          pagy value(record), page: page, page_param: page_key
+        rescue Pagy::OverflowError, Pagy::VariableError
+          pagy value, page: 1, page_param: page_key
+        end
       end
     end
   end

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/version.rb

@@ -1,3 +1,3 @@
 module Madmin
-  VERSION = "2.0.5"
+  VERSION = "2.1.1"
 end

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.0.5
+  version: 2.1.1
 platform: ruby
 authors:
 - Chris Oliver