@strapi/strapi 4.11.2 → 4.11.4

package/lib/commands/actions/telemetry/disable/action.js

@@ -28,14 +28,19 @@ const writePackageJSON = async (path, file, spacing) => {
 
 const sendEvent = async (uuid) => {
   try {
+    const event = 'didOptOutTelemetry';
+
     await fetch('https://analytics.strapi.io/api/v2/track', {
       method: 'POST',
       body: JSON.stringify({
-        event: 'didOptOutTelemetry',
+        event,
         deviceId: machineID(),
         groupProperties: { projectId: uuid },
       }),
-      headers: { 'Content-Type': 'application/json' },
+      headers: {
+        'Content-Type': 'application/json',
+        'X-Strapi-Event': event,
+      },
     });
   } catch (e) {
     // ...

package/lib/commands/actions/telemetry/enable/action.js

@@ -53,14 +53,19 @@ const generateNewPackageJSON = (packageObj) => {
 
 const sendEvent = async (uuid) => {
   try {
+    const event = 'didOptInTelemetry';
+
     await fetch('https://analytics.strapi.io/api/v2/track', {
       method: 'POST',
       body: JSON.stringify({
-        event: 'didOptInTelemetry',
+        event,
         deviceId: machineID(),
         groupProperties: { projectId: uuid },
       }),
-      headers: { 'Content-Type': 'application/json' },
+      headers: {
+        'Content-Type': 'application/json',
+        'X-Strapi-Event': event,
+      },
     });
   } catch (e) {
     // ...

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

@@ -322,6 +322,95 @@ const deleteComponents = async (uid, entityToDelete, { loadComponents = true } =
   }
 };
 
+const cloneComponents = async (uid, entityToClone, data) => {
+  const { attributes = {} } = strapi.getModel(uid);
+
+  const componentBody = {};
+  const componentData = await getComponents(uid, entityToClone);
+
+  for (const attributeName of Object.keys(attributes)) {
+    const attribute = attributes[attributeName];
+
+    // If the attribute is not set or on the component to clone, skip it
+    if (!has(attributeName, data) && !has(attributeName, componentData)) {
+      continue;
+    }
+
+    if (attribute.type === 'component') {
+      const { component: componentUID, repeatable = false } = attribute;
+
+      const componentValue = has(attributeName, data)
+        ? data[attributeName]
+        : componentData[attributeName];
+
+      if (componentValue === null) {
+        continue;
+      }
+
+      if (repeatable === true) {
+        if (!Array.isArray(componentValue)) {
+          throw new Error('Expected an array to create repeatable component');
+        }
+
+        // MySQL/MariaDB can cause deadlocks here if concurrency higher than 1
+        const components = await mapAsync(
+          componentValue,
+          (value) => cloneComponent(componentUID, value),
+          { concurrency: isDialectMySQL() ? 1 : Infinity }
+        );
+
+        componentBody[attributeName] = components.filter(_.negate(_.isNil)).map(({ id }) => {
+          return {
+            id,
+            __pivot: {
+              field: attributeName,
+              component_type: componentUID,
+            },
+          };
+        });
+      } else {
+        const component = await cloneComponent(componentUID, componentValue);
+        componentBody[attributeName] = component && {
+          id: component.id,
+          __pivot: {
+            field: attributeName,
+            component_type: componentUID,
+          },
+        };
+      }
+
+      continue;
+    }
+
+    if (attribute.type === 'dynamiczone') {
+      const dynamiczoneValues = has(attributeName, data)
+        ? data[attributeName]
+        : componentData[attributeName];
+
+      if (!Array.isArray(dynamiczoneValues)) {
+        throw new Error('Expected an array to create repeatable component');
+      }
+      // MySQL/MariaDB can cause deadlocks here if concurrency higher than 1
+      componentBody[attributeName] = await mapAsync(
+        dynamiczoneValues,
+        async (value) => {
+          const { id } = await cloneComponent(value.__component, value);
+          return {
+            id,
+            __component: value.__component,
+            __pivot: {
+              field: attributeName,
+            },
+          };
+        },
+        { concurrency: isDialectMySQL() ? 1 : Infinity }
+      );
+      continue;
+    }
+  }
+
+  return componentBody;
+};
 /** *************************
     Component queries
 ************************** */
@@ -377,6 +466,26 @@ const deleteComponent = async (uid, componentToDelete) => {
   await strapi.query(uid).delete({ where: { id: componentToDelete.id } });
 };
 
+const cloneComponent = async (uid, data) => {
+  const model = strapi.getModel(uid);
+
+  if (!has('id', data)) {
+    return createComponent(uid, data);
+  }
+
+  const componentData = await cloneComponents(uid, { id: data.id }, data);
+  const transform = pipe(
+    // Make sure we don't save the component with a pre-defined ID
+    omit('id'),
+    // Remove the component data from the original data object ...
+    (payload) => omitComponentData(model, payload),
+    // ... and assign the newly created component instead
+    assign(componentData)
+  );
+
+  return strapi.query(uid).clone(data.id, { data: transform(data) });
+};
+
 module.exports = {
   omitComponentData,
   getComponents,
@@ -384,4 +493,5 @@ module.exports = {
   updateComponents,
   deleteComponents,
   deleteComponent,
+  cloneComponents,
 };

package/lib/services/entity-service/index.d.ts

@@ -84,6 +84,11 @@ export interface EntityService {
     entityId: ID,
     params: Params<T>
   ): Promise<any>;
+  clone<K extends keyof AllTypes, T extends AllTypes[K]>(
+    uid: K,
+    cloneId: ID,
+    params: Params<T>
+  ): Promise<any>;
 }
 
 export default function (opts: {

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

@@ -16,6 +16,7 @@ const {
   createComponents,
   updateComponents,
   deleteComponents,
+  cloneComponents,
 } = require('./components');
 const { pickSelectionParams } = require('./params');
 const { applyTransforms } = require('./attributes');
@@ -267,6 +268,55 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
     return entityToDelete;
   },
 
+  async clone(uid, cloneId, opts) {
+    const wrappedParams = await this.wrapParams(opts, { uid, action: 'clone' });
+    const { data, files } = wrappedParams;
+
+    const model = strapi.getModel(uid);
+
+    const entityToClone = await db.query(uid).findOne({ where: { id: cloneId } });
+
+    if (!entityToClone) {
+      return null;
+    }
+    const isDraft = contentTypesUtils.isDraft(entityToClone, model);
+
+    const validData = await entityValidator.validateEntityUpdate(
+      model,
+      data,
+      {
+        isDraft,
+      },
+      entityToClone
+    );
+    const query = transformParamsToQuery(uid, pickSelectionParams(wrappedParams));
+
+    // TODO: wrap into transaction
+    const componentData = await cloneComponents(uid, entityToClone, validData);
+
+    const entityData = creationPipeline(
+      Object.assign(omitComponentData(model, validData), componentData),
+      {
+        contentType: model,
+      }
+    );
+
+    let entity = await db.query(uid).clone(cloneId, {
+      ...query,
+      data: entityData,
+    });
+
+    // TODO: upload the files then set the links in the entity like with compo to avoid making too many queries
+    if (files && Object.keys(files).length > 0) {
+      await this.uploadFiles(uid, Object.assign(entityData, entity), files);
+      entity = await this.findOne(uid, entity.id, wrappedParams);
+    }
+
+    const { ENTRY_CREATE } = ALLOWED_WEBHOOK_EVENTS;
+    await this.emitEvent(uid, ENTRY_CREATE, entity);
+
+    return entity;
+  },
   // FIXME: used only for the CM to be removed
   async deleteMany(uid, opts) {
     const wrappedParams = await this.wrapParams(opts, { uid, action: 'delete' });

package/lib/services/metrics/sender.js

@@ -77,7 +77,7 @@ module.exports = (strapi) => {
           ...payload.groupProperties,
         },
       }),
-      ..._.merge({}, defaultQueryOpts, opts),
+      ..._.merge({ headers: { 'X-Strapi-Event': event } }, defaultQueryOpts, opts),
     };
 
     try {

package/lib/types/core/attributes/date.d.ts

@@ -8,6 +8,6 @@ export type Date = Attribute.OfType<'date'> &
   Attribute.RequiredOption &
   Attribute.UniqueOption;
 
-export type DateValue = Date;
+export type DateValue = globalThis.Date | string;
 
 export type GetDateValue<T extends Attribute.Attribute> = T extends Date ? DateValue : never;

package/lib/utils/success.js

@@ -17,13 +17,17 @@ try {
     process.env.npm_config_global === 'true' ||
     JSON.parse(process.env.npm_config_argv).original.includes('global')
   ) {
+    const event = 'didInstallStrapi';
     fetch('https://analytics.strapi.io/api/v2/track', {
       method: 'POST',
       body: JSON.stringify({
-        event: 'didInstallStrapi',
+        event,
         deviceId: machineID(),
       }),
-      headers: { 'Content-Type': 'application/json' },
+      headers: {
+        'Content-Type': 'application/json',
+        'X-Strapi-Event': event,
+      },
     }).catch(() => {});
   }
 } catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.11.2",
+  "version": "4.11.4",
   "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",
@@ -81,19 +81,19 @@
   "dependencies": {
     "@koa/cors": "3.4.3",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.11.2",
-    "@strapi/data-transfer": "4.11.2",
-    "@strapi/database": "4.11.2",
-    "@strapi/generate-new": "4.11.2",
-    "@strapi/generators": "4.11.2",
-    "@strapi/logger": "4.11.2",
-    "@strapi/permissions": "4.11.2",
-    "@strapi/plugin-content-manager": "4.11.2",
-    "@strapi/plugin-content-type-builder": "4.11.2",
-    "@strapi/plugin-email": "4.11.2",
-    "@strapi/plugin-upload": "4.11.2",
-    "@strapi/typescript-utils": "4.11.2",
-    "@strapi/utils": "4.11.2",
+    "@strapi/admin": "4.11.4",
+    "@strapi/data-transfer": "4.11.4",
+    "@strapi/database": "4.11.4",
+    "@strapi/generate-new": "4.11.4",
+    "@strapi/generators": "4.11.4",
+    "@strapi/logger": "4.11.4",
+    "@strapi/permissions": "4.11.4",
+    "@strapi/plugin-content-manager": "4.11.4",
+    "@strapi/plugin-content-type-builder": "4.11.4",
+    "@strapi/plugin-email": "4.11.4",
+    "@strapi/plugin-upload": "4.11.4",
+    "@strapi/typescript-utils": "4.11.4",
+    "@strapi/utils": "4.11.4",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -142,5 +142,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "6f7c815c2bbe41dda7d77136eb8df736c028ff67"
+  "gitHead": "8d325a695386ab9b578b360bf768cfa25173050f"
 }