feat(jobs): 배치 작업 목록 UX 개선 및 즉시 실행 버튼 이동 (#33) #35

병합
HYOJIN feature/ISSUE-33-move-job-execute-button 에서 develop 로 2 commits 를 머지했습니다 2026-03-11 09:28:47 +09:00
2개의 변경된 파일372개의 추가작업 그리고 202개의 파일을 삭제
Showing only changes of commit cdbd7eb702 - Show all commits

파일 보기

@ -46,13 +46,6 @@ export default function Dashboard() {
const [dashboard, setDashboard] = useState<DashboardResponse | null>(null);
const [loading, setLoading] = useState(true);
// Execute Job modal
const [showExecuteModal, setShowExecuteModal] = useState(false);
const [jobs, setJobs] = useState<string[]>([]);
const [selectedJob, setSelectedJob] = useState('');
const [executing, setExecuting] = useState(false);
const [startDate, setStartDate] = useState('');
const [stopDate, setStopDate] = useState('');
const [abandoning, setAbandoning] = useState(false);
const [statistics, setStatistics] = useState<ExecutionStatisticsDto | null>(null);
const [recollectionStats, setRecollectionStats] = useState<RecollectionStatsResponse | null>(null);
@ -96,44 +89,6 @@ export default function Dashboard() {
usePoller(loadDashboard, POLLING_INTERVAL);
const handleOpenExecuteModal = async () => {
try {
const jobList = await batchApi.getJobs();
setJobs(jobList);
setSelectedJob(jobList[0] ?? '');
setShowExecuteModal(true);
} catch (err) {
showToast('작업 목록을 불러올 수 없습니다.', 'error');
console.error(err);
}
};
const handleExecuteJob = async () => {
if (!selectedJob) return;
setExecuting(true);
try {
const params: Record<string, string> = {};
if (startDate) params.startDate = startDate;
if (stopDate) params.stopDate = stopDate;
const result = await batchApi.executeJob(
selectedJob,
Object.keys(params).length > 0 ? params : undefined,
);
showToast(
result.message || `${selectedJob} 실행 요청 완료`,
'success',
);
setShowExecuteModal(false);
setStartDate('');
setStopDate('');
await loadDashboard();
} catch (err) {
showToast(`실행 실패: ${err instanceof Error ? err.message : '알 수 없는 오류'}`, 'error');
} finally {
setExecuting(false);
}
};
const handleAbandonAllStale = async () => {
setAbandoning(true);
try {
@ -173,13 +128,6 @@ export default function Dashboard() {
{/* Header */}
<div className="flex items-center justify-between flex-wrap gap-3">
<h1 className="text-2xl font-bold text-wing-text"></h1>
<button
onClick={handleOpenExecuteModal}
className="px-4 py-2 bg-wing-accent text-white font-semibold rounded-lg shadow
hover:bg-wing-accent/80 hover:shadow-lg transition-all text-sm"
>
</button>
</div>
{/* F1: Stale Execution Warning Banner */}
@ -517,73 +465,6 @@ export default function Dashboard() {
</section>
)}
{/* Execute Job Modal */}
{showExecuteModal && (
<div
className="fixed inset-0 z-50 flex items-center justify-center bg-wing-overlay"
onClick={() => setShowExecuteModal(false)}
>
<div
className="bg-wing-surface rounded-xl shadow-2xl p-6 max-w-md w-full mx-4"
onClick={(e) => e.stopPropagation()}
>
<h3 className="text-lg font-semibold text-wing-text mb-4"> </h3>
<label className="block text-sm font-medium text-wing-text mb-2">
</label>
<select
value={selectedJob}
onChange={(e) => setSelectedJob(e.target.value)}
className="w-full px-3 py-2 border border-wing-border rounded-lg text-sm
focus:ring-2 focus:ring-wing-accent focus:border-wing-accent mb-4"
>
{jobs.map((job) => (
<option key={job} value={job}>{job}</option>
))}
</select>
<label className="block text-sm font-medium text-wing-text mb-1">
<span className="text-wing-muted font-normal">()</span>
</label>
<input
type="datetime-local"
value={startDate}
onChange={(e) => setStartDate(e.target.value)}
className="w-full px-3 py-2 border border-wing-border rounded-lg text-sm
focus:ring-2 focus:ring-wing-accent focus:border-wing-accent mb-3"
/>
<label className="block text-sm font-medium text-wing-text mb-1">
<span className="text-wing-muted font-normal">()</span>
</label>
<input
type="datetime-local"
value={stopDate}
onChange={(e) => setStopDate(e.target.value)}
className="w-full px-3 py-2 border border-wing-border rounded-lg text-sm
focus:ring-2 focus:ring-wing-accent focus:border-wing-accent mb-4"
/>
<div className="flex justify-end gap-3">
<button
onClick={() => setShowExecuteModal(false)}
className="px-4 py-2 text-sm font-medium text-wing-text bg-wing-card rounded-lg
hover:bg-wing-hover transition-colors"
>
</button>
<button
onClick={handleExecuteJob}
disabled={executing || !selectedJob}
className="px-4 py-2 text-sm font-medium text-white bg-wing-accent rounded-lg
hover:bg-wing-accent/80 transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
>
{executing ? '실행 중...' : '실행'}
</button>
</div>
</div>
</div>
)}
</div>
);
}

파일 보기

@ -7,10 +7,44 @@ import { useToastContext } from '../contexts/ToastContext';
import StatusBadge from '../components/StatusBadge';
import EmptyState from '../components/EmptyState';
import LoadingSpinner from '../components/LoadingSpinner';
import { formatDateTime } from '../utils/formatters';
import { formatDateTime, calculateDuration } from '../utils/formatters';
const POLLING_INTERVAL = 30000;
type StatusFilterKey = 'ALL' | 'STARTED' | 'COMPLETED' | 'FAILED' | 'NONE';
type SortKey = 'name' | 'recent' | 'status';
type ViewMode = 'card' | 'table';
interface StatusTabConfig {
key: StatusFilterKey;
label: string;
}
const STATUS_TABS: StatusTabConfig[] = [
{ key: 'ALL', label: '전체' },
{ key: 'STARTED', label: '실행 중' },
{ key: 'COMPLETED', label: '성공' },
{ key: 'FAILED', label: '실패' },
{ key: 'NONE', label: '미실행' },
];
const STATUS_ORDER: Record<string, number> = {
FAILED: 0,
STARTED: 1,
COMPLETED: 2,
};
function getStatusOrder(job: JobDetailDto): number {
if (!job.lastExecution) return 3;
return STATUS_ORDER[job.lastExecution.status] ?? 4;
}
function matchesStatusFilter(job: JobDetailDto, filter: StatusFilterKey): boolean {
if (filter === 'ALL') return true;
if (filter === 'NONE') return job.lastExecution === null;
return job.lastExecution?.status === filter;
}
export default function Jobs() {
const navigate = useNavigate();
const { showToast } = useToastContext();
@ -18,14 +52,18 @@ export default function Jobs() {
const [jobs, setJobs] = useState<JobDetailDto[]>([]);
const [loading, setLoading] = useState(true);
const [searchTerm, setSearchTerm] = useState('');
const [statusFilter, setStatusFilter] = useState<StatusFilterKey>('ALL');
const [sortKey, setSortKey] = useState<SortKey>('name');
const [viewMode, setViewMode] = useState<ViewMode>('card');
// Execute modal
// Execute modal (individual card)
const [executeModalOpen, setExecuteModalOpen] = useState(false);
const [targetJob, setTargetJob] = useState('');
const [executing, setExecuting] = useState(false);
const [startDate, setStartDate] = useState('');
const [stopDate, setStopDate] = useState('');
const loadJobs = useCallback(async () => {
try {
const data = await batchApi.getJobsDetail();
@ -39,12 +77,48 @@ export default function Jobs() {
usePoller(loadJobs, POLLING_INTERVAL);
const filteredJobs = useMemo(() => {
if (!searchTerm.trim()) return jobs;
const term = searchTerm.toLowerCase();
return jobs.filter((job) => job.jobName.toLowerCase().includes(term));
const statusCounts = useMemo(() => {
const searchFiltered = searchTerm.trim()
? jobs.filter((job) => job.jobName.toLowerCase().includes(searchTerm.toLowerCase()))
: jobs;
return STATUS_TABS.reduce<Record<StatusFilterKey, number>>(
(acc, tab) => {
acc[tab.key] = searchFiltered.filter((job) => matchesStatusFilter(job, tab.key)).length;
return acc;
},
{ ALL: 0, STARTED: 0, COMPLETED: 0, FAILED: 0, NONE: 0 },
);
}, [jobs, searchTerm]);
const filteredJobs = useMemo(() => {
let result = jobs;
if (searchTerm.trim()) {
const term = searchTerm.toLowerCase();
result = result.filter((job) => job.jobName.toLowerCase().includes(term));
}
result = result.filter((job) => matchesStatusFilter(job, statusFilter));
result = [...result].sort((a, b) => {
if (sortKey === 'name') {
return a.jobName.localeCompare(b.jobName);
}
if (sortKey === 'recent') {
const aTime = a.lastExecution?.startTime ? new Date(a.lastExecution.startTime).getTime() : 0;
const bTime = b.lastExecution?.startTime ? new Date(b.lastExecution.startTime).getTime() : 0;
return bTime - aTime;
}
if (sortKey === 'status') {
return getStatusOrder(a) - getStatusOrder(b);
}
return 0;
});
return result;
}, [jobs, searchTerm, statusFilter, sortKey]);
const handleExecuteClick = (jobName: string) => {
setTargetJob(jobName);
setStartDate('');
@ -95,38 +169,115 @@ export default function Jobs() {
</span>
</div>
{/* Search Filter */}
{/* Status Filter Tabs */}
<div className="flex flex-wrap gap-2">
{STATUS_TABS.map((tab) => (
<button
key={tab.key}
onClick={() => setStatusFilter(tab.key)}
className={`inline-flex items-center gap-1.5 px-4 py-1.5 rounded-full text-sm font-medium transition-colors ${
statusFilter === tab.key
? 'bg-wing-accent text-white'
: 'bg-wing-card text-wing-muted hover:text-wing-text'
}`}
>
{tab.label}
<span
className={`inline-flex items-center justify-center min-w-[1.25rem] h-5 px-1 rounded-full text-xs font-semibold ${
statusFilter === tab.key
? 'bg-white/25 text-white'
: 'bg-wing-border text-wing-muted'
}`}
>
{statusCounts[tab.key]}
</span>
</button>
))}
</div>
{/* Search + Sort + View Toggle */}
<div className="bg-wing-surface rounded-xl shadow-md p-4">
<div className="relative">
<span className="absolute inset-y-0 left-3 flex items-center text-wing-muted">
<svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={2}
d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"
/>
</svg>
</span>
<input
type="text"
placeholder="작업명 검색..."
value={searchTerm}
onChange={(e) => setSearchTerm(e.target.value)}
className="w-full pl-10 pr-4 py-2 border border-wing-border rounded-lg text-sm
<div className="flex gap-3 items-center flex-wrap">
{/* Search */}
<div className="relative flex-1 min-w-[200px]">
<span className="absolute inset-y-0 left-3 flex items-center text-wing-muted">
<svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={2}
d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"
/>
</svg>
</span>
<input
type="text"
placeholder="작업명 검색..."
value={searchTerm}
onChange={(e) => setSearchTerm(e.target.value)}
className="w-full pl-10 pr-4 py-2 border border-wing-border rounded-lg text-sm
focus:ring-2 focus:ring-wing-accent focus:border-wing-accent outline-none"
/>
{searchTerm && (
<button
onClick={() => setSearchTerm('')}
className="absolute inset-y-0 right-3 flex items-center text-wing-muted hover:text-wing-text"
>
<svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M6 18L18 6M6 6l12 12" />
</svg>
</button>
)}
</div>
{/* Sort dropdown */}
<select
value={sortKey}
onChange={(e) => setSortKey(e.target.value as SortKey)}
className="px-3 py-2 border border-wing-border rounded-lg text-sm bg-wing-surface text-wing-text
focus:ring-2 focus:ring-wing-accent focus:border-wing-accent outline-none"
/>
{searchTerm && (
>
<option value="name"></option>
<option value="recent"> </option>
<option value="status">( )</option>
</select>
{/* View mode toggle */}
<div className="flex rounded-lg border border-wing-border overflow-hidden">
<button
onClick={() => setSearchTerm('')}
className="absolute inset-y-0 right-3 flex items-center text-wing-muted hover:text-wing-text"
onClick={() => setViewMode('card')}
title="카드 보기"
className={`px-3 py-2 transition-colors ${
viewMode === 'card'
? 'bg-wing-accent text-white'
: 'bg-wing-surface text-wing-muted hover:text-wing-text'
}`}
>
<svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M6 18L18 6M6 6l12 12" />
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={2}
d="M4 6a2 2 0 012-2h2a2 2 0 012 2v2a2 2 0 01-2 2H6a2 2 0 01-2-2V6zM14 6a2 2 0 012-2h2a2 2 0 012 2v2a2 2 0 01-2 2h-2a2 2 0 01-2-2V6zM4 16a2 2 0 012-2h2a2 2 0 012 2v2a2 2 0 01-2 2H6a2 2 0 01-2-2v-2zM14 16a2 2 0 012-2h2a2 2 0 012 2v2a2 2 0 01-2 2h-2a2 2 0 01-2-2v-2z"
/>
</svg>
</button>
)}
<button
onClick={() => setViewMode('table')}
title="테이블 보기"
className={`px-3 py-2 transition-colors border-l border-wing-border ${
viewMode === 'table'
? 'bg-wing-accent text-white'
: 'bg-wing-surface text-wing-muted hover:text-wing-text'
}`}
>
<svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M4 6h16M4 12h16M4 18h16" />
</svg>
</button>
</div>
</div>
{searchTerm && (
<p className="mt-2 text-xs text-wing-muted">
{filteredJobs.length}
@ -134,69 +285,206 @@ export default function Jobs() {
)}
</div>
{/* Job Cards Grid */}
{/* Job List */}
{filteredJobs.length === 0 ? (
<div className="bg-wing-surface rounded-xl shadow-md p-6">
<EmptyState
icon="🔍"
message={searchTerm ? '검색 결과가 없습니다.' : '등록된 작업이 없습니다.'}
sub={searchTerm ? '다른 검색어를 입력해 보세요.' : undefined}
message={searchTerm || statusFilter !== 'ALL' ? '검색 결과가 없습니다.' : '등록된 작업이 없습니다.'}
sub={searchTerm || statusFilter !== 'ALL' ? '다른 검색어나 필터를 사용해 보세요.' : undefined}
/>
</div>
) : (
) : viewMode === 'card' ? (
/* Card View */
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
{filteredJobs.map((job) => (
<div
key={job.jobName}
className="bg-wing-surface rounded-xl shadow-md p-6
hover:shadow-lg hover:-translate-y-0.5 transition-all"
>
<div className="flex items-start justify-between mb-3">
<h3 className="text-sm font-semibold text-wing-text break-all leading-tight">
{job.jobName}
</h3>
{job.lastExecution && (
<StatusBadge status={job.lastExecution.status} className="ml-2 shrink-0" />
)}
</div>
{filteredJobs.map((job) => {
const isRunning = job.lastExecution?.status === 'STARTED';
const duration = job.lastExecution
? calculateDuration(job.lastExecution.startTime, job.lastExecution.endTime)
: null;
const showDuration =
job.lastExecution?.endTime != null && duration !== null && duration !== '-';
{/* Job detail info */}
<div className="mb-4 space-y-1">
{job.lastExecution ? (
<p className="text-xs text-wing-muted">
: {formatDateTime(job.lastExecution.startTime)}
</p>
) : (
<p className="text-wing-muted text-xs"> </p>
)}
{job.scheduleCron && (
<p className="text-xs text-wing-muted">
:{' '}
<span className="font-mono text-xs bg-wing-card px-2 py-0.5 rounded">
{job.scheduleCron}
</span>
</p>
)}
</div>
return (
<div
key={job.jobName}
className={`bg-wing-surface rounded-xl shadow-md p-6
hover:shadow-lg hover:-translate-y-0.5 transition-all
${isRunning ? 'border-l-4 border-emerald-500' : ''}`}
>
<div className="flex items-start justify-between mb-3">
<h3 className="text-sm font-semibold text-wing-text break-all leading-tight">
{job.jobName}
</h3>
<div className="flex items-center gap-2 ml-2 shrink-0">
{isRunning && (
<span className="w-2 h-2 rounded-full bg-emerald-500 animate-pulse" />
)}
{job.lastExecution && (
<StatusBadge status={job.lastExecution.status} />
)}
</div>
</div>
<div className="flex gap-2">
<button
onClick={() => handleExecuteClick(job.jobName)}
className="flex-1 px-3 py-2 text-xs font-medium text-white bg-wing-accent rounded-lg
hover:bg-wing-accent/80 transition-colors"
>
</button>
<button
onClick={() => handleViewHistory(job.jobName)}
className="flex-1 px-3 py-2 text-xs font-medium text-wing-accent bg-wing-accent/10 rounded-lg
hover:bg-wing-accent/15 transition-colors"
>
</button>
{/* Job detail info */}
<div className="mb-4 space-y-1">
{job.lastExecution ? (
<>
<p className="text-xs text-wing-muted">
: {formatDateTime(job.lastExecution.startTime)}
</p>
{showDuration && (
<p className="text-xs text-wing-muted">
: {duration}
</p>
)}
{isRunning && !showDuration && (
<p className="text-xs text-emerald-500">
시간: 실행 ...
</p>
)}
</>
) : (
<p className="text-wing-muted text-xs"> </p>
)}
<div className="flex items-center gap-2 pt-0.5">
{job.scheduleCron ? (
<span className="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-emerald-100 text-emerald-700">
</span>
) : (
<span className="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-wing-card text-wing-muted">
</span>
)}
{job.scheduleCron && (
<span className="font-mono text-xs bg-wing-card px-2 py-0.5 rounded text-wing-muted">
{job.scheduleCron}
</span>
)}
</div>
</div>
<div className="flex gap-2">
<button
onClick={() => handleExecuteClick(job.jobName)}
className="flex-1 px-3 py-2 text-xs font-medium text-white bg-wing-accent rounded-lg
hover:bg-wing-accent/80 transition-colors"
>
</button>
<button
onClick={() => handleViewHistory(job.jobName)}
className="flex-1 px-3 py-2 text-xs font-medium text-wing-accent bg-wing-accent/10 rounded-lg
hover:bg-wing-accent/15 transition-colors"
>
</button>
</div>
</div>
</div>
))}
);
})}
</div>
) : (
/* Table View */
<div className="bg-wing-surface rounded-xl shadow-md overflow-hidden">
<div className="overflow-x-auto">
<table className="w-full text-sm">
<thead>
<tr className="border-b border-wing-border bg-wing-card">
<th className="text-left px-4 py-3 text-xs font-semibold text-wing-muted uppercase tracking-wider">
</th>
<th className="text-left px-4 py-3 text-xs font-semibold text-wing-muted uppercase tracking-wider">
</th>
<th className="text-left px-4 py-3 text-xs font-semibold text-wing-muted uppercase tracking-wider">
</th>
<th className="text-left px-4 py-3 text-xs font-semibold text-wing-muted uppercase tracking-wider">
</th>
<th className="text-left px-4 py-3 text-xs font-semibold text-wing-muted uppercase tracking-wider">
</th>
<th className="text-right px-4 py-3 text-xs font-semibold text-wing-muted uppercase tracking-wider">
</th>
</tr>
</thead>
<tbody className="divide-y divide-wing-border">
{filteredJobs.map((job) => {
const isRunning = job.lastExecution?.status === 'STARTED';
const duration = job.lastExecution
? calculateDuration(job.lastExecution.startTime, job.lastExecution.endTime)
: '-';
return (
<tr
key={job.jobName}
className={`hover:bg-wing-hover transition-colors ${
isRunning ? 'border-l-4 border-emerald-500' : ''
}`}
>
<td className="px-4 py-3 font-medium text-wing-text break-all">
<div className="flex items-center gap-2">
{isRunning && (
<span className="w-2 h-2 rounded-full bg-emerald-500 animate-pulse shrink-0" />
)}
{job.jobName}
</div>
</td>
<td className="px-4 py-3">
{job.lastExecution ? (
<StatusBadge status={job.lastExecution.status} />
) : (
<span className="text-xs text-wing-muted"></span>
)}
</td>
<td className="px-4 py-3 text-wing-muted">
{job.lastExecution
? formatDateTime(job.lastExecution.startTime)
: '-'}
</td>
<td className="px-4 py-3 text-wing-muted">
{job.lastExecution ? duration : '-'}
</td>
<td className="px-4 py-3">
{job.scheduleCron ? (
<span className="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-emerald-100 text-emerald-700">
</span>
) : (
<span className="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-wing-card text-wing-muted">
</span>
)}
</td>
<td className="px-4 py-3">
<div className="flex justify-end gap-2">
<button
onClick={() => handleExecuteClick(job.jobName)}
className="px-3 py-1.5 text-xs font-medium text-white bg-wing-accent rounded-lg
hover:bg-wing-accent/80 transition-colors"
>
</button>
<button
onClick={() => handleViewHistory(job.jobName)}
className="px-3 py-1.5 text-xs font-medium text-wing-accent bg-wing-accent/10 rounded-lg
hover:bg-wing-accent/15 transition-colors"
>
</button>
</div>
</td>
</tr>
);
})}
</tbody>
</table>
</div>
</div>
)}
@ -268,6 +556,7 @@ export default function Jobs() {
</div>
</div>
)}
</div>
);
}