geoblacklight_admin 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a28b441bd6abd075d9a44800659b3fd9d28a44a7eafc44b6cd5a35105c63c0c6
-  data.tar.gz: 98a2f2f6b11314db59f5d52f79b16c8a7d405322a7a59c8b3d3214ad7030e541
+  metadata.gz: ccbde8ddbc9a147e70292b99dc32062b43c8517821ad3aff392e73b7bcd428c8
+  data.tar.gz: 13405c8253ee7f0f6ce925eba479a880f7ef06634841169622be946cc6ee2c53
 SHA512:
-  metadata.gz: 271fd18a5c03887aeffc871857c1c7ab1f79c40d1a2f8e054f5834bca57fcd890a5664353ceb34978e6df1849b00471d15388e41e34b27bfe2fb9dd88317f5eb
-  data.tar.gz: 27e668d0c301630f549705d930d8c182b31989f3f36b7e3d22be44b25f82123ddf2552804c0e604b0a30f060304272b150883cf310a88a5cd81152dba0b816f6
+  metadata.gz: b7f19df4aecd8bbf08e0536b1cbcdc720d5f8c55e20e5c13d5296bbff61a8e8f79f724adda0899fbe566131bc7de2fdc3da141742fa064263b4136d9443dc26e
+  data.tar.gz: 524b5e9a4a1c37205d01456b5d3585183493e9d1c18397669ec692eb9072c31d1defbe8d7ca71cc3fdfef8b3dd6336ece4453cc589f4c7db92312fa00b84c9af

data/app/assets/stylesheets/geoblacklight_admin/_core.scss

@@ -27,6 +27,7 @@
 @import "modules/icons";
 @import "modules/images";
 @import "modules/nav";
+@import "modules/pagy";
 @import "modules/results";
 @import "modules/tables";
 @import "modules/toasts";

data/app/assets/stylesheets/geoblacklight_admin/modules/_pagy.scss

@@ -0,0 +1,7 @@
+.pagy {
+  a:not(.gap) {
+    &:not([href]) { /* disabled links */
+      margin-top: 0.4rem;
+    }
+  }
+}

data/app/controllers/admin/document_data_dictionaries_controller.rb

@@ -22,6 +22,11 @@ module Admin
     # GET /document_data_dictionaries/1 or /document_data_dictionaries/1.json
     def show
       @pagy, @document_data_dictionary_entries = pagy(@document_data_dictionary.document_data_dictionary_entries.order(position: :asc), items: 100)
+
+      respond_to do |format|
+        format.html
+        format.csv { render plain: @document_data_dictionary.to_csv }
+      end
     end
 
     # GET /document_data_dictionaries/new

data/app/controllers/concerns/blacklight/catalog.rb

