filter high level groups and action groups by cluster and index #1482

derek-ho · 2023-06-21T20:21:35Z

Description

Filters high level groups based on cluster or index panel and also filters the actiongroups based on their associated type

Why these changes are required?

What is the old behavior before changes and new behavior after changes?

Issues Resolved

fix: #1346
fix: #1347

Testing

[Please provide details of testing done: unit testing, integration testing and manual testing]

Check List

New functionality includes testing
New functionality has been documented
Commits are signed per the DCO using --signoff

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.

Signed-off-by: Derek Ho <dxho@amazon.com>

cwperks · 2023-06-21T21:03:38Z

Thank you for the PR @derek-ho ! Would you be able to add a test to verify the new behavior?

codecov · 2023-06-21T21:05:44Z

Codecov Report

Merging #1482 (5b059d5) into main (8dab6a3) will decrease coverage by 0.12%.
The diff coverage is 44.44%.

❗ Current head 5b059d5 differs from pull request most recent head e692169. Consider uploading reports for the commit e692169 to get more accurate results

@@            Coverage Diff             @@
##             main    #1482      +/-   ##
==========================================
- Coverage   65.62%   65.51%   -0.12%     
==========================================
  Files          93       93              
  Lines        2307     2314       +7     
  Branches      314      315       +1     
==========================================
+ Hits         1514     1516       +2     
- Misses        725      730       +5     
  Partials       68       68

Impacted Files	Coverage Δ
.../apps/configuration/panels/role-edit/role-edit.tsx	`71.66% <42.85%> (-4.70%)`	⬇️
public/plugin.ts	`13.84% <50.00%> (+1.14%)`	⬆️

cwperks · 2023-06-21T21:21:03Z

@derek-ho Does this fix #1347 too or just #1346? I took a quick glance at the code and it looks like this fixes #1346 , but not #1347

DarshitChanpura · 2023-06-26T19:39:55Z

@derek-ho Would you please fetch the latest changes from main.

RyanL1997

Hi @derek-ho, thanks for taking this on, and it is looking good to me. Just like Craig mentioned above, a testing case would be great.

RyanL1997 · 2023-07-04T01:52:14Z

public/apps/configuration/panels/role-edit/role-edit.tsx

@@ -106,12 +106,12 @@ export function RoleEdit(props: RoleEditDeps) {
    }
  }, [addToast, props.action, props.coreStart.http, props.sourceRoleName]);

-  const [actionGroups, setActionGroups] = useState<string[]>([]);
+  const [actionGroups, setActionGroups] = useState<Array<[string, ActionGroupItem]>>([]);


Just for my understanding, why are we needing this ActionGroupItem, or can we use the original Action here?

If i'm understanding your question correctly I need the whole item here in order to tell whether it is a cluster/index one later on in order to filter them accordingly

Signed-off-by: Derek Ho <dxho@amazon.com>

public/apps/configuration/panels/role-edit/test/role-edit-filtering.test.tsx

Signed-off-by: Derek Ho <dxho@amazon.com>

cwperks · 2023-07-10T16:22:43Z

public/apps/configuration/panels/role-edit/test/role-edit-filtering.test.tsx

