🧹 Get the page to load

This commit will get the proprietor page to load.  You can create a
tenant and vist it as well.

Gemfile.lock

@@ -100,7 +100,7 @@ GIT
 
 GIT
   remote: https://github.com/scientist-softserv/apartment.git
-  revision: e1a24b5574dca7116f69e99f140372c42b75e041
+  revision: 9ad4b0ef2ee6debb956e86ef9e7095c8358fef5e
   branch: development
   specs:
     apartment (2.2.1)
@@ -1365,6 +1365,7 @@ DEPENDENCIES
   iiif_print!
   jbuilder (~> 2.5)
   jquery-rails
+  json-canonicalization (= 0.3.1)
   launchy
   listen (>= 3.0.5, < 3.2)
   lograge

app/helpers/application_helper.rb

@@ -24,7 +24,7 @@ def locale_for(type:, term:, record_class:)
     locale
   end
 
-  def missing_translation(value)
+  def missing_translation(value, options = {})
     value.include?('translation missing')
   end
 end

app/jobs/create_default_admin_set_job.rb

@@ -2,6 +2,6 @@
 
 class CreateDefaultAdminSetJob < ApplicationJob
   def perform(_account)
-    AdminSet.find_or_create_default_admin_set_id
+    Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id
   end
 end

app/services/create_account.rb

@@ -46,7 +46,7 @@ def create_defaults
     Hyrax::CollectionType.find_or_create_admin_set_type
     return if account.search_only?
 
-    AdminSet.find_or_create_default_admin_set_id
+    Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id
   end
 
   # Workaround for upstream issue https://github.com/samvera/hyrax/issues/3136

app/services/roles_service.rb

@@ -87,7 +87,7 @@ def create_default_hyrax_groups_with_roles!
       default_hyrax_groups_with_roles.each do |group_name, group_attrs|
         group_roles = group_attrs.delete(:roles)
         group = Hyrax::Group.find_or_create_by!(name: group_name)
-        group.update_attributes(group_attrs)
+        group.update(group_attrs)
 
         group_roles.each do |role_name|
           next if role_name.blank?

app/views/layouts/hyrax.html.erb

@@ -31,6 +31,6 @@
       <%= content_for?(:content) ? yield(:content) : yield %>
     </div><!-- /#content-wrapper -->
     <%= render 'shared/footer' %>
-    <%= render 'shared/ajax_modal' %>
+    <%= render 'shared/modal' %>
   </body>
 </html>

config/environments/development.rb

@@ -64,5 +64,6 @@
   # routes, locales, etc. This feature depends on the listen gem.
   # config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 
-  config.hosts << "hyku.test"
+  # adding `.` wildcard to allow for subdomains
+  config.hosts << "." + ENV['HYKU_ADMIN_HOST']
 end

db/seeds.rb

@@ -17,7 +17,7 @@
   AccountElevator.switch!(single_tenant_default.cname)
 
   puts "\n== Creating default admin set"
-  admin_set = AdminSet.find(AdminSet.find_or_create_default_admin_set_id)
+  admin_set = AdminSet.find(Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id)
 
   puts "\n== Creating default collection types"
   Hyrax::CollectionType.find_or_create_default_collection_type

spec/features/admin_set_form_participants_tab_spec.rb

@@ -23,7 +23,7 @@
     end
 
     let(:admin) { FactoryBot.create(:admin) }
-    let!(:admin_set_id) { AdminSet.find_or_create_default_admin_set_id }
+    let!(:admin_set_id) { Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id }
     let!(:permission_template) { Hyrax::PermissionTemplate.find_or_create_by!(source_id: admin_set_id) }
 
     context 'add group participants' do

spec/features/assign_workflow_to_group_spec.rb

@@ -25,7 +25,7 @@
     let!(:group) { FactoryBot.create(:group, name: 'flinstones', humanized_name: 'Flinstones') }
     let!(:group_3) { FactoryBot.create(:group, name: 'town_of_bedrock', humanized_name: 'Town of Bedrock') }
 
-    let!(:admin_set_id) { AdminSet.find_or_create_default_admin_set_id }
+    let!(:admin_set_id) { Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id }
     let!(:permission_template) { Hyrax::PermissionTemplate.find_or_create_by!(source_id: admin_set_id) }
 
     it 'admin assigns an approving workflow role to a user' do

spec/features/create_generic_work_spec.rb

@@ -10,7 +10,7 @@
 
   context 'a logged in user with the :work_depositor role' do
     let(:user) { create(:user, roles: [:work_depositor]) }
-    let(:admin_set_id) { AdminSet.find_or_create_default_admin_set_id }
+    let(:admin_set_id) { Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id }
     let(:permission_template) { Hyrax::PermissionTemplate.find_or_create_by!(source_id: admin_set_id) }
     let(:workflow) do
       Sipity::Workflow.create!(

spec/features/create_image_spec.rb

@@ -10,7 +10,7 @@
 
   context 'a logged in user with the :work_depositor role' do
     let(:user) { create(:user, roles: [:work_depositor]) }
-    let(:admin_set_id) { AdminSet.find_or_create_default_admin_set_id }
+    let(:admin_set_id) { Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id }
     let(:permission_template) { Hyrax::PermissionTemplate.find_or_create_by!(source_id: admin_set_id) }
     let(:workflow) do
       Sipity::Workflow.create!(

spec/features/create_work_spec.rb

@@ -9,7 +9,7 @@
     FactoryBot.create(:admin_group)
     FactoryBot.create(:editors_group)
     FactoryBot.create(:depositors_group)
-    AdminSet.find_or_create_default_admin_set_id
+    Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id
     login_as user, scope: :user
   end
 

spec/features/show_page_theme_spec.rb

@@ -13,7 +13,7 @@
            user: user)
   end
 
-  let(:admin_set_id) { AdminSet.find_or_create_default_admin_set_id }
+  let(:admin_set_id) { Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id }
   let(:permission_template) { Hyrax::PermissionTemplate.find_or_create_by!(source_id: admin_set_id) }
   let(:workflow) do
     Sipity::Workflow.create!(

spec/requests/work_depositor_role_spec.rb

@@ -15,7 +15,7 @@
   end
 
   describe 'read permissions' do
-    let!(:admin_set_id) { AdminSet.find_or_create_default_admin_set_id }
+    let!(:admin_set_id) { Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id }
 
     before do
       solr = Blacklight.default_index.connection