@@ -0,0 +1,373 @@
+# frozen_string_literal: true
+
+module Blacklight::Catalog
+  include Pagy::Backend
+  extend ActiveSupport::Concern
+
+  # MimeResponds is part of ActionController::Base, but not ActionController::API
+  include ActionController::MimeResponds
+
+  Deprecation.silence(Blacklight::Base) do
+    include Blacklight::Base
+  end
+
+  include Blacklight::Facet
+  include Blacklight::Searchable
+
+  extend Deprecation
+
+  # The following code is executed when someone includes blacklight::catalog in their
+  # own controller.
+  included do
+    if respond_to? :helper_method
+      helper_method :sms_mappings, :has_search_parameters?, :facet_limit_for
+    end
+
+    helper Blacklight::Facet if respond_to? :helper
+
+    # The index action will more than likely throw this one.
+    # Example: when the standard query parser is used, and a user submits a "bad" query.
+    rescue_from Blacklight::Exceptions::InvalidRequest, with: :handle_request_error
+
+    record_search_parameters
+  end
+
+  # get search results from the solr index
+  def index
+    (@response, deprecated_document_list) = search_service.search_results
+
+    @document_list = ActiveSupport::Deprecation::DeprecatedObjectProxy.new(
+      deprecated_document_list,
+      "The @document_list instance variable is deprecated; use @response.documents instead.",
+      ActiveSupport::Deprecation.new("8.0", "blacklight")
+    )
+
+    @pagy = Pagy.new(
+      count: @response.total_count,
+      page: params[:page],
+      limit: params[:per_page]
+    )
+
+    respond_to do |format|
+      format.html { store_preferred_view }
+      format.rss { render layout: false }
+      format.atom { render layout: false }
+      format.json do
+        @presenter = Blacklight::JsonPresenter.new(@response,
+          blacklight_config)
+      end
+      additional_response_formats(format)
+      document_export_formats(format)
+    end
+  end
+
+  # get a single document from the index
+  # to add responses for formats other than html or json see _Blacklight::Document::Export_
+  def show
+    deprecated_response, @document = search_service.fetch(params[:id])
+    @response = ActiveSupport::Deprecation::DeprecatedObjectProxy.new(
+      deprecated_response,
+      "The @response instance variable is deprecated; use @document.response instead.",
+      ActiveSupport::Deprecation.new("8.0", "blacklight")
+    )
+
+    respond_to do |format|
+      format.html { @search_context = setup_next_and_previous_documents }
+      format.json
+      additional_export_formats(@document, format)
+    end
+  end
+
+  def advanced_search
+    (@response, _deprecated_document_list) = blacklight_advanced_search_form_search_service.search_results
+  end
+
+  # get a single document from the index
+  def raw
+    raise(ActionController::RoutingError, "Not Found") unless blacklight_config.raw_endpoint.enabled
+
+    _, @document = search_service.fetch(params[:id])
+    render json: @document
+  end
+
+  # updates the search counter (allows the show view to paginate)
+  def track
+    search_session["counter"] = params[:counter]
+    search_session["id"] = params[:search_id]
+    search_session["per_page"] = params[:per_page]
+    search_session["document_id"] = params[:document_id]
+
+    if params[:redirect] && (params[:redirect].starts_with?("/") || params[:redirect] =~ URI::DEFAULT_PARSER.make_regexp)
+      uri = URI.parse(params[:redirect])
+      path = uri.query ? "#{uri.path}?#{uri.query}" : uri.path
+      redirect_to path, status: :see_other
+    else
+      redirect_to({action: :show, id: params[:id]}, status: :see_other)
+    end
+  end
+
+  # displays values and pagination links for a single facet field
+  def facet
+    @facet = blacklight_config.facet_fields[params[:id]]
+    raise ActionController::RoutingError, "Not Found" unless @facet
+
+    @response = search_service.facet_field_response(@facet.key)
+    @display_facet = @response.aggregations[@facet.field]
+
+    @presenter = (@facet.presenter || Blacklight::FacetFieldPresenter).new(@facet, @display_facet, view_context)
+    @pagination = @presenter.paginator
+
+    @pagy = Pagy.new(
+      count: @response.total_count,
+      page_param: "facet.page",
+      page: params["facet.page"],
+      limit: 20
+    )
+
+    respond_to do |format|
+      format.html do
+        # Draw the partial for the "more" facet modal window:
+        return render layout: false if request.xhr?
+        # Otherwise draw the facet selector for users who have javascript disabled.
+      end
+      format.json
+    end
+  end
+
+  # method to serve up XML OpenSearch description and JSON autocomplete response
+  def opensearch
+    respond_to do |format|
+      format.xml { render layout: false }
+      format.json { render json: search_service.opensearch_response }
+    end
+  end
+
+  def suggest
+    respond_to do |format|
+      format.json do
+        render json: suggestions_service.suggestions
+      end
+    end
+  end
+
+  # @return [Array] first value is a Blacklight::Solr::Response and the second
+  #                 is a list of documents
+  def action_documents
+    deprecated_response, @documents = search_service.fetch(Array(params[:id]))
+    raise Blacklight::Exceptions::RecordNotFound if @documents.blank?
+
+    [deprecated_response, @documents]
+  end
+
+  def action_success_redirect_path
+    search_state.url_for_document(blacklight_config.document_model.new(id: params[:id]))
+  end
+
+  ##
+  # Check if any search parameters have been set
+  # @return [Boolean]
+  def has_search_parameters?
+    params[:search_field].present? || search_state.has_constraints?
+  end
+
+  # TODO: deprecate this constant with #facet_limit_for
+  DEFAULT_FACET_LIMIT = 10
+
+  # Look up facet limit for given facet_field. Will look at config, and
+  # if config is 'true' will look up from Solr @response if available. If
+  # no limit is available, returns nil. Used from #add_facetting_to_solr
+  # to supply f.fieldname.facet.limit values in solr request (no @response
+  # available), and used in display (with @response available) to create
+  # a facet paginator with the right limit.
+  def facet_limit_for(facet_field)
+    facet = blacklight_config.facet_fields[facet_field]
+    return if facet.blank?
+
+    if facet.limit && @response && @response.aggregations[facet.field]
+      limit = @response.aggregations[facet.field].limit
+
+      if limit.nil? # we didn't get or a set a limit, so infer one.
+        facet.limit if facet.limit != true
+      elsif limit == -1 # limit -1 is solr-speak for unlimited
+        nil
+      else
+        limit.to_i - 1 # we added 1 to find out if we needed to paginate
+      end
+    elsif facet.limit
+      (facet.limit == true) ? DEFAULT_FACET_LIMIT : facet.limit
+    end
+  end
+  deprecation_deprecate facet_limit_for: "moving to private logic in Blacklight::FacetFieldPresenter"
+
+  private
+
+  #
+  # non-routable methods ->
+  #
+
+  def render_sms_action?(_config, _options)
+    sms_mappings.present?
+  end
+
+  ##
+  # If the params specify a view, then store it in the session. If the params
+  # do not specifiy the view, set the view parameter to the value stored in the
+  # session. This enables a user with a session to do subsequent searches and have
+  # them default to the last used view.
+  def store_preferred_view
+    session[:preferred_view] = params[:view] if params[:view]
+  end
+
+  ##
+  # Render additional response formats for the index action, as provided by the
+  # blacklight configuration
+  # @param [Hash] format
+  # @note Make sure your format has a well known mime-type or is registered in config/initializers/mime_types.rb
+  # @example
+  #   config.index.respond_to.txt = Proc.new { render plain: "A list of docs." }
+  def additional_response_formats(format)
+    blacklight_config.view_config(action_name: :index).respond_to.each do |key, config|
+      format.send key do
+        case config
+        when false
+          raise ActionController::RoutingError, "Not Found"
+        when Hash
+          render config
+        when Proc
+          instance_exec(&config)
+        when Symbol, String
+          send config
+        else
+          render({})
+        end
+      end
+    end
+  end
+
+  ##
+  # Render additional export formats for the show action, as provided by
+  # the document extension framework. See _Blacklight::Document::Export_
+  def additional_export_formats(document, format)
+    document.export_formats.each_key do |format_name|
+      format.send(format_name.to_sym) { render body: document.export_as(format_name), layout: false }
+    end
+  end
+
+  ##
+  # Try to render a response from the document export formats available
+  def document_export_formats(format)
+    format.any do
+      format_name = params.fetch(:format, "").to_sym
+      if @response.export_formats.include? format_name
+        render_document_export_format format_name
+      else
+        raise ActionController::UnknownFormat
+      end
+    end
+  end
+
+  ##
+  # Render the document export formats for a response
+  # First, try to render an appropriate template (e.g. index.endnote.erb)
+  # If that fails, just concatenate the document export responses with a newline.
+  def render_document_export_format format_name
+    render
+  rescue ActionView::MissingTemplate
+    render plain: @response.documents.map { |x| x.export_as(format_name) if x.exports_as? format_name }.compact.join("\n"), layout: false
+  end
+
+  # Overrides the Blacklight::Controller provided #search_action_url.
+  # By default, any search action from a Blacklight::Catalog controller
+  # should use the current controller when constructing the route.
+  def search_action_url options = {}
+    options = options.to_h if options.is_a? Blacklight::SearchState
+    url_for(options.reverse_merge(action: "index"))
+  end
+
+  # Email Action (this will render the appropriate view on GET requests and process the form and send the email on POST requests)
+  def email_action documents
+    mail = RecordMailer.email_record(documents, {to: params[:to], message: params[:message], config: blacklight_config}, url_options)
+    if mail.respond_to? :deliver_now
+      mail.deliver_now
+    else
+      mail.deliver
+    end
+  end
+
+  # SMS action (this will render the appropriate view on GET requests and process the form and send the email on POST requests)
+  def sms_action documents
+    to = "#{params[:to].gsub(/[^\d]/, "")}@#{params[:carrier]}"
+    mail = RecordMailer.sms_record(documents, {to: to, config: blacklight_config}, url_options)
+    if mail.respond_to? :deliver_now
+      mail.deliver_now
+    else
+      mail.deliver
+    end
+  end
+
+  def validate_sms_params
+    if params[:to].blank?
+      flash[:error] = I18n.t("blacklight.sms.errors.to.blank")
+    elsif params[:carrier].blank?
+      flash[:error] = I18n.t("blacklight.sms.errors.carrier.blank")
+    elsif params[:to].gsub(/[^\d]/, "").length != 10
+      flash[:error] = I18n.t("blacklight.sms.errors.to.invalid", to: params[:to])
+    elsif !sms_mappings.value?(params[:carrier])
+      flash[:error] = I18n.t("blacklight.sms.errors.carrier.invalid")
+    end
+
+    flash[:error].blank?
+  end
+
+  def sms_mappings
+    Blacklight::Engine.config.blacklight.sms_mappings
+  end
+
+  def validate_email_params
+    if params[:to].blank?
+      flash[:error] = I18n.t("blacklight.email.errors.to.blank")
+    elsif !params[:to].match(Blacklight::Engine.config.blacklight.email_regexp)
+      flash[:error] = I18n.t("blacklight.email.errors.to.invalid", to: params[:to])
+    end
+
+    flash[:error].blank?
+  end
+
+  def start_new_search_session?
+    action_name == "index"
+  end
+
+  def determine_layout
+    (action_name == "show") ? "catalog_result" : super
+  end
+
+  # when a method throws a Blacklight::Exceptions::InvalidRequest, this method is executed.
+  def handle_request_error(exception)
+    # Rails own code will catch and give usual Rails error page with stack trace
+    raise exception if Rails.env.development? || Rails.env.test?
+
+    flash_notice = I18n.t("blacklight.search.errors.request_error")
+
+    # If there are errors coming from the index page, we want to trap those sensibly
+
+    if flash[:notice] == flash_notice
+      logger&.error "Cowardly aborting rsolr_request_error exception handling, because we redirected to a page that raises another exception"
+      raise exception
+    end
+
+    logger&.error exception
+
+    flash[:notice] = flash_notice
+    redirect_to search_action_url
+  end
+
+  def blacklight_advanced_search_form_search_service
+    form_search_state = search_state_class.new(blacklight_advanced_search_form_params, blacklight_config, self)
+
+    search_service_class.new(config: blacklight_config, search_state: form_search_state, user_params: form_search_state.to_h, **search_service_context)
+  end
+
+  def blacklight_advanced_search_form_params
+    {}
+  end
+end

