headmin 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0d9ff0c21ed70d23b6f58a61c4853028cc2580cdd23e7df89cdfce51d6c547e
-  data.tar.gz: 2e0c0aeb8efc4294c2a01bd04c46949e97a9a9c7056e5d0caf99f75339ff02d7
+  metadata.gz: 4f0d94377c6d3cf0d97bdffa08c34d9c95ef9b72036c8e7b1d0d1b89996ed52d
+  data.tar.gz: 9b263a38b16dacace7769f9eb2cab3b90dc478cc229fead7ae157c4fd48e7f65
 SHA512:
-  metadata.gz: f0712678aa575c3e982ec2359b9f1bb949b968ca8785ea482db63319b3fa843413a0e5744b31c8c7e917aafbd7db676fe2270d4e2e0b6ce419e90e2c82d06d5b
-  data.tar.gz: a6965e77198490afc58e7825da2db8711a540159e6a0366c660f9c15c2f303fa19cfbef006540677efa6f8eb8bf9aee61bfde0d5a04c774d1393c5ac5cfda859
+  metadata.gz: 3ee1ebb9dbc530154fd310c910dbab36e13272a0c3433b494588e6f552c5e8af6c6ee4f39b41f2737a7b2321805c02d9a5c22b7dfeea9c62455584ecc0cbc907
+  data.tar.gz: e88897ec516a9b4f83188f8eb12e1b49d46da547d03b459942da6f77266faee9031f0f3f06c5300529183e6f6cd9aa2112e92ce1b30ba7902edcd919b0f9ceaf

data/.gitignore

@@ -25,3 +25,9 @@
 # Ingore editors
 /.idea
 /headmin.iml
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+Gemfile.lock
+# .ruby-version
+# .ruby-gemset

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    headmin (0.5.9)
+    headmin (0.6.0)
       closure_tree (~> 7.4)
       inline_svg (~> 1.7)
       redcarpet (~> 3.5)
@@ -10,67 +10,67 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.4)
-      actionpack (= 7.0.4)
-      activesupport (= 7.0.4)
+    actioncable (7.0.4.1)
+      actionpack (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.4)
-      actionpack (= 7.0.4)
-      activejob (= 7.0.4)
-      activerecord (= 7.0.4)
-      activestorage (= 7.0.4)
-      activesupport (= 7.0.4)
+    actionmailbox (7.0.4.1)
+      actionpack (= 7.0.4.1)
+      activejob (= 7.0.4.1)
+      activerecord (= 7.0.4.1)
+      activestorage (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.4)
-      actionpack (= 7.0.4)
-      actionview (= 7.0.4)
-      activejob (= 7.0.4)
-      activesupport (= 7.0.4)
+    actionmailer (7.0.4.1)
+      actionpack (= 7.0.4.1)
+      actionview (= 7.0.4.1)
+      activejob (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.4)
-      actionview (= 7.0.4)
-      activesupport (= 7.0.4)
+    actionpack (7.0.4.1)
+      actionview (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.4)
-      actionpack (= 7.0.4)
-      activerecord (= 7.0.4)
-      activestorage (= 7.0.4)
-      activesupport (= 7.0.4)
+    actiontext (7.0.4.1)
+      actionpack (= 7.0.4.1)
+      activerecord (= 7.0.4.1)
+      activestorage (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.4)
-      activesupport (= 7.0.4)
+    actionview (7.0.4.1)
+      activesupport (= 7.0.4.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.4)
-      activesupport (= 7.0.4)
+    activejob (7.0.4.1)
+      activesupport (= 7.0.4.1)
       globalid (>= 0.3.6)
