Nits after rebasing on master

taskcluster · Oct 17, 2018 · bf98c37 · bf98c37
1 parent 079d3c8
commit bf98c37
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 35 deletions.
diff --git a/src/utils/prop-types.js b/src/utils/prop-types.js
@@ -356,4 +356,3 @@ export const pulseMessage = shape({
   redelivered: bool,
   cc: string,
 });
-.neutr
diff --git a/src/views/Clients/ViewClients/index.jsx b/src/views/Clients/ViewClients/index.jsx
@@ -52,7 +52,8 @@ export default class ViewClients extends PureComponent {
         clientSearch: props.user.credentials.clientId,
         previousClientId: props.user.credentials.clientId,
       };
-    } else if (!props.user && state.previousClientId !== '') {
+    }
+    if (!props.user && state.previousClientId !== '') {
       return {
         clientSearch: '',
         previousClientId: '',

diff --git a/src/views/PulseMessages/index.jsx b/src/views/PulseMessages/index.jsx
@@ -112,6 +112,8 @@ export default class PulseMessages extends Component {
     };
   }
 
+  subscriptionObserver = null;
+
   constructor(props) {
     super(props);
 
@@ -130,40 +132,14 @@ export default class PulseMessages extends Component {
     };
   }
 
-  subscriptionObserver = null;
-
-  unsubscribe() {
-    if (this.subscriptionObserver) {
-      this.subscriptionObserver.unsubscribe();
-    }
-  }
-
   componentWillUnmount() {
     this.unsubscribe();
   }
 
-  addMessage(message) {
-    const messages = removeKeys(this.state.messages.concat(message), [
-      '__typename',
-    ]);
-    const params = btoa(JSON.stringify(messages, null, 2));
-
-    this.setState({
-      messages,
-      downloadLink: `data:application/json;base64,${params}`,
-    });
-  }
-
   handleInputChange = ({ target: { name, value } }) => {
     this.setState({ [name]: value });
   };
 
-  static getDerivedStateFromProps(props) {
-    return {
-      bindings: getBindingsFromProps(props),
-    };
-  }
-
   handleAddBinding = () => {
     const { pulseExchange, pattern } = this.state;
     const bindings = this.state.bindings.concat([
@@ -235,6 +211,24 @@ export default class PulseMessages extends Component {
     a.dispatchEvent(new MouseEvent('click'));
   };
 
+  addMessage(message) {
+    const messages = removeKeys(this.state.messages.concat(message), [
+      '__typename',
+    ]);
+    const params = btoa(JSON.stringify(messages, null, 2));
+
+    this.setState({
+      messages,
+      downloadLink: `data:application/json;base64,${params}`,
+    });
+  }
+
+  unsubscribe() {
+    if (this.subscriptionObserver) {
+      this.subscriptionObserver.unsubscribe();
+    }
+  }
+
   render() {
     const { classes } = this.props;
     const {
@@ -357,12 +351,14 @@ export default class PulseMessages extends Component {
               noItemsMessage="No messages received."
               renderRow={message => (
                 <TableRow
-                  key={`message-${message.routingKey}-${message.exchange}`}>
+                  key={`message-${message.routingKey}-${message.exchange}`}
+                >
                   <TableCell>
                     <Button
                       className={classes.infoButton}
                       size="small"
-                      onClick={() => this.handleMessageDrawerOpen(message)}>
+                      onClick={() => this.handleMessageDrawerOpen(message)}
+                    >
                       <InformationVariantIcon size={iconSize} />
                     </Button>
                     {message.exchange}
@@ -406,17 +402,17 @@ export default class PulseMessages extends Component {
             classes={{
               paper: classes.drawerPaper,
             }}
-            onClose={this.handleMessageDrawerClose}>
+            onClose={this.handleMessageDrawerClose}
+          >
             <Fragment>
               <IconButton
                 onClick={this.handleMessageDrawerClose}
-                className={classes.drawerCloseIcon}>
+                className={classes.drawerCloseIcon}
+              >
                 <CloseIcon />
               </IconButton>
               <div className={classes.drawerContainer}>
-                <Typography
-                  variant="h5"
-                  className={classes.drawerHeadline}>
+                <Typography variant="h5" className={classes.drawerHeadline}>
                   Message
                 </Typography>
                 <List>