github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

[web] Pending invite prevents Viewer being changed to Editor (#19214)

Browse source 
* only count editor invites when disabling editor in dropdown

GitOrigin-RevId: 400215d4817c0146da4f8397fe2007699da0e92b
This commit is contained in:
roo hutton 2024-07-01 09:30:19 +01:00 committed by Copybot
parent 3b29865d87
commit fd50db2341
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
services/web/frontend/js/features/share-project-modal/components/restricted-link-sharing/share-modal-body.tsx
View file

@ -26,9 +26,13 @@ export default function ShareModalBody() {
return true return true
} }
const editorInvites = invites.filter(
invite => invite.privileges === 'readAndWrite'
).length
return ( return (
members.filter(member => member.privileges === 'readAndWrite').length + members.filter(member => member.privileges === 'readAndWrite').length +
invites.length < editorInvites <
(features.collaborators ?? 1) (features.collaborators ?? 1)
) )
}, [members, invites, features, isProjectOwner]) }, [members, invites, features, isProjectOwner])
@ -41,6 +45,7 @@ export default function ShareModalBody() {
if (features.collaborators === -1) { if (features.collaborators === -1) {
return false return false
} }
return ( return (
members.filter(member => member.privileges === 'readAndWrite').length > members.filter(member => member.privileges === 'readAndWrite').length >
(features.collaborators ?? 1) (features.collaborators ?? 1)

2
services/web/frontend/js/shared/context/types/project-context.tsx
View file

@ -14,7 +14,7 @@ export type ProjectContextValue = {
rootDocId?: string rootDocId?: string
compiler: string compiler: string
members: ProjectContextMember[] members: ProjectContextMember[]
invites: { _id: UserId }[] invites: ProjectContextMember[]
features: { features: {
collaborators?: number collaborators?: number
compileGroup?: 'alpha' | 'standard' | 'priority' compileGroup?: 'alpha' | 'standard' | 'priority'