geoblacklight_admin 0.0.1 → 0.2.1

data/app/controllers/admin/api_controller.rb

@@ -1,5 +1,6 @@
-# -*- encoding : utf-8 -*-
-require 'blacklight/catalog'
+# frozen_string_literal: true
+
+require "blacklight/catalog"
 
 # Admin::ApiController
 module Admin
@@ -18,41 +19,43 @@ module Admin
       config.advanced_search ||= Blacklight::OpenStructWithHashAccess.new
 
       # Blacklight update to 7.0.0
-      config.add_results_document_tool(:bookmark, partial: 'bookmark_control', if: :render_bookmarks_control?)
+      config.add_results_document_tool(:bookmark, partial: "bookmark_control", if: :render_bookmarks_control?)
 
       config.add_results_collection_tool(:sort_widget)
       config.add_results_collection_tool(:per_page_widget)
       config.add_results_collection_tool(:view_type_group)
 
-      config.add_show_tools_partial(:bookmark, partial: 'bookmark_control', if: :render_bookmarks_control?)
+      config.add_show_tools_partial(:bookmark, partial: "bookmark_control", if: :render_bookmarks_control?)
       config.add_show_tools_partial(:email, callback: :email_action, validator: :validate_email_params)
-      config.add_show_tools_partial(:sms, if: :render_sms_action?, callback: :sms_action, validator: :validate_sms_params)
+      config.add_show_tools_partial(:sms, if: :render_sms_action?, callback: :sms_action,
+        validator: :validate_sms_params)
 
-      config.add_nav_action(:bookmark, partial: 'blacklight/nav/bookmark', if: :render_bookmarks_control?)
+      config.add_nav_action(:bookmark, partial: "blacklight/nav/bookmark", if: :render_bookmarks_control?)
       # Blacklight update to 7.0.0
 
       # Advanced config values
       config.advanced_search ||= Blacklight::OpenStructWithHashAccess.new
-      config.advanced_search[:url_key] ||= 'advanced'
-      config.advanced_search[:query_parser] ||= 'edismax'
+      config.advanced_search[:url_key] ||= "advanced"
+      config.advanced_search[:query_parser] ||= "edismax"
       config.advanced_search[:form_solr_parameters] ||= {}
-      config.advanced_search[:form_solr_parameters]['facet.field'] ||= [Settings.FIELDS.PROVIDER, Settings.FIELDS.B1G_CODE, Settings.FIELDS.MEMBER_OF, Settings.FIELDS.IS_PART_OF, Settings.FIELDS.RESOURCE_CLASS, Settings.FIELDS.RESOURCE_TYPE, Settings.FIELDS.SUBJECT, Settings.FIELDS.THEME, Settings.FIELDS.FORMAT, Settings.FIELDS.SUPPRESSED, Settings.FIELDS.B1G_CHILD_RECORD, Settings.FIELDS.GEOREFERENCED]
-      config.advanced_search[:form_solr_parameters]['facet.query'] ||= ''
-      config.advanced_search[:form_solr_parameters]['facet.limit'] ||= -1
-      config.advanced_search[:form_solr_parameters]['facet.sort'] ||= 'index'
+      config.advanced_search[:form_solr_parameters]["facet.field"] ||= [Settings.FIELDS.PROVIDER,
+        Settings.FIELDS.B1G_CODE, Settings.FIELDS.MEMBER_OF, Settings.FIELDS.IS_PART_OF, Settings.FIELDS.RESOURCE_CLASS, Settings.FIELDS.RESOURCE_TYPE, Settings.FIELDS.SUBJECT, Settings.FIELDS.THEME, Settings.FIELDS.FORMAT, Settings.FIELDS.SUPPRESSED, Settings.FIELDS.B1G_CHILD_RECORD, Settings.FIELDS.GEOREFERENCED]
+      config.advanced_search[:form_solr_parameters]["facet.query"] ||= ""
+      config.advanced_search[:form_solr_parameters]["facet.limit"] ||= -1
+      config.advanced_search[:form_solr_parameters]["facet.sort"] ||= "index"
 
       # Map views
       config.view.mapview.partials = [:index]
