diff --git a/Gemfile b/Gemfile index 960ed4342..971dd5b31 100644 --- a/Gemfile +++ b/Gemfile @@ -82,7 +82,7 @@ gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript' gem 'geoblacklight', '4.4' # GBL Admin -gem 'geoblacklight_admin', git: "https://github.com/geobtaa/geoblacklight_admin.git", branch: "develop" +gem 'geoblacklight_admin', "~> 0.6.0" gem 'git', ">= 1.13" gem "rubyzip", ">= 1.3.0" gem "awesome_print" diff --git a/Gemfile.lock b/Gemfile.lock index 8e006178f..8aa5987ed 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -41,120 +41,81 @@ GIT rails (>= 5.2, < 8.0) statesman (>= 3.4) -GIT - remote: https://github.com/geobtaa/geoblacklight_admin.git - revision: ac7b256cebcb6e48f9ad3ea4621d0cd81543d71c - branch: develop - specs: - geoblacklight_admin (0.6.0) - active_storage_validations (~> 1.0) - amazing_print - blacklight (~> 7.33) - blacklight_advanced_search - blacklight_range_limit - bootstrap (~> 4.0) - chosen-rails (~> 1.10) - cocoon (~> 1.2) - config (~> 4.0) - devise (~> 4.7) - devise-bootstrap-views (~> 1.0) - dotenv-rails (~> 2.8) - geoblacklight (~> 4.4) - haml (~> 5.2) - httparty (~> 0.21) - inline_svg (~> 1.9) - jquery-rails (~> 4.4) - kithe (~> 2.0) - mutex_m (~> 0.2.0) - noticed (~> 1.6) - pagy (~> 6.0) - paper_trail (~> 15.0) - pg (~> 1.4) - qa (~> 5.0) - rails (~> 7.0, < 7.3) - ruby-progressbar - simple_form (~> 5.0) - sprockets (~> 3.0) - statesman (~> 12.0) - vite_rails (~> 3.0) - vite_ruby (>= 3.5) - zeitwerk (~> 2.6) - GEM remote: https://rubygems.org/ specs: Ascii85 (2.0.1) - actioncable (7.0.8.6) - actionpack (= 7.0.8.6) - activesupport (= 7.0.8.6) + actioncable (7.0.8.7) + actionpack (= 7.0.8.7) + activesupport (= 7.0.8.7) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8.6) - actionpack (= 7.0.8.6) - activejob (= 7.0.8.6) - activerecord (= 7.0.8.6) - activestorage (= 7.0.8.6) - activesupport (= 7.0.8.6) + actionmailbox (7.0.8.7) + actionpack (= 7.0.8.7) + activejob (= 7.0.8.7) + activerecord (= 7.0.8.7) + activestorage (= 7.0.8.7) + activesupport (= 7.0.8.7) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.8.6) - actionpack (= 7.0.8.6) - actionview (= 7.0.8.6) - activejob (= 7.0.8.6) - activesupport (= 7.0.8.6) + actionmailer (7.0.8.7) + actionpack (= 7.0.8.7) + actionview (= 7.0.8.7) + activejob (= 7.0.8.7) + activesupport (= 7.0.8.7) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.8.6) - actionview (= 7.0.8.6) - activesupport (= 7.0.8.6) + actionpack (7.0.8.7) + actionview (= 7.0.8.7) + activesupport (= 7.0.8.7) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8.6) - actionpack (= 7.0.8.6) - activerecord (= 7.0.8.6) - activestorage (= 7.0.8.6) - activesupport (= 7.0.8.6) + actiontext (7.0.8.7) + actionpack (= 7.0.8.7) + activerecord (= 7.0.8.7) + activestorage (= 7.0.8.7) + activesupport (= 7.0.8.7) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8.6) - activesupport (= 7.0.8.6) + actionview (7.0.8.7) + activesupport (= 7.0.8.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) active_record_query_trace (1.8.2) activerecord (>= 6.0.0) - active_storage_validations (1.3.4) + active_storage_validations (1.3.5) activejob (>= 6.1.4) activemodel (>= 6.1.4) activestorage (>= 6.1.4) activesupport (>= 6.1.4) marcel (>= 1.0.3) - activejob (7.0.8.6) - activesupport (= 7.0.8.6) + activejob (7.0.8.7) + activesupport (= 7.0.8.7) globalid (>= 0.3.6) - activemodel (7.0.8.6) - activesupport (= 7.0.8.6) - activerecord (7.0.8.6) - activemodel (= 7.0.8.6) - activesupport (= 7.0.8.6) - activerecord-import (1.8.1) + activemodel (7.0.8.7) + activesupport (= 7.0.8.7) + activerecord (7.0.8.7) + activemodel (= 7.0.8.7) + activesupport (= 7.0.8.7) + activerecord-import (2.0.0) activerecord (>= 4.2) - activestorage (7.0.8.6) - actionpack (= 7.0.8.6) - activejob (= 7.0.8.6) - activerecord (= 7.0.8.6) - activesupport (= 7.0.8.6) + activestorage (7.0.8.7) + actionpack (= 7.0.8.7) + activejob (= 7.0.8.7) + activerecord (= 7.0.8.7) + activesupport (= 7.0.8.7) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.8.6) + activesupport (7.0.8.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -168,7 +129,7 @@ GEM net-http-persistent amazing_print (1.6.0) ansi (1.5.0) - appsignal (4.2.0) + appsignal (4.2.2) logger rack attr_json (2.5.0) @@ -177,7 +138,7 @@ GEM execjs (~> 2) awesome_print (1.9.2) aws-eventstream (1.3.0) - aws-partitions (1.1017.0) + aws-partitions (1.1023.0) aws-sdk-core (3.214.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) @@ -186,7 +147,7 @@ GEM aws-sdk-kms (1.96.0) aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.176.0) + aws-sdk-s3 (1.176.1) aws-sdk-core (~> 3, >= 3.210.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) @@ -277,7 +238,7 @@ GEM connection_pool (2.4.1) content_disposition (1.0.0) crass (1.0.6) - csv (3.3.0) + csv (3.3.1) database_cleaner (2.1.0) database_cleaner-active_record (>= 2, < 3) database_cleaner-active_record (2.2.0) @@ -358,7 +319,7 @@ GEM factory_bot_rails (6.4.4) factory_bot (~> 6.5) railties (>= 5.0.0) - faraday (2.12.1) + faraday (2.12.2) faraday-net_http (>= 2.0, < 3.5) json logger @@ -404,10 +365,43 @@ GEM rgeo-geojson sprockets-rails (~> 3.0) vite_rails (~> 3.0) - geocoder (1.8.3) + geoblacklight_admin (0.6.1) + active_storage_validations (~> 1.0) + amazing_print + blacklight (~> 7.33) + blacklight_advanced_search + blacklight_range_limit + bootstrap (~> 4.0) + chosen-rails (~> 1.10) + cocoon (~> 1.2) + config (~> 4.0) + devise (~> 4.7) + devise-bootstrap-views (~> 1.0) + dotenv-rails (~> 2.8) + geoblacklight (~> 4.4) + haml (~> 5.2) + httparty (~> 0.21) + inline_svg (~> 1.9) + jquery-rails (~> 4.4) + kithe (~> 2.0) + mutex_m (~> 0.2.0) + noticed (~> 1.6) + pagy (~> 6.0) + paper_trail (~> 15.0) + pg (~> 1.4) + qa (~> 5.0) + rails (~> 7.0, < 7.3) + ruby-progressbar + simple_form (~> 5.0) + sprockets (~> 3.0) + statesman (~> 12.0) + vite_rails (~> 3.0) + vite_ruby (>= 3.5) + zeitwerk (~> 2.6) + geocoder (1.8.4) base64 (>= 0.1.0) csv (>= 3.0.0) - git (2.3.2) + git (2.3.3) activesupport (>= 5.0) addressable (~> 2.8) process_executer (~> 1.1) @@ -430,7 +424,7 @@ GEM http-cookie (~> 1.0) http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) http-form_data (2.3.0) httparty (0.22.0) @@ -503,7 +497,7 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) - logger (1.6.2) + logger (1.6.3) loofah (2.23.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) @@ -528,7 +522,7 @@ GEM mime-types (3.6.0) logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.1105) + mime-types-data (3.2024.1203) mimemagic (0.4.3) nokogiri (~> 1) rake @@ -536,7 +530,7 @@ GEM mini_mime (1.1.5) mini_portile2 (2.8.8) minitar (1.0.2) - minitest (5.25.3) + minitest (5.25.4) minitest-ci (3.4.0) minitest (>= 5.0.6) minitest-reporters (1.7.1) @@ -554,9 +548,9 @@ GEM time net-http (0.6.0) uri - net-http-persistent (4.0.4) + net-http-persistent (4.0.5) connection_pool (~> 2.2) - net-imap (0.5.1) + net-imap (0.5.2) date net-protocol net-pop (0.1.2) @@ -566,7 +560,7 @@ GEM net-smtp (0.5.0) net-protocol nio4r (2.7.4) - nokogiri (1.16.8) + nokogiri (1.17.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) noticed (1.6.3) @@ -598,14 +592,14 @@ GEM public_suffix (6.0.1) puma (5.6.9) nio4r (~> 2.0) - qa (5.13.0) + qa (5.14.0) activerecord-import deprecation faraday (< 3.0, != 2.0.0) geocoder ldpath nokogiri (~> 1.6) - rails (>= 5.0, < 8.0) + rails (>= 5.0, < 8.1) rdf racc (1.8.1) rack (2.2.10) @@ -617,30 +611,30 @@ GEM rack rack-test (2.1.0) rack (>= 1.3) - rails (7.0.8.6) - actioncable (= 7.0.8.6) - actionmailbox (= 7.0.8.6) - actionmailer (= 7.0.8.6) - actionpack (= 7.0.8.6) - actiontext (= 7.0.8.6) - actionview (= 7.0.8.6) - activejob (= 7.0.8.6) - activemodel (= 7.0.8.6) - activerecord (= 7.0.8.6) - activestorage (= 7.0.8.6) - activesupport (= 7.0.8.6) + rails (7.0.8.7) + actioncable (= 7.0.8.7) + actionmailbox (= 7.0.8.7) + actionmailer (= 7.0.8.7) + actionpack (= 7.0.8.7) + actiontext (= 7.0.8.7) + actionview (= 7.0.8.7) + activejob (= 7.0.8.7) + activemodel (= 7.0.8.7) + activerecord (= 7.0.8.7) + activestorage (= 7.0.8.7) + activesupport (= 7.0.8.7) bundler (>= 1.15.0) - railties (= 7.0.8.6) + railties (= 7.0.8.7) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.6.1) + rails-html-sanitizer (1.6.2) loofah (~> 2.21) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) - railties (7.0.8.6) - actionpack (= 7.0.8.6) - activesupport (= 7.0.8.6) + railties (7.0.8.7) + actionpack (= 7.0.8.7) + activesupport (= 7.0.8.7) method_source rake (>= 12.2) thor (~> 1.0) @@ -664,7 +658,7 @@ GEM actionpack (>= 5.2) railties (>= 5.2) retriable (3.1.2) - rexml (3.3.9) + rexml (3.4.0) rgeo (3.0.1) rgeo-geojson (2.2.0) multi_json (~> 1.15) @@ -777,7 +771,7 @@ GEM tilt (2.4.0) time (0.4.1) date - timeout (0.4.2) + timeout (0.4.3) traject (3.8.2) concurrent-ruby (>= 0.8.0) dot-properties (>= 0.1.1) @@ -884,7 +878,7 @@ DEPENDENCIES foreman geoblacklight (= 4.4) geoblacklight-icons! - geoblacklight_admin! + geoblacklight_admin (~> 0.6.0) geoblacklight_sidecar_images! git (>= 1.13) haml diff --git a/db/schema.rb b/db/schema.rb index dfea15dfc..c59d94473 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 2024_10_10_161420) do +ActiveRecord::Schema[7.0].define(version: 2024_11_20_238823) do # These are extensions that must be enabled in order to support this database enable_extension "pgcrypto" enable_extension "plpgsql" @@ -229,25 +229,25 @@ t.datetime "updated_at", null: false end - create_table "document_downloads", force: :cascade do |t| - t.string "friendlier_id" + create_table "document_distributions", force: :cascade do |t| + t.string "friendlier_id", null: false + t.bigint "reference_type_id", null: false + t.string "url" t.string "label" - t.string "value" t.integer "position" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.index ["friendlier_id", "reference_type_id", "url"], name: "document_references_unique_index", unique: true + t.index ["reference_type_id"], name: "index_document_distributions_on_reference_type_id" end - create_table "document_references", force: :cascade do |t| - t.string "friendlier_id", null: false - t.bigint "reference_type_id", null: false - t.string "url" + create_table "document_downloads", force: :cascade do |t| + t.string "friendlier_id" t.string "label" + t.string "value" t.integer "position" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.index ["friendlier_id", "reference_type_id", "url"], name: "document_references_unique_index", unique: true - t.index ["reference_type_id"], name: "index_document_references_on_reference_type_id" end create_table "document_thumbnail_transitions", force: :cascade do |t| @@ -557,7 +557,7 @@ add_foreign_key "bulk_action_document_transitions", "bulk_action_documents" add_foreign_key "bulk_action_documents", "bulk_actions" add_foreign_key "bulk_action_transitions", "bulk_actions" - add_foreign_key "document_references", "reference_types" + add_foreign_key "document_distributions", "reference_types" add_foreign_key "image_upload_transitions", "solr_document_sidecars" add_foreign_key "import_document_transitions", "import_documents" add_foreign_key "import_documents", "imports"