diff --git a/packages/images/src/components/empty.js b/packages/images/src/components/empty.js new file mode 100644 index 00000000..213c7b92 --- /dev/null +++ b/packages/images/src/components/empty.js @@ -0,0 +1,29 @@ +import React from 'react'; +import styled from 'styled-components'; +import { Margin, Padding } from 'styled-components-spacing'; +import Flex from 'styled-flex-component'; + +import { H3, Card } from 'joyent-ui-toolkit'; +import { NoPackages } from 'joyent-logo-assets'; + +const NoPackagesTitle = styled(H3)` + color: ${props => props.theme.greyDark}; + text-align: center; +`; + +const FullWidthCard = styled(Card)` + width: 100%; +`; + +export default ({ children }) => ( + + + + + + + {children} + + + +); diff --git a/packages/images/src/components/image.js b/packages/images/src/components/image.js new file mode 100644 index 00000000..a6969c4d --- /dev/null +++ b/packages/images/src/components/image.js @@ -0,0 +1,124 @@ +import React, { Fragment } from 'react'; +import { Link } from 'react-router-dom'; +import styled from 'styled-components'; +import remcalc from 'remcalc'; +import { Field } from 'redux-form'; +import { + Card, + Anchor, + CardHeader, + Divider, + ActionsIcon, + PopoverTarget, + Popover, + PopoverItem, + PopoverDivider, + PopoverContainer, + Radio, + FormLabel, + FormGroup +} from 'joyent-ui-toolkit'; + +import Flex, { FlexItem } from 'styled-flex-component'; +import { Padding, Margin } from 'styled-components-spacing'; + +import { ImageType, OS } from '../constants'; + +const A = styled(Anchor)` + color: ${props => props.theme.text}; + text-decoration: none; + font-weight: ${props => props.theme.font.weight.semibold}; +`; + +export const Image = ({ name, os, version, type }) => ( + + + + + + + {React.createElement(OS[os], { + width: '24', + height: '24' + })} + + + {name} + + + + + + + + + {version} + + + + {ImageType[type]} + + + + + + + + + + {}}> + Create Instance + + + {}}> + Remove + + + + + + + +); + +export const Filters = () => ( + + + + + + All + + + + + + + + + Virtual machines + + + + + + + + + Infrastructure container + + + + + +); diff --git a/packages/images/src/components/summary.js b/packages/images/src/components/summary.js index 020549aa..14da739c 100644 --- a/packages/images/src/components/summary.js +++ b/packages/images/src/components/summary.js @@ -22,14 +22,7 @@ import { DotIcon } from 'joyent-ui-toolkit'; -import { - Linux, - Freebsd, - Illumos, - Smart, - Windows, - Placeholder -} from 'joyent-logo-assets'; +import { ImageType, OS } from '../constants'; const { SmallOnly, Medium } = QueryBreakpoints; @@ -51,14 +44,6 @@ const GreyLabel = styled(Label)` padding-right: ${remcalc(3)}; `; -const ImageType = { - ZONE_DATASET: 'Hardware Virtual Machine', - LX_DATASET: 'Infrastructure Container', - ZVOL: 'Hardware Virtual Machine', - DOCKER: 'Docker Container', - OTHER: 'Hardware Virtual Machine' -}; - const StateColor = { ACTIVE: 'green', UNACTIVATED: 'grey', @@ -67,15 +52,7 @@ const StateColor = { FAILED: 'red' }; -const OS = { - SMARTOS: Smart, - LINUX: Linux, - WINDOWS: Windows, - BSD: Freebsd, - ILLUMOS: Illumos, - OTHER: Placeholder -}; - +// eslint-disable-next-line camelcase export const Meta = ({ name, version, type, published_at, state, os }) => ( diff --git a/packages/images/src/constants.js b/packages/images/src/constants.js new file mode 100644 index 00000000..edb0ee96 --- /dev/null +++ b/packages/images/src/constants.js @@ -0,0 +1,24 @@ +import { + Linux, + Freebsd, + Illumos, + Smart, + Windows, + Placeholder +} from 'joyent-logo-assets'; + +export const ImageType = { + ZONE_DATASET: 'Hardware Virtual Machine', + LX_DATASET: 'Infrastructure Container', + ZVOL: 'Hardware Virtual Machine', + DOCKER: 'Docker Container', + OTHER: 'Hardware Virtual Machine' +}; +export const OS = { + SMARTOS: Smart, + LINUX: Linux, + WINDOWS: Windows, + BSD: Freebsd, + ILLUMOS: Illumos, + OTHER: Placeholder +}; diff --git a/packages/images/src/containers/create.js b/packages/images/src/containers/create.js index 61cba9c0..f5138a5b 100644 --- a/packages/images/src/containers/create.js +++ b/packages/images/src/containers/create.js @@ -1,3 +1,3 @@ import React from 'react'; -export default () => (

hello world

); \ No newline at end of file +export default () =>

