DRAFT DO NOT MERGE: 🎁 Flexible double combo

.dassie/app/forms/collection_resource_form.rb

@@ -3,6 +3,6 @@
 # Generated via
 #  `rails generate hyrax:collection_resource CollectionResource`
 class CollectionResourceForm < Hyrax::Forms::PcdmCollectionForm
-  include Hyrax::FormFields(:basic_metadata)
-  include Hyrax::FormFields(:collection_resource)
+  include Hyrax::FormFields(:basic_metadata) unless Hyrax.config.flexible?
+  include Hyrax::FormFields(:collection_resource) unless Hyrax.config.flexible?
 end

.dassie/app/forms/generic_work_resource_form.rb

@@ -6,8 +6,8 @@
 # @see https://github.com/samvera/hyrax/wiki/Hyrax-Valkyrie-Usage-Guide#forms
 # @see https://github.com/samvera/valkyrie/wiki/ChangeSets-and-Dirty-Tracking
 class GenericWorkResourceForm < Hyrax::Forms::ResourceForm(GenericWorkResource)
-  include Hyrax::FormFields(:basic_metadata)
-  include Hyrax::FormFields(:generic_work_resource)
+  include Hyrax::FormFields(:basic_metadata) unless Hyrax.config.flexible?
+  include Hyrax::FormFields(:generic_work_resource) unless Hyrax.config.flexible?
 
   # Define custom form fields using the Valkyrie::ChangeSet interface
   #

.dassie/app/forms/monograph_form.rb

@@ -6,8 +6,8 @@
 # @see https://github.com/samvera/hyrax/wiki/Hyrax-Valkyrie-Usage-Guide#forms
 # @see https://github.com/samvera/valkyrie/wiki/ChangeSets-and-Dirty-Tracking
 class MonographForm < Hyrax::Forms::ResourceForm(Monograph)
-  include Hyrax::FormFields(:basic_metadata)
-  include Hyrax::FormFields(:monograph)
+  include Hyrax::FormFields(:basic_metadata) unless Hyrax.config.flexible?
+  include Hyrax::FormFields(:monograph) unless Hyrax.config.flexible?
 
   # Define custom form fields using the Valkyrie::ChangeSet interface
   #

.dassie/app/indexers/collection_resource_indexer.rb

@@ -3,6 +3,7 @@
 # Generated via
 #  `rails generate hyrax:collection_resource CollectionResource`
 class CollectionResourceIndexer < Hyrax::PcdmCollectionIndexer
-  include Hyrax::Indexer(:basic_metadata)
-  include Hyrax::Indexer(:collection_resource)
+  include Hyrax::Indexer(:basic_metadata) unless Hyrax.config.flexible?
+  include Hyrax::Indexer(:collection_resource) unless Hyrax.config.flexible?
+  include Hyrax::Indexer('CollectionResource') if Hyrax.config.flexible?
 end

.dassie/app/indexers/generic_work_resource_indexer.rb

@@ -3,8 +3,9 @@
 # Generated via
 #  `rails generate hyrax:work_resource GenericWorkResource`
 class GenericWorkResourceIndexer < Hyrax::ValkyrieWorkIndexer
-  include Hyrax::Indexer(:basic_metadata)
-  include Hyrax::Indexer(:generic_work_resource)
+  include Hyrax::Indexer(:basic_metadata) unless Hyrax.config.flexible?
+  include Hyrax::Indexer(:generic_work_resource) unless Hyrax.config.flexible?
+  include Hyrax::Indexer('GenericWorkResource') if Hyrax.config.flexible?
 
   # Uncomment this block if you want to add custom indexing behavior:
   #  def to_solr

.dassie/app/indexers/monograph_indexer.rb

@@ -3,8 +3,9 @@
 # Generated via
 #  `rails generate hyrax:work_resource Monograph`
 class MonographIndexer < Hyrax::ValkyrieWorkIndexer
-  include Hyrax::Indexer(:basic_metadata)
-  include Hyrax::Indexer(:monograph)
+  include Hyrax::Indexer(:basic_metadata) unless Hyrax.config.flexible?
+  include Hyrax::Indexer(:monograph) unless Hyrax.config.flexible?
+  include Hyrax::Indexer('Monograph') if Hyrax.config.flexible?
 
   # Uncomment this block if you want to add custom indexing behavior:
   #  def to_solr

.dassie/app/models/collection_resource.rb

@@ -30,8 +30,8 @@ class CollectionResource < Hyrax::PcdmCollection
   # * add Valkyrie attributes to this class
   # * update form and indexer to process the attributes
   #
-  include Hyrax::Schema(:basic_metadata)
-  include Hyrax::Schema(:collection_resource)
+  include Hyrax::Schema(:basic_metadata) unless Hyrax.config.flexible?
+  include Hyrax::Schema(:collection_resource) unless Hyrax.config.flexible?
 
   Hyrax::ValkyrieLazyMigration.migrating(self, from: ::Collection) if Hyrax.config.valkyrie_transition?
 end

.dassie/app/models/generic_work_resource.rb

@@ -3,8 +3,8 @@
 # Generated via
 #  `rails generate hyrax:work_resource GenericWorkResource`
 class GenericWorkResource < Hyrax::Work
-  include Hyrax::Schema(:basic_metadata)
-  include Hyrax::Schema(:generic_work_resource)
+  include Hyrax::Schema(:basic_metadata) unless Hyrax.config.flexible?
+  include Hyrax::Schema(:generic_work_resource) unless Hyrax.config.flexible?
 
   Hyrax::ValkyrieLazyMigration.migrating(self, from: GenericWork) if Hyrax.config.valkyrie_transition?
 end

.dassie/app/models/monograph.rb

@@ -3,6 +3,6 @@
 # Generated via
 #  `rails generate hyrax:work_resource Monograph`
 class Monograph < Hyrax::Work
-  include Hyrax::Schema(:basic_metadata)
-  include Hyrax::Schema(:monograph)
+  include Hyrax::Schema(:basic_metadata) unless Hyrax.config.flexible?
+  include Hyrax::Schema(:monograph) unless Hyrax.config.flexible?
 end