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

Side nav mds #1063

Merged
merged 5 commits into from
Sep 4, 2024
Merged

Side nav mds #1063

merged 5 commits into from
Sep 4, 2024

Conversation

riysaxen-amzn
Copy link
Collaborator

@riysaxen-amzn riysaxen-amzn commented Aug 29, 2024

Description

This PR persists dataSourceId across applications under new Nav change

Issues Resolved

alertingMDS.mov

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • 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: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya Saxena <riysaxen@amazon.com>
@riysaxen-amzn
Copy link
Collaborator Author

UTs passing locally:

 PASS  public/pages/CreateTrigger/components/AddActionButton/AddActionButton.test.js (51.118 s)
 PASS  public/pages/MonitorDetails/components/MonitorHistory/Legend/Legende.test.js (46.912 s)
 PASS  public/pages/MonitorDetails/components/MonitorHistory/EmptyHistory/EmptyHistory.test.js (47.623 s)
 PASS  public/pages/CreateTrigger/components/TriggerGraph.test.js (58.954 s)
 PASS  public/components/FeatureAnywhereContextMenu/AddAlertingMonitor/CreateNew/CreateNew.test.js (327.541 s)
 PASS  public/components/FeatureAnywhereContextMenu/AddAlertingMonitor/AssociateExisting/AssociateExisting.test.js (128.596 s)
 PASS  public/components/FeatureAnywhereContextMenu/AddAlertingMonitor/AddAlertingMonitor.test.js (289.891 s)
 PASS  public/expressions/helpers.test.js (364.026 s)
 PASS  public/components/FeatureAnywhereContextMenu/AssociatedMonitors/AssociatedMonitors.test.js (242.092 s)
 PASS  public/utils/savedObjectHelper.test.ts (412.843 s)
 PASS  public/components/FeatureAnywhereContextMenu/Container/Container.test.js (294.708 s)
 PASS  public/utils/contextMenu/actions.test.js (67.4 s)
A worker process has failed to exit gracefully and has been force exited. This is likely caused by tests leaking due to improper teardown. Try running with --detectOpenHandles to find leaks. Active timers can also cause this, ensure that .unref() was called on them.

Test Suites: 3 skipped, 138 passed, 138 of 141 total
Tests:       18 skipped, 713 passed, 731 total
Snapshots:   198 passed, 198 total
Time:        451.025 s

Signed-off-by: Riya Saxena <riysaxen@amazon.com>
amsiglan
amsiglan previously approved these changes Sep 3, 2024
AWSHurneyt
AWSHurneyt previously approved these changes Sep 3, 2024
Signed-off-by: Riya <69919272+riysaxen-amzn@users.noreply.github.com>
@riysaxen-amzn riysaxen-amzn dismissed stale reviews from AWSHurneyt and amsiglan via a2d07a7 September 4, 2024 00:21
@riysaxen-amzn
Copy link
Collaborator Author

riysaxen-amzn commented Sep 4, 2024

e2e cypress tests are failing because Alerting backend is not backported fully it seems ->

 Task :alerting:compileJava
