geoblacklight_admin 0.3.2 → 0.4.0

data/app/services/geoblacklight_admin/image_service.rb

@@ -0,0 +1,238 @@
+# frozen_string_literal: true
+
+require "addressable/uri"
+
+module GeoblacklightAdmin
+  class ImageService
+    attr_reader :document
+    attr_writer :metadata, :logger
+
+    def initialize(document)
+      @document = document
+
+      @metadata = {}
+      @metadata["solr_doc_id"] = document.id
+      @metadata["placeheld"] = false
+
+      @logger ||= ActiveSupport::TaggedLogging.new(
+        Logger.new(
+          Rails.root.join("log", "image_service_#{Rails.env}.log")
+        )
+      )
+    end
+
+    # Stores the document's image in ActiveStorage
+    # @return [Boolean]
+    #
+    def store
+      # Gentle hands
+      sleep(1)
+
+      puts "Storing ImageService..."
+      puts "Document ID: #{@document.id}"
+
+      io_file = image_tempfile(@document.id)
+
+      if io_file.nil?
+        puts "IO is NIL"
+      else
+        puts "Attaching IO"
+        attach_io(io_file)
+      end
+
+      log_output
+    rescue => e
+      @metadata["exception"] = e.inspect
+      log_output
+    end
+
+    private
+
+    def image_tempfile(document_id)
+      # puts "IMAGE TEMPFILE..."
+      puts "Document Viewer Protocol: #{@document.viewer_protocol}"
+      # puts "Image URL: #{image_url}"
+      # puts "IMAGE DATA: #{image_data}"
+
+      @metadata["viewer_protocol"] = @document.viewer_protocol
+      @metadata["image_url"] = image_url
+      @metadata["gblsi_thumbnail_uri"] = gblsi_thumbnail_uri
+
+      # puts "IMAGE DATA: #{image_data.inspect}"
+
+      return nil unless image_data && @metadata["placeheld"] == false
+
+      temp_file = Tempfile.new("#{document_id}.tmp")
+      temp_file.binmode
+      temp_file.write(image_data)
+      temp_file.rewind
+
+      # puts "TEMPFILE: #{temp_file.inspect}"
+
+      @metadata["image_tempfile"] = temp_file.inspect
+      temp_file
+    end
+
+    def attach_io(io)
+      # Remote content-type headers are untrustworthy
+      # Pull the mimetype and file extension via MimeMagic
+      content_type = Marcel::MimeType.for(File.open(io))
+      mime_type = Marcel::TYPES[content_type][0][0]
+
+      puts "Content Type: #{content_type.inspect}"
+      puts "MIME Type: #{mime_type.inspect}"
+
+      if content_type.start_with?("image")
+
+        puts "\n\nStoring an image!\n\n"
+
+        asset = Asset.new
+        asset.parent_id = @document.id
+        asset.file = io
+        asset.title = (asset.file&.original_filename || "Untitled")
+        asset.thumbnail = true
+        asset.save
+      else
+        # @TODO: If no thumb, what to do?
+      end
+    end
+
+    # Returns geoserver auth credentials if the document is a restriced Local WMS layer.
+    def geoserver_credentials
+      return unless restricted_wms_layer?
+
+      Settings.PROXY_GEOSERVER_AUTH&.gsub("Basic ", "")
+    end
+
+    def restricted_wms_layer?
+      @document.local_restricted? && @document.viewer_protocol == "wms"
+    end
+
+    # Tests if geoserver credentials are set beyond the default.
+    def geoserver_credentials_valid?
+      Settings.PROXY_GEOSERVER_AUTH != "Basic base64encodedusername:password"
+    end
+
+    # Tests if local thumbnail method is configured
+    def gblsi_thumbnail_field?
+      Settings.GBLSI_THUMBNAIL_FIELD
+    end
+
+    def gblsi_thumbnail_uri
+      if gblsi_thumbnail_field? && @document.send(Settings.GBLSI_THUMBNAIL_FIELD)
+        @document.send(Settings.GBLSI_THUMBNAIL_FIELD)
+      else
+        false
+      end
+    end
+
+    # Generates hash containing thumbnail mime_type and image.
+    def image_data
+      # puts "IMAGE DATA..."
+      return nil unless image_url
+
+      remote_image
+    end
+
+    # Gets thumbnail image from URL. On error, placehold image.
+    def remote_image
+      # puts "remote_image..."
+      auth = geoserver_credentials
+
+      uri = Addressable::URI.parse(image_url)
+
+      return nil unless uri.scheme.include?("http")
+
+      conn = Faraday.new(url: uri.normalize.to_s) do |b|
+        b.use Geoblacklight::FaradayMiddleware::FollowRedirects
+        b.adapter :net_http
+      end
+
+      conn.options.timeout = timeout
+      conn.authorization :Basic, auth if auth
+      conn.get.body
+    rescue Faraday::ConnectionFailed
+      @metadata["error"] = "Faraday::ConnectionFailed"
+      @metadata["placeheld"] = true
+      nil
+    rescue Faraday::TimeoutError
+      @metadata["error"] = "Faraday::TimeoutError"
+      @metadata["placeheld"] = true
+      nil
+    end
+
+    # Returns the thumbnail url.
+    # If the layer is restriced Local WMS, and the geoserver credentials
+    # have not been set beyond the default, then a thumbnail url from
+    # dct references is used instead.
+    def image_url
+      # puts "IMAGE URL..."
+      # puts "gblsi_thumbnail_uri: #{gblsi_thumbnail_uri.inspect}"
+      # puts "restricted_scanned_map?: #{restricted_scanned_map?}"
+      # puts "service_url: #{service_url.inspect}"
+      # puts "image_reference: #{image_reference.inspect}"
+
+      @image_url ||= gblsi_thumbnail_uri || service_url || image_reference
+    end
+
+    # Checks if the document is Local restriced access and is a scanned map.
+    def restricted_scanned_map?
+      @document.local_restricted?
+    end
+
+    # Gets the url for a specific service endpoint if the item is
+    # public, has the same institution as the GBL instance, and the viewer
+    # protocol is not 'map' or nil. A module name is then dynamically generated
+    # from the viewer protocol, and if it's loaded, the image_url
+    # method is called.
+    def service_url
+      # puts "SERVICE URL..."
+      # Follow image_url instead
+      return nil if gblsi_thumbnail_uri
+
+      @service_url ||=
+        begin
+          return unless @document.available?
+
+          protocol = @document.viewer_protocol
+
+          if protocol == "map" || protocol.nil?
+            @metadata["error"] = "Unsupported viewer protocol"
+            @metadata["placeheld"] = true
+            return nil
+          end
+
+          puts "Image Service: #{protocol.to_s.camelcase}"
+
+          "GeoblacklightAdmin::ImageService::#{protocol.to_s.camelcase}".constantize.image_url(@document, image_size)
+        rescue NameError
+          @metadata["error"] = "service_url NameError"
+          @metadata["placeheld"] = true
+          return nil
+        end
+    end
+
+    # 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"]
+    end
+
+    # Default image size.
+    def image_size
+      1500
+    end
+
+    # Faraday timeout value.
+    def timeout
+      30
+    end
+
+    # Capture metadata within image harvest log
+    def log_output
+      # @metadata["state"] = @document.sidecar.image_state.current_state
+      @metadata.each do |key, value|
+        @logger.tagged(@document.id, key.to_s) { @logger.info value }
+      end
+    end
+  end
+end

data/app/services/geoblacklight_admin/item_viewer.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module GeoblacklightAdmin
+  class ItemViewer
+    def initialize(references)
+      @references = references
+      @keys = references.keys.collect { |k| reference_uri_2_key(k) }
+    end
+
+    def viewer_protocol
+      viewer_preference.find { |vp| @keys.include?(vp) } || :map
+    end
+
+    def viewer_endpoint
+      @references[viewer_protocol_2_endpoint]
+    end
+
+    def reference_uri_2_key(value)
+      Geoblacklight::Constants::URI.key(value)
+    end
+
+    def viewer_protocol_2_endpoint
+      Geoblacklight::Constants::URI[viewer_protocol]
+    end
+
+    def viewer_preference
+      [:oembed, :index_map, :tilejson, :xyz, :wmts, :tms, :wms, :iiif, :tiled_map_layer, :dynamic_map_layer,
+        :image_map_layer, :feature_layer]
+    end
+  end
+end

data/app/uploaders/asset_uploader.rb

@@ -0,0 +1,31 @@
+class AssetUploader < Kithe::AssetUploader
+  # gives us md5, sha1, sha512
+  plugin :kithe_checksum_signatures
+
+  THUMB_WIDTHS = {
+    mini: 54,
+    large: 525,
+    standard: 208
+  }
+
+  # define thumb derivatives for TIFF, PDF, and other image input: :thumb_mini, :thumb_mini_2X, etc.
+  THUMB_WIDTHS.each_pair do |key, width|
+    # Single-width thumbnails
+    Attacher.define_derivative("thumb_#{key}", content_type: "image") do |original_file|
+      Kithe::VipsCliImageToJpeg.new(max_width: width, thumbnail_mode: true).call(original_file)
+    end
+
+    # Double-width thumbnails
+    Attacher.define_derivative("thumb_#{key}_2X", content_type: "image") do |original_file|
+      Kithe::VipsCliImageToJpeg.new(max_width: width * 2, thumbnail_mode: true).call(original_file)
+    end
+  end
+
+  # and a full size jpg
+  Attacher.define_derivative("download_full", content_type: "image") do |original_file, attacher:|
+    # No need to do this if our original is a JPG
+    unless attacher.file.content_type == "image/jpeg"
+      Kithe::VipsCliImageToJpeg.new.call(original_file)
+    end
+  end
+end

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

