@strapi/content-manager 0.0.0-experimental.25f7de53c1fc990bbb86d4aa43c379acfa838064 → 0.0.0-experimental.267375bdc00aa57de5e78acd345a838d21a63676

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

@@ -6,6 +6,9 @@ var strapiAdmin = require('@strapi/admin/strapi-admin');
 var designSystem = require('@strapi/design-system');
 var Icons = require('@strapi/icons');
 var mapValues = require('lodash/fp/mapValues');
+var get = require('lodash/get');
+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');
@@ -20,6 +23,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 RelationModal = require('./FormInputs/Relations/RelationModal.js');
 
 function _interopNamespaceDefault(e) {
   var n = Object.create(null);
@@ -40,6 +44,38 @@ function _interopNamespaceDefault(e) {
 
 var React__namespace = /*#__PURE__*/_interopNamespaceDefault(React);
 
+const connectRelationToParent = (parentDataToUpdate, fieldToConnect, data, fieldToConnectUID)=>{
+    /*
+   * Check if the fieldToConnect is already present in the parentDataToUpdate.
+   * This happens in particular when in the parentDocument you have created
+   * a new component without saving.
+   */ const isFieldPresent = !!get(parentDataToUpdate, fieldToConnect);
+    const fieldToConnectPath = isFieldPresent ? fieldToConnect : fieldToConnect.split('.').slice(0, -1).join('.');
+    const fieldToConnectValue = isFieldPresent ? {
+        connect: [
+            {
+                id: data.documentId,
+                documentId: data.documentId,
+                locale: data.locale
+            }
+        ]
+    } : {
+        [fieldToConnect.split('.').pop()]: {
+            connect: [
+                {
+                    id: data.documentId,
+                    documentId: data.documentId,
+                    locale: data.locale
+                }
+            ],
+            disconnect: []
+        },
+        // In case the object was not present you need to pass the componentUID of the parent document
+        __component: fieldToConnectUID
+    };
+    const objectToConnect = set({}, fieldToConnectPath, fieldToConnectValue);
+    return merge(parentDataToUpdate, objectToConnect);
+};
 const DocumentActions = ({ actions })=>{
     const { formatMessage } = reactIntl.useIntl();
     const [primaryAction, secondaryAction, ...restActions] = actions.filter((action)=>{
@@ -381,7 +417,10 @@ const transformData = (data)=>{
     const isCloning = reactRouterDom.useMatch(router.CLONE_PATH) !== null;
     const { id } = reactRouterDom.useParams();
     const { formatMessage } = reactIntl.useIntl();
-    const canPublish = DocumentRBAC.useDocumentRBAC('PublishAction', ({ canPublish })=>canPublish);
+    const { canPublish, canReadFields } = DocumentRBAC.useDocumentRBAC('PublishAction', ({ canPublish, canReadFields })=>({
+            canPublish,
+            canReadFields
+        }));
     const { publish, isLoading } = useDocumentActions.useDocumentActions();
     const onPreview = Preview.usePreviewContext('UpdateAction', (state)=>state.onPreview, false);
     const [countDraftRelations, { isLoading: isLoadingDraftRelations, isError: isErrorDraftRelations }] = documents.useGetDraftRelationCountQuery();
@@ -395,7 +434,17 @@ 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);
+    // 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;
+    const dispatch = RelationModal.useRelationModal('PublishAction', (state)=>state.dispatch);
+    const fieldToConnect = RelationModal.useRelationModal('PublishAction', (state)=>state.state.fieldToConnect, false);
+    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 { currentDocumentMeta } = useDocumentContext.useDocumentContext('PublishAction');
+    const [updateDocumentMutation] = documents.useUpdateDocumentMutation();
+    const { _unstableFormatAPIError: formatAPIError } = strapiAdmin.useAPIErrorHandler();
     const idToPublish = currentDocumentMeta.documentId || id;
     React__namespace.useEffect(()=>{
         if (isErrorDraftRelations) {
@@ -479,6 +528,16 @@ const transformData = (data)=>{
         model,
         currentDocumentMeta.params
     ]);
+    const parentDocumentMetaToUpdate = documentHistory?.at(-2) ?? rootDocumentMeta;
+    const parentDocumentData = useDocument.useDocument({
+        documentId: parentDocumentMetaToUpdate?.documentId,
+        model: parentDocumentMetaToUpdate?.model,
+        collectionType: parentDocumentMetaToUpdate?.collectionType,
+        params: parentDocumentMetaToUpdate?.params
+    }, {
+        skip: !parentDocumentMetaToUpdate
+    });
+    const { getInitialFormValues } = useDocument.useDoc();
     const isDocumentPublished = (document?.[attributes.PUBLISHED_AT_ATTRIBUTE_NAME] || meta?.availableStatus.some((doc)=>doc[attributes.PUBLISHED_AT_ATTRIBUTE_NAME] !== null)) && document?.status !== 'modified';
     if (!schema?.options?.draftAndPublish) {
         return null;
@@ -490,13 +549,27 @@ const transformData = (data)=>{
                 status: 'published'
             });
             if (errors) {
-                toggleNotification({
-                    type: 'danger',
-                    message: formatMessage({
-                        id: 'content-manager.validation.error',
-                        defaultMessage: 'There are validation errors in your document. Please fix them before saving.'
-                    })
+                const hasUnreadableRequiredField = Object.keys(schema.attributes).some((fieldName)=>{
+                    const attribute = schema.attributes[fieldName];
+                    return attribute?.required && !(canReadFields ?? []).includes(fieldName);
                 });
+                if (hasUnreadableRequiredField) {
+                    toggleNotification({
+                        type: 'danger',
+                        message: formatMessage({
+                            id: 'content-manager.validation.error.unreadable-required-field',
+                            defaultMessage: 'Your current permissions prevent access to certain required fields. Please request access from an administrator to proceed.'
+                        })
+                    });
+                } else {
+                    toggleNotification({
+                        type: 'danger',
+                        message: formatMessage({
+                            id: 'content-manager.validation.error',
+                            defaultMessage: 'There are validation errors in your document. Please fix them before saving.'
+                        })
+                    });
+                }
                 return;
             }
             const res = await publish({
@@ -512,11 +585,59 @@ const transformData = (data)=>{
             if ('data' in res && collectionType !== collections.SINGLE_TYPES) {
                 /**
          * TODO: refactor the router so we can just do `../${res.data.documentId}` instead of this.
-         */ if (idToPublish === 'create') {
+         */ if (idToPublish === 'create' && !fromRelationModal) {
                     navigate({
                         pathname: `../${collectionType}/${model}/${res.data.documentId}`,
                         search: rawQuery
                     });
+                } else if (fromRelationModal) {
+                    const newRelation = {
+                        documentId: res.data.documentId,
+                        collectionType,
+                        model,
+                        params: currentDocumentMeta.params
+                    };
+                    /*
+           * Update, if needed, the parent relation with the newly published document.
+           * Check if in history we have the parent relation otherwise use the
+           * rootDocument
+           */ if (fieldToConnect && documentHistory && (parentDocumentMetaToUpdate.documentId || parentDocumentMetaToUpdate.collectionType === collections.SINGLE_TYPES)) {
+                        const parentDataToUpdate = parentDocumentMetaToUpdate.collectionType === collections.SINGLE_TYPES ? getInitialFormValues() : parentDocumentData.getInitialFormValues();
+                        const metaDocumentToUpdate = documentHistory.at(-2) ?? rootDocumentMeta;
+                        const dataToUpdate = connectRelationToParent(parentDataToUpdate, fieldToConnect, res.data, fieldToConnectUID);
+                        try {
+                            const updateRes = await updateDocumentMutation({
+                                collectionType: metaDocumentToUpdate.collectionType,
+                                model: metaDocumentToUpdate.model,
+                                documentId: metaDocumentToUpdate.collectionType !== collections.SINGLE_TYPES ? metaDocumentToUpdate.documentId : undefined,
+                                params: metaDocumentToUpdate.params,
+                                data: dataToUpdate
+                            });
+                            if ('error' in updateRes) {
+                                toggleNotification({
+                                    type: 'danger',
+                                    message: formatAPIError(updateRes.error)
+                                });
+                                return;
+                            }
+                        } catch (err) {
+                            toggleNotification({
+                                type: 'danger',
+                                message: formatMessage({
+                                    id: 'notification.error',
+                                    defaultMessage: 'An error occurred'
+                                })
+                            });
+                            throw err;
+                        }
+                    }
+                    dispatch({
+                        type: 'GO_TO_CREATED_RELATION',
+                        payload: {
+                            document: newRelation,
+                            shouldBypassConfirmation: true
+                        }
+                    });
                 }
             } else if ('error' in res && api.isBaseQueryError(res.error) && res.error.name === 'ValidationError') {
                 setErrors(formatValidationErrors(res.error));
@@ -592,14 +713,34 @@ const UpdateAction = ({ activeTab, documentId, model, collectionType })=>{
     const { create, update, clone, isLoading } = useDocumentActions.useDocumentActions();
     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 document = strapiAdmin.useForm('UpdateAction', ({ values })=>values);
     const validate = strapiAdmin.useForm('UpdateAction', (state)=>state.validate);
     const setErrors = strapiAdmin.useForm('UpdateAction', (state)=>state.setErrors);
-    const resetForm = strapiAdmin.useForm('PublishAction', ({ resetForm })=>resetForm);
+    const resetForm = strapiAdmin.useForm('UpdateAction', ({ resetForm })=>resetForm);
+    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 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);
+    const rootDocumentMeta = RelationModal.useRelationModal('UpdateAction', (state)=>state.rootDocumentMeta);
+    const fromRelationModal = relationContext != undefined;
     const { currentDocumentMeta } = useDocumentContext.useDocumentContext('UpdateAction');
+    const [updateDocumentMutation] = documents.useUpdateDocumentMutation();
+    const { _unstableFormatAPIError: formatAPIError } = strapiAdmin.useAPIErrorHandler();
+    const parentDocumentMetaToUpdate = documentHistory?.at(-2) ?? rootDocumentMeta;
+    const parentDocumentData = useDocument.useDocument({
+        documentId: parentDocumentMetaToUpdate?.documentId,
+        model: parentDocumentMetaToUpdate?.model,
+        collectionType: parentDocumentMetaToUpdate?.collectionType,
+        params: parentDocumentMetaToUpdate?.params
+    }, {
+        skip: !parentDocumentMetaToUpdate
+    });
     const handleUpdate = React__namespace.useCallback(async ()=>{
         setSubmitting(true);
         try {
@@ -653,13 +794,64 @@ const UpdateAction = ({ activeTab, documentId, model, collectionType })=>{
                     params: currentDocumentMeta.params
                 }, transformData(document));
                 if ('data' in res && collectionType !== collections.SINGLE_TYPES) {
-                    navigate({
-                        pathname: `../${res.data.documentId}`,
-                        search: rawQuery
-                    }, {
-                        replace: true,
-                        relative: 'path'
-                    });
+                    if (fromRelationModal) {
+                        const createdRelation = {
+                            documentId: res.data.documentId,
+                            collectionType,
+                            model,
+                            params: currentDocumentMeta.params
+                        };
+                        /*
+             * Update, if needed, the parent relation with the newly published document.
+             * Check if in history we have the parent relation otherwise use the
+             * rootDocument
+             */ if (fieldToConnect && documentHistory && (parentDocumentMetaToUpdate.documentId || parentDocumentMetaToUpdate.collectionType === collections.SINGLE_TYPES)) {
+                            const parentDataToUpdate = parentDocumentMetaToUpdate.collectionType === collections.SINGLE_TYPES ? getInitialFormValues() : parentDocumentData.getInitialFormValues();
+                            const dataToUpdate = connectRelationToParent(parentDataToUpdate, fieldToConnect, res.data, fieldToConnectUID);
+                            try {
+                                const updateRes = await updateDocumentMutation({
+                                    collectionType: parentDocumentMetaToUpdate.collectionType,
+                                    model: parentDocumentMetaToUpdate.model,
+                                    documentId: parentDocumentMetaToUpdate.collectionType !== collections.SINGLE_TYPES ? parentDocumentMetaToUpdate.documentId : undefined,
+                                    params: parentDocumentMetaToUpdate.params,
+                                    data: {
+                                        ...dataToUpdate
+                                    }
+                                });
+                                if ('error' in updateRes) {
+                                    toggleNotification({
+                                        type: 'danger',
+                                        message: formatAPIError(updateRes.error)
+                                    });
+                                    return;
+                                }
+                            } catch (err) {
+                                toggleNotification({
+                                    type: 'danger',
+                                    message: formatMessage({
+                                        id: 'notification.error',
+                                        defaultMessage: 'An error occurred'
+                                    })
+                                });
+                                throw err;
+                            }
+                        }
+                        dispatch({
+                            type: 'GO_TO_CREATED_RELATION',
+                            payload: {
+                                document: createdRelation,
+                                shouldBypassConfirmation: true
+                            }
+                        });
+                    } else {
+                        navigate({
+                            pathname: `../${res.data.documentId}`,
+                            search: rawQuery
+                        }, {
+                            replace: true,
+                            relative: 'path'
+                        });
+                    }
                 } else if ('error' in res && api.isBaseQueryError(res.error) && res.error.name === 'ValidationError') {
                     setErrors(formatValidationErrors(res.error));
                 }
@@ -671,26 +863,36 @@ const UpdateAction = ({ activeTab, documentId, model, collectionType })=>{
             }
         }
     }, [
+        setSubmitting,
+        modified,
+        validate,
+        isCloning,
+        documentId,
+        collectionType,
+        toggleNotification,
+        formatMessage,
         clone,
+        model,
         cloneMatch?.params.origin,
-        collectionType,
-        create,
         currentDocumentMeta.params,
         document,
-        documentId,
-        formatMessage,
-        formatValidationErrors,
-        isCloning,
-        model,
-        modified,
         navigate,
         rawQuery,
-        resetForm,
         setErrors,
-        setSubmitting,
-        toggleNotification,
+        formatValidationErrors,
         update,
-        validate,
+        resetForm,
+        create,
+        fromRelationModal,
+        fieldToConnect,
+        documentHistory,
+        parentDocumentMetaToUpdate,
+        dispatch,
+        getInitialFormValues,
+        parentDocumentData,
+        fieldToConnectUID,
+        updateDocumentMutation,
+        formatAPIError,
         onPreview
     ]);
     // Auto-save on CMD+S or CMD+Enter on macOS, and CTRL+S or CTRL+Enter on Windows/Linux