Merge pull request #7003 from skateman/ddf-button-labels

Merge default button labels properly with the custom ones in DDF
ManageIQ · Apr 28, 2020 · b063402 · b063402
2 parents 158ca6f + a0175ca
commit b063402
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/app/javascript/forms/data-driven-form.jsx b/app/javascript/forms/data-driven-form.jsx
@@ -14,14 +14,8 @@ Validators.messages = {
   required: __('Required'),
 };
 
-const buttonLabels = {
-  submitLabel: __('Save'),
-  resetLabel: __('Reset'),
-  cancelLabel: __('Cancel'),
-};
-
 const MiqFormRenderer = ({
-  className, setPristine, onStateUpdate, formFieldsMapper, ...props
+  className, setPristine, onStateUpdate, formFieldsMapper, buttonsLabels, ...props
 }) => (
   <FormRender
     formFieldsMapper={formFieldsMapper}
@@ -39,7 +33,12 @@ const MiqFormRenderer = ({
         onStateUpdate(formOptions);
       }
     }}
-    {...buttonLabels}
+    buttonsLabels={{
+      submitLabel: __('Save'),
+      resetLabel: __('Reset'),
+      cancelLabel: __('Cancel'),
+      ...buttonsLabels,
+    }}
     {...props}
   />
 );
@@ -49,12 +48,14 @@ MiqFormRenderer.propTypes = {
   onStateUpdate: PropTypes.func,
   setPristine: PropTypes.func.isRequired,
   formFieldsMapper: PropTypes.any,
+  buttonsLabels: PropTypes.any,
 };
 
 MiqFormRenderer.defaultProps = {
   className: 'form-react',
   onStateUpdate: undefined,
   formFieldsMapper: defaultFormFieldsMapper,
+  buttonsLabels: {},
 };
 
 const mapDispatchToProps = dispatch => bindActionCreators({ setPristine }, dispatch);