[Workspace] Refactor 'Associate data sources' in create page to support direct query connections #7961

Kapian1234 · 2024-09-02T08:18:56Z

Description

Refactor 'Associate data sources' in create page to support direct query connections

Issues Resolved

Screenshot

Testing the changes

Changelog

feat: Support DQCs in create page

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

Signed-off-by: Kapian1234 <wanjinch@amazon.com>

Signed-off-by: Lin Wang <wonglam@amazon.com>

Signed-off-by: Kapian1234 <wanjinch@amazon.com>

…ch-Dashboards into creator_association

…h-Dashboards into creator_association

codecov · 2024-09-02T08:34:26Z

Codecov Report

Attention: Patch coverage is 91.36691% with 12 lines in your changes missing coverage. Please review.

Project coverage is 60.55%. Comparing base (7e8612f) to head (b4b1ac7).
Report is 91 commits behind head on main.

Files with missing lines	Patch %	Lines
src/plugins/workspace/public/utils.ts	60.00%	8 Missing ⚠️
...ents/workspace_detail/select_data_source_panel.tsx	88.23%	2 Missing ⚠️
...components/workspace_creator/workspace_creator.tsx	75.00%	0 Missing and 1 partial ⚠️
...onents/workspace_form/select_data_source_panel.tsx	96.42%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #7961      +/-   ##
==========================================
+ Coverage   60.52%   60.55%   +0.02%     
==========================================
  Files        3728     3730       +2     
  Lines       88295    88365      +70     
  Branches    13661    13681      +20     
==========================================
+ Hits        53441    53507      +66     
- Misses      31600    31606       +6     
+ Partials     3254     3252       -2

