sort by managed policy feature #950
Merged
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
Signed-off-by: Mansi Shinde <shinde.mansi55@gmail.com>
MansiShinde
requested review from
amsiglan,
AWSHurneyt,
bowenlan-amzn,
getsaurabh02,
praveensameneni,
xluo-aws,
gaobinlong,
Hailong-am,
SuZhou-Joe,
lezzago,
sbcd90 and
eirsep
as code owners
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #950 +/- ##
=======================================
Coverage 63.37% 63.37%
=======================================
Files 341 341
Lines 11554 11554
Branches 2243 2243
=======================================
Hits 7322 7322
Misses 3658 3658
Partials 574 574 ☔ View full report in Codecov by Sentry. |
server/services/IndexService.ts
Outdated
| expand_wildcards?: string; | ||
| } = { | ||
| index: getSearchString(terms, indices, dataStreams), | ||
| format: "json", | ||
| s: `${sortField}:${sortDirection}`, | ||
| // s: `${sortField}:${sortDirection}`, |
server/services/IndexService.ts
Outdated
Comment on lines
189
to
199
| let flag; | ||
| const aManaged = a.managed as string; | ||
| const bManaged = b.managed as string; | ||
|
|
||
| if (sortDirection === "asc") { | ||
| flag = aManaged < bManaged; | ||
| } else { | ||
| flag = aManaged > bManaged; | ||
| } | ||
|
|
||
| return flag ? -1 : 1; |
There was a problem hiding this comment.
Extract this out as a function, can be reused. And this sort should only apply when sortField is "managed"
Signed-off-by: Mansi Shinde <shinde.mansi55@gmail.com>
server/services/IndexService.ts
Outdated
| managed: managedStatus[catIndex.index] ? "Yes" : "No", | ||
| managedPolicy: managedStatus[catIndex.index], | ||
| })), | ||
| indices: customSort( |
There was a problem hiding this comment.
This sort on managed would only apply when the sortField is chosen to be managed as I understand.
There was a problem hiding this comment.
Hello @bowenlan-amzn, thank you for bringing this to my attention. I noticed that the code was displaying indices based on the "managed" field, regardless of whether the sort field was "managed" or not. I have updated the logic, and it is now functioning as expected. Could you please take a look?
Signed-off-by: Mansi Shinde <shinde.mansi55@gmail.com>
AWSHurneyt
approved these changes
Dec 12, 2023
bowenlan-amzn
merged commit b516933
into
opensearch-project:main
11 of 12 checks passed
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Dec 12, 2023
* sort by managed policy feature Signed-off-by: Mansi Shinde <shinde.mansi55@gmail.com> * add customSort function and remove comment Signed-off-by: Mansi Shinde <shinde.mansi55@gmail.com> * update managed by policy sorting logic Signed-off-by: Mansi Shinde <shinde.mansi55@gmail.com> --------- Signed-off-by: Mansi Shinde <shinde.mansi55@gmail.com> (cherry picked from commit b516933) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
AWSHurneyt
pushed a commit
that referenced
this pull request
Dec 13, 2023
* sort by managed policy feature * add customSort function and remove comment * update managed by policy sorting logic --------- (cherry picked from commit b516933) Signed-off-by: Mansi Shinde <shinde.mansi55@gmail.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
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.
Description
Make managed by policy field sortable.
Fix unsupported operation exception error while sorting by Data stream field.
Ascending order
Descending order
Issues Resolved
List any issues this PR will resolve - 106 , 948
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.