@@ -30,16 +30,28 @@
   <table class="table table-striped table-bordered sortable">
     <thead class="thead-dark">
       <tr>
+        <th>Thumbnail</th>
+        <th>Preview</th>
         <th>Title</th>
         <th>MimeType</th>
         <th>Actions</th>
       </tr>
     </thead>
-
     <tbody>
       <% @document_assets.each do |document_asset| %>
         <tr>
+          <td>
+            <% if document_asset.respond_to?(:thumbnail) %>
+              <%= document_asset.respond_to?(:thumbnail) %> 
+            <% end %>
+          </td>
+          <td>
+            <% if document_asset.respond_to?(:thumbnail) %>
+              <%= image_tag(document_asset.file_url(:thumb_mini_2X), { height: 100 }) %>
+            <% end %>
+          </td>
           <td><%= link_to(document_asset.title, document_asset.file.url) %></td>
+
           <td>
             <%= document_asset.file_data["metadata"]["mime_type"] %>
             <span class="sr-only"><%= document_asset.inspect %></span>

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

@@ -26,4 +26,4 @@
   <li>
     <p><strong>Missing from database: </strong><%= document.inspect %></p>
   </li>
-<% end %>
+<% end %>

data/app/views/admin/documents/_document_kithe.html.erb

@@ -0,0 +1,47 @@
+<% bookmarked = current_user.document_is_bookmarked?(document) ? 'bookmarked' : '' %>
+
+<% if document.respond_to?('friendlier_id') %>
+  <%= content_tag :li, id: document.friendlier_id, class: "#{bookmarked} mb-3" do %>
+    <div class="row">
+      <div class="doc-actions ml-3">
+        <%= check_box_tag nil, nil, false, data: { id: document.friendlier_id, action: 'click->results#checkChecked'}%>
+        <%= render 'admin/documents/document_bookmark', document: document %>
+      </div>
+      <div class="doc-hit col ml-2 mb-2">
+        <div class="row" style="font-size:1.1rem;">
+          <%= "#{@documents.meta['pages']['offset_value'] + index + 1}." if @documents %> &nbsp;
+          <%= link_to document.title, edit_admin_document_path(document.friendlier_id), { class: "js-truncate mb-2" } %>
+        </div>
+        <div class="row">
+          <div class="media">
+            <% if document&.members&.first&.file&.exists? %>
+              <%= link_to edit_admin_document_path(document.friendlier_id) do %>
+                <%= image_tag(document.members.first.file_url(:thumb_mini_2X), { height: 64, width:64 }) %>
+              <% end %>
+            <% else %>
+              <img class="" data-src="holder.js/64x64" alt="placeholder" src="data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2264%22%20height%3D%2264%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%2064%2064%22%20preserveAspectRatio%3D%22none%22%3E%3Cdefs%3E%3Cstyle%20type%3D%22text%2Fcss%22%3E%23holder_18bb5833508%20text%20%7B%20fill%3Argba(255%2C255%2C255%2C.75)%3Bfont-weight%3Anormal%3Bfont-family%3AHelvetica%2C%20monospace%3Bfont-size%3A10pt%20%7D%20%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%20id%3D%22holder_18bb5833508%22%3E%3Crect%20width%3D%2264%22%20height%3D%2264%22%20fill%3D%22%23777%22%3E%3C%2Frect%3E%3Cg%3E%3Ctext%20x%3D%2213.83984375%22%20y%3D%2236.65%22%3E64x64%3C%2Ftext%3E%3C%2Fg%3E%3C%2Fg%3E%3C%2Fsvg%3E" data-holder-rendered="true" style="width: 64px; height: 64px;">
+            <% end %>
+            <div class="media-body ml-3">
+              <%- if document.send(Settings.FIELDS.RESOURCE_CLASS) %>
+                <%= geoblacklight_icon(document.send(Settings.FIELDS.RESOURCE_CLASS)&.first) %>
+              <% end %>
+              <%= publication_state_badge(document) %>
+              <% if document.send("schema_provider_s") %>
+                &middot; <%= document.send("schema_provider_s") %>
+              <% end %>
+              <% if document.send("dct_temporal_sm") %>
+                &middot; <%= document.send("dct_temporal_sm").join("-") %>
+              <% end %>
+              <% if document.send("dct_description_sm").present? %>
+                <p class="js-truncate"><%= document.send("dct_description_sm").join %></p>
+              <% end %>
+            </div>
+          </div>
+        </div>
+      </div>
+  <% end %>
+<% else %>
+  <li>
+    <p><strong>Missing from database: </strong><%= document.inspect %></p>
+  </li>
+<% end %>

