Merge branch 'feature/gbl-admin' into develop

.env.development.example

@@ -1,4 +1,34 @@
-# Using dotenv-rails to set development environment variables
-# Example use below:
-SOLR_VERSION = 6.2.1
-SOLR_URL: http://127.0.0.1:8983/solr/geoportal-core-development
+GEOBLACKLIGHT_DB_HOST=localhost
+GEOBLACKLIGHT_DB_DATABASE=geoportal_admin
+GEOBLACKLIGHT_DB_USER= 
+GEOBLACKLIGHT_DB_PASSWORD= 
+
+SOLR_VERSION=8.11.1
+
+# Solr - Local development
+SOLR_URL=http://127.0.0.1:8983/solr/blacklight-core
+
+# Solr - Remote development
+# SOLR_URL=https://remote_server/solr/core
+# SOLR_BASIC_AUTH_USER=user
+# SOLR_BASIC_AUTH_PASSWORD=password
+
+# BL API
+BLACKLIGHT_URL=/
+BLACKLIGHT_JSON_API=/admin/api.json
+BLACKLIGHT_JSON_API_IDS=/admin/api/ids.json
+BLACKLIGHT_JSON_API_FACETS=/admin/advanced_search/facets.json
+
+# BL IDS
+BLACKLIGHT_JSON_IDS=/admin/ids.json
+
+GEOMG_DB_DATABASE=geoblacklight_development
+GEOMG_DB_USER=
+GEOMG_DB_PASSWORD=
+
+GEOMG_DEVISE_SECRET_KEY=generated-by-rake-secret
+
+# Blazer
+BLAZER_UPLOADS_URL=postgresql://127.0.0.1:5432/geoblacklight_development
+MAPBOX_ACCESS_TOKEN=your-key-here
+

.env.test.example

@@ -1,3 +1,9 @@
 # Using dotenv-rails to set test environment variables
 SOLR_VERSION = 6.2.1
 SOLR_URL: http://127.0.0.1:8985/solr/geoportal-core-test
+
+POSTGRES_HOST = localhost
+POSTGRES_PORT = 5432
+POSTGRES_DB = geoblacklight_test
+POSTGRES_USER = postgres
+POSTGRES_PASSWORD = postgres

.github/workflows/ci.yml

@@ -8,6 +8,25 @@ jobs:
     strategy:
       matrix:
         ruby: ['3.0']
+
+    services:
+      postgres:
+        image: postgres:latest
+        env:
+          POSTGRES_HOST: 127.0.0.1
+          POSTGRES_PORT: 5432
+          POSTGRES_DB: geoblacklight_test
+          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
+
     steps:
     - uses: actions/checkout@v2
 

.solr_wrapper → .solr_wrapper.yml

@@ -5,3 +5,4 @@ download_dir: tmp/solr
 collection:
   dir: solr/conf/
   name: geoportal-core-test
+  persist: true

Gemfile

@@ -45,6 +45,8 @@ gem 'stackprof', '~> 0.2.12' # ruby 2.1+ only
 gem 'memory_profiler', '~> 0.9.12'
 
 group :development, :test do
+  gem 'active_record_query_trace'
+
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug'
 
@@ -73,32 +75,51 @@ gem 'blacklight', '~> 7.33.0'
 gem "blacklight_advanced_search", git: "https://github.com/ewlarson/blacklight_advanced_search.git", branch: "bl7-fix-gentle-hands"
 
 gem 'blacklight_range_limit', '~> 7.0.0'
-gem 'chosen-rails' #  jquery multiselect plugin for advanced search
+gem 'chosen-rails', '~> 1.10' #  jquery multiselect plugin for advanced search
 gem 'bootstrap', '~> 4.0'
 gem 'popper_js'
 gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
 gem 'geoblacklight', '~> 4.1'
+gem 'geoblacklight_admin', '~> 0.3'
 gem "rubyzip", ">= 1.3.0"
 gem "awesome_print"
 
+# GBL Admin dependencies _not_ automatically loading...
+gem 'active_storage_validations'
+gem 'awesome_print'
+# gem 'blacklight_advanced_search'
+gem 'dotenv-rails'
+gem 'haml'
+gem 'inline_svg'
+gem 'kithe', '~> 2.0'
+gem 'noticed'
+gem 'paper_trail'
+
 # Image migration
-gem 'geoblacklight_sidecar_images', '~> 1.0'
+gem 'geoblacklight_sidecar_images', git: "https://github.com/geoblacklight/geoblacklight_sidecar_images.git", branch: "feature/statesman-update"
 gem 'carrierwave', '~> 1.2'
 gem 'mini_magick', '~> 4.9.4'
 
-gem 'statesman', '~> 3.4.1'
+gem 'statesman', '~> 10.0'
 gem 'sidekiq', '~> 6.4'
 gem 'sidekiq-failures', '~> 1.0.0'
-gem 'down', '~> 4.4'
+gem 'down', '~> 5.0'
 gem 'addressable', '~> 2.5.0'
 gem 'handlebars_assets', '~> 0.23.0'
 gem 'geoblacklight-icons', git: 'https://github.com/geoblacklight/geoblacklight-icons.git', :ref => '84da81140e7ef93e7241b7753c01d7f709216f2b'
 gem 'solr_wrapper', git: 'https://github.com/cbeer/solr_wrapper.git', branch: 'master'
 
 gem 'rsolr', '>= 1.0'
 gem 'jquery-rails'
-gem "devise", ">= 4.7.1"
+
+# Auth
+gem "devise", "4.7.3"
+gem 'devise-bootstrap-views', '~> 1.0'
 gem 'devise-guests', '~> 0.6'
+gem 'devise_invitable', '~> 2.0.0'
+
+# Reporting
+gem 'blazer'
 
 gem 'haml'
 gem 'chronic'