mirror of https://github.com/micromata/borgbackup-butler.git

Kai Reinhard
16.42.2018 bf3a837f8a96efc8f6163cf3870c1dd00772eace
Load button and empty search results fixed.
2 files modified
14 ■■■■ changed files
borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/ArchivesRest.java 2 ●●● patch | view | raw | blame | history
borgbutler-webapp/src/components/views/archives/FileListPanel.jsx 12 ●●●● patch | view | raw | blame | history
borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/ArchivesRest.java
@@ -62,7 +62,7 @@
        List<BorgFilesystemItem> items = ButlerCache.getInstance().getArchiveContent(archiveId, force,
                filter);
        if (items == null) {
            return "[{patch: 'notLoaded'}]";
            return "[{\"mode\": \"notLoaded\"}]";
        }
        return JsonUtils.toJson(items, prettyPrinter);
    }
borgbutler-webapp/src/components/views/archives/FileListPanel.jsx
@@ -71,7 +71,12 @@
                }}
            />;
        } else if (this.state.fileList) {
            if (this.state.fileList.length > 0) {
            if (this.state.fileList.length === 1 && this.state.fileList[0].mode === 'notLoaded') {
                content = <React.Fragment>
                    <Button outline color="primary" onClick={() => this.fetchArchiveFileList(true)}>Load file list from
                        borg backup server</Button>
                </React.Fragment>;
            } else {
                content = <React.Fragment>
                    <FileListFilter
                        filter={this.state.filter}
@@ -84,11 +89,6 @@
                    <FileListTable
                        entries={this.state.fileList}/>
                </React.Fragment>;
            } else {
                content = <React.Fragment>
                    <Button outline color="primary" onClick={() => this.fetchArchiveFileList(true)}>Load file list from
                        borg backup server</Button>
                </React.Fragment>;
            }
        }
        return <React.Fragment>