[Multiple DataSource] DataSource creation and edition page improvement to better support registered auth types #6122

xinruiba · 2024-03-12T18:30:53Z

Description

This is the PR to improve state handle for "CreateDataSource" and "EditDataSource" pages. With this change registered auth type with be better supported in editDataSource page by showing initial credential info in the edit page

Issues Resolved

Partially fixes #5692, #5838

Screenshot

CreateDataSourceWithTokenExchange.mov

EditTestingForTokenExchange.mov

Testing the changes

For the first video, we do following steps to test dataSource creation:

Go to dataSource creation page
Fill in auth credentials for registered auth type
Test connection success
Create datasource success

For the second video, we do following steps to test dataSource edition:

Select a previously created dataSource
Update the auth type to registered auth, and fill in credential info
Test connection success
Submit change success

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

…itDataSource pages Signed-off-by: Xinrui Bai <xinruiba@amazon.com>

codecov · 2024-03-12T18:46:15Z

Codecov Report

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

Project coverage is 67.18%. Comparing base (3073926) to head (41ca221).

Files	Patch %	Lines
...rce/components/edit_form/edit_data_source_form.tsx	68.42%	2 Missing and 4 partials ⚠️
...components/create_form/create_data_source_form.tsx	66.66%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #6122   +/-   ##
=======================================
  Coverage   67.17%   67.18%           
=======================================
  Files        3328     3328           
  Lines       64448    64461   +13     
  Branches    10376    10376           
=======================================
+ Hits        43295    43306   +11     
- Misses      18621    18622    +1     
- Partials     2532     2533    +1

Flag	Coverage Δ
Linux_1	`31.74% <ø> (ø)`
Linux_2	`55.29% <ø> (ø)`
Linux_3	`44.76% <72.00%> (+0.01%)`	⬆️
Linux_4	`35.05% <0.00%> (-0.01%)`	⬇️
Windows_1	`31.77% <ø> (ø)`
Windows_2	`55.26% <ø> (ø)`
Windows_3	`44.78% <72.00%> (+0.01%)`	⬆️
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.

…ge and edit page Signed-off-by: Xinrui Bai <xinruiba@amazon.com>

Signed-off-by: Xinrui Bai <xinruiba@amazon.com>

...management/public/components/edit_data_source/components/edit_form/edit_data_source_form.tsx

Signed-off-by: Xinrui Bai <xinruiba@amazon.com>

Flyingliuhub · 2024-03-13T23:36:24Z

src/plugins/data_source_management/public/components/utils.test.ts

@@ -380,5 +380,71 @@ describe('DataSourceManagement: Utils.ts', () => {

      expect(deepEqual(registedAuthTypeCredentials, expectExtractedAuthCredentials));
    });
