@strapi/content-manager 0.0.0-experimental.baa6cf22298e591b4d52d8e59c60406d7a9f137f → 0.0.0-experimental.d53e940834bf72ddc725f1d2fd36dac9abec30cb

package/dist/admin/src/pages/ListView/components/BulkActions/Actions.d.ts

@@ -1,5 +1,6 @@
 import * as React from 'react';
-import { NotificationConfig } from '@strapi/admin/strapi-admin';
+import { ButtonProps } from '@strapi/design-system';
+import { DialogOptions, ModalOptions, NotificationOptions } from '../../../EditView/components/DocumentActions';
 import type { BulkActionComponent } from '../../../../content-manager';
 interface BulkActionDescription {
     dialog?: DialogOptions | NotificationOptions | ModalOptions;
@@ -14,35 +15,7 @@ interface BulkActionDescription {
     /**
      * @default 'secondary'
      */
-    variant?: 'default' | 'secondary' | 'tertiary' | 'danger-light' | 'success';
-}
-interface DialogOptions {
-    type: 'dialog';
-    title: string;
-    content?: React.ReactNode;
-    onConfirm?: () => void | Promise<void>;
-    onCancel?: () => void | Promise<void>;
-}
-interface NotificationOptions {
-    type: 'notification';
-    title: string;
-    link?: {
-        label: string;
-        url: string;
-        target?: string;
-    };
-    content?: string;
-    onClose?: () => void;
-    status?: NotificationConfig['type'];
-    timeout?: number;
-}
-interface ModalOptions {
-    type: 'modal';
-    title: string;
-    content: React.ComponentType<{
-        onClose: () => void;
-    }>;
-    onClose?: () => void;
+    variant?: ButtonProps['variant'];
 }
 declare const BulkActionsRenderer: () => import("react/jsx-runtime").JSX.Element;
 declare const Emphasis: (chunks: React.ReactNode) => import("react/jsx-runtime").JSX.Element;

package/dist/admin/src/pages/ListView/components/BulkActions/ConfirmBulkActionDialog.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { DialogFooterProps } from '@strapi/design-system';
-interface ConfirmBulkActionDialogProps extends Pick<DialogFooterProps, 'endAction'> {
+interface ConfirmBulkActionDialogProps {
+    endAction: React.ReactNode;
     onToggleDialog: () => void;
     isOpen?: boolean;
     dialogBody: React.ReactNode;

package/dist/server/index.js

@@ -495,8 +495,6 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
     deleteExpiredJob: null,
     isInitialized: false
   };
-  const query = strapi2.db.query(HISTORY_VERSION_UID);
-  const historyService = getService(strapi2, "history");
   const serviceUtils = createServiceUtils({ strapi: strapi2 });
   return {
     async bootstrap() {
@@ -507,7 +505,10 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
         if (!strapi2.requestContext.get()?.request.url.startsWith("/content-manager")) {
           return next();
         }
-        if (context.action !== "create" && context.action !== "update" && context.action !== "publish" && context.action !== "unpublish" && context.action !== "discardDraft") {
+        if (context.action !== "create" && context.action !== "update" && context.action !== "clone" && context.action !== "publish" && context.action !== "unpublish" && context.action !== "discardDraft") {
+          return next();
+        }
+        if (context.action === "update" && strapi2.requestContext.get()?.request.url.endsWith("/actions/publish")) {
           return next();
         }
         const contentTypeUid = context.contentType.uid;
@@ -515,7 +516,10 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
           return next();
         }
         const result = await next();
-        const documentContext = context.action === "create" ? { documentId: result.documentId, locale: context.params?.locale } : { documentId: context.params.documentId, locale: context.params?.locale };
+        const documentContext = {
+          documentId: context.action === "create" || context.action === "clone" ? result.documentId : context.params.documentId,
+          locale: context.params?.locale
+        };
         const defaultLocale = await serviceUtils.getDefaultLocale();
         const locale = documentContext.locale || defaultLocale;
         if (Array.isArray(locale)) {
@@ -546,7 +550,7 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
         }, {});
         await strapi2.db.transaction(async ({ onCommit }) => {
           onCommit(() => {
-            historyService.createVersion({
+            getService(strapi2, "history").createVersion({
               contentType: contentTypeUid,
               data: fp.omit(FIELDS_TO_IGNORE, document),
               schema: fp.omit(FIELDS_TO_IGNORE, attributesSchema),
@@ -559,11 +563,10 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
         });
         return result;
       });
-      const retentionDays = serviceUtils.getRetentionDays();
       state.deleteExpiredJob = nodeSchedule.scheduleJob("0 0 * * *", () => {
-        const retentionDaysInMilliseconds = retentionDays * 24 * 60 * 60 * 1e3;
+        const retentionDaysInMilliseconds = serviceUtils.getRetentionDays() * 24 * 60 * 60 * 1e3;
         const expirationDate = new Date(Date.now() - retentionDaysInMilliseconds);
-        query.deleteMany({
+        strapi2.db.query(HISTORY_VERSION_UID).deleteMany({
           where: {
             created_at: {
               $lt: expirationDate.toISOString()
@@ -3755,22 +3758,24 @@ const getDeepPopulateDraftCount = (uid2) => {
           attribute.component
         );
         if (childHasRelations) {
-          populateAcc[attributeName] = { populate: populate2 };
+          populateAcc[attributeName] = {
+            populate: populate2
+          };
           hasRelations = true;
         }
         break;
       }
       case "dynamiczone": {
-        const dzPopulate = (attribute.components || []).reduce((acc, componentUID) => {
-          const { populate: populate2, hasRelations: childHasRelations } = getDeepPopulateDraftCount(componentUID);
-          if (childHasRelations) {
+        const dzPopulateFragment = attribute.components?.reduce((acc, componentUID) => {
+          const { populate: componentPopulate, hasRelations: componentHasRelations } = getDeepPopulateDraftCount(componentUID);
+          if (componentHasRelations) {
             hasRelations = true;
-            return fp.merge(acc, populate2);
+            return { ...acc, [componentUID]: { populate: componentPopulate } };
           }
           return acc;
         }, {});
-        if (!fp.isEmpty(dzPopulate)) {
-          populateAcc[attributeName] = { populate: dzPopulate };
+        if (!fp.isEmpty(dzPopulateFragment)) {
+          populateAcc[attributeName] = { on: dzPopulateFragment };
         }
         break;
       }