madmin 1.2.8 → 1.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 452ba760d0701d79257b2f0ef4282a785dd3bc3e5380802c75220a6e7e8d3113
-  data.tar.gz: af23fac79122683d21c97866a355b2ebb373f7353610a46e8b83f25504a7e9b2
+  metadata.gz: 1f28056e0049fbd6d19f4b686b9742d1a0d81e61bea220e0a815870be83fd426
+  data.tar.gz: ccd99dd6809870a31934bc822a4b05a506b0485a42b87b031f2b96deeea9ade9
 SHA512:
-  metadata.gz: 0e37320de16647c286f7551e819f290bd040862ba0b209f8ee0a57971c76ee2988fa149a889e6bb366e5fe212eb98c93f101cb010ac65af34f64a9144ec34800
-  data.tar.gz: 0ff60d8bca0aeb06769542e1d550ed468cad26213ab04259335dbec5e61e03890fc253babb78ac09358c15345f6c98d7b1fc55acaf77fe2115939b93d0d7005c
+  metadata.gz: bcc1478dd032b27ef03c7707ff15bb390b44e452169404b936274971a68c72cbbd83bdcccab4498dd385f0a4c0f22d1481cbccf970596d7cc1ef44a3ccc255bf
+  data.tar.gz: c55e2a66753ca675a7906a7c12114fdc956f68da3deb1119bd83761f47c3fd42396c658baab2c5a57b7c1d42047c7f0d34f95d29c1f99dc305c95d0b96ae73f9

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

@@ -2,6 +2,37 @@
 <%= stylesheet_link_tag "https://unpkg.com/flatpickr/dist/flatpickr.min.css", "data-turbo-track": "reload" %>
 <%= stylesheet_link_tag "https://unpkg.com/trix/dist/trix.css", "data-turbo-track": "reload" %>
 <%= stylesheet_link_tag "https://unpkg.com/tom-select/dist/css/tom-select.min.css", "data-turbo-track": "reload" %>
+<style type="text/tailwindcss">
+.pagy {
+  @apply isolate inline-flex rounded-md;
+
+  a:first-child {
+    @apply rounded-l-md;
+  }
+  a:last-child {
+    @apply rounded-r-md;
+  }
+
+  a {
+    @apply relative -ml-px inline-flex items-center bg-white px-3 py-2 text-sm font-semibold text-gray-900 ring-1 ring-inset ring-gray-300 hover:bg-gray-100 focus:z-10;
+
+    &:not([href]) {
+      @apply text-gray-300 cursor-default;
+    }
+
+    &.current {
+      @apply text-white bg-blue-500 ring-blue-500;
+    }
+  }
+
+  label {
+    @apply inline-block whitespace-nowrap bg-gray-200 rounded-lg px-3 py-0.5;
+    input {
+      @apply bg-gray-100 border-none rounded-md;
+    }
+  }
+}
+</style>
 
 <script type="importmap" data-turbo-track="reload">
   {
@@ -13,7 +44,7 @@
       "@rails/activestorage": "https://unpkg.com/@rails/activestorage@<%= npm_rails_version %>/app/assets/javascripts/activestorage.esm.js",
       "flatpickr": "https://unpkg.com/flatpickr/dist/esm/index.js",
       "stimulus-flatpickr": "https://unpkg.com/stimulus-flatpickr@3.0.0-0/dist/index.m.js",
-      "tailwindcss-stimulus-components": "https://unpkg.com/tailwindcss-stimulus-components/dist/tailwindcss-stimulus-components.modern.js",
+      "tailwindcss-stimulus-components": "https://unpkg.com/tailwindcss-stimulus-components/dist/tailwindcss-stimulus-components.module.js",
       "tom-select": "https://unpkg.com/tom-select/dist/esm/tom-select.complete.js",
       "trix": "https://unpkg.com/trix"
     }

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

@@ -0,0 +1,7 @@
+<% Madmin.resources.each do |resource| %>
+  <%= nav_link_to resource.friendly_name.pluralize, resource.index_path, class: "block p-2 rounded hover:bg-gray-100", starts_with: resource.index_path, active_class: "font-bold text-black" %>
+<% end %>
+
+<div class="mt-auto">
+  <%= link_to "View Madmin on GitHub", "https://github.com/excid3/madmin", target: :_blank, class: "block p-2 rounded text-gray-500 hover:bg-gray-100" %>
+</div>

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

