diff --git a/awx/ui_next/src/components/DataListToolbar/DataListToolbar.test.jsx b/awx/ui_next/src/components/DataListToolbar/DataListToolbar.test.jsx
index 1734b19ae9..b8b83ee6e2 100644
--- a/awx/ui_next/src/components/DataListToolbar/DataListToolbar.test.jsx
+++ b/awx/ui_next/src/components/DataListToolbar/DataListToolbar.test.jsx
@@ -180,10 +180,10 @@ describe('', () => {
integerFields: ['page', 'page_size', 'id'],
};
- const downNumericIconSelector = 'SortNumericDownIcon';
- const upNumericIconSelector = 'SortNumericUpIcon';
- const downAlphaIconSelector = 'SortAlphaDownIcon';
- const upAlphaIconSelector = 'SortAlphaUpIcon';
+ const forwardNumericIconSelector = 'SortNumericDownIcon';
+ const reverseNumericIconSelector = 'SortNumericDownAltIcon';
+ const forwardAlphaIconSelector = 'SortAlphaDownIcon';
+ const reverseAlphaIconSelector = 'SortAlphaDownAltIcon';
const numericColumns = [{ name: 'ID', key: 'id' }];
@@ -202,8 +202,8 @@ describe('', () => {
/>
);
- const downNumericIcon = toolbar.find(downNumericIconSelector);
- expect(downNumericIcon.length).toBe(1);
+ const reverseNumericIcon = toolbar.find(reverseNumericIconSelector);
+ expect(reverseNumericIcon.length).toBe(1);
toolbar = mountWithContexts(
', () => {
/>
);
- const upNumericIcon = toolbar.find(upNumericIconSelector);
- expect(upNumericIcon.length).toBe(1);
+ const forwardNumericIcon = toolbar.find(forwardNumericIconSelector);
+ expect(forwardNumericIcon.length).toBe(1);
toolbar = mountWithContexts(
', () => {
/>
);
- const downAlphaIcon = toolbar.find(downAlphaIconSelector);
- expect(downAlphaIcon.length).toBe(1);
+ const reverseAlphaIcon = toolbar.find(reverseAlphaIconSelector);
+ expect(reverseAlphaIcon.length).toBe(1);
toolbar = mountWithContexts(
', () => {
/>
);
- const upAlphaIcon = toolbar.find(upAlphaIconSelector);
- expect(upAlphaIcon.length).toBe(1);
+ const forwardAlphaIcon = toolbar.find(forwardAlphaIconSelector);
+ expect(forwardAlphaIcon.length).toBe(1);
});
test('should render additionalControls', () => {
diff --git a/awx/ui_next/src/components/Sort/Sort.jsx b/awx/ui_next/src/components/Sort/Sort.jsx
index 700679fc2a..79e4eda02f 100644
--- a/awx/ui_next/src/components/Sort/Sort.jsx
+++ b/awx/ui_next/src/components/Sort/Sort.jsx
@@ -14,9 +14,9 @@ import {
} from '@patternfly/react-core';
import {
SortAlphaDownIcon,
- SortAlphaUpIcon,
+ SortAlphaDownAltIcon,
SortNumericDownIcon,
- SortNumericUpIcon,
+ SortNumericDownAltIcon,
} from '@patternfly/react-icons';
import { parseQueryString } from '@util/qs';
@@ -117,10 +117,12 @@ class Sort extends React.Component {
let SortIcon;
if (isNumeric) {
SortIcon =
- sortOrder === 'ascending' ? SortNumericUpIcon : SortNumericDownIcon;
+ sortOrder === 'ascending'
+ ? SortNumericDownIcon
+ : SortNumericDownAltIcon;
} else {
SortIcon =
- sortOrder === 'ascending' ? SortAlphaUpIcon : SortAlphaDownIcon;
+ sortOrder === 'ascending' ? SortAlphaDownIcon : SortAlphaDownAltIcon;
}
return (
diff --git a/awx/ui_next/src/components/Sort/Sort.test.jsx b/awx/ui_next/src/components/Sort/Sort.test.jsx
index 40792e732a..1764cf0298 100644
--- a/awx/ui_next/src/components/Sort/Sort.test.jsx
+++ b/awx/ui_next/src/components/Sort/Sort.test.jsx
@@ -170,10 +170,10 @@ describe('', () => {
});
test('It displays correct sort icon', () => {
- const downNumericIconSelector = 'SortNumericDownIcon';
- const upNumericIconSelector = 'SortNumericUpIcon';
- const downAlphaIconSelector = 'SortAlphaDownIcon';
- const upAlphaIconSelector = 'SortAlphaUpIcon';
+ const forwardNumericIconSelector = 'SortNumericDownIcon';
+ const reverseNumericIconSelector = 'SortNumericDownAltIcon';
+ const forwardAlphaIconSelector = 'SortAlphaDownIcon';
+ const reverseAlphaIconSelector = 'SortAlphaDownAltIcon';
const qsConfigNumDown = {
namespace: 'item',
@@ -208,15 +208,15 @@ describe('', () => {
/>
);
- const downNumericIcon = sort.find(downNumericIconSelector);
- expect(downNumericIcon.length).toBe(1);
+ const reverseNumericIcon = sort.find(reverseNumericIconSelector);
+ expect(reverseNumericIcon.length).toBe(1);
sort = mountWithContexts(
);
- const upNumericIcon = sort.find(upNumericIconSelector);
- expect(upNumericIcon.length).toBe(1);
+ const forwardNumericIcon = sort.find(forwardNumericIconSelector);
+ expect(forwardNumericIcon.length).toBe(1);
sort = mountWithContexts(
', () => {
/>
);
- const downAlphaIcon = sort.find(downAlphaIconSelector);
- expect(downAlphaIcon.length).toBe(1);
+ const reverseAlphaIcon = sort.find(reverseAlphaIconSelector);
+ expect(reverseAlphaIcon.length).toBe(1);
sort = mountWithContexts(
);
- const upAlphaIcon = sort.find(upAlphaIconSelector);
- expect(upAlphaIcon.length).toBe(1);
+ const forwardAlphaIcon = sort.find(forwardAlphaIconSelector);
+ expect(forwardAlphaIcon.length).toBe(1);
});
});