Upgrade eslint config to 0.8.1. (#13128)

* Fix incorrect peerDependency and bump eslint config version to 0.8.1. * Upgrade eslint config to 0.8.1. Fix JSX to adhere to new formatting rules.
elastic · Jul 27, 2017 · e922f00 · e922f00
1 parent dd8c1ab
commit e922f00
Show file tree

Hide file tree

Showing 114 changed files with 1,039 additions and 669 deletions.
diff --git a/package.json b/package.json
@@ -203,7 +203,7 @@
     "yauzl": "2.7.0"
   },
   "devDependencies": {
-    "@elastic/eslint-config-kibana": "0.6.1",
+    "@elastic/eslint-config-kibana": "0.8.1",
     "@elastic/eslint-import-resolver-kibana": "0.8.1",
     "@elastic/eslint-plugin-kibana-custom": "1.0.3",
     "angular-mocks": "1.4.7",
@@ -221,7 +221,7 @@
     "eslint-plugin-import": "2.3.0",
     "eslint-plugin-jest": "20.0.3",
     "eslint-plugin-mocha": "4.9.0",
-    "eslint-plugin-react": "7.0.1",
+    "eslint-plugin-react": "7.1.0",
     "event-stream": "3.3.2",
     "expect.js": "0.3.1",
     "faker": "1.1.0",

diff --git a/packages/eslint-config-kibana/package.json b/packages/eslint-config-kibana/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@elastic/eslint-config-kibana",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "The eslint config used by the kibana team",
   "main": ".eslintrc.js",
   "scripts": {
@@ -23,6 +23,6 @@
     "eslint-plugin-babel": "^4.1.1",
     "eslint-plugin-import": "^2.6.0",
     "eslint-plugin-mocha": "^4.9.0",
-    "eslint-plugin-react": "^7.0.1"
+    "eslint-plugin-react": "^7.1.0"
   }
 }
diff --git a/src/core_plugins/kibana/public/dashboard/top_nav/clone_modal.js b/src/core_plugins/kibana/public/dashboard/top_nav/clone_modal.js
@@ -59,7 +59,8 @@ export class DashboardCloneModal extends React.Component {
                 data-test-subj="clonedDashboardTitle"
                 className="kuiTextInput kuiTextInput--large"
                 value={ this.state.newDashboardName }
-                onChange={ this.onInputChange } />
+                onChange={ this.onInputChange }
+              />
             </KuiModalBodyText>
           </KuiModalBody>
 

diff --git a/src/core_plugins/kibana/public/dashboard/top_nav/show_clone_modal.js b/src/core_plugins/kibana/public/dashboard/top_nav/show_clone_modal.js
@@ -17,7 +17,7 @@ export function showCloneModal(onClone, title) {
   };
   document.body.appendChild(container);
   const element = (
-    <DashboardCloneModal onClone={onCloneConfirmed} onClose={closeModal} title={title + ' Copy'}></DashboardCloneModal>
+    <DashboardCloneModal onClone={onCloneConfirmed} onClose={closeModal} title={title + ' Copy'} />
   );
   ReactDOM.render(element, container);
 }
