From 23bb06cc3607c4ba249fc49410138f34a377bdd5 Mon Sep 17 00:00:00 2001
From: Amit Sharma <74371312+Amit91848@users.noreply.github.com>
Date: Fri, 31 May 2024 13:55:10 +0530
Subject: [PATCH] fix: Avatars not showing when using bookings filter (#15271)

---
 .../features/bookings/components/PeopleFilter.tsx   | 13 +------------
 .../organizations/components/TeamInviteFromOrg.tsx  |  9 +--------
 .../features/ee/teams/components/TeamInviteList.tsx |  1 +
 .../ee/teams/components/TeamInviteListItem.tsx      |  5 +++--
 .../features/insights/filters/UsersListInTeam.tsx   | 13 +++----------
 .../UserTable/EditSheet/EditUserSheet.tsx           |  4 ++--
 .../viewer/organizations/getMembers.handler.ts      |  1 +
 .../routers/viewer/organizations/getUser.handler.ts |  1 +
 .../routers/viewer/teams/listMembers.handler.ts     |  1 +
 9 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/packages/features/bookings/components/PeopleFilter.tsx b/packages/features/bookings/components/PeopleFilter.tsx
index f37e23eb70..07d055016e 100644
--- a/packages/features/bookings/components/PeopleFilter.tsx
+++ b/packages/features/bookings/components/PeopleFilter.tsx
@@ -6,7 +6,6 @@ import {
   FilterCheckboxField,
   FilterCheckboxFieldsContainer,
 } from "@calcom/features/filters/components/TeamsFilter";
-import { WEBAPP_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { trpc } from "@calcom/trpc/react";
 import { AnimatedPopover, Avatar, Divider, FilterSearchField, Icon } from "@calcom/ui";
@@ -70,17 +69,7 @@ export const PeopleFilter = () => {
                 removeItemByKeyAndValue("userIds", member.id);
               }
             }}
