Skip to content

[ENG-9820]: cleanup and delete dead ES2 code#11688

Open
ihorsokhanexoft wants to merge 54 commits into
CenterForOpenScience:feature/pbs-26-13from
ihorsokhanexoft:feature/ENG-9820
Open

[ENG-9820]: cleanup and delete dead ES2 code#11688
ihorsokhanexoft wants to merge 54 commits into
CenterForOpenScience:feature/pbs-26-13from
ihorsokhanexoft:feature/ENG-9820

Conversation

@ihorsokhanexoft

@ihorsokhanexoft ihorsokhanexoft commented Apr 8, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Ticket

https://openscience.atlassian.net/browse/ENG-9820

Purpose

After removing v1/v2 search endpoints, there is a lot of unused code that can be removed

Changes

Remove legacy code

IT IS HIGHLY RECOMMENDED TO REVIEW THIS PULL REQUEST COMMIT BY COMMIT

Vlad0n20 and others added 30 commits April 7, 2026 11:29
@Vlad0n20
add required_metadata_template (CenterForOpenScience#11680)
c9153b8
@Vlad0n20
add required_metadata_template to API
b11d69c
@Vlad0n20
Fix tests
1034d79
@ihorsokhanexoft
removed discovery legacy search
7924acc
@ihorsokhanexoft
removed /search/ legacy route
35dca89
@ihorsokhanexoft
remove api/v1/user/search/ legacy route
7a45982
@ihorsokhanexoft
removed api/v1/search/node/ legacy route
f3e63d4
@ihorsokhanexoft
removed api/v1/share/search/ legacy route
f6abdb4
@ihorsokhanexoft
removed api/v1/search/projects/ legacy route
be6e090
@ihorsokhanexoft
removed api/v1/search/ and api/v1/search/<type>/ legacy routes
a8c11bd
@ihorsokhanexoft
removed unused website/search process_project_search_results function
d6d3357
@ihorsokhanexoft
removed api/v2/search/ endpoint
c8a2724
@ihorsokhanexoft
removed api/v2/search/components/ endpoint
b3788ad
@ihorsokhanexoft
removed api/v2/search/files/ endpoint
408b47e
@ihorsokhanexoft
removed api/v2/search/projects/ endpoint
d3fbfbd
@ihorsokhanexoft
removed api/v2/search/registrations/ endpoint
44a3c8b
@ihorsokhanexoft
removed api/v2/search/users/ endpoint
2f763bc
@ihorsokhanexoft
removed api/v2/search/institutions/ endpoint
0f7f096
@ihorsokhanexoft
removed api/v2/search/collections/ endpoint, scopes and its dependencies
0e8f7ea
@ihorsokhanexoft
removed api/v2/search/ base route
5c9e978
@ihorsokhanexoft
removed test related to legacy /explore/ route
8a9243a
@adlius
Merge pull request CenterForOpenScience#11683 from Vlad0n20/feature/E…
94ce69f 
…NG-9822

[ENG-9822] - add required_metadata_template to API
@Vlad0n20
Add required metadata validation
dfe25a1
@Vlad0n20
Add Required metadata template field to admin pages
4499aa8
@Vlad0n20
fix tests
e26fac7
@adlius
add field, change admin form
05a44c5
@adlius
add migration
903b2ce
@adlius
remove unused field
8c702a0
@Vlad0n20
Update imports
7bc97ef
@adlius
Merge pull request CenterForOpenScience#11692 from adlius/feature/es2…
0ad2116 
…-consolidation

[ENG-9829][ENG-9830] Add `should_index_for_search` field to CedarMetadataTemplate
Vlad0n20 and others added 15 commits April 14, 2026 17:54
@Vlad0n20
Add switch to enforce required_metadata_template
e70c418
@adlius
Merge pull request CenterForOpenScience#11687 from Vlad0n20/feature/E…
d8e62d1 
…NG-9823

[ENG-9823] - Add Required metadata template field to admin pages
@adlius
Merge pull request CenterForOpenScience#11691 from Vlad0n20/feature/E…
5829d41 
…NG-9824

[ENG-9824] - Add required metadata validation
@adlius
Merge pull request CenterForOpenScience#11694 from Vlad0n20/feature/E…
e883e0a 
…NG-9825

Add switch to enforce required_metadata_template
@ihorsokhanexoft
added cedar metadata record creation/deletion in share for collection…
3634ac5 
… submission
@ihorsokhanexoft
removed validate_required_metadata redefinition
f52c484
@ihorsokhanexoft
enqueue cedar record update in share
ec8fb9f
@ihorsokhanexoft
added focus_iri to shtrove POST request
06ef868
@ihorsokhanexoft
separate cedar record identifier to avoid potential issues
52c8fed
@ihorsokhanexoft
separate cedar record serialization
13ccfd3
@ihorsokhanexoft
added retry, moved tasks to task__update_share
b1630a1
@ihorsokhanexoft
added more tests, make delete cedar record function working without c…
3561ed0 
…edar record existence
@ihorsokhanexoft
fixed tests
ff4876f
@ihorsokhanexoft
simplified turtle test and task__update_share
c6d35f4
@ihorsokhanexoft
use delay instead of signature for cedar tasks
db23132
@Vlad0n20

Vlad0n20 commented May 8, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Clean, well-scoped deletion. One missed cleanup: CoreScopes.SEARCH = 'search_read' at oauth_scopes.py:136 is left as a dead definition after its only usages are removed — should be deleted alongside ADVANCED_SEARCH. Also worth confirming whether /explore/ and /activity/ need infrastructure-level redirects before this merges. Everything else looks good.

@adlius
Merge pull request CenterForOpenScience#11710 from ihorsokhanexoft/fe…
a34867a 
…ature/ENG-9831

[ENG-9831] Cedar metadata record creation/deletion in share for collection submission
@ihorsokhanexoft

ihorsokhanexoft commented May 11, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Clean, well-scoped deletion. One missed cleanup: CoreScopes.SEARCH = 'search_read' at oauth_scopes.py:136 is left as a dead definition after its only usages are removed — should be deleted alongside ADVANCED_SEARCH. Also worth confirming whether /explore/ and /activity/ need infrastructure-level redirects before this merges. Everything else looks good.

But CoreScopes.SEARCH is used in BaseSearchView that many views inherit from:
image

So why should we remove it?

Vlad0n20
Vlad0n20 approved these changes May 12, 2026
View reviewed changes

@Vlad0n20 Vlad0n20 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM!

@adlius adlius changed the base branch from feature/es2-consolidation to feature/pbs-26-13 July 6, 2026 14:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@Vlad0n20 Vlad0n20 Vlad0n20 approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ihorsokhanexoft @Vlad0n20 @adlius