HYC-1793 - Another round of style fixes (hyrax-4) #1031
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…viously in bootstrap 4
… bit wider now too, which is more inline with hyrax defaults
…ive wrapping and text escaping the box at smaller screen sizes. Preventing the main title on the homepage from wrapping at any screen size
lfarrell
approved these changes
Oct 19, 2023
lfarrell
added a commit
that referenced
this pull request
Oct 31, 2023
* Update gems to hyrax 4 * Replace bootstrap-sass with bootstrap * Make changes described in https://github.com/samvera/hyrax/wiki/Upgrade-Hyrax-3.x-to-Hyrax-4 * Require log_service in rails helper so it will load in time for usage in environment files * Trigger build for PRs to hyrax-4 * Comment out override of deleted file so application can build, will need to resolve the deletion later * Move include to environment files so that it'll be present anytime they are invoked rather than just in tests * Update to rails 5 version of puma config file * Comment automatically updated by rails * Add in twitter gem, which is a new dependency in hyrax 4 * ajax_modal was replaced by modal * Disabling sidekiq for the time being, since it can't be started with the daemon flag anymore * HYC-1595 - Sidekiq 6 in docker (#993) * 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 * Update create_derivatives_job.rb, and ignore tmp dirs * Update pointer to upstream file * Update pointer to upstream file * Remove works_controller.rb since fix for issue has been merged upstream * Update pointer to upstream file * Move override from ContentDepositorChangeEventJob to new ChangeDepositorEventJob, which does roughly the same thing. Update test to match upstream test * Update work_show_presenter_override.rb, add override comment * Update solr_query_service.rb * Removing file_download_stat_override.rb since one of the overrides has been merged upstream, and the other related to boxc stats should no longer needed since those stats will be in the cache * Remove ga_statistic override, since one of the overrides has been merged upstream, and the other related to boxc stats should no longer needed since those stats will be in the cache * Update workflow_presenter.rb * Replace workflow_presenter with override, add test for ovevrridden actions method * Add new test from upstream, and adjust override to only cleanup uploaded file when one was provided * Fix paths where collection_form are stored to match hyrax paths for them * Rubocop * Update hyrax/controller.rb * Update file_actor_override.rb. Add test to verify that longleaf is called * Mock virus scan * Switch to hyrax branch with a few upstream PRs merged in for GA4 and review pages * HYC-1739 - Blacklight class overrides (#996) * Change facets_helper_behavior to an override * Remove override of facets_helper_behavior since we don't display individual date values in the facet, so there's no reason to format them * Add test for dublin core overrides * Convert dublin_core.rb to an override * Add override url * Deleting solr_document_wrapper.rb override, the override was no longer needed since upstream they addressed the security issue where you could retrieve private records via oai get projectblacklight/blacklight_oai_provider#27 * Remove commented out code * Fix and clarify test messages * HYC-1736 - Update view overrides based on hyrax 4 (#998) * Change facets_helper_behavior to an override * Remove override of facets_helper_behavior since we don't display individual date values in the facet, so there's no reason to format them * Add test for dublin core overrides * Convert dublin_core.rb to an override * Add override url * Deleting solr_document_wrapper.rb override, the override was no longer needed since upstream they addressed the security issue where you could retrieve private records via oai get projectblacklight/blacklight_oai_provider#27 * Remove commented out code * Update header menu/search bar views * Update masthead section * Update _index_list_default.html.erb * Update override _show_document_list_row.html.erb * Update override app/views/hyrax/admin/users/index.html.erb * Update citations page to format correctly again in bootstrap 4, expand comments clarify the nature of the override * Update _currently_shared.html.erb * Update _form_child_work_relationships.html.erb, move comments closer to overrides * Update _form_metadata.html.erb * Update _form_permission.html.erb * Update _form_progress.html.erb * Update _form_relationships.html.erb * Update _guts4form.html.erb * Update _form_visibility_component.html.erb * Update _member.html.erb _show_actions.html.erb * _workflow_actions_widget.erb * Update app/views/hyrax/base/show.html.erb * Forgot to commit updates * Update _show_descriptions.html.erb (missed updates from hyrax 3) * _show_document_list_row.html.erb * Update app/views/hyrax/dashboard/sidebar/_activity.html.erb * Replace dashboard menu overrides with custom menu partials for additions and by using css to suppress unwanted menu items * Update app/views/hyrax/file_sets/_actions.html.erb * Update _show_actions.html.erb * Update app/views/hyrax/file_sets/_show_details.html.erb * Clarify where overrides are, remove override label that is now part of main * Remove override label that doesn't apply anymore * Update _image.html.erb, move override messages next to what they describe, add in disabled code * _office_document.html.erb: Clarify where overrides are, remove override label that is now part of main * Update _pdf.html.erb, move override messages next to what they describe, add in disabled code * Update _video.html.erb, move override messages next to what they describe, add in disabled code * Update front page partials * Update the dashboard my/works views * Update _notifications.html.erb, use datatable config to default to reverse sort instead of reversing it in ruby * Front page updates * Rubocop * Rearrange application.js to more closely match the source version, fix blacklight_range_limit require, add override messages * Update _select_work_type_modal.html.erb * Update social_media * Add missing controller_name property in view test which was causing an error * Remove mapping of affiliation to contributor (#1000) * HYC-1740 - Hyrax 4 updates to overrides from other hydra gems (mostly) (#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> * HYC-1739 - Blacklight overrides round 2 (#1003) * Remove _facet_pagination.html.erb, as paging/sorting components are now displaying in the correct location by default * Update to most recent range_limit plugin * Delete range_limit_helper.rb * Fix range limit tooltip errors by forcing jquery-ui to load before bootstrap * Added a ConstraintsComponent to replace the override that suppressed the constraints display when viewing collections. Deleted _constraints.html.erb override since that file now just calls a component. Moved setting of the search results header into index.html.erb for search results * Add a test for the constraints component. Add catalog_controller to make human_readable_type filterable in hyrax 4 * Rubocop * Add missing paren, remove extra closing tag (#1004) * Move fcrepo-data up a directory to avoid losss of all the other fedora data (#1006) * HYC-1752 - Hyrax 4 CSS updates (#1005) * Hyrax 4 CSS updates * More CSS updates and add display buttons back in * Add various sorting, display and citation options back in. * Fix display of masonary layout. * Display file option buttons the same (#1008) * HYC-1761 - Fix tests in hyrax-4 (#1009) * Fix dublin_core_spec.rb to work in ghactions and locally (have different hostnames) * Update be_success to be_successful (changed in rails 5) * bibliographic_citation is getting added to terms by default now, so remove it from the forms where its not supposed to be, and remove duplicate entry for forms where it is expected * Work is returning visibility now * Delete override, since batch uploads are suppressed by a setting now. Update expected error message, which doesn't appear to start with the word Embargo anymore * Update csv_entry method signature to match current upstream version * Switch range field to using current method for designating its rangedness * Update to adv search v8.0.0.alpha2, and update application accordingly. Consolidate search builder overrides into Hyc::CatalogSearchBuilder. Update full text querying behaviors to work with new version of blacklight. Gets advanced search mostly working like before * Fix line that was updated upstream * Set facets for display in advanced search * Rubocop * Override advanced_search_builder method which was throwing errors when invoked by the oai-pmh plugin * Switch to terser, since range limit plugin has ?. operators that are having trouble in uglifier * Add storage.yml file required by rails 6 * Remove advanced search and range limit helpers that don't exist anymore * HYC-1765 - Duplicate people entries, bootstrap, file upload form (hyrax-4) (#1011) * Replace 'hidden' class with 'd-none', as part of bootstrap 3->4 upgrade * Fix file form appearing on all tabs, not just the metadata tab * HYC-1728 - Update ingest from ftp, glyphicons (#1014) * Update ingest_from_ftp to work with bootstrap 4 * Switch other glyphicons over to fa * Various style updates for Bootstrap 4 (#1012) * Set a fixed height for the header * Move button beneath its header * Update people object background styling * Ensure test base created in hyrax 4 docker (#1013) * Ensure test base created (based off setup in hyrax) * Use database cleaner for test db setup * HYC-1777 - Fix bulkrax importer buttons (#1016) * Replacing override (which wasn't working) with css to suppress unwanted buttons. Fix button text color * Fix button text color for new exporters * Add custom activity partial for menu to add back in sidekiq link (#1015) * Fix spacing of buttons on admin set worktype page and clean up sidebar display on small screens. (#1018) * Remove merged overrides (hyrax-4) (#1019) * 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 * Fixes for the mobile menu (#1020) * Hide mobile facet toggler and add margin to the bottom of the facet list. (#1021) * HYC-1774 - Bulkrax importer fixes (hyrax-4) (#1010) * 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> * Style updates for agreement spacing and facet color contrast (#1017) * 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> * Bulkrax related schema changes from gem update (#1022) * HYC-1766 - Date range advanced search (#1023) * 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 * Fix styling in the worktype assignment pages. Refactor header a little bit to cut down on duplication and get the title more consistent (#1024) * HYC- 1789/1791 - Masters paper and new user styles (hyrax-4) (#1025) * 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 - Display issues on collection pages (hyrax-4) (#1026) * 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 * Use branch of blacklight 7.34.0 which has a fix for the advanced search start over button * Update to newer ref * HYC-1793 - Another round of style fixes (hyrax-4) (#1031) * 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 * Update to a bulkrax reference with fix for tab event problem (#1033) * Hyc-1788/1794 - Sidebar select color, and user links dropdown fixes (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/1798 - Fix visibility option issues (hyrax-4) (#1034) * 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 * Refactor export_as_oai_dc_xml into helper methods to reduce cognitive complexity * Add cleaning to test * HYC-1758 - Silence deprecation warnings in prod --------- Co-authored-by: sharonl <6546457+sharonluong@users.noreply.github.com> Co-authored-by: Dean Farrell <lfarrell@email.unc.edu>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://unclibrary.atlassian.net/browse/HYC-1793