Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP upgrade to blacklight 8 #1295

Draft
wants to merge 23 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
c4360b9
upgrade to rails 7
Smullz622 Apr 2, 2024
c934898
niftany
Smullz622 Apr 2, 2024
6622442
bump blacklight to latest 7.x. Most of this was actually done by the …
Smullz622 Apr 3, 2024
6d6ee8e
downgrade rubocop to fix niftany error.
Smullz622 Apr 3, 2024
5ac11c6
fix some depreciations
Smullz622 Apr 5, 2024
10e3f70
resolve depreciation warnings for render_search_bar and search_fields
Smullz622 Apr 9, 2024
d7d225e
search form partial is no longer called since SearchBarComponent repl…
Smullz622 Apr 9, 2024
0562991
fixes depreciation of render_document_heading, start_over_path, rende…
Smullz622 Apr 9, 2024
e85b5c3
resolve depreciation of render_document_show_field_label
Smullz622 Apr 10, 2024
842041f
resolve depreciation of document_partial_name
Smullz622 Apr 10, 2024
a3585af
upgrade blacklight_advanced_search gem. Large portions of the gem fun…
Smullz622 Apr 17, 2024
b3b5b9a
refactor advanced search to reduce the amount of BL overrides and add…
Smullz622 Apr 19, 2024
e1c1cb5
niftany
Smullz622 Apr 19, 2024
5860fad
remove depreciated partial, now handled by Blacklight::SearchContextC…
Smullz622 Apr 19, 2024
fa24fef
document_action_label and document_action_path are depreciated, using…
Smullz622 Apr 22, 2024
1b56fdb
Fix CI
ajkiessl Apr 24, 2024
d69b0e7
Upgrade blacklight-marc to 8
ajkiessl May 1, 2024
679ad6a
upgrade to blacklight 8
Smullz622 May 8, 2024
c97a8b6
structure of response has changed and the .first is no longer needed.…
Smullz622 May 8, 2024
9781622
convert_to_search_state has been depreciated and is no longer needed
Smullz622 May 8, 2024
9c28928
remove facets from homepage. There were problems getting them to work…
Smullz622 May 9, 2024
ec484fd
search_sidebar partial is depreciated, replacing with component
Smullz622 May 9, 2024
e1a6ddb
previous_next_doc partial is depreciated, replaced with component. Th…
Smullz622 May 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:
name: "Update Node.js and npm"
command: |
curl -sSL "https://nodejs.org/dist/v16.13.1/node-v16.13.1-linux-x64.tar.xz" | sudo tar --strip-components=2 -xJ -C /usr/local/bin/ node-v16.13.1-linux-x64/bin/node
curl https://npmjs.com/install.sh | sudo bash
curl -L https://npmjs.com/install.sh | sudo bash
- run:
name: "Bundle"
command: |
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ vendor/bundle/**/*
/blackcat_test
/psulcat_dev
/psulcat_test
/psulcat_test-shm
/psulcat_test-wal
/psulcat_dev-shm
/psulcat_dev-wal

# Ignore all logfiles and tempfiles.
/log/*
Expand Down
11 changes: 10 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,18 @@ Layout/LineLength:
# The catalog controller is just one giant block for config.
- 'app/controllers/catalog_controller.rb'
- 'spec/controllers/catalog_controller_spec.rb'
- 'app/components/blacklight/advanced_search_form_component.rb'

Lint/MissingSuper:
Exclude:
- 'app/components/browse/*'
- 'app/components/external_links/*'
- 'app/models/concerns/null_object_pattern.rb'

Metrics/CyclomaticComplexity:
Exclude:
- 'app/components/psul_search_bar_component.rb'

Rails/ContentTag:
Enabled: false

Expand All @@ -62,7 +67,7 @@ RSpec/NestedGroups:
RSpec/Capybara/FeatureMethods:
Enabled: false

RSpec/Capybara/SpecificMatcher:
RSpec/Capybara:
Enabled: false

RSpec/MultipleMemoizedHelpers:
Expand All @@ -71,6 +76,10 @@ RSpec/MultipleMemoizedHelpers:
RSpec/AnyInstance:
Exclude:
- 'spec/features/google_preview_link_spec.rb'
- 'spec/components/browse/call_number_navigation_spec.rb'
- 'spec/components/browse/facet_navigation_spec.rb'
- 'spec/components/browse/page_size_selector_spec.rb'
- 'spec/components/browse/prefix_selector_spec.rb'

RSpec/RepeatedExampleGroupBody:
Exclude:
Expand Down
2 changes: 1 addition & 1 deletion .rubocop_todo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Performance/CollectionLiteralInLoop:
- 'config/environments/production.rb'

# Offense count: 25
RSpec/Capybara/SpecificMatcher:
RSpec/Capybara:
Exclude:
- 'spec/components/psul_constraint_layout_component_spec.rb'
- 'spec/features/ask_a_librarian_spec.rb'
Expand Down
13 changes: 7 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,20 @@ gem 'net-imap', require: false
gem 'net-pop', require: false
gem 'net-smtp', require: false
gem 'okcomputer', '~> 1.18'
gem 'puma', '~> 5.6'
gem 'puma', '~> 6'
gem 'rack-mini-profiler'
gem 'rails', '~> 6.1.0'
gem 'rails', '~> 7.0'
gem 'redis', '~> 5.0', '>= 5.0.6'
gem 'rsolr', '>= 2.5'
gem 'rubyzip'
gem 'shakapacker', '= 7.1'
gem 'shelvit'
gem 'sprockets-rails'
gem 'stackprof'

gem 'blacklight', '~> 7.30'
gem 'blacklight_advanced_search', '~> 7.0'
gem 'blacklight-marc', '~> 7.0'
gem 'blacklight', '~> 8'
gem 'blacklight_advanced_search', '~> 8.0.0.alpha'
gem 'blacklight-marc', '~> 8.1'
gem 'blacklight_range_limit'

group :development do
Expand Down Expand Up @@ -63,7 +64,7 @@ group :test do
gem 'rspec-rails'
gem 'selenium-webdriver'
gem 'shoulda-matchers'
gem 'simplecov', '< 0.18', require: false # CodeClimate does not work with .18 or later
gem 'simplecov'
gem 'vcr'
gem 'webmock'
end
Expand Down
Loading