From 939bd17eb4ab071b83002e0091432e98ad81d795 Mon Sep 17 00:00:00 2001 From: Kirk Wang Date: Tue, 12 Dec 2023 13:36:58 -0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9=20Get=20the=20page=20to=20load?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit will get the proprietor page to load. You can create a tenant and vist it as well. --- Gemfile.lock | 3 ++- app/helpers/application_helper.rb | 2 +- app/jobs/create_default_admin_set_job.rb | 2 +- app/services/create_account.rb | 2 +- app/services/roles_service.rb | 2 +- app/views/layouts/hyrax.html.erb | 2 +- config/environments/development.rb | 3 ++- db/seeds.rb | 2 +- spec/features/admin_set_form_participants_tab_spec.rb | 2 +- spec/features/assign_workflow_to_group_spec.rb | 2 +- spec/features/create_generic_work_spec.rb | 2 +- spec/features/create_image_spec.rb | 2 +- spec/features/create_work_spec.rb | 2 +- spec/features/show_page_theme_spec.rb | 2 +- spec/requests/work_depositor_role_spec.rb | 2 +- 15 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 90d84f205..8c95cd3bb 100644 --- a/Gemfile.lock +++ b/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 diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index e27eee4ae..681cd4d18 100644 --- a/app/helpers/application_helper.rb +++ b/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 diff --git a/app/jobs/create_default_admin_set_job.rb b/app/jobs/create_default_admin_set_job.rb index 592b32f8e..1f8ee9437 100644 --- a/app/jobs/create_default_admin_set_job.rb +++ b/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 diff --git a/app/services/create_account.rb b/app/services/create_account.rb index f021fbff4..1ce61f94e 100644 --- a/app/services/create_account.rb +++ b/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 diff --git a/app/services/roles_service.rb b/app/services/roles_service.rb index c5c6a5de8..7b28747ad 100644 --- a/app/services/roles_service.rb +++ b/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? diff --git a/app/views/layouts/hyrax.html.erb b/app/views/layouts/hyrax.html.erb index e2ff69136..448eba3d3 100644 --- a/app/views/layouts/hyrax.html.erb +++ b/app/views/layouts/hyrax.html.erb @@ -31,6 +31,6 @@ <%= content_for?(:content) ? yield(:content) : yield %> <%= render 'shared/footer' %> - <%= render 'shared/ajax_modal' %> + <%= render 'shared/modal' %> diff --git a/config/environments/development.rb b/config/environments/development.rb index 4a0d92943..07f298607 100644 --- a/config/environments/development.rb +++ b/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 diff --git a/db/seeds.rb b/db/seeds.rb index 509224c1e..a3b84dae7 100644 --- a/db/seeds.rb +++ b/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 diff --git a/spec/features/admin_set_form_participants_tab_spec.rb b/spec/features/admin_set_form_participants_tab_spec.rb index 06fb8d1fa..13bea005e 100644 --- a/spec/features/admin_set_form_participants_tab_spec.rb +++ b/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 diff --git a/spec/features/assign_workflow_to_group_spec.rb b/spec/features/assign_workflow_to_group_spec.rb index 636d3859c..e6d791630 100644 --- a/spec/features/assign_workflow_to_group_spec.rb +++ b/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 diff --git a/spec/features/create_generic_work_spec.rb b/spec/features/create_generic_work_spec.rb index 890e6ebf6..1490a6710 100644 --- a/spec/features/create_generic_work_spec.rb +++ b/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!( diff --git a/spec/features/create_image_spec.rb b/spec/features/create_image_spec.rb index 9154f3b88..8cd1cf796 100644 --- a/spec/features/create_image_spec.rb +++ b/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!( diff --git a/spec/features/create_work_spec.rb b/spec/features/create_work_spec.rb index 6eddc7e85..49523a9cc 100644 --- a/spec/features/create_work_spec.rb +++ b/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 diff --git a/spec/features/show_page_theme_spec.rb b/spec/features/show_page_theme_spec.rb index 941ae652f..2e66de5b3 100644 --- a/spec/features/show_page_theme_spec.rb +++ b/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!( diff --git a/spec/requests/work_depositor_role_spec.rb b/spec/requests/work_depositor_role_spec.rb index b95ae1c2e..0053ac892 100644 --- a/spec/requests/work_depositor_role_spec.rb +++ b/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