Updated UNA to use namespaced schema yaml

ubiquitypress · Jan 31, 2024 · 7b84abc · 7b84abc
1 parent 8e961ed
commit 7b84abc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/app/forms/hyrax/una_open_educational_resource_form.rb b/app/forms/hyrax/una_open_educational_resource_form.rb
@@ -3,8 +3,8 @@ module Hyrax
   class UnaOpenEducationalResourceForm < Hyrax::Forms::WorkForm
     include Hyrax::DOI::DataCiteDOIFormBehavior
 
-    include ::HykuAddons::Schema::WorkForm
-    include Hyrax::FormFields(:una_open_educational_resource)
+    include Hyku::Schema::WorkForm
+    include Hyku::Schema::Hyrax::FormFields(:una_open_educational_resource)
 
     self.model_class = ::UnaOpenEducationalResource
   end

diff --git a/app/indexers/una_open_educational_resource_indexer.rb b/app/indexers/una_open_educational_resource_indexer.rb
@@ -1,9 +1,8 @@
-@@ -0,0 +1,8 @@
 # frozen_string_literal: true
 # Generated via
 #  `rails generate hyrax:work UnaOpenEducationalResource`
 class UnaOpenEducationalResourceIndexer < Hyrax::WorkIndexer
-  include Hyrax::Indexer(:una_open_educational_resource)
+  include Hyku::Schema::Hyrax::Indexer(:una_open_educational_resource)
   include Hyrax::IndexesBasicMetadata
   include Hyrax::IndexesLinkedMetadata
 end
diff --git a/app/models/una_open_educational_resource.rb b/app/models/una_open_educational_resource.rb
@@ -4,7 +4,7 @@ class UnaOpenEducationalResource < ActiveFedora::Base
   include Hyrax::DOI::DataCiteDOIBehavior
 
   include Hyku::Schema::WorkBase
-  include Hyrax::Schema(:una_open_educational_resource)
+  include Hyku::Schema::Hyrax::Schema(:una_open_educational_resource)
 
   # Included after other field definitions
   include Hyrax::BasicMetadata

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -59,12 +59,16 @@ services:
       service: web
     # command left commented for situations where the Gemfile.lock needs to be updated before the app starts
     # command: bash -l -c "sleep infinity"
+    ports:
+      - "3000:3000"
     environment:
       # This line is what makes the knapsack include use the local code instead of the remote gem
       - BUNDLE_LOCAL__HYKU_KNAPSACK=/app/samvera
       - BUNDLE_DISABLE_LOCAL_BRANCH_CHECK=true
       - VIRTUAL_PORT=3000
       - VIRTUAL_HOST=.hyku.test
+      - WORKOS_API_KEY=sk_test_a2V5XzAxR0c3RFJIOURYM0NSNUdCTjU2Q0VCTkVDLFcxUHliQWkzd3lNOFdtZXVRbWVxT3NjNnM
+      - WORKOS_CLIENT_ID=client_01GG7DRH9KVK3QNX2S6RGWA3CQ
 
   worker:
     <<: *app