@strapi/content-manager 0.0.0-experimental.f37a0ea0333947b6879c4608fae75646d63c07a1 → 0.0.0-experimental.f3ec579d505563eb88e01308248766a76e49d9b3

package/dist/admin/pages/EditView/components/DocumentActions.mjs

@@ -1,7 +1,7 @@
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 import * as React from 'react';
-import { unstable_tours, useNotification, useAPIErrorHandler, useQueryParams, useForm } from '@strapi/admin/strapi-admin';
-import { Flex, Button, Menu, VisuallyHidden, Dialog, Modal, Typography, Radio } from '@strapi/design-system';
+import { useNotification, useAPIErrorHandler, useQueryParams, useForm } from '@strapi/admin/strapi-admin';
+import { Menu, Flex, Button, VisuallyHidden, Dialog, Modal, Typography, Radio } from '@strapi/design-system';
 import { More, Cross, WarningCircle } from '@strapi/icons';
 import mapValues from 'lodash/fp/mapValues';
 import get from 'lodash/get';
@@ -9,6 +9,7 @@ import merge from 'lodash/merge';
 import set from 'lodash/set';
 import { useIntl } from 'react-intl';
 import { useNavigate, useMatch, useParams } from 'react-router-dom';
+import { styled } from 'styled-components';
 import { PUBLISHED_AT_ATTRIBUTE_NAME } from '../../../constants/attributes.mjs';
 import { SINGLE_TYPES } from '../../../constants/collections.mjs';
 import { useDocumentRBAC } from '../../../features/DocumentRBAC.mjs';
@@ -20,7 +21,6 @@ import { LIST_PATH, CLONE_PATH } from '../../../router.mjs';
 import { useGetDraftRelationCountQuery as useLazyGetDraftRelationCountQuery, useUpdateDocumentMutation } from '../../../services/documents.mjs';
 import { isBaseQueryError, buildValidParams } from '../../../utils/api.mjs';
 import { getTranslation } from '../../../utils/translations.mjs';
