diff --git a/src/actions/users.ts b/src/actions/users.ts index 47b396df9..caec9bc46 100644 --- a/src/actions/users.ts +++ b/src/actions/users.ts @@ -363,7 +363,7 @@ export async function addUser(data: { providerGroup: validatedData.providerGroup || null, tags: validatedData.tags, rpm: validatedData.rpm, - dailyQuota: validatedData.dailyQuota, + dailyQuota: validatedData.dailyQuota ?? undefined, limit5hUsd: validatedData.limit5hUsd ?? undefined, limitWeeklyUsd: validatedData.limitWeeklyUsd ?? undefined, limitMonthlyUsd: validatedData.limitMonthlyUsd ?? undefined, @@ -545,7 +545,7 @@ export async function createUserOnly(data: { providerGroup: validatedData.providerGroup || null, tags: validatedData.tags, rpm: validatedData.rpm, - dailyQuota: validatedData.dailyQuota, + dailyQuota: validatedData.dailyQuota ?? undefined, limit5hUsd: validatedData.limit5hUsd ?? undefined, limitWeeklyUsd: validatedData.limitWeeklyUsd ?? undefined, limitMonthlyUsd: validatedData.limitMonthlyUsd ?? undefined, @@ -698,12 +698,12 @@ export async function editUser( providerGroup: validatedData.providerGroup, tags: validatedData.tags, rpm: validatedData.rpm, - dailyQuota: validatedData.dailyQuota, - limit5hUsd: validatedData.limit5hUsd, - limitWeeklyUsd: validatedData.limitWeeklyUsd, - limitMonthlyUsd: validatedData.limitMonthlyUsd, - limitTotalUsd: validatedData.limitTotalUsd, - limitConcurrentSessions: validatedData.limitConcurrentSessions, + dailyQuota: validatedData.dailyQuota ?? undefined, + limit5hUsd: validatedData.limit5hUsd ?? undefined, + limitWeeklyUsd: validatedData.limitWeeklyUsd ?? undefined, + limitMonthlyUsd: validatedData.limitMonthlyUsd ?? undefined, + limitTotalUsd: validatedData.limitTotalUsd ?? undefined, + limitConcurrentSessions: validatedData.limitConcurrentSessions ?? undefined, dailyResetMode: validatedData.dailyResetMode, dailyResetTime: validatedData.dailyResetTime, isEnabled: validatedData.isEnabled, diff --git a/src/app/[locale]/dashboard/_components/user/forms/user-form.tsx b/src/app/[locale]/dashboard/_components/user/forms/user-form.tsx index 017d113d2..8782587ef 100644 --- a/src/app/[locale]/dashboard/_components/user/forms/user-form.tsx +++ b/src/app/[locale]/dashboard/_components/user/forms/user-form.tsx @@ -118,7 +118,7 @@ export function UserForm({ user, onSuccess, currentUser }: UserFormProps) { name: data.name, note: data.note, rpm: data.rpm, - dailyQuota: data.dailyQuota, + dailyQuota: data.dailyQuota ?? undefined, providerGroup: data.providerGroup || null, tags: data.tags, limit5hUsd: data.limit5hUsd, @@ -136,7 +136,7 @@ export function UserForm({ user, onSuccess, currentUser }: UserFormProps) { name: data.name, note: data.note, rpm: data.rpm, - dailyQuota: data.dailyQuota, + dailyQuota: data.dailyQuota ?? undefined, providerGroup: data.providerGroup || null, tags: data.tags, limit5hUsd: data.limit5hUsd, diff --git a/src/repository/user.ts b/src/repository/user.ts index ad220ce7c..381c2d88f 100644 --- a/src/repository/user.ts +++ b/src/repository/user.ts @@ -157,17 +157,19 @@ export async function updateUser(id: number, userData: UpdateUserData): Promise< if (userData.description !== undefined) dbData.description = userData.description; if (userData.rpm !== undefined) dbData.rpmLimit = userData.rpm; if (userData.dailyQuota !== undefined) - dbData.dailyLimitUsd = userData.dailyQuota === null ? null : userData.dailyQuota.toString(); + dbData.dailyLimitUsd = + userData.dailyQuota === null ? undefined : userData.dailyQuota.toString(); if (userData.providerGroup !== undefined) dbData.providerGroup = userData.providerGroup; if (userData.tags !== undefined) dbData.tags = userData.tags; if (userData.limit5hUsd !== undefined) - dbData.limit5hUsd = userData.limit5hUsd === null ? null : userData.limit5hUsd.toString(); + dbData.limit5hUsd = + userData.limit5hUsd === null ? undefined : userData.limit5hUsd.toString(); if (userData.limitWeeklyUsd !== undefined) dbData.limitWeeklyUsd = - userData.limitWeeklyUsd === null ? null : userData.limitWeeklyUsd.toString(); + userData.limitWeeklyUsd === null ? undefined : userData.limitWeeklyUsd.toString(); if (userData.limitMonthlyUsd !== undefined) dbData.limitMonthlyUsd = - userData.limitMonthlyUsd === null ? null : userData.limitMonthlyUsd.toString(); + userData.limitMonthlyUsd === null ? undefined : userData.limitMonthlyUsd.toString(); if (userData.limitTotalUsd !== undefined) dbData.limitTotalUsd = userData.limitTotalUsd === null ? null : userData.limitTotalUsd.toString();