data/app/views/admin/documents/_form_nav.html.erb

@@ -1,7 +1,7 @@
 <div class="make-me-sticky mt-4 ml-4">
   <nav class="nav flex-column ml-4 mt-6">
     <% if @document.persisted? %>
-      <strong class="mt-4"><%= link_to "GBL♦Admin | View in GeoBlacklight", solr_document_url(@document), { class: 'btn btn-warning' } %></strong>
+      <strong class="mb-4"><%= link_to "GBL♦Admin | View in GeoBlacklight", solr_document_url(@document), { class: 'btn btn-warning' } %></strong>
     <% end %>
 
     <%- form_elements = FormElement.all.order(position: :asc) %>

data/app/views/admin/documents/_form_nav_kithe.html.erb

@@ -0,0 +1,30 @@
+<div class="make-me-sticky mt-4 ml-4">
+  <nav class="nav flex-column ml-4 mt-6">
+    <% if @document.persisted? %>
+      <strong class="mb-4"><%= link_to "GBL♦Admin | View in GeoBlacklight", solr_document_url(@document), { class: 'btn btn-warning' } %></strong>
+
+      <% if @document&.members&.first&.file&.exists? %>
+        <%= link_to admin_document_document_assets_url(@document) do %>
+          <strong class="mt-2">Thumbnail</strong><br>
+          <%= image_tag(@document.members.first.file_url(:thumb_standard_2X), { class: "p-2", width: 150 }) %>
+        <% end %>
+      <% end %>
+    <% end %>
+
+    <%- form_elements = FormElement.all.order(position: :asc) %>
+    <%- form_elements.each do |form_element| %>
+      <% if form_element.kind_of? FormHeader %>
+        <strong class="mt-2"><a data-controller="scroll-to" class="mt-4" href="#<%= form_element.label.parameterize(separator: '-') %>"><%= form_element.label %></a></strong>
+      <% end %>
+      <% if form_element.kind_of? FormGroup %>
+        <a data-controller="scroll-to" class="ml-2" href="#<%= form_element.label.parameterize(separator: '-') %>"><%= form_element.label %></a>
+      <% end %>
+    <% end %>
+
+    <% if @document.persisted? %>
+      <%= link_to "Institutional Access Links", admin_document_document_accesses_url(@document), class: "ml-2" %>
+      <%= link_to "Multiple Download Links", admin_document_document_downloads_url(@document), class: "ml-2" %>
+      <%= link_to "Additional Assets", admin_document_document_assets_url(@document), class: "ml-2" %>
+    <% end %>
+  </nav>
+</div>

