@strapi/content-manager 0.0.0-next.737505a8bfb61e4f38da29a4089e66c0dc09745b → 0.0.0-next.73c6a77641373a80d30f9caed8985f2a9dcf3d85

package/dist/admin/pages/EditView/components/Blocker.js

@@ -0,0 +1,18 @@
+'use strict';
+
+var jsxRuntime = require('react/jsx-runtime');
+var strapiAdmin = require('@strapi/admin/strapi-admin');
+
+// Needs to be wrapped in a component to have access to the form context via a hook.
+/**
+ * Prevents users from leaving the page with unsaved form changes
+ */ const Blocker = ()=>{
+    const resetForm = strapiAdmin.useForm('Blocker', (state)=>state.resetForm);
+    // We reset the form to the published version to avoid errors like – https://strapi-inc.atlassian.net/browse/CONTENT-2284
+    return /*#__PURE__*/ jsxRuntime.jsx(strapiAdmin.Blocker, {
+        onProceed: resetForm
+    });
+};
+
+exports.Blocker = Blocker;
+//# sourceMappingURL=Blocker.js.map

package/dist/admin/pages/EditView/components/Blocker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Blocker.js","sources":["../../../../../admin/src/pages/EditView/components/Blocker.tsx"],"sourcesContent":["// Needs to be wrapped in a component to have access to the form context via a hook.\n\nimport { Blocker as BaseBlocker, useForm } from '@strapi/admin/strapi-admin';\n\n/**\n * Prevents users from leaving the page with unsaved form changes\n */\nconst Blocker = () => {\n  const resetForm = useForm('Blocker', (state) => state.resetForm);\n\n  // We reset the form to the published version to avoid errors like – https://strapi-inc.atlassian.net/browse/CONTENT-2284\n  return <BaseBlocker onProceed={resetForm} />;\n};\n\nexport { Blocker };\n"],"names":["Blocker","resetForm","useForm","state","_jsx","BaseBlocker","onProceed"],"mappings":";;;;;AAAA;AAIA;;AAEC,UACKA,OAAU,GAAA,IAAA;AACd,IAAA,MAAMC,YAAYC,mBAAQ,CAAA,SAAA,EAAW,CAACC,KAAAA,GAAUA,MAAMF,SAAS,CAAA;;AAG/D,IAAA,qBAAOG,cAACC,CAAAA,mBAAAA,EAAAA;QAAYC,SAAWL,EAAAA;;AACjC;;;;"}

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

@@ -0,0 +1,16 @@
+import { jsx } from 'react/jsx-runtime';
+import { useForm, Blocker as Blocker$1 } from '@strapi/admin/strapi-admin';
+
+// Needs to be wrapped in a component to have access to the form context via a hook.
+/**
+ * Prevents users from leaving the page with unsaved form changes
+ */ const Blocker = ()=>{
+    const resetForm = useForm('Blocker', (state)=>state.resetForm);
+    // We reset the form to the published version to avoid errors like – https://strapi-inc.atlassian.net/browse/CONTENT-2284
+    return /*#__PURE__*/ jsx(Blocker$1, {
+        onProceed: resetForm
+    });
+};
+
+export { Blocker };
+//# sourceMappingURL=Blocker.mjs.map

package/dist/admin/pages/EditView/components/Blocker.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"Blocker.mjs","sources":["../../../../../admin/src/pages/EditView/components/Blocker.tsx"],"sourcesContent":["// Needs to be wrapped in a component to have access to the form context via a hook.\n\nimport { Blocker as BaseBlocker, useForm } from '@strapi/admin/strapi-admin';\n\n/**\n * Prevents users from leaving the page with unsaved form changes\n */\nconst Blocker = () => {\n  const resetForm = useForm('Blocker', (state) => state.resetForm);\n\n  // We reset the form to the published version to avoid errors like – https://strapi-inc.atlassian.net/browse/CONTENT-2284\n  return <BaseBlocker onProceed={resetForm} />;\n};\n\nexport { Blocker };\n"],"names":["Blocker","resetForm","useForm","state","_jsx","BaseBlocker","onProceed"],"mappings":";;;AAAA;AAIA;;AAEC,UACKA,OAAU,GAAA,IAAA;AACd,IAAA,MAAMC,YAAYC,OAAQ,CAAA,SAAA,EAAW,CAACC,KAAAA,GAAUA,MAAMF,SAAS,CAAA;;AAG/D,IAAA,qBAAOG,GAACC,CAAAA,SAAAA,EAAAA;QAAYC,SAAWL,EAAAA;;AACjC;;;;"}

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

