[Multiple Datasource] Move data source selectable to its own folder, fix test and a few type errors for data source selectable component #6287

BionIT · 2024-03-28T03:47:43Z

Description

This change moves data source selectable to its own folder, fix test and a few type errors for data source selectable component

Issues Resolved

Screenshot

dsselectable.mp4

Testing the changes

The following were performed in the video:

enable data source
go to search relevance which mounted data source selectable component, select a data source from the menu, and it should show the option as selected and also reflect in the button text

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

codecov · 2024-03-28T04:02:41Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 67.47%. Comparing base (8810f08) to head (ae6afb6).

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #6287   +/-   ##
=======================================
  Coverage   67.47%   67.47%           
=======================================
  Files        3368     3368           
  Lines       65431    65433    +2     
  Branches    10560    10561    +1     
=======================================
+ Hits        44147    44152    +5     
+ Misses      18713    18709    -4     
- Partials     2571     2572    +1

Flag	Coverage Δ
Linux_1	`32.14% <ø> (ø)`
Linux_2	`55.58% <ø> (ø)`
Linux_3	`44.93% <100.00%> (+0.02%)`	⬆️
Linux_4	`35.07% <0.00%> (-0.01%)`	⬇️
Windows_1	`32.16% <ø> (ø)`
Windows_2	`55.55% <ø> (ø)`
Windows_3	`44.93% <100.00%> (+0.01%)`	⬆️
Windows_4	`35.07% <0.00%> (-0.01%)`	⬇️

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.

bandinib-amzn · 2024-03-28T18:43:30Z

CHANGELOG.md

