Compare commits

...

20 Commits

Author SHA1 Message Date
shanshanzhong147 5450eb0071 修复(#119): 补齐用户限速与促销后台实现 2026-05-28 21:59:32 -07:00
shanshanzhong147 100b641552 修复(#97): 区分邀请管理加载失败状态
PR Check / Lint, Check, Test and Build (push) Has been cancelled
Build and Release / Build (push) Has been cancelled
2026-05-27 20:24:22 -07:00
shanshanzhong147 aeca20ad1e 新功能(#93): 新增管理后台邀请管理页面
PR Check / Lint, Check, Test and Build (push) Has been cancelled
Build and Release / Build (push) Has been cancelled
新增 /dashboard/invite-management 页面,调用 GET /v1/admin/invite/list 接口展示全局邀请关系列表。
包含邀请人/被邀请人信息、状态、佣金、赠送天数等列,支持关键词和 ID 筛选、分页。
附带修复提现页收款码图片缺少 width/height 的 lint 问题。
2026-05-27 11:11:15 -07:00
shanshanzhong147 d1697bed75 新功能(#43): 提现前端优化 — 收款方式选择 + 收款码上传 + 取消按钮
PR Check / Lint, Check, Test and Build (push) Has been cancelled
Build and Release / Build (push) Has been cancelled
Issue Close Require / issue-close-require (push) Has been cancelled
2026-05-26 08:37:03 -07:00
shanshanzhong147 14d4c5f36f 配置(#54): 前端 PR 质量门禁与 auto-merge 安全加固
PR Check / Lint, Check, Test and Build (push) Has been cancelled
Build and Release / Build (push) Has been cancelled
2026-05-25 22:08:48 -07:00
shanshanzhong147 37ceb5adfc 修复(#55): 修复前端 lint/build 失败阻塞质量门禁
Build and Release / Build (push) Has been cancelled
2026-05-25 22:03:36 -07:00
shanshanzhong147 71aaa08230 fix(#HIF-37): 修复备注表单提交时未携带完整用户数据
Build and Release / Build (push) Has been cancelled
备注保存前获取完整用户详情构造请求体,TC03 清空备注场景不再丢失其他字段。
拆出 RemarkForm 组件,增加保存中禁用态和失败错误提示。
2026-05-25 21:36:44 -07:00
shanshanzhong147 cad75b92bc fix: 备注表单提交时携带完整用户数据
Build and Release / Build (push) Has been cancelled
RemarkForm 的 onSave 回调之前只传 user_id 和 remark,
导致后端用零值覆盖邀请人、余额、佣金等字段。

参考 enable 开关的模式,排除不兼容字段后展开 ...rest,
保证 updateUserBasicInfo 收到完整的用户数据。

Co-authored-by: multica-agent <github@multica.ai>
2026-05-25 20:04:57 -07:00
shanshanzhong147 11c3ce26a6 feat: add withdrawal management pages
Build and Release / Build (push) Has been cancelled
Issue Close Require / issue-close-require (push) Has been cancelled
2026-05-25 02:20:38 -07:00
shanshanzhong147 65641838f9 feat: add admin order refund action
Build and Release / Build (push) Has been cancelled
2026-05-24 20:41:53 -07:00
shanshanzhong147 d8b65c6d82 feat: 新增提现申请与提现管理页面
Build and Release / Build (push) Has been cancelled
2026-05-24 20:25:12 -07:00
shanshanzhong147 55c78276fb chore: 调整 dashboard 续费英文文案
Build and Release / Build (push) Has been cancelled
2026-05-24 17:48:52 -07:00
sepakeloudest ce6ab4f05b 增加工单关闭按钮
Build and Release / Build (push) Has been cancelled
Issue Close Require / issue-close-require (push) Has been cancelled
Issue Check Inactive / issue-check-inactive (push) Has been cancelled
2026-05-10 12:58:03 +03:00
sepakeloudest 750cab5cc9 增加备注功能
Build and Release / Build (push) Has been cancelled
Issue Close Require / issue-close-require (push) Has been cancelled
2026-05-09 06:11:07 +03:00
sepakeloudest 3e2873fb90 取消工单功能
Build and Release / Build (push) Has been cancelled
Issue Close Require / issue-close-require (push) Has been cancelled
2026-05-08 14:26:46 +03:00
sepakeloudest 644b20ebef 工单组件
Build and Release / Build (push) Has been cancelled
Issue Close Require / issue-close-require (push) Has been cancelled
2026-05-01 17:09:24 +03:00
shanshanzhong147 7400137b3c feat: 节点/服务器批量编辑 Sheet、Server 表单协议合并修复、设备类型解析
Build and Release / Build (push) Has been cancelled
- 新增 NodeBatchSheet 与 ServerBatchSheet,支持批量选中后一键编辑公共字段
- Server 表单:引入 mergeProtocol / buildSanitizedProtocols,过滤空字符串避免 Zod 枚举校验失败;renderGroupCard 改为具名导出供批量 Sheet 复用;优化嵌套错误提示递归取第一条
- 新增 parseDeviceType 工具函数,从 User-Agent 解析设备平台(iPhone/Android/Mac 等)
- 用户列表:登录标识旁展示设备平台 Badge
- 注册安全设置表单:引入 Textarea 组件并完善字段布局
- 类型定义补充及 i18n 本地化更新

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-05-01 05:17:01 -07:00
shanshanzhong147 de87133061 feat: 用户订阅列表显示节点分组名,限速详情显示起止时间
- UserSubscribe 类型新增 node_group_id/node_group_name 字段
- UserSubscribeDetail 类型新增 throttle_start/throttle_end/node_group_id/node_group_name 字段
- 订阅列表表格新增「节点分组」列
- 限速卡片新增限速窗口起止时间显示

Co-Authored-By: claude-flow <ruv@ruv.net>
2026-03-29 10:36:11 -07:00
shanshanzhong147 dd30b8eb8b fix: notify-settings-form 补充 enable_trade_notify 字段修复类型错误
Co-Authored-By: claude-flow <ruv@ruv.net>
2026-03-28 08:36:59 -07:00
shanshanzhong147 e6c2370d02 feat: 限速状态可视化 - 订阅详情 Sheet 顶部展示实时限速状态
- typings.d.ts 新增 UserSubscribeDetail.effective_speed/is_throttled/throttle_rule 字段
- SubscriptionDetail Sheet 打开时拉取订阅详情,顶部展示 SpeedLimitCard
- 被降速时显示警告样式 + 实际速率 + 划掉原始速率 + 触发规则说明

Co-Authored-By: claude-flow <ruv@ruv.net>
2026-03-28 08:32:05 -07:00
83 changed files with 6077 additions and 296 deletions
+76
View File
@@ -0,0 +1,76 @@
{
"permissions": {
"allow": [
"mcp__serena__get_symbols_overview",
"mcp__serena__find_symbol",
"Bash(pnpm:*)",
"Bash(bun run:*)",
"mcp__serena__list_dir",
"Bash(npx --filter apps/admin tsr generate --config apps/admin/tsr.config.json 2>&1 | head -20)",
"Bash(ls apps/admin/tsr.config.json 2>/dev/null || echo \"no tsr config\"; ls apps/admin/vite.config.* 2>/dev/null; cat apps/admin/package.json | grep -E '\"\\(dev|build|generate\\)\"' | head -5)",
"Bash(npx tsc:*)",
"Bash(curl -s 'http://127.0.0.1:8080/v1/admin/user/family/list?page=1&size=10' \\\\\n -H 'Accept: application/json' \\\\\n -H 'Authorization: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJDdHhMb2dpblR5cGUiOiIiLCJTZXNzaW9uSWQiOiIwMTljZjAyYi05YTcwLTcyMDItYTlmZS1jNzE1NmZkYjIzYzYiLCJVc2VySWQiOjI1OCwiZXhwIjoxODA1MDkxOTE1LCJpYXQiOjE3NzM1NTU5MTUsImlkZW50aWZpZXIiOiIifQ.rnm_y9DOsjvFC2XecRQ8BNUkWZcfiGzXIh5Dgwh99lA' 2>&1)",
"Bash(find apps/admin/src -name \"*.json\" -path \"*locale*\" -o -name \"*.json\" -path \"*i18n*\" -o -name \"*.json\" -path \"*zh*\" -o -name \"*.json\" -path \"*lang*\" 2>/dev/null | head -30)",
"Bash(find apps/admin/src -name \"*.json\" 2>/dev/null | head -20; echo \"---\"; find apps/admin -name \"i18n*\" -o -name \"locale*\" 2>/dev/null | head -20; echo \"---\"; grep -r \"i18n\\\\|i18next\\\\|useTranslation\" apps/admin/src/main.tsx apps/admin/src/App.tsx 2>/dev/null | head -10)",
"Bash(git log:*)",
"Bash(for key:*)",
"Bash(node -e \"JSON.parse\\(require\\('fs'\\).readFileSync\\('apps/admin/public/assets/locales/zh-CN/user.json','utf8'\\)\\); console.log\\('zh-CN OK'\\)\" && node -e \"JSON.parse\\(require\\('fs'\\).readFileSync\\('apps/admin/public/assets/locales/en-US/user.json','utf8'\\)\\); console.log\\('en-US OK'\\)\" && node -e \"JSON.parse\\(require\\('fs'\\).readFileSync\\('apps/admin/public/assets/locales/zh-CN/system.json','utf8'\\)\\); console.log\\('zh-CN system OK'\\)\" && node -e \"JSON.parse\\(require\\('fs'\\).readFileSync\\('apps/admin/public/assets/locales/en-US/system.json','utf8'\\)\\); console.log\\('en-US system OK'\\)\" && node -e \"JSON.parse\\(require\\('fs'\\).readFileSync\\('apps/admin/public/assets/locales/zh-CN/menu.json','utf8'\\)\\); console.log\\('zh-CN menu OK'\\)\" && node -e \"JSON.parse\\(require\\('fs'\\).readFileSync\\('apps/admin/public/assets/locales/en-US/menu.json','utf8'\\)\\); console.log\\('en-US menu OK'\\)\")",
"mcp__sequential-thinking__sequentialthinking",
"Bash(find packages/ui/src/components -name \"alert*\" 2>/dev/null | head -5)",
"Bash(node -e \"JSON.parse\\(require\\('fs'\\).readFileSync\\('apps/admin/public/assets/locales/zh-CN/user.json','utf8'\\)\\); console.log\\('zh-CN OK'\\)\" && node -e \"JSON.parse\\(require\\('fs'\\).readFileSync\\('apps/admin/public/assets/locales/en-US/user.json','utf8'\\)\\); console.log\\('en-US OK'\\)\")",
"Bash(grep -rn \"device_no\\\\|DeviceNo\\\\|device_identifier\\\\|DeviceIdentifier\\\\|sha256\\\\|SHA256\" /Users/Apple/code_vpn/vpn/ppanel-server --include=\"*.go\" 2>/dev/null | head -30)",
"Bash(find /Users/Apple/code_vpn/vpn/ppanel-server -name \"*.sql\" -o -name \"*migration*\" -o -name \"*migrate*\" 2>/dev/null | head -20)",
"Bash(grep -rn \"FindOneDeviceByIdentifier\\\\|DeviceByIdentifier\" /Users/Apple/code_vpn/vpn/ppanel-server --include=\"*.go\" 2>/dev/null | head -20)",
"Bash(grep -rn \"device_no\\\\|DeviceNo\" /Users/Apple/code_vpn/vpn/ppanel-server --include=\"*.go\" 2>/dev/null | head -20)",
"Bash(grep -rn \"DeviceLoginRequest\\\\|device.*identifier\\\\|identifier.*device\" /Users/Apple/code_vpn/vpn/ppanel-server/apis --include=\"*.api\" 2>/dev/null | head -20)",
"Bash(grep -rn \"ShortCode\\\\|short_code\" /Users/Apple/code_vpn/vpn/ppanel-server/internal --include=\"*.go\" 2>/dev/null | head -20)",
"Bash(grep -n -i \"device\" /Users/Apple/code_vpn/vpn/ppanel-server/apis/auth/*.api 2>/dev/null; ls /Users/Apple/code_vpn/vpn/ppanel-server/apis/auth/)",
"Bash(grep -n \"GetCacheKeys\\\\|ClearDeviceCache\" /Users/Apple/code_vpn/vpn/ppanel-server/internal/model/user/*.go | head -10)",
"Bash(grep -rn \"identifier\\\\|Identifier\\\\|device_id\\\\|deviceId\" apps/admin/src/sections/user/ --include=\"*.tsx\" --include=\"*.ts\" 2>/dev/null | grep -v node_modules | grep -v \".d.ts\" | head -20)",
"Bash(grep -rn \"device\\\\|Device\\\\|identifier\\\\|Identifier\" apps/user/src/ --include=\"*.tsx\" --include=\"*.ts\" 2>/dev/null | grep -v node_modules | grep -v \".d.ts\" | grep -v \"//\\\\|languageDetector\\\\|DevicePixel\\\\|device-width\" | head -30)",
"Bash(grep -rn \"user/info\\\\|UserInfo\\\\|getUserInfo\\\\|GetUserInfo\" /Users/Apple/code_vpn/vpn/ppanel-server/apis/ --include=\"*.api\" 2>/dev/null | head -10)",
"Bash(grep -l \"SelectTrigger\\\\|SelectContent\\\\|SelectItem\" packages/ui/src/components/select.tsx 2>/dev/null; echo \"---\"; grep -rn \"from.*@workspace/ui/components/select\" apps/admin/src/ --include=\"*.tsx\" 2>/dev/null | head -3)",
"Bash(grep -ohP 't\\\\\\(\"\\([^\"]+\\)\"' apps/admin/src/sections/user/index.tsx | sed 's/t\\(\"//' | sed 's/\"$//' | sort -u | while read key; do if ! grep -q \"\\\\\"$key\\\\\"\" apps/admin/public/assets/locales/zh-CN/user.json 2>/dev/null; then echo \"MISSING: $key\"; fi; done)",
"Bash(grep -o 't\\(\"[^\"]*\"' apps/admin/src/sections/user/index.tsx | sed 's/t\\(\"//' | sed 's/\"$//' | sort -u | while read key; do if ! grep -q \"\\\\\"$key\\\\\"\" apps/admin/public/assets/locales/zh-CN/user.json 2>/dev/null; then echo \"MISSING: $key\"; fi; done)",
"Bash(grep -roh 't\\(\"[^\"]*\"' apps/admin/src/sections/user/ --include=\"*.tsx\" | sed 's/t\\(\"//' | sed 's/\"$//' | sort -u | while read key; do\n if ! grep -q \"\\\\\"$key\\\\\"\" apps/admin/public/assets/locales/zh-CN/user.json 2>/dev/null; then\n echo \"MISSING zh-CN user: $key\"\n fi\ndone)",
"Bash(grep -o 't\\(\"[^\"]*\"' apps/admin/src/sections/system/user-security/signature-form.tsx apps/admin/src/sections/system/user-security/subscribe-mode-form.tsx | sed 's/.*t\\(\"//' | sed 's/\"$//' | sort -u | while read key; do\n if ! grep -q \"\\\\\"$key\\\\\"\" apps/admin/public/assets/locales/zh-CN/system.json 2>/dev/null; then\n echo \"MISSING system zh-CN: $key\"\n fi\ndone)",
"Bash(grep -rn \"EnhancedInput\\\\|enhanced-input\" packages/ui/src/composed/enhanced-input.tsx 2>/dev/null | head -3; find packages/ui/src -name \"enhanced-input*\" 2>/dev/null)",
"Bash(curl -s 'http://127.0.0.1:8080/v1/admin/system/getSignatureConfig' -H 'Authorization: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJDdHhMb2dpblR5cGUiOiIiLCJTZXNzaW9uSWQiOiIwMTljZjAyYi05YTcwLTcyMDItYTlmZS1jNzE1NmZkYjIzYzYiLCJVc2VySWQiOjI1OCwiZXhwIjoxODA1MDkxOTE1LCJpYXQiOjE3NzM1NTU5MTUsImlkZW50aWZpZXIiOiIifQ.rnm_y9DOsjvFC2XecRQ8BNUkWZcfiGzXIh5Dgwh99lA' 2>&1 | head -5)",
"Bash(curl -s 'http://127.0.0.1:8080/v1/admin/system/signature_config' -H 'Authorization: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJDdHhMb2dpblR5cGUiOiIiLCJTZXNzaW9uSWQiOiIwMTljZjAyYi05YTcwLTcyMDItYTlmZS1jNzE1NmZkYjIzYzYiLCJVc2VySWQiOjI1OCwiZXhwIjoxODA1MDkxOTE1LCJpYXQiOjE3NzM1NTU5MTUsImlkZW50aWZpZXIiOiIifQ.rnm_y9DOsjvFC2XecRQ8BNUkWZcfiGzXIh5Dgwh99lA' 2>&1)",
"Bash(curl -s 'http://127.0.0.1:8080/v1/admin/system/subscribe_config' -H 'Authorization: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJDdHhMb2dpblR5cGUiOiIiLCJTZXNzaW9uSWQiOiIwMTljZjAyYi05YTcwLTcyMDItYTlmZS1jNzE1NmZkYjIzYzYiLCJVc2VySWQiOjI1OCwiZXhwIjoxODA1MDkxOTE1LCJpYXQiOjE3NzM1NTU5MTUsImlkZW50aWZpZXIiOiIifQ.rnm_y9DOsjvFC2XecRQ8BNUkWZcfiGzXIh5Dgwh99lA' 2>&1)",
"Bash(curl -s -X PUT 'http://127.0.0.1:8080/v1/admin/system/signature_config' \\\\\n -H 'Authorization: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJDdHhMb2dpblR5cGUiOiIiLCJTZXNzaW9uSWQiOiIwMTljZjAyYi05YTcwLTcyMDItYTlmZS1jNzE1NmZkYjIzYzYiLCJVc2VySWQiOjI1OCwiZXhwIjoxODA1MDkxOTE1LCJpYXQiOjE3NzM1NTU5MTUsImlkZW50aWZpZXIiOiIifQ.rnm_y9DOsjvFC2XecRQ8BNUkWZcfiGzXIh5Dgwh99lA' \\\\\n -H 'Content-Type: application/json' \\\\\n -d '{\"enable_signature\":true}' 2>&1)",
"Bash(AUTH='Authorization: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJDdHhMb2dpblR5cGUiOiIiLCJTZXNzaW9uSWQiOiIwMTljZjAyYi05YTcwLTcyMDItYTlmZS1jNzE1NmZkYjIzYzYiLCJVc2VySWQiOjI1OCwiZXhwIjoxODA1MDkxOTE1LCJpYXQiOjE3NzM1NTU5MTUsImlkZW50aWZpZXIiOiIifQ.rnm_y9DOsjvFC2XecRQ8BNUkWZcfiGzXIh5Dgwh99lA'\n\necho \"=== 1. GET before ===\"\ncurl -s 'http://127.0.0.1:8080/v1/admin/system/signature_config' -H \"$AUTH\"\n\necho \"\"\necho \"=== 2. PUT enable=true ===\"\ncurl -s -X PUT 'http://127.0.0.1:8080/v1/admin/system/signature_config' -H \"$AUTH\" -H 'Content-Type: application/json' -d '{\"enable_signature\":true}'\n\necho \"\"\necho \"=== 3. GET after ===\"\ncurl -s 'http://127.0.0.1:8080/v1/admin/system/signature_config' -H \"$AUTH\")",
"Bash(grep -rn \"signature_config\\\\|SignatureConfig\\\\|getSignatureConfig\\\\|updateSignatureConfig\" /Users/Apple/code_vpn/vpn/ppanel-server/apis/ /Users/Apple/code_vpn/vpn/ppanel-server/internal/logic/ --include=\"*.go\" --include=\"*.api\" 2>/dev/null | head -20)",
"Bash(grep -n \"GetSignatureConfig\\\\|func.*Signature\" /Users/Apple/code_vpn/vpn/ppanel-server/internal/model/system/*.go 2>/dev/null | head -10)",
"Bash(AUTH='Authorization: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJDdHhMb2dpblR5cGUiOiIiLCJTZXNzaW9uSWQiOiIwMTljZjAyYi05YTcwLTcyMDItYTlmZS1jNzE1NmZkYjIzYzYiLCJVc2VySWQiOjI1OCwiZXhwIjoxODA1MDkxOTE1LCJpYXQiOjE3NzM1NTU5MTUsImlkZW50aWZpZXIiOiIifQ.rnm_y9DOsjvFC2XecRQ8BNUkWZcfiGzXIh5Dgwh99lA'\nAPI='https://tapi.hifast.biz'\n\necho \"=== 用户信息 ===\"\ncurl -s \"$API/v1/public/user/info\" -H \"$AUTH\" | python3 -c \"\nimport sys,json\nd=json.load\\(sys.stdin\\)\nif 'data' in d:\n print\\('user_id:', d['data']['id']\\)\n devs = d['data'].get\\('user_devices', []\\)\n print\\('device count:', len\\(devs\\)\\)\n for dev in devs[:3]:\n print\\(' device:', json.dumps\\(dev\\)\\)\nelse:\n print\\(json.dumps\\(d\\)\\)\n\")",
"Bash(API='https://tapi.hifast.biz'\nDEVICE_ID=\"devicetest$\\(openssl rand -hex 32\\)\"\n\necho \"Device ID: $DEVICE_ID\"\necho \"=== 设备登录 ===\"\ncurl -s -X POST \"$API/v1/auth/login/device\" \\\\\n -H 'Content-Type: application/json' \\\\\n -d \"{\\\\\"identifier\\\\\":\\\\\"$DEVICE_ID\\\\\",\\\\\"user_agent\\\\\":\\\\\"Mozilla/5.0 \\(Macintosh; Intel Mac OS X 10_15_7\\)\\\\\"}\" | python3 -m json.tool 2>/dev/null)",
"Bash(find /Users/Apple/code_vpn/vpn/frontend/packages/ui/src -name \"request*\" -o -name \"token*\" -o -name \"auth*\" -o -name \"store*\" 2>/dev/null | head -30)",
"Bash(grep -r \"SessionIdKey\" /Users/Apple/code_vpn/vpn/ppanel-server --include=\"*.go\" -n 2>/dev/null | head -10)",
"Bash(ls /Users/Apple/code_vpn/vpn/ppanel-server/etc/ 2>/dev/null; ls /Users/Apple/code_vpn/vpn/ppanel-server/*.yaml 2>/dev/null; ls /Users/Apple/code_vpn/vpn/ppanel-server/*.yml 2>/dev/null)",
"Bash(find /Users/Apple/code_vpn/vpn/ppanel-server/internal/svc -type f -name \"*.go\" | xargs ls -la)",
"Bash(git add:*)",
"Bash(git reset:*)",
"Bash(git commit:*)",
"Bash(git push:*)",
"Bash(git fetch:*)",
"Bash(git branch:*)",
"Bash(git merge:*)",
"Bash(node:*)",
"Bash(git stash:*)",
"Bash(npx biome:*)",
"Bash(chmod:*)",
"Bash(bash -n /Users/Apple/code_vpn/vpn/frontend/scripts/sync-upstream.sh && echo \"语法检查通过\")",
"Bash(grep:*)",
"Bash(git checkout:*)",
"Bash(python3:*)",
"Bash(find:*)",
"Bash(cd:*)",
"Read(//Users/Apple/.claude/**)",
"Bash(2)",
"Bash(claude mcp:*)",
"Bash(mysql:*)"
]
},
"enabledMcpjsonServers": ["mysql"],
"enableAllProjectMcpServers": true
}
+20 -21
View File
@@ -1,30 +1,29 @@
name: Dependabot Auto Merge
on:
pull_request_target:
types: [labeled, edited]
types: [opened, reopened, synchronize, ready_for_review, labeled]
permissions:
contents: write
pull-requests: write
concurrency:
group: dependabot-auto-merge-${{ github.event.pull_request.number }}
cancel-in-progress: true
jobs:
merge:
if: contains(github.event.pull_request.labels.*.name, 'dependencies')
if: >
github.actor == 'dependabot[bot]' &&
github.event.pull_request.user.login == 'dependabot[bot]' &&
contains(github.event.pull_request.labels.*.name, 'dependencies')
name: Dependabot Auto Merge
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v4
- name: Setup Node.js environment
uses: actions/setup-node@v4
with:
node-version: '20'
- name: Install deps
run: pnpm install
- name: Merge
uses: ahmadnassri/action-dependabot-auto-merge@v2
with:
command: merge
target: minor
github-token: ${{ secrets.GH_TOKEN }}
- name: Enable auto-merge
env:
GH_TOKEN: ${{ github.token }}
PR_URL: ${{ github.event.pull_request.html_url }}
run: gh pr merge "$PR_URL" --auto --merge
+48
View File
@@ -0,0 +1,48 @@
name: PR Check
on:
push:
branches:
- main
- internal
pull_request:
branches:
- main
- internal
permissions:
contents: read
concurrency:
group: pr-check-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
jobs:
validate:
name: Lint, Check, Test and Build
runs-on: ubuntu-latest
timeout-minutes: 20
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Bun
uses: oven-sh/setup-bun@v2
with:
bun-version: '1.3.1'
- name: Install dependencies
run: bun install --frozen-lockfile
- name: Lint
run: bun run lint
- name: Check
run: bun run check
- name: Test
run: bun run test
- name: Build
run: bun run build
+9 -4
View File
@@ -9,20 +9,25 @@ on:
permissions:
contents: write
concurrency:
group: release-${{ github.ref }}
cancel-in-progress: false
jobs:
release:
name: Build
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- uses: actions/checkout@v4
- name: Setup Bun
uses: oven-sh/setup-bun@v1
uses: oven-sh/setup-bun@v2
with:
bun-version: 'latest'
bun-version: '1.3.1'
- name: Cache Bun dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.bun
@@ -32,7 +37,7 @@ jobs:
${{ runner.os }}-bun-cache-
- name: Install deps
run: bun install
run: bun install --frozen-lockfile
- name: Build
run: bun run build
+1
View File
@@ -34,3 +34,4 @@ npm-debug.log*
# Misc
.DS_Store
*.pem
.mcp.json
Binary file not shown.
@@ -15,7 +15,7 @@
"pending": "Pending",
"pendingTickets": "Pending Tickets",
"register": "Register",
"repurchase": "Repurchase",
"repurchase": "Renewal",
"revenueTitle": "Revenue Statistics",
"selectTypePlaceholder": "Select Type",
"today": "Today",
@@ -0,0 +1,23 @@
{
"commission": "Commission",
"days": "{{count}} days",
"disabled": "Disabled",
"empty": "No invite records",
"enabled": "Enabled",
"hasPurchased": "Purchased",
"invitee": "Invitee",
"inviteeGiftDays": "Invitee Gift Days",
"inviteeId": "Invitee ID",
"invitedAt": "Invited At",
"inviter": "Inviter",
"inviterGiftDays": "Inviter Gift Days",
"inviterId": "Inviter ID",
"loadErrorDescription": "Refresh the table or try again later.",
"loadErrorTitle": "Failed to load invites",
"no": "No",
"orderCount": "Orders",
"searchPlaceholder": "Email or phone",
"status": "Status",
"title": "Invite Management",
"yes": "Yes"
}
@@ -11,6 +11,7 @@
"Email": "Email",
"Gift": "Gift",
"Group Management": "Group Management",
"Invite Management": "Invite Management",
"Login": "Login",
"Logs & Analytics": "Logs & Analytics",
"Maintenance": "Maintenance",
@@ -20,6 +21,7 @@
"Order Management": "Order Management",
"Payment Config": "Payment Config",
"Product Management": "Product Management",
"Promo Management": "Promo Management",
"Redemption Management": "Redemption Management",
"Register": "Register",
"Reset Subscribe": "Reset Subscribe",
@@ -34,5 +36,6 @@
"Traffic Details": "Traffic Details",
"Device Group": "Device Group",
"User Management": "User Management",
"Users & Support": "Users & Support"
"Users & Support": "Users & Support",
"Withdrawal Management": "Withdrawal Management"
}
@@ -1,17 +1,25 @@
{
"amount": "Amount",
"couponDiscount": "Coupon Discount",
"confirmRefund": "Confirm refund",
"discount": "Discount Amount",
"feeAmount": "Fee Amount",
"method": "Payment Method",
"orderNumber": "Order Number",
"refund": "Refund",
"refundConfirmDescription": "This refund will immediately invalidate the user's subscription and deduct the related agent commission.",
"refundConfirmTitle": "Confirm refund",
"refundConfirmWarning": "This action cannot be repeated after the order is refunded.",
"refundSubmitting": "Refunding...",
"refundSuccess": "Refund completed.",
"status": {
"0": "Status",
"1": "Pending",
"2": "Paid",
"3": "Cancelled",
"4": "Closed",
"5": "Completed"
"5": "Completed",
"6": "Refunded"
},
"subscribe": "Subscribe",
"subscribePrice": "Subscription Price",
@@ -32,6 +32,7 @@
"discount_price": "Discount Price",
"discountDescription": "Set discount based on unit price",
"discountPercent": "Discount Percentage",
"appleProductId": "Apple Product ID",
"Hour": "Hour",
"inventory": "Subscription Limit",
"language": "Language",
@@ -0,0 +1,65 @@
{
"cancel": "Cancel",
"confirm": "Confirm",
"confirmDelete": "Are you sure you want to delete?",
"createPrice": "Create Promo Price",
"createRule": "Create Rule",
"createSuccess": "Create Success",
"delete": "Delete",
"deleteSuccess": "Delete Success",
"deleteWarning": "Once deleted, data cannot be recovered. Please proceed with caution.",
"detail": "Detail",
"edit": "Edit",
"editRule": "Edit Rule",
"emptyPrices": "No promo prices",
"emptyRules": "No promo rules",
"emptyUsage": "No promo usage records",
"enabled": "Enabled",
"endTime": "End Time",
"form": {
"enterPromoPrice": "Enter price",
"inactiveMonths": "Inactive Months",
"inactiveMonthsPlaceholder": "Months without purchase",
"name": "Name",
"namePlaceholder": "Rule name",
"promoPriceLessThanUnitPrice": "Promo price must be lower than unit price",
"selectEndTime": "Select time",
"selectRule": "Select rule",
"selectStartTime": "Select time",
"selectSubscribe": "Select subscribe",
"type": "Rule Type",
"windowHours": "Window Hours",
"windowHoursPlaceholder": "Hours after registration"
},
"loadErrorDescription": "Refresh the table or try again later.",
"loadPricesError": "Failed to load promo prices",
"loadRulesError": "Failed to load promo rules",
"loadUsageError": "Failed to load promo usage",
"name": "Name",
"no": "No",
"orderNo": "Order No.",
"params": "Params",
"prices": "Prices",
"priority": "Priority",
"promoPrice": "Promo Price",
"rule": "Rule",
"ruleDetail": "Rule Detail",
"rules": "Rules",
"searchRule": "Rule name",
"startTime": "Start Time",
"subscribe": "Subscribe",
"type": "Type",
"types": {
"campaign": "Campaign",
"inactive_user": "Inactive User",
"new_user": "New User"
},
"unitPrice": "Unit Price",
"unitPriceHint": "Unit price",
"updateSuccess": "Update Success",
"usage": "Usage",
"usedAt": "Used At",
"userId": "User ID",
"validityPeriod": "Validity Period",
"yes": "Yes"
}
@@ -0,0 +1,23 @@
{
"commission": "佣金",
"days": "{{count}} 天",
"disabled": "禁用",
"empty": "暂无邀请记录",
"enabled": "启用",
"hasPurchased": "已购买",
"invitee": "被邀请人",
"inviteeGiftDays": "被邀请人赠送天数",
"inviteeId": "被邀请人 ID",
"invitedAt": "邀请时间",
"inviter": "邀请人",
"inviterGiftDays": "邀请人赠送天数",
"inviterId": "邀请人 ID",
"loadErrorDescription": "刷新表格或稍后重试。",
"loadErrorTitle": "邀请记录加载失败",
"no": "否",
"orderCount": "订单数",
"searchPlaceholder": "邮箱/手机号关键词",
"status": "状态",
"title": "邀请管理",
"yes": "是"
}
@@ -11,6 +11,7 @@
"Email": "邮件",
"Gift": "赠送",
"Group Management": "分组管理",
"Invite Management": "邀请管理",
"Login": "登录",
"Logs & Analytics": "日志与分析",
"Maintenance": "维护",
@@ -20,6 +21,7 @@
"Order Management": "订单管理",
"Payment Config": "支付配置",
"Product Management": "商品管理",
"Promo Management": "促销管理",
"Redemption Management": "兑换码管理",
"Register": "注册",
"Reset Subscribe": "重置订阅",
@@ -34,5 +36,6 @@
"Traffic Details": "流量详情",
"Device Group": "设备组",
"User Management": "用户管理",
"Users & Support": "用户与支持"
"Users & Support": "用户与支持",
"Withdrawal Management": "提现管理"
}
@@ -1,17 +1,25 @@
{
"amount": "金额",
"couponDiscount": "优惠券折扣",
"confirmRefund": "确认退费",
"discount": "折扣金额",
"feeAmount": "手续费",
"method": "支付方式",
"orderNumber": "订单编号",
"refund": "退费",
"refundConfirmDescription": "该退费操作会使用户订阅立即失效,并扣减关联代理佣金。",
"refundConfirmTitle": "确认退费",
"refundConfirmWarning": "订单退费后不可再次重复执行,请谨慎操作。",
"refundSubmitting": "退费中...",
"refundSuccess": "退费成功。",
"status": {
"0": "状态",
"1": "待支付",
"2": "已支付",
"3": "已取消",
"4": "已关闭",
"5": "已完成"
"5": "已完成",
"6": "已退费"
},
"subscribe": "订阅",
"subscribePrice": "订阅价格",
@@ -32,6 +32,7 @@
"discount_price": "折扣价格",
"discountDescription": "根据单价设置折扣",
"discountPercent": "折扣百分比",
"appleProductId": "苹果商品ID",
"Hour": "小时",
"inventory": "订阅库存",
"language": "语言",
@@ -0,0 +1,65 @@
{
"cancel": "取消",
"confirm": "确认",
"confirmDelete": "确定要删除吗?",
"createPrice": "创建促销价",
"createRule": "创建规则",
"createSuccess": "创建成功",
"delete": "删除",
"deleteSuccess": "删除成功",
"deleteWarning": "删除后数据无法恢复,请谨慎操作。",
"detail": "详情",
"edit": "编辑",
"editRule": "编辑规则",
"emptyPrices": "暂无商品促销价",
"emptyRules": "暂无促销规则",
"emptyUsage": "暂无促销使用记录",
"enabled": "启用",
"endTime": "结束时间",
"form": {
"enterPromoPrice": "输入价格",
"inactiveMonths": "未活跃月数",
"inactiveMonthsPlaceholder": "未购买的月数",
"name": "名称",
"namePlaceholder": "规则名称",
"promoPriceLessThanUnitPrice": "促销价必须低于原价",
"selectEndTime": "选择时间",
"selectRule": "选择规则",
"selectStartTime": "选择时间",
"selectSubscribe": "选择订阅",
"type": "规则类型",
"windowHours": "新用户窗口小时数",
"windowHoursPlaceholder": "注册后的小时数"
},
"loadErrorDescription": "请刷新表格或稍后重试。",
"loadPricesError": "促销价加载失败",
"loadRulesError": "促销规则加载失败",
"loadUsageError": "促销使用记录加载失败",
"name": "名称",
"no": "否",
"orderNo": "订单号",
"params": "参数",
"prices": "商品促销价",
"priority": "优先级",
"promoPrice": "促销价",
"rule": "规则",
"ruleDetail": "规则详情",
"rules": "促销规则",
"searchRule": "规则名称",
"startTime": "开始时间",
"subscribe": "订阅",
"type": "类型",
"types": {
"campaign": "活动",
"inactive_user": "回归用户",
"new_user": "新用户"
},
"unitPrice": "原价",
"unitPriceHint": "原价",
"updateSuccess": "更新成功",
"usage": "使用记录",
"usedAt": "使用时间",
"userId": "用户 ID",
"validityPeriod": "有效期",
"yes": "是"
}
@@ -12,7 +12,7 @@
"0": "状态",
"1": "待跟进",
"2": "待回复",
"3": "已解决",
"3": "已取消",
"4": "已关闭"
},
"ticketList": "工单列表",
+15
View File
@@ -49,6 +49,11 @@ export function useNavs() {
url: "/dashboard/product",
icon: "flat-color-icons:shop",
},
{
title: t("Promo Management", "Promo Management"),
url: "/dashboard/promo",
icon: "flat-color-icons:briefcase",
},
],
},
@@ -93,6 +98,16 @@ export function useNavs() {
url: "/dashboard/user",
icon: "flat-color-icons:conference-call",
},
{
title: t("Withdrawal Management", "Withdrawal Management"),
url: "/dashboard/withdrawal",
icon: "flat-color-icons:money-transfer",
},
{
title: t("Invite Management", "Invite Management"),
url: "/dashboard/invite-management",
icon: "flat-color-icons:add-user",
},
{
title: t("Device Group", "Device Group"),
url: "/dashboard/family",
+2
View File
@@ -35,12 +35,14 @@ initializeI18n({
"coupon",
"dashboard",
"document",
"invite",
"log",
"marketing",
"menu",
"nodes",
"order",
"payment",
"promo",
"product",
"servers",
"subscribe",
+114
View File
@@ -15,8 +15,14 @@ import { Route as rootRouteImport } from './routes/__root'
const DashboardRouteLazyRouteImport = createFileRoute('/dashboard')()
const IndexLazyRouteImport = createFileRoute('/')()
const DashboardIndexLazyRouteImport = createFileRoute('/dashboard/')()
const DashboardWithdrawalLazyRouteImport = createFileRoute(
'/dashboard/withdrawal',
)()
const DashboardServersLazyRouteImport = createFileRoute('/dashboard/servers')()
const DashboardNodesLazyRouteImport = createFileRoute('/dashboard/nodes')()
const DashboardWithdrawalIndexLazyRouteImport = createFileRoute(
'/dashboard/withdrawal/',
)()
const DashboardUserIndexLazyRouteImport = createFileRoute('/dashboard/user/')()
const DashboardTicketIndexLazyRouteImport =
createFileRoute('/dashboard/ticket/')()
@@ -28,6 +34,8 @@ const DashboardSubscribeIndexLazyRouteImport = createFileRoute(
const DashboardRedemptionIndexLazyRouteImport = createFileRoute(
'/dashboard/redemption/',
)()
const DashboardPromoIndexLazyRouteImport =
createFileRoute('/dashboard/promo/')()
const DashboardProductIndexLazyRouteImport = createFileRoute(
'/dashboard/product/',
)()
@@ -39,6 +47,9 @@ const DashboardOrderIndexLazyRouteImport =
const DashboardMarketingIndexLazyRouteImport = createFileRoute(
'/dashboard/marketing/',
)()
const DashboardInviteManagementIndexLazyRouteImport = createFileRoute(
'/dashboard/invite-management/',
)()
const DashboardGroupIndexLazyRouteImport =
createFileRoute('/dashboard/group/')()
const DashboardFamilyIndexLazyRouteImport =
@@ -109,6 +120,13 @@ const DashboardIndexLazyRoute = DashboardIndexLazyRouteImport.update({
} as any).lazy(() =>
import('./routes/dashboard/index.lazy').then((d) => d.Route),
)
const DashboardWithdrawalLazyRoute = DashboardWithdrawalLazyRouteImport.update({
id: '/withdrawal',
path: '/withdrawal',
getParentRoute: () => DashboardRouteLazyRoute,
} as any).lazy(() =>
import('./routes/dashboard/withdrawal.lazy').then((d) => d.Route),
)
const DashboardServersLazyRoute = DashboardServersLazyRouteImport.update({
id: '/servers',
path: '/servers',
@@ -123,6 +141,14 @@ const DashboardNodesLazyRoute = DashboardNodesLazyRouteImport.update({
} as any).lazy(() =>
import('./routes/dashboard/nodes.lazy').then((d) => d.Route),
)
const DashboardWithdrawalIndexLazyRoute =
DashboardWithdrawalIndexLazyRouteImport.update({
id: '/',
path: '/',
getParentRoute: () => DashboardWithdrawalLazyRoute,
} as any).lazy(() =>
import('./routes/dashboard/withdrawal/index.lazy').then((d) => d.Route),
)
const DashboardUserIndexLazyRoute = DashboardUserIndexLazyRouteImport.update({
id: '/user/',
path: '/user/',
@@ -162,6 +188,13 @@ const DashboardRedemptionIndexLazyRoute =
} as any).lazy(() =>
import('./routes/dashboard/redemption/index.lazy').then((d) => d.Route),
)
const DashboardPromoIndexLazyRoute = DashboardPromoIndexLazyRouteImport.update({
id: '/promo/',
path: '/promo/',
getParentRoute: () => DashboardRouteLazyRoute,
} as any).lazy(() =>
import('./routes/dashboard/promo/index.lazy').then((d) => d.Route),
)
const DashboardProductIndexLazyRoute =
DashboardProductIndexLazyRouteImport.update({
id: '/product/',
@@ -193,6 +226,16 @@ const DashboardMarketingIndexLazyRoute =
} as any).lazy(() =>
import('./routes/dashboard/marketing/index.lazy').then((d) => d.Route),
)
const DashboardInviteManagementIndexLazyRoute =
DashboardInviteManagementIndexLazyRouteImport.update({
id: '/invite-management/',
path: '/invite-management/',
getParentRoute: () => DashboardRouteLazyRoute,
} as any).lazy(() =>
import('./routes/dashboard/invite-management/index.lazy').then(
(d) => d.Route,
),
)
const DashboardGroupIndexLazyRoute = DashboardGroupIndexLazyRouteImport.update({
id: '/group/',
path: '/group/',
@@ -346,6 +389,7 @@ export interface FileRoutesByFullPath {
'/dashboard': typeof DashboardRouteLazyRouteWithChildren
'/dashboard/nodes': typeof DashboardNodesLazyRoute
'/dashboard/servers': typeof DashboardServersLazyRoute
'/dashboard/withdrawal': typeof DashboardWithdrawalLazyRouteWithChildren
'/dashboard/': typeof DashboardIndexLazyRoute
'/dashboard/log/balance': typeof DashboardLogBalanceLazyRoute
'/dashboard/log/commission': typeof DashboardLogCommissionLazyRoute
@@ -366,15 +410,18 @@ export interface FileRoutesByFullPath {
'/dashboard/document': typeof DashboardDocumentIndexLazyRoute
'/dashboard/family': typeof DashboardFamilyIndexLazyRoute
'/dashboard/group': typeof DashboardGroupIndexLazyRoute
'/dashboard/invite-management': typeof DashboardInviteManagementIndexLazyRoute
'/dashboard/marketing': typeof DashboardMarketingIndexLazyRoute
'/dashboard/order': typeof DashboardOrderIndexLazyRoute
'/dashboard/payment': typeof DashboardPaymentIndexLazyRoute
'/dashboard/product': typeof DashboardProductIndexLazyRoute
'/dashboard/promo': typeof DashboardPromoIndexLazyRoute
'/dashboard/redemption': typeof DashboardRedemptionIndexLazyRoute
'/dashboard/subscribe': typeof DashboardSubscribeIndexLazyRoute
'/dashboard/system': typeof DashboardSystemIndexLazyRoute
'/dashboard/ticket': typeof DashboardTicketIndexLazyRoute
'/dashboard/user': typeof DashboardUserIndexLazyRoute
'/dashboard/withdrawal/': typeof DashboardWithdrawalIndexLazyRoute
}
export interface FileRoutesByTo {
'/': typeof IndexLazyRoute
@@ -400,15 +447,18 @@ export interface FileRoutesByTo {
'/dashboard/document': typeof DashboardDocumentIndexLazyRoute
'/dashboard/family': typeof DashboardFamilyIndexLazyRoute
'/dashboard/group': typeof DashboardGroupIndexLazyRoute
'/dashboard/invite-management': typeof DashboardInviteManagementIndexLazyRoute
'/dashboard/marketing': typeof DashboardMarketingIndexLazyRoute
'/dashboard/order': typeof DashboardOrderIndexLazyRoute
'/dashboard/payment': typeof DashboardPaymentIndexLazyRoute
'/dashboard/product': typeof DashboardProductIndexLazyRoute
'/dashboard/promo': typeof DashboardPromoIndexLazyRoute
'/dashboard/redemption': typeof DashboardRedemptionIndexLazyRoute
'/dashboard/subscribe': typeof DashboardSubscribeIndexLazyRoute
'/dashboard/system': typeof DashboardSystemIndexLazyRoute
'/dashboard/ticket': typeof DashboardTicketIndexLazyRoute
'/dashboard/user': typeof DashboardUserIndexLazyRoute
'/dashboard/withdrawal': typeof DashboardWithdrawalIndexLazyRoute
}
export interface FileRoutesById {
__root__: typeof rootRouteImport
@@ -416,6 +466,7 @@ export interface FileRoutesById {
'/dashboard': typeof DashboardRouteLazyRouteWithChildren
'/dashboard/nodes': typeof DashboardNodesLazyRoute
'/dashboard/servers': typeof DashboardServersLazyRoute
'/dashboard/withdrawal': typeof DashboardWithdrawalLazyRouteWithChildren
'/dashboard/': typeof DashboardIndexLazyRoute
'/dashboard/log/balance': typeof DashboardLogBalanceLazyRoute
'/dashboard/log/commission': typeof DashboardLogCommissionLazyRoute
@@ -436,15 +487,18 @@ export interface FileRoutesById {
'/dashboard/document/': typeof DashboardDocumentIndexLazyRoute
'/dashboard/family/': typeof DashboardFamilyIndexLazyRoute
'/dashboard/group/': typeof DashboardGroupIndexLazyRoute
'/dashboard/invite-management/': typeof DashboardInviteManagementIndexLazyRoute
'/dashboard/marketing/': typeof DashboardMarketingIndexLazyRoute
'/dashboard/order/': typeof DashboardOrderIndexLazyRoute
'/dashboard/payment/': typeof DashboardPaymentIndexLazyRoute
'/dashboard/product/': typeof DashboardProductIndexLazyRoute
'/dashboard/promo/': typeof DashboardPromoIndexLazyRoute
'/dashboard/redemption/': typeof DashboardRedemptionIndexLazyRoute
'/dashboard/subscribe/': typeof DashboardSubscribeIndexLazyRoute
'/dashboard/system/': typeof DashboardSystemIndexLazyRoute
'/dashboard/ticket/': typeof DashboardTicketIndexLazyRoute
'/dashboard/user/': typeof DashboardUserIndexLazyRoute
'/dashboard/withdrawal/': typeof DashboardWithdrawalIndexLazyRoute
}
export interface FileRouteTypes {
fileRoutesByFullPath: FileRoutesByFullPath
@@ -453,6 +507,7 @@ export interface FileRouteTypes {
| '/dashboard'
| '/dashboard/nodes'
| '/dashboard/servers'
| '/dashboard/withdrawal'
| '/dashboard/'
| '/dashboard/log/balance'
| '/dashboard/log/commission'
@@ -473,15 +528,18 @@ export interface FileRouteTypes {
| '/dashboard/document'
| '/dashboard/family'
| '/dashboard/group'
| '/dashboard/invite-management'
| '/dashboard/marketing'
| '/dashboard/order'
| '/dashboard/payment'
| '/dashboard/product'
| '/dashboard/promo'
| '/dashboard/redemption'
| '/dashboard/subscribe'
| '/dashboard/system'
| '/dashboard/ticket'
| '/dashboard/user'
| '/dashboard/withdrawal/'
fileRoutesByTo: FileRoutesByTo
to:
| '/'
@@ -507,21 +565,25 @@ export interface FileRouteTypes {
| '/dashboard/document'
| '/dashboard/family'
| '/dashboard/group'
| '/dashboard/invite-management'
| '/dashboard/marketing'
| '/dashboard/order'
| '/dashboard/payment'
| '/dashboard/product'
| '/dashboard/promo'
| '/dashboard/redemption'
| '/dashboard/subscribe'
| '/dashboard/system'
| '/dashboard/ticket'
| '/dashboard/user'
| '/dashboard/withdrawal'
id:
| '__root__'
| '/'
| '/dashboard'
| '/dashboard/nodes'
| '/dashboard/servers'
| '/dashboard/withdrawal'
| '/dashboard/'
| '/dashboard/log/balance'
| '/dashboard/log/commission'
@@ -542,15 +604,18 @@ export interface FileRouteTypes {
| '/dashboard/document/'
| '/dashboard/family/'
| '/dashboard/group/'
| '/dashboard/invite-management/'
| '/dashboard/marketing/'
| '/dashboard/order/'
| '/dashboard/payment/'
| '/dashboard/product/'
| '/dashboard/promo/'
| '/dashboard/redemption/'
| '/dashboard/subscribe/'
| '/dashboard/system/'
| '/dashboard/ticket/'
| '/dashboard/user/'
| '/dashboard/withdrawal/'
fileRoutesById: FileRoutesById
}
export interface RootRouteChildren {
@@ -581,6 +646,13 @@ declare module '@tanstack/react-router' {
preLoaderRoute: typeof DashboardIndexLazyRouteImport
parentRoute: typeof DashboardRouteLazyRoute
}
'/dashboard/withdrawal': {
id: '/dashboard/withdrawal'
path: '/withdrawal'
fullPath: '/dashboard/withdrawal'
preLoaderRoute: typeof DashboardWithdrawalLazyRouteImport
parentRoute: typeof DashboardRouteLazyRoute
}
'/dashboard/servers': {
id: '/dashboard/servers'
path: '/servers'
@@ -595,6 +667,13 @@ declare module '@tanstack/react-router' {
preLoaderRoute: typeof DashboardNodesLazyRouteImport
parentRoute: typeof DashboardRouteLazyRoute
}
'/dashboard/withdrawal/': {
id: '/dashboard/withdrawal/'
path: '/'
fullPath: '/dashboard/withdrawal/'
preLoaderRoute: typeof DashboardWithdrawalIndexLazyRouteImport
parentRoute: typeof DashboardWithdrawalLazyRoute
}
'/dashboard/user/': {
id: '/dashboard/user/'
path: '/user'
@@ -630,6 +709,13 @@ declare module '@tanstack/react-router' {
preLoaderRoute: typeof DashboardRedemptionIndexLazyRouteImport
parentRoute: typeof DashboardRouteLazyRoute
}
'/dashboard/promo/': {
id: '/dashboard/promo/'
path: '/promo'
fullPath: '/dashboard/promo'
preLoaderRoute: typeof DashboardPromoIndexLazyRouteImport
parentRoute: typeof DashboardRouteLazyRoute
}
'/dashboard/product/': {
id: '/dashboard/product/'
path: '/product'
@@ -658,6 +744,13 @@ declare module '@tanstack/react-router' {
preLoaderRoute: typeof DashboardMarketingIndexLazyRouteImport
parentRoute: typeof DashboardRouteLazyRoute
}
'/dashboard/invite-management/': {
id: '/dashboard/invite-management/'
path: '/invite-management'
fullPath: '/dashboard/invite-management'
preLoaderRoute: typeof DashboardInviteManagementIndexLazyRouteImport
parentRoute: typeof DashboardRouteLazyRoute
}
'/dashboard/group/': {
id: '/dashboard/group/'
path: '/group'
@@ -794,9 +887,24 @@ declare module '@tanstack/react-router' {
}
}
interface DashboardWithdrawalLazyRouteChildren {
DashboardWithdrawalIndexLazyRoute: typeof DashboardWithdrawalIndexLazyRoute
}
const DashboardWithdrawalLazyRouteChildren: DashboardWithdrawalLazyRouteChildren =
{
DashboardWithdrawalIndexLazyRoute: DashboardWithdrawalIndexLazyRoute,
}
const DashboardWithdrawalLazyRouteWithChildren =
DashboardWithdrawalLazyRoute._addFileChildren(
DashboardWithdrawalLazyRouteChildren,
)
interface DashboardRouteLazyRouteChildren {
DashboardNodesLazyRoute: typeof DashboardNodesLazyRoute
DashboardServersLazyRoute: typeof DashboardServersLazyRoute
DashboardWithdrawalLazyRoute: typeof DashboardWithdrawalLazyRouteWithChildren
DashboardIndexLazyRoute: typeof DashboardIndexLazyRoute
DashboardLogBalanceLazyRoute: typeof DashboardLogBalanceLazyRoute
DashboardLogCommissionLazyRoute: typeof DashboardLogCommissionLazyRoute
@@ -817,10 +925,12 @@ interface DashboardRouteLazyRouteChildren {
DashboardDocumentIndexLazyRoute: typeof DashboardDocumentIndexLazyRoute
DashboardFamilyIndexLazyRoute: typeof DashboardFamilyIndexLazyRoute
DashboardGroupIndexLazyRoute: typeof DashboardGroupIndexLazyRoute
DashboardInviteManagementIndexLazyRoute: typeof DashboardInviteManagementIndexLazyRoute
DashboardMarketingIndexLazyRoute: typeof DashboardMarketingIndexLazyRoute
DashboardOrderIndexLazyRoute: typeof DashboardOrderIndexLazyRoute
DashboardPaymentIndexLazyRoute: typeof DashboardPaymentIndexLazyRoute
DashboardProductIndexLazyRoute: typeof DashboardProductIndexLazyRoute
DashboardPromoIndexLazyRoute: typeof DashboardPromoIndexLazyRoute
DashboardRedemptionIndexLazyRoute: typeof DashboardRedemptionIndexLazyRoute
DashboardSubscribeIndexLazyRoute: typeof DashboardSubscribeIndexLazyRoute
DashboardSystemIndexLazyRoute: typeof DashboardSystemIndexLazyRoute
@@ -831,6 +941,7 @@ interface DashboardRouteLazyRouteChildren {
const DashboardRouteLazyRouteChildren: DashboardRouteLazyRouteChildren = {
DashboardNodesLazyRoute: DashboardNodesLazyRoute,
DashboardServersLazyRoute: DashboardServersLazyRoute,
DashboardWithdrawalLazyRoute: DashboardWithdrawalLazyRouteWithChildren,
DashboardIndexLazyRoute: DashboardIndexLazyRoute,
DashboardLogBalanceLazyRoute: DashboardLogBalanceLazyRoute,
DashboardLogCommissionLazyRoute: DashboardLogCommissionLazyRoute,
@@ -851,10 +962,13 @@ const DashboardRouteLazyRouteChildren: DashboardRouteLazyRouteChildren = {
DashboardDocumentIndexLazyRoute: DashboardDocumentIndexLazyRoute,
DashboardFamilyIndexLazyRoute: DashboardFamilyIndexLazyRoute,
DashboardGroupIndexLazyRoute: DashboardGroupIndexLazyRoute,
DashboardInviteManagementIndexLazyRoute:
DashboardInviteManagementIndexLazyRoute,
DashboardMarketingIndexLazyRoute: DashboardMarketingIndexLazyRoute,
DashboardOrderIndexLazyRoute: DashboardOrderIndexLazyRoute,
DashboardPaymentIndexLazyRoute: DashboardPaymentIndexLazyRoute,
DashboardProductIndexLazyRoute: DashboardProductIndexLazyRoute,
DashboardPromoIndexLazyRoute: DashboardPromoIndexLazyRoute,
DashboardRedemptionIndexLazyRoute: DashboardRedemptionIndexLazyRoute,
DashboardSubscribeIndexLazyRoute: DashboardSubscribeIndexLazyRoute,
DashboardSystemIndexLazyRoute: DashboardSystemIndexLazyRoute,
@@ -0,0 +1,6 @@
import { createLazyFileRoute } from "@tanstack/react-router";
import InviteManagement from "@/sections/invite";
export const Route = createLazyFileRoute("/dashboard/invite-management/")({
component: InviteManagement,
});
@@ -0,0 +1,6 @@
import { createLazyFileRoute } from "@tanstack/react-router";
import PromoPage from "@/sections/promo";
export const Route = createLazyFileRoute("/dashboard/promo/")({
component: PromoPage,
});
@@ -0,0 +1,6 @@
import { createLazyFileRoute } from "@tanstack/react-router";
import WithdrawalManagementPage from "@/sections/withdrawal";
export const Route = createLazyFileRoute("/dashboard/withdrawal")({
component: WithdrawalManagementPage,
});
@@ -0,0 +1,6 @@
import { createLazyFileRoute } from "@tanstack/react-router";
import WithdrawalPage from "@/sections/withdrawal";
export const Route = createLazyFileRoute("/dashboard/withdrawal/")({
component: WithdrawalPage,
});
@@ -0,0 +1,159 @@
/**
* @vitest-environment jsdom
*/
import { cleanup, render, screen, waitFor } from "@testing-library/react";
import { getAdminInviteList } from "@workspace/ui/services/admin/invite";
import type { AxiosResponse } from "axios";
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
import InviteManagement from ".";
vi.mock("react-i18next", () => ({
useTranslation: () => ({
t: (
_key: string,
fallback: string,
options?: { count?: number }
): string => {
if (typeof options?.count === "number") {
return `${options.count} days`;
}
return fallback;
},
}),
}));
vi.mock("@/stores/global", () => ({
useGlobalStore: () => ({
common: {
currency: {
currency_symbol: "$",
},
},
}),
}));
vi.mock("@/utils/common", () => ({
formatDate: (timestamp: number) => `date-${timestamp}`,
}));
vi.mock("@workspace/ui/services/admin/invite", () => ({
getAdminInviteList: vi.fn(),
}));
const mockedGetAdminInviteList = vi.mocked(getAdminInviteList);
function createInviteListResponse(
data: API.GetAdminInviteListResponse
): AxiosResponse<API.Response & { data?: API.GetAdminInviteListResponse }> {
return {
data: {
code: 200,
data,
},
status: 200,
statusText: "OK",
headers: {},
config: {
headers: {} as AxiosResponse["config"]["headers"],
},
};
}
afterEach(() => {
cleanup();
vi.clearAllMocks();
});
beforeEach(() => {
localStorage.setItem("timezone", "UTC");
});
describe("InviteManagement", () => {
it("renders invite rows with status, purchase state, commission, and gift days", async () => {
mockedGetAdminInviteList.mockResolvedValue(
createInviteListResponse({
total: 1,
list: [
{
inviter_id: 10,
inviter_identifier: "agent@example.com",
invitee_id: 123,
invitee_identifier: "user@example.com",
invitee_avatar: "",
invitee_enable: true,
invited_at: 1_716_800_000,
order_count: 3,
has_purchased: true,
inviter_commission: 1500,
inviter_gift_days: 30,
invitee_gift_days: 7,
},
],
})
);
render(<InviteManagement />);
await waitFor(() =>
expect(mockedGetAdminInviteList).toHaveBeenCalledWith({
page: 1,
size: 200,
search: undefined,
inviter_id: undefined,
invitee_id: undefined,
})
);
expect(await screen.findByText("agent@example.com")).not.toBeNull();
expect(screen.getByText("user@example.com")).not.toBeNull();
expect(screen.getByText("Enabled")).not.toBeNull();
expect(screen.getByText("Yes")).not.toBeNull();
expect(screen.getByText("$15.00")).not.toBeNull();
expect(screen.getByText("30 days")).not.toBeNull();
expect(screen.getByText("7 days")).not.toBeNull();
expect(screen.getByText("date-1716800000")).not.toBeNull();
});
it("shows the empty state when the API returns no rows", async () => {
mockedGetAdminInviteList.mockResolvedValue(
createInviteListResponse({
total: 0,
list: [],
})
);
render(<InviteManagement />);
expect(await screen.findByText("No invite records")).not.toBeNull();
});
it("shows a loading state while invites are being fetched", () => {
let resolveRequest:
| ((
value: AxiosResponse<
API.Response & { data?: API.GetAdminInviteListResponse }
>
) => void)
| undefined;
mockedGetAdminInviteList.mockReturnValue(
new Promise((resolve) => {
resolveRequest = resolve;
})
);
render(<InviteManagement />);
expect(screen.getByRole("status", { name: "Loading data" })).not.toBeNull();
expect(resolveRequest).toBeTypeOf("function");
});
it("shows an error state when the request fails", async () => {
mockedGetAdminInviteList.mockRejectedValue(new Error("network failed"));
render(<InviteManagement />);
await waitFor(() => expect(mockedGetAdminInviteList).toHaveBeenCalled());
expect(await screen.findByText("Failed to load invites")).not.toBeNull();
expect(screen.queryByText("No invite records")).toBeNull();
});
});
+213
View File
@@ -0,0 +1,213 @@
"use client";
import {
Alert,
AlertDescription,
AlertTitle,
} from "@workspace/ui/components/alert";
import {
Avatar,
AvatarFallback,
AvatarImage,
} from "@workspace/ui/components/avatar";
import { Badge } from "@workspace/ui/components/badge";
import Empty from "@workspace/ui/composed/empty";
import {
ProTable,
type ProTableActions,
} from "@workspace/ui/composed/pro-table/pro-table";
import { getAdminInviteList } from "@workspace/ui/services/admin/invite";
import { CircleAlert } from "lucide-react";
import { useRef } from "react";
import { useTranslation } from "react-i18next";
import { Display } from "@/components/display";
import { formatDate } from "@/utils/common";
type InviteFilters = {
search?: string;
inviter_id?: string;
invitee_id?: string;
};
function toOptionalNumber(value?: string) {
if (!value) return;
const parsed = Number(value);
return Number.isFinite(parsed) ? parsed : undefined;
}
function InviteUserCell({
id,
identifier,
avatar,
}: {
id: number;
identifier: string;
avatar?: string;
}) {
const fallback = identifier?.charAt(0)?.toUpperCase() || "U";
return (
<div className="flex min-w-48 items-center gap-2">
<Avatar className="h-8 w-8">
<AvatarImage alt={identifier || `#${id}`} src={avatar} />
<AvatarFallback className="text-xs">{fallback}</AvatarFallback>
</Avatar>
<div className="min-w-0">
<div className="font-medium text-sm">#{id}</div>
<div className="max-w-52 truncate text-muted-foreground text-xs">
{identifier || "--"}
</div>
</div>
</div>
);
}
function InviteIdentifierCell({
id,
identifier,
}: {
id: number;
identifier: string;
}) {
return (
<div className="min-w-44">
<div className="font-medium text-sm">#{id}</div>
<div className="max-w-52 truncate text-muted-foreground text-xs">
{identifier || "--"}
</div>
</div>
);
}
export default function InviteManagement() {
const { t } = useTranslation("invite");
const ref = useRef<ProTableActions>(null);
return (
<ProTable<API.AdminInviteRelation, InviteFilters>
action={ref}
columns={[
{
accessorKey: "inviter_id",
header: t("inviter", "Inviter"),
cell: ({ row }) => (
<InviteIdentifierCell
id={row.original.inviter_id}
identifier={row.original.inviter_identifier}
/>
),
},
{
accessorKey: "invitee_id",
header: t("invitee", "Invitee"),
cell: ({ row }) => (
<InviteUserCell
avatar={row.original.invitee_avatar}
id={row.original.invitee_id}
identifier={row.original.invitee_identifier}
/>
),
},
{
accessorKey: "invitee_enable",
header: t("status", "Status"),
cell: ({ row }) => (
<Badge
variant={row.original.invitee_enable ? "default" : "secondary"}
>
{row.original.invitee_enable
? t("enabled", "Enabled")
: t("disabled", "Disabled")}
</Badge>
),
},
{
accessorKey: "invited_at",
header: t("invitedAt", "Invited At"),
cell: ({ row }) => formatDate(row.original.invited_at),
},
{
accessorKey: "order_count",
header: t("orderCount", "Orders"),
},
{
accessorKey: "has_purchased",
header: t("hasPurchased", "Purchased"),
cell: ({ row }) => (
<Badge variant={row.original.has_purchased ? "default" : "outline"}>
{row.original.has_purchased ? t("yes", "Yes") : t("no", "No")}
</Badge>
),
},
{
accessorKey: "inviter_commission",
header: t("commission", "Commission"),
cell: ({ row }) => (
<Display type="currency" value={row.original.inviter_commission} />
),
},
{
accessorKey: "inviter_gift_days",
header: t("inviterGiftDays", "Inviter Gift Days"),
cell: ({ row }) =>
t("days", "{{count}} days", {
count: row.original.inviter_gift_days,
}),
},
{
accessorKey: "invitee_gift_days",
header: t("inviteeGiftDays", "Invitee Gift Days"),
cell: ({ row }) =>
t("days", "{{count}} days", {
count: row.original.invitee_gift_days,
}),
},
]}
empty={<Empty description={t("empty", "No invite records")} />}
error={
<Alert className="mx-auto max-w-md" variant="destructive">
<CircleAlert aria-hidden="true" />
<AlertTitle>
{t("loadErrorTitle", "Failed to load invites")}
</AlertTitle>
<AlertDescription>
{t("loadErrorDescription", "Refresh the table or try again later.")}
</AlertDescription>
</Alert>
}
header={{ title: t("title", "Invite Management") }}
params={[
{
key: "search",
placeholder: t("searchPlaceholder", "Email or phone"),
},
{
key: "inviter_id",
placeholder: t("inviterId", "Inviter ID"),
},
{
key: "invitee_id",
placeholder: t("inviteeId", "Invitee ID"),
},
]}
request={async (pagination, filters) => {
const { data } = await getAdminInviteList({
page: pagination.page,
size: pagination.size,
search: filters.search?.trim() || undefined,
inviter_id: toOptionalNumber(filters.inviter_id),
invitee_id: toOptionalNumber(filters.invitee_id),
});
return {
list:
data.data?.list.map((item) => ({
...item,
id: `${item.inviter_id}-${item.invitee_id}-${item.invited_at}`,
})) || [],
total: data.data?.total || 0,
};
}}
/>
);
}
+10
View File
@@ -26,6 +26,7 @@ import { useTranslation } from "react-i18next";
import { toast } from "sonner";
import { useNode } from "@/stores/node";
import { useServer } from "@/stores/server";
import NodeBatchSheet from "./node-batch-sheet";
import NodeForm from "./node-form";
export default function Nodes() {
@@ -245,6 +246,15 @@ export default function Nodes() {
],
batchRender(rows) {
return [
<NodeBatchSheet
key="batch-update"
onSuccess={() => {
ref.current?.refresh();
fetchNodes();
fetchTags();
}}
rows={rows}
/>,
<ConfirmButton
cancelText={t("cancel", "Cancel")}
confirmText={t("confirm", "Confirm")}
@@ -0,0 +1,558 @@
"use client";
import { useQuery } from "@tanstack/react-query";
import { Button } from "@workspace/ui/components/button";
import { Checkbox } from "@workspace/ui/components/checkbox";
import { Label } from "@workspace/ui/components/label";
import { ScrollArea } from "@workspace/ui/components/scroll-area";
import {
Sheet,
SheetContent,
SheetFooter,
SheetHeader,
SheetTitle,
SheetTrigger,
} from "@workspace/ui/components/sheet";
import { Switch } from "@workspace/ui/components/switch";
import { Combobox } from "@workspace/ui/composed/combobox";
import { EnhancedInput } from "@workspace/ui/composed/enhanced-input";
import TagInput from "@workspace/ui/composed/tag-input";
import {
getGroupConfig,
getNodeGroupList,
} from "@workspace/ui/services/admin/group";
import { updateNode } from "@workspace/ui/services/admin/server";
import { useState } from "react";
import { useTranslation } from "react-i18next";
import { toast } from "sonner";
import { useNode } from "@/stores/node";
import { useServer } from "@/stores/server";
type FieldKey =
| "name"
| "enabled"
| "tags"
| "server_id"
| "protocol"
| "address"
| "port"
| "node_group_ids";
interface BatchPatch {
name?: string;
enabled?: boolean;
tags?: string[];
server_id?: number;
protocol?: string;
address?: string;
port?: number;
node_group_ids?: number[];
}
export default function NodeBatchSheet({
rows,
onSuccess,
}: {
rows: API.Node[];
onSuccess: () => void;
}) {
const { t } = useTranslation("nodes");
const [open, setOpen] = useState(false);
const [loading, setLoading] = useState(false);
// Which fields are active (will be applied)
const [enabledFields, setEnabledFields] = useState<Set<FieldKey>>(new Set());
// Patch values
const [patch, setPatch] = useState<BatchPatch>({
name: "",
enabled: true,
tags: [],
server_id: undefined,
protocol: undefined,
address: "",
port: undefined,
node_group_ids: [],
});
const { servers, getAvailableProtocols } = useServer();
const { tags: existingTags } = useNode();
const { data: nodeGroupsData } = useQuery({
queryKey: ["nodeGroups"],
queryFn: async () => {
const { data } = await getNodeGroupList({ page: 1, size: 1000 });
return data.data?.list || [];
},
});
const { data: groupConfigData } = useQuery({
queryKey: ["groupConfig"],
queryFn: async () => {
const { data } = await getGroupConfig();
return data.data;
},
});
const isGroupEnabled = groupConfigData?.enabled;
const availableProtocols = getAvailableProtocols(patch.server_id);
function toggleField(key: FieldKey) {
setEnabledFields((prev) => {
const next = new Set(prev);
if (next.has(key)) {
next.delete(key);
// When disabling server_id, also disable protocol (it depends on server selection)
if (key === "server_id") next.delete("protocol");
} else {
next.add(key);
// When enabling server_id, auto-enable protocol as it must be set together
if (key === "server_id") next.add("protocol");
}
return next;
});
}
function isEnabled(key: FieldKey) {
return enabledFields.has(key);
}
async function handleSubmit() {
if (rows.length === 0) return;
if (enabledFields.size === 0) {
toast.warning(
t(
"batch_no_fields_selected",
"Please select at least one field to update"
)
);
return;
}
// Validate enabled fields before submitting
if (enabledFields.has("name") && !patch.name?.trim()) {
toast.warning(t("batch_name_required", "Name cannot be empty"));
return;
}
if (enabledFields.has("server_id") && !patch.server_id) {
toast.warning(t("batch_server_required", "Please select a server"));
return;
}
if (enabledFields.has("protocol") && !patch.protocol) {
toast.warning(t("batch_protocol_required", "Please select a protocol"));
return;
}
if (
enabledFields.has("port") &&
(!patch.port || patch.port < 1 || patch.port > 65_535)
) {
toast.warning(
t("batch_port_invalid", "Port must be between 1 and 65535")
);
return;
}
const activePatch: Partial<BatchPatch> = {};
for (const key of enabledFields) {
(activePatch as any)[key] = (patch as any)[key];
}
setLoading(true);
try {
const results = await Promise.allSettled(
rows.map((row) => {
const body: API.UpdateNodeRequest = {
id: row.id,
name: row.name,
tags: row.tags,
port: row.port,
address: row.address,
server_id: row.server_id,
protocol: row.protocol,
enabled: row.enabled,
...activePatch,
} as any;
return updateNode(body);
})
);
const succeeded = results.filter((r) => r.status === "fulfilled").length;
const failed = results.filter((r) => r.status === "rejected").length;
if (failed === 0) {
toast.success(
t("batch_updated", "Updated {{count}} nodes", { count: succeeded })
);
setOpen(false);
setEnabledFields(new Set());
onSuccess();
} else if (succeeded > 0) {
toast.warning(
t("batch_partial", "{{succeeded}} updated, {{failed}} failed", {
succeeded,
failed,
})
);
onSuccess();
} else {
toast.error(t("batch_update_failed", "Batch update failed"));
}
} finally {
setLoading(false);
}
}
function handleOpen() {
setEnabledFields(new Set());
setPatch({
name: "",
enabled: true,
tags: [],
server_id: undefined,
protocol: undefined,
address: "",
port: undefined,
node_group_ids: [],
});
setOpen(true);
}
return (
<Sheet onOpenChange={setOpen} open={open}>
<SheetTrigger asChild>
<Button onClick={handleOpen} variant="outline">
{t("batch_update", "Batch Update")}
</Button>
</SheetTrigger>
<SheetContent className="w-[560px] max-w-full">
<SheetHeader>
<SheetTitle>
{t("batch_update_title", "Batch Update ({{count}} nodes)", {
count: rows.length,
})}
</SheetTitle>
</SheetHeader>
<ScrollArea className="h-[calc(100dvh-48px-36px-36px-env(safe-area-inset-top))] px-6 pt-4">
<p className="mb-4 text-muted-foreground text-sm">
{t(
"batch_update_desc",
"Check the fields you want to overwrite. Unchecked fields will keep their original values."
)}
</p>
<div className="space-y-5">
{/* name */}
<div className="flex items-start gap-3">
<Checkbox
checked={isEnabled("name")}
id="batch-name"
onCheckedChange={() => toggleField("name")}
/>
<div className="flex-1 space-y-1.5">
<Label
className={isEnabled("name") ? "" : "text-muted-foreground"}
htmlFor="batch-name"
>
{t("name", "Name")}
</Label>
<div
className={
isEnabled("name") ? "" : "pointer-events-none opacity-40"
}
>
<EnhancedInput
onValueChange={(v) =>
setPatch((p) => ({ ...p, name: String(v ?? "") }))
}
value={patch.name ?? ""}
/>
</div>
</div>
</div>
{/* enabled */}
<div className="flex items-start gap-3">
<Checkbox
checked={isEnabled("enabled")}
id="batch-enabled"
onCheckedChange={() => toggleField("enabled")}
/>
<div className="flex-1 space-y-1.5">
<Label
className={
isEnabled("enabled") ? "" : "text-muted-foreground"
}
htmlFor="batch-enabled"
>
{t("enabled", "Enabled")}
</Label>
<div
className={
isEnabled("enabled") ? "" : "pointer-events-none opacity-40"
}
>
<Switch
checked={!!patch.enabled}
onCheckedChange={(v) =>
setPatch((p) => ({ ...p, enabled: v }))
}
/>
</div>
</div>
</div>
{/* tags */}
<div className="flex items-start gap-3">
<Checkbox
checked={isEnabled("tags")}
id="batch-tags"
onCheckedChange={() => toggleField("tags")}
/>
<div className="flex-1 space-y-1.5">
<Label
className={isEnabled("tags") ? "" : "text-muted-foreground"}
htmlFor="batch-tags"
>
{t("tags", "Tags")}
</Label>
<div
className={
isEnabled("tags") ? "" : "pointer-events-none opacity-40"
}
>
<TagInput
onChange={(v) => setPatch((p) => ({ ...p, tags: v }))}
options={existingTags || []}
placeholder={t(
"tags_placeholder",
"Use Enter or comma (,) to add"
)}
value={patch.tags || []}
/>
</div>
</div>
</div>
{/* server_id */}
<div className="flex items-start gap-3">
<Checkbox
checked={isEnabled("server_id")}
id="batch-server"
onCheckedChange={() => toggleField("server_id")}
/>
<div className="flex-1 space-y-1.5">
<Label
className={
isEnabled("server_id") ? "" : "text-muted-foreground"
}
htmlFor="batch-server"
>
{t("server", "Server")}
</Label>
<div
className={
isEnabled("server_id")
? ""
: "pointer-events-none opacity-40"
}
>
<Combobox<number, false>
onChange={(v) => {
setPatch((p) => ({
...p,
server_id: v ?? undefined,
protocol: undefined,
}));
}}
options={servers.map((s) => ({
value: s.id,
label: `${s.name} (${(s.address as any) || ""})`,
}))}
placeholder={t("select_server", "Select server…")}
value={patch.server_id}
/>
</div>
</div>
</div>
{/* protocol */}
<div className="flex items-start gap-3">
<Checkbox
checked={isEnabled("protocol")}
id="batch-protocol"
onCheckedChange={() => toggleField("protocol")}
/>
<div className="flex-1 space-y-1.5">
<Label
className={
isEnabled("protocol") ? "" : "text-muted-foreground"
}
htmlFor="batch-protocol"
>
{t("protocol", "Protocol")}
</Label>
<div
className={
isEnabled("protocol")
? ""
: "pointer-events-none opacity-40"
}
>
<Combobox<string, false>
onChange={(v) =>
setPatch((p) => ({ ...p, protocol: v ?? undefined }))
}
options={availableProtocols.map((p) => ({
value: p.protocol,
label: `${p.protocol}${p.port ? ` (${p.port})` : ""}`,
}))}
placeholder={t("select_protocol", "Select protocol…")}
value={patch.protocol}
/>
</div>
</div>
</div>
{/* address */}
<div className="flex items-start gap-3">
<Checkbox
checked={isEnabled("address")}
id="batch-address"
onCheckedChange={() => toggleField("address")}
/>
<div className="flex-1 space-y-1.5">
<Label
className={
isEnabled("address") ? "" : "text-muted-foreground"
}
htmlFor="batch-address"
>
{t("address", "Address")}
</Label>
<div
className={
isEnabled("address") ? "" : "pointer-events-none opacity-40"
}
>
<EnhancedInput
onValueChange={(v) =>
setPatch((p) => ({ ...p, address: String(v ?? "") }))
}
value={patch.address ?? ""}
/>
</div>
</div>
</div>
{/* port */}
<div className="flex items-start gap-3">
<Checkbox
checked={isEnabled("port")}
id="batch-port"
onCheckedChange={() => toggleField("port")}
/>
<div className="flex-1 space-y-1.5">
<Label
className={isEnabled("port") ? "" : "text-muted-foreground"}
htmlFor="batch-port"
>
{t("port", "Port")}
</Label>
<div
className={
isEnabled("port") ? "" : "pointer-events-none opacity-40"
}
>
<EnhancedInput
max={65_535}
min={1}
onValueChange={(v) =>
setPatch((p) => ({
...p,
port: v ? Number(v) : undefined,
}))
}
placeholder="1-65535"
type="number"
value={patch.port ?? ""}
/>
</div>
</div>
</div>
{/* node_group_ids — only when group feature is enabled */}
{isGroupEnabled && (
<div className="flex items-start gap-3">
<Checkbox
checked={isEnabled("node_group_ids")}
id="batch-groups"
onCheckedChange={() => toggleField("node_group_ids")}
/>
<div className="flex-1 space-y-1.5">
<Label
className={
isEnabled("node_group_ids") ? "" : "text-muted-foreground"
}
htmlFor="batch-groups"
>
{t("nodeGroups", "Node Groups")}
</Label>
<div
className={
isEnabled("node_group_ids")
? "grid grid-cols-2 gap-2"
: "pointer-events-none grid grid-cols-2 gap-2 opacity-40"
}
>
{nodeGroupsData?.map((g) => {
const ids = patch.node_group_ids || [];
const checked = ids.includes(g.id);
return (
<div className="flex items-center space-x-2" key={g.id}>
<Checkbox
checked={checked}
id={`batch-group-${g.id}`}
onCheckedChange={(c) => {
setPatch((p) => {
const current = p.node_group_ids || [];
return {
...p,
node_group_ids: c
? [...current, g.id]
: current.filter((id) => id !== g.id),
};
});
}}
/>
<Label htmlFor={`batch-group-${g.id}`}>
{g.name}
</Label>
</div>
);
})}
</div>
</div>
</div>
)}
</div>
</ScrollArea>
<SheetFooter className="flex-row justify-end gap-2 pt-3">
<Button
disabled={loading}
onClick={() => setOpen(false)}
variant="outline"
>
{t("cancel", "Cancel")}
</Button>
<Button disabled={loading} onClick={handleSubmit}>
{t("confirm", "Confirm")}
</Button>
</SheetFooter>
</SheetContent>
</Sheet>
);
}
+134 -3
View File
@@ -1,3 +1,16 @@
import { useMutation } from "@tanstack/react-query";
import { useSearch } from "@tanstack/react-router";
import {
AlertDialog,
AlertDialogAction,
AlertDialogCancel,
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
AlertDialogTrigger,
} from "@workspace/ui/components/alert-dialog";
import { Badge } from "@workspace/ui/components/badge";
import { Button } from "@workspace/ui/components/button";
import {
@@ -15,17 +28,33 @@ import { cn } from "@workspace/ui/lib/utils";
import {
activateOrder,
getOrderList,
refundOrder,
updateOrderStatus,
} from "@workspace/ui/services/admin/order";
import { useRef } from "react";
import { useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { toast } from "sonner";
import { Display } from "@/components/display";
import { useGlobalStore } from "@/stores/global";
import { useSubscribe } from "@/stores/subscribe";
import { formatDate } from "@/utils/common";
import { UserDetail } from "../user/user-detail";
const REFUNDED_ORDER_STATUS = 6;
export default function Order() {
const { t } = useTranslation("order");
const sp = useSearch({ strict: false }) as Record<string, string | undefined>;
const user = useGlobalStore((state) => state.user);
const [confirmingOrderId, setConfirmingOrderId] = useState<number | null>(
null
);
const initialFilters = {
user_id: sp.user_id ? Number(sp.user_id) : undefined,
search: sp.search || undefined,
status: sp.status || undefined,
subscribe_id: sp.subscribe_id || undefined,
};
const statusOptions = [
{
@@ -45,6 +74,11 @@ export default function Order() {
label: t("status.5", "Completed"),
className: "bg-green-500",
},
{
value: REFUNDED_ORDER_STATUS,
label: t("status.6", "Refunded"),
className: "bg-red-500",
},
];
const typeOptions = [
@@ -57,10 +91,101 @@ export default function Order() {
const ref = useRef<ProTableActions>(null);
const { subscribes, getSubscribeName } = useSubscribe();
const canRefundOrders = Boolean(user?.is_admin);
const refundMutation = useMutation({
mutationFn: async (order: API.Order) => {
await refundOrder({ id: order.id });
},
onSuccess: () => {
toast.success(t("refundSuccess", "Refund completed."));
setConfirmingOrderId(null);
ref.current?.refresh();
},
onError: (error) => {
console.error("Refund order failed", error);
setConfirmingOrderId(null);
},
});
const isRefundedOrder = (order: API.Order) =>
order.status === REFUNDED_ORDER_STATUS ||
order.status_name === t("status.6", "Refunded") ||
order.status_name?.toLowerCase() === "refunded";
const canRefundOrder = (order: API.Order) =>
canRefundOrders && !isRefundedOrder(order);
return (
<ProTable<API.Order, any>
action={ref}
actions={{
render: (order) => {
if (!canRefundOrder(order)) return [];
const isPending =
refundMutation.isPending && confirmingOrderId === order.id;
return [
<AlertDialog
key={`refund-${order.id}`}
onOpenChange={(open) => {
setConfirmingOrderId(open ? order.id : null);
}}
open={confirmingOrderId === order.id}
>
<AlertDialogTrigger asChild>
<Button disabled={isPending} size="sm" variant="destructive">
{isPending
? t("refundSubmitting", "Refunding...")
: t("refund", "Refund")}
</Button>
</AlertDialogTrigger>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>
{t("refundConfirmTitle", "Confirm refund")}
</AlertDialogTitle>
<AlertDialogDescription asChild>
<div className="space-y-2">
<p>
{t(
"refundConfirmDescription",
"This refund will immediately invalidate the user's subscription and deduct the related agent commission."
)}
</p>
<p className="font-medium text-foreground">
{t(
"refundConfirmWarning",
"This action cannot be repeated after the order is refunded."
)}
</p>
</div>
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel disabled={isPending}>
{t("cancel", "Cancel")}
</AlertDialogCancel>
<AlertDialogAction
className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
disabled={isPending}
onClick={async (event) => {
event.preventDefault();
if (isPending) return;
await refundMutation.mutateAsync(order);
}}
>
{isPending
? t("refundSubmitting", "Refunding...")
: t("confirmRefund", "Confirm refund")}
</AlertDialogAction>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>,
];
},
}}
columns={[
{
accessorKey: "order_no",
@@ -245,13 +370,19 @@ export default function Order() {
);
}
return (
<Badge>
{option?.label || t(`status.${row.getValue("status")}`)}
<Badge
variant={isRefundedOrder(order) ? "destructive" : "default"}
>
{option?.label ||
(order.status_name
? t(`status.${row.getValue("status")}`, order.status_name)
: t(`status.${row.getValue("status")}`))}
</Badge>
);
},
},
]}
initialFilters={initialFilters}
params={[
{
key: "status",
@@ -115,6 +115,7 @@ export default function SubscribeForm<T extends Record<string, any>>({
z.object({
quantity: z.number(),
discount: z.number(),
map_apple: z.string().optional(),
})
)
.optional(),
@@ -813,6 +814,11 @@ export default function SubscribeForm<T extends Record<string, any>>({
value
).toString(),
},
{
name: "map_apple",
type: "text",
placeholder: t("form.appleProductId"),
},
]}
onChange={(
newValues: (API.SubscribeDiscount & {
@@ -0,0 +1,155 @@
/**
* @vitest-environment jsdom
*/
import { cleanup, render, screen, waitFor } from "@testing-library/react";
import { getPromoRuleList } from "@workspace/ui/services/admin/promo";
import type { AxiosResponse } from "axios";
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
import PromoPage from ".";
vi.mock("react-i18next", () => ({
useTranslation: () => ({
t: (_key: string, fallback: string): string => fallback,
}),
}));
vi.mock("@/stores/subscribe", () => ({
useSubscribe: () => ({
subscribes: [
{
id: 8,
name: "Monthly Plan",
unit_price: 1200,
sold: 0,
},
],
getSubscribeName: (id?: number) => (id === 8 ? "Monthly Plan" : "--"),
}),
}));
vi.mock("@/utils/common", () => ({
formatDate: (timestamp: number) => `date-${timestamp}`,
}));
vi.mock("@workspace/ui/services/admin/promo", () => ({
createPromoPrice: vi.fn(),
createPromoRule: vi.fn(),
deletePromoPrice: vi.fn(),
deletePromoRule: vi.fn(),
getPromoPriceList: vi.fn(),
getPromoRuleList: vi.fn(),
getPromoUsageList: vi.fn(),
updatePromoRule: vi.fn(),
}));
const mockedGetPromoRuleList = vi.mocked(getPromoRuleList);
function createRuleListResponse(
data: API.GetPromoRuleListResponse
): AxiosResponse<API.Response & { data?: API.GetPromoRuleListResponse }> {
return {
data: {
code: 200,
data,
},
status: 200,
statusText: "OK",
headers: {},
config: {
headers: {} as AxiosResponse["config"]["headers"],
},
};
}
beforeEach(() => {
localStorage.setItem("timezone", "UTC");
});
afterEach(() => {
cleanup();
vi.clearAllMocks();
});
describe("PromoPage", () => {
it("renders promo rules with type, priority, status, and validity period", async () => {
mockedGetPromoRuleList.mockResolvedValue(
createRuleListResponse({
total: 1,
list: [
{
id: 1,
name: "Return User Price",
type: "inactive_user",
params: { inactive_months: 3 },
priority: 5,
enabled: true,
start_time: 1_716_800_000,
end_time: 1_716_900_000,
},
],
})
);
render(<PromoPage />);
await waitFor(() =>
expect(mockedGetPromoRuleList).toHaveBeenCalledWith({
page: 1,
size: 200,
search: undefined,
type: undefined,
enabled: undefined,
})
);
expect(await screen.findByText("Return User Price")).not.toBeNull();
expect(screen.getByText("inactive_user")).not.toBeNull();
expect(screen.getByText("5")).not.toBeNull();
expect(screen.getByText("date-1716800000")).not.toBeNull();
expect(screen.getByText("date-1716900000")).not.toBeNull();
});
it("shows the empty state when there are no promo rules", async () => {
mockedGetPromoRuleList.mockResolvedValue(
createRuleListResponse({
total: 0,
list: [],
})
);
render(<PromoPage />);
expect(await screen.findByText("No promo rules")).not.toBeNull();
});
it("shows a loading state while promo rules are being fetched", () => {
let resolveRequest:
| ((
value: AxiosResponse<
API.Response & { data?: API.GetPromoRuleListResponse }
>
) => void)
| undefined;
mockedGetPromoRuleList.mockReturnValue(
new Promise((resolve) => {
resolveRequest = resolve;
})
);
render(<PromoPage />);
expect(screen.getByRole("status", { name: "Loading data" })).not.toBeNull();
expect(resolveRequest).toBeTypeOf("function");
});
it("shows an error state when promo rules fail to load", async () => {
mockedGetPromoRuleList.mockRejectedValue(new Error("network failed"));
render(<PromoPage />);
await waitFor(() => expect(mockedGetPromoRuleList).toHaveBeenCalled());
expect(
await screen.findByText("Failed to load promo rules")
).not.toBeNull();
expect(screen.queryByText("No promo rules")).toBeNull();
});
});
+493
View File
@@ -0,0 +1,493 @@
import {
Alert,
AlertDescription,
AlertTitle,
} from "@workspace/ui/components/alert";
import { Badge } from "@workspace/ui/components/badge";
import { Button } from "@workspace/ui/components/button";
import { Switch } from "@workspace/ui/components/switch";
import {
Tabs,
TabsContent,
TabsList,
TabsTrigger,
} from "@workspace/ui/components/tabs";
import { ConfirmButton } from "@workspace/ui/composed/confirm-button";
import Empty from "@workspace/ui/composed/empty";
import {
ProTable,
type ProTableActions,
} from "@workspace/ui/composed/pro-table/pro-table";
import {
createPromoPrice,
createPromoRule,
deletePromoPrice,
deletePromoRule,
getPromoPriceList,
getPromoRuleList,
getPromoUsageList,
updatePromoRule,
} from "@workspace/ui/services/admin/promo";
import { CircleAlert } from "lucide-react";
import { useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { toast } from "sonner";
import { useSubscribe } from "@/stores/subscribe";
import { formatDate } from "@/utils/common";
import PriceForm from "./price-form";
import RuleDetail from "./rule-detail";
import RuleForm from "./rule-form";
import { formatCurrency, parseOptionalNumber, promoRuleTypes } from "./utils";
type RuleFilters = {
search?: string;
type?: API.PromoRuleType;
enabled?: string;
};
type PriceFilters = {
rule_id?: string;
subscribe_id?: string;
};
type UsageFilters = PriceFilters & {
user_id?: string;
order_no?: string;
};
function ErrorState({
title,
description,
}: {
title: string;
description: string;
}) {
return (
<Alert className="mx-auto max-w-md" variant="destructive">
<CircleAlert aria-hidden="true" />
<AlertTitle>{title}</AlertTitle>
<AlertDescription>{description}</AlertDescription>
</Alert>
);
}
export default function PromoPage() {
const { t } = useTranslation("promo");
const { subscribes, getSubscribeName } = useSubscribe();
const [loading, setLoading] = useState(false);
const [rules, setRules] = useState<API.PromoRule[]>([]);
const [detailRule, setDetailRule] = useState<API.PromoRule>();
const [detailOpen, setDetailOpen] = useState(false);
const ruleRef = useRef<ProTableActions>(null);
const priceRef = useRef<ProTableActions>(null);
const usageRef = useRef<ProTableActions>(null);
return (
<>
<Tabs className="space-y-4" defaultValue="rules">
<TabsList className="grid w-full grid-cols-3 md:w-fit">
<TabsTrigger value="rules">{t("rules", "Rules")}</TabsTrigger>
<TabsTrigger value="prices">{t("prices", "Prices")}</TabsTrigger>
<TabsTrigger value="usage">{t("usage", "Usage")}</TabsTrigger>
</TabsList>
<TabsContent value="rules">
<ProTable<API.PromoRule, RuleFilters>
action={ruleRef}
actions={{
render: (row) => [
<Button
key="detail"
onClick={() => {
setDetailRule(row);
setDetailOpen(true);
}}
size="sm"
variant="outline"
>
{t("detail", "Detail")}
</Button>,
<RuleForm
initialValues={row}
key="edit"
loading={loading}
onSubmit={async (values) => {
setLoading(true);
try {
await updatePromoRule({ id: row.id }, values);
toast.success(t("updateSuccess", "Update Success"));
ruleRef.current?.refresh();
setLoading(false);
return true;
} catch (_error) {
setLoading(false);
return false;
}
}}
title={t("editRule", "Edit Rule")}
trigger={t("edit", "Edit")}
/>,
<ConfirmButton
cancelText={t("cancel", "Cancel")}
confirmText={t("confirm", "Confirm")}
description={t(
"deleteWarning",
"Once deleted, data cannot be recovered. Please proceed with caution."
)}
key="delete"
onConfirm={async () => {
await deletePromoRule({ id: row.id });
toast.success(t("deleteSuccess", "Delete Success"));
ruleRef.current?.refresh();
}}
title={t("confirmDelete", "Are you sure you want to delete?")}
trigger={
<Button size="sm" variant="destructive">
{t("delete", "Delete")}
</Button>
}
/>,
],
}}
columns={[
{
accessorKey: "name",
header: t("name", "Name"),
},
{
accessorKey: "type",
header: t("type", "Type"),
cell: ({ row }) => (
<Badge variant="outline">
{t(`types.${row.original.type}`, row.original.type)}
</Badge>
),
},
{
accessorKey: "priority",
header: t("priority", "Priority"),
},
{
accessorKey: "enabled",
header: t("enabled", "Enabled"),
cell: ({ row }) => (
<Switch
defaultChecked={row.original.enabled}
onCheckedChange={async (checked) => {
await updatePromoRule(
{ id: row.original.id },
{ ...row.original, enabled: checked }
);
toast.success(t("updateSuccess", "Update Success"));
ruleRef.current?.refresh();
}}
/>
),
},
{
accessorKey: "start_time",
header: t("startTime", "Start Time"),
cell: ({ row }) =>
row.original.start_time
? formatDate(row.original.start_time)
: "--",
},
{
accessorKey: "end_time",
header: t("endTime", "End Time"),
cell: ({ row }) =>
row.original.end_time
? formatDate(row.original.end_time)
: "--",
},
]}
empty={<Empty description={t("emptyRules", "No promo rules")} />}
error={
<ErrorState
description={t(
"loadErrorDescription",
"Refresh the table or try again later."
)}
title={t("loadRulesError", "Failed to load promo rules")}
/>
}
header={{
toolbar: (
<RuleForm
loading={loading}
onSubmit={async (values) => {
setLoading(true);
try {
await createPromoRule(values);
toast.success(t("createSuccess", "Create Success"));
ruleRef.current?.refresh();
setLoading(false);
return true;
} catch (_error) {
setLoading(false);
return false;
}
}}
title={t("createRule", "Create Rule")}
trigger={t("createRule", "Create Rule")}
/>
),
}}
params={[
{ key: "search", placeholder: t("searchRule", "Rule name") },
{
key: "type",
placeholder: t("type", "Type"),
options: promoRuleTypes.map((type) => ({
label: t(`types.${type}`, type),
value: type,
})),
},
{
key: "enabled",
placeholder: t("enabled", "Enabled"),
options: [
{ label: t("yes", "Yes"), value: "true" },
{ label: t("no", "No"), value: "false" },
],
},
]}
request={async (pagination, filters) => {
const { data } = await getPromoRuleList({
...pagination,
search: filters.search?.trim() || undefined,
type: filters.type,
enabled:
filters.enabled === undefined || filters.enabled === ""
? undefined
: filters.enabled === "true",
});
const list = data.data?.list || [];
setRules(list);
return {
list,
total: data.data?.total || 0,
};
}}
/>
</TabsContent>
<TabsContent value="prices">
<ProTable<API.PromoPrice, PriceFilters>
action={priceRef}
actions={{
render: (row) => [
<ConfirmButton
cancelText={t("cancel", "Cancel")}
confirmText={t("confirm", "Confirm")}
description={t(
"deleteWarning",
"Once deleted, data cannot be recovered. Please proceed with caution."
)}
key="delete"
onConfirm={async () => {
await deletePromoPrice({ id: row.id });
toast.success(t("deleteSuccess", "Delete Success"));
priceRef.current?.refresh();
}}
title={t("confirmDelete", "Are you sure you want to delete?")}
trigger={
<Button size="sm" variant="destructive">
{t("delete", "Delete")}
</Button>
}
/>,
],
}}
columns={[
{
accessorKey: "rule_id",
header: t("rule", "Rule"),
cell: ({ row }) =>
row.original.rule_id
? rules.find((rule) => rule.id === row.original.rule_id)
?.name || `#${row.original.rule_id}`
: "--",
},
{
accessorKey: "subscribe_id",
header: t("subscribe", "Subscribe"),
cell: ({ row }) =>
row.original.subscribe_name ||
getSubscribeName(row.original.subscribe_id),
},
{
accessorKey: "unit_price",
header: t("unitPrice", "Unit Price"),
cell: ({ row }) => formatCurrency(row.original.unit_price),
},
{
accessorKey: "promo_price",
header: t("promoPrice", "Promo Price"),
cell: ({ row }) => formatCurrency(row.original.promo_price),
},
]}
empty={<Empty description={t("emptyPrices", "No promo prices")} />}
error={
<ErrorState
description={t(
"loadErrorDescription",
"Refresh the table or try again later."
)}
title={t("loadPricesError", "Failed to load promo prices")}
/>
}
header={{
toolbar: (
<PriceForm
loading={loading}
onSubmit={async (values) => {
setLoading(true);
try {
await createPromoPrice(values);
toast.success(t("createSuccess", "Create Success"));
priceRef.current?.refresh();
setLoading(false);
return true;
} catch (_error) {
setLoading(false);
return false;
}
}}
rules={rules}
subscribes={subscribes}
/>
),
}}
params={[
{
key: "rule_id",
placeholder: t("rule", "Rule"),
options: rules.map((rule) => ({
label: rule.name,
value: String(rule.id),
})),
},
{
key: "subscribe_id",
placeholder: t("subscribe", "Subscribe"),
options: subscribes
.filter((item) => typeof item.id === "number")
.map((item) => ({
label: item.name || `#${item.id}`,
value: String(item.id),
})),
},
]}
request={async (pagination, filters) => {
const { data } = await getPromoPriceList({
...pagination,
rule_id: parseOptionalNumber(filters.rule_id),
subscribe_id: parseOptionalNumber(filters.subscribe_id),
});
return {
list: data.data?.list || [],
total: data.data?.total || 0,
};
}}
/>
</TabsContent>
<TabsContent value="usage">
<ProTable<API.PromoUsage, UsageFilters>
action={usageRef}
columns={[
{
accessorKey: "rule_id",
header: t("rule", "Rule"),
cell: ({ row }) =>
row.original.rule_name ||
rules.find((rule) => rule.id === row.original.rule_id)
?.name ||
`#${row.original.rule_id}`,
},
{
accessorKey: "user_id",
header: t("userId", "User ID"),
cell: ({ row }) => `#${row.original.user_id}`,
},
{
accessorKey: "subscribe_id",
header: t("subscribe", "Subscribe"),
cell: ({ row }) =>
row.original.subscribe_name ||
getSubscribeName(row.original.subscribe_id),
},
{
accessorKey: "order_no",
header: t("orderNo", "Order No."),
},
{
accessorKey: "promo_price",
header: t("promoPrice", "Promo Price"),
cell: ({ row }) => formatCurrency(row.original.promo_price),
},
{
accessorKey: "used_at",
header: t("usedAt", "Used At"),
cell: ({ row }) => formatDate(row.original.used_at),
},
]}
empty={
<Empty description={t("emptyUsage", "No promo usage records")} />
}
error={
<ErrorState
description={t(
"loadErrorDescription",
"Refresh the table or try again later."
)}
title={t("loadUsageError", "Failed to load promo usage")}
/>
}
params={[
{
key: "rule_id",
placeholder: t("rule", "Rule"),
options: rules.map((rule) => ({
label: rule.name,
value: String(rule.id),
})),
},
{
key: "subscribe_id",
placeholder: t("subscribe", "Subscribe"),
options: subscribes
.filter((item) => typeof item.id === "number")
.map((item) => ({
label: item.name || `#${item.id}`,
value: String(item.id),
})),
},
{ key: "user_id", placeholder: t("userId", "User ID") },
{ key: "order_no", placeholder: t("orderNo", "Order No.") },
]}
request={async (pagination, filters) => {
const { data } = await getPromoUsageList({
...pagination,
rule_id: parseOptionalNumber(filters.rule_id),
subscribe_id: parseOptionalNumber(filters.subscribe_id),
user_id: parseOptionalNumber(filters.user_id),
order_no: filters.order_no?.trim() || undefined,
});
return {
list: data.data?.list || [],
total: data.data?.total || 0,
};
}}
/>
</TabsContent>
</Tabs>
<RuleDetail
onOpenChange={setDetailOpen}
open={detailOpen}
rule={detailRule}
/>
</>
);
}
@@ -0,0 +1,188 @@
import { zodResolver } from "@hookform/resolvers/zod";
import { Button } from "@workspace/ui/components/button";
import {
Form,
FormControl,
FormField,
FormItem,
FormLabel,
FormMessage,
} from "@workspace/ui/components/form";
import {
Sheet,
SheetContent,
SheetFooter,
SheetHeader,
SheetTitle,
SheetTrigger,
} from "@workspace/ui/components/sheet";
import { Combobox } from "@workspace/ui/composed/combobox";
import { EnhancedInput } from "@workspace/ui/composed/enhanced-input";
import { unitConversion } from "@workspace/ui/utils/unit-conversions";
import { useState } from "react";
import { useForm } from "react-hook-form";
import { useTranslation } from "react-i18next";
import { z } from "zod";
import { getSubscribeUnitPrice } from "./utils";
const priceSchema = z.object({
rule_id: z.number().min(1),
subscribe_id: z.number().min(1),
promo_price: z.number().min(1),
});
type PriceFormValues = z.infer<typeof priceSchema>;
interface PriceFormProps {
loading?: boolean;
rules: API.PromoRule[];
subscribes: API.SubscribeItem[];
onSubmit: (data: API.CreatePromoPriceRequest) => Promise<boolean> | boolean;
}
export default function PriceForm({
loading,
rules,
subscribes,
onSubmit,
}: PriceFormProps) {
const { t } = useTranslation("promo");
const [open, setOpen] = useState(false);
const form = useForm<PriceFormValues>({
resolver: zodResolver(priceSchema),
defaultValues: {
rule_id: 0,
subscribe_id: 0,
promo_price: 0,
},
});
const subscribeId = form.watch("subscribe_id");
const subscribe = subscribes.find((item) => item.id === subscribeId);
const unitPrice = getSubscribeUnitPrice(subscribe);
async function handleSubmit(values: PriceFormValues) {
if (unitPrice > 0 && values.promo_price >= unitPrice) {
form.setError("promo_price", {
message: t(
"form.promoPriceLessThanUnitPrice",
"Promo price must be lower than unit price"
),
});
return;
}
const success = await onSubmit(values);
if (success) setOpen(false);
}
return (
<Sheet onOpenChange={setOpen} open={open}>
<SheetTrigger asChild>
<Button
onClick={() => {
form.reset({ rule_id: 0, subscribe_id: 0, promo_price: 0 });
setOpen(true);
}}
size="sm"
>
{t("createPrice", "Create Promo Price")}
</Button>
</SheetTrigger>
<SheetContent className="w-[520px] max-w-full md:max-w-screen-md">
<SheetHeader>
<SheetTitle>{t("createPrice", "Create Promo Price")}</SheetTitle>
</SheetHeader>
<Form {...form}>
<form
className="space-y-4 px-6 pt-4"
id="promo-price-form"
onSubmit={form.handleSubmit(handleSubmit)}
>
<FormField
control={form.control}
name="rule_id"
render={({ field }) => (
<FormItem>
<FormLabel>{t("rule", "Rule")}</FormLabel>
<FormControl>
<Combobox<number>
onChange={field.onChange}
options={rules.map((rule) => ({
label: rule.name,
value: rule.id,
}))}
placeholder={t("form.selectRule", "Select rule")}
value={field.value}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="subscribe_id"
render={({ field }) => (
<FormItem>
<FormLabel>{t("subscribe", "Subscribe")}</FormLabel>
<FormControl>
<Combobox<number>
onChange={field.onChange}
options={subscribes
.filter((item) => typeof item.id === "number")
.map((item) => ({
label: item.name || `#${item.id}`,
value: item.id as number,
}))}
placeholder={t(
"form.selectSubscribe",
"Select subscribe"
)}
value={field.value}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="promo_price"
render={({ field }) => (
<FormItem>
<FormLabel>{t("promoPrice", "Promo Price")}</FormLabel>
<FormControl>
<EnhancedInput
formatInput={(value) =>
unitConversion("centsToDollars", value)
}
formatOutput={(value) =>
unitConversion("dollarsToCents", value)
}
min={0.01}
onValueChange={(value) => field.onChange(value)}
placeholder={t("form.enterPromoPrice", "Enter price")}
type="number"
value={field.value}
/>
</FormControl>
{unitPrice > 0 && (
<p className="text-muted-foreground text-xs">
{t("unitPriceHint", "Unit price")}:{" "}
{unitConversion("centsToDollars", unitPrice)}
</p>
)}
<FormMessage />
</FormItem>
)}
/>
</form>
</Form>
<SheetFooter>
<Button disabled={loading} form="promo-price-form" type="submit">
{t("confirm", "Confirm")}
</Button>
</SheetFooter>
</SheetContent>
</Sheet>
);
}
@@ -0,0 +1,84 @@
import { Badge } from "@workspace/ui/components/badge";
import {
Sheet,
SheetContent,
SheetHeader,
SheetTitle,
} from "@workspace/ui/components/sheet";
import {
Table,
TableBody,
TableCell,
TableRow,
} from "@workspace/ui/components/table";
import { useTranslation } from "react-i18next";
import { formatDate } from "@/utils/common";
interface RuleDetailProps {
open: boolean;
rule?: API.PromoRule;
onOpenChange: (open: boolean) => void;
}
export default function RuleDetail({
open,
rule,
onOpenChange,
}: RuleDetailProps) {
const { t } = useTranslation("promo");
return (
<Sheet onOpenChange={onOpenChange} open={open}>
<SheetContent className="w-[520px] max-w-full md:max-w-screen-md">
<SheetHeader>
<SheetTitle>
{rule?.name || t("ruleDetail", "Rule Detail")}
</SheetTitle>
</SheetHeader>
{rule && (
<div className="px-6 pt-4">
<Table>
<TableBody>
<TableRow>
<TableCell>{t("type", "Type")}</TableCell>
<TableCell>
<Badge variant="outline">
{t(`types.${rule.type}`, rule.type)}
</Badge>
</TableCell>
</TableRow>
<TableRow>
<TableCell>{t("priority", "Priority")}</TableCell>
<TableCell>{rule.priority}</TableCell>
</TableRow>
<TableRow>
<TableCell>{t("enabled", "Enabled")}</TableCell>
<TableCell>
{rule.enabled ? t("yes", "Yes") : t("no", "No")}
</TableCell>
</TableRow>
<TableRow>
<TableCell>{t("params", "Params")}</TableCell>
<TableCell>
<code className="whitespace-pre-wrap rounded bg-muted px-2 py-1 text-xs">
{JSON.stringify(rule.params || {}, null, 2)}
</code>
</TableCell>
</TableRow>
<TableRow>
<TableCell>
{t("validityPeriod", "Validity Period")}
</TableCell>
<TableCell>
{rule.start_time ? formatDate(rule.start_time) : "--"} -{" "}
{rule.end_time ? formatDate(rule.end_time) : "--"}
</TableCell>
</TableRow>
</TableBody>
</Table>
</div>
)}
</SheetContent>
</Sheet>
);
}
+353
View File
@@ -0,0 +1,353 @@
import { zodResolver } from "@hookform/resolvers/zod";
import { Button } from "@workspace/ui/components/button";
import {
Form,
FormControl,
FormField,
FormItem,
FormLabel,
FormMessage,
} from "@workspace/ui/components/form";
import {
RadioGroup,
RadioGroupItem,
} from "@workspace/ui/components/radio-group";
import { ScrollArea } from "@workspace/ui/components/scroll-area";
import {
Sheet,
SheetContent,
SheetFooter,
SheetHeader,
SheetTitle,
SheetTrigger,
} from "@workspace/ui/components/sheet";
import { Switch } from "@workspace/ui/components/switch";
import { DatePicker } from "@workspace/ui/composed/date-picker";
import { EnhancedInput } from "@workspace/ui/composed/enhanced-input";
import { useEffect, useState } from "react";
import { useForm } from "react-hook-form";
import { useTranslation } from "react-i18next";
import { z } from "zod";
import { promoRuleTypes } from "./utils";
const ruleSchema = z
.object({
name: z.string().min(1),
type: z.enum(["new_user", "inactive_user", "campaign"]),
inactive_months: z.number().optional(),
window_hours: z.number().optional(),
priority: z.number().min(0),
enabled: z.boolean(),
start_time: z.number().optional(),
end_time: z.number().optional(),
})
.superRefine((data, ctx) => {
if (
data.start_time !== undefined &&
data.end_time !== undefined &&
data.start_time >= data.end_time
) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
message: "End time must be later than start time",
path: ["end_time"],
});
}
if (
data.type === "inactive_user" &&
(!data.inactive_months || data.inactive_months <= 0)
) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
message: "Inactive months must be greater than 0",
path: ["inactive_months"],
});
}
if (
data.type === "new_user" &&
(!data.window_hours || data.window_hours <= 0)
) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
message: "Window hours must be greater than 0",
path: ["window_hours"],
});
}
});
type RuleFormValues = z.infer<typeof ruleSchema>;
interface RuleFormProps {
initialValues?: API.PromoRule;
loading?: boolean;
onSubmit: (data: API.CreatePromoRuleRequest) => Promise<boolean> | boolean;
title: string;
trigger: string;
}
function toFormValues(rule?: API.PromoRule): RuleFormValues {
return {
name: rule?.name ?? "",
type: rule?.type ?? "inactive_user",
inactive_months: rule?.params?.inactive_months,
window_hours: rule?.params?.window_hours,
priority: rule?.priority ?? 0,
enabled: rule?.enabled ?? false,
start_time: rule?.start_time,
end_time: rule?.end_time,
};
}
function toRequest(values: RuleFormValues): API.CreatePromoRuleRequest {
const params: API.PromoRuleParams =
values.type === "inactive_user"
? { inactive_months: values.inactive_months }
: values.type === "new_user"
? { window_hours: values.window_hours }
: {};
return {
name: values.name.trim(),
type: values.type,
params,
priority: values.priority,
enabled: values.enabled,
start_time: values.start_time || undefined,
end_time: values.end_time || undefined,
};
}
export default function RuleForm({
initialValues,
loading,
onSubmit,
title,
trigger,
}: RuleFormProps) {
const { t } = useTranslation("promo");
const [open, setOpen] = useState(false);
const form = useForm<RuleFormValues>({
resolver: zodResolver(ruleSchema),
defaultValues: toFormValues(initialValues),
});
const type = form.watch("type");
useEffect(() => {
form.reset(toFormValues(initialValues));
}, [form, initialValues]);
async function handleSubmit(values: RuleFormValues) {
const success = await onSubmit(toRequest(values));
if (success) setOpen(false);
}
return (
<Sheet onOpenChange={setOpen} open={open}>
<SheetTrigger asChild>
<Button
onClick={() => {
form.reset(toFormValues(initialValues));
setOpen(true);
}}
size="sm"
>
{trigger}
</Button>
</SheetTrigger>
<SheetContent className="w-[520px] max-w-full md:max-w-screen-md">
<SheetHeader>
<SheetTitle>{title}</SheetTitle>
</SheetHeader>
<ScrollArea className="h-[calc(100vh-48px-36px-36px-env(safe-area-inset-top))]">
<Form {...form}>
<form
className="space-y-4 px-6 pt-4"
id="promo-rule-form"
onSubmit={form.handleSubmit(handleSubmit)}
>
<FormField
control={form.control}
name="name"
render={({ field }) => (
<FormItem>
<FormLabel>{t("form.name", "Name")}</FormLabel>
<FormControl>
<EnhancedInput
onValueChange={(value) => field.onChange(value)}
placeholder={t("form.namePlaceholder", "Rule name")}
value={field.value}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="type"
render={({ field }) => (
<FormItem>
<FormLabel>{t("form.type", "Rule Type")}</FormLabel>
<FormControl>
<RadioGroup
className="grid gap-2 sm:grid-cols-3"
onValueChange={(value) =>
field.onChange(value as API.PromoRuleType)
}
value={field.value}
>
{promoRuleTypes.map((item) => (
<FormItem
className="flex items-center space-x-2 space-y-0"
key={item}
>
<FormControl>
<RadioGroupItem value={item} />
</FormControl>
<FormLabel className="font-normal">
{t(`types.${item}`, item)}
</FormLabel>
</FormItem>
))}
</RadioGroup>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
{type === "inactive_user" && (
<FormField
control={form.control}
name="inactive_months"
render={({ field }) => (
<FormItem>
<FormLabel>
{t("form.inactiveMonths", "Inactive Months")}
</FormLabel>
<FormControl>
<EnhancedInput
min={1}
onValueChange={(value) => field.onChange(value)}
placeholder={t(
"form.inactiveMonthsPlaceholder",
"Months without purchase"
)}
type="number"
value={field.value}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
)}
{type === "new_user" && (
<FormField
control={form.control}
name="window_hours"
render={({ field }) => (
<FormItem>
<FormLabel>
{t("form.windowHours", "Window Hours")}
</FormLabel>
<FormControl>
<EnhancedInput
min={1}
onValueChange={(value) => field.onChange(value)}
placeholder={t(
"form.windowHoursPlaceholder",
"Hours after registration"
)}
type="number"
value={field.value}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
)}
<FormField
control={form.control}
name="priority"
render={({ field }) => (
<FormItem>
<FormLabel>{t("priority", "Priority")}</FormLabel>
<FormControl>
<EnhancedInput
min={0}
onValueChange={(value) => field.onChange(value)}
placeholder="0"
type="number"
value={field.value}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<div className="grid gap-4 sm:grid-cols-2">
<FormField
control={form.control}
name="start_time"
render={({ field }) => (
<FormItem>
<FormLabel>{t("startTime", "Start Time")}</FormLabel>
<FormControl>
<DatePicker
onChange={(value) => field.onChange(value)}
placeholder={t("form.selectStartTime", "Select time")}
value={field.value}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="end_time"
render={({ field }) => (
<FormItem>
<FormLabel>{t("endTime", "End Time")}</FormLabel>
<FormControl>
<DatePicker
onChange={(value) => field.onChange(value)}
placeholder={t("form.selectEndTime", "Select time")}
value={field.value}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
</div>
<FormField
control={form.control}
name="enabled"
render={({ field }) => (
<FormItem className="flex items-center justify-between rounded-md border p-3">
<div>
<FormLabel>{t("enabled", "Enabled")}</FormLabel>
</div>
<FormControl>
<Switch
checked={field.value}
onCheckedChange={field.onChange}
/>
</FormControl>
</FormItem>
)}
/>
</form>
</Form>
</ScrollArea>
<SheetFooter>
<Button disabled={loading} form="promo-rule-form" type="submit">
{t("confirm", "Confirm")}
</Button>
</SheetFooter>
</SheetContent>
</Sheet>
);
}
+22
View File
@@ -0,0 +1,22 @@
import { unitConversion } from "@workspace/ui/utils/unit-conversions";
export const promoRuleTypes: API.PromoRuleType[] = [
"inactive_user",
"new_user",
"campaign",
];
export function formatCurrency(value?: number) {
if (typeof value !== "number") return "--";
return `$${unitConversion("centsToDollars", value)}`;
}
export function parseOptionalNumber(value?: string) {
if (!value) return;
const parsed = Number(value);
return Number.isFinite(parsed) ? parsed : undefined;
}
export function getSubscribeUnitPrice(subscribe?: API.SubscribeItem) {
return typeof subscribe?.unit_price === "number" ? subscribe.unit_price : 0;
}
@@ -22,6 +22,7 @@ import { useNode } from "@/stores/node";
import { useServer } from "@/stores/server";
import DynamicMultiplier from "./dynamic-multiplier";
import OnlineUsersCell from "./online-users-cell";
import ServerBatchSheet from "./server-batch-sheet";
import ServerConfig from "./server-config";
import ServerForm from "./server-form";
import ServerInstall from "./server-install";
@@ -184,6 +185,14 @@ export default function Servers() {
isServerReferencedByNodes(row.id)
);
return [
<ServerBatchSheet
key="batch-update"
onSuccess={() => {
ref.current?.refresh();
fetchServers();
}}
rows={rows}
/>,
<ConfirmButton
cancelText={t("cancel", "Cancel")}
confirmText={t("confirm", "Confirm")}
@@ -0,0 +1,461 @@
"use client";
import { zodResolver } from "@hookform/resolvers/zod";
import {
Accordion,
AccordionContent,
AccordionItem,
AccordionTrigger,
} from "@workspace/ui/components/accordion";
import { Badge } from "@workspace/ui/components/badge";
import { Button } from "@workspace/ui/components/button";
import { Checkbox } from "@workspace/ui/components/checkbox";
import { Form } from "@workspace/ui/components/form";
import { Label } from "@workspace/ui/components/label";
import { ScrollArea } from "@workspace/ui/components/scroll-area";
import {
Sheet,
SheetContent,
SheetFooter,
SheetHeader,
SheetTitle,
SheetTrigger,
} from "@workspace/ui/components/sheet";
import { Switch } from "@workspace/ui/components/switch";
import { EnhancedInput } from "@workspace/ui/composed/enhanced-input";
import { cn } from "@workspace/ui/lib/utils";
import { updateServer } from "@workspace/ui/services/admin/server";
import { useState } from "react";
import { useForm, useWatch } from "react-hook-form";
import { useTranslation } from "react-i18next";
import { toast } from "sonner";
import {
formSchema,
getProtocolDefaultConfig,
protocols as PROTOCOLS,
useProtocolFields,
} from "./form-schema";
import { renderGroupCard } from "./server-form";
type SimpleFieldKey = "name" | "country" | "city" | "address";
type FieldKey = SimpleFieldKey | "protocols";
interface SimplePatch {
name: string;
country: string;
city: string;
address: string;
}
export default function ServerBatchSheet({
rows,
onSuccess,
}: {
rows: API.Server[];
onSuccess: () => void;
}) {
const { t } = useTranslation("servers");
const [open, setOpen] = useState(false);
const [loading, setLoading] = useState(false);
const [accordionValue, setAccordionValue] = useState<string>();
const [enabledFields, setEnabledFields] = useState<Set<FieldKey>>(new Set());
const [patch, setPatch] = useState<SimplePatch>({
name: "",
country: "",
city: "",
address: "",
});
const PROTOCOL_FIELDS = useProtocolFields();
const protocolForm = useForm({
resolver: zodResolver(formSchema),
defaultValues: {
name: "",
address: "",
country: "",
city: "",
protocols: PROTOCOLS.map((type) => getProtocolDefaultConfig(type)),
},
});
const protocolsValues = useWatch({
control: protocolForm.control,
name: "protocols",
});
function toggleField(key: FieldKey) {
setEnabledFields((prev) => {
const next = new Set(prev);
if (next.has(key)) next.delete(key);
else next.add(key);
return next;
});
}
function isEnabled(key: FieldKey) {
return enabledFields.has(key);
}
async function handleSubmit() {
if (rows.length === 0) return;
if (enabledFields.size === 0) {
toast.warning(
t(
"batch_no_fields_selected",
"Please select at least one field to update"
)
);
return;
}
// Validate enabled simple fields
if (enabledFields.has("name") && !patch.name.trim()) {
toast.warning(t("batch_name_required", "Name cannot be empty"));
return;
}
if (enabledFields.has("address") && !patch.address.trim()) {
toast.warning(t("batch_address_required", "Address cannot be empty"));
return;
}
const activePatch: Record<string, any> = {};
for (const key of enabledFields) {
if (key === "protocols") {
const formValues = protocolForm.getValues();
const filteredProtocols = (formValues.protocols || []).filter(
(p: any) => {
const port = Number(p?.port);
return p && Number.isFinite(port) && port > 0 && port <= 65_535;
}
);
activePatch.protocols = filteredProtocols;
} else {
activePatch[key] = patch[key];
}
}
setLoading(true);
try {
const results = await Promise.allSettled(
rows.map((row) => {
const body: API.UpdateServerRequest = {
id: row.id,
name: row.name,
country: row.country as string | undefined,
city: row.city as string | undefined,
address: row.address,
sort: row.sort,
protocols: row.protocols,
...activePatch,
};
return updateServer(body);
})
);
const succeeded = results.filter((r) => r.status === "fulfilled").length;
const failed = results.filter((r) => r.status === "rejected").length;
if (failed === 0) {
toast.success(
t("batch_updated", "Updated {{count}} servers", { count: succeeded })
);
setOpen(false);
setEnabledFields(new Set());
onSuccess();
} else if (succeeded > 0) {
toast.warning(
t("batch_partial", "{{succeeded}} updated, {{failed}} failed", {
succeeded,
failed,
})
);
onSuccess();
} else {
toast.error(t("batch_update_failed", "Batch update failed"));
}
} finally {
setLoading(false);
}
}
function handleOpen() {
setEnabledFields(new Set());
setPatch({ name: "", country: "", city: "", address: "" });
protocolForm.reset({
name: "",
address: "",
country: "",
city: "",
protocols: PROTOCOLS.map((type) => getProtocolDefaultConfig(type)),
});
setAccordionValue(undefined);
setOpen(true);
}
const simpleFields: Array<{
key: SimpleFieldKey;
label: string;
placeholder?: string;
}> = [
{ key: "name", label: t("name", "Name") },
{ key: "country", label: t("country", "Country") },
{ key: "city", label: t("city", "City") },
{
key: "address",
label: t("address", "Address"),
placeholder: t("address_placeholder", "Server address"),
},
];
return (
<Sheet onOpenChange={setOpen} open={open}>
<SheetTrigger asChild>
<Button onClick={handleOpen} variant="outline">
{t("batch_update", "Batch Update")}
</Button>
</SheetTrigger>
<SheetContent className="w-[700px] max-w-full gap-0 md:max-w-3xl">
<SheetHeader>
<SheetTitle>
{t("batch_update_title", "Batch Update ({{count}} servers)", {
count: rows.length,
})}
</SheetTitle>
</SheetHeader>
<ScrollArea className="h-[calc(100dvh-48px-36px-36px-env(safe-area-inset-top))] px-6 pt-4">
<p className="mb-4 text-muted-foreground text-sm">
{t(
"batch_update_desc",
"Check the fields you want to overwrite. Unchecked fields will keep their original values."
)}
</p>
<Form {...protocolForm}>
<form className="space-y-5">
{/* Simple text fields */}
{simpleFields.map(({ key, label, placeholder }) => (
<div className="flex items-start gap-3" key={key}>
<Checkbox
checked={isEnabled(key)}
id={`batch-server-${key}`}
onCheckedChange={() => toggleField(key)}
/>
<div className="flex-1 space-y-1.5">
<Label
className={isEnabled(key) ? "" : "text-muted-foreground"}
htmlFor={`batch-server-${key}`}
>
{label}
</Label>
<div
className={
isEnabled(key) ? "" : "pointer-events-none opacity-40"
}
>
<EnhancedInput
onValueChange={(v) =>
setPatch((p) => ({ ...p, [key]: String(v ?? "") }))
}
placeholder={placeholder}
value={patch[key]}
/>
</div>
</div>
</div>
))}
{/* Protocol Configurations */}
<div className="flex items-start gap-3">
<Checkbox
checked={isEnabled("protocols")}
id="batch-server-protocols"
onCheckedChange={() => toggleField("protocols")}
/>
<div className="flex-1 space-y-1.5">
<Label
className={
isEnabled("protocols") ? "" : "text-muted-foreground"
}
htmlFor="batch-server-protocols"
>
{t("protocol_configurations", "Protocol Configurations")}
</Label>
<p className="text-muted-foreground text-xs">
{t(
"protocol_configurations_desc",
"Enable and configure the required protocol types"
)}
</p>
<div
className={
isEnabled("protocols")
? ""
: "pointer-events-none opacity-40"
}
>
<Accordion
className="w-full space-y-3"
collapsible
onValueChange={setAccordionValue}
type="single"
value={accordionValue}
>
{PROTOCOLS.map((type) => {
const i = Math.max(0, PROTOCOLS.indexOf(type));
const current = (protocolsValues?.[i] || {}) as Record<
string,
any
>;
const isProtocolEnabled = current?.enable;
const fields = PROTOCOL_FIELDS[type] || [];
return (
<AccordionItem
className="mb-2 rounded-lg border"
key={type}
value={type}
>
<AccordionTrigger className="px-4 py-3 hover:no-underline">
<div className="flex w-full items-center justify-between">
<div className="flex flex-col items-start gap-1">
<div className="flex items-center gap-1">
<span className="font-medium capitalize">
{type}
</span>
{current.transport && (
<Badge
className="text-xs"
variant="secondary"
>
{current.transport.toUpperCase()}
</Badge>
)}
{current.security &&
current.security !== "none" && (
<Badge
className="text-xs"
variant="outline"
>
{current.security.toUpperCase()}
</Badge>
)}
{current.port && (
<Badge className="text-xs">
{current.port}
</Badge>
)}
</div>
<span
className={cn(
"text-xs",
isProtocolEnabled
? "text-green-500"
: "text-muted-foreground"
)}
>
{isProtocolEnabled
? t("enabled", "Enabled")
: t("disabled", "Disabled")}
</span>
</div>
<Switch
checked={!!isProtocolEnabled}
className="mr-2"
onCheckedChange={(checked) => {
protocolForm.setValue(
`protocols.${i}.enable` as any,
checked
);
}}
onClick={(e) => e.stopPropagation()}
/>
</div>
</AccordionTrigger>
<AccordionContent className="px-4 pt-0 pb-4">
<div className="-mx-4 space-y-4 rounded-b-lg border-t px-4 pt-4">
{renderGroupCard(
t("basic", "Basic Configuration"),
fields,
"basic",
protocolForm.control,
protocolForm,
i,
current
)}
{renderGroupCard(
t("obfs", "Obfuscation"),
fields,
"obfs",
protocolForm.control,
protocolForm,
i,
current
)}
{renderGroupCard(
t("transport", "Transport"),
fields,
"transport",
protocolForm.control,
protocolForm,
i,
current
)}
{renderGroupCard(
t("security", "Security"),
fields,
"security",
protocolForm.control,
protocolForm,
i,
current
)}
{renderGroupCard(
t("reality", "Reality"),
fields,
"reality",
protocolForm.control,
protocolForm,
i,
current
)}
{renderGroupCard(
t("encryption", "Encryption"),
fields,
"encryption",
protocolForm.control,
protocolForm,
i,
current
)}
</div>
</AccordionContent>
</AccordionItem>
);
})}
</Accordion>
</div>
</div>
</div>
</form>
</Form>
</ScrollArea>
<SheetFooter className="flex-row justify-end gap-2 pt-3">
<Button
disabled={loading}
onClick={() => setOpen(false)}
variant="outline"
>
{t("cancel", "Cancel")}
</Button>
<Button disabled={loading} onClick={handleSubmit}>
{t("confirm", "Confirm")}
</Button>
</SheetFooter>
</SheetContent>
</Sheet>
);
}
+68 -24
View File
@@ -184,7 +184,9 @@ function DynamicField({
{...fieldProps}
max={field.max}
min={field.min}
onValueChange={(v) => fieldProps.onChange(v)}
onValueChange={(v) =>
fieldProps.onChange(v === "" ? undefined : Number(v))
}
placeholder={field.placeholder}
step={field.step || 1}
suffix={field.suffix}
@@ -308,7 +310,7 @@ function renderFieldsByGroup(
);
}
function renderGroupCard(
export function renderGroupCard(
title: string,
fields: FieldConfig[],
group: string,
@@ -362,15 +364,52 @@ export default function ServerForm(props: {
const { isProtocolUsedInNodes } = useNode();
const PROTOCOL_FIELDS = useProtocolFields();
/**
* mergeProtocol - 将后端返回的协议数据与前端默认配置安全合并。
* 过滤掉空字符串 "",避免覆盖默认的枚举值(如 flow="none"),
* 从而防止 Zod 枚举校验失败。
* @param existingProtocol - 后端返回的协议对象(可能含空字符串)
* @param defaultConfig - 前端定义的安全默认配置
* @returns 合并后的协议对象
*/
function mergeProtocol(
existingProtocol: Record<string, any> | undefined,
defaultConfig: Record<string, any>
) {
if (!existingProtocol) return defaultConfig;
const merged = { ...defaultConfig };
for (const key in existingProtocol) {
if (Object.hasOwn(existingProtocol, key)) {
const val = existingProtocol[key];
// 空字符串降级为默认值,避免 Zod 枚举校验错误
if (val !== "") {
merged[key] = val;
}
}
}
return merged;
}
/**
* buildSanitizedProtocols - 为所有协议类型构建安全的初始表单数据。
* @param protocols - 后端返回的已有协议数组
* @returns 清洗后的完整协议配置数组
*/
function buildSanitizedProtocols(protocols?: any[]) {
return PROTOCOLS.map((type) => {
const existing = protocols?.find((p) => p.type === type);
return mergeProtocol(existing as any, getProtocolDefaultConfig(type));
});
}
const form = useForm({
resolver: zodResolver(formSchema),
defaultValues: {
name: "",
address: "",
country: "",
city: "",
protocols: [] as any[],
...initialValues,
name: initialValues?.name ?? "",
address: initialValues?.address ?? "",
country: initialValues?.country ?? "",
city: initialValues?.city ?? "",
protocols: buildSanitizedProtocols(initialValues?.protocols as any[]),
},
});
const { control } = form;
@@ -380,20 +419,11 @@ export default function ServerForm(props: {
useEffect(() => {
if (initialValues) {
form.reset({
name: "",
address: "",
country: "",
city: "",
...initialValues,
protocols: PROTOCOLS.map((type) => {
const existingProtocol = initialValues.protocols?.find(
(p) => p.type === type
);
const defaultConfig = getProtocolDefaultConfig(type);
return existingProtocol
? { ...defaultConfig, ...existingProtocol }
: defaultConfig;
}),
name: initialValues.name ?? "",
address: initialValues.address ?? "",
country: initialValues.country ?? "",
city: initialValues.city ?? "",
protocols: buildSanitizedProtocols(initialValues.protocols as any[]),
});
}
// eslint-disable-next-line react-hooks/exhaustive-deps
@@ -686,8 +716,22 @@ export default function ServerForm(props: {
<Button
disabled={loading}
onClick={form.handleSubmit(handleSubmit, (errors) => {
const key = Object.keys(errors)[0] as keyof typeof errors;
if (key) toast.error(String(errors[key]?.message));
const getFirstErrorMessage = (
errObj: any
): string | undefined => {
if (!errObj) return;
if (errObj.message && typeof errObj.message === "string")
return errObj.message;
for (const k in errObj) {
if (Object.hasOwn(errObj, k)) {
const msg = getFirstErrorMessage(errObj[k]);
if (msg) return msg;
}
}
return;
};
const msg = getFirstErrorMessage(errors);
if (msg) toast.error(msg);
return false;
})}
>
@@ -27,10 +27,12 @@ type Props = {
server: API.Server;
};
const DEFAULT_API_HOST = "https://api.hifast.biz";
export default function ServerInstall({ server }: Props) {
const { t } = useTranslation("servers");
const [open, setOpen] = useState(false);
const [domain, setDomain] = useState("");
const [domain, setDomain] = useState(DEFAULT_API_HOST);
const { data: cfgResp } = useQuery({
queryKey: ["getNodeConfig"],
@@ -43,8 +45,7 @@ export default function ServerInstall({ server }: Props) {
useEffect(() => {
if (open) {
const host = localStorage.getItem("API_HOST") ?? window.location.origin;
setDomain(host);
setDomain(DEFAULT_API_HOST);
}
}, [open]);
@@ -75,7 +76,6 @@ export default function ServerInstall({ server }: Props) {
const onDomainChange = useCallback((e: ChangeEvent<HTMLInputElement>) => {
setDomain(e.target.value);
localStorage.setItem("API_HOST", e.target.value);
}, []);
return (
<Dialog onOpenChange={setOpen} open={open}>
@@ -20,6 +20,7 @@ import {
SheetTrigger,
} from "@workspace/ui/components/sheet";
import { Switch } from "@workspace/ui/components/switch";
import { Textarea } from "@workspace/ui/components/textarea";
import { Combobox } from "@workspace/ui/composed/combobox";
import { EnhancedInput } from "@workspace/ui/composed/enhanced-input";
import { Icon } from "@workspace/ui/composed/icon";
@@ -40,6 +41,8 @@ const registerSchema = z.object({
trial_subscribe: z.number().optional(),
trial_time: z.number().optional(),
trial_time_unit: z.string().optional(),
enable_trial_email_whitelist: z.boolean().optional(),
trial_email_domain_whitelist: z.string().optional(),
enable_ip_register_limit: z.boolean().optional(),
ip_register_limit: z.number().optional(),
ip_register_limit_duration: z.number().optional(),
@@ -72,6 +75,8 @@ export default function RegisterConfig() {
trial_subscribe: undefined,
trial_time: 0,
trial_time_unit: "day",
enable_trial_email_whitelist: false,
trial_email_domain_whitelist: "",
enable_ip_register_limit: false,
ip_register_limit: 1,
ip_register_limit_duration: 1,
@@ -331,114 +336,182 @@ export default function RegisterConfig() {
/>
{form.watch("enable_trial") && (
<FormField
control={form.control}
name="trial_time"
render={({ field }) => (
<FormItem>
<FormLabel>
{t("register.trialConfig", "Trial Configuration")}
</FormLabel>
<FormControl>
<div className="flex gap-2">
<EnhancedInput
className="flex-1"
min={0}
onValueBlur={(value) =>
field.onChange(Number(value))
}
placeholder={t(
"register.inputPlaceholder",
"Please enter"
)}
prefix={
<FormField
control={form.control}
name="trial_subscribe"
render={({ field }) => (
<Combobox
className="w-32 rounded-r-none bg-secondary"
onChange={(value: number) => {
if (value) {
field.onChange(value);
}
}}
options={subscribes?.map((item) => ({
label: item.name!,
value: item.id!,
}))}
placeholder={t(
"register.selectPlaceholder",
"Please select"
)}
value={field.value}
/>
)}
/>
}
suffix={
<FormField
control={form.control}
name="trial_time_unit"
render={({ field: unitField }) => (
<Combobox
className="w-32 rounded-l-none bg-secondary"
onChange={(value: string) => {
unitField.onChange(value);
}}
options={[
{
label: t("register.none", "None"),
value: "None",
},
{
label: t("register.year", "Year(s)"),
value: "Year",
},
{
label: t("register.month", "Month(s)"),
value: "Month",
},
{
label: t("register.day", "Day(s)"),
value: "Day",
},
{
label: t("register.hour", "Hour(s)"),
value: "Hour",
},
{
label: t(
"register.minute",
"Minute(s)"
),
value: "Minute",
},
]}
placeholder={t(
"register.selectPlaceholder",
"Please select"
)}
value={unitField.value}
/>
)}
/>
}
type="number"
value={field.value}
<>
<FormField
control={form.control}
name="trial_time"
render={({ field }) => (
<FormItem>
<FormLabel>
{t("register.trialConfig", "Trial Configuration")}
</FormLabel>
<FormControl>
<div className="flex gap-2">
<EnhancedInput
className="flex-1"
min={0}
onValueBlur={(value) =>
field.onChange(Number(value))
}
placeholder={t(
"register.inputPlaceholder",
"Please enter"
)}
prefix={
<FormField
control={form.control}
name="trial_subscribe"
render={({ field }) => (
<Combobox
className="w-32 rounded-r-none bg-secondary"
onChange={(value: number) => {
if (value) {
field.onChange(value);
}
}}
options={subscribes?.map((item) => ({
label: item.name!,
value: item.id!,
}))}
placeholder={t(
"register.selectPlaceholder",
"Please select"
)}
value={field.value}
/>
)}
/>
}
suffix={
<FormField
control={form.control}
name="trial_time_unit"
render={({ field: unitField }) => (
<Combobox
className="w-32 rounded-l-none bg-secondary"
onChange={(value: string) => {
unitField.onChange(value);
}}
options={[
{
label: t("register.none", "None"),
value: "None",
},
{
label: t("register.year", "Year(s)"),
value: "Year",
},
{
label: t(
"register.month",
"Month(s)"
),
value: "Month",
},
{
label: t("register.day", "Day(s)"),
value: "Day",
},
{
label: t("register.hour", "Hour(s)"),
value: "Hour",
},
{
label: t(
"register.minute",
"Minute(s)"
),
value: "Minute",
},
]}
placeholder={t(
"register.selectPlaceholder",
"Please select"
)}
value={unitField.value}
/>
)}
/>
}
type="number"
value={field.value}
/>
</div>
</FormControl>
<FormDescription>
{t(
"register.trialConfigDescription",
"Configure trial subscription, duration and time unit for new users upon registration"
)}
</FormDescription>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="enable_trial_email_whitelist"
render={({ field }) => (
<FormItem>
<FormLabel>
{t(
"register.enableTrialEmailWhitelist",
"Email Domain Whitelist"
)}
</FormLabel>
<FormControl>
<Switch
checked={field.value}
className="!mt-0 float-end"
onCheckedChange={field.onChange}
/>
</div>
</FormControl>
<FormDescription>
{t(
"register.trialConfigDescription",
"Configure trial subscription, duration and time unit for new users upon registration"
)}
</FormDescription>
<FormMessage />
</FormItem>
</FormControl>
<FormDescription>
{t(
"register.enableTrialEmailWhitelistDescription",
"When enabled, trial subscription is only granted to emails with whitelisted domains"
)}
</FormDescription>
<FormMessage />
</FormItem>
)}
/>
{form.watch("enable_trial_email_whitelist") && (
<FormField
control={form.control}
name="trial_email_domain_whitelist"
render={({ field }) => (
<FormItem>
<FormLabel>
{t(
"register.trialEmailDomainWhitelist",
"Whitelisted Domains"
)}
</FormLabel>
<FormControl>
<Textarea
placeholder={t(
"register.trialEmailDomainWhitelistPlaceholder",
"gmail.com,outlook.com,edu.cn"
)}
rows={3}
{...field}
/>
</FormControl>
<FormDescription>
{t(
"register.trialEmailDomainWhitelistDescription",
"Comma-separated list of allowed email domains for trial subscription"
)}
</FormDescription>
<FormMessage />
</FormItem>
)}
/>
)}
/>
</>
)}
</form>
</Form>
+191 -17
View File
@@ -23,6 +23,10 @@ import {
getTicketList,
updateTicketStatus,
} from "@workspace/ui/services/admin/ticket";
import {
getUserDetail,
updateUserBasicInfo,
} from "@workspace/ui/services/admin/user";
import { useEffect, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { toast } from "sonner";
@@ -42,6 +46,7 @@ export default function Page() {
const [ticketId, setTicketId] = useState<any>(null);
const [message, setMessage] = useState("");
const [loadingId, setLoadingId] = useState<any>(null);
const { data: ticket, refetch: refetchTicket } = useQuery({
queryKey: ["getTicket", ticketId],
@@ -74,45 +79,214 @@ export default function Page() {
action={ref}
actions={{
render(row) {
if (row.status !== 4) {
if (row.status === 1) {
return [
<Button key="reply" onClick={() => setTicketId(row.id)}>
{t("reply", "Reply")}
</Button>,
<ConfirmButton
cancelText={t("cancel", "Cancel")}
confirmText={t("confirm", "Confirm")}
description={t(
"closeWarning",
"Once closed, the ticket cannot be operated on. Please proceed with caution."
)}
description="您确定要取消此次打款吗?取消后系统将记录此操作并关闭工单。"
key="cancel-payout"
onConfirm={async () => {
setLoadingId(row.id);
try {
await updateTicketStatus({
id: row.id,
status: 3,
});
toast.success("已取消打款并关闭工单");
ref.current?.refresh();
} catch (e) {
console.error("Cancel payout failed", e);
toast.error("取消打款失败");
}
setLoadingId(null);
}}
title="确认取消打款?"
trigger={
<Button
className="mr-2"
disabled={loadingId === row.id}
variant="outline"
>
{loadingId === row.id && (
<Icon
className="mr-2 animate-spin"
icon="lucide:loader-2"
/>
)}
</Button>
}
/>,
<ConfirmButton
cancelText={t("cancel", "Cancel")}
confirmText={t("confirm", "Confirm")}
description={
<div className="flex flex-col gap-2">
<p>
线
</p>
<p className="font-bold text-rose-500 text-sm">
USDT 1 USDT
</p>
<p className="font-bold text-rose-500 text-sm">
/ 5%
</p>
</div>
}
key="colse"
onConfirm={async () => {
setLoadingId(row.id);
try {
const titleStr = row.title || "";
const parts = titleStr.split("-");
if (parts.length > 1) {
const deductAmount = Number.parseFloat(
parts?.[1] ?? "0"
);
if (!Number.isNaN(deductAmount)) {
const res = await getUserDetail({ id: row.user_id });
const user = res?.data?.data;
if (user && typeof user.commission !== "undefined") {
const deductAmountCent = deductAmount * 100;
if (Number(user.commission) < deductAmountCent) {
toast.error("用户佣金余额不足,无法完成打款扣费");
setLoadingId(null);
return;
}
const newCommission =
Number(user.commission) - deductAmountCent;
await updateUserBasicInfo({
user_id: row.user_id,
commission: newCommission,
} as any);
}
}
}
} catch (e) {
console.error("Update commission failed", e);
}
await updateTicketStatus({
id: row.id,
status: 4,
});
toast.success(t("closeSuccess", "Closed successfully"));
ref.current?.refresh();
setLoadingId(null);
}}
title={t("confirmClose", "Are you sure you want to close?")}
title="确认已完成打款?"
trigger={
<Button variant="destructive">{t("close", "Close")}</Button>
<Button
disabled={loadingId === row.id}
variant="destructive"
>
{loadingId === row.id && (
<Icon
className="mr-2 animate-spin"
icon="lucide:loader-2"
/>
)}
</Button>
}
/>,
<ConfirmButton
cancelText={t("cancel", "Cancel")}
confirmText={t("confirm", "Confirm")}
description="检查佣金是否扣除,如已经扣除才可进行关闭,此操作不扣除佣金仅关闭工单。"
key="cancel-payout-1"
onConfirm={async () => {
setLoadingId(row.id);
try {
await updateTicketStatus({
id: row.id,
status: 4,
});
toast.success("已关闭工单");
ref.current?.refresh();
} catch (e) {
console.error("Cancel payout failed", e);
toast.error("关闭工单失败");
}
setLoadingId(null);
}}
title="确认关闭订单?"
trigger={
<Button
className="mr-2"
disabled={loadingId === row.id}
variant="secondary"
>
{loadingId === row.id && (
<Icon
className="mr-2 animate-spin"
icon="lucide:loader-2"
/>
)}
</Button>
}
/>,
];
}
return [
<Button key="check" onClick={() => setTicketId(row.id)} size="sm">
{t("check", "Check")}
</Button>,
];
return [];
},
}}
columns={[
{
accessorKey: "title",
header: t("title", "Title"),
id: "withdrawal_type",
header: "提现类型",
cell: ({ row }) => {
const title = row.original.title || "";
return title.split("-")[0] || title;
},
},
{
id: "withdrawal_amount",
header: "提现金额",
cell: ({ row }) => {
const title = row.original.title || "";
const parts = title.split("-");
if (parts.length < 2) return "";
return (
<span className="font-bold text-rose-500">${parts[1]}</span>
);
},
},
{
id: "withdrawal_method",
header: "提现方式",
cell: ({ row }) => {
const desc = row.original.description || "";
return desc.split("-")[0] || "";
},
},
{
id: "withdrawal_content",
header: "提现内容",
cell: ({ row }) => {
const desc = row.original.description || "";
const parts = desc.split("-");
if (parts.length < 2) return "";
const content = parts[1];
if (content?.startsWith("data:image/")) {
return (
<img
alt="withdrawal"
className="h-10 w-10 cursor-zoom-in rounded border object-cover"
height={40} // 这里的数值根据你的 UI 设计调整
onClick={() => {
const win = window.open();
win?.document.write(`<img src="${content}" />`);
}}
src={content}
width={40}
/>
);
}
return <span className="font-semibold">{content}</span>;
},
},
{
accessorKey: "user_id",
+67 -16
View File
@@ -16,6 +16,11 @@ import {
DropdownMenuTrigger,
} from "@workspace/ui/components/dropdown-menu";
import { Input } from "@workspace/ui/components/input";
import {
Popover,
PopoverContent,
PopoverTrigger,
} from "@workspace/ui/components/popover";
import { ScrollArea } from "@workspace/ui/components/scroll-area";
import {
Select,
@@ -39,7 +44,7 @@ import {
TabsTrigger,
} from "@workspace/ui/components/tabs";
import { Combobox } from "@workspace/ui/composed/combobox";
import { ConfirmButton } from "@workspace/ui/composed/confirm-button";
// import { ConfirmButton } from "@workspace/ui/composed/confirm-button";
import {
ProTable,
type ProTableActions,
@@ -50,11 +55,13 @@ import {
} from "@workspace/ui/services/admin/group";
import {
createUser,
deleteUser,
// deleteUser,
getUserDetail,
getUserList,
updateUserBasicInfo,
} from "@workspace/ui/services/admin/user";
import { parseDeviceType } from "@workspace/ui/utils/device";
import { FilePenLine } from "lucide-react";
import { useCallback, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { toast } from "sonner";
@@ -62,6 +69,8 @@ import { Display } from "@/components/display";
import { useSubscribe } from "@/stores/subscribe";
import { formatDate } from "@/utils/common";
import FamilyManagement from "./family";
import { RemarkForm } from "./remark-form";
import { buildUserBasicInfoPayload } from "./user-basic-info-payload";
import { UserDetail } from "./user-detail";
import UserForm from "./user-form";
import { UserInviteStatsSheet } from "./user-invite-stats-sheet";
@@ -69,8 +78,13 @@ import { AuthMethodsForm } from "./user-profile/auth-methods-form";
import { BasicInfoForm } from "./user-profile/basic-info-form";
import { NotifySettingsForm } from "./user-profile/notify-settings-form";
import UserSubscription from "./user-subscription";
// import EditUserGroupDialog from "./edit-user-group-dialog";
type UserDeviceWithDeviceNo = API.UserDevice & {
device_no?: string;
};
export default function User() {
const { t } = useTranslation("user");
const [loading, setLoading] = useState(false);
@@ -138,7 +152,7 @@ export default function User() {
userId={row.id}
/>,
<PreviewNodesDialog key="preview-nodes" userId={row.id} />,
<ConfirmButton
/* <ConfirmButton
cancelText={t("cancel", "Cancel")}
confirmText={t("confirm", "Confirm")}
description={t(
@@ -155,7 +169,7 @@ export default function User() {
trigger={
<Button variant="destructive">{t("delete", "Delete")}</Button>
}
/>,
/>,*/
<DropdownMenu key="more" modal={false}>
<DropdownMenuTrigger asChild>
<Button variant="outline">{t("more", "More")}</Button>
@@ -231,7 +245,7 @@ export default function User() {
accessorKey: "id",
header: "ID",
},
{
/*{
id: "deleted_at",
accessorKey: "deleted_at",
header: t("isDeleted", "Deleted"),
@@ -243,31 +257,69 @@ export default function User() {
<Badge variant="outline">{t("normal", "Normal")}</Badge>
);
},
},
},*/
{
id: "auth_methods",
accessorKey: "auth_methods",
header: t("userName", "Username"),
header: "设备码/邮箱",
cell: ({ row }) => {
const method = row.original.auth_methods?.[0];
const identifier = method?.auth_identifier || "";
const isDevice = method?.auth_type === "device";
const deviceNo = (row.original.user_devices?.[0] as any)?.device_no;
const firstDevice = row.original.user_devices?.[0] as
| UserDeviceWithDeviceNo
| undefined;
const deviceNo = firstDevice?.device_no;
const deviceType = parseDeviceType(firstDevice?.user_agent || "");
const display = isDevice ? deviceNo || identifier : identifier;
return (
<div>
<Badge
<div className="flex items-center">
{/* <Badge
className="mr-1 uppercase"
title={method?.verified ? t("verified", "Verified") : ""}
>
{method?.auth_type}
</Badge>
</Badge>*/}
{deviceType && (
<Badge className="mr-1" variant="secondary">
{deviceType}
</Badge>
)}
<span title={isDevice ? display : undefined}>{display}</span>
<Popover>
<PopoverTrigger>
<div className={"flex items-center"}>
{row.original?.remark ? `${row.original.remark}` : ""}
<FilePenLine className={"ml-2 text-primary"} size={14} />
</div>
</PopoverTrigger>
<PopoverContent className={"w-64"}>
<RemarkForm
initialRemark={row.original.remark}
onSave={async (remark) => {
const { data } = await getUserDetail({
id: row.original.id,
});
const user = data.data;
if (!user) {
throw new Error("User detail not found");
}
await updateUserBasicInfo(
buildUserBasicInfoPayload(user, remark)
);
toast.success(t("updateSuccess"));
ref.current?.refresh();
}}
/>
</PopoverContent>
</Popover>
</div>
);
},
},
{
/* {
id: "balance",
accessorKey: "balance",
header: t("balance", "Balance"),
@@ -282,7 +334,7 @@ export default function User() {
cell: ({ row }) => (
<Display type="currency" value={row.getValue("gift_amount")} />
),
},
},*/
{
id: "commission",
accessorKey: "commission",
@@ -523,12 +575,11 @@ function UserSearchBar({
}}
value={searchType}
>
<SelectTrigger className="w-24">
<SelectTrigger className="w-48">
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value="email">{t("email", "Email")}</SelectItem>
<SelectItem value="device">{t("deviceSearch", "Device")}</SelectItem>
<SelectItem value="email">/</SelectItem>
<SelectItem value="user_id">{t("userId", "User ID")}</SelectItem>
<SelectItem value="subscribe_id">
{t("subscription", "Subscription")}
@@ -0,0 +1,85 @@
/**
* @vitest-environment jsdom
*/
import {
cleanup,
fireEvent,
render,
screen,
waitFor,
} from "@testing-library/react";
import { Popover } from "@workspace/ui/components/popover";
import { afterEach, describe, expect, it, vi } from "vitest";
import { RemarkForm } from "./remark-form";
afterEach(() => {
cleanup();
});
function renderRemarkForm(props: Parameters<typeof RemarkForm>[0]) {
return render(
<Popover open>
<RemarkForm {...props} />
</Popover>
);
}
describe("RemarkForm", () => {
it("submits an intentionally cleared remark", async () => {
const onSave = vi.fn<Parameters<typeof RemarkForm>[0]["onSave"]>();
renderRemarkForm({ initialRemark: "old remark", onSave });
fireEvent.change(screen.getByPlaceholderText("在此输入备注..."), {
target: { value: "" },
});
fireEvent.click(screen.getByRole("button", { name: "保存" }));
await waitFor(() => expect(onSave).toHaveBeenCalledWith(""));
});
it("shows loading and keeps the input disabled while saving", async () => {
let resolveSave: (() => void) | undefined;
const onSave = vi.fn(
() =>
new Promise<void>((resolve) => {
resolveSave = resolve;
})
);
renderRemarkForm({ initialRemark: "old remark", onSave });
fireEvent.click(screen.getByRole("button", { name: "保存" }));
expect(
screen.getByRole("button", { name: "保存中..." }).hasAttribute("disabled")
).toBe(true);
expect(
screen.getByPlaceholderText("在此输入备注...").hasAttribute("disabled")
).toBe(true);
resolveSave?.();
await waitFor(() =>
expect(
screen.getByRole("button", { name: "保存" }).hasAttribute("disabled")
).toBe(false)
);
});
it("shows an error state and preserves input after save failure", async () => {
const onSave = vi.fn<Parameters<typeof RemarkForm>[0]["onSave"]>();
onSave.mockRejectedValue(new Error("failed"));
renderRemarkForm({ initialRemark: "old remark", onSave });
fireEvent.change(screen.getByPlaceholderText("在此输入备注..."), {
target: { value: "kept remark" },
});
fireEvent.click(screen.getByRole("button", { name: "保存" }));
expect((await screen.findByRole("alert")).textContent).toBe(
"备注保存失败,请重试"
);
expect(screen.getByDisplayValue("kept remark")).not.toBeNull();
});
});
@@ -0,0 +1,69 @@
import { Button } from "@workspace/ui/components/button";
import { Input } from "@workspace/ui/components/input";
import { PopoverClose } from "@workspace/ui/components/popover";
import { useRef, useState } from "react";
interface RemarkFormProps {
initialRemark?: string | null;
onSave: (remark: string) => Promise<void> | void;
}
export function RemarkForm({ onSave, initialRemark }: RemarkFormProps) {
const [remark, setRemark] = useState<string>(initialRemark ?? "");
const [saving, setSaving] = useState(false);
const [error, setError] = useState<string | null>(null);
const closeRef = useRef<HTMLButtonElement>(null);
const handleInputChange = (event: React.ChangeEvent<HTMLInputElement>) => {
setRemark(event.target.value);
};
const handleSave = async (event: React.FormEvent<HTMLFormElement>) => {
event.preventDefault();
setError(null);
setSaving(true);
try {
await onSave(remark);
closeRef.current?.click();
} catch {
setError("备注保存失败,请重试");
} finally {
setSaving(false);
}
};
return (
<form onSubmit={handleSave}>
<div className="mb-2 font-semibold text-sm"></div>
<Input
aria-invalid={Boolean(error)}
className="w-full"
disabled={saving}
onChange={handleInputChange}
placeholder="在此输入备注..."
type="text"
value={remark}
/>
{error ? (
<p className="mt-2 text-destructive text-sm" role="alert">
{error}
</p>
) : null}
<Button
className="mt-2"
disabled={saving}
size="sm"
type="submit"
variant="default"
>
{saving ? "保存中..." : "保存"}
</Button>
<PopoverClose asChild>
<button className="sr-only" ref={closeRef} type="button">
</button>
</PopoverClose>
</form>
);
}
@@ -0,0 +1,53 @@
import { describe, expect, it } from "vitest";
import { buildUserBasicInfoPayload } from "./user-basic-info-payload";
const user = {
id: 37,
avatar: "https://example.com/avatar.png",
balance: 1200,
commission: 300,
referral_percentage: 10,
only_first_purchase: true,
gift_amount: 500,
telegram: 123_456,
refer_code: "INVITE37",
referer_id: 7,
enable: true,
is_admin: false,
enable_balance_notify: true,
enable_login_notify: true,
enable_subscribe_notify: false,
enable_trade_notify: false,
user_group_id: 2,
group_locked: false,
auth_methods: [],
user_devices: [],
remark: "old remark",
rules: [],
created_at: 1_700_000_000,
updated_at: 1_700_000_100,
} satisfies API.User;
describe("buildUserBasicInfoPayload", () => {
it("keeps the full basic user fields when updating a remark", () => {
expect(buildUserBasicInfoPayload(user, "new remark")).toEqual({
user_id: 37,
avatar: "https://example.com/avatar.png",
balance: 1200,
commission: 300,
referral_percentage: 10,
only_first_purchase: true,
gift_amount: 500,
telegram: 123_456,
refer_code: "INVITE37",
referer_id: 7,
enable: true,
is_admin: false,
remark: "new remark",
});
});
it("preserves an intentionally cleared remark", () => {
expect(buildUserBasicInfoPayload(user, "").remark).toBe("");
});
});
@@ -0,0 +1,26 @@
import type { UpdateUserBasicInfoBody } from "@workspace/ui/services/admin/user";
export type UserBasicInfoPayload = Omit<UpdateUserBasicInfoBody, "remark"> & {
remark: string;
};
export function buildUserBasicInfoPayload(
user: API.User,
remark: string
): UserBasicInfoPayload {
return {
user_id: user.id,
avatar: user.avatar,
balance: user.balance,
commission: user.commission,
referral_percentage: user.referral_percentage,
only_first_purchase: user.only_first_purchase,
gift_amount: user.gift_amount,
telegram: user.telegram,
refer_code: user.refer_code,
referer_id: user.referer_id,
enable: user.enable,
is_admin: user.is_admin ?? false,
remark,
};
}
+6 -6
View File
@@ -59,8 +59,8 @@ export default function UserForm<T extends Record<string, any>>({
referral_percentage: z.number().optional(),
only_first_purchase: z.boolean().optional(),
is_admin: z.boolean().optional(),
balance: z.number().optional(),
gift_amount: z.number().optional(),
// balance: z.number().optional(),
// gift_amount: z.number().optional(),
commission: z.number().optional(),
});
const form = useForm({
@@ -282,7 +282,7 @@ export default function UserForm<T extends Record<string, any>>({
</FormItem>
)}
/>
<FormField
{/* <FormField
control={form.control}
name="balance"
render={({ field }) => (
@@ -309,8 +309,8 @@ export default function UserForm<T extends Record<string, any>>({
<FormMessage />
</FormItem>
)}
/>
<FormField
/> */}
{/* <FormField
control={form.control}
name="gift_amount"
render={({ field }) => (
@@ -340,7 +340,7 @@ export default function UserForm<T extends Record<string, any>>({
<FormMessage />
</FormItem>
)}
/>
/> */}
<FormField
control={form.control}
name="commission"
@@ -24,7 +24,7 @@ const notifySettingsSchema = z.object({
enable_balance_notify: z.boolean(),
enable_login_notify: z.boolean(),
enable_subscribe_notify: z.boolean(),
enable_trade_notify: z.boolean(),
// enable_trade_notify: z.boolean(),
});
type NotifySettingsValues = z.infer<typeof notifySettingsSchema>;
@@ -44,13 +44,14 @@ export function NotifySettingsForm({
enable_balance_notify: user.enable_balance_notify,
enable_login_notify: user.enable_login_notify,
enable_subscribe_notify: user.enable_subscribe_notify,
enable_trade_notify: user.enable_trade_notify,
// enable_trade_notify: user.enable_trade_notify,
},
});
async function onSubmit(data: NotifySettingsValues) {
await updateUserNotifySetting({
...data,
enable_trade_notify: user.enable_trade_notify ?? false,
user_id: user.id,
});
toast.success(t("updateSuccess", "Updated successfully"));
@@ -126,7 +127,7 @@ export function NotifySettingsForm({
)}
/>
<FormField
{/* <FormField
control={form.control}
name="enable_trade_notify"
render={({ field }) => (
@@ -142,7 +143,7 @@ export function NotifySettingsForm({
</FormControl>
</FormItem>
)}
/>
/> */}
</div>
</CardContent>
</Card>
@@ -278,6 +278,17 @@ export default function UserSubscription({ userId }: { userId: number }) {
/>
),
},
{
accessorKey: "traffic_limit",
header: t("userTrafficLimit", "User Traffic Limit"),
cell: ({ row }) => (
<Display
type="traffic"
unlimited
value={row.original.traffic_limit}
/>
),
},
{
id: "remaining_traffic",
header: t("remainingTraffic", "Remaining Traffic"),
@@ -296,15 +307,19 @@ export default function UserSubscription({ userId }: { userId: number }) {
accessorKey: "speed_limit",
header: t("speedLimit", "Speed Limit"),
cell: ({ row }) => {
const speed = row.original?.subscribe?.speed_limit;
return <Display type="trafficSpeed" value={speed} />;
const speed =
row.original.speed_limit ||
row.original?.subscribe?.speed_limit;
return <Display type="trafficSpeed" unlimited value={speed} />;
},
},
{
accessorKey: "device_limit",
header: t("deviceLimit", "Device Limit"),
cell: ({ row }) => {
const limit = row.original?.subscribe?.device_limit;
const limit =
row.original.device_limit ||
row.original?.subscribe?.device_limit;
return <Display type="number" unlimited value={limit} />;
},
},
@@ -329,6 +344,11 @@ export default function UserSubscription({ userId }: { userId: number }) {
: t("permanent", "Permanent");
},
},
{
accessorKey: "node_group_name",
header: t("nodeGroup", "Node Group"),
cell: ({ row }) => row.original.node_group_name || "-",
},
{
accessorKey: "created_at",
header: t("createdAt", "Created At"),
@@ -451,7 +471,7 @@ function RowReadOnlyActions({
"This action cannot be undone."
)}
onConfirm={async () => {
await deleteUserSubscribe({ user_subscribe_id: String(row.id) });
await deleteUserSubscribe({ user_subscribe_id: row.id });
toast.success(t("deleteSuccess", "Deleted successfully"));
refresh?.();
}}
@@ -636,7 +656,7 @@ function RowMoreActions({
"This action cannot be undone."
)}
onConfirm={async () => {
await deleteUserSubscribe({ user_subscribe_id: String(row.id) });
await deleteUserSubscribe({ user_subscribe_id: row.id });
toast.success(t("deleteSuccess", "Deleted successfully"));
refresh();
}}
@@ -11,16 +11,132 @@ import { Switch } from "@workspace/ui/components/switch";
import { ConfirmButton } from "@workspace/ui/composed/confirm-button";
import { ProTable } from "@workspace/ui/composed/pro-table/pro-table";
import {
getUserSubscribeById,
getUserSubscribeDevices,
kickOfflineByUserDevice,
} from "@workspace/ui/services/admin/user";
import { deviceIdToHash } from "@workspace/ui/utils/device";
import { type ReactNode, useState } from "react";
import { AlertTriangle, Gauge } from "lucide-react";
import { type ReactNode, useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { toast } from "sonner";
import { Display } from "@/components/display";
import { IpLink } from "@/components/ip-link";
import { formatDate } from "@/utils/common";
function SpeedLimitCard({ subscriptionId }: { subscriptionId: number }) {
const { t } = useTranslation("user");
const [detail, setDetail] = useState<API.UserSubscribeDetail | null>(null);
useEffect(() => {
getUserSubscribeById({ id: subscriptionId }).then(({ data }) => {
if (data.data) setDetail(data.data);
});
}, [subscriptionId]);
if (!detail || detail.status !== 1) return null;
const baseSpeed = detail.subscribe?.speed_limit ?? 0;
const userSpeed = detail.speed_limit ?? 0;
const userTraffic = detail.traffic_limit ?? 0;
const userDeviceLimit = detail.device_limit ?? 0;
const effectiveSpeed = detail.effective_speed ?? 0;
const isThrottled = detail.is_throttled;
if (
baseSpeed === 0 &&
userSpeed === 0 &&
userTraffic === 0 &&
userDeviceLimit === 0 &&
!isThrottled
) {
return null;
}
return (
<div
className={`mb-4 flex items-start gap-3 rounded-lg border p-3 text-sm ${
isThrottled
? "border-destructive/40 bg-destructive/5 text-destructive"
: "border-border bg-muted/40 text-foreground"
}`}
>
{isThrottled ? (
<AlertTriangle className="mt-0.5 h-4 w-4 shrink-0" />
) : (
<Gauge className="mt-0.5 h-4 w-4 shrink-0 text-muted-foreground" />
)}
<div className="space-y-1">
<div className="flex flex-wrap items-center gap-2 font-medium">
{isThrottled ? (
<>
<span>{t("throttled", "Speed Throttled")}</span>
<Badge className="text-xs" variant="destructive">
{effectiveSpeed} Mbps
</Badge>
{baseSpeed > 0 && (
<span className="text-muted-foreground text-xs line-through">
{baseSpeed} Mbps
</span>
)}
</>
) : (
<>
<span className="text-muted-foreground">
{t("speedLimit", "Speed Limit")}
</span>
<Badge className="text-xs" variant="secondary">
{effectiveSpeed > 0
? `${effectiveSpeed} Mbps`
: t("unlimited", "Unlimited")}
</Badge>
</>
)}
</div>
{isThrottled && detail.throttle_rule && (
<p className="text-muted-foreground text-xs">
{detail.throttle_rule}
</p>
)}
{isThrottled && detail.throttle_start && detail.throttle_end && (
<p className="text-muted-foreground text-xs">
{formatDate(detail.throttle_start)} ~{" "}
{formatDate(detail.throttle_end)}
</p>
)}
{(userSpeed > 0 || userTraffic > 0 || userDeviceLimit > 0) && (
<dl className="grid gap-2 pt-2 text-xs sm:grid-cols-3">
<div>
<dt className="text-muted-foreground">
{t("userSpeedLimit", "User Speed Limit")}
</dt>
<dd className="font-medium">
<Display type="trafficSpeed" unlimited value={userSpeed} />
</dd>
</div>
<div>
<dt className="text-muted-foreground">
{t("userTrafficLimit", "User Traffic Limit")}
</dt>
<dd className="font-medium">
<Display type="traffic" unlimited value={userTraffic} />
</dd>
</div>
<div>
<dt className="text-muted-foreground">
{t("userDeviceLimit", "User Device Limit")}
</dt>
<dd className="font-medium">
<Display type="number" unlimited value={userDeviceLimit} />
</dd>
</div>
</dl>
)}
</div>
</div>
);
}
export function SubscriptionDetail({
trigger,
userId,
@@ -44,6 +160,7 @@ export function SubscriptionDetail({
<SheetTitle>{t("onlineDevices", "Online Devices")}</SheetTitle>
</SheetHeader>
<div className="mt-4 max-h-[calc(100dvh-120px)] overflow-y-auto">
{open && <SpeedLimitCard subscriptionId={subscriptionId} />}
<ProTable<API.UserDevice, Record<string, unknown>>
actions={{
render: (row) => {
@@ -79,10 +196,9 @@ export function SubscriptionDetail({
header: t("enable", "Enable"),
cell: ({ row }) => (
<Switch
aria-label={t("deviceEnabled", "Device enabled")}
checked={row.getValue("enabled")}
onChange={(checked) => {
console.log("Switch:", checked);
}}
disabled
/>
),
},
@@ -33,20 +33,23 @@ interface Props {
title: string;
loading?: boolean;
initialData?: API.UserSubscribe;
onSubmit: (values: any) => Promise<boolean>;
onSubmit: (values: SubscriptionFormValues) => Promise<boolean>;
}
const formSchema = z.object({
subscribe_id: z.number().optional(),
traffic: z.number().optional(),
subscribe_id: z.number().default(0),
traffic: z.number().default(0),
speed_limit: z.number().optional(),
traffic_limit: z.number().optional(),
device_limit: z.number().optional(),
expired_at: z.number().nullish().optional(),
upload: z.number().optional(),
download: z.number().optional(),
expired_at: z.number().default(0),
upload: z.number().default(0),
download: z.number().default(0),
id: z.number().optional(),
});
export type SubscriptionFormValues = z.infer<typeof formSchema>;
export function SubscriptionForm({
trigger,
title,
@@ -62,6 +65,9 @@ export function SubscriptionForm({
defaultValues: {
subscribe_id: initialData?.subscribe_id || 0,
traffic: initialData?.traffic || 0,
traffic_limit: initialData?.traffic_limit || 0,
speed_limit: initialData?.speed_limit || 0,
device_limit: initialData?.device_limit || 0,
upload: initialData?.upload || 0,
download: initialData?.download || 0,
expired_at: initialData?.expire_time || 0,
@@ -69,7 +75,7 @@ export function SubscriptionForm({
},
});
const handleSubmit = async (values: any) => {
const handleSubmit = async (values: SubscriptionFormValues) => {
const success = await onSubmit(values);
if (success) {
setOpen(false);
@@ -154,6 +160,89 @@ export function SubscriptionForm({
</FormItem>
)}
/>
<FormField
control={form.control}
name="traffic_limit"
render={({ field }) => (
<FormItem>
<FormLabel>
{t("userTrafficLimit", "User Traffic Limit")}
</FormLabel>
<FormControl>
<EnhancedInput
placeholder={t(
"followSubscription",
"Follow Subscription"
)}
type="number"
{...field}
formatInput={(value) =>
unitConversion("bytesToGb", value)
}
formatOutput={(value) =>
unitConversion("gbToBytes", value)
}
onValueChange={(value) => {
form.setValue(field.name, value as number);
}}
suffix="GB"
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="speed_limit"
render={({ field }) => (
<FormItem>
<FormLabel>
{t("userSpeedLimit", "User Speed Limit")}
</FormLabel>
<FormControl>
<EnhancedInput
placeholder={t(
"followSubscription",
"Follow Subscription"
)}
type="number"
{...field}
onValueChange={(value) => {
form.setValue(field.name, value as number);
}}
suffix="Mbps"
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="device_limit"
render={({ field }) => (
<FormItem>
<FormLabel>
{t("userDeviceLimit", "User Device Limit")}
</FormLabel>
<FormControl>
<EnhancedInput
placeholder={t(
"followSubscription",
"Follow Subscription"
)}
type="number"
{...field}
onValueChange={(value) => {
form.setValue(field.name, value as number);
}}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="upload"
@@ -0,0 +1,387 @@
"use client";
import { zodResolver } from "@hookform/resolvers/zod";
import { useMutation } from "@tanstack/react-query";
import { Badge } from "@workspace/ui/components/badge";
import { Button } from "@workspace/ui/components/button";
import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle,
} from "@workspace/ui/components/dialog";
import {
Form,
FormControl,
FormField,
FormItem,
FormLabel,
FormMessage,
} from "@workspace/ui/components/form";
import { Textarea } from "@workspace/ui/components/textarea";
import { ConfirmButton } from "@workspace/ui/composed/confirm-button";
import {
ProTable,
type ProTableActions,
} from "@workspace/ui/composed/pro-table/pro-table";
import {
approveWithdrawal,
getWithdrawalList,
rejectWithdrawal,
} from "@workspace/ui/services/admin/withdrawal";
import { useRef, useState } from "react";
import { useForm } from "react-hook-form";
import { useTranslation } from "react-i18next";
import { toast } from "sonner";
import { z } from "zod";
import { Display } from "@/components/display";
import { UserDetail } from "@/sections/user/user-detail";
import { formatDate } from "@/utils/common";
const WITHDRAWAL_METHOD_MAP: Record<number, string> = {
0: "其他",
1: "支付宝",
2: "微信",
3: "银行卡",
};
const rejectSchema = z.object({
reason: z
.string()
.trim()
.min(2, "请填写拒绝原因")
.max(500, "拒绝原因不能超过 500 个字符"),
});
function QrCodeCell({ url }: { url?: string }) {
const [zoomOpen, setZoomOpen] = useState(false);
if (!url) return <span>--</span>;
return (
<>
<button
className="block overflow-hidden rounded border"
onClick={() => setZoomOpen(true)}
type="button"
>
<img
alt="收款码"
className="h-12 w-12 cursor-zoom-in object-cover"
height={48}
src={url}
width={48}
/>
</button>
{zoomOpen && (
<Dialog onOpenChange={setZoomOpen} open={zoomOpen}>
<DialogContent className="max-w-sm">
<img
alt="收款码"
className="w-full"
height={320}
src={url}
width={320}
/>
</DialogContent>
</Dialog>
)}
</>
);
}
export default function WithdrawalPage() {
const { t } = useTranslation("user");
const ref = useRef<ProTableActions>(null);
const [rejectOpen, setRejectOpen] = useState(false);
const [currentRow, setCurrentRow] = useState<API.AdminWithdrawalLog | null>(
null
);
const form = useForm<z.infer<typeof rejectSchema>>({
resolver: zodResolver(rejectSchema),
defaultValues: {
reason: "",
},
});
const approveMutation = useMutation({
mutationFn: async (withdrawalId: number) =>
approveWithdrawal({ withdrawal_id: withdrawalId }),
onSuccess: () => {
toast.success("提现申请已通过");
ref.current?.refresh();
},
onError: (error) => {
console.error("Approve withdrawal failed", error);
toast.error("提现通过失败");
},
});
const rejectMutation = useMutation({
mutationFn: async (values: { withdrawal_id: number; reason: string }) =>
rejectWithdrawal(values),
onSuccess: () => {
toast.success("提现申请已拒绝");
setRejectOpen(false);
setCurrentRow(null);
form.reset({ reason: "" });
ref.current?.refresh();
},
onError: (error) => {
console.error("Reject withdrawal failed", error);
toast.error("提现拒绝失败");
},
});
const statusOptions = [
{ value: "0", label: "审核中" },
{ value: "1", label: "已通过" },
{ value: "2", label: "已拒绝" },
{ value: "3", label: "已取消" },
];
const methodOptions = [
{ value: "1", label: "支付宝" },
{ value: "2", label: "微信" },
{ value: "3", label: "银行卡" },
{ value: "0", label: "其他" },
];
const statusMap: Record<number, { label: string; className: string }> = {
0: {
label: "审核中",
className: "bg-amber-100 text-amber-700 border-amber-200",
},
1: {
label: "已通过",
className: "bg-emerald-100 text-emerald-700 border-emerald-200",
},
2: {
label: "已拒绝",
className: "bg-rose-100 text-rose-700 border-rose-200",
},
3: {
label: "已取消",
className: "bg-gray-100 text-gray-500 border-gray-200",
},
};
return (
<>
<ProTable<
API.AdminWithdrawalLog,
{ status?: string; user_id?: string; method?: string }
>
action={ref}
actions={{
render: (row) => {
if (row.status !== 0) return [];
return [
<ConfirmButton
cancelText={t("cancel", "Cancel")}
confirmText={t("confirm", "Confirm")}
description="确认后将标记该提现为已通过,请确保线下打款流程已完成。"
key="approve"
onConfirm={async () => {
await approveMutation.mutateAsync(row.id);
}}
title="确认通过提现吗?"
trigger={
<Button
disabled={approveMutation.isPending}
size="sm"
variant="default"
>
</Button>
}
/>,
<Button
key="reject"
onClick={() => {
setCurrentRow(row);
setRejectOpen(true);
}}
size="sm"
variant="destructive"
>
</Button>,
];
},
}}
columns={[
{
accessorKey: "id",
header: "ID",
},
{
accessorKey: "user_id",
header: t("user", "User"),
cell: ({ row }) => <UserDetail id={row.original.user_id} />,
},
{
accessorKey: "amount",
header: "提现金额",
cell: ({ row }) => (
<Display type="currency" value={row.original.amount} />
),
},
{
accessorKey: "method",
header: "收款方式",
cell: ({ row }) =>
WITHDRAWAL_METHOD_MAP[row.original.method] ?? "--",
},
{
accessorKey: "account",
header: "收款账号",
cell: ({ row }) => (
<div className="max-w-[200px] break-all text-sm">
{row.original.account || "--"}
</div>
),
},
{
accessorKey: "qr_code_url",
header: "收款码",
cell: ({ row }) => <QrCodeCell url={row.original.qr_code_url} />,
},
{
accessorKey: "content",
header: "备注",
cell: ({ row }) => (
<div className="max-w-[200px] break-all text-sm">
{row.original.content || "--"}
</div>
),
},
{
accessorKey: "status",
header: "状态",
cell: ({ row }) => {
const status = statusMap[row.original.status] ?? {
label: `未知 (${row.original.status})`,
className: "",
};
return (
<Badge className={status.className} variant="outline">
{status.label}
</Badge>
);
},
},
{
accessorKey: "reason",
header: "拒绝原因",
cell: ({ row }) => row.original.reason || "--",
},
{
accessorKey: "created_at",
header: "申请时间",
cell: ({ row }) => formatDate(row.original.created_at),
},
{
accessorKey: "updated_at",
header: "更新时间",
cell: ({ row }) => formatDate(row.original.updated_at),
},
]}
header={{ title: "提现管理" }}
params={[
{
key: "status",
options: statusOptions,
placeholder: "状态",
},
{
key: "method",
options: methodOptions,
placeholder: "收款方式",
},
{
key: "user_id",
placeholder: "用户 ID",
},
]}
request={async (pagination, filter) => {
const { data } = await getWithdrawalList({
page: pagination.page,
size: pagination.size,
status: filter.status ? Number(filter.status) : undefined,
method: filter.method ? Number(filter.method) : undefined,
user_id: filter.user_id ? Number(filter.user_id) : undefined,
});
return {
list: data.data?.list || [],
total: data.data?.total || 0,
};
}}
/>
<Dialog
onOpenChange={(open) => {
setRejectOpen(open);
if (!open) {
setCurrentRow(null);
form.reset({ reason: "" });
}
}}
open={rejectOpen}
>
<DialogContent>
<DialogHeader>
<DialogTitle></DialogTitle>
<DialogDescription>
</DialogDescription>
</DialogHeader>
<Form {...form}>
<form
className="space-y-4"
onSubmit={form.handleSubmit(async (values) => {
if (!currentRow) return;
await rejectMutation.mutateAsync({
withdrawal_id: currentRow.id,
reason: values.reason.trim(),
});
})}
>
<FormField
control={form.control}
name="reason"
render={({ field }) => (
<FormItem>
<FormLabel></FormLabel>
<FormControl>
<Textarea
placeholder="请输入拒绝原因,用户端会看到这条说明"
rows={5}
{...field}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<DialogFooter>
<Button
onClick={() => setRejectOpen(false)}
type="button"
variant="outline"
>
{t("cancel", "Cancel")}
</Button>
<Button disabled={rejectMutation.isPending} type="submit">
{rejectMutation.isPending ? "提交中..." : "确认拒绝"}
</Button>
</DialogFooter>
</form>
</Form>
</DialogContent>
</Dialog>
</>
);
}
@@ -1,11 +1,37 @@
{
"accountInfo": "Payout Details",
"accountPlaceholder": "Enter bank card, Alipay, USDT wallet, or other payout details",
"accountRequired": "Payout details are required",
"accountTooLong": "Payout details must be 200 characters or fewer",
"amountInvalid": "Enter a valid amount",
"amountPositive": "Withdrawal amount must be greater than 0",
"applyTime": "Applied At",
"applyWithdraw": "Request Withdrawal",
"cancel": "Cancel",
"commissionInfo": "Commission Info",
"commissionRate": "Commission Rate",
"copyInviteLink": "Copy Invite Link",
"copySuccess": "Copy Success",
"currentCommission": "Current Commission",
"inviteCode": "Invite Code",
"inviteRecords": "Invite Records",
"noReason": "None",
"rejectReason": "Reject Reason",
"registrationTime": "Registration Time",
"submitWithdraw": "Submit Request",
"submitting": "Submitting...",
"totalCommission": "Total Commission",
"userIdentifier": "User Identifier"
"unknownStatus": "Unknown Status",
"userIdentifier": "User Identifier",
"withdrawAmount": "Withdrawal Amount",
"withdrawAmountPlaceholder": "Enter the withdrawal amount in dollars",
"withdrawDescription": "Submit the withdrawal amount and payout details, then wait for review.",
"withdrawError": "Failed to submit withdrawal request",
"withdrawRecords": "Withdrawal Records",
"withdrawStatus": {
"approved": "Approved",
"pending": "Pending Review",
"rejected": "Rejected"
},
"withdrawSuccess": "Withdrawal request submitted"
}
@@ -1,11 +1,37 @@
{
"accountInfo": "收款信息",
"accountPlaceholder": "请输入银行卡、支付宝、USDT 地址等收款信息",
"accountRequired": "请填写收款信息",
"accountTooLong": "收款信息不能超过 200 个字符",
"amountInvalid": "请输入有效金额",
"amountPositive": "提现金额必须大于 0",
"applyTime": "申请时间",
"applyWithdraw": "申请提现",
"cancel": "取消",
"commissionInfo": "佣金信息",
"commissionRate": "佣金比例",
"copyInviteLink": "复制邀请链接",
"copySuccess": "复制成功",
"currentCommission": "当前可见佣金",
"inviteCode": "邀请码",
"inviteRecords": "邀请记录",
"noReason": "无",
"rejectReason": "拒绝原因",
"registrationTime": "注册时间",
"submitWithdraw": "提交申请",
"submitting": "提交中...",
"totalCommission": "累计佣金",
"userIdentifier": "用户标识"
"unknownStatus": "未知状态",
"userIdentifier": "用户标识",
"withdrawAmount": "提现金额",
"withdrawAmountPlaceholder": "请输入提现金额,单位为元",
"withdrawDescription": "填写提现金额和收款信息后提交申请,等待后台审核。",
"withdrawError": "提现申请提交失败",
"withdrawRecords": "提现记录",
"withdrawStatus": {
"approved": "已通过",
"pending": "审核中",
"rejected": "已拒绝"
},
"withdrawSuccess": "提现申请已提交"
}
@@ -2,7 +2,12 @@ import { Button } from "@workspace/ui/components/button";
import { Input } from "@workspace/ui/components/input";
import { Icon } from "@workspace/ui/composed/icon";
import { generateCaptcha } from "@workspace/ui/services/common/auth";
import { useEffect, useImperativeHandle, useState } from "react";
import {
type RefObject,
useEffect,
useImperativeHandle,
useState,
} from "react";
import { useTranslation } from "react-i18next";
export interface LocalCaptchaRef {
@@ -10,7 +10,13 @@ import {
generateCaptcha,
verifyCaptchaSlider,
} from "@workspace/ui/services/common/auth";
import { useCallback, useImperativeHandle, useRef, useState } from "react";
import {
type RefObject,
useCallback,
useImperativeHandle,
useRef,
useState,
} from "react";
import { useTranslation } from "react-i18next";
export interface SliderCaptchaRef {
+597 -14
View File
@@ -1,6 +1,7 @@
"use client";
import { useQuery } from "@tanstack/react-query";
import { zodResolver } from "@hookform/resolvers/zod";
import { useMutation, useQuery } from "@tanstack/react-query";
import { Button } from "@workspace/ui/components/button";
import {
Card,
@@ -9,29 +10,266 @@ import {
CardHeader,
CardTitle,
} from "@workspace/ui/components/card";
import { ProList } from "@workspace/ui/composed/pro-list/pro-list";
import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle,
DialogTrigger,
} from "@workspace/ui/components/dialog";
import {
Form,
FormControl,
FormField,
FormItem,
FormLabel,
FormMessage,
} from "@workspace/ui/components/form";
import { Input } from "@workspace/ui/components/input";
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@workspace/ui/components/select";
import { Textarea } from "@workspace/ui/components/textarea";
import { ConfirmButton } from "@workspace/ui/composed/confirm-button";
import type { ProListActions } from "@workspace/ui/composed/pro-list/pro-list";
import { ProList } from "@workspace/ui/composed/pro-list/pro-list";
import { UploadImage } from "@workspace/ui/composed/upload-image";
import {
commissionWithdraw,
queryUserAffiliate,
queryUserAffiliateList,
queryWithdrawalLog,
uploadFile,
withdrawalCancel,
} from "@workspace/ui/services/user/user";
import { formatDate } from "@workspace/ui/utils/formatting";
import { Copy } from "lucide-react";
import { unitConversion } from "@workspace/ui/utils/unit-conversions";
import { Copy, X } from "lucide-react";
import { useRef, useState, useTransition } from "react";
import { CopyToClipboard } from "react-copy-to-clipboard";
import { useForm } from "react-hook-form";
import { useTranslation } from "react-i18next";
import { toast } from "sonner";
import { z } from "zod";
import { Display } from "@/components/display";
import { useGlobalStore } from "@/stores/global";
const WITHDRAWAL_METHODS = [
{ value: 1, label: "支付宝" },
{ value: 2, label: "微信" },
{ value: 3, label: "银行卡" },
{ value: 0, label: "其他" },
] as const;
function getWithdrawalMethodLabel(method: number): string {
return WITHDRAWAL_METHODS.find((m) => m.value === method)?.label ?? "未知";
}
function getWithdrawalStatusMeta(
status: number,
t: ReturnType<typeof useTranslation<"affiliate">>["t"]
) {
switch (status) {
case 1:
return {
label: t("withdrawal.status.approved", "Approved"),
className: "bg-emerald-500/10 text-emerald-600",
};
case 2:
return {
label: t("withdrawal.status.rejected", "Rejected"),
className: "bg-destructive/10 text-destructive",
};
case 3:
return {
label: t("withdrawal.status.cancelled", "Cancelled"),
className: "bg-muted text-muted-foreground",
};
default:
return {
label: t("withdrawal.status.pending", "Pending"),
className: "bg-amber-500/10 text-amber-600",
};
}
}
function QrCodeView({ url }: { url: string }) {
const [zoomOpen, setZoomOpen] = useState(false);
return (
<>
<button
className="block overflow-hidden rounded border"
onClick={() => setZoomOpen(true)}
type="button"
>
<img
alt="收款码"
className="h-16 w-16 cursor-zoom-in object-cover"
src={url}
/>
</button>
{zoomOpen && (
<Dialog onOpenChange={setZoomOpen} open={zoomOpen}>
<DialogContent className="max-w-sm">
<img alt="收款码" className="w-full" src={url} />
</DialogContent>
</Dialog>
)}
</>
);
}
const withdrawalFormSchema = z
.object({
amount: z.number(),
method: z.number(),
account: z.string().trim().max(200).optional(),
qr_code_url: z.string().optional(),
content: z.string().trim().max(1000).optional(),
})
.superRefine((data, ctx) => {
if (!data.amount || data.amount <= 0) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
message: "提现金额必须大于 0",
path: ["amount"],
});
}
if (data.method === 1 || data.method === 2) {
if (!data.qr_code_url) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
message: "请上传收款码",
path: ["qr_code_url"],
});
}
} else if (data.method === 3) {
if (!data.account) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
message: "银行卡收款账号为必填",
path: ["account"],
});
}
} else if (data.method === 0) {
if (!data.account && !data.content) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
message: "收款账号和备注至少填一项",
path: ["account"],
});
}
}
});
type WithdrawalFormValues = z.infer<typeof withdrawalFormSchema>;
export default function Affiliate() {
const { t } = useTranslation("affiliate");
const { user, common } = useGlobalStore();
const { data } = useQuery({
const { user, common, getUserInfo } = useGlobalStore();
const [withdrawalOpen, setWithdrawalOpen] = useState(false);
const [submitting, startTransition] = useTransition();
const [qrUploading, setQrUploading] = useState(false);
const withdrawalListActionRef = useRef<ProListActions | undefined>(undefined);
const affiliateQuery = useQuery({
queryKey: ["queryUserAffiliate"],
queryFn: async () => {
const response = await queryUserAffiliate();
return response.data.data;
},
});
const availableCommission = Number(
user?.commission ?? affiliateQuery.data?.total_commission ?? 0
);
const withdrawalForm = useForm<WithdrawalFormValues>({
resolver: zodResolver(withdrawalFormSchema),
defaultValues: {
amount: 0,
method: 1,
account: "",
qr_code_url: "",
content: "",
},
});
const watchedMethod = withdrawalForm.watch("method");
const watchedQrCodeUrl = withdrawalForm.watch("qr_code_url");
const handleQrUpload = async (file: string | File) => {
if (!(file instanceof File)) return;
setQrUploading(true);
try {
const formData = new FormData();
formData.append("file", file);
formData.append("biz_type", "withdrawal_qrcode");
const response = await uploadFile(formData);
const uploadedUrl =
response.data.data?.url || response.data.data?.key || "";
withdrawalForm.setValue("qr_code_url", uploadedUrl);
withdrawalForm.clearErrors("qr_code_url");
} catch {
toast.error("收款码上传失败,请重试");
} finally {
setQrUploading(false);
}
};
const cancelMutation = useMutation({
mutationFn: async (withdrawalId: number) =>
withdrawalCancel({ withdrawal_id: withdrawalId }),
onSuccess: () => {
toast.success("提现申请已取消");
withdrawalListActionRef.current?.refresh();
},
onError: () => {
toast.error("取消失败,请重试");
},
});
const submitWithdrawal = (values: WithdrawalFormValues) => {
if (values.amount > availableCommission) {
withdrawalForm.setError("amount", {
message: t(
"withdrawal.validation.amountExceeded",
"Amount cannot exceed available commission"
),
});
return;
}
startTransition(async () => {
await commissionWithdraw({
amount: values.amount,
method: values.method,
account: values.account || undefined,
qr_code_url: values.qr_code_url || undefined,
content: values.content || undefined,
});
toast.success(
t("withdrawal.submitSuccess", "Withdrawal request submitted")
);
await Promise.all([
affiliateQuery.refetch(),
getUserInfo(),
withdrawalListActionRef.current?.refresh(),
]);
setWithdrawalOpen(false);
withdrawalForm.reset({
amount: 0,
method: 1,
account: "",
qr_code_url: "",
content: "",
});
});
};
return (
<div className="flex flex-col gap-4">
@@ -43,15 +281,259 @@ export default function Affiliate() {
</CardDescription>
</CardHeader>
<CardContent>
<div className="flex items-baseline gap-2">
<span className="font-bold text-3xl">
<Display type="currency" value={data?.total_commission} />
</span>
<span className="text-muted-foreground text-sm">
({t("commissionRate", "Commission Rate")}:{" "}
{user?.referral_percentage || common?.invite?.referral_percentage}
%)
</span>
<div className="flex flex-col gap-4 md:flex-row md:items-end md:justify-between">
<div className="flex items-baseline gap-2">
<span className="font-bold text-3xl">
<Display
type="currency"
value={affiliateQuery.data?.total_commission}
/>
</span>
<span className="text-muted-foreground text-sm">
({t("commissionRate", "Commission Rate")}:{" "}
{user?.referral_percentage ||
common?.invite?.referral_percentage}
%)
</span>
</div>
<div className="flex flex-col items-start gap-2 md:items-end">
<div className="text-muted-foreground text-sm">
{t(
"withdrawal.availableCommission",
"Available for withdrawal"
)}
</div>
<div className="font-semibold text-xl">
<Display type="currency" value={availableCommission} />
</div>
<Dialog onOpenChange={setWithdrawalOpen} open={withdrawalOpen}>
<DialogTrigger asChild>
<Button>
{t("withdrawal.apply", "Apply for Withdrawal")}
</Button>
</DialogTrigger>
<DialogContent className="max-h-[90vh] overflow-y-auto">
<DialogHeader>
<DialogTitle>
{t("withdrawal.applyTitle", "Apply for Withdrawal")}
</DialogTitle>
<DialogDescription>
{t(
"withdrawal.applyDescription",
"Enter the withdrawal amount and payout details."
)}
</DialogDescription>
</DialogHeader>
<Form {...withdrawalForm}>
<form
className="space-y-4"
id="withdrawal-form"
onSubmit={withdrawalForm.handleSubmit(submitWithdrawal)}
>
<FormField
control={withdrawalForm.control}
name="amount"
render={({ field }) => (
<FormItem>
<FormLabel>
{t("withdrawal.amount", "Amount")}
</FormLabel>
<FormControl>
<Input
inputMode="decimal"
min="0"
onChange={(event) => {
const cents = unitConversion(
"dollarsToCents",
Number(event.target.value || 0)
);
field.onChange(Number(cents) || 0);
}}
placeholder={t(
"withdrawal.amountPlaceholder",
"Enter withdrawal amount"
)}
step="0.01"
type="number"
value={
field.value
? unitConversion(
"centsToDollars",
Number(field.value)
)
: ""
}
/>
</FormControl>
<p className="text-muted-foreground text-xs">
{t("withdrawal.amountHint", "Available")}:{" "}
<Display
type="currency"
value={availableCommission}
/>
</p>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={withdrawalForm.control}
name="method"
render={({ field }) => (
<FormItem>
<FormLabel></FormLabel>
<Select
onValueChange={(val) => {
field.onChange(Number(val));
withdrawalForm.setValue("qr_code_url", "");
withdrawalForm.setValue("account", "");
withdrawalForm.clearErrors();
}}
value={String(field.value)}
>
<FormControl>
<SelectTrigger>
<SelectValue placeholder="请选择收款方式" />
</SelectTrigger>
</FormControl>
<SelectContent>
{WITHDRAWAL_METHODS.map((m) => (
<SelectItem
key={m.value}
value={String(m.value)}
>
{m.label}
</SelectItem>
))}
</SelectContent>
</Select>
<FormMessage />
</FormItem>
)}
/>
{(watchedMethod === 1 || watchedMethod === 2) && (
<FormField
control={withdrawalForm.control}
name="qr_code_url"
render={() => (
<FormItem>
<FormLabel>
<span className="ml-1 text-destructive">
*
</span>
</FormLabel>
{watchedQrCodeUrl ? (
<div className="relative inline-block">
<QrCodeView url={watchedQrCodeUrl} />
<button
className="-top-2 -right-2 absolute flex h-5 w-5 items-center justify-center rounded-full bg-destructive text-destructive-foreground"
onClick={() =>
withdrawalForm.setValue("qr_code_url", "")
}
type="button"
>
<X className="h-3 w-3" />
</button>
</div>
) : (
<UploadImage
className="h-24 w-24"
id="qr-code-upload"
onChange={handleQrUpload}
returnType="file"
>
<div className="flex h-24 w-24 flex-col items-center justify-center rounded border-2 border-dashed text-muted-foreground text-xs">
{qrUploading ? "上传中..." : "点击上传\n收款码"}
</div>
</UploadImage>
)}
<FormMessage />
</FormItem>
)}
/>
)}
{(watchedMethod === 3 || watchedMethod === 0) && (
<FormField
control={withdrawalForm.control}
name="account"
render={({ field }) => (
<FormItem>
<FormLabel>
{watchedMethod === 3 && (
<span className="ml-1 text-destructive">
*
</span>
)}
</FormLabel>
<FormControl>
<Input
placeholder={
watchedMethod === 3
? "请输入银行卡号或账户信息"
: "请输入收款账号(与备注至少填一项)"
}
{...field}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
)}
<FormField
control={withdrawalForm.control}
name="content"
render={({ field }) => (
<FormItem>
<FormLabel></FormLabel>
<FormControl>
<Textarea
placeholder={
watchedMethod === 0
? "备注(与账号至少填一项)"
: "备注(可选)"
}
rows={3}
{...field}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
</form>
</Form>
<DialogFooter>
<Button
disabled={submitting}
onClick={() => setWithdrawalOpen(false)}
variant="outline"
>
{t("withdrawal.cancel", "Cancel")}
</Button>
<Button
disabled={
submitting ||
qrUploading ||
availableCommission <= 0
}
form="withdrawal-form"
type="submit"
>
{submitting
? t("withdrawal.submitting", "Submitting...")
: t("withdrawal.submit", "Submit Withdrawal")}
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
</div>
</div>
</CardContent>
</Card>
@@ -82,6 +564,107 @@ export default function Affiliate() {
</div>
</CardContent>
</Card>
<ProList<API.WithdrawalLog, Record<string, unknown>>
action={withdrawalListActionRef}
header={{
title: t("withdrawal.records", "Withdrawal Records"),
}}
renderItem={(item) => {
const statusMeta = getWithdrawalStatusMeta(item.status, t);
return (
<Card className="overflow-hidden">
<CardContent className="space-y-3 p-4 text-sm">
<div className="flex flex-wrap items-center justify-between gap-2">
<div className="font-semibold text-lg">
<Display type="currency" value={item.amount} />
</div>
<div className="flex items-center gap-2">
<span
className={`inline-flex rounded-full px-3 py-1 font-medium text-xs ${statusMeta.className}`}
>
{statusMeta.label}
</span>
{item.status === 0 && (
<ConfirmButton
cancelText="取消"
confirmText="确认取消"
description="取消后该提现申请将关闭,佣金不会退还。确定取消吗?"
onConfirm={async () => {
await cancelMutation.mutateAsync(item.id);
}}
title="取消提现申请"
trigger={
<Button
disabled={cancelMutation.isPending}
size="sm"
variant="outline"
>
</Button>
}
/>
)}
</div>
</div>
<ul className="grid gap-3 md:grid-cols-2">
<li className="flex flex-col gap-1">
<span className="text-muted-foreground"></span>
<span>{getWithdrawalMethodLabel(item.method)}</span>
</li>
{item.account && (
<li className="flex flex-col gap-1">
<span className="text-muted-foreground"></span>
<span className="break-all">{item.account}</span>
</li>
)}
{item.qr_code_url && (
<li className="flex flex-col gap-1">
<span className="text-muted-foreground"></span>
<QrCodeView url={item.qr_code_url} />
</li>
)}
{item.content && (
<li className="flex flex-col gap-1">
<span className="text-muted-foreground">
{t("withdrawal.record.content", "Payout Information")}
</span>
<span className="whitespace-pre-wrap break-words">
{item.content}
</span>
</li>
)}
<li className="flex flex-col gap-1">
<span className="text-muted-foreground">
{t("withdrawal.record.createdAt", "Created At")}
</span>
<time>{formatDate(item.created_at)}</time>
</li>
{item.reason && (
<li className="flex flex-col gap-1 md:col-span-2">
<span className="text-muted-foreground">
{t("withdrawal.record.reason", "Reject Reason")}
</span>
<span className="whitespace-pre-wrap break-words text-destructive">
{item.reason}
</span>
</li>
)}
</ul>
</CardContent>
</Card>
);
}}
request={async (pagination) => {
const response = await queryWithdrawalLog({
page: pagination.page,
size: pagination.size,
});
return {
list: response.data.data?.list || [],
total: response.data.data?.total || 0,
};
}}
/>
<ProList<API.UserAffiliate, Record<string, unknown>>
header={{
title: t("inviteRecords", "Invite Records"),
@@ -30,10 +30,39 @@ const FormSchema = z.object({
enable_trade_notify: z.boolean(),
});
type NotifyFormValues = z.infer<typeof FormSchema>;
const notificationFields = [
{
name: "enable_balance_notify",
labelKey: "notify.balanceChange",
fallbackLabel: "Balance Change",
},
{
name: "enable_login_notify",
labelKey: "notify.login",
fallbackLabel: "Login",
},
{
name: "enable_subscribe_notify",
labelKey: "notify.subscribe",
fallbackLabel: "Subscribe",
},
{
name: "enable_trade_notify",
labelKey: "notify.finance",
fallbackLabel: "Finance",
},
] satisfies Array<{
name: keyof NotifyFormValues;
labelKey: string;
fallbackLabel: string;
}>;
export default function NotifySettings() {
const { t } = useTranslation("profile");
const { user, getUserInfo } = useGlobalStore();
const form = useForm<z.infer<typeof FormSchema>>({
const form = useForm<NotifyFormValues>({
resolver: zodResolver(FormSchema),
defaultValues: {
enable_balance_notify: user?.enable_balance_notify ?? false,
@@ -43,7 +72,7 @@ export default function NotifySettings() {
},
});
async function onSubmit(data: z.infer<typeof FormSchema>) {
async function onSubmit(data: NotifyFormValues) {
await updateUserNotify(data);
toast.success(t("notify.updateSuccess", "Update Successful"));
await getUserInfo();
@@ -67,32 +96,15 @@ export default function NotifySettings() {
onSubmit={form.handleSubmit(onSubmit)}
>
<div className="space-y-4">
{[
{
name: "enable_balance_notify",
label: t("notify.balanceChange", "Balance Change"),
},
{
name: "enable_login_notify",
label: t("notify.login", "Login"),
},
{
name: "enable_subscribe_notify",
label: t("notify.subscribe", "Subscribe"),
},
{
name: "enable_trade_notify",
label: t("notify.finance", "Finance"),
},
].map(({ name, label }) => (
{notificationFields.map(({ fallbackLabel, labelKey, name }) => (
<FormField
control={form.control}
key={name}
name={name as any}
name={name}
render={({ field }) => (
<FormItem className="flex items-center justify-between space-x-4">
<FormLabel className="text-muted-foreground">
{label}
{t(labelKey, fallbackLabel)}
</FormLabel>
<FormControl>
<Switch
+4
View File
@@ -49,7 +49,9 @@
"motion": "^12.23.24",
"qrcode.react": "^4.2.0",
"radash": "^12.1.1",
"react": "^19.2.0",
"react-copy-to-clipboard": "^5.1.0",
"react-dom": "^19.2.0",
"react-helmet-async": "^2.0.5",
"react-turnstile": "^1.1.4",
"zustand": "^5.0.8",
@@ -85,7 +87,9 @@
"framer-motion": "^12.23.24",
"js-yaml": "^4.1.1",
"qrcode.react": "^4.2.0",
"react": "^19.2.0",
"react-copy-to-clipboard": "^5.1.0",
"react-dom": "^19.2.0",
"react-helmet-async": "^2.0.5",
"react-turnstile": "^1.1.4",
"zustand": "^5.0.8",
+2 -1
View File
@@ -43,5 +43,6 @@ function PopoverAnchor({
}: React.ComponentProps<typeof PopoverPrimitive.Anchor>) {
return <PopoverPrimitive.Anchor data-slot="popover-anchor" {...props} />;
}
const PopoverClose = PopoverPrimitive.Close;
export { Popover, PopoverTrigger, PopoverContent, PopoverAnchor };
export { Popover, PopoverTrigger, PopoverContent, PopoverAnchor, PopoverClose };
+1
View File
@@ -55,6 +55,7 @@ function SheetContent({
<SheetPortal>
<SheetOverlay />
<SheetPrimitive.Content
aria-describedby={undefined}
className={cn(
"fixed z-50 flex flex-col gap-4 bg-background shadow-lg transition ease-in-out data-[state=closed]:animate-out data-[state=open]:animate-in data-[state=closed]:duration-300 data-[state=open]:duration-500",
side === "right" &&
+8 -2
View File
@@ -17,7 +17,7 @@ import type { ReactNode } from "react";
interface ConfirmationButtonProps {
trigger: ReactNode;
title: string;
description: string;
description: ReactNode;
onConfirm: () => void | Promise<void>;
cancelText?: string;
confirmText?: string;
@@ -36,7 +36,13 @@ export const ConfirmButton: React.FC<ConfirmationButtonProps> = ({
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>{title}</AlertDialogTitle>
<AlertDialogDescription>{description}</AlertDialogDescription>
<AlertDialogDescription asChild>
{typeof description === "string" ? (
<span>{description}</span>
) : (
<div>{description}</div>
)}
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel>{cancelText}</AlertDialogCancel>
@@ -39,7 +39,13 @@ import { SortableRow } from "@workspace/ui/composed/pro-table/sortable-row";
import { ProTableWrapper } from "@workspace/ui/composed/pro-table/wrapper";
import { cn } from "@workspace/ui/lib/utils";
import { useSize } from "ahooks";
import { GripVertical, ListRestart, Loader, RefreshCcw } from "lucide-react";
import {
CircleAlert,
GripVertical,
ListRestart,
Loader,
RefreshCcw,
} from "lucide-react";
import type React from "react";
import {
Fragment,
@@ -79,6 +85,7 @@ export interface ProTableProps<TData, TValue> {
selectedRowsText: (total: number) => string;
}>;
empty?: React.ReactNode;
error?: React.ReactNode;
onSort?: (
sourceId: string | number,
targetId: string | number | null,
@@ -104,6 +111,7 @@ export function ProTable<
action,
texts,
empty,
error,
onSort,
initialFilters,
}: ProTableProps<TData, TValue>) {
@@ -121,6 +129,8 @@ export function ProTable<
const [rowSelection, setRowSelection] = useState({});
const [data, setData] = useState<TData[]>([]);
const [rowCount, setRowCount] = useState<number>(0);
const [isLoading, setIsLoading] = useState(false);
const [requestError, setRequestError] = useState(false);
const [pagination, setPagination] = useState({
pageIndex: 0,
pageSize: 200,
@@ -193,6 +203,8 @@ export function ProTable<
const fetchData = async () => {
if (loading.current) return;
loading.current = true;
setIsLoading(true);
setRequestError(false);
try {
const response = await request(
{
@@ -205,10 +217,13 @@ export function ProTable<
);
setData(response.list);
setRowCount(response.total);
} catch (error) {
console.log("Fetch data error:", error);
} catch (_error) {
setData([]);
setRowCount(0);
setRequestError(true);
} finally {
loading.current = false;
setIsLoading(false);
}
};
const reset = async () => {
@@ -316,7 +331,16 @@ export function ProTable<
))}
</TableHeader>
<TableBody>
{table.getRowModel()?.rows?.length ? (
{requestError ? (
<TableRow>
<TableCell
className="py-12"
colSpan={table.getAllLeafColumns().length}
>
{error || <ProTableErrorState />}
</TableCell>
</TableRow>
) : table.getRowModel()?.rows?.length ? (
onSort ? (
table.getRowModel().rows.map((row) => (
<SortableRow
@@ -371,7 +395,10 @@ export function ProTable<
)
) : (
<TableRow>
<TableCell className="py-24" colSpan={columns.length + 2}>
<TableCell
className="py-24"
colSpan={table.getAllLeafColumns().length}
>
{empty || <Empty />}
</TableCell>
</TableRow>
@@ -380,8 +407,12 @@ export function ProTable<
</Table>
</ProTableWrapper>
{loading.current && (
<div className="absolute top-0 z-20 flex h-full w-full items-center justify-center bg-muted/80">
{isLoading && (
<div
aria-label="Loading data"
className="absolute top-0 z-20 flex h-full w-full items-center justify-center bg-muted/80"
role="status"
>
<Loader className="h-4 w-4 animate-spin" />
</div>
)}
@@ -391,6 +422,16 @@ export function ProTable<
);
}
function ProTableErrorState() {
return (
<Alert className="mx-auto max-w-md" variant="destructive">
<CircleAlert aria-hidden="true" />
<AlertTitle>Failed to load data</AlertTitle>
<AlertDescription>Refresh the table or try again later.</AlertDescription>
</Alert>
);
}
function createSelectColumn<TData, TValue>(): ColumnDef<TData, TValue> {
return {
id: "selected",
+4
View File
@@ -15,6 +15,7 @@ import * as log from "./log";
import * as marketing from "./marketing";
import * as order from "./order";
import * as payment from "./payment";
import * as promo from "./promo";
import * as redemption from "./redemption";
import * as server from "./server";
import * as subscribe from "./subscribe";
@@ -22,6 +23,7 @@ import * as system from "./system";
import * as ticket from "./ticket";
import * as tool from "./tool";
import * as user from "./user";
import * as withdrawal from "./withdrawal";
export default {
ads,
announcement,
@@ -36,6 +38,7 @@ export default {
marketing,
order,
payment,
promo,
redemption,
server,
subscribe,
@@ -43,4 +46,5 @@ export default {
ticket,
tool,
user,
withdrawal,
};
+19
View File
@@ -0,0 +1,19 @@
/* eslint-disable */
import request from "@workspace/ui/lib/request";
/** Get global invite list GET /v1/admin/invite/list */
export async function getAdminInviteList(
params: API.GetAdminInviteListParams,
options?: Record<string, unknown>
) {
return request<API.Response & { data?: API.GetAdminInviteListResponse }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/invite/list`,
{
method: "GET",
params: {
...params,
},
...(options || {}),
}
);
}
+18
View File
@@ -78,3 +78,21 @@ export async function activateOrder(
}
);
}
/** Refund order POST /v1/admin/order/refund */
export async function refundOrder(
body: API.RefundOrderRequest,
options?: { [key: string]: any }
) {
return request<API.Response & { data?: any }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/order/refund`,
{
method: "POST",
headers: {
"Content-Type": "application/json",
},
data: body,
...(options || {}),
}
);
}
+150
View File
@@ -0,0 +1,150 @@
/* eslint-disable */
import request from "@workspace/ui/lib/request";
/** Create promo rule POST /v1/admin/promo/rule */
export async function createPromoRule(
body: API.CreatePromoRuleRequest,
options?: Record<string, unknown>
) {
return request<API.Response & { data?: API.PromoRule }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/promo/rule`,
{
method: "POST",
headers: {
"Content-Type": "application/json",
},
data: body,
...(options || {}),
}
);
}
/** Get promo rule list GET /v1/admin/promo/rule/list */
export async function getPromoRuleList(
params: API.GetPromoRuleListParams,
options?: Record<string, unknown>
) {
return request<API.Response & { data?: API.GetPromoRuleListResponse }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/promo/rule/list`,
{
method: "GET",
params: {
...params,
},
...(options || {}),
}
);
}
/** Get promo rule detail GET /v1/admin/promo/rule/:id */
export async function getPromoRuleDetail(
params: API.GetPromoRuleDetailParams,
options?: Record<string, unknown>
) {
return request<API.Response & { data?: API.PromoRule }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/promo/rule/${params.id}`,
{
method: "GET",
...(options || {}),
}
);
}
/** Update promo rule PUT /v1/admin/promo/rule/:id */
export async function updatePromoRule(
params: API.UpdatePromoRuleParams,
body: API.UpdatePromoRuleRequest,
options?: Record<string, unknown>
) {
return request<API.Response & { data?: API.PromoRule }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/promo/rule/${params.id}`,
{
method: "PUT",
headers: {
"Content-Type": "application/json",
},
data: body,
...(options || {}),
}
);
}
/** Delete promo rule DELETE /v1/admin/promo/rule/:id */
export async function deletePromoRule(
params: API.DeletePromoRuleParams,
options?: Record<string, unknown>
) {
return request<API.Response & { data?: unknown }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/promo/rule/${params.id}`,
{
method: "DELETE",
...(options || {}),
}
);
}
/** Create promo price POST /v1/admin/promo/price */
export async function createPromoPrice(
body: API.CreatePromoPriceRequest,
options?: Record<string, unknown>
) {
return request<API.Response & { data?: API.PromoPrice }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/promo/price`,
{
method: "POST",
headers: {
"Content-Type": "application/json",
},
data: body,
...(options || {}),
}
);
}
/** Get promo price list GET /v1/admin/promo/price/list */
export async function getPromoPriceList(
params: API.GetPromoPriceListParams,
options?: Record<string, unknown>
) {
return request<API.Response & { data?: API.GetPromoPriceListResponse }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/promo/price/list`,
{
method: "GET",
params: {
...params,
},
...(options || {}),
}
);
}
/** Delete promo price DELETE /v1/admin/promo/price/:id */
export async function deletePromoPrice(
params: API.DeletePromoPriceParams,
options?: Record<string, unknown>
) {
return request<API.Response & { data?: unknown }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/promo/price/${params.id}`,
{
method: "DELETE",
...(options || {}),
}
);
}
/** Get promo usage list GET /v1/admin/promo/usage/list */
export async function getPromoUsageList(
params: API.GetPromoUsageListParams,
options?: Record<string, unknown>
) {
return request<API.Response & { data?: API.GetPromoUsageListResponse }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/promo/usage/list`,
{
method: "GET",
params: {
...params,
},
...(options || {}),
}
);
}
+229 -9
View File
@@ -106,6 +106,10 @@ declare namespace API {
port: number;
};
type ApproveWithdrawalRequest = {
withdrawal_id: number;
};
type AuthConfig = {
mobile: MobileAuthenticateConfig;
email: EmailAuthticateConfig;
@@ -268,6 +272,69 @@ declare namespace API {
enabled: boolean;
};
type PromoRuleType = "new_user" | "inactive_user" | "campaign";
type PromoRuleParams = {
inactive_months?: number;
window_hours?: number;
[key: string]: unknown;
};
type PromoRule = {
id: number;
name: string;
type: PromoRuleType;
params: PromoRuleParams;
priority: number;
enabled: boolean;
start_time?: number;
end_time?: number;
created_at?: number;
updated_at?: number;
};
type CreatePromoRuleRequest = {
name: string;
type: PromoRuleType;
params: PromoRuleParams;
priority: number;
enabled: boolean;
start_time?: number;
end_time?: number;
};
type UpdatePromoRuleRequest = CreatePromoRuleRequest;
type PromoPrice = {
id: number;
rule_id: number;
subscribe_id: number;
subscribe_name?: string;
unit_price: number;
promo_price: number;
created_at?: number;
updated_at?: number;
};
type CreatePromoPriceRequest = {
rule_id: number;
subscribe_id: number;
promo_price: number;
};
type PromoUsage = {
id: number;
rule_id: number;
rule_name?: string;
subscribe_id: number;
subscribe_name?: string;
user_id: number;
order_no: string;
unit_price: number;
promo_price: number;
used_at: number;
};
type CreateOrderRequest = {
user_id: number;
type: number;
@@ -394,6 +461,11 @@ declare namespace API {
expired_at: number;
traffic: number;
subscribe_id: number;
speed_limit?: number;
traffic_limit?: number;
device_limit?: number;
upload?: number;
download?: number;
};
type CurrencyConfig = {
@@ -456,7 +528,7 @@ declare namespace API {
};
type DeleteUserSubscribeRequest = {
user_subscribe_id: string;
user_subscribe_id: number;
};
type DeviceAuthticateConfig = {
@@ -922,6 +994,61 @@ declare namespace API {
list: Coupon[];
};
type GetPromoRuleListParams = {
page: number;
size: number;
type?: PromoRuleType;
enabled?: boolean;
search?: string;
};
type GetPromoRuleListResponse = {
total: number;
list: PromoRule[];
};
type GetPromoRuleDetailParams = {
id: number;
};
type UpdatePromoRuleParams = {
id: number;
};
type DeletePromoRuleParams = {
id: number;
};
type GetPromoPriceListParams = {
page: number;
size: number;
rule_id?: number;
subscribe_id?: number;
};
type GetPromoPriceListResponse = {
total: number;
list: PromoPrice[];
};
type DeletePromoPriceParams = {
id: number;
};
type GetPromoUsageListParams = {
page: number;
size: number;
rule_id?: number;
subscribe_id?: number;
user_id?: number;
order_no?: string;
};
type GetPromoUsageListResponse = {
total: number;
list: PromoUsage[];
};
type GetDetailRequest = {
id: number;
};
@@ -1154,6 +1281,19 @@ declare namespace API {
list: User[];
};
type GetWithdrawalListParams = {
page: number;
size: number;
user_id?: number;
status?: number;
method?: number;
};
type GetWithdrawalListResponse = {
total: number;
list: WithdrawalLog[];
};
type GetUserLoginLogsParams = {
page: number;
size: number;
@@ -1423,6 +1563,7 @@ declare namespace API {
fee_amount: number;
trade_no: string;
status: number;
status_name?: string;
subscribe_id: number;
created_at: number;
updated_at: number;
@@ -1446,6 +1587,7 @@ declare namespace API {
fee_amount: number;
trade_no: string;
status: number;
status_name?: string;
subscribe_id: number;
subscribe: Subscribe;
created_at: number;
@@ -1791,6 +1933,8 @@ declare namespace API {
trial_subscribe: number;
trial_time: number;
trial_time_unit: string;
enable_trial_email_whitelist: boolean;
trial_email_domain_whitelist: string;
enable_ip_register_limit: boolean;
ip_register_limit: number;
ip_register_limit_duration: number;
@@ -1850,11 +1994,11 @@ declare namespace API {
};
type ResetUserSubscribeTokenRequest = {
user_subscribe_id: any;
user_subscribe_id: number;
};
type ResetUserSubscribeTrafficRequest = {
user_subscribe_id: string;
user_subscribe_id: number;
};
type Response = {
@@ -2076,6 +2220,7 @@ declare namespace API {
type SubscribeDiscount = {
quantity: number;
discount: number;
map_apple?: string;
};
type SubscribeGroup = {
@@ -2177,7 +2322,7 @@ declare namespace API {
};
type ToggleUserSubscribeStatusRequest = {
user_subscribe_id: any;
user_subscribe_id: number;
};
type TosConfig = {
@@ -2406,12 +2551,16 @@ declare namespace API {
};
type UpdateUserSubscribeRequest = {
user_subscribe_id: string;
user_id?: number;
user_subscribe_id: number;
subscribe_id: number;
traffic: number;
expired_at: number;
upload: number;
download: number;
speed_limit?: number;
traffic_limit?: number;
device_limit?: number;
};
type User = {
@@ -2431,10 +2580,11 @@ declare namespace API {
enable_login_notify: boolean;
enable_subscribe_notify: boolean;
enable_trade_notify: boolean;
user_group_id: string;
user_group_id: number;
group_locked: boolean;
auth_methods: UserAuthMethod[];
user_devices: UserDevice[];
remark: string;
rules: string[];
created_at: number;
updated_at: number;
@@ -2499,11 +2649,16 @@ declare namespace API {
finished_at: number;
reset_time: number;
traffic: number;
traffic_limit?: number;
speed_limit?: number;
device_limit?: number;
download: number;
upload: number;
token: string;
status: number;
short: string;
node_group_id?: number;
node_group_name?: string;
created_at: number;
updated_at: number;
};
@@ -2519,10 +2674,20 @@ declare namespace API {
expire_time: number;
reset_time: number;
traffic: number;
traffic_limit?: number;
speed_limit?: number;
device_limit?: number;
download: number;
upload: number;
token: string;
status: number;
effective_speed: number;
is_throttled: boolean;
throttle_rule?: string;
throttle_start?: number;
throttle_end?: number;
node_group_id?: number;
node_group_name?: string;
created_at: number;
updated_at: number;
};
@@ -2710,10 +2875,44 @@ declare namespace API {
list: AdminInvitedUser[];
};
type GetAdminInviteListParams = {
page: number;
size: number;
search?: string;
inviter_id?: number;
invitee_id?: number;
};
type AdminInviteRelation = {
id?: string;
inviter_id: number;
inviter_identifier: string;
invitee_id: number;
invitee_identifier: string;
invitee_avatar: string;
invitee_enable: boolean;
invited_at: number;
order_count: number;
has_purchased: boolean;
inviter_commission: number;
inviter_gift_days: number;
invitee_gift_days: number;
};
type GetAdminInviteListResponse = {
total: number;
list: AdminInviteRelation[];
};
type ActivateOrderRequest = {
order_no: string;
};
type RefundOrderRequest = {
id: number;
reason?: string;
};
type RedemptionCode = {
id: number;
code: string;
@@ -2824,7 +3023,7 @@ declare namespace API {
type SubscribeGroupMapping = {
subscribe_id: number;
user_group_id: string;
user_group_id: number;
created_at: number;
updated_at: number;
};
@@ -2856,8 +3055,8 @@ declare namespace API {
type GroupHistoryDetailItem = {
id: number;
history_id: number;
user_group_id: string;
node_group_id: string;
user_group_id: number;
node_group_id: number;
user_count: number;
node_count: number;
user_data?: string;
@@ -3034,6 +3233,11 @@ declare namespace API {
confirm: boolean;
};
type RejectWithdrawalRequest = {
withdrawal_id: number;
reason: string;
};
type PreviewUserNodesRequest = {
user_id: number;
};
@@ -3051,4 +3255,20 @@ declare namespace API {
}>;
}>;
};
type WithdrawalLog = {
id: number;
user_id: number;
amount: number;
method: number;
account?: string;
qr_code_url?: string;
content?: string;
status: number;
reason?: string;
created_at: number;
updated_at: number;
};
type AdminWithdrawalLog = WithdrawalLog;
}
+9 -1
View File
@@ -1,6 +1,14 @@
/* eslint-disable */
import request from "@workspace/ui/lib/request";
export type UpdateUserBasicInfoBody = Omit<
API.UpdateUserBasiceInfoRequest,
"password"
> & {
password?: string;
remark?: string;
};
/** Create user POST /v1/admin/user/ */
export async function createUser(
body: API.CreateUserRequest,
@@ -104,7 +112,7 @@ export async function deleteUserAuthMethod(
/** Update user basic info PUT /v1/admin/user/basic */
export async function updateUserBasicInfo(
body: API.UpdateUserBasiceInfoRequest,
body: UpdateUserBasicInfoBody,
options?: { [key: string]: any }
) {
return request<API.Response & { data?: any }>(
@@ -0,0 +1,55 @@
/* eslint-disable */
import request from "@workspace/ui/lib/request";
/** Get withdrawal list GET /v1/admin/user/withdrawal/list */
export async function getWithdrawalList(
params: API.GetWithdrawalListParams,
options?: { [key: string]: any }
) {
return request<API.Response & { data?: API.GetWithdrawalListResponse }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/user/withdrawal/list`,
{
method: "GET",
params: {
...params,
},
...(options || {}),
}
);
}
/** Approve withdrawal POST /v1/admin/user/withdrawal/approve */
export async function approveWithdrawal(
body: API.ApproveWithdrawalRequest,
options?: { [key: string]: any }
) {
return request<API.Response & { data?: any }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/user/withdrawal/approve`,
{
method: "POST",
headers: {
"Content-Type": "application/json",
},
data: body,
...(options || {}),
}
);
}
/** Reject withdrawal POST /v1/admin/user/withdrawal/reject */
export async function rejectWithdrawal(
body: API.RejectWithdrawalRequest,
options?: { [key: string]: any }
) {
return request<API.Response & { data?: any }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/admin/user/withdrawal/reject`,
{
method: "POST",
headers: {
"Content-Type": "application/json",
},
data: body,
...(options || {}),
}
);
}
-1
View File
@@ -1,4 +1,3 @@
// @ts-expect-error
/* eslint-disable */
import request from "@workspace/ui/lib/request";
+1
View File
@@ -909,6 +909,7 @@ declare namespace API {
type SubscribeDiscount = {
quantity: number;
discount: number;
map_apple?: string;
};
type SubscribeGroup = {
@@ -1,4 +1,3 @@
// @ts-expect-error
/* eslint-disable */
import request from "@workspace/ui/lib/request";
@@ -1,4 +1,3 @@
// @ts-expect-error
/* eslint-disable */
import request from "@workspace/ui/lib/request";
-1
View File
@@ -1,4 +1,3 @@
// @ts-expect-error
/* eslint-disable */
import request from "@workspace/ui/lib/request";
-1
View File
@@ -1,4 +1,3 @@
// @ts-expect-error
/* eslint-disable */
import request from "@workspace/ui/lib/request";
@@ -1,4 +1,3 @@
// @ts-expect-error
/* eslint-disable */
import request from "@workspace/ui/lib/request";
-1
View File
@@ -1,4 +1,3 @@
// @ts-expect-error
/* eslint-disable */
import request from "@workspace/ui/lib/request";
+21 -2
View File
@@ -172,7 +172,14 @@ declare namespace API {
type CommissionWithdrawRequest = {
amount: number;
content: string;
method: number;
account?: string;
qr_code_url?: string;
content?: string;
};
type WithdrawalCancelRequest = {
withdrawal_id: number;
};
type Coupon = {
@@ -846,6 +853,14 @@ declare namespace API {
order_no: string;
};
type RedeemCodeRequest = {
code: string;
};
type RedeemCodeResponse = {
message: string;
};
type RegisterConfig = {
stop_register: boolean;
enable_trial: boolean;
@@ -1003,6 +1018,7 @@ declare namespace API {
type SubscribeDiscount = {
quantity: number;
discount: number;
map_apple?: string;
};
type SubscribeGroup = {
@@ -1287,7 +1303,10 @@ declare namespace API {
id: number;
user_id: number;
amount: number;
content: string;
method: number;
account?: string;
qr_code_url?: string;
content?: string;
status: number;
reason?: string;
created_at: number;
+51
View File
@@ -251,6 +251,24 @@ export async function updateUserPassword(
);
}
/** Redeem Code POST /v1/public/redemption/ */
export async function redeemCode(
body: API.RedeemCodeRequest,
options?: { [key: string]: any }
) {
return request<API.Response & { data?: API.RedeemCodeResponse }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/public/redemption/`,
{
method: "POST",
headers: {
"Content-Type": "application/json",
},
data: body,
...(options || {}),
}
);
}
/** Update User Rules PUT /v1/public/user/rules */
export async function updateUserRules(
body: API.UpdateUserRulesRequest,
@@ -452,3 +470,36 @@ export async function queryWithdrawalLog(
}
);
}
/** Cancel Withdrawal POST /v1/public/user/withdrawal_cancel */
export async function withdrawalCancel(
body: API.WithdrawalCancelRequest,
options?: { [key: string]: any }
) {
return request<API.Response & { data?: any }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/public/user/withdrawal_cancel`,
{
method: "POST",
headers: {
"Content-Type": "application/json",
},
data: body,
...(options || {}),
}
);
}
/** Upload File POST /v1/public/file/upload */
export async function uploadFile(
formData: FormData,
options?: { [key: string]: any }
) {
return request<API.Response & { data?: { url: string; key: string } }>(
`${import.meta.env.VITE_API_PREFIX || ""}/v1/public/file/upload`,
{
method: "POST",
data: formData,
...(options || {}),
}
);
}
+18
View File
@@ -31,3 +31,21 @@ export function shortenDeviceIdentifier(identifier: string): string {
.slice(0, 8)
.toUpperCase();
}
/**
* 从 User-Agent 字符串解析设备平台类型
* 与后端 parseDeviceType 逻辑保持一致
* @param userAgent - 设备的 User-Agent 字符串
* @returns 设备平台类型字符串,如 "iPhone"、"Android" 等,未识别时返回空字符串
*/
export function parseDeviceType(userAgent: string): string {
if (!userAgent) return "";
const ua = userAgent.toLowerCase();
if (ua.includes("iphone")) return "iPhone";
if (ua.includes("ipad")) return "iPad";
if (ua.includes("android")) return "Android";
if (ua.includes("windows")) return "Windows";
if (ua.includes("macintosh") || ua.includes("mac os")) return "Mac";
if (ua.includes("linux")) return "Linux";
return "";
}