-import { handleInvisibleAttributes } from '../utils/data.mjs';
 import { useRelationModal } from './FormInputs/Relations/RelationModal.mjs';
 
 const connectRelationToParent = (parentDataToUpdate, fieldToConnect, data, fieldToConnectUID)=>{
@@ -75,33 +75,23 @@ const DocumentActions = ({ actions })=>{
         alignItems: "stretch",
         width: "100%",
         children: [
-            /*#__PURE__*/ jsx(unstable_tours.contentManager.Publish, {
-                children: /*#__PURE__*/ jsxs(Flex, {
-                    gap: 2,
-                    children: [
-                        primaryAction.label === 'Publish' ? /*#__PURE__*/ jsx(DocumentActionButton, {
-                            ...primaryAction,
-                            variant: primaryAction.variant || 'default'
-                        }) : /*#__PURE__*/ jsx(DocumentActionButton, {
-                            ...primaryAction,
-                            variant: primaryAction.variant || 'default'
-                        }),
-                        restActions.length > 0 ? /*#__PURE__*/ jsx(DocumentActionsMenu, {
-                            actions: restActions,
-                            label: formatMessage({
-                                id: 'content-manager.containers.edit.panels.default.more-actions',
-                                defaultMessage: 'More document actions'
-                            })
-                        }) : null
-                    ]
-                })
+            /*#__PURE__*/ jsxs(Flex, {
+                gap: 2,
+                children: [
+                    /*#__PURE__*/ jsx(DocumentActionButton, {
+                        ...primaryAction,
+                        variant: primaryAction.variant || 'default'
+                    }),
+                    restActions.length > 0 ? /*#__PURE__*/ jsx(DocumentActionsMenu, {
+                        actions: restActions,
+                        label: formatMessage({
+                            id: 'content-manager.containers.edit.panels.default.more-actions',
+                            defaultMessage: 'More document actions'
+                        })
+                    }) : null
+                ]
             }),
-            secondaryAction ? secondaryAction.label === 'Publish' ? /*#__PURE__*/ jsx(unstable_tours.contentManager.Publish, {
-                children: /*#__PURE__*/ jsx(DocumentActionButton, {
-                    ...secondaryAction,
-                    variant: secondaryAction.variant || 'secondary'
-                })
-            }) : /*#__PURE__*/ jsx(DocumentActionButton, {
+            secondaryAction ? /*#__PURE__*/ jsx(DocumentActionButton, {
                 ...secondaryAction,
                 variant: secondaryAction.variant || 'secondary'
             }) : null
@@ -163,6 +153,11 @@ const DocumentActionButton = (action)=>{
         ]
     });
 };
+const MenuItem = styled(Menu.Item)`
+  &:hover {
+    background: ${({ theme, isVariantDanger, isDisabled })=>isVariantDanger && !isDisabled ? theme.colors.danger100 : 'neutral'};
+  }
+`;
 const DocumentActionsMenu = ({ actions, children, label, variant = 'tertiary' })=>{
     const [isOpen, setIsOpen] = React.useState(false);
     const [dialogId, setDialogId] = React.useState(null);
@@ -224,19 +219,27 @@ const DocumentActionsMenu = ({ actions, children, label, variant = 'tertiary' })
                 popoverPlacement: "bottom-end",
                 children: [
                     actions.map((action)=>{
-                        return /*#__PURE__*/ jsx(Menu.Item, {
+                        return /*#__PURE__*/ jsx(MenuItem, {
                             disabled: action.disabled,
                             /* @ts-expect-error – TODO: this is an error in the DS where it is most likely a synthetic event, not regular. */ onSelect: handleClick(action),
                             display: "block",
-                            variant: action.variant === 'danger' ? action.variant : 'default',
-                            startIcon: action.icon,
+                            isVariantDanger: action.variant === 'danger',
+                            isDisabled: action.disabled,
                             children: /*#__PURE__*/ jsx(Flex, {
                                 justifyContent: "space-between",
                                 gap: 4,
-                                children: /*#__PURE__*/ jsx(Flex, {
+                                children: /*#__PURE__*/ jsxs(Flex, {
+                                    color: !action.disabled ? convertActionVariantToColor(action.variant) : 'inherit',
                                     gap: 2,
                                     tag: "span",
-                                    children: action.label
+                                    children: [
+                                        /*#__PURE__*/ jsx(Flex, {
+                                            tag: "span",
+                                            color: !action.disabled ? convertActionVariantToIconColor(action.variant) : 'inherit',
+                                            children: action.icon
+                                        }),
+                                        action.label
+                                    ]
                                 })
                             })
                         }, action.id);
@@ -264,6 +267,30 @@ const DocumentActionsMenu = ({ actions, children, label, variant = 'tertiary' })
         ]
     });
 };
+const convertActionVariantToColor = (variant = 'secondary')=>{
+    switch(variant){
+        case 'danger':
+            return 'danger600';
+        case 'secondary':
+            return undefined;
+        case 'success':
+            return 'success600';
+        default:
+            return 'primary600';
+    }
+};
+const convertActionVariantToIconColor = (variant = 'secondary')=>{
+    switch(variant){
+        case 'danger':
+            return 'danger600';
+        case 'secondary':
+            return 'neutral500';
+        case 'success':
+            return 'success600';
+        default:
+            return 'primary600';
+    }
+};
 const DocumentActionConfirmDialog = ({ onClose, onCancel, onConfirm, title, content, isOpen, variant = 'secondary', loading })=>{
     const { formatMessage } = useIntl();
     const handleClose = async ()=>{
@@ -386,7 +413,6 @@ const transformData = (data)=>{
     const setErrors = useForm('PublishAction', (state)=>state.setErrors);
     const formValues = useForm('PublishAction', ({ values })=>values);
     const resetForm = useForm('PublishAction', ({ resetForm })=>resetForm);
-    const { currentDocument: { components } } = useDocumentContext('PublishAction');
     // need to discriminate if the publish is coming from a relation modal or in the edit view
     const relationContext = useRelationModal('PublishAction', ()=>true, false);
     const fromRelationModal = relationContext != undefined;
@@ -525,16 +551,12 @@ const transformData = (data)=>{
                 }
                 return;
             }
-            const { data } = handleInvisibleAttributes(transformData(formValues), {
-                schema,
-                components
-            });
             const res = await publish({
                 collectionType,
                 model,
                 documentId,
                 params: currentDocumentMeta.params
-            }, data);
+            }, transformData(formValues));
             // Reset form if successful
             if ('data' in res) {
                 resetForm();
@@ -668,14 +690,12 @@ const UpdateAction = ({ activeTab, documentId, model, collectionType })=>{
     const isCloning = cloneMatch !== null;
     const { formatMessage } = useIntl();
     const { create, update, clone, isLoading } = useDocumentActions();
-    const { currentDocument: { components } } = useDocumentContext('UpdateAction');
     const [{ rawQuery }] = useQueryParams();
     const onPreview = usePreviewContext('UpdateAction', (state)=>state.onPreview, false);
     const { getInitialFormValues } = useDoc();
     const isSubmitting = useForm('UpdateAction', ({ isSubmitting })=>isSubmitting);
     const modified = useForm('UpdateAction', ({ modified })=>modified);
     const setSubmitting = useForm('UpdateAction', ({ setSubmitting })=>setSubmitting);
-    const initialValues = useForm('UpdateAction', ({ initialValues })=>initialValues);
     const document = useForm('UpdateAction', ({ values })=>values);
     const validate = useForm('UpdateAction', (state)=>state.validate);
     const setErrors = useForm('UpdateAction', (state)=>state.setErrors);
@@ -683,7 +703,6 @@ const UpdateAction = ({ activeTab, documentId, model, collectionType })=>{
     const dispatch = useRelationModal('UpdateAction', (state)=>state.dispatch);
     // need to discriminate if the update is coming from a relation modal or in the edit view
     const relationContext = useRelationModal('UpdateAction', ()=>true, false);
-    const relationalModalSchema = useRelationModal('UpdateAction', (state)=>state.currentDocument.schema, false);
     const fieldToConnect = useRelationModal('UpdateAction', (state)=>state.state.fieldToConnect, false);
     const fieldToConnectUID = useRelationModal('PublishAction', (state)=>state.state.fieldToConnectUID, false);
     const documentHistory = useRelationModal('UpdateAction', (state)=>state.state.documentHistory, false);
@@ -701,7 +720,6 @@ const UpdateAction = ({ activeTab, documentId, model, collectionType })=>{
     }, {
         skip: !parentDocumentMetaToUpdate
     });
-    const { schema } = useDoc();
     const handleUpdate = React.useCallback(async ()=>{
         setSubmitting(true);
         try {
@@ -738,32 +756,22 @@ const UpdateAction = ({ activeTab, documentId, model, collectionType })=>{
                     setErrors(formatValidationErrors(res.error));
                 }
             } else if (documentId || collectionType === SINGLE_TYPES) {
-                const { data } = handleInvisibleAttributes(transformData(document), {
-                    schema: fromRelationModal ? relationalModalSchema : schema,
-                    initialValues,
-                    components
-                });
                 const res = await update({
                     collectionType,
                     model,
                     documentId,
                     params: currentDocumentMeta.params
-                }, data);
+                }, transformData(document));
                 if ('error' in res && isBaseQueryError(res.error) && res.error.name === 'ValidationError') {
                     setErrors(formatValidationErrors(res.error));
                 } else {
                     resetForm();
                 }
             } else {
-                const { data } = handleInvisibleAttributes(transformData(document), {
-                    schema: fromRelationModal ? relationalModalSchema : schema,
-                    initialValues,
-                    components
-                });
                 const res = await create({
                     model,
                     params: currentDocumentMeta.params
-                }, data);
+                }, transformData(document));
                 if ('data' in res && collectionType !== SINGLE_TYPES) {
                     if (fromRelationModal) {
                         const createdRelation = {
@@ -864,11 +872,7 @@ const UpdateAction = ({ activeTab, documentId, model, collectionType })=>{
         fieldToConnectUID,
         updateDocumentMutation,
         formatAPIError,
-        onPreview,
-        initialValues,
-        schema,
-        components,
-        relationalModalSchema
+        onPreview
     ]);
     // Auto-save on CMD+S or CMD+Enter on macOS, and CTRL+S or CTRL+Enter on Windows/Linux
     React.useEffect(()=>{