-
Notifications
You must be signed in to change notification settings - Fork 8.3k
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
[ResponseOps] Add pagination and sorting to the alerts search strategy #126813
Merged
chrisronline
merged 9 commits into
elastic:main
from
chrisronline:rops/alert_search_strategy_pagination_sorting
Mar 9, 2022
Merged
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
3af172d
Add pagination and sorting
fcd67f6
Merge remote-tracking branch 'elastic/main' into rops/alert_search_st…
84bbe3f
Merge remote-tracking branch 'elastic/main' into rops/alert_search_st…
a268686
PR feedback
7272c6d
Merge remote-tracking branch 'elastic/main' into rops/alert_search_st…
be5cea8
PR feedback
4893aa4
Merge remote-tracking branch 'elastic/main' into rops/alert_search_st…
6174233
Fix merge issues
d2a265f
Fix types and PR feedback
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -91,18 +91,31 @@ export const ruleRegistrySearchStrategyProvider = ( | |
filter.push(getSpacesFilter(space.id) as estypes.QueryDslQueryContainer); | ||
} | ||
|
||
const sort = request.sort | ||
? request.sort.map(({ field, direction }) => { | ||
return { | ||
[field]: { | ||
order: direction, | ||
}, | ||
}; | ||
}) | ||
: {}; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. super small nitpick: should we try to be consistent with the types? (array) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Sure |
||
|
||
const query = { | ||
bool: { | ||
...request.query?.bool, | ||
filter, | ||
}, | ||
}; | ||
const size = request.pagination ? request.pagination.pageSize : MAX_ALERT_SEARCH_SIZE; | ||
const params = { | ||
index: indices, | ||
body: { | ||
_source: false, | ||
fields: ['*'], | ||
size: MAX_ALERT_SEARCH_SIZE, | ||
sort, | ||
size, | ||
from: request.pagination ? request.pagination.pageIndex * size : 0, | ||
query, | ||
}, | ||
}; | ||
|
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should just use the
estypes.Sort
type fromimport type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done!