geoblacklight_admin 0.6.3 → 0.7.1

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/routes/data_dictionariesable.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module GeoblacklightAdmin
+  module Routes
+    class DataDictionariesable
+      def initialize(defaults = {})
+        @defaults = defaults
+      end
+
+      def call(mapper, _options = {})
+        mapper.member do
+          mapper.get "data_dictionaries"
+        end
+      end
+    end
+  end
+end

data/lib/geoblacklight_admin/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight_admin
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.1
 platform: ruby
 authors:
 - Eric Larson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-06 00:00:00.000000000 Z
+date: 2025-02-13 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
@@ -826,12 +821,15 @@ files:
 - app/controllers/admin/bulk_actions_controller.rb
 - app/controllers/admin/document_accesses_controller.rb
 - app/controllers/admin/document_assets_controller.rb
+- app/controllers/admin/document_data_dictionaries_controller.rb
+- app/controllers/admin/document_data_dictionary_entries_controller.rb
 - app/controllers/admin/document_distributions_controller.rb
 - app/controllers/admin/document_downloads_controller.rb
 - app/controllers/admin/documents_controller.rb
 - app/controllers/admin/elements_controller.rb
 - app/controllers/admin/form_elements_controller.rb
 - app/controllers/admin/ids_controller.rb
+- app/controllers/admin/import_distributions_controller.rb
 - app/controllers/admin/import_documents_controller.rb
 - app/controllers/admin/imports_controller.rb
 - app/controllers/admin/mappings_controller.rb
@@ -839,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
@@ -863,6 +863,8 @@ files:
 - app/jobs/geoblacklight_admin/remove_parent_dct_references_uri_job.rb
 - app/jobs/geoblacklight_admin/set_parent_dct_references_uri_job.rb
 - app/jobs/geoblacklight_admin/store_image_job.rb
+- app/jobs/import_distributions_run_job.rb
+- app/jobs/import_document_distribution_job.rb
 - app/jobs/import_document_job.rb
 - app/jobs/import_run_job.rb
 - app/models/active_storage_attachment.rb
@@ -895,6 +897,9 @@ files:
 - app/models/document/geom_validator.rb
 - app/models/document/reference.rb
 - app/models/document_access.rb
+- app/models/document_data_dictionary.rb
+- app/models/document_data_dictionary/csv_header_validator.rb
+- app/models/document_data_dictionary_entry.rb
 - app/models/document_distribution.rb
 - app/models/document_download.rb
 - app/models/document_state_machine.rb
@@ -918,7 +923,14 @@ files:
 - app/models/import/csv_header_validator.rb
 - app/models/import_btaa.rb
 - app/models/import_btaa_aardvark.rb
+- app/models/import_distribution.rb
+- app/models/import_distribution/csv_header_validator.rb
+- app/models/import_distribution_state_machine.rb
+- app/models/import_distribution_transition.rb
 - app/models/import_document.rb
+- app/models/import_document_distribution.rb
+- app/models/import_document_distribution_state_machine.rb
+- app/models/import_document_distribution_transition.rb
 - app/models/import_document_state_machine.rb
 - app/models/import_document_transition.rb
 - app/models/import_gblv1.rb
@@ -984,6 +996,19 @@ files:
 - app/views/admin/document_assets/display_attach_form.html.erb
 - app/views/admin/document_assets/edit.html.erb
 - app/views/admin/document_assets/index.html.erb
+- app/views/admin/document_data_dictionaries/_data_dictionaries_table.html.erb
+- app/views/admin/document_data_dictionaries/_document_data_dictionary.html.erb
+- app/views/admin/document_data_dictionaries/_document_data_dictionary.json.jbuilder
+- app/views/admin/document_data_dictionaries/_form.html.erb
+- app/views/admin/document_data_dictionaries/edit.html.erb
+- app/views/admin/document_data_dictionaries/index.html.erb
+- app/views/admin/document_data_dictionaries/index.json.jbuilder
+- app/views/admin/document_data_dictionaries/new.html.erb
+- app/views/admin/document_data_dictionaries/show.html.erb
+- app/views/admin/document_data_dictionaries/show.json.jbuilder
+- app/views/admin/document_data_dictionary_entries/_form.html.erb
+- app/views/admin/document_data_dictionary_entries/edit.html.erb
+- app/views/admin/document_data_dictionary_entries/new.html.erb
 - app/views/admin/document_distributions/_document_distribution.html.erb
 - app/views/admin/document_distributions/_document_distribution.json.jbuilder
 - app/views/admin/document_distributions/_form.html.erb
@@ -1061,6 +1086,16 @@ files:
 - app/views/admin/form_elements/show.json.jbuilder
 - app/views/admin/ids/fetch.json.jbuilder
 - app/views/admin/ids/index.json.jbuilder
+- app/views/admin/import_distributions/_form.html.erb
+- app/views/admin/import_distributions/_import_distribution.json.jbuilder
+- app/views/admin/import_distributions/_show_failed_tab.html.erb
+- app/views/admin/import_distributions/_show_success_tab.html.erb
+- app/views/admin/import_distributions/edit.html.erb
+- app/views/admin/import_distributions/index.html.erb
+- app/views/admin/import_distributions/index.json.jbuilder
+- app/views/admin/import_distributions/new.html.erb
+- app/views/admin/import_distributions/show.html.erb
+- app/views/admin/import_distributions/show.json.jbuilder
 - app/views/admin/import_documents/show.html.haml
 - app/views/admin/imports/_form.html.erb
 - app/views/admin/imports/_import.json.jbuilder
@@ -1105,7 +1140,13 @@ 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
 - config/authorities/formats.yml
 - config/authorities/languages.yml
 - config/authorities/resource_type.yml
@@ -1129,6 +1170,9 @@ files:
 - db/migrate/20241009200524_create_admin_reference_types.rb
 - db/migrate/20241010161420_create_document_references.rb
 - db/migrate/20241120238823_rename_references_to_distributions.rb
+- db/migrate/20241204163117_create_document_data_dictionaries.rb
+- db/migrate/20241218174455_create_document_data_dictionary_entries.rb
+- db/migrate/20250113213655_import_distributions.rb
 - db/seeds.rb
 - db/seeds_elements.csv
 - db/seeds_elements.numbers
@@ -1147,6 +1191,8 @@ files:
 - lib/generators/geoblacklight_admin/templates/_user_util_links.html.erb
 - lib/generators/geoblacklight_admin/templates/api_controller.rb
 - lib/generators/geoblacklight_admin/templates/base.html.erb
+- lib/generators/geoblacklight_admin/templates/btaa_sample_document_data_dictionary_entries.csv
+- lib/generators/geoblacklight_admin/templates/btaa_sample_document_distributions.csv
 - lib/generators/geoblacklight_admin/templates/btaa_sample_records.csv
 - lib/generators/geoblacklight_admin/templates/config/database.yml
 - lib/generators/geoblacklight_admin/templates/config/geomg_aardvark_schema.json
@@ -1207,6 +1253,7 @@ files:
 - lib/geoblacklight_admin.rb
 - lib/geoblacklight_admin/engine.rb
 - lib/geoblacklight_admin/rake_task.rb
+- lib/geoblacklight_admin/routes/data_dictionariesable.rb
 - lib/geoblacklight_admin/tasks/distributions.rake
 - lib/geoblacklight_admin/tasks/images.rake
 - lib/geoblacklight_admin/tasks/solr.rake