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

Fit and Finish UX Fixes #1092

Merged
merged 26 commits into from
Sep 17, 2024
Merged

Conversation

jowg-amazon
Copy link
Contributor

Description

Addresses the fit and finish UX changes. Changes in this PR include:

  • Fixes the redirect from Notifications button so that breadcrumbs reflects the correct path
  • Adds tooltip to delete icon button
  • Moves the edit action under actions dropdown in the monitors page
  • Changes so that view alerts in the datasource alerts card opens in the same tab
  • makes the spacing between the header and panel consistent (16px) across all pages
  • makes the spacing around the content consistent (16px) across all pages
  • Moves pagination to the bottom of the table
  • Changes Updated monitor to Edit monitor in the title
  • Changes Update monitor to Save
  • Removes the bottom border in the empty state for the alerts and monitors pages
  • Adds a plus icon to the create monitor button

Alerts Page
Screenshot 2024-09-16 at 12 00 16 PM

Monitors Page
Screenshot 2024-09-16 at 12 01 03 PM

Empty Monitors Page
Screenshot 2024-09-16 at 12 03 49 PM

View Monitor Page
Screenshot 2024-09-16 at 12 01 27 PM

Edit Monitor Page
Screenshot 2024-09-16 at 12 01 41 PM

Issues Resolved

[List any issues this PR will resolve]

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: Joanne Wang <jowg@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: Joanne Wang <jowg@amazon.com>
@jowg-amazon
Copy link
Contributor Author

Acknowledge_alerts_modal_spec.js cypress tests passed locally


       Spec                                              Tests  Passing  Failing  Pending  Skipped  
  ┌────────────────────────────────────────────────────────────────────────────────────────────────┐
  │ ✔  acknowledge_alerts_modal_spec.js         01:45        3        3        -        -        - │
  └────────────────────────────────────────────────────────────────────────────────────────────────┘
    ✔  All specs passed!                        01:45        3        3        -        -        -  

Copy link
Collaborator

@AWSHurneyt AWSHurneyt left a comment

Choose a reason for hiding this comment

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

Changes LGTM.

@AWSHurneyt AWSHurneyt merged commit 4a2b603 into opensearch-project:main Sep 17, 2024
8 of 9 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.0 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.0 2.0
# Navigate to the new working tree
pushd ../.worktrees/alerting-dashboards-plugin/backport-2.0
# Create a new branch
git switch --create backport-1092-to-2.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 4a2b603b80b4875ec2ae6fe2d85ee4771116bb70
# Push it to GitHub
git push --set-upstream origin backport-1092-to-2.0
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/alerting-dashboards-plugin/backport-2.0

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

opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 17, 2024
* remove horizontal line below search bar

Signed-off-by: Joanne Wang <jowg@amazon.com>

* space between header and panel 16px and space around table 16px

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix 16px around table and search bar

Signed-off-by: Joanne Wang <jowg@amazon.com>

* remove pagination from top of table

Signed-off-by: Joanne Wang <jowg@amazon.com>

* add button to create monitor

Signed-off-by: Joanne Wang <jowg@amazon.com>

* add tooltip to delete

Signed-off-by: Joanne Wang <jowg@amazon.com>

* remove space on trash icon

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix gutter size

Signed-off-by: Joanne Wang <jowg@amazon.com>

* move edit under actions

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix notifications breadcrumb redirect

Signed-off-by: Joanne Wang <jowg@amazon.com>

* spacing from title to panel 16 for view monitor

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix some padding and remove horiz rule for findings section

Signed-off-by: Joanne Wang <jowg@amazon.com>

* change update monitor to edit monitor

Signed-off-by: Joanne Wang <jowg@amazon.com>

* change update to save and fix padding for create monitor

Signed-off-by: Joanne Wang <jowg@amazon.com>

* change monitor details padding and fix link to new page in alerts card

Signed-off-by: Joanne Wang <jowg@amazon.com>

* remove boarder when empty state

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix search bar spacing above

Signed-off-by: Joanne Wang <jowg@amazon.com>

* make create and edit monitor panels 16px padding

Signed-off-by: Joanne Wang <jowg@amazon.com>

* rename

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix original tabs

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix spacing on original monitor page

Signed-off-by: Joanne Wang <jowg@amazon.com>

* add pagination back to the alerts page

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix spacing for alerts dashboard flyout

Signed-off-by: Joanne Wang <jowg@amazon.com>

* cleanup

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix unit tests and run yarn test:jest -u

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix cypress tests

Signed-off-by: Joanne Wang <jowg@amazon.com>

---------

Signed-off-by: Joanne Wang <jowg@amazon.com>
(cherry picked from commit 4a2b603)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 17, 2024
* remove horizontal line below search bar

Signed-off-by: Joanne Wang <jowg@amazon.com>

* space between header and panel 16px and space around table 16px

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix 16px around table and search bar

