yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-27 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3768 from strapi/fix/edit-group

Browse Source 
Fix bug when editing an existing entry that did not have a group
This commit is contained in:
Alexandre BODIN 2019-08-12 11:18:12 +02:00 committed by GitHub
commit cf3df913e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/strapi-plugin-content-manager/admin/src/components/Group/index.js
View File

@ -1,7 +1,7 @@
import React, { useEffect, useReducer, memo } from 'react';
import PropTypes from 'prop-types';
import { FormattedMessage } from 'react-intl';
import { get } from 'lodash';
import { get, size } from 'lodash';
import pluginId from '../../pluginId';
import { useEditView } from '../../contexts/EditView';
@ -72,7 +72,7 @@ function Group({
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [didCheckErrors]);
const groupValueLength = groupValue.length;
const groupValueLength = size(groupValue);
return (
<>

4
packages/strapi-plugin-content-manager/admin/src/containers/EditView/utils/formatData.js
View File

@ -54,7 +54,9 @@ export const cleanData = (retrievedData, ctLayout, groupLayouts) => {
})
: value;
} else {
cleanedData = recursiveCleanData(value, groupLayouts[group]);
cleanedData = value
? recursiveCleanData(value, groupLayouts[group])
: value;
}
break;
default:

4
packages/strapi-plugin-content-manager/admin/src/containers/EditView/utils/schema.js
View File

@ -62,7 +62,9 @@ const createYupSchema = (model, { groups }) => {
? yup.array().of(groupSchema)
: groupSchema;
groupSchema =
attribute.required === true ? groupSchema.defined() : groupSchema;
attribute.required === true
? groupSchema.defined()
: groupSchema.nullable();
acc[current] = groupSchema;
}
return acc;