Handle data sources and advanced settings as global object. #313

SuZhou-Joe · 2024-04-03T05:53:56Z

Description

Handle data source and config as global objects.

Listing data source from global
Create data source into global
When import, gives error if user tries to import global objects into a workspace.

Issues Resolved

Screenshot

Import data source

Copy data source

Create data source in workspace(in normal flow, user won't be able to visit data source management page inside workspace)

Create advanced settings in workspace(in normal flow, user won't be able to visit advanced settings page inside workspace)

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

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

codecov-commenter · 2024-04-03T06:27:30Z

Codecov Report

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

Project coverage is 32.89%. Comparing base (0f34d69) to head (b1494b1).
Report is 18 commits behind head on workspace-pr-integr.

Files	Patch %	Lines
...ver/saved_objects/workspace_id_consumer_wrapper.ts	73.68%	2 Missing and 3 partials ⚠️

Additional details and impacted files

@@                   Coverage Diff                   @@
##           workspace-pr-integr     #313      +/-   ##
=======================================================
- Coverage                35.17%   32.89%   -2.28%     
=======================================================
  Files                     1885     2243     +358     
  Lines                    36421    45522    +9101     
  Branches                  6672     7153     +481     
=======================================================
+ Hits                     12810    14976    +2166     
- Misses                   22761    29816    +7055     
+ Partials                   850      730     -120

Flag	Coverage Δ
_1	`32.89% <73.68%> (?)`
_4	`?`

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: SuZhou-Joe <suzhou@amazon.com>

…out-workspace

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

…out-workspace

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

...ugins/workspace/server/saved_objects/integration_tests/workspace_id_consumer_wrapper.test.ts

src/plugins/workspace/server/saved_objects/workspace_id_consumer_wrapper.ts

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

src/plugins/workspace/server/saved_objects/workspace_id_consumer_wrapper.ts

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

...ugins/workspace/server/saved_objects/integration_tests/workspace_id_consumer_wrapper.test.ts

ruanyl

Does it sound more logical if we put these changes to the workspace conflict check wrapper?

src/plugins/workspace/server/saved_objects/workspace_id_consumer_wrapper.test.ts

src/plugins/workspace/server/saved_objects/workspace_id_consumer_wrapper.ts

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

SuZhou-Joe · 2024-04-17T08:49:06Z

Does it sound more logical if we put these changes to the workspace conflict check wrapper?

Exactly, I forgot why I wrote the logic into workspace_id_consumer. We should put these logic into conflict wrapper. Done for that.

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

…t. (opensearch-project#6524) * Handle data sources and advanced settings as global object. (#313) * feat: POC implementation Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: add some comment Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: revert dependency Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: update comment Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: address one TODO Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: address TODO Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: add unit test Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: some special logic on specific operation Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: add integration test Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: declare workspaces as empty array for advanced settings Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: unified workspaces parameters when parsing from router Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: improve code coverage Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: declare workspaces as null Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: use unified types Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: update comment Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: remove null Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: address comments Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: use request app to store request workspace id Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: use app state to store request workspace id Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: remove workspaces when listing data sources Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: remove useless code change Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: throw error if the type is not allowed Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: add unit test Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: add integration test Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: change the implementation Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: remove useless change Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: remove useless change Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: add integration test Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * fix: unit test Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: add error message Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * fix: integration test Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * fix: integration test Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: remove useless change Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: add test case and add restrict on create method Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: change type Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: change comment Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: optimize test Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * refactor: move logic to conflict check wrapper Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: remove useless change Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * fix: unit test Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * fix: unit test Signed-off-by: SuZhou-Joe <suzhou@amazon.com> --------- Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * Changeset file for PR opensearch-project#6524 created/updated * Apply suggestions from code review Co-authored-by: Lu Yu <nluyu@amazon.com> Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: optimize based on comment Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: remove useless default value Signed-off-by: SuZhou-Joe <suzhou@amazon.com> --------- Signed-off-by: SuZhou-Joe <suzhou@amazon.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> Co-authored-by: Lu Yu <nluyu@amazon.com>

…t. (opensearch-project#6524) (opensearch-project#6611) * Handle data sources and advanced settings as global object. (#313) * feat: POC implementation * feat: add some comment * feat: revert dependency * feat: update comment * feat: address one TODO * feat: address TODO * feat: add unit test * feat: some special logic on specific operation * feat: add integration test * feat: declare workspaces as empty array for advanced settings * feat: unified workspaces parameters when parsing from router * feat: improve code coverage * feat: declare workspaces as null * feat: use unified types * feat: update comment * feat: remove null * feat: address comments * feat: use request app to store request workspace id * feat: use app state to store request workspace id * feat: remove workspaces when listing data sources * feat: remove useless code change * feat: throw error if the type is not allowed * feat: add unit test * feat: add integration test * feat: change the implementation * feat: remove useless change * feat: remove useless change * feat: add integration test * fix: unit test * feat: add error message * fix: integration test * fix: integration test * feat: remove useless change * feat: add test case and add restrict on create method * feat: change type * feat: change comment * feat: optimize test * refactor: move logic to conflict check wrapper * feat: remove useless change * fix: unit test * fix: unit test --------- * Changeset file for PR opensearch-project#6524 created/updated * Apply suggestions from code review * feat: optimize based on comment * feat: remove useless default value --------- (cherry picked from commit da88296) Signed-off-by: SuZhou-Joe <suzhou@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: Lu Yu <nluyu@amazon.com>

SuZhou-Joe added 20 commits April 1, 2024 17:13

feat: POC implementation

66d6096

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: add some comment

d275f61

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: revert dependency

65f6be3

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: update comment

9c5d2d9

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: address one TODO

d5638ff

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: address TODO

45589cf

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: add unit test

5d990c8

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: some special logic on specific operation

08dc9e2

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: add integration test

d3cccb8

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: declare workspaces as empty array for advanced settings

298c2cb

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: unified workspaces parameters when parsing from router

85c522d

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: improve code coverage

cdbe9a8

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: declare workspaces as null

cb7ebd9

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: use unified types

294d2c5

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: update comment

42e0e05

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: remove null

1b32316

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: address comments

b7a6cb7

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: use request app to store request workspace id

dd6cebf

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: use app state to store request workspace id

7fd5160

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: remove workspaces when listing data sources

9d72524

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

github-actions bot added the distinguished-contributor label Apr 3, 2024

SuZhou-Joe added 3 commits April 10, 2024 10:41

temp: merge workspace-pr-intepr

be08979

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: remove useless code change

f65ffcf

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: throw error if the type is not allowed

57ddd07

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

SuZhou-Joe marked this pull request as ready for review April 10, 2024 08:16

SuZhou-Joe changed the title ~~List data source without workspace~~ Handle data sources and advanced settings as global object. Apr 10, 2024

SuZhou-Joe added 3 commits April 10, 2024 16:29

feat: add unit test

d5b8676

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: add integration test

395f6b0

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: change the implementation

0fe0d37

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

SuZhou-Joe added 8 commits April 15, 2024 14:41

Merge branch 'workspace-pr-integr' into feature/list-data-source-with…

ede24be

…out-workspace

feat: remove useless change

5f487bc

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: remove useless change

4cfdfb0

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: add integration test

2119304

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

fix: unit test

b1494b1

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

Merge branch 'workspace-pr-integr' into feature/list-data-source-with…

4097e94

…out-workspace

feat: add error message

e61910d

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

fix: integration test

49c771b

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

Hailong-am reviewed Apr 17, 2024

View reviewed changes

...ugins/workspace/server/saved_objects/integration_tests/workspace_id_consumer_wrapper.test.ts Outdated Show resolved Hide resolved

wanglam reviewed Apr 17, 2024

View reviewed changes

src/plugins/workspace/server/saved_objects/workspace_id_consumer_wrapper.ts Outdated Show resolved Hide resolved

SuZhou-Joe added 2 commits April 17, 2024 10:59

fix: integration test

402d69b

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: remove useless change

cd77dba

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

raintygao reviewed Apr 17, 2024

View reviewed changes

src/plugins/workspace/server/saved_objects/workspace_id_consumer_wrapper.ts Outdated Show resolved Hide resolved

raintygao reviewed Apr 17, 2024

View reviewed changes

src/plugins/workspace/server/saved_objects/workspace_id_consumer_wrapper.ts Outdated Show resolved Hide resolved

SuZhou-Joe added 4 commits April 17, 2024 11:38

feat: add test case and add restrict on create method

1522637

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: change type

21f73c6

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: change comment

544083e

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: optimize test

093de9e

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

wanglam reviewed Apr 17, 2024

View reviewed changes

...ugins/workspace/server/saved_objects/integration_tests/workspace_id_consumer_wrapper.test.ts Outdated Show resolved Hide resolved

ruanyl reviewed Apr 17, 2024

View reviewed changes

SuZhou-Joe added 2 commits April 17, 2024 16:43

refactor: move logic to conflict check wrapper

0c80e82

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

feat: remove useless change

804e50f

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

SuZhou-Joe added 2 commits April 17, 2024 17:03

fix: unit test

0810ec5

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

fix: unit test

39bb304

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>

ruanyl approved these changes Apr 17, 2024

View reviewed changes

raintygao approved these changes Apr 17, 2024

View reviewed changes

SuZhou-Joe merged commit a821167 into ruanyl:workspace-pr-integr Apr 18, 2024
43 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Handle data sources and advanced settings as global object. #313

Handle data sources and advanced settings as global object. #313

SuZhou-Joe commented Apr 3, 2024 •

edited

Loading

codecov-commenter commented Apr 3, 2024 •

edited

Loading

ruanyl left a comment

SuZhou-Joe commented Apr 17, 2024

Handle data sources and advanced settings as global object. #313

Handle data sources and advanced settings as global object. #313

Conversation

SuZhou-Joe commented Apr 3, 2024 • edited Loading

Description

Issues Resolved

Screenshot

Import data source

Copy data source

Create data source in workspace(in normal flow, user won't be able to visit data source management page inside workspace)

Create advanced settings in workspace(in normal flow, user won't be able to visit advanced settings page inside workspace)

Testing the changes

Check List

codecov-commenter commented Apr 3, 2024 • edited Loading

Codecov Report

ruanyl left a comment

Choose a reason for hiding this comment

SuZhou-Joe commented Apr 17, 2024

SuZhou-Joe commented Apr 3, 2024 •

edited

Loading

codecov-commenter commented Apr 3, 2024 •

edited

Loading