geoblacklight_admin 0.5.0 → 0.6.0

data/app/services/export_csv_document_distributions_service.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require "csv"
+
+# ExportCsvDocumentDistributionsService
+#
+# This service is responsible for exporting document distributions to a CSV format.
+# It broadcasts the progress of the export process via ActionCable.
+class ExportCsvDocumentDistributionsService
+  # Returns a short name for the service.
+  #
+  # @return [String] the short name of the service.
+  def self.short_name
+    "Document Distributions"
+  end
+
+  # Initiates the CSV export process for the given document IDs.
+  #
+  # @param document_ids [Array] an array of document IDs to export.
+  # @return [Array] the generated CSV file content as an array of rows.
+  #
+  # This method broadcasts the progress of the export process to the "export_channel".
+  # It processes the document IDs in slices and handles any NoMethodError exceptions
+  # that occur during the export process.
+  def self.call(document_ids)
+    ActionCable.server.broadcast("export_channel", {progress: 0})
+
+    document_ids = document_ids.flatten
+    total = document_ids.size
+    count = 0
+    slice_count = 100
+    csv_file = []
+
+    Rails.logger.debug { "\n\nExportCsvDocumentDistributionsService: #{document_ids.inspect}\n\n" }
+
+    CSV.generate(headers: true) do |_csv|
+      csv_file << DocumentDistribution.csv_column_names
+      document_ids.each_slice(slice_count) do |slice|
+        # Broadcast progress percentage
+        count += slice_count
+        progress = ((count.to_f / total) * 100).round
+        progress = 100 if progress > 100
+
+        ActionCable.server.broadcast("export_channel", {progress: progress})
+        slice.each do |doc_id|
+          doc = Document.find_by(friendlier_id: doc_id)
+
+          Rails.logger.debug { "\n\nDocDistributions: #{doc.document_distributions.size}\n\n" }
+
+          doc.document_distributions.each do |distribution|
+            csv_file << distribution.to_csv
+          end
+        rescue NoMethodError
+          Rails.logger.debug { "\n\nExport Failed: #{doc_id.inspect}\n\n" }
+        end
+      end
+    end
+
+    csv_file
+  end
+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,29 +14,21 @@ 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)
 
-        puts "Parsed URL: #{parsed_url.inspect}"
-
         # Build a hash to store the extracted components
         parsed_data = {
           base_url: "#{parsed_url.scheme}://#{parsed_url.host}#{parsed_url.port ? ":" + parsed_url.port.to_s : ""}",
           path_pattern: parsed_url.path
         }
 
-        puts "Parsed Data: #{parsed_data.inspect}"
-
         endpoint = parsed_data[:base_url]
         "#{endpoint}/geoserver/wms/reflect?" \
           "&FORMAT=image%2Fpng" \

data/app/services/geoblacklight_admin/image_service.rb

@@ -191,7 +191,7 @@ module GeoblacklightAdmin
 
     # Retreives a url to a static thumbnail from the document's dct_references field, if it exists.
     def image_reference
-      @document.references["http://schema.org/thumbnailUrl"]
+      @document.distributions["http://schema.org/thumbnailUrl"]
     end
 
     # Default image size.

data/app/services/geoblacklight_admin/item_viewer.rb

@@ -2,9 +2,9 @@
 
 module GeoblacklightAdmin
   class ItemViewer
-    def initialize(references)
-      @references = references
-      @keys = references.keys.collect { |k| reference_uri_2_key(k) }
+    def initialize(distributions)
+      @distributions = distributions
+      @keys = distributions.keys.collect { |k| reference_uri_2_key(k) }
     end
 
     def viewer_protocol
@@ -12,7 +12,7 @@ module GeoblacklightAdmin
     end
 
     def viewer_endpoint
-      @references[viewer_protocol_2_endpoint]
+      @distributions[viewer_protocol_2_endpoint]
     end
 
     def reference_uri_2_key(value)

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/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 %>

data/app/views/admin/document_accesses/import.html.erb

@@ -15,7 +15,11 @@
       <h2 class='h3'>Import for Multiple Documents</h2>
     <% end %>
 
