Merge Feature/es2 consolidation into develop#1019
Merged
Merged
Conversation
feat(ENG-9817): collection-specific metadata with cedar
[ENG-9818] - collection search with shtrove
…onflicts Resolved conflicts in: - global-search.actions.ts: kept DiscoverableFilter+FilterOption from discoverable-filter.model (fixed typo from discaverable), removed duplicate FilterOption import - en.json: deep-merged both branches, preserving ES2 feature keys and adding 46 keys from develop; applied develop's spacing/casing fixes Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…velop Merge/es2 consolidation with develop
Feat/eng 9827 - save custom collection-submission metadata two ways
Merge develop into feature/es2-consolidation feature branch
[ENG-9827] - Revert metadata creation workflow
[ENG-11252] Fix licenses
feat(es2): Fix search
feat(es2): fix search page again
feat(es2): Fix collection discover page facet
feat(es2): Only show non-cedar templates when adding metadata
Only show public projects for collection submission workflow.
feat(ENG-11333): fix selected filters from overriding default filters
fix(ENG-11358): show cedar metadata in collection accordion on projec…
fix(ENG-11346): show placeholder in cedar-derived filter dropdowns
fix(ENG-11333): fix single value filtering
feat(es2): Fix overview page dropdown
brianjgeiger
approved these changes
Jun 23, 2026
Collaborator
|
coverage: 81.85% (-0.4%) from 82.273% — feature/es2-consolidation into develop |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Purpose
Summary of Changes
Screenshot(s)
Side Effects
QA Notes