Merge branch 'develop' into group/tests

packages/strapi-hook-mongoose/lib/mount-models.js

@@ -20,6 +20,7 @@ module.exports = ({ models, target, plugin = false }, ctx) => {
     // Set the default values to model settings.
     _.defaults(definition, {
       primaryKey: '_id',
+      primaryKeyType: 'string',
     });
 
     if (!plugin) {

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

@@ -63,7 +63,11 @@ const createYupSchema = (model, { groups }) => {
 };
 const createYupSchemaAttribute = (type, validations) => {
   let schema = yup.mixed();
-  if (['string', 'text', 'email', 'password', 'enumeration'].includes(type)) {
+  if (
+    ['string', 'text', 'richtext', 'email', 'password', 'enumeration'].includes(
+      type
+    )
+  ) {
     schema = yup.string();
   }
   if (type === 'json') {
@@ -103,6 +107,7 @@ const createYupSchemaAttribute = (type, validations) => {
   if (['date', 'datetime'].includes(type)) {
     schema = yup.date().typeError();
   }
+
   Object.keys(validations).forEach(validation => {
     const validationValue = validations[validation];
     if (

packages/strapi-plugin-content-manager/services/ContentTypes.js

@@ -58,9 +58,6 @@ module.exports = {
     return {
       ...pickSchemaFields(contentType),
       attributes: {
-        [contentType.primaryKey]: {
-          type: contentType.primaryKeyType,
-        },
         id: {
           type: contentType.primaryKeyType,
         },