diff --git a/apps/web/src/app/(dashboard)/admin/documents/data-table.tsx b/apps/web/src/app/(dashboard)/admin/documents/data-table.tsx index 83ad81ca1..0fc660968 100644 --- a/apps/web/src/app/(dashboard)/admin/documents/data-table.tsx +++ b/apps/web/src/app/(dashboard)/admin/documents/data-table.tsx @@ -7,9 +7,9 @@ import Link from 'next/link'; import { Loader } from 'lucide-react'; import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params'; -import { FindResultSet } from '@documenso/lib/types/find-result-set'; -import { recipientInitials } from '@documenso/lib/utils/recipient-formatter'; -import { Document, User } from '@documenso/prisma/client'; +import type { FindResultSet } from '@documenso/lib/types/find-result-set'; +import { extractInitials } from '@documenso/lib/utils/recipient-formatter'; +import type { Document, User } from '@documenso/prisma/client'; import { Avatar, AvatarFallback } from '@documenso/ui/primitives/avatar'; import { DataTable } from '@documenso/ui/primitives/data-table'; import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination'; @@ -65,7 +65,7 @@ export const DocumentsDataTable = ({ results }: DocumentsDataTableProps) => { accessorKey: 'owner', cell: ({ row }) => { const avatarFallbackText = row.original.User.name - ? recipientInitials(row.original.User.name) + ? extractInitials(row.original.User.name) : row.original.User.email.slice(0, 1).toUpperCase(); return ( diff --git a/apps/web/src/app/(teams)/t/[teamUrl]/settings/page.tsx b/apps/web/src/app/(teams)/t/[teamUrl]/settings/page.tsx index 29f3f2041..af5f07472 100644 --- a/apps/web/src/app/(teams)/t/[teamUrl]/settings/page.tsx +++ b/apps/web/src/app/(teams)/t/[teamUrl]/settings/page.tsx @@ -2,7 +2,7 @@ import { CheckCircle2, Clock } from 'lucide-react'; import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session'; import { getTeamByUrl } from '@documenso/lib/server-only/team/get-teams'; -import { recipientInitials } from '@documenso/lib/utils/recipient-formatter'; +import { extractInitials } from '@documenso/lib/utils/recipient-formatter'; import { isTokenExpired } from '@documenso/lib/utils/token-verification'; import { AvatarWithText } from '@documenso/ui/primitives/avatar'; @@ -58,7 +58,7 @@ export default async function TeamsSettingsPage({ params }: TeamsSettingsPagePro
{ diff --git a/apps/web/src/components/(teams)/dialogs/invite-team-member-dialog.tsx b/apps/web/src/components/(teams)/dialogs/invite-team-member-dialog.tsx index e7cfc7a1f..e5db1ade5 100644 --- a/apps/web/src/components/(teams)/dialogs/invite-team-member-dialog.tsx +++ b/apps/web/src/components/(teams)/dialogs/invite-team-member-dialog.tsx @@ -45,7 +45,6 @@ export const ZInviteTeamMembersFormSchema = z .object({ invitations: ZCreateTeamMemberInvitesMutationSchema.shape.invitations, }) - // Todo: Teams .refine( (schema) => { const emails = schema.invitations.map((invitation) => invitation.email.toLowerCase()); diff --git a/apps/web/src/components/(teams)/tables/team-members-data-table.tsx b/apps/web/src/components/(teams)/tables/team-members-data-table.tsx index 34e4e11f4..5f3829cd0 100644 --- a/apps/web/src/components/(teams)/tables/team-members-data-table.tsx +++ b/apps/web/src/components/(teams)/tables/team-members-data-table.tsx @@ -7,7 +7,7 @@ import { Edit, MoreHorizontal, Trash2 } from 'lucide-react'; import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params'; import { TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams'; import { ZBaseTableSearchParamsSchema } from '@documenso/lib/types/search-params'; -import { recipientInitials } from '@documenso/lib/utils/recipient-formatter'; +import { extractInitials } from '@documenso/lib/utils/recipient-formatter'; import { trpc } from '@documenso/trpc/react'; import { AvatarWithText } from '@documenso/ui/primitives/avatar'; import { DataTable } from '@documenso/ui/primitives/data-table'; @@ -78,7 +78,7 @@ export default function TeamMembersDataTable({ header: 'Team Member', cell: ({ row }) => { const avatarFallbackText = row.original.user.name - ? recipientInitials(row.original.user.name) // Todo: Teams - Extract to `nameInitials` + ? extractInitials(row.original.user.name) : row.original.user.email.slice(0, 1).toUpperCase(); return ( diff --git a/packages/lib/server-only/document/find-documents.ts b/packages/lib/server-only/document/find-documents.ts index e128addea..c28907348 100644 --- a/packages/lib/server-only/document/find-documents.ts +++ b/packages/lib/server-only/document/find-documents.ts @@ -304,7 +304,6 @@ const findTeamDocumentsFilter = ( }) .with(ExtendedDocumentStatus.INBOX, () => { // Return a filter that will return nothing. - // Todo: Teams - Should be a better way to do this. if (!teamEmail) { return null; } diff --git a/packages/lib/server-only/team/create-team.ts b/packages/lib/server-only/team/create-team.ts index 4417dd5f6..aba8e82bc 100644 --- a/packages/lib/server-only/team/create-team.ts +++ b/packages/lib/server-only/team/create-team.ts @@ -194,7 +194,7 @@ export const createTeamFromPendingTeam = async ({ .catch((e) => { console.error(e); // Non-critical error, but we want to log it so we can rectify it. - // Todo: Teams - Send alert. + // Todo: Teams - Alert us. }); }); }; diff --git a/packages/lib/utils/recipient-formatter.ts b/packages/lib/utils/recipient-formatter.ts index da404830b..5fad45399 100644 --- a/packages/lib/utils/recipient-formatter.ts +++ b/packages/lib/utils/recipient-formatter.ts @@ -1,6 +1,6 @@ -import { Recipient } from '@documenso/prisma/client'; +import type { Recipient } from '@documenso/prisma/client'; -export const recipientInitials = (text: string) => +export const extractInitials = (text: string) => text .split(' ') .map((name: string) => name.slice(0, 1).toUpperCase()) @@ -8,5 +8,5 @@ export const recipientInitials = (text: string) => .join(''); export const recipientAbbreviation = (recipient: Recipient) => { - return recipientInitials(recipient.name) || recipient.email.slice(0, 1).toUpperCase(); + return extractInitials(recipient.name) || recipient.email.slice(0, 1).toUpperCase(); };