-      config.view['split'].title = "List view"
-      config.view['mapview'].title = "Map view"
+      config.view["split"].title = "List view"
+      config.view["mapview"].title = "Map view"
 
       config.raw_endpoint.enabled = true
 
       ## Default parameters to send to solr for all search-like requests. See also SolrHelper#solr_search_params
       config.default_solr_params = {
         :start => 0,
-        'q.alt' => '*:*',
-        'admin.api' => true
+        "q.alt" => "*:*",
+        "admin.api" => true
       }
 
       # @TODO
@@ -65,8 +68,8 @@ module Admin
       ## parameters included in the Blacklight-jetty document requestHandler.
       #
       config.default_document_solr_params = {
-       :qt => 'document',
-       :q => "{!raw f=#{Settings.FIELDS.B1G_GEOMG_ID} v=$id}"
+        qt: "document",
+        q: "{!raw f=#{Settings.FIELDS.B1G_GEOMG_ID} v=$id}"
       }
 
       # config.search_builder_class = Geoblacklight::SearchBuilder
@@ -80,7 +83,7 @@ module Admin
 
       # solr field configuration for document/show views
 
-      config.show.display_type_field = 'format'
+      config.show.display_type_field = "format"
 
       # Custom GeoBlacklight fields which currently map to GeoBlacklight-Schema
       # v0.3.2
@@ -121,29 +124,29 @@ module Admin
       # config.add_facet_field 'date_created_drsim', :label => 'Date Created', :show => false
 
       # Date Created
-      # config.add_facet_field 'time_period', label: 'Date Created', query: {
-      #  'today' => { label: 'Today', fq: "date_created_drsim:[#{Date.today.beginning_of_day.to_time.strftime('%Y-%m-%dT%H:%M:%S')} TO #{Date.today.end_of_day.to_time.strftime('%Y-%m-%dT%H:%M:%S')}]"},
-      #  'this_week' => { label: 'This week', fq: "date_created_drsim:[#{(Date.today.end_of_day - 1.week).to_time.strftime('%Y-%m-%dT%H:%M:%S')} TO  #{Date.today.end_of_day.to_time.strftime('%Y-%m-%dT%H:%M:%S')}]"},
-      #  'this_month' => { label: 'This month', fq: "date_created_drsim:[#{(Date.today.end_of_day - 1.month).to_time.strftime('%Y-%m-%dT%H:%M:%S')} TO  #{Date.today.end_of_day.to_time.strftime('%Y-%m-%dT%H:%M:%S')}]"},
-      #  'last_month' => { label: 'Last month', fq: "date_created_drsim:[#{(Date.today.end_of_day - 2.months).to_time.strftime('%Y-%m-%dT%H:%M:%S')} TO  #{(Date.today.end_of_day - 1.month).to_time.strftime('%Y-%m-%dT%H:%M:%S')}]"},
-      #  'this_quarter' => { label: 'This quarter', fq: "date_created_drsim:[#{(Date.today.end_of_day - 3.months).to_time.strftime('%Y-%m-%dT%H:%M:%S')} TO  #{(Date.today.end_of_day).to_time.strftime('%Y-%m-%dT%H:%M:%S')}]"},
-      #  'this_year' => { label: 'This year', fq: "date_created_drsim:[#{(Date.today.end_of_day - 1.year).to_time.strftime('%Y-%m-%dT%H:%M:%S')} TO  #{(Date.today.end_of_day).to_time.strftime('%Y-%m-%dT%H:%M:%S')}]"}
-      # }
+      config.add_facet_field "time_period", label: "Date Created", query: {
+        "today" => {label: "Today", fq: "date_created_drsim:[#{Date.today.beginning_of_day.to_time.strftime("%Y-%m-%dT%H:%M:%S")} TO #{Date.today.end_of_day.to_time.strftime("%Y-%m-%dT%H:%M:%S")}]"},
+        "this_week" => {label: "This week", fq: "date_created_drsim:[#{(Date.today.end_of_day - 1.week).to_time.strftime("%Y-%m-%dT%H:%M:%S")} TO  #{Date.today.end_of_day.to_time.strftime("%Y-%m-%dT%H:%M:%S")}]"},
+        "this_month" => {label: "This month", fq: "date_created_drsim:[#{(Date.today.end_of_day - 1.month).to_time.strftime("%Y-%m-%dT%H:%M:%S")} TO  #{Date.today.end_of_day.to_time.strftime("%Y-%m-%dT%H:%M:%S")}]"},
+        "last_month" => {label: "Last month", fq: "date_created_drsim:[#{(Date.today.end_of_day - 2.months).to_time.strftime("%Y-%m-%dT%H:%M:%S")} TO  #{(Date.today.end_of_day - 1.month).to_time.strftime("%Y-%m-%dT%H:%M:%S")}]"},
+        "this_quarter" => {label: "This quarter", fq: "date_created_drsim:[#{(Date.today.end_of_day - 3.months).to_time.strftime("%Y-%m-%dT%H:%M:%S")} TO  #{Date.today.end_of_day.to_time.strftime("%Y-%m-%dT%H:%M:%S")}]"},
+        "this_year" => {label: "This year", fq: "date_created_drsim:[#{(Date.today.end_of_day - 1.year).to_time.strftime("%Y-%m-%dT%H:%M:%S")} TO  #{Date.today.end_of_day.to_time.strftime("%Y-%m-%dT%H:%M:%S")}]"}
+      }
 
       # Publication State
