-
Notifications
You must be signed in to change notification settings - Fork 144
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
11477 refactor append dsl #11481
Draft
whatisgalen
wants to merge
14
commits into
dev/8.0.x
Choose a base branch
from
11477_refactor_append_dsl
base: dev/8.0.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
11477 refactor append dsl #11481
Conversation
This file contains 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
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Types of changes
Description of Change
The
append_dsl
method on search filter classes has been used historically to both evaluate search logic and create Elasticsearch DSL query objects, as well as mutate the centralQuery
object. This PR divorces the functionality into two methods: the latter remains inappend_dsl
but the former now lives ingenerate_dsl
methods to create the dsl first. This creates an intermediate point where custom indexes can hook into the search filter, examinedsl = self.generate_dsl()
and mutate this before it gets added tosearch_query_object["query"]
.Additionaly, because the
search-results
filter was applying a policy-type of logic, this was moved into its own search filter namedpermitted_graphs_policy
with an accompanying migration.Issues Solved
Closes #11477
Checklist
I targeted one of these branches:
I added a changelog in arches/releases
I submitted a PR to arches-docs (if appropriate)
Unit tests pass locally with my changes
I added tests that prove my fix is effective or that my feature works
My test fails on the target branch
Accessibility Checklist
Developer Guide
Ticket Background
Further comments