data/app/helpers/facets_helper.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module FacetsHelper
+  def local_facet_sort_buttons(facet_field)
+    content_tag(:div, class: "sort-options btn-group") do
+      if params["facet.sort"] == "index"
+        content_tag(:span, "A-Z Sort", class: "active az btn btn-outline-secondary", data: {blacklight_modal: "preserve"}) +
+          link_to("Numerical Sort", facet_sort_url("count", facet_field), class: "sort_change numeric btn btn-outline-secondary", data: {blacklight_modal: "preserve"})
+      else
+        link_to("A-Z Sort", facet_sort_url("index", facet_field), class: "sort_change az btn btn-outline-secondary", data: {blacklight_modal: "preserve"}) +
+          content_tag(:span, "Numerical Sort", class: "active numeric btn btn-outline-secondary")
+      end
+    end
+  end
+
+  def facet_sort_url(sort_type, facet_field)
+    url_for(request.query_parameters.merge(:controller => "catalog", :action => "facet", "facet_field" => facet_field, "facet.sort" => sort_type))
+  end
+end

data/app/models/document_data_dictionary.rb

@@ -15,15 +15,27 @@ class DocumentDataDictionary < ApplicationRecord
 
   # Validations
   validates :name, presence: true
-  validates :csv_file, attached: true, content_type: {in: "text/csv", message: "is not a CSV file"}
-
-  validates_with DocumentDataDictionary::CsvHeaderValidator
+  validates :csv_file, content_type: {in: "text/csv", message: "is not a CSV file"}, if: -> { csv_file.attached? }
+  validates_with DocumentDataDictionary::CsvHeaderValidator, if: -> { csv_file.attached? }
+
+  def to_csv
+    CSV.generate do |csv|
+      csv << DocumentDataDictionaryEntry.column_names.excluding("id", "created_at", "updated_at")
+      document_data_dictionary_entries.each do |entry|
+        csv << entry.attributes.values_at(*DocumentDataDictionaryEntry.column_names.excluding("id", "created_at", "updated_at"))
+      end
+    end
+  end
 
   def parse_csv_file
     if csv_file.attached?
       csv_data = CSV.parse(csv_file.download, headers: true)
       csv_data.each do |row|
