From a037d24b0fee90ca91ad36a53be5367ec5ace0ae Mon Sep 17 00:00:00 2001
From: Carter <safe@fea.st>
Date: Sun, 7 Jan 2024 01:30:23 -0800
Subject: [PATCH] Creator update hotfixes

* Responsive avatar sizing fix

* random mounting bug

* User owned project list correctly filtered

* fix accepted member count

* Leave team fix

* Remove debug

* Remove debug

* hide view button if collections view
---
 pages/[type]/[id]/settings/index.vue          |  2 +-
 pages/[type]/[id]/settings/members.vue        |  8 +++--
 pages/dashboard/organizations.vue             | 11 ++++---
 pages/organization/[id]/settings/members.vue  | 16 ++++++---
 pages/organization/[id]/settings/projects.vue | 33 +++++++++++++++++--
 pages/user/[id].vue                           |  1 +
 6 files changed, 57 insertions(+), 14 deletions(-)

diff --git a/pages/[type]/[id]/settings/index.vue b/pages/[type]/[id]/settings/index.vue
index a55fa1ad..f7fd658b 100644
--- a/pages/[type]/[id]/settings/index.vue
+++ b/pages/[type]/[id]/settings/index.vue
@@ -91,7 +91,7 @@
       </div>
       <template
         v-if="
-          project.versions.length !== 0 &&
+          project.versions?.length !== 0 &&
           project.project_type !== 'resourcepack' &&
           project.project_type !== 'plugin' &&
           project.project_type !== 'shader' &&
diff --git a/pages/[type]/[id]/settings/members.vue b/pages/[type]/[id]/settings/members.vue
index 58ab340a..8a34d67c 100644
--- a/pages/[type]/[id]/settings/members.vue
+++ b/pages/[type]/[id]/settings/members.vue
@@ -274,8 +274,8 @@
               <div class="stats">
                 <UsersIcon />
                 <span>
-                  {{ props.organization.members?.length || 0 }} member<template
-                    v-if="props.organization.members?.length !== 1"
+                  {{ acceptedOrgMembers.length }} member<template
+                    v-if="acceptedOrgMembers.length !== 1"
                     >s</template
                   >
                 </span>
@@ -580,6 +580,10 @@ const auth = await useAuth()
 const allTeamMembers = ref([])
 const allOrgMembers = ref([])
 
+const acceptedOrgMembers = computed(() => {
+  return props.organization?.members?.filter((x) => x.accepted) || []
+})
+
 watch(
   [
     () => props.allMembers,
diff --git a/pages/dashboard/organizations.vue b/pages/dashboard/organizations.vue
index 5cb9612b..57596288 100644
--- a/pages/dashboard/organizations.vue
+++ b/pages/dashboard/organizations.vue
@@ -18,7 +18,7 @@
             :key="org.id"
             :to="`/organization/${org.slug}`"
             class="universal-card button-base recessed org"
-            :class="{ 'is-disabled': org.members?.length === 0 }"
+            :class="{ 'is-disabled': onlyAcceptedMembers(org.members).length === 0 }"
           >
             <Avatar :src="org.icon_url" :alt="org.name" class="icon" />
             <div class="details">
@@ -32,7 +32,8 @@
                 <div class="stats">
                   <UsersIcon />
                   <span>
-                    {{ org.members?.length || 0 }} member<template v-if="org.members?.length !== 1"
+                    {{ onlyAcceptedMembers(org.members).length }} member<template
+                      v-if="onlyAcceptedMembers(org.members).length !== 1"
                       >s</template
                     >
                   </span>
@@ -66,6 +67,8 @@ const { data: orgs, error } = useAsyncData('organizations', () => {
   })
 })
 
