The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Sort partners with unread messages first in message list (#3600)
Kiran K0d4ca7ecb0af
diff --git a/apps/web/app/(ee)/api/messages/route.ts b/apps/web/app/(ee)/api/messages/route.tsindex 62ae82d149..483d7e7c73 100644--- a/apps/web/app/(ee)/api/messages/route.ts+++ b/apps/web/app/(ee)/api/messages/route.ts@@ -61,14 +61,25 @@ export const GET = withWorkspace(return NextResponse.json(PartnerMessagesSchema.parse(partners- // Sort by most recent message- .sort((a, b) =>- sortOrder === "desc"+ // Sort by unread first, then by most recent message+ .sort((a, b) => {+ const aUnread = a.messages.some(+ (m) => m.senderPartnerId && !m.readInApp,+ );+ const bUnread = b.messages.some(+ (m) => m.senderPartnerId && !m.readInApp,+ );++ if (aUnread !== bUnread) {+ return aUnread ? -1 : 1;+ }++ return sortOrder === "desc"? (b.messages?.[0]?.[sortBy]?.getTime() ?? 0) -- (a.messages?.[0]?.[sortBy]?.getTime() ?? 0)+ (a.messages?.[0]?.[sortBy]?.getTime() ?? 0): (a.messages?.[0]?.[sortBy]?.getTime() ?? 0) -- (b.messages?.[0]?.[sortBy]?.getTime() ?? 0),- )+ (b.messages?.[0]?.[sortBy]?.getTime() ?? 0);+ })// Map to {partner, messages}.map(({ messages, ...partner }) => ({partner,diff --git a/apps/web/app/(ee)/api/partner-profile/messages/route.ts b/apps/web/app/(ee)/api/partner-profile/messages/route.tsindex b85f361064..25fb19a366 100644--- a/apps/web/app/(ee)/api/partner-profile/messages/route.ts+++ b/apps/web/app/(ee)/api/partner-profile/messages/route.ts@@ -97,14 +97,25 @@ export const GET = withPartnerProfile(async ({ partner, searchParams }) => {return NextResponse.json(ProgramMessagesSchema.parse(programs- // Sort by most recent message- .sort((a, b) =>- sortOrder === "desc"+ // Sort by unread first, then by most recent message+ .sort((a, b) => {+ const aUnread = a.messages.some(+ (m) => !m.senderPartnerId && !m.readInApp,+ );+ const bUnread = b.messages.some(+ (m) => !m.senderPartnerId && !m.readInApp,+ );++ if (aUnread !== bUnread) {+ return aUnread ? -1 : 1;+ }++ return sortOrder === "desc"? (b.messages?.[0]?.[sortBy]?.getTime() ?? 0) -- (a.messages?.[0]?.[sortBy]?.getTime() ?? 0)+ (a.messages?.[0]?.[sortBy]?.getTime() ?? 0): (a.messages?.[0]?.[sortBy]?.getTime() ?? 0) -- (b.messages?.[0]?.[sortBy]?.getTime() ?? 0),- )+ (b.messages?.[0]?.[sortBy]?.getTime() ?? 0);+ })// Map to {program, messages}.map(({ messages, ...program }) => ({program,