@@ -11,7 +11,6 @@ var merge = require('lodash/merge');
 var set = require('lodash/set');
 var reactIntl = require('react-intl');
 var reactRouterDom = require('react-router-dom');
-var styledComponents = require('styled-components');
 var attributes = require('../../../constants/attributes.js');
 var collections = require('../../../constants/collections.js');
 var DocumentRBAC = require('../../../features/DocumentRBAC.js');
@@ -23,6 +22,7 @@ var router = require('../../../router.js');
 var documents = require('../../../services/documents.js');
 var api = require('../../../utils/api.js');
 var translations = require('../../../utils/translations.js');
+var data = require('../utils/data.js');
 var RelationModal = require('./FormInputs/Relations/RelationModal.js');
 
 function _interopNamespaceDefault(e) {
@@ -96,23 +96,33 @@ const DocumentActions = ({ actions })=>{
         alignItems: "stretch",
         width: "100%",
         children: [
-            /*#__PURE__*/ jsxRuntime.jsxs(designSystem.Flex, {
-                gap: 2,
-                children: [
-                    /*#__PURE__*/ jsxRuntime.jsx(DocumentActionButton, {
-                        ...primaryAction,
-                        variant: primaryAction.variant || 'default'
-                    }),
-                    restActions.length > 0 ? /*#__PURE__*/ jsxRuntime.jsx(DocumentActionsMenu, {
-                        actions: restActions,
-                        label: formatMessage({
-                            id: 'content-manager.containers.edit.panels.default.more-actions',
-                            defaultMessage: 'More document actions'
-                        })
-                    }) : null
-                ]
+            /*#__PURE__*/ jsxRuntime.jsx(strapiAdmin.tours.contentManager.Publish, {
+                children: /*#__PURE__*/ jsxRuntime.jsxs(designSystem.Flex, {
+                    gap: 2,
+                    children: [
+                        primaryAction.label === 'Publish' ? /*#__PURE__*/ jsxRuntime.jsx(DocumentActionButton, {
+                            ...primaryAction,
+                            variant: primaryAction.variant || 'default'
+                        }) : /*#__PURE__*/ jsxRuntime.jsx(DocumentActionButton, {
+                            ...primaryAction,
+                            variant: primaryAction.variant || 'default'
+                        }),
+                        restActions.length > 0 ? /*#__PURE__*/ jsxRuntime.jsx(DocumentActionsMenu, {
+                            actions: restActions,
+                            label: formatMessage({
+                                id: 'content-manager.containers.edit.panels.default.more-actions',
+                                defaultMessage: 'More document actions'
+                            })
+                        }) : null
+                    ]
+                })
             }),
-            secondaryAction ? /*#__PURE__*/ jsxRuntime.jsx(DocumentActionButton, {
+            secondaryAction ? secondaryAction.label === 'Publish' ? /*#__PURE__*/ jsxRuntime.jsx(strapiAdmin.tours.contentManager.Publish, {
+                children: /*#__PURE__*/ jsxRuntime.jsx(DocumentActionButton, {
+                    ...secondaryAction,
+                    variant: secondaryAction.variant || 'secondary'
+                })
+            }) : /*#__PURE__*/ jsxRuntime.jsx(DocumentActionButton, {
                 ...secondaryAction,
                 variant: secondaryAction.variant || 'secondary'
             }) : null
@@ -174,11 +184,6 @@ const DocumentActionButton = (action)=>{
         ]
     });
 };
-const MenuItem = styledComponents.styled(designSystem.Menu.Item)`
-  &:hover {
-    background: ${({ theme, isVariantDanger, isDisabled })=>isVariantDanger && !isDisabled ? theme.colors.danger100 : 'neutral'};
-  }
-`;
 const DocumentActionsMenu = ({ actions, children, label, variant = 'tertiary' })=>{
     const [isOpen, setIsOpen] = React__namespace.useState(false);
     const [dialogId, setDialogId] = React__namespace.useState(null);
@@ -240,27 +245,19 @@ const DocumentActionsMenu = ({ actions, children, label, variant = 'tertiary' })
                 popoverPlacement: "bottom-end",
                 children: [
                     actions.map((action)=>{
-                        return /*#__PURE__*/ jsxRuntime.jsx(MenuItem, {
+                        return /*#__PURE__*/ jsxRuntime.jsx(designSystem.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__*/ jsxRuntime.jsx(designSystem.Flex, {
                                 justifyContent: "space-between",
                                 gap: 4,
-                                children: /*#__PURE__*/ jsxRuntime.jsxs(designSystem.Flex, {
-                                    color: !action.disabled ? convertActionVariantToColor(action.variant) : 'inherit',
+                                children: /*#__PURE__*/ jsxRuntime.jsx(designSystem.Flex, {
                                     gap: 2,
                                     tag: "span",
-                                    children: [
-                                        /*#__PURE__*/ jsxRuntime.jsx(designSystem.Flex, {
-                                            tag: "span",
-                                            color: !action.disabled ? convertActionVariantToIconColor(action.variant) : 'inherit',
-                                            children: action.icon
-                                        }),
-                                        action.label
-                                    ]
+                                    children: action.label
                                 })
                             })
                         }, action.id);
@@ -288,30 +285,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 } = reactIntl.useIntl();
     const handleClose = async ()=>{
@@ -434,6 +407,7 @@ const transformData = (data)=>{
     const setErrors = strapiAdmin.useForm('PublishAction', (state)=>state.setErrors);
     const formValues = strapiAdmin.useForm('PublishAction', ({ values })=>values);
     const resetForm = strapiAdmin.useForm('PublishAction', ({ resetForm })=>resetForm);
+    const { currentDocument: { components } } = useDocumentContext.useDocumentContext('PublishAction');
     // need to discriminate if the publish is coming from a relation modal or in the edit view
     const relationContext = RelationModal.useRelationModal('PublishAction', ()=>true, false);
     const fromRelationModal = relationContext != undefined;
@@ -442,6 +416,7 @@ const transformData = (data)=>{
     const fieldToConnectUID = RelationModal.useRelationModal('PublishAction', (state)=>state.state.fieldToConnectUID, false);
     const documentHistory = RelationModal.useRelationModal('PublishAction', (state)=>state.state.documentHistory, false);
     const rootDocumentMeta = RelationModal.useRelationModal('PublishAction', (state)=>state.rootDocumentMeta);
+    const dispatchGuidedTour = strapiAdmin.useGuidedTour('PublishAction', (s)=>s.dispatch);
     const { currentDocumentMeta } = useDocumentContext.useDocumentContext('PublishAction');
     const [updateDocumentMutation] = documents.useUpdateDocumentMutation();
     const { _unstableFormatAPIError: formatAPIError } = strapiAdmin.useAPIErrorHandler();
@@ -572,15 +547,25 @@ const transformData = (data)=>{
                 }
                 return;
             }
+            const { data: data$1 } = data.handleInvisibleAttributes(transformData(formValues), {
+                schema,
+                components
+            });
             const res = await publish({
                 collectionType,
                 model,
                 documentId,
                 params: currentDocumentMeta.params
-            }, transformData(formValues));
+            }, data$1);
             // Reset form if successful
             if ('data' in res) {
                 resetForm();
+                dispatchGuidedTour({
+                    type: 'set_completed_actions',
+                    payload: [
+                        strapiAdmin.GUIDED_TOUR_REQUIRED_ACTIONS.contentManager.createContent
+                    ]
+                });
             }
             if ('data' in res && collectionType !== collections.SINGLE_TYPES) {
                 /**
@@ -704,6 +689,7 @@ PublishAction.position = [
     'relation-modal'
 ];
 const UpdateAction = ({ activeTab, documentId, model, collectionType })=>{
+    const dispatchGuidedTour = strapiAdmin.useGuidedTour('UpdateAction', (s)=>s.dispatch);
     const navigate = reactRouterDom.useNavigate();
     const { toggleNotification } = strapiAdmin.useNotification();
     const { _unstableFormatValidationErrors: formatValidationErrors } = strapiAdmin.useAPIErrorHandler();
@@ -711,12 +697,14 @@ const UpdateAction = ({ activeTab, documentId, model, collectionType })=>{
     const isCloning = cloneMatch !== null;
     const { formatMessage } = reactIntl.useIntl();
     const { create, update, clone, isLoading } = useDocumentActions.useDocumentActions();
+    const { currentDocument: { components } } = useDocumentContext.useDocumentContext('UpdateAction');
     const [{ rawQuery }] = strapiAdmin.useQueryParams();
     const onPreview = Preview.usePreviewContext('UpdateAction', (state)=>state.onPreview, false);
     const { getInitialFormValues } = useDocument.useDoc();
     const isSubmitting = strapiAdmin.useForm('UpdateAction', ({ isSubmitting })=>isSubmitting);
     const modified = strapiAdmin.useForm('UpdateAction', ({ modified })=>modified);
     const setSubmitting = strapiAdmin.useForm('UpdateAction', ({ setSubmitting })=>setSubmitting);
+    const initialValues = strapiAdmin.useForm('UpdateAction', ({ initialValues })=>initialValues);
     const document = strapiAdmin.useForm('UpdateAction', ({ values })=>values);
     const validate = strapiAdmin.useForm('UpdateAction', (state)=>state.validate);
     const setErrors = strapiAdmin.useForm('UpdateAction', (state)=>state.setErrors);
@@ -724,6 +712,7 @@ const UpdateAction = ({ activeTab, documentId, model, collectionType })=>{
     const dispatch = RelationModal.useRelationModal('UpdateAction', (state)=>state.dispatch);
     // need to discriminate if the update is coming from a relation modal or in the edit view
     const relationContext = RelationModal.useRelationModal('UpdateAction', ()=>true, false);
+    const relationalModalSchema = RelationModal.useRelationModal('UpdateAction', (state)=>state.currentDocument.schema, false);
     const fieldToConnect = RelationModal.useRelationModal('UpdateAction', (state)=>state.state.fieldToConnect, false);
     const fieldToConnectUID = RelationModal.useRelationModal('PublishAction', (state)=>state.state.fieldToConnectUID, false);
     const documentHistory = RelationModal.useRelationModal('UpdateAction', (state)=>state.state.documentHistory, false);
@@ -741,6 +730,7 @@ const UpdateAction = ({ activeTab, documentId, model, collectionType })=>{
     }, {
         skip: !parentDocumentMetaToUpdate
     });
+    const { schema } = useDocument.useDoc();
     const handleUpdate = React__namespace.useCallback(async ()=>{
         setSubmitting(true);
         try {
@@ -777,22 +767,32 @@ const UpdateAction = ({ activeTab, documentId, model, collectionType })=>{
                     setErrors(formatValidationErrors(res.error));
                 }
             } else if (documentId || collectionType === collections.SINGLE_TYPES) {
+                const { data: data$1 } = data.handleInvisibleAttributes(transformData(document), {
+                    schema: fromRelationModal ? relationalModalSchema : schema,
+                    initialValues,
+                    components
+                });
                 const res = await update({
                     collectionType,
                     model,
                     documentId,
                     params: currentDocumentMeta.params
-                }, transformData(document));
+                }, data$1);
                 if ('error' in res && api.isBaseQueryError(res.error) && res.error.name === 'ValidationError') {
                     setErrors(formatValidationErrors(res.error));
                 } else {
                     resetForm();
                 }
             } else {
+                const { data: data$1 } = data.handleInvisibleAttributes(transformData(document), {
+                    schema: fromRelationModal ? relationalModalSchema : schema,
+                    initialValues,
+                    components
+                });
                 const res = await create({
                     model,
                     params: currentDocumentMeta.params
-                }, transformData(document));
+                }, data$1);
                 if ('data' in res && collectionType !== collections.SINGLE_TYPES) {
                     if (fromRelationModal) {
                         const createdRelation = {
@@ -857,6 +857,12 @@ const UpdateAction = ({ activeTab, documentId, model, collectionType })=>{
                 }
             }
         } finally{
+            dispatchGuidedTour({
+                type: 'set_completed_actions',
+                payload: [
+                    strapiAdmin.GUIDED_TOUR_REQUIRED_ACTIONS.contentManager.createContent
+                ]
+            });
             setSubmitting(false);
             if (onPreview) {
                 onPreview();
@@ -893,7 +899,12 @@ const UpdateAction = ({ activeTab, documentId, model, collectionType })=>{
         fieldToConnectUID,
         updateDocumentMutation,
         formatAPIError,
-        onPreview
+        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__namespace.useEffect(()=>{