基于 WEB-UI-Development-Guide 标准的整体升级,并更名 LokiDeploy → opsx-loki。 前端(Gin+React+shadcn/ui): - 按 02/07 章重构:页面域化拆分(无超 400 行文件)、PageContainer/ListQuery、 反馈分级(成功静默/失败 toast/危险确认)、401 单飞刷新+队列重放 - 暗色模式(next-themes)+ 语义 Token(--primary 品牌色/success/warning/info) - 部署向导(状态推导四步:环境→存储→Loki→采集,内嵌表单闭环) - 日志查询页:LogQL 标签构建器/拖拽直方图/日志上下文/Live Tail/查询历史 - 按用户+标签策略的查询授权(服务端强制合并策略) 后端(Go+Gin+JSON DB): - 简单用户管理(仅 admin,无 RBAC)+ TokenVersion 会话吊销 + 登录 IP 限流 - LDAP 接入:配置(AES 加密存储/hasPassword 脱敏)/测试连接/批量导入/登录 - 存储配置测试连接(SigV4 零依赖)+ 桶不存在自动创建 - Loki 三模式部署修复:SSH 密钥认证、3.x 配置模板、ruler 对象存储嵌套块、 凭证解密、孤儿 deploying 状态恢复、Grafana 部署(可选默认关)+面板导入 - DaemonSet 采集纯 YAML(去 helm 依赖)+ DNS 自愈回退 ClusterIP + 集群名标签 - 日志查询代理:cluster-svc 经 kube-apiserver proxy/url 直连 + cursor 翻页 - 统一 log 命名空间;部署就绪探活;Grafana 访问地址自动记录 修复:run.sh 增量编译检测、Sanitized 脱敏补全、LokiDeployment Update 白名单、 健康检查 CreatedAt 零值等 10+ 存量 bug。 数据兼容:DB 沿用旧 lokideploy.json(新名优先);localStorage 一次性迁移; HKDF 加密前缀保留(已加密凭证不受影响)。
204 lines
7.8 KiB
TypeScript
204 lines
7.8 KiB
TypeScript
import { memo, useCallback, useEffect, useMemo, useState } from 'react'
|
|
import { Link } from 'react-router'
|
|
import { Users, RefreshCw } from 'lucide-react'
|
|
import { Button } from '@/components/ui/button'
|
|
import { Checkbox } from '@/components/ui/checkbox'
|
|
import {
|
|
Dialog,
|
|
DialogContent,
|
|
DialogDescription,
|
|
DialogHeader,
|
|
DialogTitle,
|
|
} from '@/components/ui/dialog'
|
|
import { ScrollArea } from '@/components/ui/scroll-area'
|
|
import { ldapApi, type LdapUserPreview, type LdapImportResult } from '@/api/ldap'
|
|
import { toast } from 'sonner'
|
|
import type { User } from '@/types'
|
|
|
|
interface LdapImportDialogProps {
|
|
open: boolean
|
|
onOpenChange: (open: boolean) => void
|
|
/** 本地用户列表(用于标记已导入,禁选) */
|
|
localUsers: User[]
|
|
onImported: () => void
|
|
}
|
|
|
|
/**
|
|
* 从 LDAP 导入用户弹窗 — 打开即拉取 LDAP 用户列表;
|
|
* 已导入(LDAP 来源)置灰禁选;本地同名用户标注「将转为 LDAP」。
|
|
*/
|
|
export const LdapImportDialog = memo(function LdapImportDialog({
|
|
open,
|
|
onOpenChange,
|
|
localUsers,
|
|
onImported,
|
|
}: LdapImportDialogProps) {
|
|
const [loading, setLoading] = useState(false)
|
|
const [importing, setImporting] = useState(false)
|
|
const [users, setUsers] = useState<LdapUserPreview[]>([])
|
|
const [selected, setSelected] = useState<Set<string>>(new Set())
|
|
const [result, setResult] = useState<LdapImportResult | null>(null)
|
|
const [error, setError] = useState('')
|
|
|
|
const localMap = useMemo(() => {
|
|
const m = new Map<string, User>()
|
|
localUsers.forEach((u) => m.set(u.username, u))
|
|
return m
|
|
}, [localUsers])
|
|
|
|
const loadUsers = useCallback(async () => {
|
|
setLoading(true)
|
|
setError('')
|
|
setResult(null)
|
|
try {
|
|
const list = await ldapApi.listUsers()
|
|
setUsers(list)
|
|
setSelected(new Set())
|
|
} catch (err) {
|
|
setError(err instanceof Error ? err.message : '加载 LDAP 用户失败')
|
|
} finally {
|
|
setLoading(false)
|
|
}
|
|
}, [])
|
|
|
|
useEffect(() => {
|
|
if (open) void loadUsers()
|
|
}, [open, loadUsers])
|
|
|
|
const toggle = (username: string, disabled: boolean) => {
|
|
if (disabled) return
|
|
setSelected((prev) => {
|
|
const next = new Set(prev)
|
|
if (next.has(username)) next.delete(username)
|
|
else next.add(username)
|
|
return next
|
|
})
|
|
}
|
|
|
|
const handleImport = async () => {
|
|
const picked = users.filter((u) => selected.has(u.username))
|
|
if (picked.length === 0) return
|
|
setImporting(true)
|
|
try {
|
|
const r = await ldapApi.batchImport(
|
|
picked.map((u) => ({
|
|
dn: u.dn, username: u.username, nickname: u.displayName, email: u.email,
|
|
}))
|
|
)
|
|
setResult(r)
|
|
onImported()
|
|
} catch (err) {
|
|
toast.error(err instanceof Error ? err.message : '导入失败')
|
|
} finally {
|
|
setImporting(false)
|
|
}
|
|
}
|
|
|
|
return (
|
|
<Dialog open={open} onOpenChange={onOpenChange}>
|
|
<DialogContent className="max-w-2xl">
|
|
<DialogHeader>
|
|
<DialogTitle>从 LDAP 导入用户</DialogTitle>
|
|
<DialogDescription>
|
|
来自 LDAP 目录的用户;导入后使用 LDAP 密码登录,角色为普通用户
|
|
</DialogDescription>
|
|
</DialogHeader>
|
|
|
|
{result ? (
|
|
<div className="space-y-3">
|
|
<div className="flex items-center gap-4 text-sm">
|
|
{result.successCount > 0 && (
|
|
<span className="text-success">新增 {result.successCount}</span>
|
|
)}
|
|
{result.updatedCount > 0 && <span className="text-info">转为 LDAP {result.updatedCount}</span>}
|
|
{result.skippedCount > 0 && <span className="text-muted-foreground">跳过 {result.skippedCount}</span>}
|
|
{result.failedCount > 0 && <span className="text-destructive">失败 {result.failedCount}</span>}
|
|
</div>
|
|
{result.failedUsers.length > 0 && (
|
|
<div className="text-xs text-destructive space-y-1 max-h-32 overflow-y-auto">
|
|
{result.failedUsers.map((f) => (
|
|
<p key={f.username}>{f.username}:{f.error}</p>
|
|
))}
|
|
</div>
|
|
)}
|
|
<div className="flex justify-end gap-2">
|
|
<Button variant="outline" onClick={() => void loadUsers()}>继续导入</Button>
|
|
<Button onClick={() => onOpenChange(false)}>完成</Button>
|
|
</div>
|
|
</div>
|
|
) : (
|
|
<>
|
|
<div className="flex items-center justify-between">
|
|
<p className="text-xs text-muted-foreground">
|
|
{loading ? '加载 LDAP 用户…' : `共 ${users.length} 个用户,已选 ${selected.size} 个`}
|
|
</p>
|
|
<Button variant="ghost" size="sm" onClick={() => void loadUsers()} disabled={loading}>
|
|
<RefreshCw className={`w-3.5 h-3.5 ${loading ? 'animate-spin' : ''}`} />
|
|
</Button>
|
|
</div>
|
|
{error ? (
|
|
<div className="space-y-3">
|
|
<p className="text-sm text-destructive">{error}</p>
|
|
<p className="text-xs text-muted-foreground">
|
|
请到
|
|
<Link to="/settings" className="text-primary mx-1">系统设置</Link>
|
|
检查 LDAP 配置与启用状态
|
|
</p>
|
|
</div>
|
|
) : (
|
|
<ScrollArea className="h-72 rounded-lg border border-border">
|
|
<div className="divide-y divide-border">
|
|
{users.map((u) => {
|
|
const local = localMap.get(u.username)
|
|
const isLdapAlready = local?.['authSource'] === 'ldap'
|
|
const willConvert = !!local && !isLdapAlready
|
|
const disabled = isLdapAlready
|
|
const checked = selected.has(u.username)
|
|
return (
|
|
<label
|
|
key={u.dn}
|
|
className={`flex items-center gap-3 px-3 py-2.5 ${disabled ? 'opacity-50' : 'cursor-pointer hover:bg-muted/50'}`}
|
|
>
|
|
<Checkbox
|
|
checked={checked}
|
|
disabled={disabled}
|
|
onCheckedChange={() => toggle(u.username, disabled)}
|
|
/>
|
|
<div className="flex-1 min-w-0">
|
|
<div className="flex items-center gap-2">
|
|
<span className="text-sm font-medium">{u.username}</span>
|
|
{isLdapAlready && (
|
|
<span className="text-xs text-muted-foreground">已导入</span>
|
|
)}
|
|
{willConvert && (
|
|
<span className="text-xs text-info">本地同名,将转为 LDAP</span>
|
|
)}
|
|
</div>
|
|
<p className="text-xs text-muted-foreground truncate">
|
|
{u.displayName || '无姓名'} · {u.email || '无邮箱'}
|
|
</p>
|
|
</div>
|
|
</label>
|
|
)
|
|
})}
|
|
{!loading && users.length === 0 && (
|
|
<div className="flex items-center justify-center gap-2 py-10 text-muted-foreground text-sm">
|
|
<Users className="w-4 h-4" /> 目录下没有用户
|
|
</div>
|
|
)}
|
|
</div>
|
|
</ScrollArea>
|
|
)}
|
|
<div className="flex justify-end gap-2">
|
|
<Button variant="outline" onClick={() => onOpenChange(false)}>取消</Button>
|
|
<Button onClick={handleImport} disabled={importing || selected.size === 0}>
|
|
{importing ? '导入中...' : `导入 ${selected.size} 个用户`}
|
|
</Button>
|
|
</div>
|
|
</>
|
|
)}
|
|
</DialogContent>
|
|
</Dialog>
|
|
)
|
|
})
|