Skip to content

Commit

Permalink
HYC-1740 - Hyrax 4 updates to overrides from other hydra gems (mostly) (
Browse files Browse the repository at this point in the history
#1002)

* HYC-1731 - Remove access and use fields from solr document (#997)

* Remove access and use fields from solr document

* Update webdrivers, remove chromedriver version override

* Require webdriver

* Permit connections to another google chrome base url

* Revert require change

* HYC-1750 - Update department names (#999)

* Remove mapping of affiliation to contributor (#1001)

* Unescape filenames in content-disposition for rails 6 to avoid double encoding

* Replace user_roles.rb with override, add test for override method

* Convert processors/document.rb to an override and add test for overrides

* Convert image.rb to a override file and remove the unused imagemagick code

* Delete roles overrides which were added to get i18n changes to show, as they now seem to be showing without

* Convert geonames.rb to an override, add a test to verify the override

* Convert uploaded_file_uploader.rb to override and add test

* Convert mini_magick/image/info.rb to an override, update to v4.12.0 and adjust the override for it. Add a test

* Clarifying override message

* Rubocop

* Delete commented code

* Add missing frozen_string_literals

* Add back in accidentally removed aria-label

* Remove override of manage users page. Move 'add new user' action to side bar menu

* Fix variable name. Allow geoname stubbing to match any username

* Update user_roles_spec.rb

---------

Co-authored-by: Dean Farrell <lfarrell@email.unc.edu>
  • Loading branch information
bbpennel and lfarrell authored Sep 22, 2023
1 parent 38f9317 commit 08258cc
Show file tree
Hide file tree
Showing 33 changed files with 283 additions and 666 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ gem 'libv8', '~> 7.3'
gem 'sparql', '3.2.5'
gem 'linkeddata'
gem 'loofah', '~>2.19.1'
gem 'mini_magick', '~>4.11.0'
gem 'mini_magick', '~>4.12.0'
gem 'mini_racer', '~> 0.2.15', platforms: :ruby
gem 'nokogiri', '~>1.14.2'
gem 'omniauth', '~> 2.0'
Expand Down Expand Up @@ -90,6 +90,6 @@ group :test do
gem 'selenium-webdriver', '~> 4.8'
gem 'shoulda-matchers', '~> 5.1.0'
gem 'simplecov'
gem 'webdrivers'
gem 'webdrivers', '~> 5.3', require: false
gem 'webmock', '~> 3.14.0'
end
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@ GEM
mime-types (3.5.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2023.0808)
mini_magick (4.11.0)
mini_magick (4.12.0)
mini_mime (1.1.5)
mini_racer (0.2.15)
libv8 (> 7.3)
Expand Down Expand Up @@ -1088,7 +1088,7 @@ DEPENDENCIES
linkeddata
listen (~> 3.7.0)
loofah (~> 2.19.1)
mini_magick (~> 4.11.0)
mini_magick (~> 4.12.0)
mini_racer (~> 0.2.15)
nokogiri (~> 1.14.2)
omniauth (~> 2.0)
Expand Down Expand Up @@ -1121,7 +1121,7 @@ DEPENDENCIES
twitter-typeahead-rails (= 0.11.1.pre.corejavascript)
uglifier (~> 4.2.0)
web-console (~> 3.7.0)
webdrivers
webdrivers (~> 5.3)
webmock (~> 3.14.0)

RUBY VERSION
Expand Down
2 changes: 1 addition & 1 deletion app/forms/single_value_form.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true
# [hyc-override] Overriding work form in hyrax gem to allow default fields to be singular
# [hyc-override] Subclassing hyrax work form to allow default fields to be singular
class SingleValueForm < Hyrax::Forms::WorkForm
extend Hyc::EdtfConvert

Expand Down
59 changes: 0 additions & 59 deletions app/lib/hydra/derivatives/processors/document.rb

This file was deleted.

113 changes: 0 additions & 113 deletions app/lib/hydra/derivatives/processors/image.rb

This file was deleted.

Loading

0 comments on commit 08258cc

Please sign in to comment.