Flag	Coverage Δ
Linux_1	`28.76% <91.36%> (+0.04%)`	⬆️
Linux_2	`56.25% <ø> (+<0.01%)`	⬆️
Linux_3	`37.40% <ø> (-0.02%)`	⬇️
Linux_4	`29.62% <ø> (+0.01%)`	⬆️
Windows_1	`28.78% <91.36%> (+0.04%)`	⬆️
Windows_2	`56.20% <ø> (+<0.01%)`	⬆️
Windows_3	`37.40% <ø> (-0.02%)`	⬇️
Windows_4	`29.62% <ø> (+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.

wanglam · 2024-09-02T09:29:08Z

src/plugins/workspace/public/components/workspace_detail/data_source_connection_table.tsx

@@ -174,27 +182,26 @@ export const DataSourceConnectionTable = ({
      },
    },
    {
-      width: '10%',
+      width: '15%',


@Kapian1234 Seems we are re-use the same component with workspace detail side. Could you help check with @yubonluo if this width updates can be applied in workspace detail? I'm prefer to add flag here to determine if we need to update the width.

The width updates will indeed be applied in workspace detail, but I've checked with @yubonluo and the new width still presents well there. Perhaps the flag isn't necessary?

Signed-off-by: Lin Wang <wonglam@amazon.com>

Signed-off-by: Kapian1234 <wanjinch@amazon.com>

SuZhou-Joe · 2024-09-05T03:00:51Z

src/plugins/workspace/public/components/workspace_form/data_source_connection_table.tsx

+          url = `${origin}${basePath}/app/dataSources/manage/${name}?dataSourceMDSId=${record.parentId}`;
+          url = http.basePath.prepend(`/app/dataSources/${record.id}`, {
+            withoutClientBasePath: true,
+          });


Suggested change

url = `${origin}${basePath}/app/dataSources/manage/${name}?dataSourceMDSId=${record.parentId}`;

url = http.basePath.prepend(`/app/dataSources/${record.id}`, {

withoutClientBasePath: true,

});

url = http.basePath.prepend(`/app/dataSources/manage/${name}?dataSourceMDSId=${record.parentId}`, {

withoutClientBasePath: true,

});

SuZhou-Joe · 2024-09-05T03:02:13Z

src/plugins/workspace/public/components/workspace_form/data_source_connection_table.tsx

+          url = http.basePath.prepend(`/app/dataSources/${record.id}`, {
+            withoutClientBasePath: true,
+          });


Suggested change

url = http.basePath.prepend(`/app/dataSources/${record.id}`, {

withoutClientBasePath: true,

});

url = http.basePath.prepend(`/app/dataSources/${record.id}`);

If it's opensearch connection, shall we just go to the data source page within the workspace?

I think we should go to the data source management page within the workspace. @yubonluo , could you help clarify this?

SuZhou-Joe · 2024-09-05T03:08:25Z

src/plugins/workspace/public/components/workspace_form/data_source_connection_table.tsx

+type DataSourceConnectionTableProps = Omit<
+  EuiInMemoryTableProps<DataSourceConnection>,
+  | 'columns'
+  | 'itemsId'
+  | 'isSelectable'
+  | 'itemIdToExpandedRowMap'
+  | 'isExpandable'
+  | 'selection'
+  | 'pagination'
+> & {


Suggested change

type DataSourceConnectionTableProps = Omit<

EuiInMemoryTableProps<DataSourceConnection>,

| 'columns'

| 'itemsId'

| 'isSelectable'

| 'itemIdToExpandedRowMap'

| 'isExpandable'

| 'selection'

| 'pagination'

> & {

type DataSourceConnectionTableProps = {

tableProps: Partial<EuiInMemoryTableProps<DataSourceConnection>>

What about we moving all the table related props to a standalone entry so that it won't bother other props. And to make the props simple by using Partial.

SuZhou-Joe · 2024-09-05T03:09:18Z

src/plugins/workspace/public/components/workspace_form/data_source_connection_table.tsx

-      )}
-    </>
+    <EuiInMemoryTable
+      {...(restProps as EuiInMemoryTableProps<DataSourceConnection>)}


Suggested change

{...(restProps as EuiInMemoryTableProps<DataSourceConnection>)}

{...restProps}

We'd better avoid type assertion.

Signed-off-by: Kapian1234 <wanjinch@amazon.com>

Signed-off-by: Lin Wang <wonglam@amazon.com>

SuZhou-Joe · 2024-09-05T15:58:30Z

Run cypress tests (osd:ciGroup6) should be irrelevant to the code changes.

…rt direct query connections (#7961) * support DQC Signed-off-by: Kapian1234 <wanjinch@amazon.com> * Fix UTs in workspace form select data source panel Signed-off-by: Lin Wang <wonglam@amazon.com> * Remove no need IntlProvider Signed-off-by: Lin Wang <wonglam@amazon.com> * Add aria-labelledby for permission inputs Signed-off-by: Lin Wang <wonglam@amazon.com> * Modify UTs Signed-off-by: Kapian1234 <wanjinch@amazon.com> * Changeset file for PR #7961 created/updated * Modify UTs Signed-off-by: Kapian1234 <wanjinch@amazon.com> * Resolve some issues Signed-off-by: Kapian1234 <wanjinch@amazon.com> * Modify UTs Signed-off-by: Kapian1234 <wanjinch@amazon.com> * Fix UT errror Signed-off-by: Lin Wang <wonglam@amazon.com> * update button text Signed-off-by: Kapian1234 <wanjinch@amazon.com> * rename onSelectItems() Signed-off-by: Kapian1234 <wanjinch@amazon.com> * Fix an error Signed-off-by: Kapian1234 <wanjinch@amazon.com> * Refactor data source connection table Signed-off-by: Lin Wang <wonglam@amazon.com> * resolve some issues Signed-off-by: Kapian1234 <wanjinch@amazon.com> * resolve some issues Signed-off-by: Kapian1234 <wanjinch@amazon.com> * Fix the data source URL reference Signed-off-by: Kapian1234 <wanjinch@amazon.com> * Move restProps to tableProps Signed-off-by: Lin Wang <wonglam@amazon.com> * Fix table not unmont after connection type changed Signed-off-by: Lin Wang <wonglam@amazon.com> * Refactor selectedDataSources to selectedDataSourceConnections Signed-off-by: Lin Wang <wonglam@amazon.com> * Load direct query connections after data source tab selected Signed-off-by: Lin Wang <wonglam@amazon.com> --------- Signed-off-by: Kapian1234 <wanjinch@amazon.com> Signed-off-by: Lin Wang <wonglam@amazon.com> Co-authored-by: Lin Wang <wonglam@amazon.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> (cherry picked from commit 16d160a) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

…rt direct query connections (#7961) (#8024) * support DQC * Fix UTs in workspace form select data source panel * Remove no need IntlProvider * Add aria-labelledby for permission inputs * Modify UTs * Changeset file for PR #7961 created/updated * Modify UTs * Resolve some issues * Modify UTs * Fix UT errror * update button text * rename onSelectItems() * Fix an error * Refactor data source connection table * resolve some issues * resolve some issues * Fix the data source URL reference * Move restProps to tableProps * Fix table not unmont after connection type changed * Refactor selectedDataSources to selectedDataSourceConnections * Load direct query connections after data source tab selected --------- (cherry picked from commit 16d160a) Signed-off-by: Kapian1234 <wanjinch@amazon.com> Signed-off-by: Lin Wang <wonglam@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Lin Wang <wonglam@amazon.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>

…rt direct query connections (#7961) (#8024) * support DQC * Fix UTs in workspace form select data source panel * Remove no need IntlProvider * Add aria-labelledby for permission inputs * Modify UTs * Changeset file for PR #7961 created/updated * Modify UTs * Resolve some issues * Modify UTs * Fix UT errror * update button text * rename onSelectItems() * Fix an error * Refactor data source connection table * resolve some issues * resolve some issues * Fix the data source URL reference * Move restProps to tableProps * Fix table not unmont after connection type changed * Refactor selectedDataSources to selectedDataSourceConnections * Load direct query connections after data source tab selected --------- (cherry picked from commit 16d160a) Signed-off-by: Kapian1234 <wanjinch@amazon.com> Signed-off-by: Lin Wang <wonglam@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Lin Wang <wonglam@amazon.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> (cherry picked from commit 3f2d867) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

…rt direct query connections (#7961) (#8024) (#8055) * support DQC * Fix UTs in workspace form select data source panel * Remove no need IntlProvider * Add aria-labelledby for permission inputs * Modify UTs * Changeset file for PR #7961 created/updated * Modify UTs * Resolve some issues * Modify UTs * Fix UT errror * update button text * rename onSelectItems() * Fix an error * Refactor data source connection table * resolve some issues * resolve some issues * Fix the data source URL reference * Move restProps to tableProps * Fix table not unmont after connection type changed * Refactor selectedDataSources to selectedDataSourceConnections * Load direct query connections after data source tab selected --------- (cherry picked from commit 16d160a) (cherry picked from commit 3f2d867) Signed-off-by: Kapian1234 <wanjinch@amazon.com> Signed-off-by: Lin Wang <wonglam@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Lin Wang <wonglam@amazon.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>

Kapian1234 and others added 7 commits September 2, 2024 13:59

support DQC

57db44d

Signed-off-by: Kapian1234 <wanjinch@amazon.com>

Fix UTs in workspace form select data source panel

6111eb3

Signed-off-by: Lin Wang <wonglam@amazon.com>

Remove no need IntlProvider

affc9ba

Signed-off-by: Lin Wang <wonglam@amazon.com>

Add aria-labelledby for permission inputs

cff1491

Signed-off-by: Lin Wang <wonglam@amazon.com>

Modify UTs

8490ca0

Signed-off-by: Kapian1234 <wanjinch@amazon.com>

Merge branch 'main' of https://github.com/opensearch-project/OpenSear…

473e058

…ch-Dashboards into creator_association

Merge branch 'creator_association' of github.com:Kapian1234/OpenSearc…

8701a3f

…h-Dashboards into creator_association

github-actions bot added the repeat-contributor label Sep 2, 2024

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

b7916d0

wanglam reviewed Sep 2, 2024

View reviewed changes

Kapian1234 marked this pull request as ready for review September 2, 2024 09:34

Kapian1234 requested review from ananzh, kavilla, AMoo-Miki, ashwin-pc, joshuarrrr, abbyhu2000, zengyan-amazon, zhongnansu, manasvinibs, ZilongX, Flyingliuhub, curq, bandinib-amzn, SuZhou-Joe, ruanyl, BionIT, xinruiba and zhyuanqi as code owners September 2, 2024 09:34

wanglam and others added 2 commits September 4, 2024 16:08

Refactor data source connection table

2b4362a

Signed-off-by: Lin Wang <wonglam@amazon.com>

resolve some issues

64363b4

Signed-off-by: Kapian1234 <wanjinch@amazon.com>

Kapian1234 force-pushed the creator_association branch from e138b57 to 64363b4 Compare September 4, 2024 08:58

Kapian1234 added 2 commits September 4, 2024 17:00

resolve some issues

308c318

Signed-off-by: Kapian1234 <wanjinch@amazon.com>

resolve conflicts

5c8d72f

Signed-off-by: Kapian1234 <wanjinch@amazon.com>

SuZhou-Joe reviewed Sep 5, 2024

View reviewed changes

ruanyl previously approved these changes Sep 5, 2024

View reviewed changes

Fix the data source URL reference

46e78c3

Signed-off-by: Kapian1234 <wanjinch@amazon.com>

Kapian1234 dismissed ruanyl’s stale review via 46e78c3 September 5, 2024 03:45

wanglam added 3 commits September 5, 2024 11:48

Move restProps to tableProps

1400600

Signed-off-by: Lin Wang <wonglam@amazon.com>

Fix table not unmont after connection type changed

ea60cb3

Signed-off-by: Lin Wang <wonglam@amazon.com>

Refactor selectedDataSources to selectedDataSourceConnections

2451b92

Signed-off-by: Lin Wang <wonglam@amazon.com>

ruanyl added backport 2.x workspace v2.17.0 labels Sep 5, 2024

Load direct query connections after data source tab selected

b4b1ac7

Signed-off-by: Lin Wang <wonglam@amazon.com>

ruanyl approved these changes Sep 5, 2024

View reviewed changes

SuZhou-Joe approved these changes Sep 5, 2024

View reviewed changes

SuZhou-Joe merged commit 16d160a into opensearch-project:main Sep 5, 2024
66 of 67 checks passed

opensearch-trigger-bot bot mentioned this pull request Sep 5, 2024

[Backport 2.x] [Workspace] Refactor 'Associate data sources' in create page to support direct query connections #8024

Merged

wanglam mentioned this pull request Sep 10, 2024

[Bug][Workspace]Fix page display errors and add loading status #8086

Merged

7 tasks

AMoo-Miki added the in-next label Sep 27, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Workspace] Refactor 'Associate data sources' in create page to support direct query connections #7961

[Workspace] Refactor 'Associate data sources' in create page to support direct query connections #7961

Kapian1234 commented Sep 2, 2024 •

edited

Loading

codecov bot commented Sep 2, 2024 •

edited

Loading

wanglam Sep 2, 2024

Kapian1234 Sep 3, 2024

SuZhou-Joe Sep 5, 2024

SuZhou-Joe Sep 5, 2024

wanglam Sep 5, 2024

SuZhou-Joe Sep 5, 2024

SuZhou-Joe Sep 5, 2024

SuZhou-Joe commented Sep 5, 2024

	{...(restProps as EuiInMemoryTableProps<DataSourceConnection>)}
	{...restProps}

[Workspace] Refactor 'Associate data sources' in create page to support direct query connections #7961

[Workspace] Refactor 'Associate data sources' in create page to support direct query connections #7961

Conversation

Kapian1234 commented Sep 2, 2024 • edited Loading

Description

Issues Resolved

Screenshot

Testing the changes

Changelog

Check List

codecov bot commented Sep 2, 2024 • edited Loading

Codecov Report

wanglam Sep 2, 2024

Choose a reason for hiding this comment

Kapian1234 Sep 3, 2024

Choose a reason for hiding this comment

SuZhou-Joe Sep 5, 2024

Choose a reason for hiding this comment

SuZhou-Joe Sep 5, 2024

Choose a reason for hiding this comment

wanglam Sep 5, 2024

Choose a reason for hiding this comment

SuZhou-Joe Sep 5, 2024

Choose a reason for hiding this comment

SuZhou-Joe Sep 5, 2024

Choose a reason for hiding this comment

SuZhou-Joe commented Sep 5, 2024

Kapian1234 commented Sep 2, 2024 •

edited

Loading

codecov bot commented Sep 2, 2024 •

edited

Loading