-
Notifications
You must be signed in to change notification settings - Fork 919
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
Fix query assist after #7492, #7546, #7540 #7552
Fix query assist after #7492, #7546, #7540 #7552
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #7552 +/- ##
=======================================
Coverage 63.64% 63.64%
=======================================
Files 3629 3629
Lines 79520 79522 +2
Branches 12601 12604 +3
=======================================
+ Hits 50611 50613 +2
Misses 25841 25841
Partials 3068 3068
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
test failure doesn't seem related to this PR, same failure occurred in previous commit |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, just one minor change
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add a style to the Query assist bar to add padding. You can add this to the EuiForm element
padding: $euiSizeXS;
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good callout. @canascar @kgcreative what are your thoughts here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This reverts commit 1ec2941. Signed-off-by: Joshua Li <[email protected]>
Signed-off-by: Joshua Li <[email protected]>
This reverts commit dea9208. Signed-off-by: Joshua Li <[email protected]>
Signed-off-by: Joshua Li <[email protected]>
Signed-off-by: Joshua Li <[email protected]>
css padding in callouts is the space between text to border. the commit adds space around through margin. Signed-off-by: Joshua Li <[email protected]>
Signed-off-by: Joshua Li <[email protected]>
Signed-off-by: Joshua Li <[email protected]>
Signed-off-by: Joshua Li <[email protected]>
a397108
to
641408b
Compare
ciGroup3 failed. re-run this test. |
Signed-off-by: Joshua Li <[email protected]>
The backport to
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-7552-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d68c589e4bd46a737beaf8e4bfdc83fc36eb7c35
# Push it to GitHub
git push --set-upstream origin backport/backport-7552-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 |
The backport to
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-7552-to-2.16
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d68c589e4bd46a737beaf8e4bfdc83fc36eb7c35
# Push it to GitHub
git push --set-upstream origin backport/backport-7552-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 |
After the following PRs: opensearch-project#7492, opensearch-project#7546, opensearch-project#7540 this commit added skip(1) back to dataset manager observable: fef6156, we need to revert changes done in fix(query assist): update reading data source id from dataset manager opensearch-project#7464 (comment) revert dataset manager observable usage in query assist to support skip(1) revert dataset manager tests [Discover Next] Fixes Discover styles opensearch-project#7546 removed query editor header div, this PR adds it back to enable query editor extensions Signed-off-by: Joshua Li <[email protected]>
* [Discover 2.0] Updating fetch functions to include local cluster (#7542) * Update datasources fetch function to include local cluster * Check for duplicates when fetching external datasources (in the case local cluster is added as a datasource) * Clean up types in DataSetNavigator so items are displayed properly --------- Signed-off-by: Sean Li <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> * [discover-next][bug] add max height to dataset navigator and use memoization (#7540) * add max heigh. use memoization Signed-off-by: Kawika Avilla <[email protected]> almost working pretty nicely Signed-off-by: Kawika Avilla <[email protected]> a little bit better Signed-off-by: Kawika Avilla <[email protected]> its ok Signed-off-by: Kawika Avilla <[email protected]> * update mock Signed-off-by: Kawika Avilla <[email protected]> * update another mock Signed-off-by: Kawika Avilla <[email protected]> * fix mock for extension Signed-off-by: Kawika Avilla <[email protected]> * rebase fixes Signed-off-by: Kawika Avilla <[email protected]> * update script Signed-off-by: Kawika Avilla <[email protected]> * fix initial load Signed-off-by: Kawika Avilla <[email protected]> --------- Signed-off-by: Kawika Avilla <[email protected]> * Fix query assist for query editor (#7552) After the following PRs: #7492, #7546, #7540 this commit added skip(1) back to dataset manager observable: fef6156, we need to revert changes done in fix(query assist): update reading data source id from dataset manager #7464 (comment) revert dataset manager observable usage in query assist to support skip(1) revert dataset manager tests [Discover Next] Fixes Discover styles #7546 removed query editor header div, this PR adds it back to enable query editor extensions Signed-off-by: Joshua Li <[email protected]> * [Discover next] Fixes dataset navigator menu styling & search error toast (#7566) Signed-off-by: Ashwin P Chandran <[email protected]> * [Discover 2.0] Loading fix for databases (#7567) * add back in useeffect for loading databases Signed-off-by: Sean Li <[email protected]> * Changeset file for PR #7567 created/updated --------- Signed-off-by: Sean Li <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> --------- Signed-off-by: Sean Li <[email protected]> Signed-off-by: Kawika Avilla <[email protected]> Signed-off-by: Joshua Li <[email protected]> Signed-off-by: Ashwin P Chandran <[email protected]> Co-authored-by: Sean Li <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> Co-authored-by: Kawika Avilla <[email protected]> Co-authored-by: Joshua Li <[email protected]> Co-authored-by: Ashwin P Chandran <[email protected]>
backported through 2411e2f |
After the following PRs: opensearch-project#7492, opensearch-project#7546, opensearch-project#7540 this commit added skip(1) back to dataset manager observable: fef6156, we need to revert changes done in fix(query assist): update reading data source id from dataset manager opensearch-project#7464 (comment) revert dataset manager observable usage in query assist to support skip(1) revert dataset manager tests [Discover Next] Fixes Discover styles opensearch-project#7546 removed query editor header div, this PR adds it back to enable query editor extensions Signed-off-by: Joshua Li <[email protected]>
Backported with #7574 |
Description
skip(1)
back to dataset manager observable: fef6156, we need to revert changes done in fix(query assist): update reading data source id from dataset manager #7464 (comment)skip(1)
Issues Resolved
Screenshot
Testing the changes
Changelog
Check List
yarn test:jest
yarn test:jest_integration