From 3b6408569b692bf2c12d8b3e355d3fba5c41a41a Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sun, 06 Jan 2019 22:08:17 +0000
Subject: [PATCH] BorgQueueStatistics
---
borgbutler-webapp/src/containers/WebApp.jsx | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/borgbutler-webapp/src/containers/WebApp.jsx b/borgbutler-webapp/src/containers/WebApp.jsx
index 0223721..639ee35 100644
--- a/borgbutler-webapp/src/containers/WebApp.jsx
+++ b/borgbutler-webapp/src/containers/WebApp.jsx
@@ -2,6 +2,7 @@
import createBrowserHistory from 'history/createBrowserHistory';
import {Route, Router, Switch} from 'react-router';
import {connect} from 'react-redux';
+import {Badge} from 'reactstrap';
import Menu from '../components/general/Menu';
import Start from '../components/views/Start';
@@ -11,7 +12,7 @@
import ConfigurationPage from '../components/views/config/ConfigurationPage';
import RestServices from '../components/views/develop/RestServices';
import JobMonitorView from '../components/views/jobs/JobMonitorView';
-import {isDevelopmentMode} from '../utilities/global';
+import {getRestServiceUrl, isDevelopmentMode} from '../utilities/global';
import LogPage from '../components/views/logging/LogPage';
import Footer from '../components/views/footer/Footer';
import {loadVersion} from '../actions';
@@ -23,13 +24,34 @@
componentDidMount = () => {
this.props.loadVersion();
+ this.interval = setInterval(() => this.fetchJobStatistics(), 5000);
+ };
+
+ fetchJobStatistics = () => {
+ fetch(getRestServiceUrl('jobs/statistics'), {
+ method: 'GET',
+ headers: {
+ 'Accept': 'application/json'
+ }
+ })
+ .then(response => response.json())
+ .then(json => {
+ this.setState({
+ statistics: json
+ });
+ })
+ .catch();
};
render() {
+ let jobsBadge = '';
+ if (this.state && this.state.statistics && this.state.statistics.numberOfRunningAndQueuedJobs > 0) {
+ jobsBadge = <Badge color="danger" pill>{this.state.statistics.numberOfRunningAndQueuedJobs}</Badge>;
+ }
let routes = [
['Start', '/', Start],
['Repositories', '/repos', RepoListView],
- ['Job monitor', '/jobmonitor', JobMonitorView],
+ ['Job monitor', '/jobmonitor', JobMonitorView, {badge: jobsBadge}],
[getTranslation('logviewer'), '/logging', LogPage],
[getTranslation('configuration'), '/config', ConfigurationPage]
];
--
Gitblit v1.10.0