Merge remote-tracking branch 'origin/feature/shibui-2380' into featur…

…e/shibui-2380
TIER · Oct 21, 2022 · d85769f · d85769f
2 parents 03ca5bb + 1f63ada
commit d85769f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/ui/src/app/form/component/AddButton.js b/ui/src/app/form/component/AddButton.js
@@ -6,9 +6,11 @@ import Button from "react-bootstrap/Button";
 import Translate from "../../i18n/components/translate";
 
 const AddButton = ({className, ...props}) => (
+    <>
     <Button {...props} variant="success" className={`array-add-button ${ className }`} size="sm">
         <Translate value="action.add" />&nbsp; 
         <FontAwesomeIcon icon={faPlus} />
     </Button>
+    </>
 );
 export default AddButton;
diff --git a/ui/src/app/form/component/fields/StringListWithDefaultField.js b/ui/src/app/form/component/fields/StringListWithDefaultField.js
@@ -105,6 +105,7 @@ const StringListWithDefaultField = ({
                                 required={props.required}
                             />}
                             <AddButton
+                                id={`array-field-addbtn-${props.idSchema.$id}`}
                                 className="array-item-add mx-2"
                                 onClick={onAdd}
                                 disabled={props.disabled || props.readonly}

diff --git a/ui/src/app/form/component/templates/ArrayFieldTemplate.js b/ui/src/app/form/component/templates/ArrayFieldTemplate.js
@@ -220,8 +220,10 @@ const DefaultFixedArrayFieldTemplate = (props) => {
                     title={props.uiSchema["ui:title"] || props.title}
                     required={props.required}
                 />
+                hi there
                 {props.canAdd && (
                     <AddButton
+                        id={`array-field-addbtn-${props.idSchema.$id}`}
                         className="array-item-add"
                         onClick={props.onAddClick}
                         disabled={props.disabled || props.readonly}
@@ -266,6 +268,7 @@ const DefaultNormalArrayFieldTemplate = (props) => {
                     />}
                     {props.canAdd && (
                         <AddButton
+                            id={`array-field-addbtn-${props.idSchema.$id}`}
                             className="array-item-add mx-2"
                             onClick={props.onAddClick}
                             disabled={props.disabled || props.readonly}