-      # config.add_facet_field Settings.FIELDS.B1G_PUBLICATION_STATE, :label => 'Publication State', :limit => 8, collapse: false
+      config.add_facet_field Settings.FIELDS.B1G_PUBLICATION_STATE, label: "Publication State", limit: 8, collapse: false
 
       # Resouce Class
-      config.add_facet_field Settings.FIELDS.RESOURCE_CLASS, label: 'Resource Class', limit: 8
+      config.add_facet_field Settings.FIELDS.RESOURCE_CLASS, label: "Resource Class", limit: 8
 
       # Contributor
-      config.add_facet_field Settings.FIELDS.PROVIDER, label: 'Provider', limit: 15
+      config.add_facet_field Settings.FIELDS.PROVIDER, label: "Provider", limit: 15
 
       # Accrual Method
       # config.add_facet_field Settings.FIELDS.B1G_ACCRUAL_METHOD, :label => 'Accrual Method'
 
       # Public/Restricted
-      config.add_facet_field Settings.FIELDS.ACCESS_RIGHTS, :label => 'Public/Restricted'
+      config.add_facet_field Settings.FIELDS.ACCESS_RIGHTS, label: "Public/Restricted"
 
       # ADVANCED SEARCH
       #
@@ -151,31 +154,31 @@ module Admin
       # config.add_facet_field Settings.FIELDS.B1G_CODE, label: 'Code', show: false
 
       # Is Part Of
-      config.add_facet_field Settings.FIELDS.IS_PART_OF, label: 'Is Part Of', show: false
+      config.add_facet_field Settings.FIELDS.IS_PART_OF, label: "Is Part Of", show: false
 
       # Member Of
-      config.add_facet_field Settings.FIELDS.MEMBER_OF, label: 'Member Of', show: false
+      config.add_facet_field Settings.FIELDS.MEMBER_OF, label: "Member Of", show: false
 
       # Resource Type
-      config.add_facet_field Settings.FIELDS.RESOURCE_TYPE, label: 'Resource Type', show: false
+      config.add_facet_field Settings.FIELDS.RESOURCE_TYPE, label: "Resource Type", show: false
 
       # Subject
-      config.add_facet_field Settings.FIELDS.SUBJECT, label: 'Subject', show: false
+      config.add_facet_field Settings.FIELDS.SUBJECT, label: "Subject", show: false
 
       # Theme
-      config.add_facet_field Settings.FIELDS.THEME, label: 'Theme', show: false
+      config.add_facet_field Settings.FIELDS.THEME, label: "Theme", show: false
 
       # Format
-      config.add_facet_field Settings.FIELDS.FORMAT, label: 'Format', show: false
+      config.add_facet_field Settings.FIELDS.FORMAT, label: "Format", show: false
 
       # Suppressed
-      config.add_facet_field Settings.FIELDS.SUPPRESSED, label: 'Suppressed', show: false
+      config.add_facet_field Settings.FIELDS.SUPPRESSED, label: "Suppressed", show: false
 
       # Child Record
       # config.add_facet_field Settings.FIELDS.B1G_CHILD_RECORD, label: 'Child Record', show: false
 
       # Georeferenced
