Merge branch 'master' into custom-column-names-update

hasura · Sep 28, 2019 · 4718af7 · 4718af7
2 parents 53b7760 + 0bf1d9a
commit 4718af7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/console/src/components/App/App.js b/console/src/components/App/App.js
@@ -53,11 +53,9 @@ class App extends Component {
       );
     }
 
-    if (telemetry.console_opts) {
-      if (!telemetry.console_opts.telemetryNotificationShown) {
-        dispatch(showTelemetryNotification());
-        dispatch(telemetryNotificationShown());
-      }
+    if (telemetry.console_opts && !telemetry.console_opts.telemetryNotificationShown) {
+      dispatch(showTelemetryNotification());
+      dispatch(telemetryNotificationShown());
     }
 
     return (

diff --git a/console/src/components/Common/Button/Button.js b/console/src/components/Common/Button/Button.js
@@ -2,10 +2,11 @@ import React from 'react';
 import styles from '../Common.scss';
 
 /*
-  This is a Button HOC that takes al the props supported by <button> and also
-  - color: (default: white) color of the button; currently supports yellow, red, green, gray, white
+  This is a Button HOC that takes all the props supported by <button>
+  - color(default: white): color of the button; currently supports yellow, red, green, gray and white
   - size: size of the button; currently supports xs (extra small), sm(small)
-  - className: although you can provide any CSS classname, it is recommended to use only the positioning related classes and not the ones that change the appearance (color, font, size) of the button
+  - className: although you can provide any CSS classname, it is recommended to use only the positioning related classes
+               and not the ones that change the appearance (color, font, size) of the button
 */
 
 const Button = props => {

diff --git a/console/src/components/Common/QueryBuilderJson/QueryBuilderJson.js b/console/src/components/Common/QueryBuilderJson/QueryBuilderJson.js
@@ -36,7 +36,7 @@ class QueryBuilderJson extends React.Component {
     };
 
     const isCustomJsonObject = object => {
-      // check if is array
+      // check if it is an array
       if (object instanceof Array) {
         // if empty array
         if (object.length === 0) {
@@ -68,7 +68,7 @@ class QueryBuilderJson extends React.Component {
         return true;
       }
 
-      // check if is object and not a React element
+      // check if it is an object and not a React element
       return object instanceof Object && !React.isValidElement(object);
     };