The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
fix: use team avatar everywhere (#1220)
Ephraim Duncan2c320e8b92c7
diff --git a/apps/web/src/app/(dashboard)/documents/documents-page-view.tsx b/apps/web/src/app/(dashboard)/documents/documents-page-view.tsxindex 84f6bfe3f..3420fc0be 100644--- a/apps/web/src/app/(dashboard)/documents/documents-page-view.tsx+++ b/apps/web/src/app/(dashboard)/documents/documents-page-view.tsx@@ -1,5 +1,6 @@import Link from 'next/link';+import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';import { findDocuments } from '@documenso/lib/server-only/document/find-documents';import type { PeriodSelectorValue } from '@documenso/lib/server-only/document/find-documents';@@ -10,7 +11,7 @@ import { formatDocumentsPath } from '@documenso/lib/utils/teams';import type { Team, TeamEmail } from '@documenso/prisma/client';import { isExtendedDocumentStatus } from '@documenso/prisma/guards/is-extended-document-status';import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';-import { Avatar, AvatarFallback } from '@documenso/ui/primitives/avatar';+import { Avatar, AvatarFallback, AvatarImage } from '@documenso/ui/primitives/avatar';import { Tabs, TabsList, TabsTrigger } from '@documenso/ui/primitives/tabs';import { PeriodSelector } from '~/components/(dashboard)/period-selector/period-selector';@@ -94,6 +95,9 @@ export const DocumentsPageView = async ({ searchParams = {}, team }: DocumentsPa<div className="flex flex-row items-center">{team && (<Avatar className="dark:border-border mr-3 h-12 w-12 border-2 border-solid border-white">+ {team.avatarImageId && (+ <AvatarImage src={`${NEXT_PUBLIC_WEBAPP_URL()}/api/avatar/${team.avatarImageId}`} />+ )}<AvatarFallback className="text-xs text-gray-400">{team.name.slice(0, 1)}</AvatarFallback>diff --git a/apps/web/src/app/(dashboard)/settings/teams/team-invitations.tsx b/apps/web/src/app/(dashboard)/settings/teams/team-invitations.tsxindex aa1be3f3f..b3ff9233b 100644--- a/apps/web/src/app/(dashboard)/settings/teams/team-invitations.tsx+++ b/apps/web/src/app/(dashboard)/settings/teams/team-invitations.tsx@@ -3,6 +3,7 @@import { AnimatePresence } from 'framer-motion';import { BellIcon } from 'lucide-react';+import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';import { formatTeamUrl } from '@documenso/lib/utils/teams';import { trpc } from '@documenso/trpc/react';import { AnimateGenericFadeInOut } from '@documenso/ui/components/animate/animate-generic-fade-in-out';@@ -55,6 +56,9 @@ export const TeamInvitations = () => {{data.map((invitation) => (<li key={invitation.teamId}><AvatarWithText+ avatarSrc={`${NEXT_PUBLIC_WEBAPP_URL()}/api/avatar/${+ invitation.team.avatarImageId+ }`}className="w-full max-w-none py-4"avatarFallback={invitation.team.name.slice(0, 1)}primaryText={diff --git a/apps/web/src/app/(dashboard)/templates/templates-page-view.tsx b/apps/web/src/app/(dashboard)/templates/templates-page-view.tsxindex 4736f4268..9f7702ccf 100644--- a/apps/web/src/app/(dashboard)/templates/templates-page-view.tsx+++ b/apps/web/src/app/(dashboard)/templates/templates-page-view.tsx@@ -1,10 +1,11 @@import React from 'react';+import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';import { findTemplates } from '@documenso/lib/server-only/template/find-templates';import { formatDocumentsPath, formatTemplatesPath } from '@documenso/lib/utils/teams';import type { Team } from '@documenso/prisma/client';-import { Avatar, AvatarFallback } from '@documenso/ui/primitives/avatar';+import { Avatar, AvatarFallback, AvatarImage } from '@documenso/ui/primitives/avatar';import { TemplatesDataTable } from './data-table-templates';import { EmptyTemplateState } from './empty-state';@@ -39,6 +40,9 @@ export const TemplatesPageView = async ({ searchParams = {}, team }: TemplatesPa<div className="flex flex-row items-center">{team && (<Avatar className="dark:border-border mr-3 h-12 w-12 border-2 border-solid border-white">+ {team.avatarImageId && (+ <AvatarImage src={`${NEXT_PUBLIC_WEBAPP_URL()}/api/avatar/${team.avatarImageId}`} />+ )}<AvatarFallback className="text-xs text-gray-400">{team.name.slice(0, 1)}</AvatarFallback>diff --git a/apps/web/src/app/(teams)/t/[teamUrl]/settings/page.tsx b/apps/web/src/app/(teams)/t/[teamUrl]/settings/page.tsxindex 88782b1e7..ca897a30e 100644--- a/apps/web/src/app/(teams)/t/[teamUrl]/settings/page.tsx+++ b/apps/web/src/app/(teams)/t/[teamUrl]/settings/page.tsx@@ -1,6 +1,7 @@import { CheckCircle2, Clock } from 'lucide-react';import { P, match } from 'ts-pattern';+import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';import { getTeamByUrl } from '@documenso/lib/server-only/team/get-team';import { extractInitials } from '@documenso/lib/utils/recipient-formatter';@@ -64,6 +65,7 @@ export default async function TeamsSettingsPage({ params }: TeamsSettingsPagePro<div className="flex flex-row items-center justify-between pt-4"><AvatarWithTextavatarClass="h-12 w-12"+ avatarSrc={`${NEXT_PUBLIC_WEBAPP_URL()}/api/avatar/${team.avatarImageId}`}avatarFallback={extractInitials((team.teamEmail?.name || team.emailVerification?.name) ?? '',)}diff --git a/apps/web/src/components/(teams)/dialogs/leave-team-dialog.tsx b/apps/web/src/components/(teams)/dialogs/leave-team-dialog.tsxindex 27384d680..a16658316 100644--- a/apps/web/src/components/(teams)/dialogs/leave-team-dialog.tsx+++ b/apps/web/src/components/(teams)/dialogs/leave-team-dialog.tsx@@ -2,6 +2,7 @@import { useState } from 'react';+import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';import { TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams';import type { TeamMemberRole } from '@documenso/prisma/client';import { trpc } from '@documenso/trpc/react';@@ -22,11 +23,18 @@ import { useToast } from '@documenso/ui/primitives/use-toast';export type LeaveTeamDialogProps = {teamId: number;teamName: string;+ teamAvatarImageId?: string | null;role: TeamMemberRole;trigger?: React.ReactNode;};-export const LeaveTeamDialog = ({ trigger, teamId, teamName, role }: LeaveTeamDialogProps) => {+export const LeaveTeamDialog = ({+ trigger,+ teamId,+ teamName,+ teamAvatarImageId,+ role,+}: LeaveTeamDialogProps) => {const [open, setOpen] = useState(false);const { toast } = useToast();@@ -70,6 +78,7 @@ export const LeaveTeamDialog = ({ trigger, teamId, teamName, role }: LeaveTeamDi<Alert variant="neutral" padding="tight"><AvatarWithTextavatarClass="h-12 w-12"+ avatarSrc={`${NEXT_PUBLIC_WEBAPP_URL()}/api/avatar/${teamAvatarImageId}`}avatarFallback={teamName.slice(0, 1).toUpperCase()}primaryText={teamName}secondaryText={TEAM_MEMBER_ROLE_MAP[role]}diff --git a/apps/web/src/components/(teams)/tables/current-user-teams-data-table.tsx b/apps/web/src/components/(teams)/tables/current-user-teams-data-table.tsxindex 0dd4bcf4c..5ece1fc6a 100644--- a/apps/web/src/components/(teams)/tables/current-user-teams-data-table.tsx+++ b/apps/web/src/components/(teams)/tables/current-user-teams-data-table.tsx@@ -4,7 +4,7 @@ import Link from 'next/link';import { useSearchParams } from 'next/navigation';import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';-import { WEBAPP_BASE_URL } from '@documenso/lib/constants/app';+import { NEXT_PUBLIC_WEBAPP_URL, WEBAPP_BASE_URL } from '@documenso/lib/constants/app';import { TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams';import { ZBaseTableSearchParamsSchema } from '@documenso/lib/types/search-params';import { canExecuteTeamAction } from '@documenso/lib/utils/teams';@@ -62,6 +62,7 @@ export const CurrentUserTeamsDataTable = () => {cell: ({ row }) => (<Link href={`/t/${row.original.url}`} scroll={false}><AvatarWithText+ avatarSrc={`${NEXT_PUBLIC_WEBAPP_URL()}/api/avatar/${row.original.avatarImageId}`}avatarClass="h-12 w-12"avatarFallback={row.original.name.slice(0, 1).toUpperCase()}primaryText={@@ -98,6 +99,7 @@ export const CurrentUserTeamsDataTable = () => {<LeaveTeamDialogteamId={row.original.id}teamName={row.original.name}+ teamAvatarImageId={row.original.avatarImageId}role={row.original.currentTeamMember.role}trigger={<Buttondiff --git a/packages/lib/server-only/team/get-team-invitations.ts b/packages/lib/server-only/team/get-team-invitations.tsindex 737f1b3f7..dbbc2a2b0 100644--- a/packages/lib/server-only/team/get-team-invitations.ts+++ b/packages/lib/server-only/team/get-team-invitations.ts@@ -15,6 +15,7 @@ export const getTeamInvitations = async ({ email }: GetTeamInvitationsOptions) =id: true,name: true,url: true,+ avatarImageId: true,},},},