-        document_data_dictionary_entries.create!(row.to_h)
+        entry = document_data_dictionary_entries.find_or_initialize_by(
+          friendlier_id: row["friendlier_id"],
+          field_name: row["field_name"]
+        )
+        entry.update(row.to_h)
       end
     end
   end

data/app/models/document_data_dictionary_entry.rb

@@ -6,4 +6,5 @@ class DocumentDataDictionaryEntry < ApplicationRecord
 
   # Validations
   validates :friendlier_id, :field_name, presence: true
+  validates :friendlier_id, uniqueness: {scope: :field_name, message: "and field_name combination must be unique"}
 end

data/app/models/document_distribution.rb

@@ -13,6 +13,7 @@ require "csv"
 #
 # Callbacks:
 # - after_save :reindex_document
+# - after_destroy :reindex_document
 #
 # Validations:
 # - Validates presence of :friendlier_id, :reference_type_id, :url
@@ -25,6 +26,7 @@ class DocumentDistribution < ApplicationRecord
   belongs_to :document, foreign_key: :friendlier_id, primary_key: :friendlier_id
   belongs_to :reference_type
   after_save :reindex_document
+  after_destroy :reindex_document
 
   # Validations
   validates :friendlier_id, :reference_type_id, :url, presence: true

data/app/views/admin/document_data_dictionaries/_data_dictionaries_table.html.erb

@@ -7,6 +7,7 @@
         <th>Staff Notes</th>
         <th>Tags</th>
         <th>Entries</th>
+        <th>Export</th>
         <th colspan="2">Actions</th>
       </tr>
     </thead>
