From 4b41bc3c23f7d3688944f1014540b352e9e3b61d Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Tue, 9 Mar 2021 00:25:17 +0100
Subject: [PATCH] smaller bug fixes

---
 src/file/edit-files.js            | 11 ++++-------
 src/scenario/scenario.js          | 11 +++++++++--
 src/signal/edit-signal-mapping.js |  2 +-
 src/styles/app.css                |  4 ++++
 src/user/user.js                  | 11 +++++++----
 5 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/file/edit-files.js b/src/file/edit-files.js
index 4058888..dca4f28 100644
--- a/src/file/edit-files.js
+++ b/src/file/edit-files.js
@@ -116,13 +116,10 @@ class EditFilesDialog extends React.Component {
         valid={true}
       >
         <Table data={this.props.files}>
-          {this.state.currentUser.role === "Admin" ?
-            <TableColumn
-              title='ID'
-              dataKey='id'
-            />
-            : <></>
-          }
+          <TableColumn
+            title='ID'
+            dataKey='id'
+          />
           <TableColumn
             title='Name'
             dataKey='name'
diff --git a/src/scenario/scenario.js b/src/scenario/scenario.js
index f8842df..73767c9 100644
--- a/src/scenario/scenario.js
+++ b/src/scenario/scenario.js
@@ -803,7 +803,7 @@ class Scenario extends React.Component {
           onEdit={index => this.setState({ editInputSignalsModal: true, modalConfigData: this.state.configs[index], modalConfigIndex: index })}
         />
         <TableColumn
-          title='Signal AutoConf'
+          title='Import Signals'
           exportButton
           onExport={(index) => this.signalsAutoConf(index)}
         />
@@ -1048,6 +1048,7 @@ class Scenario extends React.Component {
         <TableColumn
           title=''
           width='200'
+          align='right'
           deleteButton
           onDelete={(index) => this.setState({
             deleteUserModal: true,
@@ -1057,7 +1058,12 @@ class Scenario extends React.Component {
         />
       </Table>
 
-      <InputGroup style={{ width: 400, float: 'right' }}>
+      <InputGroup
+        style={{
+          width: 400,
+          float: 'right'
+        }}
+      >
         <Form.Control
           placeholder="Username"
           onChange={(e) => this.onUserInputChange(e)}
@@ -1077,6 +1083,7 @@ class Scenario extends React.Component {
         </InputGroup.Append>
       </InputGroup>
       <br />
+      <br />
 
       <DeleteDialog
         title="Delete user from scenario"
diff --git a/src/signal/edit-signal-mapping.js b/src/signal/edit-signal-mapping.js
index a9fd7a4..e5bba88 100644
--- a/src/signal/edit-signal-mapping.js
+++ b/src/signal/edit-signal-mapping.js
@@ -289,7 +289,7 @@ class EditSignalMappingDialog extends React.Component {
               variant='secondary'
               key={51}
               onClick={() => this.handleRemove()} style={buttonStyle}>
-              <Icon icon="minus" />Remove
+              <Icon icon="minus" /> Remove
             </Button>
             <Button
               variant='secondary'
diff --git a/src/styles/app.css b/src/styles/app.css
index 7142f1a..c1d3b53 100644
--- a/src/styles/app.css
+++ b/src/styles/app.css
@@ -471,3 +471,7 @@ hr {
 .swagger-ui .wrapper {
 	padding: 0 !important;
 }
+
+.swagger-ui .info {
+  margin-top: 10px;
+}
diff --git a/src/user/user.js b/src/user/user.js
index ce4cc4c..26bd161 100644
--- a/src/user/user.js
+++ b/src/user/user.js
@@ -59,22 +59,25 @@ class User extends Component {
     this.setState({ editModal: false });
 
     let updatedData = {}
-    updatedData.id = this.state.currentUser.id;
     let updatedUser = this.state.currentUser;
     let hasChanged = false;
     let pwChanged = false;
 
+    updatedData.id = this.state.currentUser.id;
+
     if (data) {
-      if (data.username !== '') {
+      if (data.username !== this.state.currentUser.username) {
         hasChanged = true;
         updatedData.username = data.username;
         updatedUser.username = data.username
       }
-      if (data.mail !== '') {
+
+      if (data.mail !== this.state.currentUser.mail) {
         hasChanged = true;
         updatedData.mail = data.mail;
         updatedUser.mail = data.mail;
       }
+
       if (data.password !== '' && data.oldPassword !== '' && data.password === data.confirmPassword ) {
         pwChanged = true;
         updatedData.password = data.password;
@@ -142,7 +145,7 @@ class User extends Component {
             <EditOwnUserDialog
               show={this.state.editModal}
               onClose={(data) => this.closeEditModal(data)}
-              user={this.state.currentUser}
+              user={user}
             />
           </>
           : <div/>