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

Contribute back OER and ETD work types from Hyku Commons #2237

Merged
merged 17 commits into from
Jun 20, 2024

Conversation

kirkkwang
Copy link
Collaborator

@kirkkwang kirkkwang commented Jun 4, 2024

🚧 Bring over new relevant files from Hyku Commons

67ce76d

This commit will bring over all the new relevant files from Hyku Commons
over to Hyku. This does not include any additional general locale yml
files such as config/locales/hyrax.en.yml or config/locales/en.yml quite
yet because they need to be examined.

🚧 Add OrderMetadataValues module for boot up

4f7584f

This module is needed for the application to boot up because it is being
called by OER and ETD.

🚧 Add OER and ETD to translations

f508bc5

This will add the OER and ETD to the translations. We would still need
to run translations for all the other languages.

🚧 Make OER and ETD display in all caps

29c77b6

The curation_concern.human_readable_type call in the Hyrax's
app/views/hyrax/base/new.html.erb now comes from Valkyrie:

GenericWorkResource.method(:human_readable_type)
=> #<Method: GenericWorkResource(Hyrax::Resource).human_readable_type() /usr/local/bundle/bundler/gems/hyrax-151fb0d38339/app/models/hyrax/resource.rb:49>

These overrides will display them as OER and ETD instead of Oer and Etd.

Ref:

🚧 Add OER and ETD to factories

aa80dcf

🚧 Reconcile scholarly_show show

13483fb

🚧 Bring in terms from Hyku Commons

8e4fd3b

This will bring in terms from Hyku Commons, primarily used by the OER
and ETD work types.

🚧 Modify CatalogController

79e1180

We add the new terms in the CatalogController from Hyku Commons

🚧 Add OER authorities

04d6609

This commit adds the OER authorities from Hyku Commons

🚧 Add OER and ETD to wings

c38539a

🚧 Add _attribute_rows for etds

9efa8ad

🚧 Bring over RelatedMembershipsJob

560eeb6

✅ Fix specs

09ca0fe

This commit will address the spec failures from bringing in OER and ETD.

🧹 Move locale files to appropriate dir

4a1df66

The locale files were in locales/locales, this commit will move it up a
directory.

🧹 Bring over more partials for OER

54e7fb5

These were originally miseed in the initial move over.

🚧 Turn the OER Actor into a Transaction

eb77743

Currently the adding of a related version works however we still need to
figure out removing.

🎁 Make OER transaction functional

d26120c

This commit will add functionality to the OER transaction of adding
custom relations to OER works. The js had to be altered because it was
sending an object to the backend which then adds [object Object] to
the OER work and not the actual id.

This commit will bring over all the new relevant files from Hyku Commons
over to Hyku.  This does not include any additional general locale yml
files such as config/locales/hyrax.en.yml or config/locales/en.yml quite
yet because they need to be examined.
This module is needed for the application to boot up because it is being
called by OER and ETD.
This will add the OER and ETD to the translations.  We would still need
to run translations for all the other languages.
The `curation_concern.human_readable_type` call in the Hyrax's
`app/views/hyrax/base/new.html.erb` now comes from Valkyrie:

```rb
GenericWorkResource.method(:human_readable_type)
=> #<Method: GenericWorkResource(Hyrax::Resource).human_readable_type() /usr/local/bundle/bundler/gems/hyrax-151fb0d38339/app/models/hyrax/resource.rb:49>
```

These overrides will display them as OER and ETD instead of Oer and Etd.

Ref:
  - https://github.com/samvera/hyrax/blob/151fb0d38339e12eabdf99ce9d0b1a0f07685fd5/app/views/hyrax/base/new.html.erb#L3
This will bring in terms from Hyku Commons, primarily used by the OER
and ETD work types.
We add the new terms in the `CatalogController` from Hyku Commons
This commit adds the OER authorities from Hyku Commons
This commit will address the spec failures from bringing in OER and ETD.
@kirkkwang kirkkwang added the minor-ver for release notes label Jun 4, 2024
Copy link

github-actions bot commented Jun 5, 2024

Test Results

    3 files  ±  0      3 suites  ±0   17m 36s ⏱️ +58s
