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

[2.x manual backport] BP for #7542, #7540, #7552, #7566, #7567 #7574

Merged
merged 5 commits into from
Jul 30, 2024

Conversation

ananzh
Copy link
Member

@ananzh ananzh commented Jul 30, 2024

Description

This is a backport PR for
Updating fetch functions to include local cluster 
#7542
Commit: 7287699

[discover-next][bug] add max height to dataset navigator and use memoization
#7540
Commit: 611f56b

Fix query assist after #7492, #7546, #7540
#7552
Commit: d68c589

[Discover next] Fixes dataset navigator menu styling & search error toast
#7566
Commit: 2b7dbe0

[Discover 2.0] Loading fix for databases
#7567
Commit: 8bafd8d

Issues Resolved

NA

Changelog

  • skip

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

sejli and others added 4 commits July 30, 2024 14:57
…nsearch-project#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>
…ization (opensearch-project#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]>
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]>
Copy link

codecov bot commented Jul 30, 2024

Codecov Report

Attention: Patch coverage is 4.48718% with 149 lines in your changes missing coverage. Please review.

Project coverage is 63.73%. Comparing base (f2eaa6e) to head (63917ef).
Report is 1 commits behind head on 2.x.

Files Patch % Lines
.../public/ui/dataset_navigator/dataset_navigator.tsx 0.86% 114 Missing ⚠️
.../public/query/state_sync/connect_to_query_state.ts 16.66% 8 Missing and 2 partials ⚠️
...navigator/lib/utils/fetch_external_data_sources.ts 0.00% 8 Missing ⚠️
...ta/public/query/dataset_manager/dataset_manager.ts 12.50% 6 Missing and 1 partial ⚠️
.../dataset_navigator/lib/utils/fetch_data_sources.ts 0.00% 3 Missing ⚠️
...c/plugins/data/public/search/search_interceptor.ts 33.33% 2 Missing ⚠️
...ublic/query_assist/components/query_assist_bar.tsx 0.00% 2 Missing ⚠️
...ata/public/antlr/opensearch_sql/code_completion.ts 0.00% 1 Missing ⚠️
...query/state_sync/create_global_query_observable.ts 0.00% 1 Missing ⚠️
.../ui/dataset_navigator/create_dataset_navigator.tsx 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##              2.x    #7574      +/-   ##
==========================================
- Coverage   63.75%   63.73%   -0.03%     
==========================================
  Files        3628     3628              
  Lines       79500    79525      +25     
  Branches    12593    12599       +6     
==========================================
  Hits        50682    50682              
- Misses      25753    25779      +26     
+ Partials     3065     3064       -1     
Flag Coverage Δ
Linux_1 30.76% <1.31%> (-0.02%) ⬇️
Linux_2 55.70% <ø> (ø)
Linux_3 40.25% <3.28%> (-0.04%) ⬇️
Linux_4 31.69% <2.56%> (-0.02%) ⬇️
Windows_1 30.78% <1.31%> (-0.02%) ⬇️
Windows_2 55.65% <ø> (ø)
Windows_3 40.26% <3.28%> (?)
Windows_4 31.69% <2.56%> (-0.02%) ⬇️

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.

ashwin-pc
ashwin-pc previously approved these changes Jul 30, 2024
* add back in useeffect for loading databases

Signed-off-by: Sean Li <[email protected]>

* Changeset file for PR opensearch-project#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>
@ananzh ananzh changed the title [2.x manual backport] BP for #7542, #7540, #7552, #7566 [2.x manual backport] BP for #7542, #7540, #7552, #7566, #7567 Jul 30, 2024
@ananzh
Copy link
Member Author

ananzh commented Jul 30, 2024

Pls don't update branch. The missing one is a workspace PR which is not relevant to these bps.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry v2.16.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants