From 60cbf9cab14aa492899699e505501d144d30ca14 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Tue, 15 Jan 2019 23:39:20 +0000
Subject: [PATCH] Show old jobs...
---
borgbutler-webapp/src/components/views/jobs/Job.jsx | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/borgbutler-webapp/src/components/views/jobs/Job.jsx b/borgbutler-webapp/src/components/views/jobs/Job.jsx
index dcf01f4..c069fd8 100644
--- a/borgbutler-webapp/src/components/views/jobs/Job.jsx
+++ b/borgbutler-webapp/src/components/views/jobs/Job.jsx
@@ -39,6 +39,14 @@
render() {
let content = undefined;
let job = this.props.job;
+ let cancelDisabled = undefined;
+ if ((job.status !== 'RUNNING' && job.status !== 'QUEUED') || job.cancellationRequested) {
+ cancelDisabled = true;
+ }
+ let cancelButton = <div className="job-cancel"><Button color={'danger'}
+ onClick={() => this.cancelJob(job.uniqueJobNumber)}
+ disabled={cancelDisabled}><IconCancel/></Button>
+ </div>;
if (job.status === 'RUNNING') {
let progressPercent = 100;
let color = 'success';
@@ -49,13 +57,15 @@
progressPercent = job.progressPercent;
}
content = <Progress animated color={color} value={progressPercent}>{job.progressText}</Progress>;
+ } else if (job.status === 'CANCELLED') {
+ content = <Progress color={'warning'} value={100}>{job.status}</Progress>
+ cancelButton = '';
+ } else if (job.status === 'DONE') {
+ content = <Progress color={'success'} value={100}>{job.status}</Progress>
+ cancelButton = '';
} else {
content = <Progress color={'info'} value={100}>{job.status}</Progress>
}
- let cancelDisabled = undefined;
- if ((job.status !== 'RUNNING' && job.status !== 'QUEUED') || job.cancellationRequested) {
- cancelDisabled = true;
- }
let environmentVariables = '';
if (job.environmentVariables && Array.isArray(job.environmentVariables)) {
environmentVariables = job.environmentVariables.map((variable, index) => <React.Fragment key={index}>
@@ -70,10 +80,7 @@
<Button color="link" onClick={this.toggle}>{job.description}</Button>
{content}
</div>
- <div className="job-cancel"><Button color={'danger'}
- onClick={() => this.cancelJob(job.uniqueJobNumber)}
- disabled={cancelDisabled}><IconCancel/></Button>
- </div>
+ {cancelButton}
</div>
<Collapse isOpen={this.state.collapse}>
<Card>
--
Gitblit v1.10.0