From 3c111895a8b56a54ae0e5d3296bfbb8fe0bb3715 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sun, 06 Jan 2019 00:54:00 +0000
Subject: [PATCH] JobMonitor is now embedded.
---
borgbutler-webapp/src/components/views/jobs/JobMonitorPanel.jsx | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/borgbutler-webapp/src/components/views/jobs/JobMonitorPanel.jsx b/borgbutler-webapp/src/components/views/jobs/JobMonitorPanel.jsx
index 9ba856e..4f6d9c4 100644
--- a/borgbutler-webapp/src/components/views/jobs/JobMonitorPanel.jsx
+++ b/borgbutler-webapp/src/components/views/jobs/JobMonitorPanel.jsx
@@ -3,6 +3,7 @@
import {getRestServiceUrl, isDevelopmentMode} from "../../../utilities/global";
import JobQueue from "./JobQueue";
import ErrorAlert from "../archives/ArchiveView";
+import PropTypes from "prop-types";
class JobMonitorPanel extends React.Component {
state = {
@@ -71,11 +72,12 @@
content = <React.Fragment>
{this.state.queues
.map((queue) => <JobQueue
+ embedded={this.props.embedded}
queue={queue}
key={queue.repo}
/>)}
</React.Fragment>;
- } else if (isDevelopmentMode()) {
+ } else if (isDevelopmentMode() && !this.props.embedded) {
content = <React.Fragment>No jobs are running or queued.<br/><br/>
<Button color="primary" onClick={this.toggleTestMode}>Test mode</Button>
</React.Fragment>
@@ -83,7 +85,7 @@
content = <React.Fragment>No jobs are running or queued.</React.Fragment>
}
}
- if (isDevelopmentMode()) {
+ if (isDevelopmentMode() && !this.props.embedded) {
todo = <React.Fragment><br/>
<code>
<h2>To-do</h2>
@@ -118,4 +120,13 @@
}
}
+JobMonitorPanel.propTypes = {
+ embedded: PropTypes.bool
+};
+
+JobMonitorPanel.defaultProps = {
+ embedded: true
+};
+
+
export default JobMonitorPanel;
\ No newline at end of file
--
Gitblit v1.10.0