geoblacklight_admin 0.5.0 → 0.6.0

data/db/migrate/20230316183001_add_geoblacklight_admin_gem.rb

@@ -364,20 +364,8 @@ class AddGeoblacklightAdminGem < ActiveRecord::Migration[6.1]
       t.datetime 'remember_created_at'
       t.datetime 'created_at', precision: 6, null: false
       t.datetime 'updated_at', precision: 6, null: false
-      t.string 'invitation_token'
-      t.datetime 'invitation_created_at'
-      t.datetime 'invitation_sent_at'
-      t.datetime 'invitation_accepted_at'
-      t.integer 'invitation_limit'
-      t.string 'invited_by_type'
-      t.bigint 'invited_by_id'
-      t.integer 'invitations_count', default: 0
       t.boolean 'admin', default: false, null: false
       t.index ['email'], name: 'index_users_on_email', unique: true
-      t.index ['invitation_token'], name: 'index_users_on_invitation_token', unique: true
-      t.index ['invitations_count'], name: 'index_users_on_invitations_count'
-      t.index ['invited_by_id'], name: 'index_users_on_invited_by_id'
-      t.index %w[invited_by_type invited_by_id], name: 'index_users_on_invited_by_type_and_invited_by_id'
       t.index ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true
     end
 

data/db/migrate/20241009200524_create_admin_reference_types.rb

@@ -0,0 +1,13 @@
+class CreateAdminReferenceTypes < ActiveRecord::Migration[7.2]
+  def change
+    create_table :reference_types do |t|
+      t.string :name                    # short name, ex: "cog"
+      t.string :reference_type          # human-readable name, ex: "Cloud Optimized GeoTIFF (COG)"
+      t.string :reference_uri           # key name, ex: "https://github.com/cogeotiff/cog-spec"
+      t.boolean :label, default: false  # optional download label
+      t.text :note                      # optional note
+      t.integer :position               # position for sorting
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20241010161420_create_document_references.rb

@@ -0,0 +1,14 @@
+class CreateDocumentReferences < ActiveRecord::Migration[7.2]
+  def change
+    create_table :document_references do |t|
+      t.string :friendlier_id, null: false
+      t.references :reference_type, null: false, foreign_key: true
+      t.string :url
+      t.string :label
+      t.integer :position
+      t.timestamps
+
+      t.index [:friendlier_id, :reference_type_id, :url], unique: true
+    end
+  end
+end

data/db/migrate/20241120238823_rename_references_to_distributions.rb

@@ -0,0 +1,5 @@
+class RenameReferencesToDistributions < ActiveRecord::Migration[7.2]
+  def change
+    rename_table :document_references, :document_distributions
+  end
+end

data/db/seeds.rb

