fix(my-joy-beta): create instance - cns ui fixes

fixes #1013

packages/my-joy-beta/package.json

@@ -36,6 +36,7 @@
     "normalized-styled-components": "^1.0.17",
     "param-case": "^2.1.1",
     "prop-types": "^15.6.0",
+    "punycode": "^2.1.0",
     "react": "^16.2.0",
     "react-apollo": "^2.0.4",
     "react-dom": "^16.2.0",

packages/my-joy-beta/src/components/navigation/__tests__/__snapshots__/menu.spec.js.snap

@@ -29,6 +29,13 @@ exports[`renders <Menu links /> without throwing 1`] = `
   max-width: 62.5rem;
 }
 
+.c3 {
+  display: inline-block;
+  font-size: 0.9375rem;
+  line-height: 1.6;
+  margin-right: 1.4375rem;
+}
+
 .c4 {
   color: rgb(70,70,70);
   text-decoration: none;
@@ -40,13 +47,6 @@ exports[`renders <Menu links /> without throwing 1`] = `
   cursor: default;
 }
 
-.c3 {
-  display: inline-block;
-  font-size: 0.9375rem;
-  line-height: 1.6;
-  margin-right: 1.4375rem;
-}
-
 .c2 {
   list-style-type: none;
   padding: 0;

packages/my-joy-beta/src/containers/create-instance/cns.js

@@ -1,5 +1,5 @@
 import React, { Fragment } from 'react';
-import { compose } from 'react-apollo';
+import { compose, graphql } from 'react-apollo';
 import ReduxForm from 'declarative-redux-form';
 import { destroy } from 'redux-form';
 import { connect } from 'react-redux';
@@ -7,6 +7,7 @@ import get from 'lodash.get';
 import { Margin, Padding } from 'styled-components-spacing';
 import Flex from 'styled-flex-component';
 import { set } from 'react-redux-values';
+import punycode from 'punycode';
 import remcalc from 'remcalc';
 
 import {
@@ -19,9 +20,12 @@ import {
   FormLabel,
   Toggle,
   Divider,
-  TagList
+  TagList,
+  StatusLoader
 } from 'joyent-ui-toolkit';
 
+import getAccount from '../../graphql/get-account.gql';
+
 import {
   Hostname,
   Header,
@@ -46,7 +50,8 @@ const CNSContainer = ({
   handleEdit,
   handleToggleCnsEnabled,
   handleAddService,
-  handleRemoveService
+  handleRemoveService,
+  loading
 }) => (
   <Fragment>
     <Title icon={<CnsIcon />}>Container Name Service</Title>
@@ -69,6 +74,12 @@ const CNSContainer = ({
         <Card>
           <Padding all={4} bottom={0}>
             <Header />
+            {loading ? (
+              <Margin all={2}>
+                {' '}
+                <StatusLoader />
+              </Margin>
+            ) : (
               <Flex column>
                 {hostnames
                   .filter(({ service }) => !service)
@@ -76,12 +87,14 @@ const CNSContainer = ({
                     <Hostname key={value} value={value} {...hostname} />
                   ))}
               </Flex>
+            )}
             <Divider height={remcalc(1)} />
             <Margin top={4}>
+              <HostnamesHeader />
               {serviceNames.length ? (
-                <Margin>
+                <Margin bottom={3}>
                   <FormLabel>Existing CNS service name(s)</FormLabel>
-                  <Margin top={0.5}>
+                  <Margin top={1}>
                     <TagList>
                       {serviceNames.map((value, index) => (
                         <Tag
@@ -95,7 +108,6 @@ const CNSContainer = ({
                   </Margin>
                 </Margin>
               ) : null}
-              <HostnamesHeader />
               <ReduxForm
                 form={`${CNS_FORM}-new-service`}
                 destroyOnUnmount={false}
@@ -131,8 +143,7 @@ const CNSContainer = ({
           </Margin>
           <Margin bottom={4}>
             <P>
-              *All hostnames are indicative and will be confirmed after
-              deployment.
+              *All hostnames listed here will be confirmed after deployment.
             </P>
           </Margin>
           <Margin bottom={4}>
@@ -147,7 +158,7 @@ const CNSContainer = ({
           <Margin bottom={4}>
             <H3>{cnsEnabled ? 'CNS Enabled' : 'CNS Not Enabled'}</H3>
           </Margin>
-          {cnsEnabled ? (
+          {cnsEnabled && serviceNames.length ? (
             <Fragment>
               <FormLabel>Existing CNS service name(s)</FormLabel>
               <Margin top={0.5}>
@@ -171,7 +182,13 @@ const CNSContainer = ({
 );
 
 export default compose(
-  connect(({ form, values }, ownProps) => {
+  graphql(getAccount, {
+    props: ({ data: { loading, account: { id } = [] } }) => ({
+      loading,
+      id
+    })
+  }),
+  connect(({ form, values }, { id }) => {
     const instanceName = get(
       form,
       'create-instance-name.values.name',
@@ -179,17 +196,16 @@ export default compose(
     );
     const serviceNames = get(values, `${CNS_FORM}-services`, []);
 
-    // REPLACE WITH USER ID AND DATA CENTER
-    const userID = '10703e3c-ada6-478d-c757-e5bcad0ea74c';
+    // REPLACE WITH  DATA CENTER
     const dataCenter = 'us-east-1';
 
     const hostnames = [
       {
-        values: [`${instanceName}.inst.${userID}.${dataCenter}.triton.zone`],
+        values: [`${instanceName}.inst.${id}.${dataCenter}.triton.zone`],
         public: true
       },
       {
-        values: [`${instanceName}.inst.${userID}.${dataCenter}.cns.joyent.com`]
+        values: [`${instanceName}.inst.${id}.${dataCenter}.cns.joyent.com`]
       },
       {
         values: [],
@@ -209,7 +225,7 @@ export default compose(
 
       return serviceNames.map(name => {
         const postfix = hostname.public ? '.triton.zone' : '.cns.joyent.com';
-        const value = `${name}.svc.${userID}.${dataCenter}${postfix}`;
+        const value = `${name}.svc.${id}.${dataCenter}${postfix}`;
         hostname.values.push(value);
       });
     });
@@ -231,11 +247,17 @@ export default compose(
     handleToggleCnsEnabled: ({ target }) =>
       dispatch(set({ name: `${CNS_FORM}-enabled`, value: !cnsEnabled })),
     handleAddService: ({ name }) => {
+      const serviceName = punycode.encode(
+        name
+          .toLowerCase()
+          .split(' ')
+          .join('-')
+      );
       dispatch([
         destroy(`${CNS_FORM}-new-service`),
         set({
           name: `${CNS_FORM}-services`,
-          value: serviceNames.concat(name.toLowerCase())
+          value: serviceNames.concat(serviceName)
         })
       ]);
     },

packages/my-joy-beta/src/graphql/get-account.gql

@@ -0,0 +1,5 @@
+query Account {
+  account {
+    id
+  }
+}

yarn.lock

@@ -7942,6 +7942,10 @@ punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
+punycode@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d"
+
 q-i@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/q-i/-/q-i-1.2.0.tgz#2cd2ab41784dc3c583e35c70a541d93c3fde5d4a"