From 7bc526696d1e8c86254cc2deaf9c5198eb4ff502 Mon Sep 17 00:00:00 2001 From: LaRita Robinson Date: Tue, 23 Jul 2024 11:08:17 -0400 Subject: [PATCH 1/2] Add some missing includes --- app/forms/conference_item_resource_form.rb | 2 ++ app/forms/dataset_resource_form.rb | 2 ++ app/forms/exam_paper_resource_form.rb | 2 ++ app/forms/journal_article_resource_form.rb | 2 ++ app/forms/published_work_resource_form.rb | 2 ++ app/forms/thesis_resource_form.rb | 2 ++ app/indexers/thesis_resource_indexer.rb | 1 + 7 files changed, 13 insertions(+) diff --git a/app/forms/conference_item_resource_form.rb b/app/forms/conference_item_resource_form.rb index 2dd8e04b..8b065fc3 100644 --- a/app/forms/conference_item_resource_form.rb +++ b/app/forms/conference_item_resource_form.rb @@ -8,8 +8,10 @@ class ConferenceItemResourceForm < Hyrax::Forms::ResourceForm(ConferenceItemResource) include Hyrax::FormFields(:basic_metadata) include Hyrax::FormFields(:conference_item_resource) + include Hyrax::FormFields(:bulkrax_metadata) include Hyrax::FormFields(:with_pdf_viewer) include Hyrax::FormFields(:with_video_embed) + include VideoEmbedBehavior::Validation # Define custom form fields using the Valkyrie::ChangeSet interface # diff --git a/app/forms/dataset_resource_form.rb b/app/forms/dataset_resource_form.rb index 15b0167c..2c46bc8a 100644 --- a/app/forms/dataset_resource_form.rb +++ b/app/forms/dataset_resource_form.rb @@ -8,8 +8,10 @@ class DatasetResourceForm < Hyrax::Forms::ResourceForm(DatasetResource) include Hyrax::FormFields(:basic_metadata) include Hyrax::FormFields(:dataset_resource) + include Hyrax::FormFields(:bulkrax_metadata) include Hyrax::FormFields(:with_pdf_viewer) include Hyrax::FormFields(:with_video_embed) + include VideoEmbedBehavior::Validation # Define custom form fields using the Valkyrie::ChangeSet interface # diff --git a/app/forms/exam_paper_resource_form.rb b/app/forms/exam_paper_resource_form.rb index d59ed0ef..40e076aa 100644 --- a/app/forms/exam_paper_resource_form.rb +++ b/app/forms/exam_paper_resource_form.rb @@ -8,8 +8,10 @@ class ExamPaperResourceForm < Hyrax::Forms::ResourceForm(ExamPaperResource) include Hyrax::FormFields(:basic_metadata) include Hyrax::FormFields(:exam_paper_resource) + include Hyrax::FormFields(:bulkrax_metadata) include Hyrax::FormFields(:with_pdf_viewer) include Hyrax::FormFields(:with_video_embed) + include VideoEmbedBehavior::Validation # Define custom form fields using the Valkyrie::ChangeSet interface # diff --git a/app/forms/journal_article_resource_form.rb b/app/forms/journal_article_resource_form.rb index 2eb92f20..681e30d6 100644 --- a/app/forms/journal_article_resource_form.rb +++ b/app/forms/journal_article_resource_form.rb @@ -8,8 +8,10 @@ class JournalArticleResourceForm < Hyrax::Forms::ResourceForm(JournalArticleResource) include Hyrax::FormFields(:basic_metadata) include Hyrax::FormFields(:journal_article_resource) + include Hyrax::FormFields(:bulkrax_metadata) include Hyrax::FormFields(:with_pdf_viewer) include Hyrax::FormFields(:with_video_embed) + include VideoEmbedBehavior::Validation # Define custom form fields using the Valkyrie::ChangeSet interface # diff --git a/app/forms/published_work_resource_form.rb b/app/forms/published_work_resource_form.rb index 709ade36..35d316cd 100644 --- a/app/forms/published_work_resource_form.rb +++ b/app/forms/published_work_resource_form.rb @@ -8,8 +8,10 @@ class PublishedWorkResourceForm < Hyrax::Forms::ResourceForm(PublishedWorkResource) include Hyrax::FormFields(:basic_metadata) include Hyrax::FormFields(:published_work_resource) + include Hyrax::FormFields(:bulkrax_metadata) include Hyrax::FormFields(:with_pdf_viewer) include Hyrax::FormFields(:with_video_embed) + include VideoEmbedBehavior::Validation # Define custom form fields using the Valkyrie::ChangeSet interface # diff --git a/app/forms/thesis_resource_form.rb b/app/forms/thesis_resource_form.rb index b22e008d..5e19258d 100644 --- a/app/forms/thesis_resource_form.rb +++ b/app/forms/thesis_resource_form.rb @@ -8,8 +8,10 @@ class ThesisResourceForm < Hyrax::Forms::ResourceForm(ThesisResource) include Hyrax::FormFields(:basic_metadata) include Hyrax::FormFields(:thesis_resource) + include Hyrax::FormFields(:bulkrax_metadata) include Hyrax::FormFields(:with_pdf_viewer) include Hyrax::FormFields(:with_video_embed) + include VideoEmbedBehavior::Validation # Define custom form fields using the Valkyrie::ChangeSet interface # diff --git a/app/indexers/thesis_resource_indexer.rb b/app/indexers/thesis_resource_indexer.rb index 89025517..4326fd9d 100644 --- a/app/indexers/thesis_resource_indexer.rb +++ b/app/indexers/thesis_resource_indexer.rb @@ -7,6 +7,7 @@ class ThesisResourceIndexer < Hyrax::ValkyrieWorkIndexer include Hyrax::Indexer(:thesis_resource) include Hyrax::Indexer(:with_pdf_viewer) include Hyrax::Indexer(:with_video_embed) + include Hyrax::Indexer(:bulkrax_metadata) include HykuIndexing From 21ba377be492498fd9b688adbfedaada27e0452b Mon Sep 17 00:00:00 2001 From: LaRita Robinson Date: Tue, 23 Jul 2024 11:25:16 -0400 Subject: [PATCH 2/2] Missed a few indexers These changes are probably not necessary since this is already included in HykuIndexing but for consistency with Hyku, we are explicitly including bulkrax on all indexers. --- app/indexers/conference_item_resource_indexer.rb | 1 + app/indexers/dataset_resource_indexer.rb | 1 + app/indexers/exam_paper_resource_indexer.rb | 1 + app/indexers/journal_article_resource_indexer.rb | 1 + app/indexers/published_work_resource_indexer.rb | 1 + 5 files changed, 5 insertions(+) diff --git a/app/indexers/conference_item_resource_indexer.rb b/app/indexers/conference_item_resource_indexer.rb index b2d9f253..1ad2c625 100644 --- a/app/indexers/conference_item_resource_indexer.rb +++ b/app/indexers/conference_item_resource_indexer.rb @@ -7,6 +7,7 @@ class ConferenceItemResourceIndexer < Hyrax::ValkyrieWorkIndexer include Hyrax::Indexer(:conference_item_resource) include Hyrax::Indexer(:with_pdf_viewer) include Hyrax::Indexer(:with_video_embed) + include Hyrax::Indexer(:bulkrax_metadata) include HykuIndexing diff --git a/app/indexers/dataset_resource_indexer.rb b/app/indexers/dataset_resource_indexer.rb index 1e26e384..c8dce8e2 100644 --- a/app/indexers/dataset_resource_indexer.rb +++ b/app/indexers/dataset_resource_indexer.rb @@ -7,6 +7,7 @@ class DatasetResourceIndexer < Hyrax::ValkyrieWorkIndexer include Hyrax::Indexer(:dataset_resource) include Hyrax::Indexer(:with_pdf_viewer) include Hyrax::Indexer(:with_video_embed) + include Hyrax::Indexer(:bulkrax_metadata) include HykuIndexing diff --git a/app/indexers/exam_paper_resource_indexer.rb b/app/indexers/exam_paper_resource_indexer.rb index 81edd8b0..3ab44fc2 100644 --- a/app/indexers/exam_paper_resource_indexer.rb +++ b/app/indexers/exam_paper_resource_indexer.rb @@ -7,6 +7,7 @@ class ExamPaperResourceIndexer < Hyrax::ValkyrieWorkIndexer include Hyrax::Indexer(:exam_paper_resource) include Hyrax::Indexer(:with_pdf_viewer) include Hyrax::Indexer(:with_video_embed) + include Hyrax::Indexer(:bulkrax_metadata) include HykuIndexing diff --git a/app/indexers/journal_article_resource_indexer.rb b/app/indexers/journal_article_resource_indexer.rb index 40020b04..18bfa08f 100644 --- a/app/indexers/journal_article_resource_indexer.rb +++ b/app/indexers/journal_article_resource_indexer.rb @@ -7,6 +7,7 @@ class JournalArticleResourceIndexer < Hyrax::ValkyrieWorkIndexer include Hyrax::Indexer(:journal_article_resource) include Hyrax::Indexer(:with_pdf_viewer) include Hyrax::Indexer(:with_video_embed) + include Hyrax::Indexer(:bulkrax_metadata) include HykuIndexing diff --git a/app/indexers/published_work_resource_indexer.rb b/app/indexers/published_work_resource_indexer.rb index c58de3c6..c8c36bcd 100644 --- a/app/indexers/published_work_resource_indexer.rb +++ b/app/indexers/published_work_resource_indexer.rb @@ -7,6 +7,7 @@ class PublishedWorkResourceIndexer < Hyrax::ValkyrieWorkIndexer include Hyrax::Indexer(:published_work_resource) include Hyrax::Indexer(:with_pdf_viewer) include Hyrax::Indexer(:with_video_embed) + include Hyrax::Indexer(:bulkrax_metadata) include HykuIndexing