[Workspace] Enable direct query connections to support in workspace by yubonluo · Pull Request #7839 · opensearch-project/OpenSearch-Dashboards

yubonluo · 2024-08-26T06:55:09Z

Description

Enable direct query connections to support in workspace

Users can switch between the OpenSearch connectionsand Direct query connections buttons to display different types of data sources
Users(dashboard admin) can assign/unassign OpenSearch connections/Direct query connections data source
When user unassign OpenSearch connections , all the related Direct query connections will be unassigned.
No dashboard admin can not assign/unassign datasource

Issues Resolved

#7939

Screenshot

2024-08-29.00.08.43.mp4

Testing the changes

Changelog

fix: Enable direct query connections to support in workspace

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: yubonluo <yubonluo@amazon.com>

…hboards into 2.17/support-DQC

Signed-off-by: yubonluo <yubonluo@amazon.com>

SuZhou-Joe · 2024-08-30T08:53:06Z

src/plugins/workspace/public/utils.ts

    });
 };

+export const getDirectQueryConnections = async (dataSourceId: string, http: HttpSetup) => {


Can we just reuse the function from DQC plugin?

The logic in DQC is coupled within the component（src/plugins/data_source_management/public/components/direct_query_data_sources_components/direct_query_data_connection/manage_direct_query_data_connections_table.tsx）

Nit: The best practice would be extract the logic to a util function, but I am OK that we leave it.

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

Signed-off-by: yubonluo <yubonluo@amazon.com>

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

Add nested support in associate data source modal

Signed-off-by: yubonluo <yubonluo@amazon.com>

yubonluo · 2024-08-30T10:08:06Z

HI @ruanyl @SuZhou-Joe, @wanglam has made a modification to the association modal. You can take a look when you have time. Thanks~

opensearch-trigger-bot · 2024-09-02T01:37:18Z

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

…7839) * add dqc Signed-off-by: yubonluo <yubonluo@amazon.com> * add dircet query connections on the detail page Signed-off-by: yubonluo <yubonluo@amazon.com> * Changeset file for PR #7839 created/updated * delete useless code Signed-off-by: yubonluo <yubonluo@amazon.com> * optimize the code Signed-off-by: yubonluo <yubonluo@amazon.com> * optimize the code Signed-off-by: yubonluo <yubonluo@amazon.com> * Refactor association modal Signed-off-by: Kapian1234 <wanjinch@amazon.com> * Integrate modal with workspace detail page Signed-off-by: Lin Wang <wonglam@amazon.com> * Fix parent data source unchecked Signed-off-by: Lin Wang <wonglam@amazon.com> * Remove all tab and sort connections by name alphabetical Signed-off-by: Lin Wang <wonglam@amazon.com> * optimzie Signed-off-by: yubonluo <yubonluo@amazon.com> * Fix checked status disappear after modal tab change Signed-off-by: Lin Wang <wonglam@amazon.com> * optimize the dqc table Signed-off-by: yubonluo <yubonluo@amazon.com> * optimize the code Signed-off-by: yubonluo <yubonluo@amazon.com> * update the table css Signed-off-by: yubonluo <yubonluo@amazon.com> * Simplify options update logic Signed-off-by: Lin Wang <wonglam@amazon.com> * Add unit tests for AssociationDataSourceModal Signed-off-by: Lin Wang <wonglam@amazon.com> * add unit test Signed-off-by: yubonluo <yubonluo@amazon.com> * optimize the code Signed-off-by: yubonluo <yubonluo@amazon.com> * Add nested support in associate data source modal Signed-off-by: Lin Wang <wonglam@amazon.com> * delete useless code Signed-off-by: yubonluo <yubonluo@amazon.com> * Change back type Signed-off-by: Lin Wang <wonglam@amazon.com> * Update type in modal UT Signed-off-by: Lin Wang <wonglam@amazon.com> * optimize the code Signed-off-by: yubonluo <yubonluo@amazon.com> --------- Signed-off-by: yubonluo <yubonluo@amazon.com> Signed-off-by: Kapian1234 <wanjinch@amazon.com> Signed-off-by: Lin Wang <wonglam@amazon.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> Co-authored-by: Kapian1234 <wanjinch@amazon.com> Co-authored-by: Lin Wang <wonglam@amazon.com> Co-authored-by: Yulong Ruan <ruanyl@amazon.com> (cherry picked from commit 0798865) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

