geoblacklight_admin 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f4725f14826124fd7393a3b7cbb37baa28b606d15cc1381186a122ef2f0a199
-  data.tar.gz: e7ba31886ae77990e504f108c8e5f9004853ee2f86266b5203490ca022dfc7ca
+  metadata.gz: 3c69db073de82cb4873945d0ae70de901c08b517852e98f4ad5ee44812eb70b0
+  data.tar.gz: ae8eeeada318da7edac96eae733f67d5e93dccabc4dcc309cf4fb1b58f22f84d
 SHA512:
-  metadata.gz: ecc2b6ce1188088007009498183016919b3b99a471a7b2746d8ec1bac4a5c0cf0aa221c38da2997fd223be68fa5a1275b3470938376131f90e92953409e8a0c2
-  data.tar.gz: 4a56d0949e659f6faf0595a56bed8e057ee2e194b651d0eb3957d0cff37419b441a799e620fe64af25a41a193fc1cbe715c25766b829a4404856260bf35ee1a1
+  metadata.gz: 2c21ed4eec52af1dcee587aa7b0e6894e121ccbd8f728198b6dd445c59c259f33fe90ea826b58007395e4770f2a0890ca4001935030e5f147739f68f648e6c72
+  data.tar.gz: 463306e5810b82d77f6059205993ed233d803dc83892b66f0cd5bacb245bb6269ba6c5c621825b28c3698de713b2c170243026383d7d0967c5b804bce13dca34

data/README.md

