From d36f0a6dbd2dba1c1dbbf56f027df7b00eaf5dee Mon Sep 17 00:00:00 2001 From: RVKen Date: Thu, 29 Jun 2017 04:37:19 +0200 Subject: [PATCH] fix eslint issues --- package.json | 1 + src/core/components/app.jsx | 5 +++-- src/core/components/auth/api-key-auth.jsx | 3 ++- src/core/components/auth/authorization-popup.jsx | 3 ++- src/core/components/auth/authorize-btn.jsx | 3 ++- .../components/auth/authorize-operation-btn.jsx | 3 ++- src/core/components/auth/auths.jsx | 3 ++- src/core/components/auth/basic-auth.jsx | 3 ++- src/core/components/auth/error.jsx | 3 ++- src/core/components/auth/oauth2.jsx | 3 ++- src/core/components/clear.jsx | 3 ++- src/core/components/content-type.jsx | 3 ++- src/core/components/curl.jsx | 3 ++- src/core/components/debug.jsx | 3 ++- src/core/components/errors.jsx | 3 ++- src/core/components/execute.jsx | 3 ++- src/core/components/headers.jsx | 3 ++- src/core/components/highlight-code.jsx | 13 +++++++++---- src/core/components/info.jsx | 3 ++- src/core/components/layout-utils.jsx | 3 ++- src/core/components/layouts/base.jsx | 3 ++- src/core/components/layouts/xpane.jsx | 3 ++- src/core/components/live-response.jsx | 3 ++- src/core/components/model-example.jsx | 4 ++-- src/core/components/model.jsx | 3 ++- src/core/components/models.jsx | 4 ++-- src/core/components/online-validator-badge.jsx | 3 ++- src/core/components/operation.jsx | 3 ++- src/core/components/operations.jsx | 3 ++- src/core/components/overview.jsx | 3 ++- src/core/components/param-body.jsx | 3 ++- src/core/components/parameter-row.jsx | 4 ++-- src/core/components/parameters.jsx | 3 ++- src/core/components/providers/markdown.jsx | 3 ++- src/core/components/response-body.jsx | 3 ++- src/core/components/response.jsx | 3 ++- src/core/components/responses.jsx | 3 ++- src/core/components/schemes.jsx | 3 ++- src/core/components/try-it-out-button.jsx | 3 ++- src/core/json-schema-components.js | 3 ++- .../split-pane-mode/components/split-pane-mode.jsx | 11 ++++++++--- src/core/plugins/view/root-injects.js | 4 ++-- src/core/proptypes.js | 2 +- src/core/system.js | 2 +- src/core/utils.js | 2 +- src/plugins/topbar/topbar.jsx | 3 ++- src/standalone/layout.jsx | 3 ++- .../plugins/err/transformers/parameter-oneof.js | 1 + 48 files changed, 105 insertions(+), 56 deletions(-) diff --git a/package.json b/package.json index cc06e3ce..c1ebc338 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,7 @@ "matcher": "^0.1.2", "memoizee": "0.4.1", "promise-worker": "^1.1.1", + "prop-types": "^15.5.10", "react": "^15.4.0", "react-addons-perf": "0.14.8", "react-addons-shallow-compare": "0.14.8", diff --git a/src/core/components/app.jsx b/src/core/components/app.jsx index 3ed94b74..9ef5a8fd 100644 --- a/src/core/components/app.jsx +++ b/src/core/components/app.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" export default class App extends React.Component { @@ -6,7 +7,7 @@ export default class App extends React.Component { let { getComponent, layoutSelectors } = this.props const layoutName = layoutSelectors.current() const Component = getComponent(layoutName, true) - return Component ? Component : ()=>

No layout defined for "{layoutName}"

+ return Component ? Component : ()=>

