@strapi/utils 4.3.0-beta.2 → 4.3.2-alpha.0

package/lib/convert-query-params.js

@@ -4,7 +4,7 @@
  * Converts the standard Strapi REST query params to a more usable format for querying
  * You can read more here: https://docs.strapi.io/developer-docs/latest/developer-resources/database-apis-reference/rest-api.html#filters
  */
-const { has, isEmpty, isObject, isPlainObject, cloneDeep, get } = require('lodash/fp');
+const { has, isEmpty, isObject, isPlainObject, cloneDeep, get, mergeAll } = require('lodash/fp');
 const _ = require('lodash');
 const parseType = require('./parse-type');
 const contentTypesUtils = require('./content-types');
@@ -170,17 +170,13 @@ const convertPopulateObject = (populate, schema) => {
     // FIXME: This is a temporary solution for dynamic zones that should be
     // fixed when we'll implement a more accurate way to query them
     if (attribute.type === 'dynamiczone') {
-      const generatedFakeDynamicZoneSchema = {
-        uid: `${schema.uid}.${key}`,
-        attributes: attribute.components
-          .sort()
-          .map(uid => strapi.getModel(uid).attributes)
-          .reduce((acc, componentAttributes) => ({ ...acc, ...componentAttributes }), {}),
-      };
+      const populates = attribute.components
+        .map(uid => strapi.getModel(uid))
+        .map(schema => convertNestedPopulate(subPopulate, schema));
 
       return {
         ...acc,
-        [key]: convertNestedPopulate(subPopulate, generatedFakeDynamicZoneSchema),
+        [key]: mergeAll(populates),
       };
     }
 

package/lib/sanitize/visitors/remove-restricted-relations.js

@@ -2,8 +2,9 @@
 
 const ACTIONS_TO_VERIFY = ['find'];
 
-// FIXME: Support populating creator fields
-module.exports = auth => async ({ data, key, attribute }, { remove, set }) => {
+const { CREATED_BY_ATTRIBUTE, UPDATED_BY_ATTRIBUTE } = require('../../content-types').constants;
+
+module.exports = auth => async ({ data, key, attribute, schema }, { remove, set }) => {
   const isRelation = attribute.type === 'relation';
 
   if (!isRelation) {
@@ -42,16 +43,22 @@ module.exports = auth => async ({ data, key, attribute }, { remove, set }) => {
   };
 
   const isMorphRelation = attribute.relation.toLowerCase().startsWith('morph');
+  const isCreatorRelation = [CREATED_BY_ATTRIBUTE, UPDATED_BY_ATTRIBUTE].includes(key);
 
   // Polymorphic relations
   if (isMorphRelation) {
     await handleMorphRelation();
+    return;
   }
 
-  // Regular relations
-  else {
-    await handleRegularRelation();
+  // Creator relations
+  if (isCreatorRelation && schema.options.populateCreatorFields) {
+    // do nothing
+    return;
   }
+
+  // Regular relations
+  await handleRegularRelation();
 };
 
 const hasAccessToSomeScopes = async (scopes, auth) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/utils",
-  "version": "4.3.0-beta.2",
+  "version": "4.3.2-alpha.0",
   "description": "Shared utilities for the Strapi packages",
   "keywords": [
     "strapi",
@@ -45,5 +45,5 @@
     "node": ">=14.19.1 <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "42aba356ad1b0751584d3b375e83baa4a2c18f65"
+  "gitHead": "8ab2db1497c3a5a805173b2d92248648b40a6f65"
 }