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

DRAFT DO NOT MERGE: 🎁 Flexible double combo #6843

Draft
wants to merge 141 commits into
base: main
Choose a base branch
from
Draft
Changes from 33 commits
Commits
Show all changes
141 commits
Select commit Hold shift + click to select a range
5ec7d1b
:construction: WIP: Port over AFlex UI to upload profile
ShanaLMoore Jun 4, 2024
c676801
initial dynamic loading work
orangewolf Jun 6, 2024
8ca106a
typo
orangewolf Jun 6, 2024
3d32fa7
do not load any metadata schemas if HYRAX_FLEXIBLE is true
orangewolf Jun 6, 2024
01b8ed1
dymanic loading of the model with m3 profiles
orangewolf Jun 6, 2024
7e06f18
refactor schema loader to reduce code duplication
orangewolf Jun 6, 2024
382c6d9
fix bugs, add db seed
orangewolf Jun 10, 2024
6f9935b
Add file_set_metadata properties to m3_profile
kirkkwang Jun 10, 2024
6209db7
:white_check_mark: test that Hyrax::Flexibility module is included
ShanaLMoore Jun 11, 2024
77ad3db
Merge branch 'double_combo' into flexible_metadata
ShanaLMoore Jun 11, 2024
c7ccccc
Update dassie's m3_profile.yaml
kirkkwang Jun 11, 2024
eb5382c
:white_check_mark: [i19] add specs for Hyrax::FlexibleSchema
ShanaLMoore Jun 11, 2024
797a48d
:lipstick: rubocop fixes
ShanaLMoore Jun 11, 2024
0ddbab7
Add basic_metadata properties to dassie m3_profile
kirkkwang Jun 11, 2024
42fca41
Add collection_resource properties to m3_profile
kirkkwang Jun 11, 2024
f186c18
Add monograph.yaml properties to m3_profile.yaml
kirkkwang Jun 12, 2024
bcaf5ab
Copy m3_profile to Koppie
kirkkwang Jun 12, 2024
6542b0d
dynamic indexers
orangewolf Jun 12, 2024
2b95bb1
Add admin set selection to worktype modal
laritakr Jun 6, 2024
449de96
Relocated the Metadata Profiles link
kirkkwang Jun 12, 2024
2e351d6
Merge branch 'flexible_metadata' into metadata-profiles-ui
kirkkwang Jun 12, 2024
c5be4bc
Make metadata profiles index work
kirkkwang Jun 12, 2024
7cd2eff
Make export work
kirkkwang Jun 13, 2024
121787d
Make it possible to create more schemas
kirkkwang Jun 13, 2024
9115944
additional indexer calls
orangewolf Jun 13, 2024
2b087c6
Favoring fetch over [] to follow existing pattern
kirkkwang Jun 13, 2024
0450385
Add hint text to modal
kirkkwang Jun 13, 2024
3737db8
Update translations
kirkkwang Jun 13, 2024
629bb68
seperate m3 profiles from other metadata
orangewolf Jun 13, 2024
39dfc2d
Update Koppie m3_profile and add ENV guards
kirkkwang Jun 13, 2024
e8c6664
Merge branch 'flexible_metadata' into metadata-profiles-ui
kirkkwang Jun 13, 2024
9f93a7f
Add migration and schema to Koppie
kirkkwang Jun 13, 2024
9a61fd8
Merge branch 'flexible_metadata' into metadata-profiles-ui
kirkkwang Jun 13, 2024
bdaa9ee
Remove locked_at and locked_by_id
kirkkwang Jun 14, 2024
bf5bbc4
Introduce flexible? configuration
kirkkwang Jun 14, 2024
0980228
Introduce valkyrie_transition? config option
kirkkwang Jun 14, 2024
1a32864
Add Wings(Hyrax::Resource) to dassie m3
kirkkwang Jun 14, 2024
44b75f9
Update specs
kirkkwang Jun 17, 2024
6ceff73
Merge in double_combo
kirkkwang Jun 17, 2024
7d87100
Add back nil guard in SolrDocumentBehavior
kirkkwang Jun 17, 2024
282709e
Move sample_attribute.yaml to fixtures
kirkkwang Jun 18, 2024
4f06880
Add some tests for Hyrax::Flexibility
kirkkwang Jun 18, 2024
4275dbc
Revert resource_spec and remove sample_attribute
kirkkwang Jun 19, 2024
258a2e7
Fix m3_schema_loader_spec and format inline YAML
kirkkwang Jun 19, 2024
d8e9189
Merge branch 'flexible_metadata' into metadata-profiles-ui
kirkkwang Jun 19, 2024
b06e6dd
Merge branch 'double_combo' into flexible_metadata
kirkkwang Jun 20, 2024
c8d0e85
Merge branch 'flexible_metadata' into metadata-profiles-ui
kirkkwang Jun 20, 2024
a40f18d
Move db query into the controller
kirkkwang Jun 20, 2024
d743501
Rename admin set dropdown options
laritakr Jun 20, 2024
c495c34
Add guard for @admin_sets_for_select
kirkkwang Jun 20, 2024
25d722f
Merge branch 'flexible_metadata' into flexible_double_combo
kirkkwang Jun 24, 2024
fd6cea9
Merge branch 'metadata-profiles-ui' into flexible_double_combo
kirkkwang Jun 24, 2024
8b95caf
Merge branch 'select-admin-set-prior-to-worktype' into flexible_doubl…
kirkkwang Jun 24, 2024
62fefce
Rubocop fixes
kirkkwang Jun 24, 2024
bb652c5
Merge branch 'metadata-profiles-ui' into flexible_double_combo
kirkkwang Jun 24, 2024
deac768
dynamic forms that load flexible metadata
orangewolf Jun 24, 2024
18125d7
Merge branch 'flexible_forms' into flexible_double_combo
orangewolf Jun 24, 2024
5d870fb
Merge branch 'flexible_double_combo' of https://github.com/samvera/hy…
orangewolf Jun 24, 2024
77c665c
make sure attributes defined in code are kept too
orangewolf Jun 24, 2024
3af2f31
Merge branch 'flexible_metadata' into flexible_forms
orangewolf Jun 25, 2024
3e06bd1
remove some false starts and debug code
orangewolf Jun 25, 2024
2fb4906
smarter schema reservation and fix some new indexers
orangewolf Jun 25, 2024
a5ba06b
Merge branch 'flexible_metadata' into flexible_forms
orangewolf Jun 25, 2024
0a761ef
Merge branch 'flexible_metadata' into flexible_double_combo
orangewolf Jun 25, 2024
3158922
Merge branch 'flexible_forms' into flexible_double_combo
orangewolf Jun 25, 2024
12143a7
Merge branch 'main' into flexible_metadata
orangewolf Jun 25, 2024
6bd4cac
Update flexible_schema.rb
orangewolf Jun 25, 2024
35bf9a5
Merge branch 'main' of https://github.com/samvera/hyrax into flexible…
orangewolf Jun 25, 2024
94a08d7
Merge branch 'flexible_metadata' of https://github.com/samvera/hyrax …
orangewolf Jun 25, 2024
e455106
sigh
orangewolf Jun 25, 2024
55fd95a
WIP getting attribute_rows to be dynamic
kirkkwang Jun 25, 2024
3a601f5
🧹 Enables dynamic display for attribute rows
ShanaLMoore Jun 25, 2024
40d33bf
🚧 WIP - handle dynamic translations
ShanaLMoore Jun 25, 2024
536f87c
Expand support for i18n labels
kirkkwang Jun 25, 2024
e4c6ff0
Merge branch 'main' into flexible_metadata
kirkkwang Jun 25, 2024
d6e0ea9
Merge branch 'flexible_metadata' into flexible_forms
kirkkwang Jun 25, 2024
b1de02b
Rubocop fixes
kirkkwang Jun 25, 2024
d7a2d1d
Merge branch 'flexible_double_combo' into flexible_forms
kirkkwang Jun 26, 2024
f860fd4
Fix return logic
kirkkwang Jun 26, 2024
631732c
Add flexible conditional
kirkkwang Jun 26, 2024
55b1d0a
Merge pull request #6851 from samvera/flexible_forms
kirkkwang Jun 26, 2024
e060c84
Add flexible conditional
kirkkwang Jun 26, 2024
1fc5d05
Merge branch 'flexible_double_combo' into flexible_forms
kirkkwang Jun 26, 2024
db059f3
Merge pull request #6852 from samvera/flexible_forms
kirkkwang Jun 26, 2024
2cead65
Add badge to dashboard works and collection lists
kirkkwang Jun 26, 2024
d3db273
Add badge to work edit form
kirkkwang Jun 26, 2024
4a4dd85
Add badge for collection and filset show
kirkkwang Jun 27, 2024
e3f7622
Pull in changes from flexible_metadata
laritakr Jun 27, 2024
8a31ea6
Merge pull request #6856 from samvera/update-from-flexible-metadata
laritakr Jun 27, 2024
d9cbf52
Remove #schema_version from SolrDocument
kirkkwang Jun 27, 2024
345677f
Removing the schema_version_ssi
kirkkwang Jun 27, 2024
a7b0ccf
Quiet down CircleCI and have it report as green
dlpierce Jun 25, 2024
39cbf99
Load the indexer module for flexible metadata
kirkkwang Jun 27, 2024
f72bfdd
Merge branch 'flexible_double_combo' into version-badge
kirkkwang Jun 27, 2024
552d564
Work show view for flexible metadata
laritakr Jun 27, 2024
a342eb5
Rubocop fixes
kirkkwang Jun 28, 2024
50e39e9
Fix view rendering for simple schema
laritakr Jun 28, 2024
7311a4e
Rubocop
laritakr Jun 28, 2024
c61b682
Rework some partials
kirkkwang Jun 28, 2024
a806366
Change #last.id to #current_schema_id
kirkkwang Jun 28, 2024
826fa67
M3 metadata_profiles
laritakr Jun 28, 2024
cdd3d7b
Merge pull request #6859 from samvera/flexible-views
laritakr Jun 28, 2024
1348710
🧹 [i41]- unable to create a work without HYRAX_FLEXIBLE true
ShanaLMoore Jun 28, 2024
3c6f5c4
Merge branch 'flexible_double_combo' into version-badge
kirkkwang Jun 28, 2024
750e554
Move setting @latest_schema_version to concern
kirkkwang Jun 30, 2024
ded7574
Merge pull request #6858 from samvera/version-badge
kirkkwang Jul 1, 2024
6e18484
Fix lint
laritakr Jul 1, 2024
9e65f4a
Merge branch 'main' into flexible_double_combo
laritakr Jul 1, 2024
377c62e
Display based_near_label for based_near term
laritakr Jul 1, 2024
42a9099
Rework menu option
laritakr Jul 3, 2024
17f1e60
Rubocop
laritakr Jul 4, 2024
0538efd
Define 'try' for flexible classes
laritakr Jul 5, 2024
5a58fa1
Merge branch 'main' into flexible_double_combo
ShanaLMoore Jul 5, 2024
8d616d3
Add flexible schema includes for FileSet
laritakr Jul 5, 2024
742354e
[i50] - Schema version number should auto increment
ShanaLMoore Jul 5, 2024
f33e382
Merge branch 'flexible_double_combo' of https://github.com/samvera/hy…
ShanaLMoore Jul 5, 2024
3ba1276
Update solr_document_behavior.rb
ShanaLMoore Jul 5, 2024
8110efe
🧹 adds dynamic presenter and reloads dynamic methods
ShanaLMoore Jul 8, 2024
c9c305a
Update work_show_presenter.rb
ShanaLMoore Jul 8, 2024
4ae1725
♻️ revert breaking change
ShanaLMoore Jul 8, 2024
6cb3d2a
🧹 reload classes and bust cache
ShanaLMoore Jul 8, 2024
67bd299
# remove reload_classes method as it caused other issues
ShanaLMoore Jul 8, 2024
37aceed
🐛 remove self.class from #delegate
ShanaLMoore Jul 9, 2024
19e50c5
:gift: add #default_schema to avoid schema not found errors
ShanaLMoore Jul 9, 2024
03966b5
:gift: add #create_default_schema
ShanaLMoore Jul 9, 2024
4f24cbd
🧹 updates logic for #define_dynamic_methods
ShanaLMoore Jul 10, 2024
31ab8e3
make #reload_dynamic_methods an instance method
ShanaLMoore Jul 10, 2024
d8ec85e
reverts changes
ShanaLMoore Jul 10, 2024
a689288
removr #reload_dynamic_methods
ShanaLMoore Jul 11, 2024
d289710
WIP Fix flexible schema on forms reload issue
laritakr Jul 15, 2024
2c6576f
:broom: update definitions to schema_definitions
ShanaLMoore Jul 16, 2024
7e78441
:broom: [i51] - handle bad profiles
ShanaLMoore Jul 16, 2024
3e2c5e7
prevent chicken / egg problem with loading the schema before migratio…
orangewolf Aug 16, 2024
bfd7351
always show the current version of a resource, it only updates to new…
orangewolf Aug 16, 2024
bc14e4d
handle deleting fields
orangewolf Aug 16, 2024
a94f39e
Merge branch 'main' into flexible_double_combo
kirkkwang Aug 23, 2024
98a7d59
add contexts to the flexible metadata model. (#6915)
orangewolf Dec 12, 2024
96c867a
Merge branch 'main' into flexible_double_combo
orangewolf Dec 12, 2024
3b685e7
metadata page styles
orangewolf Dec 20, 2024
a64afcf
fix breadcrumbs in work show
orangewolf Dec 20, 2024
260376b
form default context
orangewolf Dec 21, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .dassie/.env
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@ HYRAX_ANALYTICS=false
HYRAX_ANALYTICS_PROVIDER=google
HYRAX_DERIVATIVES_PATH=/app/samvera/hyrax-webapp/derivatives/
HYRAX_ENGINE_PATH=/app/samvera/hyrax-engine
HYRAX_FLEXIBLE=true
HYRAX_UPLOAD_PATH=/app/samvera/hyrax-webapp/uploads/
HYRAX_VALKYRIE=true
IN_DOCKER=true
4 changes: 2 additions & 2 deletions .dassie/app/models/collection_resource.rb
Original file line number Diff line number Diff line change
@@ -30,8 +30,8 @@ class CollectionResource < Hyrax::PcdmCollection
# * add Valkyrie attributes to this class
# * update form and indexer to process the attributes
#
include Hyrax::Schema(:basic_metadata)
include Hyrax::Schema(:collection_resource)
include Hyrax::Schema(:basic_metadata) unless Hyrax.config.flexible?
include Hyrax::Schema(:collection_resource) unless Hyrax.config.flexible?

Hyrax::ValkyrieLazyMigration.migrating(self, from: ::Collection) if Hyrax.config.valkyrie_transition?
end
4 changes: 2 additions & 2 deletions .dassie/app/models/generic_work_resource.rb
Original file line number Diff line number Diff line change
@@ -3,8 +3,8 @@
# Generated via
# `rails generate hyrax:work_resource GenericWorkResource`
class GenericWorkResource < Hyrax::Work
include Hyrax::Schema(:basic_metadata)
include Hyrax::Schema(:generic_work_resource)
include Hyrax::Schema(:basic_metadata) unless Hyrax.config.flexible?
include Hyrax::Schema(:generic_work_resource) unless Hyrax.config.flexible?

Hyrax::ValkyrieLazyMigration.migrating(self, from: GenericWork) if Hyrax.config.valkyrie_transition?
end
4 changes: 2 additions & 2 deletions .dassie/app/models/monograph.rb
Original file line number Diff line number Diff line change
@@ -3,6 +3,6 @@
# Generated via
# `rails generate hyrax:work_resource Monograph`
class Monograph < Hyrax::Work
include Hyrax::Schema(:basic_metadata)
include Hyrax::Schema(:monograph)
include Hyrax::Schema(:basic_metadata) unless Hyrax.config.flexible?
include Hyrax::Schema(:monograph) unless Hyrax.config.flexible?
end
Loading