@@ -1,4 +1,4 @@
-<div class="flex flex-col h-full text-sm" data-controller="dropdown">
+<div class="flex flex-col h-full text-sm">
   <div class="flex md:block justify-between items-center">
     <div class="flex md:block items-center">
       <h1 class="mr-2 md:p-2 text-xl font-semibold">Madmin</h1>
@@ -9,7 +9,7 @@
       <% end %>
     </div>
 
-    <div class="-mr-2 flex items-center md:hidden">
+    <div class="-mr-2 flex items-center md:hidden relative" data-controller="dropdown">
       <button data-action="click->dropdown#toggle touch->dropdown#toggle click@window->dropdown#hide touch@window#dropdown->hide" type="button" class="bg-white rounded-md p-2 inline-flex items-center justify-center text-gray-400 hover:bg-gray-200 focus:outline-none focus:ring-2 focus-ring-inset focus:ring-white" id="main-menu" aria-haspopup="true">
         <span class="sr-only">Open main menu</span>
         <!-- Heroicon name: outline/menu -->
@@ -17,16 +17,13 @@
           <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16"></path>
         </svg>
       </button>
-    </div>
-  </div>
 
-  <div class="hidden md:flex flex-col flex-grow justify-between" data-dropdown-target="menu">
-    <% Madmin.resources.each do |resource| %>
-      <%= nav_link_to resource.friendly_name.pluralize, resource.index_path, class: "block p-2 rounded hover:bg-gray-100", starts_with: resource.index_path, active_class: "font-bold text-black" %>
-    <% end %>
-
-    <div class="mt-auto">
-      <%= link_to "View Madmin on GitHub", "https://github.com/excid3/madmin", target: :_blank, class: "block p-2 rounded text-gray-500 hover:bg-gray-100" %>
+      <div class="absolute top-12 right-0 bg-white rounded-lg min-w-64 shadow-lg hidden md:flex flex-col flex-grow justify-between" data-dropdown-target="menu">
+        <%= render "menu_resources" %>
+      </div>
+    </div>
+    <div class="hidden md:block">
+      <%= render "menu_resources" %>
     </div>
   </div>
 </div>

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

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

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

@@ -4,7 +4,7 @@
   <div class="flex-grow flex md:justify-end gap-4">
     <form class="flex items-center gap-2 relative">
       <%= hidden_field_tag :page, params[:page], value: 1, class: "hidden" %>
-      <%= search_field_tag :q, params[:q], placeholder: "Search", class: "rounded-full px-4 focus:bg-white focus:border-indigo-500" %>
+      <%= search_field_tag :q, params[:q], placeholder: "Search", class: "rounded-full px-4 focus:bg-white focus:border-blue-500" %>
       <%= link_to clear_search_params, class: "absolute top-1/2 right-3 text-gray-500 bg-white transform -translate-y-1/2" do %>
         <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
           <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z" clip-rule="evenodd" />
@@ -51,12 +51,12 @@
           <% 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" %>
+            <%= link_to "View", resource.show_path(record), class: "text-blue-500" %>
+            <%= link_to "Edit", resource.edit_path(record), class: "text-blue-500" %>
           </td>
         </tr>
       <% end %>
     </tbody>
   </table>
 </div>
-<%== render(partial: 'madmin/pagy/nav', locals: { pagy: @pagy }) if @pagy.pages > 1 %>
+<%== pagy_nav @pagy %>

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

@@ -1,5 +1,5 @@
 <h1 class="text-xl mb-4">
-  <%= link_to resource.friendly_name.pluralize, resource.index_path, class: "text-indigo-500" %>
+  <%= link_to resource.friendly_name.pluralize, resource.index_path, class: "text-blue-500" %>
   /
   <strong>New <%= resource.friendly_name %></strong>
 </h1>

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

@@ -1,13 +1,13 @@
 <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.friendly_name.pluralize, resource.index_path, class: "text-blue-500" %>
     /
