geoblacklight_admin 0.0.1 → 0.2.1

data/app/controllers/admin/document_downloads_controller.rb

@@ -39,7 +39,8 @@ module Admin
       respond_to do |format|
         if @document_download.save
           format.html do
-            redirect_to document_document_downloads_path(@document_download.document), notice: "Document download was successfully created."
+            redirect_to admin_document_document_downloads_path(@document_download.document),
+              notice: "Document download was successfully created."
           end
           format.json { render :show, status: :created, location: @document_download }
         else
@@ -54,7 +55,8 @@ module Admin
       respond_to do |format|
         if @document_download.update(document_download_params)
           format.html do
-            redirect_to document_document_downloads_path(@document_download.document), notice: "Document download was successfully updated."
+            redirect_to admin_document_document_downloads_path(@document_download.document),
+              notice: "Document download was successfully updated."
           end
           format.json { render :show, status: :ok, location: @document_download }
         else
@@ -69,7 +71,7 @@ module Admin
       @document_download.destroy
 
       respond_to do |format|
-        format.html { redirect_to document_downloads_url, notice: "Document download was successfully destroyed." }
+        format.html { redirect_to admin_document_downloads_url, notice: "Document download was successfully destroyed." }
         format.json { head :no_content }
       end
     end
@@ -80,12 +82,12 @@ module Admin
 
       respond_to do |format|
         if DocumentDownload.destroy_all(params.dig(:document_download, :downloads, :file))
-          format.html { redirect_to document_downloads_path, notice: "Download Links were created destroyed." }
+          format.html { redirect_to admin_document_downloads_path, notice: "Download Links were created destroyed." }
         else
-          format.html { redirect_to document_downloads_path, notice: "Download Links could not be destroyed." }
+          format.html { redirect_to admin_document_downloads_path, notice: "Download Links could not be destroyed." }
         end
       rescue => e
-        format.html { redirect_to document_downloads_path, notice: "Download Links could not be destroyed. #{e}" }
+        format.html { redirect_to admin_document_downloads_path, notice: "Download Links could not be destroyed. #{e}" }
       end
     end
 
@@ -97,12 +99,12 @@ module Admin
 
       respond_to do |format|
         if DocumentDownload.import(params.dig(:document_download, :downloads, :file))
-          format.html { redirect_to document_downloads_path, notice: "Download Links were created successfully." }
+          format.html { redirect_to admin_document_downloads_path, notice: "Download Links were created successfully." }
         else
-          format.html { redirect_to document_downloads_path, notice: "Download Links could not be created." }
+          format.html { redirect_to admin_document_downloads_path, notice: "Download Links could not be created." }
         end
       rescue => e
-        format.html { redirect_to document_downloads_path, notice: "Download Links could not be created. #{e}" }
+        format.html { redirect_to admin_document_downloads_path, notice: "Download Links could not be created. #{e}" }
       end
     end
 
@@ -124,4 +126,4 @@ module Admin
       params.require(:document_download).permit(:friendlier_id, :label, :value, :position)
     end
   end
-end
+end

data/app/controllers/admin/documents_controller.rb

@@ -10,6 +10,8 @@ module Admin
     # GET /documents
     # GET /documents.json
     def index
+      @request = "#{request.protocol}#{request.host}:#{request.port}"
+
       query_params = {
         q: params["q"],
         f: params["f"],
@@ -18,7 +20,7 @@ module Admin
         sort: params["sort"] || "score desc",
         daterange: params["daterange"] || nil
       }
-      @documents = BlacklightApi.new(**query_params)
+      @documents = BlacklightApi.new(@request, **query_params)
 
       respond_to do |format|
         format.html { render :index }
@@ -26,37 +28,44 @@ module Admin
 
         # JSON - BTAA Aardvark
         format.json_btaa_aardvark do
-          ExportJsonJob.perform_later(current_user, query_params.merge!({format: "json_btaa_aardvark"}), ExportJsonService)
+          ExportJsonJob.perform_later(@request, current_user, query_params.merge!({format: "json_btaa_aardvark"}),
+            ExportJsonService)
           head :no_content
         end
 
         # JSON - GBL Aardvark
         format.json_aardvark do
