geoblacklight_admin 0.0.1 → 0.1.0

data/app/controllers/admin/notifications_controller.rb

@@ -48,4 +48,4 @@ module Admin
       @notification = Notification.find(params[:id])
     end
   end
-end
+end

data/app/controllers/admin/search_controller.rb

@@ -7,4 +7,4 @@ module Admin
       @facet_options = BlacklightApiFacets.new.facets
     end
   end
-end
+end

data/app/controllers/admin/users_controller.rb

@@ -7,4 +7,4 @@ module Admin
       @users = User.all
     end
   end
-end
+end

data/app/helpers/form_input_helper.rb

@@ -47,7 +47,7 @@ module FormInputHelper
     category_list = [existing_category_value] + category_list unless category_list.include?(existing_category_value)
 
     # Turn category list into values and human labels, using i18n or rails humanizing.
-    category_list = category_list.collect { |key|
+    category_list = category_list.collect do |key|
       value = if key.nil?
         key
       elsif model_class.respond_to?(:model_name) && key.present?
@@ -59,15 +59,15 @@ module FormInputHelper
       end
 
       [value, key]
-    }.to_h
+    end.to_h
 
     tag.div(class: "form-row category-and-value") do
       tag.div(class: "col-left category") {
         builder.input category_key, collection: category_list, label: false, include_blank: false
       } +
-        tag.div(class: "col-sm value") {
+        tag.div(class: "col-sm value") do
           builder.input value_key, label: false, input_html: {data: input_data_attributes}
-        }
+        end
     end
   end
 end

data/app/helpers/geoblacklight_admin_helper.rb

@@ -5,7 +5,7 @@ module GeoblacklightAdminHelper
   # @TODO:
   # Cannot generate app if uncommented...
   # Uncomment after app is generated to fix view errors
-  # include ::Pagy::Frontend
+  include ::Pagy::Frontend if defined?(Pagy)
 
   # jbuilder helper
   def no_json_blanks(value)

data/app/jobs/export_job.rb

@@ -41,7 +41,8 @@ class ExportJob < ApplicationJob
     notification.deliver(current_user)
 
     # Attach CSV file (can only attach after persisted)