@@ -91,6 +91,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - [BUG][MD]Expose picker using function in data source management plugin setup([#6030](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6030))
 - [BUG][Multiple Datasource] Fix data source filter bug and add tests ([#6152](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6152))
 - [BUG][Multiple Datasource] Fix obsolete snapshots for test within data source management plugin ([#6185](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6185))
+- [Multiple Datasource] Move data source selectable to its own folder, fix test and a few type errors for data source selectable component ([#6287](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6287))


should we move this changelog to Refactoring section?

Thanks for pointing out @bandinib-amzn! Right! will change in new commit

bandinib-amzn · 2024-03-28T18:46:14Z

Looks like codecov check is failing. Can you add/modify UT for uncovered lines? Thanks!

xinruiba · 2024-03-29T00:08:42Z

...s/data_source_management/public/components/data_source_selectable/data_source_selectable.tsx

+  selectedOption?: SelectedDataSourceOption[];
+}
+
+interface SelectedDataSourceOption extends DataSourceOption {


nit:
non blocking comment.

Suggested change

interface SelectedDataSourceOption extends DataSourceOption {

interface SelectableDataSourceOption extends DataSourceOption {

I think it makes more sense to call it SelectedDataSourceOption

xinruiba · 2024-03-29T00:12:28Z

...s/data_source_management/public/components/data_source_selectable/data_source_selectable.tsx


-    this.props.onSelectedDataSources([selectedDataSource]);
+      this.props.onSelectedDataSources([


nit:
non blocking comment~

Suggested change

this.props.onSelectedDataSources([

this.props.onSelectDataSources([

It will be disruptive to change the props, plus I think onSelectedDataSources makes more sense

bandinib-amzn · 2024-04-02T17:12:33Z

All checks were passing before rebase.

Signed-off-by: Lu Yu <nluyu@amazon.com>

opensearch-trigger-bot · 2024-04-02T18:04:02Z

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-6287-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e35529778c271616aa96356b6d8a240ad2cbce75
# Push it to GitHub
git push --set-upstream origin backport/backport-6287-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-6287-to-2.x.

…fix test and a few type errors for data source selectable component (#6287) * Move data source selectable to its own folder and fix test Signed-off-by: Lu Yu <nluyu@amazon.com> * add change log Signed-off-by: Lu Yu <nluyu@amazon.com> * add tests and relocate change log Signed-off-by: Lu Yu <nluyu@amazon.com> * fix snapshots Signed-off-by: Lu Yu <nluyu@amazon.com> --------- Signed-off-by: Lu Yu <nluyu@amazon.com> (cherry picked from commit e355297) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> # Conflicts: # CHANGELOG.md

…fix test and a few type errors for data source selectable component (#6287) (#6322) * Move data source selectable to its own folder and fix test Signed-off-by: Lu Yu <nluyu@amazon.com> * add change log Signed-off-by: Lu Yu <nluyu@amazon.com> * add tests and relocate change log Signed-off-by: Lu Yu <nluyu@amazon.com> * fix snapshots Signed-off-by: Lu Yu <nluyu@amazon.com> --------- Signed-off-by: Lu Yu <nluyu@amazon.com> (cherry picked from commit e355297) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> # Conflicts: # CHANGELOG.md Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

BionIT requested review from ananzh, kavilla, AMoo-Miki, ashwin-pc, joshuarrrr, abbyhu2000, zengyan-amazon, zhongnansu, manasvinibs, ZilongX, Flyingliuhub, BSFishy, curq, bandinib-amzn, SuZhou-Joe, ruanyl and xinruiba as code owners March 28, 2024 03:47

github-actions bot added the seasoned-contributor label Mar 28, 2024

BionIT mentioned this pull request Mar 28, 2024

[Multi data Source] Data source and Data source management plugin auditing #6204

Closed

3 tasks

bandinib-amzn reviewed Mar 28, 2024

View reviewed changes

xinruiba reviewed Mar 29, 2024

View reviewed changes

BionIT added 4 commits April 2, 2024 10:12

Move data source selectable to its own folder and fix test

cc5b331

Signed-off-by: Lu Yu <nluyu@amazon.com>

add change log

686a681

Signed-off-by: Lu Yu <nluyu@amazon.com>

add tests and relocate change log

1165db8

Signed-off-by: Lu Yu <nluyu@amazon.com>

fix snapshots

ae6afb6

Signed-off-by: Lu Yu <nluyu@amazon.com>

bandinib-amzn force-pushed the movepos branch from d7fcdd4 to ae6afb6 Compare April 2, 2024 17:12

bandinib-amzn approved these changes Apr 2, 2024

View reviewed changes

xinruiba approved these changes Apr 2, 2024

View reviewed changes

BionIT merged commit e355297 into opensearch-project:main Apr 2, 2024
68 checks passed

BionIT added backport 2.x multiple datasource multiple datasource project labels Apr 2, 2024

opensearch-trigger-bot bot added the failed backport label Apr 2, 2024

BionIT added v2.14.0 backport 2.x and removed backport 2.x failed backport labels Apr 2, 2024

opensearch-trigger-bot bot mentioned this pull request Apr 3, 2024

[Backport 2.x] [Multiple Datasource] Move data source selectable to its own folder, fix test and a few type errors for data source selectable component #6322

Merged

BionIT mentioned this pull request Apr 9, 2024

[Meta] [2.14] Security, bug fix and enhancemanet for dashboards anywhere #5872

Closed

77 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Multiple Datasource] Move data source selectable to its own folder, fix test and a few type errors for data source selectable component #6287

[Multiple Datasource] Move data source selectable to its own folder, fix test and a few type errors for data source selectable component #6287

BionIT commented Mar 28, 2024

codecov bot commented Mar 28, 2024 •

edited

Loading

bandinib-amzn Mar 28, 2024

BionIT Mar 28, 2024

bandinib-amzn commented Mar 28, 2024

xinruiba Mar 29, 2024

BionIT Apr 2, 2024

xinruiba Mar 29, 2024

BionIT Apr 2, 2024

bandinib-amzn commented Apr 2, 2024

opensearch-trigger-bot bot commented Apr 2, 2024

	interface SelectedDataSourceOption extends DataSourceOption {
	interface SelectableDataSourceOption extends DataSourceOption {


		this.props.onSelectedDataSources([selectedDataSource]);
		this.props.onSelectedDataSources([

	this.props.onSelectedDataSources([
	this.props.onSelectDataSources([

[Multiple Datasource] Move data source selectable to its own folder, fix test and a few type errors for data source selectable component #6287

[Multiple Datasource] Move data source selectable to its own folder, fix test and a few type errors for data source selectable component #6287

Conversation

BionIT commented Mar 28, 2024

Description

Issues Resolved

Screenshot

Testing the changes

Check List

codecov bot commented Mar 28, 2024 • edited Loading

Codecov Report

bandinib-amzn Mar 28, 2024

Choose a reason for hiding this comment

BionIT Mar 28, 2024

Choose a reason for hiding this comment

bandinib-amzn commented Mar 28, 2024

xinruiba Mar 29, 2024

Choose a reason for hiding this comment

BionIT Apr 2, 2024

Choose a reason for hiding this comment

xinruiba Mar 29, 2024

Choose a reason for hiding this comment

BionIT Apr 2, 2024

Choose a reason for hiding this comment

bandinib-amzn commented Apr 2, 2024

opensearch-trigger-bot bot commented Apr 2, 2024

codecov bot commented Mar 28, 2024 •

edited

Loading