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

Panel table fixes #406

Merged
merged 13 commits into from Apr 20, 2023
Merged

Panel table fixes #406

merged 13 commits into from Apr 20, 2023

Conversation

pjfitzgibbons
Copy link
Contributor

Description

[Describe what this change achieves]

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc 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.

Peter Fitzgibbons added 3 commits April 19, 2023 11:25
Signed-off-by: Peter Fitzgibbons <pjfitz@amazon.com>
* Panel View (legacy)
  - Duplicate
  - Rename

Signed-off-by: Peter Fitzgibbons <pjfitz@amazon.com>
* Panel View (legacy)
  - Duplicate
  - Rename

Signed-off-by: Peter Fitzgibbons <pjfitz@amazon.com>
@ps48
Copy link
Member

ps48 commented Apr 20, 2023

@pjfitzgibbons Can you please fix the failing tests?

Copy link
Collaborator

@anirudha anirudha left a comment

Choose a reason for hiding this comment

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

Thanks


dispatch(createPanel(newPanel));
} catch (err) {
console.log(err);
Copy link
Collaborator

Choose a reason for hiding this comment

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

set error toast? I do not see toast code here?

Copy link
Member

Choose a reason for hiding this comment

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

If toast is not ready, can we use console.error?

opensearch-trigger-bot bot and others added 8 commits April 20, 2023 11:33
…403)

Signed-off-by: Joshua Li <joshuali925@gmail.com>
(cherry picked from commit 05ef180)

Co-authored-by: Joshua Li <joshuali925@gmail.com>
Signed-off-by: Joshua Li <joshuali925@gmail.com>
(cherry picked from commit 6309e63)

Co-authored-by: Joshua Li <joshuali925@gmail.com>
Signed-off-by: Joshua Li <joshuali925@gmail.com>
(cherry picked from commit 3d74bac)

Co-authored-by: Joshua Li <joshuali925@gmail.com>
Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
(cherry picked from commit 78347d9)

Co-authored-by: Shenoy Pratik <sgguruda@amazon.com>
* fix saving multiple metrics to SOpanels

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* remove unused variable

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

---------

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
(cherry picked from commit a4cb6d1)

Co-authored-by: Shenoy Pratik <sgguruda@amazon.com>
Signed-off-by: Peter Fitzgibbons <pjfitz@amazon.com>
* Panel View (legacy)
  - Duplicate
  - Rename

