From 35a8842de5c4b936cd7e0a0cfa65827027874594 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Mon, 8 Mar 2021 22:19:30 +0100 Subject: [PATCH] cosmetic code cleanups --- src/common/table.js | 2 +- src/file/edit-files.js | 65 ++++++++++++++++++-------------------- src/scenario/scenarios.js | 8 ++--- src/user/edit-own-user.js | 2 +- src/user/edit-user.js | 2 +- src/user/login-complete.js | 8 +++-- src/user/users.js | 15 +++++---- 7 files changed, 49 insertions(+), 53 deletions(-) diff --git a/src/common/table.js b/src/common/table.js index 6d75cfa..b0a22c4 100644 --- a/src/common/table.js +++ b/src/common/table.js @@ -39,7 +39,7 @@ class CustomTable extends Component { }; onClick(event, row, column) { - this.setState({ editCell: [column, row] }); // x, y + this.setState({ editCell: [column, row] }); // x, y } static addCell(data, index, child) { diff --git a/src/file/edit-files.js b/src/file/edit-files.js index b7f277c..93c49c0 100644 --- a/src/file/edit-files.js +++ b/src/file/edit-files.js @@ -27,7 +27,6 @@ import EditFileContent from "./edit-file-content"; class EditFilesDialog extends React.Component { valid = true; - constructor(props) { super(props); @@ -40,7 +39,6 @@ class EditFilesDialog extends React.Component { } onClose() { - this.props.onClose(); } @@ -71,29 +69,17 @@ class EditFilesDialog extends React.Component { } else { this.setState({ uploadProgress: 0 }); } - }; clearProgress = (newFileID) => { - /*if (this.props.onChange != null) { - let event = {} - event["target"] = {} - event.target["value"] = newFileID - this.props.onChange(event); - } - */ this.setState({ uploadProgress: 0 }); - - }; - closeEditModal(){ - - this.setState({editModal: false}); + closeEditModal() { + this.setState({editModal: false}); } deleteFile(index){ - let file = this.props.files[index] AppDispatcher.dispatch({ type: 'files/start-remove', @@ -102,9 +88,7 @@ class EditFilesDialog extends React.Component { }); } - render() { - let fileOptions = []; if (this.props.files.length > 0){ fileOptions.push( @@ -122,7 +106,6 @@ class EditFilesDialog extends React.Component { marginTop: '-40px' }; - return ( this.onClose()} blendOutCancel = {true} valid={true} size = 'lg'>
@@ -135,9 +118,18 @@ class EditFilesDialog extends React.Component { /> : <> } - - - + + + this.selectUploadFile(event)} /> + onChange={(event) => this.selectUploadFile(event)} + /> - - - + + + @@ -176,12 +169,14 @@ class EditFilesDialog extends React.Component {
- this.closeEditModal(data)} sessionToken={this.props.sessionToken} file={this.state.modalFile} /> - + this.closeEditModal(data)} + sessionToken={this.props.sessionToken} + file={this.state.modalFile} + />
- - ); } } diff --git a/src/scenario/scenarios.js b/src/scenario/scenarios.js index 1c1d9d5..1128c29 100644 --- a/src/scenario/scenarios.js +++ b/src/scenario/scenarios.js @@ -228,12 +228,8 @@ class Scenarios extends Component { } modifyRunningColumn(running){ - - if(running){ - return - } else { - return - } + return + } render() { return
diff --git a/src/user/edit-own-user.js b/src/user/edit-own-user.js index d436aea..a5b7756 100644 --- a/src/user/edit-own-user.js +++ b/src/user/edit-own-user.js @@ -78,7 +78,7 @@ class EditOwnUserDialog extends React.Component { } // form is valid if the following condition is met - this.valid = username || mail || (oldPassword && pw && confirmPassword); + this.valid = username || mail || (oldPassword && pw && confirmPassword); } resetState() { diff --git a/src/user/edit-user.js b/src/user/edit-user.js index ba49228..5d20bf4 100644 --- a/src/user/edit-user.js +++ b/src/user/edit-user.js @@ -64,7 +64,7 @@ class EditUserDialog extends React.Component { username = false; } - if (this.state.role === ''){ + if (this.state.role === '') { role = false; } diff --git a/src/user/login-complete.js b/src/user/login-complete.js index 698dc81..9ed2fc7 100644 --- a/src/user/login-complete.js +++ b/src/user/login-complete.js @@ -94,8 +94,12 @@ class LoginComplete extends React.Component { this.stopTimer(); return (); } else { - return (
- Waiting Dog
); + return
+ Waiting Dog +
; } } } diff --git a/src/user/users.js b/src/user/users.js index a7686c6..a7b98ed 100644 --- a/src/user/users.js +++ b/src/user/users.js @@ -90,8 +90,7 @@ class Users extends Component { this.setState({ editModal: false }); if (data) { - if(data.password === data.confirmPassword) { - + if (data.password === data.confirmPassword) { AppDispatcher.dispatch({ type: 'users/start-edit', data: data, @@ -129,16 +128,18 @@ class Users extends Component { + {this.state.currentUser.role === "Admin" ? + + : <> + } -