From 19b117643549715d8709c081b7abce8151d080b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=CC=81rgio=20Ramos?= Date: Thu, 7 Sep 2017 16:29:41 +0100 Subject: [PATCH] style: lint --- .../src/components/manifest/files.js | 9 ++--- .../src/components/manifest/name.js | 6 ++-- .../src/containers/manifest/edit-or-create.js | 13 ++++--- packages/cp-frontend/src/state/selectors.js | 11 +++--- .../test/unit/components/manifest/files.js | 1 - .../test/unit/components/manifest/manifest.js | 34 +++++++++---------- .../test/unit/containers/services/topology.js | 1 - packages/cp-gql-mock-server/src/resolvers.js | 1 - packages/remcalc/.eslintignore | 3 +- packages/rnd-id/.eslintignore | 3 +- packages/ui-toolkit/src/card/description.js | 2 +- packages/ui-toolkit/src/card/header.js | 2 +- packages/ui-toolkit/src/card/subtitle.js | 2 +- packages/ui-toolkit/src/card/title.js | 2 +- packages/ui-toolkit/src/form/meta.js | 1 - packages/ui-toolkit/src/tooltip/tooltip.js | 3 +- packages/ui-toolkit/src/topology/node/info.js | 5 +-- 17 files changed, 46 insertions(+), 53 deletions(-) diff --git a/packages/cp-frontend/src/components/manifest/files.js b/packages/cp-frontend/src/components/manifest/files.js index e9189828..9064273b 100644 --- a/packages/cp-frontend/src/components/manifest/files.js +++ b/packages/cp-frontend/src/components/manifest/files.js @@ -4,12 +4,7 @@ import styled from 'styled-components'; import remcalc from 'remcalc'; import { EEditor } from './editors'; -import { - FormGroup, - Input, - Button, - Card -} from 'joyent-ui-toolkit'; +import { FormGroup, Input, Button, Card } from 'joyent-ui-toolkit'; const FilenameContainer = styled.span` display: flex; @@ -96,4 +91,4 @@ const Files = ({ files, onAddFile, onRemoveFile, readOnly }) => { ); }; -export default Files; \ No newline at end of file +export default Files; diff --git a/packages/cp-frontend/src/components/manifest/name.js b/packages/cp-frontend/src/components/manifest/name.js index b7058b73..219dd82b 100644 --- a/packages/cp-frontend/src/components/manifest/name.js +++ b/packages/cp-frontend/src/components/manifest/name.js @@ -1,4 +1,7 @@ import React from 'react'; +import { Row, Col } from 'react-styled-flexboxgrid'; +import remcalc from 'remcalc'; + import { FormMeta, Button, @@ -7,9 +10,6 @@ import { Small, FormGroup } from 'joyent-ui-toolkit'; -import { Row, Col } from 'react-styled-flexboxgrid'; -import remcalc from 'remcalc'; -import { Field } from 'redux-form'; const ButtonsRow = Row.extend`margin: ${remcalc(29)} 0 ${remcalc(60)} 0;`; diff --git a/packages/cp-frontend/src/containers/manifest/edit-or-create.js b/packages/cp-frontend/src/containers/manifest/edit-or-create.js index 8cb9b44e..5024974d 100644 --- a/packages/cp-frontend/src/containers/manifest/edit-or-create.js +++ b/packages/cp-frontend/src/containers/manifest/edit-or-create.js @@ -20,12 +20,7 @@ import DeploymentGroupConfigQuery from '@graphql/DeploymentGroupConfig.gql'; import { client } from '@state/store'; import { ErrorMessage } from '@components/messaging'; -import { - Environment, - Name, - Review, - Manifest -} from '@components/manifest'; +import { Environment, Name, Review, Manifest } from '@components/manifest'; const INTERPOLATE_REGEX = /\$([_a-z][_a-z0-9]*)/gi; @@ -405,7 +400,11 @@ class DeploymentGroupEditOrCreate extends Component { const { dataCenter } = this.props; return ( - + ); } diff --git a/packages/cp-frontend/src/state/selectors.js b/packages/cp-frontend/src/state/selectors.js index 5f6e27ad..2fe6f51c 100644 --- a/packages/cp-frontend/src/state/selectors.js +++ b/packages/cp-frontend/src/state/selectors.js @@ -177,11 +177,12 @@ const processServicesForTopology = services => { // metricsData should prob be an array rather than an object const processInstancesMetrics = instances => forceArray(instances).reduce((metrics, instance) => { - instance.metrics && instance.metrics.forEach(instanceMetrics => { - metrics[instanceMetrics.name] = forceArray( - metrics[instanceMetrics.name] - ).concat([instanceMetrics]); - }); + instance.metrics && + instance.metrics.forEach(instanceMetrics => { + metrics[instanceMetrics.name] = forceArray( + metrics[instanceMetrics.name] + ).concat([instanceMetrics]); + }); return metrics; }, {}); diff --git a/packages/cp-frontend/test/unit/components/manifest/files.js b/packages/cp-frontend/test/unit/components/manifest/files.js index 25ff3e38..ed8a415b 100644 --- a/packages/cp-frontend/test/unit/components/manifest/files.js +++ b/packages/cp-frontend/test/unit/components/manifest/files.js @@ -9,7 +9,6 @@ import { Store, files } from '../../mocks'; import { Files } from '@components/manifest'; - it('renders without throwing', () => { const tree = renderer .create( diff --git a/packages/cp-frontend/test/unit/components/manifest/manifest.js b/packages/cp-frontend/test/unit/components/manifest/manifest.js index c06c385b..354b7311 100644 --- a/packages/cp-frontend/test/unit/components/manifest/manifest.js +++ b/packages/cp-frontend/test/unit/components/manifest/manifest.js @@ -32,15 +32,15 @@ it('renders without throwing', () => { it('renders without throwing', () => { const renderer = new ShallowRenderer(); renderer.render( - - {}} - onCancel={() => {}} - loading - /> - - ) + + {}} + onCancel={() => {}} + loading + /> + + ); const tree = renderer.getRenderOutput(); expect(tree).toMatchSnapshot(); }); @@ -48,14 +48,14 @@ it('renders without throwing', () => { it('renders without throwing', () => { const renderer = new ShallowRenderer(); renderer.render( - - {}} - onCancel={() => {}} - /> - - ) + + {}} + onCancel={() => {}} + /> + + ); const tree = renderer.getRenderOutput(); expect(tree).toMatchSnapshot(); }); \ No newline at end of file diff --git a/packages/cp-frontend/test/unit/containers/services/topology.js b/packages/cp-frontend/test/unit/containers/services/topology.js index b57ac36c..7f7fc4c9 100644 --- a/packages/cp-frontend/test/unit/containers/services/topology.js +++ b/packages/cp-frontend/test/unit/containers/services/topology.js @@ -9,7 +9,6 @@ import 'jest-styled-components'; import { ServicesTopology } from '@containers/services/topology.js'; import { Router, Store, services } from '../../mocks'; - it('renders without throwing', () => { const tree = renderer .create( diff --git a/packages/cp-gql-mock-server/src/resolvers.js b/packages/cp-gql-mock-server/src/resolvers.js index a7cd473e..e7534597 100644 --- a/packages/cp-gql-mock-server/src/resolvers.js +++ b/packages/cp-gql-mock-server/src/resolvers.js @@ -8,7 +8,6 @@ const buildArray = require('build-array'); const forceArray = require('force-array'); const lfind = require('lodash.find'); const findIndex = require('lodash.findindex'); -const flatten = require('lodash.flatten'); const uniq = require('lodash.uniq'); const yaml = require('js-yaml'); const hasha = require('hasha'); diff --git a/packages/remcalc/.eslintignore b/packages/remcalc/.eslintignore index 2b7cecf7..fd5c1106 100644 --- a/packages/remcalc/.eslintignore +++ b/packages/remcalc/.eslintignore @@ -1,2 +1,3 @@ .nyc_output -coverage \ No newline at end of file +coverage +dist diff --git a/packages/rnd-id/.eslintignore b/packages/rnd-id/.eslintignore index 2b7cecf7..6db80622 100644 --- a/packages/rnd-id/.eslintignore +++ b/packages/rnd-id/.eslintignore @@ -1,2 +1,3 @@ .nyc_output -coverage \ No newline at end of file +coverage +dist \ No newline at end of file diff --git a/packages/ui-toolkit/src/card/description.js b/packages/ui-toolkit/src/card/description.js index 89e0eeaa..d52859b4 100644 --- a/packages/ui-toolkit/src/card/description.js +++ b/packages/ui-toolkit/src/card/description.js @@ -1,7 +1,7 @@ import { Subscriber } from 'react-broadcast'; import Baseline from '../baseline'; import typography from '../typography'; -import is, { isNot } from 'styled-is'; +import { isNot } from 'styled-is'; import remcalc from 'remcalc'; import styled from 'styled-components'; import PropTypes from 'prop-types'; diff --git a/packages/ui-toolkit/src/card/header.js b/packages/ui-toolkit/src/card/header.js index 3c8336fe..8c4824b9 100644 --- a/packages/ui-toolkit/src/card/header.js +++ b/packages/ui-toolkit/src/card/header.js @@ -2,7 +2,7 @@ import React from 'react'; import { Broadcast, Subscriber } from 'react-broadcast'; import remcalc from 'remcalc'; import PropTypes from 'prop-types'; -import is, { isNot } from 'styled-is'; +import { isNot } from 'styled-is'; import Baseline from '../baseline'; import Card from './card'; diff --git a/packages/ui-toolkit/src/card/subtitle.js b/packages/ui-toolkit/src/card/subtitle.js index f4457555..b1ace3d3 100644 --- a/packages/ui-toolkit/src/card/subtitle.js +++ b/packages/ui-toolkit/src/card/subtitle.js @@ -3,7 +3,7 @@ import styled from 'styled-components'; import Baseline from '../baseline'; import typography from '../typography'; import remcalc from 'remcalc'; -import is, { isNot } from 'styled-is'; +import is from 'styled-is'; import PropTypes from 'prop-types'; import Title from './title'; import React from 'react'; diff --git a/packages/ui-toolkit/src/card/title.js b/packages/ui-toolkit/src/card/title.js index 7dec5a1f..66e18dad 100644 --- a/packages/ui-toolkit/src/card/title.js +++ b/packages/ui-toolkit/src/card/title.js @@ -3,7 +3,7 @@ import isString from 'lodash.isstring'; import typography from '../typography'; import Baseline from '../baseline'; import remcalc from 'remcalc'; -import is, { isNot } from 'styled-is'; +import is from 'styled-is'; import styled from 'styled-components'; import PropTypes from 'prop-types'; import React from 'react'; diff --git a/packages/ui-toolkit/src/form/meta.js b/packages/ui-toolkit/src/form/meta.js index 07224769..24d49b82 100644 --- a/packages/ui-toolkit/src/form/meta.js +++ b/packages/ui-toolkit/src/form/meta.js @@ -1,7 +1,6 @@ import { Subscriber } from 'react-broadcast'; import is from 'styled-is'; import Baseline from '../baseline'; -import breakpoints from '../breakpoints'; import Label from '../label'; import PropTypes from 'prop-types'; import React from 'react'; diff --git a/packages/ui-toolkit/src/tooltip/tooltip.js b/packages/ui-toolkit/src/tooltip/tooltip.js index be120df6..269855d3 100644 --- a/packages/ui-toolkit/src/tooltip/tooltip.js +++ b/packages/ui-toolkit/src/tooltip/tooltip.js @@ -92,8 +92,7 @@ class Tooltip extends Component { left = 'auto', bottom = 'auto', right = 'auto', - secondary, - ...rest + secondary } = this.props; if (typeof top === 'number') { diff --git a/packages/ui-toolkit/src/topology/node/info.js b/packages/ui-toolkit/src/topology/node/info.js index 1796463c..fee82e56 100644 --- a/packages/ui-toolkit/src/topology/node/info.js +++ b/packages/ui-toolkit/src/topology/node/info.js @@ -6,7 +6,7 @@ import Baseline from '../../baseline'; import InstancesIcon from './icon-instances.svg'; import { Point } from '../prop-types'; import { GraphText } from './shapes'; -import { HealthyIcon, UnhealthyIcon } from '../../icons'; +import { HealthyIcon } from '../../icons'; const StyledInstancesIcon = styled(InstancesIcon)` fill: ${props => props.theme.white}; @@ -61,7 +61,8 @@ const GraphNodeInfo = ({ data, pos }) => { const healthy = (