[workspace]Support scope in data source selector #9832

Qxisylolo · 2025-05-30T08:19:22Z

Description

this pr supports scope in data source selector.

Screenshot

in a workspace, open dev tools

2025-05-30.16.09.47.mov

in a workspace, visit alert

out of a workspace, visit dev tools

2025-05-30.16.13.48.mov

in a workspace, visit sample data

in a workspace, visit notebook

Testing the changes

Changelog

feat: support scope in data source selector

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 · 2025-05-30T08:34:59Z

Codecov Report

❌ Patch coverage is 75.00000% with 5 lines in your changes missing coverage. Please review.
✅ Project coverage is 61.71%. Comparing base (958df3f) to head (d311955).
⚠️ Report is 1 commits behind head on main.

Files with missing lines	Patch %	Lines
...c/components/data_source_menu/data_source_menu.tsx	85.71%	0 Missing and 1 partial ⚠️
...ents/data_source_selector/data_source_selector.tsx	66.66%	0 Missing and 1 partial ⚠️
...c/components/drop_down_header/drop_down_header.tsx	50.00%	0 Missing and 1 partial ⚠️
...rc/plugins/data_source_management/public/plugin.ts	50.00%	1 Missing ⚠️
src/plugins/dev_tools/public/application.tsx	0.00%	1 Missing ⚠️

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #9832   +/-   ##
=======================================
  Coverage   61.70%   61.71%           
=======================================
  Files        4227     4227           
  Lines      107599   107607    +8     
  Branches    17474    17477    +3     
=======================================
+ Hits        66399    66406    +7     
+ Misses      36746    36745    -1     
- Partials     4454     4456    +2

