From 7b84abcd0a7d4d01079a3c4b4a6f3b0097709ada Mon Sep 17 00:00:00 2001 From: Martin Simpson Date: Wed, 31 Jan 2024 11:24:03 +0700 Subject: [PATCH] Updated UNA to use namespaced schema yaml --- app/forms/hyrax/una_open_educational_resource_form.rb | 4 ++-- app/indexers/una_open_educational_resource_indexer.rb | 3 +-- app/models/una_open_educational_resource.rb | 2 +- docker-compose.yml | 4 ++++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/forms/hyrax/una_open_educational_resource_form.rb b/app/forms/hyrax/una_open_educational_resource_form.rb index 04ca7c2..1f8c70d 100644 --- 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 index e2b7f1b..026d77d 100644 --- 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 index cb22baf..bc9e13f 100644 --- 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 index 6d39622..649287e 100644 --- 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