@strapi/content-manager 0.0.0-experimental.802cb832b90511f8e73309e96c68a9bbe932a499 → 0.0.0-experimental.80d3ba906e416cd717a3e334f2905460b7648735

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 { useNotification, useAPIErrorHandler, useQueryParams, useForm } from '@strapi/admin/strapi-admin';
-import { Menu, Flex, Button, VisuallyHidden, Dialog, Modal, Typography, Radio } from '@strapi/design-system';
+import { tours, useNotification, useAPIErrorHandler, useQueryParams, useForm, useGuidedTour, GUIDED_TOUR_REQUIRED_ACTIONS } from '@strapi/admin/strapi-admin';
+import { Flex, Button, Menu, 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,7 +9,6 @@ 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';
@@ -76,23 +75,33 @@ const DocumentActions = ({ actions })=>{
         alignItems: "stretch",
         width: "100%",
         children: [
-            /*#__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
-                ]
+            /*#__PURE__*/ jsx(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
+                    ]
+                })
             }),
-            secondaryAction ? /*#__PURE__*/ jsx(DocumentActionButton, {
+            secondaryAction ? secondaryAction.label === 'Publish' ? /*#__PURE__*/ jsx(tours.contentManager.Publish, {
+                children: /*#__PURE__*/ jsx(DocumentActionButton, {
+                    ...secondaryAction,
+                    variant: secondaryAction.variant || 'secondary'
+                })
+            }) : /*#__PURE__*/ jsx(DocumentActionButton, {
                 ...secondaryAction,
                 variant: secondaryAction.variant || 'secondary'
             }) : null
@@ -154,11 +163,6 @@ 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);
@@ -220,27 +224,19 @@ const DocumentActionsMenu = ({ actions, children, label, variant = 'tertiary' })
                 popoverPlacement: "bottom-end",
                 children: [
                     actions.map((action)=>{
-                        return /*#__PURE__*/ jsx(MenuItem, {
+                        return /*#__PURE__*/ jsx(Menu.Item, {
                             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",
-                            isVariantDanger: action.variant === 'danger',
-                            isDisabled: action.disabled,
+                            variant: action.variant === 'danger' ? action.variant : 'default',
+                            startIcon: action.icon,
                             children: /*#__PURE__*/ jsx(Flex, {
                                 justifyContent: "space-between",
                                 gap: 4,
-                                children: /*#__PURE__*/ jsxs(Flex, {
-                                    color: !action.disabled ? convertActionVariantToColor(action.variant) : 'inherit',
+                                children: /*#__PURE__*/ jsx(Flex, {
                                     gap: 2,
                                     tag: "span",
-                                    children: [
-                                        /*#__PURE__*/ jsx(Flex, {
-                                            tag: "span",
-                                            color: !action.disabled ? convertActionVariantToIconColor(action.variant) : 'inherit',
-                                            children: action.icon
-                                        }),
-                                        action.label
-                                    ]
+                                    children: action.label
                                 })
                             })
                         }, action.id);
@@ -268,30 +264,6 @@ 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 ()=>{
@@ -413,6 +385,7 @@ const transformData = (data)=>{
     const validate = useForm('PublishAction', (state)=>state.validate);
     const setErrors = useForm('PublishAction', (state)=>state.setErrors);
     const formValues = useForm('PublishAction', ({ values })=>values);
+    const initialValues = useForm('PublishAction', ({ initialValues })=>initialValues);
     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
@@ -423,6 +396,7 @@ const transformData = (data)=>{
     const fieldToConnectUID = useRelationModal('PublishAction', (state)=>state.state.fieldToConnectUID, false);
     const documentHistory = useRelationModal('PublishAction', (state)=>state.state.documentHistory, false);
     const rootDocumentMeta = useRelationModal('PublishAction', (state)=>state.rootDocumentMeta);
+    const dispatchGuidedTour = useGuidedTour('PublishAction', (s)=>s.dispatch);
     const { currentDocumentMeta } = useDocumentContext('PublishAction');
     const [updateDocumentMutation] = useUpdateDocumentMutation();
     const { _unstableFormatAPIError: formatAPIError } = useAPIErrorHandler();
@@ -532,6 +506,12 @@ const transformData = (data)=>{
             if (errors) {
                 const hasUnreadableRequiredField = Object.keys(schema.attributes).some((fieldName)=>{
                     const attribute = schema.attributes[fieldName];
+                    // For components, check if any of the component fields are readable
+                    if (attribute.type === 'component') {
+                        const componentFields = (canReadFields ?? []).filter((field)=>field.startsWith(`${fieldName}.`));
+                        return componentFields.length === 0;
+                    }
+                    // For regular fields, check if the field itself is readable
                     return attribute?.required && !(canReadFields ?? []).includes(fieldName);
                 });
                 if (hasUnreadableRequiredField) {
@@ -555,6 +535,7 @@ const transformData = (data)=>{
             }
             const { data } = handleInvisibleAttributes(transformData(formValues), {
                 schema,
+                initialValues,
                 components
             });
             const res = await publish({
@@ -563,9 +544,15 @@ const transformData = (data)=>{
                 documentId,
                 params: currentDocumentMeta.params
             }, data);
-            // Reset form if successful
+            // Reset form with current values as new initial values (clears errors/submitting and sets modified to false)
             if ('data' in res) {
-                resetForm();
+                resetForm(formValues);
+                dispatchGuidedTour({
+                    type: 'set_completed_actions',
+                    payload: [
+                        GUIDED_TOUR_REQUIRED_ACTIONS.contentManager.createContent
+                    ]
+                });
             }
             if ('data' in res && collectionType !== SINGLE_TYPES) {
                 /**
@@ -689,6 +676,7 @@ PublishAction.position = [
     'relation-modal'
 ];
 const UpdateAction = ({ activeTab, documentId, model, collectionType })=>{
+    const dispatchGuidedTour = useGuidedTour('UpdateAction', (s)=>s.dispatch);
     const navigate = useNavigate();
     const { toggleNotification } = useNotification();
     const { _unstableFormatValidationErrors: formatValidationErrors } = useAPIErrorHandler();
@@ -780,7 +768,7 @@ const UpdateAction = ({ activeTab, documentId, model, collectionType })=>{
                 if ('error' in res && isBaseQueryError(res.error) && res.error.name === 'ValidationError') {
                     setErrors(formatValidationErrors(res.error));
                 } else {
-                    resetForm();
+                    resetForm(document);
                 }
             } else {
                 const { data } = handleInvisibleAttributes(transformData(document), {
@@ -856,6 +844,12 @@ const UpdateAction = ({ activeTab, documentId, model, collectionType })=>{
                 }
             }
         } finally{
+            dispatchGuidedTour({
+                type: 'set_completed_actions',
+                payload: [
+                    GUIDED_TOUR_REQUIRED_ACTIONS.contentManager.createContent
+                ]
+            });
             setSubmitting(false);
             if (onPreview) {
                 onPreview();
@@ -896,7 +890,8 @@ const UpdateAction = ({ activeTab, documentId, model, collectionType })=>{
         initialValues,
         schema,
         components,
-        relationalModalSchema
+        relationalModalSchema,
+        dispatchGuidedTour
     ]);
     // Auto-save on CMD+S or CMD+Enter on macOS, and CTRL+S or CTRL+Enter on Windows/Linux
     React.useEffect(()=>{