yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-17 20:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

SettingsPage: Fix prop-types

Browse Source
This commit is contained in:
Gustav Hansen 2022-10-21 14:46:30 +02:00
parent 1ffabc219a
commit 756c4bcc04
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/ListPage/components/RoleRow/index.js
View File

@ -8,7 +8,7 @@ import { IconButton } from '@strapi/design-system/IconButton';
import { stopPropagation, onRowClick, pxToRem } from '@strapi/helper-plugin'; import { stopPropagation, onRowClick, pxToRem } from '@strapi/helper-plugin';
import { useIntl } from 'react-intl'; import { useIntl } from 'react-intl';
const RoleRow = ({ id, name, description, usersCount, icons }) => { const RoleRow = ({ id, name, description, usersCount, icons, rowIndex }) => {
const { formatMessage } = useIntl(); const { formatMessage } = useIntl();
const usersCountText = formatMessage( const usersCountText = formatMessage(
@ -21,6 +21,7 @@ const RoleRow = ({ id, name, description, usersCount, icons }) => {
return ( return (
<Tr <Tr
aria-rowindex={rowIndex}
key={id} key={id}
{...onRowClick({ {...onRowClick({
fn: icons[1].onClick, fn: icons[1].onClick,
@ -60,6 +61,7 @@ RoleRow.propTypes = {
description: PropTypes.string.isRequired, description: PropTypes.string.isRequired,
usersCount: PropTypes.number.isRequired, usersCount: PropTypes.number.isRequired,
icons: PropTypes.array.isRequired, icons: PropTypes.array.isRequired,
rowIndex: PropTypes.number.isRequired,
}; };
export default RoleRow; export default RoleRow;

3
packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/ListPage/index.js
View File

@ -168,7 +168,7 @@ const RoleListPage = () => {
</Tr> </Tr>
</Thead> </Thead>
<Tbody> <Tbody>
{sortedRoles?.map((role) => ( {sortedRoles?.map((role, rowIndex) => (
<RoleRow <RoleRow
key={role.id} key={role.id}
id={role.id} id={role.id}
@ -176,6 +176,7 @@ const RoleListPage = () => {
description={role.description} description={role.description}
usersCount={role.usersCount} usersCount={role.usersCount}
icons={getIcons(role)} icons={getIcons(role)}
rowIndex={rowIndex + 2}
/> />
))} ))}
</Tbody> </Tbody>

5
packages/core/admin/ee/admin/pages/SettingsPage/pages/Roles/ListPage/index.js
View File

@ -303,7 +303,7 @@ const RoleListPage = () => {
} }
> >
<Thead> <Thead>
<Tr> <Tr aria-rowindex={1}>
<Th> <Th>
<Typography variant="sigma" textColor="neutral600"> <Typography variant="sigma" textColor="neutral600">
{formatMessage({ {formatMessage({
@ -339,7 +339,7 @@ const RoleListPage = () => {
</Tr> </Tr>
</Thead> </Thead>
<Tbody> <Tbody>
{sortedRoles?.map((role) => ( {sortedRoles?.map((role, index) => (
<BaseRoleRow <BaseRoleRow
key={role.id} key={role.id}
id={role.id} id={role.id}
@ -347,6 +347,7 @@ const RoleListPage = () => {
description={role.description} description={role.description}
usersCount={role.usersCount} usersCount={role.usersCount}
icons={getIcons(role)} icons={getIcons(role)}
rowIndex={index + 2}
/> />
))} ))}
</Tbody> </Tbody>