Merge pull request #1149 from steverhoades/remove-delete-all-when-minItems-set

fix(pf4): Field-Array no longer shows delete all when minItems has a …

Author: rvsia

packages/pf4-component-mapper/src/field-array/field-array.js

@@ -95,13 +95,15 @@ const DynamicArray = ({ ...props }) => {
               titleDescription={description}
               actions={
                 <React.Fragment>
-                  <Button
-                    variant="link"
-                    isDisabled={value.length === 0}
-                    {...(value.length !== 0 && { onClick: () => removeBatch(value.map((_, index) => index)) })}
-                  >
-                    {combinedButtonLabels.removeAll}
-                  </Button>
+                  {minItems === 0 && (
+                    <Button
+                      variant="link"
+                      isDisabled={value.length === 0}
+                      {...(value.length !== 0 && { onClick: () => removeBatch(value.map((_, index) => index)) })}
+                    >
+                      {combinedButtonLabels.removeAll}
+                    </Button>
+                  )}
                   <Button
                     variant="secondary"
                     isDisabled={value.length >= maxItems}

packages/pf4-component-mapper/src/tests/field-array.test.js

@@ -306,7 +306,7 @@ describe('<FieldArray/>', () => {
     });
 
     await act(async () => {
-      wrapper.find('button').at(1).simulate('click');
+      wrapper.find('button').at(0).simulate('click');
     });
     wrapper.update();
 
@@ -321,7 +321,7 @@ describe('<FieldArray/>', () => {
     onSubmit.mockClear();
 
     await act(async () => {
-      wrapper.find('button').at(1).simulate('click');
+      wrapper.find('button').at(0).simulate('click');
     });
     wrapper.update();
 
@@ -336,7 +336,7 @@ describe('<FieldArray/>', () => {
     onSubmit.mockClear();
 
     await act(async () => {
-      wrapper.find('button').at(1).simulate('click');
+      wrapper.find('button').at(0).simulate('click');
     });
     wrapper.update();