Valkyrize Knapsack + Review knapsacking effort #13

jeremyf · 2024-04-16T19:10:21Z

This is the original branch for our Knapsacking effort.
After getting a bit unruly, we separated and merged all the bits before we started valkyrizing.
This PR should contain knapsacking + valkyrizing efforts only

ref:

Knapsack pals #15

Issues:

TODO:

---

🚧 Add files from PALs Hyku not in other repos

3595d6f

This is a first pass of the PALs work. There was a lot of head
scratching and copying things into Hyku Prime. Together this is a
rough process.

🚧 Partial port of PALs Hyku entries

fac9882

Move functionality to Hyku prime

c0a37d5

Review and override file_set_helper.rb

a274a65

Favor pushing views down into Hyku Prime

0a34b07

Ongoing review of files that were different in 3 or more repositories

1357812

Blank out rendering of Generic Work title

63b6b6b

Adding collections/show as this is unique to PALs

183fdd7

Add custom catalog controller for PALs

de326b4

🎁 Decorate ApplicationController based on PALs criteria

b3e8bda

jeremyf · 2024-04-18T15:06:40Z

app/factories/bulkrax/related_member_object_factory.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true


Should this go back to Hyku? It's unclear.

jeremyf · 2024-04-18T15:10:14Z

app/helpers/blacklight/advanced_search_helper.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Blacklight


Should these go back to Hyku?

jeremyf · 2024-04-18T15:11:35Z

app/helpers/blacklight/facets_helper_behavior.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+# OVERRIDE Blacklight 6.7.0 to enable markdown in the facets


Should this go back to Hyku?

jeremyf · 2024-04-18T15:12:01Z

app/helpers/blacklight/catalog_helper_behavior_decorator.rb

+
+# OVERRIDE blacklight 6 to allow full url for show links for shared search thumbnail
+module Blacklight
+  module CatalogHelperBehaviorDecorator


Should this go back to Hyku? I believe so given that it has generic_work_url

jeremyf · 2024-04-18T15:12:44Z

app/helpers/blacklight/render_constraints_helper_behavior.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true


This goes back to Hyku

jeremyf · 2024-04-18T15:13:32Z

app/helpers/hyrax/citations_behaviors/common_behavior.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Hyrax


The citation formatters might go back to Hyku

jeremyf · 2024-04-18T15:13:36Z

app/helpers/hyrax/citations_behaviors/formatters.rb

@@ -0,0 +1,30 @@
+# Hyrax Override: Improve Citations Format


The citation formatters might go back to Hyku

jeremyf · 2024-04-18T15:13:44Z

app/helpers/hyrax/citations_behaviors/formatters/apa_formatter.rb

@@ -0,0 +1,94 @@
+# Hyrax Override: Improve Format of Citations


The citation formatters might go back to Hyku

jeremyf · 2024-04-18T15:14:38Z

app/helpers/hyku_knapsack/application_helper.rb

@@ -2,5 +2,20 @@

 module HykuKnapsack
  module ApplicationHelper
+    # OVERRIDE Hyrax::FileSetHelper#media_display_partial


Does this go back to Hyku?

jeremyf · 2024-04-18T15:14:56Z

app/helpers/hyrax/citations_behaviors/formatters/chicago_formatter.rb

@@ -0,0 +1,64 @@
+# Hyrax Override: Improve Citations Format


The citation formatters might go back to Hyku

jeremyf · 2024-04-18T15:15:03Z

app/helpers/hyrax/citations_behaviors/formatters/mla_formatter.rb

@@ -0,0 +1,75 @@
+# Hyrax Override: Improve Citations Format


The citation formatters might go back to Hyku

jeremyf · 2024-04-18T15:15:11Z

app/helpers/hyrax/citations_behaviors/publication_behavior.rb

@@ -0,0 +1,48 @@
+# Hyrax Override: Improve Citations Format


The citation formatters might go back to Hyku

jeremyf · 2024-04-18T15:15:41Z

app/helpers/hyrax/override_helper_behavior.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true


Back to Hyku?

jeremyf · 2024-04-18T15:15:54Z

app/indexers/app_indexer_decorator.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module AppIndexerDecorator


Back to Hyku?

jeremyf · 2024-04-18T15:16:48Z

app/jobs/bulkrax/importer_job_decorator.rb

+# frozen_string_literal: true
+
+# OVERRIDE BULKRAX 8.0.0
+module Bulkrax


Does this go back to Hyku?

jeremyf · 2024-04-18T15:16:57Z

app/jobs/attach_files_to_work_job_decorator.rb

+
+# OVERRIDE: Hyrax 5.0.1 to handed is_derived
+class AttachFilesToWorkJobDecorator
+  def attach_work(user, work, work_attributes, work_permissions, uploaded_file)


Does this go back to Hyku?

jeremyf · 2024-04-18T15:17:09Z

app/jobs/bulkrax/related_memberships_job.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true


Does this go back to Hyku?

jeremyf · 2024-04-18T15:19:04Z