-          ExportJsonJob.perform_later(current_user, query_params.merge!({format: "json_aardvark"}), ExportJsonService)
+          ExportJsonJob.perform_later(@request, current_user, query_params.merge!({format: "json_aardvark"}), ExportJsonService)
           head :no_content
         end
 
         # JSON - GBL v1
         format.json_gbl_v1 do
-          ExportJsonJob.perform_later(current_user, query_params.merge!({format: "json_gbl_v1"}), ExportJsonService)
+          ExportJsonJob.perform_later(@request, current_user, query_params.merge!({format: "json_gbl_v1"}), ExportJsonService)
+          head :no_content
+        end
+
+        # JSON - FILE
+        format.json_file do
+          ExportJsonBulkJob.perform_later(@request, current_user, query_params.merge!({format: "json_file"}), ExportJsonService)
           head :no_content
         end
 
         # CSV - B1G
         format.csv do
-          ExportJob.perform_later(current_user, query_params, ExportCsvService)
+          ExportJob.perform_later(@request, current_user, query_params, ExportCsvService)
           head :no_content
         end
 
         # CSV Document Downloads - B1G
         format.csv_document_downloads do
-          ExportJob.perform_later(current_user, query_params, ExportCsvDocumentDownloadsService)
+          ExportJob.perform_later(@request, current_user, query_params, ExportCsvDocumentDownloadsService)
           head :no_content
         end
 
         # CSV Document Access Links - B1G
         format.csv_document_access_links do
-          ExportJob.perform_later(current_user, query_params, ExportCsvDocumentAccessLinksService)
+          ExportJob.perform_later(@request, current_user, query_params, ExportCsvDocumentAccessLinksService)
           head :no_content
         end
       end
@@ -64,6 +73,7 @@ module Admin
 
     # Fetch documents from array of friendlier_ids
     def fetch
+      @request = "#{request.protocol}#{request.host}:#{request.port}"
       @documents = Document.where(friendlier_id: params["ids"])
 
       respond_to do |format|
@@ -72,38 +82,43 @@ module Admin
 
         # JSON - BTAA Aardvark
         format.json_btaa_aardvark do