@@ -27,6 +28,9 @@
           <td>
             <%= link_to "#{document_data_dictionary.document_data_dictionary_entries.count} entries", admin_document_document_data_dictionary_path(document_data_dictionary.friendlier_id, document_data_dictionary) %>
           </td>
+          <td>
+            <%= link_to 'Export to CSV', admin_document_document_data_dictionary_path(document_data_dictionary.friendlier_id, document_data_dictionary, format: :csv), class: 'btn btn-outline-primary btn-block' %>
+          </td>
           <td>
             <%= link_to 'Edit', edit_admin_document_document_data_dictionary_path(document_data_dictionary.friendlier_id, document_data_dictionary) %>
           </td>

data/app/views/admin/document_data_dictionaries/new.html.erb

@@ -20,8 +20,8 @@
         <tr>
           <th>friendlier_id*</th>
           <th>field_name*</th>
-          <th>field_type*</th>
-          <th>values*</th>
+          <th>field_type</th>
+          <th>values</th>
           <th>definition</th>
           <th>definition_source</th>
           <th>parent_field_name</th>

data/app/views/catalog/_facet_pagination.html.erb

@@ -0,0 +1,6 @@
+<div class="prev_next_links btn-group pagy">
+  <%== pagy_prev_a(@pagy, text: "« Previous", anchor_string: 'class="btn btn-link" data-blacklight-modal="preserve" rel="prev"') %>
+  <%== pagy_next_a(@pagy, text: "Next »", anchor_string: 'class="btn btn-link" data-blacklight-modal="preserve" rel="next"') %>
+</div>
+
+<%= local_facet_sort_buttons(@display_facet.name) %>

data/app/views/catalog/_paginate_compact.html.erb

@@ -0,0 +1,9 @@
+<% if @pagy.pages > 1 %>
+  <section class="pagination">
+    <div class="page-links">
+      <%== pagy_prev_a(@pagy, text: "« Previous") %>
+      <%= "&nbsp; | &nbsp;<strong>#{number_with_delimiter(@pagy.from)} - #{number_with_delimiter(@pagy.to)}</strong>&nbsp; of &nbsp;<strong>#{number_with_delimiter(@pagy.count)}</strong>&nbsp;| &nbsp;".html_safe %>
+      <%== pagy_next_a(@pagy, text: "Next »") %>
+    </div>
+  </section>
+<% end %>

data/app/views/catalog/_results_pagination.html.erb

@@ -0,0 +1,9 @@
+<% if show_pagination? and @response.total_pages > 1 %>
+  <div class="row record-padding">
+    <div class="col-md-12">
+      <section class="pagination">
+        <%= pagy_bootstrap_nav(@pagy).html_safe if @pagy.pages > 1 %>
+      </section>
+    </div>
+  </div>
+<% end %>

data/app/views/catalog/_show_gbl_admin_data_dictionaries.html.erb

@@ -1,6 +1,7 @@
 <% if document&.kithe_model&.document_data_dictionaries.present? %>
   <% document.kithe_model.document_data_dictionaries.each do |dictionary| %>
     <h3><%= dictionary.name %></h3>
+    <p><%= dictionary.description %></p>
     <table class="table table-striped table-bordered">
       <thead class="thead-dark">
         <tr>

data/lib/generators/geoblacklight_admin/config_generator.rb

@@ -420,7 +420,7 @@ module GeoblacklightAdmin
 
     def add_show_gbl_admin_data_dictionaries
       inject_into_file "app/controllers/catalog_controller.rb", after: "# Custom tools for GeoBlacklight" do
-        "\n  config.add_show_tools_partial :gbl_admin_data_dictionaries, partial: 'gbl_admin_data_dictionaries'"
+        "\n   config.add_show_tools_partial :gbl_admin_data_dictionaries, partial: 'gbl_admin_data_dictionaries', if: proc { |_context, _config, options| options[:document] && options[:document]&.kithe_model&.document_data_dictionaries&.present? }"
       end
     end
 

data/lib/generators/geoblacklight_admin/templates/config/initializers/pagy.rb

@@ -1,37 +1,30 @@
 # frozen_string_literal: true
 
-require "pagy"
-
-# Pagy initializer file (6.0.4)
+# Pagy initializer file (9.3.3)
 # Customize only what you really need and notice that the core Pagy works also without any of the following lines.
 # Should you just cherry pick part of this file, please maintain the require-order of the extras
 
-# Pagy DEFAULT Variables
+# Pagy Variables
 # See https://ddnexus.github.io/pagy/docs/api/pagy#variables
-# All the Pagy::DEFAULT are set for all the Pagy instances but can be overridden per instance by just passing them to
+# You can set any pagy variable as a Pagy::DEFAULT. They can also be overridden per instance by just passing them to
 # Pagy.new|Pagy::Countless.new|Pagy::Calendar::*.new or any of the #pagy* controller methods
