Merge branch 'develop' into feature/decouple-references

app/controllers/admin/assets_controller.rb

@@ -144,7 +144,7 @@ def set_asset
 
     # Only allow a list of trusted parameters through.
     def asset_params
-      params.require(:asset).permit(:parent_id)
+      params.require(:asset).permit(:parent_id, :thumbnail)
     end
 
     # Checks if a value can be converted to a date.

app/controllers/admin/document_assets_controller.rb

@@ -163,7 +163,7 @@ def set_document_asset
     #
     # Returns a list of permitted parameters for document asset update.
     def document_asset_params
-      params.require(:asset).permit(:title, :label, :dct_references_uri_key)
+      params.require(:asset).permit(:title, :label, :dct_references_uri_key, :thumbnail)
     end
   end
 end

app/helpers/geoblacklight_admin_helper.rb

@@ -205,4 +205,34 @@ def link_to_gbl_import(label, import, state = false)
   def assets_dct_references_options
     escape_javascript(options_for_select(I18n.t("activemodel.enum_values.document/reference.category").invert.sort.insert(0, ["Choose Reference Type", nil]))).to_s
   end
+
+  # Determines if a document's thumbnail should be rendered.
+  #
+  # @param document [Object] the document object
+  # @return [Boolean] true if the thumbnail should be rendered, false otherwise
+  def thumb_to_render?(document)
+    if document&.thumbnail&.file_url&.present? && document&.thumbnail&.file_derivatives&.present?
+      true
+    elsif document&.document_assets&.any?
+      document.document_assets.any? do |asset|
+        asset.file_derivatives&.key?(:thumb_standard_2X)
+      end
+    else
+      false
+    end
+  end
+
+  # Returns the URL of the thumbnail to render for a document.
+  #
+  # @param document [Object] the document object
+  # @return [String] the URL of the thumbnail to render
+  def thumbnail_to_render(document)
+    if document&.thumbnail&.file_url&.present? && document&.thumbnail&.file_derivatives&.present?
+      document.thumbnail.file_url(:thumb_standard_2X)
+    elsif document&.document_assets&.any?
+      document.document_assets.find do |asset|
+        asset.file_derivatives&.key?(:thumb_standard_2X)
+      end&.file_url(:thumb_standard_2X)
+    end
+  end
 end

app/javascript/controllers/results_controller.js