-    <%= link_to resource.display_name(@record), resource.show_path(@record), class: "text-indigo-500 font-bold" %>
+    <%= link_to resource.display_name(@record), resource.show_path(@record), class: "text-blue-500 font-bold" %>
   </h1>
 
   <div class="flex gap-2 items-center px-4">
     <% resource.member_actions.each do |action| %>
-      <%= instance_eval &action  %>
+      <%= instance_eval(&action)  %>
     <% end %>
     <%= 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" %>
     <%= button_to "Delete", resource.show_path(@record), method: :delete, data: { turbo_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" %>

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

@@ -4,6 +4,6 @@
       <%= image_tag main_app.url_for(attachment), class: "max-h-32" %>
     <% end %>
   <% else %>
-    <%= link_to attachment.filename, main_app.url_for(attachment), target: :_blank, class: "text-indigo-500 underline" %>
+    <%= link_to attachment.filename, main_app.url_for(attachment), target: :_blank, class: "text-blue-500 underline" %>
   <% end %>
 <% end %>

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

@@ -5,7 +5,7 @@
         <%= image_tag main_app.url_for(attachment), class: "max-h-32" %>
       <% end %>
     <% else %>
-      <%= link_to attachment.filename, main_app.url_for(attachment), target: :_blank, class: "text-indigo-500 underline" %>
+      <%= link_to attachment.filename, main_app.url_for(attachment), target: :_blank, class: "text-blue-500 underline" %>
     <% end %>
   <% end %>
 <% end %>

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

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

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

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

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

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

data/app/views/madmin/fields/nested_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), class: "text-indigo-500 underline" %>
+    <%= link_to Madmin.resource_for(object).display_name(object), Madmin.resource_for(object).show_path(object), class: "text-blue-500 underline" %>
   </div>
 <% 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), class: "text-indigo-500 underline" %>
+  <%= link_to Madmin.resource_for(object).display_name(object), Madmin.resource_for(object).show_path(object), class: "text-blue-500 underline" %>
 <% end %>

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

@@ -2,7 +2,7 @@ require "madmin/generator_helpers"
 
 module Madmin
   module Generators
-    class InstallGenerator < Rails::Generators::Base
+    class InstallGenerator < ::Rails::Generators::Base
       include Madmin::GeneratorHelpers
 
       source_root File.expand_path("../templates", __FILE__)
@@ -43,12 +43,12 @@ module Madmin
       # Skip Abstract classes, ActiveRecord::Base, and auto-generated HABTM models
       def generateable_models
         active_record_models.reject do |model|
-          model.abstract_class? || model == ActiveRecord::Base || model.name.start_with?("HABTM_")
+          model.abstract_class? || model == ::ActiveRecord::Base || model.name.start_with?("HABTM_")
         end
       end
 
       def active_record_models
-        ObjectSpace.each_object(ActiveRecord::Base.singleton_class)
+        ObjectSpace.each_object(::ActiveRecord::Base.singleton_class)
       end
     end
   end

data/lib/madmin/fields/has_many.rb

@@ -12,7 +12,7 @@ module Madmin
       end
 
       def to_param
-        {"#{attribute_name.to_s.singularize}_ids".to_sym => []}
+        {"#{attribute_name.to_s.singularize}_ids": []}
       end
 
       def index_path

data/lib/madmin/resource.rb

@@ -1,3 +1,5 @@
+require "ostruct"
+
 module Madmin
   class Resource
     class_attribute :attributes, default: ActiveSupport::OrderedHash.new
@@ -114,8 +116,6 @@ module Madmin
         member_actions << block
       end
 
