Просмотр исходного кода

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

* only count editor invites when disabling editor in dropdown

GitOrigin-RevId: 400215d4817c0146da4f8397fe2007699da0e92b
roo hutton 2 лет назад
Родитель
Сommit
fd50db2341

+ 6 - 1
services/web/frontend/js/features/share-project-modal/components/restricted-link-sharing/share-modal-body.tsx

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

+ 1 - 1
services/web/frontend/js/shared/context/types/project-context.tsx

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