Skip to content

Commit

Permalink
⚙️ Update submodule and remove decorator
Browse files Browse the repository at this point in the history
We no longer need the SimpleSchemaLoaderDecorator as we are now using
the Hyrax.config to load the schema.
  • Loading branch information
kirkkwang committed Aug 28, 2024
1 parent 1dee3a5 commit 1ad25ea
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 17 deletions.
13 changes: 0 additions & 13 deletions app/services/hyrax/simple_schema_loader_decorator.rb

This file was deleted.

2 changes: 2 additions & 0 deletions config/initializers/hyrax.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
# config.enable_ffmpeg = false

# config.branding_path = ENV.fetch('HYRAX_BRANDING_PATH', Rails.root.join('public', 'branding'))

config.simple_schema_loader_config_search_paths.unshift(HykuKnapsack::Engine.root)
end

# Ensure that valid_child_concerns are set with all the curation concerns including
Expand Down
2 changes: 1 addition & 1 deletion hyrax-webapp
Submodule hyrax-webapp updated 80 files
+7 −1 .rubocop.yml
+37 −190 .rubocop_fixme.yml
+2 −7 .rubocop_todo.yml
+10 −6 Gemfile
+119 −98 Gemfile.lock
+26 −3 app/assets/stylesheets/hyku.scss
+5 −0 app/assets/stylesheets/themes/cultural_repository.scss
+9 −0 app/assets/stylesheets/themes/institutional_repository.scss
+4 −0 app/assets/stylesheets/themes/neutral_repository.scss
+34 −0 app/controllers/concerns/hyku/home_page_themes_behavior.rb
+1 −0 app/controllers/hyrax/admin/appearances_controller_decorator.rb
+1 −20 app/controllers/hyrax/contact_form_controller_decorator.rb
+2 −0 app/controllers/hyrax/dashboard/collections_controller_decorator.rb
+5 −19 app/controllers/hyrax/homepage_controller.rb
+1 −21 app/controllers/hyrax/pages_controller_decorator.rb
+1 −1 app/forms/admin_set_resource_form.rb
+50 −92 app/forms/hyku/forms/admin/appearance.rb
+3 −1 app/helpers/blacklight/catalog_helper_behavior_decorator.rb
+22 −32 app/jobs/batch_email_notification_job.rb
+7 −20 app/jobs/depositor_email_notification_job.rb
+4 −16 app/jobs/embargo_auto_expiry_job.rb
+4 −16 app/jobs/lease_auto_expiry_job.rb
+12 −0 app/jobs/tenant_maintenance_job.rb
+11 −0 app/jobs/user_stat_collection_job.rb
+2 −0 app/listeners/hyrax_listener.rb
+20 −1 app/models/account.rb
+4 −0 app/models/concerns/account_cname.rb
+1 −1 app/models/concerns/pdf_behavior.rb
+1 −1 app/models/domain_name.rb
+1 −1 app/models/featured_collection_list.rb
+12 −6 app/models/sushi.rb
+2 −0 app/models/sushi/item_report.rb
+4 −0 app/models/sushi/platform_report.rb
+2 −0 app/models/sushi/platform_usage_report.rb
+2 −2 app/models/sushi/report_list.rb
+10 −0 app/models/user.rb
+6 −0 app/models/user_batch_email.rb
+1 −7 app/services/create_account.rb
+1 −1 app/services/hyrax/thumbnail_path_service_decorator.rb
+1 −1 app/services/iiif_print/tenant_config.rb
+1 −1 app/services/import_counter_metrics.rb
+42 −0 app/views/hyrax/content_blocks/_form.html.erb
+14 −13 app/views/hyrax/dashboard/sidebar/_configuration.html.erb
+1 −1 app/views/shared/_appearance_styles.html.erb
+0 −1 app/views/themes/cultural_repository/_logo.html.erb
+0 −1 app/views/themes/institutional_repository/_logo.html.erb
+28 −26 app/views/themes/institutional_repository/layouts/homepage.html.erb
+6 −1 config/application.rb
+5 −3 config/initializers/hyrax.rb
+7 −4 config/initializers/wings.rb
+1 −1 config/locales/simple_form.en.yml
+5 −0 db/migrate/20240820195641_remove_last_emailed_at_from_users.rb
+10 −0 db/migrate/20240820200440_create_user_batch_emails.rb
+10 −2 db/schema.rb
+18 −0 lib/active_job_tenant.rb
+54 −6 lib/reprocessor.rb
+0 −32 lib/tasks/migrate_hyku_commons_collection_thumbnails_to_valkyrie.rake
+1 −1 lib/tasks/tenantize_task.rake
+38 −0 spec/controllers/concerns/hyku/home_page_themes_behavior_spec.rb
+1 −1 spec/features/admin_set_form_participants_tab_spec.rb
+1 −1 spec/features/appearance_theme_spec.rb
+1 −1 spec/features/create_generic_work_spec.rb
+1 −1 spec/features/create_image_spec.rb
+1 −1 spec/features/work_editor_role_spec.rb
+1 −1 spec/forms/hyku/forms/admin/appearance_spec.rb
+28 −18 spec/jobs/batch_email_notification_job_spec.rb
+7 −4 spec/jobs/depositor_email_notification_job_spec.rb
+8 −4 spec/jobs/embargo_auto_expiry_job_spec.rb
+8 −4 spec/jobs/lease_auto_expiry_job_spec.rb
+13 −0 spec/jobs/tenant_maintenance_job_spec.rb
+22 −0 spec/jobs/user_stat_collection_job_spec.rb
+1 −1 spec/models/account_spec.rb
+1 −1 spec/models/sushi_spec.rb
+1 −1 spec/models/uploaded_file_spec.rb
+1 −1 spec/routing/featured_collections_route_spec.rb
+11 −7 spec/services/create_account_spec.rb
+0 −44 spec/tasks/migrate_hyku_commons_collection_thumbnails_to_valkyrie_spec.rb
+1 −1 spec/views/hyku/admin/appearances/show.html.erb_spec.rb
+1 −1 spec/views/hyrax/content_blocks/edit.html.erb_spec.rb
+83 −40 yarn.lock
3 changes: 0 additions & 3 deletions lib/hyku_knapsack/engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ def self.load_translations!
# omniauthable
# ]
# end

# Ensure we are prepending the Hyrax::SimpleSchemaLoaderDecorator early
Hyrax::SimpleSchemaLoader.prepend(Hyrax::SimpleSchemaLoaderDecorator)
end

config.to_prepare do
Expand Down

0 comments on commit 1ad25ea

Please sign in to comment.