-      private
-
       def field_for_type(type)
         {
           binary: Fields::String,
@@ -184,7 +184,7 @@ module Madmin
 
         if model.attribute_types.include?(name_string)
           column_type = model.attribute_types[name_string]
-          if column_type.is_a? ActiveRecord::Enum::EnumType
+          if column_type.is_a? ::ActiveRecord::Enum::EnumType
             :enum
           else
             column_type.type || :string
@@ -226,7 +226,6 @@ module Madmin
 
       def model_store_accessors
         store_accessors = model.stored_attributes.values
-
         store_accessors.flatten
       end
     end

data/lib/madmin/search.rb

@@ -50,11 +50,11 @@ module Madmin
     end
 
     def query_table_name(attr)
-      ActiveRecord::Base.connection.quote_column_name(@scoped_resource.table_name)
+      ::ActiveRecord::Base.connection.quote_column_name(@scoped_resource.table_name)
     end
 
     def column_to_query(attr)
-      ActiveRecord::Base.connection.quote_column_name(attr)
+      ::ActiveRecord::Base.connection.quote_column_name(attr)
     end
   end
 end

data/lib/madmin/version.rb

@@ -1,3 +1,3 @@
 module Madmin
-  VERSION = "1.2.8"
+  VERSION = "1.2.10"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: madmin
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.10
 platform: ruby
 authors:
 - Chris Oliver
 - Andrea Fomera
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-10 00:00:00.000000000 Z
+date: 2024-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -63,6 +63,7 @@ files:
 - app/views/layouts/madmin/application.html.erb
 - app/views/madmin/application/_form.html.erb
 - app/views/madmin/application/_javascript.html.erb
+- app/views/madmin/application/_menu_resources.html.erb
 - app/views/madmin/application/_navigation.html.erb
 - app/views/madmin/application/edit.html.erb
 - app/views/madmin/application/index.html.erb
@@ -133,7 +134,6 @@ files:
 - app/views/madmin/fields/time/_form.html.erb
 - app/views/madmin/fields/time/_index.html.erb
 - app/views/madmin/fields/time/_show.html.erb
-- app/views/madmin/pagy/_nav.html.erb
 - app/views/madmin/shared/_label.html.erb
 - lib/generators/madmin/field/field_generator.rb
 - lib/generators/madmin/field/templates/_form.html.erb
@@ -191,7 +191,7 @@ homepage: https://github.com/excid3/madmin
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -206,8 +206,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
-signing_key:
+rubygems_version: 3.5.9
+signing_key: 
 specification_version: 4
 summary: A modern admin for Ruby on Rails apps
 test_files: []

data/app/views/madmin/pagy/_nav.html.erb

@@ -1,20 +0,0 @@
-<%#
-  This template is i18n-ready: if you don't use i18n, then you can replace the pagy_t
-  calls with the actual strings ("&lsaquo; Prev", "Next &rsaquo;", "&hellip;").
-  The link variable is set to a proc that returns the link tag.
-  Usage: link.call( page_number [, text [, extra_attributes_string ]])
--%>
-<% link = pagy_link_proc(pagy) -%>
-<%#                            -%><nav aria-label="pager" class="space-x-1 px-2 py-1" role="navigation">
-<% if pagy.prev                -%>  <span><%== link.call(pagy.prev, pagy_t('pagy.nav.prev'), 'aria-label="previous" class="text-white bg-indigo-500 rounded-2xl px-3 py-1.5"') %></span>
-<% else                        -%>  <span class="text-gray-400 bg-gray-100 rounded-2xl px-3 py-1.5 cursor-not-allowed"><%== pagy_t('pagy.nav.prev') %></span>
-<% end                         -%>
-<% pagy.series.each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36] -%>
-<%   if    item.is_a?(Integer) -%>  <span><%== link.call(item, item, 'class="text-gray-400 rounded-full px-2.5 py-1.5 hover:bg-indigo-200 hover:text-indigo-500"') %></span>
-<%   elsif item.is_a?(String)  -%>  <span class="text-indigo-500 font-semibold px-2.5 py-1.5"><%= item %></span>
-<%   elsif item == :gap        -%>  <span class="text-gray-400 text-xl px-1.5 py-1.5"><%== pagy_t('pagy.nav.gap') %></span>
-<%   end                       -%>
-<% end                         -%>
-<% if pagy.next                -%>  <span><%== link.call(pagy.next, pagy_t('pagy.nav.next'), 'aria-label="next" class="text-white bg-indigo-500 rounded-2xl px-3 py-1.5"') %></span>
-<% else                        -%>  <span class="text-gray-400 bg-gray-100 rounded-2xl px-3 py-1.5 cursor-not-allowed"><%== pagy_t('pagy.nav.next') %></span>
-<% end                         -%>