2 034 tests +274  1 990 ✅ +261  44 💤 +14  0 ❌  - 1 
2 061 runs  +282  2 015 ✅ +269  46 💤 +14  0 ❌  - 1 

Results for commit d26120c. ± Comparison against base commit e5e6fee.

This pull request removes 27 and adds 301 tests. Note that renamed tests count towards both.
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor FileSet permissions is expected not to be able to destroy ef0041c0-677f-413e-a3ea-f60afbf766c3
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor FileSet permissions is expected not to be able to edit ba1e2c35-5450-493e-a02f-ceecd3a35294
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor FileSet permissions is expected not to be able to read b96680f4-4eac-4b12-82ed-bc91050c885b
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor FileSet permissions is expected not to be able to update 896e6275-d697-47bf-b7e6-072ec1578456
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor GenericWork permissions is expected not to be able to destroy d61d17e3-0409-4623-8f3c-6a0bc239afe4
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor GenericWork permissions is expected not to be able to edit 76048e5e-15a5-4e9b-94da-733d9e90336a
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor GenericWork permissions is expected not to be able to read 91991e66-e823-4183-9b50-a831ad4850d0
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor GenericWork permissions is expected not to be able to update 16da613b-6c32-4fa0-ab83-2dd75911c8f5
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor Image permissions is expected not to be able to destroy 2256ab3c-a02c-42ee-b25b-9c6f0dbba2a6
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor Image permissions is expected not to be able to edit fc1ca315-4aa7-47a2-9359-816081bb8a59
…
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor Etd permissions is expected not to be able to destroy 8aaab231-ac77-40a3-83a3-a8cef061195e
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor Etd permissions is expected not to be able to destroy Etd instance
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor Etd permissions is expected not to be able to destroy Etd solr doc
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor Etd permissions is expected not to be able to edit Etd instance
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor Etd permissions is expected not to be able to edit Etd solr doc
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor Etd permissions is expected not to be able to edit bdb03972-0315-4630-84a6-79563a2ba22a
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor Etd permissions is expected not to be able to read 71f1fb33-cccf-4fbc-b9ce-b6e62dbe46ec
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor Etd permissions is expected not to be able to read Etd instance
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor Etd permissions is expected not to be able to read Etd solr doc
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor Etd permissions is expected not to be able to update 96c32c7f-133a-4489-923b-b4736958cece
…

♻️ This comment has been updated with latest results.

ShanaLMoore
ShanaLMoore previously approved these changes Jun 5, 2024
Copy link
Collaborator

@ShanaLMoore ShanaLMoore left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wow that's a lot. well done!

Update: Should we hold on merging this until the hyku 6 release? Or, until both work types have been fully valkyrized?

TODO

@ShanaLMoore ShanaLMoore self-requested a review June 5, 2024 15:34
The locale files were in locales/locales, this commit will move it up a
directory.
@ShanaLMoore ShanaLMoore dismissed their stale review June 5, 2024 15:42

The team has decided to complete the transaction work before merging in this code.

These were originally miseed in the initial move over.
Currently the adding of a related version works however we still need to
figure out removing.
This commit will add functionality to the OER transaction of adding
custom relations to OER works.  The js had to be altered because it was
sending an object to the backend which then adds `[object Object]` to
the OER work and not the actual id.
@kirkkwang kirkkwang marked this pull request as ready for review June 7, 2024 16:07
@kirkkwang kirkkwang requested a review from laritakr June 7, 2024 22:45
@ShanaLMoore
Copy link
Collaborator

Adding a Blocked label - hold off on merge until we cut a 6.0.0 release

@ShanaLMoore
Copy link
Collaborator

ShanaLMoore commented Jun 19, 2024

Removing blocked label. As discussed with Rob, cc @kirkkwang if you don't see a risk, feel free to merge this in instead of waiting for v6.0.0

@kirkkwang kirkkwang merged commit 1286826 into main Jun 20, 2024
11 checks passed
@kirkkwang kirkkwang deleted the contribute-back-oer-and-etd-from-pals branch June 20, 2024 12:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
minor-ver for release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants