yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2026-01-07 12:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply feedback

Browse Source
This commit is contained in:
Rémi de Juvigny 2021-09-14 11:40:26 +02:00
parent 4157fcc331
commit b002e21ff5
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/plugins/users-permissions/admin/src/hooks/useFetchRole/index.js
View File

@ -1,6 +1,7 @@
import { useCallback, useReducer, useEffect, useRef } from 'react';
import { request, useNotification } from '@strapi/helper-plugin';
import { useNotification } from '@strapi/helper-plugin';
import reducer, { initialState } from './reducer';
import axiosIntance from '../../utils/axiosInstance';
import pluginId from '../../pluginId';
const useFetchRole = id => {
@ -26,7 +27,9 @@ const useFetchRole = id => {
const fetchRole = async roleId => {
try {
const { role } = await request(`/${pluginId}/roles/${roleId}`, { method: 'GET' });
const {
data: { role },
} = await axiosIntance.get(`/${pluginId}/roles/${roleId}`);
// Prevent updating state on an unmounted component
if (isMounted.current) {

6
packages/plugins/users-permissions/admin/src/pages/Roles/EditPage/index.js
View File

@ -108,7 +108,7 @@ const EditPage = () => {
paddingRight={7}
>
<Stack size={4}>
<H3>
<H3 as="h2">
{formatMessage({
id: getTrad('EditPage.form.roles'),
defaultMessage: 'Role details',
@ -126,7 +126,7 @@ const EditPage = () => {
})}
error={
errors.name
? formatMessage({ id: errors.name, defaultMessage: errors.name })
? formatMessage({ id: errors.name, defaultMessage: 'Invalid value' })
: null
}
/>
@ -144,7 +144,7 @@ const EditPage = () => {
errors.description
? formatMessage({
id: errors.description,
defaultMessage: errors.description,
defaultMessage: 'Invalid value',
})
: null
}

11
packages/plugins/users-permissions/admin/src/pages/Roles/EditPage/tests/index.test.js
View File

@ -30,11 +30,8 @@ jest.mock('../../../../hooks', () => {
function makeAndRenderApp() {
const history = createMemoryHistory();
const messages = {
'components.Input.error.validation.required': 'This value is required.',
};
const app = (
<IntlProvider locale="en" messages={messages} textComponent="span">
<IntlProvider locale="en" messages={{ en: {} }} textComponent="span">
<ThemeProvider theme={lightTheme}>
<Router history={history}>
<Switch>
@ -570,11 +567,11 @@ describe('Admin | containers | RoleEditPage', () => {
<div
class="c16"
>
<h3
<h2
class="c17"
>
Role details
</h3>
</h2>
<div
class="c7 c18"
>
@ -688,7 +685,7 @@ describe('Admin | containers | RoleEditPage', () => {
// Show errors after form submit
await userEvent.click(saveButton);
await waitFor(() => expect(saveButton).not.toBeDisabled());
const errorMessages = await getAllByText(/this value is required/i);
const errorMessages = await getAllByText(/invalid value/i);
errorMessages.forEach(errorMessage => expect(errorMessage).toBeInTheDocument());
});
});