…7839) (#8010) * add dqc * add dircet query connections on the detail page * Changeset file for PR #7839 created/updated * delete useless code * optimize the code * optimize the code * Refactor association modal * Integrate modal with workspace detail page * Fix parent data source unchecked * Remove all tab and sort connections by name alphabetical * optimzie * Fix checked status disappear after modal tab change * optimize the dqc table * optimize the code * update the table css * Simplify options update logic * Add unit tests for AssociationDataSourceModal * add unit test * optimize the code * Add nested support in associate data source modal * delete useless code * Change back type * Update type in modal UT * optimize the code --------- (cherry picked from commit 0798865) Signed-off-by: yubonluo <yubonluo@amazon.com> 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: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> Co-authored-by: Kapian1234 <wanjinch@amazon.com> Co-authored-by: Lin Wang <wonglam@amazon.com> Co-authored-by: Yulong Ruan <ruanyl@amazon.com>

…7839) (#8010) * add dqc * add dircet query connections on the detail page * Changeset file for PR #7839 created/updated * delete useless code * optimize the code * optimize the code * Refactor association modal * Integrate modal with workspace detail page * Fix parent data source unchecked * Remove all tab and sort connections by name alphabetical * optimzie * Fix checked status disappear after modal tab change * optimize the dqc table * optimize the code * update the table css * Simplify options update logic * Add unit tests for AssociationDataSourceModal * add unit test * optimize the code * Add nested support in associate data source modal * delete useless code * Change back type * Update type in modal UT * optimize the code --------- (cherry picked from commit 0798865) Signed-off-by: yubonluo <yubonluo@amazon.com> 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: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> Co-authored-by: Kapian1234 <wanjinch@amazon.com> Co-authored-by: Lin Wang <wonglam@amazon.com> Co-authored-by: Yulong Ruan <ruanyl@amazon.com> (cherry picked from commit d88e3b0) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

…7839) (#8010) (#8048) * add dqc * add dircet query connections on the detail page * Changeset file for PR #7839 created/updated * delete useless code * optimize the code * optimize the code * Refactor association modal * Integrate modal with workspace detail page * Fix parent data source unchecked * Remove all tab and sort connections by name alphabetical * optimzie * Fix checked status disappear after modal tab change * optimize the dqc table * optimize the code * update the table css * Simplify options update logic * Add unit tests for AssociationDataSourceModal * add unit test * optimize the code * Add nested support in associate data source modal * delete useless code * Change back type * Update type in modal UT * optimize the code --------- (cherry picked from commit 0798865) (cherry picked from commit d88e3b0) Signed-off-by: yubonluo <yubonluo@amazon.com> 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: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> Co-authored-by: Kapian1234 <wanjinch@amazon.com> Co-authored-by: Lin Wang <wonglam@amazon.com> Co-authored-by: Yulong Ruan <ruanyl@amazon.com>

yubonluo added 3 commits August 23, 2024 10:57

add dqc

38b004a

Signed-off-by: yubonluo <yubonluo@amazon.com>

solve the code conflict

f19871f

Signed-off-by: yubonluo <yubonluo@amazon.com>

add dircet query connections on the detail page

689e0f6

Signed-off-by: yubonluo <yubonluo@amazon.com>

github-actions bot added the all-star-contributor label Aug 26, 2024

opensearch-changeset-bot bot and others added 3 commits August 26, 2024 06:55

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

13d5ba8

delete useless code

c8141e3

Signed-off-by: yubonluo <yubonluo@amazon.com>

Merge branch '2.17/support-DQC' of github.com:yubonluo/OpenSearch-Das…

51441e4

…hboards into 2.17/support-DQC

yubonluo added 2 commits August 30, 2024 14:48

resolve code conflict

651f43d

Signed-off-by: yubonluo <yubonluo@amazon.com>

optimize the code

5a1e5a5

Signed-off-by: yubonluo <yubonluo@amazon.com>

ruanyl previously approved these changes Aug 30, 2024

View reviewed changes

SuZhou-Joe reviewed Aug 30, 2024

View reviewed changes

SuZhou-Joe previously approved these changes Aug 30, 2024

View reviewed changes

wanglam and others added 2 commits August 30, 2024 17:36

Add nested support in associate data source modal

b29e3f7

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

delete useless code

c160ba2

Signed-off-by: yubonluo <yubonluo@amazon.com>

yubonluo dismissed stale reviews from SuZhou-Joe and ruanyl via c160ba2 August 30, 2024 09:42

wanglam and others added 4 commits August 30, 2024 17:48

Change back type

49517b8

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

Update type in modal UT

284a54a

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

Merge pull request #7 from wanglam/feat-support-nested-in-dqc-tab

5b99112

Add nested support in associate data source modal

optimize the code

a261a25

Signed-off-by: yubonluo <yubonluo@amazon.com>

SuZhou-Joe approved these changes Aug 30, 2024

View reviewed changes

ruanyl approved these changes Sep 2, 2024

View reviewed changes

ruanyl merged commit 0798865 into opensearch-project:main Sep 2, 2024

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

yubonluo mentioned this pull request Sep 4, 2024

[Manual Backport][2.x][Workspace]Enable direct query connections to support in workspace #7983

Closed

7 tasks

SuZhou-Joe added backport 2.x and removed backport 2.x failed backport labels Sep 5, 2024

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

[Backport 2.x] [Workspace] Enable direct query connections to support in workspace #8010

Merged

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Workspace] Enable direct query connections to support in workspace#7839

[Workspace] Enable direct query connections to support in workspace#7839
ruanyl merged 36 commits intoopensearch-project:mainfrom
yubonluo:2.17/support-DQC

yubonluo commented Aug 26, 2024 •

edited

Loading

Uh oh!

SuZhou-Joe Aug 30, 2024

Uh oh!

yubonluo Aug 30, 2024

Uh oh!

SuZhou-Joe Aug 30, 2024

Uh oh!

yubonluo commented Aug 30, 2024

Uh oh!

opensearch-trigger-bot bot commented Sep 2, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

yubonluo commented Aug 26, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Issues Resolved

Screenshot

Testing the changes

Changelog

Check List

Uh oh!

SuZhou-Joe Aug 30, 2024

Choose a reason for hiding this comment

Uh oh!

yubonluo Aug 30, 2024

Choose a reason for hiding this comment

Uh oh!

SuZhou-Joe Aug 30, 2024

Choose a reason for hiding this comment

Uh oh!

yubonluo commented Aug 30, 2024

Uh oh!

opensearch-trigger-bot bot commented Sep 2, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

yubonluo commented Aug 26, 2024 •

edited

Loading