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

Update to Hyrax v4.0 #1037

Merged
merged 71 commits into from
Oct 31, 2023
Merged

Update to Hyrax v4.0 #1037

merged 71 commits into from
Oct 31, 2023

Conversation

bbpennel
Copy link
Member

Merging hyrax-4 branch into main

bbpennel and others added 30 commits August 23, 2023 18:03
* Add service for sidekiq, using the same image as the web app but a different start script. Wait for the web service to start, rather than duplicating the bundle install steps. Allow web app to accept connections as url 'web' so it can be addressed in rails 6 by other docker services

* Loosen rubyupdate version

* Move property overrides for docker to .env file

* Update rubocop todo to migrate GitHub/RailsApplicationRecord to Rails/ApplicationRecord. Fix rubocop issues
…torEventJob, which does roughly the same thing. Update test to match upstream test
…s been merged upstream, and the other related to boxc stats should no longer needed since those stats will be in the cache
…ged upstream, and the other related to boxc stats should no longer needed since those stats will be in the cache
bbpennel and others added 22 commits October 3, 2023 14:47
* Ensure test base created (based off setup in hyrax)

* Use database cleaner for test db setup
* Replacing override (which wasn't working) with css to suppress unwanted buttons. Fix button text color

* Fix button text color for new exporters
* Update to newer commit of hyrax

* Remove override note about aria label, clarify overrides

* Remove note about aria-label

* Hide search field label with css, delete works search form override

* Delete override, change was merged upstream and in our fork
* Update csv_parser override for changes in bulkrax v5.3.0

* Minor, non-functional changes to bulkrax overrides to keep things in sync

* Use local fork of bulkrax so that we can update monads and therefor use bulkrax 5.3

* Increase connection pool size in dev to prevent sidekiq failing jobs

* Add css to cause bulkrax dashboard links to format the same as the others

* Update to bulkrax 5.4.0 (with bug fix)

* Update bulkrax fork to 5.4.1

* Have bulkrax importer table use the full page width

---------

Co-authored-by: lfarrell <lfarrell@email.unc.edu>
* Update work agreement and submit buttons

* Fix color contrast on selected facet headers

* Have save button appear below the deposit agreement

* Fix spacing around deposit agreement link and bold text to match prod

* Add back in br. Add comments to highlight the other overrides in this file

---------

Co-authored-by: Ben Pennell <bbpennel@email.unc.edu>
* Configure date_issued field to have separate facet config for advanced search and regular search results. Add override of FacetsHelperBehavior to deduplicate list of facets during rendering, otherwise the date facet shows twice. Add advanced search range component (borrowed from stanford) for rendering the date field.

* Prepopulate range fields in advanced search if there was an existing value

* Add test for adv search date range, add date_issued to fixture records. Add placeholder value, fix font weight

* Rubocop
…e bit to cut down on duplication and get the title more consistent (#1024)
* Fix styling of the add a new master's paper page to work with bootstrap 4

* hyc-1791 - Fix styles of add new user page for bootstrap 4
* hyc-1787 - Add spacing between work thumbnail and title in collection page

* Add hyc-override tags to override files that were missing them

* Mark where our overrides our and merge in a few upstream changes

* Fix rendering of the description modal

* Get 'Show More' button on collection pages working again

* Fix subcollection dropdown styles

* Fix spacing between work thumbnail and title on public collection page

* Prevent Refresh button from wrapping down onto the table below it
HYC-1790 - Advanced search "start over" button (hyrax-4)
* Update to hyrax version with style fixes for Review and Approval section

* Update style of the 'add your artwork' prompt to look like it did previously in bootstrap 4

* Get advanced search positioning consistent. Search bar is generally a bit wider now too, which is more inline with hyrax defaults

* Fix sizing and spacing of the featured works section

* Adjustments to sizing/spacing of the marketing text to prevent excessive wrapping and text escaping the box at smaller screen sizes. Preventing the main title on the homepage from wrapping at any screen size

* Adjusted spacing around navigation links and the title at the top of a search

* Prevent embargo inputs from running off the side of the page

* Remove incorrect aria-label
…hyrax-4) (#1035)

* Fix user links menu running off the right side of the page by right aligning it

* Update to hyrax ref which includes fix for sidebar highlighting issues
* hyc-1797 - Remove overrides of hyrax editor classes. Hide visibility component options when they are disabled

* hyc-1798 - Select the first visibility option which is enabled

* Enable all visibilty options for admins

* Change to performing overridden behavior server side instead of client side. For new works, default to public visibility. When the user is an admin, return their options per admin set as being able to assign any permission

* Rubocop

* Add test for visibility override

* Expand test and add clause so that new works can assign other visibilities if specified

* Update tests to reflect defaulting to open visibility default

* Add a test for WorksControllerBehavior override to ensure that admins get exempted from visibility restrictions
@lfarrell lfarrell merged commit f186f57 into main Oct 31, 2023
4 checks passed
@lfarrell lfarrell deleted the hyrax-4 branch October 31, 2023 15:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants