Skip to content

Progress bar fix #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 19, 2025
Merged

Progress bar fix #102

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 35 additions & 36 deletions ui.frontend/src/components/ExecutionProgressBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,9 @@ interface ExecutionProgressBarProps {
const ExecutionProgressInterval = 800;

const ExecutionProgressBar: React.FC<ExecutionProgressBarProps> = ({ execution, active }) => {
const standardLabel = () => {
if (execution) {
if (isExecutionPending(execution.status)) {
return `${Strings.capitalize(execution.status)}`;
} else {
return `${Strings.capitalize(execution.status)} after ${formatter.durationShort(execution.duration)}`;
}
}
return 'Not executing';
};

const formatter = useFormatter();
const [progress, setProgress] = useState<number | null>(null);
const [label, setLabel] = useState<string>(standardLabel);
const [percentage, setPercentage] = useState<number | null>(null);
const [details, setDetails] = useState<string | null>(null);
const [scriptStats, setScriptStats] = useState<ScriptStats | null>(null);

useDeepCompareEffect(() => {
Expand All @@ -49,34 +38,44 @@ const ExecutionProgressBar: React.FC<ExecutionProgressBarProps> = ({ execution,
fetchScriptStats();
}, [execution]);

const [intervalCompleted, setIntervalCompleted] = useState(false);

useInterval(
() => {
if (execution) {
if (isExecutionPending(execution.status) && scriptStats) {
const { averageDuration } = scriptStats;
if (execution.startDate && averageDuration) {
const elapsedTime = formatter.durationTillNow(execution.startDate)!;
const percentage = Math.min((elapsedTime / averageDuration) * 100, 100);
() => {
if (execution) {
if (isExecutionPending(execution.status) && scriptStats) {
const { averageDuration } = scriptStats;
if (execution.startDate && averageDuration) {
const elapsedTime = formatter.durationTillNow(execution.startDate)!;
const percentage = Math.min((elapsedTime / averageDuration) * 100, 100);

setProgress(percentage);
setLabel(percentage >= 100 ? `${Strings.capitalize(execution.status)} - Almost done` : `${Strings.capitalize(execution.status)} - ${formatter.durationShort(averageDuration - elapsedTime)} left`);
setPercentage(percentage);
setDetails(percentage >= 100 ? `Almost done` : `${formatter.durationShort(averageDuration - elapsedTime)} left`);
} else {
setPercentage(null);
setDetails(`Stay tuned`);
}
} else {
setProgress(null);
setLabel(`${Strings.capitalize(execution.status)} - Stay tuned`);
setPercentage(null);
setDetails(null);
}
}
},
execution && isExecutionPending(execution.status) && scriptStats ? ExecutionProgressInterval : null
);

const label = (() => {
if (execution) {
if (isExecutionPending(execution.status)) {
if (details) {
return `${Strings.capitalize(execution.status)} - ${details}`;
} else {
setProgress(null);
setLabel(standardLabel);
if (!isExecutionPending(execution.status)) {
setIntervalCompleted(true);
}
return `${Strings.capitalize(execution.status)}`;
}
} else {
return `${Strings.capitalize(execution.status)} after ${formatter.durationShort(execution.duration)}`;
}
},
!intervalCompleted ? ExecutionProgressInterval : null,
);
}
return 'Not executing';
})();

const variant = ((): 'positive' | 'informative' | 'warning' | 'critical' | undefined => {
switch (execution?.status) {
Expand All @@ -97,8 +96,8 @@ const ExecutionProgressBar: React.FC<ExecutionProgressBarProps> = ({ execution,
}

if (active || isExecutionPending(execution.status)) {
if (progress !== null && progress < 100) {
return <ProgressBar minWidth="size-3000" aria-label={label} label={label} value={progress} />;
if (percentage !== null && percentage < 100) {
return <ProgressBar minWidth="size-3000" aria-label={label} label={label} value={percentage} />;
}
return <ProgressBar minWidth="size-3000" aria-label={label} showValueLabel={false} label={label} isIndeterminate />;
}
Expand Down