-      config.add_facet_field Settings.FIELDS.GEOREFERENCED, label: 'Georeferenced', show: false
+      config.add_facet_field Settings.FIELDS.GEOREFERENCED, label: "Georeferenced", show: false
 
       # Have BL send all facet field names to Solr, which has been the default
       # previously. Simply remove these lines if you'd rather use Solr request
@@ -194,17 +197,17 @@ module Admin
       # config.add_index_field 'published_vern_display', :label => 'Published:'
       # config.add_index_field 'lc_callnum_display', :label => 'Call number:'
 
-      config.add_index_field Settings.FIELDS.TITLE, :label => 'Title:'
+      config.add_index_field Settings.FIELDS.TITLE, label: "Title:"
       # config.add_index_field Settings.FIELDS.B1G_GEOMG_ID, :label => 'Identifier:'
-      config.add_index_field Settings.FIELDS.PROVIDER, :label => 'Institution:'
-      config.add_index_field Settings.FIELDS.ACCESS_RIGHTS, :label => 'Access:'
-      config.add_index_field Settings.FIELDS.SUBJECT, :label => 'Keywords:'
-      config.add_index_field Settings.FIELDS.CENTROID, :label => 'Centroid:'
+      config.add_index_field Settings.FIELDS.PROVIDER, label: "Institution:"
+      config.add_index_field Settings.FIELDS.ACCESS_RIGHTS, label: "Access:"
+      config.add_index_field Settings.FIELDS.SUBJECT, label: "Keywords:"
+      config.add_index_field Settings.FIELDS.CENTROID, label: "Centroid:"
       config.add_index_field Settings.FIELDS.INDEX_YEAR
       config.add_index_field Settings.FIELDS.CREATOR
       config.add_index_field Settings.FIELDS.DESCRIPTION, helper_method: :snippit
       config.add_index_field Settings.FIELDS.PUBLISHER
-      config.add_index_field Settings.FIELDS.SUPPRESSED, :label => 'Suppressed:'
+      config.add_index_field Settings.FIELDS.SUPPRESSED, label: "Suppressed:"
 
       # solr fields to be displayed in the show (single result) view
       #  The ordering of the field names is the order of the display
@@ -212,16 +215,19 @@ module Admin
       # item_prop: [String] property given to span with Schema.org item property
       # link_to_facet: [Boolean] that can be passed to link to a facet search
       # helper_method: [Symbol] method that can be used to render the value
-      config.add_show_field Settings.FIELDS.CREATOR, label: 'Creator', itemprop: 'creator'
-      config.add_show_field Settings.FIELDS.DESCRIPTION, label: 'Description', itemprop: 'description', helper_method: :render_value_as_truncate_abstract
-      config.add_show_field Settings.FIELDS.PUBLISHER, label: 'Publisher', itemprop: 'publisher', link_to_facet: true
-      config.add_show_field Settings.FIELDS.SPATIAL_COVERAGE, label: 'Place', itemprop: 'spatial', link_to_facet: true, helper_method: :render_placenames_as_truncate_abstract
-      config.add_show_field Settings.FIELDS.SUBJECT, label: 'Subject', itemprop: 'keywords', link_to_facet: true
-      config.add_show_field Settings.FIELDS.RESOURCE_TYPE, label: 'Type', itemprop: 'keywords', link_to_facet: true
-      config.add_show_field Settings.FIELDS.DATE_ISSUED, label: 'Date Published', itemprop: 'keywords', link_to_facet: true
-      config.add_show_field Settings.FIELDS.TEMPORAL_COVERAGE, label: 'Temporal Coverage', itemprop: 'temporal'
-      config.add_show_field Settings.FIELDS.PROVIDER, label: 'Contributed by', link_to_facet: true
-      config.add_show_field Settings.FIELDS.RIGHTS, label: 'Access Rights'
+      config.add_show_field Settings.FIELDS.CREATOR, label: "Creator", itemprop: "creator"
+      config.add_show_field Settings.FIELDS.DESCRIPTION, label: "Description", itemprop: "description",
+        helper_method: :render_value_as_truncate_abstract
+      config.add_show_field Settings.FIELDS.PUBLISHER, label: "Publisher", itemprop: "publisher", link_to_facet: true
+      config.add_show_field Settings.FIELDS.SPATIAL_COVERAGE, label: "Place", itemprop: "spatial", link_to_facet: true,
+        helper_method: :render_placenames_as_truncate_abstract
+      config.add_show_field Settings.FIELDS.SUBJECT, label: "Subject", itemprop: "keywords", link_to_facet: true
+      config.add_show_field Settings.FIELDS.RESOURCE_TYPE, label: "Type", itemprop: "keywords", link_to_facet: true
+      config.add_show_field Settings.FIELDS.DATE_ISSUED, label: "Date Published", itemprop: "keywords",
+        link_to_facet: true
+      config.add_show_field Settings.FIELDS.TEMPORAL_COVERAGE, label: "Temporal Coverage", itemprop: "temporal"
+      config.add_show_field Settings.FIELDS.PROVIDER, label: "Contributed by", link_to_facet: true
+      config.add_show_field Settings.FIELDS.RIGHTS, label: "Access Rights"
 
       # "fielded" search configuration. Used by pulldown among other places.
       # For supported keys in hash, see rdoc for Blacklight::SearchFields
