🚧 [i681] - VALKYRIZE Adventist #693
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
This commit documents the need for Knapsack to reference a branch; as well as provides documentation for doing so.
🧹 Configure Knapsack to Use Hyku Prime
references hyrax-webapp[tags/v5.2.0]. Required to get the build/pipeline working.
Get the build working
commit: samvera-labs/hyku_knapsack@5a7c54c which wasn't intentional bumped rails to 7+
This reverts commit 0363299.
This reverts commit 5a7c54c.
get fixes from adventist
This is a quality of life improvement. Use this generator to create a new work type in the Knapsack because using the Hyrax work generator will create files in the submodule and we don't want that. ```sh rails generate hyku_knapsack:work WorkType ```
This decorator needs to be in play for the work types to load their respective yaml files.
🎁 Add works generator
🎁 Add SimpleSchemaLoaderDecorator for work types
This commit will fix a bug where the controller template was not being found as well as the model spec. The path was corrected to match the path found in Hyrax. Lastly, the generator now includes adding Hyku specific includes to the controller and model files that were generated.
Update `HykuKnapsack::WorkResourceGenerator`
These files are what we changed in HykuUp Knapsack to get the build, test, and lint workflows working. Also, updating the Hyku submodule to bring in the Valkyrie work.
Attempt to resolve error on pipeline: mv: cannot stat 'rspec.xml': No such file or directory
# Story Collection branding is not working. Several views were overriding Hyku and had not been updated to work with Valkyrie. The overrides are no longer needed and are being removed. Refs #797 # Expected Behavior Before Changes Branding banner and thumbnail did not work for collections. # Expected Behavior After Changes All collection branding options work. Alt text is filled in when entered. Logo links to url if entered. # Screenshots / Video <details> <summary></summary>  ### Alt Text    </details> # Notes
As much as possible, this attempts to remove views and use Hyku/Hyrax views instead. Documentation is also added regarding the purpose of views which override Hyku or Hyrax.
Besides collection, generic work and image, all work types have the same properties and require the adl_metadata schema. Because of this, it'll be easier to maintain to move basic_metadata into adl_metadata, instead of moving basic_metadata into each work type's metadata yaml file.
# Story In production, only the title is required for Collection but in staging (valkyrie) rights_statement was also being required. This change required other work types to be updated as well. For the works, this PR moved basic_metadata properties into adl_metadata.yml, which is a schema included in all of the custom work types. Since all the work types share the same properties, they're able to share adl_metadata with this adjustment. For the collection, basic_metadata was moved into collection_resource.yml in order to make the customization to not require the rights_statement. (thanks for the suggestion @laritakr) Image and GenericWork are unique though; they don't use adl_metadata. basic_metadata was moved to their respective metadata yaml files as well. This PR also fixes an issue where labels were not right. The knapsack's locale files were not taking precedence over hyku's, thus labeling the Author form fields as Creator. Additionally, I compared each work form to production to expose additional primary terms where desired. Now, besides the order of the terms (which I'd argue could be a separate ticket driven by the client), the form has feature parity with production. Refs - #777 # Screenshots / Video <details> <summary>Collection form</summary> ## PRODUCTION  # Expected Behavior Before Changes  # Expected Behavior After Changes  </details> <details> <summary>Generic Work form</summary> ## PRODUCTION  # Expected Behavior Before Changes  # Expected Behavior After Changes  </details> <details> <summary>Image form</summary> ## PRODUCTION  # Expected Behavior Before Changes  # Expected Behavior After Changes  </details> <details> <summary>Conference Item form</summary> ## PRODUCTION  # Expected Behavior Before Changes  # Expected Behavior After Changes  </details> <details> <summary>Dataset form</summary> ## PRODUCTION  # Expected Behavior Before Changes  # Expected Behavior After Changes  </details> <details> <summary>Exam Paper form</summary> ## PRODUCTION  # Expected Behavior Before Changes  # Expected Behavior After Changes  </details> <details> <summary>Journal Article form</summary> ## PRODUCTION  # Expected Behavior Before Changes  # Expected Behavior After Changes  </details> <details> <summary>Published Work form</summary> ## PRODUCTION  # Expected Behavior Before Changes  # Expected Behavior After Changes  </details> <details> <summary>Thesis form</summary> ## PRODUCTION  # Expected Behavior Before Changes  # Expected Behavior After Changes  </details> # Notes
…knapsack into sync-views
This commit is a temporary solution to prevent blank metadata fields from rendering. There is a bigger issue of why some fields are being assigned values of `[""]` but this commit solves the current issue. Ref: - #771
fixes cause of pipeline failure
# Story To make future upgrades easier, this work attempts to remove unnecessary views, and document the purpose of the overrides for views which are needed. Refs #798 # Expected Behavior Before Changes # Expected Behavior After Changes No behavior changes are expected. # Screenshots / Video <details> <summary></summary> </details> # Notes
…/adventist_knapsack into blank-metadata-properties
# Story This commit is a temporary solution to prevent blank metadata fields from rendering. There is a bigger issue of why some fields are being assigned values of `[""]` but this commit solves the current issue. Ref: - #771 # Expected Behavior Before Changes Some metadata fields that did not have content were rending on the works. # Expected Behavior After Changes Only metadata fields that have content will render. # Screenshots / Video Before:  After: <img width="1220" alt="Screenshot 2024-09-12 at 3 55 31 PM" src="https://github.com/user-attachments/assets/703b9082-fe6a-44e9-85c8-b4db8f96c74e"> # Notes This is a temporary solution to solve the current needs of the client.
This prevents views from crashing
# Story Sync Views PR broke some views. This restores functionality for pdf.js
This commit overrides an ability mixin to check for either the slugs or id so when it's used downstream, we can ensure that the thumbnails are displaying correctly due to the permissions being set correctly.
This commit overrides an ability mixin to check for either the slugs or id so when it's used downstream, we can ensure that the thumbnails are displaying correctly due to the permissions being set correctly. <img width="688" alt="image" src="https://github.com/user-attachments/assets/4b8ea0ec-d440-43a7-a8d9-e68ae3954fef">
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.
Story
Valkyrize Adventist - working base branch: pull-in-hyku-knapsack
Refs