Skip to content

Commit

Permalink
move from scientist-softserv to notch8
Browse files Browse the repository at this point in the history
  • Loading branch information
orangewolf committed Jan 3, 2025
1 parent fbe6425 commit e112da3
Show file tree
Hide file tree
Showing 16 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion app/controllers/catalog_controller_decorator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

# Clobber all existing index and show fields that come from Hyku base but skip
# the non-DogBiscuit keys that Adventist had already configured in a pre-Knapsack state
# see: https://github.com/scientist-softserv/adventist-dl/blob/97bd05946345926b2b6c706bd90e183a9d78e8ef/app/controllers/catalog_controller.rb#L38-L40
# see: https://github.com/notch8/adventist-dl/blob/97bd05946345926b2b6c706bd90e183a9d78e8ef/app/controllers/catalog_controller.rb#L38-L40
config.index_fields.keys.each do |key|
next if key == 'all_text_timv'
next if key == 'all_text_tsimv'
Expand Down
2 changes: 1 addition & 1 deletion app/forms/hyrax/forms/collection_form_decorator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def secondary_terms
##
# What the heck is going on here?
#
# As part of https://github.com/scientist-softserv/adventist_knapsack/pull/87 we have
# As part of https://github.com/notch8/adventist_knapsack/pull/87 we have
# attempted to rid the collection form of the alternative_title (to deal with the conflicting
# predicate for slugs). However, it is declared by way of
# `Hyrax::Forms::CollectionForm.delegate(:alternative_title, to: :model)`
Expand Down
2 changes: 1 addition & 1 deletion app/jobs/create_derivatives_job_decorator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def perform(file_set, file_id, filepath = nil)
end

##
# @see https://github.com/scientist-softserv/adventist-dl/issues/311 for discussion on structure
# @see https://github.com/notch8/adventist-dl/issues/311 for discussion on structure
# of non-Archival PDF.
NON_ARCHIVAL_PDF_SUFFIXES = [".reader.pdf", ".pdf-r.pdf"].freeze

Expand Down
2 changes: 1 addition & 1 deletion app/jobs/iiif_print/child_works_from_pdf_job_decorator.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true

# OVERRIDE: Overriding entire job temporarily, pending cleanup via
# https://github.com/scientist-softserv/adventist_knapsack/issues/728
# https://github.com/notch8/adventist_knapsack/issues/728
# OVERRIDE to end job based on pdfjs/uv flipper before doing anything
# so we don't get job errors
require 'iiif_print/jobs/application_job'
Expand Down
4 changes: 2 additions & 2 deletions app/models/bulkrax/oai_adventist_qdc_entry.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ def add_thumbnail_url
true
end

# @see https://github.com/scientist-softserv/adventist-dl/issues/281
# @see https://github.com/notch8/adventist-dl/issues/281
def collections_created?
true
end

