diff --git a/package.json b/package.json
index 60960279..4433f27b 100644
--- a/package.json
+++ b/package.json
@@ -65,6 +65,7 @@
"yargs": "^10.0.3"
},
"resolutions": {
+ "component-type": "1.2.1",
"styled-components": "3.1.4",
"axios": "0.16.2",
"follow-redirects": "1.4.1",
diff --git a/packages/my-joy-beta/package.json b/packages/my-joy-beta/package.json
index e4aa15d2..34c517c8 100644
--- a/packages/my-joy-beta/package.json
+++ b/packages/my-joy-beta/package.json
@@ -12,7 +12,7 @@
"lint-ci": "eslint . --ext .js --ext .md",
"lint": "eslint . --fix --ext .js --ext .md",
"test-ci": "NODE_ENV=test joyent-react-scripts test --env=jsdom --testPathIgnorePatterns='.ui.js'",
- "test": "DEFAULT_TIMEOUT_INTERVAL=80000 NODE_ENV=test joyent-react-scripts test --env=jsdom",
+ "test": "DEFAULT_TIMEOUT_INTERVAL=100000 NODE_ENV=test joyent-react-scripts test --env=jsdom",
"prepublish": "echo 0"
},
"dependencies": {
@@ -24,7 +24,8 @@
"constant-case": "^2.0.0",
"date-fns": "^1.29.0",
"declarative-redux-form": "^2.0.8",
- "joyent-manifest-editor": "3.0.1",
+ "joyent-manifest-editor": "^1.4.0",
+ "joyent-react-styled-flexboxgrid": "^2.2.3",
"joyent-ui-toolkit": "^4.5.0",
"lodash.find": "^4.6.0",
"lodash.findindex": "^4.6.0",
@@ -58,7 +59,7 @@
"scroll-to-element": "^2.0.0",
"styled-components": "^3.1.4",
"styled-components-spacing": "^2.1.3",
- "styled-flex-component": "^2.1.0",
+ "styled-flex-component": "^2.2.0",
"title-case": "^2.1.1"
},
"devDependencies": {
diff --git a/packages/my-joy-beta/src/assets/node.svg b/packages/my-joy-beta/src/assets/node.svg
index d0202a11..16cd387b 100644
--- a/packages/my-joy-beta/src/assets/node.svg
+++ b/packages/my-joy-beta/src/assets/node.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/cns-ui-js-add-service-form-1-snap.png b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/cns-ui-js-add-service-form-1-snap.png
index 8c5b37db..2309e5c6 100644
Binary files a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/cns-ui-js-add-service-form-1-snap.png and b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/cns-ui-js-add-service-form-1-snap.png differ
diff --git a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/cns-ui-js-add-service-form-pristine-1-snap.png b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/cns-ui-js-add-service-form-pristine-1-snap.png
index 44ca3e52..ecf69d12 100644
Binary files a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/cns-ui-js-add-service-form-pristine-1-snap.png and b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/cns-ui-js-add-service-form-pristine-1-snap.png differ
diff --git a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/cns-ui-js-hostname-values-1-snap.png b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/cns-ui-js-hostname-values-1-snap.png
index 356bb9d9..aa94a8a6 100644
Binary files a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/cns-ui-js-hostname-values-1-snap.png and b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/cns-ui-js-hostname-values-1-snap.png differ
diff --git a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-1-snap.png b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-1-snap.png
index b702716a..3ee90be1 100644
Binary files a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-1-snap.png and b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-1-snap.png differ
diff --git a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-input-input-1-snap.png b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-input-input-1-snap.png
index b702716a..3ee90be1 100644
Binary files a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-input-input-1-snap.png and b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-input-input-1-snap.png differ
diff --git a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-input-textarea-1-snap.png b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-input-textarea-1-snap.png
index 74139d97..19350958 100644
Binary files a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-input-textarea-1-snap.png and b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-input-textarea-1-snap.png differ
diff --git a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-method-add-1-snap.png b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-method-add-1-snap.png
index b702716a..3ee90be1 100644
Binary files a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-method-add-1-snap.png and b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-method-add-1-snap.png differ
diff --git a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-method-edit-1-snap.png b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-method-edit-1-snap.png
index edc851b6..b9ef7de0 100644
Binary files a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-method-edit-1-snap.png and b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-method-edit-1-snap.png differ
diff --git a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-removing-1-snap.png b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-removing-1-snap.png
index b702716a..3ee90be1 100644
Binary files a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-removing-1-snap.png and b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-removing-1-snap.png differ
diff --git a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-submitting-1-snap.png b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-submitting-1-snap.png
index 4bd5cb38..5a48a504 100644
Binary files a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-submitting-1-snap.png and b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-submitting-1-snap.png differ
diff --git a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-submitting-2-snap.png b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-submitting-2-snap.png
new file mode 100644
index 00000000..15583412
Binary files /dev/null and b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-submitting-2-snap.png differ
diff --git a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-type-tag-1-snap.png b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-type-tag-1-snap.png
index 5c644928..25d5c960 100644
Binary files a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-type-tag-1-snap.png and b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-type-tag-1-snap.png differ
diff --git a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/network-ui-js-network-network-5-snap.png b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/network-ui-js-network-network-5-snap.png
index 91e4fa13..06e13d30 100644
Binary files a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/network-ui-js-network-network-5-snap.png and b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/network-ui-js-network-network-5-snap.png differ
diff --git a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/network-ui-js-network-network-info-expanded-1-snap.png b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/network-ui-js-network-network-info-expanded-1-snap.png
index 71719890..1de23f61 100644
Binary files a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/network-ui-js-network-network-info-expanded-1-snap.png and b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/network-ui-js-network-network-info-expanded-1-snap.png differ
diff --git a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/network-ui-js-network-network-info-expanded-3-snap.png b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/network-ui-js-network-network-info-expanded-3-snap.png
index f4b55d31..d6efbae0 100644
Binary files a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/network-ui-js-network-network-info-expanded-3-snap.png and b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/network-ui-js-network-network-info-expanded-3-snap.png differ
diff --git a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/network-ui-js-network-network-public-3-snap.png b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/network-ui-js-network-network-public-3-snap.png
index c7650d69..f0a23cfc 100644
Binary files a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/network-ui-js-network-network-public-3-snap.png and b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/network-ui-js-network-network-public-3-snap.png differ
diff --git a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/tags-ui-js-renders-add-form-without-throwing-1-snap.png b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/tags-ui-js-renders-add-form-without-throwing-1-snap.png
index 5c644928..25d5c960 100644
Binary files a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/tags-ui-js-renders-add-form-without-throwing-1-snap.png and b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/tags-ui-js-renders-add-form-without-throwing-1-snap.png differ
diff --git a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/tags-ui-js-renders-edit-form-without-throwing-1-snap.png b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/tags-ui-js-renders-edit-form-without-throwing-1-snap.png
index 4cb9d044..3e17914f 100644
Binary files a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/tags-ui-js-renders-edit-form-without-throwing-1-snap.png and b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/tags-ui-js-renders-edit-form-without-throwing-1-snap.png differ
diff --git a/packages/my-joy-beta/src/components/__tests__/__snapshots__/cns.spec.js.snap b/packages/my-joy-beta/src/components/__tests__/__snapshots__/cns.spec.js.snap
index 41403c5d..71ff8df1 100644
--- a/packages/my-joy-beta/src/components/__tests__/__snapshots__/cns.spec.js.snap
+++ b/packages/my-joy-beta/src/components/__tests__/__snapshots__/cns.spec.js.snap
@@ -2,6 +2,10 @@
exports[`renders