app/models/bulkrax/importer_decorator.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true


Back to Hyku?

jeremyf · 2024-04-18T15:21:12Z

app/models/generic_work_decorator.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module GenericWorkDecorator


Back to Hyku?

jeremyf · 2024-04-18T15:21:24Z

app/models/concerns/order_metadata_values.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true


Back to Hyku?

jeremyf · 2024-04-18T15:29:41Z

app/parsers/bulkrax/csv_parser_decorator.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true


Likely something that should go back to Bulkrax

jeremyf · 2024-04-18T15:30:52Z

app/services/hyrax/accessibility_features_service.rb

@@ -0,0 +1,25 @@
+module Hyrax
+  module AccessibilityFeaturesService


Are these something to go back to Hyku?

jeremyf · 2024-04-18T15:31:04Z

app/services/hyrax/accessibility_hazards_service.rb

@@ -0,0 +1,25 @@
+module Hyrax
+  module AccessibilityHazardsService


Are these something that goes back to Hyku?

jeremyf · 2024-04-18T15:31:13Z

app/services/hyrax/audience_service.rb

@@ -0,0 +1,25 @@
+module Hyrax
+  module AudienceService


Are these something to send back to Hyku?

jeremyf · 2024-04-18T15:31:23Z

app/services/hyrax/contributing_library_service.rb

@@ -0,0 +1,20 @@
+module Hyrax
+  # Provide select options for the types field
+  class ContributingLibraryService < QaSelectService


Is this something to send back to Hyku?

jeremyf · 2024-04-18T15:31:32Z

app/services/hyrax/discipline_service.rb

@@ -0,0 +1,25 @@
+module Hyrax
+  module DisciplineService
+    mattr_accessor :authority


Is this something that belongs in Hyku?

jeremyf · 2024-04-18T15:31:40Z

app/services/hyrax/education_levels_service.rb

@@ -0,0 +1,25 @@
+module Hyrax
+  module EducationLevelsService
+    mattr_accessor :authority


Something that belongs in Hyku?

jeremyf · 2024-04-18T15:31:49Z

app/services/hyrax/learning_resource_types_service.rb

@@ -0,0 +1,25 @@
+module Hyrax
+  module LearningResourceTypesService


Something that belongs in Hyku?

jeremyf · 2024-04-18T15:31:59Z

app/services/hyrax/oer_types_service.rb

@@ -0,0 +1,25 @@
+module Hyrax
+  module OerTypesService


Something that belongs in Hyku?

jeremyf · 2024-04-18T15:34:17Z

app/views/hyrax/admin/workflows/index.html.erb

@@ -0,0 +1,73 @@
+<%# OVERRIDE: Hyrax v5.0.1 to show the user/depositor's display_name if available %>


Perhaps something for Hyku?

…ist-softserv/palni_palci_knapsack into review-knapsacking-effort

TODO: We can probably remove any code that matches Hyku's wings.rb

This commit will load the decorators earlier in the initialization.

In this commit I've added custom index terms to each resource indexer.

We remove the controllers because they are no longer needed and use the AF models' controllers instead.

TODO: add Image and generic work properties to the decorator yaml files

These two jobs were adjusted to the Valkyrie paradigm. The AttachFilesToWorkJobDecorator needs more context before I can change it and the Bulkrax::RelatedMembershipsJob seems like it should work, but we'll see with testing. The spec for CreateGroupAndAddMembersJob will be addressed later.

This commit will also add the same condition pattern we used in the model and update the yaml to mirror the old fields.

This commit reworks the prior ones, to allow us to override metadata defined in Hyku.

Valkyrize indexers

This commit will fix the Oer edit page because it was not loading correctly and also the required badge in the forms.

This commit will add a CDL Listener that will replace the model callback.

We remove the registration of all the migrated work types but CDL was misbehaving. The reason is because the indexer and the form was inheriting from the wrong parent and the controller was not following the same pattern.

The collection factory was failing because we overrode the basic_metadata.yaml which it also uses so we need to add all the basic metadata into the collection_resource.yaml. There was a log that was failing because it was not being explicit in the root of the application though I'm unsure if it is needed. The major question is if we need to run hyku_specs or not.

jeremyf commented Apr 18, 2024

View reviewed changes

app/helpers/hyrax/override_helper_behavior.rb Outdated

@@ -0,0 +1,58 @@

# frozen_string_literal: true

Copy link

Contributor Author

jeremyf Apr 18, 2024

Choose a reason for hiding this comment

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

Back to Hyku?

jeremyf commented Apr 18, 2024

View reviewed changes

app/models/bulkrax/importer_decorator.rb Outdated

@@ -0,0 +1,13 @@

# frozen_string_literal: true

Copy link

Contributor Author

jeremyf Apr 18, 2024

Choose a reason for hiding this comment

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

Back to Hyku?

jeremyf commented Apr 18, 2024

View reviewed changes

app/models/concerns/order_metadata_values.rb Outdated

@@ -0,0 +1,18 @@

# frozen_string_literal: true

Copy link

