From 7a1e9744fc9b7ac6ff3d3613158870847cd91524 Mon Sep 17 00:00:00 2001
From: Martin Marosi <marvusm.mmi@gmail.com>
Date: Mon, 5 Aug 2019 10:49:29 +0200
Subject: [PATCH 1/2] fix(pf3): Removed anonymous component from pf3-mapper.

---
 .../src/form-fields/button.js                 |  4 +-
 .../src/form-fields/form-fields.js            |  1 +
 .../src/form-fields/layout-components.js      | 65 ++++++++++++++-----
 .../src/form-fields/multiple-choice-list.js   | 12 +++-
 .../tests/__snapshots__/wizard.test.js.snap   | 48 +++++++-------
 5 files changed, 87 insertions(+), 43 deletions(-)

diff --git a/packages/pf3-component-mapper/src/form-fields/button.js b/packages/pf3-component-mapper/src/form-fields/button.js
index 3f4230671..d48bfa127 100644
--- a/packages/pf3-component-mapper/src/form-fields/button.js
+++ b/packages/pf3-component-mapper/src/form-fields/button.js
@@ -1,4 +1,6 @@
 import React from 'react';
 import { Button } from 'patternfly-react';
 
-export default (props) => <Button style={{ marginLeft: 3 }} { ...props } />;
+const ButtonOverride = (props) => <Button style={{ marginLeft: 3 }} { ...props } />;
+
+export default ButtonOverride;
diff --git a/packages/pf3-component-mapper/src/form-fields/form-fields.js b/packages/pf3-component-mapper/src/form-fields/form-fields.js
index c1a0606c6..d8035aedb 100644
--- a/packages/pf3-component-mapper/src/form-fields/form-fields.js
+++ b/packages/pf3-component-mapper/src/form-fields/form-fields.js
@@ -106,6 +106,7 @@ FinalFormField.propTypes = {
   description: PropTypes.string,
   hideLabel: PropTypes.bool,
   isVisible: PropTypes.bool,
+  noCheckboxLabel: PropTypes.bool,
 };
 
 const CheckboxGroupField = ({ options, ...rest }) =>
diff --git a/packages/pf3-component-mapper/src/form-fields/layout-components.js b/packages/pf3-component-mapper/src/form-fields/layout-components.js
index 03d413441..975560db2 100644
--- a/packages/pf3-component-mapper/src/form-fields/layout-components.js
+++ b/packages/pf3-component-mapper/src/form-fields/layout-components.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import { layoutComponents } from '@data-driven-forms/react-form-renderer';
 import { FormGroup, ButtonGroup, Icon, HelpBlock, Form } from 'patternfly-react';
 import Button from './button';
@@ -12,25 +13,57 @@ const ArrayFieldWrapper = ({ children }) => (
   </div>
 );
 
+const FormWapper = ({ children, ...props }) => <Form { ...props } >{ children }</Form>;
+
+FormWapper.propTypes = {
+  children: PropTypes.oneOfType([ PropTypes.node, PropTypes.arrayOf(PropTypes.node) ]).isRequired,
+};
+
+const FormButton = ({ label, variant, children, ...props }) => <Button bsStyle={ variant } { ...props }>{ label || children }</Button>;
+
+FormButton.propTypes = {
+  label: PropTypes.oneOfType([ PropTypes.string, PropTypes.node, PropTypes.arrayOf(PropTypes.node) ]),
+  variant: PropTypes.string,
+  children: PropTypes.oneOfType([ PropTypes.node, PropTypes.arrayOf(PropTypes.node) ]),
+};
+
+const ButtonGroupWrapper = ({ children, ...props }) => (
+  <ButtonGroup
+    className="pull-right"
+    style={{ display: 'inline-block' }}
+    { ...props }
+  >
+    { children }
+  </ButtonGroup>
+);
+
+ButtonGroupWrapper.propTypes = {
+  children: PropTypes.oneOfType([ PropTypes.node, PropTypes.arrayOf(PropTypes.node) ]).isRequired,
+};
+
+const TitleWrapper = ({ children }) => <h3>{ children }</h3>;
+
+TitleWrapper.propTypes = {
+  children: PropTypes.oneOfType([ PropTypes.node, PropTypes.arrayOf(PropTypes.node) ]).isRequired,
+};
+
+const DescriptionWrapper = ({ children }) => <p>{ children }</p>;
+
+DescriptionWrapper.propTypes = {
+  children: PropTypes.oneOfType([ PropTypes.node, PropTypes.arrayOf(PropTypes.node) ]).isRequired,
+};
+
 const layoutMapper = {
-  [layoutComponents.FORM_WRAPPER]: ({ children, ...props }) => <Form { ...props } >{ children }</Form>,
-  [layoutComponents.BUTTON]: ({ label, variant, children, ...props }) => <Button bsStyle={ variant } { ...props }>{ label || children }</Button>,
-  [layoutComponents.COL]: ({ children, xs, ...rest }) => <div key={ rest.key || rest.name }>{ children }</div>,
+  [layoutComponents.FORM_WRAPPER]: FormWapper,
+  [layoutComponents.BUTTON]: FormButton,
+  [layoutComponents.COL]: ({ children, xs, ...rest }) => <div key={ rest.key || rest.name }>{ children }</div>, // TO BE removed
   [layoutComponents.FORM_GROUP]: FormGroup,
-  [layoutComponents.BUTTON_GROUP]: ({ children, ...props }) => (
-    <ButtonGroup
-      className="pull-right"
-      style={{ display: 'inline-block' }}
-      { ...props }
-    >
-      { children }
-    </ButtonGroup>
-  ),
-  [layoutComponents.ICON]: props => <Icon { ...props } />,
-  [layoutComponents.ARRAY_FIELD_WRAPPER]: ArrayFieldWrapper,
+  [layoutComponents.BUTTON_GROUP]: ButtonGroupWrapper,
+  [layoutComponents.ICON]: props => <Icon { ...props } />, // TO BE removed
+  [layoutComponents.ARRAY_FIELD_WRAPPER]: ArrayFieldWrapper, // TO BE removed
   [layoutComponents.HELP_BLOCK]: HelpBlock,
-  [layoutComponents.TITLE]: ({ children }) => <h3>{ children }</h3>,
-  [layoutComponents.DESCRIPTION]: ({ children }) => <p>{ children }</p>,
+  [layoutComponents.TITLE]: TitleWrapper,
+  [layoutComponents.DESCRIPTION]: DescriptionWrapper,
 };
 
 export default layoutMapper;
diff --git a/packages/pf3-component-mapper/src/form-fields/multiple-choice-list.js b/packages/pf3-component-mapper/src/form-fields/multiple-choice-list.js
index 750e8b0e5..a49e9881a 100644
--- a/packages/pf3-component-mapper/src/form-fields/multiple-choice-list.js
+++ b/packages/pf3-component-mapper/src/form-fields/multiple-choice-list.js
@@ -1,8 +1,10 @@
 import React from 'react';
-import RequiredLabel from './required-label';
-import { Checkbox, Col, FormGroup, ControlLabel } from 'patternfly-react';
+import PropTypes from 'prop-types';
+import { Checkbox,  FormGroup, ControlLabel } from 'patternfly-react';
 import { composeValidators } from '@data-driven-forms/react-form-renderer';
 
+import RequiredLabel from './required-label';
+
 const MultipleChoiceList = ({ validate, FieldProvider, ...props }) => (
   <FieldProvider { ...props } validate={ composeValidators(props.validate || []) }>
     { ({
@@ -56,4 +58,10 @@ const MultipleChoiceList = ({ validate, FieldProvider, ...props }) => (
   </FieldProvider>
 );
 
+MultipleChoiceList.propTypes = {
+  validate: PropTypes.func,
+  FieldProvider: PropTypes.oneOfType([ PropTypes.node, PropTypes.func ]),
+  name: PropTypes.string.isRequired,
+};
+
 export default MultipleChoiceList;
diff --git a/packages/pf3-component-mapper/src/tests/__snapshots__/wizard.test.js.snap b/packages/pf3-component-mapper/src/tests/__snapshots__/wizard.test.js.snap
index 19af6e240..f5c1fcb1b 100644
--- a/packages/pf3-component-mapper/src/tests/__snapshots__/wizard.test.js.snap
+++ b/packages/pf3-component-mapper/src/tests/__snapshots__/wizard.test.js.snap
@@ -141,7 +141,7 @@ exports[`<Wizard /> should render Wizard correctly 1`] = `
           <div
             className="wizard-pf-footer modal-footer"
           >
-            <_default
+            <ButtonOverride
               color="secondary"
               onClick={[MockFunction]}
               style={
@@ -184,8 +184,8 @@ exports[`<Wizard /> should render Wizard correctly 1`] = `
                   Cancel
                 </button>
               </Button>
-            </_default>
-            <_default
+            </ButtonOverride>
+            <ButtonOverride
               disabled={true}
               onClick={[Function]}
               type="button"
@@ -234,7 +234,7 @@ exports[`<Wizard /> should render Wizard correctly 1`] = `
                   Back
                 </button>
               </Button>
-            </_default>
+            </ButtonOverride>
             <SimpleNext
               FieldProvider={[Function]}
               buttonLabels={
@@ -253,7 +253,7 @@ exports[`<Wizard /> should render Wizard correctly 1`] = `
               submit={[Function]}
               valid={true}
             >
-              <_default
+              <ButtonOverride
                 bsStyle="primary"
                 onClick={[Function]}
                 type="button"
@@ -299,7 +299,7 @@ exports[`<Wizard /> should render Wizard correctly 1`] = `
                     </Icon>
                   </button>
                 </Button>
-              </_default>
+              </ButtonOverride>
             </SimpleNext>
           </div>
         </ModalFooter>
@@ -469,7 +469,7 @@ exports[`<Wizard /> should render Wizard with conditional steps correctly 1`] =
           <div
             className="wizard-pf-footer modal-footer"
           >
-            <_default
+            <ButtonOverride
               color="secondary"
               onClick={[MockFunction]}
               style={
@@ -512,8 +512,8 @@ exports[`<Wizard /> should render Wizard with conditional steps correctly 1`] =
                   Cancel
                 </button>
               </Button>
-            </_default>
-            <_default
+            </ButtonOverride>
+            <ButtonOverride
               disabled={true}
               onClick={[Function]}
               type="button"
@@ -562,7 +562,7 @@ exports[`<Wizard /> should render Wizard with conditional steps correctly 1`] =
                   Back
                 </button>
               </Button>
-            </_default>
+            </ButtonOverride>
             <ConditionalNext
               FieldProvider={[Function]}
               buttonLabels={
@@ -612,7 +612,7 @@ exports[`<Wizard /> should render Wizard with conditional steps correctly 1`] =
                   submit={[Function]}
                   valid={true}
                 >
-                  <_default
+                  <ButtonOverride
                     bsStyle="primary"
                     onClick={[Function]}
                     type="button"
@@ -658,7 +658,7 @@ exports[`<Wizard /> should render Wizard with conditional steps correctly 1`] =
                         </Icon>
                       </button>
                     </Button>
-                  </_default>
+                  </ButtonOverride>
                 </SimpleNext>
               </MockFieldProvider>
             </ConditionalNext>
@@ -915,7 +915,7 @@ exports[`<Wizard /> should render Wizard with stepsInfo correctly 1`] = `
           <div
             className="wizard-pf-footer modal-footer"
           >
-            <_default
+            <ButtonOverride
               color="secondary"
               onClick={[MockFunction]}
               style={
@@ -958,8 +958,8 @@ exports[`<Wizard /> should render Wizard with stepsInfo correctly 1`] = `
                   Cancel
                 </button>
               </Button>
-            </_default>
-            <_default
+            </ButtonOverride>
+            <ButtonOverride
               disabled={true}
               onClick={[Function]}
               type="button"
@@ -1008,7 +1008,7 @@ exports[`<Wizard /> should render Wizard with stepsInfo correctly 1`] = `
                   Back
                 </button>
               </Button>
-            </_default>
+            </ButtonOverride>
             <SimpleNext
               FieldProvider={[Function]}
               buttonLabels={
@@ -1027,7 +1027,7 @@ exports[`<Wizard /> should render Wizard with stepsInfo correctly 1`] = `
               submit={[Function]}
               valid={true}
             >
-              <_default
+              <ButtonOverride
                 bsStyle="primary"
                 onClick={[Function]}
                 type="button"
@@ -1073,7 +1073,7 @@ exports[`<Wizard /> should render Wizard with stepsInfo correctly 1`] = `
                     </Icon>
                   </button>
                 </Button>
-              </_default>
+              </ButtonOverride>
             </SimpleNext>
           </div>
         </ModalFooter>
@@ -1245,7 +1245,7 @@ exports[`<Wizard /> should render Wizard with title correctly 1`] = `
           <div
             className="wizard-pf-footer modal-footer"
           >
-            <_default
+            <ButtonOverride
               color="secondary"
               onClick={[MockFunction]}
               style={
@@ -1288,8 +1288,8 @@ exports[`<Wizard /> should render Wizard with title correctly 1`] = `
                   Cancel
                 </button>
               </Button>
-            </_default>
-            <_default
+            </ButtonOverride>
+            <ButtonOverride
               disabled={true}
               onClick={[Function]}
               type="button"
@@ -1338,7 +1338,7 @@ exports[`<Wizard /> should render Wizard with title correctly 1`] = `
                   Back
                 </button>
               </Button>
-            </_default>
+            </ButtonOverride>
             <SimpleNext
               FieldProvider={[Function]}
               buttonLabels={
@@ -1357,7 +1357,7 @@ exports[`<Wizard /> should render Wizard with title correctly 1`] = `
               submit={[Function]}
               valid={true}
             >
-              <_default
+              <ButtonOverride
                 bsStyle="primary"
                 onClick={[Function]}
                 type="button"
@@ -1403,7 +1403,7 @@ exports[`<Wizard /> should render Wizard with title correctly 1`] = `
                     </Icon>
                   </button>
                 </Button>
-              </_default>
+              </ButtonOverride>
             </SimpleNext>
           </div>
         </ModalFooter>

From c02965d99e5d90c458898611ee931ab29ffbb624 Mon Sep 17 00:00:00 2001
From: Martin Marosi <marvusm.mmi@gmail.com>
Date: Mon, 5 Aug 2019 11:01:44 +0200
Subject: [PATCH 2/2] fix(pf4): fixed-pf4-prop-assignemt

---
 .../src/form-fields/multiple-choice-list.js              | 1 +
 .../src/form-fields/select/select.js                     | 9 +++------
 packages/pf4-component-mapper/src/form-fields/tabs.js    | 3 +++
 .../pf4-component-mapper/src/tests/select/select.test.js | 8 +++-----
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/packages/pf4-component-mapper/src/form-fields/multiple-choice-list.js b/packages/pf4-component-mapper/src/form-fields/multiple-choice-list.js
index fbc97c397..aac04189f 100644
--- a/packages/pf4-component-mapper/src/form-fields/multiple-choice-list.js
+++ b/packages/pf4-component-mapper/src/form-fields/multiple-choice-list.js
@@ -6,6 +6,7 @@ import { composeValidators } from '@data-driven-forms/react-form-renderer';
 const propTypes = {
   validate: PropTypes.oneOfType([ PropTypes.array, PropTypes.func ]),
   FieldProvider: PropTypes.oneOfType([ PropTypes.node, PropTypes.func ]),
+  name: PropTypes.string.isRequired,
 };
 
 const MultipleChoiceList = ({ validate, FieldProvider, ...props }) => (
diff --git a/packages/pf4-component-mapper/src/form-fields/select/select.js b/packages/pf4-component-mapper/src/form-fields/select/select.js
index 9de0dc2b2..1ef8146c3 100644
--- a/packages/pf4-component-mapper/src/form-fields/select/select.js
+++ b/packages/pf4-component-mapper/src/form-fields/select/select.js
@@ -109,9 +109,8 @@ Select.defaultProps = {
   loadingMessage: 'Loading...',
 };
 
-const DataDrivenSelect = ({ input, multi, ...props }) => (
+const DataDrivenSelect = ({ multi, ...props }) => (
   <Select
-    { ...input }
     hideSelectedOptions={ false }
     isMulti={ multi }
     { ...props }
@@ -120,10 +119,8 @@ const DataDrivenSelect = ({ input, multi, ...props }) => (
 );
 
 DataDrivenSelect.propTypes = {
-  input: PropTypes.shape({
-    value: PropTypes.any,
-    onChange: PropTypes.func,
-  }).isRequired,
+  value: PropTypes.any,
+  onChange: PropTypes.func,
   multi: PropTypes.bool,
   placeholder: PropTypes.string,
 };
diff --git a/packages/pf4-component-mapper/src/form-fields/tabs.js b/packages/pf4-component-mapper/src/form-fields/tabs.js
index 0dbb56bff..c6bb2857b 100644
--- a/packages/pf4-component-mapper/src/form-fields/tabs.js
+++ b/packages/pf4-component-mapper/src/form-fields/tabs.js
@@ -38,6 +38,9 @@ FormTabs.propTypes = {
   formOptions: PropTypes.shape({
     renderForm: PropTypes.func.isRequired,
   }).isRequired,
+  dataType: PropTypes.any,
+  FieldProvider: PropTypes.any,
+  validate: PropTypes.any,
 };
 
 export default FormTabs;
diff --git a/packages/pf4-component-mapper/src/tests/select/select.test.js b/packages/pf4-component-mapper/src/tests/select/select.test.js
index 3004f51af..09c471de2 100644
--- a/packages/pf4-component-mapper/src/tests/select/select.test.js
+++ b/packages/pf4-component-mapper/src/tests/select/select.test.js
@@ -109,11 +109,9 @@ describe('<Select />', () => {
     const props = {
       multi: true,
       options: [{ label: 'a', value: 1 }, { label: 'b', value: 2 }],
-      input: {
-        name: 'foo',
-        onChange: Function,
-        value: [ 1, 2 ],
-      },
+      name: 'foo',
+      onChange: Function,
+      value: [ 1, 2 ],
     };
     const wrapper = mount(<DataDrivenSelect { ...props }/>);
     const mappedProps = wrapper.find(Select).props();