diff --git a/src/core_plugins/metrics/public/components/add_delete_buttons.js b/src/core_plugins/metrics/public/components/add_delete_buttons.js
@@ -9,7 +9,7 @@ function AddDeleteButtons(props) {
     return (
       <Tooltip text={props.deleteTooltip}>
         <a className="thor__button-outlined-danger sm" onClick={ props.onDelete }>
-          <i className="fa fa-trash-o"></i>
+          <i className="fa fa-trash-o" />
         </a>
       </Tooltip>
     );
@@ -21,7 +21,7 @@ function AddDeleteButtons(props) {
     return (
       <Tooltip text={props.addTooltip}>
         <a className="thor__button-outlined-default sm" onClick={ props.onAdd }>
-          <i className="fa fa-plus"></i>
+          <i className="fa fa-plus" />
         </a>
       </Tooltip>
     );
@@ -33,7 +33,7 @@ function AddDeleteButtons(props) {
     clone = (
       <Tooltip text={props.cloneTooltip}>
         <a className="thor__button-outlined-default sm" onClick={ props.onClone }>
-          <i className="fa fa-files-o"></i>
+          <i className="fa fa-files-o" />
         </a>
       </Tooltip>
     );

diff --git a/src/core_plugins/metrics/public/components/aggs/agg.js b/src/core_plugins/metrics/public/components/aggs/agg.js
@@ -15,7 +15,8 @@ function Agg(props) {
       className={props.className}
       style={style}
       onMouseDown={props.onMouseDown}
-      onTouchStart={props.onTouchStart}>
+      onTouchStart={props.onTouchStart}
+    >
       <Component
         fields={props.fields}
         disableDelete={props.disableDelete}
@@ -25,7 +26,8 @@ function Agg(props) {
         onDelete={props.onDelete}
         panel={props.panel}
         series={props.series}
-        siblings={props.siblings}/>
+        siblings={props.siblings}
+      />
     </div>
   );
 

diff --git a/src/core_plugins/metrics/public/components/aggs/agg_row.js b/src/core_plugins/metrics/public/components/aggs/agg_row.js
@@ -18,7 +18,7 @@ function AggRow(props) {
       <div>
         <Tooltip text="Sort">
           <div className="vis_editor__agg_sort thor__button-outlined-default sm">
-            <i className="fa fa-sort"></i>
+            <i className="fa fa-sort" />
           </div>
         </Tooltip>
       </div>
@@ -29,7 +29,7 @@ function AggRow(props) {
     <div className="vis_editor__agg_row">
       <div className="vis_editor__agg_row-item">
         <div className={iconRowClassName}>
-          <i className={iconClassName}></i>
+          <i className={iconClassName} />
         </div>
         {props.children}
         { dragHandle }
@@ -38,7 +38,8 @@ function AggRow(props) {
           deleteTooltip="Delete Metric"
           onAdd={props.onAdd}
           onDelete={props.onDelete}
-          disableDelete={props.disableDelete}/>
+          disableDelete={props.disableDelete}
+        />
       </div>
     </div>
   );

diff --git a/src/core_plugins/metrics/public/components/aggs/agg_select.js b/src/core_plugins/metrics/public/components/aggs/agg_select.js
@@ -147,7 +147,8 @@ function AggSelect(props) {
         options={options}
         value={props.value}
         optionComponent={AggSelectOption}
-        onChange={handleChange}/>
+        onChange={handleChange}
+      />
     </div>
   );
 }

diff --git a/src/core_plugins/metrics/public/components/aggs/calculation.js b/src/core_plugins/metrics/public/components/aggs/calculation.js
@@ -35,21 +35,24 @@ class CalculationAgg extends Component {
         model={this.props.model}
         onAdd={this.props.onAdd}
         onDelete={this.props.onDelete}
-        siblings={this.props.siblings}>
+        siblings={this.props.siblings}
+      >
         <div className="vis_editor__row_item">
           <div>
             <div className="vis_editor__label">Aggregation</div>
             <AggSelect
               siblings={this.props.siblings}
               value={model.type}
-              onChange={handleSelectChange('type')}/>
+              onChange={handleSelectChange('type')}
+            />
             <div className="vis_editor__variables">
               <div className="vis_editor__label">Variables</div>
               <Vars
                 metrics={siblings}
                 onChange={handleChange}
                 name="variables"
-                model={model}/>
+                model={model}
+              />
             </div>
             <div className="vis_editor__row_item">
               <div className="vis_editor__label">
@@ -60,7 +63,8 @@ class CalculationAgg extends Component {
                 className="vis_editor__input-grows-100"
                 type="text"
                 onChange={handleTextChange('script')}
-                value={model.script}/>
+                value={model.script}
+              />
             </div>
           </div>
         </div>

diff --git a/src/core_plugins/metrics/public/components/aggs/cumulative_sum.js b/src/core_plugins/metrics/public/components/aggs/cumulative_sum.js
@@ -10,26 +10,29 @@ function CumlativeSumAgg(props) {
   const handleChange = createChangeHandler(props.onChange, model);
   const handleSelectChange = createSelectHandler(handleChange);
   return (
-      <AggRow
-        disableDelete={props.disableDelete}
-        model={props.model}
-        onAdd={props.onAdd}
-        onDelete={props.onDelete}
-        siblings={props.siblings}>
+    <AggRow
+      disableDelete={props.disableDelete}
+      model={props.model}
+      onAdd={props.onAdd}
+      onDelete={props.onDelete}
+      siblings={props.siblings}
+    >
       <div className="vis_editor__row_item">
         <div className="vis_editor__label">Aggregation</div>
         <AggSelect
           siblings={props.siblings}
           value={model.type}
-          onChange={handleSelectChange('type')}/>
+          onChange={handleSelectChange('type')}
+        />
       </div>
       <div className="vis_editor__row_item">
         <div className="vis_editor__label">Metric</div>
         <MetricSelect
           onChange={handleSelectChange('field')}
           metrics={siblings}
           metric={model}
-          value={model.field}/>
+          value={model.field}
+        />
       </div>
     </AggRow>
   );

diff --git a/src/core_plugins/metrics/public/components/aggs/derivative.js b/src/core_plugins/metrics/public/components/aggs/derivative.js
@@ -24,29 +24,33 @@ class DerivativeAgg extends Component {
         model={this.props.model}
         onAdd={this.props.onAdd}
         onDelete={this.props.onDelete}
-        siblings={this.props.siblings}>
+        siblings={this.props.siblings}
+      >
         <div className="vis_editor__row_item">
           <div className="vis_editor__label">Aggregation</div>
           <AggSelect
             siblings={this.props.siblings}
             value={model.type}
-            onChange={handleSelectChange('type')}/>
+            onChange={handleSelectChange('type')}
+          />
         </div>
         <div className="vis_editor__row_item">
           <div className="vis_editor__label">Metric</div>
           <MetricSelect
             onChange={handleSelectChange('field')}
             metrics={siblings}
             metric={model}
-            value={model.field}/>
+            value={model.field}
+          />
         </div>
         <div>
           <div className="vis_editor__label">Units (1s, 1m, etc)</div>
           <input
             className="vis_editor__input"
             onChange={handleTextChange('unit')}
             value={model.unit}
-            type="text"/>
+            type="text"
+          />
         </div>
       </AggRow>
     );

diff --git a/src/core_plugins/metrics/public/components/aggs/field_select.js b/src/core_plugins/metrics/public/components/aggs/field_select.js
@@ -19,7 +19,8 @@ function FieldSelect(props) {
       disabled={props.disabled}
       options={options}
       value={props.value}
-      onChange={props.onChange}/>
+      onChange={props.onChange}
+    />
   );
 }
 

diff --git a/src/core_plugins/metrics/public/components/aggs/filter_ratio.js b/src/core_plugins/metrics/public/components/aggs/filter_ratio.js
@@ -34,55 +34,61 @@ class FilterRatioAgg extends Component {
         model={this.props.model}
         onAdd={this.props.onAdd}
         onDelete={this.props.onDelete}
-        siblings={this.props.siblings}>
+        siblings={this.props.siblings}
+      >
         <div style={{ flex: '1 0 auto' }}>
           <div style={{ flex: '1 0 auto', display: 'flex' }}>
             <div className="vis_editor__row_item">
               <div className="vis_editor__label">Aggregation</div>
               <AggSelect
                 siblings={this.props.siblings}
                 value={model.type}
-                onChange={handleSelectChange('type')}/>
+                onChange={handleSelectChange('type')}
+              />
             </div>
-      <div className="vis_editor__row_item">
-        <div className="vis_editor__label">Numerator</div>
-        <input
-          className="vis_editor__input-grows-100"
-          onChange={handleTextChange('numerator')}
-          value={model.numerator}
-          type="text"/>
-      </div>
-      <div className="vis_editor__row_item">
-        <div className="vis_editor__label">Denominator</div>
-        <input
-          className="vis_editor__input-grows-100"
-          onChange={handleTextChange('denominator')}
-          value={model.denominator}
-          type="text"/>
-      </div>
-    </div>
-      <div style={{ flex: '1 0 auto', display: 'flex', marginTop: '10px' }}>
-        <div className="vis_editor__row_item">
-          <div className="vis_editor__label">Metric Aggregation</div>
-          <AggSelect
-            siblings={this.props.siblings}
-            panelType="metrics"
-            value={model.metric_agg}
-            onChange={handleSelectChange('metric_agg')}/>
+            <div className="vis_editor__row_item">
+              <div className="vis_editor__label">Numerator</div>
+              <input
+                className="vis_editor__input-grows-100"
+                onChange={handleTextChange('numerator')}
+                value={model.numerator}
+                type="text"
+              />
+            </div>
+            <div className="vis_editor__row_item">
+              <div className="vis_editor__label">Denominator</div>
+              <input
+                className="vis_editor__input-grows-100"
+                onChange={handleTextChange('denominator')}
+                value={model.denominator}
+                type="text"
+              />
+            </div>
+          </div>
+          <div style={{ flex: '1 0 auto', display: 'flex', marginTop: '10px' }}>
+            <div className="vis_editor__row_item">
+              <div className="vis_editor__label">Metric Aggregation</div>
+              <AggSelect
+                siblings={this.props.siblings}
+                panelType="metrics"
+                value={model.metric_agg}
+                onChange={handleSelectChange('metric_agg')}
+              />
+            </div>
+            { model.metric_agg !== 'count' ? (
+              <div className="vis_editor__row_item">
+                <div className="vis_editor__label">Field</div>
+                <FieldSelect
+                  fields={fields}
+                  type={model.metric_agg}
+                  restrict="numeric"
+                  indexPattern={indexPattern}
+                  value={model.field}
+                  onChange={handleSelectChange('field')}
+                />
+              </div>) : null }
+          </div>
         </div>
-      { model.metric_agg !== 'count' ? (
-        <div className="vis_editor__row_item">
-        <div className="vis_editor__label">Field</div>
-        <FieldSelect
-          fields={fields}
-          type={model.metric_agg}
-          restrict="numeric"
-          indexPattern={indexPattern}
-          value={model.field}
-          onChange={handleSelectChange('field')}/>
-      </div>) : null }
-    </div>
-      </div>
       </AggRow>
     );
   }

diff --git a/src/core_plugins/metrics/public/components/aggs/metric_select.js b/src/core_plugins/metrics/public/components/aggs/metric_select.js
@@ -41,7 +41,8 @@ function MetricSelect(props) {
       placeholder="Select metric..."
       options={options.concat(props.additionalOptions)}
       value={value}
-      onChange={onChange}/>
+      onChange={onChange}
+    />
   );
 }