fix(my-joy-beta): mark optional sections as proceeded onEdit

2018-02-27 15:08:33 +00:00 · 2018-02-27 15:08:33 +00:00 · 584c8b2028
parent 25c2735bf4
commit 584c8b2028
47 changed files with 48 additions and 21 deletions
--- a/packages/images/public/index.html
+++ b/packages/images/public/index.html
@ -11,6 +11,8 @@
    <title>My Joyent Images &beta;</title>
  </head>
  <body>
+    <div id="header"></div>
    <div id="root"></div>
+    <script src="/nav-static/main.js"></script>
  </body>
 </html>
--- 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
--- a/packages/my-joy-beta/src/components/tests/__image_snapshots__/network-ui-js-network-network-1-snap.png
+++ b/packages/my-joy-beta/src/components/tests/__image_snapshots__/network-ui-js-network-network-1-snap.png
--- a/packages/my-joy-beta/src/components/tests/__image_snapshots__/network-ui-js-network-network-2-snap.png
+++ b/packages/my-joy-beta/src/components/tests/__image_snapshots__/network-ui-js-network-network-2-snap.png
--- a/packages/my-joy-beta/src/components/tests/__image_snapshots__/network-ui-js-network-network-3-snap.png
+++ b/packages/my-joy-beta/src/components/tests/__image_snapshots__/network-ui-js-network-network-3-snap.png
--- a/packages/my-joy-beta/src/components/tests/__image_snapshots__/network-ui-js-network-network-4-snap.png
+++ b/packages/my-joy-beta/src/components/tests/__image_snapshots__/network-ui-js-network-network-4-snap.png
--- a/packages/my-joy-beta/src/components/create-instance/tests/__image_snapshots__/images-ui-js-images-images-name-stuff-image-name-stuff-1-snap.png
+++ b/packages/my-joy-beta/src/components/create-instance/tests/__image_snapshots__/images-ui-js-images-images-name-stuff-image-name-stuff-1-snap.png
--- a/packages/my-joy-beta/src/components/create-instance/package.js
+++ b/packages/my-joy-beta/src/components/create-instance/package.js
@ -104,7 +104,9 @@ export const Filters = ({ onResetFilters }) => (
      </FormGroup>
      <FormGroup type="checkbox" name="ssd" field={Field}>
        <Checkbox>
-          <FormLabel noMargin actionable>SSD</FormLabel>
+          <FormLabel noMargin actionable>
+            SSD
+          </FormLabel>
        </Checkbox>
      </FormGroup>
    </Flex>
--- a/packages/my-joy-beta/src/components/instances/tests/__image_snapshots__/list-ui-js-item-mutating-1-snap.png
+++ b/packages/my-joy-beta/src/components/instances/tests/__image_snapshots__/list-ui-js-item-mutating-1-snap.png
--- 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
--- 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
--- a/packages/my-joy-beta/src/containers/create-instance/tests/__image_snapshots__/networks-ui-js-networks-loading-expanded-1-snap.png
+++ b/packages/my-joy-beta/src/containers/create-instance/tests/__image_snapshots__/networks-ui-js-networks-loading-expanded-1-snap.png
--- a/packages/my-joy-beta/src/containers/create-instance/cns.js
+++ b/packages/my-joy-beta/src/containers/create-instance/cns.js
@ -171,6 +171,10 @@ export default compose(
      dispatch(set({ name: `${CNS_FORM}-proceeded`, value: true }));
      return history.push(`/~create/affinity${history.location.search}`);
    },
+    handleEdit: () => {
+      dispatch(set({ name: `${CNS_FORM}-proceeded`, value: true }));
+      history.push(`/~create/cns${history.location.search}`);
+    },
    shouldAsyncValidate: ({ trigger }) => trigger === 'change',
    handleAsyncValidate: async ({ name = '', value = '' }) => {
      const isNameValid = /^[a-zA-Z_.-]{1,16}$/.test(name);
@ -185,7 +189,6 @@ export default compose(
        value: isValueValid ? null : fieldError
      };
    },
-    handleEdit: () => history.push(`/~create/cns${history.location.search}`),
    handleToggleCnsEnabled: ({ target }) =>
      dispatch(set({ name: `${CNS_FORM}-enabled`, value: !cnsEnabled })),
    handleAddService: ({ name }) => {
--- a/packages/my-joy-beta/src/containers/create-instance/firewall.js
+++ b/packages/my-joy-beta/src/containers/create-instance/firewall.js
@ -168,6 +168,10 @@ export default compose(
        return history.push(`/~create/cns${history.location.search}`);
      },
      handleEdit: () => {
+        dispatch(
+          set({ name: 'create-instance-firewall-proceeded', value: true })
+        );
+
        return history.push(`/~create/firewall${history.location.search}`);
      }
    })