-
-# Instance variables
-# See https://ddnexus.github.io/pagy/docs/api/pagy#instance-variables
-# Pagy::DEFAULT[:page]   = 1                                  # default
-# Pagy::DEFAULT[:items]  = 20                                 # default
-# Pagy::DEFAULT[:outset] = 0                                  # default
-
-# Other Variables
-# See https://ddnexus.github.io/pagy/docs/api/pagy#other-variables
-# Pagy::DEFAULT[:size]       = [1,4,4,1]                       # default
-# Pagy::DEFAULT[:page_param] = :page                           # default
-# The :params can be also set as a lambda e.g ->(params){ params.exclude('useless').merge!('custom' => 'useful') }
-# Pagy::DEFAULT[:params]     = {}                              # default
-# Pagy::DEFAULT[:fragment]   = '#fragment'                     # example
-# Pagy::DEFAULT[:link_extra] = 'data-remote="true"'            # example
-# Pagy::DEFAULT[:i18n_key]   = 'pagy.item_name'                # default
-# Pagy::DEFAULT[:cycle]      = true                            # example
-# Pagy::DEFAULT[:request_path] = "/foo"                        # example
+# Here are the few that make more sense as DEFAULTs:
+# Pagy::DEFAULT[:limit]       = 20                    # default
+# Pagy::DEFAULT[:size]        = 7                     # default
+# Pagy::DEFAULT[:ends]        = true                  # default
+# Pagy::DEFAULT[:page_param]  = :page                 # default
+# Pagy::DEFAULT[:count_args]  = []                    # example for non AR ORMs
+# Pagy::DEFAULT[:max_pages]   = 3000                  # example
 
 # Extras
 # See https://ddnexus.github.io/pagy/categories/extra
 
+# Legacy Compatibility Extras
+
+# Size extra: Enable the Array type for the `:size` variable (e.g. `size: [1,4,4,1]`)
+# See https://ddnexus.github.io/pagy/docs/extras/size
+# require 'pagy/extras/size'   # must be required before the other extras
+
 # Backend Extras
 
 # Arel extra: For better performance utilizing grouped ActiveRecord collections:
@@ -45,21 +38,12 @@ require "pagy"
 # Calendar extra: Add pagination filtering by calendar time unit (year, quarter, month, week, day)
 # See https://ddnexus.github.io/pagy/docs/extras/calendar
 # require 'pagy/extras/calendar'
-# Default for each unit
-# Pagy::Calendar::Year::DEFAULT[:order]     = :asc        # Time direction of pagination
-# Pagy::Calendar::Year::DEFAULT[:format]    = '%Y'        # strftime format
-#
-# Pagy::Calendar::Quarter::DEFAULT[:order]  = :asc        # Time direction of pagination
-# Pagy::Calendar::Quarter::DEFAULT[:format] = '%Y-Q%q'    # strftime format
-#
-# Pagy::Calendar::Month::DEFAULT[:order]    = :asc        # Time direction of pagination
-# Pagy::Calendar::Month::DEFAULT[:format]   = '%Y-%m'     # strftime format
-#
-# Pagy::Calendar::Week::DEFAULT[:order]     = :asc        # Time direction of pagination
-# Pagy::Calendar::Week::DEFAULT[:format]    = '%Y-%W'     # strftime format
-#
-# Pagy::Calendar::Day::DEFAULT[:order]      = :asc        # Time direction of pagination
-# Pagy::Calendar::Day::DEFAULT[:format]     = '%Y-%m-%d'  # strftime format
+# Default for each calendar unit class in IRB:
+# >> Pagy::Calendar::Year::DEFAULT
+# >> Pagy::Calendar::Quarter::DEFAULT
+# >> Pagy::Calendar::Month::DEFAULT
+# >> Pagy::Calendar::Week::DEFAULT
+# >> Pagy::Calendar::Day::DEFAULT
 #
 # Uncomment the following lines, if you need calendar localization without using the I18n extra
 # module LocalizePagyCalendar
@@ -84,13 +68,17 @@ require "pagy"
 # require 'pagy/extras/elasticsearch_rails'
 
 # Headers extra: http response headers (and other helpers) useful for API pagination
-# See http://ddnexus.github.io/pagy/extras/headers
+# See https://ddnexus.github.io/pagy/docs/extras/headers
 # require 'pagy/extras/headers'
 # Pagy::DEFAULT[:headers] = { page: 'Current-Page',
-#                            items: 'Page-Items',
+#                            limit: 'Page-Items',
 #                            count: 'Total-Count',
 #                            pages: 'Total-Pages' }     # default
 
+# Keyset extra: Paginate with the Pagy keyset pagination technique
+# See https://ddnexus.github.io/pagy/docs/extras/keyset
+# require 'pagy/extras/keyset'
+
 # Meilisearch extra: Paginate `Meilisearch` result objects
 # See https://ddnexus.github.io/pagy/docs/extras/meilisearch
 # Default :pagy_search method: change only if you use also
