@strapi/content-manager 0.0.0-next.8c98bb4ad3e89fc5a3f45b1925795444d17042d6 → 0.0.0-next.8f0cdd4f9e4697ffed86c783465297fe532713f8

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

@@ -1,23 +1,60 @@
-import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
+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, Typography, Radio, Button, VisuallyHidden, Dialog, Modal } from '@strapi/design-system';
-import { Cross, WarningCircle, More } from '@strapi/icons';
+import { tours, useNotification, useAPIErrorHandler, useQueryParams, useForm } 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';
+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 { useDocumentContext } from '../../../features/DocumentContext.mjs';
 import { useDocumentRBAC } from '../../../features/DocumentRBAC.mjs';
-import { useDoc } from '../../../hooks/useDocument.mjs';
+import { useDocument, useDoc } from '../../../hooks/useDocument.mjs';
 import { useDocumentActions } from '../../../hooks/useDocumentActions.mjs';
+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 } from '../../../services/documents.mjs';
-import { buildValidParams, isBaseQueryError } from '../../../utils/api.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)=>{
+    /*
+   * 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 } = useIntl();
     const [primaryAction, secondaryAction, ...restActions] = actions.filter((action)=>{
@@ -38,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
@@ -116,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);
@@ -182,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);
@@ -230,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 ()=>{
@@ -350,8 +360,8 @@ const transformData = (data)=>{
 };
 /* -------------------------------------------------------------------------------------------------
  * DocumentActionComponents
- * -----------------------------------------------------------------------------------------------*/ const PublishAction = ({ activeTab, documentId, model, collectionType, meta, document, onPreview, fromPreview = false, fromRelationModal = false })=>{
-    const schema = useDocumentContext('PublishAction', (state)=>state.document.schema);
+ * -----------------------------------------------------------------------------------------------*/ const PublishAction = ({ activeTab, documentId, model, collectionType, meta, document })=>{
+    const { currentDocument: { schema } } = useDocumentContext('PublishAction');
     const navigate = useNavigate();
     const { toggleNotification } = useNotification();
     const { _unstableFormatValidationErrors: formatValidationErrors } = useAPIErrorHandler();
@@ -359,23 +369,36 @@ const transformData = (data)=>{
     const isCloning = useMatch(CLONE_PATH) !== null;
     const { id } = useParams();
     const { formatMessage } = useIntl();
-    const canPublish = useDocumentRBAC('PublishAction', ({ canPublish })=>canPublish);
-    const { publish, isLoading } = useDocumentActions(fromPreview, fromRelationModal);
+    const { canPublish, canReadFields } = useDocumentRBAC('PublishAction', ({ canPublish, canReadFields })=>({
+            canPublish,
+            canReadFields
+        }));
+    const { publish, isLoading } = useDocumentActions();
+    const onPreview = usePreviewContext('UpdateAction', (state)=>state.onPreview, false);
     const [countDraftRelations, { isLoading: isLoadingDraftRelations, isError: isErrorDraftRelations }] = useLazyGetDraftRelationCountQuery();
     const [localCountOfDraftRelations, setLocalCountOfDraftRelations] = React.useState(0);
     const [serverCountOfDraftRelations, setServerCountOfDraftRelations] = React.useState(0);
-    const [{ query, rawQuery }] = useQueryParams();
-    const params = React.useMemo(()=>buildValidParams(query), [
-        query
-    ]);
+    const [{ rawQuery }] = useQueryParams();
     const modified = useForm('PublishAction', ({ modified })=>modified);
     const setSubmitting = useForm('PublishAction', ({ setSubmitting })=>setSubmitting);
     const isSubmitting = useForm('PublishAction', ({ isSubmitting })=>isSubmitting);
     const validate = useForm('PublishAction', (state)=>state.validate);
     const setErrors = useForm('PublishAction', (state)=>state.setErrors);
     const formValues = useForm('PublishAction', ({ values })=>values);
-    const rootDocumentMeta = useDocumentContext('PublishAction', (state)=>state.rootDocumentMeta);
-    const currentDocumentMeta = useDocumentContext('PublishAction', (state)=>state.meta);
+    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;
+    const dispatch = useRelationModal('PublishAction', (state)=>state.dispatch);
+    const fieldToConnect = useRelationModal('PublishAction', (state)=>state.state.fieldToConnect, false);
+    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 { currentDocumentMeta } = useDocumentContext('PublishAction');
+    const [updateDocumentMutation] = useUpdateDocumentMutation();
+    const { _unstableFormatAPIError: formatAPIError } = useAPIErrorHandler();
+    const idToPublish = currentDocumentMeta.documentId || id;
     React.useEffect(()=>{
         if (isErrorDraftRelations) {
             toggleNotification({
@@ -439,7 +462,7 @@ const transformData = (data)=>{
                 collectionType,
                 model,
                 documentId,
-                params
+                params: currentDocumentMeta.params
             });
             if (error) {
                 throw error;
@@ -456,8 +479,18 @@ const transformData = (data)=>{
         countDraftRelations,
         collectionType,
         model,
-        params
+        currentDocumentMeta.params
     ]);
+    const parentDocumentMetaToUpdate = documentHistory?.at(-2) ?? rootDocumentMeta;
+    const parentDocumentData = useDocument({
+        documentId: parentDocumentMetaToUpdate?.documentId,
+        model: parentDocumentMetaToUpdate?.model,
+        collectionType: parentDocumentMetaToUpdate?.collectionType,
+        params: parentDocumentMetaToUpdate?.params
+    }, {
+        skip: !parentDocumentMetaToUpdate
+    });
+    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;
@@ -469,30 +502,99 @@ 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 isPublishingRelation = rootDocumentMeta.documentId !== currentDocumentMeta.documentId;
+            const { data } = handleInvisibleAttributes(transformData(formValues), {
+                schema,
+                components
+            });
             const res = await publish({
                 collectionType,
                 model,
                 documentId,
-                params: isPublishingRelation ? currentDocumentMeta.params : params
-            }, transformData(formValues));
+                params: currentDocumentMeta.params
+            }, data);
+            // Reset form if successful
+            if ('data' in res) {
+                resetForm();
+            }
             if ('data' in res && collectionType !== SINGLE_TYPES) {
                 /**
          * TODO: refactor the router so we can just do `../${res.data.documentId}` instead of this.
-         */ if (id === '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 === SINGLE_TYPES)) {
+                        const parentDataToUpdate = parentDocumentMetaToUpdate.collectionType === 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 !== 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 && isBaseQueryError(res.error) && res.error.name === 'ValidationError') {
                 setErrors(formatValidationErrors(res.error));
@@ -558,27 +660,48 @@ PublishAction.position = [
     'preview',
     'relation-modal'
 ];
-const UpdateAction = ({ activeTab, documentId, model, collectionType, onPreview, fromPreview = false, fromRelationModal = false })=>{
+const UpdateAction = ({ activeTab, documentId, model, collectionType })=>{
     const navigate = useNavigate();
     const { toggleNotification } = useNotification();
     const { _unstableFormatValidationErrors: formatValidationErrors } = useAPIErrorHandler();
     const cloneMatch = useMatch(CLONE_PATH);
     const isCloning = cloneMatch !== null;
     const { formatMessage } = useIntl();
-    const { create, update, clone, isLoading } = useDocumentActions(fromPreview, fromRelationModal);
-    const [{ query, rawQuery }] = useQueryParams();
-    const params = React.useMemo(()=>buildValidParams(query), [
-        query
-    ]);
+    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);
-    const resetForm = useForm('PublishAction', ({ resetForm })=>resetForm);
-    const rootDocumentMeta = useDocumentContext('UpdateAction', (state)=>state.rootDocumentMeta);
-    const currentDocumentMeta = useDocumentContext('UpdateAction', (state)=>state.meta);
+    const resetForm = useForm('UpdateAction', ({ resetForm })=>resetForm);
+    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);
+    const rootDocumentMeta = useRelationModal('UpdateAction', (state)=>state.rootDocumentMeta);
+    const fromRelationModal = relationContext != undefined;
+    const { currentDocumentMeta } = useDocumentContext('UpdateAction');
+    const [updateDocumentMutation] = useUpdateDocumentMutation();
+    const { _unstableFormatAPIError: formatAPIError } = useAPIErrorHandler();
+    const parentDocumentMetaToUpdate = documentHistory?.at(-2) ?? rootDocumentMeta;
+    const parentDocumentData = useDocument({
+        documentId: parentDocumentMetaToUpdate?.documentId,
+        model: parentDocumentMetaToUpdate?.model,
+        collectionType: parentDocumentMetaToUpdate?.collectionType,
+        params: parentDocumentMetaToUpdate?.params
+    }, {
+        skip: !parentDocumentMetaToUpdate
+    });
+    const { schema } = useDoc();
     const handleUpdate = React.useCallback(async ()=>{
         setSubmitting(true);
         try {
@@ -602,7 +725,7 @@ const UpdateAction = ({ activeTab, documentId, model, collectionType, onPreview,
                 const res = await clone({
                     model,
                     documentId: cloneMatch.params.origin,
-                    params
+                    params: currentDocumentMeta.params
                 }, transformData(document));
                 if ('data' in res) {
                     navigate({
@@ -615,31 +738,91 @@ const UpdateAction = ({ activeTab, documentId, model, collectionType, onPreview,
                     setErrors(formatValidationErrors(res.error));
                 }
             } else if (documentId || collectionType === SINGLE_TYPES) {
-                const isEditingRelation = rootDocumentMeta.documentId !== currentDocumentMeta.documentId;
+                const { data } = handleInvisibleAttributes(transformData(document), {
+                    schema: fromRelationModal ? relationalModalSchema : schema,
+                    initialValues,
+                    components
+                });
                 const res = await update({
                     collectionType,
                     model,
                     documentId,
-                    params: isEditingRelation ? currentDocumentMeta.params : params
-                }, transformData(document));
+                    params: currentDocumentMeta.params
+                }, data);
                 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
-                }, transformData(document));
+                    params: currentDocumentMeta.params
+                }, data);
                 if ('data' in res && collectionType !== 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 === SINGLE_TYPES)) {
+                            const parentDataToUpdate = parentDocumentMetaToUpdate.collectionType === 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 !== 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 && isBaseQueryError(res.error) && res.error.name === 'ValidationError') {
                     setErrors(formatValidationErrors(res.error));
                 }
@@ -651,30 +834,41 @@ const UpdateAction = ({ activeTab, documentId, model, collectionType, onPreview,
             }
         }
     }, [
+        setSubmitting,
+        modified,
+        validate,
+        isCloning,
+        documentId,
+        collectionType,
+        toggleNotification,
+        formatMessage,
         clone,
+        model,
         cloneMatch?.params.origin,
-        collectionType,
-        create,
-        currentDocumentMeta.documentId,
         currentDocumentMeta.params,
         document,
-        documentId,
-        formatMessage,
-        formatValidationErrors,
-        isCloning,
-        model,
-        modified,
         navigate,
-        onPreview,
-        params,
         rawQuery,
-        resetForm,
-        rootDocumentMeta.documentId,
         setErrors,
-        setSubmitting,
-        toggleNotification,
+        formatValidationErrors,
         update,
-        validate
+        resetForm,
+        create,
+        fromRelationModal,
+        fieldToConnect,
+        documentHistory,
+        parentDocumentMetaToUpdate,
+        dispatch,
+        getInitialFormValues,
+        parentDocumentData,
+        fieldToConnectUID,
+        updateDocumentMutation,
+        formatAPIError,
+        onPreview,
+        initialValues,
+        schema,
+        components,
+        relationalModalSchema
     ]);
     // Auto-save on CMD+S or CMD+Enter on macOS, and CTRL+S or CTRL+Enter on Windows/Linux
     React.useEffect(()=>{