[ShanaLMoore]

Story

Refs

• 🔥 Remove form race and hydra_model overrides once Hyrax includes hyrax#7680 and hyrax#7677 #399
• ⬆️ Bump Hyku to main and Bulkrax to 10 #407

🔥 Drop the redirect query-string override Hyrax now ships

2004c90

Hyrax d5ee8e6 (samvera/hyrax#7702) renamed with_locale to
with_query_params and carries the whole query string across display
URL redirects itself, so the override no longer runs.

The redirect controller specs still pass against stock Hyrax and stay as
regression checks.

Assisted by: Opus 5.5

🔥 Drop the flexible form race overrides Hyrax now ships

ea6ad20

Hyrax d5ee8e6 includes samvera/hyrax#7680: each flexible form is built
from its own subclass, and the batch upload form reads its required
fields from a built form. These overrides did the same in the
knapsack. Their specs passed with the overrides unapplied before they
were removed.

Ref:

• 🔥 Remove form race and hydra_model overrides once Hyrax includes hyrax#7680 and hyrax#7677 #399

Assisted by: Opus 5.5

🔥 Drop the hydra_model override Hyrax now ships

108fd00

Hyrax d5ee8e6 includes samvera/hyrax#7677: with Wings off, a Solr
document's hydra_model resolves through Valkyrie, so a file set's show
page renders its profile fields without the knapsack resolving the
model itself.

Ref:

• 🔥 Remove form race and hydra_model overrides once Hyrax includes hyrax#7680 and hyrax#7677 #399
• FileSet show page renders only Title from the M3 profile #207

Assisted by: Opus 5.5

Expected Behavior Before Changes

The knapsack carried its own copies of three Hyrax fixes: carrying the whole query string across display URL redirects, building each flexible form from a per-build subclass so concurrent Bulkrax imports don't strip each other's fields (#311), and resolving hydra_model through Valkyrie so a file set's show page renders its profile fields (#207).

Expected Behavior After Changes

Same behavior, from Hyrax itself: samvera/hyrax#7702, #7680 and #7677 are in Hyrax d5ee8e6, which #408 brings in. The knapsack's copies are gone.

Screenshots / Video

A file set's show page still renders its filled profile fields (Title, File size, Type of file), not only Title (#207)

Notes

• Stacked on ⬆️ Bump Hyku to main and Bulkrax to 10 #408 (base i407-bump-hyku-bulkrax-10); retarget to main once ⬆️ Bump Hyku to main and Bulkrax to 10 #408 merges.
• Redirects: the redirect controller specs stay and pass against stock Hyrax, which now does what the override did.
• Forms: the two deleted form specs passed with the overrides unapplied on Hyrax d5ee8e6 before they were removed.
• Full suite on this branch: 1080 examples, 0 failures (10 fewer than ⬆️ Bump Hyku to main and Bulkrax to 10 #408: the deleted form specs).
• Wings is off in every environment (compose, dev/staging/production deploy templates, CI), so #7677's Valkyrie path applies everywhere.
• Not re-run: the concurrent Bulkrax collections import from Concurrent flexible form builds create blank collections on import #311 (needs GoodJob with more than one thread). Worth a check on staging.

[Copilot]

🔵 Needs a closer look

Upstream replacements could not be independently verified in this snapshot, and the concurrent-import staging check remains outstanding.

0 open findings

What changed in this PR

Removes local Hyrax workarounds now supplied by Hyrax d5ee8e6 through prerequisite PR #408, preserving behavior while reducing overrides.

Changes:

• Removes flexible-form isolation and batch-upload required-field overrides.
• Removes the file-set metadata schema lookup override.
• Deletes the two form decorator specs.

File	Description
spec/​forms/​hyrax/​forms/​resource_form_decorator_spec.rb	Removes form-isolation decorator tests.
spec/​forms/​hyrax/​forms/​batch_upload_form_decorator_spec.rb	Removes batch required-field decorator tests.
app/​helpers/​hyrax/​attributes_helper_decorator.rb	Delegates metadata schema resolution to upstream.
app/​forms/​hyrax/​forms/​resource_form_decorator.rb	Delegates per-build form isolation to upstream.
app/​forms/​hyrax/​forms/​batch_upload_form_decorator.rb	Delegates required-field lookup to upstream.

🧠 Review effort: Balanced

---

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

[ShanaLMoore]

Answering the review's note: "Upstream replacements could not be independently verified in this snapshot, and the concurrent-import staging check remains outstanding."

Copilot can't see the hyrax-webapp submodule or the gems, so here is the upstream code at Hyrax d5ee8e6 (the pin #408 brings in):

• Forms (Build each flexible form from a subclass of its own samvera/hyrax#7680): app/forms/hyrax/forms/resource_form.rb new / per_build_class? builds each flexible form from a per-build subclass with a copy of the class's definitions, matching the deleted ResourceFormDecorator token for token. app/forms/hyrax/forms/batch_upload_form.rb#required_fields reads a built form's singleton_class, as the deleted BatchUploadFormDecorator did.
• hydra_model (Resolve hydra_model through Valkyrie when Wings is off samvera/hyrax#7677): SolrDocumentBehavior#hydra_model resolves through Valkyrie.config.resource_class_resolver with the same NameError fallback when disable_wings is set. Wings is off everywhere this app runs (HYRAX_SKIP_WINGS=true in compose and the dev, staging and production deploy templates).

Evidence: the two deleted form specs passed with the knapsack overrides unapplied on d5ee8e6 before they were removed; the full suite passes on this branch; and a file set's show page renders all its filled profile fields (screenshot in the description, #207).

The concurrent Bulkrax import (#311) needs GoodJob with more than one thread, so it stays on the staging checklist.

[Copilot]

🔵 Needs a closer look

Upstream replacements remain unverified in this review, and concurrent Bulkrax import validation is still outstanding.

0 open findings

🧠 Review effort: Balanced

[Copilot]

🔵 Needs a closer look

Upstream replacements were unavailable for inspection, and concurrent-import verification remains outstanding.

0 open findings

🧠 Review effort: Balanced

[kirkkwang]

Amazing to see these removed!

[github-actions]

Test Results

      4 files  ±    0        4 suites  ±0   51s ⏱️ -2s
205 136 tests  - 4 738  205 136 ✅  - 4 738  0 💤 ±0  0 ❌ ±0 
  1 339 runs   -    16    1 339 ✅  -    16  0 💤 ±0  0 ❌ ±0 

Results for commit 108fd00. ± Comparison against base commit 7159730.

This pull request removes 4738 tests.

app.controllers.hyku_knapsack.redirect_query_string_decorator ‑ Bundler/DuplicatedGem
app.controllers.hyku_knapsack.redirect_query_string_decorator ‑ Bundler/DuplicatedGroup
app.controllers.hyku_knapsack.redirect_query_string_decorator ‑ Bundler/GemComment
app.controllers.hyku_knapsack.redirect_query_string_decorator ‑ Bundler/GemFilename
app.controllers.hyku_knapsack.redirect_query_string_decorator ‑ Bundler/GemVersion
app.controllers.hyku_knapsack.redirect_query_string_decorator ‑ Bundler/InsecureProtocolSource
app.controllers.hyku_knapsack.redirect_query_string_decorator ‑ Bundler/OrderedGems
app.controllers.hyku_knapsack.redirect_query_string_decorator ‑ Gemspec/DependencyVersion
app.controllers.hyku_knapsack.redirect_query_string_decorator ‑ Gemspec/DeprecatedAttributeAssignment
app.controllers.hyku_knapsack.redirect_query_string_decorator ‑ Gemspec/DevelopmentDependencies
…