[workspace]add 2 step loading in 'Associate data sources' modal #8999

Qxisylolo · 2024-12-03T07:56:39Z

Description

This pr addresses the issue where a single data source has numerous connections, causing it to take more than 20 seconds to list the available data sources.
When a data source has numerous dqc connections, it will display the data source first with a badge 'loading' which will be replaced by '+n related' after dqc connections are completely loaded

Screenshot(updated)

2024-12-31.14.41.32.mov

Testing the changes

Changelog

feat: Add two-steps loading for associating data sources

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: Qxisylolo <[email protected]>

codecov · 2024-12-03T08:11:56Z

Codecov Report

Attention: Patch coverage is 82.92683% with 7 lines in your changes missing coverage. Please review.

Project coverage is 60.94%. Comparing base (f06a478) to head (58c3407).
Report is 31 commits behind head on main.

Files with missing lines	Patch %	Lines
...urce_association/association_data_source_modal.tsx	85.71%	2 Missing and 3 partials ⚠️
src/plugins/workspace/public/utils.ts	66.66%	2 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #8999      +/-   ##
==========================================
+ Coverage   60.86%   60.94%   +0.08%     
==========================================
  Files        3808     3809       +1     
  Lines       91209    91297      +88     
  Branches    14410    14416       +6     
==========================================
+ Hits        55514    55641     +127     
+ Misses      32154    32097      -57     
- Partials     3541     3559      +18