hello world

; diff --git a/packages/images/src/containers/list.js b/packages/images/src/containers/list.js index d1288f7e..64253c9b 100644 --- a/packages/images/src/containers/list.js +++ b/packages/images/src/containers/list.js @@ -1,14 +1,17 @@ import React, { Fragment } from 'react'; import { compose, graphql } from 'react-apollo'; import ReduxForm from 'declarative-redux-form'; -import { Link } from 'react-router-dom'; import { Margin } from 'styled-components-spacing'; import remcalc from 'remcalc'; +import { Row, Col } from 'joyent-react-styled-flexboxgrid'; +import { connect } from 'react-redux'; +import get from 'lodash.get'; +import find from 'lodash.find'; +import Index from '@state/gen-index'; import { ViewContainer, Divider, - Anchor, StatusLoader, Message, MessageTitle, @@ -16,17 +19,30 @@ import { } from 'joyent-ui-toolkit'; import ToolbarForm from '@components/toolbar'; +import Empty from '@components/empty'; + +import { ImageType } from '../constants'; import ListImages from '@graphql/list-images.gql'; -// const TABLE_FORM_NAME = 'images-list-table'; +import { Image, Filters } from '@components/image'; + +const TOGGLE_FORM_NAME = 'images-list-toggle'; const MENU_FORM_NAME = 'images-list-menu'; -export const List = ({ images = [], loading = false, error = null }) => ( +export const List = ({ + images = [], + allImages = [], + loading = false, + error = null, + history +}) => ( - {props => } + {props => } + + {loading && !images.length ? ( @@ -43,15 +59,26 @@ export const List = ({ images = [], loading = false, error = null }) => ( ) : null} -
    - {images.map(({ name }) => ( -
  • - - {name} - -
  • - ))} -
+ + + + {props => (allImages.length ? : null)} + + + + {images.map(image => ( + + + + ))} + {!images.length && !loading ? ( + No images to see here + ) : null} + +
); @@ -64,5 +91,38 @@ export default compose( error }; } + }), + connect(({ form, values }, { index, error, images = [] }) => { + const filter = get(form, `${MENU_FORM_NAME}.values.filter`, false); + const typeValue = get(form, `${TOGGLE_FORM_NAME}.values.image-type`, 'all'); + + const virtual = Object.keys(ImageType).filter( + i => ImageType[i] === 'Hardware Virtual Machine' + ); + const container = Object.keys(ImageType).filter( + i => ImageType[i] === 'Infrastructure Container' + ); + + const filtered = filter + ? Index(images) + .search(filter) + .map(({ ref }) => find(images, ['id', ref])) + : images; + + return { + images: filtered.filter(image => { + switch (typeValue) { + case 'all': + return true; + case 'hardware-virtual-machine': + return virtual.includes(image.type); + case 'infrastructure-container': + return container.includes(image.type); + default: + return true; + } + }), + allImages: images + }; }) )(List); diff --git a/packages/logos/assets/alpine.svg b/packages/logos/assets/alpine.svg index c4e89cfd..a592a2e7 100644 --- a/packages/logos/assets/alpine.svg +++ b/packages/logos/assets/alpine.svg @@ -1 +1 @@ -Artboard 1 copy 6 +Artboard 1 copy 6 diff --git a/packages/logos/assets/apache.svg b/packages/logos/assets/apache.svg index 0520c3b0..6c9a8557 100644 --- a/packages/logos/assets/apache.svg +++ b/packages/logos/assets/apache.svg @@ -1 +1 @@ -Artboard 1 copy 13 +Artboard 1 copy 13 diff --git a/packages/logos/assets/brocade.svg b/packages/logos/assets/brocade.svg index c8055720..ce29348d 100644 --- a/packages/logos/assets/brocade.svg +++ b/packages/logos/assets/brocade.svg @@ -1 +1 @@ -Artboard 1 copy 14 +Artboard 1 copy 14 diff --git a/packages/logos/assets/cassandra.svg b/packages/logos/assets/cassandra.svg index 41c42092..2c7c2241 100644 --- a/packages/logos/assets/cassandra.svg +++ b/packages/logos/assets/cassandra.svg @@ -1 +1 @@ -Artboard 1 copy 15 +Artboard 1 copy 15 diff --git a/packages/logos/assets/centos.svg b/packages/logos/assets/centos.svg index 19540996..49e5147c 100644 --- a/packages/logos/assets/centos.svg +++ b/packages/logos/assets/centos.svg @@ -1 +1 @@ -Artboard 1 +Artboard 1 diff --git a/packages/logos/assets/couchbase.svg b/packages/logos/assets/couchbase.svg index a759b170..8635fb90 100644 --- a/packages/logos/assets/couchbase.svg +++ b/packages/logos/assets/couchbase.svg @@ -1 +1 @@ -Artboard 1 copy 7 +Artboard 1 copy 7 diff --git a/packages/logos/assets/debian.svg b/packages/logos/assets/debian.svg index df713340..abf4cb00 100644 --- a/packages/logos/assets/debian.svg +++ b/packages/logos/assets/debian.svg @@ -1 +1 @@ -Artboard 1 copy +Artboard 1 copy diff --git a/packages/logos/assets/fedora.svg b/packages/logos/assets/fedora.svg index c2b7cf56..79022386 100644 --- a/packages/logos/assets/fedora.svg +++ b/packages/logos/assets/fedora.svg @@ -1 +1 @@ -Artboard 1 copy 2 \ No newline at end of file +Artboard 1 copy 2 \ No newline at end of file diff --git a/packages/logos/assets/freebsd.svg b/packages/logos/assets/freebsd.svg old mode 100755 new mode 100644 index cf420559..dcfdb7de --- a/packages/logos/assets/freebsd.svg +++ b/packages/logos/assets/freebsd.svg @@ -1 +1 @@ -Artboard 1 copy 3 \ No newline at end of file +Artboard 1 copy 3 diff --git a/packages/logos/assets/ghost.svg b/packages/logos/assets/ghost.svg index 4a9e2370..c0a69bf3 100644 --- a/packages/logos/assets/ghost.svg +++ b/packages/logos/assets/ghost.svg @@ -1 +1 @@ -Artboard 1 copy 16 +Artboard 1 copy 16 diff --git a/packages/logos/assets/java.svg b/packages/logos/assets/java.svg index f0ba2899..1e0b7e7a 100644 --- a/packages/logos/assets/java.svg +++ b/packages/logos/assets/java.svg @@ -1 +1 @@ -Artboard 1 copy 17 +Artboard 1 copy 17 diff --git a/packages/logos/assets/mariadb.svg b/packages/logos/assets/mariadb.svg index 8de3aaa2..a514e5e7 100644 --- a/packages/logos/assets/mariadb.svg +++ b/packages/logos/assets/mariadb.svg @@ -1 +1 @@ -Artboard 1 copy 18 +Artboard 1 copy 18 diff --git a/packages/logos/assets/mongodb.svg b/packages/logos/assets/mongodb.svg index 5bf582e2..45d0d70a 100644 --- a/packages/logos/assets/mongodb.svg +++ b/packages/logos/assets/mongodb.svg @@ -1 +1 @@ -Artboard 1 copy 8 +Artboard 1 copy 8 diff --git a/packages/logos/assets/multiarch.svg b/packages/logos/assets/multiarch.svg index d13493e8..ec7c989f 100644 --- a/packages/logos/assets/multiarch.svg +++ b/packages/logos/assets/multiarch.svg @@ -1 +1 @@ -Artboard 1 copy 43 +Artboard 1 copy 43 diff --git a/packages/logos/assets/mysql.svg b/packages/logos/assets/mysql.svg index db3e33c5..febd4b5c 100644 --- a/packages/logos/assets/mysql.svg +++ b/packages/logos/assets/mysql.svg @@ -1 +1 @@ -Artboard 1 copy 19 +Artboard 1 copy 19 diff --git a/packages/logos/assets/nginx.svg b/packages/logos/assets/nginx.svg index a0bc64a6..7e833f7c 100644 --- a/packages/logos/assets/nginx.svg +++ b/packages/logos/assets/nginx.svg @@ -1 +1 @@ -Artboard 1 copy 9 +Artboard 1 copy 9 diff --git a/packages/logos/assets/node.svg b/packages/logos/assets/node.svg index 9734a4aa..16cd387b 100644 --- a/packages/logos/assets/node.svg +++ b/packages/logos/assets/node.svg @@ -1 +1 @@ -Nodejs \ No newline at end of file +Nodejs \ No newline at end of file diff --git a/packages/logos/assets/openbsd.svg b/packages/logos/assets/openbsd.svg old mode 100755 new mode 100644 index 90bb151d..09b50623 --- a/packages/logos/assets/openbsd.svg +++ b/packages/logos/assets/openbsd.svg @@ -1 +1 @@ -Artboard 1 copy 46 \ No newline at end of file +Artboard 1 copy 46 diff --git a/packages/logos/assets/percona.svg b/packages/logos/assets/percona.svg index cefb4459..cc9778a0 100644 --- a/packages/logos/assets/percona.svg +++ b/packages/logos/assets/percona.svg @@ -1 +1 @@ -Artboard 1 copy 11 +Artboard 1 copy 11 diff --git a/packages/logos/assets/placeholder.svg b/packages/logos/assets/placeholder.svg index 0e5ed8ef..3e8734b6 100644 --- a/packages/logos/assets/placeholder.svg +++ b/packages/logos/assets/placeholder.svg @@ -1 +1 @@ -Artboard 1 copy 45 +Artboard 1 copy 45 diff --git a/packages/logos/assets/postgresql.svg b/packages/logos/assets/postgresql.svg index 636e8bf5..673b52af 100644 --- a/packages/logos/assets/postgresql.svg +++ b/packages/logos/assets/postgresql.svg @@ -1 +1 @@ -Artboard 1 copy 12 +Artboard 1 copy 12 diff --git a/packages/logos/assets/redis.svg b/packages/logos/assets/redis.svg index 20b696cb..56887cfa 100644 --- a/packages/logos/assets/redis.svg +++ b/packages/logos/assets/redis.svg @@ -1 +1 @@ -Artboard 1 copy 20 +Artboard 1 copy 20 diff --git a/packages/logos/assets/scylladb.svg b/packages/logos/assets/scylladb.svg index d8f0664e..d16985ba 100644 --- a/packages/logos/assets/scylladb.svg +++ b/packages/logos/assets/scylladb.svg @@ -1 +1 @@ -Artboard 1 copy 44 +Artboard 1 copy 44 diff --git a/packages/logos/assets/smart.svg b/packages/logos/assets/smart.svg index d13493e8..ec7c989f 100644 --- a/packages/logos/assets/smart.svg +++ b/packages/logos/assets/smart.svg @@ -1 +1 @@ -Artboard 1 copy 43 +Artboard 1 copy 43 diff --git a/packages/logos/assets/ubuntu.svg b/packages/logos/assets/ubuntu.svg index 2edec6ea..f6e9aaa5 100644 --- a/packages/logos/assets/ubuntu.svg +++ b/packages/logos/assets/ubuntu.svg @@ -1 +1 @@ -Artboard 1 copy 4 +Artboard 1 copy 4 diff --git a/packages/logos/assets/windows.svg b/packages/logos/assets/windows.svg index b54071b4..87d416ca 100644 --- a/packages/logos/assets/windows.svg +++ b/packages/logos/assets/windows.svg @@ -1 +1 @@ -Artboard 1 copy 5 +Artboard 1 copy 5 diff --git a/packages/logos/convert.js b/packages/logos/convert.js index c9aa4e8c..5161cfa2 100644 --- a/packages/logos/convert.js +++ b/packages/logos/convert.js @@ -20,14 +20,12 @@ main(async () => { await forEach(files, async file => { const svg = await readFile(file, 'utf-8'); const jsx = converter.convert(svg); - const header = jsx.match(/(^]*)/ig)[0]; await writeFile( file.replace(/logos\/assets\//, '/logos/src/').replace(/\.svg$/, '.js'), ` - import React from 'react'; - + import React from 'react';\n export default (props) => (${jsx.replace(header, `${header} {...props}`)}); ` ); diff --git a/packages/logos/src/alpine.js b/packages/logos/src/alpine.js index 5992a50c..006847be 100644 --- a/packages/logos/src/alpine.js +++ b/packages/logos/src/alpine.js @@ -1,13 +1,7 @@ import React from 'react'; export default props => ( - + Artboard 1 copy 6 ( - + Artboard 1 copy 13 ( - + Artboard 1 copy 14 ( diff --git a/packages/logos/src/centos.js b/packages/logos/src/centos.js index 9c7dc3ed..a9ec8f61 100644 --- a/packages/logos/src/centos.js +++ b/packages/logos/src/centos.js @@ -4,8 +4,6 @@ export default props => ( diff --git a/packages/logos/src/couchbase.js b/packages/logos/src/couchbase.js index 247f959e..9dd670f9 100644 --- a/packages/logos/src/couchbase.js +++ b/packages/logos/src/couchbase.js @@ -1,13 +1,7 @@ import React from 'react'; export default props => ( - + Artboard 1 copy 7 ( - + Artboard 1 copy ( diff --git a/packages/logos/src/freebsd.js b/packages/logos/src/freebsd.js index 4fc5250b..7466dfeb 100644 --- a/packages/logos/src/freebsd.js +++ b/packages/logos/src/freebsd.js @@ -1,16 +1,15 @@ import React from 'react'; export default props => ( - + Artboard 1 copy 3 - - + + ); diff --git a/packages/logos/src/ghost.js b/packages/logos/src/ghost.js index 78d83336..c78f8f3a 100644 --- a/packages/logos/src/ghost.js +++ b/packages/logos/src/ghost.js @@ -1,13 +1,7 @@ import React from 'react'; export default props => ( - + Artboard 1 copy 16 ( - + Artboard 1 copy 17 ( - + Artboard 1 copy 18 ( diff --git a/packages/logos/src/multiarch.js b/packages/logos/src/multiarch.js index 25872e22..82dd8390 100644 --- a/packages/logos/src/multiarch.js +++ b/packages/logos/src/multiarch.js @@ -1,13 +1,7 @@ import React from 'react'; export default props => ( - + Artboard 1 copy 43 ( - + Artboard 1 copy 19 ( - + Artboard 1 copy 9 ( diff --git a/packages/logos/src/openbsd.js b/packages/logos/src/openbsd.js index 437c268b..20230526 100644 --- a/packages/logos/src/openbsd.js +++ b/packages/logos/src/openbsd.js @@ -1,15 +1,11 @@ import React from 'react'; export default props => ( - + Artboard 1 copy 46 - + ); diff --git a/packages/logos/src/percona.js b/packages/logos/src/percona.js index 9a1bb819..7da45dcf 100644 --- a/packages/logos/src/percona.js +++ b/packages/logos/src/percona.js @@ -1,13 +1,7 @@ import React from 'react'; export default props => ( - + Artboard 1 copy 11 ( - + Artboard 1 copy 45 ( - + Artboard 1 copy 12 ( diff --git a/packages/logos/src/scylladb.js b/packages/logos/src/scylladb.js index 9879cb78..1cedddcd 100644 --- a/packages/logos/src/scylladb.js +++ b/packages/logos/src/scylladb.js @@ -1,13 +1,7 @@ import React from 'react'; export default props => ( - + Artboard 1 copy 44 ( - + Artboard 1 copy 43 ( diff --git a/packages/logos/src/windows.js b/packages/logos/src/windows.js index a32b06e2..07933e6f 100644 --- a/packages/logos/src/windows.js +++ b/packages/logos/src/windows.js @@ -1,13 +1,7 @@ import React from 'react'; export default props => ( - + Artboard 1 copy 5 without thr onClick={[Function]} > diff --git a/packages/my-joy-beta/src/components/create-instance/__tests__/__snapshots__/package.spec.js.snap b/packages/my-joy-beta/src/components/create-instance/__tests__/__snapshots__/package.spec.js.snap index 319bf909..5f789a8c 100644 --- a/packages/my-joy-beta/src/components/create-instance/__tests__/__snapshots__/package.spec.js.snap +++ b/packages/my-joy-beta/src/components/create-instance/__tests__/__snapshots__/package.spec.js.snap @@ -1547,10 +1547,229 @@ exports[`renders without throwing 1`] = `
- Sad Animal + + + Guilty_Salamander + + + Created using Figma + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

without throwing 1`] = `
- Sad Animal + + + Guilty_Salamander + + + Created using Figma + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

without throwing 1`] = `
- Sad Animal + + + Guilty_Salamander + + + Created using Figma + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

without throwing 1`] = `
- Sad Animal + + + Guilty_Salamander + + + Created using Figma + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

( - Sad Animal + {children} diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-actions-1-snap.png b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-actions-1-snap.png index 663218cf..b84777f2 100644 Binary files a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-actions-1-snap.png and b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-actions-1-snap.png differ diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-item-mutating-1-snap.png b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-item-mutating-1-snap.png index 55d52b09..5c7c5bd9 100644 Binary files a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-item-mutating-1-snap.png and b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-item-mutating-1-snap.png differ diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-1-snap.png b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-1-snap.png index 663218cf..c70f7e00 100644 Binary files a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-1-snap.png and b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-1-snap.png differ diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-all-selected-1-snap.png b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-all-selected-1-snap.png index 50d7fad2..7331ff36 100644 Binary files a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-all-selected-1-snap.png and b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-all-selected-1-snap.png differ diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-sort-by-1-snap.png b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-sort-by-1-snap.png index 4f56c72a..46e362c3 100644 Binary files a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-sort-by-1-snap.png and b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-sort-by-1-snap.png differ diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-sort-by-sort-order-1-snap.png b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-sort-by-sort-order-1-snap.png index dbd59ea9..c3fcf4fd 100644 Binary files a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-sort-by-sort-order-1-snap.png and b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-sort-by-sort-order-1-snap.png differ diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-submitting-1-snap.png b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-submitting-1-snap.png index 3e844843..72636f33 100644 Binary files a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-submitting-1-snap.png and b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-snapshot-list-submitting-1-snap.png differ diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-1-snap.png b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-1-snap.png index 8bad9b4c..ff1ca68f 100644 Binary files a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-1-snap.png and b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-1-snap.png differ diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__snapshots__/snapshots.spec.js.snap b/packages/my-joy-beta/src/components/instances/__tests__/__snapshots__/snapshots.spec.js.snap index 9f6a0f27..eba43be8 100644 --- a/packages/my-joy-beta/src/components/instances/__tests__/__snapshots__/snapshots.spec.js.snap +++ b/packages/my-joy-beta/src/components/instances/__tests__/__snapshots__/snapshots.spec.js.snap @@ -594,10 +594,229 @@ Array [
- Sad Animal + + + Guilty_Salamander + + + Created using Figma + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

- Sad Animal + + + Guilty_Salamander + + + Created using Figma + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

- Sad Animal + + + Guilty_Salamander + + + Created using Figma + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

- Sad Animal + + + Guilty_Salamander + + + Created using Figma + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

- Sad Animal + + + Guilty_Salamander + + + Created using Figma + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

- Sad Animal + + + Guilty_Salamander + + + Created using Figma + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

- hello—å + hello— world @@ -4400,7 +4400,7 @@ Array [ className="c7" > - hello2—å + hello2— world2 @@ -5787,7 +5787,7 @@ Array [ className="c7" > - hello—å + hello— world @@ -6922,7 +6922,7 @@ Array [ className="c7" > - hello2—å + hello2— world2 diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-loading-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-loading-1-snap.png index bb74b9a7..92b6af88 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-loading-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-loading-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-1-snap.png index 72dfa929..2b6cc658 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-inactive-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-inactive-1-snap.png index 72dfa929..7fc61c7e 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-inactive-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-inactive-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-loading-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-loading-1-snap.png index 6d4d6585..f14d06fd 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-loading-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-loading-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-loading-error-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-loading-error-1-snap.png index 21311bac..f081409f 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-loading-error-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-loading-error-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-mutation-error-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-mutation-error-1-snap.png index 1c88690b..73496df4 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-mutation-error-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-mutation-error-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-1-snap.png index 8280dc20..b9d9a160 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-error-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-error-1-snap.png index bc4cc245..fd8561c4 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-error-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-error-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-loading-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-loading-1-snap.png index b7f76f4c..cfecb095 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-loading-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-loading-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/metadata-ui-js-metadata-loading-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/metadata-ui-js-metadata-loading-1-snap.png index 3d412556..fcf193c1 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/metadata-ui-js-metadata-loading-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/metadata-ui-js-metadata-loading-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/metadata-ui-js-metadata-metadata-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/metadata-ui-js-metadata-metadata-1-snap.png index b72bee9d..c0e75074 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/metadata-ui-js-metadata-metadata-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/metadata-ui-js-metadata-metadata-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/networks-ui-js-networks-loading-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/networks-ui-js-networks-loading-1-snap.png index d6bc2ea3..b57541ca 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/networks-ui-js-networks-loading-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/networks-ui-js-networks-loading-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-1-snap.png index 217b0c57..8955ddb5 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-loading-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-loading-1-snap.png index 29443b7b..a141971c 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-loading-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-loading-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-loading-error-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-loading-error-1-snap.png index 217b0c57..a141971c 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-loading-error-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-loading-error-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-mutation-error-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-mutation-error-1-snap.png index 8ed38d6c..31737473 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-mutation-error-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-mutation-error-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-1-snap.png index 4721af67..217b0c57 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/tags-ui-js-tags-editing-removing-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/tags-ui-js-tags-editing-removing-1-snap.png index 4c5f4fc7..b91e7930 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/tags-ui-js-tags-editing-removing-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/tags-ui-js-tags-editing-removing-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/tags-ui-js-tags-loading-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/tags-ui-js-tags-loading-1-snap.png index da97d79b..9c3ecaab 100644 Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/tags-ui-js-tags-loading-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/tags-ui-js-tags-loading-1-snap.png differ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__snapshots__/firewall.spec.js.snap b/packages/my-joy-beta/src/containers/instances/__tests__/__snapshots__/firewall.spec.js.snap index 433b6708..d369b6ab 100644 --- a/packages/my-joy-beta/src/containers/instances/__tests__/__snapshots__/firewall.spec.js.snap +++ b/packages/my-joy-beta/src/containers/instances/__tests__/__snapshots__/firewall.spec.js.snap @@ -462,10 +462,229 @@ Array [
- Sad Animal + + + Guilty_Salamander + + + Created using Figma + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

- Sad Animal + + + Guilty_Salamander + + + Created using Figma + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

- Sad Animal + + + Guilty_Salamander + + + Created using Figma + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

- Sad Animal + + + Guilty_Salamander + + + Created using Figma + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

without throwing 1`] = `
- Sad Animal + + + Guilty_Salamander + + + Created using Figma + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

without throwing 1`] = `
- Sad Animal + + + Guilty_Salamander + + + Created using Figma + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

without throwing 1`] = `
- Sad Animal + + + Guilty_Salamander + + + Created using Figma + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

without throwing 1`] = `
- Sad Animal + + + Guilty_Salamander + + + Created using Figma + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

props.theme.text}; + -webkit-text-fill-color: currentcolor; + background: ${props => props.theme.white}; + box-shadow: none; + border-color: ${props => props.theme.grey};; + `}; + ${is('disabled')` color: ${props => props.theme.text}; -webkit-text-fill-color: currentcolor; diff --git a/packages/ui-toolkit/src/divider/index.js b/packages/ui-toolkit/src/divider/index.js index 440720eb..12dc06dc 100644 --- a/packages/ui-toolkit/src/divider/index.js +++ b/packages/ui-toolkit/src/divider/index.js @@ -11,6 +11,10 @@ const Divider = styled(Row)` ${is('transparent')` background-color: transparent; `}; + + ${is('vertical')` + transform: rotate(90deg); + `}; `; export default Baseline(Divider); diff --git a/packages/ui-toolkit/src/key-value/index.js b/packages/ui-toolkit/src/key-value/index.js index 84ed0e3b..112a53ec 100644 --- a/packages/ui-toolkit/src/key-value/index.js +++ b/packages/ui-toolkit/src/key-value/index.js @@ -185,11 +185,11 @@ export const KeyValue = ({ {expanded ? ( {`${initialValues.name}${ - type === 'metadata' ? '—å' : ':' + type === 'metadata' ? '—' : ':' }`} ) : ( {`${initialValues.name}${ - type === 'metadata' ? '—å' : ':' + type === 'metadata' ? '—' : ':' }`} )} {initialValues.value} diff --git a/packages/ui-toolkit/src/popover/divider.js b/packages/ui-toolkit/src/popover/divider.js index 71cecc25..e2fce714 100644 --- a/packages/ui-toolkit/src/popover/divider.js +++ b/packages/ui-toolkit/src/popover/divider.js @@ -1,5 +1,6 @@ import styled from 'styled-components'; import remcalc from 'remcalc'; +import is from 'styled-is'; export default styled.div` width: calc(100% + ${remcalc(36)});