[Discover - datasource selector] Add extension group title and modal #5815

mengweieric · 2024-02-06T16:29:02Z

Description

Add extension group title to non-index data source groups and present a modal to users upon selecting non-index pattern data sources.

Issues Resolved

Screenshot

Testing the changes

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-02-06T17:32:19Z

Codecov Report

Attention: Patch coverage is 92.30769% with 1 lines in your changes are missing coverage. Please review.

Project coverage is 67.27%. Comparing base (a9e874f) to head (78a1a32).
Report is 29 commits behind head on main.

Files	Patch %	Lines
...rces/datasource_selector/datasource_selectable.tsx	66.66%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #5815      +/-   ##
==========================================
+ Coverage   67.21%   67.27%   +0.05%     
==========================================
  Files        3344     3345       +1     
  Lines       64792    64803      +11     
  Branches    10427    10428       +1     
==========================================
+ Hits        43552    43598      +46     
+ Misses      18697    18653      -44     
- Partials     2543     2552       +9

Flag	Coverage Δ
Linux_2	`55.45% <ø> (ø)`
Linux_3	`?`
Linux_4	`?`
Windows_1	`31.66% <0.00%> (-0.01%)`	⬇️
Windows_2	`55.41% <ø> (?)`
Windows_3	`44.79% <92.30%> (+0.09%)`	⬆️
Windows_4	`35.05% <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.

src/plugins/data/public/data_sources/datasource_selector/datasource_selectable.tsx

src/plugins/data_explorer/public/components/sidebar/index.tsx

ashwin-pc

Spoke to @mengweieric offline. The change in here is not ideal and is mostly a result of the workaround we have to redirect users to different apps. Since the component is already marked as experimental and has to be mostly rewritten post 2.12, these changes are okay for now since they do not prevent us from changing them in another minor release.

src/plugins/data/public/data_sources/datasource_selector/datasource_selectable.tsx

src/plugins/data_explorer/public/components/sidebar/index.tsx

Signed-off-by: Eric <menwe@amazon.com>

ashwin-pc

Save for that test this looks good for the 2.13 temporary redirection.

src/plugins/data_explorer/public/components/sidebar/index.test.tsx

Signed-off-by: Eric <menwe@amazon.com>

AMoo-Miki · 2024-03-20T18:50:44Z

src/plugins/data_explorer/public/components/sidebar/index.tsx

+  const redirectToLogExplorer = useCallback(
+    (dsName: string, dsType: string) => {
+      return application.navigateToUrl(
+        `../observability-logs#/explorer?datasourceName=${dsName}&datasourceType=${dsType}`


Does this assume that the plugin handling observability-logs is always installed?

The s3 datasource with this redirection is for now only be able to be registered through observability plugin. Therefore it can only see s3 datasources when observability (log explorer as part of it) presented.

What happens if I have an S3 DS configured and then connect to the cluster using an OSD that doesn't have the observability plugin? On the surface, I think it will show the DS and attempt to redirect. This should check if the plugin is available and if not, fail to redirect, and also disable selecting the DS.

PS, I think due to rareness of this coming up, this can be filed as an issue for enhancing this; it is not a blocker.

yes, currently, there is no way to register s3 datasources outside of Observability plugin. Soon in next release probably, discover will be the only data exploration interface for s3 datasources where this temporary redirection will be removed. I feel it should also make sense to users that whatever datasource showed up in discover datasource selector is supported and available through using discover to avoid confusion.

Let's make sure we have an issue to track this @mengweieric

…5815) * add log explorer re-directon modal Signed-off-by: Eric <menwe@amazon.com> * adjustments to comments Signed-off-by: Eric <menwe@amazon.com> * add one missing i18n Signed-off-by: Eric <menwe@amazon.com> * add redirection text to group title Signed-off-by: Eric <menwe@amazon.com> * include changes in changelog Signed-off-by: Eric <menwe@amazon.com> * remove redundent title addition and unnecessary modal toggle functions Signed-off-by: Eric <menwe@amazon.com> * remove one comment Signed-off-by: Eric <menwe@amazon.com> * add i18n Signed-off-by: Eric <menwe@amazon.com> * add unit tests for modal Signed-off-by: Eric <menwe@amazon.com> * test id change Signed-off-by: Eric <menwe@amazon.com> * add devDependencies for tests Signed-off-by: Eric <menwe@amazon.com> * use open confirm api and move mock file to discover mock folder Signed-off-by: Eric <menwe@amazon.com> * remove unused type Signed-off-by: Eric <menwe@amazon.com> * remove modal for log explorer redirection Signed-off-by: Eric <menwe@amazon.com> * modify changelog Signed-off-by: Eric <menwe@amazon.com> * remove modal test Signed-off-by: Eric <menwe@amazon.com> * remove one modal related test Signed-off-by: Eric <menwe@amazon.com> --------- Signed-off-by: Eric <menwe@amazon.com> (cherry picked from commit a0eaf84) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> # Conflicts: # CHANGELOG.md