--- a/packages/my-joy-beta/src/containers/create-instance/metadata.js
+++ b/packages/my-joy-beta/src/containers/create-instance/metadata.js
@ -170,6 +170,10 @@ export default compose(
      return history.push(`/~create/user-script${history.location.search}`);
    },
    handleEdit: () => {
+      dispatch(
+        set({ name: 'create-instance-metadata-proceeded', value: true })
+      );
+
      return history.push(`/~create/metadata${history.location.search}`);
    },
    shouldAsyncValidate: ({ trigger }) => {
--- a/packages/my-joy-beta/src/containers/create-instance/name.js
+++ b/packages/my-joy-beta/src/containers/create-instance/name.js
@ -116,6 +116,17 @@ export default compose(
      };
    },
    (dispatch, { history, query }) => ({
+      handleNext: () => {
+        dispatch(set({ name: 'create-instance-name-proceeded', value: true }));
+        return history.push(
+          `/~create/${query.image ? 'package' : 'image'}${
+            history.location.search
+          }`
+        );
+      },
+      handleEdit: () => {
+        history.push(`/~create/name${history.location.search}`);
+      },
      shouldAsyncValidate: ({ trigger }) => trigger === 'change',
      handleAsyncValidation: async ({ name }) => {
        const sanitized = punycode.encode(name).replace(/-$/, '');
@ -159,15 +170,6 @@ export default compose(
          };
        }
      },
-      handleNext: () => {
-        dispatch(set({ name: 'create-instance-name-proceeded', value: true }));
-        return history.push(
-          `/~create/${query.image ? 'package' : 'image'}${
-            history.location.search
-          }`
-        );
-      },
-      handleEdit: () => history.push(`/~create/name${history.location.search}`),
      handleRandomize: async () => {
        dispatch(
          set({ name: 'create-instance-name-randomizing', value: true })
--- a/packages/my-joy-beta/src/containers/create-instance/networks.js
+++ b/packages/my-joy-beta/src/containers/create-instance/networks.js
@ -186,6 +186,10 @@ export default compose(
        return history.push(`/~create/firewall${history.location.search}`);
      },
      handleEdit: () => {
+        dispatch(
+          set({ name: 'create-instance-networks-proceeded', value: true })
+        );
+
        return history.push(`/~create/networks${history.location.search}`);
      },
      setInfoExpanded: (id, expanded) => {
--- a/packages/my-joy-beta/src/containers/create-instance/package.js
+++ b/packages/my-joy-beta/src/containers/create-instance/package.js
@ -234,8 +234,9 @@ export default compose(

        return history.push(`/~create/tags${history.location.search}`);
      },
-      handleEdit: () =>
-        history.push(`/~create/package${history.location.search}`),
+      handleEdit: () => {
+        return history.push(`/~create/package${history.location.search}`);
+      },
      handleResetFilters: () => {
        dispatch(destroy(`${FORM_NAME}-filters`));
      },
--- a/packages/my-joy-beta/src/containers/create-instance/tags.js
+++ b/packages/my-joy-beta/src/containers/create-instance/tags.js
@ -145,10 +145,10 @@ export default compose(
  connect(null, (dispatch, { tags = [], history }) => ({
    handleNext: () => {
      dispatch(set({ name: 'create-instance-tags-proceeded', value: true }));
-
      return history.push(`/~create/metadata${history.location.search}`);
    },
    handleEdit: () => {
+      dispatch(set({ name: 'create-instance-tags-proceeded', value: true }));
      return history.push(`/~create/tags${history.location.search}`);
    },
    shouldAsyncValidate: ({ trigger }) => trigger === 'submit',
--- a/packages/my-joy-beta/src/containers/create-instance/user-script.js
+++ b/packages/my-joy-beta/src/containers/create-instance/user-script.js
@ -116,8 +116,6 @@ export default compose(
      };
    },
    (dispatch, { history }) => ({
-      handleEdit: () =>
-        history.push(`/~create/user-script${history.location.search}`),
      handleNext: () => {
        dispatch(
          set({ name: 'create-instance-user-script-proceeded', value: true })
@ -125,6 +123,13 @@ export default compose(

        return history.push(`/~create/networks${history.location.search}`);
      },
+      handleEdit: () => {
+        dispatch(
+          set({ name: 'create-instance-user-script-proceeded', value: true })
+        );
+
+        return history.push(`/~create/user-script${history.location.search}`);
+      },
      handleChangeOpenForm: value => {
        return dispatch([
          set({ name: `create-instance-user-script-open`, value })
--- a/packages/my-joy-beta/src/containers/instances/tests/__image_snapshots__/cns-ui-js-cns-1-snap.png
+++ b/packages/my-joy-beta/src/containers/instances/tests/__image_snapshots__/cns-ui-js-cns-1-snap.png
--- a/packages/my-joy-beta/src/containers/instances/tests/__image_snapshots__/cns-ui-js-cns-hostnames-1-snap.png
+++ b/packages/my-joy-beta/src/containers/instances/tests/__image_snapshots__/cns-ui-js-cns-hostnames-1-snap.png
--- 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
--- a/packages/my-joy-beta/src/containers/instances/tests/__image_snapshots__/cns-ui-js-cns-mutating-1-snap.png
+++ b/packages/my-joy-beta/src/containers/instances/tests/__image_snapshots__/cns-ui-js-cns-mutating-1-snap.png
--- a/packages/my-joy-beta/src/containers/instances/tests/__image_snapshots__/cns-ui-js-cns-mutation-error-1-snap.png
+++ b/packages/my-joy-beta/src/containers/instances/tests/__image_snapshots__/cns-ui-js-cns-mutation-error-1-snap.png
--- a/packages/my-joy-beta/src/containers/instances/tests/__image_snapshots__/cns-ui-js-cns-services-1-snap.png
+++ b/packages/my-joy-beta/src/containers/instances/tests/__image_snapshots__/cns-ui-js-cns-services-1-snap.png
--- 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
--- 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
--- 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
--- a/packages/my-joy-beta/src/containers/instances/tests/__image_snapshots__/firewall-ui-js-firewall-tag-rules-1-snap.png
+++ b/packages/my-joy-beta/src/containers/instances/tests/__image_snapshots__/firewall-ui-js-firewall-tag-rules-1-snap.png
--- a/packages/my-joy-beta/src/containers/instances/tests/__image_snapshots__/firewall-ui-js-firewall-tag-rules-2-snap.png
+++ b/packages/my-joy-beta/src/containers/instances/tests/__image_snapshots__/firewall-ui-js-firewall-tag-rules-2-snap.png
--- a/packages/my-joy-beta/src/containers/instances/tests/__image_snapshots__/list-ui-js-list-instances-selected-1-snap.png
+++ b/packages/my-joy-beta/src/containers/instances/tests/__image_snapshots__/list-ui-js-list-instances-selected-1-snap.png
--- a/packages/my-joy-beta/src/containers/instances/tests/__image_snapshots__/list-ui-js-list-instances-selected-all-1-snap.png
+++ b/packages/my-joy-beta/src/containers/instances/tests/__image_snapshots__/list-ui-js-list-instances-selected-all-1-snap.png
--- a/packages/my-joy-beta/src/containers/instances/tests/__image_snapshots__/list-ui-js-list-instances-selected-all-allowed-actions-1-snap.png
+++ b/packages/my-joy-beta/src/containers/instances/tests/__image_snapshots__/list-ui-js-list-instances-selected-all-allowed-actions-1-snap.png
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/packages/ui-toolkit/src/form/label.js
+++ b/packages/ui-toolkit/src/form/label.js
@ -27,7 +27,7 @@ const StyledLabel = Label.extend`
      font-weight: ${props => props.theme.font.weight.normal};
  `};

-    ${is('noMargin')`
+  ${is('noMargin')`
      margin: 0;
  `};
 `;
--- a/packages/ui-toolkit/src/form/meta.js
+++ b/packages/ui-toolkit/src/form/meta.js
@ -63,8 +63,8 @@ const Meta = props => {
    const hasSuccess = Boolean(props.success || meta.success || value.success);
    const isRight = !props.left;

-    return (
-      msg ? <StyledLabel
+    return msg ? (
+      <StyledLabel
        {...meta}
        {...props}
        error={hasError}
@ -73,8 +73,8 @@ const Meta = props => {
        right={isRight}
      >
        {msg}
-      </StyledLabel> : null
-    );
+      </StyledLabel>
+    ) : null;
  };

  return <Subscriber channel="input-group">{render}</Subscriber>;