From 4753942a61f7ffa035c595ff18626a35112009cf Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sun, 06 Jan 2019 01:01:41 +0000
Subject: [PATCH] Job monitor is now embedded.
---
borgbutler-webapp/src/components/views/archives/FileListPanel.jsx | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/borgbutler-webapp/src/components/views/archives/FileListPanel.jsx b/borgbutler-webapp/src/components/views/archives/FileListPanel.jsx
index ce6bf87..be2c9ea 100644
--- a/borgbutler-webapp/src/components/views/archives/FileListPanel.jsx
+++ b/borgbutler-webapp/src/components/views/archives/FileListPanel.jsx
@@ -2,8 +2,9 @@
import {Button, Breadcrumb, BreadcrumbItem} from 'reactstrap';
import {getRestServiceUrl} from '../../../utilities/global';
import ErrorAlert from '../../general/ErrorAlert';
-import FileListTable from "./FileListTable";
-import FileListFilter from "./FileListFilter";
+import FileListTable from './FileListTable';
+import FileListFilter from './FileListFilter';
+import JobMonitorPanel from '../jobs/JobMonitorPanel';
class FileListPanel extends React.Component {
@@ -45,10 +46,6 @@
};
fetchArchiveFileList = (force) => {
- let forceReload = false;
- if (force && window.confirm('Are you sure you want to reload the archive file list? This may take a long time...')) {
- forceReload = true;
- }
this.setState({
isFetching: true,
failed: false
@@ -56,7 +53,7 @@
fetch(getRestServiceUrl('archives/filelist', {
archiveId: this.props.archiveId,
diffArchiveId: this.state.filter.diffArchiveId,
- force: forceReload,
+ force: force,
searchString: this.state.filter.search,
mode: this.state.filter.mode,
currentDirectory: this.state.filter.currentDirectory,
@@ -83,7 +80,7 @@
let breadcrumb = undefined;
if (this.state.isFetching) {
- content = <i>Loading...</i>;
+ content = <JobMonitorPanel />;
} else if (this.state.failed) {
content = <ErrorAlert
title={'Cannot load Archive file list'}
--
Gitblit v1.10.0