@@ -241,48 +247,48 @@ module Admin
       # solr request handler? The one set in config[:default_solr_parameters][:qt],
       # since we aren't specifying it otherwise.
 
-      config.add_search_field('all_fields') do |field|
+      config.add_search_field("all_fields") do |field|
         field.include_in_advanced_search = false
-        field.label = 'All Fields'
+        field.label = "All Fields"
       end
 
-      config.add_search_field('keyword') do |field|
+      config.add_search_field("keyword") do |field|
         field.include_in_simple_select = false
-        field.qt = 'search'
-        field.label = 'Keyword'
+        field.qt = "search"
+        field.label = "Keyword"
         field.solr_local_parameters = {
-          qf: '$qf',
-          pf: '$pf'
+          qf: "$qf",
+          pf: "$pf"
         }
       end
 
-      config.add_search_field('title') do |field|
+      config.add_search_field("title") do |field|
         field.include_in_simple_select = false
-        field.qt = 'search'
-        field.label = 'Title'
+        field.qt = "search"
+        field.label = "Title"
         field.solr_local_parameters = {
-          qf: '$title_qf',
-          pf: '$title_pf'
+          qf: "$title_qf",
+          pf: "$title_pf"
         }
       end
 
-      config.add_search_field('placename') do |field|
+      config.add_search_field("placename") do |field|
         field.include_in_simple_select = false
-        field.qt = 'search'
-        field.label = 'Place'
+        field.qt = "search"
+        field.label = "Place"
         field.solr_local_parameters = {
-          qf: '$placename_qf',
-          pf: '$placename_pf'
+          qf: "$placename_qf",
+          pf: "$placename_pf"
         }
       end
 
-      config.add_search_field('publisher') do |field|
+      config.add_search_field("publisher") do |field|
         field.include_in_simple_select = false
-        field.qt = 'search'
-        field.label = 'Publisher/Creator'
+        field.qt = "search"
+        field.label = "Publisher/Creator"
         field.solr_local_parameters = {
-          qf: '$publisher_qf',
-          pf: '$publisher_pf'
+          qf: "$publisher_qf",
+          pf: "$publisher_pf"
         }
       end
 
@@ -290,41 +296,52 @@ module Admin
       # label in pulldown is followed by the name of the SOLR field to sort by and
       # whether the sort is ascending or descending (it must be asc or desc
       # except in the relevancy case).
-      config.add_sort_field 'score desc, dct_title_sort asc', :label => 'Relevance'
-      config.add_sort_field "#{Settings.FIELDS.INDEX_YEAR} desc, dct_title_sort asc", :label => 'Year (Newest first)'
-      config.add_sort_field "#{Settings.FIELDS.INDEX_YEAR} asc, dct_title_sort asc", :label => 'Year (Oldest first)'
-      config.add_sort_field 'dct_title_sort asc', :label => 'Title (A-Z)'
-      config.add_sort_field 'dct_title_sort desc', :label => 'Title (Z-A)'
-      config.add_sort_field 'date_modified_dtsi desc', :label => 'Updated At (Newest first)'
-      config.add_sort_field 'date_modified_dtsi asc', :label => 'Updated At (Oldest first)'
+      config.add_sort_field "score desc, dct_title_sort asc", label: "Relevance"
+      config.add_sort_field "#{Settings.FIELDS.INDEX_YEAR} desc, dct_title_sort asc", label: "Year (Newest first)"
+      config.add_sort_field "#{Settings.FIELDS.INDEX_YEAR} asc, dct_title_sort asc", label: "Year (Oldest first)"
+      config.add_sort_field "dct_title_sort asc", label: "Title (A-Z)"
+      config.add_sort_field "dct_title_sort desc", label: "Title (Z-A)"
+      config.add_sort_field "date_modified_dtsi desc", label: "Updated At (Newest first)"
+      config.add_sort_field "date_modified_dtsi asc", label: "Updated At (Oldest first)"
 
       # If there are more than this many search results, no spelling ("did you
       # mean") suggestion is offered.
       config.spell_max = 5
 
       # Custom tools for GeoBlacklight
-      config.add_show_tools_partial :more_details, partial: 'more_details', if: proc { |_context, _config, options| options[:document] && (!options[:document].references.nil? & !options[:document].references.url.nil?)}
-      config.add_show_tools_partial :metadata, if: proc { |_context, _config, options| options[:document] && (Settings.METADATA_SHOWN & options[:document].references.refs.map(&:type).map(&:to_s)).any? }
-      config.add_show_tools_partial :web_services, if: proc { |_context, _config, options| options[:document] && (Settings.WEBSERVICES_SHOWN & options[:document].references.refs.map(&:type).map(&:to_s)).any? }
-      config.add_show_tools_partial :exports, partial: 'exports', if: proc { |_context, _config, options| options[:document] }
-      config.add_show_tools_partial :data_dictionary, partial: 'data_dictionary', if: proc { |_context, _config, options| options[:document] && options[:document].data_dictionary_download.present?}
+      config.add_show_tools_partial :more_details, partial: "more_details", if: proc { |_context, _config, options|
+                                                                                  options[:document] && (!options[:document].references.nil? & !options[:document].references.url.nil?)
+                                                                                }
+      config.add_show_tools_partial :metadata, if: proc { |_context, _config, options|
+                                                     options[:document] && (Settings.METADATA_SHOWN & options[:document].references.refs.map(&:type).map(&:to_s)).any?
+                                                   }
+      config.add_show_tools_partial :web_services, if: proc { |_context, _config, options|
+                                                         options[:document] && (Settings.WEBSERVICES_SHOWN & options[:document].references.refs.map(&:type).map(&:to_s)).any?
+                                                       }
+      config.add_show_tools_partial :exports, partial: "exports", if: proc { |_context, _config, options|
+                                                                        options[:document]
+                                                                      }
+      config.add_show_tools_partial :data_dictionary, partial: "data_dictionary", if: proc { |_context, _config, options|
+                                                                                        options[:document] && options[:document].data_dictionary_download.present?
+                                                                                      }
       config.add_show_tools_partial(:citation)
-      config.add_show_tools_partial(:access_links, partial: 'access_links', if: proc { |_context, _config, options| options[:document] && options[:document].access_links.present?})
+      config.add_show_tools_partial(:access_links, partial: "access_links", if: proc { |_context, _config, options|
+                                                                                  options[:document] && options[:document].access_links.present?
+                                                                                })
 
       # Remove nav actions
-      config.add_nav_action(:bookmark, partial: 'blacklight/nav/bookmark', if: false)
+      config.add_nav_action(:bookmark, partial: "blacklight/nav/bookmark", if: false)
 
       # Remove show tools
       config.show.partials.delete(:show_header)
       config.show.partials.delete(:show)
 
-      config.show.display_type_field = 'format'
-      config.show.partials << 'show_header'
-      config.show.partials << 'show_default_viewer_container'
-      config.show.partials << 'show_default_viewer_information'
-      config.show.partials << 'show_default_attribute_table'
-      config.show.partials << 'show'
-
+      config.show.display_type_field = "format"
+      config.show.partials << "show_header"
+      config.show.partials << "show_default_viewer_container"
+      config.show.partials << "show_default_viewer_information"
+      config.show.partials << "show_default_attribute_table"
+      config.show.partials << "show"
 
       config.show.document_actions.delete(:email)
       config.show.document_actions.delete(:bookmark)
