create-ej-app 26.0.0 → 28.0.0

package/template/saas-starter/src/app/(admin)/admin/settings/users/_components/users-table.tsx

@@ -1,415 +0,0 @@
-'use client'
-
-import { useQueryClient } from '@tanstack/react-query'
-import { ColumnDef } from '@tanstack/react-table'
-import {
-  Ban,
-  Edit,
-  MoreHorizontal,
-  Plus,
-  Shield,
-  Trash2,
-  UserCog,
-  Users
-} from 'lucide-react'
-import { useRouter } from 'next/navigation'
-import {
-  parseAsInteger,
-  parseAsJson,
-  parseAsString,
-  useQueryStates
-} from 'nuqs'
-import { useState } from 'react'
-import { DataTable } from '~/components/data-table'
-import { SortOrderEnum } from '~/components/data-table/enum'
-import { DataTableFilter } from '~/components/data-table/types'
-import { PageHeading } from '~/components/page-heading'
-import { Avatar, AvatarFallback, AvatarImage } from '~/components/ui/avatar'
-import { Badge } from '~/components/ui/badge'
-import { Button } from '~/components/ui/button'
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuLabel,
-  DropdownMenuSeparator,
-  DropdownMenuSub,
-  DropdownMenuSubContent,
-  DropdownMenuSubTrigger,
-  DropdownMenuTrigger
-} from '~/components/ui/dropdown-menu'
-import { admin } from '~/lib/auth-client'
-import { formatDate } from '~/lib/format-date'
-import { useSafeActionQuery } from '~/lib/safe-action-client'
-import { toastErrorMessage, toastSuccessMessage } from '~/lib/toast-message'
-import { getDistinctRoles, getUsers } from '../../../../actions/users'
-import { CreateUserDialog } from './create-user-dialog'
-import { EditNameDialog } from './edit-name-dialog'
-
-type User = {
-  id: string
-  name: string
-  email: string
-  emailVerified: boolean
-  image: string | null
-  role: string | null
-  banned: boolean | null
-  createdAt: Date
-  updatedAt: Date
-}
-
-const getInitials = (name: string) =>
-  name
-    .split(' ')
-    .map(n => n[0])
-    .join('')
-    .toUpperCase()
-    .slice(0, 2)
-
-const ADMIN_ROLES = new Set(['admin', 'superadmin'])
-
-function UserActionsCell({
-  user,
-  isSuperAdmin,
-  currentUserId
-}: {
-  user: User
-  isSuperAdmin: boolean
-  currentUserId: string
-}) {
-  const isSelf = user.id === currentUserId
-  const router = useRouter()
-  const queryClient = useQueryClient()
-  const [isLoading, setIsLoading] = useState(false)
-
-  const canImpersonate = isSuperAdmin
-    ? user.role !== 'superadmin'
-    : !ADMIN_ROLES.has(user.role ?? '')
-
-  async function handleImpersonate() {
-    setIsLoading(true)
-    try {
-      await admin.impersonateUser({ userId: user.id })
-      router.push('/app')
-    } catch {
-      toastErrorMessage('Failed to impersonate user')
-      setIsLoading(false)
-    }
-  }
-
-  async function handleToggleBan() {
-    const confirmed = window.confirm(
-      user.banned
-        ? 'Unban this user?'
-        : 'Ban this user? They will no longer be able to sign in.'
-    )
-    if (!confirmed) return
-
-    setIsLoading(true)
-    try {
-      const action = user.banned ? admin.unbanUser : admin.banUser
-      const { error } = await action({ userId: user.id })
-
-      if (error) {
-        toastErrorMessage(
-          error.message ?? (user.banned ? 'Failed to unban' : 'Failed to ban')
-        )
-      } else {
-        toastSuccessMessage(user.banned ? 'User unbanned' : 'User banned')
-        queryClient.invalidateQueries({ queryKey: ['admin-users'] })
-      }
-    } finally {
-      setIsLoading(false)
-    }
-  }
-
-  async function handleDelete() {
-    const confirmed = window.confirm(
-      'Delete this user? This action cannot be undone.'
-    )
-    if (!confirmed) return
-
-    setIsLoading(true)
-    try {
-      const { error } = await admin.removeUser({ userId: user.id })
-
-      if (error) {
-        toastErrorMessage(error.message ?? 'Failed to delete user')
-      } else {
-        toastSuccessMessage('User deleted')
-        queryClient.invalidateQueries({ queryKey: ['admin-users'] })
-      }
-    } finally {
-      setIsLoading(false)
-    }
-  }
-
-  async function handleSetRole(role: string) {
-    setIsLoading(true)
-    try {
-      const { error } = await admin.setRole({
-        userId: user.id,
-        role: role as any
-      })
-
-      if (error) {
-        toastErrorMessage(error.message ?? 'Failed to update role')
-      } else {
-        toastSuccessMessage('Role updated')
-        queryClient.invalidateQueries({ queryKey: ['admin-users'] })
-      }
-    } finally {
-      setIsLoading(false)
-    }
-  }
-
-  return (
-    <DropdownMenu>
-      <DropdownMenuTrigger asChild>
-        <Button
-          variant="ghost"
-          size="sm"
-          className="h-8 w-8 p-0"
-          aria-label="User actions"
-        >
-          <MoreHorizontal className="h-4 w-4" />
-        </Button>
-      </DropdownMenuTrigger>
-      <DropdownMenuContent align="end" className="w-48">
-        <DropdownMenuLabel className="text-muted-foreground max-w-44 truncate text-xs font-normal">
-          {user.email}
-        </DropdownMenuLabel>
-        <DropdownMenuSeparator />
-
-        <EditNameDialog userId={user.id} currentName={user.name}>
-          <DropdownMenuItem onSelect={e => e.preventDefault()}>
-            <Edit className="mr-2 h-4 w-4" />
-            Edit name
-          </DropdownMenuItem>
-        </EditNameDialog>
-
-        {canImpersonate && !isSelf && (
-          <DropdownMenuItem disabled={isLoading} onClick={handleImpersonate}>
-            <UserCog className="mr-2 h-4 w-4" />
-            Impersonate
-          </DropdownMenuItem>
-        )}
-
-        {!isSelf && (isSuperAdmin || user.role !== 'superadmin') && (
-          <DropdownMenuItem disabled={isLoading} onClick={handleToggleBan}>
-            <Ban className="mr-2 h-4 w-4" />
-            {user.banned ? 'Unban user' : 'Ban user'}
-          </DropdownMenuItem>
-        )}
-
-        {isSuperAdmin && !isSelf && (
-          <DropdownMenuSub>
-            <DropdownMenuSubTrigger disabled={isLoading}>
-              <Shield className="mr-2 h-4 w-4" />
-              Set role
-            </DropdownMenuSubTrigger>
-            <DropdownMenuSubContent>
-              {(['user', 'admin', 'superadmin'] as const).map(role => (
-                <DropdownMenuItem
-                  key={role}
-                  disabled={user.role === role || isLoading}
-                  onClick={() => handleSetRole(role)}
-                  className="capitalize"
-                >
-                  {role}
-                  {user.role === role && (
-                    <span className="text-muted-foreground ml-auto text-xs">
-                      current
-                    </span>
-                  )}
-                </DropdownMenuItem>
-              ))}
-            </DropdownMenuSubContent>
-          </DropdownMenuSub>
-        )}
-
-        {isSuperAdmin && !isSelf && (
-          <>
-            <DropdownMenuSeparator />
-            <DropdownMenuItem
-              variant="destructive"
-              disabled={isLoading}
-              onClick={handleDelete}
-            >
-              <Trash2 className="mr-2 h-4 w-4" />
-              Delete user
-            </DropdownMenuItem>
-          </>
-        )}
-      </DropdownMenuContent>
-    </DropdownMenu>
-  )
-}
-
-const filters: DataTableFilter[] = [
-  {
-    id: 'role',
-    label: 'Role',
-    action: getDistinctRoles,
-    queryKey: 'admin-distinct-roles'
-  },
-  {
-    id: 'banned',
-    label: 'Status',
-    options: [
-      { label: 'Active', value: false },
-      { label: 'Banned', value: true }
-    ]
-  }
-]
-
-interface UsersTableProps {
-  isSuperAdmin: boolean
-  currentUserId: string
-}
-
-export function UsersTable({ isSuperAdmin, currentUserId }: UsersTableProps) {
-  const [queryState, setQueryState] = useQueryStates({
-    page: parseAsInteger.withDefault(1),
-    limit: parseAsInteger.withDefault(10),
-    sortBy: parseAsString,
-    sortOrder: parseAsString,
-    search: parseAsString,
-    filters: parseAsJson(v => v as Record<string, (string | boolean)[]>)
-  })
-
-  const params = {
-    page: queryState.page,
-    limit: queryState.limit,
-    sortBy: (queryState.sortBy ?? undefined) as
-      | 'name'
-      | 'email'
-      | 'createdAt'
-      | undefined,
-    sortOrder: (queryState.sortOrder ?? undefined) as SortOrderEnum | undefined,
-    search: queryState.search ?? undefined,
-    filters: queryState.filters ?? undefined
-  }
-
-  const { data, isLoading } = useSafeActionQuery(
-    'admin-users',
-    getUsers,
-    params
-  )
-
-  const columns: ColumnDef<User, unknown>[] = [
-    {
-      accessorKey: 'name',
-      header: 'User',
-      enableSorting: true,
-      cell: ({ row }) => (
-        <div className="flex items-center gap-3">
-          <Avatar className="h-8 w-8">
-            <AvatarImage src={row.original.image ?? undefined} />
-            <AvatarFallback className="text-xs">
-              {getInitials(row.original.name)}
-            </AvatarFallback>
-          </Avatar>
-          <div className="flex flex-col">
-            <span className="text-sm font-medium">{row.original.name}</span>
-            <span className="text-muted-foreground text-xs">
-              {row.original.email}
-            </span>
-          </div>
-        </div>
-      )
-    },
-    {
-      accessorKey: 'role',
-      header: 'Role',
-      cell: ({ row }) => (
-        <Badge variant="outline" className="capitalize">
-          {row.original.role ?? 'user'}
-        </Badge>
-      )
-    },
-    {
-      accessorKey: 'banned',
-      header: 'Status',
-      enableSorting: false,
-      cell: ({ row }) => (
-        <Badge variant={row.original.banned ? 'destructive' : 'default'}>
-          {row.original.banned ? 'Banned' : 'Active'}
-        </Badge>
-      )
-    },
-    {
-      accessorKey: 'emailVerified',
-      header: 'Verified',
-      enableSorting: false,
-      cell: ({ row }) => (
-        <Badge variant={row.original.emailVerified ? 'default' : 'secondary'}>
-          {row.original.emailVerified ? 'Verified' : 'Unverified'}
-        </Badge>
-      )
-    },
-    {
-      accessorKey: 'createdAt',
-      header: 'Joined',
-      enableSorting: true,
-      cell: ({ row }) => formatDate(row.original.createdAt, { short: true })
-    },
-    {
-      id: 'actions',
-      header: '',
-      enableSorting: false,
-      cell: ({ row }) => (
-        <UserActionsCell
-          user={row.original}
-          isSuperAdmin={isSuperAdmin}
-          currentUserId={currentUserId}
-        />
-      )
-    }
-  ]
-
-  return (
-    <div className="flex flex-1 flex-col gap-6 p-4">
-      <PageHeading
-        title="Users"
-        description="Manage users and their roles."
-        icon={Users}
-      >
-        {isSuperAdmin && (
-          <CreateUserDialog>
-            <Button size="lg">
-              <Plus className="mr-2 h-4 w-4" />
-              New user
-            </Button>
-          </CreateUserDialog>
-        )}
-      </PageHeading>
-
-      <DataTable
-        columns={columns}
-        data={data?.[0]}
-        isLoading={isLoading}
-        totalCount={data?.[1]}
-        enableSearch
-        initialSearch={params.search}
-        searchPlaceholder="Search users..."
-        manualPagination
-        manualSorting
-        pageIndex={params.page - 1}
-        pageSize={params.limit}
-        filters={filters}
-        activeFilters={params.filters ?? {}}
-        onParamsChange={({ page, limit, sortBy, sortOrder, search, filters }) =>
-          setQueryState({
-            page,
-            limit,
-            sortBy: sortBy ?? null,
-            sortOrder: sortOrder ?? null,
-            search: search ?? null,
-            filters: filters ?? null
-          })
-        }
-      />
-    </div>
-  )
-}

