From 7a9e44bc5ca85babfad0a9ead8e402e184d0f7c8 Mon Sep 17 00:00:00 2001
From: Kirill <mpak8501@yandex.ru>
Date: Thu, 21 May 2026 20:58:50 +0500
Subject: [PATCH] fix: rename name to displayName in AdminUser type and page

---
 client/src/entities/user/api/user-api.ts      |   4 ++--
 client/src/entities/user/model/types.ts       |   2 +-
 .../pages/admin-users/ui/AdminUsersPage.tsx   |  14 +++++++-------
 server/prisma/prisma/dev.db                   | Bin 364544 -> 364544 bytes
 4 files changed, 10 insertions(+), 10 deletions(-)

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<AdminUser> {
+export async function createAdminUser(body: { email: string; displayName?: string | null }): Promise<AdminUser> {
   const { data } = await apiClient.post<AdminUser>('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<AdminUser> {
   const { data } = await apiClient.patch<AdminUser>(`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() {
                 />
               </TableCell>
               <TableCell>{u.email}</TableCell>
-              <TableCell>{u.name ?? '—'}</TableCell>
+              <TableCell>{u.displayName ?? '—'}</TableCell>
               <TableCell>{formatDt(u.createdAt)}</TableCell>
               <TableCell>{formatDt(u.updatedAt)}</TableCell>
               <TableCell align="right">
@@ -264,7 +264,7 @@ export function AdminUsersPage() {
           />
           <Controller
             control={userForm.control}
-            name="name"
+            name="displayName"
             render={({ field }) => <TextField label="Имя/ник" fullWidth {...field} />}
           />
         </Stack>
diff --git a/server/prisma/prisma/dev.db b/server/prisma/prisma/dev.db
index 1802321d0f448b0133ea0c2bc2151f83944c02ae..eda88e12626c812198dc9721c0f994d09ad00901 100644
GIT binary patch
delta 758
zcmZozAl9%zY=Sgn#zYxs#*B>#S@YQ}ERBtfEhb->F9&9tS#16?|IB=cd`m;4QUe16
zV?%@dlH}~<oJ`|nbH;hz_J+Helv(UqIg@h>(twJL3xJBuK#J0eii=W=ip;=@Zf$d5
ze8evYQZ31%&B__z>gVF==N=#680qWk7Xnoi!1%geG~d#oJP~L}Vp@@DN?LhAN=a36
zLE8n!Z5Nob=htI(M_ztvZenJRuA#ZPrLnmM#0w53sl_FF$@#fp!?#1okYGk$dw&Kn
zU}a@s!0GDr)Dqo-#7bl%%`6;J#VQhW3vyE7#$E**dv#j@^I3jltZrkHVYbH|INKVS
z4M1KtG^zr6*%TCRMTx2A*(HV9(|7!5R`Ugh7}$#4P?usxLLsAoy*8&TgCqwBvoHe#
zE2}-sQ=s^=02!HCnOap@RZsyoQpw)%7TCyJFm(k$btqA`g$3#x3`e2(2E+Vq0xY-W
z)qoLLQ3*6M4HSXdx#<N)xuph%M#d(lU~AbR<hBKjulYfdjj48<1IsacD^NN}0~(VI
nGR8E|EUD5w#Sr3TEC~c;sKEsYxvhcawLLf;Vd!6WfaL-J^=<Ko

delta 758
zcmZozAl9%zY=Sf++e8^>Mz)O!S@YQp%}gu|jV521F9&9t7;XMC|IB=cyplA75(5JR
zW0Mq%vaGV~l%g#2EXH}>CL%#h$}IM*oXNQbX+TAWc|b*GAVsEG7R3e@8OC5mh1(n$
zAMwk9R7<jGvvLNw`nh=exyJ`MM*6z?g+SE=FutxA%_~VQO92{^SXO0fV4ho)TV<4=
z+jfC*+XbfV`Sn=ck(ZyEo0yrSYiMq6X>4u*@q$B1YH^8Pa(*t@a9;=+63obJ@6P}R
ztgH+SI9;8dTB2K!Scz<;iIGF9SVdxPK~5^%*c`C2Iok@D&+;2%bsLimvpw#>+19{p
z0P=F0K?Tsurl4?3wy3De$Vn@lzT-c$nlCWKz*Yo7U5XhAg^U9B+MKcsk{le&!VC<o
ztoATZ6$6d502x_UmYY&+W}F8$QprT55Nu>2OdUp)ZDE1>2E$P(zQHhmn*hr#c{N}J
zmS+L2P6J0^c}A6?fl->Fk+F#>$Xeme5OUiB#@GCy$i`H=&4J~Zy%i`OWCD#z1{sr;
jY-nIomTL}iGL{4aHna~yZfjt9Z4XXI82XnTV7UMQUo!0L