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

fxes pagination and removes console warnings

Browse Source
This commit is contained in:
Alex Corey
2021-05-07 11:26:50 -04:00
parent e1b6e1509c
commit 5a1810e191
4 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui_next/src/components/AppContainer/NavExpandableGroup.jsx
View File

@@ -59,7 +59,7 @@ class NavExpandableGroup extends Component {
NavExpandableGroup.propTypes = { NavExpandableGroup.propTypes = {
groupId: PropTypes.string.isRequired, groupId: PropTypes.string.isRequired,
groupTitle: PropTypes.string.isRequired, groupTitle: PropTypes.element.isRequired,
routes: PropTypes.arrayOf(PropTypes.object).isRequired, routes: PropTypes.arrayOf(PropTypes.object).isRequired,
}; };

1
awx/ui_next/src/components/Pagination/Pagination.jsx
View File

@@ -4,7 +4,6 @@ import {
Pagination as PFPagination, Pagination as PFPagination,
DropdownDirection, DropdownDirection,
} from '@patternfly/react-core'; } from '@patternfly/react-core';
import {} from '@lingui/core';
import { t } from '@lingui/macro'; import { t } from '@lingui/macro';
const AWXPagination = styled(PFPagination)` const AWXPagination = styled(PFPagination)`

21
awx/ui_next/src/screens/Team/TeamRoles/TeamRoleListItem.jsx
View File

@@ -5,7 +5,6 @@ import { Chip } from '@patternfly/react-core';
import { Tr, Td } from '@patternfly/react-table'; import { Tr, Td } from '@patternfly/react-table';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import { Detail } from '../../../components/DetailList';
function TeamRoleListItem({ role, detailUrl, onDisassociate }) { function TeamRoleListItem({ role, detailUrl, onDisassociate }) {
return ( return (
@@ -19,18 +18,14 @@ function TeamRoleListItem({ role, detailUrl, onDisassociate }) {
{role.summary_fields.resource_type_display_name} {role.summary_fields.resource_type_display_name}
</Td> </Td>
<Td dataLabel={t`Role`}> <Td dataLabel={t`Role`}>
<Detail <Chip
value={ key={role.name}
<Chip aria-label={role.name}
key={role.name} onClick={() => onDisassociate(role)}
aria-label={role.name} isReadOnly={!role.summary_fields.user_capabilities.unattach}
onClick={() => onDisassociate(role)} >
isReadOnly={!role.summary_fields.user_capabilities.unattach} {role.name}
> </Chip>
{role.name}
</Chip>
}
/>
</Td> </Td>
</Tr> </Tr>
); );

4
awx/ui_next/src/screens/Team/TeamRoles/TeamRolesList.jsx
View File

@@ -39,7 +39,7 @@ function TeamRolesList({ me, team }) {
request: fetchRoles, request: fetchRoles,
error: contentError, error: contentError,
result: { result: {
// roleCount, roleCount,
roles, roles,
isAdminOfOrg, isAdminOfOrg,
relatedSearchableKeys, relatedSearchableKeys,
@@ -140,7 +140,7 @@ function TeamRolesList({ me, team }) {
contentError={contentError} contentError={contentError}
hasContentLoading={isLoading || isDisassociateLoading} hasContentLoading={isLoading || isDisassociateLoading}
items={roles} items={roles}
itemCount={0} itemCount={roleCount}
pluralizedItemName={t`Team Roles`} pluralizedItemName={t`Team Roles`}
qsConfig={QS_CONFIG} qsConfig={QS_CONFIG}
toolbarSearchColumns={[ toolbarSearchColumns={[