package/template/saas-starter/src/app/(app)/actions/organization.ts

@@ -1,92 +0,0 @@
-'use server'
-
-import { and, eq } from 'drizzle-orm'
-import { z } from 'zod'
-import { db } from '~/db'
-import { membersTable, organizationsTable } from '~/db/schema'
-import {
-  assertUserCanManageOrganization,
-  getUserMembershipCached
-} from '~/lib/organization-access'
-import { authActionClient } from '~/lib/safe-action'
-import { confirmUpload, isR2Configured, isR2Key } from '~/lib/storage'
-import { stringValidation } from '~/lib/validations'
-
-export const updateOrganizationLogoAction = authActionClient
-  .inputSchema(
-    z.object({
-      organizationId: stringValidation,
-      key: z.string().min(1),
-      oldKey: z.string().min(1).nullish()
-    })
-  )
-  .action(async ({ parsedInput }) => {
-    if (!isR2Configured() || !isR2Key(parsedInput.key)) {
-      return { success: true }
-    }
-
-    await assertUserCanManageOrganization(parsedInput.organizationId)
-
-    const org = await db.query.organizationsTable.findFirst({
-      where: eq(organizationsTable.id, parsedInput.organizationId),
-      columns: {
-        id: true,
-        logo: true
-      }
-    })
-
-    if (!org) {
-      throw new Error('Organization not found')
-    }
-
-    if (org.logo !== parsedInput.key) {
-      throw new Error(
-        'Organization logo key does not match the current logo key'
-      )
-    }
-
-    await confirmUpload(parsedInput.key, parsedInput.oldKey)
-    return true
-  })
-
-export const transferOrganizationOwnershipAction = authActionClient
-  .inputSchema(
-    z.object({
-      organizationId: stringValidation,
-      targetMemberId: stringValidation
-    })
-  )
-  .action(async ({ parsedInput: { organizationId, targetMemberId } }) => {
-    const membership = await getUserMembershipCached(organizationId)
-    if (!membership || membership.role !== 'owner') {
-      throw new Error('Only the organization owner can transfer ownership')
-    }
-
-    if (targetMemberId === membership.id) {
-      throw new Error('You are already the owner of this organization')
-    }
-
-    const target = await db.query.membersTable.findFirst({
-      where: and(
-        eq(membersTable.id, targetMemberId),
-        eq(membersTable.organizationId, organizationId)
-      )
-    })
-    if (!target) {
-      throw new Error('Selected member does not belong to this organization')
-    }
-
-    await db.transaction(async tx => {
-      await tx
-        .update(membersTable)
-        .set({ role: 'owner' })
-        .where(eq(membersTable.id, target.id))
-
-      await tx
-        .update(membersTable)
-        .set({ role: 'admin' })
-        .where(eq(membersTable.id, membership.id))
-    })
-
-    return true
-  })