@@ -23,5 +23,10 @@ CSV.foreach(File.expand_path('seeds_form_elements.csv', File.dirname(__FILE__)),
   FormElement.create!(row.to_hash)
 end
 
+# Reference Types
+CSV.foreach(File.expand_path('seeds_reference_types.csv', File.dirname(__FILE__)), headers: true) do |row|
+  ReferenceType.create!(row.to_hash)
+end
+
 # Users
 User.create(email: 'admin@geoblacklight.org', password: '123456', password_confirmation: '123456', admin: true)

data/db/seeds_elements.csv

@@ -37,7 +37,7 @@ License,dct_license_sm,https://opengeometadata.org/ogm-aardvark/#license,string,
 Access Rights,dct_accessRights_s,https://opengeometadata.org/ogm-aardvark/#access-rights,string,TRUE,FALSE,TRUE,,,access-rights1|access-rights2,access_rights,,,FALSE,TRUE,FALSE,,TRUE,,TRUE,,presence,36
 Format,dct_format_s,https://opengeometadata.org/ogm-aardvark/#format,string,FALSE,FALSE,TRUE,,,format,formats,autocomplete,,FALSE,TRUE,FALSE,,TRUE,,TRUE,,,37
 File Size,gbl_fileSize_s,https://opengeometadata.org/ogm-aardvark/#file-size,string,FALSE,FALSE,TRUE,,,60mb,,,,FALSE,TRUE,FALSE,,TRUE,,TRUE,,,38
-Reference,dct_references_s,https://opengeometadata.org/ogm-aardvark/#references,text,FALSE,TRUE,TRUE,,URIs and Values,,reference_values,,,FALSE,TRUE,FALSE,build_dct_references,TRUE,references_json,TRUE,references_json,,39
+Reference,dct_references_s,https://opengeometadata.org/ogm-aardvark/#references,text,FALSE,TRUE,TRUE,,URIs and Values,,reference_values,,,FALSE,TRUE,FALSE,build_dct_references,TRUE,distributions_json,TRUE,distributions_json,,39
 WxS Identifier,gbl_wxsIdentifier_s,https://opengeometadata.org/ogm-aardvark/#wxs-identifier,string,FALSE,FALSE,TRUE,,,wxs-identifier,,,,FALSE,TRUE,FALSE,,TRUE,,TRUE,,,40
 B1G Image URL,b1g_image_ss,https://geobtaa.github.io/metadata/b1g-custom-elements/#image,string,FALSE,FALSE,TRUE,,,image,,,,FALSE,TRUE,FALSE,,TRUE,,TRUE,,,41
 ID,geomg_id_s,https://opengeometadata.org/ogm-aardvark/#id,string,TRUE,FALSE,TRUE,,,slug,,disable_if_persisted,,FALSE,TRUE,FALSE,,TRUE,,TRUE,,presence,42

data/db/seeds_reference_types.csv

@@ -0,0 +1,29 @@
+name,reference_type,reference_uri,label,note,position
+arcgis_dynamic_map_layer,ArcGIS DynamicMapLayer,urn:x-esri:serviceType:ArcGIS#DynamicMapLayer,FALSE,-,1
+arcgis_feature_layer,ArcGIS FeatureLayer,urn:x-esri:serviceType:ArcGIS#FeatureLayer,FALSE,-,2
+arcgis_image_map_layer,ArcGIS ImageMapLayer,urn:x-esri:serviceType:ArcGIS#ImageMapLayer,FALSE,-,3
+arcgis_tiled_map_layer,ArcGIS TiledMapLayer,urn:x-esri:serviceType:ArcGIS#TiledMapLayer,FALSE,-,4
+cog,Cloud Optimized GeoTIFF (COG),https://github.com/cogeotiff/cog-spec,FALSE,-,5
+documentation_download,Data Dictionary / documentation,http://lccn.loc.gov/sh85035852,FALSE,Functions as a link to download documentation (not a viewer),6
+documentation_external,Documentation (External),http://schema.org/url,FALSE,-,7
+download,Download,http://schema.org/downloadUrl,TRUE,Link to download file (for multiple files see the multiple downloads guidelines),8
+geo_json,GeoJSON,http://geojson.org/geojson-spec.html,FALSE,-,9
+full_layer_description,Full layer description,http://schema.org/url,FALSE,To view further descriptive information about the layer or a link to its landing page,10
+iiif_image,International Image Interoperability Framework (IIIF) Image API,http://iiif.io/api/image,FALSE,Load the image viewer using Leaflet-IIIF,11
+iiif_manifest,International Image Interoperability Framework (IIIF) Presentation API Manifest,http://iiif.io/api/presentation#manifest,FALSE,View the IIIF manifest - uses the Clover viewer by default https://samvera-labs.github.io/clover-iiif/docs,12
+image,Image file,http://schema.org/image,TRUE,-,13
+metadata_fgdc,Metadata in FGDC,http://www.opengis.net/cat/csw/csdgm,FALSE,Provides an HTML view of an XML file in the FGDC standard,14
+metadata_html,Metadata in HTML,http://www.w3.org/1999/xhtml,FALSE,View structured metadata in any standard expressed as HTML,15
+metadata_iso,Metadata in ISO 19139,http://www.isotc211.org/schemas/2005/gmd/,FALSE,Provides an HTML view of an XML file in the ISO 19139 standard,16
+metadata_mods,Metadata in MODS,http://www.loc.gov/mods/v3,FALSE,Provides a raw XML view of metadata in the MODS format,17
+oembed,oEmbed,https://oembed.com,FALSE,-,18
+open_index_map,OpenIndexMap,https://openindexmaps.org,FALSE,Provides an interactive preview of a GeoJSON file formatted as an OpenIndexMap,19
+pmtiles,PMTiles,https://github.com/protomaps/PMTiles,FALSE,-,20
+thumbnail,Thumbnail file,http://schema.org/thumbnailUrl,TRUE,-,21
+tile_map_service,Tile Mapping Service (TMS),https://wiki.osgeo.org/wiki/Tile_Map_Service_Specification,FALSE,-,22
+tile_json,TileJSON,https://github.com/mapbox/tilejson-spec,FALSE,-,23
+wcs,Web Coverage Service (WCS),http://www.opengis.net/def/serviceType/ogc/wcs,FALSE,-,24
+wfs,Web Feature Service (WFS),http://www.opengis.net/def/serviceType/ogc/wfs,FALSE,"Provides a to download generated vector datasets (GeoJSON, shapefile)",25
+wmts,Web Mapping Service (WMS),http://www.opengis.net/def/serviceType/ogc/wms,FALSE,Provides a service to visually preview a layer and inspect its features,26
+wms,WMTS,http://www.opengis.net/def/serviceType/ogc/wmts,FALSE,-,27
+xyz_tiles,XYZ tiles,https://wiki.openstreetmap.org/wiki/Slippy_map_tilenames,FALSE,Link to an XYZ tile server,28

data/db/structure.sql

@@ -349,15 +349,7 @@ CREATE TABLE public.users (
     reset_password_sent_at timestamp without time zone,
     remember_created_at timestamp without time zone,
     created_at timestamp(6) without time zone NOT NULL,
-    updated_at timestamp(6) without time zone NOT NULL,
-    invitation_token character varying,
-    invitation_created_at timestamp without time zone,
-    invitation_sent_at timestamp without time zone,
-    invitation_accepted_at timestamp without time zone,
-    invitation_limit integer,
-    invited_by_type character varying,
-    invited_by_id bigint,
-    invitations_count integer DEFAULT 0
+    updated_at timestamp(6) without time zone NOT NULL
 );
 
 
@@ -670,35 +662,6 @@ CREATE INDEX index_mappings_on_import_id ON public.mappings USING btree (import_
 
 CREATE UNIQUE INDEX index_users_on_email ON public.users USING btree (email);
 
-
---
--- Name: index_users_on_invitation_token; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE UNIQUE INDEX index_users_on_invitation_token ON public.users USING btree (invitation_token);
-
-
---
--- Name: index_users_on_invitations_count; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX index_users_on_invitations_count ON public.users USING btree (invitations_count);
-
-
---
--- Name: index_users_on_invited_by_id; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX index_users_on_invited_by_id ON public.users USING btree (invited_by_id);
-
-
---
--- Name: index_users_on_invited_by_type_and_invited_by_id; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX index_users_on_invited_by_type_and_invited_by_id ON public.users USING btree (invited_by_type, invited_by_id);
-
-
 --
 -- Name: index_users_on_reset_password_token; Type: INDEX; Schema: public; Owner: -
 --

data/lib/compose.yml

@@ -0,0 +1,31 @@
+services:
+  solr:
+    image: solr:9.6.1
+    volumes:
+      - $PWD/solr/conf:/opt/solr/conf
+    ports:
+      - 8983:8983
+    entrypoint:
+      - docker-entrypoint.sh
+      - solr-precreate
+      - blacklight-core
+      - /opt/solr/conf
+      - "-Xms256m"
+      - "-Xmx512m"
+
+  postgres:
+    image: postgres:latest
+    env:
+      POSTGRES_HOST: 127.0.0.1
+      POSTGRES_PORT: 5432
+      POSTGRES_DB: geoblacklight_development
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+    ports:
+      - 5432:5432
+    # Set health checks to wait until postgres has started
+    options:
+      --health-cmd pg_isready
+      --health-interval 10s
+      --health-timeout 5s
+      --health-retries 5

data/lib/generators/geoblacklight_admin/config_generator.rb

@@ -13,7 +13,7 @@ module GeoblacklightAdmin
        3. Copies sidekiq.yml connection to host config
        5. Copies .env.development and .env.test to host
        4. Copies settings.yml to host config
-       create_solr_yml
+       5. Copies .solr_wrapper.yml to host config
        6. Copies JSON Schema to host
        7. Copies solr/* to host
        8. Sets Routes
@@ -56,6 +56,10 @@ module GeoblacklightAdmin
       copy_file "config/sidekiq.yml", "config/sidekiq.yml", force: true
     end
 
+    def create_solr_wrapper_yml
+      copy_file ".solr_wrapper.yml", ".solr_wrapper.yml", force: true
+    end
+
     def create_dotenv
       copy_file ".env.development.example", ".env.development"
       copy_file ".env.development.example", ".env.test"
@@ -65,10 +69,6 @@ module GeoblacklightAdmin
       copy_file "config/settings.yml", "config/settings.yml", force: true
     end
 
-    def create_solr_yml
-      copy_file ".solr_wrapper.yml", ".solr_wrapper.yml", force: true
-    end
-
     def copy_json_schema
       copy_file "config/geomg_aardvark_schema.json", "config/geomg_aardvark_schema.json"
     end
@@ -89,7 +89,7 @@ module GeoblacklightAdmin
         end
 
         # Users
-        devise_for :users, controllers: {invitations: "devise/invitations"}, skip: [:registrations]
+        devise_for :users, skip: [:registrations]
         as :user do
           get "/sign_in" => "devise/sessions#new" # custom path to login/sign_in
           get "/sign_up" => "devise/registrations#new", :as => "new_user_registration" # custom path to sign_up/registration
@@ -143,6 +143,11 @@ module GeoblacklightAdmin
           resources :form_control, path: :form_elements, controller: :form_elements
           resources :form_feature, path: :form_elements, controller: :form_elements
 
+          # Reference Types
+          resources :reference_types do
+            post :sort, on: :collection
+          end
+
           # Notifications
           resources :notifications do
             put "batch", on: :collection
@@ -174,6 +179,10 @@ module GeoblacklightAdmin
             get "admin"
             get "versions"
 
+            collection do
+              get "fetch"
+            end
+
             # DocumentAccesses
             resources :document_accesses, path: "access" do
               collection do
@@ -185,6 +194,17 @@ module GeoblacklightAdmin
               end
             end
 
+            # Document Assets
+            resources :document_assets, path: "assets" do
+              collection do
+                get "display_attach_form"
+                post "attach_files"
+
+                get "destroy_all"
+                post "destroy_all"
+              end
+            end
+
             # DocumentDownloads
             resources :document_downloads, path: "downloads" do
               collection do
@@ -196,20 +216,19 @@ module GeoblacklightAdmin
               end
             end
 
-            # Document Assets
-            resources :document_assets, path: "assets" do
+            # Document References
+            resources :document_distributions, path: "distributions" do
               collection do
                 get "display_attach_form"
                 post "attach_files"
 
+                get "import"
+                post "import"
+
                 get "destroy_all"
                 post "destroy_all"
               end
             end
-
-            collection do
-              get "fetch"
-            end
           end
 
           # Document Accesses
@@ -234,6 +253,17 @@ module GeoblacklightAdmin
             end
           end
 
+          # Document Distributions
+          resources :document_distributions, path: "distributions" do
+            collection do
+              get "import"
+              post "import"
+
+              get "destroy_all"
+              post "destroy_all"
+            end
+          end
+
           # Document Assets
           resources :document_assets, path: "assets" do
             collection do
@@ -374,6 +404,12 @@ module GeoblacklightAdmin
       end
     end
 
+    def add_application_config_for_psych_time_with_zone
+      inject_into_file "config/application.rb", after: "config.generators.system_tests = nil" do
+        "\n    config.active_record.yaml_column_permitted_classes = [Symbol, Date, Time, ActiveSupport::TimeWithZone, ActiveSupport::TimeZone]"
+      end
+    end
+
     def add_vite_rails_config
       copy_file "base.html.erb", "app/views/layouts/blacklight/base.html.erb", force: true
       copy_file "vite.config.ts", "vite.config.ts", force: true
@@ -381,6 +417,11 @@ module GeoblacklightAdmin
       copy_file "frontend/entrypoints/application.js", "app/javascript/entrypoints/application.js", force: true
     end
 
+    # Add test fixture files - Necessary for import background job tests
+    def add_test_fixture_files
+      copy_file "btaa_sample_records.csv", "test/fixtures/files/btaa_sample_records.csv", force: true
+    end
+
     # Run bundle with vite install
     def bundle_install
       Bundler.with_clean_env do

data/lib/generators/geoblacklight_admin/install_generator.rb

@@ -48,5 +48,13 @@ module GeoblacklightAdmin
       run "yarn add @geoblacklight/frontend@^4.4.6"
       run "yarn install"
     end
+
+    def add_rsolr_gem
+      gem "rsolr", ">= 1.0", "< 3"
+    end
+
+    def docker_compose
+      copy_file "../../../../compose.yml", "compose.yml"
+    end
   end
 end

data/lib/generators/geoblacklight_admin/templates/btaa_sample_records.csv

@@ -0,0 +1,5 @@
+Title,Alternative Title,Description,Language,Creator,Creator ID,Publisher,Provider,Resource Class,Resource Type,Subject,Theme,Keyword,Temporal Coverage,Date Issued,Date Range,Spatial Coverage,Bounding Box,Geometry,GeoNames,Relation,Member Of,Is Part Of,Source,Version,Replaces,Is Replaced By,Format,File Size,WxS Identifier,Georeferenced,Documentation,Download,FeatureServer,FGDC,Harvard Download,HTML,IIIF,ImageServer,Information,ISO19139,Manifest,MapServer,MODS,oEmbed,Index Map,TileServer,WCS,WFS,WMS,Image,ID,Identifier,Code,Rights,Rights Holder,License,Access Rights,Accrual Method,Accrual Periodicity,Date Accessioned,Date Retired,Status,Publication State,Suppressed,Child Record,Mediator,Access,Created At,Updated At
+Lake Superior,"","30 x 38 cm.|Scale approximately 1:1,800,000|General Map Collection",eng,Society for the Diffusion of Useful Knowledge (Great Britain),fst00519759,Baldwin & Cradock (London),University of Minnesota,Maps,"","","","Superior, Lake Maps|2022-creator-sprint",1832,1832,1832-1832,Canada-- Ontario--Lake Superior,"-92.5,46,-83.5,50.5","POLYGON((-92.5 50.5, -83.5 50.5, -83.5 46, -92.5 46, -92.5 50.5))","","",64bd8c4c-8e60-4956-b43d-bdc3f93db488,05d-01|p16022coll230,"","","","",JPEG,,,false,,,,,,,,,https://umedia.lib.umn.edu/item/p16022coll230:321,,https://cdm16022.contentdm.oclc.org/iiif/info/p16022coll230/321/manifest.json,,,,,,,,,https://cdm16022.contentdm.oclc.org/utils/getthumbnail/collection/p16022coll230/id/321,p16022coll230:321,UMN_ALMA:9954050630001701,05d-01,"Use of this item may be governed by US and international copyright laws. You may be able to use this item, but copyright and other considerations may apply. For possible additional information or guidance on your use, please contact the contributing organization.","","",Public,JSON API,,2017-12-22|2022-09-26,,Active,published,false,false,"",,2021-04-26 17:06:38 UTC,2023-02-07 18:33:22 UTC
+Lake Superior: Minnesota,Lake Superior,"This dataset is based on NOAA's Great Lakes Medium Resolution Digital Shoreline. The Lake Superior Shoreline was extracted and converted to a polygon feature class. Water and islands are differentiated. This layer is a medium-quality, general use digital vector dataset originally compiled from NOAA Nautical Charts, created by the Strategic Environmental Assessments Division of NOAA's Office of Ocean Resources, Conservation and Assessment. Nominal mapping scale is 1:70,000.",eng,United States. National Oceanic and Atmospheric Administration,fst00529308,"",Minnesota Geospatial Commons,Datasets,Vector data,National government records,Inland waters,|2022-creator-sprint,2020,2014-12-20,2020-2020,Minnesota,"-92.146,46.547,-83.935,48.769","POLYGON((-92.146 48.769, -83.935 48.769, -83.935 46.547, -92.146 46.547, -92.146 48.769))",http://sws.geonames.org/5037779,"",ba5cc745-21c5-4ae9-954b-72dd8db6815a,05a-01,"","","","",Shapefile,,,false,,https://resources.gisdata.mn.gov/pub/gdrs/data/pub/us_mn_state_dnr/water_lake_superior_basin/shp_water_lake_superior_basin.zip,,,,https://resources.gisdata.mn.gov/pub/gdrs/data/pub/us_mn_state_dnr/water_lake_superior_basin/metadata/metadata.html,,,https://gisdata.mn.gov/dataset/water-lake-superior-basin,,,,,,,,,,,https://resources.gisdata.mn.gov/pub/gdrs/data/pub/us_mn_state_dnr/water_lake_superior_basin/metadata/preview.jpg,82784459-acde-42ed-b615-d8300577110e,https://gisdata.mn.gov/dataset/water-lake-superior-basin,05a-01,"","","",Public,CKAN,,2020-08-31,,Active,published,false,false,"",,2021-04-26 17:03:04 UTC,2023-02-03 22:27:36 UTC
+General chart of Lake Superior,"","Relief shown by hachures and spot heights. Depths shown by bathymetric tints, soundings, and isolines.; ""Catalogue No. 9.""; ""Issued October 11, 1919.""; Includes text, magnetic variations chart, lists of United States and Canadian canals, and dry docks list.|69 x 124 Centimeters|Scale 1:500,000|General Map Collection",eng,U.S. Lake Survey,"","On sale at U.S. Lake Survey Office (Detroit, Michigan)",University of Minnesota,Maps,"","","","","",,"",United States|Lake Superior,"-92.25,46,-84.25,49","POLYGON((-92.25 49, -84.25 49, -84.25 46, -92.25 46, -92.25 49))","","",64bd8c4c-8e60-4956-b43d-bdc3f93db488,05d-01|p16022coll230,"","","","",JPEG,,,false,,,,,,,,,https://umedia.lib.umn.edu/item/p16022coll230:4115,,https://cdm16022.contentdm.oclc.org/iiif/info/p16022coll230/4115/manifest.json,,,,,,,,,https://cdm16022.contentdm.oclc.org/utils/getthumbnail/collection/p16022coll230/id/4115,p16022coll230:4115,UMN_ALMA:9976559407801701,05d-01,"Use of this item may be governed by US and international copyright laws. You may be able to use this item, but copyright and other considerations may apply. For possible additional information or guidance on your use, please contact the contributing organization.","","",Public,JSON API,,2022-04-18|2022-09-26,,Active,published,false,false,"",,2022-09-26 22:33:45 UTC,2023-02-07 18:35:42 UTC
+Lake Superior and the northern part of Michigan,"","Relief shown by hachures.; Prime meridians: Greenwich and Washington.; ""Entered according to act of Congress in the year 1855 by J.H. Colton & Co. ...""; From Colton's atlas of the world. New York: J.H. Colton & Co., 1855?. No. 43.|29 x 42 centimeters|Scale approximately 1:1,625,000|General Map Collection",eng,J.H. Colton & Co.,fst01457236,J.H. Colton & Co (New York),University of Minnesota,Maps,"","","",|2022-creator-sprint,1855,1855,1855-1855,Michigan,"-92.25,45.0,-83.4167,49.1667","POLYGON((-92.25 49.1667, -83.4167 49.1667, -83.4167 45.0, -92.25 45.0, -92.25 49.1667))","","",64bd8c4c-8e60-4956-b43d-bdc3f93db488,05d-01|p16022coll230,"","","","",JPEG,,,false,,,,,,,,,https://umedia.lib.umn.edu/item/p16022coll230:1933,,https://cdm16022.contentdm.oclc.org/iiif/info/p16022coll230/1933/manifest.json,,,,,,,,,https://cdm16022.contentdm.oclc.org/utils/getthumbnail/collection/p16022coll230/id/1933,p16022coll230:1933,UMN_ALMA:9920722310001701,05d-01,"Use of this item may be governed by US and international copyright laws. You may be able to use this item, but copyright and other considerations may apply. For possible additional information or guidance on your use, please contact the contributing organization.","","",Public,JSON API,,2021-07-19|2022-09-26,,Active,published,false,false,"",,2021-09-21 07:03:39 UTC,2023-02-07 18:33:35 UTC

data/lib/generators/geoblacklight_admin/templates/config/database.yml

@@ -2,7 +2,7 @@ default: &default
   adapter: postgresql
   encoding: unicode
   host:     <%= ENV['POSTGRES_HOST'] || '127.0.0.1' %>
-  port:     <%= ENV['POSTGRES_PORT'] || '5432' %>
+  port:     <%= ENV['POSTGRES_PORT'] || '5555' %>
   username: <%= ENV['POSTGRES_USER'] || 'postgres' %>
   password: <%= ENV['POSTGRES_PASSWORD'] || 'postgres' %>
   pool: 5

data/lib/generators/geoblacklight_admin/templates/config/initializers/devise.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "devise_invitable"
-
 # Assuming you have not yet modified this file, each configuration option below
 # is set to its default value. Note that some are commented out while others
 # are not: uncommented lines are intended to protect your configuration from

data/lib/generators/geoblacklight_admin/templates/config/initializers/mime_types.rb

@@ -13,3 +13,4 @@ Mime::Type.register "application/json", :json
 
 Mime::Type.register "text/csv", :csv_document_downloads
 Mime::Type.register "text/csv", :csv_document_access_links
+Mime::Type.register "text/csv", :csv_document_distributions

data/lib/generators/geoblacklight_admin/templates/demo-app/Dockerfile

@@ -0,0 +1,31 @@
+# syntax = docker/dockerfile:1
+
+# Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
+ARG RUBY_VERSION=3.3.5
+FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim AS base
+
+RUN apt-get update -qq && \
+    apt-get install --no-install-recommends -y build-essential git pkg-config nodejs npm curl libsqlite3-0
+
+RUN npm install --global yarn
+
+ENV RAILS_ENV="development" \
+    BUNDLE_PATH="/usr/local/bundle"
+
+# Rails app lives here
+WORKDIR /rails
+
+# Install gems and javascript packages
+COPY Gemfile .
+RUN bundle install
+COPY package.json .
+RUN yarn install
+
+FROM ghcr.io/geobtaa/geoblacklight_admin:base AS app
+
+# Add application code
+COPY . .
+
+# Run the server script by default, this can be overwritten at runtime
+EXPOSE 3000
+CMD ["sh", "start-server"]

data/lib/generators/geoblacklight_admin/templates/demo-app/compose.yml

@@ -0,0 +1,42 @@
+services:
+  app:
+    image: ghcr.io/geobtaa/geoblacklight_admin:main
+    ports:
+      - "3001:3001"
+    links:
+      - "solr:solr"
+    environment:
+      SOLR_URL: "http://solr:8983/solr/blacklight-core"
+      RAILS_DEVELOPMENT_HOSTS: ".githubpreview.dev,.preview.app.github.dev,.app.github.dev,.csb.app"
+    depends_on:
+      - solr
+    command: sh start-server.sh
+  solr:
+    image: solr:9.6.1
+    volumes:
+      - $PWD/solr/conf:/opt/solr/conf
+    ports:
+      - 8984:8983
+    entrypoint:
+      - docker-entrypoint.sh
+      - solr-precreate
+      - blacklight-core
+      - /opt/solr/conf
+      - "-Xms256m"
+      - "-Xmx512m"
+  postgres:
+    image: postgres:latest
+    env:
+      POSTGRES_HOST: 127.0.0.1
+      POSTGRES_PORT: 5432
+      POSTGRES_DB: geoblacklight_development
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+    ports:
+      - 5432:5432
+    # Set health checks to wait until postgres has started
+    options:
+      --health-cmd pg_isready
+      --health-interval 10s
+      --health-timeout 5s
+      --health-retries 5

data/lib/generators/geoblacklight_admin/templates/demo-app/start-server.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+bundle install
+yarn install
+
+# Build and Install local copy of @geoblackligt/frontend
+# These steps are included in the docker image instead if the image build script
+# to reduce the size of the layers that docker compose has to pull with each new version.
+gempath=$(bundle exec gem which geoblacklight_admin | sed 's/\/lib\/geoblacklight_admin.rb//')
+if [ ! -d "$gempath/dist/" ]; then
+  cd $gempath
+  yarn install
+  yarn vite build
+  cd -
+fi
+yarn add file:$gempath
+
+# Start the server
+bundle exec rake db:prepare
+bundle exec rake geoblacklight:index:seed
+bundle exec rails server -b 0.0.0.0 -p 3001

data/lib/geoblacklight_admin/engine.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require "devise"
+require "blacklight"
+require "geoblacklight"
+
 module GeoblacklightAdmin
   class Engine < ::Rails::Engine
     isolate_namespace GeoblacklightAdmin

data/lib/geoblacklight_admin/rake_task.rb

@@ -1,5 +1,7 @@
+# :nocov:
 module GeoblacklightAdmin
   module RakeTask
     Dir[File.expand_path(File.join(File.dirname(__FILE__), "tasks/*.rake"))].each { |ext| load ext } if defined?(Rake)
   end
 end
+# :nocov:

data/lib/geoblacklight_admin/tasks/distributions.rake

@@ -0,0 +1,69 @@
+require "rake"
+require "csv"
+
+namespace :geoblacklight_admin do
+  namespace :distributions do
+    desc "Migrate distributions into DocumentDistributions"
+    task migrate: :environment do
+      total_documents_processed = 0
+      puts "\n--- Migration Start ---"
+      Document.find_in_batches(batch_size: 1000) do |documents|
+        documents.each do |document|
+          # Moves AttrJson-based dct_references_s and Multiple Downloads into DocumentDistributions
+
+          document.distributions_csv.each do |distribution|
+            DocumentDistribution.find_or_create_by!(
+              friendlier_id: distribution[0],
+              reference_type_id: ReferenceType.find_by(name: distribution[1]).id,
+              url: distribution[2],
+              label: distribution[3]
+            )
+          end
+        rescue => e
+          puts "\nError processing distributions for document: #{document.friendlier_id} - #{e.inspect}\n"
+        end
+        total_documents_processed += documents.size
+        puts "Processed #{documents.size} documents in this batch, total processed: #{total_documents_processed}"
+      end
+      puts "--- Migration End ---\n"
+    end
+
+    desc "Audit the distributions migration"
+    task audit: :environment do
+      total_documents_processed = 0
+      puts "\n--- Audit Start ---"
+      Document.find_in_batches(batch_size: 1000) do |documents|
+        documents.each do |document|
+          # Document > Distributions as CSV
+          dr_csv = document.references_csv.sort
+
+          # document_distributions
+          doc_dists = document.document_distributions.collect { |dr| dr.to_csv }.sort
+
+          if dr_csv != doc_dists
+            puts "\nNO MATCH"
+            puts "Document: #{document.friendlier_id}"
+            puts "CSV Distributions Sorted: #{dr_csv.sort.inspect}"
+            puts "Document Distributions Sorted: #{doc_dists.sort.inspect}\n"
+          end
+        rescue => e
+          puts "\nError auditing distributions for document: #{document.friendlier_id} - #{e.inspect}\n"
+        end
+        total_documents_processed += documents.size
+        puts "Processed #{documents.size} documents in this batch, total processed: #{total_documents_processed}"
+      end
+      puts "--- Audit End ---\n"
+    end
+
+    task finalize: :environment do
+      # Step 1 - After migrate, flip the ENV var feature flag
+      # Done: Remove multiple download links from Documents
+      # Done: Remove multiple download links from FormElements (it's a feature there)
+      # Done: Remove multiple download links from FormNav (link)
+      # Done: Add DocumentDistributions to the FormElements (as a feature - manual)
+
+      # Step 2 - Finalize
+      # Remove AttrJson dct_references_s values from Documents (data is redundant and/or incorrect)
+    end
+  end
+end

data/lib/geoblacklight_admin/tasks/images.rake

@@ -1,3 +1,4 @@
+require "rake"
 require "csv"
 
 namespace :geoblacklight_admin do

data/lib/geoblacklight_admin/tasks/solr.rake

@@ -1,3 +1,4 @@
+require "rake"
 require "csv"
 
 namespace :geoblacklight_admin do
@@ -7,5 +8,35 @@ namespace :geoblacklight_admin do
       deleted_orphans = GeoblacklightAdmin::SolrUtils.delete_solr_orphans(batch_size: 1000)
       puts "Deleted: #{deleted_orphans.inspect}"
     end
+
+    desc "Reindex all Documents - via Kithe"
+    task reindex: :environment do
+      Kithe::Indexable.index_with(batching: true) do
+        progress_bar = ProgressBar.create(total: Document.count, format: Kithe::STANDARD_PROGRESS_BAR_FORMAT)
+
+        scope = Kithe::Model.where(kithe_model_type: 1)
+
+        scope.find_each do |model|
+          progress_bar.title = "#{model.class.name}:#{model.friendlier_id}"
+          model.update_index
+          progress_bar.increment
+        end
+      end
+    end
+
+    desc "Reindex all Documents - via Rails"
+    task reindex_rails: :environment do
+      total_documents_processed = 0
+      Document.find_in_batches(batch_size: 1000) do |documents|
+        documents.each do |document|
+          document.update_index
+        rescue => e
+          puts "Error updating index for document: #{document.friendlier_id}"
+          puts e.message
+        end
+        total_documents_processed += documents.size
+        puts "Processed #{documents.size} documents in this batch, total processed: #{total_documents_processed}"
+      end
+    end
   end
 end

data/lib/geoblacklight_admin/version.rb

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