From 26ccb798aae1dcd2c6952025c347718e21a7b831 Mon Sep 17 00:00:00 2001
From: Jeff Pihach <jeff.pihach@canonical.com>
Date: Mon, 24 Sep 2018 16:40:04 -0600
Subject: [PATCH 1/9] Add react/jsx-first-prop-new-line eslint rule and updated
 react/jsx-max-props-per-line rule.

---
 .eslintrc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.eslintrc b/.eslintrc
index cd5e986ac6..ee17f4ae31 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -39,11 +39,12 @@
     "react/prop-types": 2,
     "react/sort-prop-types": 2,
     "react/jsx-closing-bracket-location": ["error", "after-props"],
+    "react/jsx-first-prop-new-line": 2,
     "react/jsx-sort-props": [2, { "ignoreCase": true }],
     "react/jsx-tag-spacing": ["error", { "beforeSelfClosing": "always" }],
     "react/jsx-uses-react": 2,
     "react/jsx-uses-vars": 2,
-    "react/jsx-max-props-per-line": [1, { "when": "always" }],
+    "react/jsx-max-props-per-line": [2, { "when": "multiline" }],
     "semi": [2, "always"],
     "space-before-blocks": 2,
     "space-before-function-paren": ["error", "never"],

From 3e8df459c94d3cc8fab35e2b5ed8df6e5ef01914 Mon Sep 17 00:00:00 2001
From: Jeff Pihach <jeff.pihach@canonical.com>
Date: Mon, 24 Sep 2018 16:58:01 -0600
Subject: [PATCH 2/9] Apply eslint --fix for the JSX prop location changes.

---
 .../accordion-section/accordion-section.js    |   3 +-
 .../test-accordion-section.js                 |  15 +-
 .../added-services-list/item/item.js          |   3 +-
 .../added-services-list/item/test-item.js     |   3 +-
 .../boolean-config/boolean-config.js          |   3 +-
 .../boolean-config/test-boolean-config.js     |   3 +-
 .../components/budget-chart/budget-chart.js   |   6 +-
 .../budget-chart/test-budget-chart.js         |  12 +-
 .../app/components/budget-table/row/row.js    |   9 +-
 .../components/budget-table/row/test-row.js   |   6 +-
 .../button-dropdown/button-dropdown.js        |  12 +-
 .../button-dropdown/test-button-dropdown.js   |  24 ++-
 .../src/app/components/card-form/card-form.js |   3 +-
 .../components/card-form/test-card-form.js    |   3 +-
 .../components/charmbrowser/charmbrowser.js   |   3 +-
 .../charmbrowser/test-charmbrowser.js         |   9 +-
 .../check-list-item/check-list-item.js        |  13 +-
 .../check-list-item/test-check-list-item.js   |  13 +-
 .../app/components/constraints/constraints.js |  12 +-
 .../constraints/test-constraints.js           |  12 +-
 .../copy-to-clipboard/copy-to-clipboard.js    |   6 +-
 .../test-copy-to-clipboard.js                 |   6 +-
 .../create-payment-user.js                    |  12 +-
 .../test-create-payment-user.js               |  12 +-
 .../components/date-display/date-display.js   |   3 +-
 .../date-display/test-date-display.js         |  42 +++--
 .../notification/notification.js              |   3 +-
 .../notification/test-notification.js         |   3 +-
 .../deployment-flow/agreements/agreements.js  |   6 +-
 .../agreements/test-agreements.js             |   6 +-
 .../change-item/change-item.js                |   3 +-
 .../change-item/test-change-item.js           |   7 +-
 .../components/deployment-flow/cloud/cloud.js |   3 +-
 .../deployment-flow/cloud/test-cloud.js       |   9 +-
 .../deployment-flow/credential/add/add.js     |  10 +-
 .../credential/add/test-add.js                |  33 ++--
 .../direct-deploy/direct-deploy.js            |   9 +-
 .../direct-deploy/test-direct-deploy.js       |  15 +-
 .../expert-intro/expert-intro.js              |   9 +-
 .../expert-intro/test-expert-intro.js         |   9 +-
 .../components/deployment-flow/login/login.js |   3 +-
 .../deployment-flow/login/test-login.js       |   3 +-
 .../deployment-flow/machines/machines.js      |   3 +-
 .../deployment-flow/machines/test-machines.js |  12 +-
 .../deployment-flow/payment/payment.js        |   3 +-
 .../deployment-flow/payment/test-payment.js   |   3 +-
 .../pricing/plan-table/plan-table.js          |   3 +-
 .../pricing/plan-table/test-plan-table.js     |   3 +-
 .../deployment-flow/pricing/pricing.js        |   9 +-
 .../pricing/support-selection/plan/plan.js    |   6 +-
 .../support-selection/plan/test-plan.js       |   9 +-
 .../deployment-flow/pricing/test-pricing.js   |   9 +-
 .../deployment-flow/signup/signup.js          |   3 +-
 .../deployment-flow/signup/test-signup.js     |   3 +-
 .../deployment-flow/sshkey/sshkey.js          |  15 +-
 .../deployment-flow/sshkey/test-sshkey.js     |  25 ++-
 .../deployment-flow/vpc/test-vpc.js           |   6 +-
 .../app/components/deployment-flow/vpc/vpc.js |   6 +-
 .../content/config-option/config-option.js    |   3 +-
 .../config-option/test-config-option.js       |   3 +-
 .../entity-details/content/content.js         |  34 ++--
 .../content/description/description.js        |   3 +-
 .../content/description/test-description.js   |   6 +-
 .../entity-details/content/diagram/diagram.js |   4 +-
 .../content/diagram/test-diagram.js           |   4 +-
 .../entity-details/content/files/files.js     |  21 ++-
 .../content/files/test-files.js               |  35 +++-
 .../content/readme/test-readme.js             |   3 +-
 .../content/relations/relations.js            |  13 +-
 .../content/relations/test-relations.js       |  12 +-
 .../content/resources/resources.js            |   3 +-
 .../content/resources/test-resources.js       |   9 +-
 .../entity-details/content/test-content.js    |  75 +++++---
 .../entity-details/entity-details.js          |   6 +-
 .../entity-details/header/header.js           |  37 ++--
 .../entity-details/header/test-header.js      |  51 +++--
 .../entity-details/test-entity-details.js     |   9 +-
 .../env-size-display/env-size-display.js      |   9 +-
 .../components/env-switcher/env-switcher.js   |  12 +-
 .../app/components/env-switcher/list/list.js  |   6 +-
 .../components/env-switcher/list/test-list.js |  30 ++-
 .../env-switcher/test-env-switcher.js         |  12 +-
 .../app/components/environment/environment.js |  58 ++++--
 .../app/components/expert-card/expert-card.js |   3 +-
 .../expert-card/test-expert-card.js           |   4 +-
 .../expert-contact-card.js                    |   6 +-
 .../test-expert-contact-card.js               |  15 +-
 .../expert-store-card/expert-store-card.js    |   3 +-
 .../test-expert-store-card.js                 |   3 +-
 .../app/components/file-field/file-field.js   |   6 +-
 .../components/file-field/test-file-field.js  |  15 +-
 .../components/generic-input/generic-input.js |   9 +-
 .../generic-input/test-generic-input.js       |  18 +-
 .../src/app/components/hash-link/hash-link.js |   3 +-
 .../components/hash-link/test-hash-link.js    |   3 +-
 .../header-breadcrumb/header-breadcrumb.js    |   6 +-
 .../test-header-breadcrumb.js                 |   9 +-
 .../app/components/header-logo/header-logo.js |   3 +-
 .../header-logo/test-header-logo.js           |   9 +-
 .../components/header-search/header-search.js |  20 +-
 .../gui/src/app/components/help/help.js       |  36 ++--
 .../src/app/components/help/tour/test-tour.js |   3 +-
 .../gui/src/app/components/help/tour/tour.js  |  28 ++-
 .../src/app/components/icon-list/icon-list.js |   9 +-
 .../components/icon-list/test-icon-list.js    |  18 +-
 .../components/inset-select/inset-select.js   |   9 +-
 .../inset-select/test-inset-select.js         |   6 +-
 .../change-version/change-version.js          |   3 +-
 .../inspector/change-version/item/item.js     |   6 +-
 .../change-version/item/test-item.js          |   9 +-
 .../change-version/test-change-version.js     |   3 +-
 .../inspector/expose/unit/test-unit.js        |  18 +-
 .../components/inspector/expose/unit/unit.js  |   8 +-
 .../app/components/inspector/header/header.js |  13 +-
 .../overview-action/overview-action.js        |  13 +-
 .../overview-action/test-overview-action.js   |   6 +-
 .../inspector/relate-to/relate-to.js          |   3 +-
 .../inspector/relate-to/test-relate-to.js     |   3 +-
 .../inspector/resources/list/list.js          |   3 +-
 .../inspector/resources/list/test-list.js     |   6 +-
 .../inspector/scale-service/scale-service.js  |   9 +-
 .../unit-details/test-unit-details.js         |  51 +++--
 .../inspector/unit-details/unit-details.js    |  12 +-
 .../app/components/isv-profile/isv-profile.js |   6 +-
 .../app/components/lightbox/test-lightbox.js  |  21 ++-
 .../gui/src/app/components/link/link.js       |   3 +-
 .../gui/src/app/components/link/test-link.js  |   3 +-
 .../local-inspector/local-inspector.js        |  16 +-
 .../local-inspector/test-local-inspector.js   |  20 +-
 .../gui/src/app/components/logout/logout.js   |   3 +-
 .../src/app/components/logout/test-logout.js  |   3 +-
 .../machine-view/add-machine/add-machine.js   |   3 +-
 .../add-machine/test-add-machine.js           |   3 +-
 .../components/machine-view/column/column.js  |   3 +-
 .../machine-view/column/test-column.js        |   3 +-
 .../components/machine-view/machine-view.js   |   9 +-
 .../machine-view/scale-up/scale-up.js         |  12 +-
 .../machine-view/scale-up/test-scale-up.js    |  21 ++-
 .../machine-view/test-machine-view.js         |  18 +-
 .../unplaced-unit/test-unplaced-unit.js       |   4 +-
 .../unplaced-unit/unplaced-unit.js            |   4 +-
 .../modal-gui-settings/modal-gui-settings.js  |  31 +++-
 .../test-modal-gui-settings.js                |  26 ++-
 .../modal-shortcuts/modal-shortcuts.js        |   8 +-
 .../modal-shortcuts/test-modal-shortcuts.js   |   8 +-
 .../components/model-actions/model-actions.js |  27 ++-
 .../model-actions/test-model-actions.js       |  27 ++-
 .../components/notification-list/item/item.js |   7 +-
 .../notification-list/item/test-item.js       |   6 +-
 .../notification-list/notification-list.js    |   3 +-
 .../test-notification-list.js                 |   3 +-
 .../components/notification/notification.js   |   3 +-
 .../notification/test-notification.js         |   3 +-
 .../app/components/payment/charges/charges.js |   3 +-
 .../charges/receipt-popup/receipt-popup.js    |   3 +-
 .../payment/charges/test-charges.js           |   3 +-
 .../components/payment/methods/card/card.js   |   3 +-
 .../payment/methods/card/test-card.js         |   3 +-
 .../app/components/payment/methods/methods.js |   3 +-
 .../payment/methods/test-methods.js           |   3 +-
 .../post-deployment/post-deployment.js        |  11 +-
 .../post-deployment/test-post-deployment.js   |  11 +-
 .../profile/bundle-list/bundle-list.js        |   3 +-
 .../profile/bundle-list/test-bundle-list.js   |   3 +-
 .../profile/charm-list/charm-list.js          |  15 +-
 .../profile/charm-list/test-charm-list.js     |  45 +++--
 .../charmstore-login/charmstore-login.js      |   6 +-
 .../charmstore-login/test-charmstore-login.js |   6 +-
 .../expanded-content/expanded-content.js      |  15 +-
 .../expanded-content/test-expanded-content.js |  30 ++-
 .../app/components/profile/header/header.js   |  21 ++-
 .../components/profile/header/test-header.js  |   6 +-
 .../profile/model-list/model-list.js          |   6 +-
 .../profile/model-list/test-model-list.js     |  39 ++--
 .../gui/src/app/components/profile/profile.js |  15 +-
 .../relation-menu/ambiguous-relation-menu.js  |   3 +-
 .../components/relation-menu/relation-menu.js |  12 +-
 .../components/search-results/item/item.js    |  18 +-
 .../search-results/item/test-item.js          |  24 ++-
 .../search-results/search-results.js          |   3 +-
 .../select-filter/select-filter.js            |   6 +-
 .../select-filter/test-select-filter.js       |   3 +-
 .../search-results/test-search-results.js     |   3 +-
 .../type-filter/test-type-filter.js           |  18 +-
 .../search-results/type-filter/type-filter.js |   6 +-
 .../components/shared/basic-table/row/row.js  |   6 +-
 .../shared/basic-table/row/test-row.js        |   3 +-
 .../app/components/shared/button/button.js    |   3 +-
 .../shared/expanding-row/expanding-row.js     |   9 +-
 .../expanding-row/test-expanding-row.js       |  15 +-
 .../shared/machine-unit/machine-unit.js       |   3 +-
 .../app/components/shared/machine/machine.js  |   6 +-
 .../components/shared/machine/test-machine.js |   9 +-
 .../src/app/components/shared/panel/panel.js  |   6 +-
 .../app/components/shared/panel/test-panel.js |   6 +-
 .../application-list/application-list.js      |   6 +-
 .../components/shared/status/model/model.js   |   6 +-
 .../status/relation-list/relation-list.js     |   6 +-
 .../shared/status/unit-list/unit-list.js      |   9 +-
 .../gui/src/app/components/store/store.js     | 174 ++++++++++++------
 .../src/app/components/store/test-store.js    |   3 +-
 .../components/string-config/input/input.js   |   3 +-
 .../string-config/input/test-input.js         |   3 +-
 .../components/string-config/string-config.js |   3 +-
 .../string-config/test-string-config.js       |   3 +-
 .../src/app/components/svg-icon/svg-icon.js   |   3 +-
 .../app/components/svg-icon/test-svg-icon.js  |   4 +-
 .../app/components/terminal/test-terminal.js  |   9 +-
 .../usso-login-link/test-usso-login-link.js   |   3 +-
 .../usso-login-link/usso-login-link.js        |   3 +-
 .../gui/src/app/components/zoom/test-zoom.js  |  12 +-
 .../gui/src/app/components/zoom/zoom.js       |  12 +-
 jujugui/static/gui/src/app/init/app.js        |  18 +-
 .../static/gui/src/app/init/cookie-util.js    |   3 +-
 .../gui/src/app/init/test-cookie-util.js      |   3 +-
 jujugui/static/gui/src/app/init/utils.js      |  18 +-
 216 files changed, 1606 insertions(+), 785 deletions(-)

diff --git a/jujugui/static/gui/src/app/components/accordion-section/accordion-section.js b/jujugui/static/gui/src/app/components/accordion-section/accordion-section.js
index d56d9179db..d621f1afb2 100644
--- a/jujugui/static/gui/src/app/components/accordion-section/accordion-section.js
+++ b/jujugui/static/gui/src/app/components/accordion-section/accordion-section.js
@@ -85,7 +85,8 @@ class AccordionSection extends React.Component {
     @return {Object} The React div element.
   */
   _generateContent() {
-    return (<div className="accordion-section__content"
+    return (<div
+      className="accordion-section__content"
       ref="content"
       style={this._getStyle()}>
       {this.props.children}
diff --git a/jujugui/static/gui/src/app/components/accordion-section/test-accordion-section.js b/jujugui/static/gui/src/app/components/accordion-section/test-accordion-section.js
index fad70c50ca..6856159ef3 100644
--- a/jujugui/static/gui/src/app/components/accordion-section/test-accordion-section.js
+++ b/jujugui/static/gui/src/app/components/accordion-section/test-accordion-section.js
@@ -21,7 +21,8 @@ describe('AccordionSection', () => {
     const wrapper = renderComponent();
     const expected = (
       <div className="accordion-section">
-        <div className="accordion-section__title"
+        <div
+          className="accordion-section__title"
           onClick={wrapper.find('.accordion-section__title').prop('onClick')}
           role="button">
           <span className="accordion-section__title-content">My title!</span>
@@ -30,7 +31,9 @@ describe('AccordionSection', () => {
             name="chevron_down_16"
             size="16" />
         </div>
-        <div className="accordion-section__content" ref="content"
+        <div
+          className="accordion-section__content"
+          ref="content"
           style={{maxHeight: 0}}><span>Hello</span></div>
       </div>);
     assert.compareJSX(wrapper, expected);
@@ -44,7 +47,9 @@ describe('AccordionSection', () => {
     };
     instance._toggle();
     const expected = (
-      <div className="accordion-section__content" ref="content"
+      <div
+        className="accordion-section__content"
+        ref="content"
         style={{maxHeight: '100px'}}>
         <span>Hello</span>
       </div>);
@@ -54,7 +59,9 @@ describe('AccordionSection', () => {
   it('does not show chevron or content when there are no children', () => {
     const wrapper = renderComponent({ children: null });
     const expected = (
-      <div className="accordion-section__content" ref="content"
+      <div
+        className="accordion-section__content"
+        ref="content"
         style={{maxHeight: '100px'}}>
         {null}
       </div>);
diff --git a/jujugui/static/gui/src/app/components/added-services-list/item/item.js b/jujugui/static/gui/src/app/components/added-services-list/item/item.js
index 958ec007c2..ab5690f141 100644
--- a/jujugui/static/gui/src/app/components/added-services-list/item/item.js
+++ b/jujugui/static/gui/src/app/components/added-services-list/item/item.js
@@ -100,7 +100,8 @@ class AddedServicesListItem extends React.Component {
     var statusData = this._getPriorityUnits(service.units.toArray());
     var statusIndicator = this._renderStatusIndicator(statusData);
     return (
-      <li className={this._generateClassName()}
+      <li
+        className={this._generateClassName()}
         data-serviceid={service.id}
         onClick={this._onClickHandler.bind(this)}
         onMouseEnter={this._onMouseEnter.bind(this)}
diff --git a/jujugui/static/gui/src/app/components/added-services-list/item/test-item.js b/jujugui/static/gui/src/app/components/added-services-list/item/test-item.js
index 8336c39cbd..0267e16041 100644
--- a/jujugui/static/gui/src/app/components/added-services-list/item/test-item.js
+++ b/jujugui/static/gui/src/app/components/added-services-list/item/test-item.js
@@ -33,7 +33,8 @@ describe('AddedServicesListItem', function() {
     mockService.set('fade', false);
     const wrapper = renderComponent();
     const expected = (
-      <li className="inspector-view__list-item"
+      <li
+        className="inspector-view__list-item"
         data-serviceid="wordpress"
         onClick={wrapper.prop('onClick')}
         onMouseEnter={wrapper.prop('onMouseEnter')}
diff --git a/jujugui/static/gui/src/app/components/boolean-config/boolean-config.js b/jujugui/static/gui/src/app/components/boolean-config/boolean-config.js
index 4fd3880319..0413ec0bb8 100644
--- a/jujugui/static/gui/src/app/components/boolean-config/boolean-config.js
+++ b/jujugui/static/gui/src/app/components/boolean-config/boolean-config.js
@@ -101,7 +101,8 @@ class BooleanConfig extends React.Component {
             </label>
           </div>
         </div>
-        <div className="boolean-config--description"
+        <div
+          className="boolean-config--description"
           dangerouslySetInnerHTML={{__html: this.props.option.description}}>
         </div>
       </div>
diff --git a/jujugui/static/gui/src/app/components/boolean-config/test-boolean-config.js b/jujugui/static/gui/src/app/components/boolean-config/test-boolean-config.js
index 4707622988..30fb30809d 100644
--- a/jujugui/static/gui/src/app/components/boolean-config/test-boolean-config.js
+++ b/jujugui/static/gui/src/app/components/boolean-config/test-boolean-config.js
@@ -48,7 +48,8 @@ describe('BooleanConfig', function() {
             </label>
           </div>
         </div>
-        <div className="boolean-config--description"
+        <div
+          className="boolean-config--description"
           dangerouslySetInnerHTML={{__html: option.description}}>
         </div>
       </div>
diff --git a/jujugui/static/gui/src/app/components/budget-chart/budget-chart.js b/jujugui/static/gui/src/app/components/budget-chart/budget-chart.js
index aad59471d0..316c3fd623 100644
--- a/jujugui/static/gui/src/app/components/budget-chart/budget-chart.js
+++ b/jujugui/static/gui/src/app/components/budget-chart/budget-chart.js
@@ -52,10 +52,12 @@ class BudgetChart extends React.Component {
         <div className="budget-chart__chart twelve-col">
           <div className="budget-chart__chart-limit">
           </div>
-          <div className="budget-chart__chart-new"
+          <div
+            className="budget-chart__chart-new"
             style={styles.new}>
           </div>
-          <div className="budget-chart__chart-existing"
+          <div
+            className="budget-chart__chart-existing"
             style={styles.existing}>
           </div>
         </div>
diff --git a/jujugui/static/gui/src/app/components/budget-chart/test-budget-chart.js b/jujugui/static/gui/src/app/components/budget-chart/test-budget-chart.js
index 46ad6ae19b..c7994dff1c 100644
--- a/jujugui/static/gui/src/app/components/budget-chart/test-budget-chart.js
+++ b/jujugui/static/gui/src/app/components/budget-chart/test-budget-chart.js
@@ -25,10 +25,12 @@ describe('BudgetChart', function() {
         <div className="budget-chart__chart twelve-col">
           <div className="budget-chart__chart-limit">
           </div>
-          <div className="budget-chart__chart-new"
+          <div
+            className="budget-chart__chart-new"
             style={{width: '0%'}}>
           </div>
-          <div className="budget-chart__chart-existing"
+          <div
+            className="budget-chart__chart-existing"
             style={{
               left: '0%',
               width: '25%'
@@ -64,10 +66,12 @@ describe('BudgetChart', function() {
         <div className="budget-chart__chart twelve-col">
           <div className="budget-chart__chart-limit">
           </div>
-          <div className="budget-chart__chart-new"
+          <div
+            className="budget-chart__chart-new"
             style={{width: '0%'}}>
           </div>
-          <div className="budget-chart__chart-existing"
+          <div
+            className="budget-chart__chart-existing"
             style={{
               left: '0%',
               width: '0%'
diff --git a/jujugui/static/gui/src/app/components/budget-table/row/row.js b/jujugui/static/gui/src/app/components/budget-table/row/row.js
index a5dd8b2e12..0a025a3ffd 100644
--- a/jujugui/static/gui/src/app/components/budget-table/row/row.js
+++ b/jujugui/static/gui/src/app/components/budget-table/row/row.js
@@ -111,7 +111,8 @@ class BudgetTableRow extends React.Component {
     var disabled = this.props.acl.isReadOnly();
     var plans = this.state.plans.map((plan, i) => {
       return (
-        <li className="budget-table__plan twelve-col"
+        <li
+          className="budget-table__plan twelve-col"
           key={i}>
           <div className="six-col">
             <h4>{plan.url}</h4>
@@ -196,7 +197,8 @@ class BudgetTableRow extends React.Component {
   _generateAllocation() {
     if (this.props.allocationEditable && this.state.editAllocation) {
       return (
-        <input className="budget-table-row__allocation-input"
+        <input
+          className="budget-table-row__allocation-input"
           type="text"
           value="$1" />);
     } else {
@@ -219,7 +221,8 @@ class BudgetTableRow extends React.Component {
     return (
       <div>
         <div className="five-col no-margin-bottom">
-          <img className="budget-table__charm-icon"
+          <img
+            className="budget-table__charm-icon"
             src={service.get('icon')} />
           {service.get('name')}
         </div>
diff --git a/jujugui/static/gui/src/app/components/budget-table/row/test-row.js b/jujugui/static/gui/src/app/components/budget-table/row/test-row.js
index 1adf69672c..02233c0927 100644
--- a/jujugui/static/gui/src/app/components/budget-table/row/test-row.js
+++ b/jujugui/static/gui/src/app/components/budget-table/row/test-row.js
@@ -98,7 +98,8 @@ describe('BudgetTableRow', function() {
           <div>
             <div>
               <div className="five-col no-margin-bottom">
-                <img className="budget-table__charm-icon"
+                <img
+                  className="budget-table__charm-icon"
                   src="landscape.svg" />
                 Landscape
               </div>
@@ -202,7 +203,8 @@ describe('BudgetTableRow', function() {
             'budget-table__current twelve-col no-margin-bottom'}>
             <div>
               <div className="five-col no-margin-bottom">
-                <img className="budget-table__charm-icon"
+                <img
+                  className="budget-table__charm-icon"
                   src="landscape.svg" />
                 Landscape
               </div>
diff --git a/jujugui/static/gui/src/app/components/button-dropdown/button-dropdown.js b/jujugui/static/gui/src/app/components/button-dropdown/button-dropdown.js
index f3969ee805..be08ecf589 100644
--- a/jujugui/static/gui/src/app/components/button-dropdown/button-dropdown.js
+++ b/jujugui/static/gui/src/app/components/button-dropdown/button-dropdown.js
@@ -81,7 +81,8 @@ class ButtonDropdown extends React.Component {
         content = item.element;
       } else if (item.action) {
         content = (
-          <a className="dropdown-menu__list-item-link"
+          <a
+            className="dropdown-menu__list-item-link"
             onClick={this._handleItemClick.bind(this, item.action)}
             role="button">
             {item.label}
@@ -90,7 +91,8 @@ class ButtonDropdown extends React.Component {
         content = item.label;
       }
       return (
-        <li className={this._generateItemClasses(item)}
+        <li
+          className={this._generateItemClasses(item)}
           key={item.id || item.label || ('item-' + i)}
           role="menuitem"
           tabIndex="0">
@@ -123,7 +125,8 @@ class ButtonDropdown extends React.Component {
     const icon = this.props.icon;
     if (typeof icon === 'string') {
       return (
-        <SvgIcon className="button-dropdown__icon"
+        <SvgIcon
+          className="button-dropdown__icon"
           name={icon}
           size="16" />);
     }
@@ -169,7 +172,8 @@ class ButtonDropdown extends React.Component {
     );
     return (
       <div className={classes}>
-        <span aria-controls="headerDropdownMenu"
+        <span
+          aria-controls="headerDropdownMenu"
           aria-expanded="false"
           aria-haspopup="true"
           aria-owns="headerDropdownMenu"
diff --git a/jujugui/static/gui/src/app/components/button-dropdown/test-button-dropdown.js b/jujugui/static/gui/src/app/components/button-dropdown/test-button-dropdown.js
index 12376801b5..ee8cd9df8f 100644
--- a/jujugui/static/gui/src/app/components/button-dropdown/test-button-dropdown.js
+++ b/jujugui/static/gui/src/app/components/button-dropdown/test-button-dropdown.js
@@ -36,7 +36,8 @@ describe('Button Dropdown', function() {
     const wrapper = renderComponent();
     const expected = (
       <div className="button-dropdown extra-classes">
-        <span aria-controls="headerDropdownMenu"
+        <span
+          aria-controls="headerDropdownMenu"
           aria-expanded="false"
           aria-haspopup="true"
           aria-owns="headerDropdownMenu"
@@ -44,7 +45,8 @@ describe('Button Dropdown', function() {
           onClick={wrapper.find('.button-dropdown__button').prop('onClick')}
           role="button"
           tabIndex="0">
-          <SvgIcon className="button-dropdown__icon"
+          <SvgIcon
+            className="button-dropdown__icon"
             name="icon_16"
             size="16" />
           <span className="tooltip__tooltip--below">
@@ -66,33 +68,39 @@ describe('Button Dropdown', function() {
     const menuItems = wrapper.find('.dropdown-menu__list-item');
     const links = wrapper.find('.dropdown-menu__list-item-link');
     const children = [
-      <li className="dropdown-menu__list-item"
+      <li
+        className="dropdown-menu__list-item"
         key="item1"
         role="menuitem"
         tabIndex="0">
-        <a className="dropdown-menu__list-item-link"
+        <a
+          className="dropdown-menu__list-item-link"
           onClick={links.at(0).prop('onClick')}
           role="button">
           item1
         </a>
       </li>,
-      <li className="dropdown-menu__list-item dropdown-menu__list-item--inactive"
+      <li
+        className="dropdown-menu__list-item dropdown-menu__list-item--inactive"
         key="item2"
         role="menuitem"
         tabIndex="0">
         item2
       </li>,
-      <li className="dropdown-menu__list-item"
+      <li
+        className="dropdown-menu__list-item"
         key="item-2"
         role="menuitem"
         tabIndex="0">
         <span>item3</span>
       </li>,
-      <li className="dropdown-menu__list-item dropdown-menu__list-item--active"
+      <li
+        className="dropdown-menu__list-item dropdown-menu__list-item--active"
         key="i4"
         role="menuitem"
         tabIndex="0">
-        <a className="dropdown-menu__list-item-link"
+        <a
+          className="dropdown-menu__list-item-link"
           onClick={links.at(1).prop('onClick')}
           role="button">
           item4
diff --git a/jujugui/static/gui/src/app/components/card-form/card-form.js b/jujugui/static/gui/src/app/components/card-form/card-form.js
index dfded1a0a2..87ec9fa295 100644
--- a/jujugui/static/gui/src/app/components/card-form/card-form.js
+++ b/jujugui/static/gui/src/app/components/card-form/card-form.js
@@ -56,7 +56,8 @@ class CardForm extends React.Component {
           ref="name"
           required={true}
           validate={[required]} />
-        <div className="card-form__card"
+        <div
+          className="card-form__card"
           ref="cardNode"></div>
       </div>
     );
diff --git a/jujugui/static/gui/src/app/components/card-form/test-card-form.js b/jujugui/static/gui/src/app/components/card-form/test-card-form.js
index c6829ad11a..d7dc3d70ae 100644
--- a/jujugui/static/gui/src/app/components/card-form/test-card-form.js
+++ b/jujugui/static/gui/src/app/components/card-form/test-card-form.js
@@ -33,7 +33,8 @@ describe('CardForm', function() {
             regex: /\S+/,
             error: 'This field is required.'
           }]} />
-        <div className="card-form__card"
+        <div
+          className="card-form__card"
           ref="cardNode"></div>
       </div>);
     assert.compareJSX(wrapper, expected);
diff --git a/jujugui/static/gui/src/app/components/charmbrowser/charmbrowser.js b/jujugui/static/gui/src/app/components/charmbrowser/charmbrowser.js
index 2637cfa40f..e4d14acae9 100644
--- a/jujugui/static/gui/src/app/components/charmbrowser/charmbrowser.js
+++ b/jujugui/static/gui/src/app/components/charmbrowser/charmbrowser.js
@@ -199,7 +199,8 @@ class Charmbrowser extends React.Component {
         focus={false}
         instanceName="white-box"
         visible={true}>
-        <div className="charmbrowser"
+        <div
+          className="charmbrowser"
           ref="charmbrowser">
           {this._generateContent()}
         </div>
diff --git a/jujugui/static/gui/src/app/components/charmbrowser/test-charmbrowser.js b/jujugui/static/gui/src/app/components/charmbrowser/test-charmbrowser.js
index 88612a49f7..ee4555a145 100644
--- a/jujugui/static/gui/src/app/components/charmbrowser/test-charmbrowser.js
+++ b/jujugui/static/gui/src/app/components/charmbrowser/test-charmbrowser.js
@@ -72,7 +72,8 @@ describe('Charmbrowser', function() {
     });
     const searchResults = wrapper.find('SearchResults');
     const expected = (
-      <div className="charmbrowser"
+      <div
+        className="charmbrowser"
         ref="charmbrowser">
         <SearchResults
           acl={acl}
@@ -101,7 +102,8 @@ describe('Charmbrowser', function() {
       staticURL: 'surl'
     });
     const expected = (
-      <div className="charmbrowser"
+      <div
+        className="charmbrowser"
         ref="charmbrowser">
         <Store
           changeState={wrapper.find('Store').prop('changeState')}
@@ -143,7 +145,8 @@ describe('Charmbrowser', function() {
     });
     const entityDetails = wrapper.find('EntityDetails');
     const expected = (
-      <div className="charmbrowser"
+      <div
+        className="charmbrowser"
         ref="charmbrowser">
         <EntityDetails
           acl={acl}
diff --git a/jujugui/static/gui/src/app/components/check-list-item/check-list-item.js b/jujugui/static/gui/src/app/components/check-list-item/check-list-item.js
index deebe7ddef..26a32ae834 100644
--- a/jujugui/static/gui/src/app/components/check-list-item/check-list-item.js
+++ b/jujugui/static/gui/src/app/components/check-list-item/check-list-item.js
@@ -107,7 +107,8 @@ class CheckListItem extends React.Component {
       return;
     }
     return (
-      <span className="check-list-item__extra-info"
+      <span
+        className="check-list-item__extra-info"
         title={this.props.extraInfo}>
         {this.props.extraInfo}
       </span>);
@@ -116,11 +117,15 @@ class CheckListItem extends React.Component {
   render() {
     var id = this.props.label + '-item';
     return (
-      <li className={this._generateClasses()}
+      <li
+        className={this._generateClasses()}
         data-id={this.props.id}
-        onClick={this.props.action} role="button" tabIndex="0">
+        onClick={this.props.action}
+        role="button"
+        tabIndex="0">
         <label htmlFor={this._generateId(id)}>
-          <div className="check-list-item__hit-area"
+          <div
+            className="check-list-item__hit-area"
             onClick={this._hitAreaClick.bind(this)}>
             <input
               checked={this.state.checked}
diff --git a/jujugui/static/gui/src/app/components/check-list-item/test-check-list-item.js b/jujugui/static/gui/src/app/components/check-list-item/test-check-list-item.js
index 71fca21ac9..d4354ef52a 100644
--- a/jujugui/static/gui/src/app/components/check-list-item/test-check-list-item.js
+++ b/jujugui/static/gui/src/app/components/check-list-item/test-check-list-item.js
@@ -30,11 +30,15 @@ describe('CheckListItem', () => {
       id: 'apache/2'
     });
     const expected = (
-      <li className="check-list-item check-list-item--select-all"
+      <li
+        className="check-list-item check-list-item--select-all"
         data-id="apache/2"
-        onClick={undefined} role="button" tabIndex="0">
+        onClick={undefined}
+        role="button"
+        tabIndex="0">
         <label htmlFor="a-label-item">
-          <div className="check-list-item__hit-area"
+          <div
+            className="check-list-item__hit-area"
             onClick={wrapper.find('.check-list-item__hit-area').prop('onClick')}>
             <input
               checked={false}
@@ -61,7 +65,8 @@ describe('CheckListItem', () => {
       extraInfo: 'Current workload status'
     });
     const expected = (
-      <span className="check-list-item__extra-info"
+      <span
+        className="check-list-item__extra-info"
         title="Current workload status">
           Current workload status
       </span>);
diff --git a/jujugui/static/gui/src/app/components/constraints/constraints.js b/jujugui/static/gui/src/app/components/constraints/constraints.js
index 7ee548a56d..508d121292 100644
--- a/jujugui/static/gui/src/app/components/constraints/constraints.js
+++ b/jujugui/static/gui/src/app/components/constraints/constraints.js
@@ -93,7 +93,8 @@ class Constraints extends React.Component {
         <label className="constraints__label" htmlFor="cpu-constraint">
           CPU (GHZ)
         </label>
-        <input className="constraints__input"
+        <input
+          className="constraints__input"
           defaultValue={constraints['cpu-power']}
           disabled={disabled}
           id="cpu-constraint"
@@ -108,7 +109,8 @@ class Constraints extends React.Component {
         <label className="constraints__label" htmlFor="cores-constraint">
           Cores
         </label>
-        <input className="constraints__input"
+        <input
+          className="constraints__input"
           defaultValue={constraints['cpu-cores']}
           disabled={disabled}
           id="cores-constraint"
@@ -123,7 +125,8 @@ class Constraints extends React.Component {
         <label className="constraints__label" htmlFor="mem-constraint">
           Ram (MB)
         </label>
-        <input className="constraints__input"
+        <input
+          className="constraints__input"
           defaultValue={constraints.mem}
           disabled={disabled}
           id="mem-constraint"
@@ -138,7 +141,8 @@ class Constraints extends React.Component {
         <label className="constraints__label" htmlFor="disk-constraint">
           Disk (MB)
         </label>
-        <input className="constraints__input"
+        <input
+          className="constraints__input"
           defaultValue={constraints['root-disk']}
           disabled={disabled}
           id="disk-constraint"
diff --git a/jujugui/static/gui/src/app/components/constraints/test-constraints.js b/jujugui/static/gui/src/app/components/constraints/test-constraints.js
index 321940eb09..956ac1e5c4 100644
--- a/jujugui/static/gui/src/app/components/constraints/test-constraints.js
+++ b/jujugui/static/gui/src/app/components/constraints/test-constraints.js
@@ -66,7 +66,8 @@ describe('Constraints', function() {
             <label className="constraints__label" htmlFor="cpu-constraint">
               CPU (GHZ)
             </label>
-            <input className="constraints__input"
+            <input
+              className="constraints__input"
               defaultValue={undefined}
               disabled={false}
               id="cpu-constraint"
@@ -79,7 +80,8 @@ describe('Constraints', function() {
             <label className="constraints__label" htmlFor="cores-constraint">
               Cores
             </label>
-            <input className="constraints__input"
+            <input
+              className="constraints__input"
               defaultValue={undefined}
               disabled={false}
               id="cores-constraint"
@@ -92,7 +94,8 @@ describe('Constraints', function() {
             <label className="constraints__label" htmlFor="mem-constraint">
               Ram (MB)
             </label>
-            <input className="constraints__input"
+            <input
+              className="constraints__input"
               defaultValue={undefined}
               disabled={false}
               id="mem-constraint"
@@ -105,7 +108,8 @@ describe('Constraints', function() {
             <label className="constraints__label" htmlFor="disk-constraint">
               Disk (MB)
             </label>
-            <input className="constraints__input"
+            <input
+              className="constraints__input"
               defaultValue={undefined}
               disabled={false}
               id="disk-constraint"
diff --git a/jujugui/static/gui/src/app/components/copy-to-clipboard/copy-to-clipboard.js b/jujugui/static/gui/src/app/components/copy-to-clipboard/copy-to-clipboard.js
index 27f80e712a..1528d1e88e 100644
--- a/jujugui/static/gui/src/app/components/copy-to-clipboard/copy-to-clipboard.js
+++ b/jujugui/static/gui/src/app/components/copy-to-clipboard/copy-to-clipboard.js
@@ -31,12 +31,14 @@ class CopyToClipboard extends React.Component {
     var className = this.props.className;
     return (
       <div className={className}>
-        <input className={className + '__input'}
+        <input
+          className={className + '__input'}
           readOnly="true"
           ref="input"
           type="text"
           value={this.props.value} />
-        <button className={className + '__btn'}
+        <button
+          className={className + '__btn'}
           ref="btn">
           <SvgIcon
             name="copy-to-clipboard-16"
diff --git a/jujugui/static/gui/src/app/components/copy-to-clipboard/test-copy-to-clipboard.js b/jujugui/static/gui/src/app/components/copy-to-clipboard/test-copy-to-clipboard.js
index 6958afbd3f..46f2d61212 100644
--- a/jujugui/static/gui/src/app/components/copy-to-clipboard/test-copy-to-clipboard.js
+++ b/jujugui/static/gui/src/app/components/copy-to-clipboard/test-copy-to-clipboard.js
@@ -27,12 +27,14 @@ describe('CopyToClipboard', function() {
     const wrapper = renderComponent();
     var expected = (
       <div className="copy-to-clipboard">
-        <input className="copy-to-clipboard__input"
+        <input
+          className="copy-to-clipboard__input"
           readOnly="true"
           ref="input"
           type="text"
           value="" />
-        <button className="copy-to-clipboard__btn"
+        <button
+          className="copy-to-clipboard__btn"
           ref="btn">
           <SvgIcon
             name="copy-to-clipboard-16"
diff --git a/jujugui/static/gui/src/app/components/create-payment-user/create-payment-user.js b/jujugui/static/gui/src/app/components/create-payment-user/create-payment-user.js
index b278371c81..f8942a33bc 100644
--- a/jujugui/static/gui/src/app/components/create-payment-user/create-payment-user.js
+++ b/jujugui/static/gui/src/app/components/create-payment-user/create-payment-user.js
@@ -268,7 +268,8 @@ class CreatePaymentUser extends React.Component {
             <ul className="create-payment-user__form-type">
               <li className="create-payment-user__form-type-option">
                 <label htmlFor="business">
-                  <input checked={this.state.business}
+                  <input
+                    checked={this.state.business}
                     id="business"
                     name="formType"
                     onChange={this._setFormType.bind(this)}
@@ -278,7 +279,8 @@ class CreatePaymentUser extends React.Component {
               </li>
               <li className="create-payment-user__form-type-option">
                 <label htmlFor="personal">
-                  <input checked={!this.state.business}
+                  <input
+                    checked={!this.state.business}
                     id="personal"
                     name="formType"
                     onChange={this._setFormType.bind(this)}
@@ -311,7 +313,8 @@ class CreatePaymentUser extends React.Component {
               createCardElement={this.props.stripe.createCardElement}
               ref="cardForm" />
             <label htmlFor="cardAddressSame">
-              <input checked={this.state.cardAddressSame}
+              <input
+                checked={this.state.cardAddressSame}
                 id="cardAddressSame"
                 name="cardAddressSame"
                 onChange={this._handleCardSameChange.bind(this)}
@@ -320,7 +323,8 @@ class CreatePaymentUser extends React.Component {
               Credit or debit card address is the same as above
             </label>
             <label htmlFor="billingAddressSame">
-              <input checked={this.state.billingAddressSame}
+              <input
+                checked={this.state.billingAddressSame}
                 id="billingAddressSame"
                 name="billingAddressSame"
                 onChange={this._handleBillingSameChange.bind(this)}
diff --git a/jujugui/static/gui/src/app/components/create-payment-user/test-create-payment-user.js b/jujugui/static/gui/src/app/components/create-payment-user/test-create-payment-user.js
index 3d791e91b6..bde85e834f 100644
--- a/jujugui/static/gui/src/app/components/create-payment-user/test-create-payment-user.js
+++ b/jujugui/static/gui/src/app/components/create-payment-user/test-create-payment-user.js
@@ -71,7 +71,8 @@ describe('CreatePaymentUser', function() {
             <ul className="create-payment-user__form-type">
               <li className="create-payment-user__form-type-option">
                 <label htmlFor="business">
-                  <input checked={false}
+                  <input
+                    checked={false}
                     id="business"
                     name="formType"
                     onChange={options.at(1).prop('onChange')}
@@ -81,7 +82,8 @@ describe('CreatePaymentUser', function() {
               </li>
               <li className="create-payment-user__form-type-option">
                 <label htmlFor="personal">
-                  <input checked={true}
+                  <input
+                    checked={true}
                     id="personal"
                     name="formType"
                     onChange={options.at(0).prop('onChange')}
@@ -117,7 +119,8 @@ describe('CreatePaymentUser', function() {
               createCardElement={sinon.stub()}
               ref="cardForm" />
             <label htmlFor="cardAddressSame">
-              <input checked={true}
+              <input
+                checked={true}
                 id="cardAddressSame"
                 name="cardAddressSame"
                 onChange={options.at(2).prop('onChange')}
@@ -126,7 +129,8 @@ describe('CreatePaymentUser', function() {
               Credit or debit card address is the same as above
             </label>
             <label htmlFor="billingAddressSame">
-              <input checked={true}
+              <input
+                checked={true}
                 id="billingAddressSame"
                 name="billingAddressSame"
                 onChange={options.at(3).prop('onChange')}
diff --git a/jujugui/static/gui/src/app/components/date-display/date-display.js b/jujugui/static/gui/src/app/components/date-display/date-display.js
index 3e7f72d4cc..7d89c9e048 100644
--- a/jujugui/static/gui/src/app/components/date-display/date-display.js
+++ b/jujugui/static/gui/src/app/components/date-display/date-display.js
@@ -174,7 +174,8 @@ class DateDisplay extends React.Component {
     // just return it without any date-parsing fun.
     if (!isNaN(Date.parse(this.props.date))) {
       return (
-        <time dateTime={this._generateDate()}
+        <time
+          dateTime={this._generateDate()}
           title={this._generateTitle()}>
           {this._generateContent()}
         </time>
diff --git a/jujugui/static/gui/src/app/components/date-display/test-date-display.js b/jujugui/static/gui/src/app/components/date-display/test-date-display.js
index 1769d6f458..cdb0e385f5 100644
--- a/jujugui/static/gui/src/app/components/date-display/test-date-display.js
+++ b/jujugui/static/gui/src/app/components/date-display/test-date-display.js
@@ -39,7 +39,8 @@ describe('DateDisplay', () => {
   it('can display a date in the correct format', () => {
     const wrapper = renderComponent({ date: relative });
     const expected = (
-      <time dateTime="19/01/2020"
+      <time
+        dateTime="19/01/2020"
         title="19/01/2020 21:07">
         19/01/2020
       </time>);
@@ -49,7 +50,8 @@ describe('DateDisplay', () => {
   it('can parse a date from a string', () => {
     const wrapper = renderComponent({ date: 'Mon, 19 Jan 2020 21:07:24 GMT' });
     const expected = (
-      <time dateTime="19/01/2020"
+      <time
+        dateTime="19/01/2020"
         title="19/01/2020 21:07">
         19/01/2020
       </time>);
@@ -63,7 +65,8 @@ describe('DateDisplay', () => {
       relative: true
     });
     const expected = (
-      <time dateTime="19/01/2020"
+      <time
+        dateTime="19/01/2020"
         title="19/01/2020 21:07">
         just now
       </time>);
@@ -77,7 +80,8 @@ describe('DateDisplay', () => {
       relative: true
     });
     const expected = (
-      <time dateTime="19/01/2020"
+      <time
+        dateTime="19/01/2020"
         title="19/01/2020 21:06">
         1 minute ago
       </time>);
@@ -91,7 +95,8 @@ describe('DateDisplay', () => {
       relative: true
     });
     const expected = (
-      <time dateTime="19/01/2020"
+      <time
+        dateTime="19/01/2020"
         title="19/01/2020 20:48">
         19 minutes ago
       </time>);
@@ -105,7 +110,8 @@ describe('DateDisplay', () => {
       relative: true
     });
     const expected = (
-      <time dateTime="19/01/2020"
+      <time
+        dateTime="19/01/2020"
         title="19/01/2020 20:07">
         1 hour ago
       </time>);
@@ -119,7 +125,8 @@ describe('DateDisplay', () => {
       relative: true
     });
     const expected = (
-      <time dateTime="19/01/2020"
+      <time
+        dateTime="19/01/2020"
         title="19/01/2020 10:07">
         11 hours ago
       </time>);
@@ -133,7 +140,8 @@ describe('DateDisplay', () => {
       relative: true
     });
     const expected = (
-      <time dateTime="18/01/2020"
+      <time
+        dateTime="18/01/2020"
         title="18/01/2020 21:07">
         1 day ago
       </time>);
@@ -147,7 +155,8 @@ describe('DateDisplay', () => {
       relative: true
     });
     const expected = (
-      <time dateTime="13/01/2020"
+      <time
+        dateTime="13/01/2020"
         title="13/01/2020 21:07">
         6 days ago
       </time>);
@@ -161,7 +170,8 @@ describe('DateDisplay', () => {
       relative: true
     });
     const expected = (
-      <time dateTime="11/01/2020"
+      <time
+        dateTime="11/01/2020"
         title="11/01/2020 21:07">
         1 week ago
       </time>);
@@ -175,7 +185,8 @@ describe('DateDisplay', () => {
       relative: true
     });
     const expected = (
-      <time dateTime="25/12/2019"
+      <time
+        dateTime="25/12/2019"
         title="25/12/2019 21:07">
         3 weeks ago
       </time>);
@@ -189,7 +200,8 @@ describe('DateDisplay', () => {
       relative: true
     });
     const expected = (
-      <time dateTime="18/12/2019"
+      <time
+        dateTime="18/12/2019"
         title="18/12/2019 21:07">
         1 month ago
       </time>);
@@ -203,7 +215,8 @@ describe('DateDisplay', () => {
       relative: true
     });
     const expected = (
-      <time dateTime="11/10/2019"
+      <time
+        dateTime="11/10/2019"
         title="11/10/2019 21:07">
         3 months ago
       </time>);
@@ -217,7 +230,8 @@ describe('DateDisplay', () => {
       relative: true
     });
     const expected = (
-      <time dateTime="26/10/2018"
+      <time
+        dateTime="26/10/2018"
         title="26/10/2018 21:07">
         26/10/2018
       </time>);
diff --git a/jujugui/static/gui/src/app/components/deployment-bar/notification/notification.js b/jujugui/static/gui/src/app/components/deployment-bar/notification/notification.js
index 81a5c09c30..febc86d40e 100644
--- a/jujugui/static/gui/src/app/components/deployment-bar/notification/notification.js
+++ b/jujugui/static/gui/src/app/components/deployment-bar/notification/notification.js
@@ -68,7 +68,8 @@ class DeploymentBarNotification extends React.Component {
       'deployment-bar__notification--visible': this.state.visible
     });
     return (
-      <div className={classes}
+      <div
+        className={classes}
         onClick={this._handleClick.bind(this)}>
         {description}
       </div>
diff --git a/jujugui/static/gui/src/app/components/deployment-bar/notification/test-notification.js b/jujugui/static/gui/src/app/components/deployment-bar/notification/test-notification.js
index c1c4434709..2cef11b628 100644
--- a/jujugui/static/gui/src/app/components/deployment-bar/notification/test-notification.js
+++ b/jujugui/static/gui/src/app/components/deployment-bar/notification/test-notification.js
@@ -35,7 +35,8 @@ describe('DeploymentBarNotification', function() {
     };
     const wrapper = renderComponent({ change });
     const expected = (
-      <div className="deployment-bar__notification deployment-bar__notification--visible"
+      <div
+        className="deployment-bar__notification deployment-bar__notification--visible"
         onClick={wrapper.prop('onClick')}>
           Django added
       </div>);
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/agreements/agreements.js b/jujugui/static/gui/src/app/components/deployment-flow/agreements/agreements.js
index d99c26a4ca..0521bdea79 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/agreements/agreements.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/agreements/agreements.js
@@ -68,12 +68,14 @@ class DeploymentAgreements extends React.Component {
       });
     return (
       <div className={classes}>
-        <input className="deployment-flow__deploy-checkbox"
+        <input
+          className="deployment-flow__deploy-checkbox"
           disabled={disabled}
           id="terms"
           onChange={this.props.onCheckboxChange}
           type="checkbox" />
-        <label className="deployment-flow__deploy-label"
+        <label
+          className="deployment-flow__deploy-label"
           htmlFor="terms">
           I agree to all terms.
           {this._generateTermsLink()}
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/agreements/test-agreements.js b/jujugui/static/gui/src/app/components/deployment-flow/agreements/test-agreements.js
index 59e9622596..47b0264001 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/agreements/test-agreements.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/agreements/test-agreements.js
@@ -28,12 +28,14 @@ describe('DeploymentAgreements', function() {
     const wrapper = renderComponent();
     const expected = (
       <div className="deployment-flow-agreements deployment-flow__deploy-option">
-        <input className="deployment-flow__deploy-checkbox"
+        <input
+          className="deployment-flow__deploy-checkbox"
           disabled={false}
           id="terms"
           onChange={sinon.stub()}
           type="checkbox" />
-        <label className="deployment-flow__deploy-label"
+        <label
+          className="deployment-flow__deploy-label"
           htmlFor="terms">
           I agree to all terms.
         </label>
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/change-item/change-item.js b/jujugui/static/gui/src/app/components/deployment-flow/change-item/change-item.js
index 0dc1b85dcd..ed05a5d071 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/change-item/change-item.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/change-item/change-item.js
@@ -23,7 +23,8 @@ class DeploymentChangeItem extends React.Component {
       node = <img alt="" className={className} src={icon} />;
     } else {
       node = (
-        <SvgIcon className={className}
+        <SvgIcon
+          className={className}
           name={icon}
           size="16" />);
     }
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/change-item/test-change-item.js b/jujugui/static/gui/src/app/components/deployment-flow/change-item/test-change-item.js
index 726f56c4c7..89b4f77df5 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/change-item/test-change-item.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/change-item/test-change-item.js
@@ -31,7 +31,8 @@ describe('DeploymentChangeItem', function() {
     const expected = (
       <div className="deployment-change-item">
         <span className="deployment-change-item__change">
-          <SvgIcon className="deployment-change-item__icon"
+          <SvgIcon
+            className="deployment-change-item__icon"
             name="my-icon"
             size="16" />
           Django was added
@@ -49,7 +50,9 @@ describe('DeploymentChangeItem', function() {
   it('can display an svg icon', function() {
     const wrapper = renderComponent();
     const expected = (
-      <img alt="" className="deployment-change-item__icon"
+      <img
+        alt=""
+        className="deployment-change-item__icon"
         src="my-icon.svg" />);
     assert.compareJSX(wrapper.find('.deployment-change-item__icon'), expected);
   });
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/cloud/cloud.js b/jujugui/static/gui/src/app/components/deployment-flow/cloud/cloud.js
index bfe3c7485d..3e78bd60ce 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/cloud/cloud.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/cloud/cloud.js
@@ -84,7 +84,8 @@ class DeploymentCloud extends React.Component {
         'four-col',
         {'last-col': i % 3 === 2});
       clouds.push(
-        <li className={classes}
+        <li
+          className={classes}
           key={cloud.name}
           onClick={this.props.setCloud.bind(null, cloud)}
           role="button"
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/cloud/test-cloud.js b/jujugui/static/gui/src/app/components/deployment-flow/cloud/test-cloud.js
index 2896f4d31d..46acbf1237 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/cloud/test-cloud.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/cloud/test-cloud.js
@@ -46,7 +46,8 @@ describe('DeploymentCloud', function() {
     var expected = (
       <div>
         <ul className="deployment-cloud__list">
-          <li className="deployment-cloud__cloud four-col"
+          <li
+            className="deployment-cloud__cloud four-col"
             key="google"
             onClick={options.at(0).prop('onClick')}
             role="button"
@@ -58,7 +59,8 @@ describe('DeploymentCloud', function() {
                 width={256} />
             </span>
           </li>
-          <li className="deployment-cloud__cloud four-col"
+          <li
+            className="deployment-cloud__cloud four-col"
             key="azure"
             onClick={options.at(1).prop('onClick')}
             role="button"
@@ -70,7 +72,8 @@ describe('DeploymentCloud', function() {
                 width={204} />
             </span>
           </li>
-          <li className="deployment-cloud__cloud four-col last-col"
+          <li
+            className="deployment-cloud__cloud four-col last-col"
             key="aws"
             onClick={options.at(2).prop('onClick')}
             role="button"
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/credential/add/add.js b/jujugui/static/gui/src/app/components/deployment-flow/credential/add/add.js
index 4f5a10d032..b16d2bb4b1 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/credential/add/add.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/credential/add/add.js
@@ -175,7 +175,8 @@ class DeploymentCredentialAdd extends React.Component {
       const required = field.required === undefined ? true : field.required;
       if (field.json) {
         return (
-          <div className="deployment-credential-add__upload"
+          <div
+            className="deployment-credential-add__upload"
             key={field.id}>
             <FileField
               accept=".json"
@@ -271,7 +272,9 @@ class DeploymentCredentialAdd extends React.Component {
         </h4>
         {credentialName || !signupURL ? null : (
           <div className="twelve-col deployment-credential-add__signup">
-            <a className="deployment-credential-add__link" href={signupURL}
+            <a
+              className="deployment-credential-add__link"
+              href={signupURL}
               target="_blank">
               Sign up for {title}
               &nbsp;
@@ -280,7 +283,8 @@ class DeploymentCredentialAdd extends React.Component {
                 size="12" />
             </a>
           </div>)}
-        <form className="twelve-col no-margin-bottom"
+        <form
+          className="twelve-col no-margin-bottom"
           onSubmit={this._handleAddCredentials.bind(this)}>
           <div className="six-col last-col">
             <GenericInput
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/credential/add/test-add.js b/jujugui/static/gui/src/app/components/deployment-flow/credential/add/test-add.js
index 998a58b5dc..2eb07000dc 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/credential/add/test-add.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/credential/add/test-add.js
@@ -65,7 +65,8 @@ describe('DeploymentCredentialAdd', function() {
       <div className="deployment-credential-add twelve-col no-margin-bottom">
         <h4>Create new Google Compute Engine credential</h4>
         <div className="twelve-col deployment-credential-add__signup">
-          <a className="deployment-credential-add__link"
+          <a
+            className="deployment-credential-add__link"
             href="https://console.cloud.google.com/billing/freetrial"
             target="_blank">
             Sign up for {'Google Compute Engine'}
@@ -75,7 +76,8 @@ describe('DeploymentCredentialAdd', function() {
               size="12" />
           </a>
         </div>
-        <form className="twelve-col no-margin-bottom"
+        <form
+          className="twelve-col no-margin-bottom"
           onSubmit={wrapper.find('form').prop('onSubmit')}>
           <div className="six-col last-col">
             <GenericInput
@@ -100,10 +102,13 @@ describe('DeploymentCredentialAdd', function() {
           <div className="deployment-credential-add__credentials">
             <div className="six-col">
               <p>
-                Need help? Read more about <a className="deployment-panel__link"
+                Need help? Read more about <a
+                  className="deployment-panel__link"
                   href="https://jujucharms.com/docs/stable/credentials"
-                  target="_blank" title="Cloud credentials help">credentials in
-                general</a> or <a className="deployment-panel__link"
+                  target="_blank"
+                  title="Cloud credentials help">credentials in
+                general</a> or <a
+                  className="deployment-panel__link"
                   href="https://jujucharms.com/docs/stable/help-google"
                   target="_blank"
                   title="Help using the Google Compute Engine public cloud">
@@ -242,10 +247,13 @@ describe('DeploymentCredentialAdd', function() {
       <div className="deployment-credential-add__credentials">
         <div className="six-col">
           <p>
-            Need help? Read more about <a className="deployment-panel__link"
+            Need help? Read more about <a
+              className="deployment-panel__link"
               href="https://jujucharms.com/docs/stable/credentials"
-              target="_blank" title="Cloud credentials help">credentials in
-            general</a> or <a className="deployment-panel__link"
+              target="_blank"
+              title="Cloud credentials help">credentials in
+            general</a> or <a
+              className="deployment-panel__link"
               href="https://jujucharms.com/docs/stable/help-google"
               target="_blank"
               title="Help using the Google Compute Engine public cloud">
@@ -343,10 +351,13 @@ describe('DeploymentCredentialAdd', function() {
       <div className="deployment-credential-add__credentials">
         <div className="six-col">
           <p>
-            Need help? Read more about <a className="deployment-panel__link"
+            Need help? Read more about <a
+              className="deployment-panel__link"
               href="https://jujucharms.com/docs/stable/credentials"
-              target="_blank" title="Cloud credentials help">credentials in
-            general</a> or <a className="deployment-panel__link"
+              target="_blank"
+              title="Cloud credentials help">credentials in
+            general</a> or <a
+              className="deployment-panel__link"
               href="https://jujucharms.com/docs/stable/help-google"
               target="_blank"
               title="Help using the Google Compute Engine public cloud">
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/direct-deploy/direct-deploy.js b/jujugui/static/gui/src/app/components/deployment-flow/direct-deploy/direct-deploy.js
index 2a29b91833..f170f40170 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/direct-deploy/direct-deploy.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/direct-deploy/direct-deploy.js
@@ -47,7 +47,8 @@ class DeploymentDirectDeploy extends React.Component {
       store: url.path()
     });
     return (
-      <a className="link"
+      <a
+        className="link"
         href={url}
         target="_blank">
         Learn more about this {this.state.isBundle ? 'bundle' : 'charm'}.
@@ -68,7 +69,8 @@ class DeploymentDirectDeploy extends React.Component {
       const entity = this.props.entityModel.toEntity();
       return (
         <div className="deployment-direct-deploy__image-block">
-          <img alt={entity.displayName}
+          <img
+            alt={entity.displayName}
             className="deployment-direct-deploy__image-block-icon"
             src={entity.iconPath}
             width="96" />
@@ -96,7 +98,8 @@ class DeploymentDirectDeploy extends React.Component {
         <div className="deployment-direct-deploy__content">
           This {this.state.isBundle ? 'bundle' : 'charm'} could not be found.
           Visit the&nbsp;
-          <span className="link"
+          <span
+            className="link"
             onClick={this._handleStoreClick.bind(this)}
             role="button"
             tabIndex="0">
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/direct-deploy/test-direct-deploy.js b/jujugui/static/gui/src/app/components/deployment-flow/direct-deploy/test-direct-deploy.js
index e18b134397..c8fb03ace4 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/direct-deploy/test-direct-deploy.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/direct-deploy/test-direct-deploy.js
@@ -29,7 +29,8 @@ describe('DirectDeploy', function() {
       <div className="deployment-direct-deploy__content">
         This {'bundle'} could not be found.
         Visit the&nbsp;
-        <span className="link"
+        <span
+          className="link"
           onClick={wrapper.find('.link').prop('onClick')}
           role="button"
           tabIndex="0">
@@ -48,7 +49,8 @@ describe('DirectDeploy', function() {
       <div className="deployment-direct-deploy__content">
         This {'charm'} could not be found.
         Visit the&nbsp;
-        <span className="link"
+        <span
+          className="link"
           onClick={wrapper.find('.link').prop('onClick')}
           role="button"
           tabIndex="0">
@@ -87,7 +89,8 @@ describe('DirectDeploy', function() {
               machine{''} in your cloud.
             </li>
           </ul>
-          <a className="link"
+          <a
+            className="link"
             href="http://example.com/"
             target="_blank">
             Learn more about this {'charm'}.
@@ -96,7 +99,8 @@ describe('DirectDeploy', function() {
         <div className="six-col last-col no-margin-bottom">
           <div className="deployment-direct-deploy__image">
             <div className="deployment-direct-deploy__image-block">
-              <img alt="Apache 2"
+              <img
+                alt="Apache 2"
                 className="deployment-direct-deploy__image-block-icon"
                 src="http://example.com/icon.svg"
                 width="96" />
@@ -144,7 +148,8 @@ describe('DirectDeploy', function() {
               machine{'s'} in your cloud.
             </li>
           </ul>
-          <a className="link"
+          <a
+            className="link"
             href="http://example.com/"
             target="_blank">
             Learn more about this {'bundle'}.
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/expert-intro/expert-intro.js b/jujugui/static/gui/src/app/components/deployment-flow/expert-intro/expert-intro.js
index 80c259d96f..e2a11907a5 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/expert-intro/expert-intro.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/expert-intro/expert-intro.js
@@ -52,7 +52,8 @@ class DeploymentExpertIntro extends React.Component {
         <div className="deployment-expert-intro__not-found">
           This {this.isBundle ? 'bundle' : 'charm'} could not be found.
           Visit the&nbsp;
-          <span className="link"
+          <span
+            className="link"
             onClick={this._handleStoreClick.bind(this)}
             role="button"
             tabIndex="0">
@@ -87,7 +88,8 @@ class DeploymentExpertIntro extends React.Component {
                 <ul>
                   <li>
                     Your&nbsp;
-                    <a href="https://jujucharms.com/docs/stable/credentials"
+                    <a
+                      href="https://jujucharms.com/docs/stable/credentials"
                       target="_blank">
                       cloud credentials
                     </a>.&nbsp;
@@ -115,7 +117,8 @@ class DeploymentExpertIntro extends React.Component {
                   <div
                     className="deployment-expert-intro__description"
                     dangerouslySetInnerHTML={{__html: supportedDescription}}></div>
-                  <Link changeState={this.props.changeState}
+                  <Link
+                    changeState={this.props.changeState}
                     clickState={{ hash: 'support-level' }}
                     generatePath={this.props.generatePath}>
                     View other support options
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/expert-intro/test-expert-intro.js b/jujugui/static/gui/src/app/components/deployment-flow/expert-intro/test-expert-intro.js
index 82b9d9c56c..afb9f4a349 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/expert-intro/test-expert-intro.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/expert-intro/test-expert-intro.js
@@ -45,7 +45,8 @@ describe('DeploymentExpertIntro', () => {
       <div className="deployment-expert-intro__not-found">
         This {'charm'} could not be found.
         Visit the&nbsp;
-        <span className="link"
+        <span
+          className="link"
           onClick={wrapper.find('.deployment-expert-intro__not-found .link').prop('onClick')}
           role="button"
           tabIndex="0">
@@ -81,7 +82,8 @@ describe('DeploymentExpertIntro', () => {
                 <ul>
                   <li>
                     Your&nbsp;
-                    <a href="https://jujucharms.com/docs/stable/credentials"
+                    <a
+                      href="https://jujucharms.com/docs/stable/credentials"
                       target="_blank">
                       cloud credentials
                     </a>.&nbsp;
@@ -109,7 +111,8 @@ describe('DeploymentExpertIntro', () => {
                   <div
                     className="deployment-expert-intro__description"
                     dangerouslySetInnerHTML={{_html: 'md'}} />
-                  <Link changeState={sinon.stub()}
+                  <Link
+                    changeState={sinon.stub()}
                     clickState={{ hash: 'support-level' }}
                     generatePath={sinon.stub()}>
                     View other support options
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/login/login.js b/jujugui/static/gui/src/app/components/deployment-flow/login/login.js
index 3a20da21b4..cbffc7266d 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/login/login.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/login/login.js
@@ -141,7 +141,8 @@ class DeploymentLogin extends React.Component {
               a fully managed Juju infrastructure.
             </p>
             <p>
-              <a className="deployment-login-features__link"
+              <a
+                className="deployment-login-features__link"
                 href="http://jujucharms.com/jaas"
                 target="_blank">
                 Learn more about JAAS &rsaquo;
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/login/test-login.js b/jujugui/static/gui/src/app/components/deployment-flow/login/test-login.js
index 2f80544a5d..07ee43dd36 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/login/test-login.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/login/test-login.js
@@ -131,7 +131,8 @@ describe('DeploymentLogin', function() {
               a fully managed Juju infrastructure.
             </p>
             <p>
-              <a className="deployment-login-features__link"
+              <a
+                className="deployment-login-features__link"
                 href="http://jujucharms.com/jaas"
                 target="_blank">
                 Learn more about JAAS &rsaquo;
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/machines/machines.js b/jujugui/static/gui/src/app/components/deployment-flow/machines/machines.js
index a82c8dafed..0469933317 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/machines/machines.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/machines/machines.js
@@ -34,7 +34,8 @@ class DeploymentMachines extends React.Component {
     const machineList = Object.keys(machineDetails).map(machine => {
       const count = machineDetails[machine];
       return (
-        <li className="deployment-flow__row twelve-col"
+        <li
+          className="deployment-flow__row twelve-col"
           key={machine}>
           <div className="eight-col">
             {machine}
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/machines/test-machines.js b/jujugui/static/gui/src/app/components/deployment-flow/machines/test-machines.js
index 4a0c232425..ccb29f2bb3 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/machines/test-machines.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/machines/test-machines.js
@@ -133,7 +133,8 @@ describe('DeploymentMachines', function() {
             </div>
           </li>
           {[
-            <li className="deployment-flow__row twelve-col"
+            <li
+              className="deployment-flow__row twelve-col"
               key="xenial (constraints not set)">
               <div className="eight-col">
                 xenial, (constraints not set)
@@ -145,7 +146,8 @@ describe('DeploymentMachines', function() {
                 {1}
               </div>
             </li>,
-            <li className="deployment-flow__row twelve-col"
+            <li
+              className="deployment-flow__row twelve-col"
               key="2x0.03GHz, 1024, 4096">
               <div className="eight-col">
                 cores: 2, CPU: 0.03GHz, mem: 1.00GB, disk: 4.00GB
@@ -157,7 +159,8 @@ describe('DeploymentMachines', function() {
                 {2}
               </div>
             </li>,
-            <li className="deployment-flow__row twelve-col"
+            <li
+              className="deployment-flow__row twelve-col"
               key="trusty, 2x0.03GHz, 1024, 4096">
               <div className="eight-col">
                 trusty, cores: 2, CPU: 0.03GHz, mem: 1.00GB, disk: 4.00GB
@@ -169,7 +172,8 @@ describe('DeploymentMachines', function() {
                 {1}
               </div>
             </li>,
-            <li className="deployment-flow__row twelve-col"
+            <li
+              className="deployment-flow__row twelve-col"
               key="(constraints not set)">
               <div className="eight-col">
                 (constraints not set)
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/payment/payment.js b/jujugui/static/gui/src/app/components/deployment-flow/payment/payment.js
index cb67047f85..cbebde6e40 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/payment/payment.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/payment/payment.js
@@ -65,7 +65,8 @@ class DeploymentPayment extends React.Component {
   _generatePaymentMethods() {
     const methods = this.props.paymentUser.paymentMethods.map((method, i) => {
       return (
-        <li className="deployment-payment__method"
+        <li
+          className="deployment-payment__method"
           key={method.name + i}>
           <PaymentMethodCard
             card={method} />
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/payment/test-payment.js b/jujugui/static/gui/src/app/components/deployment-flow/payment/test-payment.js
index 1e6103189f..66d8f4c5e2 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/payment/test-payment.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/payment/test-payment.js
@@ -71,7 +71,8 @@ describe('DeploymentPayment', function() {
     const wrapper = renderComponent({ paymentUser: user });
     const expected = (
       <ul className="deployment-payment__methods twelve-col">
-        {[<li className="deployment-payment__method"
+        {[<li
+          className="deployment-payment__method"
           key="Company0">
           <PaymentMethodCard
             card={{name: 'Company'}} />
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/pricing/plan-table/plan-table.js b/jujugui/static/gui/src/app/components/deployment-flow/pricing/plan-table/plan-table.js
index 7c9af68610..c5011749bc 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/pricing/plan-table/plan-table.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/pricing/plan-table/plan-table.js
@@ -81,7 +81,8 @@ class DeploymentPlanTable extends React.Component {
         columns: [{
           content: (
             <div>
-              <img alt={app.name}
+              <img
+                alt={app.name}
                 className="deployment-plan-table__charm-icon"
                 src={app.icon} />
               <span className="deployment-plan-table__charm-name">
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/pricing/plan-table/test-plan-table.js b/jujugui/static/gui/src/app/components/deployment-flow/pricing/plan-table/test-plan-table.js
index fa8620d4f0..c535d67162 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/pricing/plan-table/test-plan-table.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/pricing/plan-table/test-plan-table.js
@@ -77,7 +77,8 @@ describe('DeploymentPlanTable', () => {
             columns: [{
               content: (
                 <div>
-                  <img alt="Apache Drill"
+                  <img
+                    alt="Apache Drill"
                     className="deployment-plan-table__charm-icon"
                     src="apache2.svg" />
                   <span className="deployment-plan-table__charm-name">
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/pricing/pricing.js b/jujugui/static/gui/src/app/components/deployment-flow/pricing/pricing.js
index da38cc1002..31807a315e 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/pricing/pricing.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/pricing/pricing.js
@@ -30,13 +30,15 @@ const DeploymentPricing = props => {
           </span>
         </div>
       </div>
-      <div className="twelve-col no-margin-bottom"
+      <div
+        className="twelve-col no-margin-bottom"
         id="support-level">
         <div className="six-col deployment-pricing__support-title">
           Choose your level of support
         </div>
         <div className="six-col last-col u-align--right deployment-pricing__estimated-price">
-          <a href="https://www.ubuntu.com/support/plans-and-pricing#ua-support"
+          <a
+            href="https://www.ubuntu.com/support/plans-and-pricing#ua-support"
             target="_blank">
             Support details
           </a>
@@ -54,7 +56,8 @@ const DeploymentPricing = props => {
           downgrade at the end of a month.
         </div>
         <div className="six-col last-col u-align--right no-margin-bottom">
-          <Link changeState={props.changeState}
+          <Link
+            changeState={props.changeState}
             clickState={{
               gui: {
                 deploy: ''
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/pricing/support-selection/plan/plan.js b/jujugui/static/gui/src/app/components/deployment-flow/pricing/support-selection/plan/plan.js
index dbf7e82551..2c361682d4 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/pricing/support-selection/plan/plan.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/pricing/support-selection/plan/plan.js
@@ -11,7 +11,8 @@ class DeploymentSupportSelectionPlan extends React.Component {
 
   _generateFeatures() {
     const features = this.props.features.map((feature, i) => (
-      <li className="deployment-support-select-plan__feature"
+      <li
+        className="deployment-support-select-plan__feature"
         key={feature + i}>
         <SvgIcon
           name="bullet"
@@ -40,7 +41,8 @@ class DeploymentSupportSelectionPlan extends React.Component {
       });
     return (
       <div className={classes}>
-        <div className="deployment-support-select-plan__card"
+        <div
+          className="deployment-support-select-plan__card"
           onClick={this.props.onSelect}
           role="button"
           tabIndex="0">
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/pricing/support-selection/plan/test-plan.js b/jujugui/static/gui/src/app/components/deployment-flow/pricing/support-selection/plan/test-plan.js
index 4a6aa1cf47..e69d43d3bb 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/pricing/support-selection/plan/test-plan.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/pricing/support-selection/plan/test-plan.js
@@ -24,20 +24,23 @@ describe('DeploymentSupportSelectionPlan', () => {
     const wrapper = renderComponent();
     const expected = (
       <div className="deployment-support-select-plan four-col">
-        <div className="deployment-support-select-plan__card"
+        <div
+          className="deployment-support-select-plan__card"
           onClick={sinon.stub()}
           role="button"
           tabIndex="0">
           <h3>Gold</h3>
           <ul className="deployment-support-select-plan__features">
-            <li className="deployment-support-select-plan__feature"
+            <li
+              className="deployment-support-select-plan__feature"
               key="feature 10">
               <SvgIcon
                 name="bullet"
                 size="14" />
               feature 1
             </li>
-            <li className="deployment-support-select-plan__feature"
+            <li
+              className="deployment-support-select-plan__feature"
               key="feature 21">
               <SvgIcon
                 name="bullet"
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/pricing/test-pricing.js b/jujugui/static/gui/src/app/components/deployment-flow/pricing/test-pricing.js
index 6c20350c7f..f303f02891 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/pricing/test-pricing.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/pricing/test-pricing.js
@@ -45,13 +45,15 @@ describe('DeploymentPricing', () => {
             </span>
           </div>
         </div>
-        <div className="twelve-col no-margin-bottom"
+        <div
+          className="twelve-col no-margin-bottom"
           id="support-level">
           <div className="six-col deployment-pricing__support-title">
             Choose your level of support
           </div>
           <div className="six-col last-col u-align--right deployment-pricing__estimated-price">
-            <a href="https://www.ubuntu.com/support/plans-and-pricing#ua-support"
+            <a
+              href="https://www.ubuntu.com/support/plans-and-pricing#ua-support"
               target="_blank">
               Support details
             </a>
@@ -69,7 +71,8 @@ describe('DeploymentPricing', () => {
               downgrade at the end of a month.
           </div>
           <div className="six-col last-col u-align--right no-margin-bottom">
-            <Link changeState={sinon.stub()}
+            <Link
+              changeState={sinon.stub()}
               clickState={{
                 gui: {
                   deploy: ''
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/signup/signup.js b/jujugui/static/gui/src/app/components/deployment-flow/signup/signup.js
index 338e71c2c5..a994e80c24 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/signup/signup.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/signup/signup.js
@@ -123,7 +123,8 @@ class DeploymentSignup extends React.Component {
                 </li>
               </ul>
               <p>
-                <a className="button--inline-positive"
+                <a
+                  className="button--inline-positive"
                   href="https://jujucharms.com/beta"
                   onClick={this._handleSignup.bind(this)}
                   target="_blank">
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/signup/test-signup.js b/jujugui/static/gui/src/app/components/deployment-flow/signup/test-signup.js
index 30b288e775..6190b06217 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/signup/test-signup.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/signup/test-signup.js
@@ -84,7 +84,8 @@ describe('DeploymentSignup', function() {
               </li>
             </ul>
             <p>
-              <a className="button--inline-positive"
+              <a
+                className="button--inline-positive"
                 href="https://jujucharms.com/beta"
                 onClick={wrapper.find('.button--inline-positive').prop('onClick')}
                 target="_blank">
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/sshkey/sshkey.js b/jujugui/static/gui/src/app/components/deployment-flow/sshkey/sshkey.js
index 84f1067f95..e4a75f313a 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/sshkey/sshkey.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/sshkey/sshkey.js
@@ -115,8 +115,10 @@ class DeploymentSSHKey extends React.Component {
 
     if (keys.length === 0) {
       this.setState({error:
-        (<span>No keys found. <a className="link"
-          href="https://github.com/settings/keys" target="_blank">
+        (<span>No keys found. <a
+          className="link"
+          href="https://github.com/settings/keys"
+          target="_blank">
           Create an SSH Key</a>.</span>)});
       return;
     }
@@ -252,7 +254,8 @@ class DeploymentSSHKey extends React.Component {
                 role="button"
                 title="Remove key">
                 <SvgIcon
-                  name="close_16" size="16" />
+                  name="close_16"
+                  size="16" />
               </span>
             </div>
           </li>
@@ -277,12 +280,14 @@ class DeploymentSSHKey extends React.Component {
           <li className="deployment-flow__row twelve-col" key={'lp-' + username}>
             <div className="eleven-col">{username}</div>
             <div className="one-col last-col">
-              <span className="added-keys__key-remove right"
+              <span
+                className="added-keys__key-remove right"
                 onClick={this._removeLPUsername.bind(this, username)}
                 role="button"
                 title="Remove username">
                 <SvgIcon
-                  name="close_16" size="16" />
+                  name="close_16"
+                  size="16" />
               </span>
             </div>
           </li>
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/sshkey/test-sshkey.js b/jujugui/static/gui/src/app/components/deployment-flow/sshkey/test-sshkey.js
index d8ad903893..e213f9a0fd 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/sshkey/test-sshkey.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/sshkey/test-sshkey.js
@@ -161,7 +161,9 @@ describe('DeploymentSSHKey', function() {
                 <b>Error:</b>
                 <span>
                   No keys found.
-                  <a className="link" href="https://github.com/settings/keys"
+                  <a
+                    className="link"
+                    href="https://github.com/settings/keys"
                     target="_blank">Create an SSH Key</a>.
                 </span>
               </span>
@@ -214,7 +216,8 @@ describe('DeploymentSSHKey', function() {
                 thekey
               </div>
               <div className="one-col last-col">
-                <span className="added-keys__key-remove right"
+                <span
+                  className="added-keys__key-remove right"
                   onClick={wrapper.find('.added-keys__key-remove').prop('onClick')}
                   role="button"
                   title="Remove key">
@@ -244,7 +247,8 @@ describe('DeploymentSSHKey', function() {
       wrapper.update();
       assert.equal(wrapper.find('.deployment-ssh-key__added-keys').length, 1);
       const expected = (
-        <span className="added-keys__key-remove right"
+        <span
+          className="added-keys__key-remove right"
           onClick={wrapper.find('.added-keys__key-remove').prop('onClick')}
           role="button"
           title="Remove key">
@@ -352,7 +356,8 @@ describe('DeploymentSSHKey', function() {
                 rose
               </div>
               <div className="one-col last-col">
-                <span className="added-keys__key-remove right"
+                <span
+                  className="added-keys__key-remove right"
                   onClick={wrapper.find('.added-keys__key-remove').prop('onClick')}
                   role="button"
                   title="Remove username">
@@ -380,7 +385,8 @@ describe('DeploymentSSHKey', function() {
                 rose
               </div>
               <div className="one-col last-col">
-                <span className="added-keys__key-remove right"
+                <span
+                  className="added-keys__key-remove right"
                   onClick={wrapper.find('.added-keys__key-remove').prop('onClick')}
                   role="button"
                   title="Remove username">
@@ -419,7 +425,8 @@ describe('DeploymentSSHKey', function() {
                 thekey
               </div>
               <div className="one-col last-col">
-                <span className="added-keys__key-remove right"
+                <span
+                  className="added-keys__key-remove right"
                   onClick={wrapper.find('.added-keys__key-remove').at(0).prop('onClick')}
                   role="button"
                   title="Remove key">
@@ -437,7 +444,8 @@ describe('DeploymentSSHKey', function() {
                 rose
               </div>
               <div className="one-col last-col">
-                <span className="added-keys__key-remove right"
+                <span
+                  className="added-keys__key-remove right"
                   onClick={wrapper.find('.added-keys__key-remove').at(1).prop('onClick')}
                   role="button"
                   title="Remove username">
@@ -498,7 +506,8 @@ describe('DeploymentSSHKey', function() {
                 thekey
               </div>
               <div className="one-col last-col">
-                <span className="added-keys__key-remove right"
+                <span
+                  className="added-keys__key-remove right"
                   onClick={instance._removeKey.bind(instance)}
                   role="button"
                   title="Remove key">
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/vpc/test-vpc.js b/jujugui/static/gui/src/app/components/deployment-flow/vpc/test-vpc.js
index 325ea122b3..eaa126d964 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/vpc/test-vpc.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/vpc/test-vpc.js
@@ -39,8 +39,10 @@ describe('DeploymentVPC', function() {
         <p>
           AWS accounts created since December 2013 have this –&nbsp;
           older accounts may not.&nbsp;
-          <a className="link"
-            href={vpcLink} target="_blank">Default VPC basics.</a>
+          <a
+            className="link"
+            href={vpcLink}
+            target="_blank">Default VPC basics.</a>
         </p>
         <div className="six-col">
           <GenericInput
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/vpc/vpc.js b/jujugui/static/gui/src/app/components/deployment-flow/vpc/vpc.js
index 9bf603ee7c..5a9c83b951 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/vpc/vpc.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/vpc/vpc.js
@@ -75,8 +75,10 @@ class DeploymentVPC extends React.Component {
         <p>
           AWS accounts created since December 2013 have this –&nbsp;
           older accounts may not.&nbsp;
-          <a className="link"
-            href={vpcLink} target="_blank">Default VPC basics.</a>
+          <a
+            className="link"
+            href={vpcLink}
+            target="_blank">Default VPC basics.</a>
         </p>
         <div className="six-col">
           <GenericInput
diff --git a/jujugui/static/gui/src/app/components/entity-details/content/config-option/config-option.js b/jujugui/static/gui/src/app/components/entity-details/content/config-option/config-option.js
index da30c2ef7e..27c9a335f2 100644
--- a/jujugui/static/gui/src/app/components/entity-details/content/config-option/config-option.js
+++ b/jujugui/static/gui/src/app/components/entity-details/content/config-option/config-option.js
@@ -26,7 +26,8 @@ class EntityContentConfigOption extends React.Component {
     var option = this.props.option;
     return (
       <div className="entity-content__config-option">
-        <dt className="entity-content__config-name"
+        <dt
+          className="entity-content__config-name"
           id={'charm-config-' + option.name}>
           {option.name}
         </dt>
diff --git a/jujugui/static/gui/src/app/components/entity-details/content/config-option/test-config-option.js b/jujugui/static/gui/src/app/components/entity-details/content/config-option/test-config-option.js
index b1c70503d9..6e1a3101c5 100644
--- a/jujugui/static/gui/src/app/components/entity-details/content/config-option/test-config-option.js
+++ b/jujugui/static/gui/src/app/components/entity-details/content/config-option/test-config-option.js
@@ -23,7 +23,8 @@ describe('EntityContentConfigOption', function() {
     const wrapper = renderComponent({ option });
     const expected = (
       <div className="entity-content__config-option">
-        <dt className="entity-content__config-name"
+        <dt
+          className="entity-content__config-name"
           id="charm-config-password">
             password
         </dt>
diff --git a/jujugui/static/gui/src/app/components/entity-details/content/content.js b/jujugui/static/gui/src/app/components/entity-details/content/content.js
index 99080dfe72..9b96f32d62 100644
--- a/jujugui/static/gui/src/app/components/entity-details/content/content.js
+++ b/jujugui/static/gui/src/app/components/entity-details/content/content.js
@@ -135,7 +135,8 @@ class EntityContent extends React.Component {
       // Generate the list of options for this application.
       let optionsList = Object.keys(options).map((name, i) => {
         return (
-          <div className="entity-content__config-option"
+          <div
+            className="entity-content__config-option"
             key={name + i}>
             <dt className="entity-content__config-name">
               {name}
@@ -152,9 +153,11 @@ class EntityContent extends React.Component {
       }
       const title = (
         <span>
-          <img alt={application}
+          <img
+            alt={application}
             className="entity-content__config-image"
-            src={applicationIcons[id]} width="26" />
+            src={applicationIcons[id]}
+            width="26" />
           {application}</span>
       );
       if (optionsList) {
@@ -192,7 +195,8 @@ class EntityContent extends React.Component {
     if (optionsList) {
       const title = isCharm ? 'Configuration' : 'Bundle configuration';
       return (
-        <div className="entity-content__configuration"
+        <div
+          className="entity-content__configuration"
           id="configuration">
           <h3 className="entity-content__header">{title}</h3>
           {optionsList}
@@ -277,7 +281,8 @@ class EntityContent extends React.Component {
     } else {
       content = terms.map((item, i) => {
         return [i > 0 ? ', ' : ''].concat(
-          <a className="link link--cold"
+          <a
+            className="link link--cold"
             key={item.name}
             onClick={this._toggleTerms.bind(this, item)}>
             {item.name}
@@ -439,7 +444,8 @@ class EntityContent extends React.Component {
         <ul className="section__list">
           {bugLink ? (
             <li className="section__list-item">
-              <a className="link link--cold"
+              <a
+                className="link link--cold"
                 href={bugLink}
                 target="_blank">
                 Submit a bug
@@ -447,7 +453,8 @@ class EntityContent extends React.Component {
             </li>) : undefined}
           {homepageLink ? (
             <li className="section__list-item">
-              <a className="link link--cold"
+              <a
+                className="link link--cold"
                 href={homepageLink}
                 target="_blank">
                 Project homepage
@@ -496,7 +503,8 @@ class EntityContent extends React.Component {
           </span>);
       }
       priceList.push(
-        <li className="entity-content__plan-price-item"
+        <li
+          className="entity-content__plan-price-item"
           key={amount + (quantity || '') + i}>
           <span className="entity-content__plan-price-amount">
             {amount}
@@ -535,7 +543,8 @@ class EntityContent extends React.Component {
         {'last-col': (i + 1) % 3 === 0});
 
       plansList.push(
-        <div className={classes}
+        <div
+          className={classes}
           key={plan.url + i}>
           <div className="entity-content__plan-content">
             <h3 className="entity-content__plan-title">
@@ -551,7 +560,8 @@ class EntityContent extends React.Component {
         </div>);
     });
     return (
-      <div className="row entity-content__plans"
+      <div
+        className="row entity-content__plans"
         id="plans">
         <div className="inner-wrapper">
           <div className="twelve-col">
@@ -591,7 +601,9 @@ class EntityContent extends React.Component {
         </h3>
         <p>
           Add this card to your website by copying the code below.&nbsp;
-          <a className="entity-content__card-cta" href="https://jujucharms.com/community/cards"
+          <a
+            className="entity-content__card-cta"
+            href="https://jujucharms.com/community/cards"
             target="_blank">
             Learn more
           </a>.
diff --git a/jujugui/static/gui/src/app/components/entity-details/content/description/description.js b/jujugui/static/gui/src/app/components/entity-details/content/description/description.js
index 965bfb147c..5a40b1fb59 100644
--- a/jujugui/static/gui/src/app/components/entity-details/content/description/description.js
+++ b/jujugui/static/gui/src/app/components/entity-details/content/description/description.js
@@ -27,7 +27,8 @@ const EntityContentDescription = props => {
   return (
     <div className="entity-content__description">
       {heading}
-      <div className="entity-content__description-content"
+      <div
+        className="entity-content__description-content"
         dangerouslySetInnerHTML={{__html: htmlDescription}}>
       </div>
     </div>
diff --git a/jujugui/static/gui/src/app/components/entity-details/content/description/test-description.js b/jujugui/static/gui/src/app/components/entity-details/content/description/test-description.js
index 1b876c10fd..f6bba66ca1 100644
--- a/jujugui/static/gui/src/app/components/entity-details/content/description/test-description.js
+++ b/jujugui/static/gui/src/app/components/entity-details/content/description/test-description.js
@@ -44,7 +44,8 @@ describe('EntityContentDescription', function() {
       const wrapper = renderComponent();
       const expected = (
         <div className="entity-content__description">
-          <div className="entity-content__description-content"
+          <div
+            className="entity-content__description-content"
             dangerouslySetInnerHTML={{__html: 'HA Django cluster.'}} />
         </div>
       );
@@ -70,7 +71,8 @@ describe('EntityContentDescription', function() {
       const wrapper = renderComponent();
       const expected = (
         <div className="entity-content__description">
-          <div className="entity-content__description-content"
+          <div
+            className="entity-content__description-content"
             dangerouslySetInnerHTML={{__html: 'Django framework.'}} />
         </div>
       );
diff --git a/jujugui/static/gui/src/app/components/entity-details/content/diagram/diagram.js b/jujugui/static/gui/src/app/components/entity-details/content/diagram/diagram.js
index 4841b72b96..1728c63bc6 100644
--- a/jujugui/static/gui/src/app/components/entity-details/content/diagram/diagram.js
+++ b/jujugui/static/gui/src/app/components/entity-details/content/diagram/diagram.js
@@ -44,7 +44,9 @@ class EntityContentDiagram extends React.PureComponent {
     );
     return (
       <div className={classes}>
-        <object className="entity-content__diagram-image" data={this.props.diagramUrl}
+        <object
+          className="entity-content__diagram-image"
+          data={this.props.diagramUrl}
           title={this.props.title}
           type="image/svg+xml" />
         {this._generateExpandButton()}
diff --git a/jujugui/static/gui/src/app/components/entity-details/content/diagram/test-diagram.js b/jujugui/static/gui/src/app/components/entity-details/content/diagram/test-diagram.js
index b504709c51..c9ff0bbaf0 100644
--- a/jujugui/static/gui/src/app/components/entity-details/content/diagram/test-diagram.js
+++ b/jujugui/static/gui/src/app/components/entity-details/content/diagram/test-diagram.js
@@ -23,7 +23,9 @@ describe('EntityContentDiagram', function() {
     const wrapper = renderComponent();
     const expected = (
       <div className="entity-content__diagram">
-        <object className="entity-content__diagram-image" data="example.com/diagram.svg"
+        <object
+          className="entity-content__diagram-image"
+          data="example.com/diagram.svg"
           title="example"
           type="image/svg+xml" />
       </div>);
diff --git a/jujugui/static/gui/src/app/components/entity-details/content/files/files.js b/jujugui/static/gui/src/app/components/entity-details/content/files/files.js
index 420271df61..f7ed298a5f 100644
--- a/jujugui/static/gui/src/app/components/entity-details/content/files/files.js
+++ b/jujugui/static/gui/src/app/components/entity-details/content/files/files.js
@@ -83,7 +83,8 @@ class EntityFiles extends React.Component {
       codeUrl = codeUrl.replace('lp:', 'https://code.launchpad.net/');
       codeLink = (
         <li className="section__list-item entity-files__code-link">
-          <a className="button--inline-neutral entity-files__link"
+          <a
+            className="button--inline-neutral entity-files__link"
             href={codeUrl}
             ref="codeLink"
             target="_blank">
@@ -123,7 +124,8 @@ class EntityFiles extends React.Component {
         const fileLink = `${url}/${path}`;
         return (
           <li className="p-list-tree__item" key={path}>
-            <a className="link link--cold"
+            <a
+              className="link link--cold"
               href={fileLink}
               target="_blank"
               title={fileName}>
@@ -141,11 +143,13 @@ class EntityFiles extends React.Component {
         });
         const isExpanded = this.state[`/${fileName}-isExpanded`] || false;
         return (
-          <li className="p-list-tree__item p-list-tree__item--group"
+          <li
+            className="p-list-tree__item p-list-tree__item--group"
             key={path}
             tabIndex="0"
             title={`/${fileName}`}>
-            <button aria-controls={`/${fileName}`}
+            <button
+              aria-controls={`/${fileName}`}
               aria-expanded={`${isExpanded}`}
               className="p-list-tree__toggle"
               id={`/${fileName}-toggle`}
@@ -153,7 +157,8 @@ class EntityFiles extends React.Component {
               role="tab">
               {`/${fileName}`}
             </button>
-            <ul aria-hidden={`${!isExpanded}`}
+            <ul
+              aria-hidden={`${!isExpanded}`}
               aria-labelledby={`/${fileName}-toggle`}
               className="p-list-tree"
               id={`/${fileName}`}
@@ -184,7 +189,8 @@ class EntityFiles extends React.Component {
         <h3 className="section__title">
           {initUtils.pluralize('File', files.length)}
         </h3>
-        <ul aria-multiselectable="true"
+        <ul
+          aria-multiselectable="true"
           className="p-list-tree"
           ref="files"
           role="tablist">
@@ -193,7 +199,8 @@ class EntityFiles extends React.Component {
         <ul className="section__list">
           {this._generateCodeLink(entityModel.get('code_source'))}
           <li className="section__list-item">
-            <a className="button--inline-neutral entity-files__link"
+            <a
+              className="button--inline-neutral entity-files__link"
               href={archiveUrl}
               target="_blank">
               Download .zip
diff --git a/jujugui/static/gui/src/app/components/entity-details/content/files/test-files.js b/jujugui/static/gui/src/app/components/entity-details/content/files/test-files.js
index f852aaa3af..64b55e9208 100644
--- a/jujugui/static/gui/src/app/components/entity-details/content/files/test-files.js
+++ b/jujugui/static/gui/src/app/components/entity-details/content/files/test-files.js
@@ -35,25 +35,36 @@ describe('EntityFiles', function() {
     var archiveUrl = `${apiUrl}/django/archive`;
     var fileItems = [
       <li className="p-list-tree__item" key="foo.zip">
-        <a className="link link--cold"
+        <a
+          className="link link--cold"
           href={archiveUrl + '/foo.zip'}
           target="_blank"
           title="foo.zip">
           foo.zip
         </a>
       </li>,
-      <li className="p-list-tree__item p-list-tree__item--group" key="/bar"
-        tabIndex="0" title="/bar">
-        <button aria-controls="/bar" aria-expanded="false"
+      <li
+        className="p-list-tree__item p-list-tree__item--group"
+        key="/bar"
+        tabIndex="0"
+        title="/bar">
+        <button
+          aria-controls="/bar"
+          aria-expanded="false"
           className="p-list-tree__toggle"
           id="/bar-toggle"
           onClick={wrapper.find('button').prop('onClick')}
           role="tab">/bar</button>
-        <ul aria-hidden="true" aria-labelledby="/bar-toggle"
-          className="p-list-tree" id="/bar" role="tabpanel">
+        <ul
+          aria-hidden="true"
+          aria-labelledby="/bar-toggle"
+          className="p-list-tree"
+          id="/bar"
+          role="tabpanel">
           {[
             <li className="p-list-tree__item" key="foo.txt">
-              <a className="link link--cold"
+              <a
+                className="link link--cold"
                 href={archiveUrl + '/bar/foo.txt'}
                 target="_blank"
                 title="foo.txt">
@@ -69,14 +80,17 @@ describe('EntityFiles', function() {
         <h3 className="section__title">
           Files
         </h3>
-        <ul aria-multiselectable="true" className="p-list-tree"
+        <ul
+          aria-multiselectable="true"
+          className="p-list-tree"
           ref="files"
           role="tablist">
           {fileItems}
         </ul>
         <ul className="section__list">
           <li className="section__list-item entity-files__code-link">
-            <a className="button--inline-neutral entity-files__link"
+            <a
+              className="button--inline-neutral entity-files__link"
               href="https://code.launchpad.net/django/code"
               ref="codeLink"
               target="_blank">
@@ -84,7 +98,8 @@ describe('EntityFiles', function() {
             </a>
           </li>
           <li className="section__list-item">
-            <a className="button--inline-neutral entity-files__link"
+            <a
+              className="button--inline-neutral entity-files__link"
               href={archiveUrl}
               target="_blank">
               Download .zip
diff --git a/jujugui/static/gui/src/app/components/entity-details/content/readme/test-readme.js b/jujugui/static/gui/src/app/components/entity-details/content/readme/test-readme.js
index 888a79801b..5138825296 100644
--- a/jujugui/static/gui/src/app/components/entity-details/content/readme/test-readme.js
+++ b/jujugui/static/gui/src/app/components/entity-details/content/readme/test-readme.js
@@ -52,7 +52,8 @@ describe('EntityContentReadme', function() {
     assert.equal(getFile.args[0][1], 'Readme.md');
     const expected = (
       <div className="entity-content__readme">
-        <div className="entity-content__readme-content"
+        <div
+          className="entity-content__readme-content"
           dangerouslySetInnerHTML={{__html: '<p>Readme</p>'}}
           ref="content" />
       </div>);
diff --git a/jujugui/static/gui/src/app/components/entity-details/content/relations/relations.js b/jujugui/static/gui/src/app/components/entity-details/content/relations/relations.js
index 6c0ba961f1..a96b03b0fb 100644
--- a/jujugui/static/gui/src/app/components/entity-details/content/relations/relations.js
+++ b/jujugui/static/gui/src/app/components/entity-details/content/relations/relations.js
@@ -71,7 +71,8 @@ class EntityContentRelations extends React.Component {
       );
       const type = this.role === 'requirer' ? 'requires' : 'provides';
       components.push(
-        <li className={classes}
+        <li
+          className={classes}
           key={relation.name}
           onClick={this._handleRelationClick.bind(
             this, type, relation.interface)}
@@ -87,7 +88,8 @@ class EntityContentRelations extends React.Component {
         'View more relations';
       components.push(
         <li className="section__list-item" key="show-more">
-          <button className="button--inline-neutral"
+          <button
+            className="button--inline-neutral"
             onClick={this._handleViewMore.bind(this)}
             role="button">
             {buttonText}
@@ -103,10 +105,11 @@ class EntityContentRelations extends React.Component {
       <div className="section entity-relations" id="relations">
         <h3 className="section__title">
           Relations&nbsp;
-          <a href={
-            'https://jujucharms.com/docs/stable/' +
+          <a
+            href={
+              'https://jujucharms.com/docs/stable/' +
             'charms-relations'}
-          target="_blank">
+            target="_blank">
             <SvgIcon
               name="help_16"
               size="16" />
diff --git a/jujugui/static/gui/src/app/components/entity-details/content/relations/test-relations.js b/jujugui/static/gui/src/app/components/entity-details/content/relations/test-relations.js
index 5bc0e429ab..357903fdbe 100644
--- a/jujugui/static/gui/src/app/components/entity-details/content/relations/test-relations.js
+++ b/jujugui/static/gui/src/app/components/entity-details/content/relations/test-relations.js
@@ -32,20 +32,23 @@ describe('EntityContentRelations', function() {
       <div className="section entity-relations" id="relations">
         <h3 className="section__title">
           Relations&nbsp;
-          <a href="https://jujucharms.com/docs/stable/charms-relations"
+          <a
+            href="https://jujucharms.com/docs/stable/charms-relations"
             target="_blank">
             <SvgIcon name="help_16" size="16" />
           </a>
         </h3>
         <ul className="section__list" ref="list">
-          <li className="link section__list-item"
+          <li
+            className="link section__list-item"
             key="http"
             onClick={wrapper.find('.section__list-item').at(0).prop('onClick')}
             role="button"
             tabIndex="0">
             {'http'}: {'http'}
           </li>
-          <li className="link section__list-item"
+          <li
+            className="link section__list-item"
             key="cache"
             onClick={wrapper.find('.section__list-item').at(1).prop('onClick')}
             role="button"
@@ -93,7 +96,8 @@ describe('EntityContentRelations', function() {
       };
       const wrapper = renderComponent();
       const expected = (
-        <button className="button--inline-neutral"
+        <button
+          className="button--inline-neutral"
           onClick={wrapper.find('button').prop('onClick')}
           role="button">View more relations</button>);
       assert.compareJSX(wrapper.find('button'), expected);
diff --git a/jujugui/static/gui/src/app/components/entity-details/content/resources/resources.js b/jujugui/static/gui/src/app/components/entity-details/content/resources/resources.js
index 9e085d4a00..f3cfc7e649 100644
--- a/jujugui/static/gui/src/app/components/entity-details/content/resources/resources.js
+++ b/jujugui/static/gui/src/app/components/entity-details/content/resources/resources.js
@@ -64,7 +64,8 @@ class EntityResources extends React.Component {
     }
     const resourceList = resources.map((resource, i) => {
       return (
-        <li className="entity-files__file"
+        <li
+          className="entity-files__file"
           key={resource.Name + i}>
           {this._generateResource(resource)}
         </li>);
diff --git a/jujugui/static/gui/src/app/components/entity-details/content/resources/test-resources.js b/jujugui/static/gui/src/app/components/entity-details/content/resources/test-resources.js
index 03bfd3ff64..92b78e55d5 100644
--- a/jujugui/static/gui/src/app/components/entity-details/content/resources/test-resources.js
+++ b/jujugui/static/gui/src/app/components/entity-details/content/resources/test-resources.js
@@ -53,19 +53,22 @@ describe('EntityResources', function() {
             {3}&nbsp;{'resources'}
           </h3>
           <ul className="section__list entity-files__listing">
-            <li className="entity-files__file"
+            <li
+              className="entity-files__file"
               key="file10">
               <a href="/api/foo-0/resource/file1/5" title="Download file1">
                 {'file1'} {'(.zip)'}
               </a>
             </li>
-            <li className="entity-files__file"
+            <li
+              className="entity-files__file"
               key="file21">
               <a href="/api/foo-0/resource/file2/2" title="Download file2">
                 {'file2'} {''}
               </a>
             </li>
-            <li className="entity-files__file"
+            <li
+              className="entity-files__file"
               key="file32">
               <span>
                 {'file3'} {'(.tar)'}
diff --git a/jujugui/static/gui/src/app/components/entity-details/content/test-content.js b/jujugui/static/gui/src/app/components/entity-details/content/test-content.js
index fdf5549c84..7e860df0d2 100644
--- a/jujugui/static/gui/src/app/components/entity-details/content/test-content.js
+++ b/jujugui/static/gui/src/app/components/entity-details/content/test-content.js
@@ -86,7 +86,8 @@ describe('EntityContent', function() {
                   <h4 className="entity-content__metadata-title">
                     Tags:
                   </h4>&nbsp;
-                  <a className="link link--cold"
+                  <a
+                    className="link link--cold"
                     data-id="database"
                     onClick={wrapper.find('.link').at(0).prop('onClick')}>
                     database
@@ -100,7 +101,8 @@ describe('EntityContent', function() {
                 getFile={sinon.stub()}
                 hash="readme"
                 scrollCharmbrowser={sinon.stub()} />
-              <div className="entity-content__configuration"
+              <div
+                className="entity-content__configuration"
                 id="configuration">
                 <h3 className="entity-content__header">
                   Configuration
@@ -131,7 +133,8 @@ describe('EntityContent', function() {
                 </h3>
                 <ul className="section__list">
                   <li className="section__list-item">
-                    <a className="link link--cold"
+                    <a
+                      className="link link--cold"
                       href="https://bugs.launchpad.net/charms/+source/django"
                       target="_blank">
                       Submit a bug
@@ -156,7 +159,8 @@ describe('EntityContent', function() {
                 </h3>
                 <p>
                   Add this card to your website by copying the code below.&nbsp;
-                  <a className="entity-content__card-cta"
+                  <a
+                    className="entity-content__card-cta"
                     href="https://jujucharms.com/community/cards"
                     target="_blank">
                     Learn more
@@ -205,12 +209,14 @@ describe('EntityContent', function() {
     const expected = (
       <div className="entity-content__metadata">
         <h4 className="entity-content__metadata-title">Terms:</h4>&nbsp;
-        <a className="link link--cold"
+        <a
+          className="link link--cold"
           key="terms1"
           onClick={links.at(0).prop('onClick')}>
             terms1
         </a>{', '}
-        <a className="link link--cold"
+        <a
+          className="link link--cold"
           key="terms2"
           onClick={links.at(1).prop('onClick')}>
             terms2
@@ -296,14 +302,16 @@ describe('EntityContent', function() {
         </h3>
         <ul className="section__list">
           <li className="section__list-item">
-            <a className="link link--cold"
+            <a
+              className="link link--cold"
               href="http://example.com/bugs"
               target="_blank">
               Submit a bug
             </a>
           </li>
           <li className="section__list-item">
-            <a className="link link--cold"
+            <a
+              className="link link--cold"
               href="http://example.com/"
               target="_blank">
               Project homepage
@@ -349,7 +357,8 @@ describe('EntityContent', function() {
                 getFile={sinon.stub()}
                 hash="readme"
                 scrollCharmbrowser={sinon.stub()} />
-              <div className="entity-content__configuration"
+              <div
+                className="entity-content__configuration"
                 id="configuration">
                 <h3 className="entity-content__header">
                   Bundle configuration
@@ -357,9 +366,11 @@ describe('EntityContent', function() {
                 <div>
                   <AccordionSection
                     title={<span>
-                      <img alt="gunicorn"
+                      <img
+                        alt="gunicorn"
                         className="entity-content__config-image"
-                        src={undefined} width="26" />
+                        src={undefined}
+                        width="26" />
                       gunicorn
                     </span>}>
                     <div className="entity-content__config-description">
@@ -383,9 +394,11 @@ describe('EntityContent', function() {
                   </AccordionSection>
                   <AccordionSection
                     title={<span>
-                      <img alt="django"
+                      <img
+                        alt="django"
                         className="entity-content__config-image"
-                        src={undefined} width="26" />
+                        src={undefined}
+                        width="26" />
                       django
                     </span>} />
                 </div>
@@ -403,7 +416,8 @@ describe('EntityContent', function() {
                 <ul className="section__list">
                   {undefined}
                   <li className="section__list-item">
-                    <a className="link link--cold"
+                    <a
+                      className="link link--cold"
                       href={'https://code.launchpad.net/~charmers/charms/' +
                       'bundles/django-cluster/bundle'}
                       target="_blank">
@@ -423,7 +437,8 @@ describe('EntityContent', function() {
                 </h3>
                 <p>
                   Add this card to your website by copying the code below.&nbsp;
-                  <a className="entity-content__card-cta"
+                  <a
+                    className="entity-content__card-cta"
                     href="https://jujucharms.com/community/cards"
                     target="_blank">
                     Learn more
@@ -455,14 +470,16 @@ describe('EntityContent', function() {
         </h3>
         <ul className="section__list">
           <li className="section__list-item">
-            <a className="link link--cold"
+            <a
+              className="link link--cold"
               href="http://example.com/bugs"
               target="_blank">
               Submit a bug
             </a>
           </li>
           <li className="section__list-item">
-            <a className="link link--cold"
+            <a
+              className="link link--cold"
               href="http://example.com/"
               target="_blank">
               Project homepage
@@ -499,21 +516,24 @@ describe('EntityContent', function() {
       plans
     });
     const expected = (
-      <div className="row entity-content__plans"
+      <div
+        className="row entity-content__plans"
         id="plans">
         <div className="inner-wrapper">
           <div className="twelve-col">
             <h2 className="entity-content__header">Plans</h2>
             <div className="equal-height">
               {[
-                <div className="entity-content__plan four-col"
+                <div
+                  className="entity-content__plan four-col"
                   key="plan10">
                   <div className="entity-content__plan-content">
                     <h3 className="entity-content__plan-title">
                       plan1
                     </h3>
                     <ul className="entity-content__plan-price">
-                      {[<li className="entity-content__plan-price-item"
+                      {[<li
+                        className="entity-content__plan-price-item"
                         key="testprice10">
                         <span className="entity-content__plan-price-amount">
                           test
@@ -528,14 +548,16 @@ describe('EntityContent', function() {
                     </p>
                   </div>
                 </div>,
-                <div className="entity-content__plan four-col"
+                <div
+                  className="entity-content__plan four-col"
                   key="plan21">
                   <div className="entity-content__plan-content">
                     <h3 className="entity-content__plan-title">
                       plan2
                     </h3>
                     <ul className="entity-content__plan-price">
-                      {[<li className="entity-content__plan-price-item"
+                      {[<li
+                        className="entity-content__plan-price-item"
                         key="price20">
                         <span className="entity-content__plan-price-amount">
                           price2
@@ -548,14 +570,16 @@ describe('EntityContent', function() {
                     </p>
                   </div>
                 </div>,
-                <div className="entity-content__plan four-col last-col"
+                <div
+                  className="entity-content__plan four-col last-col"
                   key="plan32">
                   <div className="entity-content__plan-content">
                     <h3 className="entity-content__plan-title">
                       plan3
                     </h3>
                     <ul className="entity-content__plan-price">
-                      <li className="entity-content__plan-price-item"
+                      <li
+                        className="entity-content__plan-price-item"
                         key="testprice30">
                         <span className="entity-content__plan-price-amount">
                           test
@@ -564,7 +588,8 @@ describe('EntityContent', function() {
                           / {'price3'}
                         </span>
                       </li>
-                      <li className="entity-content__plan-price-item"
+                      <li
+                        className="entity-content__plan-price-item"
                         key="price3b1">
                         <span className="entity-content__plan-price-amount">
                           price3b
diff --git a/jujugui/static/gui/src/app/components/entity-details/entity-details.js b/jujugui/static/gui/src/app/components/entity-details/entity-details.js
index 28895a9f4c..f23e131588 100644
--- a/jujugui/static/gui/src/app/components/entity-details/entity-details.js
+++ b/jujugui/static/gui/src/app/components/entity-details/entity-details.js
@@ -133,7 +133,8 @@ class EntityDetails extends React.Component {
           <p className="error">
               There was a problem while loading the entity details.
               You could try searching for another charm or bundle or go{' '}
-            <span className="link"
+            <span
+              className="link"
               onClick={this._handleBack.bind(this)}>
                 back
             </span>.
@@ -258,7 +259,8 @@ class EntityDetails extends React.Component {
 
   render() {
     return (
-      <div className={this._generateClasses()}
+      <div
+        className={this._generateClasses()}
         ref="content"
         tabIndex="0">
         {this._generateContent()}
diff --git a/jujugui/static/gui/src/app/components/entity-details/header/header.js b/jujugui/static/gui/src/app/components/entity-details/header/header.js
index 6041ffe2b1..913acd4314 100644
--- a/jujugui/static/gui/src/app/components/entity-details/header/header.js
+++ b/jujugui/static/gui/src/app/components/entity-details/header/header.js
@@ -169,7 +169,8 @@ class EntityHeader extends React.Component {
       );
     } else {
       deployAction = (
-        <div className="entity-header__deploy-action"
+        <div
+          className="entity-header__deploy-action"
           ref="deployAction">
           This type of charm can only be deployed from the command line.
         </div>
@@ -204,14 +205,16 @@ class EntityHeader extends React.Component {
       options = [];
       plans.forEach((plan, i) => {
         options.push(
-          <option key={plan.url + i}
+          <option
+            key={plan.url + i}
             value={plan.url}>
             {plan.url}
           </option>);
       });
     }
     return (
-      <select className="entity-header__select"
+      <select
+        className="entity-header__select"
         ref="plan">
         <option key="default">{defaultMessage}</option>
         {options}
@@ -253,10 +256,11 @@ class EntityHeader extends React.Component {
     return (
       <li className="entity-header__subordinate">
         Subordinate
-        <a href={
-          'https://jujucharms.com/docs/stable/' +
-          'authors-subordinate-applications'}
-        target="_blank">
+        <a
+          href={
+            'https://jujucharms.com/docs/stable/' +
+            'authors-subordinate-applications'}
+          target="_blank">
           <SvgIcon
             name="help_16"
             size="16" />
@@ -378,11 +382,15 @@ class EntityHeader extends React.Component {
     ].join('');
 
     if (entity.type !== 'bundle') {
-      icon = (<img alt={entity.displayName} className="entity-header__icon"
-        src={entity.iconPath} width="96" />);
+      icon = (<img
+        alt={entity.displayName}
+        className="entity-header__icon"
+        src={entity.iconPath}
+        width="96" />);
     }
     return (
-      <div className="row-hero"
+      <div
+        className="row-hero"
         ref="headerWrapper"
         style={this._generateWrapperStyles()}>
         <header className={this._generateClasses()}>
@@ -401,7 +409,8 @@ class EntityHeader extends React.Component {
               <ul className="bullets inline entity-header__properties">
                 <li className="entity-header__by">
                   By&nbsp;
-                  <span className="link"
+                  <span
+                    className="link"
                     onClick={this._onOwnerClick.bind(this)}>
                     {entity.owner}
                   </span>
@@ -414,7 +423,8 @@ class EntityHeader extends React.Component {
               {this._generateCounts()}
               <ul className="entity-header__social-list">
                 <li>
-                  <a href={twitterUrl}
+                  <a
+                    href={twitterUrl}
                     id="item-twitter"
                     target="_blank">
                     <SvgIcon
@@ -423,7 +433,8 @@ class EntityHeader extends React.Component {
                   </a>
                 </li>
                 <li>
-                  <a href={googlePlusUrl}
+                  <a
+                    href={googlePlusUrl}
                     id="item-googleplus"
                     target="_blank">
                     <SvgIcon
diff --git a/jujugui/static/gui/src/app/components/entity-details/header/test-header.js b/jujugui/static/gui/src/app/components/entity-details/header/test-header.js
index 75e04810d8..b48a5d6301 100644
--- a/jujugui/static/gui/src/app/components/entity-details/header/test-header.js
+++ b/jujugui/static/gui/src/app/components/entity-details/header/test-header.js
@@ -46,14 +46,18 @@ describe('EntityHeader', function() {
   it('renders the latest entity properly', function() {
     const wrapper = renderComponent();
     const expected = (
-      <div className="row-hero"
+      <div
+        className="row-hero"
         ref="headerWrapper"
         style={{}}>
         <header className="entity-header">
           <div className="inner-wrapper">
             <div className="eight-col no-margin-bottom">
-              <img alt="django" className="entity-header__icon"
-                src="data:image/gif;base64," width="96" />
+              <img
+                alt="django"
+                className="entity-header__icon"
+                src="data:image/gif;base64,"
+                width="96" />
               <h1
                 className="entity-header__title"
                 itemProp="name"
@@ -66,13 +70,15 @@ describe('EntityHeader', function() {
               <ul className="bullets inline entity-header__properties">
                 <li className="entity-header__by">
                   By&nbsp;
-                  <span className="link"
+                  <span
+                    className="link"
                     onClick={wrapper.find('.entity-header__by .link').prop('onClick')}>
                     test-owner
                   </span>
                 </li>
                 <li className="entity-header__series">
-                  <span className="link"
+                  <span
+                    className="link"
                     onClick={wrapper.find('.entity-header__series .link').prop('onClick')}>
                     Latest version (#{42})
                   </span>
@@ -81,28 +87,31 @@ describe('EntityHeader', function() {
                   trusty
                 </li>]}
                 {undefined}
-                {<li className="entity-header__channels"
+                {<li
+                  className="entity-header__channels"
                   key="Stable, Candidate">
                   Stable, Candidate
                 </li>}
               </ul>
               <ul className="entity-header__social-list">
                 <li>
-                  <a href={'https://twitter.com/intent/tweet?text=django%20' +
+                  <a
+                    href={'https://twitter.com/intent/tweet?text=django%20' +
                       'charm&via=ubuntu_cloud&url=https%3A%2F%2Fjujucharms' +
                       '.com%2Fdjango%2Ftrusty%2F'}
-                  id="item-twitter"
-                  target="_blank">
+                    id="item-twitter"
+                    target="_blank">
                     <SvgIcon
                       name="icon-social-twitter"
                       size="36" />
                   </a>
                 </li>
                 <li>
-                  <a href={'https://plus.google.com/share?url=https%3A%2F%2F' +
+                  <a
+                    href={'https://plus.google.com/share?url=https%3A%2F%2F' +
                       'jujucharms.com%2Fdjango%2Ftrusty%2F'}
-                  id="item-googleplus"
-                  target="_blank">
+                    id="item-googleplus"
+                    target="_blank">
                     <SvgIcon
                       name="icon-social-google"
                       size="36" />
@@ -147,10 +156,12 @@ describe('EntityHeader', function() {
       plans
     });
     const expected = (
-      <select className="entity-header__select"
+      <select
+        className="entity-header__select"
         ref="plan">
         <option key="default">Choose a plan</option>
-        {[<option key="test0"
+        {[<option
+          key="test0"
           value="test">
           test
         </option>]}
@@ -164,7 +175,8 @@ describe('EntityHeader', function() {
       plans: null
     });
     const expected = (
-      <select className="entity-header__select"
+      <select
+        className="entity-header__select"
         ref="plan">
         <option key="default">Loading plans...</option>
         {null}
@@ -205,10 +217,11 @@ describe('EntityHeader', function() {
     const expected = (
       <li className="entity-header__subordinate">
         Subordinate
-        <a href={
-          'https://jujucharms.com/docs/stable/' +
-          'authors-subordinate-applications'}
-        target="_blank">
+        <a
+          href={
+            'https://jujucharms.com/docs/stable/' +
+            'authors-subordinate-applications'}
+          target="_blank">
           <SvgIcon
             name="help_16"
             size="16" />
diff --git a/jujugui/static/gui/src/app/components/entity-details/test-entity-details.js b/jujugui/static/gui/src/app/components/entity-details/test-entity-details.js
index 1712970e61..8bb05bf30a 100644
--- a/jujugui/static/gui/src/app/components/entity-details/test-entity-details.js
+++ b/jujugui/static/gui/src/app/components/entity-details/test-entity-details.js
@@ -80,7 +80,8 @@ describe('EntityDetails', function() {
     assert.equal(charmstore.getEntity.args[0][0], 'django',
       'getEntity not called with the entity ID');
     const expected = (
-      <div className="entity-details charm"
+      <div
+        className="entity-details charm"
         ref="content"
         tabIndex="0">
         <div>
@@ -127,13 +128,15 @@ describe('EntityDetails', function() {
     charmstore.getEntity.callsArgWith(1, 'bad wolf', [mockEntity]);
     const wrapper = renderComponent();
     const expected = (
-      <div className="entity-details"
+      <div
+        className="entity-details"
         ref="content"
         tabIndex="0">
         <p className="error">
           There was a problem while loading the entity details.
           You could try searching for another charm or bundle or go{' '}
-          <span className="link"
+          <span
+            className="link"
             onClick={wrapper.find('.link').prop('onClick')}>
             back
           </span>.
diff --git a/jujugui/static/gui/src/app/components/env-size-display/env-size-display.js b/jujugui/static/gui/src/app/components/env-size-display/env-size-display.js
index 223a941eaf..b2a294ddc9 100644
--- a/jujugui/static/gui/src/app/components/env-size-display/env-size-display.js
+++ b/jujugui/static/gui/src/app/components/env-size-display/env-size-display.js
@@ -55,7 +55,8 @@ class EnvSizeDisplay extends React.Component {
   _generateStatus() {
     return (
       <li className={this._genClasses('status')}>
-        <a className="env-size-display__link"
+        <a
+          className="env-size-display__link"
           data-view="status"
           onClick={this._changeEnvironmentView.bind(this)}>
           status
@@ -71,7 +72,8 @@ class EnvSizeDisplay extends React.Component {
       <div className="env-size-display">
         <ul className="env-size-display__list">
           <li className={this._genClasses('application')}>
-            <a className="env-size-display__link"
+            <a
+              className="env-size-display__link"
               data-view="application"
               onClick={this._changeEnvironmentView.bind(this)}>
               {serviceCount}&nbsp;
@@ -79,7 +81,8 @@ class EnvSizeDisplay extends React.Component {
             </a>
           </li>
           {props.providerType !== 'kubernetes' ? <li className={this._genClasses('machines')}>
-            <a className="env-size-display__link"
+            <a
+              className="env-size-display__link"
               data-view="machines"
               onClick={this._changeEnvironmentView.bind(this)}>
               {machineCount}&nbsp;
diff --git a/jujugui/static/gui/src/app/components/env-switcher/env-switcher.js b/jujugui/static/gui/src/app/components/env-switcher/env-switcher.js
index 6ef7ccbb13..51432b9681 100644
--- a/jujugui/static/gui/src/app/components/env-switcher/env-switcher.js
+++ b/jujugui/static/gui/src/app/components/env-switcher/env-switcher.js
@@ -188,7 +188,8 @@ class EnvSwitcher extends React.Component {
   _generateName() {
     if (this.props.modelCommitted) {
       return (
-        <span className="env-switcher__name"
+        <span
+          className="env-switcher__name"
           ref="name">
           {this.props.environmentName}
         </span>);
@@ -196,7 +197,8 @@ class EnvSwitcher extends React.Component {
     // If the model is not committed then allow the name to be changed.
     return (
       <div>
-        <span className="env-switcher__name"
+        <span
+          className="env-switcher__name"
           contentEditable={true}
           dangerouslySetInnerHTML={{__html: this.props.environmentName}}
           onBlur={this._handleInputBlur.bind(this)}
@@ -216,14 +218,16 @@ class EnvSwitcher extends React.Component {
       {'env-switcher--error': !this.state.validName}
     );
     return (
-      <div aria-label="Model switcher"
+      <div
+        aria-label="Model switcher"
         className={classes}
         onClick={this.props.modelCommitted ? toggleEnvList : null}
         role="navigation"
         tabIndex="0">
         <div className={this._toggleClasses()}>
           {this._generateName()}
-          <div aria-controls="environmentSwitcherMenu"
+          <div
+            aria-controls="environmentSwitcherMenu"
             aria-expanded="false"
             aria-haspopup="true"
             aria-owns="environmentSwitcherMenu"
diff --git a/jujugui/static/gui/src/app/components/env-switcher/list/list.js b/jujugui/static/gui/src/app/components/env-switcher/list/list.js
index 5f459ade8f..6145c1093b 100644
--- a/jujugui/static/gui/src/app/components/env-switcher/list/list.js
+++ b/jujugui/static/gui/src/app/components/env-switcher/list/list.js
@@ -66,7 +66,8 @@ class EnvList extends React.Component {
           name = `${ownerNoDomain}/${model.name}`;
         }
         return (
-          <li className="env-list__environment"
+          <li
+            className="env-list__environment"
             data-id={model.uuid}
             data-name={model.name}
             data-owner={model.owner}
@@ -115,7 +116,8 @@ class EnvList extends React.Component {
   */
   _generateModels() {
     return (
-      <ul aria-expanded="true"
+      <ul
+        aria-expanded="true"
         aria-hidden="false"
         aria-labelledby="environmentSwitcherToggle"
         className="env-list"
diff --git a/jujugui/static/gui/src/app/components/env-switcher/list/test-list.js b/jujugui/static/gui/src/app/components/env-switcher/list/test-list.js
index f512d464cd..615a4d0379 100644
--- a/jujugui/static/gui/src/app/components/env-switcher/list/test-list.js
+++ b/jujugui/static/gui/src/app/components/env-switcher/list/test-list.js
@@ -39,13 +39,15 @@ describe('EnvList', function() {
     const wrapper = renderComponent({ envs: models });
 
     const expected = (
-      <ul aria-expanded="true"
+      <ul
+        aria-expanded="true"
         aria-hidden="false"
         aria-labelledby="environmentSwitcherToggle"
         className="env-list"
         id="environmentSwitcherMenu"
         role="menubar">
-        <li className="env-list__environment"
+        <li
+          className="env-list__environment"
           data-id={models[0].uuid}
           data-name={models[0].name}
           data-owner={models[0].owner}
@@ -63,7 +65,8 @@ describe('EnvList', function() {
             </span>
           </div>
         </li>
-        <li className="env-list__environment"
+        <li
+          className="env-list__environment"
           data-id={models[1].uuid}
           data-name={models[1].name}
           data-owner={models[1].owner}
@@ -113,14 +116,16 @@ describe('EnvList', function() {
     ];
     const wrapper = renderComponent({ envs: models });
     const expected = (
-      <ul aria-expanded="true"
+      <ul
+        aria-expanded="true"
         aria-hidden="false"
         aria-labelledby="environmentSwitcherToggle"
         className="env-list"
         id="environmentSwitcherMenu"
         role="menubar">
         {[
-          <li className="env-list__environment"
+          <li
+            className="env-list__environment"
             data-id={models[0].uuid}
             data-name={models[0].name}
             data-owner={models[0].owner}
@@ -138,7 +143,8 @@ describe('EnvList', function() {
               </span>
             </div>
           </li>,
-          <li className="env-list__environment"
+          <li
+            className="env-list__environment"
             data-id={models[1].uuid}
             data-name={models[1].name}
             data-owner={models[1].owner}
@@ -156,7 +162,8 @@ describe('EnvList', function() {
               </span>
             </div>
           </li>,
-          <li className="env-list__environment"
+          <li
+            className="env-list__environment"
             data-id={models[2].uuid}
             data-name={models[2].name}
             data-owner={models[2].owner}
@@ -174,7 +181,8 @@ describe('EnvList', function() {
               </span>
             </div>
           </li>,
-          <li className="env-list__environment"
+          <li
+            className="env-list__environment"
             data-id={models[3].uuid}
             data-name={models[3].name}
             data-owner={models[3].owner}
@@ -209,7 +217,8 @@ describe('EnvList', function() {
     ];
     const wrapper = renderComponent({ envs: models });
     const expected = (
-      <ul aria-expanded="true"
+      <ul
+        aria-expanded="true"
         aria-hidden="false"
         aria-labelledby="environmentSwitcherToggle"
         className="env-list"
@@ -241,7 +250,8 @@ describe('EnvList', function() {
           data-owner="dalek"
           key="model-uuid-2"
           onClick={wrapper.find('.env-list__environment').at(1).prop('onClick')}
-          role="menuitem" tabIndex="0">
+          role="menuitem"
+          tabIndex="0">
           dalek/model-name-2
           <div className="env-list__last-connected">
             <span>
diff --git a/jujugui/static/gui/src/app/components/env-switcher/test-env-switcher.js b/jujugui/static/gui/src/app/components/env-switcher/test-env-switcher.js
index 5a8ab71507..e8afaefe71 100644
--- a/jujugui/static/gui/src/app/components/env-switcher/test-env-switcher.js
+++ b/jujugui/static/gui/src/app/components/env-switcher/test-env-switcher.js
@@ -25,14 +25,16 @@ describe('EnvSwitcher', function() {
   it('renders the closed switcher component', () => {
     const wrapper = renderComponent();
     const expected = (
-      <div aria-label="Model switcher"
+      <div
+        aria-label="Model switcher"
         className="env-switcher"
         onClick={null}
         role="navigation"
         tabIndex="0">
         <div className="env-switcher__toggle editable">
           <div>
-            <span className="env-switcher__name"
+            <span
+              className="env-switcher__name"
               contentEditable={true}
               dangerouslySetInnerHTML={{__html: 'MyEnv'}}
               onBlur={wrapper.find('.env-switcher__name').prop('onBlur')}
@@ -43,7 +45,8 @@ describe('EnvSwitcher', function() {
               It must not start or end with a hyphen.
             </div>
           </div>
-          <div aria-controls="environmentSwitcherMenu"
+          <div
+            aria-controls="environmentSwitcherMenu"
             aria-expanded="false"
             aria-haspopup="true"
             aria-owns="environmentSwitcherMenu"
@@ -66,7 +69,8 @@ describe('EnvSwitcher', function() {
   it('should not have an editable name when the model is committed', () => {
     const wrapper = renderComponent({modelCommitted: true});
     const expected = (
-      <span className="env-switcher__name"
+      <span
+        className="env-switcher__name"
         ref="name">
         MyEnv
       </span>);
diff --git a/jujugui/static/gui/src/app/components/environment/environment.js b/jujugui/static/gui/src/app/components/environment/environment.js
index 479a865c2e..9949ca869f 100644
--- a/jujugui/static/gui/src/app/components/environment/environment.js
+++ b/jujugui/static/gui/src/app/components/environment/environment.js
@@ -17,41 +17,65 @@ const Environment = function() {
                   Drop file to add to model
               </p>
             </div>
-            <svg className="environment-help__image"
+            <svg
+              className="environment-help__image"
               height="386.027"
               viewBox="0 0 789.055 386.027"
               width="789.055"
               xmlns="http://www.w3.org/2000/svg">
               <g className="plus-service">
-                <circle cx="374.527" cy="96.438" fill="#FFF"
-                  r="63" stroke="#CECDCD" />
-                <circle className="plus-service__plus-circle" cx="374.527" cy="96.438"
-                  fill="#38b44a" r="32" />
-                <path d="M383.527 95.438h-8v-8h-2v8h-8v2h8v8h2v-8h8"
+                <circle
+                  cx="374.527"
+                  cy="96.438"
+                  fill="#FFF"
+                  r="63"
+                  stroke="#CECDCD" />
+                <circle
+                  className="plus-service__plus-circle"
+                  cx="374.527"
+                  cy="96.438"
+                  fill="#38b44a"
+                  r="32" />
+                <path
+                  d="M383.527 95.438h-8v-8h-2v8h-8v2h8v8h2v-8h8"
                   fill="#FFF" />
               </g>
               <g fill="none" stroke="#CECDCD">
                 <circle cx="129.527" cy="300.771" r="63" />
-                <circle cx="129.527" cy="300.771"
-                  r="32" strokeMiterlimit="10" />
+                <circle
+                  cx="129.527"
+                  cy="300.771"
+                  r="32"
+                  strokeMiterlimit="10" />
               </g>
               <g fill="none" stroke="#CECDCD">
                 <circle cx="679.295" cy="96.438" r="63" />
-                <circle cx="679.295" cy="96.438"
-                  r="32" strokeMiterlimit="10" />
+                <circle
+                  cx="679.295"
+                  cy="96.438"
+                  r="32"
+                  strokeMiterlimit="10" />
               </g>
-              <path d="M438.046 96.438h178" fill="none"
-                stroke="#CECDCD" strokeMiterlimit="10" />
+              <path
+                d="M438.046 96.438h178"
+                fill="none"
+                stroke="#CECDCD"
+                strokeMiterlimit="10" />
               <circle cx="531.139" cy="96.438" fill="#CECDCD" r="7" />
               <circle cx="250.712" cy="197.276" fill="#CECDCD" r="7" />
-              <path d="M175.28 257.708l150.865-120.865" fill="none"
-                stroke="#CECDCD" strokeMiterlimit="10" />
-              <path d={
-                'M172.805 255.233c1.367-1.367 3.583-1.367 4.95 0s1.367 ' +
+              <path
+                d="M175.28 257.708l150.865-120.865"
+                fill="none"
+                stroke="#CECDCD"
+                strokeMiterlimit="10" />
+              <path
+                d={
+                  'M172.805 255.233c1.367-1.367 3.583-1.367 4.95 0s1.367 ' +
                 '3.583 0 4.95M328.62 139.318c-1.367 1.367-3.583 ' +
                 '1.367-4.95 0s-1.367-3.583 0-4.95M436.99 92.938c1.933 0 ' +
                 '3.5 1.567 3.5 3.5s-1.567 3.5-3.5 3.5M616.295 ' +
-                '99.938c-1.933 0-3.5-1.567-3.5-3.5s1.567-3.5 3.5-3.5'} fill="#CECDCD" />
+                '99.938c-1.933 0-3.5-1.567-3.5-3.5s1.567-3.5 3.5-3.5'}
+                fill="#CECDCD" />
             </svg>
           </div>
         </div>
diff --git a/jujugui/static/gui/src/app/components/expert-card/expert-card.js b/jujugui/static/gui/src/app/components/expert-card/expert-card.js
index 0ef87ddc68..5d06305dd2 100644
--- a/jujugui/static/gui/src/app/components/expert-card/expert-card.js
+++ b/jujugui/static/gui/src/app/components/expert-card/expert-card.js
@@ -16,7 +16,8 @@ class ExpertCard extends React.Component {
         classes={this.props.classes}
         title="Juju expert partners">
         <div className="expert-card__logo">
-          <img alt={expert.logo}
+          <img
+            alt={expert.logo}
             className="expert-card__logo-image"
             src={logo} />
         </div>
diff --git a/jujugui/static/gui/src/app/components/expert-card/test-expert-card.js b/jujugui/static/gui/src/app/components/expert-card/test-expert-card.js
index a9decf13c7..1e517f2c25 100644
--- a/jujugui/static/gui/src/app/components/expert-card/test-expert-card.js
+++ b/jujugui/static/gui/src/app/components/expert-card/test-expert-card.js
@@ -25,7 +25,9 @@ describe('ExpertCard', function() {
         classes={undefined}
         title="Juju expert partners">
         <div className="expert-card__logo">
-          <img alt="spicule.png" className="expert-card__logo-image"
+          <img
+            alt="spicule.png"
+            className="expert-card__logo-image"
             src={
               '/media/static/gui/build/app/assets/images/' +
               'non-sprites/experts/spicule.png'} />
diff --git a/jujugui/static/gui/src/app/components/expert-contact-card/expert-contact-card.js b/jujugui/static/gui/src/app/components/expert-contact-card/expert-contact-card.js
index 9b6451eea8..4f8b470dd2 100644
--- a/jujugui/static/gui/src/app/components/expert-contact-card/expert-contact-card.js
+++ b/jujugui/static/gui/src/app/components/expert-contact-card/expert-contact-card.js
@@ -31,7 +31,8 @@ class ExpertContactCard extends React.Component {
   _generateInitial() {
     const expert = EXPERTS[this.props.expert];
     const highlights = expert.highlights.map(highlight => (
-      <li className="expert-contact-card__highlight"
+      <li
+        className="expert-contact-card__highlight"
         key={highlight}>
         <SvgIcon
           name="bullet"
@@ -57,7 +58,8 @@ class ExpertContactCard extends React.Component {
   _generateContact() {
     const expert = EXPERTS[this.props.expert];
     const phoneNumbers = expert.phoneNumbers.map(number => (
-      <li className="expert-contact-card__phone-number"
+      <li
+        className="expert-contact-card__phone-number"
         key={number}>
         {number}
       </li>));
diff --git a/jujugui/static/gui/src/app/components/expert-contact-card/test-expert-contact-card.js b/jujugui/static/gui/src/app/components/expert-contact-card/test-expert-contact-card.js
index 62644e4b66..7eea03b0af 100644
--- a/jujugui/static/gui/src/app/components/expert-contact-card/test-expert-contact-card.js
+++ b/jujugui/static/gui/src/app/components/expert-contact-card/test-expert-contact-card.js
@@ -24,21 +24,24 @@ describe('ExpertContactCard', function() {
         <div className="expert-contact-card__initial">
           <ul className="expert-contact-card__highlights">
             {[
-              <li className="expert-contact-card__highlight"
+              <li
+                className="expert-contact-card__highlight"
                 key="Machine learning">
                 <SvgIcon
                   name="bullet"
                   size="14" />
                 Machine learning
               </li>,
-              <li className="expert-contact-card__highlight"
+              <li
+                className="expert-contact-card__highlight"
                 key="Data service deployments">
                 <SvgIcon
                   name="bullet"
                   size="14" />
                 Data service deployments
               </li>,
-              <li className="expert-contact-card__highlight"
+              <li
+                className="expert-contact-card__highlight"
                 key="Container orchestration">
                 <SvgIcon
                   name="bullet"
@@ -91,11 +94,13 @@ describe('ExpertContactCard', function() {
               size="16" />
             <ul className="expert-contact-card__phone-numbers">
               {[
-                <li className="expert-contact-card__phone-number"
+                <li
+                  className="expert-contact-card__phone-number"
                   key="UK +44 (0)1603 327762">
                   UK +44 (0)1603 327762
                 </li>,
-                <li className="expert-contact-card__phone-number"
+                <li
+                  className="expert-contact-card__phone-number"
                   key="US +1 8448141689">
                   US +1 8448141689
                 </li>
diff --git a/jujugui/static/gui/src/app/components/expert-store-card/expert-store-card.js b/jujugui/static/gui/src/app/components/expert-store-card/expert-store-card.js
index 578afaae9a..a6abfbf27a 100644
--- a/jujugui/static/gui/src/app/components/expert-store-card/expert-store-card.js
+++ b/jujugui/static/gui/src/app/components/expert-store-card/expert-store-card.js
@@ -22,7 +22,8 @@ class ExpertStoreCard extends React.Component {
           <p className="expert-store-card__description">
             {expert.storeDescription}
           </p>
-          <a className="button--inline-neutral"
+          <a
+            className="button--inline-neutral"
             href="http://jujucharms.com/experts/"
             target="_blank">
             Learn about Big Data expertise&hellip;
diff --git a/jujugui/static/gui/src/app/components/expert-store-card/test-expert-store-card.js b/jujugui/static/gui/src/app/components/expert-store-card/test-expert-store-card.js
index c7f8a161ac..3889494eb5 100644
--- a/jujugui/static/gui/src/app/components/expert-store-card/test-expert-store-card.js
+++ b/jujugui/static/gui/src/app/components/expert-store-card/test-expert-store-card.js
@@ -23,7 +23,8 @@ describe('ExpertStoreCard', function() {
         Learn how Spicule and Canonical can help solve your Big Data
         challenges with JAAS:
         </p>
-        <a className="button--inline-neutral"
+        <a
+          className="button--inline-neutral"
           href="http://jujucharms.com/experts/"
           target="_blank">
           Learn about Big Data expertise&hellip;
diff --git a/jujugui/static/gui/src/app/components/file-field/file-field.js b/jujugui/static/gui/src/app/components/file-field/file-field.js
index 4a59de3ecd..e0519c35e5 100644
--- a/jujugui/static/gui/src/app/components/file-field/file-field.js
+++ b/jujugui/static/gui/src/app/components/file-field/file-field.js
@@ -110,7 +110,8 @@ class FileField extends React.Component {
         label = 'File stored.';
       }
       element = (
-        <label className="file-field__label"
+        <label
+          className="file-field__label"
           htmlFor={id}>
           {label}
         </label>);
@@ -135,7 +136,8 @@ class FileField extends React.Component {
     );
     return (
       <div className={classes}>
-        <input accept={this.props.accept}
+        <input
+          accept={this.props.accept}
           className="file-field__field"
           disabled={this.props.disabled}
           id={id}
diff --git a/jujugui/static/gui/src/app/components/file-field/test-file-field.js b/jujugui/static/gui/src/app/components/file-field/test-file-field.js
index 6e009e00f4..2500a30727 100644
--- a/jujugui/static/gui/src/app/components/file-field/test-file-field.js
+++ b/jujugui/static/gui/src/app/components/file-field/test-file-field.js
@@ -20,7 +20,8 @@ describe('FileField', function() {
     const wrapper = renderComponent();
     var expected = (
       <div className="file-field">
-        <input accept=".json"
+        <input
+          accept=".json"
           className="file-field__field"
           disabled={false}
           id="Dingo"
@@ -28,7 +29,8 @@ describe('FileField', function() {
           ref="field"
           required={true}
           type="file" />
-        <label className="file-field__label"
+        <label
+          className="file-field__label"
           htmlFor="Dingo">
           Dingo
         </label>
@@ -71,7 +73,8 @@ describe('FileField', function() {
     wrapper.update();
     var expected = (
       <ul className="file-field__errors">
-        {[<li className="file-field__error"
+        {[<li
+          className="file-field__error"
           key="required">
           This field is required.
         </li>]}
@@ -88,7 +91,8 @@ describe('FileField', function() {
     wrapper.update();
     var expected = (
       <ul className="file-field__errors">
-        {[<li className="file-field__error"
+        {[<li
+          className="file-field__error"
           key="required">
           This field is required.
         </li>]}
@@ -103,7 +107,8 @@ describe('FileField', function() {
     instance.setState({contents: 'foo'});
     wrapper.update();
     const expected = (
-      <label className="file-field__label"
+      <label
+        className="file-field__label"
         htmlFor="Dingo">
         File stored.
       </label>);
diff --git a/jujugui/static/gui/src/app/components/generic-input/generic-input.js b/jujugui/static/gui/src/app/components/generic-input/generic-input.js
index 33974aab62..7b174bba18 100644
--- a/jujugui/static/gui/src/app/components/generic-input/generic-input.js
+++ b/jujugui/static/gui/src/app/components/generic-input/generic-input.js
@@ -143,7 +143,8 @@ class GenericInput extends React.Component {
     }
     const components = errors.map(error => {
       return (
-        <li className="generic-input__error"
+        <li
+          className="generic-input__error"
           key={error}
           role="alert">
           {error}
@@ -173,7 +174,8 @@ class GenericInput extends React.Component {
     if (label) {
       id = label.replace(' ', '-');
       element = (
-        <label className={classes}
+        <label
+          className={classes}
           htmlFor={id}>
           {label}
         </label>);
@@ -211,7 +213,8 @@ class GenericInput extends React.Component {
         </div>);
     }
     return (
-      <input aria-invalid={errors}
+      <input
+        aria-invalid={errors}
         autoComplete={this.props.autocomplete ? 'on' : 'off'}
         className="generic-input__field"
         defaultValue={this.props.value}
diff --git a/jujugui/static/gui/src/app/components/generic-input/test-generic-input.js b/jujugui/static/gui/src/app/components/generic-input/test-generic-input.js
index 9c60948f15..d2b3294aa6 100644
--- a/jujugui/static/gui/src/app/components/generic-input/test-generic-input.js
+++ b/jujugui/static/gui/src/app/components/generic-input/test-generic-input.js
@@ -49,13 +49,15 @@ describe('GenericInput', function() {
     const input = wrapper.find('input');
     const expected = (
       <div className="generic-input">
-        <label className={
-          'generic-input__label generic-input__label--value-present ' +
-          'generic-input__label--placeholder-present'}
-        htmlFor="Region">
+        <label
+          className={
+            'generic-input__label generic-input__label--value-present ' +
+            'generic-input__label--placeholder-present'}
+          htmlFor="Region">
           Region
         </label>
-        <input aria-invalid={false}
+        <input
+          aria-invalid={false}
           autoComplete="off"
           className="generic-input__field"
           defaultValue="default"
@@ -82,7 +84,8 @@ describe('GenericInput', function() {
     });
     const input = wrapper.find('.generic-input__multiline-field');
     const expected = (
-      <div aria-invalid={false}
+      <div
+        aria-invalid={false}
         className="generic-input__multiline-field"
         contentEditable={true}
         dangerouslySetInnerHTML={{__html: 'default'}}
@@ -141,7 +144,8 @@ describe('GenericInput', function() {
     wrapper.update();
     const expected = (
       <ul className="generic-input__errors">
-        {[<li className="generic-input__error"
+        {[<li
+          className="generic-input__error"
           key="This field is required."
           role="alert">
           This field is required.
diff --git a/jujugui/static/gui/src/app/components/hash-link/hash-link.js b/jujugui/static/gui/src/app/components/hash-link/hash-link.js
index 88cb2b8676..edd3783575 100644
--- a/jujugui/static/gui/src/app/components/hash-link/hash-link.js
+++ b/jujugui/static/gui/src/app/components/hash-link/hash-link.js
@@ -19,7 +19,8 @@ class HashLink extends React.Component {
 
   render() {
     return (
-      <div className="hash-link"
+      <div
+        className="hash-link"
         onClick={this._handleClick.bind(this)}>
         <SvgIcon
           name="anchor_16"
diff --git a/jujugui/static/gui/src/app/components/hash-link/test-hash-link.js b/jujugui/static/gui/src/app/components/hash-link/test-hash-link.js
index 3596e327b6..ba4f175005 100644
--- a/jujugui/static/gui/src/app/components/hash-link/test-hash-link.js
+++ b/jujugui/static/gui/src/app/components/hash-link/test-hash-link.js
@@ -18,7 +18,8 @@ describe('HashLink', () => {
   it('can render', () => {
     const wrapper = renderComponent();
     const expected = (
-      <div className="hash-link"
+      <div
+        className="hash-link"
         onClick={wrapper.prop('onClick')}>
         <SvgIcon
           name="anchor_16"
diff --git a/jujugui/static/gui/src/app/components/header-breadcrumb/header-breadcrumb.js b/jujugui/static/gui/src/app/components/header-breadcrumb/header-breadcrumb.js
index dc698e8b99..48e6961944 100644
--- a/jujugui/static/gui/src/app/components/header-breadcrumb/header-breadcrumb.js
+++ b/jujugui/static/gui/src/app/components/header-breadcrumb/header-breadcrumb.js
@@ -122,7 +122,8 @@ class HeaderBreadcrumb extends React.Component {
     const profileUrl = props.appState.generatePath({profile: username});
     return (
       <li className="header-breadcrumb__list-item">
-        <a className={linkClasses}
+        <a
+          className={linkClasses}
           href={profileUrl}
           onClick={onClick}
           title={username}>
@@ -139,7 +140,8 @@ class HeaderBreadcrumb extends React.Component {
     return (
       <div className={this._generateClasses()}>
         <div className="header-breadcrumb__loading">Loading model</div>
-        <ul className="header-breadcrumb__list"
+        <ul
+          className="header-breadcrumb__list"
           // This attribute is required by uitests.
           data-username={user && user.displayName}>
           {userItem}
diff --git a/jujugui/static/gui/src/app/components/header-breadcrumb/test-header-breadcrumb.js b/jujugui/static/gui/src/app/components/header-breadcrumb/test-header-breadcrumb.js
index 1f45bfe96e..bc57f247e7 100644
--- a/jujugui/static/gui/src/app/components/header-breadcrumb/test-header-breadcrumb.js
+++ b/jujugui/static/gui/src/app/components/header-breadcrumb/test-header-breadcrumb.js
@@ -51,7 +51,8 @@ describe('HeaderBreadcrumb', () => {
         <div className="header-breadcrumb__loading">Loading model</div>
         <ul className="header-breadcrumb__list" data-username="who">
           <li className="header-breadcrumb__list-item">
-            <a className="header-breadcrumb--link"
+            <a
+              className="header-breadcrumb--link"
               href="/u/who"
               onClick={wrapper.find('.header-breadcrumb--link').prop('onClick')}
               title="who">
@@ -85,7 +86,8 @@ describe('HeaderBreadcrumb', () => {
       showEnvSwitcher: true
     });
     const expected = (
-      <a className="header-breadcrumb--link"
+      <a
+        className="header-breadcrumb--link"
         href="/u/rose"
         onClick={wrapper.find('.header-breadcrumb--link').prop('onClick')}
         title="rose">
@@ -106,7 +108,8 @@ describe('HeaderBreadcrumb', () => {
       showEnvSwitcher: true
     });
     const expected = (
-      <a className="header-breadcrumb--link"
+      <a
+        className="header-breadcrumb--link"
         href="/u/cyberman"
         onClick={wrapper.find('.header-breadcrumb--link').prop('onClick')}
         title="cyberman">
diff --git a/jujugui/static/gui/src/app/components/header-logo/header-logo.js b/jujugui/static/gui/src/app/components/header-logo/header-logo.js
index 53f4133637..4680bd35e0 100644
--- a/jujugui/static/gui/src/app/components/header-logo/header-logo.js
+++ b/jujugui/static/gui/src/app/components/header-logo/header-logo.js
@@ -40,7 +40,8 @@ class HeaderLogo extends React.Component {
 
   render() {
     return (
-      <a href={this.props.homePath}
+      <a
+        href={this.props.homePath}
         onClick={this._showProfile.bind(this)}
         role="button"
         title="Home">
diff --git a/jujugui/static/gui/src/app/components/header-logo/test-header-logo.js b/jujugui/static/gui/src/app/components/header-logo/test-header-logo.js
index 75ca1866e6..ce7aced189 100644
--- a/jujugui/static/gui/src/app/components/header-logo/test-header-logo.js
+++ b/jujugui/static/gui/src/app/components/header-logo/test-header-logo.js
@@ -19,13 +19,16 @@ describe('HeaderLogo', function() {
   it('renders', () => {
     const wrapper = renderComponent();
     const expected = (
-      <a href="/"
+      <a
+        href="/"
         onClick={wrapper.prop('onClick')}
         role="button"
         title="Home">
-        <SvgIcon className="svg-icon"
+        <SvgIcon
+          className="svg-icon"
           height="35"
-          name="juju-logo" width="90" />
+          name="juju-logo"
+          width="90" />
       </a>);
     assert.compareJSX(wrapper, expected);
   });
diff --git a/jujugui/static/gui/src/app/components/header-search/header-search.js b/jujugui/static/gui/src/app/components/header-search/header-search.js
index b5a2ce02c2..69094b61c4 100644
--- a/jujugui/static/gui/src/app/components/header-search/header-search.js
+++ b/jujugui/static/gui/src/app/components/header-search/header-search.js
@@ -215,13 +215,17 @@ class HeaderSearch extends React.Component {
     return (
       <div className={this._generateClasses()} ref="headerSearchContainer">
         <form className="header-search__form">
-          <button className="header-search__submit"
+          <button
+            className="header-search__submit"
             onClick={this._handleSubmit.bind(this)}
             type="submit">
-            <SvgIcon name="search_16"
+            <SvgIcon
+              name="search_16"
               size="16" />
           </button>
-          <input className="header-search__input" name="query"
+          <input
+            className="header-search__input"
+            name="query"
             onChange={this._handleQueryChange.bind(this)}
             onFocus={this._handleSearchFocus.bind(this)}
             placeholder="Search the store"
@@ -236,14 +240,18 @@ class HeaderSearch extends React.Component {
           role="button"
           tabIndex="0">
           <span className="header-search__store-icon">
-            <SvgIcon name="search_16"
+            <SvgIcon
+              name="search_16"
               size="16" />
           </span>
         </span>
-        <span className={this._closeClasses()} onClick={this._handleClose.bind(this)}
+        <span
+          className={this._closeClasses()}
+          onClick={this._handleClose.bind(this)}
           role="button"
           tabIndex="0">
-          <SvgIcon name="close_16"
+          <SvgIcon
+            name="close_16"
             size="16" />
         </span>
       </div>
diff --git a/jujugui/static/gui/src/app/components/help/help.js b/jujugui/static/gui/src/app/components/help/help.js
index 35d1294a2f..8eac65c1bd 100644
--- a/jujugui/static/gui/src/app/components/help/help.js
+++ b/jujugui/static/gui/src/app/components/help/help.js
@@ -92,8 +92,10 @@ ${this.props.youtubeAPIKey}`,
         'https://jujucharms.com/docs/stable/about-juju';
     }
     return (
-      <a className="link"
-        href={link} target="_blank">{label}</a>);
+      <a
+        className="link"
+        href={link}
+        target="_blank">{label}</a>);
   }
 
   _generateJujuShow() {
@@ -101,10 +103,12 @@ ${this.props.youtubeAPIKey}`,
       return null;
     }
     return (
-      <a className="four-col juju-show"
+      <a
+        className="four-col juju-show"
         href={`https://youtube.com/watch?v=${this.state.jujuShow.videoId}`}
         target="_blank">
-        <img className="juju-show__image"
+        <img
+          className="juju-show__image"
           src={this.state.jujuShow.thumbnail.url} />
         <p>
           <b>The Juju show</b>
@@ -138,15 +142,20 @@ ${this.props.youtubeAPIKey}`,
         <header className="help__header clearfix">
           <h3 className="help__header-title">Help</h3>
           <div className="help__header-search header-search">
-            <form action="https://jujucharms.com/docs/search/"
+            <form
+              action="https://jujucharms.com/docs/search/"
               className="header-search__form"
               target="_blank">
-              <button className="header-search__submit"
+              <button
+                className="header-search__submit"
                 type="submit">
-                <SvgIcon name="search_16"
+                <SvgIcon
+                  name="search_16"
                   size="16" />
               </button>
-              <input className="header-search__input" name="text"
+              <input
+                className="header-search__input"
+                name="text"
                 placeholder="Search the docs"
                 ref={input => {this.searchDocs = input;}}
                 type="search" />
@@ -200,7 +209,9 @@ ${this.props.youtubeAPIKey}`,
                 src={`${basePath}/help@1x.png`}
                 srcSet={`${basePath}/help@2x.png 2x`}
                 width="201" />
-              <span className="link" onClick={this._startTour.bind(this)}
+              <span
+                className="link"
+                onClick={this._startTour.bind(this)}
                 role="button">
                 Learn how to use the canvas.
               </span>
@@ -210,13 +221,16 @@ ${this.props.youtubeAPIKey}`,
         <footer className="help__footer clearfix">
           <div className="four-col">
             <p>
-              <span className="link" onClick={this._handleShortcutsLink.bind(this)}
+              <span
+                className="link"
+                onClick={this._handleShortcutsLink.bind(this)}
                 role="button">
                 Keyboard shortcuts
               </span>
             </p>
             <p>
-              <a className="link"
+              <a
+                className="link"
                 href="https://jujucharms.com/how-it-works#frequently-asked-questions"
                 target="_blank">
                 FAQs
diff --git a/jujugui/static/gui/src/app/components/help/tour/test-tour.js b/jujugui/static/gui/src/app/components/help/tour/test-tour.js
index ee0361ebc8..c25bc6a27d 100644
--- a/jujugui/static/gui/src/app/components/help/tour/test-tour.js
+++ b/jujugui/static/gui/src/app/components/help/tour/test-tour.js
@@ -19,7 +19,8 @@ describe('Tour', () => {
   it('renders', () => {
     const wrapper = renderComponent();
     const expected = (
-      <span className="back-to-help"
+      <span
+        className="back-to-help"
         onClick={wrapper.find('.back-to-help').prop('onClick')}>
         <SvgIcon
           className="back-to-help__icon"
diff --git a/jujugui/static/gui/src/app/components/help/tour/tour.js b/jujugui/static/gui/src/app/components/help/tour/tour.js
index 08cd05d9ea..0b8c3e1f84 100644
--- a/jujugui/static/gui/src/app/components/help/tour/tour.js
+++ b/jujugui/static/gui/src/app/components/help/tour/tour.js
@@ -14,17 +14,21 @@ class Tour extends React.PureComponent {
     const basePath = `${staticURL}/static/gui/build/app/assets/images/non-sprites/tour`;
     return (
       <div>
-        <span className="back-to-help"
+        <span
+          className="back-to-help"
           onClick={this.props.endTour.bind(this)}>
           <SvgIcon
-            className="back-to-help__icon" name="chevron_down_16" size="16" />
+            className="back-to-help__icon"
+            name="chevron_down_16"
+            size="16" />
           Back to GUI help
         </span>
         <Lightbox
           close={this.props.close.bind(this)}
           extraClasses={['tour']}>
           <div className="tour__slide">
-            <img className="tour__slide-image"
+            <img
+              className="tour__slide-image"
               src={`${basePath}/welcome@1x.png`}
               srcSet={`${basePath}/welcome@2x.png 2x`} />
             <div className="tour__slide-description clearfix">
@@ -36,7 +40,8 @@ class Tour extends React.PureComponent {
             </div>
           </div>
           <div className="tour__slide">
-            <img className="tour__slide-image"
+            <img
+              className="tour__slide-image"
               sizes="(max-width: 768px) 347w"
               src={`${basePath}/store@1x.png`}
               srcSet={`
@@ -51,7 +56,8 @@ ${basePath}/store-mobile@1x.png 347w,
             </div>
           </div>
           <div className="tour__slide">
-            <img className="tour__slide-image"
+            <img
+              className="tour__slide-image"
               sizes="(max-width: 768px) 335w"
               src={`${basePath}/relations@1x.png`}
               srcSet={`
@@ -69,7 +75,8 @@ ${basePath}/relations-mobile@1x.png 335w,
             </div>
           </div>
           <div className="tour__slide">
-            <img className="tour__slide-image"
+            <img
+              className="tour__slide-image"
               sizes="(max-width: 768px) 307w"
               src={`${basePath}/inspector@1x.png`}
               srcSet={`
@@ -84,7 +91,8 @@ ${basePath}/inspector-mobile@1x.png 307w,
             </div>
           </div>
           <div className="tour__slide">
-            <img className="tour__slide-image"
+            <img
+              className="tour__slide-image"
               sizes="(max-width: 768px) 431w"
               src={`${basePath}/machine-app-view@1x.png`}
               srcSet={`
@@ -101,7 +109,8 @@ ${basePath}/machine-app-view-mobile@1x.png 431w,
             </div>
           </div>
           <div className="tour__slide">
-            <img className="tour__slide-image"
+            <img
+              className="tour__slide-image"
               sizes="(max-width: 768px) 341w"
               src={`${basePath}/deploy@1x.png`}
               srcSet={`
@@ -116,7 +125,8 @@ ${basePath}/deploy-mobile@1x.png 341w,
             </div>
           </div>
           <div className="tour__slide">
-            <img className="tour__slide-image"
+            <img
+              className="tour__slide-image"
               sizes="(max-width: 768px) 375w"
               src={`${basePath}/post-deploy@1x.png`}
               srcSet={`
diff --git a/jujugui/static/gui/src/app/components/icon-list/icon-list.js b/jujugui/static/gui/src/app/components/icon-list/icon-list.js
index 29ce13c029..f21bfa26f1 100644
--- a/jujugui/static/gui/src/app/components/icon-list/icon-list.js
+++ b/jujugui/static/gui/src/app/components/icon-list/icon-list.js
@@ -63,12 +63,15 @@ class IconList extends React.Component {
       const src = app.iconPath ||
           'static/gui/build/app/assets/images/non-sprites/charm_160.svg';
       components.push(
-        <li className="icon-list__item tooltip"
+        <li
+          className="icon-list__item tooltip"
           key={app.displayName}>
-          <a className="icon-list__link"
+          <a
+            className="icon-list__link"
             href={this._generateStoreURL(app.id)}
             onClick={this._handleItemClick.bind(this, app.id)}>
-            <img alt={app.displayName}
+            <img
+              alt={app.displayName}
               className="icon-list__image"
               src={src} />
             <span className="tooltip__tooltip">
diff --git a/jujugui/static/gui/src/app/components/icon-list/test-icon-list.js b/jujugui/static/gui/src/app/components/icon-list/test-icon-list.js
index 9e10fe608e..81c8b207fb 100644
--- a/jujugui/static/gui/src/app/components/icon-list/test-icon-list.js
+++ b/jujugui/static/gui/src/app/components/icon-list/test-icon-list.js
@@ -32,10 +32,12 @@ describe('IconList', function() {
     const expected = (
       <ul className="icon-list">
         <li className="icon-list__item tooltip" key="mysql">
-          <a className="icon-list__link"
+          <a
+            className="icon-list__link"
             href="/charm/path"
             onClick={links.at(0).prop('onClick')}>
-            <img alt='mysql'
+            <img
+              alt='mysql'
               className="icon-list__image"
               src="mysql.svg" />
             <span className="tooltip__tooltip">
@@ -46,10 +48,12 @@ describe('IconList', function() {
           </a>
         </li>
         <li className="icon-list__item tooltip" key="wordpress">
-          <a className="icon-list__link"
+          <a
+            className="icon-list__link"
             href="/charm/path"
             onClick={links.at(1).prop('onClick')}>
-            <img alt='wordpress'
+            <img
+              alt='wordpress'
               className="icon-list__image"
               src="static/gui/build/app/assets/images/non-sprites/charm_160.svg" />
             <span className="tooltip__tooltip">
@@ -60,10 +64,12 @@ describe('IconList', function() {
           </a>
         </li>
         <li className="icon-list__item tooltip" key="django">
-          <a className="icon-list__link"
+          <a
+            className="icon-list__link"
             href="/charm/path"
             onClick={links.at(0).prop('onClick')}>
-            <img alt='django'
+            <img
+              alt='django'
               className="icon-list__image"
               src="django.svg" />
             <span className="tooltip__tooltip">
diff --git a/jujugui/static/gui/src/app/components/inset-select/inset-select.js b/jujugui/static/gui/src/app/components/inset-select/inset-select.js
index 95d1a3f4f3..254a7ea0df 100644
--- a/jujugui/static/gui/src/app/components/inset-select/inset-select.js
+++ b/jujugui/static/gui/src/app/components/inset-select/inset-select.js
@@ -49,7 +49,8 @@ class InsetSelect extends React.Component {
     if (label) {
       id = label.replace(' ', '-');
       element = (
-        <label className="inset-select__label"
+        <label
+          className="inset-select__label"
           htmlFor={id}>
           {label}
         </label>);
@@ -69,7 +70,8 @@ class InsetSelect extends React.Component {
   _generateOptions() {
     return this.props.options.map((option, i) => {
       return (
-        <option key={option.value + i}
+        <option
+          key={option.value + i}
           value={option.value}>
           {option.label}
         </option>
@@ -100,7 +102,8 @@ class InsetSelect extends React.Component {
     return (
       <div className={this._generateClasses()}>
         {labelElement}
-        <select className="inset-select__field"
+        <select
+          className="inset-select__field"
           defaultValue={this.props.value}
           disabled={this.props.disabled}
           id={id}
diff --git a/jujugui/static/gui/src/app/components/inset-select/test-inset-select.js b/jujugui/static/gui/src/app/components/inset-select/test-inset-select.js
index e0554d0c16..e3bc18c29a 100644
--- a/jujugui/static/gui/src/app/components/inset-select/test-inset-select.js
+++ b/jujugui/static/gui/src/app/components/inset-select/test-inset-select.js
@@ -25,11 +25,13 @@ describe('InsetSelect', function() {
     const wrapper = renderComponent();
     var expected = (
       <div className='inset-select inset-select--spork'>
-        <label className="inset-select__label"
+        <label
+          className="inset-select__label"
           htmlFor="Spork!">
           Spork!
         </label>
-        <select className="inset-select__field"
+        <select
+          className="inset-select__field"
           defaultValue={undefined}
           disabled={undefined}
           id="Spork!"
diff --git a/jujugui/static/gui/src/app/components/inspector/change-version/change-version.js b/jujugui/static/gui/src/app/components/inspector/change-version/change-version.js
index 816c6a6aca..145283ed15 100644
--- a/jujugui/static/gui/src/app/components/inspector/change-version/change-version.js
+++ b/jujugui/static/gui/src/app/components/inspector/change-version/change-version.js
@@ -204,7 +204,8 @@ class InspectorChangeVersion extends React.Component {
       <div className="inspector-change-version">
         <div className="inspector-change-version__current">
           Current version:
-          <div className="inspector-change-version__current-version"
+          <div
+            className="inspector-change-version__current-version"
             onClick={this._viewCharmDetails.bind(this, url)}
             role="button"
             tabIndex="0">
diff --git a/jujugui/static/gui/src/app/components/inspector/change-version/item/item.js b/jujugui/static/gui/src/app/components/inspector/change-version/item/item.js
index ef6c8f2fa3..7e3f5a4214 100644
--- a/jujugui/static/gui/src/app/components/inspector/change-version/item/item.js
+++ b/jujugui/static/gui/src/app/components/inspector/change-version/item/item.js
@@ -21,8 +21,10 @@ class InspectorChangeVersionItem extends React.Component {
     const path = this.props.url.path();
     const props = this.props;
     return (
-      <li className="inspector-current-version__item"
-        onClick={props.itemAction} role="button"
+      <li
+        className="inspector-current-version__item"
+        onClick={props.itemAction}
+        role="button"
         tabIndex="0">
         <span className="inspector-current-version__title" title={path}>
           version {props.url.revision}
diff --git a/jujugui/static/gui/src/app/components/inspector/change-version/item/test-item.js b/jujugui/static/gui/src/app/components/inspector/change-version/item/test-item.js
index 849acb7ca9..b5c5fb931a 100644
--- a/jujugui/static/gui/src/app/components/inspector/change-version/item/test-item.js
+++ b/jujugui/static/gui/src/app/components/inspector/change-version/item/test-item.js
@@ -27,10 +27,13 @@ describe('InspectorChangeVersionItem', function() {
   it('can display the version item', function() {
     const wrapper = renderComponent();
     const expected = (
-      <li className="inspector-current-version__item"
-        onClick={wrapper.prop('onClick')} role="button"
+      <li
+        className="inspector-current-version__item"
+        onClick={wrapper.prop('onClick')}
+        role="button"
         tabIndex="0">
-        <span className="inspector-current-version__title"
+        <span
+          className="inspector-current-version__title"
           title="django/xenial/5">
           version {5}
         </span>
diff --git a/jujugui/static/gui/src/app/components/inspector/change-version/test-change-version.js b/jujugui/static/gui/src/app/components/inspector/change-version/test-change-version.js
index 4d2fcc00af..de139f87cd 100644
--- a/jujugui/static/gui/src/app/components/inspector/change-version/test-change-version.js
+++ b/jujugui/static/gui/src/app/components/inspector/change-version/test-change-version.js
@@ -63,7 +63,8 @@ describe('InspectorChangeVersion', function() {
       <div className="inspector-change-version">
         <div className="inspector-change-version__current">
           Current version:
-          <div className="inspector-change-version__current-version"
+          <div
+            className="inspector-change-version__current-version"
             onClick={
               wrapper.find('.inspector-change-version__current-version').prop('onClick')}
             role="button"
diff --git a/jujugui/static/gui/src/app/components/inspector/expose/unit/test-unit.js b/jujugui/static/gui/src/app/components/inspector/expose/unit/test-unit.js
index 5ac1a3dc25..bb4b94aaa1 100644
--- a/jujugui/static/gui/src/app/components/inspector/expose/unit/test-unit.js
+++ b/jujugui/static/gui/src/app/components/inspector/expose/unit/test-unit.js
@@ -29,7 +29,8 @@ describe('InspectorExposeUnit', function() {
     };
     const wrapper = renderComponent({ unit });
     var expected = (
-      <li className="inspector-expose__unit"
+      <li
+        className="inspector-expose__unit"
         data-id="django/1"
         onClick={sinon.stub()}
         role="button"
@@ -38,21 +39,26 @@ describe('InspectorExposeUnit', function() {
               django/1
         </div>
         <ul className="inspector-expose__unit-list">
-          <li className="inspector-expose__item"
+          <li
+            className="inspector-expose__item"
             key="20.20.20.199:9000-10000/udp">
             <span>{'20.20.20.199:9000-10000/udp'}</span>
           </li>
-          <li className="inspector-expose__item"
+          <li
+            className="inspector-expose__item"
             key="https://20.20.20.199:443">
-            <a href="https://20.20.20.199:443"
+            <a
+              href="https://20.20.20.199:443"
               onClick={wrapper.find('a').at(0).prop('onClick')}
               target="_blank">
               {'20.20.20.199:443'}
             </a>
           </li>
-          <li className="inspector-expose__item"
+          <li
+            className="inspector-expose__item"
             key="http://20.20.20.199:8080">
-            <a href="http://20.20.20.199:8080"
+            <a
+              href="http://20.20.20.199:8080"
               onClick={wrapper.find('a').at(1).prop('onClick')}
               target="_blank">
               {'20.20.20.199:8080'}
diff --git a/jujugui/static/gui/src/app/components/inspector/expose/unit/unit.js b/jujugui/static/gui/src/app/components/inspector/expose/unit/unit.js
index 50d7f5eb98..fac9139d20 100644
--- a/jujugui/static/gui/src/app/components/inspector/expose/unit/unit.js
+++ b/jujugui/static/gui/src/app/components/inspector/expose/unit/unit.js
@@ -38,7 +38,8 @@ class InspectorExposeUnit extends React.Component {
         const href = `${protocol}://${label}`;
         return (
           <li className="inspector-expose__item" key={href}>
-            <a href={href}
+            <a
+              href={href}
               onClick={this._stopBubble.bind(this)}
               target="_blank">
               {label}
@@ -62,7 +63,10 @@ class InspectorExposeUnit extends React.Component {
     var publicList = this._getAddressList(
       unit.public_address, unit.portRanges);
     return (
-      <li className="inspector-expose__unit" data-id={unit.id} onClick={this.props.action}
+      <li
+        className="inspector-expose__unit"
+        data-id={unit.id}
+        onClick={this.props.action}
         role="button"
         tabIndex="0">
         <div className="inspector-expose__unit-detail">
diff --git a/jujugui/static/gui/src/app/components/inspector/header/header.js b/jujugui/static/gui/src/app/components/inspector/header/header.js
index 379a700e88..0831aa7de3 100644
--- a/jujugui/static/gui/src/app/components/inspector/header/header.js
+++ b/jujugui/static/gui/src/app/components/inspector/header/header.js
@@ -98,15 +98,20 @@ class InspectorHeader extends React.Component {
     var backIcon = type && type !== 'started' ? backIconWhite : backIconGrey;
 
     return (
-      <div className={this._headerClasses()}
-        onClick={this.props.backCallback} role="button" tabIndex="0">
-        <span className="inspector-header__back"
+      <div
+        className={this._headerClasses()}
+        onClick={this.props.backCallback}
+        role="button"
+        tabIndex="0">
+        <span
+          className="inspector-header__back"
           dangerouslySetInnerHTML={{__html: backIcon}} />
         <span className="inspector-header__title">
           {this.props.title}
         </span>
         <span className="inspector-header__icon-container">
-          <img className="inspector-header__service-icon"
+          <img
+            className="inspector-header__service-icon"
             src={this.props.icon} />
         </span>
         {this._generateLinks()}
diff --git a/jujugui/static/gui/src/app/components/inspector/overview-action/overview-action.js b/jujugui/static/gui/src/app/components/inspector/overview-action/overview-action.js
index b36a93d39a..0bb51239b5 100644
--- a/jujugui/static/gui/src/app/components/inspector/overview-action/overview-action.js
+++ b/jujugui/static/gui/src/app/components/inspector/overview-action/overview-action.js
@@ -69,7 +69,8 @@ class OverviewAction extends React.Component {
     }
     return (
       <span className="overview-action__icon">
-        <SvgIcon name={icon}
+        <SvgIcon
+          name={icon}
           size="16" />
       </span>
     );
@@ -78,14 +79,18 @@ class OverviewAction extends React.Component {
   render() {
     var titleClass = this.baseClass + '__title';
     return (
-      <li className={this.baseClass}
+      <li
+        className={this.baseClass}
         onClick={this.props.action}
-        role="button" tabIndex="0" title={this.props.title}>
+        role="button"
+        tabIndex="0"
+        title={this.props.title}>
         {this._generateIcon()}
         <span className={titleClass}>
           {this.props.title}
         </span>
-        <span className={this._linkClasses()}
+        <span
+          className={this._linkClasses()}
           onClick={this._handleLinkClick.bind(this)}>
           {this.props.linkTitle}
         </span>
diff --git a/jujugui/static/gui/src/app/components/inspector/overview-action/test-overview-action.js b/jujugui/static/gui/src/app/components/inspector/overview-action/test-overview-action.js
index 67f28b8a81..b034b36456 100644
--- a/jujugui/static/gui/src/app/components/inspector/overview-action/test-overview-action.js
+++ b/jujugui/static/gui/src/app/components/inspector/overview-action/test-overview-action.js
@@ -36,7 +36,8 @@ describe('OverviewAction', function() {
     const wrapper = renderComponent({ icon: 'action-icon' });
     const expected = (
       <span className="overview-action__icon">
-        <SvgIcon name="action-icon"
+        <SvgIcon
+          name="action-icon"
           size="16" />
       </span>);
     assert.compareJSX(wrapper.find('.overview-action__icon'), expected);
@@ -49,7 +50,8 @@ describe('OverviewAction', function() {
       linkTitle: 'Juju Charms'
     });
     const expected = (
-      <span className="overview-action__link"
+      <span
+        className="overview-action__link"
         onClick={wrapper.find('.overview-action__link').prop('onClick')}>
           Juju Charms
       </span>);
diff --git a/jujugui/static/gui/src/app/components/inspector/relate-to/relate-to.js b/jujugui/static/gui/src/app/components/inspector/relate-to/relate-to.js
index 2db569c329..973eb41890 100644
--- a/jujugui/static/gui/src/app/components/inspector/relate-to/relate-to.js
+++ b/jujugui/static/gui/src/app/components/inspector/relate-to/relate-to.js
@@ -43,7 +43,8 @@ class InspectorRelateTo extends React.Component {
     return applications.map((application, index) => {
       var data = application.getAttrs();
       return (
-        <li className="inspector-view__list-item"
+        <li
+          className="inspector-view__list-item"
           data-id={data.id}
           key={data.id + index}
           onClick={this._relateToItemAction.bind(this)}
diff --git a/jujugui/static/gui/src/app/components/inspector/relate-to/test-relate-to.js b/jujugui/static/gui/src/app/components/inspector/relate-to/test-relate-to.js
index 6548d05a08..d28e9bc13f 100644
--- a/jujugui/static/gui/src/app/components/inspector/relate-to/test-relate-to.js
+++ b/jujugui/static/gui/src/app/components/inspector/relate-to/test-relate-to.js
@@ -22,7 +22,8 @@ describe('InspectorRelateTo', function() {
     var expected = (
       <div className="inspector-relate-to">
         <ul className="inspector-view__list">
-          {[<li className="inspector-view__list-item"
+          {[<li
+            className="inspector-view__list-item"
             data-id="id"
             key="id0"
             onClick={wrapper.find('.inspector-view__list-item').prop('onClick')}
diff --git a/jujugui/static/gui/src/app/components/inspector/resources/list/list.js b/jujugui/static/gui/src/app/components/inspector/resources/list/list.js
index 255e983ee7..702509e67e 100644
--- a/jujugui/static/gui/src/app/components/inspector/resources/list/list.js
+++ b/jujugui/static/gui/src/app/components/inspector/resources/list/list.js
@@ -14,7 +14,8 @@ class InspectorResourcesList extends React.Component {
     const resources = this.props.resources;
     const resourceList = resources.map((resource, i) => {
       return (
-        <li className="inspector-resources-list__resource"
+        <li
+          className="inspector-resources-list__resource"
           key={resource.Name + i}>
           <p>{resource.Name}</p>
           <p>{resource.Description}</p>
diff --git a/jujugui/static/gui/src/app/components/inspector/resources/list/test-list.js b/jujugui/static/gui/src/app/components/inspector/resources/list/test-list.js
index 4c3df72f22..5bfe9d6245 100644
--- a/jujugui/static/gui/src/app/components/inspector/resources/list/test-list.js
+++ b/jujugui/static/gui/src/app/components/inspector/resources/list/test-list.js
@@ -35,12 +35,14 @@ describe('InspectorResourcesList', function() {
     const expected = (
       <div className="inspector-resources-list">
         <ul className="inspector-resources-list__list">
-          <li className="inspector-resources-list__resource"
+          <li
+            className="inspector-resources-list__resource"
             key="file10">
             <p>file1</p>
             <p>file1 desc</p>
           </li>
-          <li className="inspector-resources-list__resource"
+          <li
+            className="inspector-resources-list__resource"
             key="file21">
             <p>file2</p>
             <p>file2 desc</p>
diff --git a/jujugui/static/gui/src/app/components/inspector/scale-service/scale-service.js b/jujugui/static/gui/src/app/components/inspector/scale-service/scale-service.js
index 60ad07dc49..02f0c7b648 100644
--- a/jujugui/static/gui/src/app/components/inspector/scale-service/scale-service.js
+++ b/jujugui/static/gui/src/app/components/inspector/scale-service/scale-service.js
@@ -109,7 +109,8 @@ class ScaleService extends React.Component {
     }];
 
     return (
-      <form className="scale-service"
+      <form
+        className="scale-service"
         onSubmit={this._scaleUpService.bind(this)}>
         <div className="scale-service--units">
           <input
@@ -129,7 +130,8 @@ class ScaleService extends React.Component {
             <input
               className="scale-service--selector__radio"
               disabled={disabled}
-              id="auto-place-units" name="placement"
+              id="auto-place-units"
+              name="placement"
               onChange={this._toggleConstraints.bind(this)}
               ref="autoPlaceUnitsToggle"
               type="radio" />
@@ -139,7 +141,8 @@ class ScaleService extends React.Component {
             <input
               className="scale-service--selector__radio"
               defaultChecked={true}
-              disabled={disabled} id="manually-place-units"
+              disabled={disabled}
+              id="manually-place-units"
               name="placement"
               onChange={this._toggleConstraints.bind(this)}
               type="radio" />
diff --git a/jujugui/static/gui/src/app/components/inspector/unit-details/test-unit-details.js b/jujugui/static/gui/src/app/components/inspector/unit-details/test-unit-details.js
index fef1e96bc0..2c84fd5331 100644
--- a/jujugui/static/gui/src/app/components/inspector/unit-details/test-unit-details.js
+++ b/jujugui/static/gui/src/app/components/inspector/unit-details/test-unit-details.js
@@ -89,7 +89,8 @@ describe('UnitDetails', function() {
     unit.workloadStatusMessage = '';
     const wrapper = renderComponent();
     const expected = (
-      <li className="twelve-col unit-details__list-item"
+      <li
+        className="twelve-col unit-details__list-item"
         key="uncommitted0">
         <div className="four-col prepend-one no-margin-bottom unit-details__label">
           started
@@ -109,7 +110,8 @@ describe('UnitDetails', function() {
     const wrapper = renderComponent();
     const expected = (
       <ul className="twelve-col unit-details__list">
-        <li className="twelve-col unit-details__list-item"
+        <li
+          className="twelve-col unit-details__list-item"
           key="uncommitted0">
           <div className="four-col prepend-one no-margin-bottom unit-details__label">
             started
@@ -127,7 +129,8 @@ describe('UnitDetails', function() {
     const wrapper = renderComponent();
     const expected = (
       <ul className="twelve-col unit-details__list">
-        <li className="twelve-col unit-details__list-item"
+        <li
+          className="twelve-col unit-details__list-item"
           key="uncommitted0">
           <div className="four-col prepend-one no-margin-bottom unit-details__label">
             uncommitted
@@ -157,7 +160,8 @@ describe('UnitDetails', function() {
     const wrapper = renderComponent();
     const publicAddresses = (
       <ul className="unit-details__action-list">
-        <li className="unit-details__action-list-item"
+        <li
+          className="unit-details__action-list-item"
           key="93.20.93.20:9000-10000/udp">
           <span>
             {'93.20.93.20:9000-10000/udp'}
@@ -176,21 +180,24 @@ describe('UnitDetails', function() {
       </ul>);
     const ipAddresses = (
       <ul className="unit-details__action-list">
-        <li className="unit-details__action-list-item"
+        <li
+          className="unit-details__action-list-item"
           key="192.168.0.1:9000-10000/udp">
           <span>
             {'192.168.0.1:9000-10000/udp'}
           </span>
         </li>
         <li className="unit-details__action-list-item" key="192.168.0.1:443">
-          <a className="unit-details__address-link"
+          <a
+            className="unit-details__address-link"
             href="https://192.168.0.1:443"
             target="_blank">
             {'192.168.0.1:443'}
           </a>
         </li>
         <li className="unit-details__action-list-item" key="192.168.0.1:8080">
-          <a className="unit-details__address-link"
+          <a
+            className="unit-details__address-link"
             href="http://192.168.0.1:8080"
             target="_blank">
             {'192.168.0.1:8080'}
@@ -228,21 +235,24 @@ describe('UnitDetails', function() {
     const wrapper = renderComponent();
     const publicAddresses = (
       <ul className="unit-details__action-list">
-        <li className="unit-details__action-list-item"
+        <li
+          className="unit-details__action-list-item"
           key="93.20.93.20:9000-10000/udp">
           <span>
             {'93.20.93.20:9000-10000/udp'}
           </span>
         </li>
         <li className="unit-details__action-list-item" key="93.20.93.20:443">
-          <a className="unit-details__address-link"
+          <a
+            className="unit-details__address-link"
             href="https://93.20.93.20:443"
             target="_blank">
             {'93.20.93.20:443'}
           </a>
         </li>
         <li className="unit-details__action-list-item" key="93.20.93.20:8080">
-          <a className="unit-details__address-link"
+          <a
+            className="unit-details__address-link"
             href="http://93.20.93.20:8080"
             target="_blank">
             {'93.20.93.20:8080'}
@@ -251,21 +261,24 @@ describe('UnitDetails', function() {
       </ul>);
     const ipAddresses = (
       <ul className="unit-details__action-list">
-        <li className="unit-details__action-list-item"
+        <li
+          className="unit-details__action-list-item"
           key="192.168.0.1:9000-10000/udp">
           <span>
             {'192.168.0.1:9000-10000/udp'}
           </span>
         </li>
         <li className="unit-details__action-list-item" key="192.168.0.1:443">
-          <a className="unit-details__address-link"
+          <a
+            className="unit-details__address-link"
             href="https://192.168.0.1:443"
             target="_blank">
             {'192.168.0.1:443'}
           </a>
         </li>
         <li className="unit-details__action-list-item" key="192.168.0.1:8080">
-          <a className="unit-details__address-link"
+          <a
+            className="unit-details__address-link"
             href="http://192.168.0.1:8080"
             target="_blank">
             {'192.168.0.1:8080'}
@@ -329,7 +342,8 @@ describe('UnitDetails', function() {
         </div>
         <div className="seven-col last-col no-margin-bottom">
           <ul className="unit-details__action-list">
-            <li className="unit-details__action-list-item"
+            <li
+              className="unit-details__action-list-item"
               key="SSH to unit">
               <Link
                 changeState={sinon.stub()}
@@ -351,7 +365,8 @@ describe('UnitDetails', function() {
     const wrapper = renderComponent({showSSHButtons: true});
     const expected = (
       <ul className="unit-details__action-list">
-        <li className="unit-details__action-list-item"
+        <li
+          className="unit-details__action-list-item"
           key="SSH to unit">
           <Link
             changeState={sinon.stub()}
@@ -362,7 +377,8 @@ describe('UnitDetails', function() {
             SSH to unit
           </Link>
         </li>
-        <li className="unit-details__action-list-item"
+        <li
+          className="unit-details__action-list-item"
           key="Tail logs">
           <Link
             changeState={sinon.stub()}
@@ -373,7 +389,8 @@ describe('UnitDetails', function() {
             Tail logs
           </Link>
         </li>
-        <li className="unit-details__action-list-item"
+        <li
+          className="unit-details__action-list-item"
           key="Debug hooks">
           <Link
             changeState={sinon.stub()}
diff --git a/jujugui/static/gui/src/app/components/inspector/unit-details/unit-details.js b/jujugui/static/gui/src/app/components/inspector/unit-details/unit-details.js
index b3b78ab35f..45d52fa7e7 100644
--- a/jujugui/static/gui/src/app/components/inspector/unit-details/unit-details.js
+++ b/jujugui/static/gui/src/app/components/inspector/unit-details/unit-details.js
@@ -69,14 +69,16 @@ class UnitDetails extends React.Component {
       let link = (<span>{label}</span>);
       if (href) {
         link = (
-          <a className="unit-details__address-link"
+          <a
+            className="unit-details__address-link"
             href={href}
             target="_blank">
             {label}
           </a>);
       }
       return (
-        <li className="unit-details__action-list-item"
+        <li
+          className="unit-details__action-list-item"
           key={label}>
           {link}
         </li>);
@@ -116,7 +118,8 @@ class UnitDetails extends React.Component {
   */
   _generateList(items) {
     const list = items.map((item, i) => (
-      <li className="twelve-col unit-details__list-item"
+      <li
+        className="twelve-col unit-details__list-item"
         key={item.label + item.value + i}>
         <div className="four-col prepend-one no-margin-bottom unit-details__label">
           {item.label}
@@ -222,7 +225,8 @@ class UnitDetails extends React.Component {
         [`cd /var/lib/juju/agents/unit-${this.props.unit.urlName}/charm`])
     }].concat(this._generateErrorButtons());
     const links = actions.map(action => (
-      <li className="unit-details__action-list-item"
+      <li
+        className="unit-details__action-list-item"
         key={action.title}>
         <Link
           changeState={this.props.changeState}
diff --git a/jujugui/static/gui/src/app/components/isv-profile/isv-profile.js b/jujugui/static/gui/src/app/components/isv-profile/isv-profile.js
index 8e1e0e1e26..d689ffc750 100644
--- a/jujugui/static/gui/src/app/components/isv-profile/isv-profile.js
+++ b/jujugui/static/gui/src/app/components/isv-profile/isv-profile.js
@@ -90,14 +90,16 @@ class ISVProfile extends React.Component {
                 <div className="twelve-col isv-profile__box">
                   <div className="twelve-col">
                     Show dates from:
-                    <select className="isv-profile__historic-data-input"
+                    <select
+                      className="isv-profile__historic-data-input"
                       name="select">
                       <option value="value1">01/08/2016</option>
                       <option value="value2">01/08/2016</option>
                       <option value="value3">01/08/2016</option>
                     </select>
                     to:
-                    <select className="isv-profile__historic-data-input"
+                    <select
+                      className="isv-profile__historic-data-input"
                       name="select">
                       <option value="value1">05/09/2016</option>
                       <option value="value2">01/08/2016</option>
diff --git a/jujugui/static/gui/src/app/components/lightbox/test-lightbox.js b/jujugui/static/gui/src/app/components/lightbox/test-lightbox.js
index d719c50e21..19ad7d3a88 100644
--- a/jujugui/static/gui/src/app/components/lightbox/test-lightbox.js
+++ b/jujugui/static/gui/src/app/components/lightbox/test-lightbox.js
@@ -21,12 +21,14 @@ describe('Lightbox', function() {
   it('renders', () => {
     const wrapper = renderComponent();
     const expected = (
-      <div className="lightbox"
+      <div
+        className="lightbox"
         onClick={wrapper.prop('onClick')}>
         <button className="lightbox__close">
           <SvgIcon name="close_16_white" width="16" />
         </button>
-        <div className="lightbox__wrapper"
+        <div
+          className="lightbox__wrapper"
           onClick={wrapper.find('.lightbox__wrapper').prop('onClick')}>
           <div className="lightbox__content">
             Hi
@@ -72,26 +74,31 @@ describe('Lightbox', function() {
       const expected = (
         <div className="lightbox__content">
           <div className="lightbox__navigation">
-            <button className="lightbox__navigation-previous"
+            <button
+              className="lightbox__navigation-previous"
               disabled={true}
               onClick={wrapper.find('.lightbox__navigation-previous').prop('onClick')}>
               <SvgIcon name="chevron_down_16" width="16" />
             </button>
-            <button className="lightbox__navigation-next"
+            <button
+              className="lightbox__navigation-next"
               disabled={false}
               onClick={wrapper.find('.lightbox__navigation-next').prop('onClick')}>
               <SvgIcon name="chevron_down_16" width="16" />
             </button>
             <ul className="lightbox__navigation-bullets">
-              <li className="lightbox__navigation-bullet is-active"
+              <li
+                className="lightbox__navigation-bullet is-active"
                 onClick={wrapper.find('.lightbox__navigation-bullet').at(0).prop('onClick')}>
                 &bull;
               </li>
-              <li className="lightbox__navigation-bullet"
+              <li
+                className="lightbox__navigation-bullet"
                 onClick={wrapper.find('.lightbox__navigation-bullet').at(1).prop('onClick')}>
                 &bull;
               </li>
-              <li className="lightbox__navigation-bullet"
+              <li
+                className="lightbox__navigation-bullet"
                 onClick={wrapper.find('.lightbox__navigation-bullet').at(2).prop('onClick')}>
                 &bull;
               </li>
diff --git a/jujugui/static/gui/src/app/components/link/link.js b/jujugui/static/gui/src/app/components/link/link.js
index 169022167d..aef5f554f8 100644
--- a/jujugui/static/gui/src/app/components/link/link.js
+++ b/jujugui/static/gui/src/app/components/link/link.js
@@ -26,7 +26,8 @@ class Link extends React.Component {
     // both changing the internal state (without refreshing the gui) and
     // right-click-open-in-new-tab cases.
     return (
-      <a className={classes}
+      <a
+        className={classes}
         href={this.props.generatePath(clickState)}
         onClick={this._handleClick.bind(this, clickState)}>
         {this.props.children}
diff --git a/jujugui/static/gui/src/app/components/link/test-link.js b/jujugui/static/gui/src/app/components/link/test-link.js
index 46bfdc90de..856b89ab6c 100644
--- a/jujugui/static/gui/src/app/components/link/test-link.js
+++ b/jujugui/static/gui/src/app/components/link/test-link.js
@@ -21,7 +21,8 @@ describe('Link', function() {
   it('can generate a link', () => {
     const wrapper = renderComponent();
     const expected = (
-      <a className="link"
+      <a
+        className="link"
         href="/new/state"
         onClick={wrapper.prop('onClick')}>
         Link content
diff --git a/jujugui/static/gui/src/app/components/local-inspector/local-inspector.js b/jujugui/static/gui/src/app/components/local-inspector/local-inspector.js
index fe2b0d0341..bfd938eca1 100644
--- a/jujugui/static/gui/src/app/components/local-inspector/local-inspector.js
+++ b/jujugui/static/gui/src/app/components/local-inspector/local-inspector.js
@@ -64,7 +64,9 @@ class LocalInspector extends React.Component {
         component = (
           <div className="local-inspector__content-new">
             <p>Choose a series to deploy this charm</p>
-            <select className="local-inspector__series" defaultValue="trusty"
+            <select
+              className="local-inspector__series"
+              defaultValue="trusty"
               disabled={this.props.acl.isReadOnly()}
               ref="series">
               {seriesOptions}
@@ -103,7 +105,9 @@ class LocalInspector extends React.Component {
       items.push(
         <li key={serviceId}>
           <label>
-            <input data-id={serviceId} disabled={props.acl.isReadOnly()}
+            <input
+              data-id={serviceId}
+              disabled={props.acl.isReadOnly()}
               ref={'service-' + serviceId}
               type="checkbox" />
             {service.get('name')}
@@ -184,7 +188,9 @@ class LocalInspector extends React.Component {
           <ul className="local-inspector__list">
             <li>
               <label>
-                <input defaultChecked={localType === 'new'} disabled={isReadOnly}
+                <input
+                  defaultChecked={localType === 'new'}
+                  disabled={isReadOnly}
                   name="action"
                   onChange={this._changeActiveComponent.bind(this, 'new')}
                   type="radio" />
@@ -193,7 +199,9 @@ class LocalInspector extends React.Component {
             </li>
             <li>
               <label>
-                <input defaultChecked={localType === 'update'} disabled={isReadOnly}
+                <input
+                  defaultChecked={localType === 'update'}
+                  disabled={isReadOnly}
                   name="action"
                   onChange={
                     this._changeActiveComponent.bind(this, 'update')}
diff --git a/jujugui/static/gui/src/app/components/local-inspector/test-local-inspector.js b/jujugui/static/gui/src/app/components/local-inspector/test-local-inspector.js
index e38eab3d78..49aefceb54 100644
--- a/jujugui/static/gui/src/app/components/local-inspector/test-local-inspector.js
+++ b/jujugui/static/gui/src/app/components/local-inspector/test-local-inspector.js
@@ -79,7 +79,9 @@ describe('LocalInspector', function() {
           <ul className="local-inspector__list">
             <li>
               <label>
-                <input defaultChecked={true} disabled={false}
+                <input
+                  defaultChecked={true}
+                  disabled={false}
                   name="action"
                   onChange={inputs.at(0).prop('onChange')}
                   type="radio" />
@@ -88,7 +90,9 @@ describe('LocalInspector', function() {
             </li>
             <li>
               <label>
-                <input defaultChecked={false} disabled={false}
+                <input
+                  defaultChecked={false}
+                  disabled={false}
                   name="action"
                   onChange={inputs.at(1).prop('onChange')}
                   type="radio" />
@@ -98,7 +102,9 @@ describe('LocalInspector', function() {
           </ul>
           <div className="local-inspector__content-new">
             <p>Choose a series to deploy this charm</p>
-            <select className="local-inspector__series" defaultValue="trusty"
+            <select
+              className="local-inspector__series"
+              defaultValue="trusty"
               disabled={false}
               ref="series">
               <option key="vivid" value="vivid">Vivid Vervet 15.04</option>
@@ -120,7 +126,9 @@ describe('LocalInspector', function() {
         <ul className="local-inspector__list">
           <li key="apache2-2">
             <label>
-              <input data-id="apache2-2" disabled={false}
+              <input
+                data-id="apache2-2"
+                disabled={false}
                 ref="service-apache2-2"
                 type="checkbox" />
               apache2
@@ -128,7 +136,9 @@ describe('LocalInspector', function() {
           </li>
           <li key="mysql-1">
             <label>
-              <input data-id="mysql-1" disabled={false}
+              <input
+                data-id="mysql-1"
+                disabled={false}
                 ref="service-mysql-1"
                 type="checkbox" />
               mysql
diff --git a/jujugui/static/gui/src/app/components/logout/logout.js b/jujugui/static/gui/src/app/components/logout/logout.js
index 18f491802e..ae1d091d97 100644
--- a/jujugui/static/gui/src/app/components/logout/logout.js
+++ b/jujugui/static/gui/src/app/components/logout/logout.js
@@ -39,7 +39,8 @@ class Logout extends React.Component {
     }
 
     return (
-      <a className={this._generateClasses()}
+      <a
+        className={this._generateClasses()}
         href={logoutUrl}
         onClick={this._handleClick.bind(this)}
         target={target}>
diff --git a/jujugui/static/gui/src/app/components/logout/test-logout.js b/jujugui/static/gui/src/app/components/logout/test-logout.js
index 827efe4891..8f1943a3bf 100644
--- a/jujugui/static/gui/src/app/components/logout/test-logout.js
+++ b/jujugui/static/gui/src/app/components/logout/test-logout.js
@@ -20,7 +20,8 @@ describe('Logout', () => {
   it('renders properly for regular logout', () => {
     const wrapper = renderComponent();
     const expected = (
-      <a className="logout-link dropdown-menu__list-item-link"
+      <a
+        className="logout-link dropdown-menu__list-item-link"
         href="http://logout"
         onClick={wrapper.prop('onClick')}
         target="_self">Logout</a>
diff --git a/jujugui/static/gui/src/app/components/machine-view/add-machine/add-machine.js b/jujugui/static/gui/src/app/components/machine-view/add-machine/add-machine.js
index 5a4fbfa6e1..60ad604651 100644
--- a/jujugui/static/gui/src/app/components/machine-view/add-machine/add-machine.js
+++ b/jujugui/static/gui/src/app/components/machine-view/add-machine/add-machine.js
@@ -125,7 +125,8 @@ class MachineViewAddMachine extends React.Component {
   */
   _generateSelectContainer() {
     return (
-      <select className="add-machine__container"
+      <select
+        className="add-machine__container"
         defaultValue=""
         disabled={this.props.acl.isReadOnly()}
         key="containers"
diff --git a/jujugui/static/gui/src/app/components/machine-view/add-machine/test-add-machine.js b/jujugui/static/gui/src/app/components/machine-view/add-machine/test-add-machine.js
index e9d2b8d448..f061e48390 100644
--- a/jujugui/static/gui/src/app/components/machine-view/add-machine/test-add-machine.js
+++ b/jujugui/static/gui/src/app/components/machine-view/add-machine/test-add-machine.js
@@ -95,7 +95,8 @@ describe('MachineViewAddMachine', function() {
     const wrapper = renderComponent({ parentId: 'new0' });
     const expected = (
       <div className="add-machine">{[
-        <select className="add-machine__container"
+        <select
+          className="add-machine__container"
           defaultValue=""
           disabled={false}
           key="containers"
diff --git a/jujugui/static/gui/src/app/components/machine-view/column/column.js b/jujugui/static/gui/src/app/components/machine-view/column/column.js
index 8190367508..eb49b3c1a2 100644
--- a/jujugui/static/gui/src/app/components/machine-view/column/column.js
+++ b/jujugui/static/gui/src/app/components/machine-view/column/column.js
@@ -95,7 +95,8 @@ class MachineViewColumn extends React.Component {
         <div className="machine-view__column-content">
           {this.props.children}
           <div className="machine-view__column-drop-target">
-            <SvgIcon name="add_16"
+            <SvgIcon
+              name="add_16"
               size="16" />
           </div>
         </div>
diff --git a/jujugui/static/gui/src/app/components/machine-view/column/test-column.js b/jujugui/static/gui/src/app/components/machine-view/column/test-column.js
index 59e3c163e8..ba5df5e335 100644
--- a/jujugui/static/gui/src/app/components/machine-view/column/test-column.js
+++ b/jujugui/static/gui/src/app/components/machine-view/column/test-column.js
@@ -59,7 +59,8 @@ describe('MachineViewColumn', function() {
         <div className="machine-view__column-content">
           <div>contents</div>
           <div className="machine-view__column-drop-target">
-            <SvgIcon name="add_16"
+            <SvgIcon
+              name="add_16"
               size="16" />
           </div>
         </div>
diff --git a/jujugui/static/gui/src/app/components/machine-view/machine-view.js b/jujugui/static/gui/src/app/components/machine-view/machine-view.js
index 2b9a6b0218..234dd2d7ec 100644
--- a/jujugui/static/gui/src/app/components/machine-view/machine-view.js
+++ b/jujugui/static/gui/src/app/components/machine-view/machine-view.js
@@ -140,7 +140,8 @@ class MachineView extends React.Component {
               Unplaced units will appear here. Drag and drop them to
               customise your deployment.
             </p>
-            <span className="link"
+            <span
+              className="link"
               onClick={this._openStore.bind(this)}>
               Add applications to get started
             </span>
@@ -153,7 +154,8 @@ class MachineView extends React.Component {
       return (
         <div className="machine-view__column-onboarding">
           {icon ? (
-            <SvgIcon name={icon}
+            <SvgIcon
+              name={icon}
               size="16" />) : null}
           {content}
         </div>);
@@ -314,7 +316,8 @@ class MachineView extends React.Component {
             <li>Manually place new units</li>
             <li>Colocate applications</li>
           </ul>
-          <span className="link"
+          <span
+            className="link"
             onClick={this._addMachine.bind(this)}
             role="button"
             tabIndex="0">
diff --git a/jujugui/static/gui/src/app/components/machine-view/scale-up/scale-up.js b/jujugui/static/gui/src/app/components/machine-view/scale-up/scale-up.js
index 961664fa8f..1174c7d0d5 100644
--- a/jujugui/static/gui/src/app/components/machine-view/scale-up/scale-up.js
+++ b/jujugui/static/gui/src/app/components/machine-view/scale-up/scale-up.js
@@ -23,12 +23,15 @@ class MachineViewScaleUp extends React.Component {
         return;
       }
       components.push(
-        <li className="machine-view__scale-up-unit"
+        <li
+          className="machine-view__scale-up-unit"
           key={service.get('id')}>
-          <img alt={service.get('name')}
+          <img
+            alt={service.get('name')}
             className="machine-view__scale-up-unit-icon"
             src={service.get('icon')} />
-          <div className="machine-view__scale-up-unit-name"
+          <div
+            className="machine-view__scale-up-unit-name"
             title={service.get('name')}>
             {service.get('name')}
           </div>
@@ -82,7 +85,8 @@ class MachineViewScaleUp extends React.Component {
       type: 'neutral'
     }];
     return (
-      <form className="machine-view__scale-up"
+      <form
+        className="machine-view__scale-up"
         onSubmit={this._handleAddUnits.bind(this)}>
         {this._generateServices()}
         <ButtonRow buttons={buttons} />
diff --git a/jujugui/static/gui/src/app/components/machine-view/scale-up/test-scale-up.js b/jujugui/static/gui/src/app/components/machine-view/scale-up/test-scale-up.js
index bfd90bc32f..96d803045c 100644
--- a/jujugui/static/gui/src/app/components/machine-view/scale-up/test-scale-up.js
+++ b/jujugui/static/gui/src/app/components/machine-view/scale-up/test-scale-up.js
@@ -90,15 +90,19 @@ describe('MachineViewScaleUp', function() {
     const wrapper = renderComponent();
     const buttons = wrapper.find('ButtonRow').prop('buttons');
     const expected = (
-      <form className="machine-view__scale-up"
+      <form
+        className="machine-view__scale-up"
         onSubmit={wrapper.prop('onSubmit')}>
         <ul className="machine-view__scale-up-units">
-          <li className="machine-view__scale-up-unit"
+          <li
+            className="machine-view__scale-up-unit"
             key="111111$">
-            <img alt="django"
+            <img
+              alt="django"
               className="machine-view__scale-up-unit-icon"
               src="data:image/gif;base64," />
-            <div className="machine-view__scale-up-unit-name"
+            <div
+              className="machine-view__scale-up-unit-name"
               title="django">
               django
             </div>
@@ -111,12 +115,15 @@ describe('MachineViewScaleUp', function() {
               step="1"
               type="number" />
           </li>
-          <li className="machine-view__scale-up-unit"
+          <li
+            className="machine-view__scale-up-unit"
             key="222222$">
-            <img alt="mysql"
+            <img
+              alt="mysql"
               className="machine-view__scale-up-unit-icon"
               src="data:image/gif;base64," />
-            <div className="machine-view__scale-up-unit-name"
+            <div
+              className="machine-view__scale-up-unit-name"
               title="mysql">
               mysql
             </div>
diff --git a/jujugui/static/gui/src/app/components/machine-view/test-machine-view.js b/jujugui/static/gui/src/app/components/machine-view/test-machine-view.js
index 6c0770dba1..6e99d5fc8b 100644
--- a/jujugui/static/gui/src/app/components/machine-view/test-machine-view.js
+++ b/jujugui/static/gui/src/app/components/machine-view/test-machine-view.js
@@ -120,7 +120,8 @@ describe('MachineView', function() {
                   Unplaced units will appear here. Drag and drop them to
                   customise your deployment.
                 </p>
-                <span className="link"
+                <span
+                  className="link"
                   onClick={links.at(0).prop('onClick')}>
                   Add applications to get started
                 </span>
@@ -180,7 +181,8 @@ describe('MachineView', function() {
                 <li>Manually place new units</li>
                 <li>Colocate applications</li>
               </ul>
-              <span className="link"
+              <span
+                className="link"
                 onClick={links.at(1).prop('onClick')}
                 role="button"
                 tabIndex="0">
@@ -232,7 +234,8 @@ describe('MachineView', function() {
             Unplaced units will appear here. Drag and drop them to
             customise your deployment.
           </p>
-          <span className="link"
+          <span
+            className="link"
             onClick={
               wrapper.find('.machine-view__column-onboarding .link').at(0).prop('onClick')}>
             Add applications to get started
@@ -256,7 +259,8 @@ describe('MachineView', function() {
     const wrapper = renderComponent();
     const expected = (
       <div className="machine-view__column-onboarding">
-        <SvgIcon name="task-done_16"
+        <SvgIcon
+          name="task-done_16"
           size="16" />
         You have placed all of your units
       </div>);
@@ -304,7 +308,8 @@ describe('MachineView', function() {
     const wrapper = renderComponent();
     const expected = (
       <div className="machine-view__column-onboarding">
-        <SvgIcon name="task-done_16"
+        <SvgIcon
+          name="task-done_16"
           size="16" />
         You have placed all of your units
       </div>);
@@ -341,7 +346,8 @@ describe('MachineView', function() {
           <li>Manually place new units</li>
           <li>Colocate applications</li>
         </ul>
-        <span className="link"
+        <span
+          className="link"
           onClick={wrapper.find('.link').at(1).prop('onClick')}
           role="button"
           tabIndex="0">
diff --git a/jujugui/static/gui/src/app/components/machine-view/unplaced-unit/test-unplaced-unit.js b/jujugui/static/gui/src/app/components/machine-view/unplaced-unit/test-unplaced-unit.js
index fa655248e3..49b7102cb8 100644
--- a/jujugui/static/gui/src/app/components/machine-view/unplaced-unit/test-unplaced-unit.js
+++ b/jujugui/static/gui/src/app/components/machine-view/unplaced-unit/test-unplaced-unit.js
@@ -52,7 +52,9 @@ describe('MachineViewUnplacedUnit', function() {
     const items = wrapper.find('ButtonDropdown').prop('listItems');
     const expected = (
       <li className="machine-view__unplaced-unit">
-        <img alt="django/7" className="machine-view__unplaced-unit-icon"
+        <img
+          alt="django/7"
+          className="machine-view__unplaced-unit-icon"
           src="icon.svg" />
         django/7
         <ButtonDropdown
diff --git a/jujugui/static/gui/src/app/components/machine-view/unplaced-unit/unplaced-unit.js b/jujugui/static/gui/src/app/components/machine-view/unplaced-unit/unplaced-unit.js
index 113925fd27..2481866999 100644
--- a/jujugui/static/gui/src/app/components/machine-view/unplaced-unit/unplaced-unit.js
+++ b/jujugui/static/gui/src/app/components/machine-view/unplaced-unit/unplaced-unit.js
@@ -117,7 +117,9 @@ class MachineViewUnplacedUnit extends React.Component {
     // Wrap the returned components in the drag source method.
     return props.connectDragSource(
       <li className={this._generateClasses()}>
-        <img alt={unit.displayName} className="machine-view__unplaced-unit-icon"
+        <img
+          alt={unit.displayName}
+          className="machine-view__unplaced-unit-icon"
           src={unitAPI.icon} />
         {unit.displayName}
         <ButtonDropdown
diff --git a/jujugui/static/gui/src/app/components/modal-gui-settings/modal-gui-settings.js b/jujugui/static/gui/src/app/components/modal-gui-settings/modal-gui-settings.js
index 4974f44e06..584f9bdb77 100644
--- a/jujugui/static/gui/src/app/components/modal-gui-settings/modal-gui-settings.js
+++ b/jujugui/static/gui/src/app/components/modal-gui-settings/modal-gui-settings.js
@@ -73,7 +73,10 @@ class ModalGUISettings extends React.Component {
       <div className="modal modal--narrow">
         <div className="twelve-col no-margin-bottom">
           <h2 className="bordered">Custom GUI Settings</h2>
-          <span className="close" onClick={props.closeModal} role="button"
+          <span
+            className="close"
+            onClick={props.closeModal}
+            role="button"
             tabIndex="0">
             <SvgIcon name="close_16" size="16" />
           </span>
@@ -81,7 +84,9 @@ class ModalGUISettings extends React.Component {
         <div className="content">
           <p>
             <label htmlFor="disable-cookie">
-              <input defaultChecked={state['disable-cookie']} id="disable-cookie"
+              <input
+                defaultChecked={state['disable-cookie']}
+                id="disable-cookie"
                 name="disable-cookie"
                 onChange={handleChange}
                 type="checkbox" />&nbsp;
@@ -90,7 +95,9 @@ class ModalGUISettings extends React.Component {
           </p>
           <p>
             <label htmlFor="force-containers">
-              <input defaultChecked={state['force-containers']} id="force-containers"
+              <input
+                defaultChecked={state['force-containers']}
+                id="force-containers"
                 name="force-containers"
                 onChange={handleChange}
                 type="checkbox" />&nbsp;
@@ -99,7 +106,9 @@ class ModalGUISettings extends React.Component {
           </p>
           <p>
             <label htmlFor="disable-auto-place">
-              <input defaultChecked={state['disable-auto-place']} id="disable-auto-place"
+              <input
+                defaultChecked={state['disable-auto-place']}
+                id="disable-auto-place"
                 name="disable-auto-place"
                 onChange={handleChange}
                 type="checkbox" />&nbsp;
@@ -108,7 +117,9 @@ class ModalGUISettings extends React.Component {
           </p>
           <p>
             <label htmlFor="jujushell-url">
-              <input id="jujushell-url" name="jujushell-url"
+              <input
+                id="jujushell-url"
+                name="jujushell-url"
                 onChange={handleChange}
                 type="text"
                 value={state['jujushell-url']} />&nbsp;
@@ -120,9 +131,13 @@ class ModalGUISettings extends React.Component {
               NOTE: You will need to reload for changes to take effect.
             </small>
           </p>
-          <input className="button--positive" id="save-settings"
-            name="save-settings" onClick={this._handleSave.bind(this)}
-            type="button" value="Save" />
+          <input
+            className="button--positive"
+            id="save-settings"
+            name="save-settings"
+            onClick={this._handleSave.bind(this)}
+            type="button"
+            value="Save" />
         </div>
       </div>
     );
diff --git a/jujugui/static/gui/src/app/components/modal-gui-settings/test-modal-gui-settings.js b/jujugui/static/gui/src/app/components/modal-gui-settings/test-modal-gui-settings.js
index 7da560bbfd..4d931df678 100644
--- a/jujugui/static/gui/src/app/components/modal-gui-settings/test-modal-gui-settings.js
+++ b/jujugui/static/gui/src/app/components/modal-gui-settings/test-modal-gui-settings.js
@@ -33,7 +33,8 @@ describe('ModalGUISettings', function() {
       <div className="modal modal--narrow">
         <div className="twelve-col no-margin-bottom">
           <h2 className="bordered">Custom GUI Settings</h2>
-          <span className="close"
+          <span
+            className="close"
             onClick={sinon.stub()}
             role="button"
             tabIndex="0">
@@ -43,7 +44,9 @@ describe('ModalGUISettings', function() {
         <div className="content">
           <p>
             <label htmlFor="disable-cookie">
-              <input defaultChecked={false} id="disable-cookie"
+              <input
+                defaultChecked={false}
+                id="disable-cookie"
                 name="disable-cookie"
                 onChange={wrapper.find('#disable-cookie').prop('onChange')}
                 type="checkbox" />&nbsp;
@@ -52,7 +55,9 @@ describe('ModalGUISettings', function() {
           </p>
           <p>
             <label htmlFor="force-containers">
-              <input defaultChecked={false} id="force-containers"
+              <input
+                defaultChecked={false}
+                id="force-containers"
                 name="force-containers"
                 onChange={wrapper.find('#force-containers').prop('onChange')}
                 type="checkbox" />&nbsp;
@@ -61,7 +66,9 @@ describe('ModalGUISettings', function() {
           </p>
           <p>
             <label htmlFor="disable-auto-place">
-              <input defaultChecked={false} id="disable-auto-place"
+              <input
+                defaultChecked={false}
+                id="disable-auto-place"
                 name="disable-auto-place"
                 onChange={wrapper.find('#disable-auto-place').prop('onChange')}
                 type="checkbox" />&nbsp;
@@ -70,7 +77,9 @@ describe('ModalGUISettings', function() {
           </p>
           <p>
             <label htmlFor="jujushell-url">
-              <input id="jujushell-url" name="jujushell-url"
+              <input
+                id="jujushell-url"
+                name="jujushell-url"
                 onChange={wrapper.find('#jujushell-url').prop('onChange')}
                 type="text"
                 value="" />&nbsp;
@@ -82,10 +91,13 @@ describe('ModalGUISettings', function() {
               NOTE: You will need to reload for changes to take effect.
             </small>
           </p>
-          <input className="button--positive" id="save-settings"
+          <input
+            className="button--positive"
+            id="save-settings"
             name="save-settings"
             onClick={wrapper.find('#save-settings').prop('onClick')}
-            type="button" value="Save" />
+            type="button"
+            value="Save" />
         </div>
       </div>);
     assert.compareJSX(wrapper, expected);
diff --git a/jujugui/static/gui/src/app/components/modal-shortcuts/modal-shortcuts.js b/jujugui/static/gui/src/app/components/modal-shortcuts/modal-shortcuts.js
index 3e0dd70ec5..6063407d24 100644
--- a/jujugui/static/gui/src/app/components/modal-shortcuts/modal-shortcuts.js
+++ b/jujugui/static/gui/src/app/components/modal-shortcuts/modal-shortcuts.js
@@ -60,9 +60,13 @@ class ModalShortcuts extends React.Component {
       <div className="modal">
         <div className="twelve-col no-margin-bottom">
           <h2 className="bordered">Keyboard Shortcuts</h2>
-          <span className="close" onClick={this.props.closeModal} role="button"
+          <span
+            className="close"
+            onClick={this.props.closeModal}
+            role="button"
             tabIndex="0">
-            <SvgIcon name="close_16"
+            <SvgIcon
+              name="close_16"
               size="16" />
           </span>
         </div>
diff --git a/jujugui/static/gui/src/app/components/modal-shortcuts/test-modal-shortcuts.js b/jujugui/static/gui/src/app/components/modal-shortcuts/test-modal-shortcuts.js
index 7be2e547db..158b2a56f1 100644
--- a/jujugui/static/gui/src/app/components/modal-shortcuts/test-modal-shortcuts.js
+++ b/jujugui/static/gui/src/app/components/modal-shortcuts/test-modal-shortcuts.js
@@ -33,9 +33,13 @@ describe('ModalSortcuts', function() {
     let expected = (<div className="modal">
       <div className="twelve-col no-margin-bottom">
         <h2 className="bordered">Keyboard Shortcuts</h2>
-        <span className="close" onClick={sinon.stub()} role="button"
+        <span
+          className="close"
+          onClick={sinon.stub()}
+          role="button"
           tabIndex="0">
-          <SvgIcon name="close_16"
+          <SvgIcon
+            name="close_16"
             size="16" />
         </span>
       </div>
diff --git a/jujugui/static/gui/src/app/components/model-actions/model-actions.js b/jujugui/static/gui/src/app/components/model-actions/model-actions.js
index 107f8bde5e..e834344694 100644
--- a/jujugui/static/gui/src/app/components/model-actions/model-actions.js
+++ b/jujugui/static/gui/src/app/components/model-actions/model-actions.js
@@ -78,11 +78,13 @@ class ModelActions extends React.Component {
         'model-actions__button'
       );
       shareAction = (
-        <span className={shareClasses}
+        <span
+          className={shareClasses}
           onClick={props.sharingVisibility}
           role="button"
           tabIndex="0">
-          <SvgIcon className="model-actions__icon"
+          <SvgIcon
+            className="model-actions__icon"
             name="share_16"
             size="16" />
           <span className="tooltip__tooltip--below">
@@ -97,11 +99,13 @@ class ModelActions extends React.Component {
     let terminalAction = null;
     if (props.displayTerminalButton) {
       terminalAction = (
-        <span className="model-actions__shell model-actions__button"
+        <span
+          className="model-actions__shell model-actions__button"
           onClick={this._handleTerminalClick.bind(this)}
           role="button"
           tabIndex="0">
-          <SvgIcon className="model-actions__icon"
+          <SvgIcon
+            className="model-actions__icon"
             name="code-snippet_24"
             size="16" />
           <span className="tooltip__tooltip--below">
@@ -115,11 +119,13 @@ class ModelActions extends React.Component {
     return (
       <div className={this._generateClasses()}>
         <div className="model-actions__buttons">
-          <span className="model-actions__export model-actions__button"
+          <span
+            className="model-actions__export model-actions__button"
             onClick={this._handleExport.bind(this)}
             role="button"
             tabIndex="0">
-            <SvgIcon className="model-actions__icon"
+            <SvgIcon
+              className="model-actions__icon"
               name="export_16"
               size="16" />
             <span className="tooltip__tooltip--below">
@@ -128,11 +134,13 @@ class ModelActions extends React.Component {
               </span>
             </span>
           </span>
-          <span className="model-actions__import model-actions__button"
+          <span
+            className="model-actions__import model-actions__button"
             onClick={isReadOnly ? undefined : this._handleImportClick.bind(this)}
             role="button"
             tabIndex="0">
-            <SvgIcon className="model-actions__icon"
+            <SvgIcon
+              className="model-actions__icon"
               name="import_16"
               size="16" />
             <span className="tooltip__tooltip--below">
@@ -144,7 +152,8 @@ class ModelActions extends React.Component {
           {shareAction}
           {terminalAction}
         </div>
-        <input accept=".zip,.yaml,.yml"
+        <input
+          accept=".zip,.yaml,.yml"
           className="model-actions__file"
           onChange={isReadOnly ? null : this._handleImportFile.bind(this)}
           ref="file-input"
diff --git a/jujugui/static/gui/src/app/components/model-actions/test-model-actions.js b/jujugui/static/gui/src/app/components/model-actions/test-model-actions.js
index 1a4dae7747..7a554a9438 100644
--- a/jujugui/static/gui/src/app/components/model-actions/test-model-actions.js
+++ b/jujugui/static/gui/src/app/components/model-actions/test-model-actions.js
@@ -39,11 +39,13 @@ describe('ModelActions', function() {
     var expected = (
       <div className="model-actions">
         <div className="model-actions__buttons">
-          <span className="model-actions__export model-actions__button"
+          <span
+            className="model-actions__export model-actions__button"
             onClick={wrapper.find('.model-actions__export').prop('onClick')}
             role="button"
             tabIndex="0">
-            <SvgIcon className="model-actions__icon"
+            <SvgIcon
+              className="model-actions__icon"
               name="export_16"
               size="16" />
             <span className="tooltip__tooltip--below">
@@ -52,11 +54,13 @@ describe('ModelActions', function() {
               </span>
             </span>
           </span>
-          <span className="model-actions__import model-actions__button"
+          <span
+            className="model-actions__import model-actions__button"
             onClick={wrapper.find('.model-actions__import').prop('onClick')}
             role="button"
             tabIndex="0">
-            <SvgIcon className="model-actions__icon"
+            <SvgIcon
+              className="model-actions__icon"
               name="import_16"
               size="16" />
             <span className="tooltip__tooltip--below">
@@ -65,11 +69,13 @@ describe('ModelActions', function() {
               </span>
             </span>
           </span>
-          <span className="model-actions__share model-actions__button"
+          <span
+            className="model-actions__share model-actions__button"
             onClick={wrapper.find('.model-actions__share').prop('onClick')}
             role="button"
             tabIndex="0">
-            <SvgIcon className="model-actions__icon"
+            <SvgIcon
+              className="model-actions__icon"
               name="share_16"
               size="16" />
             <span className="tooltip__tooltip--below">
@@ -79,7 +85,8 @@ describe('ModelActions', function() {
             </span>
           </span>
         </div>
-        <input accept=".zip,.yaml,.yml"
+        <input
+          accept=".zip,.yaml,.yml"
           className="model-actions__file"
           onChange={wrapper.find('.model-actions__file').prop('onChange')}
           ref="file-input"
@@ -91,11 +98,13 @@ describe('ModelActions', function() {
   it('can render the terminalAction', () => {
     const wrapper = renderComponent({ displayTerminalButton: true });
     var expected = (
-      <span className="model-actions__shell model-actions__button"
+      <span
+        className="model-actions__shell model-actions__button"
         onClick={wrapper.find('.model-actions__shell').prop('onClick')}
         role="button"
         tabIndex="0">
-        <SvgIcon className="model-actions__icon"
+        <SvgIcon
+          className="model-actions__icon"
           name="code-snippet_24"
           size="16" />
         <span className="tooltip__tooltip--below">
diff --git a/jujugui/static/gui/src/app/components/notification-list/item/item.js b/jujugui/static/gui/src/app/components/notification-list/item/item.js
index 1eae3f1397..46b3a09e51 100644
--- a/jujugui/static/gui/src/app/components/notification-list/item/item.js
+++ b/jujugui/static/gui/src/app/components/notification-list/item/item.js
@@ -54,10 +54,13 @@ class NotificationListItem extends React.Component {
     return (
       <li className={this._generateClasses()}>
         <span>{this.props.message}</span>
-        <span className="notification-list-item__hide" onClick={this.hide.bind(this)}
+        <span
+          className="notification-list-item__hide"
+          onClick={this.hide.bind(this)}
           role="button"
           tabIndex="0">
-          <SvgIcon name="close_16"
+          <SvgIcon
+            name="close_16"
             size="16" />
         </span>
       </li>);
diff --git a/jujugui/static/gui/src/app/components/notification-list/item/test-item.js b/jujugui/static/gui/src/app/components/notification-list/item/test-item.js
index a30b83e763..8adc199d90 100644
--- a/jujugui/static/gui/src/app/components/notification-list/item/test-item.js
+++ b/jujugui/static/gui/src/app/components/notification-list/item/test-item.js
@@ -33,11 +33,13 @@ describe('NotificationListItem', function() {
     var expected = (
       <li className={classes}>
         <span>notification message</span>
-        <span className="notification-list-item__hide"
+        <span
+          className="notification-list-item__hide"
           onClick={wrapper.find('.notification-list-item__hide').prop('onClick')}
           role="button"
           tabIndex="0">
-          <SvgIcon name="close_16"
+          <SvgIcon
+            name="close_16"
             size="16" />
         </span>
       </li>);
diff --git a/jujugui/static/gui/src/app/components/notification-list/notification-list.js b/jujugui/static/gui/src/app/components/notification-list/notification-list.js
index 05d15bdd9e..ba21fa19f9 100644
--- a/jujugui/static/gui/src/app/components/notification-list/notification-list.js
+++ b/jujugui/static/gui/src/app/components/notification-list/notification-list.js
@@ -125,7 +125,8 @@ class NotificationList extends React.Component {
 
   render() {
     return (
-      <ul className="notification-list"
+      <ul
+        className="notification-list"
         onMouseOut={this._restartTimeouts.bind(this)}
         onMouseOver={this._clearTimeouts.bind(this)}>
         {this._generateNotifications()}
diff --git a/jujugui/static/gui/src/app/components/notification-list/test-notification-list.js b/jujugui/static/gui/src/app/components/notification-list/test-notification-list.js
index c44548b5d3..59158cd51c 100644
--- a/jujugui/static/gui/src/app/components/notification-list/test-notification-list.js
+++ b/jujugui/static/gui/src/app/components/notification-list/test-notification-list.js
@@ -43,7 +43,8 @@ describe('NotificationList', function() {
         timestamp={notifications[0].timestamp}
         type={notifications[0].level} />];
     const expected = (
-      <ul className="notification-list"
+      <ul
+        className="notification-list"
         onMouseOut={wrapper.prop('onMouseOut')}
         onMouseOver={wrapper.prop('onMouseOver')}>
         {items}
diff --git a/jujugui/static/gui/src/app/components/notification/notification.js b/jujugui/static/gui/src/app/components/notification/notification.js
index c7edf5b431..bd16ddedca 100644
--- a/jujugui/static/gui/src/app/components/notification/notification.js
+++ b/jujugui/static/gui/src/app/components/notification/notification.js
@@ -55,7 +55,8 @@ class Notification extends React.Component {
         className="p-notification__action"
         onClick={this._dismiss.bind(this)}>
         <SvgIcon
-          name="close_16" size="16" />
+          name="close_16"
+          size="16" />
       </button>);
   }
 
diff --git a/jujugui/static/gui/src/app/components/notification/test-notification.js b/jujugui/static/gui/src/app/components/notification/test-notification.js
index a37e750779..ae4f1155a7 100644
--- a/jujugui/static/gui/src/app/components/notification/test-notification.js
+++ b/jujugui/static/gui/src/app/components/notification/test-notification.js
@@ -44,7 +44,8 @@ describe('Notification', function() {
     const dismiss = sinon.stub();
     const wrapper = renderComponent({ dismiss });
     const expected = (
-      <button className="p-notification__action"
+      <button
+        className="p-notification__action"
         onClick={wrapper.find('.p-notification__action').prop('onClick')}>
         <SvgIcon
           name="close_16"
diff --git a/jujugui/static/gui/src/app/components/payment/charges/charges.js b/jujugui/static/gui/src/app/components/payment/charges/charges.js
index 39ff62be94..cb1e07ab27 100644
--- a/jujugui/static/gui/src/app/components/payment/charges/charges.js
+++ b/jujugui/static/gui/src/app/components/payment/charges/charges.js
@@ -81,7 +81,8 @@ class PaymentCharges extends React.Component {
     }
     const items = lineItems.map((item, i) => {
       return (
-        <li className="user-profile__list-row twelve-col"
+        <li
+          className="user-profile__list-row twelve-col"
           key={item.name + i}>
           <div className="three-col no-margin-bottom">
             {item.name}
diff --git a/jujugui/static/gui/src/app/components/payment/charges/receipt-popup/receipt-popup.js b/jujugui/static/gui/src/app/components/payment/charges/receipt-popup/receipt-popup.js
index f6eadb3d71..db7b27e65a 100644
--- a/jujugui/static/gui/src/app/components/payment/charges/receipt-popup/receipt-popup.js
+++ b/jujugui/static/gui/src/app/components/payment/charges/receipt-popup/receipt-popup.js
@@ -60,7 +60,8 @@ class ReceiptPopup extends React.Component {
     } else {
       content = (
         <div className="receipt-popup__container">
-          <iframe height="100%"
+          <iframe
+            height="100%"
             src={
               `data:text/html;charset=utf-8,${encodeURIComponent(receipt)}`}
             width="100%">
diff --git a/jujugui/static/gui/src/app/components/payment/charges/test-charges.js b/jujugui/static/gui/src/app/components/payment/charges/test-charges.js
index b644f6e2cf..458da4e602 100644
--- a/jujugui/static/gui/src/app/components/payment/charges/test-charges.js
+++ b/jujugui/static/gui/src/app/components/payment/charges/test-charges.js
@@ -127,7 +127,8 @@ describe('PaymentCharges', function() {
                         Price
                       </div>
                     </li>
-                    <li className="user-profile__list-row twelve-col"
+                    <li
+                      className="user-profile__list-row twelve-col"
                       key="this is line 10">
                       <div className="three-col no-margin-bottom">
                         this is line 1
diff --git a/jujugui/static/gui/src/app/components/payment/methods/card/card.js b/jujugui/static/gui/src/app/components/payment/methods/card/card.js
index 64ee9f0a38..d701ee8ebe 100644
--- a/jujugui/static/gui/src/app/components/payment/methods/card/card.js
+++ b/jujugui/static/gui/src/app/components/payment/methods/card/card.js
@@ -106,7 +106,8 @@ class PaymentMethodCard extends React.Component {
     return (
       <div className="payment-card">
         <div className="five-col">
-          <div className={cardClasses}
+          <div
+            className={cardClasses}
             onClick={this._handleCardClick.bind(this)}>
             <div className="payment-card-container">
               <div className="payment-card-front">
diff --git a/jujugui/static/gui/src/app/components/payment/methods/card/test-card.js b/jujugui/static/gui/src/app/components/payment/methods/card/test-card.js
index f160f68191..eeae282b15 100644
--- a/jujugui/static/gui/src/app/components/payment/methods/card/test-card.js
+++ b/jujugui/static/gui/src/app/components/payment/methods/card/test-card.js
@@ -47,7 +47,8 @@ describe('PaymentMethodCard', () => {
     const expected = (
       <div className="payment-card">
         <div className="five-col">
-          <div className="payment-card-wrapper"
+          <div
+            className="payment-card-wrapper"
             onClick={wrapper.find('.payment-card-wrapper').prop('onClick')}>
             <div className="payment-card-container">
               <div className="payment-card-front">
diff --git a/jujugui/static/gui/src/app/components/payment/methods/methods.js b/jujugui/static/gui/src/app/components/payment/methods/methods.js
index f75ff9cad3..10d4d1d945 100644
--- a/jujugui/static/gui/src/app/components/payment/methods/methods.js
+++ b/jujugui/static/gui/src/app/components/payment/methods/methods.js
@@ -200,7 +200,8 @@ class PaymentMethods extends React.Component {
               createCardElement={this.props.stripe.createCardElement}
               ref="cardForm" />
             <label htmlFor="cardAddressSame">
-              <input checked={this.state.cardAddressSame}
+              <input
+                checked={this.state.cardAddressSame}
                 className="payment-methods__form-checkbox"
                 id="cardAddressSame"
                 name="cardAddressSame"
diff --git a/jujugui/static/gui/src/app/components/payment/methods/test-methods.js b/jujugui/static/gui/src/app/components/payment/methods/test-methods.js
index 834a6d2f29..85b5a0fb72 100644
--- a/jujugui/static/gui/src/app/components/payment/methods/test-methods.js
+++ b/jujugui/static/gui/src/app/components/payment/methods/test-methods.js
@@ -133,7 +133,8 @@ describe('PaymentMethods', () => {
             createCardElement={sinon.stub()}
             ref="cardForm" />
           <label htmlFor="cardAddressSame">
-            <input checked={true}
+            <input
+              checked={true}
               className="payment-methods__form-checkbox"
               id="cardAddressSame"
               name="cardAddressSame"
diff --git a/jujugui/static/gui/src/app/components/post-deployment/post-deployment.js b/jujugui/static/gui/src/app/components/post-deployment/post-deployment.js
index b0b5e1f6e5..72583fab59 100644
--- a/jujugui/static/gui/src/app/components/post-deployment/post-deployment.js
+++ b/jujugui/static/gui/src/app/components/post-deployment/post-deployment.js
@@ -267,12 +267,17 @@ class PostDeployment extends React.Component {
         extraClasses={classes.join(' ')}
         instanceName="post-deployment"
         visible={true}>
-        <span className="close" onClick={this._closePostDeployment.bind(this)} role="button"
+        <span
+          className="close"
+          onClick={this._closePostDeployment.bind(this)}
+          role="button"
           tabIndex="0">
-          <SvgIcon name="close_16"
+          <SvgIcon
+            name="close_16"
             size="16" />
         </span>
-        <div dangerouslySetInnerHTML={{__html: content}}
+        <div
+          dangerouslySetInnerHTML={{__html: content}}
           onClick={this._handleContentClick.bind(this)} />
         {this._renderPostDeploymentScriptButton()}
       </Panel>
diff --git a/jujugui/static/gui/src/app/components/post-deployment/test-post-deployment.js b/jujugui/static/gui/src/app/components/post-deployment/test-post-deployment.js
index e23d4beab7..35b553b7e3 100644
--- a/jujugui/static/gui/src/app/components/post-deployment/test-post-deployment.js
+++ b/jujugui/static/gui/src/app/components/post-deployment/test-post-deployment.js
@@ -32,12 +32,13 @@ describe('PostDeployment', () => {
       'content', null, '<h1>Test Name</h1><p>{details_link}{requires_cli_link}</p>');
     wrapper.update();
     const expected = (
-      <div dangerouslySetInnerHTML={
-        {
-          __html: '<h1>Test Name</h1><p>{details_link}{requires_cli_link}</p>'
+      <div
+        dangerouslySetInnerHTML={
+          {
+            __html: '<h1>Test Name</h1><p>{details_link}{requires_cli_link}</p>'
+          }
         }
-      }
-      onClick={wrapper.find('div').prop('onClick')} />
+        onClick={wrapper.find('div').prop('onClick')} />
     );
     assert.compareJSX(wrapper.find('div'), expected);
   });
diff --git a/jujugui/static/gui/src/app/components/profile/bundle-list/bundle-list.js b/jujugui/static/gui/src/app/components/profile/bundle-list/bundle-list.js
index 5def630a9f..ffce3568d7 100644
--- a/jujugui/static/gui/src/app/components/profile/bundle-list/bundle-list.js
+++ b/jujugui/static/gui/src/app/components/profile/bundle-list/bundle-list.js
@@ -139,7 +139,8 @@ class ProfileBundleList extends React.Component {
             {this._generateTitle()}
             <p className="profile-bundle-list__onboarding">
               Learn about&nbsp;
-              <a href="https://jujucharms.com/docs/stable/charms-bundles#creating-a-bundle"
+              <a
+                href="https://jujucharms.com/docs/stable/charms-bundles#creating-a-bundle"
                 target="_blank">
                 writing your own bundle
               </a>.
diff --git a/jujugui/static/gui/src/app/components/profile/bundle-list/test-bundle-list.js b/jujugui/static/gui/src/app/components/profile/bundle-list/test-bundle-list.js
index ae3ea4cc1b..39e00ef32c 100644
--- a/jujugui/static/gui/src/app/components/profile/bundle-list/test-bundle-list.js
+++ b/jujugui/static/gui/src/app/components/profile/bundle-list/test-bundle-list.js
@@ -285,7 +285,8 @@ describe('Profile Bundle List', function() {
     const expected = (
       <p className="profile-bundle-list__onboarding">
         Learn about&nbsp;
-        <a href="https://jujucharms.com/docs/stable/charms-bundles#creating-a-bundle"
+        <a
+          href="https://jujucharms.com/docs/stable/charms-bundles#creating-a-bundle"
           target="_blank">
           writing your own bundle
         </a>.
diff --git a/jujugui/static/gui/src/app/components/profile/charm-list/charm-list.js b/jujugui/static/gui/src/app/components/profile/charm-list/charm-list.js
index cc15da1cf5..3aeb0dfd8d 100644
--- a/jujugui/static/gui/src/app/components/profile/charm-list/charm-list.js
+++ b/jujugui/static/gui/src/app/components/profile/charm-list/charm-list.js
@@ -116,7 +116,8 @@ class ProfileCharmList extends React.Component {
       return null;
     }
     const tagList = tags.map((tag, i) => (
-      <li className="link profile-charm-list__tag"
+      <li
+        className="link profile-charm-list__tag"
         key={tag + i}
         onClick={this._handleTagClick.bind(this, tag)}
         role="button"
@@ -180,7 +181,8 @@ class ProfileCharmList extends React.Component {
             {this._generateTitle()}
             <p className="profile-charm-list__onboarding">
               Learn about&nbsp;
-              <a href="https://jujucharms.com/docs/stable/developer-getting-started"
+              <a
+                href="https://jujucharms.com/docs/stable/developer-getting-started"
                 target="_blank">
                 writing your own charm
               </a>.
@@ -196,7 +198,8 @@ class ProfileCharmList extends React.Component {
         const version = `#${url.revision}`;
         const series = charm.series.join(', ');
         const icon = (
-          <img className="profile-charm-list__icon"
+          <img
+            className="profile-charm-list__icon"
             key="img"
             src={src}
             title={charm.name} />);
@@ -209,7 +212,8 @@ class ProfileCharmList extends React.Component {
                     {icon}
                   </div>
                   <div>
-                    <a href={`${this.props.baseURL}${path}`}
+                    <a
+                      href={`${this.props.baseURL}${path}`}
                       key="link"
                       onClick={this._navigateToCharm.bind(this, path)}>
                       {charm.name}
@@ -238,7 +242,8 @@ class ProfileCharmList extends React.Component {
                 <div>
                   <div className="six-col profile-expanded-content__top-row">
                     {icon}
-                    <a href={`${this.props.baseURL}${path}`}
+                    <a
+                      href={`${this.props.baseURL}${path}`}
                       key="link"
                       onClick={this._navigateToCharm.bind(this, path)}>
                       {charm.name}
diff --git a/jujugui/static/gui/src/app/components/profile/charm-list/test-charm-list.js b/jujugui/static/gui/src/app/components/profile/charm-list/test-charm-list.js
index 071595461d..6f35f1afd9 100644
--- a/jujugui/static/gui/src/app/components/profile/charm-list/test-charm-list.js
+++ b/jujugui/static/gui/src/app/components/profile/charm-list/test-charm-list.js
@@ -107,12 +107,14 @@ describe('Profile Charm List', function() {
                   <div>
                     <div className="profile-charm-list__item">
                       <div>
-                        <img className="profile-charm-list__icon"
+                        <img
+                          className="profile-charm-list__icon"
                           src="/charmstore/~hatch/precise/failtester-7/icon.svg"
                           title="failtester" />
                       </div>
                       <div>
-                        <a href="/gui/u/hatch/failtester/precise/7"
+                        <a
+                          href="/gui/u/hatch/failtester/precise/7"
                           onClick={sinon.stub()}>
                           failtester
                         </a>
@@ -138,10 +140,12 @@ describe('Profile Charm List', function() {
                   topRow={(
                     <div>
                       <div className="six-col profile-expanded-content__top-row">
-                        <img className="profile-charm-list__icon"
+                        <img
+                          className="profile-charm-list__icon"
                           src="/charmstore/~hatch/precise/failtester-7/icon.svg"
                           title="failtester" />
-                        <a href="/gui/u/hatch/failtester/precise/7"
+                        <a
+                          href="/gui/u/hatch/failtester/precise/7"
                           onClick={sinon.stub()}>
                           failtester
                         </a>
@@ -161,23 +165,27 @@ describe('Profile Charm List', function() {
                   <div>
                     <div className="profile-charm-list__item">
                       <div>
-                        <img className="profile-charm-list__icon"
+                        <img
+                          className="profile-charm-list__icon"
                           src="/charmstore/~hatch/xenial/ghost-3/icon.svg"
                           title="ghost" />
                       </div>
                       <div>
-                        <a href="/gui/u/hatch/ghost/xenial/3"
+                        <a
+                          href="/gui/u/hatch/ghost/xenial/3"
                           onClick={sinon.stub()}>
                           ghost
                         </a>
                         <ul className="profile-charm-list__tags">
-                          <li className="link profile-charm-list__tag"
+                          <li
+                            className="link profile-charm-list__tag"
                             onClick={sinon.stub()}
                             role="button"
                             tabIndex="0">
                             misc
                           </li>
-                          <li className="link profile-charm-list__tag"
+                          <li
+                            className="link profile-charm-list__tag"
                             onClick={sinon.stub()}
                             role="button"
                             tabIndex="0">
@@ -206,10 +214,12 @@ describe('Profile Charm List', function() {
                   topRow={(
                     <div>
                       <div className="six-col profile-expanded-content__top-row">
-                        <img className="profile-charm-list__icon"
+                        <img
+                          className="profile-charm-list__icon"
                           src="/charmstore/~hatch/xenial/ghost-3/icon.svg"
                           title="ghost" />
-                        <a href="/gui/u/hatch/ghost/xenial/3"
+                        <a
+                          href="/gui/u/hatch/ghost/xenial/3"
                           onClick={sinon.stub()}>
                           ghost
                         </a>
@@ -229,12 +239,14 @@ describe('Profile Charm List', function() {
                   <div>
                     <div className="profile-charm-list__item">
                       <div>
-                        <img className="profile-charm-list__icon"
+                        <img
+                          className="profile-charm-list__icon"
                           src="/charmstore/~hatch/privghost-1/icon.svg"
                           title="privghost" />
                       </div>
                       <div>
-                        <a href="/gui/u/hatch/privghost/1"
+                        <a
+                          href="/gui/u/hatch/privghost/1"
                           onClick={sinon.stub()}>
                           privghost
                         </a>
@@ -260,10 +272,12 @@ describe('Profile Charm List', function() {
                   topRow={(
                     <div>
                       <div className="six-col profile-expanded-content__top-row">
-                        <img className="profile-charm-list__icon"
+                        <img
+                          className="profile-charm-list__icon"
                           src="/charmstore/~hatch/privghost-1/icon.svg"
                           title="privghost" />
-                        <a href="/gui/u/hatch/privghost/1"
+                        <a
+                          href="/gui/u/hatch/privghost/1"
                           onClick={sinon.stub()}>
                           privghost
                         </a>
@@ -291,7 +305,8 @@ describe('Profile Charm List', function() {
     const expected = (
       <p className="profile-charm-list__onboarding">
         Learn about&nbsp;
-        <a href="https://jujucharms.com/docs/stable/developer-getting-started"
+        <a
+          href="https://jujucharms.com/docs/stable/developer-getting-started"
           target="_blank">
           writing your own charm
         </a>.
diff --git a/jujugui/static/gui/src/app/components/profile/charmstore-login/charmstore-login.js b/jujugui/static/gui/src/app/components/profile/charmstore-login/charmstore-login.js
index 1189a3f97e..71881b1bfe 100644
--- a/jujugui/static/gui/src/app/components/profile/charmstore-login/charmstore-login.js
+++ b/jujugui/static/gui/src/app/components/profile/charmstore-login/charmstore-login.js
@@ -56,14 +56,16 @@ class ProfileCharmstoreLogin extends React.Component {
         </h2>
         <p className="profile-charmstore-login__notice">
           You must&nbsp;
-          <span className="link"
+          <span
+            className="link"
             onClick={this._interactiveLogin.bind(this)}
             role="button"
             tabIndex="0">
             login
           </span>&nbsp;
           to the&nbsp;
-          <span className="link"
+          <span
+            className="link"
             onClick={this._openStore.bind(this)}
             role="button"
             tabIndex="0">
diff --git a/jujugui/static/gui/src/app/components/profile/charmstore-login/test-charmstore-login.js b/jujugui/static/gui/src/app/components/profile/charmstore-login/test-charmstore-login.js
index b6fdb1f67f..e37c1b1b1b 100644
--- a/jujugui/static/gui/src/app/components/profile/charmstore-login/test-charmstore-login.js
+++ b/jujugui/static/gui/src/app/components/profile/charmstore-login/test-charmstore-login.js
@@ -37,14 +37,16 @@ describe('ProfileCharmstoreLogin ', function() {
         </h2>
         <p className="profile-charmstore-login__notice">
           You must&nbsp;
-          <span className="link"
+          <span
+            className="link"
             onClick={links.at(0).prop('onClick')}
             role="button"
             tabIndex="0">
             login
           </span>&nbsp;
           to the&nbsp;
-          <span className="link"
+          <span
+            className="link"
             onClick={links.at(1).prop('onClick')}
             role="button"
             tabIndex="0">
diff --git a/jujugui/static/gui/src/app/components/profile/expanded-content/expanded-content.js b/jujugui/static/gui/src/app/components/profile/expanded-content/expanded-content.js
index aee9b01efa..b27018e2cc 100644
--- a/jujugui/static/gui/src/app/components/profile/expanded-content/expanded-content.js
+++ b/jujugui/static/gui/src/app/components/profile/expanded-content/expanded-content.js
@@ -56,7 +56,8 @@ class ProfileExpandedContent extends React.Component {
         content = username;
       } else {
         content = (
-          <Link changeState={this.props.changeState}
+          <Link
+            changeState={this.props.changeState}
             clickState={{
               hash: null,
               profile: username
@@ -66,14 +67,16 @@ class ProfileExpandedContent extends React.Component {
           </Link>);
       }
       return (
-        <li className="profile-expanded-content__permission"
+        <li
+          className="profile-expanded-content__permission"
           key={username + i}>
           {content}
         </li>);
     });
     if (items.length === 0) {
       items = (
-        <li className="profile-expanded-content__permission"
+        <li
+          className="profile-expanded-content__permission"
           key="none">
           None
         </li>);
@@ -104,7 +107,8 @@ class ProfileExpandedContent extends React.Component {
         <div className="six-col last-col">
           {entity.bugUrl ? (
             <div>
-              <a href={entity.bugUrl}
+              <a
+                href={entity.bugUrl}
                 onClick={this._stopPropagation.bind(this)}
                 target="_blank">
                 Bugs
@@ -112,7 +116,8 @@ class ProfileExpandedContent extends React.Component {
             </div>) : null}
           {entity.homepage ? (
             <div>
-              <a href={entity.homepage}
+              <a
+                href={entity.homepage}
                 onClick={this._stopPropagation.bind(this)}
                 target="_blank">
                 Homepage
diff --git a/jujugui/static/gui/src/app/components/profile/expanded-content/test-expanded-content.js b/jujugui/static/gui/src/app/components/profile/expanded-content/test-expanded-content.js
index b7e60d1b15..68d904364f 100644
--- a/jujugui/static/gui/src/app/components/profile/expanded-content/test-expanded-content.js
+++ b/jujugui/static/gui/src/app/components/profile/expanded-content/test-expanded-content.js
@@ -94,14 +94,16 @@ describe('Profile expanded content', function() {
         </div>
         <div className="six-col last-col">
           <div>
-            <a href="example.com/bugs"
+            <a
+              href="example.com/bugs"
               onClick={wrapper.find('a').at(0).prop('onClick')}
               target="_blank">
               Bugs
             </a>
           </div>
           <div>
-            <a href="example.com/"
+            <a
+              href="example.com/"
               onClick={wrapper.find('a').at(1).prop('onClick')}
               target="_blank">
               Homepage
@@ -111,9 +113,11 @@ describe('Profile expanded content', function() {
             Writeable:
           </p>
           <ul className="profile-expanded-content__permissions">
-            <li className="profile-expanded-content__permission"
+            <li
+              className="profile-expanded-content__permission"
               key="lazypower">
-              <Link changeState={sinon.stub()}
+              <Link
+                changeState={sinon.stub()}
                 clickState={{
                   hash: null,
                   profile: 'lazypower'
@@ -159,14 +163,16 @@ describe('Profile expanded content', function() {
         </div>
         <div className="six-col last-col">
           <div>
-            <a href="example.com/bugs"
+            <a
+              href="example.com/bugs"
               onClick={wrapper.find('a').at(0).prop('onClick')}
               target="_blank">
               Bugs
             </a>
           </div>
           <div>
-            <a href="example.com/"
+            <a
+              href="example.com/"
               onClick={wrapper.find('a').at(1).prop('onClick')}
               target="_blank">
               Homepage
@@ -176,9 +182,11 @@ describe('Profile expanded content', function() {
             Writeable:
           </p>
           <ul className="profile-expanded-content__permissions">
-            <li className="profile-expanded-content__permission"
+            <li
+              className="profile-expanded-content__permission"
               key="hatch">
-              <Link changeState={sinon.stub()}
+              <Link
+                changeState={sinon.stub()}
                 clickState={{
                   hash: null,
                   profile: 'hatch'
@@ -195,9 +203,11 @@ describe('Profile expanded content', function() {
             <li className="profile-expanded-content__permission">
               everyone
             </li>
-            <li className="profile-expanded-content__permission"
+            <li
+              className="profile-expanded-content__permission"
               key="hatch">
-              <Link changeState={sinon.stub()}
+              <Link
+                changeState={sinon.stub()}
                 clickState={{
                   hash: null,
                   profile: 'hatch'
diff --git a/jujugui/static/gui/src/app/components/profile/header/header.js b/jujugui/static/gui/src/app/components/profile/header/header.js
index 4f940763ad..07dfa9287b 100644
--- a/jujugui/static/gui/src/app/components/profile/header/header.js
+++ b/jujugui/static/gui/src/app/components/profile/header/header.js
@@ -77,7 +77,8 @@ class ProfileHeader extends React.Component {
       'profile-header__avatar--hidden': !this.state.userRequested
     });
     const tooltip = isCurrent ? (
-      <span className="p-tooltip__message"
+      <span
+        className="p-tooltip__message"
         id="tp-cntr"
         role="tooltip">
         Edit your Gravatar
@@ -113,30 +114,35 @@ class ProfileHeader extends React.Component {
     let items;
     if (this.props.gisf) {
       items = [
-        <li className="p-list__item"
+        <li
+          className="p-list__item"
           key="controller">
           <h2>
             <a href="/">jaas</a>
           </h2>
           <hr />
         </li>,
-        <li className="p-list__item"
+        <li
+          className="p-list__item"
           key="home">
           <a href="https://jujucharms.com/home">Home</a>
         </li>,
-        <li className="p-list__item"
+        <li
+          className="p-list__item"
           key="aboutjaas">
           <a href="https://jujucharms.com/jaas">About JAAS</a>
         </li>
       ];
     } else {
       items = [
-        <li className="p-list__item"
+        <li
+          className="p-list__item"
           key="controller">
           <h2>{this.props.controllerIP}</h2>
           <hr />
         </li>,
-        <li className="p-list__item"
+        <li
+          className="p-list__item"
           key="home">
           <a href="https://jujucharms.com/about">Juju Home</a>
         </li>
@@ -170,7 +176,8 @@ class ProfileHeader extends React.Component {
                 onClick={this._handleClose.bind(this)}
                 role="button"
                 tabIndex="0">
-                <SvgIcon name="close_16"
+                <SvgIcon
+                  name="close_16"
                   size="20" />
               </div>
             </div>
diff --git a/jujugui/static/gui/src/app/components/profile/header/test-header.js b/jujugui/static/gui/src/app/components/profile/header/test-header.js
index 8978831c8f..4e2152dcbd 100644
--- a/jujugui/static/gui/src/app/components/profile/header/test-header.js
+++ b/jujugui/static/gui/src/app/components/profile/header/test-header.js
@@ -51,12 +51,14 @@ describe('Profile Header', function() {
     const wrapper = renderComponent({ gisf: false });
     const expected = (
       <ul className="p-list ts-profile-header__menu">
-        <li className="p-list__item"
+        <li
+          className="p-list__item"
           key="controller">
           <h2>1.2.3.4</h2>
           <hr />
         </li>
-        <li className="p-list__item"
+        <li
+          className="p-list__item"
           key="home">
           <a href="https://jujucharms.com/about">Juju Home</a>
         </li>
diff --git a/jujugui/static/gui/src/app/components/profile/model-list/model-list.js b/jujugui/static/gui/src/app/components/profile/model-list/model-list.js
index cce4a95db9..d2860ce8ec 100644
--- a/jujugui/static/gui/src/app/components/profile/model-list/model-list.js
+++ b/jujugui/static/gui/src/app/components/profile/model-list/model-list.js
@@ -183,7 +183,8 @@ class ProfileModelList extends React.Component {
       const username = owner === profileUsername ? 'Me' : owner;
       const region = model.region ? '/' + model.region : '';
       const nameContent = (
-        <a href={path}
+        <a
+          href={path}
           onClick={this.switchToModel.bind(this, {
             name: model.name,
             id: model.id,
@@ -223,7 +224,8 @@ class ProfileModelList extends React.Component {
       if (owner === profileUsername) {
         expandedContent = (
           <div className="three-col prepend-five profile-model-list__credential-name">
-            <span className="link"
+            <span
+              className="link"
               onClick={this._handleCredentialClick.bind(this, model.credential)}
               role="button"
               tabIndex="0">
diff --git a/jujugui/static/gui/src/app/components/profile/model-list/test-model-list.js b/jujugui/static/gui/src/app/components/profile/model-list/test-model-list.js
index 92d71151b8..ac70900c9a 100644
--- a/jujugui/static/gui/src/app/components/profile/model-list/test-model-list.js
+++ b/jujugui/static/gui/src/app/components/profile/model-list/test-model-list.js
@@ -209,7 +209,8 @@ describe('Profile Model List', function() {
           rows={[{
             columns: [{
               content: (
-                <a href="/gui/u/tester/mymodel"
+                <a
+                  href="/gui/u/tester/mymodel"
                   onClick={sinon.stub()}>
                   mymodel
                 </a>),
@@ -248,7 +249,8 @@ describe('Profile Model List', function() {
             }, {
               content: (
                 <a onClick={sinon.stub()}>
-                  <SvgIcon name="delete_16"
+                  <SvgIcon
+                    name="delete_16"
                     size="16" />
                 </a>),
               columnSize: 1,
@@ -257,7 +259,8 @@ describe('Profile Model List', function() {
             expandedContent: (
               <div className="profile-model-list__expanded-content">
                 <div className="three-col">
-                  <a href="/gui/u/tester/mymodel"
+                  <a
+                    href="/gui/u/tester/mymodel"
                     onClick={sinon.stub()}>
                       mymodel
                   </a>
@@ -298,7 +301,8 @@ describe('Profile Model List', function() {
                   </a>
                 </div>
                 <div className="three-col prepend-five profile-model-list__credential-name">
-                  <span className="link"
+                  <span
+                    className="link"
                     onClick={sinon.stub()}
                     role="button"
                     tabIndex="0">
@@ -310,7 +314,8 @@ describe('Profile Model List', function() {
           }, {
             columns: [{
               content: (
-                <a href="/gui/u/tester/mymodel2"
+                <a
+                  href="/gui/u/tester/mymodel2"
                   onClick={sinon.stub()}>
                   mymodel2
                 </a>),
@@ -349,7 +354,8 @@ describe('Profile Model List', function() {
             }, {
               content: (
                 <a onClick={sinon.stub()}>
-                  <SvgIcon name="delete_16"
+                  <SvgIcon
+                    name="delete_16"
                     size="16" />
                 </a>),
               columnSize: 1,
@@ -358,7 +364,8 @@ describe('Profile Model List', function() {
             expandedContent: (
               <div className="profile-model-list__expanded-content">
                 <div className="three-col">
-                  <a href="/gui/u/tester/mymodel2"
+                  <a
+                    href="/gui/u/tester/mymodel2"
                     onClick={sinon.stub()}>
                       mymodel2
                   </a>
@@ -399,7 +406,8 @@ describe('Profile Model List', function() {
                   </a>
                 </div>
                 <div className="three-col prepend-five profile-model-list__credential-name">
-                  <span className="link"
+                  <span
+                    className="link"
                     onClick={sinon.stub()}
                     role="button"
                     tabIndex="0">
@@ -411,7 +419,8 @@ describe('Profile Model List', function() {
           }, {
             columns: [{
               content: (
-                <a href="/gui/u/tester2/test-db"
+                <a
+                  href="/gui/u/tester2/test-db"
                   onClick={sinon.stub()}>
                   test-db
                 </a>),
@@ -455,7 +464,8 @@ describe('Profile Model List', function() {
             expandedContent: (
               <div className="profile-model-list__expanded-content">
                 <div className="three-col">
-                  <a href="/gui/u/tester2/test-db"
+                  <a
+                    href="/gui/u/tester2/test-db"
                     onClick={sinon.stub()}>
                       test-db
                   </a>
@@ -498,7 +508,8 @@ describe('Profile Model List', function() {
           }, {
             columns: [{
               content: (
-                <a href="/gui/u/tester3/website"
+                <a
+                  href="/gui/u/tester3/website"
                   onClick={sinon.stub()}>
                   website
                 </a>),
@@ -537,7 +548,8 @@ describe('Profile Model List', function() {
             }, {
               content: (
                 <a onClick={sinon.stub()}>
-                  <SvgIcon name="delete_16"
+                  <SvgIcon
+                    name="delete_16"
                     size="16" />
                 </a>),
               columnSize: 1,
@@ -546,7 +558,8 @@ describe('Profile Model List', function() {
             expandedContent: (
               <div className="profile-model-list__expanded-content">
                 <div className="three-col">
-                  <a href="/gui/u/tester3/website"
+                  <a
+                    href="/gui/u/tester3/website"
                     onClick={sinon.stub()}>
                       website
                   </a>
diff --git a/jujugui/static/gui/src/app/components/profile/profile.js b/jujugui/static/gui/src/app/components/profile/profile.js
index 965b495aba..d3478d2b73 100644
--- a/jujugui/static/gui/src/app/components/profile/profile.js
+++ b/jujugui/static/gui/src/app/components/profile/profile.js
@@ -53,7 +53,8 @@ class Profile extends React.Component {
 
     if (profileUrl.full === 'revenue-statement') {
       return (
-        <Panel instanceName="revenue-statement"
+        <Panel
+          instanceName="revenue-statement"
           visible={true}>
           <RevenueStatement />
         </Panel>
@@ -62,7 +63,8 @@ class Profile extends React.Component {
 
     if (sectionInfo.active === 'invoices' && sectionInfo.sub !== null) {
       return (
-        <Panel instanceName="invoice"
+        <Panel
+          instanceName="invoice"
           visible={true}>
           <Invoice />
         </Panel>
@@ -165,14 +167,16 @@ class Profile extends React.Component {
       sectionsMap.set('invoices', {
         label: 'Invoices',
         getComponent: () => {
-          return (<ProfileInvoiceList baseURL={props.baseURL}
+          return (<ProfileInvoiceList
+            baseURL={props.baseURL}
             user={props.userInfo.external} />);
         }
       });
       sectionsMap.set('revenue-statement', {
         label: 'Revenue Statements',
         getComponent: () => {
-          return (<ProfileInvoiceList baseURL={props.baseURL}
+          return (<ProfileInvoiceList
+            baseURL={props.baseURL}
             user={props.userInfo.external} />);
         }
       });
@@ -188,7 +192,8 @@ class Profile extends React.Component {
     }
 
     return (
-      <Panel instanceName="profile"
+      <Panel
+        instanceName="profile"
         visible={true}>
         <ProfileHeader
           changeState={props.changeState}
diff --git a/jujugui/static/gui/src/app/components/relation-menu/ambiguous-relation-menu.js b/jujugui/static/gui/src/app/components/relation-menu/ambiguous-relation-menu.js
index 2c38850390..f46ccebea3 100644
--- a/jujugui/static/gui/src/app/components/relation-menu/ambiguous-relation-menu.js
+++ b/jujugui/static/gui/src/app/components/relation-menu/ambiguous-relation-menu.js
@@ -38,7 +38,8 @@ const AmbiguousRelationMenu = function(props) {
         {_generateRelations(props.endpoints)}
       </ul>
       <div className="cancel link" role="button" tabIndex="0">
-        <SvgIcon name="close_16"
+        <SvgIcon
+          name="close_16"
           size="16" />
       </div>
     </div>
diff --git a/jujugui/static/gui/src/app/components/relation-menu/relation-menu.js b/jujugui/static/gui/src/app/components/relation-menu/relation-menu.js
index 4b71b1f9c5..92012c2be6 100644
--- a/jujugui/static/gui/src/app/components/relation-menu/relation-menu.js
+++ b/jujugui/static/gui/src/app/components/relation-menu/relation-menu.js
@@ -71,21 +71,25 @@ const RelationMenu = function(props) {
       var targetClasses = 'inspect-relation endpoint ' + (
         relation.targetHasError() ? 'error' : '');
       components.push(
-        <li className={relationClasses}
+        <li
+          className={relationClasses}
           data-relationid={relation.id}
           key={relation.id}>
           {_generateIcon(relation)}
-          <span className={sourceClasses}
+          <span
+            className={sourceClasses}
             data-endpoint={relation.sourceId}>
             {_getRealServiceName(relation.sourceId, relation)}
           </span>
           {' '}-{' '}
-          <span className={targetClasses}
+          <span
+            className={targetClasses}
             data-endpoint={relation.targetId}>
             {_getRealServiceName(relation.targetId, relation)}
           </span>
           <span className="relation-remove link">
-            <SvgIcon name="delete_16"
+            <SvgIcon
+              name="delete_16"
               size="16" />
           </span>
         </li>);
diff --git a/jujugui/static/gui/src/app/components/search-results/item/item.js b/jujugui/static/gui/src/app/components/search-results/item/item.js
index 80aa3fbde1..86035b0338 100644
--- a/jujugui/static/gui/src/app/components/search-results/item/item.js
+++ b/jujugui/static/gui/src/app/components/search-results/item/item.js
@@ -40,9 +40,11 @@ class SearchResultsItem extends React.Component {
     }
     tags.forEach(function(tag, i) {
       components.push(
-        <li className="tag-list--item"
+        <li
+          className="tag-list--item"
           key={tag + i}>
-          <a className="list-block__list--item-link"
+          <a
+            className="list-block__list--item-link"
             href={this.props.generatePath({search: {tags: tag}})}
             onClick={this._handleTagClick.bind(this, tag)}>
             {tag}
@@ -69,9 +71,11 @@ class SearchResultsItem extends React.Component {
     }
     series.forEach(function(s) {
       components.push(
-        <li className="list-series__item"
+        <li
+          className="list-series__item"
           key={s.name}>
-          <a className="list-block__list--item-link"
+          <a
+            className="list-block__list--item-link"
             href={this._generateStoreURL(s.storeId)}
             onClick={this._handleItemClick.bind(this, s.storeId)}>
             {s.name}
@@ -227,7 +231,8 @@ class SearchResultsItem extends React.Component {
     var item = this.props.item;
     return (
       <li className={'list-block__list--item ' + item.type}>
-        <a className="list-block__list--item-main-link"
+        <a
+          className="list-block__list--item-main-link"
           href={this._generateStoreURL(item.id)}
           onClick={this._handleItemClick.bind(this, item.id)}></a>
         <div className="four-col charm-name__column">
@@ -253,7 +258,8 @@ class SearchResultsItem extends React.Component {
         <div className="two-col owner__column list-block__column">
           <p className="cell">
             {'By '}
-            <a className="list-block__list--item-link"
+            <a
+              className="list-block__list--item-link"
               href={
                 this.props.generatePath({search: null, profile: item.owner})}
               onClick={this._handleOwnerClick.bind(this, item.owner)}
diff --git a/jujugui/static/gui/src/app/components/search-results/item/test-item.js b/jujugui/static/gui/src/app/components/search-results/item/test-item.js
index b3ba5dd164..bfacfe58d3 100644
--- a/jujugui/static/gui/src/app/components/search-results/item/test-item.js
+++ b/jujugui/static/gui/src/app/components/search-results/item/test-item.js
@@ -49,7 +49,8 @@ describe('SearchResultsItem', function() {
     const seriesLinks = wrapper.find('.list-series__item a');
     var expected = (
       <li className="list-block__list--item charm">
-        <a className="list-block__list--item-main-link"
+        <a
+          className="list-block__list--item-main-link"
           href="/u/spinach/apache2"
           onClick={
             wrapper.find('.list-block__list--item-main-link').prop('onClick')}></a>
@@ -60,14 +61,16 @@ describe('SearchResultsItem', function() {
           </h3>
           <ul className="tag-list">
             <li className="tag-list--item">
-              <a className="list-block__list--item-link"
+              <a
+                className="list-block__list--item-link"
                 href="/u/spinach/apache2"
                 onClick={tagLinks.at(0).prop('onClick')}>
                 tag1
               </a>
             </li>
             <li className="tag-list--item">
-              <a className="list-block__list--item-link"
+              <a
+                className="list-block__list--item-link"
                 href="/u/spinach/apache2"
                 onClick={tagLinks.at(1).prop('onClick')}>
                 tag2
@@ -78,15 +81,19 @@ describe('SearchResultsItem', function() {
         <div className="series__column four-col">
           <ul className="list-series">
             {[
-              <li className="list-series__item"
+              <li
+                className="list-series__item"
                 key="vivid">
-                <a className="list-block__list--item-link"
+                <a
+                  className="list-block__list--item-link"
                   href="/u/spinach/apache2"
                   onClick={seriesLinks.at(0).prop('onClick')}>vivid</a>
               </li>,
-              <li className="list-series__item"
+              <li
+                className="list-series__item"
                 key="wily">
-                <a className="list-block__list--item-link"
+                <a
+                  className="list-block__list--item-link"
                   href="/u/spinach/apache2"
                   onClick={seriesLinks.at(1).prop('onClick')}>wily</a>
               </li>
@@ -102,7 +109,8 @@ describe('SearchResultsItem', function() {
         <div className="two-col owner__column list-block__column">
           <p className="cell">
             {'By '}
-            <a className="list-block__list--item-link"
+            <a
+              className="list-block__list--item-link"
               href="/u/spinach/apache2"
               onClick={wrapper.find('.owner__column a').prop('onClick')}
               title="See other charms and bundles by test-owner">
diff --git a/jujugui/static/gui/src/app/components/search-results/search-results.js b/jujugui/static/gui/src/app/components/search-results/search-results.js
index d1ea20308c..78a04ec229 100644
--- a/jujugui/static/gui/src/app/components/search-results/search-results.js
+++ b/jujugui/static/gui/src/app/components/search-results/search-results.js
@@ -399,7 +399,8 @@ class SearchResults extends React.Component {
                   http://jujucharms.com
                 </a>
                 {' '}or go{' '}
-                <span className="link"
+                <span
+                  className="link"
                   onClick={this._handleBack.bind(this)}>
                   back
                 </span>.
diff --git a/jujugui/static/gui/src/app/components/search-results/select-filter/select-filter.js b/jujugui/static/gui/src/app/components/search-results/select-filter/select-filter.js
index 3b32c769bd..c491257b88 100644
--- a/jujugui/static/gui/src/app/components/search-results/select-filter/select-filter.js
+++ b/jujugui/static/gui/src/app/components/search-results/select-filter/select-filter.js
@@ -15,7 +15,8 @@ class SearchResultsSelectFilter extends React.Component {
     var components = [];
     this.props.items.forEach(function(item) {
       components.push(
-        <option key={item.value}
+        <option
+          key={item.value}
           value={item.value}>
           {item.label}
         </option>);
@@ -42,7 +43,8 @@ class SearchResultsSelectFilter extends React.Component {
     return (
       <div className={className}>
         {this.props.label}:
-        <select defaultValue={this.props.currentValue}
+        <select
+          defaultValue={this.props.currentValue}
           onChange={this._handleChange.bind(this)}>
           {this._generateItems()}
         </select>
diff --git a/jujugui/static/gui/src/app/components/search-results/select-filter/test-select-filter.js b/jujugui/static/gui/src/app/components/search-results/select-filter/test-select-filter.js
index 495ff09aca..5181043bbf 100644
--- a/jujugui/static/gui/src/app/components/search-results/select-filter/test-select-filter.js
+++ b/jujugui/static/gui/src/app/components/search-results/select-filter/test-select-filter.js
@@ -33,7 +33,8 @@ describe('SearchResultsSelectFilter', function() {
     const expected = (
       <div className="list-block__sort">
         {'Sort by'}:
-        <select defaultValue={null}
+        <select
+          defaultValue={null}
           onChange={wrapper.find('select').prop('onChange')}>
           <option key="-downloads" value="-downloads">Most popular</option>
           <option key="downloads" value="downloads">Least popular</option>
diff --git a/jujugui/static/gui/src/app/components/search-results/test-search-results.js b/jujugui/static/gui/src/app/components/search-results/test-search-results.js
index 8f37efbf70..68c7197c59 100644
--- a/jujugui/static/gui/src/app/components/search-results/test-search-results.js
+++ b/jujugui/static/gui/src/app/components/search-results/test-search-results.js
@@ -138,7 +138,8 @@ describe('SearchResults', function() {
               http://jujucharms.com
             </a>
             {' '}or go{' '}
-            <span className="link"
+            <span
+              className="link"
               onClick={wrapper.find('.link').prop('onClick')}>
               back
             </span>.
diff --git a/jujugui/static/gui/src/app/components/search-results/type-filter/test-type-filter.js b/jujugui/static/gui/src/app/components/search-results/type-filter/test-type-filter.js
index db77592026..1817a04d14 100644
--- a/jujugui/static/gui/src/app/components/search-results/type-filter/test-type-filter.js
+++ b/jujugui/static/gui/src/app/components/search-results/type-filter/test-type-filter.js
@@ -19,22 +19,28 @@ describe('SearchResultsTypeFilter', function() {
     const expected = (
       <nav className="six-col list-block__type">
         <ul>
-          <li className="selected"
+          <li
+            className="selected"
             key="All"
             onClick={wrapper.find('li').at(0).prop('onClick')}
-            role="button" tabIndex="0">
+            role="button"
+            tabIndex="0">
             All
           </li>
-          <li className=""
+          <li
+            className=""
             key="Charms"
             onClick={wrapper.find('li').at(1).prop('onClick')}
-            role="button" tabIndex="0">
+            role="button"
+            tabIndex="0">
             Charms
           </li>
-          <li className=""
+          <li
+            className=""
             key="Bundles"
             onClick={wrapper.find('li').at(2).prop('onClick')}
-            role="button" tabIndex="0">
+            role="button"
+            tabIndex="0">
             Bundles
           </li>
         </ul>
diff --git a/jujugui/static/gui/src/app/components/search-results/type-filter/type-filter.js b/jujugui/static/gui/src/app/components/search-results/type-filter/type-filter.js
index 06db138f03..f17d7cc196 100644
--- a/jujugui/static/gui/src/app/components/search-results/type-filter/type-filter.js
+++ b/jujugui/static/gui/src/app/components/search-results/type-filter/type-filter.js
@@ -43,10 +43,12 @@ class SearchResultsTypeFilter extends React.Component {
     }];
     items.forEach(function(item) {
       components.push(
-        <li className={this._generateClasses(item.selected)}
+        <li
+          className={this._generateClasses(item.selected)}
           key={item.label}
           onClick={this._handleFilterClick.bind(this, item.action)}
-          role="button" tabIndex="0">
+          role="button"
+          tabIndex="0">
           {item.label}
         </li>);
     }, this);
diff --git a/jujugui/static/gui/src/app/components/shared/basic-table/row/row.js b/jujugui/static/gui/src/app/components/shared/basic-table/row/row.js
index 7b3154e631..2881ba53e5 100644
--- a/jujugui/static/gui/src/app/components/shared/basic-table/row/row.js
+++ b/jujugui/static/gui/src/app/components/shared/basic-table/row/row.js
@@ -63,7 +63,8 @@ class BasicTableRow extends React.Component {
       return null;
     }
     return (
-      <a className="basic-table__row-link"
+      <a
+        className="basic-table__row-link"
         href={clickURL}
         onClick={onClick && this._handleRowClick.bind(this, onClick)}></a>);
   }
@@ -123,7 +124,8 @@ class BasicTableRow extends React.Component {
       });
     const onClick = this._isRowClickable() ? this._toggleExpanded.bind(this) : null;
     return (
-      <li className={classes}
+      <li
+        className={classes}
         onClick={onClick}
         role="button"
         tabIndex="0">
diff --git a/jujugui/static/gui/src/app/components/shared/basic-table/row/test-row.js b/jujugui/static/gui/src/app/components/shared/basic-table/row/test-row.js
index 3fee5e193f..0c002e294e 100644
--- a/jujugui/static/gui/src/app/components/shared/basic-table/row/test-row.js
+++ b/jujugui/static/gui/src/app/components/shared/basic-table/row/test-row.js
@@ -73,7 +73,8 @@ describe('BasicTableRow', () => {
       clickURL: 'http://example.com'
     });
     const expected = (
-      <a className="basic-table__row-link"
+      <a
+        className="basic-table__row-link"
         href="http://example.com"
         onClick={wrapper.find('.basic-table__row-link').prop('onClick')}></a>);
     assert.compareJSX(wrapper.find('.basic-table__row-link').at(0), expected);
diff --git a/jujugui/static/gui/src/app/components/shared/button/button.js b/jujugui/static/gui/src/app/components/shared/button/button.js
index da417143a0..077956978f 100644
--- a/jujugui/static/gui/src/app/components/shared/button/button.js
+++ b/jujugui/static/gui/src/app/components/shared/button/button.js
@@ -42,7 +42,8 @@ class Button extends React.Component {
 
   render() {
     return (
-      <button className={this._generateClasses()}
+      <button
+        className={this._generateClasses()}
         onClick={this._handleClick.bind(this)}
         title={this.props.tooltip}
         type={this.props.submit ? 'submit' : 'button'}>
diff --git a/jujugui/static/gui/src/app/components/shared/expanding-row/expanding-row.js b/jujugui/static/gui/src/app/components/shared/expanding-row/expanding-row.js
index cf645cfd32..87da35fdbe 100644
--- a/jujugui/static/gui/src/app/components/shared/expanding-row/expanding-row.js
+++ b/jujugui/static/gui/src/app/components/shared/expanding-row/expanding-row.js
@@ -89,15 +89,18 @@ class ExpandingRow extends React.Component {
 
   render() {
     return (
-      <li className={this._generateClasses()}
+      <li
+        className={this._generateClasses()}
         onClick={this.props.clickable ? this._toggle.bind(this) : undefined}
         style={this.props.style}>
         <div className="expanding-row__initial twelve-col no-margin-bottom">
           {this.props.children[0]}
         </div>
-        <div className="expanding-row__expanded twelve-col"
+        <div
+          className="expanding-row__expanded twelve-col"
           style={this.state.styles}>
-          <div className="twelve-col no-margin-bottom"
+          <div
+            className="twelve-col no-margin-bottom"
             ref="inner">
             {this.props.children[1]}
           </div>
diff --git a/jujugui/static/gui/src/app/components/shared/expanding-row/test-expanding-row.js b/jujugui/static/gui/src/app/components/shared/expanding-row/test-expanding-row.js
index bb8eda2ea3..1c801955b1 100644
--- a/jujugui/static/gui/src/app/components/shared/expanding-row/test-expanding-row.js
+++ b/jujugui/static/gui/src/app/components/shared/expanding-row/test-expanding-row.js
@@ -35,16 +35,19 @@ describe('ExpandingRow', () => {
       classes: {extraClass: true}
     });
     var expected = (
-      <li className={
-        'expanding-row twelve-col extraClass expanding-row--clickable'}
-      onClick={wrapper.prop('onClick')}
-      style={undefined}>
+      <li
+        className={
+          'expanding-row twelve-col extraClass expanding-row--clickable'}
+        onClick={wrapper.prop('onClick')}
+        style={undefined}>
         <div className="expanding-row__initial twelve-col no-margin-bottom">
           <span>closed</span>
         </div>
-        <div className="expanding-row__expanded twelve-col"
+        <div
+          className="expanding-row__expanded twelve-col"
           style={{height: '0px', opacity: 0}}>
-          <div className="twelve-col no-margin-bottom"
+          <div
+            className="twelve-col no-margin-bottom"
             ref="inner">
             <span>open</span>
           </div>
diff --git a/jujugui/static/gui/src/app/components/shared/machine-unit/machine-unit.js b/jujugui/static/gui/src/app/components/shared/machine-unit/machine-unit.js
index 71955ab30e..7fdf37aa00 100644
--- a/jujugui/static/gui/src/app/components/shared/machine-unit/machine-unit.js
+++ b/jujugui/static/gui/src/app/components/shared/machine-unit/machine-unit.js
@@ -34,7 +34,8 @@ class MachineUnit extends React.Component {
     return (
       <li className={this._generateClasses()}>
         <span className="machine-unit__icon">
-          <img alt={name}
+          <img
+            alt={name}
             className="machine-unit__icon-img"
             src={this.props.icon}
             title={name} />
diff --git a/jujugui/static/gui/src/app/components/shared/machine/machine.js b/jujugui/static/gui/src/app/components/shared/machine/machine.js
index 0c2ae6a1ab..4ba3c3ab77 100644
--- a/jujugui/static/gui/src/app/components/shared/machine/machine.js
+++ b/jujugui/static/gui/src/app/components/shared/machine/machine.js
@@ -22,7 +22,8 @@ class Machine extends React.Component {
     }
     const items = hardware.map((item, i) => {
       return (
-        <li className="machine__hardware-item"
+        <li
+          className="machine__hardware-item"
           key={item.label + item.value + i}>
           <span className="machine__hardware-item-label">
             {item.label}:
@@ -153,7 +154,8 @@ class Machine extends React.Component {
 
   render() {
     return (
-      <div className={this._generateClasses()}
+      <div
+        className={this._generateClasses()}
         onClick={this.props.onClick}
         role="button"
         tabIndex="0">
diff --git a/jujugui/static/gui/src/app/components/shared/machine/test-machine.js b/jujugui/static/gui/src/app/components/shared/machine/test-machine.js
index 97f93c646e..276b3ff595 100644
--- a/jujugui/static/gui/src/app/components/shared/machine/test-machine.js
+++ b/jujugui/static/gui/src/app/components/shared/machine/test-machine.js
@@ -60,7 +60,8 @@ describe('Machine', () => {
       units
     });
     const expected = (
-      <div className="machine machine--machine"
+      <div
+        className="machine machine--machine"
         onClick={undefined}
         role="button"
         tabIndex="0">
@@ -85,7 +86,8 @@ describe('Machine', () => {
           </li>
         </ul>
         <ul className="machine__hardware">
-          <li className="machine__hardware-item"
+          <li
+            className="machine__hardware-item"
             key="diskfloppy0">
             <span className="machine__hardware-item-label">
               {'disk'}:
@@ -94,7 +96,8 @@ describe('Machine', () => {
               floppy
             </span>
           </li>
-          <li className="machine__hardware-item"
+          <li
+            className="machine__hardware-item"
             key="memorygoldfish-like1">
             <span className="machine__hardware-item-label">
               {'memory'}:
diff --git a/jujugui/static/gui/src/app/components/shared/panel/panel.js b/jujugui/static/gui/src/app/components/shared/panel/panel.js
index 63192bfb85..951c971354 100644
--- a/jujugui/static/gui/src/app/components/shared/panel/panel.js
+++ b/jujugui/static/gui/src/app/components/shared/panel/panel.js
@@ -60,11 +60,13 @@ class Panel extends React.Component {
 
   render() {
     return (
-      <div className={this._genClasses()}
+      <div
+        className={this._genClasses()}
         onClick={this._handleClick.bind(this)}
         ref="content"
         tabIndex="0">
-        <div className="panel-component__inner"
+        <div
+          className="panel-component__inner"
           onClick={this._stopBubble.bind(this)}>
           {this.props.children}
         </div>
diff --git a/jujugui/static/gui/src/app/components/shared/panel/test-panel.js b/jujugui/static/gui/src/app/components/shared/panel/test-panel.js
index 5a60854906..1e5acc16f9 100644
--- a/jujugui/static/gui/src/app/components/shared/panel/test-panel.js
+++ b/jujugui/static/gui/src/app/components/shared/panel/test-panel.js
@@ -32,11 +32,13 @@ describe('PanelComponent', function() {
   it('generates a visible panel when visible flag is provided', function() {
     const wrapper = renderComponent();
     var expected = (
-      <div className="panel-component custom-instance-name"
+      <div
+        className="panel-component custom-instance-name"
         onClick={wrapper.prop('onClick')}
         ref="content"
         tabIndex="0">
-        <div className="panel-component__inner"
+        <div
+          className="panel-component__inner"
           onClick={wrapper.find('.panel-component__inner').prop('onClick')}>
           <div>child</div>
         </div>
diff --git a/jujugui/static/gui/src/app/components/shared/status/application-list/application-list.js b/jujugui/static/gui/src/app/components/shared/status/application-list/application-list.js
index 386c04a490..d3ae355f13 100644
--- a/jujugui/static/gui/src/app/components/shared/status/application-list/application-list.js
+++ b/jujugui/static/gui/src/app/components/shared/status/application-list/application-list.js
@@ -41,8 +41,7 @@ class StatusApplicationList extends React.Component {
           columnSize: 2,
           content: (
             <span>
-              <img className="status-view__icon"
-                src={this.props.getIconPath(app)} />
+              <img className="status-view__icon" src={this.props.getIconPath(app)} />
               {app.name}
             </span>)
         }, {
@@ -58,7 +57,8 @@ class StatusApplicationList extends React.Component {
         }, {
           columnSize: 2,
           content: (
-            <a className="status-view__link"
+            <a
+              className="status-view__link"
               href={this.props.generateCharmURL(charmId)}
               onClick={this.props.onCharmClick.bind(this, charmId)}>
               {charm.path()}
diff --git a/jujugui/static/gui/src/app/components/shared/status/model/model.js b/jujugui/static/gui/src/app/components/shared/status/model/model.js
index 059bda4be4..8461be650d 100644
--- a/jujugui/static/gui/src/app/components/shared/status/model/model.js
+++ b/jujugui/static/gui/src/app/components/shared/status/model/model.js
@@ -28,14 +28,16 @@ class StatusModel extends React.Component {
   _generateFilters() {
     const options = ['none'].concat(utils.STATUS_ORDER).map(status => {
       return (
-        <option className="status-view__filter-option"
+        <option
+          className="status-view__filter-option"
           key={status}
           value={status}>
           {status}
         </option>);
     });
     return (
-      <select className="status-view__filter-select"
+      <select
+        className="status-view__filter-select"
         onChange={this._handleFilterChange.bind(this)}
         value={this.props.statusFilter || 'none'}>
         {options}
diff --git a/jujugui/static/gui/src/app/components/shared/status/relation-list/relation-list.js b/jujugui/static/gui/src/app/components/shared/status/relation-list/relation-list.js
index 7153bdc3f7..1dfe110931 100644
--- a/jujugui/static/gui/src/app/components/shared/status/relation-list/relation-list.js
+++ b/jujugui/static/gui/src/app/components/shared/status/relation-list/relation-list.js
@@ -22,11 +22,11 @@ class StatusRelationList extends React.Component {
       return (<span>{name}</span>);
     }
     return (
-      <a className="status-view__link"
+      <a
+        className="status-view__link"
         href={this.props.generateApplicationURL(name)}
         onClick={this.props.onApplicationClick.bind(this, name)}>
-        <img className="status-view__icon"
-          src={this.props.getIconPath(app)} />
+        <img className="status-view__icon" src={this.props.getIconPath(app)} />
         {name}
       </a>);
   }
diff --git a/jujugui/static/gui/src/app/components/shared/status/unit-list/unit-list.js b/jujugui/static/gui/src/app/components/shared/status/unit-list/unit-list.js
index 717b396c3b..e830b8daa4 100644
--- a/jujugui/static/gui/src/app/components/shared/status/unit-list/unit-list.js
+++ b/jujugui/static/gui/src/app/components/shared/status/unit-list/unit-list.js
@@ -47,7 +47,8 @@ class StatusUnitList extends React.Component {
         const protocol = port === 443 ? 'https' : 'http';
         const href = `${protocol}://${label}`;
         publicAddress = (
-          <a className="status-view__link"
+          <a
+            className="status-view__link"
             href={href}
             target="_blank">
             {unit.publicAddress}
@@ -65,8 +66,7 @@ class StatusUnitList extends React.Component {
           columnSize: 2,
           content: (
             <span>
-              <img className="status-view__icon"
-                src={this.props.getIconPath(application)} />
+              <img className="status-view__icon" src={this.props.getIconPath(application)} />
               {unit.name}
             </span>)
         }, {
@@ -80,7 +80,8 @@ class StatusUnitList extends React.Component {
         }, {
           columnSize: 1,
           content: (
-            <a className="status-view__link"
+            <a
+              className="status-view__link"
               href={this.props.generateMachineURL(unit.machineID)}
               onClick={this.props.onMachineClick.bind(this, unit.machineID)}>
               {unit.machineID}
diff --git a/jujugui/static/gui/src/app/components/store/store.js b/jujugui/static/gui/src/app/components/store/store.js
index 055cd190ed..81a0d11faa 100644
--- a/jujugui/static/gui/src/app/components/store/store.js
+++ b/jujugui/static/gui/src/app/components/store/store.js
@@ -144,7 +144,8 @@ class Store extends React.Component {
             scripts is straightforward. You can keep new charms
             private, or share them back with the community.</p>
             <p>
-              <a className="link link--cold"
+              <a
+                className="link link--cold"
                 href={href}
                 target="_blank">
               Learn more about writing charms&nbsp;&rsaquo;
@@ -170,11 +171,13 @@ class Store extends React.Component {
         <h2>Development tools</h2>
         <ul className="twelve-col no-bullets equal-height">
           <li className="three-col featured-entity">
-            <span className="featured-entity__link link"
+            <span
+              className="featured-entity__link link"
               data-entity="gitlab"
               onClick={this._handleEntityClick.bind(this)}>
               <div className="one-col no-margin-bottom">
-                <img alt=""
+                <img
+                  alt=""
                   className="featured-entity__image"
                   src={this._generateIconPath('gitlab')} />
               </div>
@@ -188,11 +191,13 @@ class Store extends React.Component {
             </span>
           </li>
           <li className="three-col featured-entity">
-            <span className="featured-entity__link link"
+            <span
+              className="featured-entity__link link"
               data-entity="jenkins"
               onClick={this._handleEntityClick.bind(this)}>
               <div className="one-col no-margin-bottom">
-                <img alt=""
+                <img
+                  alt=""
                   className="featured-entity__image"
                   src={this._generateIconPath('jenkins')} />
               </div>
@@ -226,36 +231,42 @@ class Store extends React.Component {
     if (lastCol) {
       sharedClasses.push('last-col');
     }
-    let kubernetesButton = (<a className="button--inline-neutral"
+    let kubernetesButton = (<a
+      className="button--inline-neutral"
       href="https://jujucharms.com/kubernetes"
       onClick={this._stopPropagation.bind(this)}
       target="_blank">
           Find out more
     </a>);
-    let openstackButton = (<a className="button--inline-neutral"
+    let openstackButton = (<a
+      className="button--inline-neutral"
       href="https://jujucharms.com/openstack"
       onClick={this._stopPropagation.bind(this)}
       target="_blank">
           Find out more
     </a>);
-    let bigdataButton = (<a className="button--inline-neutral"
+    let bigdataButton = (<a
+      className="button--inline-neutral"
       href="https://jujucharms.com/big-data"
       onClick={this._stopPropagation.bind(this)}
       target="_blank">
       Find out more
     </a>);
     if (!this.props.gisf) {
-      kubernetesButton = (<span className="button--inline-neutral"
+      kubernetesButton = (<span
+        className="button--inline-neutral"
         data-query="kubernetes"
         onClick={this._handleSearchClick.bind(this)}>
         View
       </span>);
-      openstackButton = (<span className="button--inline-neutral"
+      openstackButton = (<span
+        className="button--inline-neutral"
         data-query="openstack"
         onClick={this._handleSearchClick.bind(this)}>
           View
       </span>);
-      bigdataButton = (<span className="button--inline-neutral"
+      bigdataButton = (<span
+        className="button--inline-neutral"
         data-query="hadoop"
         onClick={this._handleSearchClick.bind(this)}>
         View
@@ -264,11 +275,13 @@ class Store extends React.Component {
     switch (name) {
       case 'kubernetes':
         return (
-          <div className={classNames('box--kubernetes', sharedClasses)}
+          <div
+            className={classNames('box--kubernetes', sharedClasses)}
             data-query="kubernetes"
             key="kubernetes"
             onClick={this._handleSearchClick.bind(this)}>
-            <img alt="Kubernetes"
+            <img
+              alt="Kubernetes"
               className="box__image"
               src={this._generateLocalImagePath('k8-image.png')} />
             <div className="align-bottom">
@@ -278,11 +291,13 @@ class Store extends React.Component {
           </div>);
       case 'openstack':
         return (
-          <div className={classNames('box--openstack', sharedClasses)}
+          <div
+            className={classNames('box--openstack', sharedClasses)}
             data-query="openstack"
             key="openstack"
             onClick={this._handleSearchClick.bind(this)}>
-            <img alt="Openstack"
+            <img
+              alt="Openstack"
               className="box__image"
               src={this._generateLocalImagePath('openstack-promo.png')} />
             <div className="align-bottom">
@@ -292,12 +307,14 @@ class Store extends React.Component {
           </div>);
       case 'bigdata':
         return (
-          <div className={classNames('box--hadoop', sharedClasses)}
+          <div
+            className={classNames('box--hadoop', sharedClasses)}
             data-query="hadoop"
             key="hadoop"
             onClick={this._handleSearchClick.bind(this)}>
             <div className="box--hadoop-container">
-              <img alt="Hadoop"
+              <img
+                alt="Hadoop"
                 className="box__image"
                 src={this._generateLocalImagePath('hadoop-elephant.png')} />
               <div className="align-bottom">
@@ -378,7 +395,8 @@ class Store extends React.Component {
       let key = `tagItem-${index}`;
       let comma = index === topics.length - 1 ? '' : ',';
       list.push(<li className="inline-list__item" key={key}>
-        <span className="link link--cold"
+        <span
+          className="link link--cold"
           data-filterkey="tags"
           data-filtervalue={topic.name}
           onClick={this._handleSearchClick.bind(this)}>
@@ -415,7 +433,8 @@ class Store extends React.Component {
             <p>Charms are sets of scripts that simplify the
                   deployment and management tasks of a service. They
                   are regularly reviewed and updated.</p>
-            <span className="button--inline-neutral"
+            <span
+              className="button--inline-neutral"
               data-filterkey="type"
               data-filtervalue="charm"
               onClick={this._handleSearchClick.bind(this)}>
@@ -433,7 +452,8 @@ class Store extends React.Component {
             <p>Bundles are collections of charms that link
                   applications together, so you can deploy whole
                   chunks of infrastructure in one go.</p>
-            <span className="button--inline-neutral"
+            <span
+              className="button--inline-neutral"
               data-filterkey="type"
               data-filtervalue="bundle"
               onClick={this._handleSearchClick.bind(this)}>
@@ -465,7 +485,8 @@ class Store extends React.Component {
           <div className="six-col no-margin-bottom last-col">
             <h3>Nagios</h3>
             <p>
-                      By <a className="link link--cold"
+                      By <a
+                className="link link--cold"
                 href={this._generateUserPath('charmers')}
                 target="_blank">
                           charmers
@@ -485,11 +506,13 @@ class Store extends React.Component {
 
         <ul className="twelve-col no-bullets equal-height">
           <li className="three-col featured-entity">
-            <span className="featured-entity__link link"
+            <span
+              className="featured-entity__link link"
               data-entity="kibana"
               onClick={this._handleEntityClick.bind(this)}>
               <div className="one-col no-margin-bottom">
-                <img alt=""
+                <img
+                  alt=""
                   className="featured-entity__image"
                   src={this._generateIconPath('kibana')} />
               </div>
@@ -503,7 +526,8 @@ class Store extends React.Component {
             </span>
           </li>
           <li className="three-col featured-entity">
-            <span className="featured-entity__link link"
+            <span
+              className="featured-entity__link link"
               data-entity="logstash"
               onClick={this._handleEntityClick.bind(this)}>
               <div className="one-col no-margin-bottom">
@@ -522,7 +546,8 @@ class Store extends React.Component {
             </span>
           </li>
           <li className="three-col featured-entity">
-            <span className="featured-entity__link link"
+            <span
+              className="featured-entity__link link"
               data-entity="elasticsearch"
               onClick={this._handleEntityClick.bind(this)}>
               <div className="one-col no-margin-bottom">
@@ -541,7 +566,8 @@ class Store extends React.Component {
             </span>
           </li>
           <li className="three-col last-col featured-entity">
-            <span className="featured-entity__link link"
+            <span
+              className="featured-entity__link link"
               data-entity="prometheus"
               onClick={this._handleEntityClick.bind(this)}>
               <div className="one-col no-margin-bottom">
@@ -561,12 +587,14 @@ class Store extends React.Component {
             </span>
           </li>
           <li className="three-col featured-entity">
-            <a className="featured-entity__link link"
+            <a
+              className="featured-entity__link link"
               data-entity="munin"
               onClick={this._handleEntityClick.bind(this)}>
               <div
                 className="one-col no-margin-bottom">
-                <img alt=""
+                <img
+                  alt=""
                   className="featured-entity__image"
                   src={this._generateIconPath('munin')} />
               </div>
@@ -580,12 +608,14 @@ class Store extends React.Component {
             </a>
           </li>
           <li className="three-col featured-entity">
-            <span className="featured-entity__link link"
+            <span
+              className="featured-entity__link link"
               data-entity="rsyslog"
               onClick={this._handleEntityClick.bind(this)}>
               <div
                 className="one-col no-margin-bottom">
-                <img alt=""
+                <img
+                  alt=""
                   className="featured-entity__image"
                   src={this._generateIconPath('rsyslog')} />
               </div>
@@ -598,7 +628,8 @@ class Store extends React.Component {
             </span>
           </li>
           <li className="three-col featured-entity">
-            <span className="featured-entity__link link"
+            <span
+              className="featured-entity__link link"
               data-entity="zabbix-server"
               onClick={this._handleEntityClick.bind(this)}>
               <div className="one-col no-margin-bottom">
@@ -616,11 +647,13 @@ class Store extends React.Component {
             </span>
           </li>
           <li className="three-col last-col featured-entity">
-            <span className="featured-entity__link link"
+            <span
+              className="featured-entity__link link"
               data-entity="u/ricardokirkner/sentry"
               onClick={this._handleEntityClick.bind(this)}>
               <div className="one-col no-margin-bottom">
-                <img alt=""
+                <img
+                  alt=""
                   className="featured-entity__image control-size"
                   src={this._generateIconPath(
                     '~ricardokirkner/sentry')} />
@@ -636,7 +669,8 @@ class Store extends React.Component {
           </li>
         </ul>
         <p className="intro">
-          <span className="link link--cold"
+          <span
+            className="link link--cold"
             data-filterkey="tags"
             data-filtervalue="ops"
             onClick={this._handleSearchClick.bind(this)}>
@@ -662,7 +696,8 @@ class Store extends React.Component {
             <p>Juju makes it easy to deploy container management solutions
             by provisioning, installing and configuring all the systems in
             the cluster.</p>
-            <p><span className="button--inline-neutral"
+            <p><span
+              className="button--inline-neutral"
               data-query="containers"
               onClick={this._handleSearchClick.bind(this)}>
               View bundles
@@ -698,7 +733,8 @@ class Store extends React.Component {
           </div>
           <div className="six-col no-margin-bottom last-col">
             <h3>Realtime Syslog Analytics</h3>
-            <p>By <a className="link link--cold"
+            <p>By <a
+              className="link link--cold"
               href={this._generateUserPath('bigdata-charmers')}
               target="_blank">
                           bigdata-charmers
@@ -709,7 +745,8 @@ class Store extends React.Component {
                   components, it offers a repeatable and reliable way
                   to setup complex software across multiple
                   substrates.</p>
-            <span className="button--inline-neutral"
+            <span
+              className="button--inline-neutral"
               data-entity="realtime-syslog-analytics"
               onClick={this._handleEntityClick.bind(this)}>
                       View the bundle
@@ -719,11 +756,13 @@ class Store extends React.Component {
 
         <ul className="twelve-col no-bullets equal-height">
           <li className="three-col featured-entity">
-            <span className="featured-entity__link link"
+            <span
+              className="featured-entity__link link"
               data-entity="hive"
               onClick={this._handleEntityClick.bind(this)}>
               <div className="one-col no-margin-bottom">
-                <img alt=""
+                <img
+                  alt=""
                   className="featured-entity__image"
                   src={this._generateIconPath('hive')} />
               </div>
@@ -736,7 +775,8 @@ class Store extends React.Component {
             </span>
           </li>
           <li className="three-col featured-entity">
-            <span className="featured-entity__link link"
+            <span
+              className="featured-entity__link link"
               data-entity="spark"
               onClick={this._handleEntityClick.bind(this)}>
               <div className="one-col no-margin-bottom">
@@ -755,7 +795,8 @@ class Store extends React.Component {
             </span>
           </li>
           <li className="three-col featured-entity">
-            <span className="featured-entity__link link"
+            <span
+              className="featured-entity__link link"
               data-entity="zeppelin"
               onClick={this._handleEntityClick.bind(this)}>
               <div className="one-col no-margin-bottom">
@@ -773,7 +814,8 @@ class Store extends React.Component {
             </span>
           </li>
           <li className="three-col last-col featured-entity">
-            <span className="featured-entity__link link"
+            <span
+              className="featured-entity__link link"
               data-entity="elasticsearch-cluster"
               onClick={this._handleEntityClick.bind(this)}>
               <ul className="featured-entity__image-list one-col">
@@ -785,7 +827,8 @@ class Store extends React.Component {
                       'elasticsearch')} />
                 </li>
                 <li className="featured-entity__image-list-item">
-                  <img alt=""
+                  <img
+                    alt=""
                     className="featured-entity__image"
                     src={this._generateIconPath('kibana')} />
                 </li>
@@ -799,12 +842,14 @@ class Store extends React.Component {
             </span>
           </li>
           <li className="three-col featured-entity">
-            <span className="featured-entity__link link"
+            <span
+              className="featured-entity__link link"
               data-entity="u/elasticsearch-charmers/elk-stack"
               onClick={this._handleEntityClick.bind(this)}>
               <ul className="featured-entity__image-list one-col">
                 <li className="featured-entity__image-list-item">
-                  <img alt=""
+                  <img
+                    alt=""
                     className="featured-entity__image"
                     src={this._generateIconPath('zulu8')} />
                 </li>
@@ -823,7 +868,8 @@ class Store extends React.Component {
                       '~containers/logstash')} />
                 </li>
                 <li className="featured-entity__image-list-item">
-                  <img alt=""
+                  <img
+                    alt=""
                     className="featured-entity__image"
                     src={this._generateIconPath('kibana')} />
                 </li>
@@ -838,7 +884,8 @@ class Store extends React.Component {
           </li>
         </ul>
         <p className="intro">
-          <span className="link link--cold"
+          <span
+            className="link link--cold"
             data-filterkey="tags"
             data-filtervalue="analytics"
             onClick={this._handleSearchClick.bind(this)}>
@@ -867,7 +914,8 @@ class Store extends React.Component {
           </div>
           <div className="six-col no-margin-bottom last-col">
             <h3>MySQL</h3>
-            <p>By <a className="link link--cold"
+            <p>By <a
+              className="link link--cold"
               href={this._generateUserPath('mysql-charmers')}
               target="_blank">
                           mysql-charmers
@@ -876,7 +924,8 @@ class Store extends React.Component {
             <p>MySQL is a fast, stable and true multi-user,
                   multi-threaded SQL database server. Its main goals
                   are speed, robustness and ease of use.</p>
-            <span className="button--inline-neutral"
+            <span
+              className="button--inline-neutral"
               data-entity="mysql"
               onClick={this._handleEntityClick.bind(this)}>
                       View the charm
@@ -886,11 +935,13 @@ class Store extends React.Component {
 
         <ul className="twelve-col no-bullets equal-height">
           <li className="three-col featured-entity">
-            <span className="featured-entity__link link"
+            <span
+              className="featured-entity__link link"
               data-entity="cassandra"
               onClick={this._handleEntityClick.bind(this)}>
               <div className="one-col no-margin-bottom">
-                <img alt=""
+                <img
+                  alt=""
                   className="featured-entity__image"
                   src={this._generateIconPath('cassandra')} />
               </div>
@@ -903,7 +954,8 @@ class Store extends React.Component {
             </span>
           </li>
           <li className="three-col featured-entity">
-            <span className="featured-entity__link link"
+            <span
+              className="featured-entity__link link"
               data-entity="mariadb"
               onClick={this._handleEntityClick.bind(this)}>
               <div
@@ -923,11 +975,13 @@ class Store extends React.Component {
             </span>
           </li>
           <li className="three-col featured-entity">
-            <span className="featured-entity__link link"
+            <span
+              className="featured-entity__link link"
               data-entity="mongodb"
               onClick={this._handleEntityClick.bind(this)}>
               <div className="one-col no-margin-bottom">
-                <img alt=""
+                <img
+                  alt=""
                   className="featured-entity__image"
                   src={this._generateIconPath('mongodb')} />
               </div>
@@ -940,7 +994,8 @@ class Store extends React.Component {
             </span>
           </li>
           <li className="three-col last-col featured-entity">
-            <span className="featured-entity__link link"
+            <span
+              className="featured-entity__link link"
               data-entity="redis"
               onClick={this._handleEntityClick.bind(this)}>
               <div className="one-col no-margin-bottom">
@@ -958,12 +1013,14 @@ class Store extends React.Component {
             </span>
           </li>
           <li className="three-col last-col featured-entity">
-            <span className="featured-entity__link link"
+            <span
+              className="featured-entity__link link"
               data-entity="postgresql"
               onClick={this._handleEntityClick.bind(this)}>
               <div
                 className="one-col no-margin-bottom">
-                <img alt=""
+                <img
+                  alt=""
                   className="featured-entity__image"
                   src={this._generateIconPath('postgresql')} />
               </div>
@@ -977,7 +1034,8 @@ class Store extends React.Component {
           </li>
         </ul>
         <p className="intro">
-          <span className="link link--cold"
+          <span
+            className="link link--cold"
             data-filterkey="tags"
             data-filtervalue="databases"
             onClick={this._handleSearchClick.bind(this)}>
diff --git a/jujugui/static/gui/src/app/components/store/test-store.js b/jujugui/static/gui/src/app/components/store/test-store.js
index 3cbf5f1896..f39eb06ba7 100644
--- a/jujugui/static/gui/src/app/components/store/test-store.js
+++ b/jujugui/static/gui/src/app/components/store/test-store.js
@@ -78,7 +78,8 @@ describe('Store', function() {
             scripts is straightforward. You can keep new charms
             private, or share them back with the community.</p>
             <p>
-              <a className="link link--cold"
+              <a
+                className="link link--cold"
                 href={href}
                 target="_blank">
               Learn more about writing charms&nbsp;&rsaquo;
diff --git a/jujugui/static/gui/src/app/components/string-config/input/input.js b/jujugui/static/gui/src/app/components/string-config/input/input.js
index 9bd5262b93..a310a0ca3f 100644
--- a/jujugui/static/gui/src/app/components/string-config/input/input.js
+++ b/jujugui/static/gui/src/app/components/string-config/input/input.js
@@ -30,7 +30,8 @@ class StringConfigInput extends React.Component {
 
   render() {
     return (
-      <div className="string-config-input"
+      <div
+        className="string-config-input"
         contentEditable={!this.props.disabled}
         dangerouslySetInnerHTML={{__html: this.state.value}}
         onBlur={this._updateValue.bind(this)}
diff --git a/jujugui/static/gui/src/app/components/string-config/input/test-input.js b/jujugui/static/gui/src/app/components/string-config/input/test-input.js
index 2066e1b747..a360516a2b 100644
--- a/jujugui/static/gui/src/app/components/string-config/input/test-input.js
+++ b/jujugui/static/gui/src/app/components/string-config/input/test-input.js
@@ -18,7 +18,8 @@ describe('StringConfigInput', function() {
   it('can render', function() {
     const wrapper = renderComponent();
     var expected = (
-      <div className="string-config-input"
+      <div
+        className="string-config-input"
         contentEditable={true}
         dangerouslySetInnerHTML={{__html: 'config value'}}
         onBlur={wrapper.prop('onBlur')}
diff --git a/jujugui/static/gui/src/app/components/string-config/string-config.js b/jujugui/static/gui/src/app/components/string-config/string-config.js
index bab5930475..86dfdaa20c 100644
--- a/jujugui/static/gui/src/app/components/string-config/string-config.js
+++ b/jujugui/static/gui/src/app/components/string-config/string-config.js
@@ -77,7 +77,8 @@ class StringConfig extends React.Component {
             ref="editableInput"
             setValue={this._setValue.bind(this)} />
         </div>
-        <span className="string-config--description"
+        <span
+          className="string-config--description"
           dangerouslySetInnerHTML={{__html: this.props.option.description}}>
         </span>
       </div>
diff --git a/jujugui/static/gui/src/app/components/string-config/test-string-config.js b/jujugui/static/gui/src/app/components/string-config/test-string-config.js
index 3032c8a946..22489f4af5 100644
--- a/jujugui/static/gui/src/app/components/string-config/test-string-config.js
+++ b/jujugui/static/gui/src/app/components/string-config/test-string-config.js
@@ -38,7 +38,8 @@ describe('StringConfig', function() {
             ref="editableInput"
             setValue={wrapper.find('StringConfigInput').prop('setValue')} />
         </div>
-        <span className="string-config--description"
+        <span
+          className="string-config--description"
           dangerouslySetInnerHTML={{__html: option.description}}>
         </span>
       </div>);
diff --git a/jujugui/static/gui/src/app/components/svg-icon/svg-icon.js b/jujugui/static/gui/src/app/components/svg-icon/svg-icon.js
index fef3193639..e21d97b2ad 100644
--- a/jujugui/static/gui/src/app/components/svg-icon/svg-icon.js
+++ b/jujugui/static/gui/src/app/components/svg-icon/svg-icon.js
@@ -68,7 +68,8 @@ class SvgIcon extends React.PureComponent {
 
   render() {
     return (
-      <svg className={this._generateClasses()}
+      <svg
+        className={this._generateClasses()}
         style={this._generateStyles()}
         viewBox={this._generateViewbox()}>
         <use xlinkHref={'#' + this.props.name} />
diff --git a/jujugui/static/gui/src/app/components/svg-icon/test-svg-icon.js b/jujugui/static/gui/src/app/components/svg-icon/test-svg-icon.js
index c84ebf8b0e..858a53d10f 100644
--- a/jujugui/static/gui/src/app/components/svg-icon/test-svg-icon.js
+++ b/jujugui/static/gui/src/app/components/svg-icon/test-svg-icon.js
@@ -20,7 +20,9 @@ describe('SvgIcon', function() {
   it('can render an icon', function() {
     const wrapper = renderComponent({ size: 24 });
     const expected = (
-      <svg className="svg-icon" style={{width: '24px', height: '24px'}}
+      <svg
+        className="svg-icon"
+        style={{width: '24px', height: '24px'}}
         viewBox='0 0 24 24'>
         <use xlinkHref="#icon-name" />
       </svg>);
diff --git a/jujugui/static/gui/src/app/components/terminal/test-terminal.js b/jujugui/static/gui/src/app/components/terminal/test-terminal.js
index fe7791646b..aa01bfa65b 100644
--- a/jujugui/static/gui/src/app/components/terminal/test-terminal.js
+++ b/jujugui/static/gui/src/app/components/terminal/test-terminal.js
@@ -59,17 +59,20 @@ describe('Terminal', () => {
         <div className="juju-shell__header">
           <span className="juju-shell__header-label">Juju Shell</span>
           <div className="juju-shell__header-actions">
-            <span onClick={actions.at(0).prop('onClick')}
+            <span
+              onClick={actions.at(0).prop('onClick')}
               role="button"
               tabIndex="0">
               <SvgIcon name="minimize-bar_16" size="16" />
             </span>
-            <span onClick={actions.at(1).prop('onClick')}
+            <span
+              onClick={actions.at(1).prop('onClick')}
               role="button"
               tabIndex="0">
               <SvgIcon name="maximize-bar_16" size="16" />
             </span>
-            <span onClick={actions.at(2).prop('onClick')}
+            <span
+              onClick={actions.at(2).prop('onClick')}
               role="button"
               tabIndex="0">
               <SvgIcon name="close_16" size="16" />
diff --git a/jujugui/static/gui/src/app/components/usso-login-link/test-usso-login-link.js b/jujugui/static/gui/src/app/components/usso-login-link/test-usso-login-link.js
index a958f43c1d..64de10f701 100644
--- a/jujugui/static/gui/src/app/components/usso-login-link/test-usso-login-link.js
+++ b/jujugui/static/gui/src/app/components/usso-login-link/test-usso-login-link.js
@@ -24,7 +24,8 @@ describe('USSOLoginLink', () => {
     const wrapper = renderComponent();
     const expected = (
       <div className="usso-login">
-        <a className="usso-login__action"
+        <a
+          className="usso-login__action"
           onClick={wrapper.find('.usso-login__action').prop('onClick')}
           target="_blank">
             Login
diff --git a/jujugui/static/gui/src/app/components/usso-login-link/usso-login-link.js b/jujugui/static/gui/src/app/components/usso-login-link/usso-login-link.js
index b22a5104f3..05fdaef602 100644
--- a/jujugui/static/gui/src/app/components/usso-login-link/usso-login-link.js
+++ b/jujugui/static/gui/src/app/components/usso-login-link/usso-login-link.js
@@ -54,7 +54,8 @@ class USSOLoginLink extends React.Component {
   */
   _renderTextLink() {
     return (
-      <a className="usso-login__action"
+      <a
+        className="usso-login__action"
         onClick={this.handleLogin.bind(this)}
         target="_blank">
         {this._generateContent('Login')}
diff --git a/jujugui/static/gui/src/app/components/zoom/test-zoom.js b/jujugui/static/gui/src/app/components/zoom/test-zoom.js
index 4a5a7a12f8..c74fea2050 100644
--- a/jujugui/static/gui/src/app/components/zoom/test-zoom.js
+++ b/jujugui/static/gui/src/app/components/zoom/test-zoom.js
@@ -32,19 +32,23 @@ describe('Zoom', function() {
     const wrapper = renderComponent();
     var expected = (
       <ul className="zoom">
-        <li className="zoom__in link"
+        <li
+          className="zoom__in link"
           onClick={wrapper.find('.zoom__in').prop('onClick')}
           role="button"
           tabIndex="0">
-          <SvgIcon className="zoom-in__icon"
+          <SvgIcon
+            className="zoom-in__icon"
             name="add_16"
             size="12" />
         </li>
-        <li className="zoom__out link"
+        <li
+          className="zoom__out link"
           onClick={wrapper.find('.zoom__out').prop('onClick')}
           role="button"
           tabIndex="0">
-          <SvgIcon className="zoom-out__icon"
+          <SvgIcon
+            className="zoom-out__icon"
             name="minus_16"
             size="12" />
         </li>
diff --git a/jujugui/static/gui/src/app/components/zoom/zoom.js b/jujugui/static/gui/src/app/components/zoom/zoom.js
index c11f120fea..c20084a86a 100644
--- a/jujugui/static/gui/src/app/components/zoom/zoom.js
+++ b/jujugui/static/gui/src/app/components/zoom/zoom.js
@@ -36,19 +36,23 @@ class Zoom extends React.Component {
   render() {
     return (
       <ul className="zoom">
-        <li className="zoom__in link"
+        <li
+          className="zoom__in link"
           onClick={this._zoomIn.bind(this)}
           role="button"
           tabIndex="0">
-          <SvgIcon className="zoom-in__icon"
+          <SvgIcon
+            className="zoom-in__icon"
             name="add_16"
             size="12" />
         </li>
-        <li className="zoom__out link"
+        <li
+          className="zoom__out link"
           onClick={this._zoomOut.bind(this)}
           role="button"
           tabIndex="0">
-          <SvgIcon className="zoom-out__icon"
+          <SvgIcon
+            className="zoom-out__icon"
             name="minus_16"
             size="12" />
         </li>
diff --git a/jujugui/static/gui/src/app/init/app.js b/jujugui/static/gui/src/app/init/app.js
index 29a24af773..bb2487fc31 100644
--- a/jujugui/static/gui/src/app/init/app.js
+++ b/jujugui/static/gui/src/app/init/app.js
@@ -521,13 +521,16 @@ Browser: ${navigator.userAgent}`
       });
     };
     return (
-      <li className="header-banner__list-item header-banner__list-item--no-padding"
+      <li
+        className="header-banner__list-item header-banner__list-item--no-padding"
         id="header-help">
-        <span className="header__button"
+        <span
+          className="header__button"
           onClick={openHelp.bind(this)}
           role="button"
           tabIndex="0">
-          <SvgIcon className="header__button-icon"
+          <SvgIcon
+            className="header__button-icon"
             name="help_16"
             size="16" />
           <span className="tooltip__tooltip--below">
@@ -679,7 +682,8 @@ Browser: ${navigator.userAgent}`
     const homePath = gisf ? '/' :
       this.props.appState.generatePath({profile: userName});
     return (
-      <div className="header-banner__logo"
+      <div
+        className="header-banner__logo"
         id="header-logo" >
         <HeaderLogo
           gisf={gisf}
@@ -1155,7 +1159,8 @@ Browser: ${navigator.userAgent}`
     };
 
     return (
-      <li className="header-banner__list-item header-banner__list-item--no-padding"
+      <li
+        className="header-banner__list-item header-banner__list-item--no-padding"
         id="profile-link-container">
         <UserMenu
           controllerAPI={controllerAPI}
@@ -1342,7 +1347,8 @@ Browser: ${navigator.userAgent}`
     }
     return (
       <li className="header-banner__list-item">
-        <a className="header-banner__link"
+        <a
+          className="header-banner__link"
           href={maasServer}
           target="_blank">
           MAAS UI
diff --git a/jujugui/static/gui/src/app/init/cookie-util.js b/jujugui/static/gui/src/app/init/cookie-util.js
index 8e60ce3148..3386b2253d 100644
--- a/jujugui/static/gui/src/app/init/cookie-util.js
+++ b/jujugui/static/gui/src/app/init/cookie-util.js
@@ -85,7 +85,8 @@ function _renderNotification(doc, state) {
       We use cookies to improve your experience. By your continued use
       of this application you accept such use. To change your settings
       please&nbsp;
-      <a href="http://www.ubuntu.com/privacy-policy#cookies"
+      <a
+        href="http://www.ubuntu.com/privacy-policy#cookies"
         target="_blank">
         see our policy
       </a>
diff --git a/jujugui/static/gui/src/app/init/test-cookie-util.js b/jujugui/static/gui/src/app/init/test-cookie-util.js
index bbcb0e45e2..0a547f9222 100644
--- a/jujugui/static/gui/src/app/init/test-cookie-util.js
+++ b/jujugui/static/gui/src/app/init/test-cookie-util.js
@@ -35,7 +35,8 @@ describe('CookieUtil', () => {
         We use cookies to improve your experience. By your continued use
         of this application you accept such use. To change your settings
         please&nbsp;
-        <a href="http://www.ubuntu.com/privacy-policy#cookies"
+        <a
+          href="http://www.ubuntu.com/privacy-policy#cookies"
           target="_blank">
           see our policy
         </a>
diff --git a/jujugui/static/gui/src/app/init/utils.js b/jujugui/static/gui/src/app/init/utils.js
index 13ec44238a..9d5545f7dc 100644
--- a/jujugui/static/gui/src/app/init/utils.js
+++ b/jujugui/static/gui/src/app/init/utils.js
@@ -645,11 +645,13 @@ utils.getCloudProviderDetails = providerName => {
       },
       message: (
         <p>
-          Need help? Read more about <a className="deployment-panel__link"
+          Need help? Read more about <a
+            className="deployment-panel__link"
             href="https://jujucharms.com/docs/stable/credentials"
             target="_blank"
             title="Cloud credentials help">credentials in
-          general</a> or <a className="deployment-panel__link"
+          general</a> or <a
+            className="deployment-panel__link"
             href="https://jujucharms.com/docs/stable/help-google"
             target="_blank"
             title="Help using the Google Compute Engine public cloud">
@@ -679,11 +681,13 @@ utils.getCloudProviderDetails = providerName => {
       },
       message: (
         <p>
-          Need help? Read more about <a className="deployment-panel__link"
+          Need help? Read more about <a
+            className="deployment-panel__link"
             href="https://jujucharms.com/docs/stable/credentials"
             target="_blank"
             title="Cloud credentials help">credentials in
-          general</a> or <a className="deployment-panel__link"
+          general</a> or <a
+            className="deployment-panel__link"
             href="https://jujucharms.com/docs/stable/help-azure"
             target="_blank"
             title="Help using the Microsoft Azure public cloud">setting up
@@ -711,11 +715,13 @@ utils.getCloudProviderDetails = providerName => {
       },
       message: (
         <p>
-          Need help? Read more about <a className="deployment-panel__link"
+          Need help? Read more about <a
+            className="deployment-panel__link"
             href="https://jujucharms.com/docs/stable/credentials"
             target="_blank"
             title="Cloud credentials help">credentials in
-          general</a> or <a className="deployment-panel__link"
+          general</a> or <a
+            className="deployment-panel__link"
             href="https://jujucharms.com/docs/stable/help-aws"
             target="_blank"
             title="Help using the Amazon Web Service public cloud">setting up

From 075a347e34ea2eb9613dcfc98548b87b71b20d25 Mon Sep 17 00:00:00 2001
From: Jeff Pihach <jeff.pihach@canonical.com>
Date: Mon, 24 Sep 2018 17:45:50 -0600
Subject: [PATCH 3/9] Add object-curly-spacing eslint rule.

---
 .eslintrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.eslintrc b/.eslintrc
index ee17f4ae31..24ff68a870 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -30,6 +30,7 @@
     "no-undef": 2,
     "no-underscore-dangle": 0,
     "no-unused-vars": [2, { "args": "none" }],
+    "object-curly-spacing": 2,
     "quotes": [2, "single"],
     "react/jsx-curly-spacing": 2,
     "react/jsx-equals-spacing": 2,

From 3dcda860365974ac2927fc4e8e6121190b1dbbb2 Mon Sep 17 00:00:00 2001
From: Jeff Pihach <jeff.pihach@canonical.com>
Date: Mon, 24 Sep 2018 17:47:15 -0600
Subject: [PATCH 4/9] Run eslint --fix for object curly spacing.

---
 .../test-accordion-section.js                 |   2 +-
 .../added-services-list/item/item.js          |   2 +-
 .../added-services-list/item/test-item.js     |   8 +-
 .../test-added-services-list.js               |   4 +-
 .../address-form/test-address-form.js         |   4 +-
 .../boolean-config/boolean-config.js          |   4 +-
 .../boolean-config/test-boolean-config.js     |  10 +-
 .../budget-chart/test-budget-chart.js         |   2 +-
 .../components/budget-table/row/test-row.js   |  24 ++--
 .../components/card-form/test-card-form.js    |   2 +-
 .../components/charmbrowser/charmbrowser.js   |   2 +-
 .../check-list-item/test-check-list-item.js   |  10 +-
 .../constraints/test-constraints.js           |  16 +--
 .../test-copy-to-clipboard.js                 |   6 +-
 .../test-create-model-button.js               |   6 +-
 .../test-create-payment-user.js               |  22 +--
 .../date-display/test-date-display.js         |   4 +-
 .../notification/notification.js              |   4 +-
 .../notification/test-notification.js         |   6 +-
 .../deployment-bar/test-deployment-bar.js     |   4 +-
 .../deployment-flow/agreements/agreements.js  |   2 +-
 .../agreements/test-agreements.js             |   8 +-
 .../deployment-flow/budget/test-budget.js     |   2 +-
 .../change-item/test-change-item.js           |   4 +-
 .../deployment-flow/cloud/test-cloud.js       |   2 +-
 .../credential/test-credential.js             |  10 +-
 .../deployment-flow/deployment-flow.js        |  10 +-
 .../expert-budget/expert-budget.js            |   2 +-
 .../expert-budget/test-expert-budget.js       |   2 +-
 .../expert-intro/expert-intro.js              |   4 +-
 .../expert-intro/test-expert-intro.js         |   2 +-
 .../deployment-flow/login/test-login.js       |   2 +-
 .../deployment-flow/machines/test-machines.js |   4 +-
 .../model-name/test-model-name.js             |  10 +-
 .../deployment-flow/panel/test-panel.js       |   2 +-
 .../deployment-flow/payment/payment.js        |   2 +-
 .../deployment-flow/payment/test-payment.js   |   4 +-
 .../pricing/plan-table/plan-table.js          |   2 +-
 .../pricing/plan-table/test-plan-table.js     |   2 +-
 .../support-selection/plan/test-plan.js       |   4 +-
 .../deployment-flow/signup/test-signup.js     |   2 +-
 .../deployment-flow/sshkey/test-sshkey.js     |   8 +-
 .../deployment-flow/test-deployment-flow.js   |  24 ++--
 .../config-option/test-config-option.js       |   4 +-
 .../content/description/description.js        |   2 +-
 .../content/description/test-description.js   |   8 +-
 .../content/diagram/test-diagram.js           |   4 +-
 .../content/readme/test-readme.js             |   2 +-
 .../content/relations/test-relations.js       |   2 +-
 .../entity-details/entity-details.js          |   4 +-
 .../entity-details/header/header.js           |   2 +-
 .../entity-details/header/test-header.js      |   4 +-
 .../entity-details/test-entity-details.js     |   8 +-
 .../components/env-switcher/env-switcher.js   |   2 +-
 .../components/env-switcher/list/test-list.js |  12 +-
 .../env-switcher/test-env-switcher.js         |  16 +--
 .../app/components/expert-card/expert-card.js |   2 +-
 .../test-expert-contact-card.js               |   4 +-
 .../generic-input/test-generic-input.js       |   8 +-
 .../components/hash-link/test-hash-link.js    |   2 +-
 .../header-logo/test-header-logo.js           |   2 +-
 .../header-search/test-header-search.js       |  10 +-
 .../gui/src/app/components/help/test-help.js  |   4 +-
 .../inset-select/test-inset-select.js         |   4 +-
 .../change-version/change-version.js          |   2 +-
 .../change-version/item/test-item.js          |   2 +-
 .../change-version/test-change-version.js     |  10 +-
 .../inspector/config/test-config.js           |   8 +-
 .../inspector/confirm/test-confirm.js         |   4 +-
 .../inspector/expose/test-expose.js           |   6 +-
 .../inspector/expose/unit/test-unit.js        |   4 +-
 .../app/components/inspector/header/header.js |   2 +-
 .../src/app/components/inspector/inspector.js |   4 +-
 .../overview-action/test-overview-action.js   |   6 +-
 .../components/inspector/plan/test-plan.js    |   2 +-
 .../relate-to/endpoint/test-endpoint.js       |   4 +-
 .../inspector/relate-to/test-relate-to.js     |   4 +-
 .../relations/details/test-details.js         |   2 +-
 .../inspector/relations/test-relations.js     |  10 +-
 .../inspector/resources/list/test-list.js     |   2 +-
 .../inspector/scale-service/scale-service.js  |   2 +-
 .../scale-service/test-scale-service.js       |   6 +-
 .../service-overview/service-overview.js      |   2 +-
 .../service-overview/test-service-overview.js |  10 +-
 .../components/inspector/test-inspector.js    |   2 +-
 .../unit-details/test-unit-details.js         |   2 +-
 .../inspector/unit-details/unit-details.js    |   8 +-
 .../inspector/unit-list/test-unit-list.js     |  14 +-
 .../gui/src/app/components/link/test-link.js  |   6 +-
 .../local-charm-import-helpers.js             |   2 +-
 .../local-inspector/test-local-inspector.js   |   6 +-
 .../src/app/components/login/test-login.js    |  12 +-
 .../src/app/components/logout/test-logout.js  |   6 +-
 .../add-machine/test-add-machine.js           |   6 +-
 .../machine-view/column/test-column.js        |   4 +-
 .../machine-view/header/test-header.js        |   8 +-
 .../machine-unit/test-machine-unit.js         |   8 +-
 .../machine-view/machine/test-machine.js      |   4 +-
 .../machine-view/test-machine-view.js         |   6 +-
 .../unplaced-unit/test-unplaced-unit.js       |   2 +-
 .../modal-shortcuts/test-modal-shortcuts.js   |   4 +-
 .../model-actions/test-model-actions.js       |  18 +--
 .../notification-list/item/test-item.js       |   2 +-
 .../test-notification-list.js                 |  18 +--
 .../notification/test-notification.js         |  10 +-
 .../receipt-popup/test-receipt-popup.js       |   6 +-
 .../payment/charges/test-charges.js           |   2 +-
 .../payment/details/address/test-address.js   |   4 +-
 .../payment/details/test-details.js           |   2 +-
 .../payment/methods/method/test-method.js     |   4 +-
 .../payment/methods/test-methods.js           |   8 +-
 .../app/components/payment/test-payment.js    |   2 +-
 .../src/app/components/popup/test-popup.js    |   2 +-
 .../post-deployment/post-deployment.js        |   2 +-
 .../post-deployment/test-post-deployment.js   |   2 +-
 .../credential-list/delete/test-delete.js     |   6 +-
 .../app/components/profile/header/header.js   |   4 +-
 .../components/profile/header/test-header.js  |   8 +-
 .../profile/navigation/test-navigation.js     |  10 +-
 .../app/components/profile/test-profile.js    |  10 +-
 .../rs-details-item/test-rs-details-item.js   |   2 +-
 .../test-revenue-statement.js                 |   2 +-
 .../search-results/item/test-item.js          |   8 +-
 .../search-results/search-results.js          |   4 +-
 .../select-filter/test-select-filter.js       |   4 +-
 .../search-results/test-search-results.js     |   4 +-
 .../type-filter/test-type-filter.js           |   4 +-
 .../shared/basic-table/basic-table.js         |   2 +-
 .../shared/basic-table/cell/cell.js           |   2 +-
 .../components/shared/basic-table/row/row.js  |   4 +-
 .../shared/basic-table/test-basic-table.js    |   2 +-
 .../shared/button-row/test-button-row.js      |   4 +-
 .../expanding-row/test-expanding-row.js       |   8 +-
 .../shared/machine-unit/machine-unit.js       |   2 +-
 .../app/components/shared/machine/machine.js  |  12 +-
 .../app/components/shared/panel/test-panel.js |  10 +-
 .../application-list/application-list.js      |   2 +-
 .../components/shared/status/label/label.js   |   2 +-
 .../shared/status/label/test-label.js         |   4 +-
 .../remote-application-list.js                |   2 +-
 .../app/components/sharing/test-sharing.js    |  20 +--
 .../src/app/components/status/test-status.js  |   4 +-
 .../gui/src/app/components/store/store.js     |   2 +-
 .../src/app/components/store/test-store.js    |  12 +-
 .../string-config/input/test-input.js         |   2 +-
 .../components/string-config/string-config.js |   2 +-
 .../string-config/test-string-config.js       |  10 +-
 .../app/components/svg-icon/test-svg-icon.js  |   4 +-
 .../app/components/terminal/test-terminal.js  |  10 +-
 .../terms-popup/test-terms-popup.js           |   4 +-
 .../components/user-menu/test-user-menu.js    |   2 +-
 .../usso-login-link/test-usso-login-link.js   |   6 +-
 .../app/d3-components/test-d3-components.js   |   2 +-
 jujugui/static/gui/src/app/init/app.js        |  32 ++---
 .../gui/src/app/init/bundle-importer.js       |   6 +-
 jujugui/static/gui/src/app/init/test-app.js   |   8 +-
 .../gui/src/app/init/test-bundle-exporter.js  |  38 ++---
 .../gui/src/app/init/test-bundle-importer.js  |  38 ++---
 .../gui/src/app/init/test-deployer-mixin.js   |   6 +-
 .../gui/src/app/init/test-endpoint-utils.js   |   2 +-
 .../app/init/test-environment-change-set.js   | 120 ++++++++--------
 .../gui/src/app/init/test-relation-utils.js   |  20 +--
 jujugui/static/gui/src/app/init/test-utils.js |   2 +-
 .../gui/src/app/init/testing-factory.js       |   2 +-
 .../gui/src/app/init/topology/relation.js     |  18 +--
 .../gui/src/app/init/topology/service.js      |   2 +-
 .../src/app/init/topology/test-environment.js |  28 ++--
 .../src/app/init/topology/test-relation.js    |   6 +-
 .../gui/src/app/init/topology/test-service.js |  80 +++++------
 .../src/app/init/topology/test-topology.js    |   2 +-
 jujugui/static/gui/src/app/init/utils.js      |  16 +--
 .../static/gui/src/app/models/test-models.js  |  18 +--
 jujugui/static/gui/src/app/state/state.js     |   4 +-
 .../static/gui/src/app/state/test-state.js    | 130 +++++++++---------
 jujugui/static/gui/src/app/test-init.js       |  12 +-
 jujugui/static/gui/src/test/enzyme-setup.js   |   2 +-
 jujugui/static/gui/src/test/test_env_api.js   |  10 +-
 177 files changed, 720 insertions(+), 720 deletions(-)

diff --git a/jujugui/static/gui/src/app/components/accordion-section/test-accordion-section.js b/jujugui/static/gui/src/app/components/accordion-section/test-accordion-section.js
index 6856159ef3..221909dbe9 100644
--- a/jujugui/static/gui/src/app/components/accordion-section/test-accordion-section.js
+++ b/jujugui/static/gui/src/app/components/accordion-section/test-accordion-section.js
@@ -57,7 +57,7 @@ describe('AccordionSection', () => {
   });
 
   it('does not show chevron or content when there are no children', () => {
-    const wrapper = renderComponent({ children: null });
+    const wrapper = renderComponent({children: null});
     const expected = (
       <div
         className="accordion-section__content"
diff --git a/jujugui/static/gui/src/app/components/added-services-list/item/item.js b/jujugui/static/gui/src/app/components/added-services-list/item/item.js
index ab5690f141..d3b54cd02f 100644
--- a/jujugui/static/gui/src/app/components/added-services-list/item/item.js
+++ b/jujugui/static/gui/src/app/components/added-services-list/item/item.js
@@ -16,7 +16,7 @@ class AddedServicesListItem extends React.Component {
   */
   _getPriorityUnits(units) {
     var unitStatuses = initUtils.getUnitStatusCounts(units);
-    var top = { priority: 99, key: '', size: 0 };
+    var top = {priority: 99, key: '', size: 0};
     var status;
     for (var key in unitStatuses) {
       status = unitStatuses[key];
diff --git a/jujugui/static/gui/src/app/components/added-services-list/item/test-item.js b/jujugui/static/gui/src/app/components/added-services-list/item/test-item.js
index 0267e16041..ed444aa908 100644
--- a/jujugui/static/gui/src/app/components/added-services-list/item/test-item.js
+++ b/jujugui/static/gui/src/app/components/added-services-list/item/test-item.js
@@ -90,7 +90,7 @@ describe('AddedServicesListItem', function() {
         get: function() {
           return false;
         }};
-      const wrapper = renderComponent({ service });
+      const wrapper = renderComponent({service});
       const expected = (
         <span className="inspector-view__status-block">
           {statusIcon(status)}
@@ -112,7 +112,7 @@ describe('AddedServicesListItem', function() {
       get: function() {
         return false;
       }};
-    const wrapper = renderComponent({ service });
+    const wrapper = renderComponent({service});
     const expected = (
       <span className="inspector-view__status-block">
         {undefined}
@@ -133,7 +133,7 @@ describe('AddedServicesListItem', function() {
       get: function() {
         return false;
       }};
-    const wrapper = renderComponent({ service });
+    const wrapper = renderComponent({service});
     assert.equal(wrapper.find('.inspector-view__status--error').length, 1);
   });
 
@@ -150,7 +150,7 @@ describe('AddedServicesListItem', function() {
       get: function() {
         return false;
       }};
-    const wrapper = renderComponent({ service });
+    const wrapper = renderComponent({service});
     assert.equal(wrapper.find('.inspector-view__status--pending').length, 1);
   });
 
diff --git a/jujugui/static/gui/src/app/components/added-services-list/test-added-services-list.js b/jujugui/static/gui/src/app/components/added-services-list/test-added-services-list.js
index 84cee2c9ae..890137ff46 100644
--- a/jujugui/static/gui/src/app/components/added-services-list/test-added-services-list.js
+++ b/jujugui/static/gui/src/app/components/added-services-list/test-added-services-list.js
@@ -29,7 +29,7 @@ describe('AddedServicesList', () => {
   it('generates a list of added services list items', () => {
     const allServices = [{get: () => 1}, {get: () => 2}, {get: () => 3}];
     const services = {each: cb => allServices.forEach(cb)};
-    const component = renderComponent({ services });
+    const component = renderComponent({services});
     expect(component).toMatchSnapshot();
   });
 
@@ -43,7 +43,7 @@ describe('AddedServicesList', () => {
       }
     }}, {get: () => 3}];
     const services = {each: cb => allServices.forEach(cb)};
-    const component = renderComponent({ services });
+    const component = renderComponent({services});
     expect(component).toMatchSnapshot();
   });
 });
diff --git a/jujugui/static/gui/src/app/components/address-form/test-address-form.js b/jujugui/static/gui/src/app/components/address-form/test-address-form.js
index af272937c7..40924d350b 100644
--- a/jujugui/static/gui/src/app/components/address-form/test-address-form.js
+++ b/jujugui/static/gui/src/app/components/address-form/test-address-form.js
@@ -55,7 +55,7 @@ describe('AddressForm', function() {
   });
 
   it('can display a loading spinner', function() {
-    const wrapper = renderComponent({ getCountries: sinon.stub() });
+    const wrapper = renderComponent({getCountries: sinon.stub()});
     const expected = (
       <div className="address-form">
         <Spinner />
@@ -191,7 +191,7 @@ describe('AddressForm', function() {
   it('can abort requests when unmounting', function() {
     const abort = sinon.stub();
     getCountries = sinon.stub().returns({abort: abort});
-    const wrapper = renderComponent({ getCountries });
+    const wrapper = renderComponent({getCountries});
     wrapper.unmount();
     assert.equal(abort.callCount, 1);
   });
diff --git a/jujugui/static/gui/src/app/components/boolean-config/boolean-config.js b/jujugui/static/gui/src/app/components/boolean-config/boolean-config.js
index 0413ec0bb8..e033d705c6 100644
--- a/jujugui/static/gui/src/app/components/boolean-config/boolean-config.js
+++ b/jujugui/static/gui/src/app/components/boolean-config/boolean-config.js
@@ -8,7 +8,7 @@ const React = require('react');
 class BooleanConfig extends React.Component {
   constructor(props) {
     super(props);
-    this.state = { value: this._cleanConfig(this.props.config) };
+    this.state = {value: this._cleanConfig(this.props.config)};
   }
 
   /**
@@ -57,7 +57,7 @@ class BooleanConfig extends React.Component {
     // Due to a bug in React we must use target here because we aren't able
     // to simulate changes on currentTarget.
     // https://github.com/facebook/react/issues/4950
-    this.setState({ value: e.target.checked }, () => {
+    this.setState({value: e.target.checked}, () => {
       if (onChange) {
         onChange();
       }
diff --git a/jujugui/static/gui/src/app/components/boolean-config/test-boolean-config.js b/jujugui/static/gui/src/app/components/boolean-config/test-boolean-config.js
index 30fb30809d..944ca46c92 100644
--- a/jujugui/static/gui/src/app/components/boolean-config/test-boolean-config.js
+++ b/jujugui/static/gui/src/app/components/boolean-config/test-boolean-config.js
@@ -58,23 +58,23 @@ describe('BooleanConfig', function() {
   });
 
   it('renders an unchecked input based on config prop', function() {
-    const wrapper = renderComponent({ config: false });
+    const wrapper = renderComponent({config: false});
     assert.equal(wrapper.find('.boolean-config--input').prop('defaultChecked'), false);
   });
 
   it('supports string boolean config props (true)', function() {
-    const wrapper = renderComponent({ config: 'True' });
+    const wrapper = renderComponent({config: 'True'});
     assert.equal(wrapper.find('.boolean-config--input').prop('defaultChecked'), true);
   });
 
   it('supports string boolean config props (false)', function() {
-    const wrapper = renderComponent({ config: 'False' });
+    const wrapper = renderComponent({config: 'False'});
     assert.equal(wrapper.find('.boolean-config--input').prop('defaultChecked'), false);
   });
 
   it('can call an onChange method if supplied', function() {
     const onChange = sinon.stub();
-    const wrapper = renderComponent({ onChange });
+    const wrapper = renderComponent({onChange});
     wrapper.find('.boolean-config--input').simulate('change', {
       target: {
         checked: true
@@ -84,7 +84,7 @@ describe('BooleanConfig', function() {
   });
 
   it('can be disabled', function() {
-    const wrapper = renderComponent({ disabled: true });
+    const wrapper = renderComponent({disabled: true});
     assert.equal(wrapper.find('.boolean-config--input').prop('disabled'), true);
   });
 });
diff --git a/jujugui/static/gui/src/app/components/budget-chart/test-budget-chart.js b/jujugui/static/gui/src/app/components/budget-chart/test-budget-chart.js
index c7994dff1c..4cb070917e 100644
--- a/jujugui/static/gui/src/app/components/budget-chart/test-budget-chart.js
+++ b/jujugui/static/gui/src/app/components/budget-chart/test-budget-chart.js
@@ -19,7 +19,7 @@ describe('BudgetChart', function() {
         limit: 80
       }
     };
-    const wrapper = renderComponent({ budgets });
+    const wrapper = renderComponent({budgets});
     var expected = (
       <div className="budget-chart">
         <div className="budget-chart__chart twelve-col">
diff --git a/jujugui/static/gui/src/app/components/budget-table/row/test-row.js b/jujugui/static/gui/src/app/components/budget-table/row/test-row.js
index 02233c0927..a3aab41878 100644
--- a/jujugui/static/gui/src/app/components/budget-table/row/test-row.js
+++ b/jujugui/static/gui/src/app/components/budget-table/row/test-row.js
@@ -132,7 +132,7 @@ describe('BudgetTableRow', function() {
   });
 
   it('can render without plans', function() {
-    const wrapper = renderComponent({ withPlans: false });
+    const wrapper = renderComponent({withPlans: false});
     assert.equal(wrapper.find('.budget-table-row__plans').length, 0);
   });
 
@@ -170,7 +170,7 @@ describe('BudgetTableRow', function() {
         }
       }
     };
-    const wrapper = renderComponent({ service });
+    const wrapper = renderComponent({service});
     const expected = (
       <span className="budget-table-row__plan">{'plan 1'} ({'$5'})</span>);
     assert.compareJSX(wrapper.find('.budget-table-row__plan'), expected);
@@ -286,7 +286,7 @@ describe('BudgetTableRow', function() {
   it('will abort the request when unmounting', function() {
     var abort = sinon.stub();
     listPlansForCharm = sinon.stub().returns({abort: abort});
-    const wrapper = renderComponent({ listPlansForCharm });
+    const wrapper = renderComponent({listPlansForCharm});
     wrapper.unmount();
     assert.equal(abort.callCount, 1);
   });
@@ -296,7 +296,7 @@ describe('BudgetTableRow', function() {
       get: sinon.stub().returns(null)
     });
     const showTerms = sinon.stub();
-    const wrapper = renderComponent({ charmsGetById, showTerms });
+    const wrapper = renderComponent({charmsGetById, showTerms});
     assert.equal(showTerms.callCount, 0);
     assert.equal(wrapper.find('TermsPopup').length, 0);
   });
@@ -306,7 +306,7 @@ describe('BudgetTableRow', function() {
       get: sinon.stub().returns(['landscape-terms'])
     });
     const showTerms = sinon.stub();
-    const wrapper = renderComponent({ charmsGetById, parseTermId, showTerms });
+    const wrapper = renderComponent({charmsGetById, parseTermId, showTerms});
     const expected = (
       <div className={
         'two-col prepend-five no-margin-bottom budget-table-row__link ' +
@@ -325,7 +325,7 @@ describe('BudgetTableRow', function() {
       get: sinon.stub().returns(['landscape-terms'])
     });
     const showTerms = sinon.stub();
-    renderComponent({ charmsGetById, parseTermId, showTerms });
+    renderComponent({charmsGetById, parseTermId, showTerms});
     assert.equal(showTerms.callCount, 1);
     assert.equal(showTerms.args[0][0], 'landscape-terms');
     assert.isNull(showTerms.args[0][1]);
@@ -336,7 +336,7 @@ describe('BudgetTableRow', function() {
       get: sinon.stub().returns(['landscape-terms/15'])
     });
     const showTerms = sinon.stub();
-    renderComponent({ charmsGetById, parseTermId, showTerms });
+    renderComponent({charmsGetById, parseTermId, showTerms});
     assert.equal(showTerms.callCount, 1);
     assert.equal(showTerms.args[0][0], 'landscape-terms');
     assert.equal(showTerms.args[0][1], 15);
@@ -347,7 +347,7 @@ describe('BudgetTableRow', function() {
       get: sinon.stub().returns(['spinach/landscape-terms'])
     });
     const showTerms = sinon.stub();
-    renderComponent({ charmsGetById, parseTermId, showTerms });
+    renderComponent({charmsGetById, parseTermId, showTerms});
     assert.equal(showTerms.callCount, 1);
     assert.equal(showTerms.args[0][0], 'spinach/landscape-terms');
     assert.isNull(showTerms.args[0][1]);
@@ -358,7 +358,7 @@ describe('BudgetTableRow', function() {
       get: sinon.stub().returns(['spinach/landscape-terms/15'])
     });
     const showTerms = sinon.stub();
-    renderComponent({ charmsGetById, parseTermId, showTerms });
+    renderComponent({charmsGetById, parseTermId, showTerms});
     assert.equal(showTerms.callCount, 1);
     assert.equal(showTerms.args[0][0], 'spinach/landscape-terms');
     assert.equal(showTerms.args[0][1], 15);
@@ -377,7 +377,7 @@ describe('BudgetTableRow', function() {
       name: 'apache2',
       content: 'Apache2 terms.'
     });
-    const wrapper = renderComponent({ charmsGetById, parseTermId, showTerms });
+    const wrapper = renderComponent({charmsGetById, parseTermId, showTerms});
     wrapper.find('.budget-table-row__terms-link Button').props().action();
     wrapper.update();
     const popup = wrapper.find('TermsPopup');
@@ -390,7 +390,7 @@ describe('BudgetTableRow', function() {
 
   it('can handle errors when getting plans', function() {
     listPlansForCharm = sinon.stub().callsArgWith(1, 'uh oh!', null);
-    renderComponent({ listPlansForCharm });
+    renderComponent({listPlansForCharm});
     assert.equal(addNotification.callCount, 1);
     assert.deepEqual(addNotification.args[0][0], {
       title: 'Fetching plans failed',
@@ -404,7 +404,7 @@ describe('BudgetTableRow', function() {
       get: sinon.stub().returns(['landscape-terms', 'apache2-terms'])
     });
     const showTerms = sinon.stub().callsArgWith(2, 'uh oh!', null);
-    const wrapper = renderComponent({ charmsGetById, parseTermId, showTerms });
+    const wrapper = renderComponent({charmsGetById, parseTermId, showTerms});
     wrapper.find('.budget-table-row__terms-link Button').props().action();
     wrapper.update();
     assert.equal(addNotification.callCount, 2);
diff --git a/jujugui/static/gui/src/app/components/card-form/test-card-form.js b/jujugui/static/gui/src/app/components/card-form/test-card-form.js
index d7dc3d70ae..4d858129b1 100644
--- a/jujugui/static/gui/src/app/components/card-form/test-card-form.js
+++ b/jujugui/static/gui/src/app/components/card-form/test-card-form.js
@@ -45,7 +45,7 @@ describe('CardForm', function() {
     const createCardElement = sinon.stub().callsArgWith(0, {
       mount: mount
     });
-    const wrapper = renderComponent({ createCardElement });
+    const wrapper = renderComponent({createCardElement});
     const instance = wrapper.instance();
     instance.refs = {cardNode: {}};
     instance.componentDidMount();
diff --git a/jujugui/static/gui/src/app/components/charmbrowser/charmbrowser.js b/jujugui/static/gui/src/app/components/charmbrowser/charmbrowser.js
index e4d14acae9..32933deecd 100644
--- a/jujugui/static/gui/src/app/components/charmbrowser/charmbrowser.js
+++ b/jujugui/static/gui/src/app/components/charmbrowser/charmbrowser.js
@@ -159,7 +159,7 @@ class Charmbrowser extends React.Component {
       case 'entity-details':
         // TODO frankban: do we still really need this?
         const id = currentState.store || `~${currentState.user}`;
-        const { charmstore } = this.props;
+        const {charmstore} = this.props;
         activeChild = (
           <EntityDetails
             acl={this.props.acl}
diff --git a/jujugui/static/gui/src/app/components/check-list-item/test-check-list-item.js b/jujugui/static/gui/src/app/components/check-list-item/test-check-list-item.js
index d4354ef52a..16a2ac18ea 100644
--- a/jujugui/static/gui/src/app/components/check-list-item/test-check-list-item.js
+++ b/jujugui/static/gui/src/app/components/check-list-item/test-check-list-item.js
@@ -89,7 +89,7 @@ describe('CheckListItem', () => {
 
   it('calls the supplied whenChanged if supplied', () => {
     const whenChanged = sinon.stub();
-    const wrapper = renderComponent({ whenChanged });
+    const wrapper = renderComponent({whenChanged});
     wrapper.find('input').simulate('change', {
       currentTarget: {
         checked: true
@@ -101,18 +101,18 @@ describe('CheckListItem', () => {
 
   it('does not bubble the click event when clicking a checkbox', () => {
     const action = sinon.stub();
-    const wrapper = renderComponent({ action });
-    wrapper.find('input').simulate('click', { stopPropagation: sinon.stub() });
+    const wrapper = renderComponent({action});
+    wrapper.find('input').simulate('click', {stopPropagation: sinon.stub()});
     assert.equal(action.callCount, 0);
   });
 
   it('can have a disabled checkbox', () => {
-    const wrapper = renderComponent({ disabled: true });
+    const wrapper = renderComponent({disabled: true});
     assert.equal(wrapper.find('input').prop('disabled'), true);
   });
 
   it('can toggle the checkbox from the hit area', () => {
-    const wrapper = renderComponent({ action: sinon.stub() });
+    const wrapper = renderComponent({action: sinon.stub()});
     assert.equal(wrapper.find('input').prop('checked'), false);
     wrapper.find('.check-list-item__hit-area').simulate('click',
       {stopPropagation: sinon.stub()});
diff --git a/jujugui/static/gui/src/app/components/constraints/test-constraints.js b/jujugui/static/gui/src/app/components/constraints/test-constraints.js
index 956ac1e5c4..02ec49111b 100644
--- a/jujugui/static/gui/src/app/components/constraints/test-constraints.js
+++ b/jujugui/static/gui/src/app/components/constraints/test-constraints.js
@@ -188,7 +188,7 @@ describe('Constraints', function() {
 
   it('calls the provided method when the component is mounted', function() {
     const valuesChanged = sinon.stub();
-    renderComponent({ valuesChanged });
+    renderComponent({valuesChanged});
     assert.equal(valuesChanged.callCount, 1, 'valuesChanged.callCount');
     const args = valuesChanged.args[0];
     assert.equal(args.length, 1, 'args.length');
@@ -204,15 +204,15 @@ describe('Constraints', function() {
 
   it('calls the provided method when the values changed', function() {
     const valuesChanged = sinon.stub();
-    const wrapper = renderComponent({ valuesChanged });
+    const wrapper = renderComponent({valuesChanged});
     const instance = wrapper.instance();
     const refs = {};
-    refs.seriesConstraintSelect = { value: 'xenial' };
-    refs.archConstraintSelect = { value: 'i386' };
-    refs.cpuConstraintInput = { value: '1024' };
-    refs.coresConstraintInput = { value: '2' };
-    refs.memConstraintInput = { value: '2048' };
-    refs.diskConstraintInput = { value: '4096' };
+    refs.seriesConstraintSelect = {value: 'xenial'};
+    refs.archConstraintSelect = {value: 'i386'};
+    refs.cpuConstraintInput = {value: '1024'};
+    refs.coresConstraintInput = {value: '2'};
+    refs.memConstraintInput = {value: '2048'};
+    refs.diskConstraintInput = {value: '4096'};
     instance.refs = refs;
     wrapper.find('#cpu-constraint').simulate('change', refs.cpuConstraintInput);
     assert.equal(valuesChanged.callCount, 2, 'valuesChanged.callCount');
diff --git a/jujugui/static/gui/src/app/components/copy-to-clipboard/test-copy-to-clipboard.js b/jujugui/static/gui/src/app/components/copy-to-clipboard/test-copy-to-clipboard.js
index 46f2d61212..9b048a2268 100644
--- a/jujugui/static/gui/src/app/components/copy-to-clipboard/test-copy-to-clipboard.js
+++ b/jujugui/static/gui/src/app/components/copy-to-clipboard/test-copy-to-clipboard.js
@@ -20,7 +20,7 @@ describe('CopyToClipboard', function() {
         value={options.value} />,
       // Don't call componentDidMount as it requires nodes that don't exist in
       // the shallow renderer.
-      { disableLifecycleMethods: true });
+      {disableLifecycleMethods: true});
   };
 
   it('renders with a default value', function() {
@@ -46,7 +46,7 @@ describe('CopyToClipboard', function() {
   });
 
   it('can render with a provided className', function() {
-    const wrapper = renderComponent({ className: 'class-name' });
+    const wrapper = renderComponent({className: 'class-name'});
     assert.equal(wrapper.prop('className'), 'class-name');
     assert.equal(wrapper.find('input').prop('className'), 'class-name__input');
     assert.equal(wrapper.find('button').prop('className'), 'class-name__btn');
@@ -54,7 +54,7 @@ describe('CopyToClipboard', function() {
 
   it('renders a user-provided value properly', function() {
     var value = 'foobar';
-    const wrapper = renderComponent({ value });
+    const wrapper = renderComponent({value});
     assert.equal(wrapper.find('input').prop('value'), value,
       'Value is not set properly for input');
   });
diff --git a/jujugui/static/gui/src/app/components/create-model-button/test-create-model-button.js b/jujugui/static/gui/src/app/components/create-model-button/test-create-model-button.js
index 3dec3cacd2..ccf3819059 100644
--- a/jujugui/static/gui/src/app/components/create-model-button/test-create-model-button.js
+++ b/jujugui/static/gui/src/app/components/create-model-button/test-create-model-button.js
@@ -45,20 +45,20 @@ describe('CreateModelButton', () => {
   });
 
   it('renders a disabled button when provided with disabled state', () => {
-    const wrapper = renderComponent({ disabled: true });
+    const wrapper = renderComponent({disabled: true});
     assert.equal(wrapper.find('Button').prop('disabled'), true);
   });
 
   it('calls the passed action', () => {
     const action = sinon.stub();
-    const wrapper = renderComponent({ action });
+    const wrapper = renderComponent({action});
     wrapper.find('Button').props().action();
     assert.isTrue(action.called);
   });
 
   it('the passed action isn\'t called if button is disabled', () => {
     const action = sinon.stub();
-    const wrapper = renderComponent({ action, disabled: true });
+    const wrapper = renderComponent({action, disabled: true});
     wrapper.find('Button').props().action();
     assert.isFalse(action.called);
   });
diff --git a/jujugui/static/gui/src/app/components/create-payment-user/test-create-payment-user.js b/jujugui/static/gui/src/app/components/create-payment-user/test-create-payment-user.js
index bde85e834f..5b332b1774 100644
--- a/jujugui/static/gui/src/app/components/create-payment-user/test-create-payment-user.js
+++ b/jujugui/static/gui/src/app/components/create-payment-user/test-create-payment-user.js
@@ -62,7 +62,7 @@ describe('CreatePaymentUser', function() {
 
   it('can display a personal form', function() {
     const addNotification = sinon.stub();
-    const wrapper = renderComponent({ addNotification });
+    const wrapper = renderComponent({addNotification});
     const options = wrapper.find('input');
     const expected = (
       <div className="create-payment-user">
@@ -151,13 +151,13 @@ describe('CreatePaymentUser', function() {
           </div>
         </form>
       </div>);
-    wrapper.find('#personal').simulate('change', { target: { id: 'personal'} });
+    wrapper.find('#personal').simulate('change', {target: {id: 'personal'}});
     assert.compareJSX(wrapper, expected);
   });
 
   it('can display a business form', function() {
     const wrapper = renderComponent({});
-    wrapper.find('#business').simulate('change', { target: { id: 'business'} });
+    wrapper.find('#business').simulate('change', {target: {id: 'business'}});
     const inputs = wrapper.find('GenericInput');
     assert.equal(inputs.at(0).prop('label'), 'VAT number (optional)');
     assert.equal(inputs.at(1).prop('label'), 'Business name');
@@ -165,7 +165,7 @@ describe('CreatePaymentUser', function() {
 
   it('can display card and billing address fields', function() {
     const addNotification = sinon.stub();
-    const wrapper = renderComponent({ addNotification });
+    const wrapper = renderComponent({addNotification});
     wrapper.find('#cardAddressSame').simulate('change',
       {currentTarget: {checked: false}});
     wrapper.find('#billingAddressSame').simulate('change',
@@ -272,7 +272,7 @@ describe('CreatePaymentUser', function() {
   it('can handle errors when trying to create the token', function() {
     const addNotification = sinon.stub();
     stripe.createToken.callsArgWith(2, 'Uh oh!', null);
-    const wrapper = renderComponent({ addNotification });
+    const wrapper = renderComponent({addNotification});
     const instance = wrapper.instance();
     instance.refs = refs;
     wrapper.find('Button').props().action();
@@ -289,7 +289,7 @@ describe('CreatePaymentUser', function() {
     const wrapper = renderComponent();
     const instance = wrapper.instance();
     instance.refs = refs;
-    wrapper.find('#personal').simulate('change', { target: { id: 'personal'} });
+    wrapper.find('#personal').simulate('change', {target: {id: 'personal'}});
     wrapper.find('Button').props().action();
     assert.equal(payment.createUser.callCount, 1);
     assert.deepEqual(payment.createUser.args[0][0], {
@@ -338,7 +338,7 @@ describe('CreatePaymentUser', function() {
     };
     instance.refs = Object.assign(refs, extraRefs);
     instance.refs = refs;
-    wrapper.find('#business').simulate('change', { target: { id: 'business'} });
+    wrapper.find('#business').simulate('change', {target: {id: 'business'}});
     wrapper.update();
     wrapper.find('Button').props().action();
     assert.equal(payment.createUser.callCount, 1);
@@ -365,7 +365,7 @@ describe('CreatePaymentUser', function() {
       })
     };
     instance.refs = refs;
-    wrapper.find('#personal').simulate('change', { target: { id: 'personal'} });
+    wrapper.find('#personal').simulate('change', {target: {id: 'personal'}});
     wrapper.find('#billingAddressSame').simulate('change',
       {currentTarget: {checked: false}});
     wrapper.update();
@@ -407,10 +407,10 @@ describe('CreatePaymentUser', function() {
     const addNotification = sinon.stub();
     stripe.createToken.callsArgWith(2, null, {id: 'token_123'});
     payment.createUser.callsArgWith(1, 'Uh oh!', null);
-    const wrapper = renderComponent({ addNotification });
+    const wrapper = renderComponent({addNotification});
     const instance = wrapper.instance();
     instance.refs = refs;
-    wrapper.find('#personal').simulate('change', { target: { id: 'personal'} });
+    wrapper.find('#personal').simulate('change', {target: {id: 'personal'}});
     wrapper.find('Button').props().action();
     assert.equal(addNotification.callCount, 1);
     assert.deepEqual(addNotification.args[0][0], {
@@ -426,7 +426,7 @@ describe('CreatePaymentUser', function() {
     const wrapper = renderComponent();
     const instance = wrapper.instance();
     instance.refs = refs;
-    wrapper.find('#personal').simulate('change', { target: { id: 'personal'} });
+    wrapper.find('#personal').simulate('change', {target: {id: 'personal'}});
     wrapper.find('Button').props().action();
     assert.equal(onUserCreated.callCount, 1);
   });
diff --git a/jujugui/static/gui/src/app/components/date-display/test-date-display.js b/jujugui/static/gui/src/app/components/date-display/test-date-display.js
index cdb0e385f5..7916c1f792 100644
--- a/jujugui/static/gui/src/app/components/date-display/test-date-display.js
+++ b/jujugui/static/gui/src/app/components/date-display/test-date-display.js
@@ -37,7 +37,7 @@ describe('DateDisplay', () => {
   });
 
   it('can display a date in the correct format', () => {
-    const wrapper = renderComponent({ date: relative });
+    const wrapper = renderComponent({date: relative});
     const expected = (
       <time
         dateTime="19/01/2020"
@@ -48,7 +48,7 @@ describe('DateDisplay', () => {
   });
 
   it('can parse a date from a string', () => {
-    const wrapper = renderComponent({ date: 'Mon, 19 Jan 2020 21:07:24 GMT' });
+    const wrapper = renderComponent({date: 'Mon, 19 Jan 2020 21:07:24 GMT'});
     const expected = (
       <time
         dateTime="19/01/2020"
diff --git a/jujugui/static/gui/src/app/components/deployment-bar/notification/notification.js b/jujugui/static/gui/src/app/components/deployment-bar/notification/notification.js
index febc86d40e..fdce1b01f0 100644
--- a/jujugui/static/gui/src/app/components/deployment-bar/notification/notification.js
+++ b/jujugui/static/gui/src/app/components/deployment-bar/notification/notification.js
@@ -19,7 +19,7 @@ class DeploymentBarNotification extends React.Component {
     @method _hideNotification
   */
   _hideNotification() {
-    this.setState({ visible: false });
+    this.setState({visible: false});
   }
 
   componentDidMount() {
@@ -42,7 +42,7 @@ class DeploymentBarNotification extends React.Component {
       var oldId = prevProps && prevProps.change ? prevProps.change.id : null;
       // Only show the notification if we've received a new id.
       if (newId !== oldId) {
-        this.setState({ visible: true });
+        this.setState({visible: true});
         this.timeout = window.setTimeout(
           this._hideNotification.bind(this), 4000);
       }
diff --git a/jujugui/static/gui/src/app/components/deployment-bar/notification/test-notification.js b/jujugui/static/gui/src/app/components/deployment-bar/notification/test-notification.js
index 2cef11b628..c6488bdb09 100644
--- a/jujugui/static/gui/src/app/components/deployment-bar/notification/test-notification.js
+++ b/jujugui/static/gui/src/app/components/deployment-bar/notification/test-notification.js
@@ -33,7 +33,7 @@ describe('DeploymentBarNotification', function() {
     var change = {
       description: 'Django added'
     };
-    const wrapper = renderComponent({ change });
+    const wrapper = renderComponent({change});
     const expected = (
       <div
         className="deployment-bar__notification deployment-bar__notification--visible"
@@ -59,7 +59,7 @@ describe('DeploymentBarNotification', function() {
       id: 'service-added-1',
       description: 'Django added'
     };
-    const wrapper = renderComponent({ change });
+    const wrapper = renderComponent({change});
     assert.equal(
       wrapper.prop('className').includes('deployment-bar__notification--visible'), true);
     wrapper.simulate('click');
@@ -67,7 +67,7 @@ describe('DeploymentBarNotification', function() {
     assert.equal(window.setTimeout.callCount, 1);
     assert.equal(
       wrapper.prop('className').includes('deployment-bar__notification--visible'), false);
-    wrapper.setProps({ change });
+    wrapper.setProps({change});
     assert.equal(window.setTimeout.callCount, 1);
     assert.equal(
       wrapper.prop('className').includes('deployment-bar__notification--visible'), false);
diff --git a/jujugui/static/gui/src/app/components/deployment-bar/test-deployment-bar.js b/jujugui/static/gui/src/app/components/deployment-bar/test-deployment-bar.js
index 5e1e6eef48..ba008132e3 100644
--- a/jujugui/static/gui/src/app/components/deployment-bar/test-deployment-bar.js
+++ b/jujugui/static/gui/src/app/components/deployment-bar/test-deployment-bar.js
@@ -36,7 +36,7 @@ describe('DeploymentBar', function() {
 
   it('can render and pass the correct props', function() {
     var currentChangeSet = {one: 1, two: 2};
-    const wrapper = renderComponent({ currentChangeSet });
+    const wrapper = renderComponent({currentChangeSet});
     var expected = (
       <div className="deployment-bar">
         <DeploymentBarNotification
@@ -200,7 +200,7 @@ describe('DeploymentBar', function() {
     });
     wrapper.find('Button').props().action();
     assert.equal(changeState.callCount, 1);
-    assert.deepEqual(changeState.args[0][0], {gui: { deploy: ''}});
+    assert.deepEqual(changeState.args[0][0], {gui: {deploy: ''}});
     assert.equal(sendAnalytics.callCount, 1);
     assert.equal(sendAnalytics.args[0][0], 'Deployment Flow');
     assert.equal(sendAnalytics.args[0][1], 'Button click');
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/agreements/agreements.js b/jujugui/static/gui/src/app/components/deployment-flow/agreements/agreements.js
index 0521bdea79..263d528a0b 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/agreements/agreements.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/agreements/agreements.js
@@ -22,7 +22,7 @@ class DeploymentAgreements extends React.Component {
    Toggle the terms state.
   */
   _toggleTerms() {
-    this.setState({ showTerms: !this.state.showTerms });
+    this.setState({showTerms: !this.state.showTerms});
   }
 
   /**
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/agreements/test-agreements.js b/jujugui/static/gui/src/app/components/deployment-flow/agreements/test-agreements.js
index 47b0264001..fbf7dc3868 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/agreements/test-agreements.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/agreements/test-agreements.js
@@ -20,7 +20,7 @@ describe('DeploymentAgreements', function() {
   );
 
   beforeEach(() => {
-    acl = { isReadOnly: sinon.stub().returns(false) };
+    acl = {isReadOnly: sinon.stub().returns(false)};
     terms = [];
   });
 
@@ -44,7 +44,7 @@ describe('DeploymentAgreements', function() {
   });
 
   it('can display as disabled', function() {
-    const wrapper = renderComponent({ disabled: true });
+    const wrapper = renderComponent({disabled: true});
     assert.strictEqual(wrapper.find('input').prop('disabled'), true);
   });
 
@@ -56,7 +56,7 @@ describe('DeploymentAgreements', function() {
 
   it('can show the terms link', function() {
     terms = [{}, {}];
-    const wrapper = renderComponent({ showTerms: true });
+    const wrapper = renderComponent({showTerms: true});
     const expected = (
       <Button
         action={wrapper.find('Button').prop('action')}
@@ -68,7 +68,7 @@ describe('DeploymentAgreements', function() {
 
   it('can show the terms popup', function() {
     terms = [{}, {}];
-    const wrapper = renderComponent({ showTerms: true });
+    const wrapper = renderComponent({showTerms: true});
     wrapper.find('Button').props().action();
     wrapper.update();
     assert.equal(wrapper.find('TermsPopup').length, 1);
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/budget/test-budget.js b/jujugui/static/gui/src/app/components/deployment-flow/budget/test-budget.js
index 2868e23b2d..f302c2fbc7 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/budget/test-budget.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/budget/test-budget.js
@@ -175,7 +175,7 @@ describe('DeploymentBudget', function() {
   it('will abort the requests when unmounting', function() {
     var abort = sinon.stub();
     var listBudgets = sinon.stub().returns({abort: abort});
-    const wrapper = renderComponent({ listBudgets });
+    const wrapper = renderComponent({listBudgets});
     wrapper.unmount();
     assert.equal(abort.callCount, 1);
   });
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/change-item/test-change-item.js b/jujugui/static/gui/src/app/components/deployment-flow/change-item/test-change-item.js
index 89b4f77df5..c114f44fc4 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/change-item/test-change-item.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/change-item/test-change-item.js
@@ -27,7 +27,7 @@ describe('DeploymentChangeItem', function() {
 
   it('can display a sprite icon', function() {
     change.icon = 'my-icon';
-    const wrapper = renderComponent({ change });
+    const wrapper = renderComponent({change});
     const expected = (
       <div className="deployment-change-item">
         <span className="deployment-change-item__change">
@@ -64,7 +64,7 @@ describe('DeploymentChangeItem', function() {
   });
 
   it('can display without the time', function() {
-    const wrapper = renderComponent({ showTime: false });
+    const wrapper = renderComponent({showTime: false});
     assert.equal(wrapper.find('.deployment-change-item__time').length, 0);
   });
 });
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/cloud/test-cloud.js b/jujugui/static/gui/src/app/components/deployment-flow/cloud/test-cloud.js
index 46acbf1237..25419a24f4 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/cloud/test-cloud.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/cloud/test-cloud.js
@@ -92,7 +92,7 @@ describe('DeploymentCloud', function() {
   });
 
   it('can display the loading state', function() {
-    const wrapper = renderComponent({ listClouds: sinon.stub() });
+    const wrapper = renderComponent({listClouds: sinon.stub()});
     var expected = (
       <div className="deployment-cloud__loading">
         <Spinner />
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/credential/test-credential.js b/jujugui/static/gui/src/app/components/deployment-flow/credential/test-credential.js
index 62202a76c1..3af5f2278f 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/credential/test-credential.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/credential/test-credential.js
@@ -139,7 +139,7 @@ describe('DeploymentCredential', function() {
 
   it('selects an initial credential', function() {
     var setCredential = sinon.stub();
-    renderComponent({ setCredential });
+    renderComponent({setCredential});
     assert.equal(setCredential.callCount, 1);
     assert.equal(setCredential.args[0][0], 'lxd_admin@local_default');
   });
@@ -149,7 +149,7 @@ describe('DeploymentCredential', function() {
     credentials['new@test'] = {
       name: 'new@test'
     };
-    const wrapper = renderComponent({ setCredential });
+    const wrapper = renderComponent({setCredential});
     const instance = wrapper.instance();
     instance.refs = {credential: {setValue: sinon.stub()}};
     instance._getCredentials('new@test');
@@ -194,7 +194,7 @@ describe('DeploymentCredential', function() {
 
   it('clears the credential when displaying the form', function() {
     var setCredential = sinon.stub();
-    const wrapper = renderComponent({ setCredential });
+    const wrapper = renderComponent({setCredential});
     wrapper.find('InsetSelect').at(0).simulate('change', 'add-credential');
     assert.equal(setCredential.callCount, 2);
     assert.equal(setCredential.args[1][0], null);
@@ -230,7 +230,7 @@ describe('DeploymentCredential', function() {
     const addNotification = sinon.stub();
     controllerAPI.getCloudCredentialNames.callsArgWith(1, 'Uh oh!', null);
     controllerAPI.getCloudCredentials.callsArgWith(1, null, []);
-    renderComponent({ addNotification });
+    renderComponent({addNotification});
     assert.equal(addNotification.callCount, 1);
     assert.deepEqual(addNotification.args[0][0], {
       title: 'unable to get names for credentials',
@@ -242,7 +242,7 @@ describe('DeploymentCredential', function() {
   it('can handle errors when getting credentials', () => {
     const addNotification = sinon.stub();
     controllerAPI.getCloudCredentials.callsArgWith(1, 'Uh oh!', null);
-    renderComponent({ addNotification });
+    renderComponent({addNotification});
     assert.equal(addNotification.callCount, 1);
     assert.deepEqual(addNotification.args[0][0], {
       title: 'Unable to get credentials',
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/deployment-flow.js b/jujugui/static/gui/src/app/components/deployment-flow/deployment-flow.js
index 71c14d9528..a33b724136 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/deployment-flow.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/deployment-flow.js
@@ -80,18 +80,18 @@ class DeploymentFlow extends React.Component {
     // If the direct deploy data changes then get and store the new entity or
     // clear the state.
     const isDirectDeploy = !!(nextProps.ddData && nextProps.ddData.id);
-    this.setState({ isDirectDeploy });
+    this.setState({isDirectDeploy});
     if (isDirectDeploy) {
       if (nextProps.ddData.id !== this.props.ddData.id) {
         this._getDirectDeployEntity(nextProps.ddData.id);
       }
     } else {
-      this.setState({ ddEntity: null });
+      this.setState({ddEntity: null});
     }
   }
 
   componentDidUpdate(prevProps) {
-    const { hash } = this.props;
+    const {hash} = this.props;
     if (hash && (hash !== prevProps.hash)) {
       this._scrollDeploymentFlow(`#${hash}`);
     }
@@ -272,7 +272,7 @@ class DeploymentFlow extends React.Component {
     @param count {Int} The number of clouds.
   */
   _setCloudCount(count) {
-    this.setState({ cloudCount: count });
+    this.setState({cloudCount: count});
   }
 
   /**
@@ -912,7 +912,7 @@ class DeploymentFlow extends React.Component {
       return;
     }
     var cloud = this.state.cloud;
-    const { initUtils } = this.props;
+    const {initUtils} = this.props;
     return (
       <DeploymentSection
         completed={status.completed}
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/expert-budget/expert-budget.js b/jujugui/static/gui/src/app/components/deployment-flow/expert-budget/expert-budget.js
index 0e1d79a4fe..f29b563610 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/expert-budget/expert-budget.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/expert-budget/expert-budget.js
@@ -21,7 +21,7 @@ class DeploymentExpertBudget extends React.Component {
     @param {String} The select value.
   */
   _inputChange(value) {
-    this.setState({ budget: value });
+    this.setState({budget: value});
   }
 
   render() {
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/expert-budget/test-expert-budget.js b/jujugui/static/gui/src/app/components/deployment-flow/expert-budget/test-expert-budget.js
index d91e0a0522..c40e29901c 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/expert-budget/test-expert-budget.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/expert-budget/test-expert-budget.js
@@ -18,7 +18,7 @@ describe('DeploymentExpertBudget', () => {
   );
 
   it('can render', function() {
-    const wrapper = renderComponent({ budget: 99 });
+    const wrapper = renderComponent({budget: 99});
     const expected = (
       <div className="deployment-expert-budget">
         <div className="deployment-expert-budget__row">
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/expert-intro/expert-intro.js b/jujugui/static/gui/src/app/components/deployment-flow/expert-intro/expert-intro.js
index e2a11907a5..134681b564 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/expert-intro/expert-intro.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/expert-intro/expert-intro.js
@@ -45,7 +45,7 @@ class DeploymentExpertIntro extends React.Component {
   }
 
   render() {
-    const { entityModel } = this.props;
+    const {entityModel} = this.props;
     let content;
     if (!entityModel) {
       content = (
@@ -119,7 +119,7 @@ class DeploymentExpertIntro extends React.Component {
                     dangerouslySetInnerHTML={{__html: supportedDescription}}></div>
                   <Link
                     changeState={this.props.changeState}
-                    clickState={{ hash: 'support-level' }}
+                    clickState={{hash: 'support-level'}}
                     generatePath={this.props.generatePath}>
                     View other support options
                   </Link>
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/expert-intro/test-expert-intro.js b/jujugui/static/gui/src/app/components/deployment-flow/expert-intro/test-expert-intro.js
index afb9f4a349..ffe7e647f9 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/expert-intro/test-expert-intro.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/expert-intro/test-expert-intro.js
@@ -113,7 +113,7 @@ describe('DeploymentExpertIntro', () => {
                     dangerouslySetInnerHTML={{_html: 'md'}} />
                   <Link
                     changeState={sinon.stub()}
-                    clickState={{ hash: 'support-level' }}
+                    clickState={{hash: 'support-level'}}
                     generatePath={sinon.stub()}>
                     View other support options
                   </Link>
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/login/test-login.js b/jujugui/static/gui/src/app/components/deployment-flow/login/test-login.js
index 07ee43dd36..5ef325fd6b 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/login/test-login.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/login/test-login.js
@@ -91,7 +91,7 @@ describe('DeploymentLogin', function() {
   });
 
   it('can render for the direct deploy flow', function() {
-    const wrapper = renderComponent({ isDirectDeploy: true });
+    const wrapper = renderComponent({isDirectDeploy: true});
     const expected = (
       <div className="deployment-login__login">
         <DeploymentSection
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/machines/test-machines.js b/jujugui/static/gui/src/app/components/deployment-flow/machines/test-machines.js
index ccb29f2bb3..07cd6054d3 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/machines/test-machines.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/machines/test-machines.js
@@ -192,7 +192,7 @@ describe('DeploymentMachines', function() {
   });
 
   it('can render for a local cloud', function() {
-    const wrapper = renderComponent({ cloud: {name: 'localhost'} });
+    const wrapper = renderComponent({cloud: {name: 'localhost'}});
     var expected = (
       <p className="deployment-machines__message">
         These machines will be provisioned on {'localhost'}.&nbsp;
@@ -202,7 +202,7 @@ describe('DeploymentMachines', function() {
   });
 
   it('can render with unknown cloud', function() {
-    const wrapper = renderComponent({ cloud: null });
+    const wrapper = renderComponent({cloud: null});
     var expected = (
       <p className="deployment-machines__message">
         These machines will be provisioned on {'the cloud'}.&nbsp;
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/model-name/test-model-name.js b/jujugui/static/gui/src/app/components/deployment-flow/model-name/test-model-name.js
index 2d089ed2d9..1fa56dfee6 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/model-name/test-model-name.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/model-name/test-model-name.js
@@ -72,17 +72,17 @@ describe('DeploymentModelName', () => {
   });
 
   it('does not focus on the model name field when specified', () => {
-    const wrapper = renderComponent({ focusName: false });
+    const wrapper = renderComponent({focusName: false});
     const instance = wrapper.instance();
     const focus = sinon.stub();
-    instance.refs = { modelName: { focus } };
+    instance.refs = {modelName: {focus}};
     instance.componentDidMount();
     assert.equal(focus.callCount, 0);
   });
 
   it('can update the model name on blur', () => {
     const setModelName = sinon.stub();
-    const wrapper = renderComponent({ setModelName });
+    const wrapper = renderComponent({setModelName});
     wrapper.find('GenericInput').simulate('blur', {
       currentTarget: {
         value: 'snazzy-bundle'
@@ -94,7 +94,7 @@ describe('DeploymentModelName', () => {
 
   it('can update the model name on change', () => {
     const setModelName = sinon.stub();
-    const wrapper = renderComponent({ setModelName });
+    const wrapper = renderComponent({setModelName});
     wrapper.find('GenericInput').simulate('change', 'snazzy-bundle');
     assert.equal(setModelName.callCount, 1);
     assert.equal(setModelName.args[0][0], 'snazzy-bundle');
@@ -102,7 +102,7 @@ describe('DeploymentModelName', () => {
 
   it('does not update the model name if there is no value', () => {
     const setModelName = sinon.stub();
-    const wrapper = renderComponent({ setModelName });
+    const wrapper = renderComponent({setModelName});
     wrapper.find('GenericInput').simulate('blur', {
       currentTarget: {
         value: ''
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/panel/test-panel.js b/jujugui/static/gui/src/app/components/deployment-flow/panel/test-panel.js
index 86dbfbf712..8d3ccf7d38 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/panel/test-panel.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/panel/test-panel.js
@@ -76,7 +76,7 @@ describe('DeploymentPanel', function() {
 
   it('can close', function() {
     const changeState = sinon.stub();
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     wrapper.find('Button').props().action();
     assert.equal(changeState.callCount, 1);
     assert.deepEqual(changeState.args[0][0], {
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/payment/payment.js b/jujugui/static/gui/src/app/components/deployment-flow/payment/payment.js
index cbebde6e40..c0bc7a2382 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/payment/payment.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/payment/payment.js
@@ -123,7 +123,7 @@ class DeploymentPayment extends React.Component {
 
   render() {
     let content;
-    const { paymentUser } = this.props;
+    const {paymentUser} = this.props;
     const hasPaymentMethods = paymentUser && paymentUser.paymentMethods &&
       paymentUser.paymentMethods.length;
     if (this.state.loading) {
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/payment/test-payment.js b/jujugui/static/gui/src/app/components/deployment-flow/payment/test-payment.js
index 66d8f4c5e2..8499cfe260 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/payment/test-payment.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/payment/test-payment.js
@@ -62,13 +62,13 @@ describe('DeploymentPayment', function() {
 
   it('can store the user details', function() {
     const setPaymentUser = sinon.stub();
-    renderComponent({ setPaymentUser });
+    renderComponent({setPaymentUser});
     assert.equal(setPaymentUser.callCount, 1);
     assert.deepEqual(setPaymentUser.args[0][0], user);
   });
 
   it('can display payment methods', function() {
-    const wrapper = renderComponent({ paymentUser: user });
+    const wrapper = renderComponent({paymentUser: user});
     const expected = (
       <ul className="deployment-payment__methods twelve-col">
         {[<li
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/pricing/plan-table/plan-table.js b/jujugui/static/gui/src/app/components/deployment-flow/pricing/plan-table/plan-table.js
index c5011749bc..05fd8a818c 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/pricing/plan-table/plan-table.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/pricing/plan-table/plan-table.js
@@ -60,7 +60,7 @@ class DeploymentPlanTable extends React.Component {
     }
     const newPlans = this.state.plans;
     newPlans[charmId] = (plans || [])[0];
-    this.setState({ plans: newPlans });
+    this.setState({plans: newPlans});
   }
 
   /**
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/pricing/plan-table/test-plan-table.js b/jujugui/static/gui/src/app/components/deployment-flow/pricing/plan-table/test-plan-table.js
index c535d67162..a2c9b93cab 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/pricing/plan-table/test-plan-table.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/pricing/plan-table/test-plan-table.js
@@ -121,7 +121,7 @@ describe('DeploymentPlanTable', () => {
   it('can handle errors when getting plans', function() {
     const addNotification = sinon.stub();
     listPlansForCharm.callsArgWith(1, 'Uh oh!', null);
-    renderComponent({ addNotification });
+    renderComponent({addNotification});
     assert.equal(addNotification.callCount, 1);
     assert.deepEqual(addNotification.args[0][0], {
       title: 'Fetching plans failed',
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/pricing/support-selection/plan/test-plan.js b/jujugui/static/gui/src/app/components/deployment-flow/pricing/support-selection/plan/test-plan.js
index e69d43d3bb..a4ac790baf 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/pricing/support-selection/plan/test-plan.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/pricing/support-selection/plan/test-plan.js
@@ -63,14 +63,14 @@ describe('DeploymentSupportSelectionPlan', () => {
   });
 
   it('can display as selected', function() {
-    const wrapper = renderComponent({ selected: true });
+    const wrapper = renderComponent({selected: true});
     assert.equal(
       wrapper.prop('className').includes('deployment-support-select-plan--selected'),
       true);
   });
 
   it('can handle extra classes', function() {
-    const wrapper = renderComponent({ classes: ['extra'] });
+    const wrapper = renderComponent({classes: ['extra']});
     assert.equal(wrapper.prop('className').includes('extra'), true);
   });
 });
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/signup/test-signup.js b/jujugui/static/gui/src/app/components/deployment-flow/signup/test-signup.js
index 6190b06217..2553b0d426 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/signup/test-signup.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/signup/test-signup.js
@@ -122,7 +122,7 @@ describe('DeploymentSignup', function() {
 
   it('can navigate to the flow view', function() {
     const changeState = sinon.stub();
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     wrapper.find('Button').props().action();
     assert.equal(changeState.callCount, 1);
     assert.deepEqual(changeState.args[0][0], {
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/sshkey/test-sshkey.js b/jujugui/static/gui/src/app/components/deployment-flow/sshkey/test-sshkey.js
index e213f9a0fd..fe72fb5cd8 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/sshkey/test-sshkey.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/sshkey/test-sshkey.js
@@ -262,7 +262,7 @@ describe('DeploymentSSHKey', function() {
     });
 
     it('stores the SSH keys', function() {
-      const wrapper = renderComponent({ cloud: { cloudType: 'gce' } });
+      const wrapper = renderComponent({cloud: {cloudType: 'gce'}});
       const instance = wrapper.instance();
       instance.refs = {
         githubUsername: {
@@ -284,7 +284,7 @@ describe('DeploymentSSHKey', function() {
     });
 
     it('disables the add key button after keys stored', function() {
-      const wrapper = renderComponent({ cloud: { cloudType: 'gce' } });
+      const wrapper = renderComponent({cloud: {cloudType: 'gce'}});
       const instance = wrapper.instance();
       let githubUsername = 'spinach';
       instance.refs = {
@@ -321,7 +321,7 @@ describe('DeploymentSSHKey', function() {
     let instance, wrapper;
 
     beforeEach(() => {
-      wrapper = renderComponent({ cloud: { cloudType: 'gce' } });
+      wrapper = renderComponent({cloud: {cloudType: 'gce'}});
       instance = wrapper.instance();
       instance.refs = {
         sshSource: {getValue: () => 'launchpad'},
@@ -464,7 +464,7 @@ describe('DeploymentSSHKey', function() {
     let instance, wrapper;
 
     beforeEach(() => {
-      wrapper = renderComponent({ cloud: { cloudType: 'gce' } });
+      wrapper = renderComponent({cloud: {cloudType: 'gce'}});
       instance = wrapper.instance();
       instance.refs = {
         sshSource: {getValue: () => 'manual'},
diff --git a/jujugui/static/gui/src/app/components/deployment-flow/test-deployment-flow.js b/jujugui/static/gui/src/app/components/deployment-flow/test-deployment-flow.js
index eb68a7c940..e4376ef049 100644
--- a/jujugui/static/gui/src/app/components/deployment-flow/test-deployment-flow.js
+++ b/jujugui/static/gui/src/app/components/deployment-flow/test-deployment-flow.js
@@ -184,7 +184,7 @@ describe('DeploymentFlow', function() {
       withPlans: true
     });
     const instance = wrapper.instance();
-    instance.setState({ cloudCount: 2 });
+    instance.setState({cloudCount: 2});
     wrapper.update();
     const expected = (
       <div className="deployment-flow">
@@ -312,8 +312,8 @@ describe('DeploymentFlow', function() {
       modelCommitted: false
     });
     assert.equal(terms.getAgreementsByTerms.callCount, 1);
-    applications.push({ get: sinon.stub().returns('service2') });
-    wrapper.setProps({ applications });
+    applications.push({get: sinon.stub().returns('service2')});
+    wrapper.setProps({applications});
     assert.equal(terms.getAgreementsByTerms.callCount, 2);
     assert.deepEqual(terms.getAgreementsByTerms.args[0][0], ['service1-terms']);
   });
@@ -329,13 +329,13 @@ describe('DeploymentFlow', function() {
         one: {
           command: {
             method: '_deploy',
-            args: [{ charmURL: 'service1' }]
+            args: [{charmURL: 'service1'}]
           }
         },
         two: {
           command: {
             method: '_deploy',
-            args: [{ charmURL: 'mysql' }]
+            args: [{charmURL: 'mysql'}]
           }
         }
       }
@@ -346,7 +346,7 @@ describe('DeploymentFlow', function() {
 
   it('shows a spinnner when loading the direct deploy entity', () => {
     const wrapper = createDeploymentFlow({
-      ddData: { id: 'cs:bundle/kubernetes-core-8' },
+      ddData: {id: 'cs:bundle/kubernetes-core-8'},
       getEntity: sinon.stub()
     });
     assert.equal(wrapper.find('Spinner').length, 1);
@@ -413,7 +413,7 @@ describe('DeploymentFlow', function() {
     const wrapper = createDeploymentFlow({
       addNotification: addNotification,
       changeState: changeState,
-      ddData: { id: entityId },
+      ddData: {id: entityId},
       modelCommitted: false
     });
     const instance = wrapper.instance();
@@ -447,13 +447,13 @@ describe('DeploymentFlow', function() {
     const wrapper = createDeploymentFlow({
       addNotification: addNotification,
       changeState: changeState,
-      ddData: { id: entityId },
+      ddData: {id: entityId},
       modelCommitted: false
     });
     const instance = wrapper.instance();
     assert.equal(instance.state.isDirectDeploy, true);
     assert.deepEqual(instance.state.ddEntity, entityModel);
-    wrapper.setProps({ ddData: null });
+    wrapper.setProps({ddData: null});
     assert.equal(instance.state.isDirectDeploy, false);
     assert.strictEqual(instance.state.ddEntity, null);
   });
@@ -494,7 +494,7 @@ describe('DeploymentFlow', function() {
     assert.equal(wrapper.find('DeploymentAgreements').length, 0);
     assert.equal(wrapper.find('.deployment-flow__deploy-action').length, 0);
     const instance = wrapper.instance();
-    instance.setState({ budget: 125 });
+    instance.setState({budget: 125});
     wrapper.update();
     assert.equal(wrapper.find('DeploymentPayment').length, 1);
     assert.equal(wrapper.find('DeploymentAgreements').length, 1);
@@ -527,7 +527,7 @@ describe('DeploymentFlow', function() {
     const wrapper = createDeploymentFlow();
     const instance = wrapper.instance();
     instance.setState({
-      cloud: { name: 'cloud' },
+      cloud: {name: 'cloud'},
       cloudCount: 2
     });
     wrapper.update();
@@ -545,7 +545,7 @@ describe('DeploymentFlow', function() {
     const wrapper = createDeploymentFlow();
     const instance = wrapper.instance();
     instance.setState({
-      cloud: { name: 'cloud' },
+      cloud: {name: 'cloud'},
       cloudCount: 1
     });
     wrapper.update();
diff --git a/jujugui/static/gui/src/app/components/entity-details/content/config-option/test-config-option.js b/jujugui/static/gui/src/app/components/entity-details/content/config-option/test-config-option.js
index 6e1a3101c5..9c6d06ae28 100644
--- a/jujugui/static/gui/src/app/components/entity-details/content/config-option/test-config-option.js
+++ b/jujugui/static/gui/src/app/components/entity-details/content/config-option/test-config-option.js
@@ -20,7 +20,7 @@ describe('EntityContentConfigOption', function() {
       type: 'string',
       default: 'abc123'
     };
-    const wrapper = renderComponent({ option });
+    const wrapper = renderComponent({option});
     const expected = (
       <div className="entity-content__config-option">
         <dt
@@ -50,7 +50,7 @@ describe('EntityContentConfigOption', function() {
       description: 'Required password',
       type: 'string'
     };
-    const wrapper = renderComponent({ option });
+    const wrapper = renderComponent({option});
     assert.equal(wrapper.find('.entity-content__config-default').length, 0);
   });
 });
diff --git a/jujugui/static/gui/src/app/components/entity-details/content/description/description.js b/jujugui/static/gui/src/app/components/entity-details/content/description/description.js
index 5a40b1fb59..6546abb6a8 100644
--- a/jujugui/static/gui/src/app/components/entity-details/content/description/description.js
+++ b/jujugui/static/gui/src/app/components/entity-details/content/description/description.js
@@ -8,7 +8,7 @@ const React = require('react');
 const HashLink = require('../../../hash-link/hash-link');
 
 const EntityContentDescription = props => {
-  const { description } = props;
+  const {description} = props;
   if (!description) {
     return false;
   }
diff --git a/jujugui/static/gui/src/app/components/entity-details/content/description/test-description.js b/jujugui/static/gui/src/app/components/entity-details/content/description/test-description.js
index f6bba66ca1..b8f300bb89 100644
--- a/jujugui/static/gui/src/app/components/entity-details/content/description/test-description.js
+++ b/jujugui/static/gui/src/app/components/entity-details/content/description/test-description.js
@@ -20,10 +20,10 @@ describe('EntityContentDescription', function() {
 
   it('can render markdown in the description', () => {
     const description = 'A simple [link](http://google.com/).';
-    const wrapper = renderComponent({ description });
+    const wrapper = renderComponent({description});
     assert.deepEqual(
       wrapper.find('.entity-content__description-content').prop('dangerouslySetInnerHTML'),
-      { __html: '<p>A simple <a href="http://google.com/">link</a>.</p>\n' });
+      {__html: '<p>A simple <a href="http://google.com/">link</a>.</p>\n'});
   });
 
   describe('bundle', () => {
@@ -36,7 +36,7 @@ describe('EntityContentDescription', function() {
     });
 
     it('can render without description', () => {
-      const wrapper = renderComponent({ description: null });
+      const wrapper = renderComponent({description: null});
       assert.equal(wrapper.text(), false);
     });
 
@@ -63,7 +63,7 @@ describe('EntityContentDescription', function() {
     });
 
     it('can render without description', () => {
-      const wrapper = renderComponent({ description: null });
+      const wrapper = renderComponent({description: null});
       assert.equal(wrapper.text(), false);
     });
 
diff --git a/jujugui/static/gui/src/app/components/entity-details/content/diagram/test-diagram.js b/jujugui/static/gui/src/app/components/entity-details/content/diagram/test-diagram.js
index c9ff0bbaf0..8eddda087c 100644
--- a/jujugui/static/gui/src/app/components/entity-details/content/diagram/test-diagram.js
+++ b/jujugui/static/gui/src/app/components/entity-details/content/diagram/test-diagram.js
@@ -33,13 +33,13 @@ describe('EntityContentDiagram', function() {
   });
 
   it('can display a diagram as a row', () => {
-    const wrapper = renderComponent({ isRow: true });
+    const wrapper = renderComponent({isRow: true});
     assert.equal(wrapper.prop('className'),
       'entity-content__diagram row row--grey');
   });
 
   it('can display a diagram expand button', () => {
-    const wrapper = renderComponent({ isExpandable: true });
+    const wrapper = renderComponent({isExpandable: true});
     const expected = (
       <button
         className="entity-content__diagram-expand"
diff --git a/jujugui/static/gui/src/app/components/entity-details/content/readme/test-readme.js b/jujugui/static/gui/src/app/components/entity-details/content/readme/test-readme.js
index 5138825296..6f2d44d850 100644
--- a/jujugui/static/gui/src/app/components/entity-details/content/readme/test-readme.js
+++ b/jujugui/static/gui/src/app/components/entity-details/content/readme/test-readme.js
@@ -20,7 +20,7 @@ describe('EntityContentReadme', function() {
         getFile={options.getFile || sinon.stub()}
         hash={options.hash}
         scrollCharmbrowser={options.scrollCharmbrowser || sinon.stub()} />,
-      { disableLifecycleMethods: true });
+      {disableLifecycleMethods: true});
     const instance = wrapper.instance();
     // Stub the method for getting the container node so that the component
     // works in the shallow renderer.
diff --git a/jujugui/static/gui/src/app/components/entity-details/content/relations/test-relations.js b/jujugui/static/gui/src/app/components/entity-details/content/relations/test-relations.js
index 357903fdbe..6c141fcbd9 100644
--- a/jujugui/static/gui/src/app/components/entity-details/content/relations/test-relations.js
+++ b/jujugui/static/gui/src/app/components/entity-details/content/relations/test-relations.js
@@ -75,7 +75,7 @@ describe('EntityContentRelations', function() {
 
   it('can navigate to a relation', function() {
     var changeState = sinon.spy();
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     wrapper.find('.section__list-item').at(0).simulate('click');
     assert.equal(changeState.callCount, 1);
     assert.deepEqual(changeState.args[0][0], {
diff --git a/jujugui/static/gui/src/app/components/entity-details/entity-details.js b/jujugui/static/gui/src/app/components/entity-details/entity-details.js
index f23e131588..c6bb898f8a 100644
--- a/jujugui/static/gui/src/app/components/entity-details/entity-details.js
+++ b/jujugui/static/gui/src/app/components/entity-details/entity-details.js
@@ -5,7 +5,7 @@ const classNames = require('classnames');
 const PropTypes = require('prop-types');
 const React = require('react');
 const shapeup = require('shapeup');
-const { urls } = require('jaaslib');
+const {urls} = require('jaaslib');
 
 const EntityContent = require('./content/content');
 const EntityHeader = require('./header/header');
@@ -91,7 +91,7 @@ class EntityDetails extends React.Component {
         break;
       case 'entity-details':
         var entityModel = this.state.entityModel;
-        const { charmstore } = this.props;
+        const {charmstore} = this.props;
         activeChild = (
           <div>
             <EntityHeader
diff --git a/jujugui/static/gui/src/app/components/entity-details/header/header.js b/jujugui/static/gui/src/app/components/entity-details/header/header.js
index 913acd4314..2ae962e436 100644
--- a/jujugui/static/gui/src/app/components/entity-details/header/header.js
+++ b/jujugui/static/gui/src/app/components/entity-details/header/header.js
@@ -4,7 +4,7 @@
 const classNames = require('classnames');
 const PropTypes = require('prop-types');
 const React = require('react');
-const { urls } = require('jaaslib');
+const {urls} = require('jaaslib');
 
 const CopyToClipboard = require('../../copy-to-clipboard/copy-to-clipboard');
 const Button = require('../../shared/button/button');
diff --git a/jujugui/static/gui/src/app/components/entity-details/header/test-header.js b/jujugui/static/gui/src/app/components/entity-details/header/test-header.js
index b48a5d6301..70a705a8f3 100644
--- a/jujugui/static/gui/src/app/components/entity-details/header/test-header.js
+++ b/jujugui/static/gui/src/app/components/entity-details/header/test-header.js
@@ -28,7 +28,7 @@ describe('EntityHeader', function() {
       plans={options.plans}
       scrollPosition={
         options.scrollPosition === undefined ? 0 : options.scrollPosition} />,
-    { disableLifecycleMethods: true }
+    {disableLifecycleMethods: true}
   );
 
   beforeEach(function() {
@@ -275,7 +275,7 @@ describe('EntityHeader', function() {
     });
     const instance = wrapper.instance();
     // Change the select value to a plan.
-    instance.refs = { plan: { value: 'test-plan' } };
+    instance.refs = {plan: {value: 'test-plan'}};
     // Simulate a click.
     wrapper.find('Button').props().action();
     assert.equal(deployService.callCount, 1);
diff --git a/jujugui/static/gui/src/app/components/entity-details/test-entity-details.js b/jujugui/static/gui/src/app/components/entity-details/test-entity-details.js
index 8bb05bf30a..c6df226927 100644
--- a/jujugui/static/gui/src/app/components/entity-details/test-entity-details.js
+++ b/jujugui/static/gui/src/app/components/entity-details/test-entity-details.js
@@ -36,7 +36,7 @@ describe('EntityDetails', function() {
         setPageTitle={options.setPageTitle || sinon.stub()}
         showTerms={options.showTerms || sinon.stub()}
         staticURL={options.staticURL || 'http://example.com'} />,
-      { disableLifecycleMethods: true }
+      {disableLifecycleMethods: true}
     );
     const instance = wrapper.instance();
     instance.refs = {content: {focus: sinon.stub()}};
@@ -165,7 +165,7 @@ describe('EntityDetails', function() {
     const plans = ['plan1', 'plan2'];
     charmstore.getEntity.callsArgWith(1, null, [mockEntity]);
     const listPlansForCharm = sinon.stub().callsArgWith(1, null, plans);
-    const wrapper = renderComponent({ listPlansForCharm });
+    const wrapper = renderComponent({listPlansForCharm});
     assert.equal(wrapper.find('EntityHeader').prop('hasPlans'), true);
     assert.deepEqual(wrapper.find('EntityHeader').prop('plans'), plans);
     assert.equal(wrapper.find('EntityContent').prop('hasPlans'), true);
@@ -178,7 +178,7 @@ describe('EntityDetails', function() {
     mockEntity.hasMetrics = sinon.stub().returns(true);
     charmstore.getEntity.callsArgWith(1, null, [mockEntity]);
     const listPlansForCharm = sinon.stub().callsArgWith(1, 'An error', null);
-    const wrapper = renderComponent({ listPlansForCharm });
+    const wrapper = renderComponent({listPlansForCharm});
     assert.equal(wrapper.find('EntityHeader').prop('hasPlans'), true);
     assert.deepEqual(wrapper.find('EntityHeader').prop('plans'), []);
     assert.equal(wrapper.find('EntityContent').prop('hasPlans'), true);
@@ -190,7 +190,7 @@ describe('EntityDetails', function() {
     mockEntity.hasMetrics = sinon.stub().returns(false);
     const addNotification = sinon.stub();
     charmstore.getEntity.callsArgWith(1, 'Uh oh!', null);
-    renderComponent({ addNotification });
+    renderComponent({addNotification});
     assert.equal(addNotification.callCount, 1);
     assert.deepEqual(addNotification.args[0][0], {
       title: 'cannot fetch the entity',
diff --git a/jujugui/static/gui/src/app/components/env-switcher/env-switcher.js b/jujugui/static/gui/src/app/components/env-switcher/env-switcher.js
index 51432b9681..7707ee104e 100644
--- a/jujugui/static/gui/src/app/components/env-switcher/env-switcher.js
+++ b/jujugui/static/gui/src/app/components/env-switcher/env-switcher.js
@@ -79,7 +79,7 @@ class EnvSwitcher extends React.Component {
   _toggleEnvList(e) {
     e.preventDefault();
     this.updateEnvList();
-    this.setState({ showEnvList: !this.state.showEnvList });
+    this.setState({showEnvList: !this.state.showEnvList});
   }
 
   /**
diff --git a/jujugui/static/gui/src/app/components/env-switcher/list/test-list.js b/jujugui/static/gui/src/app/components/env-switcher/list/test-list.js
index 615a4d0379..3c3e2384fd 100644
--- a/jujugui/static/gui/src/app/components/env-switcher/list/test-list.js
+++ b/jujugui/static/gui/src/app/components/env-switcher/list/test-list.js
@@ -36,7 +36,7 @@ describe('EnvList', function() {
         lastConnection: new Date('Mon, 19 Jan 2020 21:07:24 GMT')
       }
     ];
-    const wrapper = renderComponent({ envs: models });
+    const wrapper = renderComponent({envs: models});
 
     const expected = (
       <ul
@@ -114,7 +114,7 @@ describe('EnvList', function() {
         owner: 'dalek@external'
       }
     ];
-    const wrapper = renderComponent({ envs: models });
+    const wrapper = renderComponent({envs: models});
     const expected = (
       <ul
         aria-expanded="true"
@@ -215,7 +215,7 @@ describe('EnvList', function() {
         lastConnection: new Date('Mon, 19 Jan 2020 21:07:24 GMT')
       }
     ];
-    const wrapper = renderComponent({ envs: models });
+    const wrapper = renderComponent({envs: models});
     const expected = (
       <ul
         aria-expanded="true"
@@ -278,7 +278,7 @@ describe('EnvList', function() {
     getAttribute.withArgs('data-id').returns('abc123');
     getAttribute.withArgs('data-name').returns('the name');
     getAttribute.withArgs('data-owner').returns('who@external');
-    const wrapper = renderComponent({ envs: models, handleModelClick });
+    const wrapper = renderComponent({envs: models, handleModelClick});
     wrapper.find('.env-list__environment').simulate('click', {
       currentTarget: {
         getAttribute: getAttribute
@@ -290,14 +290,14 @@ describe('EnvList', function() {
   it('new model call is made when clicking on the createm model button', function() {
     const handleModelClick = sinon.stub();
     const models = [{uuid: 'abc123', name: 'the name', owner: 'who@external'}];
-    const wrapper = renderComponent({ envs: models, handleModelClick });
+    const wrapper = renderComponent({envs: models, handleModelClick});
     wrapper.find('CreateModelButton').props().action();
     assert.equal(handleModelClick.callCount, 1);
   });
 
   it('new model is not made when user has incorrect permissions', () => {
     const acl = {canAddModels: sinon.stub().returns(false)};
-    const wrapper = renderComponent({ acl: acl });
+    const wrapper = renderComponent({acl: acl});
     assert.strictEqual(wrapper.find('CreateModelButton').prop('disabled'), true);
   });
 });
diff --git a/jujugui/static/gui/src/app/components/env-switcher/test-env-switcher.js b/jujugui/static/gui/src/app/components/env-switcher/test-env-switcher.js
index e8afaefe71..742ed66837 100644
--- a/jujugui/static/gui/src/app/components/env-switcher/test-env-switcher.js
+++ b/jujugui/static/gui/src/app/components/env-switcher/test-env-switcher.js
@@ -89,7 +89,7 @@ describe('EnvSwitcher', function() {
 
   it('can change the model name', () => {
     const setModelName = sinon.stub();
-    const wrapper = renderComponent({ setModelName });
+    const wrapper = renderComponent({setModelName});
     const instance = wrapper.instance();
     instance.refs = {
       name: {
@@ -103,7 +103,7 @@ describe('EnvSwitcher', function() {
 
   it('does not change the model name if there is an error', () => {
     const setModelName = sinon.stub();
-    const wrapper = renderComponent({ setModelName });
+    const wrapper = renderComponent({setModelName});
     const instance = wrapper.instance();
     instance.refs = {
       name: {
@@ -128,9 +128,9 @@ describe('EnvSwitcher', function() {
   });
 
   it('opens the list on click', () => {
-    const models = [{ isAlive: true }, { isAlive: true }];
+    const models = [{isAlive: true}, {isAlive: true}];
     const listModelsWithInfo = sinon.stub().callsArgWith(0, null, models);
-    const wrapper = renderComponent({ listModelsWithInfo });
+    const wrapper = renderComponent({listModelsWithInfo});
     assert.equal(wrapper.find('EnvList').length, 0);
     wrapper.find('.env-switcher__chevron').simulate('click', {
       preventDefault: () => null
@@ -143,7 +143,7 @@ describe('EnvSwitcher', function() {
 
   it('fetches a list of environments on mount', () => {
     const listModelsWithInfo = sinon.stub();
-    const wrapper = renderComponent({ listModelsWithInfo });
+    const wrapper = renderComponent({listModelsWithInfo});
     const instance = wrapper.instance();
     assert.equal(listModelsWithInfo.callCount, 1);
     const err = null;
@@ -157,7 +157,7 @@ describe('EnvSwitcher', function() {
 
   it('fetches the env list when opening', () => {
     const listModelsWithInfo = sinon.stub();
-    const wrapper = renderComponent({ listModelsWithInfo });
+    const wrapper = renderComponent({listModelsWithInfo});
     const instance = wrapper.instance();
     // Click the toggler
     wrapper.find('.env-switcher__chevron').simulate('click', {
@@ -185,7 +185,7 @@ describe('EnvSwitcher', function() {
     }];
     const listModelsWithInfo = sinon.stub();
     const switchModel = sinon.stub();
-    const wrapper = renderComponent({ listModelsWithInfo, switchModel });
+    const wrapper = renderComponent({listModelsWithInfo, switchModel});
     const instance = wrapper.instance();
     listModelsWithInfo.args[0][0](null, models);
     const model = {
@@ -201,7 +201,7 @@ describe('EnvSwitcher', function() {
   it('handles errors when getting models', function() {
     const addNotification = sinon.stub();
     const listModelsWithInfo = sinon.stub().callsArgWith(0, 'Uh oh!', null);
-    renderComponent({ listModelsWithInfo, addNotification });
+    renderComponent({listModelsWithInfo, addNotification});
     assert.equal(addNotification.callCount, 1);
     assert.deepEqual(addNotification.args[0][0], {
       title: 'unable to retrieve model list',
diff --git a/jujugui/static/gui/src/app/components/expert-card/expert-card.js b/jujugui/static/gui/src/app/components/expert-card/expert-card.js
index 5d06305dd2..22a407530e 100644
--- a/jujugui/static/gui/src/app/components/expert-card/expert-card.js
+++ b/jujugui/static/gui/src/app/components/expert-card/expert-card.js
@@ -8,7 +8,7 @@ const ExpertBlock = require('../expert-block/expert-block');
 
 class ExpertCard extends React.Component {
   render() {
-    const { expert } = this.props;
+    const {expert} = this.props;
     const logo = `${this.props.staticURL}/static/gui/build/app/assets/images/` +
       `non-sprites/experts/${expert.logo}`;
     return (
diff --git a/jujugui/static/gui/src/app/components/expert-contact-card/test-expert-contact-card.js b/jujugui/static/gui/src/app/components/expert-contact-card/test-expert-contact-card.js
index 7eea03b0af..e2b7aaf5c8 100644
--- a/jujugui/static/gui/src/app/components/expert-contact-card/test-expert-contact-card.js
+++ b/jujugui/static/gui/src/app/components/expert-contact-card/test-expert-contact-card.js
@@ -61,7 +61,7 @@ describe('ExpertContactCard', function() {
   });
 
   it('can render without a matching expert', () => {
-    const wrapper = renderComponent({ expert: 'spinach' });
+    const wrapper = renderComponent({expert: 'spinach'});
     assert.strictEqual(wrapper.html(), null);
   });
 
@@ -114,7 +114,7 @@ describe('ExpertContactCard', function() {
 
   it('can send analytics when the contact button is clicked', () => {
     const sendAnalytics = sinon.stub();
-    const wrapper = renderComponent({ sendAnalytics });
+    const wrapper = renderComponent({sendAnalytics});
     wrapper.find('Button').props().action();
     assert.equal(sendAnalytics.callCount, 1);
   });
diff --git a/jujugui/static/gui/src/app/components/generic-input/test-generic-input.js b/jujugui/static/gui/src/app/components/generic-input/test-generic-input.js
index d2b3294aa6..1f975f5f66 100644
--- a/jujugui/static/gui/src/app/components/generic-input/test-generic-input.js
+++ b/jujugui/static/gui/src/app/components/generic-input/test-generic-input.js
@@ -138,7 +138,7 @@ describe('GenericInput', function() {
   });
 
   it('can validate the form', () => {
-    const wrapper = renderComponent({ value: '' });
+    const wrapper = renderComponent({value: ''});
     const instance = wrapper.instance();
     instance.validate();
     wrapper.update();
@@ -184,19 +184,19 @@ describe('GenericInput', function() {
   });
 
   it('can validate the input when leaving', () => {
-    const wrapper = renderComponent({ value: '' });
+    const wrapper = renderComponent({value: ''});
     wrapper.find('input').props().onBlur();
     wrapper.update();
     assert.equal(wrapper.find('.generic-input__errors').length, 1);
   });
 
   it('allows the label to be optional', () => {
-    const wrapper = renderComponent({ label: null });
+    const wrapper = renderComponent({label: null});
     assert.equal(wrapper.find('.generic-input__label').length, 0);
   });
 
   it('adds a class to the wrapper element on error', () => {
-    const wrapper = renderComponent({ value: '' });
+    const wrapper = renderComponent({value: ''});
     wrapper.find('input').props().onBlur();
     wrapper.update();
     assert.equal(wrapper.prop('className').includes('has-error'), true);
diff --git a/jujugui/static/gui/src/app/components/hash-link/test-hash-link.js b/jujugui/static/gui/src/app/components/hash-link/test-hash-link.js
index ba4f175005..1278b886d6 100644
--- a/jujugui/static/gui/src/app/components/hash-link/test-hash-link.js
+++ b/jujugui/static/gui/src/app/components/hash-link/test-hash-link.js
@@ -30,7 +30,7 @@ describe('HashLink', () => {
 
   it('can change the hash state', () => {
     const changeState = sinon.stub();
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     wrapper.props().onClick();
     assert.equal(changeState.callCount, 1);
     assert.deepEqual(changeState.args[0][0], {
diff --git a/jujugui/static/gui/src/app/components/header-logo/test-header-logo.js b/jujugui/static/gui/src/app/components/header-logo/test-header-logo.js
index ce7aced189..b7323538f9 100644
--- a/jujugui/static/gui/src/app/components/header-logo/test-header-logo.js
+++ b/jujugui/static/gui/src/app/components/header-logo/test-header-logo.js
@@ -49,7 +49,7 @@ describe('HeaderLogo', function() {
   it('does not call showProfile on click in gisf', () => {
     const showProfile = sinon.stub();
     const preventDefault = sinon.stub();
-    const wrapper = renderComponent({ showProfile });
+    const wrapper = renderComponent({showProfile});
     // Call the click handler
     wrapper.props().onClick({preventDefault});
     assert.equal(preventDefault.callCount, 0);
diff --git a/jujugui/static/gui/src/app/components/header-search/test-header-search.js b/jujugui/static/gui/src/app/components/header-search/test-header-search.js
index c7064595a1..5e4cdc24a2 100644
--- a/jujugui/static/gui/src/app/components/header-search/test-header-search.js
+++ b/jujugui/static/gui/src/app/components/header-search/test-header-search.js
@@ -72,7 +72,7 @@ describe('HeaderSearch', function() {
       wrapper.find('.header-search__input').prop('value'), 'hexo');
     // re-render which will get the new state.
     delete appState.current.search;
-    wrapper.setProps({ appState });
+    wrapper.setProps({appState});
     // It should be emptied out when metadata.search is undefined.
     // It is important that this is an empty string with React 15.3+ because
     // it now treats an undefined value as the input being 'uncontrolled',
@@ -116,7 +116,7 @@ describe('HeaderSearch', function() {
     appState.current.store = '/u/hatch/juju-gui/precise/14';
     const wrapper = renderComponent();
     const instance = wrapper.instance();
-    instance.setState({ active: false });
+    instance.setState({active: false});
     instance._handleSearchFocus();
     assert.equal(appState.changeState.callCount, 1);
     assert.deepEqual(appState.changeState.args[0][0], {
@@ -164,7 +164,7 @@ describe('HeaderSearch', function() {
     };
     const wrapper = renderComponent();
     const instance = wrapper.instance();
-    instance.setState({ active: true });
+    instance.setState({active: true});
     wrapper.find('.header-search__submit').props().onClick({
       preventDefault: sinon.stub()
     });
@@ -192,7 +192,7 @@ describe('HeaderSearch', function() {
     };
     const wrapper = renderComponent();
     const instance = wrapper.instance();
-    instance.setState({ active: true });
+    instance.setState({active: true});
     wrapper.find('.header-search__submit').props().onClick({
       preventDefault: sinon.stub()
     });
@@ -220,7 +220,7 @@ describe('HeaderSearch', function() {
     };
     const wrapper = renderComponent();
     const instance = wrapper.instance();
-    instance.setState({ active: true });
+    instance.setState({active: true});
     wrapper.find('.header-search__submit').props().onClick({
       preventDefault: sinon.stub()
     });
diff --git a/jujugui/static/gui/src/app/components/help/test-help.js b/jujugui/static/gui/src/app/components/help/test-help.js
index 1bd15689ae..172680f4f0 100644
--- a/jujugui/static/gui/src/app/components/help/test-help.js
+++ b/jujugui/static/gui/src/app/components/help/test-help.js
@@ -19,12 +19,12 @@ describe('Help', () => {
   );
 
   it('renders', () => {
-    const wrapper = renderComponent({ gisf: true });
+    const wrapper = renderComponent({gisf: true});
     expect(wrapper).toMatchSnapshot();
   });
 
   it('renders for non-gisf', () => {
-    const wrapper = renderComponent({ gisf: false });
+    const wrapper = renderComponent({gisf: false});
     assert.equal(wrapper.find('.link').at(0).text(), 'Read the Juju docs');
     assert.equal(
       wrapper.find('.link').at(6).prop('href'),
diff --git a/jujugui/static/gui/src/app/components/inset-select/test-inset-select.js b/jujugui/static/gui/src/app/components/inset-select/test-inset-select.js
index e3bc18c29a..ba21bb1535 100644
--- a/jujugui/static/gui/src/app/components/inset-select/test-inset-select.js
+++ b/jujugui/static/gui/src/app/components/inset-select/test-inset-select.js
@@ -65,7 +65,7 @@ describe('InsetSelect', function() {
 
   it('can pass the field value to a supplied onChange method', () => {
     var onChange = sinon.stub();
-    const wrapper = renderComponent({ onChange });
+    const wrapper = renderComponent({onChange});
     var instance = wrapper.instance();
     instance.refs = {field: {value: 'new'}};
     wrapper.find('.inset-select__field').props().onChange();
@@ -74,7 +74,7 @@ describe('InsetSelect', function() {
   });
 
   it('allows the label to be optional', () => {
-    const wrapper = renderComponent({ label: null });
+    const wrapper = renderComponent({label: null});
     assert.equal(wrapper.find('.inset-select__label').length, 0);
   });
 });
diff --git a/jujugui/static/gui/src/app/components/inspector/change-version/change-version.js b/jujugui/static/gui/src/app/components/inspector/change-version/change-version.js
index 145283ed15..53f486a7ba 100644
--- a/jujugui/static/gui/src/app/components/inspector/change-version/change-version.js
+++ b/jujugui/static/gui/src/app/components/inspector/change-version/change-version.js
@@ -165,7 +165,7 @@ class InspectorChangeVersion extends React.Component {
       );
     }
     let components = [];
-    const { versions } = this.state;
+    const {versions} = this.state;
     if (!versions || versions.length === 1) {
       components = (
         <li className="inspector-change-version__none">
diff --git a/jujugui/static/gui/src/app/components/inspector/change-version/item/test-item.js b/jujugui/static/gui/src/app/components/inspector/change-version/item/test-item.js
index b5c5fb931a..c3a5c78a51 100644
--- a/jujugui/static/gui/src/app/components/inspector/change-version/item/test-item.js
+++ b/jujugui/static/gui/src/app/components/inspector/change-version/item/test-item.js
@@ -49,7 +49,7 @@ describe('InspectorChangeVersionItem', function() {
   });
 
   it('can show a downgrade label', function() {
-    const wrapper = renderComponent({ downgrade: true });
+    const wrapper = renderComponent({downgrade: true});
     assert.equal(wrapper.find('Button').children().text(), 'Downgrade');
   });
 
diff --git a/jujugui/static/gui/src/app/components/inspector/change-version/test-change-version.js b/jujugui/static/gui/src/app/components/inspector/change-version/test-change-version.js
index de139f87cd..8209643e63 100644
--- a/jujugui/static/gui/src/app/components/inspector/change-version/test-change-version.js
+++ b/jujugui/static/gui/src/app/components/inspector/change-version/test-change-version.js
@@ -40,13 +40,13 @@ describe('InspectorChangeVersion', function() {
   });
 
   it('can display a loading spinner', function() {
-    const wrapper = renderComponent({ getAvailableVersions: sinon.stub() });
+    const wrapper = renderComponent({getAvailableVersions: sinon.stub()});
     assert.equal(wrapper.find('Spinner').length, 1);
   });
 
   it('can display an empty versions list', function() {
     const getAvailableVersions = sinon.stub().callsArgWith(1, null, ['cs:django']);
-    const wrapper = renderComponent({ getAvailableVersions });
+    const wrapper = renderComponent({getAvailableVersions});
     const expected = (
       <ul className="inspector-change-version__versions">
         <li className="inspector-change-version__none">
@@ -94,7 +94,7 @@ describe('InspectorChangeVersion', function() {
 
   it('can display a message if there is a get versions failure', function() {
     var getAvailableVersions = sinon.stub().callsArg(1, 'bad wolf', []);
-    const wrapper = renderComponent({ getAvailableVersions });
+    const wrapper = renderComponent({getAvailableVersions});
     const expected = (
       <ul className="inspector-change-version__versions">
         <li className="inspector-change-version__none">
@@ -106,7 +106,7 @@ describe('InspectorChangeVersion', function() {
 
   it('can navigate to the current charm version details', function() {
     var changeState = sinon.stub();
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     wrapper.find('.inspector-change-version__current-version').props().onClick();
     assert.equal(changeState.callCount, 1);
     assert.deepEqual(changeState.args[0][0], {
@@ -116,7 +116,7 @@ describe('InspectorChangeVersion', function() {
 
   it('can navigate to another charm version details', function() {
     var changeState = sinon.stub();
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     wrapper.find('InspectorChangeVersionItem').at(0).props().itemAction();
     assert.equal(changeState.callCount, 1);
     assert.deepEqual(changeState.args[0][0], {
diff --git a/jujugui/static/gui/src/app/components/inspector/config/test-config.js b/jujugui/static/gui/src/app/components/inspector/config/test-config.js
index dcdada7869..11a8809458 100644
--- a/jujugui/static/gui/src/app/components/inspector/config/test-config.js
+++ b/jujugui/static/gui/src/app/components/inspector/config/test-config.js
@@ -62,7 +62,7 @@ describe('Configuration', function() {
     const option1key = 'string body value';
     const option2key = true;
     const charmGet = sinon.stub();
-    charmGet.withArgs('options').returns({ option1: option1, option2: option2 });
+    charmGet.withArgs('options').returns({option1: option1, option2: option2});
     charmGet.withArgs('name').returns('apache2');
     charm = {
       get: charmGet
@@ -72,7 +72,7 @@ describe('Configuration', function() {
     serviceGet.withArgs('name').returns('ghost');
     serviceGet.withArgs('series').returns('trusty');
     serviceGet.withArgs('config').returns(
-      { option1: option1key, option2: option2key });
+      {option1: option1key, option2: option2key});
     service = {
       get: serviceGet,
       set: sinon.stub()
@@ -321,7 +321,7 @@ describe('Configuration', function() {
 
   it('can handle cancelling the changes', function() {
     var changeState = sinon.stub();
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     wrapper.find('.inspector-config__buttons ButtonRow').prop('buttons')[0].action();
     assert.equal(changeState.callCount, 1);
     assert.deepEqual(changeState.args[0][0], {
@@ -334,7 +334,7 @@ describe('Configuration', function() {
 
   it('can open the file dialog when the button is clicked', function() {
     var changeState = sinon.stub();
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     const instance = wrapper.instance();
     wrapper.find('.inspector-config__config-file ButtonRow').prop('buttons')[0].action();
     assert.equal(instance.refs.file.click.callCount, 1);
diff --git a/jujugui/static/gui/src/app/components/inspector/confirm/test-confirm.js b/jujugui/static/gui/src/app/components/inspector/confirm/test-confirm.js
index 93645cd220..ff218a39b0 100644
--- a/jujugui/static/gui/src/app/components/inspector/confirm/test-confirm.js
+++ b/jujugui/static/gui/src/app/components/inspector/confirm/test-confirm.js
@@ -46,14 +46,14 @@ describe('InspectorConfirm', function() {
   });
 
   it('generates the correct classes if it is open', function() {
-    const wrapper = renderComponent({ open: true });
+    const wrapper = renderComponent({open: true});
     assert.equal(
       wrapper.prop('className').includes('inspector-confirm--open'),
       true);
   });
 
   it('hides the message if one is not provided', function() {
-    const wrapper = renderComponent({ message: null });
+    const wrapper = renderComponent({message: null});
     const expected = (
       <p className="inspector-confirm__message hidden">
         {undefined}
diff --git a/jujugui/static/gui/src/app/components/inspector/expose/test-expose.js b/jujugui/static/gui/src/app/components/inspector/expose/test-expose.js
index 281928d097..63abfd92a2 100644
--- a/jujugui/static/gui/src/app/components/inspector/expose/test-expose.js
+++ b/jujugui/static/gui/src/app/components/inspector/expose/test-expose.js
@@ -67,7 +67,7 @@ describe('InspectorExpose', function() {
       {id: 'django/2'}
     ];
     var units = {toArray: sinon.stub().returns(unitList)};
-    const wrapper = renderComponent({ units });
+    const wrapper = renderComponent({units});
     const expected = (
       <ul className="inspector-expose__units">
         <InspectorExposeUnit
@@ -84,7 +84,7 @@ describe('InspectorExpose', function() {
 
   it('can navigate to a unit', function() {
     var changeState = sinon.stub();
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     wrapper.find('InspectorExposeUnit').at(0).props().action({
       currentTarget: {
         getAttribute: sinon.stub().returns('django/1')
@@ -121,7 +121,7 @@ describe('InspectorExpose', function() {
     modelAPI.exposeService.callsArgWith(1, {err: 'error'});
     var addNotification = sinon.stub();
     service.get.withArgs('exposed').returns(false);
-    const wrapper = renderComponent({ addNotification });
+    const wrapper = renderComponent({addNotification});
     wrapper.find('BooleanConfig').props().onChange();
     assert.equal(addNotification.callCount, 1);
     assert.equal(addNotification.args[0][0].title, 'Exposing charm failed');
diff --git a/jujugui/static/gui/src/app/components/inspector/expose/unit/test-unit.js b/jujugui/static/gui/src/app/components/inspector/expose/unit/test-unit.js
index bb4b94aaa1..b329bceb20 100644
--- a/jujugui/static/gui/src/app/components/inspector/expose/unit/test-unit.js
+++ b/jujugui/static/gui/src/app/components/inspector/expose/unit/test-unit.js
@@ -27,7 +27,7 @@ describe('InspectorExposeUnit', function() {
       }],
       public_address: '20.20.20.199'
     };
-    const wrapper = renderComponent({ unit });
+    const wrapper = renderComponent({unit});
     var expected = (
       <li
         className="inspector-expose__unit"
@@ -74,7 +74,7 @@ describe('InspectorExposeUnit', function() {
       id: 'django/1',
       displayName: 'django/1'
     };
-    const wrapper = renderComponent({ unit });
+    const wrapper = renderComponent({unit});
     assert.equal(
       wrapper.find('.inspector-expose__unit-detail').at(1).text(),
       'No public address');
diff --git a/jujugui/static/gui/src/app/components/inspector/header/header.js b/jujugui/static/gui/src/app/components/inspector/header/header.js
index 0831aa7de3..050cdea8fe 100644
--- a/jujugui/static/gui/src/app/components/inspector/header/header.js
+++ b/jujugui/static/gui/src/app/components/inspector/header/header.js
@@ -5,7 +5,7 @@ const classNames = require('classnames');
 const PropTypes = require('prop-types');
 const React = require('react');
 const ReactDOM = require('react-dom');
-const { urls } = require('jaaslib');
+const {urls} = require('jaaslib');
 
 class InspectorHeader extends React.Component {
   /**
diff --git a/jujugui/static/gui/src/app/components/inspector/inspector.js b/jujugui/static/gui/src/app/components/inspector/inspector.js
index 856f05bd2a..aca45bae5a 100644
--- a/jujugui/static/gui/src/app/components/inspector/inspector.js
+++ b/jujugui/static/gui/src/app/components/inspector/inspector.js
@@ -43,7 +43,7 @@ class Inspector extends React.Component {
     @return {Object} A generated state object which can be passed to setState.
   */
   generateState(nextProps) {
-    const { modelAPI } = nextProps;
+    const {modelAPI} = nextProps;
     const service = nextProps.service;
     const serviceId = service.get('id');
     const appState = this.props.appState;
@@ -167,7 +167,7 @@ class Inspector extends React.Component {
                 unitStatus: unitStatus}}}};
         break;
       case 'scale':
-        const { initUtils } = nextProps;
+        const {initUtils} = nextProps;
         state.activeChild = {
           title: 'Scale',
           icon: service.get('icon'),
diff --git a/jujugui/static/gui/src/app/components/inspector/overview-action/test-overview-action.js b/jujugui/static/gui/src/app/components/inspector/overview-action/test-overview-action.js
index b034b36456..3a51ccbfc1 100644
--- a/jujugui/static/gui/src/app/components/inspector/overview-action/test-overview-action.js
+++ b/jujugui/static/gui/src/app/components/inspector/overview-action/test-overview-action.js
@@ -22,7 +22,7 @@ describe('OverviewAction', function() {
 
   it('calls the callable provided when clicked', function() {
     const action = sinon.stub();
-    const wrapper = renderComponent({ action });
+    const wrapper = renderComponent({action});
     wrapper.simulate('click');
     assert.equal(action.callCount, 1);
   });
@@ -33,7 +33,7 @@ describe('OverviewAction', function() {
   });
 
   it('sets the provided icon', function() {
-    const wrapper = renderComponent({ icon: 'action-icon' });
+    const wrapper = renderComponent({icon: 'action-icon'});
     const expected = (
       <span className="overview-action__icon">
         <SvgIcon
@@ -80,7 +80,7 @@ describe('OverviewAction', function() {
   });
 
   it('sets the value', function() {
-    const wrapper = renderComponent({ value: '5' });
+    const wrapper = renderComponent({value: '5'});
     assert.equal(wrapper.find('.overview-action__value').text(), '5');
   });
 
diff --git a/jujugui/static/gui/src/app/components/inspector/plan/test-plan.js b/jujugui/static/gui/src/app/components/inspector/plan/test-plan.js
index 6027fac33f..efd44db8c3 100644
--- a/jujugui/static/gui/src/app/components/inspector/plan/test-plan.js
+++ b/jujugui/static/gui/src/app/components/inspector/plan/test-plan.js
@@ -27,7 +27,7 @@ describe('InspectorPlan', () => {
       price: 'price/goes/here',
       url: 'canonical-landscape/24-7'
     };
-    const wrapper = renderComponent({ currentPlan });
+    const wrapper = renderComponent({currentPlan});
     var expected = (
       <div className="inspector-plan">
         <div className="inspector-plan__details">
diff --git a/jujugui/static/gui/src/app/components/inspector/relate-to/endpoint/test-endpoint.js b/jujugui/static/gui/src/app/components/inspector/relate-to/endpoint/test-endpoint.js
index b96d4b07a6..ffc7ed4eab 100644
--- a/jujugui/static/gui/src/app/components/inspector/relate-to/endpoint/test-endpoint.js
+++ b/jujugui/static/gui/src/app/components/inspector/relate-to/endpoint/test-endpoint.js
@@ -49,7 +49,7 @@ describe('InspectorRelateToEndpoint', () => {
   });
 
   it('can render when there are no relatable endpoints', () => {
-    const wrapper = renderComponent({ endpoints: [] });
+    const wrapper = renderComponent({endpoints: []});
     assert.equal(
       wrapper.find('.inspector-relate-to-endpoint__message').text(),
       'No relatable endpoints for these applications.');
@@ -68,7 +68,7 @@ describe('InspectorRelateToEndpoint', () => {
     // Trigger the checkbox for the available relation
     instance.refs = {
       'InspectorRelateToEndpoint-0': {
-        state: { checked: true }}};
+        state: {checked: true}}};
     wrapper.find('CheckListItem').props().whenChanged();
     // Click the add relation button
     wrapper.find('ButtonRow').prop('buttons')[0].action();
diff --git a/jujugui/static/gui/src/app/components/inspector/relate-to/test-relate-to.js b/jujugui/static/gui/src/app/components/inspector/relate-to/test-relate-to.js
index d28e9bc13f..c931f0696b 100644
--- a/jujugui/static/gui/src/app/components/inspector/relate-to/test-relate-to.js
+++ b/jujugui/static/gui/src/app/components/inspector/relate-to/test-relate-to.js
@@ -13,7 +13,7 @@ describe('InspectorRelateTo', function() {
       application={options.application || {}}
       changeState={options.changeState || sinon.stub()}
       relatableApplications={options.relatableApplications || [{
-        getAttrs: () => ({ id: 'id', name: 'name', icon: 'icon'})
+        getAttrs: () => ({id: 'id', name: 'name', icon: 'icon'})
       }]} />
   );
 
@@ -39,7 +39,7 @@ describe('InspectorRelateTo', function() {
   });
 
   it('can render when there are no relatable endpoints', () => {
-    const wrapper = renderComponent({ relatableApplications: [] });
+    const wrapper = renderComponent({relatableApplications: []});
     assert.equal(
       wrapper.find('.unit-list__message').text(),
       'No relatable endpoints available.');
diff --git a/jujugui/static/gui/src/app/components/inspector/relations/details/test-details.js b/jujugui/static/gui/src/app/components/inspector/relations/details/test-details.js
index d7b9cf7b18..5544568667 100644
--- a/jujugui/static/gui/src/app/components/inspector/relations/details/test-details.js
+++ b/jujugui/static/gui/src/app/components/inspector/relations/details/test-details.js
@@ -26,7 +26,7 @@ describe('InspectorRelationDetails', function() {
       interface: 'postgresql',
       scope: 'global'
     };
-    const wrapper = renderComponent({ relation });
+    const wrapper = renderComponent({relation});
     var expected = (<div className='inspector-relation-details__properties'>
       <p className='inspector-relation-details__property'>
         Interface: {relation.interface}
diff --git a/jujugui/static/gui/src/app/components/inspector/relations/test-relations.js b/jujugui/static/gui/src/app/components/inspector/relations/test-relations.js
index fa14dc9e79..434094f96b 100644
--- a/jujugui/static/gui/src/app/components/inspector/relations/test-relations.js
+++ b/jujugui/static/gui/src/app/components/inspector/relations/test-relations.js
@@ -108,7 +108,7 @@ describe('InspectorRelations', function() {
 
   it('can show relation details on click', function() {
     var changeState = sinon.stub();
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     wrapper.find('CheckListItem').at(1).props().action();
     assert.deepEqual(changeState.args[0][0].gui.inspector, {
       activeComponent: 'relation',
@@ -126,7 +126,7 @@ describe('InspectorRelations', function() {
   });
 
   it('renders if there are no relations', () => {
-    const wrapper = renderComponent({ serviceRelations: [] });
+    const wrapper = renderComponent({serviceRelations: []});
     assert.equal(
       wrapper.find('.inspector-relations__message').text(),
       'No active relations for this application.');
@@ -161,7 +161,7 @@ describe('InspectorRelations', function() {
 
   it('can remove the selected relations', function() {
     var destroyRelations = sinon.stub();
-    const wrapper = renderComponent({ destroyRelations });
+    const wrapper = renderComponent({destroyRelations});
     const instance = wrapper.instance();
     instance.refs = {
       'CheckListItem-mysql': {
@@ -185,7 +185,7 @@ describe('InspectorRelations', function() {
 
   it('deselects all relations after removal', function() {
     var destroyRelations = sinon.stub();
-    const wrapper = renderComponent({ destroyRelations });
+    const wrapper = renderComponent({destroyRelations});
     const instance = wrapper.instance();
     instance.refs = {
       'CheckListItem-mysql': {
@@ -212,7 +212,7 @@ describe('InspectorRelations', function() {
 
   it('navigates to show build relation on build-relation click', function() {
     var changeState = sinon.stub();
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     // Call the action for the create relation button.
     wrapper.find('OverviewAction').props().action();
     assert.deepEqual(changeState.args[0][0], {
diff --git a/jujugui/static/gui/src/app/components/inspector/resources/list/test-list.js b/jujugui/static/gui/src/app/components/inspector/resources/list/test-list.js
index 5bfe9d6245..e906b8b8da 100644
--- a/jujugui/static/gui/src/app/components/inspector/resources/list/test-list.js
+++ b/jujugui/static/gui/src/app/components/inspector/resources/list/test-list.js
@@ -31,7 +31,7 @@ describe('InspectorResourcesList', function() {
       Path: 'file2',
       Revision: 2
     }];
-    const wrapper = renderComponent({ resources });
+    const wrapper = renderComponent({resources});
     const expected = (
       <div className="inspector-resources-list">
         <ul className="inspector-resources-list__list">
diff --git a/jujugui/static/gui/src/app/components/inspector/scale-service/scale-service.js b/jujugui/static/gui/src/app/components/inspector/scale-service/scale-service.js
index 02f0c7b648..0b56d10150 100644
--- a/jujugui/static/gui/src/app/components/inspector/scale-service/scale-service.js
+++ b/jujugui/static/gui/src/app/components/inspector/scale-service/scale-service.js
@@ -37,7 +37,7 @@ class ScaleService extends React.Component {
   */
   _toggleConstraints(e) {
     var id = e.currentTarget.id;
-    this.setState({ constraintsVisibility: id === 'auto-place-units'});
+    this.setState({constraintsVisibility: id === 'auto-place-units'});
   }
 
   /**
diff --git a/jujugui/static/gui/src/app/components/inspector/scale-service/test-scale-service.js b/jujugui/static/gui/src/app/components/inspector/scale-service/test-scale-service.js
index 3c6c4928af..1844d8903a 100644
--- a/jujugui/static/gui/src/app/components/inspector/scale-service/test-scale-service.js
+++ b/jujugui/static/gui/src/app/components/inspector/scale-service/test-scale-service.js
@@ -16,7 +16,7 @@ describe('ScaleService', function() {
       changeState={options.changeState || sinon.stub()}
       initUtils={options.initUtils || initUtils}
       serviceId={options.serviceId || '123'} />,
-    { disableLifecycleMethods: true }
+    {disableLifecycleMethods: true}
   );
 
   beforeEach(() => {
@@ -52,7 +52,7 @@ describe('ScaleService', function() {
 
   it('creates and autoplaces units if constraints is open', function() {
     const changeState = sinon.stub();
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     // Set the value in the input.
     wrapper.find('.scale-service--units input').simulate('change', {
       currentTarget: {
@@ -102,7 +102,7 @@ describe('ScaleService', function() {
 
   it('creates and shows the machine view if constraints is closed', function() {
     var changeState = sinon.stub();
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     // Set the value in the input.
     wrapper.find('.scale-service--units input').simulate('change', {
       currentTarget: {
diff --git a/jujugui/static/gui/src/app/components/inspector/service-overview/service-overview.js b/jujugui/static/gui/src/app/components/inspector/service-overview/service-overview.js
index 4a7bd74297..647184cbdc 100644
--- a/jujugui/static/gui/src/app/components/inspector/service-overview/service-overview.js
+++ b/jujugui/static/gui/src/app/components/inspector/service-overview/service-overview.js
@@ -66,7 +66,7 @@ class ServiceOverview extends React.Component {
           }
           if (plans && plans.length > 0) {
             service.set('activePlan', activePlan);
-            this.setState({ activePlan, plans });
+            this.setState({activePlan, plans});
           }
         });
     }
diff --git a/jujugui/static/gui/src/app/components/inspector/service-overview/test-service-overview.js b/jujugui/static/gui/src/app/components/inspector/service-overview/test-service-overview.js
index 47ff4f4d8c..9927045ddb 100644
--- a/jujugui/static/gui/src/app/components/inspector/service-overview/test-service-overview.js
+++ b/jujugui/static/gui/src/app/components/inspector/service-overview/test-service-overview.js
@@ -53,7 +53,7 @@ describe('ServiceOverview', function() {
     service.get.withArgs('plans').throws('it should not fetch this if no metrics');
     charm.hasMetrics.returns(false);
     const showActivePlan = sinon.stub();
-    const wrapper = renderComponent({ showActivePlan });
+    const wrapper = renderComponent({showActivePlan});
     const instance = wrapper.instance();
     assert.equal(showActivePlan.callCount, 0);
     assert.equal(instance.state.plans, null);
@@ -130,7 +130,7 @@ describe('ServiceOverview', function() {
     service.get.withArgs('id').returns('demo');
     service.get.withArgs('pending').returns(true);
     const changeState = sinon.stub();
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     // call the action method which is passed to the child to make sure it
     // is hooked up to the changeState method.
     wrapper.find('OverviewAction[valueType="all"]').props().action({
@@ -210,7 +210,7 @@ describe('ServiceOverview', function() {
 
   it('shows the charm details if the version is clicked', function() {
     const changeState = sinon.stub();
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     wrapper.find('OverviewAction[title="Change version"]').props().linkAction();
     assert.equal(changeState.callCount, 1);
     assert.deepEqual(changeState.args[0][0], {
@@ -228,7 +228,7 @@ describe('ServiceOverview', function() {
     // Return an array to make it think it has plans
     charm.get.withArgs('plans').returns([]);
     const showActivePlan = sinon.stub();
-    const wrapper = renderComponent({ showActivePlan });
+    const wrapper = renderComponent({showActivePlan});
     assert.equal(
       showActivePlan.callCount, 0,
       'we are defining plans in the service, it should not call to fetch more');
@@ -265,7 +265,7 @@ describe('ServiceOverview', function() {
 
   it('calls the destroy service method if destroy is clicked', function() {
     const destroyService = sinon.stub();
-    const wrapper = renderComponent({ destroyService });
+    const wrapper = renderComponent({destroyService});
     // Simulate the confirm click.
     wrapper.find('ButtonRow').prop('buttons')[0].action();
     assert.equal(destroyService.callCount, 1);
diff --git a/jujugui/static/gui/src/app/components/inspector/test-inspector.js b/jujugui/static/gui/src/app/components/inspector/test-inspector.js
index fde09af517..0bb796014a 100644
--- a/jujugui/static/gui/src/app/components/inspector/test-inspector.js
+++ b/jujugui/static/gui/src/app/components/inspector/test-inspector.js
@@ -336,7 +336,7 @@ describe('Inspector', function() {
     appState.current.gui.inspector = {
       activeComponent: 'scale'
     };
-    const wrapper = renderComponent({ providerType: 'lxd' });
+    const wrapper = renderComponent({providerType: 'lxd'});
     const header = wrapper.find('InspectorHeader');
     assert.equal(header.prop('activeComponent'), 'scale');
     assert.equal(header.prop('title'), 'Scale');
diff --git a/jujugui/static/gui/src/app/components/inspector/unit-details/test-unit-details.js b/jujugui/static/gui/src/app/components/inspector/unit-details/test-unit-details.js
index 2c84fd5331..0da50b7109 100644
--- a/jujugui/static/gui/src/app/components/inspector/unit-details/test-unit-details.js
+++ b/jujugui/static/gui/src/app/components/inspector/unit-details/test-unit-details.js
@@ -415,7 +415,7 @@ describe('UnitDetails', function() {
 
   it('destroys the unit when the destroy button is clicked', function() {
     const destroyUnits = sinon.stub();
-    const wrapper = renderComponent({ destroyUnits });
+    const wrapper = renderComponent({destroyUnits});
     wrapper.find('ButtonRow').prop('buttons')[0].action();
     assert.equal(destroyUnits.callCount, 1);
     assert.deepEqual(destroyUnits.args[0][0], [unit.id]);
diff --git a/jujugui/static/gui/src/app/components/inspector/unit-details/unit-details.js b/jujugui/static/gui/src/app/components/inspector/unit-details/unit-details.js
index 45d52fa7e7..7e900782b1 100644
--- a/jujugui/static/gui/src/app/components/inspector/unit-details/unit-details.js
+++ b/jujugui/static/gui/src/app/components/inspector/unit-details/unit-details.js
@@ -33,7 +33,7 @@ class UnitDetails extends React.Component {
   _generateDebugHooksState() {
     const unit = this.props.unit;
     let commands = [`juju debug-hooks ${unit.id}`];
-    return { terminal: commands };
+    return {terminal: commands};
   }
 
   /**
@@ -45,7 +45,7 @@ class UnitDetails extends React.Component {
     const unit = this.props.unit;
     let commands = [`juju ssh ${unit.id}`];
     cmds.forEach(cmd => commands.push(cmd));
-    return { terminal: commands };
+    return {terminal: commands};
   }
 
   /**
@@ -141,7 +141,7 @@ class UnitDetails extends React.Component {
     @returns {Object} The status list JSX.
   */
   _generateStatuses() {
-    const { unit } = this.props;
+    const {unit} = this.props;
     let statuses = [];
     if (!unit.agent_state) {
       statuses.push({
@@ -173,7 +173,7 @@ class UnitDetails extends React.Component {
     @returns {Object} The address list JSX.
   */
   _generateAddressList() {
-    const { unit } = this.props;
+    const {unit} = this.props;
     const privateList = this._generateAddresses(
       unit.private_address, unit.portRanges, true);
     const publicList = this._generateAddresses(
diff --git a/jujugui/static/gui/src/app/components/inspector/unit-list/test-unit-list.js b/jujugui/static/gui/src/app/components/inspector/unit-list/test-unit-list.js
index e18b182819..e5d9e83099 100644
--- a/jujugui/static/gui/src/app/components/inspector/unit-list/test-unit-list.js
+++ b/jujugui/static/gui/src/app/components/inspector/unit-list/test-unit-list.js
@@ -80,7 +80,7 @@ describe('UnitList', () => {
   });
 
   it('renders if there are no units', () => {
-    const wrapper = renderComponent({ units: [] });
+    const wrapper = renderComponent({units: []});
     var expected = (
       <div className="unit-list">
         <div className="unit-list__actions">
@@ -99,7 +99,7 @@ describe('UnitList', () => {
 
   it('renders a list of unit components', () => {
     units.pop();
-    const wrapper = renderComponent({ units });
+    const wrapper = renderComponent({units});
     const items = wrapper.find('CheckListItem');
     const expected = (
       <ul className="unit-list__units">
@@ -187,7 +187,7 @@ describe('UnitList', () => {
   });
 
   it('does not render the actions when viewing a status list', () => {
-    const wrapper = renderComponent({ unitStatus: 'pending' });
+    const wrapper = renderComponent({unitStatus: 'pending'});
     assert.equal(wrapper.find('.unit-list__actions').length, 0);
   });
 
@@ -213,7 +213,7 @@ describe('UnitList', () => {
 
   it('navigates to the unit when a list item is clicked', function() {
     var changeState = sinon.stub();
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     wrapper.find('CheckListItem').at(1).props().action({
       currentTarget: {
         getAttribute: function() {
@@ -246,7 +246,7 @@ describe('UnitList', () => {
   });
 
   it('displays Resolve and Retry buttons for an error list', function() {
-    const wrapper = renderComponent({ unitStatus: 'error' });
+    const wrapper = renderComponent({unitStatus: 'error'});
     const buttonItems = wrapper.find('ButtonRow').prop('buttons');
     var buttons = [{
       title: 'Resolve',
@@ -323,7 +323,7 @@ describe('UnitList', () => {
     units[0].agent_status = 'running';
     units[1].agent_status = 'running';
     units[2].agent_status = 'running';
-    const wrapper = renderComponent({ envResolved });
+    const wrapper = renderComponent({envResolved});
     wrapper.find('ButtonRow').prop('buttons')[0].action();
     assert.equal(envResolved.callCount, 2);
     assert.deepEqual(envResolved.args[0][0], units[0].id);
@@ -334,7 +334,7 @@ describe('UnitList', () => {
 
   it('will not resolve pending units', function() {
     const envResolved = sinon.stub();
-    const wrapper = renderComponent({ envResolved });
+    const wrapper = renderComponent({envResolved});
     wrapper.find('ButtonRow').prop('buttons')[0].action();
     assert.equal(envResolved.callCount, 0);
   });
diff --git a/jujugui/static/gui/src/app/components/link/test-link.js b/jujugui/static/gui/src/app/components/link/test-link.js
index 856b89ab6c..657c428c2d 100644
--- a/jujugui/static/gui/src/app/components/link/test-link.js
+++ b/jujugui/static/gui/src/app/components/link/test-link.js
@@ -31,15 +31,15 @@ describe('Link', function() {
   });
 
   it('can render with extra classes', () => {
-    const wrapper = renderComponent({ classes: ['another'] });
+    const wrapper = renderComponent({classes: ['another']});
     assert.equal(wrapper.prop('className').includes('another'), true);
   });
 
   it('changes state when clicked on', () => {
     const changeState = sinon.stub();
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     const preventDefault = sinon.stub();
-    wrapper.simulate('click', { preventDefault });
+    wrapper.simulate('click', {preventDefault});
     assert.equal(preventDefault.callCount, 1);
     assert.equal(changeState.callCount, 1);
     assert.deepEqual(changeState.args[0][0], {state: 'new'});
diff --git a/jujugui/static/gui/src/app/components/local-inspector/local-charm-import-helpers.js b/jujugui/static/gui/src/app/components/local-inspector/local-charm-import-helpers.js
index beca377434..376fb65652 100644
--- a/jujugui/static/gui/src/app/components/local-inspector/local-charm-import-helpers.js
+++ b/jujugui/static/gui/src/app/components/local-inspector/local-charm-import-helpers.js
@@ -49,7 +49,7 @@ function uploadLocalCharm(env, db, series, file, options) {
     has been loaded.
 */
 function loadCharmDetails(charmUrl, env, callback) {
-  var charm = new yui.juju.models.Charm({ id: charmUrl });
+  var charm = new yui.juju.models.Charm({id: charmUrl});
   charm.after('load', function(e) {
     callback(charm);
   });
diff --git a/jujugui/static/gui/src/app/components/local-inspector/test-local-inspector.js b/jujugui/static/gui/src/app/components/local-inspector/test-local-inspector.js
index 49aefceb54..e85222c169 100644
--- a/jujugui/static/gui/src/app/components/local-inspector/test-local-inspector.js
+++ b/jujugui/static/gui/src/app/components/local-inspector/test-local-inspector.js
@@ -119,7 +119,7 @@ describe('LocalInspector', function() {
   });
 
   it('can display the update service view', function() {
-    const wrapper = renderComponent({ localType: 'update' });
+    const wrapper = renderComponent({localType: 'update'});
     var expected = (
       <div className="local-inspector__content-update">
         <p className="local-inspector__label">Choose applications to upgrade:</p>
@@ -161,7 +161,7 @@ describe('LocalInspector', function() {
 
   it('can handle deploying a new charm', function() {
     var uploadLocalCharm = sinon.spy();
-    const wrapper = renderComponent({ uploadLocalCharm });
+    const wrapper = renderComponent({uploadLocalCharm});
     const instance = wrapper.instance();
     instance.refs = {series: {value: 'wily'}};
     wrapper.find('ButtonRow').prop('buttons')[1].action();
@@ -199,7 +199,7 @@ describe('LocalInspector', function() {
 
   it('can cancel the upload', function() {
     var changeState = sinon.spy();
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     wrapper.find('ButtonRow').prop('buttons')[0].action();
     assert.equal(changeState.callCount, 1);
     assert.deepEqual(changeState.args[0][0], {
diff --git a/jujugui/static/gui/src/app/components/login/test-login.js b/jujugui/static/gui/src/app/components/login/test-login.js
index 143bfb20e0..f7c49eb610 100644
--- a/jujugui/static/gui/src/app/components/login/test-login.js
+++ b/jujugui/static/gui/src/app/components/login/test-login.js
@@ -21,7 +21,7 @@ describe('LoginComponent', function() {
         gisf={options.gisf === undefined ? false : options.gisf}
         loginToAPIs={options.loginToAPIs || sinon.stub()}
         loginToController={options.loginToController || sinon.stub()} />,
-      { disableLifecycleMethods: true }
+      {disableLifecycleMethods: true}
     );
     const instance = wrapper.instance();
     instance.refs = {
@@ -112,21 +112,21 @@ describe('LoginComponent', function() {
   });
 
   it('renders but is hidden in gisf', function() {
-    const wrapper = renderComponent({ gisf: true });
+    const wrapper = renderComponent({gisf: true});
     assert.equal(wrapper.prop('className').includes('hidden'), true);
   });
 
   it('can display a login error message', function() {
-    const wrapper = renderComponent({ errorMessage: 'bad wolf' });
+    const wrapper = renderComponent({errorMessage: 'bad wolf'});
     assert.equal(wrapper.find('.login__failure-message').text(), 'bad wolf');
   });
 
   it('calls to log the user in on submit', function() {
     var loginToAPIs = sinon.stub();
-    const wrapper = renderComponent({ loginToAPIs });
+    const wrapper = renderComponent({loginToAPIs});
     const instance = wrapper.instance();
-    instance.refs.username = { value: 'foo' };
-    instance.refs.password = { value: 'bar' };
+    instance.refs.username = {value: 'foo'};
+    instance.refs.password = {value: 'bar'};
     wrapper.find('form').simulate('submit');
     assert.equal(loginToAPIs.callCount, 1, 'loginToAPIs never called');
     assert.deepEqual(loginToAPIs.args[0], [{
diff --git a/jujugui/static/gui/src/app/components/logout/test-logout.js b/jujugui/static/gui/src/app/components/logout/test-logout.js
index 8f1943a3bf..e80bbd54d3 100644
--- a/jujugui/static/gui/src/app/components/logout/test-logout.js
+++ b/jujugui/static/gui/src/app/components/logout/test-logout.js
@@ -31,18 +31,18 @@ describe('Logout', () => {
 
   it('renders properly for charmstore logout', () => {
     const doCharmstoreLogout = sinon.stub().returns(true);
-    const wrapper = renderComponent({ doCharmstoreLogout });
+    const wrapper = renderComponent({doCharmstoreLogout});
     assert.equal(wrapper.prop('href'), 'http://charmstorelogout');
   });
 
   it('can be hidden', () => {
-    const wrapper = renderComponent({ visible: false });
+    const wrapper = renderComponent({visible: false});
     assert.equal(wrapper.prop('className').includes('logout-link--hidden'), true);
   });
 
   it('does not redirect to logout onClick for regular logout', () => {
     const locationAssign = sinon.stub();
-    const wrapper = renderComponent({ locationAssign });
+    const wrapper = renderComponent({locationAssign});
     wrapper.simulate('click');
     assert.equal(locationAssign.callCount, 0);
   });
diff --git a/jujugui/static/gui/src/app/components/machine-view/add-machine/test-add-machine.js b/jujugui/static/gui/src/app/components/machine-view/add-machine/test-add-machine.js
index f061e48390..0917a188bf 100644
--- a/jujugui/static/gui/src/app/components/machine-view/add-machine/test-add-machine.js
+++ b/jujugui/static/gui/src/app/components/machine-view/add-machine/test-add-machine.js
@@ -92,7 +92,7 @@ describe('MachineViewAddMachine', function() {
   });
 
   it('can render for creating a container', function() {
-    const wrapper = renderComponent({ parentId: 'new0' });
+    const wrapper = renderComponent({parentId: 'new0'});
     const expected = (
       <div className="add-machine">{[
         <select
@@ -148,7 +148,7 @@ describe('MachineViewAddMachine', function() {
 
   it('can call the cancel method', function() {
     const close = sinon.stub();
-    const wrapper = renderComponent({ close });
+    const wrapper = renderComponent({close});
     wrapper.find('ButtonRow').prop('buttons')[0].action();
     assert.equal(close.callCount, 1);
   });
@@ -165,7 +165,7 @@ describe('MachineViewAddMachine', function() {
   });
 
   it('can create a container', function() {
-    const wrapper = renderComponent({ parentId: 'new0' });
+    const wrapper = renderComponent({parentId: 'new0'});
     wrapper.find('.add-machine__container').simulate('change', {
       currentTarget: {
         value: 'lxd'
diff --git a/jujugui/static/gui/src/app/components/machine-view/column/test-column.js b/jujugui/static/gui/src/app/components/machine-view/column/test-column.js
index ba5df5e335..26ec010d5b 100644
--- a/jujugui/static/gui/src/app/components/machine-view/column/test-column.js
+++ b/jujugui/static/gui/src/app/components/machine-view/column/test-column.js
@@ -69,14 +69,14 @@ describe('MachineViewColumn', function() {
   });
 
   it('can render in droppable mode', function() {
-    const wrapper = renderComponent({ canDrop: true });
+    const wrapper = renderComponent({canDrop: true});
     assert.equal(
       wrapper.prop('className').includes('machine-view__column--droppable'),
       true);
   });
 
   it('can render in drop mode', function() {
-    const wrapper = renderComponent({ isOver: true });
+    const wrapper = renderComponent({isOver: true});
     assert.equal(
       wrapper.prop('className').includes('machine-view__column--drop'),
       true);
diff --git a/jujugui/static/gui/src/app/components/machine-view/header/test-header.js b/jujugui/static/gui/src/app/components/machine-view/header/test-header.js
index 7e10d85bfb..998370afe9 100644
--- a/jujugui/static/gui/src/app/components/machine-view/header/test-header.js
+++ b/jujugui/static/gui/src/app/components/machine-view/header/test-header.js
@@ -51,14 +51,14 @@ describe('MachineViewHeader', function() {
   });
 
   it('can render in droppable mode', function() {
-    const wrapper = renderComponent({ canDrop: true });
+    const wrapper = renderComponent({canDrop: true});
     assert.equal(
       wrapper.prop('className').includes('machine-view__header--droppable'),
       true);
   });
 
   it('can render in drop mode', function() {
-    const wrapper = renderComponent({ isOver: true });
+    const wrapper = renderComponent({isOver: true});
     assert.equal(
       wrapper.prop('className').includes('machine-view__header--drop'),
       true);
@@ -66,7 +66,7 @@ describe('MachineViewHeader', function() {
 
   it('can render with a menu', function() {
     const menuItems = [];
-    const wrapper = renderComponent({ menuItems });
+    const wrapper = renderComponent({menuItems});
     const dropdown = wrapper.find('ButtonDropdown');
     assert.equal(dropdown.length, 1);
     assert.equal(dropdown.prop('listItems'), menuItems);
@@ -78,7 +78,7 @@ describe('MachineViewHeader', function() {
       disabled: false,
       toggleOn: true
     };
-    const wrapper = renderComponent({ toggle });
+    const wrapper = renderComponent({toggle});
     assert.equal(wrapper.find('Button').length, 1);
   });
 });
diff --git a/jujugui/static/gui/src/app/components/machine-view/machine-unit/test-machine-unit.js b/jujugui/static/gui/src/app/components/machine-view/machine-unit/test-machine-unit.js
index da4180669e..0c3f278f9c 100644
--- a/jujugui/static/gui/src/app/components/machine-view/machine-unit/test-machine-unit.js
+++ b/jujugui/static/gui/src/app/components/machine-view/machine-unit/test-machine-unit.js
@@ -51,7 +51,7 @@ describe('MachineViewMachineUnit', function() {
   });
 
   it('can render for a container', function() {
-    const wrapper = renderComponent({ machineType: 'container' });
+    const wrapper = renderComponent({machineType: 'container'});
     const menuItems = wrapper.find('MachineUnit').prop('menuItems');
     assert.deepEqual(menuItems, [{
       label: 'Destroy',
@@ -61,20 +61,20 @@ describe('MachineViewMachineUnit', function() {
 
   it('can disable the destroy when read only', function() {
     acl = shapeup.deepFreeze({isReadOnly: () => true});
-    const wrapper = renderComponent({ machineType: 'container' });
+    const wrapper = renderComponent({machineType: 'container'});
     assert.strictEqual(
       wrapper.find('MachineUnit').prop('menuItems')[0].action, null);
   });
 
   it('can display in dragged mode', function() {
-    const wrapper = renderComponent({ isDragging: true });
+    const wrapper = renderComponent({isDragging: true});
     assert.equal(
       wrapper.prop('className').includes('machine-view__machine-unit--dragged'),
       true);
   });
 
   it('can display in draggable mode', function() {
-    const wrapper = renderComponent({ canDrag: true });
+    const wrapper = renderComponent({canDrag: true});
     assert.equal(
       wrapper.prop('className').includes('machine-view__machine-unit--draggable'),
       true);
diff --git a/jujugui/static/gui/src/app/components/machine-view/machine/test-machine.js b/jujugui/static/gui/src/app/components/machine-view/machine/test-machine.js
index 96a8dfea6f..b89e0f43ca 100644
--- a/jujugui/static/gui/src/app/components/machine-view/machine/test-machine.js
+++ b/jujugui/static/gui/src/app/components/machine-view/machine/test-machine.js
@@ -290,7 +290,7 @@ describe('MachineViewMachine', function() {
       displayName: 'new0/lxc/0'
     };
     machineAPI.machine = machine;
-    const wrapper = renderComponent({ type: 'container' });
+    const wrapper = renderComponent({type: 'container'});
     assert.equal(wrapper.find('.add-machine__constraints').length, 0);
     const expected = (
       <ul className="machine-view__machine-units machine__units">
@@ -333,7 +333,7 @@ describe('MachineViewMachine', function() {
       displayName: 'new0/lxc/0'
     };
     machineAPI.machine = machine;
-    const wrapper = renderComponent({ type: 'container' });
+    const wrapper = renderComponent({type: 'container'});
     wrapper.find('DragSource(MachineViewMachineUnit)').at(0).props().removeUnit();
     assert.equal(machineAPI.removeUnit.callCount, 1);
   });
diff --git a/jujugui/static/gui/src/app/components/machine-view/test-machine-view.js b/jujugui/static/gui/src/app/components/machine-view/test-machine-view.js
index 6e99d5fc8b..b342ed1e72 100644
--- a/jujugui/static/gui/src/app/components/machine-view/test-machine-view.js
+++ b/jujugui/static/gui/src/app/components/machine-view/test-machine-view.js
@@ -26,7 +26,7 @@ describe('MachineView', function() {
         parseMachineDetails={options.parseMachineDetails || sinon.stub()}
         parseMachineName={options.parseMachineName || parseMachineName}
         sendAnalytics={options.sendAnalytics || sinon.stub()} />,
-      { disableLifecycleMethods: true }
+      {disableLifecycleMethods: true}
     );
     const instance = wrapper.instance();
     const column = document.createElement('div');
@@ -248,7 +248,7 @@ describe('MachineView', function() {
 
   it('can open the store from the onboarding', function() {
     const changeState = sinon.stub();
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     wrapper.find('.machine-view__column-onboarding .link').at(0).props().onClick();
     assert.equal(changeState.callCount, 2);
     assert.deepEqual(changeState.args[1][0], {store: ''});
@@ -417,7 +417,7 @@ describe('MachineView', function() {
 
   it('can select a machine', function() {
     const changeState = sinon.stub();
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     const instance = wrapper.instance();
     assert.equal(changeState.callCount, 1);
     assert.deepEqual(changeState.args[0][0], {gui: {machines: 'new0'}});
diff --git a/jujugui/static/gui/src/app/components/machine-view/unplaced-unit/test-unplaced-unit.js b/jujugui/static/gui/src/app/components/machine-view/unplaced-unit/test-unplaced-unit.js
index 49b7102cb8..2776e81df3 100644
--- a/jujugui/static/gui/src/app/components/machine-view/unplaced-unit/test-unplaced-unit.js
+++ b/jujugui/static/gui/src/app/components/machine-view/unplaced-unit/test-unplaced-unit.js
@@ -73,7 +73,7 @@ describe('MachineViewUnplacedUnit', function() {
   });
 
   it('can display in dragged mode', function() {
-    const wrapper = renderComponent({ isDragging: true });
+    const wrapper = renderComponent({isDragging: true});
     assert.equal(
       wrapper.prop('className').includes('machine-view__unplaced-unit--dragged'),
       true);
diff --git a/jujugui/static/gui/src/app/components/modal-shortcuts/test-modal-shortcuts.js b/jujugui/static/gui/src/app/components/modal-shortcuts/test-modal-shortcuts.js
index 158b2a56f1..b694c0cf32 100644
--- a/jujugui/static/gui/src/app/components/modal-shortcuts/test-modal-shortcuts.js
+++ b/jujugui/static/gui/src/app/components/modal-shortcuts/test-modal-shortcuts.js
@@ -18,8 +18,8 @@ describe('ModalSortcuts', function() {
   beforeEach(function() {
     ModalShortcuts.__Rewire__('hotkeys', {
       keyBindings: {
-        test: { label: 'test', help: 'a test item' },
-        test2: { label: 'test2', help: 'a second test item' }
+        test: {label: 'test', help: 'a test item'},
+        test2: {label: 'test2', help: 'a second test item'}
       }
     });
   });
diff --git a/jujugui/static/gui/src/app/components/model-actions/test-model-actions.js b/jujugui/static/gui/src/app/components/model-actions/test-model-actions.js
index 7a554a9438..1501575753 100644
--- a/jujugui/static/gui/src/app/components/model-actions/test-model-actions.js
+++ b/jujugui/static/gui/src/app/components/model-actions/test-model-actions.js
@@ -96,7 +96,7 @@ describe('ModelActions', function() {
   });
 
   it('can render the terminalAction', () => {
-    const wrapper = renderComponent({ displayTerminalButton: true });
+    const wrapper = renderComponent({displayTerminalButton: true});
     var expected = (
       <span
         className="model-actions__shell model-actions__button"
@@ -118,7 +118,7 @@ describe('ModelActions', function() {
 
   it('can export the env', function() {
     var exportEnvironmentFile = sinon.stub();
-    const wrapper = renderComponent({ exportEnvironmentFile });
+    const wrapper = renderComponent({exportEnvironmentFile});
     wrapper.find('.model-actions__export').props().onClick();
     assert.equal(exportEnvironmentFile.callCount, 1);
   });
@@ -134,7 +134,7 @@ describe('ModelActions', function() {
 
   it('can get a file when a file is selected', function() {
     var importBundleFile = sinon.stub();
-    const wrapper = renderComponent({ importBundleFile });
+    const wrapper = renderComponent({importBundleFile});
     var instance = wrapper.instance();
     instance.refs = {
       'file-input': {files: ['apache2.yaml']}
@@ -152,38 +152,38 @@ describe('ModelActions', function() {
   });
 
   it('disables sharing when not connected', function() {
-    const wrapper = renderComponent({ userIsAuthenticated: false });
+    const wrapper = renderComponent({userIsAuthenticated: false});
     assert.equal(wrapper.find('.model-actions__share').length, 0);
   });
 
   it('disables sharing when creating a new model', function() {
-    const wrapper = renderComponent({ appState: {current: {root: 'new'}} });
+    const wrapper = renderComponent({appState: {current: {root: 'new'}}});
     assert.equal(wrapper.find('.model-actions__share').length, 0);
   });
 
   it('can trigger the sharing UI', function() {
     const sharingVisibility = sinon.stub();
-    const wrapper = renderComponent({ sharingVisibility });
+    const wrapper = renderComponent({sharingVisibility});
     wrapper.find('.model-actions__share').props().onClick();
     assert.equal(sharingVisibility.callCount, 1);
   });
 
   it('applies the correct class when model is loading', function() {
-    const wrapper = renderComponent({ loadingModel: true });
+    const wrapper = renderComponent({loadingModel: true});
     const className = 'model-actions--loading-model';
     assert.equal(
       wrapper.find('.model-actions').prop('className').includes(className), true);
   });
 
   it('applies the correct class when on a user profile', function() {
-    const wrapper = renderComponent({ appState: {current: {profile: 'foo'}} });
+    const wrapper = renderComponent({appState: {current: {profile: 'foo'}}});
     const className = 'model-actions--loading-model';
     assert.equal(
       wrapper.find('.model-actions').prop('className').includes(className), true);
   });
 
   it('applies the correct class when on a user account page', function() {
-    const wrapper = renderComponent({ appState: {current: {root: 'account'}} });
+    const wrapper = renderComponent({appState: {current: {root: 'account'}}});
     const className = 'model-actions--loading-model';
     assert.equal(
       wrapper.find('.model-actions').prop('className').includes(className), true);
diff --git a/jujugui/static/gui/src/app/components/notification-list/item/test-item.js b/jujugui/static/gui/src/app/components/notification-list/item/test-item.js
index 8adc199d90..f05dd01188 100644
--- a/jujugui/static/gui/src/app/components/notification-list/item/test-item.js
+++ b/jujugui/static/gui/src/app/components/notification-list/item/test-item.js
@@ -64,7 +64,7 @@ describe('NotificationListItem', function() {
 
   it('calls the remove notification prop after the timeout', () => {
     const removeNotification = sinon.stub();
-    const wrapper = renderComponent({ removeNotification });
+    const wrapper = renderComponent({removeNotification});
     wrapper.find('.notification-list-item__hide').simulate('click');
     assert.equal(removeNotification.callCount, 0);
     clock.tick(1000);
diff --git a/jujugui/static/gui/src/app/components/notification-list/test-notification-list.js b/jujugui/static/gui/src/app/components/notification-list/test-notification-list.js
index 59158cd51c..a05b8e497e 100644
--- a/jujugui/static/gui/src/app/components/notification-list/test-notification-list.js
+++ b/jujugui/static/gui/src/app/components/notification-list/test-notification-list.js
@@ -54,26 +54,26 @@ describe('NotificationList', function() {
   });
 
   it('can render with no notifications', () => {
-    const wrapper = renderComponent({ notifications: [] });
+    const wrapper = renderComponent({notifications: []});
     assert.equal(wrapper.find('NotificationListItem').length, 0);
   });
 
   it('can render notifications after rendering none', () => {
-    const wrapper = renderComponent({ notifications: [] });
+    const wrapper = renderComponent({notifications: []});
     assert.equal(wrapper.find('NotificationListItem').length, 0);
-    wrapper.setProps({ notifications });
+    wrapper.setProps({notifications});
     wrapper.update();
     assert.equal(wrapper.find('NotificationListItem').length, 1);
   });
 
   it('times out non error messages', () => {
     const timeout = 500;
-    const wrapper = renderComponent({ timeout });
+    const wrapper = renderComponent({timeout});
     const instance = wrapper.instance();
     const key = 'NotificationListItem' + notifications[0].timestamp;
     const refs = {};
     const hideStub = sinon.stub();
-    refs[key] = { hide: hideStub };
+    refs[key] = {hide: hideStub};
     instance.refs = refs;
     // Trigger the timeout.
     clock.tick(timeout + 10);
@@ -83,12 +83,12 @@ describe('NotificationList', function() {
   it('does not time out error messages', () => {
     notifications[0].level = 'error';
     const timeout = 500;
-    const wrapper = renderComponent({ timeout });
+    const wrapper = renderComponent({timeout});
     const instance = wrapper.instance();
     const key = 'NotificationListItem' + notifications[0].timestamp;
     const refs = {};
     const hideStub = sinon.stub();
-    refs[key] = { hide: hideStub };
+    refs[key] = {hide: hideStub};
     instance.refs = refs;
     // Trigger the timeout.
     clock.tick(timeout + 10);
@@ -97,7 +97,7 @@ describe('NotificationList', function() {
 
   it('can clear and restart timeouts', () => {
     const timeout = 10000;
-    const wrapper = renderComponent({ timeout });
+    const wrapper = renderComponent({timeout});
     const instance = wrapper.instance();
     assert.equal(instance.timeouts.length, 1,
       'notification timeouts were not populated');
@@ -124,7 +124,7 @@ describe('NotificationList', function() {
       message: 'notification2 message',
       level: 'error'
     });
-    wrapper.setProps({ notifications });
+    wrapper.setProps({notifications});
     items = wrapper.find('NotificationListItem');
     assert.equal(items.length, 1);
     assert.equal(items.first().prop('timestamp'), '2468');
diff --git a/jujugui/static/gui/src/app/components/notification/test-notification.js b/jujugui/static/gui/src/app/components/notification/test-notification.js
index ae4f1155a7..169813c384 100644
--- a/jujugui/static/gui/src/app/components/notification/test-notification.js
+++ b/jujugui/static/gui/src/app/components/notification/test-notification.js
@@ -31,18 +31,18 @@ describe('Notification', function() {
   });
 
   it('renders type', () => {
-    const wrapper = renderComponent({ type: 'positive' });
+    const wrapper = renderComponent({type: 'positive'});
     assert.equal(wrapper.prop('className'), 'p-notification--positive');
   });
 
   it('renders with additional classes', () => {
-    const wrapper = renderComponent({ extraClasses: 'test' });
+    const wrapper = renderComponent({extraClasses: 'test'});
     assert.equal(wrapper.prop('className').includes('test'), true);
   });
 
   it('renders with dismiss function', () => {
     const dismiss = sinon.stub();
-    const wrapper = renderComponent({ dismiss });
+    const wrapper = renderComponent({dismiss});
     const expected = (
       <button
         className="p-notification__action"
@@ -57,7 +57,7 @@ describe('Notification', function() {
   it('can be dismissed', () => {
     const dismiss = sinon.stub();
     const stopPropagation = sinon.stub();
-    const wrapper = renderComponent({ dismiss });
+    const wrapper = renderComponent({dismiss});
     wrapper.find('.p-notification__action').props().onClick({
       stopPropagation: stopPropagation
     });
@@ -66,7 +66,7 @@ describe('Notification', function() {
   });
 
   it('renders with a blocking div', () => {
-    const wrapper = renderComponent({ isBlocking: true });
+    const wrapper = renderComponent({isBlocking: true});
     assert.equal(wrapper.find('.p-notification__blocker').length, 1);
     assert.equal(wrapper.find('.p-notification').length, 1);
   });
diff --git a/jujugui/static/gui/src/app/components/payment/charges/receipt-popup/test-receipt-popup.js b/jujugui/static/gui/src/app/components/payment/charges/receipt-popup/test-receipt-popup.js
index 4525154325..867dd74274 100644
--- a/jujugui/static/gui/src/app/components/payment/charges/receipt-popup/test-receipt-popup.js
+++ b/jujugui/static/gui/src/app/components/payment/charges/receipt-popup/test-receipt-popup.js
@@ -23,7 +23,7 @@ describe('ReceiptPopup', function() {
 
   it('can display the receipt', function() {
     const getReceipt = sinon.stub().callsArgWith(1, null, '<html>...</html>');
-    const wrapper = renderComponent({ getReceipt });
+    const wrapper = renderComponent({getReceipt});
     assert.equal(
       wrapper.find('iframe').prop('src').includes('%3Chtml%3E...%3C%2Fhtml%3E'),
       true);
@@ -46,7 +46,7 @@ describe('ReceiptPopup', function() {
 
   it('can close the popup', function() {
     const close = sinon.stub();
-    const wrapper = renderComponent({ close });
+    const wrapper = renderComponent({close});
     wrapper.props().close();
     assert.equal(close.callCount, 1);
   });
@@ -54,7 +54,7 @@ describe('ReceiptPopup', function() {
   it('can abort requests when unmounting', function() {
     const abort = sinon.stub();
     const getReceipt = sinon.stub().returns({abort: abort});
-    const wrapper = renderComponent({ getReceipt });
+    const wrapper = renderComponent({getReceipt});
     wrapper.unmount();
     assert.equal(abort.callCount, 1);
   });
diff --git a/jujugui/static/gui/src/app/components/payment/charges/test-charges.js b/jujugui/static/gui/src/app/components/payment/charges/test-charges.js
index 458da4e602..b64dd81ff6 100644
--- a/jujugui/static/gui/src/app/components/payment/charges/test-charges.js
+++ b/jujugui/static/gui/src/app/components/payment/charges/test-charges.js
@@ -193,7 +193,7 @@ describe('PaymentCharges', function() {
   it('can handle errors when getting the charges', function() {
     const addNotification = sinon.stub();
     payment.getCharges = sinon.stub().callsArgWith(1, 'Uh oh!', null);
-    renderComponent({ addNotification });
+    renderComponent({addNotification});
     assert.equal(addNotification.callCount, 1);
     assert.deepEqual(addNotification.args[0][0], {
       title: 'Could not load the list of charges',
diff --git a/jujugui/static/gui/src/app/components/payment/details/address/test-address.js b/jujugui/static/gui/src/app/components/payment/details/address/test-address.js
index b0208fb4e2..a6f6edf8ca 100644
--- a/jujugui/static/gui/src/app/components/payment/details/address/test-address.js
+++ b/jujugui/static/gui/src/app/components/payment/details/address/test-address.js
@@ -97,14 +97,14 @@ describe('PaymentDetailsAddress', () => {
 
   it('can cancel the form', () => {
     const close = sinon.stub();
-    const wrapper = renderComponent({ close });
+    const wrapper = renderComponent({close});
     wrapper.find('Button').at(0).props().action();
     assert.equal(close.callCount, 1);
   });
 
   it('can validate the form', () => {
     const removeAddress = sinon.stub();
-    const wrapper = renderComponent({ removeAddress });
+    const wrapper = renderComponent({removeAddress});
     const instance = wrapper.instance();
     instance.refs = {
       addressForm: {
diff --git a/jujugui/static/gui/src/app/components/payment/details/test-details.js b/jujugui/static/gui/src/app/components/payment/details/test-details.js
index c431bd29b2..a4c8a715c4 100644
--- a/jujugui/static/gui/src/app/components/payment/details/test-details.js
+++ b/jujugui/static/gui/src/app/components/payment/details/test-details.js
@@ -65,7 +65,7 @@ describe('PaymentDetails', () => {
         phones: ['00001111']
       }]
     };
-    const wrapper = renderComponent({ paymentUser });
+    const wrapper = renderComponent({paymentUser});
     const expected = (
       <div className="payment__section">
         <h2 className="payment__title twelve-col">
diff --git a/jujugui/static/gui/src/app/components/payment/methods/method/test-method.js b/jujugui/static/gui/src/app/components/payment/methods/method/test-method.js
index 7f606f61e0..86f6ea1f24 100644
--- a/jujugui/static/gui/src/app/components/payment/methods/method/test-method.js
+++ b/jujugui/static/gui/src/app/components/payment/methods/method/test-method.js
@@ -146,7 +146,7 @@ describe('PaymentMethod', () => {
   it('can update a payment method', () => {
     payment.updatePaymentMethod = sinon.stub().callsArgWith(4, null);
     const updateUser = sinon.stub();
-    const wrapper = renderComponent({ updateUser });
+    const wrapper = renderComponent({updateUser});
     wrapper.find('PaymentMethodCard').props().updatePaymentMethod();
     wrapper.update();
     wrapper.find('Button').at(1).props().action();
@@ -171,7 +171,7 @@ describe('PaymentMethod', () => {
   it('can handle errors when creating a token', () => {
     const addNotification = sinon.stub();
     payment.updatePaymentMethod = sinon.stub().callsArgWith(4, 'Uh oh!');
-    const wrapper = renderComponent({ addNotification });
+    const wrapper = renderComponent({addNotification});
     wrapper.find('PaymentMethodCard').props().updatePaymentMethod();
     wrapper.update();
     wrapper.find('Button').at(1).props().action();
diff --git a/jujugui/static/gui/src/app/components/payment/methods/test-methods.js b/jujugui/static/gui/src/app/components/payment/methods/test-methods.js
index 85b5a0fb72..2986cbbc1e 100644
--- a/jujugui/static/gui/src/app/components/payment/methods/test-methods.js
+++ b/jujugui/static/gui/src/app/components/payment/methods/test-methods.js
@@ -186,7 +186,7 @@ describe('PaymentMethods', () => {
 
   it('can create a new payment method with an existing address', () => {
     const updateUser = sinon.stub();
-    const wrapper = renderComponent({ updateUser });
+    const wrapper = renderComponent({updateUser});
     const instance = wrapper.instance();
     wrapper.find('Button').props().action();
     wrapper.update();
@@ -211,7 +211,7 @@ describe('PaymentMethods', () => {
 
   it('can create a new payment method with a new address', () => {
     const updateUser = sinon.stub();
-    const wrapper = renderComponent({ updateUser });
+    const wrapper = renderComponent({updateUser});
     const instance = wrapper.instance();
     instance.refs.cardAddress = {
       getValue: sinon.stub().returns({
@@ -254,7 +254,7 @@ describe('PaymentMethods', () => {
   it('can handle errors when creating a token', () => {
     stripe.createToken = sinon.stub().callsArgWith(2, 'Uh oh!');
     const addNotification = sinon.stub();
-    const wrapper = renderComponent({ addNotification });
+    const wrapper = renderComponent({addNotification});
     wrapper.find('Button').props().action();
     wrapper.update();
     wrapper.find('Button').at(1).props().action();
@@ -269,7 +269,7 @@ describe('PaymentMethods', () => {
   it('can handle errors when creating a payment method', () => {
     payment.createPaymentMethod = sinon.stub().callsArgWith(3, 'Uh oh!', null);
     const addNotification = sinon.stub();
-    const wrapper = renderComponent({ addNotification });
+    const wrapper = renderComponent({addNotification});
     wrapper.find('Button').props().action();
     wrapper.update();
     wrapper.find('Button').at(1).props().action();
diff --git a/jujugui/static/gui/src/app/components/payment/test-payment.js b/jujugui/static/gui/src/app/components/payment/test-payment.js
index b15e0eafc0..b11e458054 100644
--- a/jujugui/static/gui/src/app/components/payment/test-payment.js
+++ b/jujugui/static/gui/src/app/components/payment/test-payment.js
@@ -115,7 +115,7 @@ describe('Payment', function() {
   it('can display an error when getting users', function() {
     payment.getUser = sinon.stub().callsArgWith(1, 'Uh oh!', null);
     const addNotification = sinon.stub();
-    renderComponent({ addNotification });
+    renderComponent({addNotification});
     assert.equal(addNotification.callCount, 1);
     assert.deepEqual(addNotification.args[0][0], {
       title: 'Could not load user info',
diff --git a/jujugui/static/gui/src/app/components/popup/test-popup.js b/jujugui/static/gui/src/app/components/popup/test-popup.js
index 31e263de3c..56441409c2 100644
--- a/jujugui/static/gui/src/app/components/popup/test-popup.js
+++ b/jujugui/static/gui/src/app/components/popup/test-popup.js
@@ -46,7 +46,7 @@ describe('Popup', () => {
   });
 
   it('can set a type class', () => {
-    const wrapper = renderComponent({ type: 'wide' });
+    const wrapper = renderComponent({type: 'wide'});
     assert.equal(
       wrapper.find('.popup__panel').prop('className').includes('popup__panel--wide'),
       true);
diff --git a/jujugui/static/gui/src/app/components/post-deployment/post-deployment.js b/jujugui/static/gui/src/app/components/post-deployment/post-deployment.js
index 72583fab59..2d91166dbe 100644
--- a/jujugui/static/gui/src/app/components/post-deployment/post-deployment.js
+++ b/jujugui/static/gui/src/app/components/post-deployment/post-deployment.js
@@ -5,7 +5,7 @@ const marked = require('marked');
 const PropTypes = require('prop-types');
 const React = require('react');
 const shapeup = require('shapeup');
-const { urls } = require('jaaslib');
+const {urls} = require('jaaslib');
 
 const Button = require('../shared/button/button');
 const Panel = require('../shared/panel/panel');
diff --git a/jujugui/static/gui/src/app/components/post-deployment/test-post-deployment.js b/jujugui/static/gui/src/app/components/post-deployment/test-post-deployment.js
index 35b553b7e3..51af6e766a 100644
--- a/jujugui/static/gui/src/app/components/post-deployment/test-post-deployment.js
+++ b/jujugui/static/gui/src/app/components/post-deployment/test-post-deployment.js
@@ -146,7 +146,7 @@ target="_blank">Juju CLI client</a>');
 
   it('replaces templateTags in markdown', () => {
     const changeState = sinon.stub();
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     const instance = wrapper.instance();
     instance._handleContentClick({
       target: {
diff --git a/jujugui/static/gui/src/app/components/profile/credential-list/delete/test-delete.js b/jujugui/static/gui/src/app/components/profile/credential-list/delete/test-delete.js
index 24b6b1a311..f9a4cc5e3d 100644
--- a/jujugui/static/gui/src/app/components/profile/credential-list/delete/test-delete.js
+++ b/jujugui/static/gui/src/app/components/profile/credential-list/delete/test-delete.js
@@ -43,7 +43,7 @@ describe('ProfileCredentialListDelete', () => {
 
   it('can cancel', () => {
     const onCancel = sinon.stub();
-    const wrapper = renderComponent({ onCancel });
+    const wrapper = renderComponent({onCancel});
     wrapper.find('Popup').prop('buttons')[0].action();
     assert.equal(onCancel.callCount, 1);
   });
@@ -51,7 +51,7 @@ describe('ProfileCredentialListDelete', () => {
   it('can remove credentials', () => {
     const revokeCloudCredential = sinon.stub().callsArgWith(1, null);
     const onCredentialDeleted = sinon.stub();
-    const wrapper = renderComponent({ revokeCloudCredential, onCredentialDeleted });
+    const wrapper = renderComponent({revokeCloudCredential, onCredentialDeleted});
     wrapper.find('Popup').prop('buttons')[1].action();
     assert.equal(revokeCloudCredential.callCount, 1);
     assert.equal(onCredentialDeleted.callCount, 1);
@@ -63,7 +63,7 @@ describe('ProfileCredentialListDelete', () => {
     const onCredentialDeleted = sinon.stub();
     const addNotification = sinon.stub();
     const wrapper = renderComponent(
-      { addNotification, revokeCloudCredential, onCredentialDeleted });
+      {addNotification, revokeCloudCredential, onCredentialDeleted});
     wrapper.find('Popup').prop('buttons')[1].action();
     assert.equal(addNotification.callCount, 1);
     assert.deepEqual(addNotification.args[0][0], {
diff --git a/jujugui/static/gui/src/app/components/profile/header/header.js b/jujugui/static/gui/src/app/components/profile/header/header.js
index 07dfa9287b..95fd8deb96 100644
--- a/jujugui/static/gui/src/app/components/profile/header/header.js
+++ b/jujugui/static/gui/src/app/components/profile/header/header.js
@@ -34,12 +34,12 @@ class ProfileHeader extends React.Component {
     @param {Array} modelList The list of models.
   */
   _getUserCallback(err, user) {
-    this.setState({ userRequested: true }, () => {
+    this.setState({userRequested: true}, () => {
       if (err) {
         console.log('unable to load user:', err);
         return;
       }
-      this.setState({ user: user });
+      this.setState({user: user});
     });
   }
 
diff --git a/jujugui/static/gui/src/app/components/profile/header/test-header.js b/jujugui/static/gui/src/app/components/profile/header/test-header.js
index 4e2152dcbd..315a3a1a96 100644
--- a/jujugui/static/gui/src/app/components/profile/header/test-header.js
+++ b/jujugui/static/gui/src/app/components/profile/header/test-header.js
@@ -32,7 +32,7 @@ describe('Profile Header', function() {
   });
 
   it('can render', () => {
-    const wrapper = renderComponent({ gisf: true });
+    const wrapper = renderComponent({gisf: true});
     expect(wrapper).toMatchSnapshot();
   });
 
@@ -48,7 +48,7 @@ describe('Profile Header', function() {
   });
 
   it('displays a different link list for non-jaas', () => {
-    const wrapper = renderComponent({ gisf: false });
+    const wrapper = renderComponent({gisf: false});
     const expected = (
       <ul className="p-list ts-profile-header__menu">
         <li
@@ -69,7 +69,7 @@ describe('Profile Header', function() {
 
   it('displays a hidden gravatar until the user request has returned', () => {
     // For the test where it has returned successfully see the above tests.
-    const wrapper = renderComponent({ getUser: sinon.stub() });
+    const wrapper = renderComponent({getUser: sinon.stub()});
     assert.equal(
       wrapper
         .find('.profile-header__avatar')
@@ -94,7 +94,7 @@ describe('Profile Header', function() {
 
   it('can close the profile', () => {
     const changeState = sinon.stub();
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     wrapper
       .find('.profile-header__close')
       .props()
diff --git a/jujugui/static/gui/src/app/components/profile/navigation/test-navigation.js b/jujugui/static/gui/src/app/components/profile/navigation/test-navigation.js
index 14649371f8..ec234d6d78 100644
--- a/jujugui/static/gui/src/app/components/profile/navigation/test-navigation.js
+++ b/jujugui/static/gui/src/app/components/profile/navigation/test-navigation.js
@@ -8,8 +8,8 @@ const ProfileNavigation = require('./navigation');
 
 describe('Profile Navigation', function() {
   const sectionsMap = new Map([
-    ['models', { label: 'Models' }],
-    ['charms', { label: 'Charms' }]
+    ['models', {label: 'Models'}],
+    ['charms', {label: 'Charms'}]
   ]);
 
   const renderComponent = (options = {}) =>
@@ -21,7 +21,7 @@ describe('Profile Navigation', function() {
     );
 
   it('can render', () => {
-    const wrapper = renderComponent({ gisf: true });
+    const wrapper = renderComponent({gisf: true});
     expect(wrapper).toMatchSnapshot();
   });
 
@@ -36,7 +36,7 @@ describe('Profile Navigation', function() {
       .props()
       .onClick();
     assert.equal(changeState.callCount, 1);
-    assert.deepEqual(changeState.args[0][0], { hash: 'charms' });
+    assert.deepEqual(changeState.args[0][0], {hash: 'charms'});
   });
 
   it('updates the active nav item when re-rendered', () => {
@@ -45,7 +45,7 @@ describe('Profile Navigation', function() {
       changeState
     });
     assert.equal(wrapper.find('.is-active').length, 0);
-    wrapper.setProps({ activeSection: 'charms' });
+    wrapper.setProps({activeSection: 'charms'});
     assert.equal(wrapper.find('.is-active').length, 1);
   });
 });
diff --git a/jujugui/static/gui/src/app/components/profile/test-profile.js b/jujugui/static/gui/src/app/components/profile/test-profile.js
index 3602738ac9..048f95c121 100644
--- a/jujugui/static/gui/src/app/components/profile/test-profile.js
+++ b/jujugui/static/gui/src/app/components/profile/test-profile.js
@@ -52,7 +52,7 @@ describe('Profile', function() {
   let acl, controllerAPI, userInfo;
 
   beforeEach(() => {
-    acl = shapeup.deepFreeze({ isReadOnly: () => false });
+    acl = shapeup.deepFreeze({isReadOnly: () => false});
     controllerAPI = {
       getCloudCredentialNames: sinon.stub(),
       listClouds: sinon.stub(),
@@ -68,7 +68,7 @@ describe('Profile', function() {
   });
 
   it('can render', () => {
-    const wrapper = renderComponent({ gisf: true });
+    const wrapper = renderComponent({gisf: true});
     expect(wrapper).toMatchSnapshot();
   });
 
@@ -79,20 +79,20 @@ describe('Profile', function() {
   });
 
   it('shows the payments section when the flag is on', () => {
-    const wrapper = renderComponent({ showPay: true });
+    const wrapper = renderComponent({showPay: true});
     const sectionsMap = getSectionsMap(wrapper);
     assert.isObject(sectionsMap.get('payment'));
   });
 
   it('hides certain sections when viewing others profile pages', () => {
-    const wrapper = renderComponent({ controllerUser: 'foo' });
+    const wrapper = renderComponent({controllerUser: 'foo'});
     const sectionsMap = getSectionsMap(wrapper);
     const allowedKeys = ['charms', 'bundles'];
     assert.deepEqual(Array.from(sectionsMap.keys()), allowedKeys);
   });
 
   it('correctly parses the URL', () => {
-    const wrapper = renderComponent({ activeSection: 'credentials/aws_test' });
+    const wrapper = renderComponent({activeSection: 'credentials/aws_test'});
     const instance = wrapper.instance();
     assert.deepEqual(instance._getSectionInfo(), {
       full: 'credentials/aws_test',
diff --git a/jujugui/static/gui/src/app/components/revenue-statement/rs-details-item/test-rs-details-item.js b/jujugui/static/gui/src/app/components/revenue-statement/rs-details-item/test-rs-details-item.js
index 668d86f650..bebddd7bfa 100644
--- a/jujugui/static/gui/src/app/components/revenue-statement/rs-details-item/test-rs-details-item.js
+++ b/jujugui/static/gui/src/app/components/revenue-statement/rs-details-item/test-rs-details-item.js
@@ -12,7 +12,7 @@ describe('Revenue statement details item', () => {
     );
 
   it('can render', () => {
-    const wrapper = renderComponent({ gisf: true });
+    const wrapper = renderComponent({gisf: true});
     expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/jujugui/static/gui/src/app/components/revenue-statement/test-revenue-statement.js b/jujugui/static/gui/src/app/components/revenue-statement/test-revenue-statement.js
index 91f4387ae8..09f704eb40 100644
--- a/jujugui/static/gui/src/app/components/revenue-statement/test-revenue-statement.js
+++ b/jujugui/static/gui/src/app/components/revenue-statement/test-revenue-statement.js
@@ -9,7 +9,7 @@ describe('Revenue statement', () => {
   const renderComponent = (options = {}) => enzyme.shallow(<RevenueStatement />);
 
   it('can render', () => {
-    const wrapper = renderComponent({ gisf: true });
+    const wrapper = renderComponent({gisf: true});
     expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/jujugui/static/gui/src/app/components/search-results/item/test-item.js b/jujugui/static/gui/src/app/components/search-results/item/test-item.js
index bfacfe58d3..1f4c1e0770 100644
--- a/jujugui/static/gui/src/app/components/search-results/item/test-item.js
+++ b/jujugui/static/gui/src/app/components/search-results/item/test-item.js
@@ -163,7 +163,7 @@ describe('SearchResultsItem', function() {
   it('can handle clicking on an item', function() {
     var changeState = sinon.stub();
     var preventDefault = sinon.stub();
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     wrapper.find('.list-block__list--item-main-link').simulate('click', {
       preventDefault: preventDefault
     });
@@ -179,7 +179,7 @@ describe('SearchResultsItem', function() {
   it('can handle clicking on a series', function() {
     var changeState = sinon.stub();
     var preventDefault = sinon.stub();
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     wrapper.find('.list-series__item a').at(0).simulate('click', {
       preventDefault: preventDefault
     });
@@ -205,7 +205,7 @@ describe('SearchResultsItem', function() {
   it('can handle clicking on a tag', function() {
     var changeState = sinon.stub();
     var preventDefault = sinon.stub();
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     wrapper.find('.tag-list a').at(0).simulate('click', {
       preventDefault: preventDefault
     });
@@ -227,7 +227,7 @@ describe('SearchResultsItem', function() {
   it('can handle clicking on an owner', function() {
     const changeState = sinon.stub();
     const preventDefault = sinon.stub();
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     wrapper.find('.owner__column a').at(0).simulate('click', {
       preventDefault: preventDefault
     });
diff --git a/jujugui/static/gui/src/app/components/search-results/search-results.js b/jujugui/static/gui/src/app/components/search-results/search-results.js
index 78a04ec229..dff3891616 100644
--- a/jujugui/static/gui/src/app/components/search-results/search-results.js
+++ b/jujugui/static/gui/src/app/components/search-results/search-results.js
@@ -84,7 +84,7 @@ class SearchResults extends React.Component {
         // The series data structure is modified in the non-multi series
         // charms so this formats the series to match.
         entity.series = series.map(
-          name => ({ name: name, storeId: entity.id }));
+          name => ({name: name, storeId: entity.id}));
         collapsedEntities[key] = entity;
         orderedKeys.push(key);
         continue;
@@ -237,7 +237,7 @@ class SearchResults extends React.Component {
       filters.owner = owner;
     }
     this._changeActiveComponent('loading');
-    this.setState({ waitingForSearch: true });
+    this.setState({waitingForSearch: true});
     // If there is an existing search request then abort it before starting
     // the new search.
     if (this.searchXhr) {
diff --git a/jujugui/static/gui/src/app/components/search-results/select-filter/test-select-filter.js b/jujugui/static/gui/src/app/components/search-results/select-filter/test-select-filter.js
index 5181043bbf..19e88e0c87 100644
--- a/jujugui/static/gui/src/app/components/search-results/select-filter/test-select-filter.js
+++ b/jujugui/static/gui/src/app/components/search-results/select-filter/test-select-filter.js
@@ -44,13 +44,13 @@ describe('SearchResultsSelectFilter', function() {
   });
 
   it('can select an option', function() {
-    const wrapper = renderComponent({ currentValue: 'downloads' });
+    const wrapper = renderComponent({currentValue: 'downloads'});
     assert.equal(wrapper.find('select').prop('defaultValue'), 'downloads');
   });
 
   it('can change the search state', function() {
     var changeState = sinon.stub();
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     wrapper.find('select').simulate('change', {
       currentTarget: {
         value: 'downloads'
diff --git a/jujugui/static/gui/src/app/components/search-results/test-search-results.js b/jujugui/static/gui/src/app/components/search-results/test-search-results.js
index 68c7197c59..347c8f15d5 100644
--- a/jujugui/static/gui/src/app/components/search-results/test-search-results.js
+++ b/jujugui/static/gui/src/app/components/search-results/test-search-results.js
@@ -97,7 +97,7 @@ describe('SearchResults', function() {
 
   describe('functional tests', function() {
     it('can initially show the spinner', function() {
-      const wrapper = renderComponent({ charmstoreSearch: sinon.stub() });
+      const wrapper = renderComponent({charmstoreSearch: sinon.stub()});
       assert.equal(wrapper.find('Spinner').length, 1);
     });
 
@@ -325,7 +325,7 @@ describe('SearchResults', function() {
       charmstoreSearch.returns({abort: abort});
       const wrapper = renderComponent();
       assert.equal(abort.callCount, 0);
-      wrapper.setProps({ query: 'apache2' });
+      wrapper.setProps({query: 'apache2'});
       assert.equal(abort.callCount, 1);
     });
   });
diff --git a/jujugui/static/gui/src/app/components/search-results/type-filter/test-type-filter.js b/jujugui/static/gui/src/app/components/search-results/type-filter/test-type-filter.js
index 1817a04d14..9a3d14c0e3 100644
--- a/jujugui/static/gui/src/app/components/search-results/type-filter/test-type-filter.js
+++ b/jujugui/static/gui/src/app/components/search-results/type-filter/test-type-filter.js
@@ -49,14 +49,14 @@ describe('SearchResultsTypeFilter', function() {
   });
 
   it('can show a filter as active', function() {
-    const wrapper = renderComponent({ currentType: 'bundle' });
+    const wrapper = renderComponent({currentType: 'bundle'});
     assert.equal(
       wrapper.find('li').at(2).prop('className').includes('selected'), true);
   });
 
   it('can change the state when a filter is clicked', function() {
     var changeState = sinon.stub();
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     wrapper.find('li').at(1).simulate('click');
     assert.equal(changeState.callCount, 1);
     assert.deepEqual(changeState.args[0][0], {
diff --git a/jujugui/static/gui/src/app/components/shared/basic-table/basic-table.js b/jujugui/static/gui/src/app/components/shared/basic-table/basic-table.js
index d960986f5e..faa025b340 100644
--- a/jujugui/static/gui/src/app/components/shared/basic-table/basic-table.js
+++ b/jujugui/static/gui/src/app/components/shared/basic-table/basic-table.js
@@ -62,7 +62,7 @@ class BasicTable extends React.Component {
       this.props.tableClasses);
     return (
       <ul className={classes}>
-        {this._generateRow(true, { columns: this.props.headers })}
+        {this._generateRow(true, {columns: this.props.headers})}
         {this._generateContent()}
       </ul>
     );
diff --git a/jujugui/static/gui/src/app/components/shared/basic-table/cell/cell.js b/jujugui/static/gui/src/app/components/shared/basic-table/cell/cell.js
index dfbf4729b9..7707c2c711 100644
--- a/jujugui/static/gui/src/app/components/shared/basic-table/cell/cell.js
+++ b/jujugui/static/gui/src/app/components/shared/basic-table/cell/cell.js
@@ -24,7 +24,7 @@ const COLUMN_CLASSES = [
 /** Basic table React component used to display data in a table structure. */
 class BasicTableCell extends React.Component {
   render() {
-    const { classes } = this.props;
+    const {classes} = this.props;
     let conditionalClasses = {'last-col': this.props.isLastCol};
     // Map the column size to the appropriate CSS class.
     conditionalClasses[COLUMN_CLASSES[this.props.columnSize - 1]] = true;
diff --git a/jujugui/static/gui/src/app/components/shared/basic-table/row/row.js b/jujugui/static/gui/src/app/components/shared/basic-table/row/row.js
index 2881ba53e5..6053d246b5 100644
--- a/jujugui/static/gui/src/app/components/shared/basic-table/row/row.js
+++ b/jujugui/static/gui/src/app/components/shared/basic-table/row/row.js
@@ -76,7 +76,7 @@ class BasicTableRow extends React.Component {
     @returns {Object} The anchor element or null.
   */
   _generateCell(column, index) {
-    const { isHeader } = this.props;
+    const {isHeader} = this.props;
     const conditionalClasses = isHeader ? this.props.headerColumnClasses :
       this.props.rowColumnClasses;
     const classes = (column.classes || []).concat(conditionalClasses);
@@ -112,7 +112,7 @@ class BasicTableRow extends React.Component {
   }
 
   render() {
-    const { expandedContent, isHeader } = this.props;
+    const {expandedContent, isHeader} = this.props;
     const classes = classNames(
       'twelve-col',
       this.props.classes,
diff --git a/jujugui/static/gui/src/app/components/shared/basic-table/test-basic-table.js b/jujugui/static/gui/src/app/components/shared/basic-table/test-basic-table.js
index b4e2df6c17..3fa7fd14bd 100644
--- a/jujugui/static/gui/src/app/components/shared/basic-table/test-basic-table.js
+++ b/jujugui/static/gui/src/app/components/shared/basic-table/test-basic-table.js
@@ -88,7 +88,7 @@ describe('BasicTable', () => {
       }
       return 0;
     };
-    const wrapper = renderComponent({ sort });
+    const wrapper = renderComponent({sort});
     const rowItems = wrapper.find('BasicTableRow');
     assert.equal(rowItems.at(0).key(), 'basic-table-header');
     assert.equal(rowItems.at(1).key(), 'row-one-key');
diff --git a/jujugui/static/gui/src/app/components/shared/button-row/test-button-row.js b/jujugui/static/gui/src/app/components/shared/button-row/test-button-row.js
index d1407f07a8..202f52c837 100644
--- a/jujugui/static/gui/src/app/components/shared/button-row/test-button-row.js
+++ b/jujugui/static/gui/src/app/components/shared/button-row/test-button-row.js
@@ -21,7 +21,7 @@ describe('ButtonRow', function() {
       type: 'submit',
       action: callbackStub
     }];
-    const wrapper = renderComponent({ buttons });
+    const wrapper = renderComponent({buttons});
     const expected = (
       <div className="button-row button-row--multiple button-row--count-1">
         <Button
@@ -48,7 +48,7 @@ describe('ButtonRow', function() {
       type: 'submit',
       action: callbackStub
     }];
-    const wrapper = renderComponent({ buttons });
+    const wrapper = renderComponent({buttons});
     const expected = (
       <div className="button-row button-row--multiple button-row--count-2">
         <Button
diff --git a/jujugui/static/gui/src/app/components/shared/expanding-row/test-expanding-row.js b/jujugui/static/gui/src/app/components/shared/expanding-row/test-expanding-row.js
index 1c801955b1..8b9f7a4d34 100644
--- a/jujugui/static/gui/src/app/components/shared/expanding-row/test-expanding-row.js
+++ b/jujugui/static/gui/src/app/components/shared/expanding-row/test-expanding-row.js
@@ -20,11 +20,11 @@ describe('ExpandingRow', () => {
         <span>closed</span>
         <span>open</span>
       </ExpandingRow>,
-      { disableLifecycleMethods: true }
+      {disableLifecycleMethods: true}
     );
     const instance = wrapper.instance();
     // Mock the ref. The MutationObserver needs a real DOM node.
-    instance.refs = { inner: document.createElement('div') };
+    instance.refs = {inner: document.createElement('div')};
     instance.componentDidMount();
     wrapper.update();
     return wrapper;
@@ -122,8 +122,8 @@ describe('ExpandingRow', () => {
   });
 
   it('can pass through styles', () => {
-    const style = { zIndex: 5 };
-    const wrapper = renderComponent({ style });
+    const style = {zIndex: 5};
+    const wrapper = renderComponent({style});
     assert.deepEqual(wrapper.prop('style'), style);
   });
 });
diff --git a/jujugui/static/gui/src/app/components/shared/machine-unit/machine-unit.js b/jujugui/static/gui/src/app/components/shared/machine-unit/machine-unit.js
index 7fdf37aa00..9cfc1932ae 100644
--- a/jujugui/static/gui/src/app/components/shared/machine-unit/machine-unit.js
+++ b/jujugui/static/gui/src/app/components/shared/machine-unit/machine-unit.js
@@ -20,7 +20,7 @@ class MachineUnit extends React.Component {
   render() {
     let menu;
     let title;
-    const { name, menuItems } = this.props;
+    const {name, menuItems} = this.props;
     if (menuItems) {
       title = (
         <span className="machine-unit__name">
diff --git a/jujugui/static/gui/src/app/components/shared/machine/machine.js b/jujugui/static/gui/src/app/components/shared/machine/machine.js
index 4ba3c3ab77..bef4c304b5 100644
--- a/jujugui/static/gui/src/app/components/shared/machine/machine.js
+++ b/jujugui/static/gui/src/app/components/shared/machine/machine.js
@@ -16,7 +16,7 @@ class Machine extends React.Component {
     @returns {Object} the machine hardware elements.
   */
   _generateHardware() {
-    const { hardware } = this.props;
+    const {hardware} = this.props;
     if (!hardware) {
       return null;
     }
@@ -44,7 +44,7 @@ class Machine extends React.Component {
     @returns {Object} the unit elements.
   */
   _generateUnits() {
-    const { isContainer, units } = this.props;
+    const {isContainer, units} = this.props;
     if (!units || !units.length) {
       return null;
     }
@@ -73,7 +73,7 @@ class Machine extends React.Component {
     @returns {String} The collection of class names.
   */
   _generateClasses() {
-    const { isContainer, machine } = this.props;
+    const {isContainer, machine} = this.props;
     const classes = {
       'machine--root': machine.root
     };
@@ -90,7 +90,7 @@ class Machine extends React.Component {
     @returns {Object} The button JSX.
   */
   _generateTerminalAction() {
-    const { sshAction } = this.props;
+    const {sshAction} = this.props;
     if (!sshAction) {
       return null;
     }
@@ -113,7 +113,7 @@ class Machine extends React.Component {
     @returns {Object} The menu JSX.
   */
   _generateMenu() {
-    const { menuItems } = this.props;
+    const {menuItems} = this.props;
     if (!menuItems) {
       return null;
     }
@@ -128,7 +128,7 @@ class Machine extends React.Component {
     @returns {Object} The details JSX.
   */
   _generateDetails() {
-    const { machine } = this.props;
+    const {machine} = this.props;
     const machineName = (
       <span className="machine__name">
         {machine.name}
diff --git a/jujugui/static/gui/src/app/components/shared/panel/test-panel.js b/jujugui/static/gui/src/app/components/shared/panel/test-panel.js
index 1e5acc16f9..8543f69d91 100644
--- a/jujugui/static/gui/src/app/components/shared/panel/test-panel.js
+++ b/jujugui/static/gui/src/app/components/shared/panel/test-panel.js
@@ -17,7 +17,7 @@ describe('PanelComponent', function() {
         visible={options.visible === undefined ? true : options.visible}>
         {options.children || (<div>child</div>)}
       </Panel>,
-      { disableLifecycleMethods: true }
+      {disableLifecycleMethods: true}
     );
     const instance = wrapper.instance();
     instance.refs = {
@@ -47,13 +47,13 @@ describe('PanelComponent', function() {
   });
 
   it('generates a hidden panel if visible flag is falsey', function() {
-    const wrapper = renderComponent({ visible: false });
+    const wrapper = renderComponent({visible: false});
     assert.equal(wrapper.prop('className').includes('hidden'), true);
   });
 
   it('can call a function on click if provided', function() {
     var clickAction = sinon.stub();
-    const wrapper = renderComponent({ clickAction });
+    const wrapper = renderComponent({clickAction});
     wrapper.simulate('click');
     assert.equal(clickAction.callCount, 1);
   });
@@ -61,7 +61,7 @@ describe('PanelComponent', function() {
   it('does not bubble clicks from the children', function() {
     var clickAction = sinon.stub();
     var stopPropagation = sinon.stub();
-    const wrapper = renderComponent({ clickAction });
+    const wrapper = renderComponent({clickAction});
     wrapper.find('.panel-component__inner').simulate('click', {
       stopPropagation: stopPropagation
     });
@@ -76,7 +76,7 @@ describe('PanelComponent', function() {
   });
 
   it('can not set the keyboard focus on load', function() {
-    const wrapper = renderComponent({ focus: false });
+    const wrapper = renderComponent({focus: false});
     const instance = wrapper.instance();
     assert.equal(instance.refs.content.focus.callCount, 0);
   });
diff --git a/jujugui/static/gui/src/app/components/shared/status/application-list/application-list.js b/jujugui/static/gui/src/app/components/shared/status/application-list/application-list.js
index d3ae355f13..7589166675 100644
--- a/jujugui/static/gui/src/app/components/shared/status/application-list/application-list.js
+++ b/jujugui/static/gui/src/app/components/shared/status/application-list/application-list.js
@@ -3,7 +3,7 @@
 
 const PropTypes = require('prop-types');
 const React = require('react');
-const { urls } = require('jaaslib');
+const {urls} = require('jaaslib');
 
 const maracaPropTypes = require('../../../../maraca/prop-types');
 const StatusLabel = require('../label/label');
diff --git a/jujugui/static/gui/src/app/components/shared/status/label/label.js b/jujugui/static/gui/src/app/components/shared/status/label/label.js
index 0d4d3434d7..42be958e84 100644
--- a/jujugui/static/gui/src/app/components/shared/status/label/label.js
+++ b/jujugui/static/gui/src/app/components/shared/status/label/label.js
@@ -5,7 +5,7 @@ const PropTypes = require('prop-types');
 const React = require('react');
 const classNames = require('classnames');
 
-const { getStatusClass } = require('../../utils');
+const {getStatusClass} = require('../../utils');
 
 const StatusLabel = props => {
   const status = props.status;
diff --git a/jujugui/static/gui/src/app/components/shared/status/label/test-label.js b/jujugui/static/gui/src/app/components/shared/status/label/test-label.js
index 1b44166aaa..f0f0076a62 100644
--- a/jujugui/static/gui/src/app/components/shared/status/label/test-label.js
+++ b/jujugui/static/gui/src/app/components/shared/status/label/test-label.js
@@ -14,12 +14,12 @@ describe('StatusTable', () => {
   );
 
   it('renders', () => {
-    const wrapper = renderComponent({ status: 'available' });
+    const wrapper = renderComponent({status: 'available'});
     expect(wrapper).toMatchSnapshot();
   });
 
   it('renders with a known status', () => {
-    const wrapper = renderComponent({ status: 'ok' });
+    const wrapper = renderComponent({status: 'ok'});
     assert.strictEqual(wrapper.prop('className').includes('status-label--ok'), true);
   });
 });
diff --git a/jujugui/static/gui/src/app/components/shared/status/remote-application-list/remote-application-list.js b/jujugui/static/gui/src/app/components/shared/status/remote-application-list/remote-application-list.js
index 15b9514744..f95e309c6e 100644
--- a/jujugui/static/gui/src/app/components/shared/status/remote-application-list/remote-application-list.js
+++ b/jujugui/static/gui/src/app/components/shared/status/remote-application-list/remote-application-list.js
@@ -7,7 +7,7 @@ const React = require('react');
 const StatusTable = require('../table/table');
 
 const maracaPropTypes = require('../../../../maraca/prop-types');
-const { normaliseStatus } = require('../../utils');
+const {normaliseStatus} = require('../../utils');
 
 class StatusRemoteApplicationList extends React.Component {
 
diff --git a/jujugui/static/gui/src/app/components/sharing/test-sharing.js b/jujugui/static/gui/src/app/components/sharing/test-sharing.js
index d6d502101d..4bd62ca3f8 100644
--- a/jujugui/static/gui/src/app/components/sharing/test-sharing.js
+++ b/jujugui/static/gui/src/app/components/sharing/test-sharing.js
@@ -81,7 +81,7 @@ describe('Sharing', () => {
   });
 
   it('can render with a spinner', () => {
-    const wrapper = renderComponent({ getModelUserInfo: sinon.stub() });
+    const wrapper = renderComponent({getModelUserInfo: sinon.stub()});
     assert.equal(wrapper.find('Spinner').length, 1);
   });
 
@@ -160,7 +160,7 @@ describe('Sharing', () => {
   });
 
   it('can render the invitation form', () => {
-    const wrapper = renderComponent({ canShareModel: true });
+    const wrapper = renderComponent({canShareModel: true});
     const expectedOptions = [{
       label: 'Read',
       value: 'read'
@@ -255,7 +255,7 @@ describe('Sharing', () => {
   });
 
   it('handles revoke/grant errors', () => {
-    const wrapper = renderComponent({ canShareModel: true });
+    const wrapper = renderComponent({canShareModel: true});
     const instance = wrapper.instance();
     instance._modifyModelAccessCallback('boom');
     wrapper.update();
@@ -268,16 +268,16 @@ describe('Sharing', () => {
   describe('add button states', () => {
 
     it('shows a disabled button with "add" text by default', () => {
-      const wrapper = renderComponent({ canShareModel: true });
+      const wrapper = renderComponent({canShareModel: true});
       const button = wrapper.find('.sharing__invite--grant-button Button');
       assert.equal(button.children().text(), 'Add');
       assert.equal(button.prop('disabled'), true);
     });
 
     it('shows an active button with "add" text when enabled', () => {
-      const wrapper = renderComponent({ canShareModel: true });
+      const wrapper = renderComponent({canShareModel: true});
       const instance = wrapper.instance();
-      instance.setState({ canAdd: true });
+      instance.setState({canAdd: true});
       wrapper.update();
       const button = wrapper.find('.sharing__invite--grant-button Button');
       assert.equal(button.children().text(), 'Add');
@@ -285,9 +285,9 @@ describe('Sharing', () => {
     });
 
     it('shows a disabled button with "add" text when sending', () => {
-      const wrapper = renderComponent({ canShareModel: true });
+      const wrapper = renderComponent({canShareModel: true});
       const instance = wrapper.instance();
-      instance.setState({ sending: true });
+      instance.setState({sending: true});
       wrapper.update();
       const button = wrapper.find('.sharing__invite--grant-button Button');
       assert.equal(button.children().text(), 'Add');
@@ -295,9 +295,9 @@ describe('Sharing', () => {
     });
 
     it('shows a disabled button with tick icon when sent', () => {
-      const wrapper = renderComponent({ canShareModel: true });
+      const wrapper = renderComponent({canShareModel: true});
       const instance = wrapper.instance();
-      instance.setState({ sent: true });
+      instance.setState({sent: true});
       wrapper.update();
       const button = wrapper.find('.sharing__invite--grant-button Button');
       assert.equal(button.find('SvgIcon').length, 1);
diff --git a/jujugui/static/gui/src/app/components/status/test-status.js b/jujugui/static/gui/src/app/components/status/test-status.js
index 5f1d94f090..bf532239f6 100644
--- a/jujugui/static/gui/src/app/components/status/test-status.js
+++ b/jujugui/static/gui/src/app/components/status/test-status.js
@@ -42,7 +42,7 @@ describe('Status', function() {
   it('can navigate to charms from the app list', () => {
     const wrapper = renderComponent();
     wrapper.props().navigateToCharm(
-      'u/who/django/xenial/42', { preventDefault: sinon.stub() });
+      'u/who/django/xenial/42', {preventDefault: sinon.stub()});
     assert.equal(changeState.callCount, 1);
     assert.deepEqual(
       changeState.args[0][0], {store: 'u/who/django/xenial/42'});
@@ -50,7 +50,7 @@ describe('Status', function() {
 
   it('can navigate to apps from the relation list', () => {
     const wrapper = renderComponent();
-    wrapper.props().navigateToApplication('mysql', { preventDefault: sinon.stub() });
+    wrapper.props().navigateToApplication('mysql', {preventDefault: sinon.stub()});
     assert.equal(changeState.callCount, 1);
     assert.deepEqual(changeState.args[0][0], {
       gui: {
diff --git a/jujugui/static/gui/src/app/components/store/store.js b/jujugui/static/gui/src/app/components/store/store.js
index 81a0d11faa..932524752e 100644
--- a/jujugui/static/gui/src/app/components/store/store.js
+++ b/jujugui/static/gui/src/app/components/store/store.js
@@ -4,7 +4,7 @@
 const PropTypes = require('prop-types');
 const React = require('react');
 const classNames = require('classnames');
-const { charmstore } = require('jaaslib');
+const {charmstore} = require('jaaslib');
 
 const ExpertStoreCard = require('../expert-store-card/expert-store-card');
 
diff --git a/jujugui/static/gui/src/app/components/store/test-store.js b/jujugui/static/gui/src/app/components/store/test-store.js
index f39eb06ba7..d0c239bbe5 100644
--- a/jujugui/static/gui/src/app/components/store/test-store.js
+++ b/jujugui/static/gui/src/app/components/store/test-store.js
@@ -18,7 +18,7 @@ describe('Store', function() {
   );
 
   it('can render the right items for gij', function() {
-    const wrapper = renderComponent({ gisf: false, showExperts: false });
+    const wrapper = renderComponent({gisf: false, showExperts: false});
     assert.equal(wrapper.find('.box--kubernetes').length, 1, 'k8s');
     assert.equal(wrapper.find('.box--openstack').length, 1, 'openstack');
     assert.equal(wrapper.find('.box--hadoop').length, 1, 'hadoop');
@@ -29,7 +29,7 @@ describe('Store', function() {
   });
 
   it('can render the right items for gisf', function() {
-    const wrapper = renderComponent({ gisf: true, showExperts: false });
+    const wrapper = renderComponent({gisf: true, showExperts: false});
     assert.equal(wrapper.find('.box--kubernetes').length, 1, 'k8s');
     assert.equal(wrapper.find('.box--openstack').length, 0, 'openstack');
     assert.equal(wrapper.find('.box--hadoop').length, 1, 'hadoop');
@@ -40,7 +40,7 @@ describe('Store', function() {
   });
 
   it('can render the right items for gij with experts', function() {
-    const wrapper = renderComponent({ gisf: false, showExperts: true });
+    const wrapper = renderComponent({gisf: false, showExperts: true});
     assert.equal(wrapper.find('.box--kubernetes').length, 1, 'k8s');
     assert.equal(wrapper.find('.box--openstack').length, 1, 'openstack');
     assert.equal(wrapper.find('.box--hadoop').length, 0, 'hadoop');
@@ -53,7 +53,7 @@ describe('Store', function() {
   });
 
   it('can render the right items for gisf with experts', function() {
-    const wrapper = renderComponent({ gisf: true, showExperts: true });
+    const wrapper = renderComponent({gisf: true, showExperts: true});
     assert.equal(wrapper.find('.box--kubernetes').length, 1, 'k8s');
     assert.equal(wrapper.find('.box--openstack').length, 0, 'openstack');
     assert.equal(wrapper.find('.box--hadoop').length, 1, 'hadoop');
@@ -99,7 +99,7 @@ describe('Store', function() {
     var changeState = sinon.stub();
     var stopPropagation = sinon.stub();
     var target = {dataset: {entity: 'kibana'}};
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     wrapper.find('.featured-entity__link[data-entity="kibana"]').simulate('click', {
       stopPropagation: stopPropagation,
       target: target
@@ -120,7 +120,7 @@ describe('Store', function() {
         filtervalue: 'databases'
       }
     };
-    const wrapper = renderComponent({ changeState });
+    const wrapper = renderComponent({changeState});
     wrapper.find('.link[data-filtervalue="databases"]').at(0).simulate('click', {
       stopPropagation: stopPropagation,
       currentTarget: target
diff --git a/jujugui/static/gui/src/app/components/string-config/input/test-input.js b/jujugui/static/gui/src/app/components/string-config/input/test-input.js
index a360516a2b..05562bd08c 100644
--- a/jujugui/static/gui/src/app/components/string-config/input/test-input.js
+++ b/jujugui/static/gui/src/app/components/string-config/input/test-input.js
@@ -31,7 +31,7 @@ describe('StringConfigInput', function() {
 
   it('can update the value', function() {
     const setValue = sinon.stub();
-    const wrapper = renderComponent({ setValue });
+    const wrapper = renderComponent({setValue});
     const instance = wrapper.instance();
     instance.refs = {
       editableInput: {
diff --git a/jujugui/static/gui/src/app/components/string-config/string-config.js b/jujugui/static/gui/src/app/components/string-config/string-config.js
index 86dfdaa20c..9eba46541d 100644
--- a/jujugui/static/gui/src/app/components/string-config/string-config.js
+++ b/jujugui/static/gui/src/app/components/string-config/string-config.js
@@ -10,7 +10,7 @@ const StringConfigInput = require('./input/input');
 class StringConfig extends React.Component {
   constructor(props) {
     super(props);
-    this.state = { value: this.props.config };
+    this.state = {value: this.props.config};
   }
 
   /**
diff --git a/jujugui/static/gui/src/app/components/string-config/test-string-config.js b/jujugui/static/gui/src/app/components/string-config/test-string-config.js
index 22489f4af5..bdfab5a9eb 100644
--- a/jujugui/static/gui/src/app/components/string-config/test-string-config.js
+++ b/jujugui/static/gui/src/app/components/string-config/test-string-config.js
@@ -47,7 +47,7 @@ describe('StringConfig', function() {
   });
 
   it('can handle a string config without a config value', function() {
-    const wrapper = renderComponent({ config: null });
+    const wrapper = renderComponent({config: null});
     assert.equal(wrapper.find('StringConfigInput').prop('config'), null);
   });
 
@@ -58,7 +58,7 @@ describe('StringConfig', function() {
   });
 
   it('can be disabled', function() {
-    const wrapper = renderComponent({ disabled: true });
+    const wrapper = renderComponent({disabled: true});
     assert.equal(wrapper.find('StringConfigInput').prop('disabled'), true);
   });
 
@@ -74,7 +74,7 @@ describe('StringConfig', function() {
   });
 
   it('correctly compares existing numbers', function() {
-    const wrapper = renderComponent({ config: 123 });
+    const wrapper = renderComponent({config: 123});
     const instance = wrapper.instance();
     instance._setValue('123');
     wrapper.update();
@@ -85,7 +85,7 @@ describe('StringConfig', function() {
   });
 
   it('can handle empty strings with newlines', function() {
-    const wrapper = renderComponent({ config: '' });
+    const wrapper = renderComponent({config: ''});
     const instance = wrapper.instance();
     instance._setValue('\n');
     wrapper.update();
@@ -97,7 +97,7 @@ describe('StringConfig', function() {
   });
 
   it('can remove trailing newlines', function() {
-    const wrapper = renderComponent({ config: '0' });
+    const wrapper = renderComponent({config: '0'});
     const instance = wrapper.instance();
     instance._setValue('0\n');
     wrapper.update();
diff --git a/jujugui/static/gui/src/app/components/svg-icon/test-svg-icon.js b/jujugui/static/gui/src/app/components/svg-icon/test-svg-icon.js
index 858a53d10f..f757a4b4db 100644
--- a/jujugui/static/gui/src/app/components/svg-icon/test-svg-icon.js
+++ b/jujugui/static/gui/src/app/components/svg-icon/test-svg-icon.js
@@ -18,7 +18,7 @@ describe('SvgIcon', function() {
   );
 
   it('can render an icon', function() {
-    const wrapper = renderComponent({ size: 24 });
+    const wrapper = renderComponent({size: 24});
     const expected = (
       <svg
         className="svg-icon"
@@ -45,7 +45,7 @@ describe('SvgIcon', function() {
   });
 
   it('can set a class', function() {
-    const wrapper = renderComponent({ className: 'extra-class' });
+    const wrapper = renderComponent({className: 'extra-class'});
     assert.equal(wrapper.prop('className').includes('extra-class'), true);
   });
 });
diff --git a/jujugui/static/gui/src/app/components/terminal/test-terminal.js b/jujugui/static/gui/src/app/components/terminal/test-terminal.js
index aa01bfa65b..0f3f557671 100644
--- a/jujugui/static/gui/src/app/components/terminal/test-terminal.js
+++ b/jujugui/static/gui/src/app/components/terminal/test-terminal.js
@@ -29,12 +29,12 @@ describe('Terminal', () => {
           macaroons: {}
         }}
         WebSocket={options.websocket || websocket} />,
-      { disableLifeCycleMethods: true }
+      {disableLifeCycleMethods: true}
     );
     const instance = wrapper.instance();
     instance.refs = {
       terminal: {
-        querySelector: sinon.stub().returns({ focus: sinon.stub() })
+        querySelector: sinon.stub().returns({focus: sinon.stub()})
       }
     };
     return wrapper;
@@ -150,7 +150,7 @@ describe('Terminal', () => {
   }
 
   it('sends supplied commands when it is set up', () => {
-    wrapper = renderComponent({ commands: ['juju status'] });
+    wrapper = renderComponent({commands: ['juju status']});
     const instance = wrapper.instance();
     // Check that fit is called after receiving the first PS1.
     instance.term.fit = sinon.stub(); // eslint-disable-line
@@ -165,7 +165,7 @@ describe('Terminal', () => {
   });
 
   it('sends multiple commands when it is set up', () => {
-    wrapper = renderComponent({ commands: ['juju status', 'juju switch'] });
+    wrapper = renderComponent({commands: ['juju status', 'juju switch']});
     const instance = wrapper.instance();
     instance.term.fit = sinon.stub(); // eslint-disable-line
     // Send the setup from the term.
@@ -193,7 +193,7 @@ describe('Terminal', () => {
 
   it('handles unexpected WebSocket closures', () => {
     const addNotification = sinon.stub();
-    wrapper = renderComponent({ addNotification });
+    wrapper = renderComponent({addNotification});
     const instance = wrapper.instance();
     instance.ws.onclose({
       // Should only throw the notification on code over 1000 which is an
diff --git a/jujugui/static/gui/src/app/components/terms-popup/test-terms-popup.js b/jujugui/static/gui/src/app/components/terms-popup/test-terms-popup.js
index 4e46bcfab5..6c722deb4a 100644
--- a/jujugui/static/gui/src/app/components/terms-popup/test-terms-popup.js
+++ b/jujugui/static/gui/src/app/components/terms-popup/test-terms-popup.js
@@ -45,13 +45,13 @@ describe('TermsPopup', function() {
   });
 
   it('can display the loading spinner', function() {
-    const wrapper = renderComponent({ terms: [] });
+    const wrapper = renderComponent({terms: []});
     assert.equal(wrapper.find('Spinner').length, 1);
   });
 
   it('can close the popup', function() {
     const close = sinon.stub();
-    const wrapper = renderComponent({ close });
+    const wrapper = renderComponent({close});
     wrapper.find('Popup').props().close();
     assert.equal(close.callCount, 1);
   });
diff --git a/jujugui/static/gui/src/app/components/user-menu/test-user-menu.js b/jujugui/static/gui/src/app/components/user-menu/test-user-menu.js
index bb0289b1b9..c6537a3338 100644
--- a/jujugui/static/gui/src/app/components/user-menu/test-user-menu.js
+++ b/jujugui/static/gui/src/app/components/user-menu/test-user-menu.js
@@ -67,7 +67,7 @@ describe('UserMenu', () => {
 
   it('navigates to user profile when clicked', () => {
     const navigateUserProfile = sinon.stub();
-    const wrapper = renderComponent({ navigateUserProfile });
+    const wrapper = renderComponent({navigateUserProfile});
     wrapper.find('ButtonDropdown').prop('listItems')[0].action();
     assert.equal(navigateUserProfile.callCount, 1);
   });
diff --git a/jujugui/static/gui/src/app/components/usso-login-link/test-usso-login-link.js b/jujugui/static/gui/src/app/components/usso-login-link/test-usso-login-link.js
index 64de10f701..ea17ef6aa5 100644
--- a/jujugui/static/gui/src/app/components/usso-login-link/test-usso-login-link.js
+++ b/jujugui/static/gui/src/app/components/usso-login-link/test-usso-login-link.js
@@ -36,7 +36,7 @@ describe('USSOLoginLink', () => {
 
   it('calls loginToController on click for text link', () => {
     const loginToController = sinon.stub();
-    const wrapper = renderComponent({ loginToController });
+    const wrapper = renderComponent({loginToController});
     wrapper.find('.usso-login__action').simulate('click');
     assert.equal(loginToController.callCount, 1);
   });
@@ -58,7 +58,7 @@ describe('USSOLoginLink', () => {
   });
 
   it('can render a button link', () => {
-    const wrapper = renderComponent({ displayType: 'button' });
+    const wrapper = renderComponent({displayType: 'button'});
     var expected = (
       <div className="usso-login">
         <Button
@@ -80,7 +80,7 @@ describe('USSOLoginLink', () => {
   });
 
   it('can render a text link with custom content', () => {
-    const wrapper = renderComponent({ children: 'Scooby Doo' });
+    const wrapper = renderComponent({children: 'Scooby Doo'});
     assert.equal(wrapper.find('.usso-login__action').text(), 'Scooby Doo');
   });
 
diff --git a/jujugui/static/gui/src/app/d3-components/test-d3-components.js b/jujugui/static/gui/src/app/d3-components/test-d3-components.js
index ed1ba82097..5b6803c41e 100644
--- a/jujugui/static/gui/src/app/d3-components/test-d3-components.js
+++ b/jujugui/static/gui/src/app/d3-components/test-d3-components.js
@@ -14,7 +14,7 @@ describe('d3-components', function() {
         this.name = options.name || 'TestModule';
         this.container = options.container;
         this.events = {
-          scene: { '.thing': {click: 'decorateThing'}},
+          scene: {'.thing': {click: 'decorateThing'}},
           d3: {'.target': {click: 'targetTarget'}},
           topo: {
             cancel: 'cancelHandler'
diff --git a/jujugui/static/gui/src/app/init/app.js b/jujugui/static/gui/src/app/init/app.js
index bb2487fc31..f60d71c3dc 100644
--- a/jujugui/static/gui/src/app/init/app.js
+++ b/jujugui/static/gui/src/app/init/app.js
@@ -150,7 +150,7 @@ class App extends React.Component {
     @param evt {String} The event details.
   */
   _loginNotificationListener(evt) {
-    this.setState({ loginNotificiationURL: evt.detail });
+    this.setState({loginNotificiationURL: evt.detail});
   }
 
   /**
@@ -196,7 +196,7 @@ class App extends React.Component {
     @param evt {String} The event details.
   */
   _popupActionListener(evt) {
-    this.setState({ popupAction: evt.detail });
+    this.setState({popupAction: evt.detail});
   }
 
   /**
@@ -234,7 +234,7 @@ class App extends React.Component {
       this._removeEvent('topo.hoverService');
     }
     const onHover = evt => {
-      this.setState({ hoveredService: evt.detail.id });
+      this.setState({hoveredService: evt.detail.id});
     };
     this._addEvent('topo.hoverService', onHover);
     // Deselect the active service token. This needs to happen so that when a
@@ -258,7 +258,7 @@ class App extends React.Component {
     designated element.
   */
   _generateEnvSizeDisplay() {
-    const { db } = this.props;
+    const {db} = this.props;
     return (
       <EnvSizeDisplay
         appState={this.props.appState}
@@ -299,7 +299,7 @@ class App extends React.Component {
                      (false); defaults to true.
   */
   _sharingVisibility(visibility = true) {
-    this.setState({ sharingVisible: visibility });
+    this.setState({sharingVisible: visibility});
   }
 
   /**
@@ -547,7 +547,7 @@ Browser: ${navigator.userAgent}`
     @param visible {Boolean} Whether the modal should be shown.
   */
   _displayShortcutsModal(visible=true) {
-    this.setState({ shortcutsModalVisible: visible });
+    this.setState({shortcutsModalVisible: visible});
   }
 
   /**
@@ -568,7 +568,7 @@ Browser: ${navigator.userAgent}`
     @param visible {Boolean} Whether the modal should be shown.
   */
   _displaySettingsModal(visible=true) {
-    this.setState({ settingsModalVisible: visible });
+    this.setState({settingsModalVisible: visible});
   }
 
   /**
@@ -602,14 +602,14 @@ Browser: ${navigator.userAgent}`
     Hides the lightbox.
   */
   _hideLightbox() {
-    this.setState({ lightbox: null });
+    this.setState({lightbox: null});
   }
 
   /**
     Displays a lightbox with provided content.
   */
   _generateLightbox() {
-    const { lightbox } = this.state;
+    const {lightbox} = this.state;
     if (!lightbox) {
       return null;
     }
@@ -647,7 +647,7 @@ Browser: ${navigator.userAgent}`
   */
   _generatePostDeployment() {
     const state = this.props.appState.current;
-    const { postDeploymentPanel } = state;
+    const {postDeploymentPanel} = state;
     if (!postDeploymentPanel) {
       return null;
     }
@@ -1287,7 +1287,7 @@ Browser: ${navigator.userAgent}`
   */
   _showDragOverNotification(showIndicator = true) {
     this.props.topology.fadeHelpIndicator(showIndicator);
-    this.setState({ dragOverNotificationVisible: showIndicator });
+    this.setState({dragOverNotificationVisible: showIndicator});
   }
 
   /**
@@ -1314,13 +1314,13 @@ Browser: ${navigator.userAgent}`
     Generate the login notification.
   */
   _generateLoginNotification() {
-    const { loginNotificiationURL } = this.state;
+    const {loginNotificiationURL} = this.state;
     if (!loginNotificiationURL) {
       return null;
     }
     let dismiss = null;
     if (this.props.appState.current.root !== 'login') {
-      dismiss = this.setState.bind(this, { loginNotificiationURL: null });
+      dismiss = this.setState.bind(this, {loginNotificiationURL: null});
     }
     const content = (
       <span>
@@ -1341,7 +1341,7 @@ Browser: ${navigator.userAgent}`
     Generate the MAAS link.
   */
   _generateMAASLink() {
-    const { maasServer } = this.props;
+    const {maasServer} = this.props;
     if (!maasServer) {
       return null;
     }
@@ -1360,13 +1360,13 @@ Browser: ${navigator.userAgent}`
     Generate the confirmation for losing uncommitted changes.
   */
   _generateUncommittedConfirm() {
-    const { popupAction } = this.state;
+    const {popupAction} = this.state;
     if (!popupAction) {
       return null;
     }
     const buttons = [{
       title: 'Cancel',
-      action: this.setState.bind(this, { popupAction: null }),
+      action: this.setState.bind(this, {popupAction: null}),
       type: 'inline-neutral'
     }, {
       title: 'Continue',
diff --git a/jujugui/static/gui/src/app/init/bundle-importer.js b/jujugui/static/gui/src/app/init/bundle-importer.js
index ca735c69e2..fc5202312d 100644
--- a/jujugui/static/gui/src/app/init/bundle-importer.js
+++ b/jujugui/static/gui/src/app/init/bundle-importer.js
@@ -363,7 +363,7 @@ class BundleImporter {
     );
     this.modelAPI.addMachines(record.args, function(machine) {
       this.db.machines.remove(machine);
-    }.bind(this, machine), { modelId: machine.id});
+    }.bind(this, machine), {modelId: machine.id});
     // Loop through recordSet and add the machine model to every record which
     // requires it.
     this._saveModelToRequires(record.id, machine);
@@ -663,8 +663,8 @@ class BundleImporter {
     const ep1 = record.args[0].split(':');
     const ep2 = record.args[1].split(':');
     const endpoints = [
-      [ep1[0], { name: ep1[1] }],
-      [ep2[0], { name: ep2[1] }]
+      [ep1[0], {name: ep1[1]}],
+      [ep2[0], {name: ep2[1]}]
     ];
     // Resolve the record indexes to the service names.
     endpoints.forEach(function(ep, index) {
diff --git a/jujugui/static/gui/src/app/init/test-app.js b/jujugui/static/gui/src/app/init/test-app.js
index 94b1ca7fec..d2c753b7e6 100644
--- a/jujugui/static/gui/src/app/init/test-app.js
+++ b/jujugui/static/gui/src/app/init/test-app.js
@@ -151,7 +151,7 @@ describe('App', () => {
     it('reports true when the controller API is ready', () => {
       controllerAPI.get = sinon.stub().withArgs('connected').returns(true);
       controllerAPI.userIsAuthenticated = true;
-      const wrapper = renderComponent({ controllerAPI });
+      const wrapper = renderComponent({controllerAPI});
       const instance = wrapper.instance();
       assert.strictEqual(instance._controllerIsReady(), true);
     });
@@ -160,16 +160,16 @@ describe('App', () => {
       const wrapper = renderComponent();
       const instance = wrapper.instance();
       // Without a controller API object the controller is not ready.
-      wrapper.setProps({ controllerAPI: null });
+      wrapper.setProps({controllerAPI: null});
       assert.strictEqual(instance._controllerIsReady(), false, 'no controller');
       // Before the API is connected the controller is not ready.
       controllerAPI.get.withArgs('connected').returns(false);
       controllerAPI.userIsAuthenticated = false;
-      wrapper.setProps({ controllerAPI });
+      wrapper.setProps({controllerAPI});
       assert.strictEqual(instance._controllerIsReady(), false, 'not connected');
       // Before the API is properly logged in the controller is not ready.
       controllerAPI.get.withArgs('connected').returns(true);
-      wrapper.setProps({ controllerAPI });
+      wrapper.setProps({controllerAPI});
       assert.strictEqual(instance._controllerIsReady(), false, 'not authenticated');
     });
   });
diff --git a/jujugui/static/gui/src/app/init/test-bundle-exporter.js b/jujugui/static/gui/src/app/init/test-bundle-exporter.js
index 7fd0f388ba..55ecf6dd87 100644
--- a/jujugui/static/gui/src/app/init/test-bundle-exporter.js
+++ b/jujugui/static/gui/src/app/init/test-bundle-exporter.js
@@ -37,7 +37,7 @@ describe('bundle exporter', () => {
 
   beforeEach(() => {
     db = new models.Database({getECS: sinon.stub().returns({changeSet: {}})});
-    bundleExporter = new BundleExporter({ db });
+    bundleExporter = new BundleExporter({db});
   });
 
   it('can export the model as a bundle', () => {
@@ -137,7 +137,7 @@ describe('bundle exporter', () => {
     db.services.add({
       id: 'resourcemanager', charm: 'hadoop-resourcemanager-14'});
     db.services.add({
-      id: 'namenode', charm: 'hadoop-namenode-13' });
+      id: 'namenode', charm: 'hadoop-namenode-13'});
     db.relations.add({
       id: 'relation-0',
       endpoints: [
@@ -297,7 +297,7 @@ describe('bundle exporter', () => {
   });
 
   it('can determine complex machine placement for services', () => {
-    var machines = [{ id: '0' }, { id: '1' }, { id: '2' }];
+    var machines = [{id: '0'}, {id: '1'}, {id: '2'}];
     var units = [{
       service: 'wordpress',
       id: 'wordpress/0',
@@ -388,9 +388,9 @@ describe('bundle exporter', () => {
     // Because we ignore any machines which do not have units placed or only
     // host the GUI service we remap all machine ids to start at 0.
     var machines = [
-      { id: '3', hardware: {}, series: 'trusty' },
-      { id: '4', hardware: {}, series: 'trusty' },
-      { id: '5', hardware: {}, series: 'trusty' }
+      {id: '3', hardware: {}, series: 'trusty'},
+      {id: '4', hardware: {}, series: 'trusty'},
+      {id: '5', hardware: {}, series: 'trusty'}
     ];
     var units = [{
       service: 'wordpress',
@@ -429,14 +429,14 @@ describe('bundle exporter', () => {
       machine: '5'
     }];
     var services = [
-      { id: 'wordpress', charm: 'cs:trusty/wordpress-27' },
-      { id: 'apache2', charm: 'cs:trusty/apache2-27' },
-      { id: 'mysql', charm: 'cs:trusty/mysql-27' }
+      {id: 'wordpress', charm: 'cs:trusty/wordpress-27'},
+      {id: 'apache2', charm: 'cs:trusty/apache2-27'},
+      {id: 'mysql', charm: 'cs:trusty/mysql-27'}
     ];
     var charms = [
-      { id: 'cs:trusty/wordpress-27' },
-      { id: 'cs:trusty/apache2-27' },
-      { id: 'cs:trusty/mysql-27' }
+      {id: 'cs:trusty/wordpress-27'},
+      {id: 'cs:trusty/apache2-27'},
+      {id: 'cs:trusty/mysql-27'}
     ];
     db.machines.add(machines);
     db.services.add(services);
@@ -444,9 +444,9 @@ describe('bundle exporter', () => {
     db.units.add(units, true);
     const bundle = bundleExporter.exportBundle();
     const expectedMachines = {
-      '0': { series: 'trusty' },
-      '1': { series: 'trusty' },
-      '2': { series: 'trusty' }
+      '0': {series: 'trusty'},
+      '1': {series: 'trusty'},
+      '2': {series: 'trusty'}
     };
     assert.deepEqual(bundle.machines, expectedMachines);
   });
@@ -480,7 +480,7 @@ describe('bundle exporter', () => {
   });
 
   it('includes uncommmitted units when determining placement', () => {
-    var machine = { id: '0' };
+    var machine = {id: '0'};
     var units = [{
       service: 'wordpress',
       id: 'wordpress/0',
@@ -508,7 +508,7 @@ describe('bundle exporter', () => {
   });
 
   it('includes uncommitted machines when determining placement', () => {
-    var machine = { id: 'new0', commitStatus: 'uncommitted' };
+    var machine = {id: 'new0', commitStatus: 'uncommitted'};
     var units = [{
       service: 'wordpress',
       id: 'wordpress/0',
@@ -537,7 +537,7 @@ describe('bundle exporter', () => {
 
   it('ignores machines with no units when determining placements',
     () => {
-      var machine = { id: '0' };
+      var machine = {id: '0'};
       db.machines.add(machine);
       var placement = bundleExporter._mapServicesToMachines(db.machines);
       assert.deepEqual(placement, {});
@@ -546,7 +546,7 @@ describe('bundle exporter', () => {
   it('annotates services with placement info', () => {
     db.services.add({id: 'mysql', charm: 'precise/mysql-1'});
     db.services.add({id: 'wordpress', charm: 'precise/wordpress-1'});
-    db.machines.add({ id: '0', hardware: {}});
+    db.machines.add({id: '0', hardware: {}});
     db.units.add([{
       service: 'wordpress',
       id: 'wordpress/0',
diff --git a/jujugui/static/gui/src/app/init/test-bundle-importer.js b/jujugui/static/gui/src/app/init/test-bundle-importer.js
index e9bacdf65d..a5205e4b21 100644
--- a/jujugui/static/gui/src/app/init/test-bundle-importer.js
+++ b/jujugui/static/gui/src/app/init/test-bundle-importer.js
@@ -113,7 +113,7 @@ describe('BundleImporter', () => {
     describe('FileReader onload callback', () => {
       it('calls fetchDryRun if yaml file', () => {
         const fetch = sinon.stub(bundleImporter, 'fetchDryRun');
-        const yamlFile = { name: 'path/to/file.yaml' };
+        const yamlFile = {name: 'path/to/file.yaml'};
         bundleImporter._fileReaderOnload(yamlFile, {target: {result: 'foo'}});
         assert.equal(fetch.callCount, 1);
         const args = fetch.lastCall.args;
@@ -127,22 +127,22 @@ describe('BundleImporter', () => {
 
   describe('importBundleDryRun', () => {
     const unsortedRecords = [
-      { id: '2', requires: []},
-      { id: '5', requires: ['3']},
+      {id: '2', requires: []},
+      {id: '5', requires: ['3']},
       // The order of the following records (id:6) requires is important.
       // The sorter must check that all requires are resolved before
       // adding it to the changeSet.
-      { id: '6', requires: ['2', '5']},
-      { id: '4', requires: ['2']},
-      { id: '3', requires: []}
+      {id: '6', requires: ['2', '5']},
+      {id: '4', requires: ['2']},
+      {id: '3', requires: []}
     ];
 
     const sortedRecords = [
-      { id: '2', requires: []},
-      { id: '4', requires: ['2']},
-      { id: '3', requires: []},
-      { id: '5', requires: ['3']},
-      { id: '6', requires: ['2', '5']}
+      {id: '2', requires: []},
+      {id: '4', requires: ['2']},
+      {id: '3', requires: []},
+      {id: '5', requires: ['3']},
+      {id: '6', requires: ['2', '5']}
     ];
 
     it('sorts the records then calls to execute', () => {
@@ -236,12 +236,12 @@ describe('BundleImporter', () => {
       bundleImporter._execute_setAnnotations = executor;
 
       const sortedRecords = [
-        { method: 'addCharm' },
-        { method: 'addMachines' },
-        { method: 'deploy' },
-        { method: 'addUnit' },
-        { method: 'addRelation' },
-        { method: 'setAnnotations' }
+        {method: 'addCharm'},
+        {method: 'addMachines'},
+        {method: 'deploy'},
+        {method: 'addUnit'},
+        {method: 'addRelation'},
+        {method: 'setAnnotations'}
       ];
       bundleImporter._executeDryRun(sortedRecords);
       assert.deepEqual(called, {
@@ -275,7 +275,7 @@ describe('BundleImporter', () => {
 
     it('stops but does not fail if unknown record type', () => {
       const sortedRecords = [
-        { method: 'badMethod' }
+        {method: 'badMethod'}
       ];
       const execute = sinon.stub(bundleImporter, '_executeRecord');
       const notification = sinon.stub(
@@ -403,7 +403,7 @@ describe('BundleImporter', () => {
           id,
           'trusty',
           name,
-          { services: '', enable_monitoring: true, source: 'backports' },
+          {services: '', enable_monitoring: true, source: 'backports'},
           '',
           {},
           {},
diff --git a/jujugui/static/gui/src/app/init/test-deployer-mixin.js b/jujugui/static/gui/src/app/init/test-deployer-mixin.js
index 920512e50c..5736b11655 100644
--- a/jujugui/static/gui/src/app/init/test-deployer-mixin.js
+++ b/jujugui/static/gui/src/app/init/test-deployer-mixin.js
@@ -41,14 +41,14 @@ describe('Ghost Deployer Extension', function() {
       constructor() {
         var getMethod = sinon.stub();
         this.db = {
-          charms: { add: sinon.stub().returns({ get: getMethod }) },
+          charms: {add: sinon.stub().returns({get: getMethod})},
           services: {
             ghostService: sinon.stub().returns({
               get: sinon.stub().returns('ghost-service-id'),
               set: sinon.stub()
             })
           },
-          notifications: { add: sinon.stub() },
+          notifications: {add: sinon.stub()},
           addUnits: sinon.stub(),
           removeUnits: sinon.stub()
         };
@@ -88,7 +88,7 @@ describe('Ghost Deployer Extension', function() {
 
   it('sets the ghost service config to its defaults', function() {
     var charm = makeCharm();
-    charm.set('options', { foo: { default: 'bar' }});
+    charm.set('options', {foo: {default: 'bar'}});
     ghostDeployer.db.services = new models.ServiceList();
     ghostDeployer.deployService(charm);
     var service = ghostDeployer.db.services.item(0);
diff --git a/jujugui/static/gui/src/app/init/test-endpoint-utils.js b/jujugui/static/gui/src/app/init/test-endpoint-utils.js
index 926163a78f..b77cd7be2c 100644
--- a/jujugui/static/gui/src/app/init/test-endpoint-utils.js
+++ b/jujugui/static/gui/src/app/init/test-endpoint-utils.js
@@ -348,7 +348,7 @@ describe('Endpoints map', function() {
           'interface': 'logging',
           scope: 'container'
         }
-      ] }});
+      ]}});
   });
 
   it('should add a service to the map, neither provides nor requires',
diff --git a/jujugui/static/gui/src/app/init/test-environment-change-set.js b/jujugui/static/gui/src/app/init/test-environment-change-set.js
index a05d2d8843..0e7ce9bf40 100644
--- a/jujugui/static/gui/src/app/init/test-environment-change-set.js
+++ b/jujugui/static/gui/src/app/init/test-environment-change-set.js
@@ -175,7 +175,7 @@ describe('Environment Change Set', function() {
       });
 
       it('creates a new record of the specified type', function() {
-        var command = { foo: 'foo' };
+        var command = {foo: 'foo'};
         var wrapCallback = sinon.stub(
           ecs, '_wrapCallback').returns(command);
         _cleanups.push(wrapCallback.restore);
@@ -202,7 +202,7 @@ describe('Environment Change Set', function() {
       });
 
       it('adds supplied parent records to the new record', function() {
-        var command = { foo: 'foo' };
+        var command = {foo: 'foo'};
         var wrapCallback = sinon.stub(
           ecs, '_wrapCallback').returns(command);
         _cleanups.push(wrapCallback.restore);
@@ -334,52 +334,52 @@ describe('Environment Change Set', function() {
 
       it('only acts on the current index', function() {
         ecs.changeSet = {
-          a: { index: 0, parents: [] },
-          b: { index: 0, parents: [] },
-          c: { index: 1, parents: [] }
+          a: {index: 0, parents: []},
+          b: {index: 0, parents: []},
+          c: {index: 1, parents: []}
         };
         var result = ecs._buildHierarchy();
         // XXX assert.deepEqual does not seem to play well with arrays
         // of objects.  Slack card on board - Makyo 2014-04-23
         assert.deepEqual(JSON.stringify(result), JSON.stringify([
           [
-            { index: 0, parents: [], key: 'a' },
-            { index: 0, parents: [], key: 'b' }
+            {index: 0, parents: [], key: 'a'},
+            {index: 0, parents: [], key: 'b'}
           ]
         ]));
       });
 
       it('acts sane with "flat" hierarchies', function() {
         ecs.changeSet = {
-          a: { index: 0, parents: [] },
-          b: { index: 0, parents: [] },
-          c: { index: 0, parents: [] },
-          d: { index: 0, parents: [] },
-          e: { index: 0, parents: [] },
-          f: { index: 0 } // Can handle missing parents attribute.
+          a: {index: 0, parents: []},
+          b: {index: 0, parents: []},
+          c: {index: 0, parents: []},
+          d: {index: 0, parents: []},
+          e: {index: 0, parents: []},
+          f: {index: 0} // Can handle missing parents attribute.
         };
 
         var result = ecs._buildHierarchy();
         assert.deepEqual(JSON.stringify(result), JSON.stringify([
           [
-            { index: 0, parents: [], key: 'a' },
-            { index: 0, parents: [], key: 'b' },
-            { index: 0, parents: [], key: 'c' },
-            { index: 0, parents: [], key: 'd' },
-            { index: 0, parents: [], key: 'e' },
-            { index: 0, key: 'f' }
+            {index: 0, parents: [], key: 'a'},
+            {index: 0, parents: [], key: 'b'},
+            {index: 0, parents: [], key: 'c'},
+            {index: 0, parents: [], key: 'd'},
+            {index: 0, parents: [], key: 'e'},
+            {index: 0, key: 'f'}
           ]
         ]));
       });
 
       it('splits commands into dependency levels', function() {
         ecs.changeSet = {
-          a: { index: 0, parents: [] },
-          b: { index: 0, parents: [] },
-          c: { index: 0, parents: ['a', 'b'] },
-          d: { index: 0, parents: ['a'] },
-          e: { index: 0, parents: ['a', 'c'] },
-          f: { index: 0, parents: ['e'] }
+          a: {index: 0, parents: []},
+          b: {index: 0, parents: []},
+          c: {index: 0, parents: ['a', 'b']},
+          d: {index: 0, parents: ['a']},
+          e: {index: 0, parents: ['a', 'c']},
+          f: {index: 0, parents: ['e']}
         };
 
         var result = ecs._buildHierarchy();
@@ -388,31 +388,31 @@ describe('Environment Change Set', function() {
         assert.equal(JSON.stringify(result), JSON.stringify([
           // Top-level.
           [
-            { index: 0, parents: [], key: 'a' },
-            { index: 0, parents: [], key: 'b' }
+            {index: 0, parents: [], key: 'a'},
+            {index: 0, parents: [], key: 'b'}
           ],
           [
-            { index: 0, parents: ['a', 'b'], key: 'c' },
-            { index: 0, parents: ['a'], key: 'd' }
+            {index: 0, parents: ['a', 'b'], key: 'c'},
+            {index: 0, parents: ['a'], key: 'd'}
           ],
           [
-            { index: 0, parents: ['a', 'c'], key: 'e' }
+            {index: 0, parents: ['a', 'c'], key: 'e'}
           ],
           [
-            { index: 0, parents: ['e'], key: 'f' }
+            {index: 0, parents: ['e'], key: 'f'}
           ]
         ]));
       });
 
       it('filters out unplaced units when instructed to', function() {
         ecs.changeSet = {
-          a: { index: 0, parents: [], command: {
+          a: {index: 0, parents: [], command: {
             method: '_deploy',
-            options: { modelId: '75930989$' }
+            options: {modelId: '75930989$'}
           }},
-          b: { index: 0, parents: [], command: {
+          b: {index: 0, parents: [], command: {
             method: '_add_unit',
-            options: { modelId: '75930989$/0' }
+            options: {modelId: '75930989$/0'}
           }}
         };
 
@@ -429,7 +429,7 @@ describe('Environment Change Set', function() {
               parents: [],
               command: {
                 method: '_deploy',
-                options: { modelId: '75930989$' }
+                options: {modelId: '75930989$'}
               },
               key: 'a'
             }
@@ -642,7 +642,7 @@ describe('Environment Change Set', function() {
           };
         }
         if (key === 'environmentConfig') {
-          return { foo: 'baz' };
+          return {foo: 'baz'};
         }
       };
       db.services.getById = sinon.stub().returns({
@@ -1065,7 +1065,7 @@ describe('Environment Change Set', function() {
     describe('lazyDestroyMachines', function() {
       it('creates a new destroy record', function(done) {
         const args = [['0/lxc/0'], false, done];
-        const machineObj = { units: [] };
+        const machineObj = {units: []};
         ecs.db = {
           machines: {
             getById: function(arg) {
@@ -1142,7 +1142,7 @@ describe('Environment Change Set', function() {
           destroy: function() {},
           reset: function() {},
           getById: function() {
-            return { units: []};
+            return {units: []};
           }
         };
         ecs.changeSet = {
@@ -1199,7 +1199,7 @@ describe('Environment Change Set', function() {
       it('removes machines from uncommitted units', function() {
         var stubSet = sinon.stub();
         var db = ecs.db;
-        var unit = { machine: 'foo'};
+        var unit = {machine: 'foo'};
         db.machines = {
           getById: function() {
             return {};
@@ -1218,7 +1218,7 @@ describe('Environment Change Set', function() {
           free: sinon.stub()
         };
         db.units = {
-          revive: function() { return { set: stubSet }; },
+          revive: function() { return {set: stubSet}; },
           free: function() {},
           reset: function() {},
           detachAll: function() {},
@@ -1376,7 +1376,7 @@ describe('Environment Change Set', function() {
           'service-1': {
             command: {
               method: '_deploy',
-              options: { modelId: 'mysql' },
+              options: {modelId: 'mysql'},
               args: ['charmid', 'mysql']
             }
           }
@@ -1463,7 +1463,7 @@ describe('Environment Change Set', function() {
             if (key === '_dirtyFields') {
               return service._dirtyFields;
             } else {
-              return { foo: 'bar' };
+              return {foo: 'bar'};
             }
           },
           set: function(key, value) {
@@ -1512,7 +1512,7 @@ describe('Environment Change Set', function() {
         var dirtyFields = service.get('_dirtyFields');
         dirtyFields.push('bax');
         service.set('_dirtyFields', dirtyFields);
-        var args = ['mysql', { foo: 'bar' }, null, { foo: 'baz' }];
+        var args = ['mysql', {foo: 'bar'}, null, {foo: 'baz'}];
         ecs.lazySetConfig(args);
         dirtyFields = service.get('_dirtyFields');
         assert.equal(dirtyFields.length, 2);
@@ -1520,11 +1520,11 @@ describe('Environment Change Set', function() {
       });
 
       it('sets the changed values to the service model', function() {
-        var args = ['mysql', { foo: 'bar' }, null, { foo: 'baz', bax: 'qux' }];
+        var args = ['mysql', {foo: 'bar'}, null, {foo: 'baz', bax: 'qux'}];
         service.set = sinon.stub();
         ecs.lazySetConfig(args);
         assert.equal(service.set.callCount, 2);
-        assert.deepEqual(service.set.lastCall.args[1], { foo: 'bar' });
+        assert.deepEqual(service.set.lastCall.args[1], {foo: 'bar'});
       });
     });
 
@@ -1540,14 +1540,14 @@ describe('Environment Change Set', function() {
             command: {
               args: ['charm', 'mysql'],
               method: '_deploy',
-              options: { modelId: 'serviceId1$' }
+              options: {modelId: 'serviceId1$'}
             }
           },
           'service-2': {
             command: {
               args: ['charm', 'wordpress'],
               method: '_deploy',
-              options: { modelId: 'serviceId2$' }
+              options: {modelId: 'serviceId2$'}
             }
           }
         };
@@ -1751,7 +1751,7 @@ describe('Environment Change Set', function() {
         var lazyAddCharm = sinon.stub(ecs, 'lazyAddCharm');
         _cleanups.push(lazyAddCharm.restore);
         var callback = sinon.stub();
-        var args = [1, 2, callback, { immediate: true}];
+        var args = [1, 2, callback, {immediate: true}];
         envObj.addCharm.apply(envObj, args);
         assert.equal(envObj._addCharm.calledOnce, true);
         var addCharmArgs = envObj._addCharm.lastCall.args;
@@ -1811,7 +1811,7 @@ describe('Environment Change Set', function() {
         var lazySetConfig = sinon.stub(ecs, 'lazySetConfig');
         _cleanups.push(lazySetConfig.restore);
         var callback = sinon.stub();
-        var args = ['service', {key: 'value'}, callback, { immediate: true}];
+        var args = ['service', {key: 'value'}, callback, {immediate: true}];
         envObj.set_config.apply(envObj, args);
         assert.equal(envObj._set_config.calledOnce, true);
         var setConfigArgs = envObj._set_config.lastCall.args;
@@ -1832,7 +1832,7 @@ describe('Environment Change Set', function() {
           // this is using bind instead of apply because of how the
           // assert.throws assertion operates.
           envObj.set_config.bind(
-            envObj, 'foo', {}, callback, { immediate: true}),
+            envObj, 'foo', {}, callback, {immediate: true}),
           'You cannot immediately set config on a queued application');
         assert.equal(envObj._set_config.callCount, 0);
         // make sure that we don't add it to the changeSet.
@@ -1853,14 +1853,14 @@ describe('Environment Change Set', function() {
       it('handles heirarchical changes on queued services', function() {
         var db = ecs.db;
         db.services = new Y.juju.models.ServiceList();
-        db.services.add({ id: 'serviceId1$' });
+        db.services.add({id: 'serviceId1$'});
         db.units.filterByMachine = sinon.stub();
         ecs.changeSet = {
           'service-1': {
             command: {
               args: ['charm', 'mysql'],
               method: '_deploy',
-              options: { modelId: 'serviceId1$' }
+              options: {modelId: 'serviceId1$'}
             }
           }
         };
@@ -2034,15 +2034,15 @@ describe('Environment Change Set', function() {
             command: {
               method: '_add_unit',
               options: {
-                modelId: unit.id }},
-            parents: ['addMachines_123'] },
+                modelId: unit.id}},
+            parents: ['addMachines_123']},
           addMachines_123: {
             command: {
               args: [[{series: 'trusty'}]],
               method: '_addMachines',
               options: {
-                modelId: machineId }},
-            parents: [] }
+                modelId: machineId}},
+            parents: []}
         };
         assert.equal(ecs.changeSet.a.parents.length, 1);
         ecs.placeUnit(unit, machineId);
@@ -2065,8 +2065,8 @@ describe('Environment Change Set', function() {
               args: cmdArgs,
               method: '_add_unit',
               options: {
-                modelId: unit.id }},
-            parents: [] }
+                modelId: unit.id}},
+            parents: []}
         };
         assert.deepEqual(ecs.changeSet.a.command.args, cmdArgs);
         ecs.placeUnit(unit, machineId);
@@ -2089,7 +2089,7 @@ describe('Environment Change Set', function() {
         assert.isNull(err);
         assert.strictEqual(mockValidateUnitPlacement.calledOnce, true);
         var args = mockValidateUnitPlacement.lastCall.args;
-        assert.deepEqual(args, [{ id: 'django/42' }, '0', ecs.db]);
+        assert.deepEqual(args, [{id: 'django/42'}, '0', ecs.db]);
       });
 
       it('does not apply changes if unit placement is not valid', function() {
diff --git a/jujugui/static/gui/src/app/init/test-relation-utils.js b/jujugui/static/gui/src/app/init/test-relation-utils.js
index 625c7b28ad..0f13409514 100644
--- a/jujugui/static/gui/src/app/init/test-relation-utils.js
+++ b/jujugui/static/gui/src/app/init/test-relation-utils.js
@@ -367,21 +367,21 @@ describe('RelationUtils', () => {
     beforeEach(() => {
       source = {
         id: 'source-id',
-        model: { get: function() {} },
+        model: {get: function() {}},
         modelId: function() {
           return 'source-id';
         },
         _units: [],
-        units: { toArray: () => source._units }
+        units: {toArray: () => source._units}
       };
       target = {
         id: 'target-id',
-        model: { get: function() {} },
+        model: {get: function() {}},
         modelId: function() {
           return 'target-id';
         },
         _units: [],
-        units: { toArray: () => target._units }
+        units: {toArray: () => target._units}
       };
       inputRelation = new models.Relation({
         endpoints: [
@@ -489,7 +489,7 @@ describe('RelationUtils', () => {
 
     it('can store relations in collections', () => {
       const thirdModel = {
-        model: { get: function() {} },
+        model: {get: function() {}},
         modelId: function() {
           return 'third-id';
         }
@@ -516,7 +516,7 @@ describe('RelationUtils', () => {
       thirdModel._units = [Object.assign({}, unit)];
       thirdModel._units[0].agent_state = 'error';
       thirdModel._units[0].agent_state_data.hook = 'endpoint-1-relation';
-      thirdModel.units = { toArray: function() { return thirdModel._units; } };
+      thirdModel.units = {toArray: function() { return thirdModel._units; }};
       // Add two relations between the same two models, plus a third.
       const relations = [
         relationUtils.DecoratedRelation(inputRelation, source, target),
@@ -633,7 +633,7 @@ describe('RelationUtils', () => {
       assert.deepEqual(env.add_relation.lastCall.args[1], endpoints[1]);
       // Call the add_relation callback.
       env.add_relation.lastCall.args[2]({
-        result: { id: 'foo', 'interface': 'bar', scope: 'global' }
+        result: {id: 'foo', 'interface': 'bar', scope: 'global'}
       });
       // Callback method assertions.
       assert.equal(db.relations.remove.callCount, 1);
@@ -724,7 +724,7 @@ describe('RelationUtils', () => {
       assert.deepEqual(env.add_relation.lastCall.args[1], endpoints[1]);
       // Call the add_relation callback.
       env.add_relation.lastCall.args[2]({
-        result: { id: 'foo', 'interface': 'bar', scope: 'global' }
+        result: {id: 'foo', 'interface': 'bar', scope: 'global'}
       });
       // Callback method assertions.
       assert.equal(db.relations.remove.callCount, 1);
@@ -818,7 +818,7 @@ describe('RelationUtils', () => {
       assert.deepEqual(env.add_relation.lastCall.args[1], endpoints[1]);
       // Call the add_relation callback.
       env.add_relation.lastCall.args[2]({
-        result: { id: 'foo', 'interface': 'bar', scope: 'global' }
+        result: {id: 'foo', 'interface': 'bar', scope: 'global'}
       });
       // Callback method assertions.
       assert.equal(db.relations.remove.callCount, 1);
@@ -845,7 +845,7 @@ describe('RelationUtils', () => {
       endpointData[vals.applicationToId] = JSON.parse(vals.getEndpoints);
       const getEndpoints = sinon.stub().returns(endpointData);
       const applicationFrom = vals.applicationFrom || {};
-      const applicationTo = { get: function() { return vals.applicationToId; } };
+      const applicationTo = {get: function() { return vals.applicationToId; }};
       return relationUtils.getAvailableEndpoints(
         endpointsController, 'db', getEndpoints, applicationFrom,
         applicationTo, JSON.parse(vals.getRelationDataForService));
diff --git a/jujugui/static/gui/src/app/init/test-utils.js b/jujugui/static/gui/src/app/init/test-utils.js
index 27f91622df..b380032f77 100644
--- a/jujugui/static/gui/src/app/init/test-utils.js
+++ b/jujugui/static/gui/src/app/init/test-utils.js
@@ -1111,7 +1111,7 @@ describe('init utils', () => {
     );
 
     it('properly removes the ghost units on env add_unit callback', function() {
-      const ghostUnit = { ghostUnit: 'I am' };
+      const ghostUnit = {ghostUnit: 'I am'};
       const db = {
         removeUnits: sinon.stub()
       };
diff --git a/jujugui/static/gui/src/app/init/testing-factory.js b/jujugui/static/gui/src/app/init/testing-factory.js
index 699d956cd7..c7ce405851 100644
--- a/jujugui/static/gui/src/app/init/testing-factory.js
+++ b/jujugui/static/gui/src/app/init/testing-factory.js
@@ -56,7 +56,7 @@ const factory = {
         var pathParts = path.split('/');
         // The path might not contain the series.
         path = pathParts[1] ? pathParts[1].split('-')[0] : pathParts[0];
-        var xhr = { target: { responseText: null}};
+        var xhr = {target: {responseText: null}};
         if (charms[path]) {
           xhr.target.responseText = charms[path];
           callback(null, xhr);
diff --git a/jujugui/static/gui/src/app/init/topology/relation.js b/jujugui/static/gui/src/app/init/topology/relation.js
index 414fdc6957..8bae02fab1 100644
--- a/jujugui/static/gui/src/app/init/topology/relation.js
+++ b/jujugui/static/gui/src/app/init/topology/relation.js
@@ -41,10 +41,10 @@ class RelationModule {
           mousemove: 'mousemove'
         },
         '.relation-remove': {
-          click: {callback: 'relationRemoveClick' }
+          click: {callback: 'relationRemoveClick'}
         },
         '.inspect-relation': {
-          click: {callback: 'inspectRelationClick' }
+          click: {callback: 'inspectRelationClick'}
         },
         '.dragline': {
           /**
@@ -890,11 +890,11 @@ class RelationModule {
       const ep = endpoints[0];
       const endpoints_item = [
         [ep[0].service,
-          { name: ep[0].name,
-            role: 'server' }],
+          {name: ep[0].name,
+            role: 'server'}],
         [ep[1].service,
-          { name: ep[1].name,
-            role: 'client' }]];
+          {name: ep[1].name,
+            role: 'client'}]];
       view.addRelationEnd(endpoints_item, view, context);
       return;
     }
@@ -981,10 +981,10 @@ class RelationModule {
         const endpoints_item = [
           [el.getAttribute('data-startservice'), {
             name: el.getAttribute('data-startname'),
-            role: 'server' }],
+            role: 'server'}],
           [el.getAttribute('data-endservice'), {
             name: el.getAttribute('data-endname'),
-            role: 'client' }]
+            role: 'client'}]
         ];
         menu.classList.remove('active');
         view.addRelationEnd(endpoints_item, view, context);
@@ -1090,7 +1090,7 @@ class RelationModule {
     const z = topo.zoom.scale();
     const line = relation.source.getConnectorPair(relation.target);
     const coords = topoUtils.findCenterPoint(line[0], line[1]);
-    const point = { x: coords[0], y: coords[1], w: 0, h: 0 };
+    const point = {x: coords[0], y: coords[1], w: 0, h: 0};
     const locateAt = topoUtils.locateRelativePointOnCanvas(point, tr, z);
     // Shift the menu to the left by half its width, and up by its height
     // plus the height of the arrow (16px).
diff --git a/jujugui/static/gui/src/app/init/topology/service.js b/jujugui/static/gui/src/app/init/topology/service.js
index 9a71eda008..22c9c39bd5 100644
--- a/jujugui/static/gui/src/app/init/topology/service.js
+++ b/jujugui/static/gui/src/app/init/topology/service.js
@@ -1022,7 +1022,7 @@ class ServiceModule {
     var dragData = JSON.parse(evt.dataTransfer.getData('Text'));
     var translation = topo.getTranslate();
     var scale = topo.getScale();
-    var ghostAttributes = { coordinates: [] };
+    var ghostAttributes = {coordinates: []};
     // The following magic number 71 is the height of the header and is
     // required to position the service in the proper y position.
     var dropXY = [evt.clientX, (evt.clientY - 71)];
diff --git a/jujugui/static/gui/src/app/init/topology/test-environment.js b/jujugui/static/gui/src/app/init/topology/test-environment.js
index 02e8f46285..18a3de85f4 100644
--- a/jujugui/static/gui/src/app/init/topology/test-environment.js
+++ b/jujugui/static/gui/src/app/init/topology/test-environment.js
@@ -162,7 +162,7 @@ describe('EnvironmentView', function() {
     // Additional relations between the same two services for collection
     // testing. Note that this uses the gojuju style relation ideas for
     // additional compatibility.
-    var additionalRelations = { 'result': [
+    var additionalRelations = {'result': [
       [
         'relationInfo',
         'add', {
@@ -623,14 +623,14 @@ describe('EnvironmentView', function() {
         validateRelationCount(service, relationModule, 1).should.equal(true);
       });
 
-      db.onDelta({detail: { data: addSubordinate }});
+      db.onDelta({detail: {data: addSubordinate}});
       view.update();
 
       container.querySelectorAll('.subordinate.service').forEach(service => {
         validateRelationCount(service, relationModule, 1).should.equal(true);
       });
 
-      db.onDelta({detail: { data: addRelation }});
+      db.onDelta({detail: {data: addRelation}});
       view.update();
 
       validateRelationCount(container.querySelector('.subordinate.service'),
@@ -667,7 +667,7 @@ describe('EnvironmentView', function() {
       };
       view.render();
 
-      db.onDelta({detail: { data: tmp_data }});
+      db.onDelta({detail: {data: tmp_data}});
       view.render();
 
       container.querySelectorAll('.service').forEach(serviceNode => {
@@ -717,7 +717,7 @@ describe('EnvironmentView', function() {
           chartSizedProperly(service).should.equal(true);
         });
 
-        db.onDelta({detail: { data: tmp_data }});
+        db.onDelta({detail: {data: tmp_data}});
 
         container.querySelectorAll('.service').forEach(service => {
           chartSizedProperly(service).should.equal(true);
@@ -794,7 +794,7 @@ describe('EnvironmentView', function() {
         });
 
         // Resize the wordpress service.
-        db.onDelta({detail: { data: tmp_data }});
+        db.onDelta({detail: {data: tmp_data}});
 
         // Ensure that endpoints still match for all services, now that
         // one service has been resized.  This is the real test here.
@@ -850,7 +850,7 @@ describe('EnvironmentView', function() {
           .should.equal(true);
       });
 
-      db.onDelta({detail: { data: tmp_data }});
+      db.onDelta({detail: {data: tmp_data}});
       view.render();
 
       container.querySelectorAll('.service').forEach(serviceNode => {
@@ -884,10 +884,10 @@ describe('EnvironmentView', function() {
       view.topo.modules.ServiceModule.useTransitions = false;
       view.render();
 
-      db.onDelta({detail: { data: tmp_data }});
+      db.onDelta({detail: {data: tmp_data}});
       view.update();
       tmp_data.result[0][2].name = 'wordpressb';
-      db.onDelta({detail: { data: tmp_data }});
+      db.onDelta({detail: {data: tmp_data}});
       view.update();
 
       assert.notDeepEqual(
@@ -924,7 +924,7 @@ describe('EnvironmentView', function() {
       match[1].should.eql('100');
       match[2].should.eql('200');
 
-      db.onDelta({detail: { data: tmp_data }});
+      db.onDelta({detail: {data: tmp_data}});
       view.update();
 
       // On annotation change  position should be updated.
@@ -950,7 +950,7 @@ describe('EnvironmentView', function() {
           ]
         ]
       };
-      db.onDelta({detail: { data: tmp_data }});
+      db.onDelta({detail: {data: tmp_data}});
       view.update();
     });
 
@@ -1098,8 +1098,8 @@ describe('EnvironmentView', function() {
             type: 'relType'
           }]];
         // Add a mock charm for the service.
-        var charm = { id: service.charm, loaded: false };
-        var charm2 = { id: 'cs:precise/mediawiki-3', loaded: false };
+        var charm = {id: service.charm, loaded: false};
+        var charm2 = {id: 'cs:precise/mediawiki-3', loaded: false};
         db.charms.add(charm);
         db.charms.add(charm2);
         charm = db.charms.getById(service.charm);
@@ -1380,7 +1380,7 @@ describe('EnvironmentView', function() {
         fauxController.endpointsMap = endpointsMap;
         fauxController.db = db;
         var view = new EnvironmentView(
-          { container: container,
+          {container: container,
             db: db,
             endpointsController: fauxController,
             env: env,
diff --git a/jujugui/static/gui/src/app/init/topology/test-relation.js b/jujugui/static/gui/src/app/init/topology/test-relation.js
index f8e7a1847e..8f14ae245d 100644
--- a/jujugui/static/gui/src/app/init/topology/test-relation.js
+++ b/jujugui/static/gui/src/app/init/topology/test-relation.js
@@ -61,7 +61,7 @@ describe('topology relation module', function() {
     var topo = {
       vis: {
         selectAll: function() {
-          return { remove: stubRemove };
+          return {remove: stubRemove};
         }
       }
     };
@@ -88,7 +88,7 @@ describe('topology relation module', function() {
       assert.equal(state.changeState.callCount, 1);
       assert.deepEqual(state.changeState.args[0][0], {
         gui: {
-          inspector: { id: 'one' }
+          inspector: {id: 'one'}
         }});
     });
 
@@ -148,7 +148,7 @@ describe('topology relation module', function() {
       assert.deepEqual(hide.lastCall.args[0], {
         serviceNames: ['foo2', 'foo4']
       });
-      assert.deepEqual(show.lastCall.args[0], { serviceNames: ['foo3'] });
+      assert.deepEqual(show.lastCall.args[0], {serviceNames: ['foo3']});
     });
   });
 
diff --git a/jujugui/static/gui/src/app/init/topology/test-service.js b/jujugui/static/gui/src/app/init/topology/test-service.js
index 66526b4063..8d4ffe8f0b 100644
--- a/jujugui/static/gui/src/app/init/topology/test-service.js
+++ b/jujugui/static/gui/src/app/init/topology/test-service.js
@@ -42,7 +42,7 @@ describe('service module annotations', function() {
     viewContainer = utils.makeContainer(this);
     db = new models.Database({getECS: sinon.stub().returns({changeSet: {}})});
     called = false;
-    location = { 'gui-x': 0, 'gui-y': 0};
+    location = {'gui-x': 0, 'gui-y': 0};
     const env = {
       update_annotations: function(name, type, data) {
         called = true;
@@ -71,7 +71,7 @@ describe('service module annotations', function() {
   it('should set location annotations on service block drag end',
     function() {
       const d =
-           { id: 'wordpress',
+           {id: 'wordpress',
              inDrag: serviceModule.DRAG_ACTIVE,
              x: 100.1,
              y: 200.2};
@@ -84,7 +84,7 @@ describe('service module annotations', function() {
   it('should not set annotations on drag end if building a relation',
     function() {
       const d =
-           { id: 'wordpress',
+           {id: 'wordpress',
              x: 100.1,
              y: 200.2};
       const topo = serviceModule.topo;
@@ -131,7 +131,7 @@ describe('service updates', function() {
     viewContainer = utils.makeContainer(this);
     db = new models.Database({getECS: sinon.stub().returns({changeSet: {}})});
     view = new EnvironmentView(
-      { container: viewContainer,
+      {container: viewContainer,
         db: db,
         env: {
           update_annotations: function() {}
@@ -427,7 +427,7 @@ describe('service module events', function() {
   });
 
   it('should deploy a bundle on file drop events', function(done) {
-    const file = { name: '', type: '' };
+    const file = {name: '', type: ''};
     const fakeEventObject = {
       dataTransfer: {
         // All we need to fake things out is to have a file.
@@ -508,10 +508,10 @@ describe('service module events', function() {
   });
 
   it('_extractCharmMetadata: calls ziputils.getEntries()', function() {
-    const fileObj = { file: '' },
-        topoObj = { topo: '' },
-        envObj = { env: '' },
-        dbObj = { db: '' };
+    const fileObj = {file: ''},
+        topoObj = {topo: ''},
+        envObj = {env: ''},
+        dbObj = {db: ''};
     const findCharmEntries = sinon.stub(
       serviceModule, '_findCharmEntries');
     cleanups.push(findCharmEntries.restore);
@@ -544,9 +544,9 @@ describe('service module events', function() {
     let dbObj, envObj, fileObj, topoObj, notificationParams;
 
     beforeEach(function() {
-      fileObj = { name: 'foo' };
-      topoObj = { topo: '' };
-      envObj = { env: '' };
+      fileObj = {name: 'foo'};
+      topoObj = {topo: ''};
+      envObj = {env: ''};
       dbObj = {
         notifications: {
           add: function(info) {
@@ -557,7 +557,7 @@ describe('service module events', function() {
     });
 
     it('finds the files in the zip', function() {
-      const entries = { metadata: 'foo' };
+      const entries = {metadata: 'foo'};
       findCharmEntries.returns(entries);
       const readEntries = sinon.stub(
         serviceModule, '_readCharmEntries');
@@ -577,7 +577,7 @@ describe('service module events', function() {
     });
 
     it('shows an error notification if there is no metadata.yaml', function() {
-      const entries = { foo: 'bar' };
+      const entries = {foo: 'bar'};
       findCharmEntries.returns(entries);
       const readEntries = sinon.stub(
         serviceModule, '_readCharmEntries');
@@ -601,10 +601,10 @@ describe('service module events', function() {
   });
 
   it('_readCharmEntries: calls ziputils.readCharmEntries', function() {
-    const fileObj = { file: '' },
-        topoObj = { topo: '' },
-        envObj = { env: '' },
-        dbObj = { db: '' };
+    const fileObj = {file: ''},
+        topoObj = {topo: ''},
+        envObj = {env: ''},
+        dbObj = {db: ''};
     const existingServices = sinon.stub(
       serviceModule, '_checkForExistingServices');
     cleanups.push(existingServices);
@@ -640,12 +640,12 @@ describe('service module events', function() {
 
     beforeEach(function() {
       cleanups = [];
-      fileObj = { name: 'foo' };
+      fileObj = {name: 'foo'};
       topochangeState = sinon.stub();
       topoObj = {};
       view.topo.state.changeState = topochangeState;
-      envObj = { env: 'foo' };
-      contentsObj = { metadata: 'foo' };
+      envObj = {env: 'foo'};
+      contentsObj = {metadata: 'foo'};
     });
 
     afterEach(() => {
@@ -668,7 +668,7 @@ describe('service module events', function() {
       setup(this);
 
       getServicesStub = sinon.stub().returns(['service']);
-      dbObj = { services: { getServicesFromCharmName: getServicesStub }};
+      dbObj = {services: {getServicesFromCharmName: getServicesStub}};
 
       serviceModule._checkForExistingServices(
         fileObj, topoObj, envObj, dbObj, contentsObj);
@@ -681,7 +681,7 @@ describe('service module events', function() {
       setup(this);
 
       getServicesStub = sinon.stub().returns(['service']);
-      dbObj = { services: { getServicesFromCharmName: getServicesStub }};
+      dbObj = {services: {getServicesFromCharmName: getServicesStub}};
 
       serviceModule._checkForExistingServices(
         fileObj, topoObj, envObj, dbObj, contentsObj);
@@ -701,7 +701,7 @@ describe('service module events', function() {
         }
       }
     };
-    const fileObj = { name: 'foo' };
+    const fileObj = {name: 'foo'};
     const fadeHelpIndicator = sinon.stub();
     const topo = {
       environmentView: {
@@ -720,10 +720,10 @@ describe('service module events', function() {
   });
 
   it('_showUpgradeOrNewInspector: shows the inspector', function() {
-    const dbObj = { db: 'db' };
-    const fileObj = { name: 'foo' };
-    const envObj = { env: 'env' };
-    const services = [{ getAttrs: function() {} }];
+    const dbObj = {db: 'db'};
+    const fileObj = {name: 'foo'};
+    const envObj = {env: 'env'};
+    const services = [{getAttrs: function() {}}];
     const changeState = serviceModule.topo.state.changeState;
 
     serviceModule._showUpgradeOrNewInspector(services, fileObj, envObj, dbObj);
@@ -739,9 +739,9 @@ describe('service module events', function() {
   });
 
   it('_deployLocalCharm: calls to show the inspector', function() {
-    const dbObj = { db: 'db' };
-    const fileObj = { name: 'foo' };
-    const envObj = { env: 'env' };
+    const dbObj = {db: 'db'};
+    const fileObj = {name: 'foo'};
+    const envObj = {env: 'env'};
     const changeState = serviceModule.topo.state.changeState;
 
     serviceModule._deployLocalCharm(fileObj, envObj, dbObj);
@@ -959,22 +959,22 @@ describe('updateElementVisibility', function() {
     serviceModule.topo.db.services = serviceList;
     serviceModule.updateElementVisibility();
     assert.equal(fade.callCount, 1);
-    assert.deepEqual(fade.lastCall.args[0], { serviceNames: ['foo1'] });
+    assert.deepEqual(fade.lastCall.args[0], {serviceNames: ['foo1']});
     assert.equal(hide.callCount, 1);
-    assert.deepEqual(hide.lastCall.args[0], { serviceNames: ['foo2'] });
+    assert.deepEqual(hide.lastCall.args[0], {serviceNames: ['foo2']});
     assert.equal(show.callCount, 3);
     assert.deepEqual(show.args, [
-      [{ serviceNames: ['foo1'] }],
-      [{ serviceNames: ['foo3'] }],
-      [{ serviceNames: ['foo4'] }]
+      [{serviceNames: ['foo1']}],
+      [{serviceNames: ['foo3']}],
+      [{serviceNames: ['foo4']}]
     ]);
     assert.equal(highlight.callCount, 1);
-    assert.deepEqual(highlight.lastCall.args[0], { serviceName: ['foo3'] });
+    assert.deepEqual(highlight.lastCall.args[0], {serviceName: ['foo3']});
     assert.equal(unhighlight.callCount, 3);
     assert.deepEqual(unhighlight.args, [
-      [{ serviceName: ['foo1'] }],
-      [{ serviceName: ['foo2'] }],
-      [{ serviceName: ['foo4'] }]
+      [{serviceName: ['foo1']}],
+      [{serviceName: ['foo2']}],
+      [{serviceName: ['foo4']}]
     ]);
   });
 });
diff --git a/jujugui/static/gui/src/app/init/topology/test-topology.js b/jujugui/static/gui/src/app/init/topology/test-topology.js
index b0879743b7..45a8de133f 100644
--- a/jujugui/static/gui/src/app/init/topology/test-topology.js
+++ b/jujugui/static/gui/src/app/init/topology/test-topology.js
@@ -34,7 +34,7 @@ describe('topology', function() {
         this.name = 'TestModule';
         this.container = container;
         this.events = {
-          scene: { '.thing': {click: 'decorateThing'}},
+          scene: {'.thing': {click: 'decorateThing'}},
           d3: {'.target': {click: 'targetTarget'}},
           topo: {
             cancel: 'cancelHandler'
diff --git a/jujugui/static/gui/src/app/init/utils.js b/jujugui/static/gui/src/app/init/utils.js
index 9d5545f7dc..4ea2be4931 100644
--- a/jujugui/static/gui/src/app/init/utils.js
+++ b/jujugui/static/gui/src/app/init/utils.js
@@ -84,7 +84,7 @@ utils.exportEnvironmentFile = (db, sendAnalytics)=> {
   apps.forEach(app => {
     idMap.set(app.get('id'), app.get('name'));
   });
-  const bundleExporter = new BundleExporter({ db });
+  const bundleExporter = new BundleExporter({db});
   const result = bundleExporter.exportBundle();
   let exportData = jsyaml.dump(result);
   // Replace the temporary app ids with the real ids.
@@ -304,10 +304,10 @@ utils.destroyModel = (
 */
 utils.getUnitStatusCounts = units => {
   const unitStatuses = {
-    uncommitted: { priority: 3, size: 0 },
-    started: { priority: 2, size: 0 },
-    pending: { priority: 1, size: 0 },
-    error: { priority: 0, size: 0 }
+    uncommitted: {priority: 3, size: 0},
+    started: {priority: 2, size: 0},
+    pending: {priority: 1, size: 0},
+    error: {priority: 0, size: 0}
   };
   let agentState;
   units.forEach(unit => {
@@ -315,7 +315,7 @@ utils.getUnitStatusCounts = units => {
     // If we don't have it in our status list then add it to the end
     // with a very low priority.
     if (!unitStatuses[agentState]) {
-      unitStatuses[agentState] = { priority: 99, size: 0 };
+      unitStatuses[agentState] = {priority: 99, size: 0};
     }
     unitStatuses[agentState].size += 1;
   });
@@ -954,7 +954,7 @@ utils.parseMachineDetails = (genericConstraints, machine) => {
           label = 'disk';
           break;
       }
-      details.push({ label, value });
+      details.push({label, value});
     }
   });
   return details && details.length ? details : null;
@@ -1013,7 +1013,7 @@ utils.createMachinesPlaceUnits = function(
       constraints: constraints
     }], function(machine) {
       db.machines.remove(machine);
-    }.bind(this, machine), { modelId: machine.id});
+    }.bind(this, machine), {modelId: machine.id});
     env.placeUnit(addGhostAndEcsUnits(db, env, service, 1)[0], machine.id);
   }
 };
diff --git a/jujugui/static/gui/src/app/models/test-models.js b/jujugui/static/gui/src/app/models/test-models.js
index c457eb0c90..a8fd22dc9b 100644
--- a/jujugui/static/gui/src/app/models/test-models.js
+++ b/jujugui/static/gui/src/app/models/test-models.js
@@ -617,32 +617,32 @@ describe('test_model.js', function() {
         var db = new models.Database({getECS: sinon.stub().returns({changeSet: {}})}),
             service = new models.Service({id: 'mysql', exposed: false}),
             rel0 = new models.Relation(
-              { id: 'relation-0',
+              {id: 'relation-0',
                 endpoints:
                  [['mediawiki', {name: 'cache', role: 'source'}],
                    ['squid', {name: 'cache', role: 'front'}]],
-                'interface': 'cache' }),
+                'interface': 'cache'}),
             rel1 = new models.Relation(
-              { id: 'relation-1',
+              {id: 'relation-1',
                 endpoints: [['wordpress', {
                   role: 'peer', name: 'loadbalancer'}]],
-                'interface': 'reversenginx' }),
+                'interface': 'reversenginx'}),
             rel2 = new models.Relation(
-              { id: 'relation-2',
+              {id: 'relation-2',
                 endpoints: [['mysql', {name: 'db', role: 'db'}],
                   ['mediawiki', {name: 'storage', role: 'app'}]],
                 'interface': 'db'}),
             rel3 = new models.Relation(
-              { id: 'relation-3',
+              {id: 'relation-3',
                 endpoints:
                  [['mysql', {role: 'peer', name: 'loadbalancer'}]],
-                'interface': 'mysql-loadbalancer' }),
+                'interface': 'mysql-loadbalancer'}),
             rel4 = new models.Relation(
-              { id: 'relation-4',
+              {id: 'relation-4',
                 endpoints:
                  [['something', {name: 'foo', role: 'bar'}],
                    ['mysql', {name: 'la', role: 'lee'}]],
-                'interface': 'thing' });
+                'interface': 'thing'});
         db.relations.add([rel0, rel1, rel2, rel3, rel4]);
         db.relations.get_relations_for_service(service).map(
           function(r) { return r.get('id'); })
diff --git a/jujugui/static/gui/src/app/state/state.js b/jujugui/static/gui/src/app/state/state.js
index c5894863c7..249d258177 100644
--- a/jujugui/static/gui/src/app/state/state.js
+++ b/jujugui/static/gui/src/app/state/state.js
@@ -880,11 +880,11 @@ class State {
     });
     // If we have no user parts then we don't need to parse them.
     if (indexes.length === 0) {
-      return { state, parts: urlParts, error };
+      return {state, parts: urlParts, error};
     }
     // If we don't have a user delimeter at 0 then this is an invalid URL.
     if (indexes[0] !== 0) {
-      return { state, parts: urlParts, error: 'invalid user path.'};
+      return {state, parts: urlParts, error: 'invalid user path.'};
     }
     /**
       Takes the section of the URL parts which needs to be added to either the
diff --git a/jujugui/static/gui/src/app/state/test-state.js b/jujugui/static/gui/src/app/state/test-state.js
index d121b7ef90..1fb669c6d4 100644
--- a/jujugui/static/gui/src/app/state/test-state.js
+++ b/jujugui/static/gui/src/app/state/test-state.js
@@ -57,27 +57,27 @@ describe('State', () => {
 
   const userStateTests = [{
     path: 'http://abc.com:123/u/ant',
-    state: { profile: 'ant' },
+    state: {profile: 'ant'},
     error: null
   }, {
     path: 'http://abc.com:123/u/hatch/staging',
-    state: { user: 'hatch/staging' },
+    state: {user: 'hatch/staging'},
     error: null
   }, {
     path: 'http://abc.com:123/u/hatch/mongodb/xenial',
-    state: { store: 'u/hatch/mongodb/xenial' },
+    state: {store: 'u/hatch/mongodb/xenial'},
     error: null
   }, {
     path: 'http://abc.com:123/u/hatch/mongodb/47',
-    state: { store: 'u/hatch/mongodb/47' },
+    state: {store: 'u/hatch/mongodb/47'},
     error: null
   }, {
     path: 'http://abc.com:123/u/frankban/django/bundle/0',
-    state: { store: 'u/frankban/django/bundle/0' },
+    state: {store: 'u/frankban/django/bundle/0'},
     error: null
   }, {
     path: 'http://abc.com:123/u/frankban/django/bundle/0/#jam',
-    state: { hash: 'jam', store: 'u/frankban/django/bundle/0' },
+    state: {hash: 'jam', store: 'u/frankban/django/bundle/0'},
     error: null
   }];
 
@@ -87,31 +87,31 @@ describe('State', () => {
     error: null
   }, {
     path: 'http://abc.com:123/new',
-    state: { root: 'new' },
+    state: {root: 'new'},
     error: null
   }, {
     path: 'http://abc.com:123/new/store',
-    state: { root: 'new', store: '' },
+    state: {root: 'new', store: ''},
     error: null
   }, {
     path: 'http://abc.com:123/new/u/spinach/django/xenial/9',
-    state: { root: 'new', store: 'u/spinach/django/xenial/9' },
+    state: {root: 'new', store: 'u/spinach/django/xenial/9'},
     error: null
   }, {
     path: 'http://abc.com:123/new/apache2',
-    state: { root: 'new', store: 'apache2' },
+    state: {root: 'new', store: 'apache2'},
     error: null
   }, {
     path: 'http://abc.com:123/about',
-    state: { root: 'about' },
+    state: {root: 'about'},
     error: null
   }, {
     path: 'http://abc.com:123/docs',
-    state: { root: 'docs' },
+    state: {root: 'docs'},
     error: null
   }, {
     path: 'http://abc.com:123/login',
-    state: { root: 'login' },
+    state: {root: 'login'},
     error: null
   }, {
     path: 'http://abc.com:123/login/#honey',
@@ -119,7 +119,7 @@ describe('State', () => {
     error: null
   }, {
     path: 'http://abc.com:123/logout',
-    state: { root: 'logout' },
+    state: {root: 'logout'},
     error: null
   }];
 
@@ -203,11 +203,11 @@ describe('State', () => {
     error: null
   }, {
     path: 'http://abc.com:123/i/machines',
-    state: {gui: {machines: '' }},
+    state: {gui: {machines: ''}},
     error: null
   }, {
     path: 'http://abc.com:123/store/i/machines',
-    state: {gui: {machines: '' }, store: ''},
+    state: {gui: {machines: ''}, store: ''},
     error: null
   }, {
     path: 'http://abc.com:123/i/applications/inspector/ghost',
@@ -217,7 +217,7 @@ describe('State', () => {
     path:
       'http://abc.com:123/i/inspector/apache2/machines/3/lxc-0/deploy',
     state: {
-      gui: { inspector: {id: 'apache2'}, machines: '3/lxc-0', deploy: ''}
+      gui: {inspector: {id: 'apache2'}, machines: '3/lxc-0', deploy: ''}
     },
     error: null
   }, {
@@ -249,78 +249,78 @@ describe('State', () => {
 
   const storeStateTests = [{
     path: 'http://abc.com:123/store',
-    state: { store: '' },
+    state: {store: ''},
     error: null
   }, {
     path: 'http://abc.com:123/haproxy',
-    state: { store: 'haproxy' },
+    state: {store: 'haproxy'},
     error: null
   }, {
     path: 'http://abc.com:123/haproxy/xenial',
-    state: { store: 'haproxy/xenial' },
+    state: {store: 'haproxy/xenial'},
     error: null
   }, {
     path: 'http://abc.com:123/haproxy/42',
-    state: { store: 'haproxy/42' },
+    state: {store: 'haproxy/42'},
     error: null
   }, {
     path: 'http://abc.com:123/django/bundle/47',
-    state: { store: 'django/bundle/47' },
+    state: {store: 'django/bundle/47'},
     error: null
   }, {
     path: 'http://abc.com:123/django/bundle/47/#relish',
-    state: { hash: 'relish', store: 'django/bundle/47' },
+    state: {hash: 'relish', store: 'django/bundle/47'},
     error: null
   }];
 
   const modelStoreStateTests = [{
     path: 'http://abc.com:123/u/hatch/staging/store',
-    state: { user: 'hatch/staging', store: '' },
+    state: {user: 'hatch/staging', store: ''},
     error: null
   }, {
     path: 'http://abc.com:123/u/hatch/staging/haproxy',
-    state: { user: 'hatch/staging', store: 'haproxy' },
+    state: {user: 'hatch/staging', store: 'haproxy'},
     error: null
   }, {
     path: 'http://abc.com:123/u/frankban/production/ghost/xenial',
-    state: { user: 'frankban/production', store: 'ghost/xenial' },
+    state: {user: 'frankban/production', store: 'ghost/xenial'},
     error: null
   }, {
     path: 'http://abc.com:123/u/hatch/staging/ghost/42',
-    state: { user: 'hatch/staging', store: 'ghost/42' },
+    state: {user: 'hatch/staging', store: 'ghost/42'},
     error: null
   }, {
     path: 'http://abc.com:123/u/frankban/production/django/bundle/47',
-    state: { user: 'frankban/production', store: 'django/bundle/47' },
+    state: {user: 'frankban/production', store: 'django/bundle/47'},
     error: null
   }, {
     path: 'http://abc.com:123/u/hatch/staging/u/hatch',
-    state: { user: 'hatch/staging', profile: 'hatch' },
+    state: {user: 'hatch/staging', profile: 'hatch'},
     error: null
   }, {
     path: 'http://abc.com:123/u/hatch/staging/u/frankban/django',
-    state: { user: 'hatch/staging', store: 'u/frankban/django' },
+    state: {user: 'hatch/staging', store: 'u/frankban/django'},
     error: null
   }, {
     path: 'http://abc.com:123/u/frankban/production/u/hatch/mongodb/xenial',
-    state: { user: 'frankban/production', store: 'u/hatch/mongodb/xenial' },
+    state: {user: 'frankban/production', store: 'u/hatch/mongodb/xenial'},
     error: null
   }, {
     path: 'http://abc.com:123/u/hatch/staging/u/hatch/mongodb/47',
-    state: { user: 'hatch/staging', store: 'u/hatch/mongodb/47' },
+    state: {user: 'hatch/staging', store: 'u/hatch/mongodb/47'},
     error: null
   }, {
     path:
       'http://abc.com:123/u/frankban/production/u/frankban/django/bundle/0',
     state: {
-      user: 'frankban/production', store: 'u/frankban/django/bundle/0' },
+      user: 'frankban/production', store: 'u/frankban/django/bundle/0'},
     error: null
   }, {
     path:
       'http://abc.com:123/u/frankban/production/u/frankban/django/bundle/0/#ham', // eslint-disable-line max-len
     state: {
       hash: 'ham',
-      user: 'frankban/production', store: 'u/frankban/django/bundle/0' },
+      user: 'frankban/production', store: 'u/frankban/django/bundle/0'},
     error: null
   }];
 
@@ -329,25 +329,25 @@ describe('State', () => {
     state: {
       user: 'hatch/staging',
       gui: {
-        inspector: {id: 'haproxy', activeComponent: 'config', config: true }
+        inspector: {id: 'haproxy', activeComponent: 'config', config: true}
       }},
     error: null
   }, {
     path: 'http://abc.com:123/u/frankban/production/i/machines',
-    state: { user: 'frankban/production', gui: { machines: '' } },
+    state: {user: 'frankban/production', gui: {machines: ''}},
     error: null
   }, {
     path:
       'http://abc.com:123/u/hatch/staging/i/applications/inspector/ghost',
     state: {
-      user: 'hatch/staging', gui: {applications: '', inspector: {id: 'ghost' }}},
+      user: 'hatch/staging', gui: {applications: '', inspector: {id: 'ghost'}}},
     error: null
   }, {
     path:
       'http://abc.com:123/u/hatch/staging/i/applications/inspector/ghost/#mayo',
     state: {
       hash: 'mayo',
-      user: 'hatch/staging', gui: {applications: '', inspector: {id: 'ghost' }}},
+      user: 'hatch/staging', gui: {applications: '', inspector: {id: 'ghost'}}},
     error: null
   }];
 
@@ -356,12 +356,12 @@ describe('State', () => {
     state: {
       store: 'haproxy',
       gui: {
-        inspector: {id: 'haproxy', activeComponent: 'config', config: true }
+        inspector: {id: 'haproxy', activeComponent: 'config', config: true}
       }},
     error: null
   }, {
     path: 'http://abc.com:123/ghost/xenial/i/machines',
-    state: { store: 'ghost/xenial', gui: { machines: '' } },
+    state: {store: 'ghost/xenial', gui: {machines: ''}},
     error: null
   }, {
     path: 'http://abc.com:123/ghost/42/i/applications/inspector/ghost',
@@ -370,7 +370,7 @@ describe('State', () => {
     error: null
   }, {
     path: 'http://abc.com:123/django/bundle/47/i/machines',
-    state: { store: 'django/bundle/47', gui: { machines: '' } },
+    state: {store: 'django/bundle/47', gui: {machines: ''}},
     error: null
   }, {
     path: 'http://abc.com:123/u/hatch/mongodb/xenial/i/applications/inspector/ghost', // eslint-disable-line max-len
@@ -380,7 +380,7 @@ describe('State', () => {
     error: null
   }, {
     path: 'http://abc.com:123/u/frankban/django/bundle/0/i/machines',
-    state: { store: 'u/frankban/django/bundle/0', gui: { machines: '' } },
+    state: {store: 'u/frankban/django/bundle/0', gui: {machines: ''}},
     error: null
   }];
 
@@ -413,7 +413,7 @@ describe('State', () => {
     state: {
       user: 'frankban/production',
       store: 'django/bundle/47',
-      gui: { machines: '' }
+      gui: {machines: ''}
     },
     error: null
   }, {
@@ -429,7 +429,7 @@ describe('State', () => {
     state: {
       user: 'frankban/production',
       store: 'u/hatch/mongodb/xenial',
-      gui: { machines: '' }
+      gui: {machines: ''}
     },
     error: null
   }, {
@@ -445,7 +445,7 @@ describe('State', () => {
     state: {
       user: 'frankban/production',
       store: 'u/frankban/django/bundle/0',
-      gui: { applications: '' }
+      gui: {applications: ''}
     },
     error: null
   }, {
@@ -454,7 +454,7 @@ describe('State', () => {
       hash: 'turkey',
       user: 'frankban/production',
       store: 'u/frankban/django/bundle/0',
-      gui: { applications: '' }
+      gui: {applications: ''}
     },
     error: null
   }, {
@@ -787,62 +787,62 @@ describe('State', () => {
         outputParts: []
       }, {
         parts: ['u', 'ant'],
-        state: { profile: 'ant' },
+        state: {profile: 'ant'},
         error: null,
         outputParts: []
       }, {
         parts: ['u', 'frankban', 'settings'],
-        state: { profile: 'frankban/settings' },
+        state: {profile: 'frankban/settings'},
         error: null,
         outputParts: []
       }, {
         parts: ['u', 'frankban', 'charms'],
-        state: { profile: 'frankban/charms' },
+        state: {profile: 'frankban/charms'},
         error: null,
         outputParts: []
       }, {
         parts: ['u', 'frankban', 'issues'],
-        state: { profile: 'frankban/issues' },
+        state: {profile: 'frankban/issues'},
         error: null,
         outputParts: []
       }, {
         parts: ['u', 'frankban', 'revenue'],
-        state: { profile: 'frankban/revenue' },
+        state: {profile: 'frankban/revenue'},
         error: null,
         outputParts: []
       }, {
         parts: ['u', 'hatch', 'staging', 'haproxy'],
-        state: { user: 'hatch/staging' },
+        state: {user: 'hatch/staging'},
         error: null,
         outputParts: ['haproxy']
       }, {
         parts: ['u', 'frankban', 'production', 'ghost', 'xenial'],
-        state: { user: 'frankban/production' },
+        state: {user: 'frankban/production'},
         error: null,
         outputParts: ['ghost', 'xenial']
       }, {
         parts: ['u', 'hatch', 'charms', 'ghost', 'xenial'],
-        state: { profile: 'hatch/charms' },
+        state: {profile: 'hatch/charms'},
         error: null,
         outputParts: ['ghost', 'xenial']
       }, {
         parts: ['u', 'hatch', 'staging', 'ghost', '42'],
-        state: { user: 'hatch/staging' },
+        state: {user: 'hatch/staging'},
         error: null,
         outputParts: ['ghost', '42']
       }, {
         parts: ['u', 'hatch', 'mongodb', 'xenial'],
-        state: { store: 'u/hatch/mongodb/xenial' },
+        state: {store: 'u/hatch/mongodb/xenial'},
         error: null,
         outputParts: []
       }, {
         parts: ['u', 'hatch', 'mongodb', '47'],
-        state: { store: 'u/hatch/mongodb/47' },
+        state: {store: 'u/hatch/mongodb/47'},
         error: null,
         outputParts: []
       }, {
         parts: ['u', 'frankban', 'django', 'bundle', '0'],
-        state: { store: 'u/frankban/django/bundle/0' },
+        state: {store: 'u/frankban/django/bundle/0'},
         error: null,
         outputParts: []
       }, {
@@ -1090,7 +1090,7 @@ describe('State', () => {
       });
       const stub = sinon
         .stub(state, 'generateState')
-        .callsFake(() => ({ error: null, state: {}}));
+        .callsFake(() => ({error: null, state: {}}));
       state.dispatch([], true, false, true);
       assert.equal(stub.callCount, 1);
       assert.deepEqual(stub.args[0], ['/hatch/ghost', true]);
@@ -1104,7 +1104,7 @@ describe('State', () => {
       });
       sinon
         .stub(state, 'generateState')
-        .callsFake(() => ({ error: null, state: {new: 'state'}}));
+        .callsFake(() => ({error: null, state: {new: 'state'}}));
       state.dispatch([], true, false, true);
       assert.deepEqual(state._appStateHistory, [{new: 'state'}]);
     });
@@ -1118,7 +1118,7 @@ describe('State', () => {
       const currentState = {
         gui: {
           deploy: '',
-          inspector: { id: '$foo'}}};
+          inspector: {id: '$foo'}}};
       sinon
         .stub(state, 'generateState')
         .callsFake(() => ({error: null, state: currentState}));
@@ -1268,7 +1268,7 @@ describe('State', () => {
       assert.deepEqual(
         state.current, {
           user: 'hatch/staging',
-          gui: {applications: '', inspector: {id: 'ghost' }}
+          gui: {applications: '', inspector: {id: 'ghost'}}
         },
         'generateState() did not parse location properly');
       const dispatchStub = sinon.stub(state, 'dispatch').returns({error: null});
@@ -1279,10 +1279,10 @@ describe('State', () => {
       });
       assert.deepEqual(state._appStateHistory, [{
         user: 'hatch/staging',
-        gui: {applications: '', inspector: {id: 'ghost' }}
+        gui: {applications: '', inspector: {id: 'ghost'}}
       }, {
         user: 'hatch/staging',
-        gui: {applications: 'foo', inspector: {id: 'ghost' }}
+        gui: {applications: 'foo', inspector: {id: 'ghost'}}
       }]);
       assert.equal(pushStub.callCount, 1);
       assert.equal(dispatchStub.callCount, 1);
@@ -1305,7 +1305,7 @@ describe('State', () => {
       assert.deepEqual(
         state.current, {
           user: 'hatch/staging',
-          gui: {applications: '', inspector: {id: 'ghost' }}
+          gui: {applications: '', inspector: {id: 'ghost'}}
         },
         'generateState() did not parse location properly');
       const dispatchStub = sinon.stub(state, 'dispatch').returns({error: null});
diff --git a/jujugui/static/gui/src/app/test-init.js b/jujugui/static/gui/src/app/test-init.js
index 1e2ee64ea0..1066f12159 100644
--- a/jujugui/static/gui/src/app/test-init.js
+++ b/jujugui/static/gui/src/app/test-init.js
@@ -200,7 +200,7 @@ describe('init', () => {
       it('returns "zip" for zip files', () => {
         const result = app._determineFileType({
           types: ['Files'],
-          items: [{ type: 'application/zip' }]
+          items: [{type: 'application/zip'}]
         });
         assert.equal(result, 'zip');
       });
@@ -209,7 +209,7 @@ describe('init', () => {
         // IE uses a different mime type than other browsers.
         const result = app._determineFileType({
           types: ['Files'],
-          items: [{ type: 'application/x-zip-compressed' }]
+          items: [{type: 'application/x-zip-compressed'}]
         });
         assert.equal(result, 'zip');
       });
@@ -219,7 +219,7 @@ describe('init', () => {
         // across browser so we respond with yaml for now.
         const result = app._determineFileType({
           types: ['Files'],
-          items: [{ type: 'application/x-yaml' }]
+          items: [{type: 'application/x-yaml'}]
         });
         assert.equal(result, 'yaml');
       });
@@ -251,9 +251,9 @@ describe('init', () => {
 
       const noop = () => {};
       const ev1 = {
-        dataTransfer: 'foo', preventDefault: noop, type: 'dragenter' };
-      const ev2 = { dataTransfer: {}, preventDefault: noop, type: 'dragleave' };
-      const ev3 = { dataTransfer: {}, preventDefault: noop, type: 'dragover' };
+        dataTransfer: 'foo', preventDefault: noop, type: 'dragenter'};
+      const ev2 = {dataTransfer: {}, preventDefault: noop, type: 'dragleave'};
+      const ev3 = {dataTransfer: {}, preventDefault: noop, type: 'dragover'};
 
       app._appDragOverHandler(ev1);
       app._appDragOverHandler(ev2);
diff --git a/jujugui/static/gui/src/test/enzyme-setup.js b/jujugui/static/gui/src/test/enzyme-setup.js
index 42e2a55043..b27977ae46 100644
--- a/jujugui/static/gui/src/test/enzyme-setup.js
+++ b/jujugui/static/gui/src/test/enzyme-setup.js
@@ -3,4 +3,4 @@
 const Enzyme = require('enzyme');
 const Adapter = require('enzyme-adapter-react-16');
 
-Enzyme.configure({ adapter: new Adapter() });
+Enzyme.configure({adapter: new Adapter()});
diff --git a/jujugui/static/gui/src/test/test_env_api.js b/jujugui/static/gui/src/test/test_env_api.js
index 7a8aa0fb92..20e44a7b06 100644
--- a/jujugui/static/gui/src/test/test_env_api.js
+++ b/jujugui/static/gui/src/test/test_env_api.js
@@ -43,7 +43,7 @@ const utils = require('../app/init/testing-utils');
       // hand-crafted bundles.
       var endpointA = [
         'foo',
-        { name: 'bar' }
+        {name: 'bar'}
       ];
       var endpointB = [
         'bar',
@@ -701,7 +701,7 @@ const utils = require('../app/init/testing-utils');
       it('responds with only the server data if no error', function() {
         const callback = sinon.stub();
         env.redirectInfo(callback);
-        conn.msg({ 'request-id': 1, response: { servers: 'servers' }});
+        conn.msg({'request-id': 1, response: {servers: 'servers'}});
         assert.equal(callback.callCount, 1);
         assert.deepEqual(callback.args[0], [null, 'servers']);
       });
@@ -709,7 +709,7 @@ const utils = require('../app/init/testing-utils');
       it('responds with the error if error', function() {
         const callback = sinon.stub();
         env.redirectInfo(callback);
-        conn.msg({ 'request-id': 1, response: { error: 'error' }});
+        conn.msg({'request-id': 1, response: {error: 'error'}});
         assert.equal(callback.callCount, 1);
         assert.deepEqual(callback.args[0][0], 'error');
       });
@@ -1093,7 +1093,7 @@ const utils = require('../app/init/testing-utils');
       });
 
       it('uses the correct endpoint when served from juju', function() {
-        window.juju_config = { staticURL: '/static-url'};
+        window.juju_config = {staticURL: '/static-url'};
         env.userIsAuthenticated = true;
         var mockWebHandler = {sendPostRequest: sinon.stub()};
         env.set('webHandler', mockWebHandler);
@@ -2014,7 +2014,7 @@ const utils = require('../app/init/testing-utils');
         {jobs: [machineJobs.MANAGE_ENVIRON], series: 'precise'},
         {jobs: [machineJobs.HOST_UNITS], 'container-type': 'kvm'},
         {jobs: [machineJobs.HOST_UNITS],
-          'container-type': 'lxc', 'parent-id': '1' }
+          'container-type': 'lxc', 'parent-id': '1'}
       ];
       var expectedMsg = {
         'request-id': 1,

From d9add982ce5f8696b09f0e5f3857c76d160ec2e7 Mon Sep 17 00:00:00 2001
From: Jeff Pihach <jeff.pihach@canonical.com>
Date: Tue, 25 Sep 2018 06:29:31 -0600
Subject: [PATCH 5/9] Update eslint to 5.6.0 and eslint-plugin-react to 7.11.1.

---
 package-lock.json | 472 ++++++++++++++++++++++++++++++----------------
 package.json      |   4 +-
 2 files changed, 316 insertions(+), 160 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7a6e3e6cf2..6bd5751de5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -204,9 +204,9 @@
       }
     },
     "ajv-keywords": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
-      "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz",
+      "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=",
       "dev": true
     },
     "align-text": {
@@ -2337,9 +2337,9 @@
       }
     },
     "chardet": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
-      "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
       "dev": true
     },
     "check-error": {
@@ -3581,57 +3581,98 @@
       }
     },
     "eslint": {
-      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz",
-      "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==",
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.6.0.tgz",
+      "integrity": "sha512-/eVYs9VVVboX286mBK7bbKnO1yamUy2UCRjiY6MryhQL2PaaXCExsCQ2aO83OeYRhU2eCU/FMFP+tVMoOrzNrA==",
       "dev": true,
       "requires": {
-        "ajv": "^5.3.0",
-        "babel-code-frame": "^6.22.0",
+        "@babel/code-frame": "^7.0.0",
+        "ajv": "^6.5.3",
         "chalk": "^2.1.0",
-        "concat-stream": "^1.6.0",
-        "cross-spawn": "^5.1.0",
+        "cross-spawn": "^6.0.5",
         "debug": "^3.1.0",
         "doctrine": "^2.1.0",
-        "eslint-scope": "^3.7.1",
+        "eslint-scope": "^4.0.0",
+        "eslint-utils": "^1.3.1",
         "eslint-visitor-keys": "^1.0.0",
-        "espree": "^3.5.4",
-        "esquery": "^1.0.0",
+        "espree": "^4.0.0",
+        "esquery": "^1.0.1",
         "esutils": "^2.0.2",
         "file-entry-cache": "^2.0.0",
         "functional-red-black-tree": "^1.0.1",
         "glob": "^7.1.2",
-        "globals": "^11.0.1",
-        "ignore": "^3.3.3",
+        "globals": "^11.7.0",
+        "ignore": "^4.0.6",
         "imurmurhash": "^0.1.4",
-        "inquirer": "^3.0.6",
-        "is-resolvable": "^1.0.0",
-        "js-yaml": "^3.9.1",
+        "inquirer": "^6.1.0",
+        "is-resolvable": "^1.1.0",
+        "js-yaml": "^3.12.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.3.0",
-        "lodash": "^4.17.4",
-        "minimatch": "^3.0.2",
+        "lodash": "^4.17.5",
+        "minimatch": "^3.0.4",
         "mkdirp": "^0.5.1",
         "natural-compare": "^1.4.0",
         "optionator": "^0.8.2",
         "path-is-inside": "^1.0.2",
         "pluralize": "^7.0.0",
         "progress": "^2.0.0",
-        "regexpp": "^1.0.1",
+        "regexpp": "^2.0.0",
         "require-uncached": "^1.0.3",
-        "semver": "^5.3.0",
+        "semver": "^5.5.1",
         "strip-ansi": "^4.0.0",
-        "strip-json-comments": "~2.0.1",
-        "table": "4.0.2",
-        "text-table": "~0.2.0"
+        "strip-json-comments": "^2.0.1",
+        "table": "^4.0.3",
+        "text-table": "^0.2.0"
       },
       "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
+          "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.0.0"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
+          "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
+          "dev": true,
+          "requires": {
+            "chalk": "^2.0.0",
+            "esutils": "^2.0.2",
+            "js-tokens": "^4.0.0"
+          }
+        },
         "acorn": {
-          "version": "5.5.3",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz",
-          "integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==",
+          "version": "5.7.3",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+          "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
           "dev": true
         },
+        "acorn-jsx": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-4.1.1.tgz",
+          "integrity": "sha512-JY+iV6r+cO21KtntVvFkD+iqjtdpRUpGqKWgfkCdZq1R+kbreEl8EcdcJR4SmiIgsIQT33s6QzheQ9a275Q8xw==",
+          "dev": true,
+          "requires": {
+            "acorn": "^5.0.3"
+          }
+        },
+        "ajv": {
+          "version": "6.5.4",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.4.tgz",
+          "integrity": "sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
         "ansi-regex": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
@@ -3658,50 +3699,66 @@
             "supports-color": "^5.3.0"
           }
         },
-        "concat-stream": {
-          "version": "1.6.2",
-          "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-          "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
           "dev": true,
           "requires": {
-            "buffer-from": "^1.0.0",
-            "inherits": "^2.0.3",
-            "readable-stream": "^2.2.2",
-            "typedarray": "^0.0.6"
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
           }
         },
         "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "version": "3.2.5",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.5.tgz",
+          "integrity": "sha512-D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg==",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2"
+            "ms": "^2.1.1"
           }
         },
         "espree": {
-          "version": "3.5.4",
-          "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
-          "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/espree/-/espree-4.0.0.tgz",
+          "integrity": "sha512-kapdTCt1bjmspxStVKX6huolXVV5ZfyZguY1lcfhVVZstce3bqxH9mcLzNn3/mlgW6wQ732+0fuG9v7h0ZQoKg==",
           "dev": true,
           "requires": {
-            "acorn": "^5.5.0",
-            "acorn-jsx": "^3.0.0"
+            "acorn": "^5.6.0",
+            "acorn-jsx": "^4.1.1"
           }
         },
+        "fast-deep-equal": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+          "dev": true
+        },
         "globals": {
-          "version": "11.5.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.5.0.tgz",
-          "integrity": "sha512-hYyf+kI8dm3nORsiiXUQigOU62hDLfJ9G01uyGMxhc6BKsircrUhC4uJPQPUSuq2GrTmiiEt7ewxlMdBewfmKQ==",
+          "version": "11.7.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-11.7.0.tgz",
+          "integrity": "sha512-K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==",
+          "dev": true
+        },
+        "ignore": {
+          "version": "4.0.6",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+          "dev": true
+        },
+        "is-resolvable": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
+          "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
+          "dev": true
+        },
+        "js-tokens": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
           "dev": true
         },
         "js-yaml": {
@@ -3714,6 +3771,30 @@
             "esprima": "^4.0.0"
           }
         },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
+        "lodash": {
+          "version": "4.17.11",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        },
+        "semver": {
+          "version": "5.5.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz",
+          "integrity": "sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==",
+          "dev": true
+        },
         "strip-ansi": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
@@ -3724,9 +3805,9 @@
           }
         },
         "supports-color": {
-          "version": "5.4.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
           "dev": true,
           "requires": {
             "has-flag": "^3.0.0"
@@ -3735,27 +3816,55 @@
       }
     },
     "eslint-plugin-react": {
-      "version": "7.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.7.0.tgz",
-      "integrity": "sha512-KC7Snr4YsWZD5flu6A5c0AcIZidzW3Exbqp7OT67OaD2AppJtlBr/GuPrW/vaQM/yfZotEvKAdrxrO+v8vwYJA==",
+      "version": "7.11.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.11.1.tgz",
+      "integrity": "sha512-cVVyMadRyW7qsIUh3FHp3u6QHNhOgVrLQYdQEB1bPWBsgbNCHdFAeNMquBMCcZJu59eNthX053L70l7gRt4SCw==",
       "dev": true,
       "requires": {
-        "doctrine": "^2.0.2",
-        "has": "^1.0.1",
+        "array-includes": "^3.0.3",
+        "doctrine": "^2.1.0",
+        "has": "^1.0.3",
         "jsx-ast-utils": "^2.0.1",
-        "prop-types": "^15.6.0"
+        "prop-types": "^15.6.2"
+      },
+      "dependencies": {
+        "has": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+          "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+          "dev": true,
+          "requires": {
+            "function-bind": "^1.1.1"
+          }
+        },
+        "prop-types": {
+          "version": "15.6.2",
+          "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz",
+          "integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==",
+          "dev": true,
+          "requires": {
+            "loose-envify": "^1.3.1",
+            "object-assign": "^4.1.1"
+          }
+        }
       }
     },
     "eslint-scope": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz",
-      "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
+      "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
       "dev": true,
       "requires": {
         "esrecurse": "^4.1.0",
         "estraverse": "^4.1.1"
       }
     },
+    "eslint-utils": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz",
+      "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==",
+      "dev": true
+    },
     "eslint-visitor-keys": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
@@ -4005,14 +4114,25 @@
       }
     },
     "external-editor": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
-      "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz",
+      "integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
       "dev": true,
       "requires": {
-        "chardet": "^0.4.0",
-        "iconv-lite": "^0.4.17",
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
         "tmp": "^0.0.33"
+      },
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.4.24",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+          "dev": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        }
       }
     },
     "extglob": {
@@ -4356,8 +4476,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.1.1",
@@ -4417,7 +4536,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "tweetnacl": "0.14.5"
+            "tweetnacl": "^0.14.3"
           }
         },
         "block-stream": {
@@ -4433,7 +4552,6 @@
           "version": "2.10.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "hoek": "2.x.x"
           }
@@ -4599,14 +4717,12 @@
         "fs.realpath": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "fstream": {
           "version": "1.0.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "graceful-fs": "^4.1.2",
             "inherits": "~2.0.0",
@@ -4662,7 +4778,6 @@
           "version": "7.1.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "fs.realpath": "^1.0.0",
             "inflight": "^1.0.4",
@@ -4675,8 +4790,7 @@
         "graceful-fs": {
           "version": "4.1.11",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "har-schema": {
           "version": "1.0.5",
@@ -4706,17 +4820,16 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "boom": "2.10.1",
-            "cryptiles": "2.0.5",
-            "hoek": "2.16.3",
-            "sntp": "1.0.9"
+            "boom": "2.x.x",
+            "cryptiles": "2.x.x",
+            "hoek": "2.x.x",
+            "sntp": "1.x.x"
           }
         },
         "hoek": {
           "version": "2.16.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "http-signature": {
           "version": "1.1.1",
@@ -4733,7 +4846,6 @@
           "version": "1.0.6",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "once": "^1.3.0",
             "wrappy": "1"
@@ -4742,8 +4854,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.4",
@@ -4859,7 +4970,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "1.1.7"
           }
@@ -4874,7 +4984,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -4948,7 +5057,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4978,8 +5086,7 @@
         "path-is-absolute": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "performance-now": {
           "version": "0.2.0",
@@ -5011,10 +5118,10 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "deep-extend": "0.4.2",
-            "ini": "1.3.4",
-            "minimist": "1.2.0",
-            "strip-json-comments": "2.0.1"
+            "deep-extend": "~0.4.0",
+            "ini": "~1.3.0",
+            "minimist": "^1.2.0",
+            "strip-json-comments": "~2.0.1"
           },
           "dependencies": {
             "minimist": {
@@ -5074,7 +5181,6 @@
           "version": "2.6.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "glob": "^7.0.5"
           }
@@ -5109,7 +5215,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "hoek": "2.16.3"
+            "hoek": "2.x.x"
           }
         },
         "sshpk": {
@@ -5118,15 +5224,15 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "asn1": "0.2.3",
-            "assert-plus": "1.0.0",
-            "bcrypt-pbkdf": "1.0.1",
-            "dashdash": "1.14.1",
-            "ecc-jsbn": "0.1.1",
-            "getpass": "0.1.7",
-            "jodid25519": "1.0.2",
-            "jsbn": "0.1.1",
-            "tweetnacl": "0.14.5"
+            "asn1": "~0.2.3",
+            "assert-plus": "^1.0.0",
+            "bcrypt-pbkdf": "^1.0.0",
+            "dashdash": "^1.12.0",
+            "ecc-jsbn": "~0.1.1",
+            "getpass": "^0.1.1",
+            "jodid25519": "^1.0.0",
+            "jsbn": "~0.1.0",
+            "tweetnacl": "~0.14.0"
           },
           "dependencies": {
             "assert-plus": {
@@ -5143,9 +5249,9 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "code-point-at": "1.1.0",
-            "is-fullwidth-code-point": "1.0.0",
-            "strip-ansi": "3.0.1"
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
           }
         },
         "string_decoder": {
@@ -5154,7 +5260,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "safe-buffer": "5.0.1"
+            "safe-buffer": "^5.0.1"
           }
         },
         "stringstream": {
@@ -5167,9 +5273,8 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
-            "ansi-regex": "2.1.1"
+            "ansi-regex": "^2.0.0"
           }
         },
         "strip-json-comments": {
@@ -5211,7 +5316,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "punycode": "1.4.1"
+            "punycode": "^1.4.1"
           }
         },
         "tunnel-agent": {
@@ -5220,7 +5325,7 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "safe-buffer": "5.0.1"
+            "safe-buffer": "^5.0.1"
           }
         },
         "tweetnacl": {
@@ -5268,8 +5373,7 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -5945,22 +6049,21 @@
       }
     },
     "inquirer": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
-      "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.0.tgz",
+      "integrity": "sha512-QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg==",
       "dev": true,
       "requires": {
         "ansi-escapes": "^3.0.0",
         "chalk": "^2.0.0",
         "cli-cursor": "^2.1.0",
         "cli-width": "^2.0.0",
-        "external-editor": "^2.0.4",
+        "external-editor": "^3.0.0",
         "figures": "^2.0.0",
-        "lodash": "^4.3.0",
+        "lodash": "^4.17.10",
         "mute-stream": "0.0.7",
         "run-async": "^2.2.0",
-        "rx-lite": "^4.0.8",
-        "rx-lite-aggregates": "^4.0.8",
+        "rxjs": "^6.1.0",
         "string-width": "^2.1.0",
         "strip-ansi": "^4.0.0",
         "through": "^2.3.6"
@@ -5992,6 +6095,12 @@
             "supports-color": "^5.3.0"
           }
         },
+        "lodash": {
+          "version": "4.17.11",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+          "dev": true
+        },
         "strip-ansi": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
@@ -6002,9 +6111,9 @@
           }
         },
         "supports-color": {
-          "version": "5.4.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
           "dev": true,
           "requires": {
             "has-flag": "^3.0.0"
@@ -8711,6 +8820,12 @@
       "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
       "dev": true
     },
+    "nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
+    },
     "nise": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/nise/-/nise-1.3.3.tgz",
@@ -10230,9 +10345,9 @@
       }
     },
     "regexpp": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz",
-      "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.0.tgz",
+      "integrity": "sha512-g2FAVtR8Uh8GO1Nv5wpxW7VFVwHcCEr4wyA8/MHiRkO8uHoR5ntAA8Uq3P1vvMTX/BeQiRVSpDGLd+Wn5HNOTA==",
       "dev": true
     },
     "regexpu-core": {
@@ -10818,19 +10933,13 @@
         "is-promise": "^2.1.0"
       }
     },
-    "rx-lite": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
-      "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
-      "dev": true
-    },
-    "rx-lite-aggregates": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
-      "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
+    "rxjs": {
+      "version": "6.3.2",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.2.tgz",
+      "integrity": "sha512-hV7criqbR0pe7EeL3O66UYVg92IR0XsA97+9y+BWTePK9SKmEI5Qd3Zj6uPnGkNzXsBywBQWTvujPl+1Kn9Zjw==",
       "dev": true,
       "requires": {
-        "rx-lite": "*"
+        "tslib": "^1.9.0"
       }
     },
     "safe-buffer": {
@@ -12865,19 +12974,31 @@
       }
     },
     "table": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
-      "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
+      "version": "4.0.3",
+      "resolved": "http://registry.npmjs.org/table/-/table-4.0.3.tgz",
+      "integrity": "sha512-S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==",
       "dev": true,
       "requires": {
-        "ajv": "^5.2.3",
-        "ajv-keywords": "^2.1.0",
+        "ajv": "^6.0.1",
+        "ajv-keywords": "^3.0.0",
         "chalk": "^2.1.0",
         "lodash": "^4.17.4",
         "slice-ansi": "1.0.0",
         "string-width": "^2.1.1"
       },
       "dependencies": {
+        "ajv": {
+          "version": "6.5.4",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.4.tgz",
+          "integrity": "sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
         "ansi-styles": {
           "version": "3.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
@@ -12898,10 +13019,22 @@
             "supports-color": "^5.3.0"
           }
         },
+        "fast-deep-equal": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+          "dev": true
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
         "supports-color": {
-          "version": "5.4.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
           "dev": true,
           "requires": {
             "has-flag": "^3.0.0"
@@ -13411,6 +13544,12 @@
       "integrity": "sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics=",
       "dev": true
     },
+    "tslib": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
+      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==",
+      "dev": true
+    },
     "tsscmp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz",
@@ -13669,6 +13808,23 @@
         }
       }
     },
+    "uri-js": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+          "dev": true
+        }
+      }
+    },
     "urix": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
diff --git a/package.json b/package.json
index 5d6b2d6c12..f887378086 100644
--- a/package.json
+++ b/package.json
@@ -55,8 +55,8 @@
     "enzyme": "3.3.0",
     "enzyme-adapter-react-16": "1.1.1",
     "enzyme-to-json": "^3.3.4",
-    "eslint": "4.19.1",
-    "eslint-plugin-react": "7.7.0",
+    "eslint": "^5.6.0",
+    "eslint-plugin-react": "^7.11.1",
     "expect.js": "0.3.1",
     "jasmine-core": "2.99.1",
     "jest": "^23.5.0",

From d381f85eeb833c6c50b34a01d39904fe565ce0f1 Mon Sep 17 00:00:00 2001
From: Jeff Pihach <jeff.pihach@canonical.com>
Date: Tue, 25 Sep 2018 06:40:51 -0600
Subject: [PATCH 6/9] Added object-property-newline eslint rule.

---
 .eslintrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.eslintrc b/.eslintrc
index 24ff68a870..0137134e29 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -31,6 +31,7 @@
     "no-underscore-dangle": 0,
     "no-unused-vars": [2, { "args": "none" }],
     "object-curly-spacing": 2,
+    "object-property-newline": [2, {"allowAllPropertiesOnSameLine": true}],
     "quotes": [2, "single"],
     "react/jsx-curly-spacing": 2,
     "react/jsx-equals-spacing": 2,

From d5b5ce5e4ad2c3a80a59734ee8a68b7bf443dcb3 Mon Sep 17 00:00:00 2001
From: Jeff Pihach <jeff.pihach@canonical.com>
Date: Tue, 25 Sep 2018 06:41:14 -0600
Subject: [PATCH 7/9] Ran --fix on codebase for new eslint rule.

---
 .../added-services-list/item/test-item.js     | 35 ++++++--
 .../search-results/test-search-results.js     | 81 +++++++++++++++----
 jujugui/static/gui/src/app/init/hotkeys.js    | 14 +++-
 .../app/init/test-environment-change-set.js   | 20 +++--
 .../src/app/init/topology/test-environment.js | 24 ++++--
 .../static/gui/src/app/init/topology/utils.js |  6 +-
 .../static/gui/src/app/state/test-state.js    |  6 +-
 jujugui/static/gui/src/app/test-init.js       | 16 +++-
 .../gui/src/test/test_controller_api.js       | 34 ++++----
 jujugui/static/gui/src/test/test_env_api.js   | 60 +++++++-------
 10 files changed, 204 insertions(+), 92 deletions(-)

diff --git a/jujugui/static/gui/src/app/components/added-services-list/item/test-item.js b/jujugui/static/gui/src/app/components/added-services-list/item/test-item.js
index ed444aa908..af4fdcbae3 100644
--- a/jujugui/static/gui/src/app/components/added-services-list/item/test-item.js
+++ b/jujugui/static/gui/src/app/components/added-services-list/item/test-item.js
@@ -81,7 +81,10 @@ describe('AddedServicesListItem', function() {
       var service = {
         getAttrs: function() {
           return {
-            icon: 'icon.gif', unit_count: '1', name: 'demo', id: 'demo',
+            icon: 'icon.gif',
+            unit_count: '1',
+            name: 'demo',
+            id: 'demo',
             units: {
               toArray: function() {
                 return [{agent_state: status.name}];
@@ -103,7 +106,10 @@ describe('AddedServicesListItem', function() {
     var service = {
       getAttrs: function() {
         return {
-          icon: 'icon.gif', unit_count: '5', name: 'demo', id: 'demo',
+          icon: 'icon.gif',
+          unit_count: '5',
+          name: 'demo',
+          id: 'demo',
           units: {
             toArray: function() {
               return [{agent_state: 'unknown-state'}];
@@ -124,7 +130,10 @@ describe('AddedServicesListItem', function() {
     var service = {
       getAttrs: function() {
         return {
-          icon: 'icon.gif', unit_count: '2', name: 'demo', id: 'demo',
+          icon: 'icon.gif',
+          unit_count: '2',
+          name: 'demo',
+          id: 'demo',
           units: {
             toArray: function() {
               return [{agent_state: 'pending'}, {agent_state: 'error'}];
@@ -141,7 +150,10 @@ describe('AddedServicesListItem', function() {
     var service = {
       getAttrs: function() {
         return {
-          icon: 'icon.gif', unit_count: '2', name: 'demo', id: 'demo',
+          icon: 'icon.gif',
+          unit_count: '2',
+          name: 'demo',
+          id: 'demo',
           units: {
             toArray: function() {
               return [{agent_state: 'uncommitted'}, {agent_state: 'pending'}];
@@ -158,7 +170,10 @@ describe('AddedServicesListItem', function() {
     const service = {
       getAttrs: function() {
         return {
-          icon: 'icon.gif', unit_count: '5', name: 'demo', id: 'demo',
+          icon: 'icon.gif',
+          unit_count: '5',
+          name: 'demo',
+          id: 'demo',
           units: {
             toArray: function() {
               return [];
@@ -193,7 +208,10 @@ describe('AddedServicesListItem', function() {
       get: sinon.stub().returns('apache2'),
       getAttrs: function() {
         return {
-          icon: 'icon.gif', unit_count: '5', name: 'demo', id: 'demo',
+          icon: 'icon.gif',
+          unit_count: '5',
+          name: 'demo',
+          id: 'demo',
           units: {
             toArray: function() {
               return [];
@@ -213,7 +231,10 @@ describe('AddedServicesListItem', function() {
       get: sinon.stub().returns('apache2'),
       getAttrs: function() {
         return {
-          icon: 'icon.gif', unit_count: '5', name: 'demo', id: 'demo',
+          icon: 'icon.gif',
+          unit_count: '5',
+          name: 'demo',
+          id: 'demo',
           units: {
             toArray: function() {
               return [];
diff --git a/jujugui/static/gui/src/app/components/search-results/test-search-results.js b/jujugui/static/gui/src/app/components/search-results/test-search-results.js
index 347c8f15d5..70477f7dc7 100644
--- a/jujugui/static/gui/src/app/components/search-results/test-search-results.js
+++ b/jujugui/static/gui/src/app/components/search-results/test-search-results.js
@@ -344,7 +344,10 @@ describe('SearchResults', function() {
     it('collapses identical charms with different series', function() {
       var entities = [
         {id: 'foo', name: 'foo', owner: 'bar', type: 'charm', series: 'trusty'},
-        {id: 'foo', name: 'foo', owner: 'bar', type: 'charm',
+        {id: 'foo',
+          name: 'foo',
+          owner: 'bar',
+          type: 'charm',
           series: 'precise'},
         {id: 'foo', name: 'foo', owner: 'baz', type: 'charm', series: 'vivid'}
       ];
@@ -373,9 +376,15 @@ describe('SearchResults', function() {
 
     it('can collapse charms when the id contains "cs:"', () => {
       const entities = [
-        {id: 'cs:foo', name: 'foo', owner: 'bar', type: 'charm',
+        {id: 'cs:foo',
+          name: 'foo',
+          owner: 'bar',
+          type: 'charm',
           series: 'trusty'},
-        {id: 'foo', name: 'foo', owner: 'bar', type: 'charm',
+        {id: 'foo',
+          name: 'foo',
+          owner: 'bar',
+          type: 'charm',
           series: 'precise'},
         {id: 'foo', name: 'foo', owner: 'baz', type: 'charm', series: 'vivid'}
       ];
@@ -385,11 +394,23 @@ describe('SearchResults', function() {
 
     it('aggregates downloads when collapsing charms', function() {
       var entities = [
-        {name: 'c1', id: 'c1', owner: 'o1', type: 'c', series: 's1',
+        {name: 'c1',
+          id: 'c1',
+          owner: 'o1',
+          type: 'c',
+          series: 's1',
           downloads: 1},
-        {name: 'c1', id: 'c1', owner: 'o1', type: 'c', series: 's2',
+        {name: 'c1',
+          id: 'c1',
+          owner: 'o1',
+          type: 'c',
+          series: 's2',
           downloads: 5},
-        {name: 'c1', id: 'c1', owner: 'o2', type: 'c', series: 's3',
+        {name: 'c1',
+          id: 'c1',
+          owner: 'o2',
+          type: 'c',
+          series: 's3',
           downloads: 3}
       ];
       var actual = searchResults._collapseSeries(entities);
@@ -399,21 +420,53 @@ describe('SearchResults', function() {
 
     it('maintains sort order when collapsing charms', function() {
       var entities = [
-        {id: 'foo1', name: 'foo1', owner: 'bar', type: 'c', series: 's1',
+        {id: 'foo1',
+          name: 'foo1',
+          owner: 'bar',
+          type: 'c',
+          series: 's1',
           downloads: 6},
-        {id: 'foo2', name: 'foo2', owner: 'bar', type: 'c', series: 's1',
+        {id: 'foo2',
+          name: 'foo2',
+          owner: 'bar',
+          type: 'c',
+          series: 's1',
           downloads: 5},
-        {id: 'foo1', name: 'foo1', owner: 'bar', type: 'c', series: 's2',
+        {id: 'foo1',
+          name: 'foo1',
+          owner: 'bar',
+          type: 'c',
+          series: 's2',
           downloads: 4},
-        {id: 'foo3', name: 'foo3', owner: 'bar', type: 'c', series: 's1',
+        {id: 'foo3',
+          name: 'foo3',
+          owner: 'bar',
+          type: 'c',
+          series: 's1',
           downloads: 4},
-        {id: 'foo2', name: 'foo2', owner: 'bar', type: 'c', series: 's1',
+        {id: 'foo2',
+          name: 'foo2',
+          owner: 'bar',
+          type: 'c',
+          series: 's1',
           downloads: 3},
-        {id: 'foo3', name: 'foo3', owner: 'bar', type: 'c', series: 's3',
+        {id: 'foo3',
+          name: 'foo3',
+          owner: 'bar',
+          type: 'c',
+          series: 's3',
           downloads: 3},
-        {id: 'foo3', name: 'foo3', owner: 'bar', type: 'c', series: 's4',
+        {id: 'foo3',
+          name: 'foo3',
+          owner: 'bar',
+          type: 'c',
+          series: 's4',
           downloads: 3},
-        {id: 'foo3', name: 'foo3', owner: 'bar', type: 'c', series: 's5',
+        {id: 'foo3',
+          name: 'foo3',
+          owner: 'bar',
+          type: 'c',
+          series: 's5',
           downloads: 3}
       ];
       var actual = searchResults._collapseSeries(entities);
diff --git a/jujugui/static/gui/src/app/init/hotkeys.js b/jujugui/static/gui/src/app/init/hotkeys.js
index a375cb12a6..a5e375be7a 100644
--- a/jujugui/static/gui/src/app/init/hotkeys.js
+++ b/jujugui/static/gui/src/app/init/hotkeys.js
@@ -70,9 +70,17 @@ const keyBindings = {
 */
 const activate = () => {
   const key_map = {
-    '1': 49, '/': 191, '?': 63, '+': 187, '-': 189,
-    enter: 13, esc: 27, backspace: 8,
-    tab: 9, pageup: 33, pagedown: 34};
+    '1': 49,
+    '/': 191,
+    '?': 63,
+    '+': 187,
+    '-': 189,
+    enter: 13,
+    esc: 27,
+    backspace: 8,
+    tab: 9,
+    pageup: 33,
+    pagedown: 34};
   const code_map = {};
   Object.keys(key_map).forEach(k => code_map[key_map[k]] = k);
   const listener = evt => {
diff --git a/jujugui/static/gui/src/app/init/test-environment-change-set.js b/jujugui/static/gui/src/app/init/test-environment-change-set.js
index 0e7ce9bf40..d1fec62bcf 100644
--- a/jujugui/static/gui/src/app/init/test-environment-change-set.js
+++ b/jujugui/static/gui/src/app/init/test-environment-change-set.js
@@ -406,14 +406,18 @@ describe('Environment Change Set', function() {
 
       it('filters out unplaced units when instructed to', function() {
         ecs.changeSet = {
-          a: {index: 0, parents: [], command: {
-            method: '_deploy',
-            options: {modelId: '75930989$'}
-          }},
-          b: {index: 0, parents: [], command: {
-            method: '_add_unit',
-            options: {modelId: '75930989$/0'}
-          }}
+          a: {index: 0,
+            parents: [],
+            command: {
+              method: '_deploy',
+              options: {modelId: '75930989$'}
+            }},
+          b: {index: 0,
+            parents: [],
+            command: {
+              method: '_add_unit',
+              options: {modelId: '75930989$/0'}
+            }}
         };
 
         filterStub.returns([{id: '75930989$/0'}]);
diff --git a/jujugui/static/gui/src/app/init/topology/test-environment.js b/jujugui/static/gui/src/app/init/topology/test-environment.js
index 18a3de85f4..2fb9dde836 100644
--- a/jujugui/static/gui/src/app/init/topology/test-environment.js
+++ b/jujugui/static/gui/src/app/init/topology/test-environment.js
@@ -567,14 +567,18 @@ describe('EnvironmentView', function() {
                 {
                   'application-name': 'puppet2',
                   relation: {
-                    name: 'juju-info', role: 'requirer',
-                    interface: 'juju-info', scope: 'container'
+                    name: 'juju-info',
+                    role: 'requirer',
+                    interface: 'juju-info',
+                    scope: 'container'
                   }
                 }, {
                   'application-name': 'wordpress',
                   relation: {
-                    name: 'juju-info', role: 'provider',
-                    interface: 'juju-info', scope: 'container'
+                    name: 'juju-info',
+                    role: 'provider',
+                    interface: 'juju-info',
+                    scope: 'container'
                   }
                 }
               ]
@@ -593,14 +597,18 @@ describe('EnvironmentView', function() {
                 {
                   'application-name': 'mediawiki',
                   relation: {
-                    name: 'juju-info', role: 'provider',
-                    interface: 'juju-info', scope: 'container'
+                    name: 'juju-info',
+                    role: 'provider',
+                    interface: 'juju-info',
+                    scope: 'container'
                   }
                 }, {
                   'application-name': 'puppet',
                   relation: {
-                    name: 'juju-info', role: 'requirer',
-                    interface: 'juju-info', scope: 'container'
+                    name: 'juju-info',
+                    role: 'requirer',
+                    interface: 'juju-info',
+                    scope: 'container'
                   }
                 }
               ]
diff --git a/jujugui/static/gui/src/app/init/topology/utils.js b/jujugui/static/gui/src/app/init/topology/utils.js
index 2772491b25..412e7a7eda 100644
--- a/jujugui/static/gui/src/app/init/topology/utils.js
+++ b/jujugui/static/gui/src/app/init/topology/utils.js
@@ -155,8 +155,10 @@ topologyUtils.getBoundingBox = function(vertices, boxWidth, boxHeight) {
     if (v[1] > maxY) { maxY = v[1]; }
   });
   return {
-    translateX: minX - boxWidth / 2, translateY: minY - boxHeight / 2,
-    w: maxX - minX + boxWidth, h: maxY - minY + boxHeight};
+    translateX: minX - boxWidth / 2,
+    translateY: minY - boxHeight / 2,
+    w: maxX - minX + boxWidth,
+    h: maxY - minY + boxHeight};
 };
 
 /**
diff --git a/jujugui/static/gui/src/app/state/test-state.js b/jujugui/static/gui/src/app/state/test-state.js
index 1fb669c6d4..d38139834f 100644
--- a/jujugui/static/gui/src/app/state/test-state.js
+++ b/jujugui/static/gui/src/app/state/test-state.js
@@ -320,7 +320,8 @@ describe('State', () => {
       'http://abc.com:123/u/frankban/production/u/frankban/django/bundle/0/#ham', // eslint-disable-line max-len
     state: {
       hash: 'ham',
-      user: 'frankban/production', store: 'u/frankban/django/bundle/0'},
+      user: 'frankban/production',
+      store: 'u/frankban/django/bundle/0'},
     error: null
   }];
 
@@ -347,7 +348,8 @@ describe('State', () => {
       'http://abc.com:123/u/hatch/staging/i/applications/inspector/ghost/#mayo',
     state: {
       hash: 'mayo',
-      user: 'hatch/staging', gui: {applications: '', inspector: {id: 'ghost'}}},
+      user: 'hatch/staging',
+      gui: {applications: '', inspector: {id: 'ghost'}}},
     error: null
   }];
 
diff --git a/jujugui/static/gui/src/app/test-init.js b/jujugui/static/gui/src/app/test-init.js
index 1066f12159..3311b03add 100644
--- a/jujugui/static/gui/src/app/test-init.js
+++ b/jujugui/static/gui/src/app/test-init.js
@@ -907,7 +907,8 @@ describe('init', () => {
           path: 'frankban/latta',
           uuid: 'fe9a2845-4829-4d61-8653-248b7052204e'
         },
-        user: null, root: null
+        user: null,
+        root: null
       }]);
     });
 
@@ -921,7 +922,8 @@ describe('init', () => {
           path: 'uros-jovanovic/jujugui-org',
           uuid: '509f6e4c-4da4-49c8-8f18-537c33b4d3a0'
         },
-        user: null, root: null
+        user: null,
+        root: null
       }]);
     });
 
@@ -931,7 +933,10 @@ describe('init', () => {
       assert.deepEqual(app.maskVisibility.args[0], [false]);
       assert.equal(app.state.changeState.callCount, 1);
       assert.deepEqual(app.state.changeState.args[0], [{
-        root: null, store: null, model: null, user: null,
+        root: null,
+        store: null,
+        model: null,
+        user: null,
         profile: ''
       }]);
     });
@@ -942,7 +947,10 @@ describe('init', () => {
       assert.deepEqual(app.maskVisibility.args[0], [false]);
       assert.equal(app.state.changeState.callCount, 1);
       assert.deepEqual(app.state.changeState.args[0], [{
-        root: null, store: null, model: null, user: null,
+        root: null,
+        store: null,
+        model: null,
+        user: null,
         profile: ''
       }]);
     });
diff --git a/jujugui/static/gui/src/test/test_controller_api.js b/jujugui/static/gui/src/test/test_controller_api.js
index 08d494d2ce..dfaa20eb80 100644
--- a/jujugui/static/gui/src/test/test_controller_api.js
+++ b/jujugui/static/gui/src/test/test_controller_api.js
@@ -294,28 +294,30 @@ describe('Controller API', function() {
     it('stores user information', function() {
       controllerAPI.login();
       // Assume login to be the first request.
-      conn.msg({'request-id': 1, response: {
-        facades: [
-          {name: 'Client', versions: [0]},
-          {name: 'ModelManager', versions: [4]}
-        ],
-        'controller-tag': 'controller-42',
-        'user-info': {'controller-access': 'add-model', 'model-access': ''}
-      }});
+      conn.msg({'request-id': 1,
+        response: {
+          facades: [
+            {name: 'Client', versions: [0]},
+            {name: 'ModelManager', versions: [4]}
+          ],
+          'controller-tag': 'controller-42',
+          'user-info': {'controller-access': 'add-model', 'model-access': ''}
+        }});
       assert.strictEqual(controllerAPI.get('controllerAccess'), 'add-model');
     });
 
     it('stores user information (legacy addmodel)', function() {
       controllerAPI.login();
       // Assume login to be the first request.
-      conn.msg({'request-id': 1, response: {
-        facades: [
-          {name: 'Client', versions: [0]},
-          {name: 'ModelManager', versions: [4]}
-        ],
-        'controller-tag': 'controller-42',
-        'user-info': {'controller-access': 'addmodel', 'model-access': ''}
-      }});
+      conn.msg({'request-id': 1,
+        response: {
+          facades: [
+            {name: 'Client', versions: [0]},
+            {name: 'ModelManager', versions: [4]}
+          ],
+          'controller-tag': 'controller-42',
+          'user-info': {'controller-access': 'addmodel', 'model-access': ''}
+        }});
       assert.strictEqual(controllerAPI.get('controllerAccess'), 'add-model');
     });
   });
diff --git a/jujugui/static/gui/src/test/test_env_api.js b/jujugui/static/gui/src/test/test_env_api.js
index 20e44a7b06..9a8315bbf5 100644
--- a/jujugui/static/gui/src/test/test_env_api.js
+++ b/jujugui/static/gui/src/test/test_env_api.js
@@ -450,14 +450,15 @@ const utils = require('../app/init/testing-utils');
       it('calls currentModelInfo and watchAll after login', function() {
         env.login();
         // Assume login to be the first request.
-        conn.msg({'request-id': 1, response: {
-          facades: [
-            {name: 'Client', versions: [0]},
-            {name: 'ModelManager', versions: [2]}
-          ],
-          'user-info': {},
-          'model-tag': 'model-my-model'
-        }});
+        conn.msg({'request-id': 1,
+          response: {
+            facades: [
+              {name: 'Client', versions: [0]},
+              {name: 'ModelManager', versions: [2]}
+            ],
+            'user-info': {},
+            'model-tag': 'model-my-model'
+          }});
         var currentModelInfoMessage = conn.last_message(2);
         // ModelInfo is the second request.
         var currentModelInfoExpected = {
@@ -487,14 +488,15 @@ const utils = require('../app/init/testing-utils');
       it('stores user information', function() {
         env.login();
         // Assume login to be the first request.
-        conn.msg({'request-id': 1, response: {
-          facades: [
-            {name: 'Client', versions: [0]},
-            {name: 'ModelManager', versions: [2]}
-          ],
-          'model-tag': 'model-42',
-          'user-info': {'controller-access': 'login', 'model-access': 'read'}
-        }});
+        conn.msg({'request-id': 1,
+          response: {
+            facades: [
+              {name: 'Client', versions: [0]},
+              {name: 'ModelManager', versions: [2]}
+            ],
+            'model-tag': 'model-42',
+            'user-info': {'controller-access': 'login', 'model-access': 'read'}
+          }});
         assert.strictEqual(env.get('controllerAccess'), 'login');
         assert.strictEqual(env.get('modelAccess'), 'read');
       });
@@ -502,17 +504,18 @@ const utils = require('../app/init/testing-utils');
       it('stores user information (legacy addmodel)', function() {
         env.login();
         // Assume login to be the first request.
-        conn.msg({'request-id': 1, response: {
-          facades: [
-            {name: 'Client', versions: [0]},
-            {name: 'ModelManager', versions: [2]}
-          ],
-          'model-tag': 'model-42',
-          'user-info': {
-            'controller-access': 'addmodel',
-            'model-access': 'admin'
-          }
-        }});
+        conn.msg({'request-id': 1,
+          response: {
+            facades: [
+              {name: 'Client', versions: [0]},
+              {name: 'ModelManager', versions: [2]}
+            ],
+            'model-tag': 'model-42',
+            'user-info': {
+              'controller-access': 'addmodel',
+              'model-access': 'admin'
+            }
+          }});
         assert.strictEqual(env.get('controllerAccess'), 'add-model');
         assert.strictEqual(env.get('modelAccess'), 'admin');
       });
@@ -2014,7 +2017,8 @@ const utils = require('../app/init/testing-utils');
         {jobs: [machineJobs.MANAGE_ENVIRON], series: 'precise'},
         {jobs: [machineJobs.HOST_UNITS], 'container-type': 'kvm'},
         {jobs: [machineJobs.HOST_UNITS],
-          'container-type': 'lxc', 'parent-id': '1'}
+          'container-type': 'lxc',
+          'parent-id': '1'}
       ];
       var expectedMsg = {
         'request-id': 1,

From ad3388c0283179af2808cf8169d42862d3e79abd Mon Sep 17 00:00:00 2001
From: Jeff Pihach <jeff.pihach@canonical.com>
Date: Tue, 25 Sep 2018 06:54:44 -0600
Subject: [PATCH 8/9] Added array-bracket-spacing eslint rule.

---
 .eslintrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.eslintrc b/.eslintrc
index 0137134e29..f0a5681b93 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -12,6 +12,7 @@
     }
   },
   "rules": {
+    "array-bracket-spacing": [2, "never"],
     "arrow-parens": ["error", "as-needed"],
     "brace-style": ["error", "1tbs", { "allowSingleLine": true }],
     "comma-dangle": ["error", "never"],

From 9ff6e0ea819d0978f0831b1ba0b42aed5551b899 Mon Sep 17 00:00:00 2001
From: Jeff Pihach <jeff.pihach@canonical.com>
Date: Mon, 1 Oct 2018 08:06:17 -0600
Subject: [PATCH 9/9] Cleanup from rebase.

---
 .../src/app/components/post-deployment/test-post-deployment.js  | 2 +-
 jujugui/static/gui/src/app/init/test-bundle-importer.js         | 2 +-
 jujugui/static/gui/src/app/state/test-state.js                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jujugui/static/gui/src/app/components/post-deployment/test-post-deployment.js b/jujugui/static/gui/src/app/components/post-deployment/test-post-deployment.js
index 51af6e766a..994cdd7e03 100644
--- a/jujugui/static/gui/src/app/components/post-deployment/test-post-deployment.js
+++ b/jujugui/static/gui/src/app/components/post-deployment/test-post-deployment.js
@@ -95,7 +95,7 @@ describe('PostDeployment', () => {
     // sinon.callsArgWith passes the same file each time it's called, so we
     // expect the markdown content, here.
     assert.deepEqual(changeState.args[0][0], {
-      terminal: [ 'commands', '    on multiple', '    lines']
+      terminal: ['commands', '    on multiple', '    lines']
     });
   });
 
diff --git a/jujugui/static/gui/src/app/init/test-bundle-importer.js b/jujugui/static/gui/src/app/init/test-bundle-importer.js
index a5205e4b21..d7a3ef01d6 100644
--- a/jujugui/static/gui/src/app/init/test-bundle-importer.js
+++ b/jujugui/static/gui/src/app/init/test-bundle-importer.js
@@ -411,7 +411,7 @@ describe('BundleImporter', () => {
         ],
         id: 'deploy-1',
         method: 'deploy',
-        requires: [ 'addCharm-0' ]
+        requires: ['addCharm-0']
       };
       const options = {
         services: {
diff --git a/jujugui/static/gui/src/app/state/test-state.js b/jujugui/static/gui/src/app/state/test-state.js
index d38139834f..3b471c7002 100644
--- a/jujugui/static/gui/src/app/state/test-state.js
+++ b/jujugui/static/gui/src/app/state/test-state.js
@@ -1386,7 +1386,7 @@ describe('State', () => {
       sinon.stub(state, 'dispatch').returns({error: null});
       const stub1 = sinon.stub();
       state.register([
-        ['test', stub1 ]
+        ['test', stub1]
       ]);
       state.changeState({
         test: {