Signed-off-by: Joanne Wang <jowg@amazon.com>

* remove pagination from top of table

Signed-off-by: Joanne Wang <jowg@amazon.com>

* add button to create monitor

Signed-off-by: Joanne Wang <jowg@amazon.com>

* add tooltip to delete

Signed-off-by: Joanne Wang <jowg@amazon.com>

* remove space on trash icon

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix gutter size

Signed-off-by: Joanne Wang <jowg@amazon.com>

* move edit under actions

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix notifications breadcrumb redirect

Signed-off-by: Joanne Wang <jowg@amazon.com>

* spacing from title to panel 16 for view monitor

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix some padding and remove horiz rule for findings section

Signed-off-by: Joanne Wang <jowg@amazon.com>

* change update monitor to edit monitor

Signed-off-by: Joanne Wang <jowg@amazon.com>

* change update to save and fix padding for create monitor

Signed-off-by: Joanne Wang <jowg@amazon.com>

* change monitor details padding and fix link to new page in alerts card

Signed-off-by: Joanne Wang <jowg@amazon.com>

* remove boarder when empty state

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix search bar spacing above

Signed-off-by: Joanne Wang <jowg@amazon.com>

* make create and edit monitor panels 16px padding

Signed-off-by: Joanne Wang <jowg@amazon.com>

* rename

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix original tabs

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix spacing on original monitor page

Signed-off-by: Joanne Wang <jowg@amazon.com>

* add pagination back to the alerts page

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix spacing for alerts dashboard flyout

Signed-off-by: Joanne Wang <jowg@amazon.com>

* cleanup

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix unit tests and run yarn test:jest -u

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix cypress tests

Signed-off-by: Joanne Wang <jowg@amazon.com>

---------

Signed-off-by: Joanne Wang <jowg@amazon.com>
(cherry picked from commit 4a2b603)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@AWSHurneyt AWSHurneyt added anomaly-detector-monitor Anomaly detector monitor related and removed backport 2.0 anomaly-detector-monitor Anomaly detector monitor related failed backport labels Sep 17, 2024
amsiglan pushed a commit that referenced this pull request Sep 17, 2024
* remove horizontal line below search bar



* space between header and panel 16px and space around table 16px



* fix 16px around table and search bar



* remove pagination from top of table



* add button to create monitor



* add tooltip to delete



* remove space on trash icon



* fix gutter size



* move edit under actions



* fix notifications breadcrumb redirect



* spacing from title to panel 16 for view monitor



* fix some padding and remove horiz rule for findings section



* change update monitor to edit monitor



* change update to save and fix padding for create monitor



* change monitor details padding and fix link to new page in alerts card



* remove boarder when empty state



* fix search bar spacing above



* make create and edit monitor panels 16px padding



* rename



* fix original tabs



* fix spacing on original monitor page



* add pagination back to the alerts page



* fix spacing for alerts dashboard flyout



* cleanup



* fix unit tests and run yarn test:jest -u



* fix cypress tests



---------


(cherry picked from commit 4a2b603)

Signed-off-by: Joanne Wang <jowg@amazon.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>
jowg-amazon added a commit to jowg-amazon/alerting-dashboards-plugin that referenced this pull request Sep 17, 2024
* remove horizontal line below search bar

Signed-off-by: Joanne Wang <jowg@amazon.com>

* space between header and panel 16px and space around table 16px

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix 16px around table and search bar

Signed-off-by: Joanne Wang <jowg@amazon.com>

* remove pagination from top of table

Signed-off-by: Joanne Wang <jowg@amazon.com>

* add button to create monitor

Signed-off-by: Joanne Wang <jowg@amazon.com>

* add tooltip to delete

Signed-off-by: Joanne Wang <jowg@amazon.com>

* remove space on trash icon

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix gutter size

Signed-off-by: Joanne Wang <jowg@amazon.com>

* move edit under actions

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix notifications breadcrumb redirect

Signed-off-by: Joanne Wang <jowg@amazon.com>

* spacing from title to panel 16 for view monitor

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix some padding and remove horiz rule for findings section

Signed-off-by: Joanne Wang <jowg@amazon.com>

* change update monitor to edit monitor

Signed-off-by: Joanne Wang <jowg@amazon.com>

* change update to save and fix padding for create monitor

Signed-off-by: Joanne Wang <jowg@amazon.com>

* change monitor details padding and fix link to new page in alerts card

Signed-off-by: Joanne Wang <jowg@amazon.com>

* remove boarder when empty state

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix search bar spacing above

Signed-off-by: Joanne Wang <jowg@amazon.com>

* make create and edit monitor panels 16px padding

Signed-off-by: Joanne Wang <jowg@amazon.com>

* rename

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix original tabs

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix spacing on original monitor page

