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

[Manual backport 2.x] New Query Enhancement UI #7457

Merged

Conversation

abbyhu2000
Copy link
Member

Description

Manual backport of #7309

Issues Resolved

Screenshot

Testing the changes

Changelog

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

* 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>
@abbyhu2000 abbyhu2000 added the Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry label Jul 24, 2024
@opensearch-project opensearch-project deleted a comment from github-actions bot Jul 24, 2024
@abbyhu2000 abbyhu2000 added autocut Skip the changelog verification check on backports and removed Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry labels Jul 24, 2024
Copy link

codecov bot commented Jul 24, 2024

Codecov Report

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

Project coverage is 67.81%. Comparing base (0b7b75f) to head (009d4d8).
Report is 1 commits behind head on 2.x.

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             @@
##              2.x    #7457      +/-   ##
==========================================
- Coverage   67.81%   67.81%   -0.01%     
==========================================
  Files        3600     3600              
  Lines       72605    72616      +11     
  Branches    11898    11901       +3     
==========================================
+ Hits        49238    49244       +6     
- Misses      20373    20377       +4     
- Partials     2994     2995       +1     
Flag Coverage Δ
Linux_1 32.94% <ø> (-0.01%) ⬇️
Linux_2 55.66% <ø> (ø)
Linux_3 43.66% <58.82%> (+<0.01%) ⬆️
Linux_4 34.38% <ø> (ø)
Windows_1 32.96% <ø> (ø)
Windows_2 55.61% <ø> (ø)
Windows_3 43.67% <58.82%> (+<0.01%) ⬆️
Windows_4 34.38% <ø> (ø)

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.

@ananzh ananzh merged commit 8ee8678 into opensearch-project:2.x Jul 24, 2024
65 of 69 checks passed
@opensearch-trigger-bot
Copy link
Contributor

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

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

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
Labels
autocut Skip the changelog verification check on backports backport 2.16 failed changeset
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants