[Workspace] fix: Fix workspace page hanging with none collaborators for non dashboard admin #9004
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
raintygao
requested review from
ananzh,
kavilla,
AMoo-Miki,
ashwin-pc,
joshuarrrr,
abbyhu2000,
zengyan-amazon,
zhongnansu,
manasvinibs,
ZilongX,
Flyingliuhub,
curq,
bandinib-amzn,
SuZhou-Joe,
ruanyl,
BionIT,
xinruiba,
zhyuanqi,
mengweieric,
LDrago27,
virajsanghvi,
sejli,
joshuali925 and
huyaboo
as code owners
opensearch-changeset-bot bot
added a commit
to raintygao/OpenSearch-Dashboards
that referenced
this pull request
Dec 4, 2024
raintygao
changed the title
raintygao
changed the title
opensearch-changeset-bot bot
added a commit
to raintygao/OpenSearch-Dashboards
that referenced
this pull request
Dec 4, 2024
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #9004 +/- ##
=======================================
Coverage 60.90% 60.90%
=======================================
Files 3808 3808
Lines 91196 91197 +1
Branches 14400 14400
=======================================
+ Hits 55544 55547 +3
+ Misses 32097 32096 -1
+ Partials 3555 3554 -1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
d-buckner
reviewed
Dec 4, 2024
Comment on lines
40
to
46
| export const EMPTY_PERMISSIONS = { | ||
| library_read: {}, | ||
| library_write: {}, | ||
| read: {}, | ||
| write: {}, | ||
| }; | ||
|
|
There was a problem hiding this comment.
Is this a WorkspacePermissionSetting object? If so can we add the typing so that typescript can better infer the return type of convertPermissionSettingsToPermissions?
We can also define this as readonly to ensure no consumer can modify this.
Ex.
export const EMPTY_PERMISSIONS: WorkspacePermissionSetting = {
library_read: {},
library_write: {},
read: {},
write: {},
} as const;
There was a problem hiding this comment.
Sure. Its type is SavedObjectPermissions, have updated.
d-buckner
approved these changes
Dec 5, 2024
Hailong-am
reviewed
Dec 10, 2024
Comment on lines
-107
to
116
| return undefined; | ||
| // Workspace object should always have permissions, set it as an empty object here instead of undefined. | ||
| return EMPTY_PERMISSIONS; | ||
| } |
There was a problem hiding this comment.
does it has any impact when permission control is turned off?
There was a problem hiding this comment.
I supposed it may not as this is a specific object for workspace object.
There was a problem hiding this comment.
when permission control is off, permission field will not initialized and add to kibana index, i am not sure it will cause any issue when try to save a object with empty permission, we can have a test
There was a problem hiding this comment.
This means the value of permission field will not be consistent between permission is on/off, right? So it seems updating client wrapper will be a better solution?
Signed-off-by: tygao <tygao@amazon.com>
Signed-off-by: tygao <tygao@amazon.com>
…tail page Signed-off-by: tygao <tygao@amazon.com>
raintygao
force-pushed
the
fix-empty-coll
branch
from
58e4cbb to
b9b7edd
Compare
yubonluo
approved these changes
Dec 11, 2024
Hailong-am
approved these changes
Dec 13, 2024
SuZhou-Joe
approved these changes
Dec 30, 2024
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Jan 2, 2025
…or non dashboard admin (#9004) * fix: fix page hanging when none collaborators for non dashboard admin Signed-off-by: tygao <tygao@amazon.com> * add const type Signed-off-by: tygao <tygao@amazon.com> * Changeset file for PR #9004 created/updated * Changeset file for PR #9004 created/updated * update empty permissions when permission is disabled for workspace detail page Signed-off-by: tygao <tygao@amazon.com> --------- Signed-off-by: tygao <tygao@amazon.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> Co-authored-by: SuZhou-Joe <suzhou@amazon.com> (cherry picked from commit 40e61c7) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
SuZhou-Joe
added a commit
that referenced
this pull request
Jan 9, 2025
…or non dashboard admin (#9004) (#9141) * fix: fix page hanging when none collaborators for non dashboard admin * add const type * Changeset file for PR #9004 created/updated * Changeset file for PR #9004 created/updated * update empty permissions when permission is disabled for workspace detail page --------- (cherry picked from commit 40e61c7) Signed-off-by: tygao <tygao@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: SuZhou-Joe <suzhou@amazon.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Fix workspace page hanging with none collaborators for non dashboard admin
Previously the permission field of a workspace with none collaborators is undefined, which will pass the workspace permission wrapper and cause page hanging. Actually this field could be an empty ACL object as workspace type object should always have this field.
Screenshot
Before
After
Testing the changes
Changelog
Check List
yarn test:jestyarn test:jest_integration