diff --git a/awx/ui/src/components/AppContainer/PageHeaderToolbar.js b/awx/ui/src/components/AppContainer/PageHeaderToolbar.js index 1d287ce9c3..cd4df94dc6 100644 --- a/awx/ui/src/components/AppContainer/PageHeaderToolbar.js +++ b/awx/ui/src/components/AppContainer/PageHeaderToolbar.js @@ -5,7 +5,6 @@ import { t } from '@lingui/macro'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; import { - Badge, Dropdown, DropdownItem, DropdownToggle, @@ -14,12 +13,10 @@ import { PageHeaderToolsGroup, PageHeaderToolsItem, Tooltip, + NotificationBadge, + NotificationBadgeVariant, } from '@patternfly/react-core'; -import { - BellIcon, - QuestionCircleIcon, - UserIcon, -} from '@patternfly/react-icons'; +import { QuestionCircleIcon, UserIcon } from '@patternfly/react-icons'; import { WorkflowApprovalsAPI } from 'api'; import useRequest from 'hooks/useRequest'; import getDocsBaseUrl from 'util/getDocsBaseUrl'; @@ -33,10 +30,6 @@ const PendingWorkflowApprovals = styled.div` margin-right: 10px; `; -const PendingWorkflowApprovalBadge = styled(Badge)` - margin-left: 10px; -`; - function PageHeaderToolbar({ isAboutDisabled, onAboutClick, @@ -84,13 +77,15 @@ function PageHeaderToolbar({ - - - {pendingApprovalsCount} - + count={pendingApprovalsCount} + variant={ + pendingApprovalsCount === 0 + ? NotificationBadgeVariant.read + : NotificationBadgeVariant.unread + } + /> diff --git a/awx/ui/src/components/AppContainer/PageHeaderToolbar.test.js b/awx/ui/src/components/AppContainer/PageHeaderToolbar.test.js index a326707c04..1fd1734c59 100644 --- a/awx/ui/src/components/AppContainer/PageHeaderToolbar.test.js +++ b/awx/ui/src/components/AppContainer/PageHeaderToolbar.test.js @@ -80,7 +80,7 @@ describe('PageHeaderToolbar', () => { }); expect( - wrapper.find('Badge#toolbar-workflow-approval-badge').text() + wrapper.find('NotificationBadge#toolbar-workflow-approval-badge').text() ).toEqual('20'); }); });