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

[Bugfix] Update UI and handle new navigation #416

Merged
merged 8 commits into from
Sep 5, 2024

Conversation

TackAdam
Copy link
Contributor

@TackAdam TackAdam commented Sep 4, 2024

Description

  1. Updates the UI with the compressed elements and formatting.
  2. Add condition for new navigation to prevent double titles.
  3. Update testing to handle chrome prop for new navigation check.

New navigation

Before After
Before Image 1 After Image 1
Before Image 2 After Image 2
Before Image 3 After Image 3
Before Image 4 After Image 4
Before Image 5 After Image 5

Old Navigation

Before After
Before Image 1 After Image 1
Before Image 2 After Image 2
Before Image 3 After Image 3
Before Image 4 After Image 4
Before Image 5 After Image 5

Issues Resolved

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.

Signed-off-by: Adam Tackett <tackadam@amazon.com>
Copy link

codecov bot commented Sep 4, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.13%. Comparing base (2f7ae07) to head (325a43b).
Report is 13 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #416      +/-   ##
==========================================
+ Coverage   71.05%   71.13%   +0.07%     
==========================================
  Files          31       31              
  Lines        2011     2016       +5     
  Branches      432      434       +2     
==========================================
+ Hits         1429     1434       +5     
  Misses        579      579              
  Partials        3        3              
Flag Coverage Δ
dashboards-report 71.13% <ø> (+0.07%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

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

Adam Tackett added 2 commits September 4, 2024 12:01
Signed-off-by: Adam Tackett <tackadam@amazon.com>
Signed-off-by: Adam Tackett <tackadam@amazon.com>
Copy link
Collaborator

@derek-ho derek-ho left a comment

Choose a reason for hiding this comment

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

Mostly LGTM

Signed-off-by: Adam Tackett <tackadam@amazon.com>
@ps48
Copy link
Member

ps48 commented Sep 4, 2024

Just one callout under the new nav, the table headers look as big as the title. May be we can reduce their size under the new nav?

Screenshot 2024-09-04 at 1 41 21 PM

Copy link
Member

@ps48 ps48 left a comment

Choose a reason for hiding this comment

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

Nothing blocking thanks for taking this up

Signed-off-by: Adam Tackett <tackadam@amazon.com>
@TackAdam
Copy link
Contributor Author

TackAdam commented Sep 4, 2024

Adjusted spacing in old and new navigation. Added tittle to the old nav for it to match
New nav:
NewNav

Old nav:
OldNav

Adam Tackett added 2 commits September 4, 2024 15:05
Signed-off-by: Adam Tackett <tackadam@amazon.com>
Signed-off-by: Adam Tackett <tackadam@amazon.com>
@ps48 ps48 added enhancement New feature or request backport 2.x labels Sep 4, 2024
@ps48 ps48 added backport 2.17 bug Something isn't working and removed enhancement New feature or request labels Sep 4, 2024
Signed-off-by: Adam Tackett <tackadam@amazon.com>
@ps48 ps48 merged commit 20dea69 into opensearch-project:main Sep 5, 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/dashboards-reporting/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/dashboards-reporting/backport-2.x
# Create a new branch
git switch --create backport/backport-416-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 20dea69a6f58b2a4038b0ebb7c43e5314d745a1b
# Push it to GitHub
git push --set-upstream origin backport/backport-416-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/dashboards-reporting/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-416-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/dashboards-reporting/backport-2.17 2.17
# Navigate to the new working tree
pushd ../.worktrees/dashboards-reporting/backport-2.17
# Create a new branch
git switch --create backport/backport-416-to-2.17
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 20dea69a6f58b2a4038b0ebb7c43e5314d745a1b
# Push it to GitHub
git push --set-upstream origin backport/backport-416-to-2.17
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/dashboards-reporting/backport-2.17

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

TackAdam added a commit to TackAdam/dashboards-reporting that referenced this pull request Sep 5, 2024
* update reporting UI and handle new navigation

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* fix linting errors

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* fix linting errors

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* fix spacing from comment

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* fix comments

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* fix lint spacing in app

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* more lint

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* and more lint

Signed-off-by: Adam Tackett <tackadam@amazon.com>

---------

Signed-off-by: Adam Tackett <tackadam@amazon.com>
Co-authored-by: Adam Tackett <tackadam@amazon.com>
(cherry picked from commit 20dea69)
TackAdam added a commit to TackAdam/dashboards-reporting that referenced this pull request Sep 5, 2024
* update reporting UI and handle new navigation

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* fix linting errors

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* fix linting errors

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* fix spacing from comment

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* fix comments

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* fix lint spacing in app

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* more lint

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* and more lint

Signed-off-by: Adam Tackett <tackadam@amazon.com>

---------

Signed-off-by: Adam Tackett <tackadam@amazon.com>
Co-authored-by: Adam Tackett <tackadam@amazon.com>
(cherry picked from commit 20dea69)
ps48 pushed a commit that referenced this pull request Sep 5, 2024
)

* [Bugfix] Update UI and handle new navigation (#416)

* update reporting UI and handle new navigation

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* fix linting errors

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* fix linting errors

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* fix spacing from comment

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* fix comments

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* fix lint spacing in app

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* more lint

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* and more lint

Signed-off-by: Adam Tackett <tackadam@amazon.com>

---------

Signed-off-by: Adam Tackett <tackadam@amazon.com>
Co-authored-by: Adam Tackett <tackadam@amazon.com>
(cherry picked from commit 20dea69)

* small button and update snapshots

Signed-off-by: Adam Tackett <tackadam@amazon.com>

---------

Signed-off-by: Adam Tackett <tackadam@amazon.com>
Co-authored-by: Adam Tackett <tackadam@amazon.com>
ps48 pushed a commit that referenced this pull request Sep 5, 2024
* [Bugfix] Update UI and handle new navigation (#416)

* update reporting UI and handle new navigation

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* fix linting errors

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* fix linting errors

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* fix spacing from comment

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* fix comments

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* fix lint spacing in app

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* more lint

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* and more lint

Signed-off-by: Adam Tackett <tackadam@amazon.com>

---------

Signed-off-by: Adam Tackett <tackadam@amazon.com>
Co-authored-by: Adam Tackett <tackadam@amazon.com>
(cherry picked from commit 20dea69)

* switch to small button

Signed-off-by: Adam Tackett <tackadam@amazon.com>

* update snapshots

Signed-off-by: Adam Tackett <tackadam@amazon.com>

---------

Signed-off-by: Adam Tackett <tackadam@amazon.com>
Co-authored-by: Adam Tackett <tackadam@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