+const onlyAcceptedMembers = (members) => members.filter((member) => member?.accepted)
+
 if (error.value) {
   createError({
     statusCode: 500,
@@ -102,13 +105,13 @@ const openCreateOrgModal = () => {
 
   .org {
     display: grid;
-    grid-template-columns: auto 1fr;
+    grid-template-columns: max-content 1fr;
     gap: var(--gap-md);
     margin-bottom: 0;
 
     .icon {
       width: 100% !important;
-      height: 6rem !important;
+      height: min(6rem, 20vw) !important;
       max-width: unset !important;
       max-height: unset !important;
       aspect-ratio: 1 / 1;
diff --git a/pages/organization/[id]/settings/members.vue b/pages/organization/[id]/settings/members.vue
index c9d45122..8c2d5e73 100644
--- a/pages/organization/[id]/settings/members.vue
+++ b/pages/organization/[id]/settings/members.vue
@@ -25,7 +25,7 @@
               organizationPermissions.MANAGE_INVITES
             )
           "
-          @keypress.enter="() => onInviteTeamMember(organization.team_id, currentUsername)"
+          @keypress.enter="() => onInviteTeamMember(organization.team, currentUsername)"
         />
         <label for="username" class="hidden">Username</label>
         <Button
@@ -49,7 +49,11 @@
             Remove yourself as a member of this organization.
           </span>
         </span>
-        <Button color="danger" :disabled="currentMember.role === 'Owner'" @click="leaveProject()">
+        <Button
+          color="danger"
+          :disabled="currentMember.role === 'Owner'"
+          @click="() => onLeaveProject(organization.team_id, auth.user.id)"
+        >
           <UserRemoveIcon />
           Leave organization
         </Button>
@@ -287,11 +291,13 @@ const permToLabel = (key) => {
   return o.charAt(0).toUpperCase() + o.slice(1).toLowerCase()
 }
 
-const leaveProject = async () => {
-  await removeTeamMember(organization.value.team_id, auth.user.id)
-  await navigateTo(`/organization/${organization.value.slug}`)
+const leaveProject = async (teamId, uid) => {
+  await removeTeamMember(teamId, uid)
+  await navigateTo(`/organization/${organization.value.id}`)
 }
 
+const onLeaveProject = useClientTry(leaveProject)
+
 const onInviteTeamMember = useClientTry(async (teamId, username) => {
   const user = await useBaseFetch(`user/${username}`)
   const data = {
diff --git a/pages/organization/[id]/settings/projects.vue b/pages/organization/[id]/settings/projects.vue
index a210cf59..a60c86d4 100644
--- a/pages/organization/[id]/settings/projects.vue
+++ b/pages/organization/[id]/settings/projects.vue
@@ -166,7 +166,7 @@
           Create a project
         </Button>
         <OrganizationProjectTransferModal
-          :projects="userProjects || []"
+          :projects="usersOwnedProjects || []"
           @submit="onProjectTransferSubmit"
         />
       </div>
@@ -325,7 +325,7 @@ const { organization, projects, refresh } = inject('organizationContext')
 
 const auth = await useAuth()
 
-const { data: userProjects } = await useAsyncData(
+const { data: userProjects, refresh: refreshUserProjects } = await useAsyncData(
   `user/${auth.value.user.id}/projects`,
   () => useBaseFetch(`user/${auth.value.user.id}/projects`),
   {
@@ -333,6 +333,34 @@ const { data: userProjects } = await useAsyncData(
   }
 )
 
+const usersOwnedProjects = ref([])
+
+watch(
+  () => userProjects.value,
+  async () => {
+    if (!userProjects.value) return
+    if (!userProjects.value.length) return
+
+    const projects = userProjects.value.filter((project) => project.organization === null)
+
+    const teamIds = projects.map((project) => project?.team).filter((x) => x)
+    // Shape of teams is member[][]
+    const teams = await useBaseFetch(`teams?ids=${JSON.stringify(teamIds)}`, {
+      apiVersion: 3,
+    })
+    // for each team id, figure out if the user is a member, and is_owner. Then filter the projects to only include those that are owned by the user
+    const ownedTeamIds = teamIds.filter((_tid, i) => {
+      const team = teams?.[i]
+      if (!team) return false
+      const member = team.find((member) => member.user.id === auth.value.user.id)
+      return member && member.is_owner
+    })
+    const ownedProjects = projects.filter((project) => ownedTeamIds.includes(project.team))
+    usersOwnedProjects.value = ownedProjects
+  }, // watch options
+  { immediate: true, deep: true }
+)
+
 const onProjectTransferSubmit = async (projects) => {
   try {
     for (const project of projects) {
@@ -346,6 +374,7 @@ const onProjectTransferSubmit = async (projects) => {
     }
 
     await refresh()
+    await refreshUserProjects()
 
     addNotification({
       group: 'main',
diff --git a/pages/user/[id].vue b/pages/user/[id].vue
index 28061546..7e7c8db8 100644
--- a/pages/user/[id].vue
+++ b/pages/user/[id].vue
@@ -201,6 +201,7 @@
               {{ formatMessage(messages.profileManageProjectsButton) }}
             </NuxtLink>
             <button
+              v-if="route.params.projectType !== 'collections'"
               v-tooltip="
                 formatMessage(commonMessages[`${cosmetics.searchDisplayMode.user}InputView`])
               "