Contributor Author

jeremyf Apr 18, 2024

Choose a reason for hiding this comment

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

Back to Hyku?

jeremyf commented Apr 18, 2024

View reviewed changes

ShanaLMoore added 4 commits May 16, 2024 12:34

AF records should reroute to resources

ee25656

Merge branch 'review-knapsacking-effort' of https://github.com/scient…

060d9da

…ist-softserv/palni_palci_knapsack into review-knapsacking-effort

update indexers and inherit from ValkyrieWorkIndexer

308a4a0

Create wings.rb

7382b86

TODO: We can probably remove any code that matches Hyku's wings.rb

ShanaLMoore mentioned this pull request May 17, 2024

Knapsack pals #15

Merged

Merge branch 'main' into review-knapsacking-effort

fe50ab0

ShanaLMoore changed the title ~~Review knapsacking effort~~ Valkyrize Knapsack + Review knapsacking effort May 17, 2024

ShanaLMoore and others added 4 commits May 17, 2024 08:54

Update wings to specify knapsack specific overrides

b3d7a5d

Update wings so you only need one point of change

1695788

Update engine to load decorators earlier

6696d80

This commit will load the decorators earlier in the initialization.

🎁 customize indexers

bb63948

In this commit I've added custom index terms to each resource indexer.

kirkkwang force-pushed the review-knapsacking-effort branch from 16cbee2 to 78f74ad Compare May 17, 2024 20:31

Remove the controllers for migrated models

673335d

We remove the controllers because they are no longer needed and use the AF models' controllers instead.

kirkkwang force-pushed the review-knapsacking-effort branch from 78f74ad to 673335d Compare May 17, 2024 20:34

ShanaLMoore and others added 14 commits May 17, 2024 14:58

🎁 Allow knapsack to override Hyku metadata

894dd41

TODO: add Image and generic work properties to the decorator yaml files

Update Image form, indexer, and yaml

7550093

This commit will also add the same condition pattern we used in the model and update the yaml to mirror the old fields.

Valkyrize GenericWorkResourceDecorator

84e8e6b

update submodule

88a0742

🧹 Allow for custom metadata overrides

80c9417

This commit reworks the prior ones, to allow us to override metadata defined in Hyku.

🧹 replace glyphicon with font awesome

6fbe72b

Update submodule

9e303dc

update submodule

22b8d01

Merge pull request #16 from scientist-softserv/valkyrize-indexers

1b5062b

Valkyrize indexers

Fix some Oer stuff

307edee

This commit will fix the Oer edit page because it was not loading correctly and also the required badge in the forms.

Address CDL listener

6da581c

This commit will add a CDL Listener that will replace the model callback.

Fix CDLs

45ec495

We remove the registration of all the migrated work types but CDL was misbehaving. The reason is because the indexer and the form was inheriting from the wrong parent and the controller was not following the same pattern.

kirkkwang merged commit 1647043 into main May 21, 2024
2 of 6 checks passed

kirkkwang deleted the review-knapsacking-effort branch May 21, 2024 18:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Valkyrize Knapsack + Review knapsacking effort #13

Valkyrize Knapsack + Review knapsacking effort #13

jeremyf commented Apr 16, 2024 •

edited by kirkkwang

Loading

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

jeremyf Apr 18, 2024

		@@ -0,0 +1,50 @@
		# frozen_string_literal: true

		module Blacklight

		@@ -0,0 +1,12 @@
		# frozen_string_literal: true

		# OVERRIDE Blacklight 6.7.0 to enable markdown in the facets

		@@ -0,0 +1,94 @@
		# Hyrax Override: Improve Format of Citations

		@@ -0,0 +1,11 @@
		# frozen_string_literal: true

		module AppIndexerDecorator

		@@ -0,0 +1,32 @@
		# frozen_string_literal: true

		module GenericWorkDecorator

		@@ -0,0 +1,25 @@
		module Hyrax
		module AccessibilityFeaturesService

		@@ -0,0 +1,25 @@
		module Hyrax
		module AccessibilityHazardsService

		@@ -0,0 +1,25 @@
		module Hyrax
		module LearningResourceTypesService

		@@ -0,0 +1,73 @@
		<%# OVERRIDE: Hyrax v5.0.1 to show the user/depositor's display_name if available %>

Valkyrize Knapsack + Review knapsacking effort #13

Valkyrize Knapsack + Review knapsacking effort #13

Conversation

jeremyf commented Apr 16, 2024 • edited by kirkkwang Loading

TODO:

---

🚧 Add files from PALs Hyku not in other repos

🚧 Partial port of PALs Hyku entries

Move functionality to Hyku prime

Review and override file_set_helper.rb

Favor pushing views down into Hyku Prime

Ongoing review of files that were different in 3 or more repositories

Blank out rendering of Generic Work title

Adding collections/show as this is unique to PALs

Add custom catalog controller for PALs

🎁 Decorate ApplicationController based on PALs criteria

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jeremyf commented Apr 16, 2024 •

edited by kirkkwang

Loading