Skip to content

Commit fc66763

Browse files
rvsiarvsia
committed
Remove key assigning in components
1 parent 3da4c23 commit fc66763

7 files changed

Lines changed: 30 additions & 14 deletions

File tree

‎packages/mui-component-mapper/src/form-fields/tabs.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import AppBar from '@material-ui/core/AppBar';
44
import Tabs from '@material-ui/core/Tabs';
55
import Tab from '@material-ui/core/Tab';
66

7-
const renderTabHeader = items => items.map(({ title, key, name }) => <Tab key={ name || key } label={ title } />);
8-
const renderTabContet = ({ key, name, fields }, formOptions) => <Fragment key={ name || key }>{ formOptions.renderForm(fields, formOptions) }</Fragment>;
7+
const renderTabHeader = items => items.map(({ title, key, name }) => <Tab key={ name } label={ title } />);
8+
const renderTabContet = ({ name, fields }, formOptions) => <Fragment key={ name }>{ formOptions.renderForm(fields, formOptions) }</Fragment>;
99

1010
class FormTabs extends Component {
1111
state = {

‎packages/pf3-component-mapper/src/form-fields/tabs.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ import get from 'lodash/get';
33
import PropTypes from 'prop-types';
44
import { TabContainer, Nav, NavItem, TabContent, TabPane, Icon } from 'patternfly-react';
55

6-
const renderTabHeader = (items, formOptions) => items.map(({ title, key, name, validateFields = []}, index) => {
6+
const renderTabHeader = (items, formOptions) => items.map(({ title, name, validateFields = []}, index) => {
77
const errors = formOptions.getState().errors;
88
const hasError = validateFields.find(name => !!get(errors, name));
99
return (
10-
<NavItem key={ name || key } eventKey={ index }>
10+
<NavItem key={ name } eventKey={ index }>
1111
{ hasError && <Icon style={{ marginRight: 8, color: '#CC0000' }} type="fa" name="exclamation-circle" /> }
1212
{ title }
1313
</NavItem>
1414
);
1515
});
1616
const renderTabContent = (items, formOptions) =>
17-
items.map(({ key, name, fields }, index) =>
18-
<TabPane key={ name || key } eventKey={ index } >{ formOptions.renderForm(fields, formOptions) }</TabPane>);
17+
items.map(({ name, fields }, index) =>
18+
<TabPane key={ name } eventKey={ index } >{ formOptions.renderForm(fields, formOptions) }</TabPane>);
1919

2020
const FormTabs = ({ fields, formOptions }) => (
2121
<TabContainer id="basic-tabs-pf" defaultActiveKey={ 0 }>

‎packages/pf4-component-mapper/src/form-fields/multiple-choice-list.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ FinalCheckbox.propTypes = {
1717
const Wrapper = ({ showError, isRequired, helperText, label, meta, children, rest }) =>(
1818
<FormGroup
1919
label={ label }
20-
fieldId={ rest.id || rest.key || rest.name }
20+
fieldId={ rest.name }
2121
isValid={ !showError }
2222
isRequired={ isRequired }
2323
helperText={ helperText }

‎packages/pf4-component-mapper/src/form-fields/tabs.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ class FormTabs extends React.Component {
1717
});
1818
};
1919

20-
renderTabItems = (fields, formOptions) => fields.map(({ key, fields, title, name }, index) => (
21-
<Tab key={ name || key } eventKey={ index } title={ title }>
20+
renderTabItems = (fields, formOptions) => fields.map(({ fields, title, name }, index) => (
21+
<Tab key={ name } eventKey={ index } title={ title }>
2222
<div className='pf-c-form'>
2323
{ formOptions.renderForm(fields, formOptions) }
2424
</div>

‎packages/pf4-component-mapper/src/tests/__snapshots__/form-fields.test.js.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ exports[`FormFields should render Checkbox with options correctly 1`] = `
295295
showError={false}
296296
>
297297
<FormGroup
298-
fieldId="someIdKey"
298+
fieldId="Name of the field"
299299
helperTextInvalid={false}
300300
isValid={true}
301301
>
@@ -1643,7 +1643,7 @@ exports[`FormFields should render disabled Checkbox with options correctly 1`] =
16431643
showError={false}
16441644
>
16451645
<FormGroup
1646-
fieldId="someIdKey"
1646+
fieldId="Name of the field"
16471647
helperTextInvalid={false}
16481648
isValid={true}
16491649
>

‎packages/pf4-component-mapper/src/tests/sub-form.test.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ describe('SubForm component', () => {
99
name: 'cosiName',
1010
fields: [],
1111
formOptions: {
12-
renderForm: (fields, formOptions) => <div>{ 'Here would be form' }</div>,
12+
renderForm: () => <div>Here would be form</div>,
1313
},
1414
};
1515

@@ -29,8 +29,8 @@ describe('SubForm component', () => {
2929
});
3030

3131
it('should render SubForm without title correctly', () => {
32-
const { key, name, fields, formOptions } = props;
33-
const propsWithoutTitle = { key, name, fields, formOptions };
32+
const { name, fields, formOptions } = props;
33+
const propsWithoutTitle = { name, fields, formOptions };
3434
const wrapper = shallow(
3535
<SubForm { ...propsWithoutTitle } />
3636
);

‎packages/pf4-component-mapper/src/tests/wizard/wizard.test.js‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -652,6 +652,7 @@ describe('<Wizard />', () => {
652652
fields: [{
653653
title: FIRST_TITLE,
654654
stepKey: 1,
655+
name: 'first-step',
655656
nextStep: {
656657
when: 'source.source-type',
657658
stepMapper: {
@@ -668,6 +669,7 @@ describe('<Wizard />', () => {
668669
title: SECOND_TITLE_AWS,
669670
stepKey: 'aws',
670671
nextStep: 'summary',
672+
name: 'second-step-aws',
671673
fields: [{
672674
component: componentTypes.TEXT_FIELD,
673675
name: 'aws-field',
@@ -677,6 +679,7 @@ describe('<Wizard />', () => {
677679
title: SECOND_TITLE_GOOLE,
678680
stepKey: 'google',
679681
nextStep: 'summary',
682+
name: 'second-step-google',
680683
fields: [{
681684
component: componentTypes.TEXT_FIELD,
682685
name: 'google.google-field',
@@ -685,6 +688,7 @@ describe('<Wizard />', () => {
685688
}, {
686689
title: THIRD_TITLE,
687690
fields: [],
691+
name: 'summary',
688692
stepKey: 'summary',
689693
}],
690694
}],
@@ -765,6 +769,7 @@ describe('<Wizard />', () => {
765769
fields: [{
766770
title: FIRST_TITLE,
767771
stepKey: 1,
772+
name: 'first-step',
768773
nextStep: {
769774
when: 'source.source-type',
770775
stepMapper: {
@@ -780,6 +785,7 @@ describe('<Wizard />', () => {
780785
title: SECOND_TITLE_AWS,
781786
stepKey: 'aws',
782787
nextStep: 'summary',
788+
name: 'aws',
783789
fields: [{
784790
component: componentTypes.TEXT_FIELD,
785791
name: 'aws-field',
@@ -823,6 +829,7 @@ describe('<Wizard />', () => {
823829
fields: [{
824830
title: FIRST_TITLE,
825831
stepKey: 1,
832+
name: 'first-step',
826833
nextStep: NEXTSTEP_FUNCTION,
827834
fields: [{
828835
name: 'source.source-type',
@@ -833,6 +840,7 @@ describe('<Wizard />', () => {
833840
title: SECOND_TITLE_AWS,
834841
stepKey: 'aws',
835842
nextStep: 'summary',
843+
name: 'aws',
836844
fields: [{
837845
component: componentTypes.TEXT_FIELD,
838846
name: 'aws-field',
@@ -879,6 +887,7 @@ describe('<Wizard />', () => {
879887
title: FIRST_TITLE,
880888
stepKey: 1,
881889
nextStep: 'aws',
890+
name: 'first-step',
882891
disableForwardJumping: true,
883892
fields: [{
884893
name: 'source.source-type',
@@ -889,6 +898,7 @@ describe('<Wizard />', () => {
889898
title: SECOND_TITLE_AWS,
890899
stepKey: 'aws',
891900
nextStep: 'summary',
901+
name: 'aws',
892902
fields: [{
893903
component: componentTypes.TEXT_FIELD,
894904
name: 'aws-field',
@@ -931,6 +941,7 @@ describe('<Wizard />', () => {
931941
fields: [{
932942
title: 'first-step',
933943
stepKey: 1,
944+
name: 'first-step',
934945
nextStep: {
935946
when: 'source.source-type',
936947
stepMapper: {
@@ -946,12 +957,14 @@ describe('<Wizard />', () => {
946957
}, {
947958
title: 'second-step',
948959
stepKey: 'aws',
960+
name: 'aws',
949961
nextStep: 'summary',
950962
fields: [],
951963
},
952964
{
953965
title: 'summary',
954966
stepKey: 'summary',
967+
name: 'summary',
955968
fields: [],
956969
}],
957970
}],
@@ -1018,6 +1031,7 @@ describe('<Wizard />', () => {
10181031
fields: [{
10191032
title: 'first-step',
10201033
stepKey: 1,
1034+
name: 'first-step',
10211035
nextStep: {
10221036
when: 'source.source-type',
10231037
stepMapper: {
@@ -1035,11 +1049,13 @@ describe('<Wizard />', () => {
10351049
title: 'second-step',
10361050
stepKey: 'aws',
10371051
nextStep: 'summary',
1052+
name: 'aws',
10381053
fields: [],
10391054
},
10401055
{
10411056
title: 'summary',
10421057
stepKey: 'summary',
1058+
name: 'summary',
10431059
fields: [],
10441060
}],
10451061
}],

0 commit comments

Comments
 (0)