Sharing UI: display user names #25
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,15 +24,39 @@ interface RawResourceInfo { | |
| type?: ResourceType; | ||
| } | ||
|
|
||
| interface RawGranteeUserInfo { | ||
|
Member
There was a problem hiding this comment. Is there a reason to have different interfaces that are the same? They actually represent the same entity (user, person, account.. not sure what's the most appropriate name), that can be a person that creates or receives a share. |
||
| id: { opaque_id: string }; | ||
| mail: string; | ||
| display_name: string; | ||
| } | ||
|
|
||
| interface RawCreatorUserInfo { | ||
| id: { opaque_id: string }; | ||
| mail: string; | ||
| display_name: string; | ||
| } | ||
|
|
||
| interface RawSharedByMeRegularUser { | ||
| share: { | ||
| id: { opaque_id: string }; | ||
| resource_id: { opaque_id: string }; | ||
| grantee: RawUserGrantee; | ||
| }; | ||
| resource_info: RawResourceInfo; | ||
| grantee_user_info: RawGranteeUserInfo; | ||
| } | ||
|
|
||
| interface RawSharedByMeRegularGroup { | ||
| share: { | ||
| id: { opaque_id: string }; | ||
| resource_id: { opaque_id: string }; | ||
| grantee: RawGroupGrantee; | ||
| }; | ||
| resource_info: RawResourceInfo; | ||
| } | ||
|
|
||
| type RawSharedByMeRegular = RawSharedByMeRegularUser | RawSharedByMeRegularGroup; | ||
|
|
||
| interface RawSharedByMePublic { | ||
| public_share: { | ||
| id: { opaque_id: string }; | ||
|
|
@@ -52,12 +76,31 @@ interface RawSharedWithMe { | |
| }; | ||
| }; | ||
| resource_info: RawResourceInfo; | ||
| creator_user_info?: RawCreatorUserInfo; | ||
| } | ||
|
|
||
| interface InvalidGrantee { | ||
| type: 'GRANTEE_TYPE_INVALID'; | ||
| opaqueId: string; | ||
| } | ||
| interface GroupGrantee { | ||
| type: 'GRANTEE_TYPE_GROUP'; | ||
| opaqueId: string; | ||
| } | ||
| interface UserGrantee { | ||
| type: 'GRANTEE_TYPE_USER'; | ||
| opaqueId: string; | ||
| mail: string; | ||
| displayName: string; | ||
| } | ||
|
|
||
| type Grantee = InvalidGrantee | GroupGrantee | UserGrantee; | ||
|
|
||
| interface Creator { | ||
| opaqueId: string; | ||
| mail?: string; | ||
| displayName?: string; | ||
| } | ||
|
|
||
| interface _Share { | ||
| shareDirection: ShareDirection; | ||
|
|
@@ -83,7 +126,7 @@ interface ByMePublicShare extends _Share { | |
| interface WithMeRegularShare extends _Share { | ||
| shareDirection: 'WITH_ME'; | ||
| shareType: 'REGULAR'; | ||
| sharedBy: Creator; | ||
| } | ||
|
|
||
| export type Share = ByMeRegularShare | ByMePublicShare | WithMeRegularShare; | ||
|
|
@@ -116,6 +159,19 @@ export async function fetchShares(): Promise<Share[]> { | |
| ? share.share.grantee.user_id.opaque_id | ||
| : share.share.grantee.group_id.opaque_id; | ||
|
|
||
| const grantee: Grantee = | ||
| 'grantee_user_info' in share | ||
| ? { | ||
| type: 'GRANTEE_TYPE_USER', | ||
| opaqueId: sharedWithOpaqueId, | ||
| mail: share.grantee_user_info.mail, | ||
| displayName: share.grantee_user_info.display_name | ||
| } | ||
| : { | ||
| type: share.share.grantee.type, | ||
| opaqueId: sharedWithOpaqueId | ||
| }; | ||
|
|
||
| if (!byMeMerged.has(resourceId)) { | ||
| byMeMerged.set(resourceId, { | ||
| shareDirection: 'BY_ME', | ||
|
|
@@ -125,18 +181,10 @@ export async function fetchShares(): Promise<Share[]> { | |
| name: share.resource_info.name, | ||
| path: share.resource_info.path.slice('/eos'.length), // TODO: Don't hardcode this prefix | ||
| rawPath: share.resource_info.path, | ||
| sharedWith: [grantee] | ||
| }); | ||
| } else { | ||
| byMeMerged.get(resourceId)?.sharedWith.push(grantee); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -168,7 +216,11 @@ export async function fetchShares(): Promise<Share[]> { | |
| name: share.resource_info.name, | ||
| path: share.resource_info.path.slice('/eos'.length), // TODO: Don't hardcode this prefix | ||
| rawPath: share.resource_info.path, | ||
| sharedBy: { | ||
| opaqueId: share.received_share.share.creator.opaque_id, | ||
| mail: share.creator_user_info?.mail, | ||
| displayName: share.creator_user_info?.display_name | ||
| } | ||
| }); | ||
| } | ||
|
|
||
|
|
@@ -180,6 +232,7 @@ export interface ShareGranteeDetail { | |
| type: GranteeType; | ||
| opaqueId: string; | ||
| role: ShareRole; | ||
| displayName?: string; | ||
| } | ||
|
|
||
| export interface UserSearchResult { | ||
|
|
@@ -214,16 +267,22 @@ export async function fetchSharesForResource(rawPath: string): Promise<ShareGran | |
|
|
||
| for (const item of data.shares as RawSharedByMeRegular[]) { | ||
| const grantee = item.share.grantee; | ||
| const opaqueId = grantee.type === 'GRANTEE_TYPE_USER' ? grantee.user_id.opaque_id : grantee.group_id.opaque_id; | ||
|
|
||
| const detail: ShareGranteeDetail = { | ||
| shareId: item.share.id.opaque_id, | ||
| type: grantee.type, | ||
| opaqueId, | ||
| role: roleFromRawPermissions( | ||
| (item.share as Record<string, unknown>).permissions as Record<string, unknown> | undefined | ||
| ) | ||
| }; | ||
|
|
||
| if ('grantee_user_info' in item) { | ||
| detail.displayName = item.grantee_user_info.display_name; | ||
| } | ||
|
|
||
| results.push(detail); | ||
| } | ||
|
|
||
| return results; | ||
|
|
@@ -298,7 +357,7 @@ export async function findUsers(query: string, signal?: AbortSignal): Promise<Us | |
| } | ||
|
|
||
| const data = await resp.json(); | ||
| return (data.items as Array<Record<string, unknown>>).map(u => ({ | ||
| opaqueId: (u.id as Record<string, string>).opaque_id, | ||
| idp: (u.id as Record<string, string>).idp, | ||
| displayName: (u.display_name as string) || (u.username as string) || '', | ||
|
|
@@ -317,7 +376,7 @@ export async function findGroups(query: string, signal?: AbortSignal): Promise<G | |
| } | ||
|
|
||
| const data = await resp.json(); | ||
| return (data.items as Array<Record<string, unknown>>).map(g => ({ | ||
| opaqueId: (g.id as Record<string, string>).opaque_id, | ||
| displayName: (g.group_name as string) || (g.id as Record<string, string>).opaque_id | ||
| })); | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is just a formatting change