Flag	Coverage Δ
Linux_1	`27.68% <5.26%> (-0.01%)`	⬇️
Linux_2	`41.16% <ø> (ø)`
Linux_3	`39.54% <75.00%> (?)`
Linux_4	`32.73% <26.31%> (+<0.01%)`	⬆️
Windows_1	`27.69% <5.26%> (-0.01%)`	⬇️
Windows_2	`41.13% <ø> (ø)`
Windows_3	`39.55% <75.00%> (+<0.01%)`	⬆️
Windows_4	`32.73% <26.31%> (+<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.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

yubonluo · 2025-06-10T09:40:52Z

...ugins/data_source_management/public/components/data_source_selector/data_source_selector.tsx

  onSelectedDataSource: (dataSourceOption: DataSourceOption[]) => void;
  disabled: boolean;
  fullWidth: boolean;
+  getWorkspaces: () => WorkspacesStart;


Why getWorkspaces was added into this Props, I think we just used it in this component, could we just use getWorkspace function directly and do not need to update src/plugins/data_source_management/public/components/data_source_selector/create_data_source_selector.tsx.

sure, updated, thanks

yubonluo · 2025-06-11T02:31:42Z

...ugins/data_source_management/public/components/data_source_selector/data_source_selector.tsx

 import { DataSourceItem } from '../data_source_item';
 import './data_source_selector.scss';
 import { DataSourceOption } from '../data_source_menu/types';
+import { getWorkspaces } from '../utils';


NIT: you can add getWorkspaces at line 23.

yubonluo · 2025-06-11T02:32:34Z

...ata_source_management/public/components/data_source_selector/create_data_source_selector.tsx

 ) {
  const { hideLocalCluster } = dataSourcePluginSetup;
-  return (props: DataSourceSelectorProps) => (
+  return (props: Omit<DataSourceSelectorProps, 'getWorkspaces'>) => (


NIT: do not need to use Omit and delete 'getWorkspaces'

updated, thanks~

Signed-off-by: Qxisylolo <qianxisy@amazon.com>

SuZhou-Joe · 2025-08-04T10:18:34Z

...s/data_source_management/public/components/data_source_menu/create_data_source_menu.test.tsx

        savedObjects: client,
        notifications,
      },
+      scope: UiSettingScope.WORKSPACE,


Shall we use Global as default scope?

SuZhou-Joe · 2025-08-04T10:19:20Z

...s/data_source_management/public/components/data_source_menu/create_data_source_menu.test.tsx

      },
+      scope: UiSettingScope.WORKSPACE,
+      uiSettings,
+      hideLocalCluster: false,


We should keep hideLocalCluster: true.

oh sorry. I paste the wrong line. updated

SuZhou-Joe · 2025-08-04T10:23:17Z

src/plugins/data_source_management/public/components/data_source_menu/data_source_menu.tsx

    hideLocalCluster,
    application,
    onManageDataSource,
+    scope,


For other plugins that have integrated with MDS, they do not need to manually pass scope right?

SuZhou-Joe · 2025-08-04T10:28:27Z

...a_source_management/public/components/data_source_selectable/data_source_selectable.test.tsx

        disabled={false}
        hideLocalCluster={false}
        fullWidth={false}
+        scope={UiSettingScope.WORKSPACE}


Workspace is still a feature that requires feature flag, shall we make it GLOBAL?

Signed-off-by: Qxisylolo <qianxisy@amazon.com>

...ugins/data_source_management/public/components/data_source_selector/data_source_selector.tsx

Signed-off-by: Qxisylolo <qianxisy@amazon.com>

SuZhou-Joe

Thanks for the comprehensive change.

github-actions bot added the all-star-contributor label May 30, 2025

opensearch-changeset-bot bot added a commit to Qxisylolo/OpenSearch-Dashboards that referenced this pull request May 30, 2025

Changeset file for PR opensearch-project#9832 created/updated

c1a6097

Qxisylolo force-pushed the feat/support_scope_in_ds_selector branch from c1a6097 to 79bbb9f Compare May 30, 2025 08:20

opensearch-changeset-bot bot added a commit to Qxisylolo/OpenSearch-Dashboards that referenced this pull request May 30, 2025

Changeset file for PR opensearch-project#9832 created/updated

12bb04d

Qxisylolo force-pushed the feat/support_scope_in_ds_selector branch from 32c5f48 to 5b021cc Compare June 3, 2025 08:36

Qxisylolo marked this pull request as ready for review June 3, 2025 08:53

Hailong-am added the workspace label Jun 5, 2025

Qxisylolo force-pushed the feat/support_scope_in_ds_selector branch from c27cc59 to 568386c Compare June 6, 2025 05:58

Qxisylolo requested a review from raintygao as a code owner June 6, 2025 05:58

yubonluo reviewed Jun 10, 2025

View reviewed changes

yubonluo reviewed Jun 11, 2025

View reviewed changes

Qxisylolo and others added 8 commits August 4, 2025 11:05

use scope

0c9b7ac

Signed-off-by: Qxisylolo <qianxisy@amazon.com>

Changeset file for PR opensearch-project#9832 created/updated

799808e

fix tests

a0942f7

Signed-off-by: Qxisylolo <qianxisy@amazon.com>

Changeset file for PR opensearch-project#9832 created/updated

825b0ed

fix type error

bb39bd4

Signed-off-by: Qxisylolo <qianxisy@amazon.com>

keep fix type error

2c7ce5e

Signed-off-by: Qxisylolo <qianxisy@amazon.com>

resolve comments

25eaf64

Signed-off-by: Qxisylolo <qianxisy@amazon.com>

comments

b3b47d9

Signed-off-by: Qxisylolo <qianxisy@amazon.com>

Qxisylolo force-pushed the feat/support_scope_in_ds_selector branch from d5da686 to b3b47d9 Compare August 4, 2025 05:02

Qxisylolo requested a review from ps48 as a code owner August 4, 2025 05:02

Qxisylolo added 2 commits August 4, 2025 15:46

Merge branch 'main' into feat/support_scope_in_ds_selector

f8f10d7

update

df5479f

Signed-off-by: Qxisylolo <qianxisy@amazon.com>

SuZhou-Joe reviewed Aug 4, 2025

View reviewed changes

adress comments

293b2df

Signed-off-by: Qxisylolo <qianxisy@amazon.com>

wanglam previously approved these changes Aug 5, 2025

View reviewed changes

...ugins/data_source_management/public/components/data_source_selector/data_source_selector.tsx Show resolved Hide resolved

infer scope in data source menu

2a83031

Signed-off-by: Qxisylolo <qianxisy@amazon.com>

Qxisylolo dismissed wanglam’s stale review via 2a83031 August 5, 2025 03:55

Qxisylolo force-pushed the feat/support_scope_in_ds_selector branch from b562667 to 2a83031 Compare August 5, 2025 03:55

Merge branch 'main' into feat/support_scope_in_ds_selector

d311955

SuZhou-Joe approved these changes Aug 5, 2025

View reviewed changes

wanglam approved these changes Aug 5, 2025

View reviewed changes

SuZhou-Joe merged commit b475eec into opensearch-project:main Aug 5, 2025
82 of 83 checks passed

[workspace]Support scope in data source selector #9832

[workspace]Support scope in data source selector #9832

Uh oh!

Conversation

Qxisylolo commented May 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Screenshot

Testing the changes

Changelog

Check List

Uh oh!

codecov bot commented May 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

yubonluo Jun 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

SuZhou-Joe left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Qxisylolo commented May 30, 2025 •

edited

Loading

codecov bot commented May 30, 2025 •

edited

Loading

yubonluo Jun 10, 2025 •

edited

Loading