-          ExportJsonJob.perform_later(current_user, {ids: @documents.pluck(:friendlier_id), format: "json_btaa_aardvark"},
+          ExportJsonJob.perform_later(@request, current_user, {ids: @documents.pluck(:friendlier_id), format: "json_btaa_aardvark"},
             ExportJsonService)
           head :no_content
         end
 
         # JSON - GBL Aardvark
         format.json_aardvark do
-          ExportJsonJob.perform_later(current_user, {ids: @documents.pluck(:friendlier_id), format: "json_aardvark"}, ExportJsonService)
+          ExportJsonJob.perform_later(@request, current_user, {ids: @documents.pluck(:friendlier_id), format: "json_aardvark"},
+            ExportJsonService)
           head :no_content
         end
 
         # JSON - GBL v1
         format.json_gbl_v1 do
-          ExportJsonJob.perform_later(current_user, {ids: @documents.pluck(:friendlier_id), format: "json_gbl_v1"}, ExportJsonService)
+          ExportJsonJob.perform_later(@request, current_user, {ids: @documents.pluck(:friendlier_id), format: "json_gbl_v1"},
+            ExportJsonService)
           head :no_content
         end
 
         # CSV - B1G
         format.csv do
-          ExportJob.perform_later(current_user, {ids: @documents.pluck(:friendlier_id), format: "csv"}, ExportCsvService)
+          ExportJob.perform_later(@request, current_user, {ids: @documents.pluck(:friendlier_id), format: "csv"},
+            ExportCsvService)
           head :no_content
         end
 
         # CSV Document Downloads - B1G
         format.csv_document_downloads do
-          ExportJob.perform_later(current_user, {ids: @documents.pluck(:friendlier_id), format: "csv_document_downloads"}, ExportCsvDocumentDownloadsService)
+          ExportJob.perform_later(@request, current_user,
+            {ids: @documents.pluck(:friendlier_id), format: "csv_document_downloads"}, ExportCsvDocumentDownloadsService)
           head :no_content
         end
 
         # CSV Document Downloads - B1G
         format.csv_document_access_links do
-          ExportJob.perform_later(current_user, {ids: @documents.pluck(:friendlier_id), format: "csv_document_access_links"}, ExportCsvDocumentAccessLinksService)
+          ExportJob.perform_later(@request, current_user,
+            {ids: @documents.pluck(:friendlier_id), format: "csv_document_access_links"}, ExportCsvDocumentAccessLinksService)
           head :no_content
         end
       end
@@ -158,7 +173,9 @@ module Admin
     def destroy
       @document.destroy
       respond_to do |format|
-        format.html { redirect_to admin_documents_url, notice: "Document '#{@document.title}' was successfully destroyed." }
+        format.html do
+          redirect_to admin_documents_url, notice: "Document '#{@document.title}' was successfully destroyed."
+        end
         format.json { head :no_content }
       end
     end
@@ -216,4 +233,4 @@ module Admin
       end
     end
   end
-end
+end

data/app/controllers/admin/elements_controller.rb

@@ -29,7 +29,7 @@ module Admin
 
       respond_to do |format|
         if @element.save
-          format.html { redirect_to element_url(@element), notice: "Element was successfully created." }
+          format.html { redirect_to admin_element_url(@element), notice: "Element was successfully created." }
           format.json { render :show, status: :created, location: @element }
         else
           format.html { render :new, status: :unprocessable_entity }
@@ -42,7 +42,7 @@ module Admin
     def update
       respond_to do |format|
         if @element.update(element_params)
-          format.html { redirect_to element_url(@element), notice: "Element was successfully updated." }
+          format.html { redirect_to admin_element_url(@element), notice: "Element was successfully updated." }
           format.json { render :show, status: :ok, location: @element }
         else
           format.html { render :edit, status: :unprocessable_entity }
@@ -56,7 +56,7 @@ module Admin
       @element.destroy
 
       respond_to do |format|
-        format.html { redirect_to elements_url, notice: "Element was successfully destroyed." }
+        format.html { redirect_to admin_elements_url, notice: "Element was successfully destroyed." }
         format.json { head :no_content }
       end
     end
@@ -75,7 +75,8 @@ module Admin
 
     # Only allow a list of trusted parameters through.
     def element_params
-      params.require(:element).permit(:label, :solr_field, :field_definition, :field_type, :required, :repeatable, :formable, :placeholder_text, :data_entry_hint, :test_fixture_example, :controlled_vocabulary, :js_behaviors, :html_attributes, :display_only_on_persisted, :importable, :import_deliminated, :import_transformation_method, :exportable, :export_transformation_method, :indexable, :index_transformation_method, :validation_method, :position)
+      params.require(:element).permit(:label, :solr_field, :field_definition, :field_type, :required, :repeatable,
+        :formable, :placeholder_text, :data_entry_hint, :test_fixture_example, :controlled_vocabulary, :js_behaviors, :html_attributes, :display_only_on_persisted, :importable, :import_deliminated, :import_transformation_method, :exportable, :export_transformation_method, :indexable, :index_transformation_method, :validation_method, :position)
     end
   end
-end
+end

data/app/controllers/admin/form_elements_controller.rb

@@ -29,7 +29,7 @@ module Admin
 
       respond_to do |format|
         if @form_element.save
-          format.html { redirect_to form_elements_path, notice: "Form element was successfully created." }
+          format.html { redirect_to admin_form_elements_path, notice: "Form element was successfully created." }
           format.json { render :show, status: :created, location: @form_element }
         else
           format.html { render :new, status: :unprocessable_entity }
@@ -42,7 +42,7 @@ module Admin
     def update
       respond_to do |format|
         if @form_element.update(form_element_params)
-          format.html { redirect_to form_element_url(@form_element), notice: "Form element was successfully updated." }
+          format.html { redirect_to admin_form_element_url(@form_element), notice: "Form element was successfully updated." }
           format.json { render :show, status: :ok, location: @form_element }
         else
           format.html { render :edit, status: :unprocessable_entity }
@@ -56,7 +56,7 @@ module Admin
       @form_element.destroy
 
       respond_to do |format|
-        format.html { redirect_to form_elements_url, notice: "Form element was successfully destroyed." }
+        format.html { redirect_to admin_form_elements_url, notice: "Form element was successfully destroyed." }
         format.json { head :no_content }
       end
     end
@@ -78,4 +78,4 @@ module Admin
       params.require(:form_element).permit(:type, :label, :element_solr_field)
     end
   end
-end
+end

data/app/controllers/admin/ids_controller.rb

@@ -1,7 +1,7 @@
-# -*- encoding : utf-8 -*-
 # frozen_string_literal: true
 
-require 'blacklight/catalog'
+require "blacklight/catalog"
+require "blacklight_range_limit/controller_override"
 
 # Admin::IdsController
 module Admin
@@ -10,6 +10,9 @@ module Admin
     include BlacklightRangeLimit::ControllerOverride
     include Blacklight::Catalog
 
+    # No need to auth, only queries Solr
+    skip_before_action :authenticate_admin!
+
     configure_blacklight do |config|
       # special search builder / fails
       config.search_builder_class = ApiSearchBuilder
@@ -18,42 +21,44 @@ 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' => '*:*',
-        'bf' => ["if(exists(#{Settings.FIELDS.B1G_CHILD_RECORD}),0,100)^0.5"],
-        'admin.api' => true
+        "q.alt" => "*:*",
+        "bf" => ["if(exists(#{Settings.FIELDS.B1G_CHILD_RECORD}),0,100)^0.5"],
+        "admin.api" => true
       }
 
       config.default_per_page = 1000 # Works!