data/app/views/admin/documents/_result_facets.html.erb

@@ -1,4 +1,28 @@
-<%= form_with url: '/documents', method: :get, local: true  do |form| %>
+<a class="h5" data-toggle="collapse" href="#collapseExample" role="button" aria-expanded="false" aria-controls="collapseExample">
+  Imports
+</a>
+
+<% if params["f"]&.keys&.include?("b1g_geom_import_id_ssi") %>
+  <% import = Import.find_by_id(params["f"]["b1g_geom_import_id_ssi"]) %>
+  <ul class="list-unstyled mt-3">
+    <li><%= link_to("- #{import.name} &#10060;".html_safe) %></li>
+  </ul>
+<% else %>
+  <div class="collapse" id="collapseExample">
+    <ul class="list-unstyled mt-3">
+      <% Import.last(20).sort_by(&:created_at).reverse.each do |import| %>
+        <li>
+          <%= link_to_admin_import(import) %> - 
+          <small><%= time_ago_in_words(import.created_at) %> ago</small>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>
+
+<hr/>
+
+<%= form_with url: '/admin/documents', method: :get, local: true  do |form| %>
   <div class="input-group mb-3" style="width:300px">
     <%= form.text_field("daterange", { class: 'form-control', placeholder: 'Date range filter', size: 24, 'aria-label': "Date range filter", value: params['daterange']  }) %>
     <%= params_as_hidden_fields(
@@ -16,7 +40,7 @@
 <% if @documents.facets.present? %>
   <% @documents.facets.each do |facet| %>
     <% if facet['type'] == 'facet' %>
-      <%- next if ['b1g_code_s', 'dct_isPartOf_sm'].include?(facet['id']) %>
+      <%- next if ['b1g_geom_import_id_ssi', 'b1g_code_s', 'dct_isPartOf_sm'].include?(facet['id']) %>
       <h3 class="h5"><%= facet['attributes']['label'] %></h3>
       <ul class="list-unstyled">
         <%- facet['attributes']['items'].each do |item| %>

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

@@ -11,18 +11,14 @@
   </div>
 
   <div id="resultset" class="col-8">
-    <p>
-      <%= render "result_toggle" %>
-      <%= render "result_selected_options" %>
-      <%= render "result_pagination" %>
-    </p>
-
-    <hr/>
 
+    <%= render "result_toggle" %>
+    <%= render "result_selected_options" %>
+    <%= render "result_pagination" %>
     <%= render "result_selection_options" %>
 
     <% if @documents.results.present? &&  @documents.results.kind_of?(Array) %>
-      <ol id='results' class='list-unstyled' data-controller='results'>
+      <ol id='results' class='list-unstyled mt-4' data-controller='results'>
         <% @documents.results.each_with_index do |document, index| %>
           <% doc = Document.find_by(friendlier_id: document['id']) %>
           <% if doc.present? %>

data/app/views/admin/documents/versions.html.erb

@@ -33,7 +33,7 @@
                 <%- # Current Document %>
                 <%- if index == 0 %>
                   <%- current = @document.json_attributes %>
-                  <%- previous = version.previous.reify&.json_attributes %>
+                  <%- previous = version&.previous&.reify&.json_attributes %>
                   <%- diff = Hashdiff.diff(previous,current) %>
                   <%- changeset = version.changeset.except(:json_attributes).collect{ |change| ["+", change[0], change[1][1]] }.flatten %>
                   <%- diff << changeset %>

data/app/views/admin/imports/show.html.erb

@@ -50,7 +50,7 @@
         <h3 class="h5">Imported Documents</h3>
       </div>
       <ul class="list-group list-group-flush">
-        <li class="list-group-item text-center">
+        <li class="list-group-item">
           <% if @import.state_machine.current_state == 'mapped' %>
             <%= form_tag run_admin_import_path(@import), method: :patch do -%>
               <%= hidden_field_tag :run, true -%>
@@ -58,7 +58,34 @@
             <%- end -%>
           <% end %>
           <% if @import.state_machine.current_state == 'imported' %>
-            <%= @import.documents.size %>
+            <table class="table table-sm table-bordered import-documents">
+              <thead>
+                <tr>
+                  <th>Publication State</th>
+                  <th>Document Count</th>
+                </tr>
+              </thead>
+              <tbody>
+              <tr>
+                <td><%= link_to_gbl_import('Published', @import, 'published') %></td>
+                <td><%= @import.documents.where(publication_state: 'published').size %></td>
+              </tr>
+              <tr>
+                <td><%= link_to_gbl_import('Unpublished', @import, 'unpublished') %></td>
+                <td><%= @import.documents.where(publication_state: 'unpublished').size %></td>
+              </tr>
+              <tr>
+                <td><%= link_to_gbl_import('Draft', @import, 'draft') %></td>
+                <td><%= @import.documents.where(publication_state: 'draft').size %></td>
+              </tr>
+              </tbody>
+              <tfoot>
+                <tr>
+                  <th><%= link_to_gbl_import('Total', @import) %></th>
+                  <td><%= @import.documents.size %></td>
+              </tr>
+              </tfoot>
+            </table>
           <% end %>
         </li>
       </ul>
@@ -104,19 +131,18 @@
 
     <nav>
       <div class="nav nav-tabs" id="import-state-tabs" role="tablist">
-        <a class="nav-item nav-link active" id="import-failed-tab" data-toggle="tab" href="#import-state-failed" role="tab" aria-controls="import-state-failed" aria-selected="true">Failed</a>
-        <a class="nav-item nav-link" id="import-success-tab" data-toggle="tab" href="#import-state-success" role="tab" aria-controls="import-state-success"
-          aria-selected="false">Success</a>
+        <a class="nav-item nav-link active" id="import-success-tab" data-toggle="tab" href="#import-state-success" role="tab" aria-controls="import-state-success" aria-selected="true">Success</a>
+        <a class="nav-item nav-link" id="import-failed-tab" data-toggle="tab" href="#import-state-failed" role="tab" aria-controls="import-state-failed" aria-selected="false">Failed</a>
       </div>
     </nav>
 
     <div class="tab-content" id="import-states">
-      <div class="tab-pane fade show active" id="import-state-failed" role="tabpanel" aria-labelledby="import-state-failed-tab">
-        <%= render partial: 'show_failed_tab' %>
+      <div class="tab-pane fade show active" id="import-state-success" role="tabpanel" aria-labelledby="import-state-success-tab">
+        <%= render partial: 'show_success_tab' %>
       </div>
 
-      <div class="tab-pane fade" id="import-state-success" role="tabpanel" aria-labelledby="import-state-success-tab">
-        <%= render partial: 'show_success_tab' %>
+      <div class="tab-pane fade" id="import-state-failed" role="tabpanel" aria-labelledby="import-state-failed-tab">
+        <%= render partial: 'show_failed_tab' %>
       </div>
     </div>
   </div>

data/app/views/admin/shared/_navbar.html.erb

@@ -19,15 +19,15 @@
       <% end %>
 
       <div class="input-group-append">
-        <button class="btn btn-outline-secondary my-2 my-sm-0" type="submit">Search</button>
-        <button type="button" class="btn btn-outline-secondary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-          <span class="sr-only">Toggle Dropdown</span>
+        <button class="btn btn-outline-secondary my-2 my-sm-0" type="submit">
+          <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-search" viewBox="0 0 16 16">
+            <path d="M11.742 10.344a6.5 6.5 0 1 0-1.397 1.398h-.001c.03.04.062.078.098.115l3.85 3.85a1 1 0 0 0 1.415-1.414l-3.85-3.85a1.007 1.007 0 0 0-.115-.1zM12 6.5a5.5 5.5 0 1 1-11 0 5.5 5.5 0 0 1 11 0"/>
+          </svg>
+          <span class="sr-only">Search</span>
         </button>
-        <div class="dropdown-menu">
-          <%= link_to "Advanced", admin_search_path, { class: 'dropdown-item' } %>
-        </div>
       </div>
     </div>
+    <%= link_to "Advanced", admin_search_path, { class: 'btn my-2 my-sm-0' } %>
   <% end %>
 
   <div class="collapse navbar-collapse" id="navbarSupportedContent">

data/db/migrate/20231106215104_bulk_action_sti.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class BulkActionSti < ActiveRecord::Migration[6.1]
+  def change
+    add_column :bulk_actions, :bulk_action_type, :string, default: "ChangePublicationState", null: false
+    add_column :bulk_actions, :action, :string, null: true
+    change_column :bulk_actions, :field_name, :string, null: true
+    change_column :bulk_actions, :field_value, :string, null: true
+  end
+end

data/lib/generators/geoblacklight_admin/config_generator.rb

@@ -270,10 +270,18 @@ module GeoblacklightAdmin
       end
     end
 
+    def add_api_controller
+      copy_file "api_controller.rb", "app/controllers/admin/api_controller.rb"
+    end
+
     def add_user_util_links
       copy_file "_user_util_links.html.erb", "app/views/shared/_user_util_links.html.erb"
     end
 
+    def copy_catalog_index_view
+      copy_file "views/_index_split_default.html.erb", "app/views/catalog/_index_split_default.html.erb"
+    end
+
     def add_show_sidebar
       copy_file "_show_sidebar.html.erb", "app/views/catalog/_show_sidebar.html.erb"
     end
@@ -305,9 +313,31 @@ module GeoblacklightAdmin
       end
     end
 
-    def add_catalog_controller_default_params
-      inject_into_file "app/controllers/catalog_controller.rb", after: '"q.alt" => "*:*"' do
-        ",\n      'fq' => ['b1g_publication_state_s:published']"
+    def add_kithe_bulk_loading_service
+      inject_into_file "app/controllers/catalog_controller.rb", after: 'require "blacklight/catalog"' do
+        "\nrequire 'kithe/blacklight_tools/bulk_loading_search_service'"
+      end
+
+      inject_into_file "app/controllers/catalog_controller.rb", after: "include Blacklight::Catalog" do
+        "\nself.search_service_class = Kithe::BlacklightTools::BulkLoadingSearchService"
+      end
+    end
+
+    def add_kithe_model_to_solr_document
+      inject_into_file "app/models/solr_document.rb", after: "include Geoblacklight::SolrDocument" do
+        "\n\nattr_accessor :model"
+      end
+    end
+
+    def add_search_builder_publication_state_concern
+      inject_into_file "app/models/search_builder.rb", after: "include Geoblacklight::SuppressedRecordsSearchBehavior" do
+        "\n      include GeoblacklightAdmin::PublicationStateSearchBehavior"
+      end
+    end
+
+    def add_import_id_facet
+      inject_into_file "app/controllers/catalog_controller.rb", before: "# Item Relationship Facets" do
+        "\nconfig.add_facet_field Settings.FIELDS.B1G_IMPORT_ID, label: 'Import ID', show: false\n"
       end
     end
   end