package/template/saas-starter/src/app/proxy.ts

@@ -1,28 +0,0 @@
-import { NextResponse } from 'next/server'
-
-export function proxy() {
-  return NextResponse.next()
-}
-
-export const config = {
-  matcher: [
-    {
-      /**
-       * Route matching pattern
-       *
-       * This regex pattern matches all routes EXCEPT:
-       * - /_next/static - Next.js static assets
-       * - /_next/image - Next.js image optimization
-       * - /favicon.ico - Browser favicon
-       * - /.well-known/workflow/ - Internal workflow paths
-       *
-       * Excluding these paths ensures that:
-       * 1. Static assets load efficiently without middleware overhead
-       * 2. Image optimization is not interrupted
-       * 3. Workflow execution and resumption function correctly
-       */
-      source:
-        '/((?!_next/static|_next/image|favicon.ico|.well-known/workflow/).*)'
-    }
-  ]
-}

package/template/saas-starter/src/components/impersonation-banner.tsx

@@ -1,44 +0,0 @@
-'use client'
-
-import { UserX } from 'lucide-react'
-import { useRouter } from 'next/navigation'
-import { FC, useState } from 'react'
-import { Button } from '~/components/ui/button'
-import { admin } from '~/lib/auth-client'
-
-export const ImpersonationBanner: FC = () => {
-  const router = useRouter()
-  const [isStopping, setIsStopping] = useState(false)
-
-  const handleStopImpersonation = async () => {
-    try {
-      setIsStopping(true)
-      await admin.stopImpersonating()
-      router.refresh()
-    } catch (error) {
-      console.error('Failed to stop impersonation:', error)
-      setIsStopping(false)
-    }
-  }
-
-  return (
-    <div className="bg-primary text-primary-foreground w-full border-b text-sm">
-      <div className="container flex min-h-10 items-center justify-between gap-4 py-2">
-        <div className="flex items-center gap-2">
-          <UserX className="size-4" />
-          <span className="font-medium">Impersonating User</span>
-        </div>
-        <div className="flex items-center gap-3">
-          <Button
-            variant="ghost"
-            size="sm"
-            onClick={handleStopImpersonation}
-            disabled={isStopping}
-          >
-            {isStopping ? 'Stopping...' : 'Stop Impersonation'}
-          </Button>
-        </div>
-      </div>
-    </div>
-  )
-}

package/template/saas-starter/src/lib/organization-plan-limits.ts

@@ -1,38 +0,0 @@
-import { eq } from 'drizzle-orm'
-import { cache } from 'react'
-import { db } from '~/db'
-import { organizationSubscriptionsTable } from '~/db/schema'
-import { PLANS } from './plans'
-
-export const getOrganizationPlan = async (organizationId: string) => {
-  const sub = await db.query.organizationSubscriptionsTable.findFirst({
-    where: eq(organizationSubscriptionsTable.organizationId, organizationId)
-  })
-
-  if (!sub) {
-    throw new Error(
-      `Organization: ${organizationId} does not have a subscription`
-    )
-  }
-
-  const effectivePlan =
-    sub.status === 'trialing' ||
-    sub.status === 'active' ||
-    sub.status === 'past_due'
-      ? sub.plan
-      : 'free'
-
-  const plan = PLANS.find(plan => plan.id === effectivePlan)
-  if (!plan) {
-    throw new Error(
-      `Organization: ${organizationId} does not have a valid subscription plan, ${effectivePlan}`
-    )
-  }
-
-  return {
-    plan,
-    sub
-  }
-}
-
-export const getOrganizationPlanCached = cache(getOrganizationPlan)