@strapi/content-manager 0.0.0-next.e5d4b412da0d932b61b2fa5012d16513fda6de04 → 0.0.0-next.e7ae51b01f78ddeaa09c4aa3e3882f466a5b3188

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 { 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 { Flex, Button, Menu, VisuallyHidden, Dialog, Modal, Typography, Radio, Tooltip } from '@strapi/design-system';
 import { More, Cross, WarningCircle } from '@strapi/icons';
 import mapValues from 'lodash/fp/mapValues';
 import get from 'lodash/get';
@@ -18,7 +18,7 @@ import { useDocumentContext } from '../../../hooks/useDocumentContext.mjs';
 import { usePreviewContext } from '../../../preview/pages/Preview.mjs';
 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 { buildValidParams, isBaseQueryError } from '../../../utils/api.mjs';
 import { getTranslation } from '../../../utils/translations.mjs';
 import { handleInvisibleAttributes } from '../utils/data.mjs';
 import { useRelationModal } from './FormInputs/Relations/RelationModal.mjs';
@@ -69,6 +69,20 @@ const DocumentActions = ({ actions })=>{
     if (!primaryAction) {
         return null;
     }
+    const addHintTooltip = (action, children)=>{
+        return !action.disabled ? /*#__PURE__*/ jsx(Tooltip, {
+            label: formatMessage({
+                id: 'content-manager.containers.EditView.saveHint',
+                defaultMessage: 'Ctrl / Cmd + Enter to {action}'
+            }, {
+                action: action.label
+            }),
+            children: /*#__PURE__*/ jsx(Flex, {
+                width: "100%",
+                children: children
+            })
+        }) : children;
+    };
     return /*#__PURE__*/ jsxs(Flex, {
         direction: "column",
         gap: 2,
@@ -79,13 +93,14 @@ const DocumentActions = ({ actions })=>{
                 children: /*#__PURE__*/ jsxs(Flex, {
                     gap: 2,
                     children: [
-                        primaryAction.label === 'Publish' ? /*#__PURE__*/ jsx(DocumentActionButton, {
+                        primaryAction.label === 'Publish' ? addHintTooltip(primaryAction, /*#__PURE__*/ jsx(DocumentActionButton, {
                             ...primaryAction,
                             variant: primaryAction.variant || 'default'
-                        }) : /*#__PURE__*/ jsx(DocumentActionButton, {
+                        })) : addHintTooltip(primaryAction, /*#__PURE__*/ jsx(DocumentActionButton, {
                             ...primaryAction,
-                            variant: primaryAction.variant || 'default'
-                        }),
+                            variant: primaryAction.variant || 'default',
+                            buttonType: "submit"
+                        })),
                         restActions.length > 0 ? /*#__PURE__*/ jsx(DocumentActionsMenu, {
                             actions: restActions,
                             label: formatMessage({
@@ -103,12 +118,13 @@ const DocumentActions = ({ actions })=>{
                 })
             }) : /*#__PURE__*/ jsx(DocumentActionButton, {
                 ...secondaryAction,
-                variant: secondaryAction.variant || 'secondary'
+                variant: secondaryAction.variant || 'secondary',
+                buttonType: "submit"
             }) : null
         ]
     });
 };
-const DocumentActionButton = (action)=>{
+const DocumentActionButton = ({ buttonType = 'button', ...action })=>{
     const [dialogId, setDialogId] = React.useState(null);
     const { toggleNotification } = useNotification();
     const handleClick = (action)=>async (e)=>{
@@ -147,6 +163,7 @@ const DocumentActionButton = (action)=>{
                 paddingTop: "7px",
                 paddingBottom: "7px",
                 loading: action.loading,
+                type: buttonType,
                 children: action.label
             }),
             action.dialog?.type === 'dialog' ? /*#__PURE__*/ jsx(DocumentActionConfirmDialog, {
@@ -385,6 +402,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
@@ -493,9 +511,7 @@ const transformData = (data)=>{
     });
     const { getInitialFormValues } = useDoc();
     const isDocumentPublished = (document?.[PUBLISHED_AT_ATTRIBUTE_NAME] || meta?.availableStatus.some((doc)=>doc[PUBLISHED_AT_ATTRIBUTE_NAME] !== null)) && document?.status !== 'modified';
-    if (!schema?.options?.draftAndPublish) {
-        return null;
-    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
     const performPublish = async ()=>{
         setSubmitting(true);
         try {
@@ -503,8 +519,14 @@ const transformData = (data)=>{
                 status: 'published'
             });
             if (errors) {
-                const hasUnreadableRequiredField = Object.keys(schema.attributes).some((fieldName)=>{
+                const hasUnreadableRequiredField = schema && 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) {
@@ -528,6 +550,7 @@ const transformData = (data)=>{
             }
             const { data } = handleInvisibleAttributes(transformData(formValues), {
                 schema,
+                initialValues,
                 components
             });
             const res = await publish({
@@ -536,9 +559,9 @@ 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: [
@@ -618,6 +641,31 @@ const transformData = (data)=>{
     // see RFC "Count draft relations" in Notion
     const enableDraftRelationsCount = false;
     const hasDraftRelations = enableDraftRelationsCount;
+    // Auto-publish on CMD+Enter on macOS, and CTRL+Enter on Windows/Linux
+    React.useEffect(()=>{
+        if (!schema?.options?.draftAndPublish) {
+            return;
+        }
+        const handleKeyDown = (e)=>{
+            if (e.key === 'Enter' && (e.metaKey || e.ctrlKey)) {
+                e.preventDefault();
+                {
+                    performPublish();
+                }
+            }
+        };
+        window.addEventListener('keydown', handleKeyDown);
+        return ()=>{
+            window.removeEventListener('keydown', handleKeyDown);
+        };
+    }, [
+        hasDraftRelations,
+        performPublish,
+        schema?.options?.draftAndPublish
+    ]);
+    if (!schema?.options?.draftAndPublish) {
+        return null;
+    }
     return {
         loading: isLoading,
         position: [
@@ -710,7 +758,7 @@ const UpdateAction = ({ activeTab, documentId, model, collectionType })=>{
         skip: !parentDocumentMetaToUpdate
     });
     const { schema } = useDoc();
-    const handleUpdate = React.useCallback(async ()=>{
+    const handleUpdate = async ()=>{
         setSubmitting(true);
         try {
             if (!modified) {
@@ -760,7 +808,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), {
@@ -847,59 +895,7 @@ const UpdateAction = ({ activeTab, documentId, model, collectionType })=>{
                 onPreview();
             }
         }
-    }, [
-        setSubmitting,
-        modified,
-        validate,
-        isCloning,
-        documentId,
-        collectionType,
-        toggleNotification,
-        formatMessage,
-        clone,
-        model,
-        cloneMatch?.params.origin,
-        currentDocumentMeta.params,
-        document,
-        navigate,
-        rawQuery,
-        setErrors,
-        formatValidationErrors,
-        update,
-        resetForm,
-        create,
-        fromRelationModal,
-        fieldToConnect,
-        documentHistory,
-        parentDocumentMetaToUpdate,
-        dispatch,
-        getInitialFormValues,
-        parentDocumentData,
-        fieldToConnectUID,
-        updateDocumentMutation,
-        formatAPIError,
-        onPreview,
-        initialValues,
-        schema,
-        components,
-        relationalModalSchema,
-        dispatchGuidedTour
-    ]);
-    // Auto-save on CMD+S or CMD+Enter on macOS, and CTRL+S or CTRL+Enter on Windows/Linux
-    React.useEffect(()=>{
-        const handleKeyDown = (e)=>{
-            if (e.key === 'Enter' && (e.metaKey || e.ctrlKey)) {
-                e.preventDefault();
-                handleUpdate();
-            }
-        };
-        window.addEventListener('keydown', handleKeyDown);
-        return ()=>{
-            window.removeEventListener('keydown', handleKeyDown);
-        };
-    }, [
-        handleUpdate
-    ]);
+    };
     return {
         loading: isLoading,
         /**