i54 Get UI working with Dual Boot Conditionals #743
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
Merge to Main - Production deployment
Merge into main
PR for deploying to prod
Merge from `development` for production deployment
Ship latest to production
…into i54-dual-booting-ui
This commit upgrade bootstrap per the 'Upgrade Hyrax 3.x to Hyrax 4' wiki instructions. wiki: - https://github.com/samvera/hyrax/wiki/Upgrade-Hyrax-3.x-to-Hyrax-4 Issue: - scientist-softserv#22
In this commit I made a copy of the asset directory in order to server a different version of it when dual booting this application.
In this commit we Update app/assets/javascripts/application.js per the Hyrax 3 to Hyrax 4 wiki
instead of copying the asset directory, we are copying application js/css and making the global directory. We tell the view to use these instead when dual booting.
…gallery file For some reason not doing so would cause issues with the pipeline not finding blacklight_gallery
This commit uses the solution from Bulkrax, to update all the deprecated references to Solrizer. At this point, I am able to dual boot up with app and visit/see the dashboard. ref: - https://github.com/samvera-labs/bulkrax/pull/700/files
ShanaLMoore
commented
Aug 9, 2023
…hyrax 3+" This reverts commit 55428d9.
orangewolf
approved these changes
Aug 9, 2023
kirkkwang
reviewed
Aug 9, 2023
| <% if App.rails_5_1? %> | ||
| <%= text_field_tag :q, params[:q], placeholder: t('blacklight.search.form.search.placeholder'), class: "search_q q form-control", id: "q", autofocus: should_autofocus_on_search_box?, data: { autocomplete_enabled: autocomplete_enabled?, autocomplete_path: blacklight.suggest_index_path } %> | ||
| <% else %> | ||
| <%= text_field_tag :q, params[:q], placeholder: t('blacklight.search.form.search.placeholder'), class: "search_q q form-control", id: "q", autofocus: should_autofocus_on_search_box?, data: { autocomplete_enabled: autocomplete_enabled? } %> |
There was a problem hiding this comment.
Seems like we can remove the entire data argument here, found this commit fwiw
Removed the data config item to fix error: undefined method `suggest_index_path'
https://gitlab.galileo.usg.edu/DLG/meta/-/merge_requests/359/diffs?commit_id=1157838179ef6d22946a33dc1329ebfe52d6afa5
There was a problem hiding this comment.
Good find! But since I already merged this PR let's make another one.
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.
This PR corrects issues that prevented a dev from seeing the UI/homepage when dual booting. This was mainly done by adding dual boot conditionals throughout the code. From here devs should be unblocked from subsequent tickets.
ref:
NORMAL boot:
Booting Rails 6.1:
- Note: I reverted a commit that allowed the user to navigate to the dashboard without error This will get resolved in a separate PR.