-    <h3 class='h4'>Import a CSV File</h3>
+    <p class="alert alert-info" role="alert">
+      <strong>Note:</strong> New Institutional Access URLs will be created. Existing Institutional Access URLs will be updated per the CSV file.
+    </p>
+
+    <h3 class='h4'>Upload a CSV File</h3>
     <%= simple_form_for DocumentAccess.new, url: import_admin_document_accesses_path, method: :post, multipart: true do |f| %>
       <div class="form-inputs">
         <%= f.simple_fields_for :assets do |asset_fields| %>
@@ -24,7 +28,7 @@
       </div>
 
       <div class="form-actions">
-        <%= submit_tag "Import CSV", {class: 'btn btn-primary'} %>
+        <%= submit_tag "+ Import CSV", {class: 'btn btn-primary'} %>
       </div>
     <% end %>
   </div>

data/app/views/admin/document_assets/_assets_table.html.erb

@@ -0,0 +1,49 @@
+<div class="table-responsive">
+  <table class="table table-striped table-bordered sortable">
+    <thead class="thead-dark">
+      <tr>
+        <th>Thumbnail</th>
+        <th>Preview</th>
+        <th>Title</th>
+        <th>Label</th>
+        <th>MimeType</th>
+        <th>Reference URI Type</th>
+        <th colspan="2">Actions</th>
+      </tr>
+    </thead>
+    <tbody>
+      <% document_assets.each do |document_asset| %>
+        <tr>
+        <td>
+          <%= form_with model: document_asset, url: admin_document_document_asset_path(document_asset.parent, document_asset), method: :put, remote: true, class: 'thumbnail-form' do |f| %>
+            <%= f.check_box :thumbnail, class: 'thumbnail-toggle', onchange: "this.form.submit()" %>
+              <%= f.submit 'Save', class: 'btn btn-sm btn-primary d-none' %>
+            <% end %>
+          </td>
+          <td>
+            <% if document_asset.respond_to?(:thumbnail) %>
+              <% unless document_asset.file_url(:thumb_standard).nil? %>
+                <%= image_tag(document_asset.file_url(:thumb_standard), { height: 100 }) %>
+              <% end %>
+            <% end %>
+          </td>
+          <td><%= link_to(document_asset.title, document_asset.file.url) %></td>
+          <td><%= document_asset.label %></td>
+          <td>
+            <%= document_asset.file_data["metadata"]["mime_type"] %>
+            <span class="sr-only"><%= document_asset.inspect %></span>
+          </td>
+          <td>
+            <%= document_asset.dct_references_uri_key %>
+          </td>
+          <td>
+            <%= link_to 'Edit', edit_admin_document_document_asset_path(document_asset.parent, document_asset) %>
+          </td>
+          <td>
+            <%= link_to 'Destroy', admin_document_document_asset_path(document_asset.parent, document_asset), method: :delete, data: { confirm: 'Are you sure?' } %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

data/app/views/admin/document_assets/_form.html.erb

@@ -1,11 +1,10 @@
-<%= @document_asset.class %>
-
 <%= simple_form_for [:admin, @document, @document_asset], :url => admin_document_document_asset_path(@document, @document_asset) do |f| %>
   <%= f.error_notification %>
   <%= f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? %>
 
   <div class="form-inputs">
-    <%= f.input :parent_id, input_html: { value: @document.friendlier_id, readonly: true } %>
+    <%= link_to "Parent Document", admin_document_path(@document_asset.parent) %>
+    <%= f.input :parent_id, as: :hidden %>
     <%= f.input :title %>
     <%= f.input :label %>
     <%= f.input :dct_references_uri_key, collection: I18n.t("activemodel.enum_values.document/reference.category").invert.sort.insert(0, ["Choose Reference Type", nil]), label: 'Reference' %>

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

@@ -30,53 +30,7 @@
     </h6>
     <% end %>
 
-    <div class="table-responsive">
-      <table class="table table-striped table-bordered sortable">
-        <thead class="thead-dark">
-          <tr>
-            <th>Thumbnail</th>
-            <th>Preview</th>
-            <th>Title</th>
-            <th>Label</th>
-            <th>MimeType</th>
-            <th>Reference URI Type</th>
-            <th colspan="2">Actions</th>
-          </tr>
-        </thead>
-        <tbody>
-          <% @document_assets.each do |document_asset| %>
-            <tr>
-              <td>
-                <% if document_asset.respond_to?(:thumbnail) %>
-                  <%= document_asset.thumbnail %> 
-                <% end %>
-              </td>
-              <td>
-                <% if document_asset.respond_to?(:thumbnail) %>
-                  <% unless document_asset.file_url(:thumb_standard).nil? %>
-                    <%= image_tag(document_asset.file_url(:thumb_standard), { height: 100 }) %>
-                  <% end %>
-                <% end %>
-              </td>
-              <td><%= link_to(document_asset.title, document_asset.file.url) %></td>
-              <td><%= document_asset.label %></td>
-              <td>
-                <%= document_asset.file_data["metadata"]["mime_type"] %>
-                <span class="sr-only"><%= document_asset.inspect %></span>
-              </td>
-              <td>
-                <%= document_asset.dct_references_uri_key %>
-              </td>
-              <td>
-                <%= link_to 'Edit', edit_admin_document_document_asset_path(document_asset.parent, document_asset) %>
-              </td>
-              <td>
-                <%= link_to 'Destroy', admin_document_document_asset_path(document_asset.parent, document_asset), method: :delete, data: { confirm: 'Are you sure?' } %>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
+    <%= render partial: 'assets_table', locals: { document_assets: @document_assets } %>
 
       <% if @pagy %>
       <h6>

data/app/views/admin/document_distributions/_document_distribution.html.erb

@@ -0,0 +1,39 @@
+<%- @page_title = "GBL♦Admin - Document - Distribution - #{document_distribution.url}" %>
+
+<h1>Distribution</h1>
+
+<div class="row">
+  <div class="col-9">
+    <h2>
+      <%= document_distribution.url %>
+      <span class="float-right">
+        <%= link_to '~ Edit Distribution', edit_admin_document_document_distribution_path(@document, document_distribution), { class: 'btn btn-primary' } %>
+        <%= button_to "Destroy this distribution", admin_document_document_distribution_path(@document, document_distribution), method: :delete, class: "btn btn-danger" %>
+      </span>
+    </h2>
+
+    <table class="table table-bordered">
+      <thead class="thead-dark">
+        <tr>
+          <th class="header" style="width:300px;">Attribute</th>
+          <th class="header">Value</th>
+        </tr>
+      </thead>
+      <tr>
+        <th>Reference Type</th>
+        <td><%= document_distribution.reference_type.reference_type %></td>
+      </tr>
+      <tr>
+        <th>Reference URL</th>
+        <td><%= document_distribution.url %></td>
+      </tr>
+      <tr>
+        <th>Label</th>
+        <td><%= document_distribution.label %></td>
+      </tr>
+    </table>
+  </div>
+</div>
+
+<%= link_to 'Edit', edit_admin_document_document_distribution_path(@document, document_distribution) %> |
+<%= link_to 'Back', admin_document_document_distributions_path(@document) %>

data/app/views/admin/document_distributions/_document_distribution.json.jbuilder

@@ -0,0 +1,2 @@
+json.extract! document_distribution, :id, :created_at, :updated_at
+json.url document_distribution_url(document_distribution, format: :json)

data/app/views/admin/document_distributions/_form.html.erb

@@ -0,0 +1,34 @@
+<%= simple_form_for([:admin, @document, @document_distribution]) do |f| %>
+  <%= f.error_notification %>
+  <%= f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? %>
+
+  <div class="form-inputs">
+    <%= f.input :friendlier_id, input_html: { value: @document.friendlier_id, readonly: true } %>
+    <%= f.input :reference_type_id, as: :select, collection: ReferenceType.all.map { |r| [r.reference_type, r.id] }, label: 'Reference Type' %>
+    <%= f.input :url, label: 'Distribution URL' %>
+    <%= f.input :label, autofocus: true, input_html: { disabled: true, id: 'label-input' } %>
+    
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit, 'Create Download URL', {class: 'btn btn-primary'} %>
+  </div>
+<% end %>
+
+<script>
+document.addEventListener('DOMContentLoaded', function() {
+  const distributionSelect = document.querySelector('select[name="document_distribution[reference_type_id]"]');
+  const labelInput = document.getElementById('label-input');
+
+  function toggleLabelInput() {
+    if (distributionSelect.options[distributionSelect.selectedIndex].text === 'Download file') {
+      labelInput.disabled = false;
+    } else {
+      labelInput.disabled = true;
+    }
+  }
+
+  distributionSelect.addEventListener('change', toggleLabelInput);
+    toggleLabelInput(); // Initial check
+  });
+</script>