-    activemodel (7.0.4)
-      activesupport (= 7.0.4)
-    activerecord (7.0.4)
-      activemodel (= 7.0.4)
-      activesupport (= 7.0.4)
-    activestorage (7.0.4)
-      actionpack (= 7.0.4)
-      activejob (= 7.0.4)
-      activerecord (= 7.0.4)
-      activesupport (= 7.0.4)
+    activemodel (7.0.4.1)
+      activesupport (= 7.0.4.1)
+    activerecord (7.0.4.1)
+      activemodel (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
+    activestorage (7.0.4.1)
+      actionpack (= 7.0.4.1)
+      activejob (= 7.0.4.1)
+      activerecord (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.4)
+    activesupport (7.0.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -96,9 +96,10 @@ GEM
     closure_tree (7.4.0)
       activerecord (>= 4.2.10)
       with_advisory_lock (>= 4.0.0)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.0)
     crass (1.0.6)
-    debug (1.7.0)
+    date (3.3.3)
+    debug (1.7.1)
       irb (>= 1.5.0)
       reline (>= 0.3.1)
     devise (4.8.1)
@@ -109,9 +110,9 @@ GEM
       warden (~> 1.2.3)
     enumerize (2.5.0)
       activesupport (>= 3.2)
-    erubi (1.11.0)
+    erubi (1.12.0)
     ffi (1.15.5)
-    globalid (1.0.0)
+    globalid (1.0.1)
       activesupport (>= 5.0)
     hotwire-rails (0.1.3)
       rails (>= 6.0.0)
@@ -128,8 +129,8 @@ GEM
     inline_svg (1.8.0)
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
-    io-console (0.5.11)
-    irb (1.5.1)
+    io-console (0.6.0)
+    irb (1.6.2)
       reline (>= 0.3.0)
     json (2.6.3)
     kaminari (1.2.2)
@@ -145,10 +146,10 @@ GEM
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
     language_server-protocol (3.17.0.2)
-    loofah (2.19.0)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.8.0)
+    mail (2.8.0.1)
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
@@ -156,60 +157,61 @@ GEM
     marcel (1.0.2)
     matrix (0.4.2)
     method_source (1.0.0)
-    mini_magick (4.11.0)
+    mini_magick (4.12.0)
     mini_mime (1.1.2)
-    minitest (5.16.3)
+    minitest (5.17.0)
     minitest-spec-rails (6.2.0)
       minitest (>= 5.0)
       railties (>= 4.1)
