@strapi/content-manager 5.13.0-beta.0 → 5.13.0-beta.1

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

@@ -4,57 +4,21 @@ import { useNotification, useAPIErrorHandler, useQueryParams, useForm } from '@s
 import { Menu, Flex, Button, 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 { useDocumentRBAC } from '../../../features/DocumentRBAC.mjs';
-import { useDocument, useDoc } from '../../../hooks/useDocument.mjs';
+import { 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, useUpdateDocumentMutation } from '../../../services/documents.mjs';
+import { useGetDraftRelationCountQuery as useLazyGetDraftRelationCountQuery } from '../../../services/documents.mjs';
 import { isBaseQueryError, buildValidParams } from '../../../utils/api.mjs';
 import { getTranslation } from '../../../utils/translations.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)=>{
@@ -410,17 +374,7 @@ const transformData = (data)=>{
     const setErrors = useForm('PublishAction', (state)=>state.setErrors);
     const formValues = useForm('PublishAction', ({ values })=>values);
     const resetForm = useForm('PublishAction', ({ resetForm })=>resetForm);
-    // 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) {
@@ -504,16 +458,6 @@ const transformData = (data)=>{
         model,
         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;
@@ -547,59 +491,11 @@ const transformData = (data)=>{
             if ('data' in res && collectionType !== SINGLE_TYPES) {
                 /**
          * TODO: refactor the router so we can just do `../${res.data.documentId}` instead of this.
-         */ if (idToPublish === 'create' && !fromRelationModal) {
+         */ if (idToPublish === 'create') {
                     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));
@@ -675,34 +571,14 @@ const UpdateAction = ({ activeTab, documentId, model, collectionType })=>{
     const { create, update, clone, isLoading } = useDocumentActions();
     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 document = useForm('UpdateAction', ({ values })=>values);
     const validate = useForm('UpdateAction', (state)=>state.validate);
     const setErrors = useForm('UpdateAction', (state)=>state.setErrors);
-    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 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 resetForm = useForm('PublishAction', ({ resetForm })=>resetForm);
     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 handleUpdate = React.useCallback(async ()=>{
         setSubmitting(true);
         try {
@@ -756,64 +632,13 @@ const UpdateAction = ({ activeTab, documentId, model, collectionType })=>{
                     params: currentDocumentMeta.params
                 }, transformData(document));
                 if ('data' in res && collectionType !== SINGLE_TYPES) {
-                    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'
-                        });
-                    }
+                    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));
                 }
@@ -825,36 +650,26 @@ 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,
-        formatValidationErrors,
+        setSubmitting,
+        toggleNotification,
         update,
-        resetForm,
-        create,
-        fromRelationModal,
-        fieldToConnect,
-        documentHistory,
-        parentDocumentMetaToUpdate,
-        dispatch,
-        getInitialFormValues,
-        parentDocumentData,
-        fieldToConnectUID,
-        updateDocumentMutation,
-        formatAPIError,
+        validate,
         onPreview
     ]);
     // Auto-save on CMD+S or CMD+Enter on macOS, and CTRL+S or CTRL+Enter on Windows/Linux