data/app/views/admin/document_distributions/destroy_all.html.erb

@@ -0,0 +1,82 @@
+<p id="notice"><%= notice %></p>
+
+<h1 style="width:100%; border-bottom:dotted;" class="mb-4">
+  Document &middot; Destroy Distributions
+  <% if params[:document_id] %>
+    <%= link_to '+ New Distribution', new_document_document_distribution_path(@document), { class: 'btn btn-primary float-right' } %>
+  <% end %>
+</h1>
+
+<div class="row">
+  <div class="col-4">
+    <% if params[:document_id] %>
+      <h2 class='h3'><%= @document.title %></h2>
+    <% else %>
+      <h2 class='h3'>Destroy Multiple Distributions</h2>
+    <% end %>
+
+    <p class="alert alert-danger" role="alert">
+      <strong>Warning:</strong> All matching Distributions will be destroyed. There is <strong>NO UNDO</strong> here.
+    </p>
+    <h3 class='h4'>Upload a CSV File</h3>
+
+    <%= simple_form_for DocumentDistribution.new, url: destroy_all_admin_document_distributions_path, method: :post, multipart: true do |f| %>
+      <div class="form-group">
+        <div class="form-inputs">
+          <%= f.simple_fields_for :distributions do |distribution_fields| %>
+            <%= reference_fields.input :file, as: :file, input_html: {} %>
+          <%- end %>
+        </div>
+
+        <div class="form-actions">
+          <%= submit_tag "- Destroy All", {class: 'btn btn-danger'} %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+  <div class="col-8">
+    <h4>Example CSV File</h4>
+    <table class="table table-bordered">
+      <thead>
+        <tr>
+          <th>friendlier_id</th>
+          <th>reference_type</th>
+          <th>distribution_url</th>
+          <th>label</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td>00add5b8-a7b1-42d4-b4de-ca99716a5096</td>
+          <td>download</td>
+          <td>https://s3.amazonaws.com/holc/tiles/WI/Madison/1937/rectified.zip</td>
+          <td>GeoTIFF</td>
+        </tr>
+        <tr>
+          <td>00add5b8-a7b1-42d4-b4de-ca99716a5096</td>
+          <td>download</td>
+          <td>https://s3.amazonaws.com/holc/tiles/WI/Madison/1937/holc-scan.jpg</td>
+          <td>JPEG</td>
+        </tr>
+        <tr>
+          <td>...</td>
+          <td>...</td>
+          <td>...</td>
+          <td>...</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <h5>CSV File Column Definitions</h5>
+    <dl>
+      <dt>friendlier_id</dt>
+      <dd>The associated document's friendlier id</dd>
+      <dt>reference_type</dt>
+      <dd>The name of the reference type</dd>
+      <dt>distribution_url</dt>
+      <dd>The URL for the distribution</dd>
+      <dt>label</dt>
+      <dd>The label for the distribution, if the reference type is labeled</dd>
+    </dl>
+  </div>
+</div>

data/app/views/admin/document_distributions/edit.html.erb

@@ -0,0 +1,12 @@
+<% content_for :title, "Editing document distribution" %>
+
+<h1>Editing document distribution</h1>
+
+<%= render "form", document_distribution: @document_distribution %>
+
+<br>
+
+<div>
+  <%= link_to "Show this document distribution", admin_document_document_distribution_path(@document, @document_distribution) %> |
+  <%= link_to "Back to document distributions", admin_document_document_distributions_path(@document) %>
+</div>