+
+    test('Should inherit value from registered field when credentail state not have registered field', () => {


Typo: credentail. Actually, there are only 8 files referenced by crendentialFormField. Can you please fix crendentialFormField in this PR, and then fix #6122 (comment) (31 files referenced)?

Sure, thanks for the comment.
Fixing.

crendentialFormField typo resolved, thanks.

Signed-off-by: Xinrui Bai <xinruiba@amazon.com>

…t to better support registered auth types (#6122) * [Token Exchange Unification] State update for createDataSource and editDataSource pages Signed-off-by: Xinrui Bai <xinruiba@amazon.com> * [Token Exchange Unification] rectify state for dataSource creation page and edit page Signed-off-by: Xinrui Bai <xinruiba@amazon.com> * [UT] Add more test cases for util functions Signed-off-by: Xinrui Bai <xinruiba@amazon.com> * [Token Exchange Unification] Update dataSource bottom banner control Signed-off-by: Xinrui Bai <xinruiba@amazon.com> * Update changefile.md Signed-off-by: Xinrui Bai <xinruiba@amazon.com> * Add comments Signed-off-by: Xinrui Bai <xinruiba@amazon.com> * Code review change, fix typo Signed-off-by: Xinrui Bai <xinruiba@amazon.com> * Resolve comments, update typo in test cases Signed-off-by: Xinrui Bai <xinruiba@amazon.com> --------- Signed-off-by: Xinrui Bai <xinruiba@amazon.com> (cherry picked from commit 31e8481) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> # Conflicts: # CHANGELOG.md

…t to better support registered auth types (#6122) (#6145) * [Token Exchange Unification] State update for createDataSource and editDataSource pages Signed-off-by: Xinrui Bai <xinruiba@amazon.com> * [Token Exchange Unification] rectify state for dataSource creation page and edit page Signed-off-by: Xinrui Bai <xinruiba@amazon.com> * [UT] Add more test cases for util functions Signed-off-by: Xinrui Bai <xinruiba@amazon.com> * [Token Exchange Unification] Update dataSource bottom banner control Signed-off-by: Xinrui Bai <xinruiba@amazon.com> * Update changefile.md Signed-off-by: Xinrui Bai <xinruiba@amazon.com> * Add comments Signed-off-by: Xinrui Bai <xinruiba@amazon.com> * Code review change, fix typo Signed-off-by: Xinrui Bai <xinruiba@amazon.com> * Resolve comments, update typo in test cases Signed-off-by: Xinrui Bai <xinruiba@amazon.com> --------- Signed-off-by: Xinrui Bai <xinruiba@amazon.com> (cherry picked from commit 31e8481) 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>

[Token Exchange Unification] State update for createDataSource and ed…

679cee0

…itDataSource pages Signed-off-by: Xinrui Bai <xinruiba@amazon.com>

github-actions bot added the valued-contributor label Mar 12, 2024

xinruiba and others added 4 commits March 12, 2024 20:34

[Token Exchange Unification] rectify state for dataSource creation pa…

83e24f4

…ge and edit page Signed-off-by: Xinrui Bai <xinruiba@amazon.com>

Merge branch 'main' into xinrui_TokenExchangeUnification_FormValidation

562f458

[UT] Add more test cases for util functions

abdfa2d

Signed-off-by: Xinrui Bai <xinruiba@amazon.com>

[Token Exchange Unification] Update dataSource bottom banner control

c62847e

Signed-off-by: Xinrui Bai <xinruiba@amazon.com>

xinruiba changed the title ~~[Multiple DataSource] State update for createDataSource and edit DataSource pages~~ [Multiple DataSource] Create DataSource form and Edit DataSource form state update and validation Mar 12, 2024

xinruiba changed the title ~~[Multiple DataSource] Create DataSource form and Edit DataSource form state update and validation~~ [Multiple DataSource] DataSource creation and edition page improvement to better support registered auth types Mar 12, 2024

Update changefile.md

500c375

Signed-off-by: Xinrui Bai <xinruiba@amazon.com>

xinruiba marked this pull request as ready for review March 13, 2024 00:25

xinruiba requested review from ananzh, kavilla, AMoo-Miki, ashwin-pc, joshuarrrr, abbyhu2000, zengyan-amazon, kristenTian, zhongnansu, manasvinibs, ZilongX, Flyingliuhub, BSFishy, curq, bandinib-amzn, SuZhou-Joe, ruanyl and BionIT as code owners March 13, 2024 00:25

xinruiba added the backport 2.x label Mar 13, 2024

xinruiba added v2.13.0 multiple datasource multiple datasource project labels Mar 13, 2024

Merge branch 'main' into xinrui_TokenExchangeUnification_FormValidation

a392dd3

yujin-emma approved these changes Mar 13, 2024

View reviewed changes

ruanyl reviewed Mar 13, 2024

View reviewed changes

Add comments

be1abac

Signed-off-by: Xinrui Bai <xinruiba@amazon.com>

bandinib-amzn previously approved these changes Mar 13, 2024

View reviewed changes

Flyingliuhub reviewed Mar 13, 2024

View reviewed changes

xinruiba and others added 2 commits March 13, 2024 20:45

Merge branch 'main' into xinrui_TokenExchangeUnification_FormValidation

9516901

Code review change, fix typo

5dbc943

Signed-off-by: Xinrui Bai <xinruiba@amazon.com>

xinruiba dismissed bandinib-amzn’s stale review via 5dbc943 March 14, 2024 04:14

xinruiba and others added 2 commits March 14, 2024 04:17

Resolve comments, update typo in test cases

c104509

Signed-off-by: Xinrui Bai <xinruiba@amazon.com>

Merge branch 'main' into xinrui_TokenExchangeUnification_FormValidation

41ca221

Flyingliuhub approved these changes Mar 14, 2024

View reviewed changes

bandinib-amzn approved these changes Mar 14, 2024

View reviewed changes

Flyingliuhub merged commit 31e8481 into opensearch-project:main Mar 14, 2024
68 checks passed

opensearch-trigger-bot bot mentioned this pull request Mar 14, 2024

[Backport 2.x] [Multiple DataSource] DataSource creation and edition page improvement to better support registered auth types #6145

Merged

xinruiba mentioned this pull request Mar 15, 2024

[Multiple Datasource] Handle form values(request payload) if the selected type is available in the authentication registry. #6049

Merged

7 tasks

xinruiba deleted the xinrui_TokenExchangeUnification_FormValidation branch March 18, 2024 05:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Multiple DataSource] DataSource creation and edition page improvement to better support registered auth types #6122

[Multiple DataSource] DataSource creation and edition page improvement to better support registered auth types #6122

xinruiba commented Mar 12, 2024 •

edited

Loading

codecov bot commented Mar 12, 2024 •

edited

Loading

Flyingliuhub Mar 13, 2024

xinruiba Mar 14, 2024

xinruiba Mar 14, 2024 •

edited

Loading

[Multiple DataSource] DataSource creation and edition page improvement to better support registered auth types #6122

[Multiple DataSource] DataSource creation and edition page improvement to better support registered auth types #6122

Conversation

xinruiba commented Mar 12, 2024 • edited Loading

Description

Issues Resolved

Screenshot

Testing the changes

Check List

codecov bot commented Mar 12, 2024 • edited Loading

Codecov Report

Flyingliuhub Mar 13, 2024

Choose a reason for hiding this comment

xinruiba Mar 14, 2024

Choose a reason for hiding this comment

xinruiba Mar 14, 2024 • edited Loading

Choose a reason for hiding this comment

xinruiba commented Mar 12, 2024 •

edited

Loading

codecov bot commented Mar 12, 2024 •

edited

Loading

xinruiba Mar 14, 2024 •

edited

Loading