No layout defined for "{layoutName}"

} render() { diff --git a/src/core/components/auth/api-key-auth.jsx b/src/core/components/auth/api-key-auth.jsx index 036afa86..d9796f76 100644 --- a/src/core/components/auth/api-key-auth.jsx +++ b/src/core/components/auth/api-key-auth.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" export default class ApiKeyAuth extends React.Component { static propTypes = { diff --git a/src/core/components/auth/authorization-popup.jsx b/src/core/components/auth/authorization-popup.jsx index 7b09fbd1..887a06a5 100644 --- a/src/core/components/auth/authorization-popup.jsx +++ b/src/core/components/auth/authorization-popup.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" export default class AuthorizationPopup extends React.Component { close =() => { diff --git a/src/core/components/auth/authorize-btn.jsx b/src/core/components/auth/authorize-btn.jsx index 315312d4..b7266bce 100644 --- a/src/core/components/auth/authorize-btn.jsx +++ b/src/core/components/auth/authorize-btn.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" export default class AuthorizeBtn extends React.Component { static propTypes = { diff --git a/src/core/components/auth/authorize-operation-btn.jsx b/src/core/components/auth/authorize-operation-btn.jsx index a3ce19f9..2753bffe 100644 --- a/src/core/components/auth/authorize-operation-btn.jsx +++ b/src/core/components/auth/authorize-operation-btn.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" import ImPropTypes from "react-immutable-proptypes" export default class AuthorizeOperationBtn extends React.Component { diff --git a/src/core/components/auth/auths.jsx b/src/core/components/auth/auths.jsx index 9e9cf6f6..f03837d6 100644 --- a/src/core/components/auth/auths.jsx +++ b/src/core/components/auth/auths.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" import ImPropTypes from "react-immutable-proptypes" export default class Auths extends React.Component { diff --git a/src/core/components/auth/basic-auth.jsx b/src/core/components/auth/basic-auth.jsx index fb954bf1..8d45d210 100644 --- a/src/core/components/auth/basic-auth.jsx +++ b/src/core/components/auth/basic-auth.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" import ImPropTypes from "react-immutable-proptypes" export default class BasicAuth extends React.Component { diff --git a/src/core/components/auth/error.jsx b/src/core/components/auth/error.jsx index db5e0124..c3af158f 100644 --- a/src/core/components/auth/error.jsx +++ b/src/core/components/auth/error.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" export default class AuthError extends React.Component { diff --git a/src/core/components/auth/oauth2.jsx b/src/core/components/auth/oauth2.jsx index 8e1dd83e..0632c259 100644 --- a/src/core/components/auth/oauth2.jsx +++ b/src/core/components/auth/oauth2.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" import oauth2Authorize from "core/oauth2-authorize" const IMPLICIT = "implicit" diff --git a/src/core/components/clear.jsx b/src/core/components/clear.jsx index 944ad29f..d4e0ec85 100644 --- a/src/core/components/clear.jsx +++ b/src/core/components/clear.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from "react" +import React, { Component } from "react" +import PropTypes from "prop-types" export default class Clear extends Component { diff --git a/src/core/components/content-type.jsx b/src/core/components/content-type.jsx index 1afffd33..4cc22f8b 100644 --- a/src/core/components/content-type.jsx +++ b/src/core/components/content-type.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" import ImPropTypes from "react-immutable-proptypes" import { fromJS } from "immutable" diff --git a/src/core/components/curl.jsx b/src/core/components/curl.jsx index 5bbc242b..ad1a2df4 100644 --- a/src/core/components/curl.jsx +++ b/src/core/components/curl.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" import curlify from "core/curlify" export default class Curl extends React.Component { diff --git a/src/core/components/debug.jsx b/src/core/components/debug.jsx index 95fcaae9..6cb7d5d7 100644 --- a/src/core/components/debug.jsx +++ b/src/core/components/debug.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" import Collapse from "react-collapse" import { presets } from "react-motion" import ObjectInspector from "react-object-inspector" diff --git a/src/core/components/errors.jsx b/src/core/components/errors.jsx index 1c8d857c..bea01ba9 100644 --- a/src/core/components/errors.jsx +++ b/src/core/components/errors.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" import { List } from "immutable" import Collapse from "react-collapse" diff --git a/src/core/components/execute.jsx b/src/core/components/execute.jsx index 37425466..8d114b14 100644 --- a/src/core/components/execute.jsx +++ b/src/core/components/execute.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from "react" +import React, { Component } from "react" +import PropTypes from "prop-types" export default class Execute extends Component { diff --git a/src/core/components/headers.jsx b/src/core/components/headers.jsx index 54b937e2..5dc13f6c 100644 --- a/src/core/components/headers.jsx +++ b/src/core/components/headers.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" import Im from "immutable" export default class Headers extends React.Component { diff --git a/src/core/components/highlight-code.jsx b/src/core/components/highlight-code.jsx index 7bfb1728..e0c3c461 100644 --- a/src/core/components/highlight-code.jsx +++ b/src/core/components/highlight-code.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from "react" +import React, { Component } from "react" +import PropTypes from "prop-types" import { highlight } from "core/utils" export default class HighlightCode extends Component { @@ -8,17 +9,21 @@ export default class HighlightCode extends Component { } componentDidMount() { - highlight(this.refs.el) + highlight(this.el) } componentDidUpdate() { - highlight(this.refs.el) + highlight(this.el) + } + + initializeComponent = (c) => { + this.el = c } render () { let { value, className } = this.props className = className || "" - return 
{ value }
+ return 
{ value }
} } diff --git a/src/core/components/info.jsx b/src/core/components/info.jsx index da53be06..6ea1ed48 100644 --- a/src/core/components/info.jsx +++ b/src/core/components/info.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" import { fromJS } from "immutable" import ImPropTypes from "react-immutable-proptypes" diff --git a/src/core/components/layout-utils.jsx b/src/core/components/layout-utils.jsx index 22cd1d51..00a4a09d 100644 --- a/src/core/components/layout-utils.jsx +++ b/src/core/components/layout-utils.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" import OriCollapse from "react-collapse" function xclass(...args) { diff --git a/src/core/components/layouts/base.jsx b/src/core/components/layouts/base.jsx index 35cfd7b8..9da4b347 100644 --- a/src/core/components/layouts/base.jsx +++ b/src/core/components/layouts/base.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" export default class BaseLayout extends React.Component { diff --git a/src/core/components/layouts/xpane.jsx b/src/core/components/layouts/xpane.jsx index b18af4a8..1149fc55 100644 --- a/src/core/components/layouts/xpane.jsx +++ b/src/core/components/layouts/xpane.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" export default class XPane extends React.Component { diff --git a/src/core/components/live-response.jsx b/src/core/components/live-response.jsx index 550208fa..bb61e252 100644 --- a/src/core/components/live-response.jsx +++ b/src/core/components/live-response.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" import ImPropTypes from "react-immutable-proptypes" const Headers = ( { headers } )=>{ diff --git a/src/core/components/model-example.jsx b/src/core/components/model-example.jsx index 0117c9a5..1b4273ce 100644 --- a/src/core/components/model-example.jsx +++ b/src/core/components/model-example.jsx @@ -1,5 +1,5 @@ -import React, { PropTypes } from "react" - +import React from "react" +import PropTypes from "prop-types" export default class ModelExample extends React.Component { static propTypes = { diff --git a/src/core/components/model.jsx b/src/core/components/model.jsx index a043c325..f2b2e99d 100644 --- a/src/core/components/model.jsx +++ b/src/core/components/model.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from "react" +import React, { Component } from "react" +import PropTypes from "prop-types" import ImPropTypes from "react-immutable-proptypes" import { List } from "immutable" const braceOpen = "{" diff --git a/src/core/components/models.jsx b/src/core/components/models.jsx index 21605199..dbd14a05 100644 --- a/src/core/components/models.jsx +++ b/src/core/components/models.jsx @@ -1,5 +1,5 @@ -import React, { Component, PropTypes } from "react" - +import React, { Component } from "react" +import PropTypes from "prop-types" export default class Models extends Component { static propTypes = { diff --git a/src/core/components/online-validator-badge.jsx b/src/core/components/online-validator-badge.jsx index 7988ea98..466d4c97 100644 --- a/src/core/components/online-validator-badge.jsx +++ b/src/core/components/online-validator-badge.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" export default class OnlineValidatorBadge extends React.Component { static propTypes = { diff --git a/src/core/components/operation.jsx b/src/core/components/operation.jsx index 31f52cda..50552ddc 100644 --- a/src/core/components/operation.jsx +++ b/src/core/components/operation.jsx @@ -1,4 +1,5 @@ -import React, { PureComponent, PropTypes } from "react" +import React, { PureComponent } from "react" +import PropTypes from "prop-types" import { getList } from "core/utils" import * as CustomPropTypes from "core/proptypes" diff --git a/src/core/components/operations.jsx b/src/core/components/operations.jsx index 16c8a86e..7275eea2 100644 --- a/src/core/components/operations.jsx +++ b/src/core/components/operations.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" export default class Operations extends React.Component { diff --git a/src/core/components/overview.jsx b/src/core/components/overview.jsx index 327c0135..6e1708d3 100644 --- a/src/core/components/overview.jsx +++ b/src/core/components/overview.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" import { Link } from "core/components/layout-utils" export default class Overview extends React.Component { diff --git a/src/core/components/param-body.jsx b/src/core/components/param-body.jsx index ce5438d1..7de6766b 100644 --- a/src/core/components/param-body.jsx +++ b/src/core/components/param-body.jsx @@ -1,4 +1,5 @@ -import React, { PureComponent, PropTypes } from "react" +import React, { PureComponent } from "react" +import PropTypes from "prop-types" import { fromJS, List } from "immutable" import { getSampleSchema } from "core/utils" diff --git a/src/core/components/parameter-row.jsx b/src/core/components/parameter-row.jsx index 672e7c95..8db1f29a 100644 --- a/src/core/components/parameter-row.jsx +++ b/src/core/components/parameter-row.jsx @@ -1,7 +1,7 @@ -import React, { Component, PropTypes } from "react" +import React, { Component } from "react" +import PropTypes from "prop-types" import win from "core/window" - export default class ParameterRow extends Component { static propTypes = { onChange: PropTypes.func.isRequired, diff --git a/src/core/components/parameters.jsx b/src/core/components/parameters.jsx index a1659849..b85cc8ab 100644 --- a/src/core/components/parameters.jsx +++ b/src/core/components/parameters.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from "react" +import React, { Component } from "react" +import PropTypes from "prop-types" import ImPropTypes from "react-immutable-proptypes" import Im from "immutable" diff --git a/src/core/components/providers/markdown.jsx b/src/core/components/providers/markdown.jsx index 8ebce12c..ff29f021 100644 --- a/src/core/components/providers/markdown.jsx +++ b/src/core/components/providers/markdown.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" import Remarkable from "react-remarkable" import sanitize from "sanitize-html" diff --git a/src/core/components/response-body.jsx b/src/core/components/response-body.jsx index 45f8e90c..b933eb70 100644 --- a/src/core/components/response-body.jsx +++ b/src/core/components/response-body.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" import { formatXml } from "core/utils" import lowerCase from "lodash/lowerCase" diff --git a/src/core/components/response.jsx b/src/core/components/response.jsx index 227ce43a..b63c8d7b 100644 --- a/src/core/components/response.jsx +++ b/src/core/components/response.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" import { fromJS } from "immutable" import { getSampleSchema } from "core/utils" diff --git a/src/core/components/responses.jsx b/src/core/components/responses.jsx index 8bbe4f0f..f32e7a1f 100644 --- a/src/core/components/responses.jsx +++ b/src/core/components/responses.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" import { fromJS } from "immutable" import { defaultStatusCode } from "core/utils" diff --git a/src/core/components/schemes.jsx b/src/core/components/schemes.jsx index 21d954f0..4742e691 100644 --- a/src/core/components/schemes.jsx +++ b/src/core/components/schemes.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" export default class Schemes extends React.Component { diff --git a/src/core/components/try-it-out-button.jsx b/src/core/components/try-it-out-button.jsx index aa2b4da2..e2b66294 100644 --- a/src/core/components/try-it-out-button.jsx +++ b/src/core/components/try-it-out-button.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" export default class TryItOutButton extends React.Component { diff --git a/src/core/json-schema-components.js b/src/core/json-schema-components.js index b7795f15..bf4ae514 100644 --- a/src/core/json-schema-components.js +++ b/src/core/json-schema-components.js @@ -1,4 +1,5 @@ -import React, { PropTypes, PureComponent, Component } from "react" +import React, { PureComponent, Component } from "react" +import PropTypes from "prop-types" import { List, fromJS } from "immutable" //import "less/json-schema-form" diff --git a/src/core/plugins/split-pane-mode/components/split-pane-mode.jsx b/src/core/plugins/split-pane-mode/components/split-pane-mode.jsx index 74190445..73f2acbc 100644 --- a/src/core/plugins/split-pane-mode/components/split-pane-mode.jsx +++ b/src/core/plugins/split-pane-mode/components/split-pane-mode.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" import SplitPane from "react-split-pane" import "./split-pane-mode.less" @@ -23,9 +24,13 @@ export default class SplitPaneMode extends React.Component { children: [], }; + initializeComponent = (c) => { + this.splitPane = c + } + onDragFinished = () => { let { threshold, layoutActions } = this.props - let { position, draggedSize } = this.refs.splitPane.state + let { position, draggedSize } = this.splitPane.state this.draggedSize = draggedSize let nearLeftEdge = position <= threshold @@ -62,7 +67,7 @@ export default class SplitPaneMode extends React.Component { return ( } // Render try/catch wrapper -const createClass = component => React.createClass({ +const createClass = component => class extends Component { render() { return component(this.props) } -}) +} const Fallback = ({ name }) =>
PropTypes.shape( diff --git a/src/core/system.js b/src/core/system.js index 551b7ca1..24c7523a 100644 --- a/src/core/system.js +++ b/src/core/system.js @@ -240,7 +240,7 @@ export default class Store { action = {type: NEW_THROWN_ERR, error: true, payload: serializeError(e) } } finally{ - return action + return action // eslint-disable-line no-unsafe-finally } } diff --git a/src/core/utils.js b/src/core/utils.js index 1412c344..2131e8d2 100644 --- a/src/core/utils.js +++ b/src/core/utils.js @@ -343,7 +343,7 @@ export function highlight (el) { while (![ 1, // 0: whitespace // 1: operator or braces - /[\/{}[(\-+*=<>:;|\\.,?!&@~]/[test](chr), + /[\/{}[(\-+*=<>:;|\\.,?!&@~]/[test](chr), // eslint-disable-line no-useless-escape /[\])]/[test](chr), // 2: closing brace /[$\w]/[test](chr), // 3: (key)word chr == "/" && // 4: regex diff --git a/src/plugins/topbar/topbar.jsx b/src/plugins/topbar/topbar.jsx index 88da133c..11b5c7eb 100644 --- a/src/plugins/topbar/topbar.jsx +++ b/src/plugins/topbar/topbar.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" //import "./topbar.less" import Logo from "./logo_small.png" diff --git a/src/standalone/layout.jsx b/src/standalone/layout.jsx index 0652555e..20ca50d1 100644 --- a/src/standalone/layout.jsx +++ b/src/standalone/layout.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react" +import React from "react" +import PropTypes from "prop-types" export default class StandaloneLayout extends React.Component { diff --git a/test/core/plugins/err/transformers/parameter-oneof.js b/test/core/plugins/err/transformers/parameter-oneof.js index f44cd792..604ab42d 100644 --- a/test/core/plugins/err/transformers/parameter-oneof.js +++ b/test/core/plugins/err/transformers/parameter-oneof.js @@ -1,3 +1,4 @@ +/* eslint-disable no-useless-escape */ import expect from "expect" import { fromJS } from "immutable" import { transform } from "corePlugins/err/error-transformers/transformers/parameter-oneof"