Flag	Coverage Δ
Linux_1	`28.99% <82.92%> (-0.03%)`	⬇️
Linux_2	`56.45% <ø> (+0.06%)`	⬆️
Linux_3	`37.96% <ø> (?)`
Linux_4	`29.03% <ø> (+0.01%)`	⬆️
Windows_1	`29.01% <82.92%> (-0.03%)`	⬇️
Windows_2	`56.40% <ø> (+0.06%)`	⬆️
Windows_3	`37.97% <ø> (+0.03%)`	⬆️
Windows_4	`29.03% <ø> (+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.

Signed-off-by: Qxisylolo <[email protected]>

ruanyl · 2024-12-24T07:56:31Z

...lugins/workspace/public/components/data_source_association/association_data_source_modal.tsx

@@ -25,7 +25,11 @@ import {
 import { FormattedMessage } from 'react-intl';
 import { i18n } from '@osd/i18n';

-import { getDataSourcesList, fetchDataSourceConnections } from '../../utils';


I think we can remove function fetchDataSourceConnections if it's not used anymore.

fetchDataSourceConnections is also required in DataSourceTable, so perhaps we should keep it.

src/plugins/workspace/public/utils.ts

...lugins/workspace/public/components/data_source_association/association_data_source_modal.tsx

Signed-off-by: Qxisylolo <[email protected]>

Hailong-am · 2025-01-03T06:34:47Z

...lugins/workspace/public/components/data_source_association/association_data_source_modal.tsx

+      selectedConnectionIds.includes(connection.id)
+        ? ('on' as const)
+        : undefined,
+    prepend: <ConnectionIcon connection={connection} logos={logos} />,


do we need to keep the style of indent 16px?

Thanks for the comment, I think the indent is set by default in eui.

...lugins/workspace/public/components/data_source_association/association_data_source_modal.tsx

Signed-off-by: Qxisylolo <[email protected]>

...lugins/workspace/public/components/data_source_association/association_data_source_modal.tsx

Signed-off-by: Qxisylolo <[email protected]>

* add 2 step loading Signed-off-by: Qxisylolo <[email protected]> * Changeset file for PR #8999 created/updated * ifx ut Signed-off-by: Qxisylolo <[email protected]> * resolve comments Signed-off-by: Qxisylolo <[email protected]> * delete functions Signed-off-by: Qxisylolo <[email protected]> * separately fetch dqc Signed-off-by: Qxisylolo <[email protected]> * small mistakes Signed-off-by: Qxisylolo <[email protected]> * dqc should not show data source without dqc Signed-off-by: Qxisylolo <[email protected]> * fix tests Signed-off-by: Qxisylolo <[email protected]> * new update Signed-off-by: Qxisylolo <[email protected]> * delete non-used import Signed-off-by: Qxisylolo <[email protected]> * delete if Signed-off-by: Qxisylolo <[email protected]> * add try catch Signed-off-by: Qxisylolo <[email protected]> --------- Signed-off-by: Qxisylolo <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> Co-authored-by: Yulong Ruan <[email protected]> (cherry picked from commit eff5b27) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

… (#9163) * add 2 step loading * Changeset file for PR #8999 created/updated * ifx ut * resolve comments * delete functions * separately fetch dqc * small mistakes * dqc should not show data source without dqc * fix tests * new update * delete non-used import * delete if * add try catch --------- (cherry picked from commit eff5b27) Signed-off-by: Qxisylolo <[email protected]> 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: Yulong Ruan <[email protected]>

…search-project#8999) * add 2 step loading Signed-off-by: Qxisylolo <[email protected]> * Changeset file for PR opensearch-project#8999 created/updated * ifx ut Signed-off-by: Qxisylolo <[email protected]> * resolve comments Signed-off-by: Qxisylolo <[email protected]> * delete functions Signed-off-by: Qxisylolo <[email protected]> * separately fetch dqc Signed-off-by: Qxisylolo <[email protected]> * small mistakes Signed-off-by: Qxisylolo <[email protected]> * dqc should not show data source without dqc Signed-off-by: Qxisylolo <[email protected]> * fix tests Signed-off-by: Qxisylolo <[email protected]> * new update Signed-off-by: Qxisylolo <[email protected]> * delete non-used import Signed-off-by: Qxisylolo <[email protected]> * delete if Signed-off-by: Qxisylolo <[email protected]> * add try catch Signed-off-by: Qxisylolo <[email protected]> --------- Signed-off-by: Qxisylolo <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> Co-authored-by: Yulong Ruan <[email protected]>

add 2 step loading

1ed0922

Signed-off-by: Qxisylolo <[email protected]>

github-actions bot added the seasoned-contributor label Dec 3, 2024

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

6c87e65

Qxisylolo changed the title ~~add 2 step loading~~ [workspace]add 2 step loading in 'Associate data sources' modal Dec 3, 2024

ifx ut

df5de09

Signed-off-by: Qxisylolo <[email protected]>

Qxisylolo marked this pull request as ready for review December 4, 2024 02:19

Qxisylolo force-pushed the feat/delay_in-_loading_data_sources branch from a3c139c to 9b4259d Compare December 11, 2024 10:28

Merge branch 'main' into feat/delay_in-_loading_data_sources

0136501

ruanyl reviewed Dec 24, 2024

View reviewed changes

ruanyl previously approved these changes Dec 24, 2024

View reviewed changes

SuZhou-Joe added the workspace label Dec 26, 2024

SuZhou-Joe reviewed Dec 30, 2024

View reviewed changes

src/plugins/workspace/public/utils.ts Show resolved Hide resolved

SuZhou-Joe reviewed Dec 30, 2024

View reviewed changes

...lugins/workspace/public/components/data_source_association/association_data_source_modal.tsx Show resolved Hide resolved

SuZhou-Joe reviewed Dec 30, 2024

View reviewed changes

...lugins/workspace/public/components/data_source_association/association_data_source_modal.tsx Outdated Show resolved Hide resolved

dqc should not show data source without dqc

2f9bce0

Signed-off-by: Qxisylolo <[email protected]>

Qxisylolo dismissed ruanyl’s stale review via 2f9bce0 December 30, 2024 23:10

Qxisylolo added 3 commits December 31, 2024 11:39

fix tests

47f05b1

Signed-off-by: Qxisylolo <[email protected]>

new update

c830c34

Signed-off-by: Qxisylolo <[email protected]>

delete non-used import

ac0e00f

Signed-off-by: Qxisylolo <[email protected]>

Hailong-am previously approved these changes Jan 3, 2025

View reviewed changes

SuZhou-Joe reviewed Jan 3, 2025

View reviewed changes

...lugins/workspace/public/components/data_source_association/association_data_source_modal.tsx Outdated Show resolved Hide resolved

SuZhou-Joe reviewed Jan 3, 2025

View reviewed changes

...lugins/workspace/public/components/data_source_association/association_data_source_modal.tsx Outdated Show resolved Hide resolved

SuZhou-Joe reviewed Jan 3, 2025

View reviewed changes

...lugins/workspace/public/components/data_source_association/association_data_source_modal.tsx Outdated Show resolved Hide resolved

delete if

7764cfd

Signed-off-by: Qxisylolo <[email protected]>

Qxisylolo dismissed Hailong-am’s stale review via 7764cfd January 3, 2025 09:02

SuZhou-Joe reviewed Jan 6, 2025

View reviewed changes

...lugins/workspace/public/components/data_source_association/association_data_source_modal.tsx Outdated Show resolved Hide resolved

add try catch

58c3407

Signed-off-by: Qxisylolo <[email protected]>

ruanyl approved these changes Jan 8, 2025

View reviewed changes

SuZhou-Joe approved these changes Jan 9, 2025

View reviewed changes

SuZhou-Joe added backport 2.x v2.19.0 labels Jan 9, 2025

SuZhou-Joe merged commit eff5b27 into opensearch-project:main Jan 9, 2025
73 checks passed

opensearch-trigger-bot bot mentioned this pull request Jan 9, 2025

[Backport 2.x] [workspace]add 2 step loading in 'Associate data sources' modal #9163

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[workspace]add 2 step loading in 'Associate data sources' modal #8999

[workspace]add 2 step loading in 'Associate data sources' modal #8999

Qxisylolo commented Dec 3, 2024 •

edited

Loading

codecov bot commented Dec 3, 2024 •

edited

Loading

ruanyl Dec 24, 2024

Qxisylolo Dec 30, 2024

Hailong-am Jan 3, 2025

Qxisylolo Jan 3, 2025 •

edited

Loading

[workspace]add 2 step loading in 'Associate data sources' modal #8999

[workspace]add 2 step loading in 'Associate data sources' modal #8999

Conversation

Qxisylolo commented Dec 3, 2024 • edited Loading

Description

Screenshot(updated)

Testing the changes

Changelog

Check List

codecov bot commented Dec 3, 2024 • edited Loading

Codecov Report

ruanyl Dec 24, 2024

Choose a reason for hiding this comment

Qxisylolo Dec 30, 2024

Choose a reason for hiding this comment

Hailong-am Jan 3, 2025

Choose a reason for hiding this comment

Qxisylolo Jan 3, 2025 • edited Loading

Choose a reason for hiding this comment

Qxisylolo commented Dec 3, 2024 •

edited

Loading

codecov bot commented Dec 3, 2024 •

edited

Loading

Qxisylolo Jan 3, 2025 •

edited

Loading