From c15d7ae0207b2b21d2dab9b503f80295a2a2eaf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=CC=81rgio=20Ramos?= Date: Fri, 13 Oct 2017 21:02:58 +0100 Subject: [PATCH] style: lint --- packages/cloudapi-gql/src/api/machines.js | 6 ++--- .../containers/instances/create-snapshot.js | 26 +++++++++---------- .../src/containers/instances/resize.js | 1 - packages/ui-toolkit/src/breadcrumb/index.js | 4 --- packages/ui-toolkit/src/card/info.js | 1 - packages/ui-toolkit/src/form/toggle.js | 2 +- packages/ui-toolkit/styleguide.config.js | 2 +- packages/ui-toolkit/test/start.js | 2 +- yarn.lock | 18 ++++++------- 9 files changed, 28 insertions(+), 34 deletions(-) diff --git a/packages/cloudapi-gql/src/api/machines.js b/packages/cloudapi-gql/src/api/machines.js index aaa3d6b4..0eb6ea91 100644 --- a/packages/cloudapi-gql/src/api/machines.js +++ b/packages/cloudapi-gql/src/api/machines.js @@ -35,9 +35,9 @@ module.exports.start = uuid => request('startMachine', uuid); module.exports.startFromSnapshot = ctx => request('startMachineFromSnapshot', ctx); module.exports.reboot = ctx => request('rebootMachine', ctx); -(module.exports.resize = ({ id, package }) => - request.fetch(`/:login/machines/${id}?action=resize?package=${package}`)), - (module.exports.rename = ctx => request('', ctx)); +module.exports.resize = ({ id, ...rest }) => + request.fetch(`/:login/machines/${id}?action=resize?package=${rest.package}`); +module.exports.rename = ctx => request('', ctx); module.exports.destroy = ctx => request('deleteMachine', ctx); module.exports.audit = ({ id }) => request('machineAudit', id); diff --git a/packages/my-joy-beta/src/containers/instances/create-snapshot.js b/packages/my-joy-beta/src/containers/instances/create-snapshot.js index 7bbb1aaf..3568ea4c 100644 --- a/packages/my-joy-beta/src/containers/instances/create-snapshot.js +++ b/packages/my-joy-beta/src/containers/instances/create-snapshot.js @@ -34,20 +34,20 @@ const CreateSnapshot = ({ })(InstanceCreateSnapshot); const _error = error && - !instance && - !_loading && ( - - Ooops! - - An error occurred while loading your instance - - - ); + !instance && + !_loading && ( + + Ooops! + + An error occurred while loading your instance + + + ); const _form = !loading && - !_error && ( - - ); + !_error && ( + + ); return ( @@ -76,7 +76,7 @@ export default compose( connect( null, (dispatch, { history, location, instance, createSnapshot }) => ({ - handleCancel: () => history.push(location.pathname.split(/\/\~/).shift()), + handleCancel: () => history.push(location.pathname.split(/\/~/).shift()), handleSubmit: ({ name }) => createSnapshot({ variables: { name, id: instance.id } diff --git a/packages/my-joy-beta/src/containers/instances/resize.js b/packages/my-joy-beta/src/containers/instances/resize.js index 676f7bbc..2cd59ac7 100644 --- a/packages/my-joy-beta/src/containers/instances/resize.js +++ b/packages/my-joy-beta/src/containers/instances/resize.js @@ -17,7 +17,6 @@ import { import { Resize as InstanceResize } from '@components/instances'; import ListPackages from '@graphql/list-packages.gql'; -import ListInstances from '@graphql/list-instances.gql'; import GetInstance from '@graphql/get-instance.gql'; const Resize = ({ match, loading, error, instance, packages }) => { diff --git a/packages/ui-toolkit/src/breadcrumb/index.js b/packages/ui-toolkit/src/breadcrumb/index.js index 766e9a18..e49d23e3 100644 --- a/packages/ui-toolkit/src/breadcrumb/index.js +++ b/packages/ui-toolkit/src/breadcrumb/index.js @@ -1,13 +1,9 @@ import React from 'react'; -import forceArray from 'force-array'; import styled from 'styled-components'; import { Row, Col } from 'react-styled-flexboxgrid'; -import PropTypes from 'prop-types'; import remcalc from 'remcalc'; import View from '../layout/view-container'; -import Breadcrumb from './index'; -import Item from './item'; const Border = styled.div` border-bottom: solid ${remcalc(1)} ${props => props.theme.grey}; diff --git a/packages/ui-toolkit/src/card/info.js b/packages/ui-toolkit/src/card/info.js index 07ac6394..3f28fad8 100644 --- a/packages/ui-toolkit/src/card/info.js +++ b/packages/ui-toolkit/src/card/info.js @@ -1,4 +1,3 @@ -import React from 'react'; import PropTypes from 'prop-types'; import styled from 'styled-components'; import remcalc from 'remcalc'; diff --git a/packages/ui-toolkit/src/form/toggle.js b/packages/ui-toolkit/src/form/toggle.js index c889fef9..2d8d0732 100644 --- a/packages/ui-toolkit/src/form/toggle.js +++ b/packages/ui-toolkit/src/form/toggle.js @@ -7,7 +7,7 @@ import unitcalc from 'unitcalc'; import rndId from 'rnd-id'; import is from 'styled-is'; -import { bottomShadow, border, borderRadius } from '../boxes'; +import { border, borderRadius } from '../boxes'; import Baseline from '../baseline'; import BaseInput from './base/input'; import typography from '../typography'; diff --git a/packages/ui-toolkit/styleguide.config.js b/packages/ui-toolkit/styleguide.config.js index 259dee81..5d2ac759 100644 --- a/packages/ui-toolkit/styleguide.config.js +++ b/packages/ui-toolkit/styleguide.config.js @@ -1,7 +1,7 @@ const webpackConfig = require('react-scripts/config/webpack.config.dev.js'); const { defaultHandlers } = require('react-docgen'); const dnHandler = require('react-docgen-displayname-handler'); -const snapguidist = require('snapguidist'); +// const snapguidist = require('snapguidist'); const path = require('path'); module.exports = { diff --git a/packages/ui-toolkit/test/start.js b/packages/ui-toolkit/test/start.js index 72dda791..ff164899 100644 --- a/packages/ui-toolkit/test/start.js +++ b/packages/ui-toolkit/test/start.js @@ -1,6 +1,6 @@ const http = require('http'); const serveStatic = require('serve-static'); -const jest = require('jest'); +// const jest = require('jest'); const serve = serveStatic('styleguide/'); const server = http.createServer((req, res) => { diff --git a/yarn.lock b/yarn.lock index 91cf6239..9245d47e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2934,8 +2934,8 @@ configstore@^3.0.0: xdg-basedir "^3.0.0" connect-history-api-fallback@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz#e51d17f8f0ef0db90a64fdb47de3051556e9f169" + version "1.4.0" + resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.4.0.tgz#3db24f973f4b923b0e82f619ce0df02411ca623d" console-browserify@^1.1.0: version "1.1.0" @@ -4268,8 +4268,8 @@ es-to-primitive@^1.1.1: is-symbol "^1.0.1" es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14: - version "0.10.31" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.31.tgz#7bb938c95a7f1b9f728092dc09c41edcc398eefe" + version "0.10.35" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.35.tgz#18ee858ce6a3c45c7d79e91c15fcca9ec568494f" dependencies: es6-iterator "~2.0.1" es6-symbol "~3.1.1" @@ -5829,8 +5829,8 @@ graphql-tools@^1.1.0: "@types/graphql" "^0.9.0" graphql-tools@^2.3.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-2.4.0.tgz#183d7e509e1ebd07d51db05fdeb181e7126f7ecb" + version "2.5.0" + resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-2.5.0.tgz#b072faf8e1d621550598a681c08504bae13b1904" dependencies: apollo-link "^0.7.0" deprecated-decorator "^0.1.6" @@ -8583,7 +8583,7 @@ moment@2.15.x: version "2.15.2" resolved "https://registry.yarnpkg.com/moment/-/moment-2.15.2.tgz#1bfdedf6a6e345f322fe956d5df5bd08a8ce84dc" -moment@2.x.x, moment@^2.10.6, moment@^2.19.0, moment@^2.6.0: +moment@2.x.x, moment@^2.10.6, moment@^2.19.0, moment@^2.19.1, moment@^2.6.0: version "2.19.1" resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.1.tgz#56da1a2d1cbf01d38b7e1afc31c10bcfa1929167" @@ -9881,8 +9881,8 @@ pretty-format@^21.2.1: ansi-styles "^3.2.0" private@^0.1.6, private@^0.1.7, private@~0.1.5: - version "0.1.7" - resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1" + version "0.1.8" + resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" process-nextick-args@~1.0.6: version "1.0.7"