From 88c5085ce1689e2fcd0cdaa1bc24dae26d7b60a7 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sun, 16 Dec 2018 15:55:08 +0000
Subject: [PATCH] ...
---
borgbutler-webapp/src/components/views/archives/FileListEntry.jsx | 3 ++-
borgbutler-webapp/src/components/views/archives/FileListPanel.jsx | 16 +++++++++++-----
borgbutler-webapp/src/components/views/archives/ArchiveView.jsx | 2 +-
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/borgbutler-webapp/src/components/views/archives/ArchiveView.jsx b/borgbutler-webapp/src/components/views/archives/ArchiveView.jsx
index 2ffe1d0..37dac71 100644
--- a/borgbutler-webapp/src/components/views/archives/ArchiveView.jsx
+++ b/borgbutler-webapp/src/components/views/archives/ArchiveView.jsx
@@ -23,7 +23,7 @@
fetchArchive = (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...')) {
+ if (force && window.confirm('Are you sure you want to reload the archive info? This may take some time...')) {
forceReload = true;
}
this.setState({
diff --git a/borgbutler-webapp/src/components/views/archives/FileListEntry.jsx b/borgbutler-webapp/src/components/views/archives/FileListEntry.jsx
index a58e1bf..d994b4b 100644
--- a/borgbutler-webapp/src/components/views/archives/FileListEntry.jsx
+++ b/borgbutler-webapp/src/components/views/archives/FileListEntry.jsx
@@ -1,13 +1,14 @@
import React from 'react';
import PropTypes from 'prop-types';
import Highlight from 'react-highlighter';
+import {humanFileSize} from '../../../utilities/global';
function FileListEntry({entry, search}) {
return (
<tr>
<td className={'tt'}>{entry.mode}</td>
<td className={'tt'}>{entry.mtime}</td>
- <td className={'tt'}>{entry.size}</td>
+ <td className={'tt'}>{humanFileSize(entry.size, true, true)}</td>
<td className={'tt'}><Highlight search={search}>{entry.path}</Highlight></td>
</tr>
);
diff --git a/borgbutler-webapp/src/components/views/archives/FileListPanel.jsx b/borgbutler-webapp/src/components/views/archives/FileListPanel.jsx
index 0a9275b..fb8e2e2 100644
--- a/borgbutler-webapp/src/components/views/archives/FileListPanel.jsx
+++ b/borgbutler-webapp/src/components/views/archives/FileListPanel.jsx
@@ -7,7 +7,7 @@
state = {
isFetching: false, activeTab: '1',
- fileList : undefined
+ fileList: undefined
};
componentDidMount = () => {
@@ -58,10 +58,16 @@
}}
/>;
} else if (this.state.fileList) {
- content = <React.Fragment>
- <FileListTable
- entries={this.state.fileList}/>
- </React.Fragment>;
+ if (this.state.fileList.length > 0) {
+ content = <React.Fragment>
+ <FileListTable
+ entries={this.state.fileList}/>
+ </React.Fragment>;
+ } else {
+ content = <React.Fragment>
+ Not yet loaded.
+ </React.Fragment>;
+ }
}
return <React.Fragment>
{content}
--
Gitblit v1.10.0