yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-17 18:51:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix toast message

Browse Source 
Signed-off-by: soupette <cyril@strapi.io>
This commit is contained in:
soupette 2021-09-28 10:03:26 +02:00
parent 907979acd3
commit 6cefdaaf11
4 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/core/admin/admin/src/components/Notifications/Notification/index.js
View File

@ -6,7 +6,7 @@ import { Link } from '@strapi/parts/Link';
const Notification = ({ dispatch, notification }) => { const Notification = ({ dispatch, notification }) => {
const { formatMessage } = useIntl(); const { formatMessage } = useIntl();
const { message, link, type, id, onClose, timeout, blockTransition, title } = notification; const { message, link, type, id, onClose, timeout, blockTransition } = notification;
const formattedMessage = msg => (typeof msg === 'string' ? msg : formatMessage(msg, msg.values)); const formattedMessage = msg => (typeof msg === 'string' ? msg : formatMessage(msg, msg.values));
const handleClose = useCallback(() => { const handleClose = useCallback(() => {
@ -56,10 +56,6 @@ const Notification = ({ dispatch, notification }) => {
variant = 'success'; variant = 'success';
} }
if (title) {
alertTitle = title;
}
return ( return (
<Alert <Alert
action={ action={
@ -97,7 +93,6 @@ Notification.defaultProps = {
}, },
onClose: () => null, onClose: () => null,
timeout: 2500, timeout: 2500,
title: null,
blockTransition: false, blockTransition: false,
}, },
}; };
@ -126,7 +121,6 @@ Notification.propTypes = {
}), }),
]).isRequired, ]).isRequired,
}), }),
title: PropTypes.string,
type: PropTypes.string, type: PropTypes.string,
onClose: PropTypes.func, onClose: PropTypes.func,
timeout: PropTypes.number, timeout: PropTypes.number,

1
packages/core/admin/admin/src/components/Notifications/reducer.js
View File

@ -14,7 +14,6 @@ const notificationReducer = (state = initialState, action) =>
draftState.notifications.push({ draftState.notifications.push({
// No action.config spread to limit the notification API and avoid customization // No action.config spread to limit the notification API and avoid customization
id: state.notifId, id: state.notifId,
title: action.config.title || null,
type: get(action, ['config', 'type'], 'success'), type: get(action, ['config', 'type'], 'success'),
message: get(action, ['config', 'message'], { message: get(action, ['config', 'message'], {
id: 'notification.success.saved', id: 'notification.success.saved',

1
packages/core/admin/admin/src/components/Notifications/tests/reducer.test.js
View File

@ -30,7 +30,6 @@ describe('ADMIN | COMPONENTS | NOTIFICATIONS | reducer', () => {
notifications: [ notifications: [
{ {
id: 0, id: 0,
title: null,
type: 'success', type: 'success',
message: { id: 'notification.message' }, message: { id: 'notification.message' },
link: null, link: null,

7
packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js
View File

@ -304,12 +304,13 @@ const EditViewDataManagerProvider = ({
console.error(err); console.error(err);
errors = getYupInnerErrors(err); errors = getYupInnerErrors(err);
const firstError = Object.keys(errors)[0];
toggleNotification({ toggleNotification({
type: 'warning', type: 'warning',
title: `${firstError}:`, message: {
message: errors[firstError], id: getTrad('containers.EditView.notification.errors'),
defaultMessage: 'The form contains some errors',
},
}); });
} }