Signed-off-by: Joanne Wang <jowg@amazon.com>

* add pagination back to the alerts page

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix spacing for alerts dashboard flyout

Signed-off-by: Joanne Wang <jowg@amazon.com>

* cleanup

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix unit tests and run yarn test:jest -u

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix cypress tests

Signed-off-by: Joanne Wang <jowg@amazon.com>

---------

Signed-off-by: Joanne Wang <jowg@amazon.com>
AWSHurneyt pushed a commit that referenced this pull request Sep 17, 2024
* remove horizontal line below search bar



* space between header and panel 16px and space around table 16px



* fix 16px around table and search bar



* remove pagination from top of table



* add button to create monitor



* add tooltip to delete



* remove space on trash icon



* fix gutter size



* move edit under actions



* fix notifications breadcrumb redirect



* spacing from title to panel 16 for view monitor



* fix some padding and remove horiz rule for findings section



* change update monitor to edit monitor



* change update to save and fix padding for create monitor



* change monitor details padding and fix link to new page in alerts card



* remove boarder when empty state



* fix search bar spacing above



* make create and edit monitor panels 16px padding



* rename



* fix original tabs



* fix spacing on original monitor page



* add pagination back to the alerts page



* fix spacing for alerts dashboard flyout



* cleanup



* fix unit tests and run yarn test:jest -u



* fix cypress tests



---------


(cherry picked from commit 4a2b603)

Signed-off-by: Joanne Wang <jowg@amazon.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>
AWSHurneyt pushed a commit to AWSHurneyt/alerting-dashboards-plugin that referenced this pull request Sep 19, 2024
* remove horizontal line below search bar

Signed-off-by: Joanne Wang <jowg@amazon.com>

* space between header and panel 16px and space around table 16px

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix 16px around table and search bar

Signed-off-by: Joanne Wang <jowg@amazon.com>

* remove pagination from top of table

Signed-off-by: Joanne Wang <jowg@amazon.com>

* add button to create monitor

Signed-off-by: Joanne Wang <jowg@amazon.com>

* add tooltip to delete

Signed-off-by: Joanne Wang <jowg@amazon.com>

* remove space on trash icon

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix gutter size

Signed-off-by: Joanne Wang <jowg@amazon.com>

* move edit under actions

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix notifications breadcrumb redirect

Signed-off-by: Joanne Wang <jowg@amazon.com>

* spacing from title to panel 16 for view monitor

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix some padding and remove horiz rule for findings section

Signed-off-by: Joanne Wang <jowg@amazon.com>

* change update monitor to edit monitor

Signed-off-by: Joanne Wang <jowg@amazon.com>

* change update to save and fix padding for create monitor

Signed-off-by: Joanne Wang <jowg@amazon.com>

* change monitor details padding and fix link to new page in alerts card

Signed-off-by: Joanne Wang <jowg@amazon.com>

* remove boarder when empty state

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix search bar spacing above

Signed-off-by: Joanne Wang <jowg@amazon.com>

* make create and edit monitor panels 16px padding

Signed-off-by: Joanne Wang <jowg@amazon.com>

* rename

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix original tabs

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix spacing on original monitor page

Signed-off-by: Joanne Wang <jowg@amazon.com>

* add pagination back to the alerts page

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix spacing for alerts dashboard flyout

Signed-off-by: Joanne Wang <jowg@amazon.com>

* cleanup

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix unit tests and run yarn test:jest -u

Signed-off-by: Joanne Wang <jowg@amazon.com>

* fix cypress tests

Signed-off-by: Joanne Wang <jowg@amazon.com>

---------

Signed-off-by: Joanne Wang <jowg@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
AWSHurneyt added a commit to AWSHurneyt/alerting-dashboards-plugin that referenced this pull request Sep 24, 2024
AWSHurneyt added a commit to AWSHurneyt/alerting-dashboards-plugin that referenced this pull request Sep 24, 2024
…-project#1094)"

This reverts commit 51d2c95.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
jowg-amazon added a commit to jowg-amazon/alerting-dashboards-plugin that referenced this pull request Sep 24, 2024
jowg-amazon added a commit to jowg-amazon/alerting-dashboards-plugin that referenced this pull request Sep 24, 2024
…-project#1094)"

This reverts commit 51d2c95.

Signed-off-by: Joanne Wang <jowg@amazon.com>
AWSHurneyt pushed a commit that referenced this pull request Sep 24, 2024
* Revert "Fit and Finish UX changes Pt 2 (#1099) (#1107)"

This reverts commit bfb0d79.

Signed-off-by: Joanne Wang <jowg@amazon.com>

* Revert "Fit and Finish UX Fixes (#1092) (#1094)"

This reverts commit 51d2c95.

Signed-off-by: Joanne Wang <jowg@amazon.com>

---------

Signed-off-by: Joanne Wang <jowg@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.

4 participants