fix: refactor teams router (#1500)

apps/web/package.json

@@ -59,7 +59,7 @@
     "ts-pattern": "^5.0.5",
     "ua-parser-js": "^1.0.37",
     "uqr": "^0.1.2",
-    "zod": "^3.22.4"
+    "zod": "^3.23.8"
   },
   "devDependencies": {
     "@documenso/tailwind-config": "*",

apps/web/src/app/(profile)/profile-header.tsx

@@ -9,7 +9,7 @@ import { Trans } from '@lingui/macro';
 import { PlusIcon } from 'lucide-react';
 
 import LogoIcon from '@documenso/assets/logo_icon.png';
-import type { GetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
+import type { TGetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
 import type { User } from '@documenso/prisma/client';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
@@ -19,7 +19,7 @@ import { Logo } from '~/components/branding/logo';
 
 type ProfileHeaderProps = {
   user?: User | null;
-  teams?: GetTeamsResponse;
+  teams?: TGetTeamsResponse;
 };
 
 export const ProfileHeader = ({ user, teams = [] }: ProfileHeaderProps) => {
@@ -58,7 +58,7 @@ export const ProfileHeader = ({ user, teams = [] }: ProfileHeaderProps) => {
             alt="Documenso Logo"
             width={48}
             height={48}
-            className="h-10 w-auto dark:invert sm:hidden"
+            className="h-10 w-auto sm:hidden dark:invert"
           />
         </Link>
 

apps/web/src/app/(recipient)/layout.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 
 import { setupI18nSSR } from '@documenso/lib/client-only/providers/i18n.server';
 import { getServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
-import type { GetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
+import type { TGetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
 import { getTeams } from '@documenso/lib/server-only/team/get-teams';
 
 import { Header as AuthenticatedHeader } from '~/components/(dashboard)/layout/header';
@@ -23,7 +23,7 @@ export default async function RecipientLayout({ children }: RecipientLayoutProps
 
   const { user, session } = await getServerComponentSession();
 
-  let teams: GetTeamsResponse = [];
+  let teams: TGetTeamsResponse = [];
 
   if (user && session) {
     teams = await getTeams({ userId: user.id });

apps/web/src/app/(signing)/sign/[token]/layout.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 
 import { setupI18nSSR } from '@documenso/lib/client-only/providers/i18n.server';
 import { getServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
-import type { GetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
+import type { TGetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
 import { getTeams } from '@documenso/lib/server-only/team/get-teams';
 
 import { Header as AuthenticatedHeader } from '~/components/(dashboard)/layout/header';
@@ -17,7 +17,7 @@ export default async function SigningLayout({ children }: SigningLayoutProps) {
 
   const { user, session } = await getServerComponentSession();
 
-  let teams: GetTeamsResponse = [];
+  let teams: TGetTeamsResponse = [];
 
   if (user && session) {
     teams = await getTeams({ userId: user.id });

apps/web/src/components/(dashboard)/layout/header.tsx

@@ -8,7 +8,7 @@ import { usePathname } from 'next/navigation';
 
 import { MenuIcon, SearchIcon } from 'lucide-react';
 
-import type { GetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
+import type { TGetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
 import { getRootHref } from '@documenso/lib/utils/params';
 import type { User } from '@documenso/prisma/client';
 import { cn } from '@documenso/ui/lib/utils';
@@ -22,7 +22,7 @@ import { MobileNavigation } from './mobile-navigation';
 
 export type HeaderProps = HTMLAttributes<HTMLDivElement> & {
   user: User;
-  teams: GetTeamsResponse;
+  teams: TGetTeamsResponse;
 };
 
 export const Header = ({ className, user, teams, ...props }: HeaderProps) => {
@@ -75,7 +75,7 @@ export const Header = ({ className, user, teams, ...props }: HeaderProps) => {
 
         <div
           className="flex gap-x-4 md:ml-8"
-          title={selectedTeam ? selectedTeam.name : user.name ?? ''}
+          title={selectedTeam ? selectedTeam.name : (user.name ?? '')}
         >
           <MenuSwitcher user={user} teams={teams} />
         </div>

apps/web/src/components/(dashboard)/layout/menu-switcher.tsx

@@ -14,7 +14,7 @@ import { signOut } from 'next-auth/react';
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
 import { TEAM_MEMBER_ROLE_MAP, TEAM_URL_REGEX } from '@documenso/lib/constants/teams';
 import { isAdmin } from '@documenso/lib/next-auth/guards/is-admin';
-import type { GetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
+import type { TGetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
 import { extractInitials } from '@documenso/lib/utils/recipient-formatter';
 import { canExecuteTeamAction } from '@documenso/lib/utils/teams';
 import type { User } from '@documenso/prisma/client';
@@ -36,7 +36,7 @@ const MotionLink = motion(Link);
 
 export type MenuSwitcherProps = {
   user: User;
-  teams: GetTeamsResponse;
+  teams: TGetTeamsResponse;
 };
 
 export const MenuSwitcher = ({ user, teams: initialTeamsData }: MenuSwitcherProps) => {

apps/web/src/providers/team.tsx

@@ -3,14 +3,14 @@
 import { createContext, useContext } from 'react';
 import React from 'react';
 
-import type { GetTeamResponse } from '@documenso/lib/server-only/team/get-team';
+import type { TGetTeamByIdResponse } from '@documenso/lib/server-only/team/get-team';
 
 interface TeamProviderProps {
   children: React.ReactNode;
-  team: GetTeamResponse;
+  team: TGetTeamByIdResponse;
 }
 
-const TeamContext = createContext<GetTeamResponse | null>(null);
+const TeamContext = createContext<TGetTeamByIdResponse | null>(null);
 
 export const useCurrentTeam = () => {
   const context = useContext(TeamContext);