@@ -102,8 +90,8 @@ require "pagy"
 
 # Metadata extra: Provides the pagination metadata to Javascript frameworks like Vue.js, react.js, etc.
 # See https://ddnexus.github.io/pagy/docs/extras/metadata
-# you must require the frontend helpers internal extra (BEFORE the metadata extra) ONLY if you need also the :sequels
-# require 'pagy/extras/frontend_helpers'
+# you must require the JS Tools internal extra (BEFORE the metadata extra) ONLY if you need also the :sequels
+# require 'pagy/extras/js_tools'
 # require 'pagy/extras/metadata'
 # For performance reasons, you should explicitly set ONLY the metadata you use in the frontend
 # Pagy::DEFAULT[:metadata] = %i[scaffold_url page prev next last]   # example
@@ -112,7 +100,7 @@ require "pagy"
 # See https://ddnexus.github.io/pagy/docs/extras/searchkick
 # Default :pagy_search method: change only if you use also
 # the elasticsearch_rails or meilisearch extra that defines the same
-# DEFAULT[:searchkick_pagy_search] = :pagy_search
+# Pagy::DEFAULT[:searchkick_pagy_search] = :pagy_search
 # Default original :search method called internally to do the actual search
 # Pagy::DEFAULT[:searchkick_search] = :search
 # require 'pagy/extras/searchkick'
@@ -129,58 +117,37 @@ require "pagy/extras/bootstrap"
 # See https://ddnexus.github.io/pagy/docs/extras/bulma
 # require 'pagy/extras/bulma'
 
-# Foundation extra: Add nav, nav_js and combo_nav_js helpers and templates for Foundation pagination
-# See https://ddnexus.github.io/pagy/docs/extras/foundation
-# require 'pagy/extras/foundation'
-
-# Materialize extra: Add nav, nav_js and combo_nav_js helpers for Materialize pagination
-# See https://ddnexus.github.io/pagy/docs/extras/materialize
-# require 'pagy/extras/materialize'
-
-# Navs extra: Add nav_js and combo_nav_js javascript helpers
-# Notice: the other frontend extras add their own framework-styled versions,
-# so require this extra only if you need the unstyled version
-# See https://ddnexus.github.io/pagy/docs/extras/navs
-# require 'pagy/extras/navs'
-
-# Semantic extra: Add nav, nav_js and combo_nav_js helpers for Semantic UI pagination
-# See https://ddnexus.github.io/pagy/docs/extras/semantic
-# require 'pagy/extras/semantic'
-
-# UIkit extra: Add nav helper and templates for UIkit pagination
-# See https://ddnexus.github.io/pagy/docs/extras/uikit
-# require 'pagy/extras/uikit'
+# Pagy extra: Add the pagy styled versions of the javascript-powered navs
+# and a few other components to the Pagy::Frontend module.
+# See https://ddnexus.github.io/pagy/docs/extras/pagy
+require "pagy/extras/pagy"
 
 # Multi size var used by the *_nav_js helpers
-# See https://ddnexus.github.io/pagy/docs/extras/navs#steps
-# Pagy::DEFAULT[:steps] = { 0 => [2,3,3,2], 540 => [3,5,5,3], 720 => [5,7,7,5] }   # example
+# See https://ddnexus.github.io/pagy/docs/extras/pagy#steps
+# Pagy::DEFAULT[:steps] = { 0 => 5, 540 => 7, 720 => 9 }   # example
 
 # Feature Extras
 
-# Gearbox extra: Automatically change the number of items per page depending on the page number
+# Gearbox extra: Automatically change the limit per page depending on the page number
 # See https://ddnexus.github.io/pagy/docs/extras/gearbox
 # require 'pagy/extras/gearbox'
 # set to false only if you want to make :gearbox_extra an opt-in variable
 # Pagy::DEFAULT[:gearbox_extra] = false               # default true
-# Pagy::DEFAULT[:gearbox_items] = [15, 30, 60, 100]   # default
+# Pagy::DEFAULT[:gearbox_limit] = [15, 30, 60, 100]   # default
 
-# Items extra: Allow the client to request a custom number of items per page with an optional selector UI
-# See https://ddnexus.github.io/pagy/docs/extras/items
-# require 'pagy/extras/items'
-# set to false only if you want to make :items_extra an opt-in variable
-# Pagy::DEFAULT[:items_extra] = false    # default true
-# Pagy::DEFAULT[:items_param] = :items   # default
-# Pagy::DEFAULT[:max_items]   = 100      # default
+# Limit extra: Allow the client to request a custom limit per page with an optional selector UI
+# See https://ddnexus.github.io/pagy/docs/extras/limit
+require "pagy/extras/limit"
+# set to false only if you want to make :limit_extra an opt-in variable
+# Pagy::DEFAULT[:limit_extra] = false    # default true
+# Pagy::DEFAULT[:limit_param] = :limit   # default
+Pagy::DEFAULT[:limit_max] = 100      # default
 
 # Overflow extra: Allow for easy handling of overflowing pages
 # See https://ddnexus.github.io/pagy/docs/extras/overflow
 # require 'pagy/extras/overflow'
 # Pagy::DEFAULT[:overflow] = :empty_page    # default  (other options: :last_page and :exception)
 