@@ -12,6 +12,7 @@ import { Controller } from "stimulus"
 export default class extends Controller {
 
   connect() {
+    console.log("GBL Admin - ResultsController connected");
   }
 
   checkedState(checked, selector='input[type=checkbox]') {

app/javascript/index.js

@@ -1,8 +1,11 @@
 console.log('Vite ⚡️ Rails - GBL Admin')
 
-// Stimulus
+// Import Stimulus and controllers
 import { Application } from '@hotwired/stimulus'
 import ResultsController from "./controllers/results_controller"
 
+// Initialize Stimulus
 window.Stimulus = Application.start()
-Stimulus.register("results", ResultsController)
+
+// Register controllers
+Stimulus.register("results", ResultsController)

app/models/document.rb

@@ -42,9 +42,7 @@ def item_viewer
   # @TODO: Redundant? Kithe also includes a members association
   def document_assets
     scope = Kithe::Asset
-    scope = scope.where(parent_id: id)
-
-    # scope = scope.page(params[:page]).per(20).order(created_at: :desc)
+    scope = scope.where(parent_id: id).order(position: :asc)
     scope.includes(:parent)
   end
 

app/views/admin/bulk_actions/show.html.erb

@@ -43,7 +43,7 @@
           <% if @bulk_action.state_machine.current_state == 'created' %>
             <%= form_tag run_admin_bulk_action_path(@bulk_action), method: :patch do -%>
               <%= hidden_field_tag :run, true -%>
-              <%= submit_tag 'Run Bulk Action' -%>
+              <%= submit_tag '+ Run Bulk Action', class: 'btn btn-primary btn-block' -%>
             <%- end -%>
           <% else %>
             <%= @bulk_action.state_machine.current_state %>

app/views/admin/documents/_document.html.erb

@@ -8,9 +8,7 @@
         <% @document = Document.find_by(friendlier_id: document.friendlier_id) %>
         <% if thumb_to_render?(@document) %>
           <%= link_to edit_admin_document_path(document.friendlier_id) do %>
-            <% if @document.thumbnail.file_derivatives[:thumb_standard_2X].exists? %>
-              <%= image_tag(@document.thumbnail.file_url(:thumb_standard_2X), class: "thumbnail") %>
-            <% end %>
+            <%= image_tag(thumbnail_to_render(@document), class: "thumbnail") %>
           <% end %>
         <% end %>
       </div>

app/views/admin/documents/_form.html.erb

@@ -8,11 +8,9 @@
           <h1 class="h5">
             <% if @document.persisted? %>
               <div class="row">
-                <% if @document.thumbnail.present? %>
+                <% if thumb_to_render?(@document) %>
                   <div class="thumbnail col-2">
-                    <% unless @document&.thumbnail&.file_url(:thumb_mini).nil? %>
-                      <%= image_tag @document&.thumbnail&.file_url(:thumb_mini) %>
-                    <% end %>
+                    <%= image_tag thumbnail_to_render(@document), class: "thumbnail" %>
                   </div>
                 <% end %>
                 <div class="col">

docs/development.md

@@ -26,4 +26,12 @@ standardrb --fix
 ### Test App
 ```bash
 bundle exec rake ci
-```
+```
+
+### Build Node Module
+Bump the package version in `package.json` and run the following commands to build and publish the node module.
+
+```bash
+bundle exec vite build
+npm publish
+```

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@geoblacklight/admin",
   "type": "module",
-  "version": "0.4.5",
+  "version": "0.4.12",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public"

test/helpers/geoblacklight_admin_helper_test.rb

@@ -3,10 +3,31 @@
 require "test_helper"
 
 class GeoblacklightAdminHelperTest < ActionView::TestCase
+  include GeoblacklightAdminHelper
   attr_reader :current_user
 
   setup do
     @current_user = users(:user_001)
+
+    @document_with_thumbnail = OpenStruct.new(
+      thumbnail: OpenStruct.new(
+        file_url: "http://example.com/thumbnail.jpg",
+        file_derivatives: {thumb_standard_2X: "http://example.com/thumbnail_2x.jpg"}
+      ),
+      document_assets: []
+    )
+
+    @document_with_assets = OpenStruct.new(
+      thumbnail: nil,
+      document_assets: [
+        OpenStruct.new(file_derivatives: {thumb_standard_2X: "http://example.com/asset_thumbnail_2x.jpg"})
+      ]
+    )
+
+    @document_without_thumbnail = OpenStruct.new(
+      thumbnail: nil,
+      document_assets: []
+    )
   end
 
   test "diff_class" do
@@ -72,4 +93,20 @@ class GeoblacklightAdminHelperTest < ActionView::TestCase
   test "params_as_hidden_fields" do
     assert_equal "<input type=\"hidden\" name=\"q\" value=\"foo\" autocomplete=\"off\" />", params_as_hidden_fields({"q" => "foo"})
   end
+
+  test "thumb_to_render_with_thumbnail" do
+    assert thumb_to_render?(@document_with_thumbnail)
+  end
+
+  test "thumb_to_render_with_assets" do
+    assert thumb_to_render?(@document_with_assets)
+  end
+
+  test "thumb_to_render_without_thumbnail_or_assets" do
+    refute thumb_to_render?(@document_without_thumbnail)
+  end
+
+  test "thumbnail_to_render_without_thumbnail_or_assets" do
+    assert_nil thumbnail_to_render(@document_without_thumbnail)
+  end
 end