madmin 1.2.7 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cd4e0b3d14780dd13db0a21a57a63e750a750298ea78cc93ec5eb327b1714e7
-  data.tar.gz: 92f273ea140b603a887660b36802de9e6c0021a56cbeeb49cef5318696ae7bf6
+  metadata.gz: d4711c582952084164bfafbad483a4b5cb520ff505f96c0f9a87a7b61732068c
+  data.tar.gz: 3eed3f7cbd6969f14b499c3c51bc91cacf423b9554c590c612000d23ccafea8f
 SHA512:
-  metadata.gz: 677c4da0f37a96e2515584a02e6d0c941d59fae91b43a15e19386a723d1bdeb6a4e47db8bdc987c59e59c1b75ae2f507d055603a8a996dc5c45b3731d95aac13
-  data.tar.gz: b06f7fa04b747a761f956fccaa81e9f4535757db2276427e0cbda7a63d901295c9e275faf22a9753459290d530808f6b118806813e7858aeada501b3cb220cbf
+  metadata.gz: 3464c6efd9b1561a49c437b8f994616e212d88ba0ec37eebbdac78cccaa0f700ef28bb5c90c20133eea98dfbc71cd7f008b8db38e055602bacc7a7bddcafb0e8
+  data.tar.gz: dff80cd6e7c84008618f61381ec0551519305f6ab8434d0742a85f37e50202740a5d146beb27989308426f8bd7ffd218fb86bf0903074bb4d89ec2238b55dbf2

data/app/helpers/madmin/application_helper.rb

@@ -15,7 +15,7 @@ module Madmin
     end
 
     def clear_search_params
-      resource.index_path(params.permit(:sort, :direction))
+      resource.index_path(sort: params[:sort], direction: params[:direction])
     end
   end
 end

data/app/helpers/madmin/sort_helper.rb

@@ -2,13 +2,13 @@ module Madmin
   module SortHelper
     def sortable(column, title, options = {})
       matching_column = (column.to_s == sort_column)
-      direction = sort_direction == "asc" ? "desc" : "asc"
+      direction = (sort_direction == "asc") ? "desc" : "asc"
 
       link_to resource.index_path(sort: column, direction: direction), options do
         concat title
         if matching_column
           concat " "
-          concat tag.i(sort_direction == "asc" ? "▲" : "▼")
+          concat tag.i((sort_direction == "asc") ? "▲" : "▼")
         end
       end
     end

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

@@ -13,7 +13,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/show.html.erb

@@ -5,10 +5,11 @@
     <%= link_to resource.display_name(@record), resource.show_path(@record), class: "text-indigo-500 font-bold" %>
   </h1>
 
-  <div class="flex items-center px-4">
-    <div class="mr-2">
-      <%= 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" %>
-    </div>
+  <div class="flex gap-2 items-center px-4">
+    <% resource.member_actions.each do |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" %>
   </div>
 </div>

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,11 +1,15 @@
+require "ostruct"
+
 module Madmin
   class Resource
     class_attribute :attributes, default: ActiveSupport::OrderedHash.new
+    class_attribute :member_actions, default: []
     class_attribute :scopes, default: []
 
     class << self
       def inherited(base)
         base.attributes = attributes.dup
+        base.member_actions = scopes.dup
         base.scopes = scopes.dup
         super
       end
@@ -108,7 +112,9 @@ module Madmin
         attributes.values.select { |a| a.field.searchable? }
       end
 
-      private
+      def member_action(&block)
+        member_actions << block
+      end
 
       def field_for_type(type)
         {
@@ -178,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
@@ -220,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.7"
+  VERSION = "1.2.9"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: madmin
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.9
 platform: ruby
 authors:
 - Chris Oliver
 - Andrea Fomera
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-30 00:00:00.000000000 Z
+date: 2024-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -32,9 +32,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,9 +39,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
 description: It's an admin, obviously.
 email:
 - excid3@gmail.com
@@ -69,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
@@ -197,7 +192,7 @@ homepage: https://github.com/excid3/madmin
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -212,8 +207,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.5.9
+signing_key: 
 specification_version: 4
 summary: A modern admin for Ruby on Rails apps
 test_files: []