fix(user-modal): enhance user edit form initialization for keep auto refresh updates off during edit

Author: x0sina

dashboard/public/statics/locales/en.json

@@ -1350,7 +1350,7 @@
     "proxySettings.wireguardPublicKey": "WireGuard Public key",
     "proxySettings.wireguardPeerIps": "WireGuard Peer IPs",
     "proxySettings.generateWireGuardKeyPair": "WireGuard keypair",
-    "proxySettings.peerIpsHint": "Leave empty to auto-assign from the global WireGuard peer pool. Manual entries must fall within that pool.",
+    "proxySettings.peerIpsHint": "Leave empty to auto-assign from the global WireGuard peer pool. For manual entries, enter one CIDR per line, and keep each value within that pool.",
     "proxySettings.wireguardGenerated": "WireGuard keypair generated",
     "proxySettings.desc": "Configure protocol-specific settings for this user.",
     "selectNode": "Select Node",

dashboard/public/statics/locales/fa.json

@@ -1215,7 +1215,7 @@
   "userDialog.proxySettings.wireguardPublicKey": "کلید عمومی وایرگارد",
   "userDialog.proxySettings.wireguardPeerIps": "IPهای همتای وایرگارد",
   "userDialog.proxySettings.generateWireGuardKeyPair": "جفت‌کلید وایرگارد",
-  "userDialog.proxySettings.peerIpsHint": "برای تخصیص خودکار از استخر سراسری آی‌پی وایرگارد خالی بگذارید. مقادیر دستی باید داخل همان محدوده باشند.",
+  "userDialog.proxySettings.peerIpsHint": "برای تخصیص خودکار از استخر سراسری آی‌پی وایرگارد خالی بگذارید. در ورود دستی، هر CIDR را در یک خط جدا وارد کنید و همه مقادیر باید داخل همان محدوده باشند.",
   "userDialog.proxySettings.wireguardGenerated": "جفت‌کلید وایرگارد تولید شد",
   "userDialog.proxySettings.desc": "تنظیمات اختصاصی پروتکل برای این کاربر را پیکربندی کنید.",
   "userDialog.expireDate": "تاریخ انقضا",

dashboard/public/statics/locales/ru.json

@@ -1718,7 +1718,7 @@
     "proxySettings.wireguardPublicKey": "Публичный ключ WireGuard",
     "proxySettings.wireguardPeerIps": "Peer IP-адреса WireGuard",
     "proxySettings.generateWireGuardKeyPair": "Пара ключей WireGuard",
-    "proxySettings.peerIpsHint": "Оставьте пустым для автоназначения из глобального пула peer-адресов WireGuard. Ручной ввод должен попадать в этот пул.",
+    "proxySettings.peerIpsHint": "Оставьте пустым для автоназначения из глобального пула peer-адресов WireGuard. При ручном вводе указывайте по одному CIDR в строке, и каждое значение должно входить в этот пул.",
     "proxySettings.wireguardGenerated": "Пара ключей WireGuard сгенерирована",
     "proxySettings.desc": "Настройте параметры протокола для этого пользователя.",
     "selectNode": "Выберите узел",

dashboard/public/statics/locales/zh.json

@@ -1321,7 +1321,7 @@
   "userDialog.proxySettings.wireguardPublicKey": "WireGuard 公钥",
   "userDialog.proxySettings.wireguardPeerIps": "WireGuard 对端 IP",
   "userDialog.proxySettings.generateWireGuardKeyPair": "WireGuard 密钥对",
-  "userDialog.proxySettings.peerIpsHint": "留空则从全局 WireGuard 对端地址池自动分配；手动填写须在该池范围内。",
+  "userDialog.proxySettings.peerIpsHint": "留空则从全局 WireGuard 对端地址池自动分配；手动填写时每行输入一个 CIDR，且每个值都必须在该地址池范围内。",
   "userDialog.proxySettings.wireguardGenerated": "WireGuard 密钥对已生成",
   "userDialog.proxySettings.desc": "为此用户配置协议专属设置。",
   "userDialog.expireDate": "过期日期",

dashboard/src/components/dialogs/user-modal.tsx