@@ -336,30 +353,30 @@ module Admin
       # 'mapquest' http://developer.mapquest.com/web/products/open/map
       # 'positron' http://cartodb.com/basemaps/
       # 'darkMatter' http://cartodb.com/basemaps/
-      config.basemap_provider = 'esri'
-      config.max_per_page = 100000
+      config.basemap_provider = "esri"
+      config.max_per_page = 100_000
 
       # Configuration for autocomplete suggestor
       config.autocomplete_enabled = true
-      config.autocomplete_path = 'suggest'
+      config.autocomplete_path = "suggest"
     end
 
     # Administrative view of document
     # - Sidecar Image
     # - URIs
     def admin
-      deprecated_response, @document = search_service.fetch(params[:id])
+      _, @document = search_service.fetch(params[:id])
     end
 
     # Administrative view for array of document ids
     # - bookmarks
     def fetch
-      @response, deprecated_document_list = search_service.fetch(params[:id])
+      @response, = search_service.fetch(params[:id])
 
       respond_to do |format|
         format.json do
           @presenter = Blacklight::JsonPresenter.new(@response,
-                                                     blacklight_config)
+            blacklight_config)
         end
       end
     end
@@ -369,16 +386,14 @@ module Admin
       # We want to find the facets available for the current search, but:
       # * IGNORING current query (add in facets_for_advanced_search_form filter)
       # * IGNORING current advanced search facets (remove add_advanced_search_to_solr filter)
-      @response, _ = search_service.search_results do |search_builder|
+      @response, = search_service.search_results do |search_builder|
         search_builder.except(:add_advanced_search_to_solr).append(:facets_for_advanced_search_form)
       end
 
-      @response
-
       respond_to do |format|
         format.json do
           @presenter = Blacklight::JsonPresenter.new(@response,
-                                                     blacklight_config)
+            blacklight_config)
         end
       end
     end

data/app/controllers/admin/bookmarks_controller.rb

@@ -9,7 +9,7 @@ module Admin
     # GET /bookmarks
     # GET /bookmarks.json
     def index
-      @pagy, @bookmarks = pagy(current_user.bookmarks)
+      @pagy, @bookmarks = pagy(current_user.bookmarks.where(document_type: "Kithe::Model"))
 
       respond_to do |format|
         format.html { render :index }
@@ -21,7 +21,7 @@ module Admin
     # POST /bookmarks
     # POST /bookmarks.json
     def create
-      @bookmark = Bookmark.find_or_create_by(user: current_user, document: @document)
+      @bookmark = Admin::Bookmark.find_or_create_by(user: current_user, document: @document)
 
       respond_to do |format|
         if @bookmark.save
@@ -37,7 +37,7 @@ module Admin
     # DELETE /bookmarks/1
     # DELETE /bookmarks/1.json
     def destroy
-      Bookmark.destroy_by(user: current_user, document: @document)
+      Admin::Bookmark.destroy_by(user: current_user, document: @document)
 
       respond_to do |format|
         format.html { redirect_to bookmarks_url, notice: "Bookmark was successfully destroyed." }
@@ -65,4 +65,4 @@ module Admin
       end
     end
   end
-end
+end

data/app/controllers/admin/bulk_actions_controller.rb

@@ -34,7 +34,9 @@ module Admin
 
       respond_to do |format|
         if @bulk_action.save
-          format.html { redirect_to admin_bulk_action_path(@bulk_action), notice: "Bulk action was successfully created." }
+          format.html do
+            redirect_to admin_bulk_action_path(@bulk_action), notice: "Bulk action was successfully created."
+          end
           format.json { render :show, status: :created, location: @bulk_action }
         else
           format.html { render :new }
@@ -48,7 +50,9 @@ module Admin
     def update
       respond_to do |format|
         if @bulk_action.update(bulk_action_params)
-          format.html { redirect_to admin_bulk_action_path(@bulk_action), notice: "Bulk action was successfully updated." }
+          format.html do
+            redirect_to admin_bulk_action_path(@bulk_action), notice: "Bulk action was successfully updated."
+          end
           format.json { render :show, status: :ok, location: @bulk_action }
         else
           format.html { render :edit }
