Merge pull request #1700 from rockingrohit9639/fix/booking-export

fix(booking-export): fix issue with custodian user in export

Author: DonKoko

app/components/assets/asset-custody-card.tsx

@@ -111,7 +111,6 @@ export function CustodyCard({
         user: {
           firstName: booking.custodianUser?.firstName || "",
           lastName: booking.custodianUser?.lastName || "",
-          profilePicture: booking.custodianUser?.profilePicture || null,
         },
       });
     } else if (booking.custodianTeamMember) {

app/components/assets/assets-index/advanced-asset-columns.tsx

@@ -400,8 +400,6 @@ function CustodyColumn({
                     ? {
                         firstName: custody.custodian?.user?.firstName || null,
                         lastName: custody.custodian?.user?.lastName || null,
-                        profilePicture:
-                          custody.custodian?.user?.profilePicture || null,
                         email: custody.custodian?.user?.email || "",
                       }
                     : undefined,

app/routes/_layout+/assets._index.tsx

@@ -476,8 +476,6 @@ const ListAssetContent = ({
                       ? {
                           firstName: custody.custodian?.user?.firstName || null,
                           lastName: custody.custodian?.user?.lastName || null,
-                          profilePicture:
-                            custody.custodian?.user?.profilePicture || null,
                           email: custody.custodian?.user?.email || "",
                         }
                       : undefined,

app/routes/_layout+/kits._index.tsx

@@ -311,9 +311,6 @@ function ListContent({
                             item?.custody?.custodian?.user?.firstName || null,
                           lastName:
                             item?.custody?.custodian?.user?.lastName || null,
-                          profilePicture:
-                            item?.custody?.custodian?.user?.profilePicture ||
-                            null,
                           email: item?.custody?.custodian?.user?.email || "",
                         }
                       : undefined,

app/utils/csv.server.ts

@@ -647,9 +647,16 @@ export const buildCsvExportDataFromBookings = (
           value = booking.displayTo;
           break;
         case "custodian":
-          value = booking.custodianTeamMember
-            ? resolveTeamMemberName(booking.custodianTeamMember)
-            : "";
+          const teamMember = {
+            name: booking.custodianTeamMember?.name ?? "",
+            user: {
+              firstName: booking.custodianUser?.firstName ?? "",
+              lastName: booking.custodianUser?.lastName ?? "",
+              email: booking.custodianUser?.email ?? "",
+            },
+          };
+
+          value = resolveTeamMemberName(teamMember, true);
           break;
         case "description":
           value = booking.description ?? "";

app/utils/user.ts

@@ -11,9 +11,7 @@ export const randomUsernameFromEmail = (email: string): string =>
 export const resolveTeamMemberName = (
   teamMember: {
     name: string;
-    user?: Partial<
-      Pick<User, "firstName" | "lastName" | "profilePicture" | "email">
-    > | null;
+    user?: Partial<Pick<User, "firstName" | "lastName" | "email">> | null;
   },
   includeEmail?: boolean
 ): string => {