+      },
+      {
+        label: 'Cluster permissions',
+        options: CLUSTER_PERMISSIONS.map((x) => {


Much more robust and less lines of code :)

cwperks

Looks good to me! Thank you for solving this pesky issue @derek-ho !

derek-ho · 2023-07-10T17:15:06Z

@derek-ho Does this fix #1347 too or just #1346? I took a quick glance at the code and it looks like this fixes #1346 , but not #1347

This should fix both. It is both filtering action groups (which comes from the network call), and also creates a separate variable, so that only cluster/index respectively permissions from the constants file is included

RyanL1997

Thanks for the work @derek-ho and I'm approving these changes. However, I think your PR is also impacted by this issue: #1506

* filter high level groups and action groups by cluster and index Signed-off-by: Derek Ho <dxho@amazon.com> * remove unecessary console Signed-off-by: Derek Ho <dxho@amazon.com> * add semicolon back Signed-off-by: Derek Ho <dxho@amazon.com> * use map instead of flat map Signed-off-by: Derek Ho <dxho@amazon.com> * fix lint Signed-off-by: Derek Ho <dxho@amazon.com> * fix tests Signed-off-by: Derek Ho <dxho@amazon.com> * revert file Signed-off-by: Derek Ho <dxho@amazon.com> * fix up tests Signed-off-by: Derek Ho <dxho@amazon.com> * lint Signed-off-by: Derek Ho <dxho@amazon.com> --------- Signed-off-by: Derek Ho <dxho@amazon.com> (cherry picked from commit 5fd8018)

… (#1508) * filter high level groups and action groups by cluster and index Signed-off-by: Derek Ho <dxho@amazon.com> * remove unecessary console Signed-off-by: Derek Ho <dxho@amazon.com> * add semicolon back Signed-off-by: Derek Ho <dxho@amazon.com> * use map instead of flat map Signed-off-by: Derek Ho <dxho@amazon.com> * fix lint Signed-off-by: Derek Ho <dxho@amazon.com> * fix tests Signed-off-by: Derek Ho <dxho@amazon.com> * revert file Signed-off-by: Derek Ho <dxho@amazon.com> * fix up tests Signed-off-by: Derek Ho <dxho@amazon.com> * lint Signed-off-by: Derek Ho <dxho@amazon.com> --------- Signed-off-by: Derek Ho <dxho@amazon.com> (cherry picked from commit 5fd8018) Co-authored-by: Derek Ho <dxho@amazon.com>

…search-project#1482) * filter high level groups and action groups by cluster and index Signed-off-by: Derek Ho <dxho@amazon.com> * remove unecessary console Signed-off-by: Derek Ho <dxho@amazon.com> * add semicolon back Signed-off-by: Derek Ho <dxho@amazon.com> * use map instead of flat map Signed-off-by: Derek Ho <dxho@amazon.com> * fix lint Signed-off-by: Derek Ho <dxho@amazon.com> * fix tests Signed-off-by: Derek Ho <dxho@amazon.com> * revert file Signed-off-by: Derek Ho <dxho@amazon.com> * fix up tests Signed-off-by: Derek Ho <dxho@amazon.com> * lint Signed-off-by: Derek Ho <dxho@amazon.com> --------- Signed-off-by: Derek Ho <dxho@amazon.com> Signed-off-by: Sam <samuel.costa@eliatra.com>

filter high level groups and action groups by cluster and index

9c11750

Signed-off-by: Derek Ho <dxho@amazon.com>

derek-ho requested review from cliu123, cwperks, DarshitChanpura, davidlago, peternied, RyanL1997 and stephen-crawford as code owners June 21, 2023 20:21

derek-ho added 4 commits June 21, 2023 16:22

remove unecessary console

38c151a

Signed-off-by: Derek Ho <dxho@amazon.com>

add semicolon back

8c0fbe3

Signed-off-by: Derek Ho <dxho@amazon.com>

use map instead of flat map

974f02f

Signed-off-by: Derek Ho <dxho@amazon.com>

fix lint

62220bb

Signed-off-by: Derek Ho <dxho@amazon.com>

cwperks added the backport 2.x backport to 2.x branch label Jun 21, 2023

Merge branch 'main' into filter-in-dropdown

2485ca6

RyanL1997 reviewed Jul 4, 2023

View reviewed changes

fix tests

a8f27ce

Signed-off-by: Derek Ho <dxho@amazon.com>

derek-ho force-pushed the filter-in-dropdown branch from 5b059d5 to a8f27ce Compare July 10, 2023 15:08

revert file

1d98208

Signed-off-by: Derek Ho <dxho@amazon.com>

cwperks reviewed Jul 10, 2023

View reviewed changes

public/apps/configuration/panels/role-edit/test/role-edit-filtering.test.tsx Outdated Show resolved Hide resolved

cwperks reviewed Jul 10, 2023

View reviewed changes

public/apps/configuration/panels/role-edit/test/role-edit-filtering.test.tsx Outdated Show resolved Hide resolved

fix up tests

f66725a

Signed-off-by: Derek Ho <dxho@amazon.com>

derek-ho force-pushed the filter-in-dropdown branch from 60ed3c7 to f66725a Compare July 10, 2023 16:08

derek-ho added 2 commits July 10, 2023 12:10

lint

e692169

Signed-off-by: Derek Ho <dxho@amazon.com>

Merge branch 'main' into filter-in-dropdown

cfa7907

cwperks reviewed Jul 10, 2023

View reviewed changes

cwperks approved these changes Jul 10, 2023

View reviewed changes

stephen-crawford approved these changes Jul 10, 2023

View reviewed changes

RyanL1997 approved these changes Jul 10, 2023

View reviewed changes

cwperks merged commit 5fd8018 into opensearch-project:main Jul 11, 2023

opensearch-trigger-bot bot mentioned this pull request Jul 11, 2023

[Backport 2.x] filter high level groups and action groups by cluster and index #1508

Merged

cwperks mentioned this pull request Jan 25, 2024

Adding @derek-ho as a maintainer #1758

Merged

3 tasks

cwperks mentioned this pull request Mar 21, 2024

Adding @derek-ho as a maintainer #1842

Merged

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

filter high level groups and action groups by cluster and index #1482

filter high level groups and action groups by cluster and index #1482

derek-ho commented Jun 21, 2023 •

edited

Loading

cwperks commented Jun 21, 2023

codecov bot commented Jun 21, 2023 •

edited

Loading

cwperks commented Jun 21, 2023

DarshitChanpura commented Jun 26, 2023

RyanL1997 left a comment

RyanL1997 Jul 4, 2023

derek-ho Jul 10, 2023

cwperks Jul 10, 2023

cwperks left a comment

derek-ho commented Jul 10, 2023

RyanL1997 left a comment

filter high level groups and action groups by cluster and index #1482

filter high level groups and action groups by cluster and index #1482

Conversation

derek-ho commented Jun 21, 2023 • edited Loading

Description

Category

Why these changes are required?

What is the old behavior before changes and new behavior after changes?

Issues Resolved

Testing

Check List

cwperks commented Jun 21, 2023

codecov bot commented Jun 21, 2023 • edited Loading

Codecov Report

cwperks commented Jun 21, 2023

DarshitChanpura commented Jun 26, 2023

RyanL1997 left a comment

Choose a reason for hiding this comment

RyanL1997 Jul 4, 2023

Choose a reason for hiding this comment

derek-ho Jul 10, 2023

Choose a reason for hiding this comment

cwperks Jul 10, 2023

Choose a reason for hiding this comment

cwperks left a comment

Choose a reason for hiding this comment

derek-ho commented Jul 10, 2023

RyanL1997 left a comment

Choose a reason for hiding this comment

derek-ho commented Jun 21, 2023 •

edited

Loading

codecov bot commented Jun 21, 2023 •

edited

Loading