Update code formatting

2019-06-15 14:56:57 +02:00
parent 6176859c7c
commit 92e045297e
115 changed files with 2988 additions and 1042 deletions
--- a/app/src/components/ConnectionSetup/AddButton.tsx
+++ b/app/src/components/ConnectionSetup/AddButton.tsx
@@ -14,18 +14,9 @@ const styles = (theme: Theme) => ({
  },
 })

-export const AddButton = withStyles(styles)((props: {
-  classes: any,
-  action: any,
-}) => {
+export const AddButton = withStyles(styles)((props: { classes: any; action: any }) => {
  return (
-    <Fab
-      size="small"
-      color="secondary"
-      aria-label="Add"
-      className={props.classes.addButton}
-      onClick={props.action}
-    >
+    <Fab size="small" color="secondary" aria-label="Add" className={props.classes.addButton} onClick={props.action}>
      <Add className={props.classes.addIcon} />
    </Fab>
  )
--- a/app/src/components/ConnectionSetup/AdvancedConnectionSettings.tsx
+++ b/app/src/components/ConnectionSetup/AdvancedConnectionSettings.tsx
@@ -56,8 +56,8 @@ class ConnectionSettings extends React.Component<Props, State> {
            <ClearAdornment action={this.clearCertificate} value={this.props.connection.selfSignedCertificate.name} />
            {this.props.connection.selfSignedCertificate.name}
          </Typography>
-      </Tooltip>
-     </span>
+        </Tooltip>
+      </span>
    )
  }

@@ -89,27 +89,26 @@ class ConnectionSettings extends React.Component<Props, State> {
                className={classes.fullWidth}
                label="Subscription"
                margin="normal"
-                onChange={(event: React.ChangeEvent<HTMLInputElement>) => this.setState({ subscription: event.target.value })}
+                onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
+                  this.setState({ subscription: event.target.value })
+                }
              />
            </Grid>
            <Grid item={true} xs={2} className={classes.gridPadding}>
              <Button
                className={classes.button}
                color="secondary"
-                onClick={() => this.props.managerActions.addSubscription(this.state.subscription, this.props.connection.id)}
+                onClick={() =>
+                  this.props.managerActions.addSubscription(this.state.subscription, this.props.connection.id)
+                }
                variant="contained"
              >
                <Add /> Add
              </Button>
            </Grid>
            <Grid item={true} xs={12} style={{ padding: 0 }}>
-              <List
-                className={`${classes.topicList} advanced-connection-settings-topic-list`}
-                component="nav"
-              >
-                <div className={classes.list}>
-                  {this.renderSubscriptions()}
-                </div>
+              <List className={`${classes.topicList} advanced-connection-settings-topic-list`} component="nav">
+                <div className={classes.list}>{this.renderSubscriptions()}</div>
              </List>
            </Grid>
            <Grid item={true} xs={7} className={classes.gridPadding}>
@@ -151,17 +150,15 @@ class ConnectionSettings extends React.Component<Props, State> {
  }
 }

-const Subscription = (props: {
-  subscription: string,
-  deleteAction: any,
-}) => {
+const Subscription = (props: { subscription: string; deleteAction: any }) => {
  return (
    <ListItem style={{ padding: '0 0 0 8px' }}>
      <ListItemText>
        <IconButton onClick={props.deleteAction} style={{ padding: '6px' }}>
          <Delete />
        </IconButton>
-        {props.subscription}</ListItemText>
+        {props.subscription}
+      </ListItemText>
    </ListItem>
  )
 }
@@ -199,4 +196,7 @@ const styles = (theme: Theme) => ({
  },
 })

-export default connect(undefined, mapDispatchToProps)(withStyles(styles)(ConnectionSettings))
+export default connect(
+  undefined,
+  mapDispatchToProps
+)(withStyles(styles)(ConnectionSettings))
--- a/app/src/components/ConnectionSetup/ConnectionSettings.tsx
+++ b/app/src/components/ConnectionSetup/ConnectionSettings.tsx
@@ -29,17 +29,14 @@ import ConnectionHealthIndicator from '../helper/ConnectionHealthIndicator'

 interface Props {
  connection: ConnectionOptions
-  classes: {[s: string]: string}
-  actions: typeof connectionActions,
+  classes: { [s: string]: string }
+  actions: typeof connectionActions
  managerActions: typeof connectionManagerActions
  connected: boolean
  connecting: boolean
 }

-const protocols = [
-  'mqtt',
-  'ws',
-]
+const protocols = ['mqtt', 'ws']

 interface State {
  showPassword: boolean
@@ -127,20 +124,12 @@ class ConnectionSettings extends React.Component<Props, State> {
    const { classes, connection } = this.props

    const certSwitch = (
-      <Switch
-        checked={connection.certValidation}
-        onChange={this.toggleCertValidation}
-        color="primary"
-      />
+      <Switch checked={connection.certValidation} onChange={this.toggleCertValidation} color="primary" />
    )

    return (
      <div className={classes.switch}>
-        <FormControlLabel
-          control={certSwitch}
-          label="Validate certificate"
-          labelPlacement="bottom"
-        />
+        <FormControlLabel control={certSwitch} label="Validate certificate" labelPlacement="bottom" />
      </div>
    )
  }
@@ -154,21 +143,11 @@ class ConnectionSettings extends React.Component<Props, State> {
  private renderTlsSwitch() {
    const { classes, connection } = this.props

-    const tlsSwitch = (
-      <Switch
-        checked={connection.encryption}
-        onChange={this.toggleTls}
-        color="primary"
-      />
-    )
+    const tlsSwitch = <Switch checked={connection.encryption} onChange={this.toggleTls} color="primary" />

    return (
      <div className={classes.switch}>
-        <FormControlLabel
-          control={tlsSwitch}
-          label="Encryption (tls)"
-          labelPlacement="bottom"
-        />
+        <FormControlLabel control={tlsSwitch} label="Encryption (tls)" labelPlacement="bottom" />
      </div>
    )
  }
@@ -185,12 +164,13 @@ class ConnectionSettings extends React.Component<Props, State> {
    if (this.props.connecting) {
      return (
        <Button variant="contained" color="primary" className={classes.button} onClick={actions.disconnect}>
-          <ConnectionHealthIndicator />&nbsp;&nbsp;Abort
+          <ConnectionHealthIndicator />
+          &nbsp;&nbsp;Abort
        </Button>
      )
    }
    return (
-       <Button variant="contained" color="primary" className={classes.button} onClick={this.onClickConnect}>
+      <Button variant="contained" color="primary" className={classes.button} onClick={this.onClickConnect}>
        <PowerSettingsNew /> Connect
      </Button>
    )
@@ -212,10 +192,7 @@ class ConnectionSettings extends React.Component<Props, State> {

    const passwordVisibilityButton = (
      <InputAdornment position="end">
-        <IconButton
-          aria-label="Toggle password visibility"
-          onClick={this.handleClickShowPassword}
-        >
+        <IconButton aria-label="Toggle password visibility" onClick={this.handleClickShowPassword}>
          {this.state.showPassword ? <Visibility /> : <VisibilityOff />}
        </IconButton>
      </InputAdornment>
@@ -287,15 +264,28 @@ class ConnectionSettings extends React.Component<Props, State> {
          <br />
          <div>
            <div style={{ float: 'left' }}>
-              <Button variant="contained" className={classes.button} onClick={() => this.props.managerActions.deleteConnection(this.props.connection.id)}>
+              <Button
+                variant="contained"
+                className={classes.button}
+                onClick={() => this.props.managerActions.deleteConnection(this.props.connection.id)}
+              >
                Delete <Delete />
              </Button>
-              <Button variant="contained" className={classes.button} onClick={this.props.managerActions.toggleAdvancedSettings}>
+              <Button
+                variant="contained"
+                className={classes.button}
+                onClick={this.props.managerActions.toggleAdvancedSettings}
+              >
                <Settings /> Advanced
              </Button>
            </div>
-            <div style={{ float : 'right' }}>
-              <Button variant="contained" color="secondary" className={classes.button} onClick={this.props.managerActions.saveConnectionSettings}>
+            <div style={{ float: 'right' }}>
+              <Button
+                variant="contained"
+                color="secondary"
+                className={classes.button}
+                onClick={this.props.managerActions.saveConnectionSettings}
+              >
                <Save /> Save
              </Button>
              {this.renderConnectButton()}
@@ -336,4 +326,7 @@ const styles = (theme: Theme) => ({
  },
 })

-export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ConnectionSettings))
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(withStyles(styles)(ConnectionSettings))
--- a/app/src/components/ConnectionSetup/ConnectionSetup.tsx
+++ b/app/src/components/ConnectionSetup/ConnectionSetup.tsx
@@ -7,13 +7,7 @@ import { connect } from 'react-redux'
 import { connectionManagerActions } from '../../actions'
 import { ConnectionOptions, toMqttConnection } from '../../model/ConnectionOptions'
 import { Theme, withStyles } from '@material-ui/core/styles'
-import {
-  Modal,
-  Paper,
-  Toolbar,
-  Typography,
-  Collapse,
-} from '@material-ui/core'
+import { Modal, Paper, Toolbar, Typography, Collapse } from '@material-ui/core'
 import AdvancedConnectionSettings from './AdvancedConnectionSettings'

 interface Props {
@@ -37,8 +31,12 @@ class ConnectionSetup extends React.Component<Props, {}> {

    return (
      <div>
-        <Collapse in={!showAdvancedSettings}><ConnectionSettings connection={connection} /></Collapse>
-        <Collapse in={showAdvancedSettings}><AdvancedConnectionSettings connection={connection} /></Collapse>
+        <Collapse in={!showAdvancedSettings}>
+          <ConnectionSettings connection={connection} />
+        </Collapse>
+        <Collapse in={showAdvancedSettings}>
+          <AdvancedConnectionSettings connection={connection} />
+        </Collapse>
      </div>
    )
  }
@@ -54,13 +52,15 @@ class ConnectionSetup extends React.Component<Props, {}> {
      <div>
        <Modal open={visible} disableAutoFocus={true}>
          <Paper className={classes.root}>
-            <div className={classes.left}><ProfileList /></div>
+            <div className={classes.left}>
+              <ProfileList />
+            </div>
            <div className={classes.right} key={connection && connection.id}>
              <Toolbar>
-                <Typography className={classes.title} variant="h6" color="inherit">MQTT Connection</Typography>
-                <Typography className={classes.connectionUri}>
-                  {mqttConnection && mqttConnection.url}
+                <Typography className={classes.title} variant="h6" color="inherit">
+                  MQTT Connection
                </Typography>
+                <Typography className={classes.connectionUri}>{mqttConnection && mqttConnection.url}</Typography>
              </Toolbar>
              {this.renderSettings()}
            </div>
@@ -115,7 +115,9 @@ const mapStateToProps = (state: AppState) => {
  return {
    visible: !state.connection.connected,
    showAdvancedSettings: state.connectionManager.showAdvancedSettings,
-    connection: state.connectionManager.selected ? state.connectionManager.connections[state.connectionManager.selected] : undefined,
+    connection: state.connectionManager.selected
+      ? state.connectionManager.connections[state.connectionManager.selected]
+      : undefined,
  }
 }

@@ -125,4 +127,7 @@ const mapDispatchToProps = (dispatch: any) => {
  }
 }

-export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ConnectionSetup))
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(withStyles(styles)(ConnectionSetup))
--- a/app/src/components/ConnectionSetup/ProfileList.tsx
+++ b/app/src/components/ConnectionSetup/ProfileList.tsx
@@ -6,17 +6,12 @@ import { connect } from 'react-redux'
 import { connectionManagerActions } from '../../actions'
 import { ConnectionOptions, toMqttConnection } from '../../model/ConnectionOptions'
 import { Theme, withStyles } from '@material-ui/core/styles'
-import {
-  List,
-  ListItem,
-  ListSubheader,
-  Typography,
-} from '@material-ui/core'
+import { List, ListItem, ListSubheader, Typography } from '@material-ui/core'

 interface Props {
  classes: any
  selected?: string
-  connections: {[s: string]: ConnectionOptions}
+  connections: { [s: string]: ConnectionOptions }
  actions: any
 }

@@ -26,7 +21,11 @@ class ProfileList extends React.Component<Props, {}> {
  }

  private addConnectionButton() {
-    return <span id="addProfileButton" style={{ marginRight: '12px' }}><AddButton action={this.props.actions.createConnection} /></span>
+    return (
+      <span id="addProfileButton" style={{ marginRight: '12px' }}>
+        <AddButton action={this.props.actions.createConnection} />
+      </span>
+    )
  }

  public render() {
@@ -37,7 +36,13 @@ class ProfileList extends React.Component<Props, {}> {
        subheader={<ListSubheader component="div">{this.addConnectionButton()}Connections</ListSubheader>}
      >
        <div className={this.props.classes.list}>
-          {Object.values(this.props.connections).map(connection => <ConnectionItem connection={connection} key={connection.id} selected={this.props.selected === connection.id} />)}
+          {Object.values(this.props.connections).map(connection => (
+            <ConnectionItem
+              connection={connection}
+              key={connection.id}
+              selected={this.props.selected === connection.id}
+            />
+          ))}
        </div>
      </List>
    )
@@ -59,9 +64,9 @@ const mapDispatchToProps = (dispatch: any) => {
 }

 interface ConnectionItemProps {
-  connection: ConnectionOptions,
-  actions: any,
-  selected: boolean,
+  connection: ConnectionOptions
+  actions: any
+  selected: boolean
  classes: any
 }

@@ -91,17 +96,16 @@ const connectionItemRenderer = withStyles(connectionItemStyle)((props: Connectio
      style={{ display: 'block' }}
      onClick={() => props.actions.selectConnection(props.connection.id)}
    >
-      <Typography className={props.classes.name}>
-        {props.connection.name || 'mqtt broker'}
-      </Typography>
-      <Typography className={props.classes.details}>
-        {connection && connection.url}
-      </Typography>
+      <Typography className={props.classes.name}>{props.connection.name || 'mqtt broker'}</Typography>
+      <Typography className={props.classes.details}>{connection && connection.url}</Typography>
    </ListItem>
  )
 })

-const ConnectionItem = connect(null, mapDispatchToProps)(connectionItemRenderer)
+const ConnectionItem = connect(
+  null,
+  mapDispatchToProps
+)(connectionItemRenderer)

 const mapStateToProps = (state: AppState) => {
  return {
@@ -110,4 +114,7 @@ const mapStateToProps = (state: AppState) => {
  }
 }

-export default connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(ProfileList))
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(withStyles(styles)(ProfileList))