@@ -62,8 +67,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
@@ -77,7 +82,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
@@ -115,16 +120,22 @@ module Admin
       ## FACETS
       #
       # Date Range Filter
-      config.add_facet_field 'date_created_drsim', :label => 'Date Created', :show => false
+      # 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
@@ -145,34 +156,34 @@ module Admin
       # ADVANCED SEARCH
       #
       # Code
-      config.add_facet_field Settings.FIELDS.B1G_CODE, label: 'Code', limit: 1000
+      config.add_facet_field Settings.FIELDS.B1G_CODE, label: "Code", limit: 1000
 
       # Is Part Of
-      config.add_facet_field Settings.FIELDS.IS_PART_OF, label: 'Is Part Of', limit: 1000
+      config.add_facet_field Settings.FIELDS.IS_PART_OF, label: "Is Part Of", limit: 1000
 
       # Member Of
-      config.add_facet_field Settings.FIELDS.MEMBER_OF, label: 'Member Of', limit: 1000
+      config.add_facet_field Settings.FIELDS.MEMBER_OF, label: "Member Of", limit: 1000
 
       # Resource Type
-      config.add_facet_field Settings.FIELDS.RESOURCE_TYPE, label: 'Resource Type', limit: 1000
+      config.add_facet_field Settings.FIELDS.RESOURCE_TYPE, label: "Resource Type", limit: 1000
 
       # Subject
-      config.add_facet_field Settings.FIELDS.SUBJECT, label: 'Subject', limit: 1000
+      config.add_facet_field Settings.FIELDS.SUBJECT, label: "Subject", limit: 1000
 
       # Theme
-      config.add_facet_field Settings.FIELDS.THEME, label: 'Theme', limit: 1000
+      config.add_facet_field Settings.FIELDS.THEME, label: "Theme", limit: 1000
 
       # Format
-      config.add_facet_field Settings.FIELDS.FORMAT, label: 'Format', limit: 1000
+      config.add_facet_field Settings.FIELDS.FORMAT, label: "Format", limit: 1000
 
       # Suppressed
-      config.add_facet_field Settings.FIELDS.SUPPRESSED, label: 'Suppressed'
+      config.add_facet_field Settings.FIELDS.SUPPRESSED, label: "Suppressed"
 
       # Child Record
-      config.add_facet_field Settings.FIELDS.B1G_CHILD_RECORD, label: 'Child Record'
+      config.add_facet_field Settings.FIELDS.B1G_CHILD_RECORD, label: "Child Record"
 
       # Georeferenced
-      config.add_facet_field Settings.FIELDS.GEOREFERENCED, label: 'Georeferenced'
+      config.add_facet_field Settings.FIELDS.GEOREFERENCED, label: "Georeferenced"
 
       # 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
@@ -238,48 +249,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
 
@@ -287,37 +298,48 @@ 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'
-      config.add_sort_field 'dct_title_sort asc', :label => 'title'
+      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"
+      config.add_sort_field "dct_title_sort asc", label: "title"
 
       # 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)
@@ -329,30 +351,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
@@ -362,16 +384,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