yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-30 01:17:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: issue 20747

Browse Source
This commit is contained in:
Alexandre Bodin 2024-08-26 20:54:42 +02:00
parent 860584b10c
commit 587fe5d570
1 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
packages/core/content-releases/admin/src/pages/ReleaseDetailsPage.tsx
View File

@ -14,6 +14,7 @@ import {
isFetchError,
useStrapiApp,
Layouts,
FormErrors,
} from '@strapi/admin/strapi-admin';
import { unstable_useDocument } from '@strapi/content-manager/strapi-admin';
import {
@ -145,6 +146,42 @@ const EntryValidationText = ({ action, schema, entry, status }: EntryValidationT
}
);
const errorsToString = (errors: FormErrors, prefix: string = ''): string => {
if (Object.keys(errors).length === 0) {
return '';
}
return Object.entries(errors)
.map(([key, value]) => {
if (value === undefined || value === null) {
return '';
}
if (typeof value === 'string') {
return formatMessage(
{ id: value, defaultMessage: value },
{ field: prefix ? `${prefix}.${key}` : key }
);
}
if (
typeof value === 'object' &&
value !== null &&
'id' in value &&
'defaultMessage' in value
) {
return formatMessage(
// @ts-expect-error – TODO: default message will be a string
{ id: `${value.id}.withField`, defaultMessage: value.defaultMessage },
{ field: prefix ? `${prefix}.${key}` : key }
);
}
return errorsToString(value as FormErrors, key);
})
.join(' ');
};
if (isLoading) {
return null;
}
@ -153,15 +190,7 @@ const EntryValidationText = ({ action, schema, entry, status }: EntryValidationT
if (action === 'publish') {
if (Object.keys(errors).length > 0) {
const validationErrorsMessages = Object.entries(errors)
.map(([key, value]) =>
formatMessage(
// @ts-expect-error – TODO: fix this will better checks
{ id: `${value.id}.withField`, defaultMessage: value.defaultMessage },
{ field: key }
)
)
.join(' ');
const validationErrorsMessages = errorsToString(errors);
return (
<Flex gap={2}>