From 282472ea60cceb58d40d638f1a80b6958ba97b4e Mon Sep 17 00:00:00 2001
From: Mike <mike.tasset@gmail.com>
Date: Mon, 21 Apr 2025 15:22:22 +0200
Subject: [PATCH] Fix: Various project invite fixes (#4505)

---
 .../invite/dialog/project/Project.vue         | 22 +++++++++++++++++--
 .../page/collaborators/Collaborators.vue      |  5 +++--
 .../lib/invites/helpers/constants.ts          |  3 ++-
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/packages/frontend-2/components/invite/dialog/project/Project.vue b/packages/frontend-2/components/invite/dialog/project/Project.vue
index 5025df0f1..6e5e3cf78 100644
--- a/packages/frontend-2/components/invite/dialog/project/Project.vue
+++ b/packages/frontend-2/components/invite/dialog/project/Project.vue
@@ -23,6 +23,16 @@
         </FormButton>
       </div>
     </form>
+    <p v-if="!isAdmin && isInWorkspace" class="text-foreground-2 text-body-2xs py-3">
+      Project owners without admin rights can only add existing workspace members.
+    </p>
+    <p v-else-if="isInWorkspace" class="text-foreground-2 text-body-2xs py-3">
+      Users not currently in the workspace will be added with a free viewer seat. Read
+      more about
+      <NuxtLink :to="LearnMoreRolesSeatsUrl" class="underline" target="_blank">
+        Speckle roles and seats.
+      </NuxtLink>
+    </p>
   </LayoutDialog>
 </template>
 <script setup lang="ts">
@@ -40,6 +50,7 @@ import type {
 import { useInviteUserToProject } from '~~/lib/projects/composables/projectManagement'
 import { useMixpanel } from '~~/lib/core/composables/mp'
 import { Roles } from '@speckle/shared'
+import { LearnMoreRolesSeatsUrl } from '~~/lib/common/helpers/route'
 
 graphql(`
   fragment InviteDialogProject_Project on Project {
@@ -116,7 +127,11 @@ const onSubmit = handleSubmit(async () => {
   const inputs: ProjectInviteCreateInput[] | WorkspaceProjectInviteCreateInput[] =
     invites.map((u) => ({
       role: u.projectRole,
-      ...(isAdmin.value ? { email: u.email } : { userId: u.userId }),
+      ...(isInWorkspace.value
+        ? isAdmin.value
+          ? { email: u.email }
+          : { userId: u.userId }
+        : { email: u.email }),
       ...(props.project?.workspace?.id
         ? {
             workspaceRole: u.project?.id
@@ -126,7 +141,10 @@ const onSubmit = handleSubmit(async () => {
         : {})
     }))
 
-  if (!inputs.length) return
+  if (!inputs.length) {
+    isOpen.value = false
+    return
+  }
 
   await createInvite(props.project.id, inputs)
 
diff --git a/packages/frontend-2/components/project/page/collaborators/Collaborators.vue b/packages/frontend-2/components/project/page/collaborators/Collaborators.vue
index 68d7ad0ad..92ed29c01 100644
--- a/packages/frontend-2/components/project/page/collaborators/Collaborators.vue
+++ b/packages/frontend-2/components/project/page/collaborators/Collaborators.vue
@@ -100,11 +100,12 @@ const loading = ref(false)
 
 const canUpdate = computed(() => pageResult.value?.project?.permissions?.canUpdate)
 const canInvite = computed(() =>
-  workspace?.value?.id ? projectRole.value !== Roles.Stream.Reviewer : isOwner.value
+  project.value?.workspaceId
+    ? isOwner.value || workspace.value?.role === Roles.Workspace.Admin
+    : isOwner.value
 )
 const project = computed(() => pageResult.value?.project)
 const workspace = computed(() => project.value?.workspace)
-const projectRole = computed(() => project.value?.role)
 const updateRole = useUpdateUserRole(project)
 const { collaboratorListItems, isOwner } = useTeamInternals(project, workspace)
 
diff --git a/packages/frontend-2/lib/invites/helpers/constants.ts b/packages/frontend-2/lib/invites/helpers/constants.ts
index 22ef2f6a6..7b6f7fafe 100644
--- a/packages/frontend-2/lib/invites/helpers/constants.ts
+++ b/packages/frontend-2/lib/invites/helpers/constants.ts
@@ -13,8 +13,9 @@ export const emptyInviteServerItem: InviteServerItem = {
 
 export const emptyInviteProjectItem: InviteProjectItem = {
   email: '',
+  userId: undefined,
   serverRole: Roles.Server.User,
-  projectRole: Roles.Stream.Contributor,
+  projectRole: Roles.Stream.Reviewer,
   project: undefined
 }