@@ -2259,7 +2259,7 @@ function UserModal({ isDialogOpen, onOpenChange, form, editingUser, editingUserI
                                   />
                                 </FormControl>
                                 <p className="text-xs text-muted-foreground">
-                                  {t('userDialog.proxySettings.peerIpsHint', { defaultValue: 'Leave empty to auto-assign from the global WireGuard peer pool. Manual entries must fall within that pool.' })}
+                                  {t('userDialog.proxySettings.peerIpsHint', { defaultValue: 'Leave empty to auto-assign from the global WireGuard peer pool. For manual entries, enter one CIDR per line, and keep each value within that pool.' })}
                                 </p>
                                 <FormMessage />
                               </FormItem>

dashboard/src/components/users/action-buttons.tsx

@@ -159,6 +159,27 @@ const updateModalState = (userId: number, updater: (prev: ActionButtonsModalStat
   notifyGlobalListeners()
 }
 
+const buildUserEditFormValues = (user: UserResponse): UseEditFormValues => ({
+  username: user.username,
+  status: user.status === 'active' || user.status === 'on_hold' || user.status === 'disabled' ? (user.status as UseEditFormValues['status']) : 'active',
+  data_limit: user.data_limit ? bytesToFormGigabytes(Number(user.data_limit)) : 0,
+  expire: normalizeExpireForEditForm(user.expire),
+  note: user.note || '',
+  data_limit_reset_strategy: user.data_limit_reset_strategy || undefined,
+  group_ids: user.group_ids || [],
+  on_hold_expire_duration: user.on_hold_expire_duration || undefined,
+  on_hold_timeout: user.on_hold_timeout || undefined,
+  proxy_settings: user.proxy_settings || undefined,
+  next_plan: user.next_plan
+    ? {
+      user_template_id: user.next_plan.user_template_id ? Number(user.next_plan.user_template_id) : undefined,
+      data_limit: user.next_plan.data_limit ? Math.round(Number(user.next_plan.data_limit)) : 0,
+      expire: user.next_plan.expire ? Math.round(Number(user.next_plan.expire)) : 0,
+      add_remaining_traffic: user.next_plan.add_remaining_traffic || false,
+    }
+    : undefined,
+})
+
 const ActionButtons: FC<ActionButtonsProps> = ({ user, isModalHost = true, renderActions = true }) => {
   const [subscribeLinks, setSubscribeLinks] = useState<SubscribeLink[]>([])
   const [isEditModalOpen, setEditModalOpen] = useState(false)
@@ -264,54 +285,16 @@ const ActionButtons: FC<ActionButtonsProps> = ({ user, isModalHost = true, rende
 
   // Create form for user editing
   const userForm = useForm<UseEditFormValues>({
-    defaultValues: {
-      username: user.username,
-      status: user.status === 'expired' || user.status === 'limited' ? 'active' : user.status,
-      data_limit: user.data_limit ? bytesToFormGigabytes(Number(user.data_limit)) : undefined,
-      expire: normalizeExpireForEditForm(user.expire),
-      note: user.note || '',
-      data_limit_reset_strategy: user.data_limit_reset_strategy || undefined,
-      group_ids: user.group_ids || [], // Add group_ids
-      on_hold_expire_duration: user.on_hold_expire_duration || undefined,
-      on_hold_timeout: user.on_hold_timeout || undefined,
-      proxy_settings: user.proxy_settings || undefined,
-      next_plan: user.next_plan
-        ? {
-          user_template_id: user.next_plan.user_template_id ? Number(user.next_plan.user_template_id) : undefined,
-          data_limit: user.next_plan.data_limit ? Math.round(Number(user.next_plan.data_limit)) : 0,
-          expire: user.next_plan.expire ? Math.round(Number(user.next_plan.expire)) : 0,
-          add_remaining_traffic: user.next_plan.add_remaining_traffic || false,
-        }
-        : undefined,
-    },
+    defaultValues: buildUserEditFormValues(user),
   })
 
   // Update form when user data changes
   useEffect(() => {
-    const values: UseEditFormValues = {
-      username: user.username,
-      status: user.status === 'active' || user.status === 'on_hold' || user.status === 'disabled' ? (user.status as any) : 'active',
-      data_limit: user.data_limit ? bytesToFormGigabytes(Number(user.data_limit)) : 0,
-      expire: normalizeExpireForEditForm(user.expire),
-      note: user.note || '',
-      data_limit_reset_strategy: user.data_limit_reset_strategy || undefined,
-      group_ids: user.group_ids || [],
-      on_hold_expire_duration: user.on_hold_expire_duration || undefined,
-      on_hold_timeout: user.on_hold_timeout || undefined,
-      proxy_settings: user.proxy_settings || undefined,
-      next_plan: user.next_plan
-        ? {
-          user_template_id: user.next_plan.user_template_id ? Number(user.next_plan.user_template_id) : undefined,
-          data_limit: user.next_plan.data_limit ? Math.round(Number(user.next_plan.data_limit)) : 0,
-          expire: user.next_plan.expire ? Math.round(Number(user.next_plan.expire)) : 0,
-          add_remaining_traffic: user.next_plan.add_remaining_traffic || false,
-        }
-        : undefined,
-    }
+    // Keep background refreshes from clobbering an active edit session.
+    if (isEditModalOpen) return
 
-    // Update form with current values
-    userForm.reset(values)
-  }, [user, userForm])
+    userForm.reset(buildUserEditFormValues(user))
+  }, [user, userForm, isEditModalOpen])
 
   const onOpenSubscriptionModal = useCallback(() => {
     setSubscribeUrl(user.subscription_url ? user.subscription_url : '')
@@ -372,28 +355,7 @@ const ActionButtons: FC<ActionButtonsProps> = ({ user, isModalHost = true, rende
     }
 
     // Update form with latest user data
-    const values: UseEditFormValues = {
-      username: latestUser.username,
-      status: latestUser.status === 'active' || latestUser.status === 'on_hold' || latestUser.status === 'disabled' ? (latestUser.status as any) : 'active',
-      data_limit: latestUser.data_limit ? bytesToFormGigabytes(Number(latestUser.data_limit)) : 0,
-      expire: normalizeExpireForEditForm(latestUser.expire),
-      note: latestUser.note || '',
-      data_limit_reset_strategy: latestUser.data_limit_reset_strategy || undefined,
-      group_ids: latestUser.group_ids || [],
-      on_hold_expire_duration: latestUser.on_hold_expire_duration || undefined,
-      on_hold_timeout: latestUser.on_hold_timeout || undefined,
-      proxy_settings: latestUser.proxy_settings || undefined,
-      next_plan: latestUser.next_plan
-        ? {
-          user_template_id: latestUser.next_plan.user_template_id ? Number(latestUser.next_plan.user_template_id) : undefined,
-          data_limit: latestUser.next_plan.data_limit ? Math.round(Number(latestUser.next_plan.data_limit)) : 0,
-          expire: latestUser.next_plan.expire ? Math.round(Number(latestUser.next_plan.expire)) : 0,
-          add_remaining_traffic: latestUser.next_plan.add_remaining_traffic || false,
-        }
-        : undefined,
-    }
-
-    userForm.reset(values)
+    userForm.reset(buildUserEditFormValues(latestUser))
     setSelectedUser(latestUser)
     setEditModalOpen(true)
   }