Signed-off-by: Peter Fitzgibbons <pjfitz@amazon.com>
@@ -193,7 +222,7 @@ export const CustomPanelTable = ({
'Duplicate Dashboard',
'Cancel',
'Duplicate',
selectedCustomPanels[0].title + ' (copy)',
selectedCustomPanels[0].title + ' (copy)x',
Copy link
Member

Choose a reason for hiding this comment

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

I think this x is a typo. Should we remove this?

Signed-off-by: Peter Fitzgibbons <pjfitz@amazon.com>
Signed-off-by: Peter Fitzgibbons <pjfitz@amazon.com>
@pjfitzgibbons pjfitzgibbons merged commit bac5746 into 2.7 Apr 20, 2023
6 of 9 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-406-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 bac57464ac7bcf992828e116949114770084d8a4
# Push it to GitHub
git push --set-upstream origin backport/backport-406-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

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

opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 20, 2023
* Fix Panel View (legacy)
  - Duplicate
  - Rename
  - Delete

---------

Signed-off-by: Peter Fitzgibbons <pjfitz@amazon.com>
Co-authored-by: Peter Fitzgibbons <pjfitz@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Joshua Li <joshuali925@gmail.com>
Co-authored-by: Shenoy Pratik <sgguruda@amazon.com>
(cherry picked from commit bac5746)
mengweieric pushed a commit that referenced this pull request Apr 26, 2023
* Fix Panel View (legacy)
  - Duplicate
  - Rename
  - Delete

---------

Signed-off-by: Peter Fitzgibbons <pjfitz@amazon.com>
Co-authored-by: Peter Fitzgibbons <pjfitz@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Joshua Li <joshuali925@gmail.com>
Co-authored-by: Shenoy Pratik <sgguruda@amazon.com>
(cherry picked from commit bac5746)

Co-authored-by: Peter Fitzgibbons <peter.fitzgibbons@gmail.com>
ps48 added a commit that referenced this pull request May 24, 2023
* Fix for hover issue on docs of discover/explorer data grid (#329) (#358)

Signed-off-by: Eric Wei <menwe@amazon.com>
(cherry picked from commit 19f29e1)

Co-authored-by: Eric Wei <menwe@amazon.com>

* [2.7] Refactor Saved objects and add visualization embeddable (#341) (#353)

Signed-off-by: Joshua Li <joshuali925@gmail.com>
Co-authored-by: Eric Wei <menwe@amazon.com>

* Cohesion main to 2.7 (#382)

Signed-off-by: Eric Wei <menwe@amazon.com>
Signed-off-by: Joshua Li <joshuali925@gmail.com>
Signed-off-by: Peter Fitzgibbons <pjfitz@amazon.com>
Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Co-authored-by: Derek Ho <dxho@amazon.com>
Co-authored-by: Eric Wei <menwe@amazon.com>
Co-authored-by: Joshua Li <joshuali925@gmail.com>
Co-authored-by: Peter Fitzgibbons <pjfitz@amazon.com>
Co-authored-by: Shenoy Pratik <sgguruda@amazon.com>
Co-authored-by: Rupal Mahajan <maharup@amazon.com>

* Fix redirection to legacy event_analytics URL (#383) (#384)

Signed-off-by: Joshua Li <joshuali925@gmail.com>
(cherry picked from commit 23e09e5)

Co-authored-by: Joshua Li <joshuali925@gmail.com>

* [2.7] Redo pick from main to 2.7 (#385)

Signed-off-by: Peter Fitzgibbons <pjfitz@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Eric Wei <menwe@amazon.com>
Signed-off-by: Rupal Mahajan <maharup@amazon.com>
Signed-off-by: Kavitha Conjeevaram Mohan <mohakavi@amazon.com>
Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
Signed-off-by: Joshua Li <joshuali925@gmail.com>
Co-authored-by: Eric Wei <menwe@amazon.com>
Co-authored-by: Peter Fitzgibbons <pjfitz@amazon.com>
Co-authored-by: Derek Ho <dxho@amazon.com>
Co-authored-by: Peter Fitzgibbons <peter.fitzgibbons@gmail.com>
Co-authored-by: Rupal Mahajan <maharup@amazon.com>
Co-authored-by: Kavitha Conjeevaram Mohan <mohakavi@amazon.com>
Co-authored-by: Shenoy Pratik <sgguruda@amazon.com>

* Metrics analytics support for SOpanels  (#386) (#388)

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
(cherry picked from commit 1ecd7ea)

Co-authored-by: Shenoy Pratik <sgguruda@amazon.com>

* change plugin ordering (#389) (#390)

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
(cherry picked from commit a6c1ebc)

Co-authored-by: Shenoy Pratik <sgguruda@amazon.com>

* notebooks fix for cypress and minor bugs (#392) (#393)

* notebooks fix for cypress and minor bugs

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* remove comments

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

---------

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
(cherry picked from commit 3219f14)

* Update traces integration tests (#391) (#397)

* Update traces cypress tests

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Update traces cypress test

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Fix traces cypress tests

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Fix filters test

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

---------

Signed-off-by: Rupal Mahajan <maharup@amazon.com>
(cherry picked from commit b8f9ca3)

Co-authored-by: Rupal Mahajan <maharup@amazon.com>

* Fix redirection to legacy event_analytics URL from dashboards (#399) (#403)

Signed-off-by: Joshua Li <joshuali925@gmail.com>
(cherry picked from commit 05ef180)

Co-authored-by: Joshua Li <joshuali925@gmail.com>

* Adjust metrics top menu layout to avoid overflow (#398) (#402)

Signed-off-by: Joshua Li <joshuali925@gmail.com>
(cherry picked from commit 6309e63)

Co-authored-by: Joshua Li <joshuali925@gmail.com>

* Support duplicate visualization in dashboard (#400) (#405)

Signed-off-by: Joshua Li <joshuali925@gmail.com>
(cherry picked from commit 3d74bac)

Co-authored-by: Joshua Li <joshuali925@gmail.com>

* fix panel visualization preview, new viz workflow (#401) (#404)

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
(cherry picked from commit 78347d9)

Co-authored-by: Shenoy Pratik <sgguruda@amazon.com>

* Fix saving multiple metrics to SOpanels (#407) (#408)

* fix saving multiple metrics to SOpanels

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* remove unused variable

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

---------

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
(cherry picked from commit a4cb6d1)

Co-authored-by: Shenoy Pratik <sgguruda@amazon.com>

* Panel table fixes (#406)

* Fix Panel View (legacy)
  - Duplicate
  - Rename
  - Delete

---------

Signed-off-by: Peter Fitzgibbons <pjfitz@amazon.com>
Co-authored-by: Peter Fitzgibbons <pjfitz@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Joshua Li <joshuali925@gmail.com>
Co-authored-by: Shenoy Pratik <sgguruda@amazon.com>

* Release Notes 2.7.0.0 (#394) (#412)

* Release Notes 2.7.0.0

Signed-off-by: Peter Fitzgibbons <pjfitz@amazon.com>

* Release Notes 2.7.0.0

Signed-off-by: Peter Fitzgibbons <pjfitz@amazon.com>

---------

Signed-off-by: Peter Fitzgibbons <pjfitz@amazon.com>
Co-authored-by: Peter Fitzgibbons <pjfitz@amazon.com>
(cherry picked from commit 969e639)

Co-authored-by: Peter Fitzgibbons <peter.fitzgibbons@gmail.com>

* [Dashboard listing] update edit url and view url (#416) (#421)

* [Dashboard listing] update edit url and view url

Update to include BASE_URL if basePath is defined. Since create url is just
a direct nav and needs the basePath when passing props to the provider, the source
code no longer appends the basePath to keep these URLs consistent.

A feature should consolidate the basePaths in the dashboard listing service so that
createUrl also adds the base path. At which point we no longer need the base path.

Also removed some rogue URLs.

Core PR:
opensearch-project/OpenSearch-Dashboards#3922

---------

Signed-off-by: Kawika Avilla <kavilla414@gmail.com>
Signed-off-by: Joshua Li <joshuali925@gmail.com>
Co-authored-by: Joshua Li <joshuali925@gmail.com>
(cherry picked from commit f94c21e)

Co-authored-by: Kawika Avilla <kavilla414@gmail.com>

* Fix invalid time range in new panels (#419)

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* open new tab for editing panel visualization (#430)

Signed-off-by: Eric Wei <menwe@amazon.com>

* Save new prometheus metrics to OSD saved objects (#428)

* Save new prometheus metrics to OSD saved objects

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* Return if failed at saving metrics

Signed-off-by: Joshua Li <joshuali925@gmail.com>

---------

Signed-off-by: Joshua Li <joshuali925@gmail.com>

* fixes edit mode callback bug in Saved Object Panels (#420)

* fix for SOpanels editMode

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* rename edit button data-test-subj

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

---------

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* Add Toasts to Observability Dashboards  (#435)

* Fixes
* Panel View (legacy)
  - Duplicate
  - Rename

Signed-off-by: Peter Fitzgibbons <pjfitz@amazon.com>

* Toasts use hook from useOpenSearchDashboards context provider

Signed-off-by: Peter Fitzgibbons <pjfitz@amazon.com>

* Testing for CustomPanel Toast

Signed-off-by: Peter Fitzgibbons <pjfitz@amazon.com>

* update catches from comments, minor code cleaning

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* update tests

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* remove unused redux slice

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* revert cypress changes

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* add toasts to SOflyout

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* fix messaging for multiple delete

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

* fix up toast and error handling for create and delete flows

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

* fix up clone

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

* fix rename in table

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

* fix rename in custom panel so view

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

* fix up panel toasts

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

* fix up for flyout

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

* code cleanup

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

* finish merge

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

* fix up PR comments

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

---------

Signed-off-by: Peter Fitzgibbons <pjfitz@amazon.com>
Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Co-authored-by: Peter Fitzgibbons <pjfitz@amazon.com>
Co-authored-by: Derek Ho <dxho@amazon.com>

* change samples to saved object (#427) (#436)

* change samples to saved object



* add sample to so



* fix saved object sample



* fix up



* add back toast



* revert file



* refactoring



* use constant



---------


(cherry picked from commit ce06ccb)

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

* Add Error handling on duplicate dashboard names (#441)

* Add check for existing panel name

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Nit

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Remove double await

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Add rename name check test

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Remove test

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* Add unique id to sample panel name

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

---------

Signed-off-by: Rupal Mahajan <maharup@amazon.com>

* fix timestamp overriding issue (#449)

Signed-off-by: Eric Wei <menwe@amazon.com>

* Renaming custom panels to Observability Dashboards (#450)

* change custom panels -> observability dashboards

Signed-off-by: Eric Wei <menwe@amazon.com>

* rest of the panel renaming

Signed-off-by: Eric Wei <menwe@amazon.com>

---------

Signed-off-by: Eric Wei <menwe@amazon.com>

* Fix delete failure when no osd item selected (#452)

Signed-off-by: Joshua Li <joshuali925@gmail.com>
(cherry picked from commit a4a310e)

* Open log patterns by default (#444) (#459)

Signed-off-by: Joshua Li <joshuali925@gmail.com>
(cherry picked from commit 72970aa)

* diff merging between 2.x and 2.7

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

* add service fields length check in app analytics

Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>

---------

Signed-off-by: Joshua Li <joshuali925@gmail.com>
Signed-off-by: Eric Wei <menwe@amazon.com>
Signed-off-by: Peter Fitzgibbons <pjfitz@amazon.com>
Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Rupal Mahajan <maharup@amazon.com>
Signed-off-by: Kavitha Conjeevaram Mohan <mohakavi@amazon.com>
Co-authored-by: Joshua Li <joshuali925@gmail.com>
Co-authored-by: Eric Wei <menwe@amazon.com>
Co-authored-by: Peter Fitzgibbons <peter.fitzgibbons@gmail.com>
Co-authored-by: Derek Ho <dxho@amazon.com>
Co-authored-by: Peter Fitzgibbons <pjfitz@amazon.com>
Co-authored-by: Rupal Mahajan <maharup@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Kavitha Conjeevaram Mohan <mohakavi@amazon.com>
Co-authored-by: Kawika Avilla <kavilla414@gmail.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.

None yet

4 participants