From d8422665712f4e8b4a65be584a6d1924519f0181 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sun, 06 Jan 2019 02:02:10 +0000
Subject: [PATCH] Embedded job monitor displays now only jobs of current repo.
---
borgbutler-webapp/src/components/views/jobs/JobMonitorPanel.jsx | 7 +++++--
borgbutler-webapp/src/components/views/archives/FileListPanel.jsx | 2 +-
borgbutler-webapp/src/components/views/archives/ArchiveView.jsx | 3 ++-
borgbutler-webapp/src/components/views/repos/RepoArchiveListView.jsx | 2 +-
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/borgbutler-webapp/src/components/views/archives/ArchiveView.jsx b/borgbutler-webapp/src/components/views/archives/ArchiveView.jsx
index d239550..dac9fc4 100644
--- a/borgbutler-webapp/src/components/views/archives/ArchiveView.jsx
+++ b/borgbutler-webapp/src/components/views/archives/ArchiveView.jsx
@@ -63,7 +63,7 @@
let pageHeader = '';
if (this.state.isFetching) {
- content = <JobMonitorPanel/>;
+ content = <JobMonitorPanel repo={this.state.repoId} />;
} else if (this.state.failed) {
content = <ErrorAlert
title={'Cannot load Repositories'}
@@ -101,6 +101,7 @@
<TabContent activeTab={this.state.activeTab}>
<TabPane tabId={'1'}>
<FileListPanel
+ repoId={this.state.repoId}
archiveId={archive.id}
archiveShortInfoList={archive.archiveShortInfoList}
/>
diff --git a/borgbutler-webapp/src/components/views/archives/FileListPanel.jsx b/borgbutler-webapp/src/components/views/archives/FileListPanel.jsx
index be2c9ea..fd3f6e4 100644
--- a/borgbutler-webapp/src/components/views/archives/FileListPanel.jsx
+++ b/borgbutler-webapp/src/components/views/archives/FileListPanel.jsx
@@ -80,7 +80,7 @@
let breadcrumb = undefined;
if (this.state.isFetching) {
- content = <JobMonitorPanel />;
+ content = <JobMonitorPanel repo={this.props.repoId} />;
} else if (this.state.failed) {
content = <ErrorAlert
title={'Cannot load Archive file list'}
diff --git a/borgbutler-webapp/src/components/views/jobs/JobMonitorPanel.jsx b/borgbutler-webapp/src/components/views/jobs/JobMonitorPanel.jsx
index 4f6d9c4..35d41f1 100644
--- a/borgbutler-webapp/src/components/views/jobs/JobMonitorPanel.jsx
+++ b/borgbutler-webapp/src/components/views/jobs/JobMonitorPanel.jsx
@@ -32,6 +32,7 @@
failed: false
});
fetch(getRestServiceUrl('jobs', {
+ repo: this.props.repo,
testMode: this.state.testMode
}), {
method: 'GET',
@@ -121,11 +122,13 @@
}
JobMonitorPanel.propTypes = {
- embedded: PropTypes.bool
+ embedded: PropTypes.bool,
+ repo: PropTypes.string
};
JobMonitorPanel.defaultProps = {
- embedded: true
+ embedded: true,
+ repo: null
};
diff --git a/borgbutler-webapp/src/components/views/repos/RepoArchiveListView.jsx b/borgbutler-webapp/src/components/views/repos/RepoArchiveListView.jsx
index b047446..b2d5fba 100644
--- a/borgbutler-webapp/src/components/views/repos/RepoArchiveListView.jsx
+++ b/borgbutler-webapp/src/components/views/repos/RepoArchiveListView.jsx
@@ -65,7 +65,7 @@
let pageHeader = '';
if (this.state.isFetching) {
- content = <JobMonitorPanel />;
+ content = <JobMonitorPanel repo={this.state.id} />;
} else if (this.state.failed) {
content = <ErrorAlert
title={'Cannot load Repositories'}
--
Gitblit v1.10.0