…pensearch-project#5815) * add log explorer re-directon modal Signed-off-by: Eric <menwe@amazon.com> * adjustments to comments Signed-off-by: Eric <menwe@amazon.com> * add one missing i18n Signed-off-by: Eric <menwe@amazon.com> * add redirection text to group title Signed-off-by: Eric <menwe@amazon.com> * include changes in changelog Signed-off-by: Eric <menwe@amazon.com> * remove redundent title addition and unnecessary modal toggle functions Signed-off-by: Eric <menwe@amazon.com> * remove one comment Signed-off-by: Eric <menwe@amazon.com> * add i18n Signed-off-by: Eric <menwe@amazon.com> * add unit tests for modal Signed-off-by: Eric <menwe@amazon.com> * test id change Signed-off-by: Eric <menwe@amazon.com> * add devDependencies for tests Signed-off-by: Eric <menwe@amazon.com> * use open confirm api and move mock file to discover mock folder Signed-off-by: Eric <menwe@amazon.com> * remove unused type Signed-off-by: Eric <menwe@amazon.com> * remove modal for log explorer redirection Signed-off-by: Eric <menwe@amazon.com> * modify changelog Signed-off-by: Eric <menwe@amazon.com> * remove modal test Signed-off-by: Eric <menwe@amazon.com> * remove one modal related test Signed-off-by: Eric <menwe@amazon.com> --------- Signed-off-by: Eric <menwe@amazon.com>

