External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-15 18:20:00 -03:30
Code Issues Packages Projects Releases Wiki Activity

Update styles to delete button to be secondary

Browse Source 
Update styles to delete button to be secondary.

See: https://github.com/ansible/awx/issues/7041
Also: https://github.com/ansible/awx/issues/7984
This commit is contained in:
nixocio
2020-08-25 10:10:52 -04:00
parent 5248ac4498
commit 6794f331c3
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui_next/src/screens/Inventory/InventoryGroupDetail/InventoryGroupDetail.jsx
View File

@@ -85,7 +85,7 @@ function InventoryGroupDetail({ i18n, inventoryGroup }) {
{i18n._(t`Edit`)} {i18n._(t`Edit`)}
</Button> </Button>
<Button <Button
variant="danger" variant="secondary"
aria-label={i18n._(t`Delete`)} aria-label={i18n._(t`Delete`)}
onClick={() => setIsDeleteModalOpen(true)} onClick={() => setIsDeleteModalOpen(true)}
> >

2
awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.jsx
View File

@@ -214,7 +214,7 @@ function InventoryGroupsList({ i18n }) {
<Tooltip content={renderTooltip()} position="top" key="delete"> <Tooltip content={renderTooltip()} position="top" key="delete">
<div> <div>
<Button <Button
variant="danger" variant="secondary"
aria-label={i18n._(t`Delete`)} aria-label={i18n._(t`Delete`)}
onClick={toggleModal} onClick={toggleModal}
isDisabled={ isDisabled={

8
awx/ui_next/src/screens/Template/Survey/SurveyList.test.jsx
View File

@@ -59,7 +59,7 @@ describe('<SurveyList />', () => {
}); });
wrapper.update(); wrapper.update();
expect(wrapper.find('Button[variant="danger"]').prop('isDisabled')).toBe( expect(wrapper.find('Button[variant="secondary"]').prop('isDisabled')).toBe(
true true
); );
expect( expect(
@@ -76,11 +76,11 @@ describe('<SurveyList />', () => {
expect( expect(
wrapper.find('Checkbox[aria-label="Select all"]').prop('isChecked') wrapper.find('Checkbox[aria-label="Select all"]').prop('isChecked')
).toBe(true); ).toBe(true);
expect(wrapper.find('Button[variant="danger"]').prop('isDisabled')).toBe( expect(wrapper.find('Button[variant="secondary"]').prop('isDisabled')).toBe(
false false
); );
act(() => { act(() => {
wrapper.find('Button[variant="danger"]').invoke('onClick')(); wrapper.find('Button[variant="secondary"]').invoke('onClick')();
}); });
wrapper.update(); wrapper.update();
@@ -148,7 +148,7 @@ describe('<SurveyList />', () => {
).toBe(true); ).toBe(true);
expect(wrapper.find('Switch').prop('isDisabled')).toBe(true); expect(wrapper.find('Switch').prop('isDisabled')).toBe(true);
expect(wrapper.find('ToolbarAddButton').prop('isDisabled')).toBe(true); expect(wrapper.find('ToolbarAddButton').prop('isDisabled')).toBe(true);
expect(wrapper.find('Button[variant="danger"]').prop('isDisabled')).toBe( expect(wrapper.find('Button[variant="secondary"]').prop('isDisabled')).toBe(
true true
); );
}); });

2
awx/ui_next/src/screens/Template/Survey/SurveyToolbar.jsx
View File

@@ -65,7 +65,7 @@ function SurveyToolbar({
</ToolbarItem> </ToolbarItem>
<ToolbarItem> <ToolbarItem>
<Button <Button
variant="danger" variant="secondary"
isDisabled={isDeleteDisabled} isDisabled={isDeleteDisabled}
onClick={() => onToggleDeleteModal(true)} onClick={() => onToggleDeleteModal(true)}
> >

6
awx/ui_next/src/screens/Template/Survey/SurveyToolbar.test.jsx
View File

@@ -21,7 +21,7 @@ describe('<SurveyToolbar />', () => {
); );
}); });
expect(wrapper.find('Button[variant="danger"]').prop('isDisabled')).toBe( expect(wrapper.find('Button[variant="secondary"]').prop('isDisabled')).toBe(
true true
); );
}); });
@@ -43,7 +43,7 @@ describe('<SurveyToolbar />', () => {
expect( expect(
wrapper.find('Checkbox[aria-label="Select all"]').prop('isChecked') wrapper.find('Checkbox[aria-label="Select all"]').prop('isChecked')
).toBe(true); ).toBe(true);
expect(wrapper.find('Button[variant="danger"]').prop('isDisabled')).toBe( expect(wrapper.find('Button[variant="secondary"]').prop('isDisabled')).toBe(
false false
); );
}); });
@@ -108,7 +108,7 @@ describe('<SurveyToolbar />', () => {
).toBe(true); ).toBe(true);
expect(wrapper.find('Switch').prop('isDisabled')).toBe(true); expect(wrapper.find('Switch').prop('isDisabled')).toBe(true);
expect(wrapper.find('ToolbarAddButton').prop('isDisabled')).toBe(true); expect(wrapper.find('ToolbarAddButton').prop('isDisabled')).toBe(true);
expect(wrapper.find('Button[variant="danger"]').prop('isDisabled')).toBe( expect(wrapper.find('Button[variant="secondary"]').prop('isDisabled')).toBe(
true true
); );
}); });