diff --git a/ui/src/components/ConfirmDialog.tsx b/ui/src/components/ConfirmDialog.tsx index 597d3a1c2..e31ddee20 100644 --- a/ui/src/components/ConfirmDialog.tsx +++ b/ui/src/components/ConfirmDialog.tsx @@ -72,7 +72,7 @@ export default function ConfirmDialog({ {cancelText && ( + ) : null; + const formContent = (
@@ -376,28 +445,46 @@ export default function InstallForm({ wide title="Security Threats Detected" message={ -
-
+
+
Critical issues found during security audit
-
- {auditDialog?.findings.map((line, i) => ( -
- {line.startsWith('CRITICAL:') ? ( - CRITICAL {line.replace('CRITICAL: ', '')} - ) : line.startsWith('HIGH:') ? ( - HIGH {line.replace('HIGH: ', '')} - ) : ( - line - )} -
- ))} +
+ {auditFindings.length} {auditFindings.length === 1 ? 'finding' : 'findings'}: + {filterBadge('CRITICAL', auditCounts.CRITICAL, 'danger', 'Critical')} + {filterBadge('HIGH', auditCounts.HIGH, 'warning', 'High')} + {filterBadge('MEDIUM', auditCounts.MEDIUM, 'default', 'Medium')} + {severityFilter && ( + — showing {filteredAudit.length} + )}
-

+

+ {filteredAudit.map((f, i) => { + const s = severityStyle(f.severity); + return ( +
+ {f.skillName &&
{f.skillName}
} +
+ {f.severity} + {f.description} +
+ {f.snippets.length > 0 && ( +
+ {f.snippets.map((sn, j) => ( +
{sn}
+ ))} +
+ )} +
+ ); + })} +
+

Force install will bypass the security check. Proceed with caution.

@@ -405,7 +492,7 @@ export default function InstallForm({ confirmText="Force Install" cancelText="Cancel" onConfirm={handleAuditForce} - onCancel={() => setAuditDialog(null)} + onCancel={() => { setAuditDialog(null); setSeverityFilter(null); }} loading={auditForcing} /> ); @@ -417,29 +504,41 @@ export default function InstallForm({ wide title="Security Warnings" message={ -
-
+
+
Skill installed with audit warnings
-
- {warningDialog?.map((w, i) => { - const lines = w.split('\n'); - const header = lines[0]; - const snippet = lines.slice(1).map((l) => l.trim()).filter(Boolean).join(' '); - const isHigh = header.includes('HIGH'); +
+ {warningFindings.length} {warningFindings.length === 1 ? 'warning' : 'warnings'}: + {filterBadge('CRITICAL', warningCounts.CRITICAL, 'danger', 'Critical')} + {filterBadge('HIGH', warningCounts.HIGH, 'warning', 'High')} + {filterBadge('MEDIUM', warningCounts.MEDIUM, 'default', 'Medium')} + {severityFilter && ( + — showing {filteredWarnings.length} + )} +
+
+ {filteredWarnings.map((f, i) => { + const s = severityStyle(f.severity); return ( -
-
- - {isHigh ? 'HIGH' : 'MEDIUM'} - {' '} - {header.replace(/^audit\s+(HIGH|MEDIUM|CRITICAL):\s*/, '')} +
+ {f.skillName &&
{f.skillName}
} +
+ {f.severity} + {f.description}
- {snippet &&
{snippet}
} + {f.snippets.length > 0 && ( +
+ {f.snippets.map((sn, j) => ( +
{sn}
+ ))} +
+ )}
); })} @@ -448,8 +547,8 @@ export default function InstallForm({ } confirmText="OK" cancelText="" - onConfirm={() => setWarningDialog(null)} - onCancel={() => setWarningDialog(null)} + onConfirm={() => { setWarningDialog(null); setSeverityFilter(null); }} + onCancel={() => { setWarningDialog(null); setSeverityFilter(null); }} /> ); diff --git a/ui/src/pages/SkillsPage.tsx b/ui/src/pages/SkillsPage.tsx index 5aaf0d747..f390e1b9b 100644 --- a/ui/src/pages/SkillsPage.tsx +++ b/ui/src/pages/SkillsPage.tsx @@ -1,4 +1,5 @@ -import { useState, useMemo, forwardRef, memo } from 'react'; +import { useState, useMemo, forwardRef, memo, useEffect } from 'react'; +import { createPortal } from 'react-dom'; import { Link } from 'react-router-dom'; import { Search, @@ -10,10 +11,13 @@ import { Globe, FolderOpen, LayoutGrid, + List, Target, + ChevronLeft, + ChevronRight, } from 'lucide-react'; import { useQuery } from '@tanstack/react-query'; -import { VirtuosoGrid } from 'react-virtuoso'; +import { Virtuoso, VirtuosoGrid } from 'react-virtuoso'; import type { GridComponents } from 'react-virtuoso'; import { queryKeys, staleTimes } from '../lib/queryKeys'; import Badge from '../components/Badge'; @@ -28,7 +32,7 @@ import { radius, shadows } from '../design'; type FilterType = 'all' | 'tracked' | 'github' | 'local'; type SortType = 'name-asc' | 'name-desc' | 'newest' | 'oldest'; -type ViewType = 'grid' | 'grouped'; +type ViewType = 'grid' | 'grouped' | 'table'; const filterOptions: { key: FilterType; label: string; icon: React.ReactNode }[] = [ { key: 'all', label: 'All', icon: }, @@ -254,7 +258,15 @@ export default function SkillsPage() { const [search, setSearch] = useState(''); const [filterType, setFilterType] = useState('all'); const [sortType, setSortType] = useState('name-asc'); - const [viewType, setViewType] = useState('grid'); + const [viewType, setViewType] = useState(() => { + const saved = localStorage.getItem('skillshare:skills-view'); + return (saved === 'grid' || saved === 'grouped' || saved === 'table') ? saved : 'grid'; + }); + + const changeViewType = (v: ViewType) => { + setViewType(v); + localStorage.setItem('skillshare:skills-view', v); + }; const skills = data?.skills ?? []; @@ -364,19 +376,26 @@ export default function SkillsPage() { {/* View toggle */}
+
@@ -416,7 +435,7 @@ export default function SkillsPage() {

)} - {/* Skills grid / grouped view */} + {/* Skills grid / grouped / table view */} {filtered.length > 0 ? ( viewType === 'grid' ? ( )} /> + ) : viewType === 'grouped' ? ( + ) : ( - + ) ) : ( }) { - let globalIndex = 0; +type GroupRow = + | { type: 'header'; dir: string; count: number; showHeader: boolean } + | { type: 'cards'; skills: Skill[] }; + +function VirtualizedGroupedView({ dirs, groups }: { dirs: string[]; groups: Map }) { + const rows = useMemo(() => { + const result: GroupRow[] = []; + const showHeaders = dirs.length > 1 || (dirs.length === 1 && dirs[0] !== ''); + for (const dir of dirs) { + const skills = groups.get(dir) ?? []; + result.push({ type: 'header', dir, count: skills.length, showHeader: showHeaders }); + // Chunk skills into rows of 3 + for (let i = 0; i < skills.length; i += 3) { + result.push({ type: 'cards', skills: skills.slice(i, i + 3) }); + } + } + return result; + }, [dirs, groups]); return ( -
- {dirs.map((dir) => { - const skills = groups.get(dir) ?? []; - const sectionLabel = dir || '(root)'; - const showHeader = dirs.length > 1 || dir !== ''; - - return ( -
- {showHeader && ( -
- -

- {sectionLabel} -

- - {skills.length} - -
- )} -
- {skills.map((skill) => { - const idx = globalIndex++; - return ; - })} + { + const row = rows[index]; + if (row.type === 'header') { + if (!row.showHeader) return
; + return ( +
+ +

+ {row.dir || '(root)'} +

+ + {row.count} +
+ ); + } + return ( +
+ {row.skills.map((skill) => ( +
+ +
+ ))}
); - })} -
+ }} + /> + ); +} + +/* -- Table view with pagination ------------------- */ + +const TABLE_PAGE_SIZES = [10, 25, 50] as const; + +function TablePillButton({ + active, + onClick, + children, +}: { + active: boolean; + onClick: () => void; + children: React.ReactNode; +}) { + return ( + + ); +} + +function TruncateWithTip({ text }: { text: string }) { + const [tip, setTip] = useState<{ x: number; y: number } | null>(null); + + return ( + <> + { + const rect = e.currentTarget.getBoundingClientRect(); + setTip({ x: rect.left, y: rect.bottom + 4 }); + }} + onMouseLeave={() => setTip(null)} + > + {text} + + {tip && createPortal( +
+ {text} +
, + document.body, + )} + + ); +} + +function SkillsTable({ skills }: { skills: Skill[] }) { + const [page, setPage] = useState(0); + const [pageSize, setPageSize] = useState(10); + + useEffect(() => { setPage(0); }, [skills]); + + const totalPages = Math.max(1, Math.ceil(skills.length / pageSize)); + const start = page * pageSize; + const visible = skills.slice(start, start + pageSize); + + return ( + +
+ + + + + + + + + + + {visible.map((skill) => ( + + {/* Status stripe */} + + {/* Name */} + + {/* Path */} + + {/* Type badge */} + + {/* Source */} + + + ))} + +
+ NamePathTypeSource
+
+
+ + {skill.name} + + + + + {skill.isInRepo ? ( + tracked + ) : getTypeLabel(skill.type) ? ( + {getTypeLabel(skill.type)} + ) : ( + local + )} + + +
+
+ + {/* Pagination */} + {skills.length > TABLE_PAGE_SIZES[0] && ( +
+
+ Show + {TABLE_PAGE_SIZES.map((size) => ( + { setPageSize(size); setPage(0); }} + > + {size} + + ))} + + {start + 1}–{Math.min(start + pageSize, skills.length)} of {skills.length} + +
+ +
+ + + {page + 1} / {totalPages} + + +
+
+ )} +
); }