Settings plus cross search (#1753)

* draft of uncompleted implementation of cross tenant search

* port settings from hyku_addons, set up settings as properties

* email settings and env vars

* move many settings to account or env vars, set up gtm

* goodbye SETTINGS__

* working on specs

* splash view fix

* more spec fixes

* more spec fixes

* more spec fixes

* rubocop fixes

* fix oai and s3 buckets

* always set web_host, fix mailer spec

* Typo/Spelling fix

* spec typo

* dynamic display and edit of settings

* Update .env (#1752)

* Update .env

* Update .env

* rubocop

* merge concepts of cross search with new settings, rework cross search to be many to many and use the db

* rubocop

* better solr nil check

* add some model & system test for cross tenant search

* Deleting a full_tenant from a search failed because '1' is sent back instead of 'true', hence I added typecasting

* remove extra end

* rubocop

* rubocop fixes

* make sure rdf doesnt bump to 3.2 as ldp is broken with that version

* clean up specs. collection controller is moved to settings, so specs need to go

* fix selenium version issue

* fix elastic jobs

* try to fix catalog spec for ci

* mark domain names feature spec pending

* trying to make circle ci happy

Co-authored-by: edward <[email protected]>

.env

@@ -18,10 +18,8 @@ PASSENGER_APP_ENV=development
 RAILS_LOG_TO_STDOUT=true
 REDIS_HOST=redis
 SECRET_KEY_BASE=asdf
-SETTINGS__ACTIVE_JOB__QUEUE_ADAPTER=sidekiq
-SETTINGS__BULKRAX__ENABLED=false
-SETTINGS__FITS_PATH=/app/fits/fits.sh
-SETTINGS__SOLR__URL=http://admin:admin@solr:8983/solr/
+HYRAX_ACTIVE_JOB_QUEUE=sidekiq
+HYRAX_FITS_PATH=/app/fits/fits.sh
 SOLR_ADMIN_PASSWORD=admin
 SOLR_ADMIN_USER=admin
 SOLR_COLLECTION_NAME=hydra-development
@@ -31,12 +29,11 @@ SOLR_PORT=8983
 SOLR_URL=http://admin:admin@solr:8983/solr/
 
 # Comment out these 5 for single tenancy / Uncomment for multi
-SETTINGS__MULTITENANCY__ADMIN_HOST=hyku.test
-SETTINGS__MULTITENANCY__ADMIN_ONLY_TENANT_CREATION=false
-SETTINGS__MULTITENANCY__DEFAULT_HOST=%{tenant}.hyku.test
-SETTINGS__MULTITENANCY__ROOT_HOST=hyku.test
-SETTINGS__MULTITENANCY__ENABLED=true
+HYKU_ADMIN_HOST=hyku.test
+HYKU_ADMIN_ONLY_TENANT_CREATION=false
+HYKU_DEFAULT_HOST=%{tenant}.hyku.test
+HYKU_ROOT_HOST=hyku.test
+HYKU_MULTITENANT=true
 # Comment out these 2 for multi tenancy / Uncomment for single
-# SETTINGS__MULTITENANCY__ROOT_HOST=hyku.test
-# SETTINGS__MULTITENANCY__ENABLED=false
-
+# HYKU_ROOT_HOST=hyku.test
+# HYKU_MULTITENANT=false

Dockerfile

@@ -26,7 +26,7 @@ RUN bundle install --jobs "$(nproc)"
 
 COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp
 
-ARG SETTINGS__BULKRAX__ENABLED="false"
+ARG HYKU_BULKRAX_ENABLED="false"
 RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nulldb DATABASE_URL='postgresql://fake' bundle exec rake assets:precompile
 
 FROM hyku-base as hyku-worker

Gemfile

@@ -105,7 +105,6 @@ gem 'devise-i18n'
 gem 'devise_invitable', '~> 1.6'
 
 gem 'apartment'
-gem 'config', '>= 2.2.1', '< 4.0'
 gem 'is_it_working'
 gem 'rolify'
 
@@ -124,8 +123,10 @@ group :aws do
 end
 
 gem 'bootstrap-datepicker-rails'
+gem "cocoon"
 gem 'codemirror-rails'
 gem 'parser', '~> 2.5.3'
+gem 'rdf', '~> 3.1.15' # rdf 3.2.0 removed SerializedTransaction which ldp requires
 gem 'riiif', '~> 1.1'
 gem 'secure_headers'
 gem 'sidekiq'