Skip to content

fix(content-sharing): Collaborator current user #4328

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

Merged
mergify merged 3 commits into from
Oct 7, 2025
Merged

fix(content-sharing): Collaborator current user #4328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26878b4
fix: Collaborator current user
reneshen0328 Oct 6, 2025
d392ce4
fix: nits
reneshen0328 Oct 7, 2025
58bc944
Merge branch 'master' into fix-collab-current-user
mergify[bot] Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ export const PERMISSION_CAN_VIEW_ANNOTATIONS = 'can_view_annotations';

/* --------------------- Invitee roles --------------------------- */
export const INVITEE_ROLE_EDITOR: 'editor' = 'editor';
export const INVITEE_ROLE_OWNER: 'owner' = 'owner';

/* ------------- Delimiters for bread crumbs ---------------- */
export const DELIMITER_SLASH: 'slash' = 'slash';
Expand Down
16 changes: 12 additions & 4 deletions src/elements/content-sharing/ContentSharingV2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,21 @@ function ContentSharingV2({
const [collaborationRoles, setCollaborationRoles] = React.useState<CollaborationRole[] | null>(null);
const [collaborators, setCollaborators] = React.useState<Collaborator[] | null>(null);
const [collaboratorsData, setCollaboratorsData] = React.useState<Collaborations | null>(null);
const [owner, setOwner] = React.useState({ id: '', email: '', name: '' });

// Handle successful GET requests to /files or /folders
const handleGetItemSuccess = React.useCallback(itemData => {
const {
collaborationRoles: collaborationRolesFromAPI,
item: itemFromAPI,
ownedBy,
sharedLink: sharedLinkFromAPI,
} = convertItemResponse(itemData);

setItem(itemFromAPI);
setSharedLink(sharedLinkFromAPI);
setCollaborationRoles(collaborationRolesFromAPI);
setOwner({ id: ownedBy.id, email: ownedBy.login, name: ownedBy.name });
}, []);

// Reset state if the API has changed
Expand Down Expand Up @@ -122,13 +126,17 @@ function ContentSharingV2({
})();
}, [api, avatarURLMap, collaboratorsData, itemID]);

// Return processed data when both are ready
React.useEffect(() => {
if (collaboratorsData && avatarURLMap) {
const collaboratorsWithAvatars = convertCollabsResponse(collaboratorsData, avatarURLMap);
if (avatarURLMap && collaboratorsData && currentUser && owner) {
const collaboratorsWithAvatars = convertCollabsResponse(
collaboratorsData,
currentUser.id,
owner,
avatarURLMap,
);
setCollaborators(collaboratorsWithAvatars);
}
}, [collaboratorsData, avatarURLMap]);
}, [avatarURLMap, collaboratorsData, currentUser, owner]);

const config = { sharedLinkEmail: false };

Expand Down
21 changes: 11 additions & 10 deletions src/elements/content-sharing/utils/__mocks__/ContentSharingV2Mocks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ export const mockAvatarURLMap = {
};

export const mockOwnerEmail = 'aotter@example.com';

export const mockCurrentUserID = 789;
export const mockOwnerName = 'Astronaut Otter';
export const mockOwnerId = 789;

export const collabUser1 = {
id: 456,
Expand All @@ -44,7 +44,7 @@ export const collabUser1 = {

export const collabUser2 = {
id: 457,
login: 'rqueen@example.com',
login: 'rqueen@external.example.com',
name: 'Raccoon Queen',
};

Expand All @@ -54,26 +54,26 @@ export const collabUser3 = {
name: 'Dancing Penguin',
};

export const collabUser4 = {
id: mockCurrentUserID,
export const mockOwner = {
id: mockOwnerId,
login: mockOwnerEmail,
name: 'Astronaut Otter',
name: mockOwnerName,
};

export const MOCK_COLLABORATORS = [collabUser4, collabUser1, collabUser2, collabUser3];
export const MOCK_COLLABORATORS = [collabUser1, collabUser2, collabUser3];

export const MOCK_COLLABORATIONS_RESPONSE = {
entries: MOCK_COLLABORATORS.map(user => ({
id: `record_${user.id}`,
accessible_by: user,
expires_at: user.expires_at,
created_by: {
id: mockCurrentUserID,
id: mockOwnerId,
login: mockOwnerEmail,
name: 'Astronaut Otter',
name: mockOwnerName,
type: 'user',
},
role: user.id === mockCurrentUserID ? 'owner' : 'editor',
role: user.id === mockOwnerId ? 'owner' : 'editor',
status: 'accepted',
type: user.type,
})),
Expand All @@ -99,6 +99,7 @@ export const DEFAULT_ITEM_API_RESPONSE = {
classification: null,
id: MOCK_ITEM.id,
name: MOCK_ITEM.name,
owned_by: mockOwner,
permissions: MOCK_PERMISSIONS,
shared_link: null,
shared_link_features: { password: true },
Expand Down
Loading