# @see https://github.com/scientist-softserv/adventist-dl/issues/281
# @see https://github.com/notch8/adventist-dl/issues/281
def find_collection_ids
self.collection_ids = []
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def self.split_this?(path:, suffixes: CreateDerivativesJobDecorator::NON_ARCHIVA
# an instance of {IiifPrint::SplitPdfs::AdventistPagesToJpgsSplitter}.
# @note I am adding a {.new} method to a module to mimic the instantiation of a class.
#
# @see https://github.com/scientist-softserv/iiif_print/blob/a23706453f23e0f54c9d50bbf0ddf9311d82a0b9/lib/iiif_print/jobs/child_works_from_pdf_job.rb#L39-L63
# @see https://github.com/notch8/iiif_print/blob/a23706453f23e0f54c9d50bbf0ddf9311d82a0b9/lib/iiif_print/jobs/child_works_from_pdf_job.rb#L39-L63
def self.call(path,
splitter: DerivativeRodeoSplitter,
suffixes: CreateDerivativesJobDecorator::NON_ARCHIVAL_PDF_SUFFIXES,
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/hyrax.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# Injected via `rails g hyrax:work Thesis`
config.register_curation_concern :thesis

# See https://github.com/scientist-softserv/adventist-dl/issues/183
# See https://github.com/notch8/adventist-dl/issues/183
# Also, we will continue to extract txt file's text using Adventist::TextFileTextExtractionService
config.extract_full_text = false
config.work_requires_files = false
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/iiif_print.rb
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
}

# Override IiifPrint's function to substitute Array.wrap prior to gem cleanup.
# See https://github.com/scientist-softserv/adventist_knapsack/issues/729
# See https://github.com/notch8/adventist_knapsack/issues/729
config.child_work_attributes_function = lambda do |parent_work:, admin_set_id:|
embargo = parent_work.embargo
lease = parent_work.lease
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ x-app: &app
args:
BUILDKIT_INLINE_CACHE: 1
APP_PATH: ./hyrax-webapp
image: ghcr.io/scientist-softserv/adventist_knapsack:${TAG:-latest}
image: ghcr.io/notch8/adventist_knapsack:${TAG:-latest}
environment:
- AUXILIARY_QUEUE_TENANTS="sdapi" # This line is what makes the knapsack include use the local code instead of the remote gem
- AWS_REGION=us-east-1
Expand Down Expand Up @@ -50,7 +50,7 @@ x-app-worker: &app-worker
args:
BUILDKIT_INLINE_CACHE: 1
APP_PATH: ./hyrax-webapp
image: ghcr.io/scientist-softserv/adventist_knapsack/worker:${TAG:-latest}
image: ghcr.io/notch8/adventist_knapsack/worker:${TAG:-latest}
# Uncomment command to access container with out starting bin/worker. Useful for debugging or updating Gemfile.lock
# command: sleep infinity
depends_on:
Expand Down
2 changes: 1 addition & 1 deletion hyrax-webapp
Submodule hyrax-webapp updated 50 files
+1 −1 Gemfile
+10 −10 Gemfile.lock
+20 −0 app/assets/javascripts/admin_color_select.js
+6 −0 app/assets/javascripts/admin_font_select.js
+3 −1 app/assets/javascripts/application.js
+1 −1 app/assets/javascripts/hyku/admin/appearance/colors.js
+1 −1 app/assets/javascripts/hyku/admin/appearance/default_images.js
+1 −1 app/assets/javascripts/hyku/admin/appearance/fonts.js
+1 −1 app/assets/stylesheets/application.css
+27 −109 app/assets/stylesheets/hyku.scss
+92 −1 app/assets/stylesheets/hyrax.scss
+5 −6 app/assets/stylesheets/themes/cultural_repository.scss
+1 −1 app/assets/stylesheets/themes/scholarly_show.scss
+2 −0 app/assets/stylesheets/variables.scss
+1 −2 app/controllers/devise_guest_controllers_helpers_decorator.rb
+3 −16 app/forms/hyku/forms/admin/appearance.rb
+2 −2 app/views/admin/roles_service/index.html.erb
+1 −1 app/views/hyrax/admin/appearances/_banner_image_form.html.erb
+1 −1 app/views/hyrax/base/_analytics_button.html.erb
+5 −6 app/views/hyrax/base/show.html.erb
+8 −8 app/views/hyrax/content_blocks/_form.html.erb
+2 −2 app/views/hyrax/homepage/_featured_collection_section.html.erb
+1 −1 app/views/hyrax/my/_collection_action_menu.html.erb
+1 −1 app/views/hyrax/my/_work_action_menu.html.erb
+1 −1 app/views/hyrax/oers/_form_metadata.html.erb
+3 −3 app/views/hyrax/oers/show.html.erb
+0 −100 app/views/hyrax/pages/_form.html.erb
+2 −2 app/views/roles/index.html.erb
+92 −156 app/views/shared/_appearance_styles.html.erb
+1 −1 app/views/themes/cultural_repository/_facets.html.erb
+1 −1 app/views/themes/cultural_repository/catalog/_search_form.html.erb
+1 −1 app/views/themes/cultural_repository/hyrax/homepage/_featured_works.html.erb
+3 −3 app/views/themes/image_show/hyrax/base/show.html.erb
+1 −1 app/views/themes/institutional_repository/catalog/_search_form.html.erb
+0 −1 app/views/themes/institutional_repository/layouts/hyrax.html.erb
+4 −4 app/views/themes/neutral_repository/layouts/_share_your_work_row.html.erb
+3 −3 app/views/themes/scholarly_show/hyrax/oers/show.html.erb
+1 −1 config/initializers/simple_form_bootstrap.rb
+0 −2 config/locales/en.yml
+0 −3 config/locales/hyrax.en.yml
+15 −5 db/schema.rb
+1 −2 docker-compose.yml
+3 −7 lib/reprocessor.rb
+1 −4 spec/features/appearance_theme_spec.rb
+1 −4 spec/features/create_etd_spec.rb
+1 −4 spec/features/create_generic_work_spec.rb
+1 −4 spec/features/create_image_spec.rb
+1 −4 spec/features/create_oer_spec.rb
+1 −4 spec/features/work_editor_role_spec.rb
+9 −9 yarn.lock
4 changes: 2 additions & 2 deletions lib/hyku_knapsack/engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def self.load_translations!
# Adventist::TextFileTextExtractionService to the beginning of the services array we are
# enabling text extraction from plain text files.
#
# https://github.com/scientist-softserv/adventist-dl/blob/97bd05946345926b2b6c706bd90e183a9d78e8ef/config/application.rb#L68-L73
# https://github.com/notch8/adventist-dl/blob/97bd05946345926b2b6c706bd90e183a9d78e8ef/config/application.rb#L68-L73
Hyrax::DerivativeService.services = [
Adventist::TextFileTextExtractionService,
IiifPrint::DerivativeRodeoService,
Expand Down Expand Up @@ -91,7 +91,7 @@ def self.load_translations!
end

DerivativeRodeo::Generators::HocrGenerator.additional_tessearct_options = "-l eng_best"
# See: https://github.com/scientist-softserv/adventist-dl/issues/676
# See: https://github.com/notch8/adventist-dl/issues/676
IiifPrint::DerivativeRodeoService.named_derivatives_and_generators_filter =
lambda do |_file_set:, filename:, named_derivatives_and_generators:|
named_derivatives_and_generators.reject do |named_derivative, _generators|
Expand Down
2 changes: 1 addition & 1 deletion lib/oai/client_decorator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module OAI
# Typically, the resumption token represents the full context of the previous request. However,
# in the Adventist implementation it's operating a bit like a pagination page indicator.
#
# @see https://github.com/scientist-softserv/adventist-dl/issues/271
# @see https://github.com/notch8/adventist-dl/issues/271
module ClientDecorator
# @note override
def do_resumable(responseClass, verb, opts)
Expand Down
2 changes: 1 addition & 1 deletion sdapi_ingest_scripts/jobs/collection_membership_job.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## The purpose of this job is to take an array of collection ids and remove the
# membership relationshp from every work of a given work type. These are the 20
# collections that we were unable to delete, most likely due to too many members
# causing timeouts. Ref https://github.com/scientist-softserv/adventist-dl/issues/459
# causing timeouts. Ref https://github.com/notch8/adventist-dl/issues/459
class CollectionMembershipJob < ApplicationJob
queue_as :collections

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# @note This class is starting it's life in the Adventist repository but is being designed so that
# we could copy it rather easily into Bulkrax.
#
# @see https://github.com/scientist-softserv/adventist-dl/issues/430
# @see https://github.com/notch8/adventist-dl/issues/430
#
# @example
# switch!('sdapi'); RerunErroredEntriesForImporterJob.perform_later(importer_id: 123, last_run_id: 456)
Expand Down
2 changes: 1 addition & 1 deletion spec/config/initializers/iiif_print_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

it 'is defined in HykuKnapsack::Engine' do
# Verifying that we're using the configured title generator for PDFs.
# Triage for: https://github.com/scientist-softserv/adventist-dl/issues/628
# Triage for: https://github.com/notch8/adventist-dl/issues/628
expect(subject.source_location[0]).to(
eq(HykuKnapsack::Engine.root.join('config', 'initializers', 'iiif_print.rb').to_s)
)
Expand Down
4 changes: 2 additions & 2 deletions spec/jobs/file_sets_reprocess_job_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

describe '#perform' do
# TODO: commenting out failing job - loading issue - this work was merged as WIP
# ref: https://github.com/scientist-softserv/adventist-dl/commit/54d7cf8ed278b5fa09ee2cd14ca81f856e660add
# ref: https://github.com/notch8/adventist-dl/commit/54d7cf8ed278b5fa09ee2cd14ca81f856e660add
# TODO: Make this job work with valkyrie
xit 'submits jobs' do
expect(described_class::ConditionallyResplitFileSetJob).to receive(:perform_later).with(file_set_id: file_set.id)
Expand All @@ -23,7 +23,7 @@
describe 'ConditionallyResplitFileSetJob#perform' do
describe '#perform' do
# TODO: commenting out failing job - loading issue - this work was merged as WIP
# ref: https://github.com/scientist-softserv/adventist-dl/commit/54d7cf8ed278b5fa09ee2cd14ca81f856e660add
# ref: https://github.com/notch8/adventist-dl/commit/54d7cf8ed278b5fa09ee2cd14ca81f856e660add
# TODO: Make this job work with valkyrie
xit 'submits IiifPrint::Jobs::RequestSplitPdfJob' do
file_set
Expand Down

0 comments on commit e112da3

Please sign in to comment.