diff --git a/client/src/entities/user/api/user-api.ts b/client/src/entities/user/api/user-api.ts index 814b6cc..20fdf20 100644 --- a/client/src/entities/user/api/user-api.ts +++ b/client/src/entities/user/api/user-api.ts @@ -17,14 +17,14 @@ export async function fetchAdminUsers(params?: { return data } -export async function createAdminUser(body: { email: string; name?: string | null }): Promise { +export async function createAdminUser(body: { email: string; displayName?: string | null }): Promise { const { data } = await apiClient.post('admin/users', body) return data } export async function updateAdminUser( id: string, - body: Partial<{ email: string; name: string | null }>, + body: Partial<{ email: string; displayName: string | null }>, ): Promise { const { data } = await apiClient.patch(`admin/users/${id}`, body) return data diff --git a/client/src/entities/user/model/types.ts b/client/src/entities/user/model/types.ts index 66b4871..3d00022 100644 --- a/client/src/entities/user/model/types.ts +++ b/client/src/entities/user/model/types.ts @@ -1,7 +1,7 @@ export type AdminUser = { id: string email: string - name: string | null + displayName: string | null avatar?: string | null avatarType?: string | null avatarStyle?: string | null diff --git a/client/src/pages/admin-users/ui/AdminUsersPage.tsx b/client/src/pages/admin-users/ui/AdminUsersPage.tsx index e5f1eb6..6e5d85b 100644 --- a/client/src/pages/admin-users/ui/AdminUsersPage.tsx +++ b/client/src/pages/admin-users/ui/AdminUsersPage.tsx @@ -25,10 +25,10 @@ import { UserAvatar } from '@/shared/ui/UserAvatar' type UserFormState = { email: string - name: string + displayName: string } -const emptyUserForm = (): UserFormState => ({ email: '', name: '' }) +const emptyUserForm = (): UserFormState => ({ email: '', displayName: '' }) function formatDt(v: string) { try { @@ -78,7 +78,7 @@ export function AdminUsersPage() { const v = userForm.getValues() await createAdminUser({ email: v.email.trim(), - name: v.name.trim() || null, + displayName: v.displayName.trim() || null, }) }, onSuccess: () => { @@ -92,7 +92,7 @@ export function AdminUsersPage() { const v = userForm.getValues() await updateAdminUser(editing!.id, { email: v.email.trim(), - name: v.name.trim() || null, + displayName: v.displayName.trim() || null, }) }, onSuccess: () => { @@ -119,7 +119,7 @@ export function AdminUsersPage() { openEditDialog(u) userForm.reset({ email: u.email, - name: u.name ?? '', + displayName: u.displayName ?? '', }) } @@ -201,7 +201,7 @@ export function AdminUsersPage() { /> {u.email} - {u.name ?? '—'} + {u.displayName ?? '—'} {formatDt(u.createdAt)} {formatDt(u.updatedAt)} @@ -264,7 +264,7 @@ export function AdminUsersPage() { /> } /> diff --git a/server/prisma/prisma/dev.db b/server/prisma/prisma/dev.db index 1802321..eda88e1 100644 Binary files a/server/prisma/prisma/dev.db and b/server/prisma/prisma/dev.db differ