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

New Query Enhancement UI #7309

Merged
merged 6 commits into from
Jul 20, 2024
Merged

Conversation

abbyhu2000
Copy link
Member

@abbyhu2000 abbyhu2000 commented Jul 18, 2024

Description

New query enhancement UI.

Issues Resolved

#7038

Screenshot

Screen.Recording.2024-07-18.at.2.35.01.PM.mov

Testing the changes

Changelog

  • feat: Update query enhancement UI

Check List

  • All tests pass
    • yarn test:jest
    • yarn test:jest_integration
  • New functionality includes testing.
  • New functionality has been documented.
  • Update CHANGELOG.md
  • Commits are signed per the DCO using --signoff

kavilla
kavilla previously approved these changes Jul 18, 2024
Copy link

codecov bot commented Jul 18, 2024

Codecov Report

Attention: Patch coverage is 58.82353% with 7 lines in your changes missing coverage. Please review.

Project coverage is 67.53%. Comparing base (6f28170) to head (7981a2e).
Report is 1 commits behind head on main.

Files Patch % Lines
.../data/public/ui/query_editor/language_selector.tsx 58.82% 6 Missing and 1 partial ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             main    #7309   +/-   ##
=======================================
  Coverage   67.53%   67.53%           
=======================================
  Files        3504     3504           
  Lines       69407    69418   +11     
  Branches    11324    11327    +3     
=======================================
+ Hits        46872    46881    +9     
- Misses      19775    19777    +2     
  Partials     2760     2760           
Flag Coverage Δ
Linux_1 33.15% <ø> (ø)
Linux_2 55.46% <ø> (ø)
Linux_3 43.06% <58.82%> (+0.01%) ⬆️
Linux_4 34.76% <ø> (ø)
Windows_1 33.17% <ø> (ø)
Windows_2 55.41% <ø> (ø)
Windows_3 43.07% <58.82%> (+<0.01%) ⬆️
Windows_4 34.76% <ø> (ø)

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.

@abbyhu2000
Copy link
Member Author

@ashwin-pc

  1. fix the padding
  2. changed footer to use OUI theme color
  3. the default is not PPL, it is based on local storage
  4. changed the language shadow box to use OUI theme color
  5. based on discussion @kgcreative we agree to get rid of the arrow on the right of the saved query management

@abbyhu2000 abbyhu2000 force-pushed the query_bar_4 branch 5 times, most recently from 21c1a35 to 6e6ff41 Compare July 19, 2024 23:18
Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com>
Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com>
Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com>
Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com>
Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com>
Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com>
Copy link
Member

@ashwin-pc ashwin-pc left a comment

Choose a reason for hiding this comment

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

Nice, this gets the framework in. Since we have gone the custom route, lets clean up the styles to make the fit and finish better.

@@ -61,7 +61,6 @@ export interface QueryEditorExtensionConfig {
*/
getBanner?: (dependencies: QueryEditorExtensionDependencies) => React.ReactElement | null;
}

Copy link
Member

Choose a reason for hiding this comment

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

nit: Think you might have unintentionally deleted this line

@ashwin-pc ashwin-pc merged commit f955faa into opensearch-project:main Jul 20, 2024
66 of 67 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/OpenSearch-Dashboards/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch-Dashboards/backport-2.x
# Create a new branch
git switch --create backport/backport-7309-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f955faa37d78ffad09b6902da4a1f900d4616a94
# Push it to GitHub
git push --set-upstream origin backport/backport-7309-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch-Dashboards/backport-2.x

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

@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/OpenSearch-Dashboards/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch-Dashboards/backport-2.x
# Create a new branch
git switch --create backport/backport-7309-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f955faa37d78ffad09b6902da4a1f900d4616a94
# Push it to GitHub
git push --set-upstream origin backport/backport-7309-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch-Dashboards/backport-2.x

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

abbyhu2000 added a commit to abbyhu2000/OpenSearch-Dashboards that referenced this pull request Jul 24, 2024
* UI changes

Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com>

* update snapshots

Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com>

* styling

Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com>

* correct license

Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com>

* more cleanup

Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com>

* more styling and update snapshots

Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com>

---------

Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com>
ananzh pushed a commit that referenced this pull request Jul 24, 2024
* UI changes
* update snapshots
* styling
* correct license
* more cleanup
* more styling and update snapshots



---------

Signed-off-by: abbyhu2000 <abigailhu2000@gmail.com>
ananzh pushed a commit to ananzh/OpenSearch-Dashboards that referenced this pull request Jul 24, 2024
…t#7457)

* UI changes
* update snapshots
* styling
* correct license
* more cleanup
* more styling and update snapshots



---------

Signed-off-by: abbyhu2000 <abigailhu2000@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.

[Discover-Next][UI] Query editor can be collapsed
4 participants