Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[workspace] fix set as default error in data source and index pattern #9187

Merged
merged 5 commits into from
Jan 16, 2025
Merged

[workspace] fix set as default error in data source and index pattern #9187

merged 5 commits into from
Jan 16, 2025

Conversation

Qxisylolo
Copy link
Contributor

@Qxisylolo Qxisylolo commented Jan 15, 2025 •
edited by SuZhou-Joe
Loading

Description

When a user has read-only access to a workspace
the user shouldn't:

  1. set an index pattern as default
  2. set a data source as default

Screenshot

  1. read-only user try to set an index pattern as default
2025-01-15.14.19.36.mov
  1. read-only user try to set a data source as default
2025-01-15.14.20.08.mov

Changelog

  • fix: fix set as default error in data source and index pattern

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

@Qxisylolo
fix set as default error
c97ff38 
Signed-off-by: Qxisylolo <[email protected]>
@codecov Codecov
Copy link

codecov bot commented Jan 15, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 61.01%. Comparing base (9b5ce68) to head (6663d36).
Report is 2 commits behind head on main.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #9187      +/-   ##
==========================================
- Coverage   61.02%   61.01%   -0.02%     
==========================================
  Files        3813     3813              
  Lines       91401    91400       -1     
  Branches    14443    14443              
==========================================
- Hits        55782    55772      -10     
- Misses      32056    32067      +11     
+ Partials     3563     3561       -2
Flag Coverage Δ
Linux_1 29.08% <ø> (ø)
Linux_2 56.45% <ø> (ø)
Linux_3 38.03% <100.00%> (?)
Linux_4 29.03% <ø> (ø)
Windows_1 29.09% <ø> (-0.02%) ⬇️
Windows_2 56.40% <ø> (ø)
Windows_3 38.03% <100.00%> (+<0.01%) ⬆️
Windows_4 29.03% <ø> (ø)

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.

@Qxisylolo
add tests
33cd74c 
Signed-off-by: Qxisylolo <[email protected]>
@Qxisylolo
fix tests
49cacb8 
Signed-off-by: Qxisylolo <[email protected]>
@Qxisylolo Qxisylolo marked this pull request as ready for review January 15, 2025 09:08
@Qxisylolo Qxisylolo requested a review from huyaboo as a code owner January 15, 2025 09:08
SuZhou-Joe
SuZhou-Joe reviewed Jan 15, 2025
View reviewed changes
src/plugins/data_source_management/public/components/edit_data_source/edit_data_source.tsx Outdated
Comment on lines 99 to 100
const isSuccess = await uiSettings.set(DEFAULT_DATA_SOURCE_UI_SETTINGS_ID, dataSourceID);
return isSuccess;
Copy link
Member

@SuZhou-Joe SuZhou-Joe Jan 15, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
const isSuccess = await uiSettings.set(DEFAULT_DATA_SOURCE_UI_SETTINGS_ID, dataSourceID);
return isSuccess;
return await uiSettings.set(DEFAULT_DATA_SOURCE_UI_SETTINGS_ID, dataSourceID);

Nit: perhaps we can make it Concise.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the advice, already updated~

@Qxisylolo
resolve comments
6663d36 
Signed-off-by: Qxisylolo <[email protected]>
@SuZhou-Joe SuZhou-Joe merged commit 5a290a4 into opensearch-project:main Jan 16, 2025
73 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jan 16, 2025
@github-actions @opensearch-changeset-bot
[workspace] fix set as default error in data source and index pattern (…
73779b2 
…#9187)

* fix set as default error

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

* Changeset file for PR #9187 created/updated

* add tests

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

* fix tests

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

* resolve comments

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>
(cherry picked from commit 5a290a4)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Jan 16, 2025
Merged
SuZhou-Joe added a commit that referenced this pull request Jan 17, 2025
@opensearch-trigger-bot @github-actions
@opensearch-changeset-bot @SuZhou-Joe
[workspace] fix set as default error in data source and index pattern (…
d99d244 
…#9187) (#9195)

* fix set as default error



* Changeset file for PR #9187 created/updated

* add tests



* fix tests



* resolve comments



---------



(cherry picked from commit 5a290a4)

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: SuZhou-Joe <[email protected]>
d-buckner pushed a commit to d-buckner/OpenSearch-Dashboards that referenced this pull request Jan 17, 2025
@Qxisylolo @opensearch-changeset-bot @d-buckner
[workspace] fix set as default error in data source and index pattern (…
c6adb0f 
…opensearch-project#9187)

* fix set as default error

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

* Changeset file for PR opensearch-project#9187 created/updated

* add tests

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

* fix tests

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

* resolve comments

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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuZhou-Joe SuZhou-Joe SuZhou-Joe approved these changes

@ruanyl ruanyl ruanyl approved these changes

@ananzh ananzh Awaiting requested review from ananzh ananzh is a code owner

@kavilla kavilla Awaiting requested review from kavilla kavilla is a code owner

@AMoo-Miki AMoo-Miki Awaiting requested review from AMoo-Miki AMoo-Miki is a code owner

@ashwin-pc ashwin-pc Awaiting requested review from ashwin-pc ashwin-pc is a code owner

@joshuarrrr joshuarrrr Awaiting requested review from joshuarrrr joshuarrrr is a code owner

@abbyhu2000 abbyhu2000 Awaiting requested review from abbyhu2000 abbyhu2000 is a code owner

@zengyan-amazon zengyan-amazon Awaiting requested review from zengyan-amazon zengyan-amazon is a code owner

@zhongnansu zhongnansu Awaiting requested review from zhongnansu zhongnansu is a code owner

@manasvinibs manasvinibs Awaiting requested review from manasvinibs manasvinibs is a code owner

@ZilongX ZilongX Awaiting requested review from ZilongX ZilongX is a code owner

@Flyingliuhub Flyingliuhub Awaiting requested review from Flyingliuhub Flyingliuhub is a code owner

@curq curq Awaiting requested review from curq curq is a code owner

@bandinib-amzn bandinib-amzn Awaiting requested review from bandinib-amzn bandinib-amzn is a code owner

@BionIT BionIT Awaiting requested review from BionIT BionIT is a code owner

@xinruiba xinruiba Awaiting requested review from xinruiba xinruiba is a code owner

@zhyuanqi zhyuanqi Awaiting requested review from zhyuanqi zhyuanqi is a code owner

@mengweieric mengweieric Awaiting requested review from mengweieric mengweieric is a code owner

@LDrago27 LDrago27 Awaiting requested review from LDrago27 LDrago27 is a code owner

@virajsanghvi virajsanghvi Awaiting requested review from virajsanghvi virajsanghvi is a code owner

@sejli sejli Awaiting requested review from sejli sejli is a code owner

@joshuali925 joshuali925 Awaiting requested review from joshuali925 joshuali925 is a code owner

@huyaboo huyaboo Awaiting requested review from huyaboo huyaboo is a code owner

Assignees
No one assigned
Labels
backport 2.x seasoned-contributor workspace
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Qxisylolo @ruanyl @SuZhou-Joe