From 84f6faf693c92cdc4ce9f49547d8b9ae7becc5f7 Mon Sep 17 00:00:00 2001 From: Sara Vieira Date: Tue, 27 Feb 2018 13:24:36 +0000 Subject: [PATCH] fix(my-joy-beta): fix section-list scrolling fixes #1266 --- .../src/components/create-instance/package.js | 2 +- .../src/components/instances/__tests__/snapshots.spec.js | 4 ++-- .../src/components/instances/__tests__/snapshots.ui.js | 4 ++-- .../my-joy-beta/src/components/instances/snapshots.js | 9 +-------- .../navigation/__tests__/__snapshots__/menu.spec.js.snap | 3 ++- .../__tests__/__snapshots__/metadata.spec.js.snap | 8 ++++---- .../src/containers/create-instance/affinity.js | 2 +- .../my-joy-beta/src/containers/create-instance/index.js | 2 +- .../src/containers/create-instance/package.js | 4 ++-- .../__tests__/__snapshots__/metadata.spec.js.snap | 8 ++++---- .../instances/__tests__/__snapshots__/tags.spec.js.snap | 4 ++-- .../my-joy-beta/src/containers/instances/metadata.js | 2 +- packages/ui-toolkit/src/key-value/index.js | 8 ++------ .../__tests__/__snapshots__/section.spec.js.snap | 3 ++- packages/ui-toolkit/src/section-list/index.js | 3 ++- 15 files changed, 29 insertions(+), 37 deletions(-) diff --git a/packages/my-joy-beta/src/components/create-instance/package.js b/packages/my-joy-beta/src/components/create-instance/package.js index 7ce1d2f2..b33a4909 100644 --- a/packages/my-joy-beta/src/components/create-instance/package.js +++ b/packages/my-joy-beta/src/components/create-instance/package.js @@ -130,7 +130,7 @@ export const Package = ({ sortBy, onRowClick }) => ( - onRowClick({ id, selected })}> + onRowClick(id)}> diff --git a/packages/my-joy-beta/src/components/instances/__tests__/snapshots.spec.js b/packages/my-joy-beta/src/components/instances/__tests__/snapshots.spec.js index fe2323b5..d87d1808 100644 --- a/packages/my-joy-beta/src/components/instances/__tests__/snapshots.spec.js +++ b/packages/my-joy-beta/src/components/instances/__tests__/snapshots.spec.js @@ -25,8 +25,8 @@ it('renders without throwing', () => { - - + +
diff --git a/packages/my-joy-beta/src/components/instances/__tests__/snapshots.ui.js b/packages/my-joy-beta/src/components/instances/__tests__/snapshots.ui.js index 2cf99ee5..d563d723 100644 --- a/packages/my-joy-beta/src/components/instances/__tests__/snapshots.ui.js +++ b/packages/my-joy-beta/src/components/instances/__tests__/snapshots.ui.js @@ -26,8 +26,8 @@ it('', async () => { - - + +
diff --git a/packages/my-joy-beta/src/components/instances/snapshots.js b/packages/my-joy-beta/src/components/instances/snapshots.js index 6e7dae54..9cc0edaf 100644 --- a/packages/my-joy-beta/src/components/instances/snapshots.js +++ b/packages/my-joy-beta/src/components/instances/snapshots.js @@ -35,14 +35,7 @@ const loadingState = { remove: 'Removing...' }; -export const Item = ({ - name, - state, - created, - onStart, - onRemove, - mutating -}) => ( +export const Item = ({ name, state, created, onStart, onRemove, mutating }) => ( {!mutating ? ( diff --git a/packages/my-joy-beta/src/components/navigation/__tests__/__snapshots__/menu.spec.js.snap b/packages/my-joy-beta/src/components/navigation/__tests__/__snapshots__/menu.spec.js.snap index 45201a63..2b12cd38 100644 --- a/packages/my-joy-beta/src/components/navigation/__tests__/__snapshots__/menu.spec.js.snap +++ b/packages/my-joy-beta/src/components/navigation/__tests__/__snapshots__/menu.spec.js.snap @@ -75,7 +75,8 @@ exports[`renders without throwing 1`] = ` padding: 0.8125rem 0rem; margin: 1.125rem 0 0 0; max-height: 50px; - overflow-x: scroll; + overflow-x: auto; + overflow-y: hidden; box-sizing: border-box; display: -webkit-inline-box; display: -webkit-inline-flex; diff --git a/packages/my-joy-beta/src/containers/create-instance/__tests__/__snapshots__/metadata.spec.js.snap b/packages/my-joy-beta/src/containers/create-instance/__tests__/__snapshots__/metadata.spec.js.snap index b156ad2b..abafee1a 100644 --- a/packages/my-joy-beta/src/containers/create-instance/__tests__/__snapshots__/metadata.spec.js.snap +++ b/packages/my-joy-beta/src/containers/create-instance/__tests__/__snapshots__/metadata.spec.js.snap @@ -3394,7 +3394,7 @@ Array [ className="c7" > - hello— + hello: world @@ -4563,7 +4563,7 @@ Array [ className="c7" > - hello2— + hello2: world2 @@ -6003,7 +6003,7 @@ Array [ className="c7" > - hello— + hello: world @@ -7191,7 +7191,7 @@ Array [ className="c7" > - hello2— + hello2: world2 diff --git a/packages/my-joy-beta/src/containers/create-instance/affinity.js b/packages/my-joy-beta/src/containers/create-instance/affinity.js index 0080fc26..42aad493 100644 --- a/packages/my-joy-beta/src/containers/create-instance/affinity.js +++ b/packages/my-joy-beta/src/containers/create-instance/affinity.js @@ -20,7 +20,7 @@ const FORM_NAME_EDIT = i => `CREATE-INSTANCE-AFFINITY-EDIT-${i}`; const RULE_DEFAULTS = { 'rule-instance-name': '', - 'rule-instance-conditional': 'must', + 'rule-instance-conditional': 'should', 'rule-instance-placement': 'same', 'rule-instance-tag-key-pattern': 'equalling', 'rule-instance-tag-value-pattern': 'equalling', diff --git a/packages/my-joy-beta/src/containers/create-instance/index.js b/packages/my-joy-beta/src/containers/create-instance/index.js index 12813c10..ebcad69e 100644 --- a/packages/my-joy-beta/src/containers/create-instance/index.js +++ b/packages/my-joy-beta/src/containers/create-instance/index.js @@ -160,7 +160,7 @@ export default compose( const error = get(form, `${CREATE_FORM}.error`, null); const name = get(form, `${FORM_NAME}.values.name`, ''); const image = get(form, 'create-instance-image.values.image', ''); - const pkg = get(form, 'create-instance-package.values.package', ''); + const pkg = get(values, 'selected-package', ''); const networks = get(form, 'CREATE-INSTANCE-NETWORKS.values', {}); const enabled = diff --git a/packages/my-joy-beta/src/containers/create-instance/package.js b/packages/my-joy-beta/src/containers/create-instance/package.js index 024292d6..f908d6d4 100644 --- a/packages/my-joy-beta/src/containers/create-instance/package.js +++ b/packages/my-joy-beta/src/containers/create-instance/package.js @@ -239,8 +239,8 @@ export default compose( handleResetFilters: () => { dispatch(destroy(`${FORM_NAME}-filters`)); }, - handleRowClick: ({ id, selected }) => { - dispatch(change(FORM_NAME, id, !selected)); + handleRowClick: id => { + dispatch(change(FORM_NAME, 'package', id)); }, handleSortBy: (newSortBy, sortOrder) => { dispatch([ diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__snapshots__/metadata.spec.js.snap b/packages/my-joy-beta/src/containers/instances/__tests__/__snapshots__/metadata.spec.js.snap index 317d303e..fe6aa438 100644 --- a/packages/my-joy-beta/src/containers/instances/__tests__/__snapshots__/metadata.spec.js.snap +++ b/packages/my-joy-beta/src/containers/instances/__tests__/__snapshots__/metadata.spec.js.snap @@ -453,7 +453,7 @@ exports[`renders without throwing 1`] = ` className="c17" > 0 - key:value pair + key-value pair s @@ -1895,7 +1895,7 @@ exports[`renders without throwing 1`] = ` className="c40" > 0 - key:value pair + key-value pair s @@ -2423,7 +2423,7 @@ exports[`renders without throwing 1`] = ` className="c22" > 0 - key:value pair + key-value pair s @@ -4422,7 +4422,7 @@ exports[`renders without throwing 1`] = ` className="c17" > 3 - key:value pair + key-value pair s diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__snapshots__/tags.spec.js.snap b/packages/my-joy-beta/src/containers/instances/__tests__/__snapshots__/tags.spec.js.snap index 9506c5e2..6f0fe6aa 100644 --- a/packages/my-joy-beta/src/containers/instances/__tests__/__snapshots__/tags.spec.js.snap +++ b/packages/my-joy-beta/src/containers/instances/__tests__/__snapshots__/tags.spec.js.snap @@ -3624,7 +3624,7 @@ exports[`renders without throwing 1`] = ` className="c23" > - name1: + name1: value1 @@ -5159,7 +5159,7 @@ exports[`renders without throwing 1`] = ` className="c23" > - name1: + name1: value1 diff --git a/packages/my-joy-beta/src/containers/instances/metadata.js b/packages/my-joy-beta/src/containers/instances/metadata.js index c86b9152..a665eedd 100644 --- a/packages/my-joy-beta/src/containers/instances/metadata.js +++ b/packages/my-joy-beta/src/containers/instances/metadata.js @@ -79,7 +79,7 @@ export const Metadata = ({ const _count = !_loading ? (

- {metadata.length} key:value pair{metadata.length === 1 ? '' : 's'} + {metadata.length} key-value pair{metadata.length === 1 ? '' : 's'}

) : null; diff --git a/packages/ui-toolkit/src/key-value/index.js b/packages/ui-toolkit/src/key-value/index.js index d183800e..2bff4de4 100644 --- a/packages/ui-toolkit/src/key-value/index.js +++ b/packages/ui-toolkit/src/key-value/index.js @@ -213,13 +213,9 @@ export const KeyValue = ({ {initialValues.name ? ( {expanded ? ( - {`${initialValues.name}${ - type === 'metadata' ? '—' : ':' - }`} + {`${initialValues.name}${': '}`} ) : ( - {`${initialValues.name}${ - type === 'metadata' ? '—' : ':' - }`} + {`${initialValues.name}${': '}`} )} {initialValues.value} diff --git a/packages/ui-toolkit/src/section-list/__tests__/__snapshots__/section.spec.js.snap b/packages/ui-toolkit/src/section-list/__tests__/__snapshots__/section.spec.js.snap index c18f9873..61a6d46c 100644 --- a/packages/ui-toolkit/src/section-list/__tests__/__snapshots__/section.spec.js.snap +++ b/packages/ui-toolkit/src/section-list/__tests__/__snapshots__/section.spec.js.snap @@ -276,7 +276,8 @@ exports[`SectionList SectionList 1`] = ` padding: 0.8125rem 0rem; margin: 1.125rem 0 0 0; max-height: 50px; - overflow-x: scroll; + overflow-x: auto; + overflow-y: hidden; box-sizing: border-box; display: -webkit-inline-box; display: -webkit-inline-flex; diff --git a/packages/ui-toolkit/src/section-list/index.js b/packages/ui-toolkit/src/section-list/index.js index 05efbf13..3cc90f1f 100644 --- a/packages/ui-toolkit/src/section-list/index.js +++ b/packages/ui-toolkit/src/section-list/index.js @@ -10,7 +10,8 @@ const UnorderedList = styled.ul` padding: ${remcalc(13)} ${remcalc(0)}; margin: ${remcalc(18)} 0 0 0; max-height: 50px; - overflow-x: scroll; + overflow-x: auto; + overflow-y: hidden; box-sizing: border-box; display: inline-flex; position: relative;