@strapi/strapi 4.5.1 → 4.5.3

package/lib/core/domain/content-type/index.js

@@ -54,7 +54,7 @@ const createContentType = (uid, definition) => {
     });
   } else {
     throw new Error(
-      `Incorrect Content Type UID "${uid}". The UID should start with api::, plugin:: or strapi::.`
+      `Incorrect Content Type UID "${uid}". The UID should start with api::, plugin:: or admin::.`
     );
   }
 

package/lib/services/entity-service/index.js

@@ -134,17 +134,20 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
     // TODO: wrap into transaction
     const componentData = await createComponents(uid, validData);
 
+    const entityData = creationPipeline(
+      Object.assign(omitComponentData(model, validData), componentData),
+      {
+        contentType: model,
+      }
+    );
     let entity = await db.query(uid).create({
       ...query,
-      data: creationPipeline(Object.assign(omitComponentData(model, validData), componentData), {
-        contentType: model,
-      }),
+      data: entityData,
     });
 
     // TODO: upload the files then set the links in the entity like with compo to avoid making too many queries
-    // FIXME: upload in components
     if (files && Object.keys(files).length > 0) {
-      await this.uploadFiles(uid, entity, files);
+      await this.uploadFiles(uid, Object.assign(entityData, entity), files);
       entity = await this.findOne(uid, entity.id, wrappedParams);
     }
 
@@ -180,19 +183,22 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
 
     // TODO: wrap in transaction
     const componentData = await updateComponents(uid, entityToUpdate, validData);
+    const entityData = updatePipeline(
+      Object.assign(omitComponentData(model, validData), componentData),
+      {
+        contentType: model,
+      }
+    );
 
     let entity = await db.query(uid).update({
       ...query,
       where: { id: entityId },
-      data: updatePipeline(Object.assign(omitComponentData(model, validData), componentData), {
-        contentType: model,
-      }),
+      data: entityData,
     });
 
     // TODO: upload the files then set the links in the entity like with compo to avoid making too many queries
-    // FIXME: upload in components
     if (files && Object.keys(files).length > 0) {
-      await this.uploadFiles(uid, entity, files);
+      await this.uploadFiles(uid, Object.assign(entityData, entity), files);
       entity = await this.findOne(uid, entity.id, wrappedParams);
     }
 

package/lib/services/entity-validator/index.js

@@ -5,8 +5,8 @@
 
 'use strict';
 
-const { uniqBy, castArray, isNil } = require('lodash');
-const { has, assoc, prop, isObject, isEmpty, merge } = require('lodash/fp');
+const { uniqBy, castArray, isNil, isArray, mergeWith } = require('lodash');
+const { has, assoc, prop, isObject, isEmpty } = require('lodash/fp');
 const strapiUtils = require('@strapi/utils');
 const validators = require('./validators');
 
@@ -247,9 +247,14 @@ const createValidateEntity =
  * @returns {Object}
  */
 const buildRelationsStore = ({ uid, data }) => {
+  if (!uid) {
+    throw new ValidationError(`Cannot build relations store: "uid" is undefined`);
+  }
+
   if (isEmpty(data)) {
     return {};
   }
+
   const currentModel = strapi.getModel(uid);
 
   return Object.keys(currentModel.attributes).reduce((result, attributeName) => {
@@ -290,12 +295,17 @@ const buildRelationsStore = ({ uid, data }) => {
       case 'component': {
         return castArray(value).reduce(
           (relationsStore, componentValue) =>
-            merge(
+            mergeWith(
               relationsStore,
               buildRelationsStore({
                 uid: attribute.component,
                 data: componentValue,
-              })
+              }),
+              (objValue, srcValue) => {
+                if (isArray(objValue)) {
+                  return objValue.concat(srcValue);
+                }
+              }
             ),
           result
         );
@@ -303,12 +313,17 @@ const buildRelationsStore = ({ uid, data }) => {
       case 'dynamiczone': {
         return value.reduce(
           (relationsStore, dzValue) =>
-            merge(
+            mergeWith(
               relationsStore,
               buildRelationsStore({
                 uid: dzValue.__component,
                 data: dzValue,
-              })
+              }),
+              (objValue, srcValue) => {
+                if (isArray(objValue)) {
+                  return objValue.concat(srcValue);
+                }
+              }
             ),
           result
         );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.5.1",
+  "version": "4.5.3",
   "description": "An open source headless CMS solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier. Databases supported: MySQL, MariaDB, PostgreSQL, SQLite",
   "keywords": [
     "strapi",
@@ -80,18 +80,18 @@
   "dependencies": {
     "@koa/cors": "3.4.3",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.5.1",
-    "@strapi/database": "4.5.1",
-    "@strapi/generate-new": "4.5.1",
-    "@strapi/generators": "4.5.1",
-    "@strapi/logger": "4.5.1",
-    "@strapi/permissions": "4.5.1",
-    "@strapi/plugin-content-manager": "4.5.1",
-    "@strapi/plugin-content-type-builder": "4.5.1",
-    "@strapi/plugin-email": "4.5.1",
-    "@strapi/plugin-upload": "4.5.1",
-    "@strapi/typescript-utils": "4.5.1",
-    "@strapi/utils": "4.5.1",
+    "@strapi/admin": "4.5.3",
+    "@strapi/database": "4.5.3",
+    "@strapi/generate-new": "4.5.3",
+    "@strapi/generators": "4.5.3",
+    "@strapi/logger": "4.5.3",
+    "@strapi/permissions": "4.5.3",
+    "@strapi/plugin-content-manager": "4.5.3",
+    "@strapi/plugin-content-type-builder": "4.5.3",
+    "@strapi/plugin-email": "4.5.3",
+    "@strapi/plugin-upload": "4.5.3",
+    "@strapi/typescript-utils": "4.5.3",
+    "@strapi/utils": "4.5.3",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -128,7 +128,7 @@
     "package-json": "7.0.0",
     "qs": "6.10.1",
     "resolve-cwd": "3.0.0",
-    "semver": "7.3.7",
+    "semver": "7.3.8",
     "statuses": "2.0.1",
     "uuid": "^8.3.2"
   },
@@ -140,5 +140,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "8c20ea2b5c5a115b78454086ea270dcd59b06004"
+  "gitHead": "5453885f7aa329f98d047a6030a8e98ba3cbdb41"
 }