feat(bundle): update cloudapi-gql dependency

This commit is contained in:
Sérgio Ramos 2018-02-26 16:42:25 +00:00
parent 99374a8170
commit 1a8a91e41e
33 changed files with 73 additions and 72 deletions

View File

@ -14,7 +14,7 @@
"dependencies": { "dependencies": {
"brok": "^2.0.0", "brok": "^2.0.0",
"brule": "^3.1.0", "brule": "^3.1.0",
"cloudapi-gql": "^4.6.0", "cloudapi-gql": "^6.1.0",
"hapi": "^17.2.0", "hapi": "^17.2.0",
"hapi-triton-auth": "^1.0.0", "hapi-triton-auth": "^1.0.0",
"inert": "^5.1.0", "inert": "^5.1.0",

View File

@ -1,5 +1,3 @@
const path = require('path');
const { SSR } = process.env; const { SSR } = process.env;
const aliases = {}; const aliases = {};

View File

@ -10,7 +10,7 @@ const { default: createStore } = require('./state/redux-store');
const indexFile = path.join(__dirname, '../../build/index.html'); const indexFile = path.join(__dirname, '../../build/index.html');
const getState = request => { const getState = request => {
const { req, res } = request.raw; const { req } = request.raw;
const _font = get(theme, 'font.href', () => ''); const _font = get(theme, 'font.href', () => '');
const _mono = get(theme, 'monoFont.href', () => ''); const _mono = get(theme, 'monoFont.href', () => '');

View File

@ -1,5 +1,3 @@
const path = require('path');
const { SSR } = process.env; const { SSR } = process.env;
const aliases = {}; const aliases = {};

View File

@ -10,7 +10,7 @@ const { default: createStore } = require('./state/redux-store');
const indexFile = path.join(__dirname, '../../build/index.html'); const indexFile = path.join(__dirname, '../../build/index.html');
const getState = request => { const getState = request => {
const { req, res } = request.raw; const { req } = request.raw;
const _font = get(theme, 'font.href', () => ''); const _font = get(theme, 'font.href', () => '');
const _mono = get(theme, 'monoFont.href', () => ''); const _mono = get(theme, 'monoFont.href', () => '');

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 20 KiB

View File

@ -21,7 +21,6 @@ import {
Card Card
} from 'joyent-ui-toolkit'; } from 'joyent-ui-toolkit';
const Version = styled(Select)` const Version = styled(Select)`
min-width: 100%; min-width: 100%;
width: ${remcalc(144)}; width: ${remcalc(144)};

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

View File

@ -142,7 +142,9 @@ export default withTheme(
small small
icon icon
> >
<Padding top={0.5}><InstanceTypeIcon /></Padding> <Padding top={0.5}>
<InstanceTypeIcon />
</Padding>
</Button> </Button>
<SmallOnly> <SmallOnly>
<Button <Button

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

View File

@ -20,34 +20,45 @@ import Description from '@components/description';
import imageData from '@data/images-map.json'; import imageData from '@data/images-map.json';
import GetImages from '@graphql/get-images.gql'; import GetImages from '@graphql/get-images.gql';
const HarcodedImage = image => ( const HarcodedImage = (image = {}) => (
<Fragment> <Fragment>
<Title icon={<InstanceTypeIcon />} collapsed={false}> <Title icon={<InstanceTypeIcon />} collapsed={false}>
Instance type and image Instance type and image
</Title> </Title>
<Margin bottom={7}> {image.id ? (
<Preview {...image} /> <ReduxForm
</Margin> form="create-instance-image"
destroyOnUnmount={false}
forceUnregisterOnUnmount={true}
initialValues={{ image: image.id }}
>
{props => (
<Margin bottom={7}>
<Preview {...image} />
</Margin>
)}
</ReduxForm>
) : null}
</Fragment> </Fragment>
); );
const ImageContainer = ({ const ImageContainer = ({
expanded, expanded,
proceeded, proceeded,
queryImage, hardcoded,
image = {}, image = {},
handleNext, handleNext,
handleEdit, handleEdit,
handleSelectLatest, handleSelectLatest,
setImageType,
loading, loading,
images, images,
vms, vms,
step, step
setImageType
}) => }) =>
queryImage ? ( hardcoded ? (
<Fragment> <Fragment>
<HarcodedImage {...queryImage} /> <HarcodedImage {...image} />
</Fragment> </Fragment>
) : ( ) : (
<Fragment> <Fragment>
@ -93,7 +104,8 @@ const ImageContainer = ({
</Fragment> </Fragment>
) : image.id ? ( ) : image.id ? (
<Preview {...image} /> <Preview {...image} />
) : null} ) : null
}
</ReduxForm> </ReduxForm>
{expanded ? ( {expanded ? (
<Margin top={1} bottom={7}> <Margin top={1} bottom={7}>
@ -135,8 +147,9 @@ export default compose(
return history.push(`/~create/package${history.location.search}`); return history.push(`/~create/package${history.location.search}`);
}, },
handleEdit: () => handleEdit: () => {
history.push(`/~create/image${history.location.search}`), return history.push(`/~create/image${history.location.search}`);
},
handleSelectLatest: ({ versions }) => { handleSelectLatest: ({ versions }) => {
const id = versions[0].id; const id = versions[0].id;
return dispatch(change('create-instance-image', 'image', id)); return dispatch(change('create-instance-image', 'image', id));
@ -154,9 +167,13 @@ export default compose(
const { image = '', query } = ownProps; const { image = '', query } = ownProps;
const { loading = false, images = [] } = data; const { loading = false, images = [] } = data;
const queryImage = query.image if (query.image) {
? find(images, ['name', query.image]) return {
: null; loading,
image: find(images, ['name', query.image], {}),
hardcoded: true
};
}
const values = images const values = images
.reduce((acc, img) => { .reduce((acc, img) => {
@ -211,7 +228,6 @@ export default compose(
return { return {
loading, loading,
images: values, images: values,
queryImage,
image: { image: {
...selected, ...selected,
isVm: !includes(selected.type || '', 'DATASET') isVm: !includes(selected.type || '', 'DATASET')

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

View File

@ -62,7 +62,8 @@ class ValueTextareaField extends PureComponent {
React.createElement(editor, { React.createElement(editor, {
...props, ...props,
mode: 'sh' mode: 'sh'
})} })
}
/> />
) : ( ) : (
<Textarea monospace resize="vertical" disabled={submitting} fluid /> <Textarea monospace resize="vertical" disabled={submitting} fluid />
@ -212,13 +213,13 @@ export const KeyValue = ({
{initialValues.name ? ( {initialValues.name ? (
<Fragment> <Fragment>
{expanded ? ( {expanded ? (
<span>{`${initialValues.name}${type === 'metadata' <span>{`${initialValues.name}${
? '—' type === 'metadata' ? '—' : ':'
: ':'}`}</span> }`}</span>
) : ( ) : (
<Bold>{`${initialValues.name}${type === 'metadata' <Bold>{`${initialValues.name}${
? '—' type === 'metadata' ? '—' : ':'
: ':'}`}</Bold> }`}</Bold>
)} )}
<span>{initialValues.value}</span> <span>{initialValues.value}</span>
</Fragment> </Fragment>

View File

@ -579,7 +579,7 @@ apr-main@^4.0.2, apr-main@^4.0.3:
dependencies: dependencies:
is-promise "^2.1.0" is-promise "^2.1.0"
apr-map@^3.0.2, apr-map@^3.0.3: apr-map@3.x.x, apr-map@^3.0.2, apr-map@^3.0.3:
version "3.0.3" version "3.0.3"
resolved "https://registry.yarnpkg.com/apr-map/-/apr-map-3.0.3.tgz#2bf91e9aeb18794bc95631311d6e94741ef16dc2" resolved "https://registry.yarnpkg.com/apr-map/-/apr-map-3.0.3.tgz#2bf91e9aeb18794bc95631311d6e94741ef16dc2"
dependencies: dependencies:
@ -1929,13 +1929,13 @@ boom@6.x.x:
dependencies: dependencies:
hoek "5.x.x" hoek "5.x.x"
boom@7.1.x, boom@7.x.x, boom@^7.1.1: boom@7.1.x, boom@7.x.x:
version "7.1.1" version "7.1.1"
resolved "https://registry.yarnpkg.com/boom/-/boom-7.1.1.tgz#50392a4e3417e971f1ad28622c20e832275260bb" resolved "https://registry.yarnpkg.com/boom/-/boom-7.1.1.tgz#50392a4e3417e971f1ad28622c20e832275260bb"
dependencies: dependencies:
hoek "5.x.x" hoek "5.x.x"
bounce@1.2.x, bounce@1.x.x, bounce@^1.2.0: bounce@1.2.x, bounce@1.x.x:
version "1.2.0" version "1.2.0"
resolved "https://registry.yarnpkg.com/bounce/-/bounce-1.2.0.tgz#e3bac68c73fd256e38096551efc09f504873c8c8" resolved "https://registry.yarnpkg.com/bounce/-/bounce-1.2.0.tgz#e3bac68c73fd256e38096551efc09f504873c8c8"
dependencies: dependencies:
@ -2542,25 +2542,21 @@ clone@^1.0.2:
version "1.0.3" version "1.0.3"
resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f" resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f"
cloudapi-gql@^4.6.0: cloudapi-gql@^6.1.0:
version "4.6.0" version "6.1.0"
resolved "https://registry.yarnpkg.com/cloudapi-gql/-/cloudapi-gql-4.6.0.tgz#2b8a03d38003c230a222042366d7ec26c492fcbb" resolved "https://registry.yarnpkg.com/cloudapi-gql/-/cloudapi-gql-6.1.0.tgz#898da3ab7684b8378eb79c5aa42073b0465318e8"
dependencies: dependencies:
apr-map "^3.0.3" apr-map "3.x.x"
boom "^7.1.1" boom "7.x.x"
bounce "^1.2.0" bounce "1.x.x"
constant-case "^2.0.0" force-array "3.1.x"
force-array "^3.1.0" fwrule "1.4.x"
fwrule "^1.4.1" graphi "5.x.x"
graphi "^5.3.0" graphql-tools "2.21.x"
graphql-tools "^2.19.0" hasha "3.0.x"
hasha "^3.0.0" lodash.uniq "4.5.x"
lodash.isundefined "^3.0.1" sentiment "4.2.x"
lodash.uniq "^4.5.0" wreck "14.x.x"
random-int "^1.0.0"
reach "^1.0.0"
sentiment "^4.2.0"
wreck "^14.0.2"
cmd-shim@^2.0.2: cmd-shim@^2.0.2:
version "2.0.2" version "2.0.2"
@ -4235,11 +4231,10 @@ esquery@^1.0.0:
estraverse "^4.0.0" estraverse "^4.0.0"
esrecurse@^4.1.0: esrecurse@^4.1.0:
version "4.2.0" version "4.2.1"
resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.0.tgz#fa9568d98d3823f9a41d91e902dcab9ea6e5b163" resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
dependencies: dependencies:
estraverse "^4.1.0" estraverse "^4.1.0"
object-assign "^4.0.1"
estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
version "4.2.0" version "4.2.0"
@ -4728,7 +4723,7 @@ for-own@^0.1.4:
dependencies: dependencies:
for-in "^1.0.1" for-in "^1.0.1"
force-array@^3.1.0: force-array@3.1.x, force-array@^3.1.0:
version "3.1.0" version "3.1.0"
resolved "https://registry.yarnpkg.com/force-array/-/force-array-3.1.0.tgz#a060f6d4188dc7daa6fe562df39aeaabca404784" resolved "https://registry.yarnpkg.com/force-array/-/force-array-3.1.0.tgz#a060f6d4188dc7daa6fe562df39aeaabca404784"
dependencies: dependencies:
@ -4866,7 +4861,7 @@ fuse.js@^3.2.0:
version "3.2.0" version "3.2.0"
resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-3.2.0.tgz#f0448e8069855bf2a3e683cdc1d320e7e2a07ef4" resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-3.2.0.tgz#f0448e8069855bf2a3e683cdc1d320e7e2a07ef4"
fwrule@^1.4.1: fwrule@1.4.x:
version "1.4.1" version "1.4.1"
resolved "https://registry.yarnpkg.com/fwrule/-/fwrule-1.4.1.tgz#41f24a1d9eac22b8cf20c65dd9dab4240ad11a1f" resolved "https://registry.yarnpkg.com/fwrule/-/fwrule-1.4.1.tgz#41f24a1d9eac22b8cf20c65dd9dab4240ad11a1f"
dependencies: dependencies:
@ -5129,7 +5124,7 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.4,
version "4.1.11" version "4.1.11"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
graphi@^5.3.0: graphi@5.x.x:
version "5.3.2" version "5.3.2"
resolved "https://registry.yarnpkg.com/graphi/-/graphi-5.3.2.tgz#ec427db244f576845163dd30dff780366d18933d" resolved "https://registry.yarnpkg.com/graphi/-/graphi-5.3.2.tgz#ec427db244f576845163dd30dff780366d18933d"
dependencies: dependencies:
@ -5170,7 +5165,7 @@ graphql-tag@^2.6.1, graphql-tag@^2.7.3, graphql-tag@^2.8.0:
version "2.8.0" version "2.8.0"
resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.8.0.tgz#52cdea07a842154ec11a2e840c11b977f9b835ce" resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.8.0.tgz#52cdea07a842154ec11a2e840c11b977f9b835ce"
graphql-tools@^2.19.0: graphql-tools@2.21.x:
version "2.21.0" version "2.21.0"
resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-2.21.0.tgz#c0d0fbda6f40a87c8d267a2989ade2ae8b9a288e" resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-2.21.0.tgz#c0d0fbda6f40a87c8d267a2989ade2ae8b9a288e"
dependencies: dependencies:
@ -5366,7 +5361,7 @@ hash.js@^1.0.0, hash.js@^1.0.3:
inherits "^2.0.3" inherits "^2.0.3"
minimalistic-assert "^1.0.0" minimalistic-assert "^1.0.0"
hasha@^3.0.0: hasha@3.0.x:
version "3.0.0" version "3.0.0"
resolved "https://registry.yarnpkg.com/hasha/-/hasha-3.0.0.tgz#52a32fab8569d41ca69a61ff1a214f8eb7c8bd39" resolved "https://registry.yarnpkg.com/hasha/-/hasha-3.0.0.tgz#52a32fab8569d41ca69a61ff1a214f8eb7c8bd39"
dependencies: dependencies:
@ -7130,7 +7125,7 @@ lodash.templatesettings@^4.0.0:
dependencies: dependencies:
lodash._reinterpolate "~3.0.0" lodash._reinterpolate "~3.0.0"
lodash.uniq@^4.5.0: lodash.uniq@4.5.x, lodash.uniq@^4.5.0:
version "4.5.0" version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
@ -8969,10 +8964,6 @@ raf@3.4.0:
dependencies: dependencies:
performance-now "^2.1.0" performance-now "^2.1.0"
random-int@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/random-int/-/random-int-1.0.0.tgz#e6a2ed3448ac9c6646a0657443b1c1521592ed08"
random-integral@^1.0.3: random-integral@^1.0.3:
version "1.0.3" version "1.0.3"
resolved "https://registry.yarnpkg.com/random-integral/-/random-integral-1.0.3.tgz#8ff3c117565c9a04b66ddd559f3aed29bd0f0f6c" resolved "https://registry.yarnpkg.com/random-integral/-/random-integral-1.0.3.tgz#8ff3c117565c9a04b66ddd559f3aed29bd0f0f6c"
@ -9030,10 +9021,6 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.1.7:
minimist "^1.2.0" minimist "^1.2.0"
strip-json-comments "~2.0.1" strip-json-comments "~2.0.1"
reach@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/reach/-/reach-1.0.0.tgz#4d12d160960bcac67dc624f0f91bafeb36f794f6"
react-apollo@^2.0.4: react-apollo@^2.0.4:
version "2.0.4" version "2.0.4"
resolved "https://registry.yarnpkg.com/react-apollo/-/react-apollo-2.0.4.tgz#01dd32a8e388672f5d7385b21cdd0b94009ee9ee" resolved "https://registry.yarnpkg.com/react-apollo/-/react-apollo-2.0.4.tgz#01dd32a8e388672f5d7385b21cdd0b94009ee9ee"
@ -10253,7 +10240,7 @@ send@0.16.1:
range-parser "~1.2.0" range-parser "~1.2.0"
statuses "~1.3.1" statuses "~1.3.1"
sentiment@^4.2.0: sentiment@4.2.x:
version "4.2.0" version "4.2.0"
resolved "https://registry.yarnpkg.com/sentiment/-/sentiment-4.2.0.tgz#02e3e59972d754e81d427f7a3a8c25b43ed8d4f0" resolved "https://registry.yarnpkg.com/sentiment/-/sentiment-4.2.0.tgz#02e3e59972d754e81d427f7a3a8c25b43ed8d4f0"
@ -12061,7 +12048,7 @@ wrappy@1:
version "1.0.2" version "1.0.2"
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
wreck@14.0.x, wreck@14.x.x, wreck@^14.0.2: wreck@14.0.x, wreck@14.x.x:
version "14.0.2" version "14.0.2"
resolved "https://registry.yarnpkg.com/wreck/-/wreck-14.0.2.tgz#89c17a9061c745ed1c3aebcb66ea181dbaab454c" resolved "https://registry.yarnpkg.com/wreck/-/wreck-14.0.2.tgz#89c17a9061c745ed1c3aebcb66ea181dbaab454c"
dependencies: dependencies: