From c15b6b740fdb6d887aa14d3640485936fe1fccc3 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sun, 09 Dec 2018 21:54:22 +0000
Subject: [PATCH] ...
---
/dev/null | 126 ------------------------------------------
.gitignore | 1
borgbutler-webapp/src/components/general/Menu.jsx | 4 -
borgbutler-webapp/src/components/views/config/ConfigurationServerTab.jsx | 6 -
borgbutler-webapp/src/reducers/index.js | 2
borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/LoggingRest.java | 4 -
borgbutler-webapp/src/containers/WebApp.jsx | 7 --
7 files changed, 2 insertions(+), 148 deletions(-)
diff --git a/.gitignore b/.gitignore
index 853fd5c..223b030 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@
borgbutler-core/build
borgbutler-core/out
borgbutler-server/out
+borgbutler-webapp/node_modules
diff --git a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/LoggingRest.java b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/LoggingRest.java
index 8cef74f..e268a36 100644
--- a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/LoggingRest.java
+++ b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/LoggingRest.java
@@ -26,8 +26,6 @@
* @param maxSize Max size of the result list.
* @param ascendingOrder Default is false (default is descending order).
* @param lastReceivedOrderNumber The last received order number for updating log entries (preventing querying all entries again).
- * @param mdcTemplatePk
- * @param mdcTemplateDefinitionPk
* @param prettyPrinter
* @return
*/
@@ -38,8 +36,6 @@
@QueryParam("search") String search, @QueryParam("treshold") String logLevelTreshold,
@QueryParam("maxSize") Integer maxSize, @QueryParam("ascendingOrder") Boolean ascendingOrder,
@QueryParam("lastReceivedOrderNumber") Integer lastReceivedOrderNumber,
- @QueryParam("mdcTemplatePk") String mdcTemplatePk,
- @QueryParam("mdcTemplateDefinitionPk") String mdcTemplateDefinitionPk,
@QueryParam("prettyPrinter") boolean prettyPrinter) {
LogFilter filter = new LogFilter();
filter.setSearch(search);
diff --git a/borgbutler-webapp/src/components/general/Menu.jsx b/borgbutler-webapp/src/components/general/Menu.jsx
index 4980612..a9d2d51 100644
--- a/borgbutler-webapp/src/components/general/Menu.jsx
+++ b/borgbutler-webapp/src/components/general/Menu.jsx
@@ -46,7 +46,6 @@
failed: false,
isOpen: false
};
- this.uploadFile = this.uploadFile.bind(this);
}
toggle() {
@@ -70,9 +69,6 @@
))
}
</Nav>
- <DropArea id={'menuDropZone'} className={'menu'}
- upload={this.uploadFile}
- />
</Collapse>
<LoadingOverlay active={this.state.loading} />
<FailedOverlay
diff --git a/borgbutler-webapp/src/components/views/config/ConfigurationServerTab.jsx b/borgbutler-webapp/src/components/views/config/ConfigurationServerTab.jsx
index a5df501..b3b5796 100644
--- a/borgbutler-webapp/src/components/views/config/ConfigurationServerTab.jsx
+++ b/borgbutler-webapp/src/components/views/config/ConfigurationServerTab.jsx
@@ -1,6 +1,6 @@
import React from 'react';
import {Button, Collapse} from 'reactstrap';
-import DirectoryItemsFieldset from './DirectoryItemsFieldset';
+//import DirectoryItemsFieldset from './DirectoryItemsFieldset';
import {
FormButton,
FormCheckbox,
@@ -175,10 +175,6 @@
name="showTestData"
onChange={this.handleCheckboxChange}/>
</FormLabelField>
- <DirectoryItemsFieldset items={this.state.directoryItems} addItem={this.addDirectoryItem}
- removeItem={this.removeDirectoryItem}
- onDirectoryChange={this.handleDirectoryChange}
- onRecursiveFlagChange={this.handleRecursiveFlagChange}/>
<FormLabelField>
<Button className={'btn-outline-primary'}
onClick={() => this.setState({expertSettingsOpen: !this.state.expertSettingsOpen})}>
diff --git a/borgbutler-webapp/src/components/views/config/UpdatePage.jsx b/borgbutler-webapp/src/components/views/config/UpdatePage.jsx
deleted file mode 100644
index 43e53cf..0000000
--- a/borgbutler-webapp/src/components/views/config/UpdatePage.jsx
+++ /dev/null
@@ -1,126 +0,0 @@
-import React from 'react';
-import {connect} from 'react-redux';
-import {PageHeader} from '../../general/BootstrapComponents';
-import {getRestServiceUrl} from '../../../utilities/global';
-import {FormButton} from '../../general/forms/FormComponents';
-import {Table} from 'reactstrap';
-import I18n from "../../general/translation/I18n";
-
-
-class UpdatePage extends React.Component {
-
- onUpdate = () => {
- fetch(getRestServiceUrl('updates/install'), {
- method: 'GET',
- headers: {
- 'Content-Type': 'application/json'
- }
- });
- }
-
- componentDidMount() {
- fetch(getRestServiceUrl("updates/info"), {
- method: "GET",
- dataType: "JSON",
- headers: {
- "Content-Type": "text/plain; charset=utf-8"
- }
- })
- .then((resp) => {
- return resp.json();
- })
- .then((data) => {
- this.setState({
- version: data.version,
- installerUrl: data.installerUrl,
- fileSize: data.fileSize,
- filename: data.filename,
- baseUrl: data.baseUrl,
- comment: data.comment
- });
- })
- .catch((error) => {
- console.log(error, "Oups, what's happened?")
- })
- }
-
- render() {
- let content = <I18n name={'update.noUpdateAvailable'}/>;
- if (this.props.updateVersion) {
- let comment = null;
- if (this.state.comment) {
- comment = <tr>
- <th><I18n name={'common.comment'}/></th>
- <td>{this.state.comment}</td>
- </tr>;
- }
- content = <React.Fragment>
- <h2><I18n name={'update.newVersion'}/></h2>
- <I18n name={'update.newVersionAvailable'} params={[this.props.updateVersion]}/>
- <br/>
- <I18n name={'update.newVersion.simplyClickButton'} />
- <br/>
- <br/>
- <form>
- <FormButton
- onClick={this.onUpdate}
- hintKey={'update.update.button.hint'}
- >
- <I18n name={'common.update'}/>
- </FormButton>
- </form>
- <br/>
- <I18n name={'update.description.line1'}/>
- <br/>
- <I18n name={'update.description.line2'}/>
- <br/>
- <br/>
- <Table striped bordered hover size={'sm'}>
- <tbody>
- <tr>
- <th><I18n name={'version'}/></th>
- <td>{this.state.version}</td>
- </tr>
- <tr>
- <th><I18n name={'update.installerUrl'}/></th>
- <td><a href={this.state.installerUrl} target={'_new'}>{this.state.installerUrl}</a></td>
- </tr>
- <tr>
- <th><I18n name={'common.fileSize'}/></th>
- <td>{this.state.fileSize}</td>
- </tr>
- <tr>
- <th><I18n name={'common.filename'}/></th>
- <td>{this.state.filename}</td>
- </tr>
- {comment}
- </tbody>
- </Table>
-
- </React.Fragment>
- }
- return <React.Fragment>
- <PageHeader><I18n name={'update'}/></PageHeader>
- {content}
- </React.Fragment>;
- }
-
- constructor(props) {
- super(props);
- this.state = {
- version: null,
- installerUrl: null,
- baseUrl: null,
- fileSize: null,
- filename: null,
- comment: null
- }
- }
-}
-
-const mapStateToProps = state => ({
- updateVersion: state.version.updateVersion
-});
-
-export default connect(mapStateToProps, {})(UpdatePage);
-
diff --git a/borgbutler-webapp/src/containers/WebApp.jsx b/borgbutler-webapp/src/containers/WebApp.jsx
index 9c9da92..8724746 100644
--- a/borgbutler-webapp/src/containers/WebApp.jsx
+++ b/borgbutler-webapp/src/containers/WebApp.jsx
@@ -30,13 +30,6 @@
[getTranslation('configuration'), '/config', ConfigurationPage]
];
- if (this.props.version.updateVersion) {
- routes.push([getTranslation('update'), '/update', UpdatePage, {
- badge: <Badge color={'danger'}><I18n name={'common.new'}/></Badge>,
- className: 'danger'
- }]);
- }
-
if (isDevelopmentMode()) {
routes.push(['Rest services', '/restServices', RestServices]);
}
diff --git a/borgbutler-webapp/src/reducers/index.js b/borgbutler-webapp/src/reducers/index.js
index f7ee479..915edf9 100644
--- a/borgbutler-webapp/src/reducers/index.js
+++ b/borgbutler-webapp/src/reducers/index.js
@@ -1,11 +1,9 @@
import {combineReducers} from 'redux';
import log from './log';
-import template from './template';
import version from './version';
const reducers = combineReducers({
log,
- template,
version
});
--
Gitblit v1.10.0