Skip to content

Commit

Permalink
Upgrade to ruby 2.7.5 rails 6.0.4 blacklight 7.25 (#262)
Browse files Browse the repository at this point in the history
* migrate to webpack

* webpack compiles

* translate image refs for webpack;add webpack js libraries

* address blacklight 6 deprecations

* address deprecations in selenium, factorybot and blacklight

* rails app udpate

* upgrade to blacklight 7.2

* address BL 7.2 deprecations

* provide blacklight config to response init

* webpacker migration and js library upgrades

* code cleanup

* update dependencies

* add format to show partial template names

* correct url-loader and jquery-ui dependencies for node runtime

* set window dimensions in headless js driver

* update search results feature specs for Blacklight 7 markup

* Update blacklight layout to Blacklight 7 expectations
- rename stylesheets.scss to application.scss
- rename main layout for html format
- add a sass variable for logo to allow inclusion of blacklight_base directly
- update show_tools partial override to use BL7 markup
- remove app/views/layouts/blacklight.html.erb in favor of app/views/layouts/blacklight/base.html.erb
- use webpack helpers instead of asset pipeline helpers in app/views/layouts/blacklight/base.html.erb
- emit css in webpack config
- layouts set up cached content and delegate directly to blacklight/base
-- this avoids duplication in blacklight layout, which uncritically adds to content buffer

* email and embed stylesheets are used as distinct packs

* use templated solr_wrapper configuration

* restore missing logo

* fix search box layout

* fix navbar layout

* reorder sections on item page

* add styling to item page panels

* fix layout issues with item page sidebar

* hide 'Start Over' box from item page and search results

* fix layout issues with item page sidebar

* fix layout issue with search results page

* fix styling for search results page facets sidebar

* update responsive breakpoints

* fix layout issues with menus

* fix issue with breakpoint for facets navbar toggler

* fix layout of search results document metadata

* upgrade to font awesome 5.2

* fix layout of text pages with sidebars

* fix layout issues with top nav area

* fix layout issues with text pages

* fix styling issues with facets side nav

* replace sticky sidebar js with css sticky position

* fix layout issues with admin dashboard

* update Gemfile

* replace social-share-button gem with html links

* fix layout issue with item page related items (ACHYDRA-838)

* fix alignment of search form submit icon

* fix various layout and styling issues

* fix issues with admin dashboard layout

* fix styling of page links nav on search results page

* replace smooth scroll js with css scroll-behavior

* add titles to social share icons

* fix minor layout and styling issues

* Rakefile linter fixes

* app/models/solr_document.rb linter fixes

* config/initializers/new_framework_defaults_5_2.rb linter fixes

* whitespace linter fixes in catalog_controller.rb, info_controller.rb

* spec/factories/deposit.rb linter fixes

* implement a spec helper to create Blacklight::Solr::Response from a data hash

* move sitemap fixture xml into a fixture file

* allow aliases in Rakefile YAML safe_load

* upgrade to rails 6

* ensure blacklight initializer runs on reload under zeitwerk

* use readmore v3-beta

* upgrade blacklight to 7.25

* update blacklight range limit plugin

* cleanup application css file

* set up blacklight_range_limit to run under webpack

* use forked blacklight_range_limit; use agent forwarding

* Update to ruby 2.7, plus M1 mac compatibility updates (#260)

* Ruby 2.7 update

* Update .rubocop_todo.yml now that we're using rubocul 4

* Update to newer version of rubocul to get rid of warning

* Update to solr_wrapper 4.x; Update solr template to allow dev and test solr instances to run at the same time; Re-run migrations for test environment

* Update webdrivers gem version to 5.2 to fix chromedriver download source for M1 macs

* Update GitHub Actions ci.yml ruby matrix to only include 2.7.5; Update spec_helper.rb to only require chrome-specific webdriver

* Remove temporarily-added solr_wrapper Rakefile setup code; Update solr_wrapper.template.yml.erb file

* Update jetty and fedora ports to avoid conflicts in development and test

* Additional template file config solr port updates to sync up with recent solr_wrapper.template.yml update, plus related test updates

* rubocop fixes

* ci error reporting fix (#261)

* rubocop fixes

* ACHYDRA-889: Update ci task to re-raise SystemExit exception (when present) to indicate that the tests have failed in a CI environment
And also:
- Remove coveralls gem
- Fix some rubocop errors
- Update rubocop expected ruby and rails version

Co-authored-by: JackBlackLight <[email protected]>

* subclass Blacklight::Component

* fix blacklight 8 deprecations

* suppressing failing tests pending review

* fix issue with search box layout

* restore start over box to search results page

* redesign constraints component

* styling fixes for search results page

* using relative value for font-size-large

* modify shade of green

* Upgrade to ruby 2.7.5 rails 6.0.4 blacklight 7.25 achydra 734 (#263)

* modify tests to incorporate new form fields and new licensing format

* adds new fields for current student deposits

* add new fields and new student and license functionality to upload form

* convert optional fields to select elements

* add additional required fields for deposit upload

* make degree earned and embargo date optional

---------

Co-authored-by: Benjamin Armintor <[email protected]>
Co-authored-by: Ed Madrid <[email protected]>
Co-authored-by: Eric O <[email protected]>
  • Loading branch information
4 people authored Mar 20, 2023
1 parent 586fbd5 commit a69708e
Show file tree
Hide file tree
Showing 205 changed files with 6,554 additions and 5,057 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ruby-version: ['2.6.9']
ruby-version: ['2.7.5']
node: ['10', '12']
env:
RAILS_ENV: test
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ tmp/*_visits
tmp/*_visitors
config/database.yml
config/solr.yml
config/solr_wrapper.yml
config/fedora.yml
config/*.sphinx.conf
config/s3_credentials.yml
Expand Down
4 changes: 2 additions & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ inherit_gem:
inherit_from: .rubocop_todo.yml

AllCops:
TargetRubyVersion: 2.5.3
TargetRailsVersion: 5.2.3
TargetRubyVersion: 2.7.5
TargetRailsVersion: 6.0.4
Loading

0 comments on commit a69708e

Please sign in to comment.