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

Merge pull request #7988 from nixocio/add_more_styles_delete_button

Browse Source 
Update styles to delete button to be secondary 

Reviewed-by: Michael Abashian
             https://github.com/mabashian
This commit is contained in:
softwarefactory-project-zuul[bot] 2020-08-26 14:02:46 +00:00 committed by GitHub
commit 96e1920d36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 10 deletions
Show Stats 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`)}
</Button>
<Button
variant="danger"
variant="secondary"
aria-label={i18n._(t`Delete`)}
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">
<div>
<Button
variant="danger"
variant="secondary"
aria-label={i18n._(t`Delete`)}
onClick={toggleModal}
isDisabled={

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

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

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

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