-# Support extra: Extra support for features like: incremental, infinite, auto-scroll pagination
-# See https://ddnexus.github.io/pagy/docs/extras/support
-# require 'pagy/extras/support'
-
 # Trim extra: Remove the page=1 param from links
 # See https://ddnexus.github.io/pagy/docs/extras/trim
 # require 'pagy/extras/trim'
@@ -192,9 +159,15 @@ require "pagy/extras/bootstrap"
 # require 'pagy/extras/standalone'
 # Pagy::DEFAULT[:url] = 'http://www.example.com/subdir'  # optional default
 
+# Jsonapi extra: Implements JSON:API specifications
+# See https://ddnexus.github.io/pagy/docs/extras/jsonapi
+# require 'pagy/extras/jsonapi'   # must be required after the other extras
+# set to false only if you want to make :jsonapi an opt-in variable
+# Pagy::DEFAULT[:jsonapi] = false  # default true
+
 # Rails
 # Enable the .js file required by the helpers that use javascript
-# (pagy*_nav_js, pagy*_combo_nav_js, and pagy_items_selector_js)
+# (pagy*_nav_js, pagy*_combo_nav_js, and pagy_limit_selector_js)
 # See https://ddnexus.github.io/pagy/docs/api/javascript
 
 # With the asset pipeline
@@ -235,8 +208,5 @@ require "pagy/extras/bootstrap"
 # See https://ddnexus.github.io/pagy/docs/extras/i18n
 # require 'pagy/extras/i18n'
 
-# Default i18n key
-# Pagy::DEFAULT[:i18n_key] = 'pagy.item_name'   # default
-
 # When you are done setting your own default freeze it, so it will not get changed accidentally
 Pagy::DEFAULT.freeze

data/lib/geoblacklight_admin/engine.rb

@@ -18,6 +18,7 @@ module GeoblacklightAdmin
         ActionView::Base.include DocumentHelper
         ActionView::Base.include FormInputHelper
         ActionView::Base.include MappingsHelper
+        ActionView::Base.include FacetsHelper
       end
     end
   end

data/lib/geoblacklight_admin/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight_admin
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Eric Larson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-17 00:00:00.000000000 Z
+date: 2025-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_storage_validations
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.33'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.33'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -296,14 +296,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: paper_trail
   requirement: !ruby/object:Gem::Requirement
@@ -353,9 +353,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -363,9 +360,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.3'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -813,6 +807,7 @@ files:
 - app/assets/stylesheets/geoblacklight_admin/modules/_icons.scss
 - app/assets/stylesheets/geoblacklight_admin/modules/_images.scss
 - app/assets/stylesheets/geoblacklight_admin/modules/_nav.scss
+- app/assets/stylesheets/geoblacklight_admin/modules/_pagy.scss
 - app/assets/stylesheets/geoblacklight_admin/modules/_results.scss
 - app/assets/stylesheets/geoblacklight_admin/modules/_tables.scss
 - app/assets/stylesheets/geoblacklight_admin/modules/_toasts.scss
@@ -842,9 +837,11 @@ files:
 - app/controllers/admin/reference_types_controller.rb
 - app/controllers/admin/search_controller.rb
 - app/controllers/admin/users_controller.rb
+- app/controllers/concerns/blacklight/catalog.rb
 - app/helpers/asset_helper.rb
 - app/helpers/bulk_actions_helper.rb
 - app/helpers/document_helper.rb
+- app/helpers/facets_helper.rb
 - app/helpers/form_input_helper.rb
 - app/helpers/geoblacklight_admin_helper.rb
 - app/helpers/mappings_helper.rb
@@ -1143,7 +1140,10 @@ files:
 - app/views/admin/shared/_schema_timestamp.html.erb
 - app/views/admin/shared/_toast.html.erb
 - app/views/admin/users/index.html.erb
+- app/views/catalog/_facet_pagination.html.erb
 - app/views/catalog/_gbl_admin_data_dictionaries.html.erb
+- app/views/catalog/_paginate_compact.html.erb
+- app/views/catalog/_results_pagination.html.erb
 - app/views/catalog/_show_gbl_admin.html.erb
 - app/views/catalog/_show_gbl_admin_data_dictionaries.html.erb
 - app/views/catalog/data_dictionaries.html.erb