fix(my-joy-beta): consisten onClick on create-instance headers

packages/images/src/containers/list.js

@@ -77,7 +77,7 @@ export const List = ({
         </ReduxForm>
       </Margin>
       <Row>
-        {images.map((image) => (
+        {images.map(image => (
           <Col sm={4}>
             <Image {...image} onRemove={() => handleRemove(image.id)} />
           </Col>
@@ -128,22 +128,24 @@ export default compose(
         : images;
 
       return {
-        images: filtered.filter(image => {
+        images: filtered
-          switch (typeValue) {
+          .filter(image => {
-            case 'all':
+            switch (typeValue) {
-              return true;
+              case 'all':
-            case 'hardware-virtual-machine':
+                return true;
-              return virtual.includes(image.type);
+              case 'hardware-virtual-machine':
-            case 'infrastructure-container':
+                return virtual.includes(image.type);
-              return container.includes(image.type);
+              case 'infrastructure-container':
-            default:
+                return container.includes(image.type);
-              return true;
+              default:
-          }
+                return true;
-        }).map(({ id, ...image }) => ({
+            }
-          ...image,
+          })
-          id,
+          .map(({ id, ...image }) => ({
-          removing: get(values, `remove-mutation-${id}-loading`, false)
+            ...image,
-        })),
+            id,
+            removing: get(values, `remove-mutation-${id}-loading`, false)
+          })),
         allImages: images,
         mutationError,
         typeValue
@@ -169,7 +171,9 @@ export default compose(
         }
 
         if (res) {
-          dispatch([set({ name: `remove-mutation-${id}-loading`, value: false })]);
+          dispatch([
+            set({ name: `remove-mutation-${id}-loading`, value: false })
+          ]);
           history.push(`/`);
         }
       }

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

@@ -36,7 +36,7 @@ const ImageContainer = ({
   <Fragment>
     <Title
       id={step}
-      onClick={!expanded && !image.id && handleEdit}
+      onClick={!expanded && !proceeded && handleEdit}
       collapsed={!expanded && !proceeded}
       icon={<InstanceTypeIcon />}
     >

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

@@ -38,7 +38,7 @@ const NameContainer = ({
   <Fragment>
     <Title
       id={step}
-      onClick={!expanded && !name && handleEdit}
+      onClick={!expanded && !proceeded && handleEdit}
       collapsed={!expanded && !proceeded}
       icon={<NameIcon />}
     >

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

@@ -127,32 +127,31 @@ export default compose(
       const selected = get(form, `${FORM_NAME}.values`, {});
       const empty = id => !includes(Object.keys(selected), id);
 
-      const _networks = networks
+      const _networks = networks.map(({ id, name, ...network }) => {
-        .map(({ id, name, ...network }) => {
+        if (empty(id) && name === 'Joyent-SDC-Public') {
-          if (empty(id) && name === 'Joyent-SDC-Public') {
+          selected[id] = true;
-            selected[id] = true;
+        }
-          }
 
-          return {
+        return {
-            ...network,
+          ...network,
-            name,
+          name,
-            selected:
+          selected:
-              empty(id) && name === 'Joyent-SDC-Public'
+            empty(id) && name === 'Joyent-SDC-Public'
-                ? true
+              ? true
-                : Boolean(selected[id]),
+              : Boolean(selected[id]),
-            infoExpanded: get(
+          infoExpanded: get(
-              values,
+            values,
-              `create-instance-networks-${id}-info-expanded`,
+            `create-instance-networks-${id}-info-expanded`,
-              false
+            false
-            ),
+          ),
-            machinesExpanded: get(
+          machinesExpanded: get(
-              values,
+            values,
-              `create-instance-networks-${id}-machines-expanded`,
+            `create-instance-networks-${id}-machines-expanded`,
-              false
+            false
-            ),
+          ),
-            id
+          id
-          };
+        };
-        });
+      });
 
       return {
         proceeded: get(values, 'create-instance-networks-proceeded', false),

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

@@ -49,7 +49,7 @@ const PackageContainer = ({
   <Fragment>
     <Title
       id={step}
-      onClick={!expanded && !selected.id && handleEdit}
+      onClick={!expanded && !proceeded && handleEdit}
       collapsed={!expanded && !proceeded}
       icon={<PackageIcon />}
     >