admin/shop-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: use mutation variables in onSuccess, fix null displayName handling

Browse Source
This commit is contained in:
Kirill
2026-05-21 20:42:59 +05:00
parent 0dfa428931
commit 52290e162e
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/pages/admin-settings/ui/AdminSettingsPage.tsx
+6 -7
View File
@@ -72,13 +72,12 @@ export function AdminSettingsPage() {
avatarType?: string | null avatarType?: string | null
avatarStyle?: string | null avatarStyle?: string | null
}) => apiClient.patch('admin/profile', params), }) => apiClient.patch('admin/profile', params),
onSuccess: () => { onSuccess: (_data, variables) => {
const name = profileForm.getValues('displayName').trim() const p: UpdateProfileParams = { displayName: variables.displayName ?? null }
const p: UpdateProfileParams = { displayName: name.length ? name : null } if (variables.avatar !== undefined) {
if (hasUnsavedPreview) { p.avatar = variables.avatar
p.avatar = previewSrc p.avatarType = variables.avatarType ?? null
p.avatarType = 'generated' p.avatarStyle = variables.avatarStyle ?? null
p.avatarStyle = previewStyle
} }
updateProfileFx(p) updateProfileFx(p)
void qc.invalidateQueries({ queryKey: ['admin', 'profile'] }) void qc.invalidateQueries({ queryKey: ['admin', 'profile'] })
server/prisma/prisma/dev.db
BIN
View File
Binary file not shown.
server/src/routes/api/admin-profile.js
+2 -1
View File
@@ -18,7 +18,8 @@ export async function registerAdminProfileRoutes(fastify) {
fastify.patch('/api/admin/profile', { preHandler: [fastify.verifyAdmin] }, async (request, reply) => { fastify.patch('/api/admin/profile', { preHandler: [fastify.verifyAdmin] }, async (request, reply) => {
const userId = request.user.sub const userId = request.user.sub
const nameRaw = request.body?.displayName const nameRaw = request.body?.displayName
const displayName = nameRaw === null || nameRaw === undefined ? undefined : String(nameRaw).trim() const displayName =
nameRaw === undefined ? undefined : nameRaw === null ? null : nameRaw === '' ? null : String(nameRaw).trim()
const avatarRaw = request.body?.avatar const avatarRaw = request.body?.avatar
const avatar = avatarRaw === null || avatarRaw === undefined ? undefined : String(avatarRaw).trim() const avatar = avatarRaw === null || avatarRaw === undefined ? undefined : String(avatarRaw).trim()
const avatarTypeRaw = request.body?.avatarType const avatarTypeRaw = request.body?.avatarType