yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-03 19:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix PR feedback

Browse Source 
Signed-off-by: soupette <cyril.lpz@gmail.com>
This commit is contained in:
soupette 2020-06-02 10:33:41 +02:00 committed by Alexandre Bodin
parent 664be7d2db
commit e941ab8fae
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/strapi-admin/admin/src/components/Users/SelectRoles/index.js
View File

@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import Select from 'react-select'; import Select from 'react-select';
import { Padded } from '@buffetjs/core'; import { Padded } from '@buffetjs/core';
import { useGlobalContext } from 'strapi-helper-plugin'; import { useGlobalContext } from 'strapi-helper-plugin';
import { useFetchRole } from '../../../hooks'; import { useRolesList } from '../../../hooks';
import styles from './utils/styles'; import styles from './utils/styles';
import ClearIndicator from './ClearIndicator'; import ClearIndicator from './ClearIndicator';
import DropdownIndicator from './DropdownIndicator'; import DropdownIndicator from './DropdownIndicator';
@ -14,7 +14,7 @@ import MultiValueContainer from './MultiValueContainer';
const SelectRoles = ({ error, isDisabled, name, onChange, value }) => { const SelectRoles = ({ error, isDisabled, name, onChange, value }) => {
const { formatMessage } = useGlobalContext(); const { formatMessage } = useGlobalContext();
const translatedError = error && error.id ? formatMessage(error) : null; const translatedError = error && error.id ? formatMessage(error) : null;
const { data, isLoading } = useFetchRole(); const { roles: data, isLoading } = useRolesList();
return ( return (
<> <>

1
packages/strapi-admin/admin/src/hooks/index.js
View File

@ -1,2 +1,3 @@
export { default as useFetchRole } from './useFetchRole'; export { default as useFetchRole } from './useFetchRole';
export { default as useRolesList } from './useRolesList';
export { default as useFetchPermissionsLayout } from './useFetchPermissionsLayout'; export { default as useFetchPermissionsLayout } from './useFetchPermissionsLayout';

2
packages/strapi-admin/admin/src/hooks/useFetchRole/index.js
View File

@ -14,7 +14,7 @@ const useFetchRole = id => {
const fetchRole = async roleId => { const fetchRole = async roleId => {
try { try {
const requestURL = roleId ? `/admin/roles/${roleId}` : '/admin/roles'; const requestURL = `/admin/roles/${roleId}`;
const { data } = await request(requestURL, { method: 'GET' }); const { data } = await request(requestURL, { method: 'GET' });