@@ -8,9 +8,9 @@ GeoBlacklight Admin is a [GeoBlacklight](https://github.com/geoblacklight/geobla
 
 ## Requirements
 
-* Rails v7
+* Rails v7 (not v8)
 * Blacklight v7 (not v8)
-* GeoBlacklight v4.4+ (Vite.js)
+* GeoBlacklight v4 (not v5)
 * @geoblacklight/frontend v4 (NPM package)
 * Solr v8.4+
 * PostgreSQL (not MySQL-based DBs)
@@ -55,9 +55,13 @@ For Developer documentation see [doc/developer.md](./docs/development.md)
 ## License
 The gem is available as open source under the terms of the [Apache 2.0 License](https://opensource.org/license/apache-2-0).
 
-
-## TODOs
+## TODOs / Roadmap
 * ~~Send GBLADMIN JavaScript pack to NPM like Blacklight~~
-* DRY up Engine routing
-* Remove legacy GEOMG / B1G everywhere...
-* Likely some more polish to be uncovered...
+* ~~Improve test coverage~~
+* Fix CI test runner
+* Debug Rails 7.2 support
+* Separate dct_references_s support into a separate model
+* Import/Export dct_references_s outside of the main document model
+* Migrate our GBL api controllers to just RSolr-based models
+* DRY up Gem dependencies and Engine routing
+* Remove any remaining GEOMG references

data/app/controllers/admin/advanced_search_controller.rb

@@ -380,5 +380,11 @@ module Admin
         end
       end
     end
+
+    private
+
+    def advanced_search_params
+      params.permit(:advanced_search)
+    end
   end
 end

data/app/controllers/admin/assets_controller.rb

@@ -5,7 +5,7 @@ module Admin
   class AssetsController < Admin::AdminController
     before_action :set_asset, only: %i[show edit update destroy]
 
-    # GET /assets or /assets.json
+    # GET /admin/asset_files
     def index
       scope = Asset
       search_query = params[:q].strip if params[:q].present?
@@ -32,34 +32,14 @@ module Admin
     def show
     end
 
-    # GET /assets/new
-    def new
-      @asset = Asset.new
-    end
-
     # GET /assets/1/edit
     def edit
     end
 
-    # POST /assets or /assets.json
-    def create
-      @asset = Asset.new(asset_params)
-
-      respond_to do |format|
-        if @asset.save
-          format.html { redirect_to admin_asset_url(@asset), notice: "Asset was successfully created." }
-          format.json { render :show, status: :created, location: @asset }
-        else
-          format.html { render :new, status: :unprocessable_entity }
-          format.json { render json: @asset.errors, status: :unprocessable_entity }
-        end
-      end
-    end
-
     # PATCH/PUT /assets/1 or /assets/1.json
     def update
       respond_to do |format|
-        if @asset.update(asset_params)
+        if @asset.update(asset_params.merge!(parent_id: parent_id_via_friendly_id(asset_params[:parent_id])))
           format.html { redirect_to admin_asset_url(@asset.id), notice: "Asset was successfully updated." }
           format.json { render :show, status: :ok, location: @asset }
         else
@@ -116,13 +96,12 @@ module Admin
       redirect_to admin_assets_url, notice: "Files attached successfully."
     end
 
-    def sort
-      Asset.sort_assets(params[:id_list])
-      render body: nil
-    end
-
     private
 
+    def parent_id_via_friendly_id(friendlier_id)
+      Document.find_by_friendlier_id(friendlier_id)&.id
+    end
+
     # Use callbacks to share common setup or constraints between actions.
     def set_asset
       @asset = Asset.find(params[:id])
@@ -130,7 +109,7 @@ module Admin
 
     # Only allow a list of trusted parameters through.
     def asset_params
-      params.require(:asset)
+      params.require(:asset).permit(:parent_id)
     end
 
     def date_check?(val)

data/app/controllers/admin/bookmarks_controller.rb

@@ -25,10 +25,10 @@ module Admin
 
       respond_to do |format|
         if @bookmark.save
-          format.html { redirect_to @bookmark, notice: "Bookmark was successfully created." }
+          format.html { redirect_to admin_bookmarks_url, notice: "Bookmark was successfully created." }
           format.js
         else
-          format.html { render :new }
+          format.html { render :index, status: :unprocessable_entity }
           format.json { render json: @bookmark.errors, status: :unprocessable_entity }
         end
       end
@@ -40,7 +40,7 @@ module Admin
       Admin::Bookmark.destroy_by(user: current_user, document: @document)
 
       respond_to do |format|
-        format.html { redirect_to bookmarks_url, notice: "Bookmark was successfully destroyed." }
+        format.html { redirect_to admin_bookmarks_url, notice: "Bookmark was successfully destroyed." }
         format.js
       end
     end

data/app/controllers/admin/bulk_actions_controller.rb

@@ -93,7 +93,7 @@ module Admin
 
     # Only allow a list of trusted parameters through.
     def bulk_action_params
-      params.fetch(:bulk_action, {})
+      params.require(:bulk_action).permit(:name, :scope, :request, :field_name, :field_value)
     end
   end
 end

data/app/controllers/admin/document_assets_controller.rb

@@ -37,11 +37,11 @@ module Admin
     # PATCH/PUT /works/1
     # PATCH/PUT /works/1.json
     def update
-      @document_asset = DocumentAsset.find_by_friendlier_id!(params[:id])
+      @document_asset = Asset.find_by_friendlier_id!(params[:id])
 
       respond_to do |format|
         if @document_asset.update(document_asset_params)
-          format.html { redirect_to admin_document_document_assets_path(@document, @document_asset.parent), notice: "Asset was successfully updated." }
+          format.html { redirect_to admin_document_document_assets_path(@document_asset.parent), notice: "Asset was successfully updated." }
           format.json { render :show, status: :ok, location: @document_asset }
         else
           format.html { render :edit }
@@ -63,16 +63,6 @@ module Admin
       end
     end
 
-    def check_fixity
-      @asset = Asset.find_by_friendlier_id!(params[:asset_id])
-      SingleAssetCheckerJob.perform_later(@asset)
-      redirect_to admin_asset_url(@asset), notice: "This file will be checked shortly."
-    end
-
-    def fixity_report
-      @fixity_report = FixityReport.new
-    end
-
     def display_attach_form
       @document = Document.find_by_friendlier_id!(params[:document_id])
     end
@@ -114,75 +104,6 @@ module Admin
       redirect_to admin_document_document_assets_path(@parent.friendlier_id, anchor: "nav-members")
     end
 
-    def convert_to_child_work
-      @asset = Asset.find_by_friendlier_id!(params[:id])
-
-      parent = @asset.parent
-
-      new_child = Work.new(title: @asset.title)
-
-      # Asking for permission to create a new Work,
-      # which is arguably the main thing going on in this method.
-      # authorize! :create, Work as the first line of the method
-      # would be better, but we currently aren't allowed to do that
-      # see (https://github.com/chaps-io/access-granted/pull/56).
-      authorize! :create, new_child
-
-      new_child.parent = parent
-      # collections
-      new_child.contained_by = parent.contained_by
-      new_child.position = @asset.position
-      new_child.representative = @asset
-      # we can copy _all_ the non-title metadata like this...
-      new_child.json_attributes = parent.json_attributes
-
-      @asset.parent = new_child
-
-      Kithe::Model.transaction do
-        new_child.save!
-        @asset.save! # to get new parent
-
-        if parent.representative_id == @asset.id
-          parent.representative = new_child
-          parent.save!
-        end
-      end
-
-      redirect_to edit_admin_work_path(new_child), notice: "Asset promoted to child work #{new_child.title}"
-    end
-
-    # requires params[:active_encode_status_id]
-    def refresh_active_encode_status
-      status = ActiveEncodeStatus.find(params[:active_encode_status_id])
-
-      RefreshActiveEncodeStatusJob.perform_later(status)
-
-      redirect_to admin_asset_url(status.asset),
-        notice: "Started refresh for ActiveEncode job #{status.active_encode_id}"
-    end
-
-    def work_is_oral_history?
-      (@asset.parent.is_a? Work) && @asset.parent.genre && @asset.parent.genre.include?("Oral histories")
-    end
-    helper_method :work_is_oral_history?
-
-    def asset_is_collection_thumbnail?
-      @asset.parent.is_a? Collection
-    end
-    helper_method :asset_is_collection_thumbnail?
-
-    def edit_path(asset)
-      asset.parent.is_a? Collection ? edit_admin_collection_path(asset.parent) : edit_admin_asset_path(asset)
-    end
-    helper_method :edit_path
-
-    def parent_path(asset)
-      return nil if asset.parent.nil?
-
-      asset.parent.is_a? Collection ? collection_path(asset.parent) : admin_work_path(asset.parent)
-    end
-    helper_method :parent_path
-
     private
 
     def asset_params

data/app/controllers/admin/documents_controller.rb

@@ -152,7 +152,7 @@ module Admin
           format.html { redirect_to edit_admin_document_path(@document), notice: "Document was successfully created." }
           format.json { render :show, status: :created, location: @document }
         else
-          format.html { render :edit }
+          format.html { render :edit, status: :unprocessable_entity }
           format.json { render json: @document.errors, status: :unprocessable_entity }
         end
       end
@@ -166,7 +166,7 @@ module Admin
           format.html { redirect_to edit_admin_document_path(@document), notice: "Document was successfully updated." }
           format.json { render :show, status: :ok, location: @document }
         else
-          format.html { render :edit }
+          format.html { render :edit, status: :unprocessable_entity }
           format.json { render json: @document.errors, status: :unprocessable_entity }
         end
       end

data/app/controllers/admin/elements_controller.rb

@@ -71,6 +71,8 @@ module Admin
     # Use callbacks to share common setup or constraints between actions.
     def set_element
       @element = Element.find(params[:id])
+    rescue ActiveRecord::RecordNotFound
+      redirect_to admin_elements_url, alert: "Element not found."
     end
 
     # Only allow a list of trusted parameters through.

data/app/controllers/admin/form_elements_controller.rb

@@ -71,6 +71,8 @@ module Admin
     # Use callbacks to share common setup or constraints between actions.
     def set_form_element
       @form_element = FormElement.find(params[:id])
+    rescue ActiveRecord::RecordNotFound
+      redirect_to admin_form_elements_url, alert: "Form element not found."
     end
 
     # Only allow a list of trusted parameters through.

data/app/controllers/admin/ids_controller.rb

@@ -397,5 +397,11 @@ module Admin
         end
       end
     end
+
+    private
+
+    def ids_params
+      params.permit(:id)
+    end
   end
 end

data/app/controllers/admin/imports_controller.rb

@@ -40,7 +40,7 @@ module Admin
           end
           format.json { render :show, status: :created, location: @import }
         else
-          format.html { render :new }
+          format.html { render :new, status: :unprocessable_entity }
           format.json { render json: @import.errors, status: :unprocessable_entity }
         end
       end
@@ -54,7 +54,7 @@ module Admin
           format.html { redirect_to admin_import_path(@import), notice: "Import was successfully updated." }
           format.json { render :show, status: :ok, location: @import }
         else
-          format.html { render :edit }
+          format.html { render :edit, status: :unprocessable_entity }
           format.json { render json: @import.errors, status: :unprocessable_entity }
         end
       end

data/app/helpers/bulk_actions_helper.rb

@@ -3,7 +3,7 @@
 # BulkActionsHelper
 module BulkActionsHelper
   def bulk_actions_collection
-    attrs = Geomg.field_mappings.collect { |key, _value| key }
+    attrs = GeoblacklightAdmin::Schema.instance.importable_fields.collect { |key, _value| key }
     attrs.prepend("Publication State")
   end
 end

data/app/jobs/bulk_action_revert_document_job.rb

@@ -21,18 +21,14 @@ class BulkActionRevertDocumentJob < ApplicationJob
     logger.debug("Revert PubStatus - #{document.friendlier_id}")
 
     versions = document.versions
-    document = versions[doc.version].reify
+    document = versions[doc.current_version].reify
     document&.skip_callbacks = true
 
-    if document&.save
-      doc.state_machine.transition_to!(:success)
-    else
-      doc.state_machine.transition_to!(:failed)
-    end
+    document.save
   end
 
   def revert_delete(doc)
-    document = Document.new(id: doc.document_id)
+    document = Document.find_by!(friendlier_id: doc.friendlier_id)
 
     logger.debug("Revert Delete - #{document.id}")
 
@@ -40,10 +36,6 @@ class BulkActionRevertDocumentJob < ApplicationJob
     document = versions.last.reify
     document.skip_callbacks = true
 
-    if document.save
-      doc.state_machine.transition_to!(:success)
-    else
-      doc.state_machine.transition_to!(:failed)
-    end
+    document.save
   end
 end

data/app/jobs/bulk_action_run_document_job.rb

@@ -25,11 +25,7 @@ class BulkActionRunDocumentJob < ApplicationJob
 
     logger.debug("Update PubStatus - #{document.friendlier_id} => #{field_value}")
 
-    if document.update!(publication_state: field_value.to_sym)
-      doc.state_machine.transition_to!(:success)
-    else
-      doc.state_machine.transition_to!(:failed)
-    end
+    document.update!(publication_state: field_value.to_sym)
   end
 
   def update_delete(doc, field_value)
@@ -37,10 +33,6 @@ class BulkActionRunDocumentJob < ApplicationJob
 
     logger.debug("Update Delete - #{document.friendlier_id} => #{field_value}")
 
-    if document.destroy
-      doc.state_machine.transition_to!(:success)
-    else
-      doc.state_machine.transition_to!(:failed)
-    end
+    document.destroy
   end
 end

data/app/jobs/import_document_job.rb

@@ -5,10 +5,7 @@ class ImportDocumentJob < ApplicationJob
   queue_as :priority
 
   def perform(import_document)
-    # @TODO: Check for friendlier_id or raise error
-    document = Document.where(
-      friendlier_id: import_document.friendlier_id
-    ).first_or_create
+    document = Document.find_or_create_by(friendlier_id: import_document.friendlier_id)
 
     # Set the geom
     document.set_geometry

data/app/jobs/import_run_job.rb

@@ -5,7 +5,7 @@ class ImportRunJob < ApplicationJob
   queue_as :priority
 
   def perform(import)
-    data = CSV.parse(import.csv_file.download.force_encoding("UTF-8"), headers: true)
+    data = CSV.parse(import.csv_file.download, headers: true)
 
     data.each do |doc|
       extract_hash = doc.to_h

data/app/models/admin/bookmark.rb

@@ -8,7 +8,7 @@ module Admin
     validates :user_id, presence: true
 
     def document_id
-      document_id
+      document.id
     end
 
     def document_type

data/app/models/bulk_actions/change_publication_state.rb

@@ -3,29 +3,4 @@ module BulkActions
   class ChangePublicationState < BulkAction
     # Add specific methods and validations for ChangePublicationState here
   end
-
-  # Subclass for PublishDocument
-  class PublishDocument < BulkAction
-    # Add specific methods and validations for PublishDocument here
-  end
-
-  # Subclass for UnpublishDocument
-  class UnpublishDocument < BulkAction
-    # Add specific methods and validations for UnpublishDocument here
-  end
-
-  # Subclass for DraftDocument
-  class DraftDocument < BulkAction
-    # Add specific methods and validations for DraftDocument here
-  end
-
-  # Subclass for HarvestThumbnails
-  class HarvestThumbnails < BulkAction
-    # Add specific methods and validations for HarvestThumbnails here
-  end
-
-  # Subclass for DeleteThumbnails
-  class DeleteThumbnails < BulkAction
-    # Add specific methods and validations for DeleteThumbnails here
-  end
 end

data/app/models/bulk_actions/delete_thumbnails.rb

@@ -0,0 +1,6 @@
+module BulkActions
+  # Subclass for DeleteThumbnails
+  class DeleteThumbnails < BulkAction
+    # Add specific methods and validations for DeleteThumbnails here
+  end
+end

data/app/models/bulk_actions/draft_document.rb

@@ -0,0 +1,6 @@
+module BulkActions
+  # Subclass for DraftDocument
+  class DraftDocument < BulkAction
+    # Add specific methods and validations for DraftDocument here
+  end
+end

data/app/models/bulk_actions/harvest_thumbnails.rb

@@ -0,0 +1,6 @@
+module BulkActions
+  # Subclass for HarvestThumbnails
+  class HarvestThumbnails < BulkAction
+    # Add specific methods and validations for HarvestThumbnails here
+  end
+end

data/app/models/bulk_actions/publish_document.rb

@@ -0,0 +1,6 @@
+module BulkActions
+  # Subclass for PublishDocument
+  class PublishDocument < ChangePublicationState
+    # Add specific methods and validations for PublishDocument here
+  end
+end

data/app/models/bulk_actions/unpublish_document.rb

@@ -0,0 +1,6 @@
+module BulkActions
+  # Subclass for UnpublishDocument
+  class UnpublishDocument < BulkAction
+    # Add specific methods and validations for UnpublishDocument here
+  end
+end

data/app/models/document.rb

@@ -257,7 +257,7 @@ class Document < Kithe::Work
 
   def local?
     local = send(Settings.FIELDS.PROVIDER) || ""
-    local.casecmp(Settings.INSTITUTION_LOCAL_NAME)&.zero?
+    local.casecmp(Settings.INSTITUTION)&.zero?
   end
 
   def restricted?

data/app/models/import/csv_duplicates_validator.rb

@@ -32,6 +32,8 @@ class Import
       end
 
       duplicate_id
+    rescue ArgumentError, ActiveStorage::FileNotFoundError
+      false
     end
   end
 end

data/app/models/import/csv_header_validator.rb

@@ -8,7 +8,7 @@ class Import
   class CsvHeaderValidator < ActiveModel::Validator
     def validate(record)
       valid_csv_header = true
-      unless valid_csv_headers?(record.csv_file)
+      unless valid_csv_headers?(record&.csv_file)
         valid_csv_header = false
         record.errors.add(:csv_file,
           "Missing a required CSV header. Title, Resource Class, Access Rights, and ID are required.")
@@ -20,6 +20,8 @@ class Import
     def valid_csv_headers?(csv_file)
       headers = CSV.parse(csv_file.download)[0]
       (["Title", "Resource Class", "Access Rights", "ID"] - headers).empty?
+    rescue ArgumentError, ActiveStorage::FileNotFoundError
+      false
     end
   end
 end

data/app/models/import_btaa_aardvark.rb

@@ -5,7 +5,7 @@ class ImportBtaaAardvark < Import
   # validations, constants and methods
 
   def mapping_configuration
-    Geomg.field_mappings_btaa_aardvark
+    GeoblacklightAdmin::Schema.instance.importable_fields
   end
 
   def klass_delimiter
@@ -98,7 +98,7 @@ class ImportBtaaAardvark < Import
       json_data.each do |key, value|
         reference = {
           value: value,
-          category: Geomg.uri_2_category_references_mappings[key]
+          category: GeoblacklightAdmin::FieldMappingsBtaaAardvark.uri_2_category_references_mappings[key]
         }
         references << reference
       end

data/app/models/import_gblv1.rb

@@ -5,7 +5,7 @@ class ImportGblv1 < Import
   # validations, constants and methods
 
   def mapping_configuration
-    Geomg.field_mappings_gblv1
+    GeoblacklightAdmin::Schema.instance.importable_fields
   end
 
   def klass_delimiter
@@ -81,7 +81,7 @@ class ImportGblv1 < Import
       json_data.each do |key, value|
         reference = {
           value: value,
-          category: Geomg::FieldMappingsGblv1.uri_2_category_references_mappings[key]
+          category: GeoblacklightAdmin::FieldMappingsGblv1.uri_2_category_references_mappings[key]
         }
         references << reference
       end

data/app/services/geoblacklight_admin/image_service/iiif_manifest.rb

@@ -54,57 +54,53 @@ module GeoblacklightAdmin
       # @param [Integer] thumbnail size
       # @return [String] iiif thumbnail url
       def self.image_url(document, _size)
-        Rails.logger.debug("\n\nViewer Endpoint: #{document.viewer_endpoint}")
+        tempfile = Down.download(document.viewer_endpoint)
+        manifest_json = JSON.parse(tempfile.read)
 
-        begin
-          tempfile = Down.download(document.viewer_endpoint)
-          manifest_json = JSON.parse(tempfile.read)
-
-          # Sequences - Return the first image if it exists
-          # - best case option
-          if manifest_json.dig("sequences", 0, "canvases", 0, "images", 0, "resource", "@id")
-            Rails.logger.debug("\n Image: sequences \n")
-            if manifest_json.dig("sequences", 0, "canvases", 0, "images", 0, "resource", "@id").include?("osu")
-              Rails.logger.debug("\n Image: sequences - OSU variant \n")
-              manifest_json.dig("sequences", 0, "canvases", 0, "images", 0, "resource", "service", "@id") + "/full/1000,/0/default.jpg"
-            else
-              manifest_json.dig("sequences", 0, "canvases", 0, "images", 0, "resource", "@id")
-            end
-
-          # Items - Return the first item image if it exists
-          # - Northwestern
-          elsif manifest_json.dig("items", 0, "items", 0, "items", 0, "body", "id")
-            Rails.logger.debug("\n Image: items body id \n")
-            manifest_json.dig("items", 0, "items", 0, "items", 0, "body", "id")
+        # Sequences - Return the first image if it exists
+        # - best case option
+        if manifest_json.dig("sequences", 0, "canvases", 0, "images", 0, "resource", "@id")
+          Rails.logger.debug("\n Image: sequences \n")
+          if manifest_json.dig("sequences", 0, "canvases", 0, "images", 0, "resource", "@id").include?("osu")
+            Rails.logger.debug("\n Image: sequences - OSU variant \n")
+            manifest_json.dig("sequences", 0, "canvases", 0, "images", 0, "resource", "service", "@id") + "/full/1000,/0/default.jpg"
+          else
+            manifest_json.dig("sequences", 0, "canvases", 0, "images", 0, "resource", "@id")
+          end
 
-          # Items - Return the first item image if it exists
-          # - strange option
-          elsif manifest_json.dig("items", 0, "items", 0, "items", 0, "id")
-            Rails.logger.debug("\n Image: items id \n")
-            manifest_json.dig("items", 0, "items", 0, "items", 0, "id")
+        # Items - Return the first item image if it exists
+        # - Northwestern
+        elsif manifest_json.dig("items", 0, "items", 0, "items", 0, "body", "id")
+          Rails.logger.debug("\n Image: items body id \n")
+          manifest_json.dig("items", 0, "items", 0, "items", 0, "body", "id")
 
-          # Thumbnail - Return the "thumbnail" if it exists
-          # - varies in size depending on the provider
-          # - worst case option really
-          # - can be @id or id
-          elsif manifest_json["thumbnail"]
-            Rails.logger.debug("\n Image: thumbnail \n")
-            if manifest_json.dig("thumbnail", "@id")
-              manifest_json.dig("thumbnail", "@id")
-            else
-              manifest_json.dig("thumbnail", "id")
-              manifest_json.dig("thumbnail", "id")
-            end
+        # Items - Return the first item image if it exists
+        # - strange option
+        elsif manifest_json.dig("items", 0, "items", 0, "items", 0, "id")
+          Rails.logger.debug("\n Image: items id \n")
+          manifest_json.dig("items", 0, "items", 0, "items", 0, "id")
 
-          # Fail - Gonna fail
+        # Thumbnail - Return the "thumbnail" if it exists
+        # - varies in size depending on the provider
+        # - worst case option really
+        # - can be @id or id
+        elsif manifest_json["thumbnail"]
+          Rails.logger.debug("\n Image: thumbnail \n")
+          if manifest_json.dig("thumbnail", "@id")
+            manifest_json.dig("thumbnail", "@id")
           else
-            Rails.logger.debug("\n Image: failed \n")
-            document.viewer_endpoint
+            manifest_json.dig("thumbnail", "id")
+            manifest_json.dig("thumbnail", "id")
           end
-        rescue => e
-          Rails.logger.debug("\n Rescued: #{e.inspect} \n")
+
+        # Fail - Gonna fail
+        else
+          Rails.logger.debug("\n Image: failed \n")
           document.viewer_endpoint
         end
+      rescue => e
+        Rails.logger.debug("\n Rescued: #{e.inspect} \n")
+        document.viewer_endpoint
       end
     end
   end

data/app/services/geoblacklight_admin/image_service/tms.rb

@@ -14,16 +14,12 @@ module GeoblacklightAdmin
       # @param [Integer] thumbnail size
       # @return [String] tms thumbnail url
       def self.image_url(document, size)
-        puts "\nTMS IMAGE URL..."
-        puts "document.viewer_endpoint: #{document.viewer_endpoint.inspect}"
-
         # Begins with:
         # https://cugir.library.cornell.edu/geoserver/gwc/service/tms/1.0.0/cugir%3Acugir007957@EPSG%3A3857@png/{z}/{x}/{y}.png
 
         # Works with:
         # https://cugir.library.cornell.edu/geoserver/wms/reflect?&FORMAT=image%2Fpng&TRANSPARENT=TRUE&LAYERS=cugir007957&WIDTH=1500&HEIGHT=1500
 
-        puts "\nPARSE TMS URL..."
         # Parse the URL using Addressable::URI which handles more complex URIs
         parsed_url = Addressable::URI.parse(document.viewer_endpoint)
 

data/app/views/admin/bookmarks/index.html.erb

@@ -2,20 +2,25 @@
 
 <h1>Bookmarks (<%= current_user.bookmarks.where(document_type: 'Kithe::Model').size %>)</h1>
 
-<p>
-  <%= render "admin/documents/result_toggle" %>
-  <%= render "admin/documents/result_selected_options" %>
-  <span class='float-right'>
-    <%== pagy_bootstrap_nav(@pagy) %>
-  </span>
-</p>
+<%- if @pagy %>
 
-<hr/>
+  <p>
+    <%= render "admin/documents/result_toggle" %>
+    <%= render "admin/documents/result_selected_options" %>
+    <span class='float-right'>
+      <%== pagy_bootstrap_nav(@pagy) %>
+    </span>
+  </p>
 
-<%= render "admin/documents/result_selection_options" %>
+  <hr/>
 
-<ol id='results' class='list-unstyled' data-controller='results'>
-  <% @bookmarks.each_with_index do |bookmark, index| %>
-    <%= render 'admin/documents/document', document: Kithe::Model.find(bookmark.document_id), index: index %>
-  <% end %>
-</ol>
+  <%= render "admin/documents/result_selection_options" %>
+
+  <ol id='results' class='list-unstyled' data-controller='results'>
+    <% @bookmarks.each_with_index do |bookmark, index| %>
+      <%= render 'admin/documents/document', document: Kithe::Model.find(bookmark.document_id), index: index %>
+    <% end %>
+  </ol>
+<%- else %>
+  <p>No bookmarks found.</p>
+<%- end %>

data/app/views/admin/mappings/index.html.erb

@@ -4,7 +4,7 @@
   <tbody>
     <%- if @import.mappings.size > 1 %>
       <%- @import.mappings.each do |mapping| %>
-        <%= simple_form_for [@import, mapping], :url => import_mapping_path(@import, mapping) do |f| %>
+        <%= simple_form_for [@import, mapping], :url => admin_import_mapping_path(@import, mapping) do |f| %>
           <tr>
             <td><%= f.input :source_header, :input_html => {:readonly => true} %></td>
             <td><%= f.input :destination_field, collection: attribute_collection %></td>

data/app/views/admin/notifications/_notification.html.haml

@@ -1,31 +1,32 @@
 - # Split message "Download Type|Row Count|Button Label"
-- message = notification.to_notification.params[:message].split("|")
+- message = notification&.to_notification&.params[:message]&.split("|")
 
-%tr
-  %td
-    = check_box_tag 'read', notification.read?, notification.read?,
-  onchange: "this.setAttribute('data-params', this.name + '=' + this.checked*this.checked)",
-  data: { remote: true, url: admin_notification_path(notification), method: :patch }
-  %td
-    %strong
-      = message.length > 1 ? message[0] : "CSV"
-      = t('dictionary.download')
-  %td
-    = message.length > 1 ? message[1] : message[0]
-  %td
-    - if notification.file.attached?
-      = link_to rails_blob_path(notification.file.blob, disposition: "attachment"), { class: 'btn btn-primary btn-block' } do
-        :plain
-          <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-cloud-download" viewBox="0 0 16 16">
-            <path d="M4.406 1.342A5.53 5.53 0 0 1 8 0c2.69 0 4.923 2 5.166 4.579C14.758 4.804 16 6.137 16 7.773 16 9.569 14.502 11 12.687 11H10a.5.5 0 0 1 0-1h2.688C13.979 10 15 8.988 15 7.773c0-1.216-1.02-2.228-2.313-2.228h-.5v-.5C12.188 2.825 10.328 1 8 1a4.53 4.53 0 0 0-2.941 1.1c-.757.652-1.153 1.438-1.153 2.055v.448l-.445.049C2.064 4.805 1 5.952 1 7.318 1 8.785 2.23 10 3.781 10H6a.5.5 0 0 1 0 1H3.781C1.708 11 0 9.366 0 7.318c0-1.763 1.266-3.223 2.942-3.593.143-.863.698-1.723 1.464-2.383z"/>
-            <path d="M7.646 15.854a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 14.293V5.5a.5.5 0 0 0-1 0v8.793l-2.146-2.147a.5.5 0 0 0-.708.708l3 3z"/>
-          </svg>
-        = message.length > 1 ? message[2] : "CSV"
-        = "(#{number_to_human_size(notification.file.blob.byte_size)})"
-    - else
-      = 'N/A'
-  %td
-    %span.reldate{:data => {:asked_at => notification.created_at.to_json.gsub('"', '')}}
-      = notification.created_at
+- if message
+  %tr
+    %td
+      = check_box_tag 'read', notification.read?, notification.read?,
+    onchange: "this.setAttribute('data-params', this.name + '=' + this.checked*this.checked)",
+    data: { remote: true, url: admin_notification_path(notification), method: :patch }
+    %td
+      %strong
+        = message.length > 1 ? message[0] : "CSV"
+        = t('dictionary.download')
+    %td
+      = message.length > 1 ? message[1] : message[0]
+    %td
+      - if notification.file.attached?
+        = link_to rails_blob_path(notification.file.blob, disposition: "attachment"), { class: 'btn btn-primary btn-block' } do
+          :plain
+            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-cloud-download" viewBox="0 0 16 16">
+              <path d="M4.406 1.342A5.53 5.53 0 0 1 8 0c2.69 0 4.923 2 5.166 4.579C14.758 4.804 16 6.137 16 7.773 16 9.569 14.502 11 12.687 11H10a.5.5 0 0 1 0-1h2.688C13.979 10 15 8.988 15 7.773c0-1.216-1.02-2.228-2.313-2.228h-.5v-.5C12.188 2.825 10.328 1 8 1a4.53 4.53 0 0 0-2.941 1.1c-.757.652-1.153 1.438-1.153 2.055v.448l-.445.049C2.064 4.805 1 5.952 1 7.318 1 8.785 2.23 10 3.781 10H6a.5.5 0 0 1 0 1H3.781C1.708 11 0 9.366 0 7.318c0-1.763 1.266-3.223 2.942-3.593.143-.863.698-1.723 1.464-2.383z"/>
+              <path d="M7.646 15.854a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 14.293V5.5a.5.5 0 0 0-1 0v8.793l-2.146-2.147a.5.5 0 0 0-.708.708l3 3z"/>
+            </svg>
+          = message.length > 1 ? message[2] : "CSV"
+          = "(#{number_to_human_size(notification.file.blob.byte_size)})"
+      - else
+        = 'N/A'
+    %td
+      %span.reldate{:data => {:asked_at => notification.created_at.to_json.gsub('"', '')}}
+        = notification.created_at
 
-  %td= link_to 'Destroy', admin_notification_path(notification), method: :delete
+    %td= link_to 'Destroy', admin_notification_path(notification), method: :delete

data/lib/generators/geoblacklight_admin/config_generator.rb

@@ -381,6 +381,11 @@ module GeoblacklightAdmin
       copy_file "frontend/entrypoints/application.js", "app/javascript/entrypoints/application.js", force: true
     end
 
+    # Add test fixture files - Necessary for import background job tests
+    def add_test_fixture_files
+      copy_file "btaa_sample_records.csv", "test/fixtures/files/btaa_sample_records.csv", force: true
+    end
+
     # Run bundle with vite install
     def bundle_install
       Bundler.with_clean_env do

data/lib/generators/geoblacklight_admin/templates/btaa_sample_records.csv

@@ -0,0 +1,5 @@
+Title,Alternative Title,Description,Language,Creator,Creator ID,Publisher,Provider,Resource Class,Resource Type,Subject,Theme,Keyword,Temporal Coverage,Date Issued,Date Range,Spatial Coverage,Bounding Box,Geometry,GeoNames,Relation,Member Of,Is Part Of,Source,Version,Replaces,Is Replaced By,Format,File Size,WxS Identifier,Georeferenced,Documentation,Download,FeatureServer,FGDC,Harvard Download,HTML,IIIF,ImageServer,Information,ISO19139,Manifest,MapServer,MODS,oEmbed,Index Map,TileServer,WCS,WFS,WMS,Image,ID,Identifier,Code,Rights,Rights Holder,License,Access Rights,Accrual Method,Accrual Periodicity,Date Accessioned,Date Retired,Status,Publication State,Suppressed,Child Record,Mediator,Access,Created At,Updated At
+Lake Superior,"","30 x 38 cm.|Scale approximately 1:1,800,000|General Map Collection",eng,Society for the Diffusion of Useful Knowledge (Great Britain),fst00519759,Baldwin & Cradock (London),University of Minnesota,Maps,"","","","Superior, Lake Maps|2022-creator-sprint",1832,1832,1832-1832,Canada-- Ontario--Lake Superior,"-92.5,46,-83.5,50.5","POLYGON((-92.5 50.5, -83.5 50.5, -83.5 46, -92.5 46, -92.5 50.5))","","",64bd8c4c-8e60-4956-b43d-bdc3f93db488,05d-01|p16022coll230,"","","","",JPEG,,,false,,,,,,,,,https://umedia.lib.umn.edu/item/p16022coll230:321,,https://cdm16022.contentdm.oclc.org/iiif/info/p16022coll230/321/manifest.json,,,,,,,,,https://cdm16022.contentdm.oclc.org/utils/getthumbnail/collection/p16022coll230/id/321,p16022coll230:321,UMN_ALMA:9954050630001701,05d-01,"Use of this item may be governed by US and international copyright laws. You may be able to use this item, but copyright and other considerations may apply. For possible additional information or guidance on your use, please contact the contributing organization.","","",Public,JSON API,,2017-12-22|2022-09-26,,Active,published,false,false,"",,2021-04-26 17:06:38 UTC,2023-02-07 18:33:22 UTC
+Lake Superior: Minnesota,Lake Superior,"This dataset is based on NOAA's Great Lakes Medium Resolution Digital Shoreline. The Lake Superior Shoreline was extracted and converted to a polygon feature class. Water and islands are differentiated. This layer is a medium-quality, general use digital vector dataset originally compiled from NOAA Nautical Charts, created by the Strategic Environmental Assessments Division of NOAA's Office of Ocean Resources, Conservation and Assessment. Nominal mapping scale is 1:70,000.",eng,United States. National Oceanic and Atmospheric Administration,fst00529308,"",Minnesota Geospatial Commons,Datasets,Vector data,National government records,Inland waters,|2022-creator-sprint,2020,2014-12-20,2020-2020,Minnesota,"-92.146,46.547,-83.935,48.769","POLYGON((-92.146 48.769, -83.935 48.769, -83.935 46.547, -92.146 46.547, -92.146 48.769))",http://sws.geonames.org/5037779,"",ba5cc745-21c5-4ae9-954b-72dd8db6815a,05a-01,"","","","",Shapefile,,,false,,https://resources.gisdata.mn.gov/pub/gdrs/data/pub/us_mn_state_dnr/water_lake_superior_basin/shp_water_lake_superior_basin.zip,,,,https://resources.gisdata.mn.gov/pub/gdrs/data/pub/us_mn_state_dnr/water_lake_superior_basin/metadata/metadata.html,,,https://gisdata.mn.gov/dataset/water-lake-superior-basin,,,,,,,,,,,https://resources.gisdata.mn.gov/pub/gdrs/data/pub/us_mn_state_dnr/water_lake_superior_basin/metadata/preview.jpg,82784459-acde-42ed-b615-d8300577110e,https://gisdata.mn.gov/dataset/water-lake-superior-basin,05a-01,"","","",Public,CKAN,,2020-08-31,,Active,published,false,false,"",,2021-04-26 17:03:04 UTC,2023-02-03 22:27:36 UTC
+General chart of Lake Superior,"","Relief shown by hachures and spot heights. Depths shown by bathymetric tints, soundings, and isolines.; ""Catalogue No. 9.""; ""Issued October 11, 1919.""; Includes text, magnetic variations chart, lists of United States and Canadian canals, and dry docks list.|69 x 124 Centimeters|Scale 1:500,000|General Map Collection",eng,U.S. Lake Survey,"","On sale at U.S. Lake Survey Office (Detroit, Michigan)",University of Minnesota,Maps,"","","","","",,"",United States|Lake Superior,"-92.25,46,-84.25,49","POLYGON((-92.25 49, -84.25 49, -84.25 46, -92.25 46, -92.25 49))","","",64bd8c4c-8e60-4956-b43d-bdc3f93db488,05d-01|p16022coll230,"","","","",JPEG,,,false,,,,,,,,,https://umedia.lib.umn.edu/item/p16022coll230:4115,,https://cdm16022.contentdm.oclc.org/iiif/info/p16022coll230/4115/manifest.json,,,,,,,,,https://cdm16022.contentdm.oclc.org/utils/getthumbnail/collection/p16022coll230/id/4115,p16022coll230:4115,UMN_ALMA:9976559407801701,05d-01,"Use of this item may be governed by US and international copyright laws. You may be able to use this item, but copyright and other considerations may apply. For possible additional information or guidance on your use, please contact the contributing organization.","","",Public,JSON API,,2022-04-18|2022-09-26,,Active,published,false,false,"",,2022-09-26 22:33:45 UTC,2023-02-07 18:35:42 UTC
+Lake Superior and the northern part of Michigan,"","Relief shown by hachures.; Prime meridians: Greenwich and Washington.; ""Entered according to act of Congress in the year 1855 by J.H. Colton & Co. ...""; From Colton's atlas of the world. New York: J.H. Colton & Co., 1855?. No. 43.|29 x 42 centimeters|Scale approximately 1:1,625,000|General Map Collection",eng,J.H. Colton & Co.,fst01457236,J.H. Colton & Co (New York),University of Minnesota,Maps,"","","",|2022-creator-sprint,1855,1855,1855-1855,Michigan,"-92.25,45.0,-83.4167,49.1667","POLYGON((-92.25 49.1667, -83.4167 49.1667, -83.4167 45.0, -92.25 45.0, -92.25 49.1667))","","",64bd8c4c-8e60-4956-b43d-bdc3f93db488,05d-01|p16022coll230,"","","","",JPEG,,,false,,,,,,,,,https://umedia.lib.umn.edu/item/p16022coll230:1933,,https://cdm16022.contentdm.oclc.org/iiif/info/p16022coll230/1933/manifest.json,,,,,,,,,https://cdm16022.contentdm.oclc.org/utils/getthumbnail/collection/p16022coll230/id/1933,p16022coll230:1933,UMN_ALMA:9920722310001701,05d-01,"Use of this item may be governed by US and international copyright laws. You may be able to use this item, but copyright and other considerations may apply. For possible additional information or guidance on your use, please contact the contributing organization.","","",Public,JSON API,,2021-07-19|2022-09-26,,Active,published,false,false,"",,2021-09-21 07:03:39 UTC,2023-02-07 18:33:35 UTC

data/lib/geoblacklight_admin/rake_task.rb

@@ -1,5 +1,7 @@
+# :nocov:
 module GeoblacklightAdmin
   module RakeTask
     Dir[File.expand_path(File.join(File.dirname(__FILE__), "tasks/*.rake"))].each { |ext| load ext } if defined?(Rake)
   end
 end
+# :nocov:

data/lib/geoblacklight_admin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GeoblacklightAdmin
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight_admin
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Eric Larson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-09 00:00:00.000000000 Z
+date: 2024-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_storage_validations
@@ -276,6 +276,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: mutex_m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: noticed
   requirement: !ruby/object:Gem::Requirement
@@ -355,7 +369,7 @@ dependencies:
         version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -365,7 +379,7 @@ dependencies:
         version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -398,16 +412,16 @@ dependencies:
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: statesman
   requirement: !ruby/object:Gem::Requirement
@@ -604,6 +618,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rails-controller-testing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -622,16 +650,16 @@ dependencies:
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.25'
 - !ruby/object:Gem::Dependency
   name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
@@ -678,16 +706,16 @@ dependencies:
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: standard
   requirement: !ruby/object:Gem::Requirement
@@ -730,6 +758,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.23'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.23'
 description:
 email:
 - ewlarson@gmail.com
@@ -800,7 +842,6 @@ files:
 - app/helpers/document_helper.rb
 - app/helpers/form_input_helper.rb
 - app/helpers/geoblacklight_admin_helper.rb
-- app/helpers/import_documents_helper.rb
 - app/helpers/mappings_helper.rb
 - app/indexers/document_indexer.rb
 - app/javascript/controllers/results_controller.js
@@ -836,6 +877,11 @@ files:
 - app/models/bulk_action_state_machine.rb
 - app/models/bulk_action_transition.rb
 - app/models/bulk_actions/change_publication_state.rb
+- app/models/bulk_actions/delete_thumbnails.rb
+- app/models/bulk_actions/draft_document.rb
+- app/models/bulk_actions/harvest_thumbnails.rb
+- app/models/bulk_actions/publish_document.rb
+- app/models/bulk_actions/unpublish_document.rb
 - app/models/concerns/geoblacklight_admin/publication_state_search_behavior.rb
 - app/models/document.rb
 - app/models/document/bbox_validator.rb
@@ -1064,6 +1110,7 @@ files:
 - lib/generators/geoblacklight_admin/templates/_user_util_links.html.erb
 - lib/generators/geoblacklight_admin/templates/api_controller.rb
 - lib/generators/geoblacklight_admin/templates/base.html.erb
+- lib/generators/geoblacklight_admin/templates/btaa_sample_records.csv
 - lib/generators/geoblacklight_admin/templates/config/database.yml
 - lib/generators/geoblacklight_admin/templates/config/geomg_aardvark_schema.json
 - lib/generators/geoblacklight_admin/templates/config/initializers/devise.rb

data/app/helpers/import_documents_helper.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-# ImportDocumentsHelper
-module ImportDocumentsHelper
-end