-    net-imap (0.3.1)
+    net-imap (0.3.4)
+      date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.0)
+    net-protocol (0.2.1)
       timeout
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.8)
-    nokogiri (1.13.9-arm64-darwin)
+    nokogiri (1.14.0-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.9-x86_64-darwin)
+    nokogiri (1.14.0-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.9-x86_64-linux)
+    nokogiri (1.14.0-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     parallel (1.22.1)
-    parser (3.1.3.0)
+    parser (3.2.0.0)
       ast (~> 2.4.1)
-    public_suffix (5.0.0)
+    public_suffix (5.0.1)
     puma (5.6.5)
       nio4r (~> 2.0)
-    racc (1.6.1)
-    rack (2.2.4)
+    racc (1.6.2)
+    rack (2.2.6.2)
     rack-test (2.0.2)
       rack (>= 1.3)
-    rails (7.0.4)
-      actioncable (= 7.0.4)
-      actionmailbox (= 7.0.4)
-      actionmailer (= 7.0.4)
-      actionpack (= 7.0.4)
-      actiontext (= 7.0.4)
-      actionview (= 7.0.4)
-      activejob (= 7.0.4)
-      activemodel (= 7.0.4)
-      activerecord (= 7.0.4)
-      activestorage (= 7.0.4)
-      activesupport (= 7.0.4)
+    rails (7.0.4.1)
+      actioncable (= 7.0.4.1)
+      actionmailbox (= 7.0.4.1)
+      actionmailer (= 7.0.4.1)
+      actionpack (= 7.0.4.1)
+      actiontext (= 7.0.4.1)
+      actionview (= 7.0.4.1)
+      activejob (= 7.0.4.1)
+      activemodel (= 7.0.4.1)
+      activerecord (= 7.0.4.1)
+      activestorage (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       bundler (>= 1.15.0)
-      railties (= 7.0.4)
+      railties (= 7.0.4.1)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
-    railties (7.0.4)
-      actionpack (= 7.0.4)
-      activesupport (= 7.0.4)
+    rails-html-sanitizer (1.5.0)
+      loofah (~> 2.19, >= 2.19.1)
+    railties (7.0.4.1)
+      actionpack (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -217,8 +219,8 @@ GEM
     rainbow (3.1.1)
     rake (13.0.6)
     redcarpet (3.5.1)
-    regexp_parser (2.6.1)
-    reline (0.3.1)
+    regexp_parser (2.6.2)
+    reline (0.3.2)
       io-console (~> 0.5)
     responders (3.0.1)
       actionpack (>= 5.0)
@@ -229,19 +231,19 @@ GEM
       actionpack (>= 5.2, < 7.1)
       activesupport (>= 5.2, < 7.1)
       addressable (~> 2.7)
-    rubocop (1.39.0)
+    rubocop (1.42.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.23.0, < 2.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.24.0)
+    rubocop-ast (1.24.1)
       parser (>= 3.1.1.0)
-    rubocop-performance (1.15.1)
+    rubocop-performance (1.15.2)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
@@ -255,20 +257,20 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    sprockets (4.1.1)
+    sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
+      rack (>= 2.2.4, < 4)
     sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.5.4-arm64-darwin)
-    sqlite3 (1.5.4-x86_64-darwin)
-    sqlite3 (1.5.4-x86_64-linux)
-    standard (1.19.1)
+    sqlite3 (1.6.0-arm64-darwin)
+    sqlite3 (1.6.0-x86_64-darwin)
+    sqlite3 (1.6.0-x86_64-linux)
+    standard (1.22.1)
       language_server-protocol (~> 3.17.0.2)
-      rubocop (= 1.39.0)
-      rubocop-performance (= 1.15.1)
+      rubocop (= 1.42.0)
+      rubocop-performance (= 1.15.2)
     stimulus-rails (1.2.1)
       railties (>= 6.0.0)
     thor (1.2.1)
@@ -280,7 +282,7 @@ GEM
       railties (>= 6.0.0)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.4.2)
     warden (1.2.9)
       rack (>= 2.0.9)
     websocket-driver (0.7.5)

data/README.md

@@ -128,8 +128,8 @@ $ bundle
 # Update the version number, push commits and tag the release
 $ gem bump -v {patch,minor,major,...} --push --tag
 
-# Release to Rubygems
-$ gem release
+# Release to Rubygems and create a Github release tag
+$ gem release --github
 ```
 
 Update the node package

data/app/models/concerns/headmin/attachment.rb

@@ -0,0 +1,34 @@
+module Headmin
+  module Attachment
+    extend ActiveSupport::Concern
+    included do
+      scope :not_a_variant, -> { where.not(record_type: "ActiveStorage::VariantRecord") }
+
+      def record_hierarchy
+        hierarchy = []
+
+        current = record
+
+        current, partial_hierarchy = process_fieldable(current)
+        hierarchy << partial_hierarchy if partial_hierarchy.present?
+
+        current, partial_hierarchy = process_blockable(current)
+        hierarchy << partial_hierarchy if partial_hierarchy.present?
+
+        hierarchy << current if current.present?
+
+        hierarchy.flatten
+      end
+
+      private
+
+      def process_blockable(field)
+        field.respond_to?(:blockable) ? [field.blockable, field] : [field, nil]
+      end
+
+      def process_fieldable(field)
+        field.respond_to?(:fieldable) ? [field.root.fieldable, field.self_and_ancestors] : [field, nil]
+      end
+    end
+  end
+end

data/app/models/headmin/form/media_view.rb

@@ -66,7 +66,9 @@ module Headmin
       def association_object
         if attached.is_a?(ActiveStorage::Attached::Many)
           result = form.object.send(nested_attribute)
-          result = result.order(position: :asc) if sort
+
+          # We sort the collection with ruby to prevent a new query to be made that would dispose of the objects in memory
+          result = result.sort_by { |item| item.position } if sort
           result
         else
           form.object.send(nested_attribute)
@@ -76,7 +78,9 @@ module Headmin
       def attachments
         if attached.is_a?(ActiveStorage::Attached::Many)
           result = form.object.send(nested_attribute)
-          result = result.order(position: :asc) if sort
+
+          # We sort the collection with ruby to prevent a new query to be made that would dispose of the objects in memory
+          result = result.sort_by { |item| item.position } if sort
           result.to_a.compact
         else
           [form.object.send(nested_attribute)].compact

data/app/views/headmin/_filters.html.erb

@@ -14,15 +14,10 @@
   #   <%= render "headmin/filters", url: admin_polls_path %#>
 
   action = local_assigns.has_key?(:url) ? url : request.path
-
-  begin
-    model = controller_name.classify.constantize
-  rescue
-    raise "Cannot find class!"
-  end
+  model = controller_name.classify.constantize rescue nil
 %>
 
-<%= form_with model: model.new, url: action, method: :get, data: {controller: "filters", filters_target: "form"} do |form| %>
+<%= form_with model: model&.new, url: action, method: :get, data: {controller: "filters", filters_target: "form"} do |form| %>
   <%# Perform yield in order to capture content blocks, pass form so we can use headmin form inputs %>
   <%= yield(form) %>
 

data/app/views/headmin/_form.html.erb

@@ -58,7 +58,7 @@
   }
 %>
 
-<div class="container">
+<div class="container py-4">
   <%= form_with model: model, scope: scope, url: url, format: format, **options do |form| %>
     <%= yield(form) %>
   <% end %>

data/app/views/headmin/_index.html.erb

@@ -8,6 +8,6 @@
   #   <% end %#>
 %>
 
-<div class="container-fluid">
+<div class="container-fluid py-4">
   <%= yield %>
 </div>

data/app/views/headmin/forms/fields/_base.html.erb

@@ -11,7 +11,6 @@
   #   <%= render "headmin/forms/fields/base", form: form, field_type: :text, name: name do |field, label| %#>
   #     <%= render "headmin/forms/text", form: field, attribute: :value, label: label %#>
   #   <% end %#>
-
   field = form.object.fields.detect { |field| field.name.to_s == name.to_s }
   field = field ? field : form.object.fields.new(field_type: field_type, name: name)
   label = t("attributes.#{name.to_s.parameterize}", default: field.name.to_s)
@@ -21,5 +20,6 @@
   <%= ff.hidden_field :id %>
   <%= ff.hidden_field :name %>
   <%= ff.hidden_field :field_type %>
+
   <%= yield ff, label %>
 <% end %>

data/app/views/headmin/layout/_content.html.erb

@@ -4,6 +4,6 @@
     parameters: none
 %>
 
-<div class="content py-4">
+<div class="content">
   <%= yield %>
 </div>

data/app/views/headmin/media/_media_item_modal.html.erb

@@ -42,6 +42,32 @@
           <%= render "headmin/forms/text", form: form, attribute: :filename, append: "." + form.object.filename.to_s.rpartition(".").last, value: form.object.filename.to_s.rpartition(".").first %>
         </div>
       </div>
+      <% attachments = @blob.attachments.not_a_variant.all %>
+      <% if attachments.any? %>
+        <hr>
+        <h6><%= t(".attachment_used_by") %>:</h6>
+        <table class="table table-sm">
+          <tbody>
+          <% attachments.each do |attachment| %>
+            <% context_resource = attachment.record_hierarchy.last %>
+            <% context_resource_path = polymorphic_path([:admin, context_resource]) rescue nil %>
+            <tr>
+              <td width="40%">
+                <% if context_resource_path.present? %>
+                  <%= link_to truncate(context_resource.to_s), context_resource_path, title: context_resource %>
+                <% else %>
+                  <%= context_resource %>
+                <% end %>
+              </td>
+              <td width="25%"><%= "#{context_resource.model_name.human(count: 1)} (#{attachment.class.human_attribute_name(attachment.name.to_sym)})" %></td>
+              <td width="35%">
+                <small class="text-secondary"><%= l(attachment.created_at, format: :long) %></small>
+              </td>
+            </tr>
+          <% end %>
+          </tbody>
+        </table>
+      <% end %>
     </div>
     <div class="modal-footer">
       <button type="button" class="btn btn-secondary" data-bs-dismiss="modal"><%= t(".close") %></button>

data/app/views/headmin/nav/_item.html.erb

@@ -5,6 +5,7 @@
   # * +name</tt> - Name of the nav item
   # * +url</tt> - URL for this nav item
   # * +icon</tt> - Optional Bootstrap icon name
+  # * +locked</tt> - Item becomes unclickable and a lock icon appears at the end of the item
   # * +active</tt> - Set to true if this nav item needs to be highlighted
   #
   # ==== Examples
@@ -17,14 +18,18 @@
   name = local_assigns.has_key?(:name) ? name : ""
   icon = local_assigns.has_key?(:icon) ? icon : nil
   url = local_assigns.has_key?(:url) ? url : request.url
+  locked = local_assigns.has_key?(:locked) ? locked : false
   active = local_assigns.has_key?(:active) ? active : current_url?(url)
 %>
 
 <li class="nav-item">
-  <a class="nav-link d-flex align-items-center <%= "active" if active %>" aria-current="page" href="<%= url %>">
+  <a class="nav-link d-flex align-items-center <%= "active" if active %> <%= "disabled" if locked %>" aria-current="page" href="<%= url %>">
     <%= bootstrap_icon(icon, class: "me-2") if icon %>
     <span class="d-block d-md-none d-lg-block">
       <%= name %>
     </span>
+    <% if locked %>
+      <%= bootstrap_icon("lock", class: "fs-6 ms-2") %>
+    <% end %>
   </a>
 </li>

data/config/initializers/extend_active_storage_attachment.rb

@@ -0,0 +1,3 @@
+Rails.configuration.to_prepare do
+  ActiveStorage::Attachment.include Headmin::Attachment
+end

data/config/locales/headmin/media/en.yml

@@ -13,6 +13,7 @@ en:
         unlimited: unlimited
         upload: Upload new files
       media_item_modal:
+        attachment_used_by: Used by
         close: Close
         dimensions: Dimensions
         edit: Edit Media item

data/config/locales/headmin/media/nl.yml

@@ -13,6 +13,7 @@ nl:
         unlimited: onbeperkt
         upload: Nieuwe bestanden uploaden
       media_item_modal:
+        attachment_used_by: Gebruikt door
         close: Sluiten
         dimensions: Afmetingen
         edit: Media item wijzigen

data/lib/headmin/version.rb

@@ -1,3 +1,3 @@
 module Headmin
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "headmin",
-  "version": "0.5.9",
+  "version": "0.6.0",
   "description": "Admin component library",
   "module": "app/assets/javascripts/headmin.js",
   "main": "app/assets/javascripts/headmin.js",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: headmin
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Jef Vlamings
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-09 00:00:00.000000000 Z
+date: 2023-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: closure_tree
@@ -244,6 +244,7 @@ files:
 - app/helpers/headmin/form_helper.rb
 - app/helpers/headmin/notification_helper.rb
 - app/helpers/headmin/request_helper.rb
+- app/models/concerns/headmin/attachment.rb
 - app/models/concerns/headmin/blob.rb
 - app/models/concerns/headmin/block.rb
 - app/models/concerns/headmin/blockable.rb
@@ -468,6 +469,7 @@ files:
 - bin/setup
 - config/importmap.rb
 - config/initializers/customize_input_error.rb
+- config/initializers/extend_active_storage_attachment.rb
 - config/initializers/extend_active_storage_blob.rb
 - config/locales/activerecord/en.yml
 - config/locales/activerecord/nl.yml