@@ -76,7 +80,8 @@ module Admin
     def revert
       @bulk_action.revert!
       @bulk_action.state_machine.transition_to!(:queued)
-      redirect_to admin_bulk_action_url(@bulk_action), notice: "Revert bulk action is running. Check back soon for results."
+      redirect_to admin_bulk_action_url(@bulk_action),
+        notice: "Revert bulk action is running. Check back soon for results."
     end
 
     private
@@ -91,4 +96,4 @@ module Admin
       params.fetch(:bulk_action, {})
     end
   end
-end
+end

data/app/controllers/admin/concerns/upload_util.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module UploadUtil
   def self.kithe_upload_data_config(toggle_value: "kithe-upload")
     {

data/app/controllers/admin/document_accesses_controller.rb

@@ -39,7 +39,9 @@ module Admin
 
       respond_to do |format|
         if @document_access.save
-          format.html { redirect_to document_document_accesses_path(@document), notice: "Document access was successfully created." }
+          format.html do
+            redirect_to admin_document_document_accesses_path(@document), notice: "Document access was successfully created."
+          end
           format.json { render :show, status: :created, location: @document_access }
         else
           format.html { render :new }
@@ -53,7 +55,9 @@ module Admin
     def update
       respond_to do |format|
         if @document_access.update(document_access_params)
-          format.html { redirect_to document_document_accesses_path(@document), notice: "Document access was successfully updated." }
+          format.html do
+            redirect_to admin_document_document_accesses_path(@document), notice: "Document access was successfully updated."
+          end
           format.json { render :show, status: :ok, location: @document_access }
         else
           format.html { render :edit }
@@ -67,7 +71,9 @@ module Admin
     def destroy
       @document_access.destroy
       respond_to do |format|
-        format.html { redirect_to document_document_accesses_path(@document), notice: "Document access was successfully destroyed." }
+        format.html do
+          redirect_to admin_document_document_accesses_path(@document), notice: "Document access was successfully destroyed."
+        end
         format.json { head :no_content }
       end
     end
@@ -122,4 +128,4 @@ module Admin
       params.require(:document_access).permit(:friendlier_id, :institution_code, :access_url)
     end
   end
-end
+end

data/app/controllers/admin/document_assets_controller.rb

@@ -24,11 +24,11 @@ module Admin
       @asset = Kithe::Asset.find_by_friendlier_id!(params[:id])
       authorize! :read, @asset
 
-      if @asset.stored?
-        @checks = @asset.fixity_checks.order("created_at asc")
-        @latest_check = @checks.last
-        @earliest_check = @checks.first
-      end
+      return unless @asset.stored?
+
+      @checks = @asset.fixity_checks.order("created_at asc")
+      @latest_check = @checks.last
+      @earliest_check = @checks.first
     end
 
     def edit
@@ -58,7 +58,10 @@ module Admin
       @asset.destroy
 
       respond_to do |format|
-        format.html { redirect_to document_document_assets_path(@document), notice: "Asset '#{@asset.title}' was successfully destroyed." }
+        format.html do
+          redirect_to document_document_assets_path(@document),
+            notice: "Asset '#{@asset.title}' was successfully destroyed."
+        end
         format.json { head :no_content }
       end
     end
@@ -105,9 +108,7 @@ module Admin
         asset.save!
       end
 
-      if @parent.representative_id.nil?
-        @parent.update(representative: @parent.members.order(:position).first)
-      end
+      @parent.update(representative: @parent.members.order(:position).first) if @parent.representative_id.nil?
 
       redirect_to document_path(@parent.friendlier_id, anchor: "nav-members")
     end
@@ -155,7 +156,8 @@ module Admin
 
       RefreshActiveEncodeStatusJob.perform_later(status)
 
-      redirect_to admin_asset_url(status.asset), notice: "Started refresh for ActiveEncode job #{status.active_encode_id}"
+      redirect_to admin_asset_url(status.asset),
+        notice: "Started refresh for ActiveEncode job #{status.active_encode_id}"
     end
 
     def work_is_oral_history?
@@ -175,6 +177,7 @@ module Admin
 
     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
@@ -195,4 +198,4 @@ module Admin
       params.require(:asset).permit(*allowed_params)
     end
   end
-end
+end