-            icon={
-              <Avatar
-                alt={`${member?.id} avatar`}
-                imageSrc={
-                  member.username
-                    ? `${orgBranding?.fullDomain ?? WEBAPP_URL}/${member.username}/avatar.png`
-                    : undefined
-                }
-                size="xs"
-              />
-            }
+            icon={<Avatar alt={`${member?.id} avatar`} imageSrc={member.avatarUrl} size="xs" />}
           />
         ))}
         {filteredMembers?.length === 0 && (
diff --git a/packages/features/ee/organizations/components/TeamInviteFromOrg.tsx b/packages/features/ee/organizations/components/TeamInviteFromOrg.tsx
index 3864361e98..61b731e66e 100644
--- a/packages/features/ee/organizations/components/TeamInviteFromOrg.tsx
+++ b/packages/features/ee/organizations/components/TeamInviteFromOrg.tsx
@@ -2,7 +2,6 @@ import type { PropsWithChildren } from "react";
 import { useState } from "react";
 
 import classNames from "@calcom/lib/classNames";
-import { useBookerUrl } from "@calcom/lib/hooks/useBookerUrl";
 import type { RouterOutputs } from "@calcom/trpc";
 import { Avatar, TextField } from "@calcom/ui";
 
@@ -65,7 +64,6 @@ function UserToInviteItem({
   isSelected: boolean;
   onChange: () => void;
 }) {
-  const bookerUrl = useBookerUrl();
   return (
     <div
       key={member.userId}
@@ -75,12 +73,7 @@ function UserToInviteItem({
         isSelected ? "bg-emphasis" : "hover:bg-subtle "
       )}>
       <div className="flex items-center space-x-2 rtl:space-x-reverse">
-        <Avatar
-          size="sm"
-          alt="Users avatar"
-          asChild
-          imageSrc={`${bookerUrl}/${member.user.username}/avatar.png`}
-        />
+        <Avatar size="sm" alt="Users avatar" asChild imageSrc={member.user.avatarUrl} />
         <label
           htmlFor={`${member.user.id}`}
           className="text-emphasis cursor-pointer text-sm font-medium leading-none">
diff --git a/packages/features/ee/teams/components/TeamInviteList.tsx b/packages/features/ee/teams/components/TeamInviteList.tsx
index fe3bfaa87c..82f7fa83c1 100644
--- a/packages/features/ee/teams/components/TeamInviteList.tsx
+++ b/packages/features/ee/teams/components/TeamInviteList.tsx
@@ -15,6 +15,7 @@ interface Props {
     bio?: string | null;
     hideBranding?: boolean | undefined;
     role: MembershipRole;
+    logoUrl?: string | null;
     accepted: boolean;
   }[];
 }
diff --git a/packages/features/ee/teams/components/TeamInviteListItem.tsx b/packages/features/ee/teams/components/TeamInviteListItem.tsx
index de7c1d9f0a..7ec579a7e2 100644
--- a/packages/features/ee/teams/components/TeamInviteListItem.tsx
+++ b/packages/features/ee/teams/components/TeamInviteListItem.tsx
@@ -1,5 +1,5 @@
 import classNames from "@calcom/lib/classNames";
-import { WEBAPP_URL } from "@calcom/lib/constants";
+import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import type { MembershipRole } from "@calcom/prisma/enums";
 import { trpc } from "@calcom/trpc/react";
@@ -20,6 +20,7 @@ interface Props {
     name?: string | null;
     slug?: string | null;
     bio?: string | null;
+    logoUrl?: string | null;
     hideBranding?: boolean | undefined;
     role: MembershipRole;
     accepted: boolean;
@@ -64,7 +65,7 @@ export default function TeamInviteListItem(props: Props) {
     <div className="flex">
       <Avatar
         size="mdLg"
-        imageSrc={`${WEBAPP_URL}/team/${team.slug}/avatar.png`}
+        imageSrc={getPlaceholderAvatar(team.logoUrl, team.name)}
         alt="Team Logo"
         className=""
       />
diff --git a/packages/features/insights/filters/UsersListInTeam.tsx b/packages/features/insights/filters/UsersListInTeam.tsx
index 2eefb0d775..36a7cd1825 100644
--- a/packages/features/insights/filters/UsersListInTeam.tsx
+++ b/packages/features/insights/filters/UsersListInTeam.tsx
@@ -2,7 +2,6 @@ import {
   FilterCheckboxField,
   FilterCheckboxFieldsContainer,
 } from "@calcom/features/filters/components/TeamsFilter";
-import { useBookerUrl } from "@calcom/lib/hooks/useBookerUrl";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import type { RouterOutputs } from "@calcom/trpc";
 import { trpc } from "@calcom/trpc";
@@ -11,17 +10,17 @@ import { AnimatedPopover, Avatar } from "@calcom/ui";
 import { useFilterContext } from "../context/provider";
 
 type User = RouterOutputs["viewer"]["insights"]["userList"][number];
-type Option = { value: number; label: string; username: string | null };
+type Option = { value: number; label: string; username: string | null; avatarUrl: string | null };
 
 const mapUserToOption = (user: User): Option => ({
   value: user.id,
   label: user.name ?? user.email, // every user should have at least email
   username: user.username,
+  avatarUrl: user.avatarUrl,
 });
 
 export const UserListInTeam = () => {
   const { t } = useLocale();
-  const bookerUrl = useBookerUrl();
   const { filter, setConfigFilters } = useFilterContext();
   const { selectedFilter, selectedTeamId, selectedMemberUserId, isAll } = filter;
   const { data, isSuccess } = trpc.viewer.insights.userList.useQuery({
@@ -65,13 +64,7 @@ export const UserListInTeam = () => {
                 });
               }
             }}
-            icon={
-              <Avatar
-                alt={`${member?.value} avatar`}
-                imageSrc={member.username ? `${bookerUrl}/${member.username}/avatar.png` : undefined}
-                size="xs"
-              />
-            }
+            icon={<Avatar alt={`${member?.value} avatar`} imageSrc={member.avatarUrl} size="xs" />}
           />
         ))}
         {userListOptions?.length === 0 && (
diff --git a/packages/features/users/components/UserTable/EditSheet/EditUserSheet.tsx b/packages/features/users/components/UserTable/EditSheet/EditUserSheet.tsx
index 847f5c8659..b2c0c3e386 100644
--- a/packages/features/users/components/UserTable/EditSheet/EditUserSheet.tsx
+++ b/packages/features/users/components/UserTable/EditSheet/EditUserSheet.tsx
@@ -45,7 +45,7 @@ export function EditUserSheet({ state, dispatch }: { state: State; dispatch: Dis
                     asChild
                     className="h-[36px] w-[36px]"
                     alt={`${loadedUser?.name} avatar`}
-                    imageSrc={avatarURL}
+                    imageSrc={loadedUser.avatarUrl}
                   />
                   <div className="space-between flex flex-col leading-none">
                     <Skeleton loading={isPending} as="p" waitForTranslation={false}>
@@ -100,7 +100,7 @@ export function EditUserSheet({ state, dispatch }: { state: State; dispatch: Dis
               <div className="mb-4 flex-grow">
                 <EditForm
                   selectedUser={loadedUser}
-                  avatarUrl={avatarURL}
+                  avatarUrl={loadedUser.avatarUrl ?? avatarURL}
                   domainUrl={orgBranding?.fullDomain ?? WEBAPP_URL}
                   dispatch={dispatch}
                 />
diff --git a/packages/trpc/server/routers/viewer/organizations/getMembers.handler.ts b/packages/trpc/server/routers/viewer/organizations/getMembers.handler.ts
index 30390d3bec..10e1feffb7 100644
--- a/packages/trpc/server/routers/viewer/organizations/getMembers.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/getMembers.handler.ts
@@ -43,6 +43,7 @@ export const getMembersHandler = async ({ input, ctx }: CreateOptions) => {
             select: {
               id: true,
               username: true,
+              avatarUrl: true,
               email: true,
               completedOnboarding: true,
               name: true,
diff --git a/packages/trpc/server/routers/viewer/organizations/getUser.handler.ts b/packages/trpc/server/routers/viewer/organizations/getUser.handler.ts
index 908cf10874..6f297eaf39 100644
--- a/packages/trpc/server/routers/viewer/organizations/getUser.handler.ts
+++ b/packages/trpc/server/routers/viewer/organizations/getUser.handler.ts
@@ -31,6 +31,7 @@ export async function getUserHandler({ input, ctx }: AdminVerifyOptions) {
         email: true,
         username: true,
         name: true,
+        avatarUrl: true,
         bio: true,
         timeZone: true,
         schedules: {
diff --git a/packages/trpc/server/routers/viewer/teams/listMembers.handler.ts b/packages/trpc/server/routers/viewer/teams/listMembers.handler.ts
index 5c92afe940..fce0a112a9 100644
--- a/packages/trpc/server/routers/viewer/teams/listMembers.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/listMembers.handler.ts
@@ -43,6 +43,7 @@ export const listMembersHandler = async ({ ctx, input }: ListMembersOptions) =>
               id: true,
               name: true,
               username: true,
+              avatarUrl: true,
             },
           },
           accepted: true,