Skip to content
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

Do not register tenancy app if disabled in yml #2057

Merged

Conversation

derek-ho
Copy link
Collaborator

@derek-ho derek-ho commented Jul 24, 2024

Description

Doesn't register tenancy app if disabled in yml in the new side navigation. This was initially fixed in: #1960, but when the new left nav is enabled, tenancy is registered as an app (not just as part of the in-app navigation), so the code needs to change slightly to handle this case.

Category

Bug Fix

Why these changes are required?

Closes: #2056

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

Old behavior: in new left nav tenancy would show up even if disabled in yml
New behavior: in new left nav tenancy will not show up when disabled in yml

Issues Resolved

Closes: #2056

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>
Copy link

codecov bot commented Jul 24, 2024

Codecov Report

Attention: Patch coverage is 50.00000% with 2 lines in your changes missing coverage. Please review.

Project coverage is 71.17%. Comparing base (2cc3f60) to head (6c37aca).

Files Patch % Lines
public/plugin.ts 50.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2057      +/-   ##
==========================================
+ Coverage   69.46%   71.17%   +1.70%     
==========================================
  Files          96       96              
  Lines        2597     2598       +1     
  Branches      386      380       -6     
==========================================
+ Hits         1804     1849      +45     
+ Misses        699      649      -50     
- Partials       94      100       +6     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@derek-ho derek-ho marked this pull request as ready for review July 24, 2024 21:42
public/types.ts Outdated Show resolved Hide resolved
Signed-off-by: Derek Ho <dxho@amazon.com>
…o/security-dashboards-plugin into dont-register-tenant-application
Signed-off-by: Derek Ho <dxho@amazon.com>
…o/security-dashboards-plugin into dont-register-tenant-application
@derek-ho derek-ho added the backport 2.x backport to 2.x branch label Jul 25, 2024
@derek-ho derek-ho self-assigned this Jul 25, 2024
public/test/plugin.test.ts Outdated Show resolved Hide resolved
Signed-off-by: Derek Ho <dxho@amazon.com>
cwperks
cwperks previously approved these changes Jul 25, 2024
Copy link
Contributor

@Hailong-am Hailong-am left a comment

Choose a reason for hiding this comment

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

thanks

common/index.ts Outdated Show resolved Hide resolved
public/test/plugin.test.ts Show resolved Hide resolved
Signed-off-by: Derek Ho <dxho@amazon.com>
@derek-ho derek-ho merged commit 0ed2cf2 into opensearch-project:main Jul 25, 2024
18 of 19 checks passed
@derek-ho derek-ho deleted the dont-register-tenant-application branch July 25, 2024 19:03
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 25, 2024
* Do not register tenancy app if disabled in yml

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

* Adds a test

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

* Revert type and export

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

* Use constants

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

* Remove extra license field

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

* Refactor with constants

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

---------

Signed-off-by: Derek Ho <dxho@amazon.com>
(cherry picked from commit 0ed2cf2)
derek-ho added a commit that referenced this pull request Jul 25, 2024
* Do not register tenancy app if disabled in yml

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

* Adds a test

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

* Revert type and export

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

* Use constants

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

* Remove extra license field

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

* Refactor with constants

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

---------

Signed-off-by: Derek Ho <dxho@amazon.com>
(cherry picked from commit 0ed2cf2)

Co-authored-by: Derek Ho <dxho@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] tenant link is not hide when new navigation is enabled
6 participants