/home/runner/work/alerting-dashboards-plugin/alerting-dashboards-plugin/alerting/alerting/src/main/java/org/opensearch/percolator/PercolateQueryBuilderExt.java:116: error: PercolateQueryBuilderExt is not abstract and does not override abstract method fieldName() in AbstractQueryBuilder
public class PercolateQueryBuilderExt extends AbstractQueryBuilder<PercolateQueryBuilderExt> {

This is due to Core made some changes to the abstract query builder that is causing this error: opensearch-project/OpenSearch#15328. But 2.x should be working as the change is not backported

@amsiglan amsiglan merged commit 5feef22 into opensearch-project:main Sep 4, 2024
8 of 11 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/alerting-dashboards-plugin/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/alerting-dashboards-plugin/backport-2.x
# Create a new branch
git switch --create backport-1063-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5feef220ca9ab9532d67ac5d85e1edc3c67c31d9
# Push it to GitHub
git push --set-upstream origin backport-1063-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/alerting-dashboards-plugin/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport-1063-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.17 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/alerting-dashboards-plugin/backport-2.17 2.17
# Navigate to the new working tree
pushd ../.worktrees/alerting-dashboards-plugin/backport-2.17
# Create a new branch
git switch --create backport-1063-to-2.17
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5feef220ca9ab9532d67ac5d85e1edc3c67c31d9
# Push it to GitHub
git push --set-upstream origin backport-1063-to-2.17
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/alerting-dashboards-plugin/backport-2.17

Then, create a pull request where the base branch is 2.17 and the compare/head branch is backport-1063-to-2.17.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/alerting-dashboards-plugin/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/alerting-dashboards-plugin/backport-2.x
# Create a new branch
git switch --create backport-1063-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5feef220ca9ab9532d67ac5d85e1edc3c67c31d9
# Push it to GitHub
git push --set-upstream origin backport-1063-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/alerting-dashboards-plugin/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport-1063-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.17 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/alerting-dashboards-plugin/backport-2.17 2.17
# Navigate to the new working tree
pushd ../.worktrees/alerting-dashboards-plugin/backport-2.17
# Create a new branch
git switch --create backport-1063-to-2.17
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5feef220ca9ab9532d67ac5d85e1edc3c67c31d9
# Push it to GitHub
git push --set-upstream origin backport-1063-to-2.17
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/alerting-dashboards-plugin/backport-2.17

Then, create a pull request where the base branch is 2.17 and the compare/head branch is backport-1063-to-2.17.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/alerting-dashboards-plugin/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/alerting-dashboards-plugin/backport-2.x
# Create a new branch
git switch --create backport-1063-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5feef220ca9ab9532d67ac5d85e1edc3c67c31d9
# Push it to GitHub
git push --set-upstream origin backport-1063-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/alerting-dashboards-plugin/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport-1063-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.17 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/alerting-dashboards-plugin/backport-2.17 2.17
# Navigate to the new working tree
pushd ../.worktrees/alerting-dashboards-plugin/backport-2.17
# Create a new branch
git switch --create backport-1063-to-2.17
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5feef220ca9ab9532d67ac5d85e1edc3c67c31d9
# Push it to GitHub
git push --set-upstream origin backport-1063-to-2.17
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/alerting-dashboards-plugin/backport-2.17

Then, create a pull request where the base branch is 2.17 and the compare/head branch is backport-1063-to-2.17.

riysaxen-amzn added a commit to riysaxen-amzn/alerting-dashboards-plugin that referenced this pull request Sep 5, 2024
* persist dataSource when swictching between sideNav

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* persist dataSource when swictching between sideNav

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* persist dataSource when swictching between sideNav

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* fix the CI

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

---------

Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya <69919272+riysaxen-amzn@users.noreply.github.com>
(cherry picked from commit 5feef22)
riysaxen-amzn added a commit to riysaxen-amzn/alerting-dashboards-plugin that referenced this pull request Sep 5, 2024
* persist dataSource when swictching between sideNav

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* persist dataSource when swictching between sideNav

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* persist dataSource when swictching between sideNav

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* fix the CI

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

---------

Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya <69919272+riysaxen-amzn@users.noreply.github.com>
(cherry picked from commit 5feef22)
riysaxen-amzn added a commit that referenced this pull request Sep 5, 2024
* persist dataSource when swictching between sideNav

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* persist dataSource when swictching between sideNav

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* persist dataSource when swictching between sideNav

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* fix the CI

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

---------

Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya <69919272+riysaxen-amzn@users.noreply.github.com>
(cherry picked from commit 5feef22)
riysaxen-amzn added a commit that referenced this pull request Sep 5, 2024
* persist dataSource when swictching between sideNav

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* persist dataSource when swictching between sideNav

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* persist dataSource when swictching between sideNav

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* fix the CI

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

---------

Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya <69919272+riysaxen-amzn@users.noreply.github.com>
(cherry picked from commit 5feef22)
AWSHurneyt pushed a commit to AWSHurneyt/alerting-dashboards-plugin that referenced this pull request Sep 19, 2024
* persist dataSource when swictching between sideNav

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* persist dataSource when swictching between sideNav

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* persist dataSource when swictching between sideNav

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* fix the CI

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

---------

Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya <69919272+riysaxen-amzn@users.noreply.github.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants