madmin 1.2.5 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea857d0e707bca79172d1bcbecb72cfb939724279ab3f2c08546ff279fd38d03
-  data.tar.gz: c886c8ad0c5d0a11c81f1aecf45463e29205e9bf29dfe00fae4fc94466988ee0
+  metadata.gz: 8cd4e0b3d14780dd13db0a21a57a63e750a750298ea78cc93ec5eb327b1714e7
+  data.tar.gz: 92f273ea140b603a887660b36802de9e6c0021a56cbeeb49cef5318696ae7bf6
 SHA512:
-  metadata.gz: 65e7522be423638030455299a70bfdd21cc706e75a5b6624f7a41f869250517474b00dd514551914e86bb3b7e7dac31aa812826461a634649caba8456b73f5c8
-  data.tar.gz: faea74829b0c7e307960dcbe006986f51c064e147c00b17f1234bfc6b72246511c1d206d4891fd773f3f97ea05b96a87dbcdd3e9b709aac1141407a580529b26
+  metadata.gz: 677c4da0f37a96e2515584a02e6d0c941d59fae91b43a15e19386a723d1bdeb6a4e47db8bdc987c59e59c1b75ae2f507d055603a8a996dc5c45b3731d95aac13
+  data.tar.gz: b06f7fa04b747a761f956fccaa81e9f4535757db2276427e0cbda7a63d901295c9e275faf22a9753459290d530808f6b118806813e7858aeada501b3cb220cbf

data/README.md

@@ -73,6 +73,23 @@ rails g madmin:views:index
  # -> app/views/madmin/application/index.html.erb
 ```
 
+You might want to make some of your model's attributes visible in some views but invisible in others.
+The `attribute` method in model_resource.rb gives you that flexibility.
+
+```bash
+ # -> app/madmin/resources/book_resource.rb
+```
+```ruby
+class UserResource < Madmin::Resource
+  attribute :id, form: false
+  attribute :tile
+  attribute :subtitle, index: false
+  attribute :author
+  attribute :genre
+  attribute :pages, show: false
+end
+```
+
 You can also scope the copied view(s) to a specific Resource/Model:
 ```bash
 rails generate madmin:views:index Book

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/layouts/madmin/application.html.erb

@@ -7,9 +7,7 @@
     <title>
       Madmin: <%= Rails.application.class %>
     </title>
-    <link href="https://unpkg.com/@tailwindcss/forms/dist/forms.min.css" rel="stylesheet" />
-    <link href="https://unpkg.com/tailwindcss@^2.0/dist/tailwind.min.css" rel="stylesheet" />
-    <link href="https://unpkg.com/@tailwindcss/typography/dist/typography.min.css" rel="stylesheet" />
+
     <%= csrf_meta_tags %>
 
     <%= render "javascript" %>

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

@@ -1,28 +1,44 @@
+<script src="https://cdn.tailwindcss.com?plugins=forms,typography,aspect-ratio,line-clamp"></script>
 <%= 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" %>
 
-<script type="module">
-  import { Application, Controller } from 'https://cdn.skypack.dev/@hotwired/stimulus'
-  const application = Application.start()
+<script type="importmap" data-turbo-track="reload">
+  {
+    "imports": {
+      "@hotwired/stimulus": "https://unpkg.com/@hotwired/stimulus/dist/stimulus.js",
+      "@hotwired/turbo": "https://unpkg.com/@hotwired/turbo",
+      "@hotwired/turbo-rails": "https://unpkg.com/@hotwired/turbo-rails",
+      "@rails/actiontext": "https://unpkg.com/@rails/actiontext@<%= npm_rails_version %>/app/assets/javascripts/actiontext.js",
+      "@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",
+      "tom-select": "https://unpkg.com/tom-select/dist/esm/tom-select.complete.js",
+      "trix": "https://unpkg.com/trix"
+    }
+  }
+</script>
+<script async src="https://unpkg.com/es-module-shims/dist/es-module-shims.js"></script>
 
-  import { Dropdown } from "https://cdn.skypack.dev/tailwindcss-stimulus-components"
-  application.register("dropdown", Dropdown)
+<script type="module">
+  import * as Turbo from "@hotwired/turbo-rails"
 
-  import stimulusFlatpickr from 'https://cdn.skypack.dev/stimulus-flatpickr'
-  application.register("flatpickr", stimulusFlatpickr)
+  import * as ActiveStorage from "@rails/activestorage"
+  ActiveStorage.start()
+  import "trix"
+  import "@rails/actiontext"
 
-  import TomSelect from 'https://cdn.skypack.dev/tom-select'
+  import { Application, Controller } from '@hotwired/stimulus'
+  const application = Application.start()
 
-  import Rails from 'https://cdn.skypack.dev/@rails/ujs@<%= npm_rails_version %>'
-  import * as ActiveStorage from 'https://cdn.skypack.dev/@rails/activestorage@<%= npm_rails_version %>'
-  import 'https://cdn.skypack.dev/trix'
-  import 'https://cdn.skypack.dev/@rails/actiontext@<%= npm_rails_version %>'
+  import { Dropdown } from "tailwindcss-stimulus-components"
+  application.register("dropdown", Dropdown)
 
-  if (!window._rails_loaded) { Rails.start() }
-  ActiveStorage.start()
+  import StimulusFlatpickr from "stimulus-flatpickr"
+  application.register("flatpickr", StimulusFlatpickr)
 
-  import * as Turbo from "https://cdn.skypack.dev/@hotwired/turbo"
+  import TomSelect from "tom-select"
 
   (() => {
     application.register('select', class extends Controller {
@@ -38,7 +54,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/application/index.html.erb

@@ -59,4 +59,4 @@
     </tbody>
   </table>
 </div>
-<%== pagy_nav(@pagy) if @pagy.pages > 1 %>
+<%== render(partial: 'madmin/pagy/nav', locals: { pagy: @pagy }) if @pagy.pages > 1 %>

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

@@ -9,7 +9,7 @@
     <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>
-    <%= button_to "Delete", resource.show_path(@record), method: :delete, data: { 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" %>
+    <%= 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/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/app/views/madmin/pagy/_nav.html.erb

@@ -0,0 +1,20 @@
+<%#
+  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                         -%>

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/fields/nested_has_many.rb

@@ -3,7 +3,7 @@ module Madmin
     class NestedHasMany < Field
       DEFAULT_ATTRIBUTES = %w[_destroy id].freeze
       def nested_attributes
-        resource.attributes.reject { |name, attribute| skipped_fields.include?(name) }
+        resource.attributes.except(*skipped_fields)
       end
 
       def resource

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)
@@ -129,6 +129,7 @@ module Madmin
           text: Fields::Text,
           time: Fields::Time,
           timestamp: Fields::Time,
+          timestamptz: Fields::Time,
           password: Fields::Password,
           file: Fields::File,
 

data/lib/madmin/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: madmin
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.7
 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: 2022-09-30 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
@@ -139,6 +139,7 @@ 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
@@ -211,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A modern admin for Ruby on Rails apps