-    notification.record.file.attach(io: @tempfile, filename: "geomg-export-#{Time.zone.today}.csv", content_type: "text/csv")
+    notification.record.file.attach(io: @tempfile, filename: "geomg-export-#{Time.zone.today}.csv",
+      content_type: "text/csv")
 
     # Update UI
     ActionCable.server.broadcast("export_channel", {

data/app/models/admin/bookmark.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+# Admin::Bookmark
+module Admin
+  class Bookmark < ApplicationRecord
+    belongs_to :user, polymorphic: true
+    belongs_to :document, polymorphic: true
+    validates :user_id, presence: true
+
+    def document_id
+      document_id
+    end
+
+    def document_type
+      Kithe::Model
+    end
+  end
+end

data/app/models/api_search_builder.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 class ApiSearchBuilder < Blacklight::SearchBuilder
   include Blacklight::Solr::SearchBuilderBehavior
   include BlacklightAdvancedSearch::AdvancedSearchBuilder
   # include B1gDateRangeQueryConcern::RangeLimitBuilder
 
-  self.default_processor_chain += [:add_advanced_parse_q_to_solr, :add_advanced_search_to_solr]
+  self.default_processor_chain += %i[add_advanced_parse_q_to_solr add_advanced_search_to_solr]
 
   # Remove GBL Spatial, otherwise it will hide all suppressed docs
   #   from API search results

data/app/models/document/bbox_validator.rb

@@ -14,7 +14,10 @@ class Document
       valid_geom = true
 
       # Sane for W,S,E,N?
-      proper_bounding_box(record, valid_geom) unless record.send(GeoblacklightAdmin::Schema.instance.solr_fields[:bounding_box]).nil?
+      unless record.send(GeoblacklightAdmin::Schema.instance.solr_fields[:bounding_box]).nil?
+        proper_bounding_box(record,
+          valid_geom)
+      end
 
       valid_geom
     end
@@ -57,10 +60,11 @@ class Document
         # Reject ENVELOPE(-118.00.0000,-88.00.0000,51.00.0000,42.00.0000
         # - Double period float-ish things?
         geom.each do |val|
-          if val.count(".") >= 2
-            valid_geom = false
-            record.errors.add(GeoblacklightAdmin::Schema.instance.solr_fields[:bounding_box], "invalid ENVELOPE(W,E,N,S) syntax - found multiple periods in a coordinate value.")
-          end
+          next unless val.count(".") >= 2
+
+          valid_geom = false
+          record.errors.add(GeoblacklightAdmin::Schema.instance.solr_fields[:bounding_box],
+            "invalid ENVELOPE(W,E,N,S) syntax - found multiple periods in a coordinate value.")
         end
       end
 

data/app/models/document/date_range_validator.rb

@@ -18,7 +18,8 @@ class Document
 
         # Must split into two via '-'
         if date_range.split("-").size != 2
-          record.errors.add(GeoblacklightAdmin::Schema.instance.solr_fields[:date_range], "invalid date range present - missing YYYY-YYYY value")
+          record.errors.add(GeoblacklightAdmin::Schema.instance.solr_fields[:date_range],
+            "invalid date range present - missing YYYY-YYYY value")
           valid_date_ranges = false
           return valid_date_ranges
         end
@@ -26,28 +27,30 @@ class Document
         start_date, end_date = date_range.split("-")
 
         unless valid_yyyy(start_date)
-          record.errors.add(GeoblacklightAdmin::Schema.instance.solr_fields[:date_range], "invalid start date - bad YYYY-YYYY value, only integers or the wildcard '*' allowed")
+          record.errors.add(GeoblacklightAdmin::Schema.instance.solr_fields[:date_range],
+            "invalid start date - bad YYYY-YYYY value, only integers or the wildcard '*' allowed")
           valid_date_ranges = false
         end
 
         unless valid_yyyy(end_date)
-          record.errors.add(GeoblacklightAdmin::Schema.instance.solr_fields[:date_range], "invalid end date - bad YYYY-YYYY value, only integers or the wildcard '*' allowed")
+          record.errors.add(GeoblacklightAdmin::Schema.instance.solr_fields[:date_range],
+            "invalid end date - bad YYYY-YYYY value, only integers or the wildcard '*' allowed")
           valid_date_ranges = false
         end
 
         # Allow only 1 wildcard
         if start_date == "*" && end_date == "*"
-          record.errors.add(GeoblacklightAdmin::Schema.instance.solr_fields[:date_range], "invalid only one wildcard can be used")
+          record.errors.add(GeoblacklightAdmin::Schema.instance.solr_fields[:date_range],
+            "invalid only one wildcard can be used")
           valid_date_ranges = false
         end
 
         # Avoid 1996-1946
-        if start_date[/\d+/] && end_date[/\d+/]
-          unless start_date.to_i <= end_date.to_i
-            record.errors.add(GeoblacklightAdmin::Schema.instance.solr_fields[:date_range], "invalid start date must be less than the end date")
-            valid_date_ranges = false
-          end
-        end
+        next unless start_date[/\d+/] && end_date[/\d+/] && start_date.to_i > end_date.to_i
+
+        record.errors.add(GeoblacklightAdmin::Schema.instance.solr_fields[:date_range],
+          "invalid start date must be less than the end date")
+        valid_date_ranges = false
       end
       valid_date_ranges
     end

data/app/models/document/geom_validator.rb

@@ -37,7 +37,8 @@ class Document
       end
 
       unless valid_geom
-        record.errors.add(GeoblacklightAdmin::Schema.instance.solr_fields[:geometry], "Invalid envelope: #{error_message}")
+        record.errors.add(GeoblacklightAdmin::Schema.instance.solr_fields[:geometry],
+          "Invalid envelope: #{error_message}")
       end
 
       valid_geom
@@ -60,7 +61,8 @@ class Document
       # Guard against a whole world polygons
       if geom == "POLYGON((-180 90, 180 90, 180 -90, -180 -90, -180 90))"
         valid_geom = false
-        record.errors.add(GeoblacklightAdmin::Schema.instance.solr_fields[:geometry], "Invalid polygon: all points are coplanar input, Solr will not index")
+        record.errors.add(GeoblacklightAdmin::Schema.instance.solr_fields[:geometry],
+          "Invalid polygon: all points are coplanar input, Solr will not index")
       end
 
       valid_geom

data/app/models/document.rb

@@ -11,7 +11,8 @@ class Document < Kithe::Work
   belongs_to :import, optional: true
 
   # Statesman
-  has_many :document_transitions, foreign_key: "kithe_model_id", autosave: false, dependent: :destroy, inverse_of: :document
+  has_many :document_transitions, foreign_key: "kithe_model_id", autosave: false, dependent: :destroy,
+    inverse_of: :document
 
   # DocumentAccesses
   has_many :document_accesses, primary_key: "friendlier_id", foreign_key: "friendlier_id", autosave: false, dependent: :destroy,
@@ -69,7 +70,9 @@ class Document < Kithe::Work
   # Index Transformations - *_json functions
   def references_json
     references = ActiveSupport::HashWithIndifferentAccess.new
-    send(GeoblacklightAdmin::Schema.instance.solr_fields[:reference]).each { |ref| references[Document::Reference::REFERENCE_VALUES[ref.category.to_sym][:uri]] = ref.value }
+    send(GeoblacklightAdmin::Schema.instance.solr_fields[:reference]).each do |ref|
+      references[Document::Reference::REFERENCE_VALUES[ref.category.to_sym][:uri]] = ref.value
+    end
     references = apply_downloads(references)
     references.to_json
   end
@@ -79,7 +82,10 @@ class Document < Kithe::Work
     # Make sure downloads exist!
     if document_downloads.present?
       multiple_downloads = multiple_downloads_array
-      multiple_downloads << {label: download_text(send(GeoblacklightAdmin::Schema.instance.solr_fields[:format])), url: dct_downloads} if dct_downloads.present?
+      if dct_downloads.present?
+        multiple_downloads << {label: download_text(send(GeoblacklightAdmin::Schema.instance.solr_fields[:format])),
+                                url: dct_downloads}
+      end
       references[:"http://schema.org/downloadUrl"] = multiple_downloads
     end
     references
@@ -178,7 +184,9 @@ class Document < Kithe::Work
   end
 
   def dct_references_s_to_csv(key, destination)
-    send(destination).detect { |ref| ref.category == GeoblacklightAdmin::Schema.instance.dct_references_mappings[key] }.value
+    send(destination).detect do |ref|
+      ref.category == GeoblacklightAdmin::Schema.instance.dct_references_mappings[key]
+    end.value
   rescue NoMethodError
     nil
   end
@@ -219,9 +227,9 @@ class Document < Kithe::Work
   end
 
   def set_geometry
-    if locn_geometry.blank? && self&.dcat_bbox&.present?
-      self.locn_geometry = derive_polygon
-    end
+    return unless locn_geometry.blank? && self&.dcat_bbox&.present?
+
+    self.locn_geometry = derive_polygon
   end
 
   # Convert GEOM for Solr Indexing

data/app/models/element.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Element < ApplicationRecord
   serialize :html_attributes
 
@@ -21,13 +23,13 @@ class Element < ApplicationRecord
   # Validations
   validates :label, :solr_field, :field_type, presence: true
 
-  FIELD_TYPES = [
-    "string",
-    "text",
-    "integer",
-    "boolean",
-    "datetime"
-  ]
+  FIELD_TYPES = %w[
+    string
+    text
+    integer
+    boolean
+    datetime
+  ].freeze
 
   # Find by solr_field shortcut
   def self.at(field)

data/app/models/form_control.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class FormControl < FormElement
 end

data/app/models/form_element.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class FormElement < ApplicationRecord
   belongs_to :element, optional: true
 

data/app/models/form_feature.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class FormFeature < FormElement
 end

data/app/models/form_group.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class FormGroup < FormElement
 end

data/app/models/form_header.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class FormHeader < FormElement
 end

data/app/models/geoblacklight_admin/schema.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "singleton"
 
 module GeoblacklightAdmin
@@ -11,12 +13,12 @@ module GeoblacklightAdmin
     end
 
     def solr_fields
-      elements.map { |elm|
+      elements.map do |elm|
         [
           elm.label.parameterize(separator: "_").to_sym,
           elm.solr_field
         ]
-      }.to_h
+      end.to_h
     end
 
     def importable_fields
@@ -40,6 +42,7 @@ module GeoblacklightAdmin
       Element.exportable.order(:position).each do |elm|
         # Skip References
         next if elm.solr_field == "dct_references_s"
+
         @fields[elm.label.to_sym] = {
           destination: elm.solr_field,
           delimited: elm.repeatable,

data/app/models/geoblacklight_admin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GeoblacklightAdmin
   include GeoblacklightAdmin::IsoLanguageCodes
 end

data/app/models/import/csv_duplicates_validator.rb

@@ -15,7 +15,8 @@ class Import
       duplicate_id = validate_csv_file(record.csv_file)
       unless duplicate_id.nil?
         valid_csv_file = false
-        record.errors.add(:csv_file, "Duplicate ID value found: #{duplicate_id}. Please clean up the CSV file and reimport.")
+        record.errors.add(:csv_file,
+          "Duplicate ID value found: #{duplicate_id}. Please clean up the CSV file and reimport.")
       end
 
       valid_csv_file

data/app/models/import/csv_header_validator.rb

@@ -10,7 +10,8 @@ class Import
       valid_csv_header = true
       unless valid_csv_headers?(record.csv_file)
         valid_csv_header = false
-        record.errors.add(:csv_file, "Missing a required CSV header. Title, Resource Class, Access Rights, and ID are required.")
+        record.errors.add(:csv_file,
+          "Missing a required CSV header. Title, Resource Class, Access Rights, and ID are required.")
       end
 
       valid_csv_header

data/app/models/import.rb

@@ -94,9 +94,7 @@ class Import < ApplicationRecord
       # logger.debug("Mapping: #{mapping.source_header} to #{mapping.destination_field}")
 
       # Handle discards
-      if mapping.destination_field == "Discard"
-        next
-      end
+      next if mapping.destination_field == "Discard"
 
       # Handle repeatable dct_references_s entries
       if mapping.destination_field == "dct_references_s"
@@ -118,7 +116,8 @@ class Import < ApplicationRecord
 
       # Split delimited field values, if field has a value present
       if mapping.delimited?
-        transformed_data[mapping.destination_field] = transformed_data[mapping.destination_field].present? ? transformed_data[mapping.destination_field].split(klass_delimiter) : ""
+        transformed_data[mapping.destination_field] =
+          transformed_data[mapping.destination_field].present? ? transformed_data[mapping.destination_field].split(klass_delimiter) : ""
       end
     end
 
@@ -175,9 +174,7 @@ class Import < ApplicationRecord
         required_mapping = {}
         required_mapping[key] = value
 
-        unless data_hash.has_key?(key)
-          data_hash.merge!(required_mapping.stringify_keys)
-        end
+        data_hash.merge!(required_mapping.stringify_keys) unless data_hash.key?(key)
       end
     end
 

data/app/models/user.rb

@@ -3,7 +3,7 @@
 # User
 class User < ApplicationRecord
   include Blacklight::User
-  
+
   # Include default devise modules. Others available are:
   # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
   devise :invitable, :database_authenticatable,

data/app/services/export_csv_service.rb

@@ -20,7 +20,11 @@ class ExportCsvService
     Rails.logger.debug { "\n\nExportCsvService: #{document_ids.inspect}\n\n" }
 
     CSV.generate(headers: true) do |_csv|
-      Rails.logger.debug { "\n\n CSV Fields: #{GeoblacklightAdmin::Schema.instance.exportable_fields.map { |k, _v| k.to_s }} \n\n" }
+      Rails.logger.debug do
+        "\n\n CSV Fields: #{GeoblacklightAdmin::Schema.instance.exportable_fields.map do |k, _v|
+                              k.to_s
+                            end} \n\n"
+      end
 
       csv_file << GeoblacklightAdmin::Schema.instance.exportable_fields.map { |k, _v| k.to_s }
       document_ids.each_slice(slice_count) do |slice|

data/app/views/admin/advanced_search/facets.json.jbuilder

@@ -9,10 +9,10 @@ json.data do
       doc_presenter = index_presenter(document)
 
       doc_presenter.fields_to_render.each do |field_name, field|
-        json.partial! 'field', field: field,
-                               field_name: field_name,
-                               document_url: document_url,
-                               doc_presenter: doc_presenter
+        json.partial! "field", field: field,
+          field_name: field_name,
+          document_url: document_url,
+          doc_presenter: doc_presenter
       end
     end
 
@@ -24,7 +24,7 @@ end
 
 json.included do
   json.array! @presenter.search_facets do |facet|
-    json.type 'facet'
+    json.type "facet"
     json.id facet.name
     json.attributes do
       facet_config = facet_configuration_for_field(facet.name)
@@ -41,7 +41,8 @@ json.included do
             Deprecation.silence(Blacklight::FacetsHelperBehavior) do
               if facet_in_params?(facet.name, item.value)
                 Deprecation.silence(Blacklight::SearchState) do
-                  json.remove admin_advanced_search_action_path(search_state.remove_facet_params(facet.name, item.value))
+                  json.remove admin_advanced_search_action_path(search_state.remove_facet_params(facet.name,
+                    item.value))
                 end
               else
                 json.self path_for_facet(facet.name, item.value, only_path: false)
@@ -57,7 +58,7 @@ json.included do
   end
 
   json.array! search_fields do |(label, key)|
-    json.type 'search_field'
+    json.type "search_field"
     json.id key
     json.attributes do
       json.label label
@@ -68,7 +69,7 @@ json.included do
   end
 
   json.array! active_sort_fields do |key, field|
-    json.type 'sort'
+    json.type "sort"
     json.id key
     json.attributes do
       json.label field.label

data/app/views/admin/advanced_search/index.json.jbuilder

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 json.links do
   json.self url_for(search_state.to_h.merge(only_path: false))
   json.prev url_for(search_state.to_h.merge(only_path: false, page: @response.prev_page.to_s)) if @response.prev_page
@@ -19,10 +20,10 @@ json.data do
       doc_presenter = document_presenter(document)
 
       doc_presenter.fields_to_render.each do |field_name, field|
-        json.partial! 'field', field: field,
-                               field_name: field_name,
-                               document_url: document_url,
-                               doc_presenter: doc_presenter
+        json.partial! "field", field: field,
+          field_name: field_name,
+          document_url: document_url,
+          doc_presenter: doc_presenter
       end
     end
 
@@ -34,7 +35,7 @@ end
 
 json.included do
   json.array! @presenter.search_facets do |facet|
-    json.type 'facet'
+    json.type "facet"
     json.id facet.name
     json.attributes do
       facet_config = facet_configuration_for_field(facet.name)
@@ -67,7 +68,7 @@ json.included do
   end
 
   json.array! search_fields do |(label, key)|
-    json.type 'search_field'
+    json.type "search_field"
     json.id key
     json.attributes do
       json.label label
@@ -78,7 +79,7 @@ json.included do
   end
 
   json.array! active_sort_fields do |key, field|
-    json.type 'sort'
+    json.type "sort"
     json.id key
     json.attributes do
       json.label field.label

data/app/views/admin/api/_field.json.jbuilder

@@ -2,7 +2,7 @@
 
 json.set!(field_name) do
   json.id "#{document_url}##{field_name}"
-  json.type 'document_value'
+  json.type "document_value"
   json.attributes do
     json.value doc_presenter.field_value(field)
     json.label field.label

data/app/views/admin/api/fetch.json.jbuilder

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 json.links do
   json.self url_for(search_state.to_h.merge(only_path: false))
   json.prev url_for(search_state.to_h.merge(only_path: false, page: @response.prev_page.to_s)) if @response.prev_page
@@ -19,10 +20,10 @@ json.data do
       doc_presenter = index_presenter(document)
 
       doc_presenter.fields_to_render.each do |field_name, field|
-        json.partial! 'field', field: field,
-                               field_name: field_name,
-                               document_url: document_url,
-                               doc_presenter: doc_presenter
+        json.partial! "field", field: field,
+          field_name: field_name,
+          document_url: document_url,
+          doc_presenter: doc_presenter
       end
     end
 
@@ -34,7 +35,7 @@ end
 
 json.included do
   json.array! @presenter.search_facets do |facet|
-    json.type 'facet'
+    json.type "facet"
     json.id facet.name
     json.attributes do
       facet_config = facet_configuration_for_field(facet.name)
@@ -63,7 +64,7 @@ json.included do
   end
 
   json.array! search_fields do |(label, key)|
-    json.type 'search_field'
+    json.type "search_field"
     json.id key
     json.attributes do
       json.label label
@@ -74,7 +75,7 @@ json.included do
   end
 
   json.array! active_sort_fields do |key, field|
-    json.type 'sort'
+    json.type "sort"
     json.id key
     json.attributes do
       json.label field.label

data/app/views/admin/api/index.json.jbuilder

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 json.links do
   json.self url_for(search_state.to_h.merge(only_path: false))
   json.prev url_for(search_state.to_h.merge(only_path: false, page: @response.prev_page.to_s)) if @response.prev_page
@@ -19,10 +20,10 @@ json.data do
       doc_presenter = document_presenter(document)
 
       doc_presenter.fields_to_render.each do |field_name, field|
-        json.partial! 'field', field: field,
-                               field_name: field_name,
-                               document_url: document_url,
-                               doc_presenter: doc_presenter
+        json.partial! "field", field: field,
+          field_name: field_name,
+          document_url: document_url,
+          doc_presenter: doc_presenter
       end
     end
 
@@ -34,7 +35,7 @@ end
 
 json.included do
   json.array! @presenter.search_facets do |facet|
-    json.type 'facet'
+    json.type "facet"
     json.id facet.name
     json.attributes do
       facet_config = facet_configuration_for_field(facet.name)
@@ -67,7 +68,7 @@ json.included do
   end
 
   json.array! search_fields do |(label, key)|
-    json.type 'search_field'
+    json.type "search_field"
     json.id key
     json.attributes do
       json.label label
@@ -78,7 +79,7 @@ json.included do
   end
 
   json.array! active_sort_fields do |key, field|
-    json.type 'sort'
+    json.type "sort"
     json.id key
     json.attributes do
       json.label field.label

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

@@ -1,6 +1,6 @@
 <p id="notice"><%= notice %></p>
 
-<h1>Bookmarks (<%= current_user.bookmarks.size %>)</h1>
+<h1>Bookmarks (<%= current_user.bookmarks.where(document_type: 'Kithe::Model').size %>)</h1>
 
 <p>
   <%= render "admin/documents/result_toggle" %>
@@ -16,6 +16,6 @@
 
 <ol id='results' class='list-unstyled' data-controller='results'>
   <% @bookmarks.each_with_index do |bookmark, index| %>
-    <%= render 'admin/documents/document', document: bookmark.document, index: index %>
+    <%= render 'admin/documents/document', document: Kithe::Model.find(bookmark.document_id), index: index %>
   <% end %>
 </ol>