…5815) (#6359) * add log explorer re-directon modal Signed-off-by: Eric <menwe@amazon.com> * adjustments to comments Signed-off-by: Eric <menwe@amazon.com> * add one missing i18n Signed-off-by: Eric <menwe@amazon.com> * add redirection text to group title Signed-off-by: Eric <menwe@amazon.com> * include changes in changelog Signed-off-by: Eric <menwe@amazon.com> * remove redundent title addition and unnecessary modal toggle functions Signed-off-by: Eric <menwe@amazon.com> * remove one comment Signed-off-by: Eric <menwe@amazon.com> * add i18n Signed-off-by: Eric <menwe@amazon.com> * add unit tests for modal Signed-off-by: Eric <menwe@amazon.com> * test id change Signed-off-by: Eric <menwe@amazon.com> * add devDependencies for tests Signed-off-by: Eric <menwe@amazon.com> * use open confirm api and move mock file to discover mock folder Signed-off-by: Eric <menwe@amazon.com> * remove unused type Signed-off-by: Eric <menwe@amazon.com> * remove modal for log explorer redirection Signed-off-by: Eric <menwe@amazon.com> * modify changelog Signed-off-by: Eric <menwe@amazon.com> * remove modal test Signed-off-by: Eric <menwe@amazon.com> * remove one modal related test Signed-off-by: Eric <menwe@amazon.com> --------- Signed-off-by: Eric <menwe@amazon.com> (cherry picked from commit a0eaf84) 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>

github-actions bot added the repeat-contributor label Feb 6, 2024

mengweieric marked this pull request as ready for review February 6, 2024 19:34

mengweieric requested review from ananzh, kavilla, AMoo-Miki, ashwin-pc, joshuarrrr, abbyhu2000, zengyan-amazon, kristenTian, zhongnansu, manasvinibs, ZilongX, Flyingliuhub, BSFishy, curq, bandinib-amzn and SuZhou-Joe as code owners February 6, 2024 19:34

mengweieric changed the title ~~Feature/redirection modal~~ [Discover - datasource selector] Add extension group title and modal Feb 6, 2024

ashwin-pc reviewed Feb 6, 2024

View reviewed changes

src/plugins/data/public/data_sources/datasource_selector/datasource_selectable.tsx Outdated Show resolved Hide resolved

src/plugins/data_explorer/public/components/sidebar/index.tsx Outdated Show resolved Hide resolved

mengweieric mentioned this pull request Feb 6, 2024

Add modal for DQL language opensearch-project/dashboards-observability#1420

Merged

6 tasks

ashwin-pc added backport 2.x v2.12.0 labels Feb 6, 2024

ashwin-pc previously approved these changes Feb 6, 2024

View reviewed changes

ashwin-pc added the backport 2.12 label Feb 7, 2024

ashwin-pc dismissed their stale review via c88ded9 February 8, 2024 00:34

AMoo-Miki reviewed Feb 8, 2024

View reviewed changes

src/plugins/data/public/data_sources/datasource_selector/datasource_selectable.tsx Outdated Show resolved Hide resolved

AMoo-Miki reviewed Feb 8, 2024

View reviewed changes

src/plugins/data_explorer/public/components/sidebar/index.tsx Outdated Show resolved Hide resolved

SuZhou-Joe reviewed Feb 8, 2024

View reviewed changes

src/plugins/data_explorer/public/components/sidebar/index.tsx Show resolved Hide resolved

mengweieric added 11 commits March 15, 2024 21:34

remove redundent title addition and unnecessary modal toggle functions

5babb73

Signed-off-by: Eric <menwe@amazon.com>

remove one comment

40b1a94

Signed-off-by: Eric <menwe@amazon.com>

add i18n

ac67245

Signed-off-by: Eric <menwe@amazon.com>

add unit tests for modal

3486197

Signed-off-by: Eric <menwe@amazon.com>

test id change

9b1cc32

Signed-off-by: Eric <menwe@amazon.com>

add devDependencies for tests

7cdfbf0

Signed-off-by: Eric <menwe@amazon.com>

use open confirm api and move mock file to discover mock folder

999efa4

Signed-off-by: Eric <menwe@amazon.com>

remove unused type

f83b1a1

Signed-off-by: Eric <menwe@amazon.com>

remove modal for log explorer redirection

cfeeb62

Signed-off-by: Eric <menwe@amazon.com>

modify changelog

3295dc0

Signed-off-by: Eric <menwe@amazon.com>

remove modal test

8be8a1c

Signed-off-by: Eric <menwe@amazon.com>

mengweieric force-pushed the feature/redirection-modal branch from 54fc2ef to 8be8a1c Compare March 15, 2024 21:34

ashwin-pc previously approved these changes Mar 18, 2024

View reviewed changes

src/plugins/data_explorer/public/components/sidebar/index.test.tsx Outdated Show resolved Hide resolved

remove one modal related test

1dc902f

Signed-off-by: Eric <menwe@amazon.com>

mengweieric dismissed ashwin-pc’s stale review via 1dc902f March 18, 2024 18:02

mengweieric added 2 commits March 18, 2024 11:42

Merge branch 'main' into feature/redirection-modal

b59f833

Merge branch 'main' into feature/redirection-modal

78a1a32

ashwin-pc added the v2.13.0 label Mar 18, 2024

ashwin-pc approved these changes Mar 19, 2024

View reviewed changes

AMoo-Miki reviewed Mar 20, 2024

View reviewed changes

kavilla added v2.14.0 and removed v2.13.0 labels Apr 1, 2024

AMoo-Miki approved these changes Apr 4, 2024

View reviewed changes

ashwin-pc merged commit a0eaf84 into opensearch-project:main Apr 5, 2024
76 checks passed

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

[Backport 2.x] [Discover - datasource selector] Add extension group title and modal #6359

Merged

SuZhou-Joe mentioned this pull request Apr 7, 2024

Fix: cypress failure ruanyl/OpenSearch-Dashboards#319

Merged

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Discover - datasource selector] Add extension group title and modal #5815

[Discover - datasource selector] Add extension group title and modal #5815

mengweieric commented Feb 6, 2024 •

edited

Loading

codecov bot commented Feb 6, 2024 •

edited

Loading

ashwin-pc left a comment

ashwin-pc left a comment

AMoo-Miki Mar 20, 2024

mengweieric Mar 20, 2024

AMoo-Miki Mar 25, 2024 •

edited

Loading

mengweieric Mar 25, 2024 •

edited

Loading

AMoo-Miki Apr 4, 2024

[Discover - datasource selector] Add extension group title and modal #5815

[Discover - datasource selector] Add extension group title and modal #5815

Conversation

mengweieric commented Feb 6, 2024 • edited Loading

Description

Issues Resolved

Screenshot

Testing the changes

Check List

codecov bot commented Feb 6, 2024 • edited Loading

Codecov Report

ashwin-pc left a comment

Choose a reason for hiding this comment

ashwin-pc left a comment

Choose a reason for hiding this comment

AMoo-Miki Mar 20, 2024

Choose a reason for hiding this comment

mengweieric Mar 20, 2024

Choose a reason for hiding this comment

AMoo-Miki Mar 25, 2024 • edited Loading

Choose a reason for hiding this comment

mengweieric Mar 25, 2024 • edited Loading

Choose a reason for hiding this comment

AMoo-Miki Apr 4, 2024

Choose a reason for hiding this comment

mengweieric commented Feb 6, 2024 •

edited

Loading

codecov bot commented Feb 6, 2024 •

edited

Loading

AMoo-Miki Mar 25, 2024 •

edited

Loading

mengweieric Mar 25, 2024 •

edited

Loading