@strapi/content-manager 5.51.1 → 5.52.0

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

@@ -3,10 +3,6 @@ import * as React from 'react';
 import { useNotification, useAPIErrorHandler, useQueryParams, useForm, useGuidedTour, GUIDED_TOUR_REQUIRED_ACTIONS, useIsDesktop, tours } from '@strapi/admin/strapi-admin';
 import { Button, Dialog, Modal, Flex, Typography, Radio, Tooltip, Menu, IconButton } from '@strapi/design-system';
 import { WarningCircle, Cross, More } 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 { PUBLISHED_AT_ATTRIBUTE_NAME } from '../../../constants/attributes.mjs';
@@ -19,6 +15,7 @@ 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 { buildValidParams, isBaseQueryError } from '../../../utils/api.mjs';
+import { getIn, setIn, isObject } from '../../../utils/objects.mjs';
 import { getTranslation } from '../../../utils/translations.mjs';
 import { handleInvisibleAttributes } from '../utils/data.mjs';
 import { EMPTY_DRAFT_RELATION_COUNTS, countLocalDraftRelations, normalizeDraftRelationCounts, resolveDraftRelationCounts, getDraftRelationsPublishState } from '../utils/draftRelationCounts.mjs';
@@ -30,36 +27,42 @@ const openPublishConfirmDialog = (scope)=>{
     publishConfirmDialogOpeners.get(scope)?.();
 };
 const connectRelationToParent = (parentDataToUpdate, fieldToConnect, data, fieldToConnectUID)=>{
+    const relationToConnect = {
+        id: data.documentId,
+        documentId: data.documentId,
+        locale: data.locale
+    };
     /*
    * 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
-            }
-        ]
+   */ const fieldValue = getIn(parentDataToUpdate, fieldToConnect);
+    const relationFieldValue = isObject(fieldValue) ? fieldValue : undefined;
+    const isFieldPresent = relationFieldValue !== undefined;
+    const fieldPath = fieldToConnect.split('.');
+    const fieldName = fieldPath.at(-1);
+    if (!fieldName) {
+        return parentDataToUpdate;
+    }
+    const parentPath = fieldPath.slice(0, -1).join('.');
+    const existingConnect = Array.isArray(relationFieldValue?.connect) ? relationFieldValue.connect : [];
+    // A relation is identified by documentId and locale; numeric ids are not stable across locales.
+    const connect = existingConnect.some((relation)=>relation.documentId === relationToConnect.documentId && relation.locale === relationToConnect.locale) ? existingConnect : [
+        ...existingConnect,
+        relationToConnect
+    ];
+    const relationValue = isFieldPresent ? {
+        ...relationFieldValue,
+        connect
     } : {
-        [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
+        connect,
+        disconnect: []
     };
-    const objectToConnect = set({}, fieldToConnectPath, fieldToConnectValue);
-    return merge(parentDataToUpdate, objectToConnect);
+    const dataWithRelation = setIn(parentDataToUpdate, fieldToConnect, relationValue);
+    if (!isFieldPresent && fieldToConnectUID && parentPath) {
+        return setIn(dataWithRelation, `${parentPath}.__component`, fieldToConnectUID);
+    }
+    return dataWithRelation;
 };
 const DocumentActions = ({ actions })=>{
     const { formatMessage } = useIntl();
@@ -232,7 +235,7 @@ const DocumentActionsMenu = ({ actions, children, label, variant = 'tertiary' })
     const [dialogId, setDialogId] = React.useState(null);
     const { formatMessage } = useIntl();
     const { toggleNotification } = useNotification();
-    const isDisabled = actions.every((action)=>action.disabled) || actions.length === 0;
+    const isDisabled = actions.every((action)=>action.disabled);
     const triggerRef = React.useRef(null);
     const handleClick = (action)=>async (e)=>{
             const { onClick = ()=>false, dialog, id } = action;
@@ -436,11 +439,26 @@ const transformData = (data)=>{
         if ('apiData' in data) {
             return data.apiData;
         }
-        return mapValues((value)=>transformData(value))(data);
+        return Object.fromEntries(Object.entries(data).map(([key, value])=>[
+                key,
+                transformData(value)
+            ]));
     }
     return data;
 };
 const transformDocumentData = (data)=>transformData(data);
+const prepareParentDataForRelationUpdate = (parentFormValues, fallbackParentFormValues, options)=>{
+    const parentDataToUpdate = parentFormValues ?? fallbackParentFormValues;
+    if (!parentDataToUpdate) {
+        return parentDataToUpdate;
+    }
+    const { data } = handleInvisibleAttributes(transformDocumentData(parentDataToUpdate), {
+        ...options,
+        // The live snapshot can omit saved invisible fields, so retain the parent's saved initial values.
+        initialValues: fallbackParentFormValues
+    });
+    return data;
+};
 /* -------------------------------------------------------------------------------------------------
  * DocumentActionComponents
  * -----------------------------------------------------------------------------------------------*/ const PublishAction = ({ activeTab, documentId, model, collectionType, meta, document })=>{
@@ -480,6 +498,7 @@ const transformDocumentData = (data)=>transformData(data);
     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 getParentFormValues = useRelationModal('PublishAction', (state)=>state.state.getParentFormValues, false);
     const documentHistory = useRelationModal('PublishAction', (state)=>state.state.documentHistory, false);
     const rootDocumentMeta = useRelationModal('PublishAction', (state)=>state.rootDocumentMeta);
     const dispatchGuidedTour = useGuidedTour('PublishAction', (s)=>s.dispatch);
@@ -650,33 +669,39 @@ const transformDocumentData = (data)=>transformData(data);
            * 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 fallbackParentFormValues = parentDocumentMetaToUpdate.collectionType === SINGLE_TYPES ? getInitialFormValues() : parentDocumentData.getInitialFormValues();
+                        const parentDataToUpdate = prepareParentDataForRelationUpdate(getParentFormValues?.(), fallbackParentFormValues, {
+                            schema: parentDocumentData.schema,
+                            components: parentDocumentData.components
+                        });
                         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) {
+                        if (parentDataToUpdate) {
+                            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: formatAPIError(updateRes.error)
+                                    message: formatMessage({
+                                        id: 'notification.error',
+                                        defaultMessage: 'An error occurred'
+                                    })
                                 });
-                                return;
+                                throw err;
                             }
-                        } catch (err) {
-                            toggleNotification({
-                                type: 'danger',
-                                message: formatMessage({
-                                    id: 'notification.error',
-                                    defaultMessage: 'An error occurred'
-                                })
-                            });
-                            throw err;
                         }
                     }
                     dispatch({
@@ -860,6 +885,7 @@ const UpdateAction = ({ activeTab, documentId, model, collectionType })=>{
     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 getParentFormValues = useRelationModal('UpdateAction', (state)=>state.state.getParentFormValues, false);
     const documentHistory = useRelationModal('UpdateAction', (state)=>state.state.documentHistory, false);
     const rootDocumentMeta = useRelationModal('UpdateAction', (state)=>state.rootDocumentMeta);
     const fromRelationModal = relationContext != undefined;
@@ -970,34 +996,40 @@ const UpdateAction = ({ activeTab, documentId, model, collectionType })=>{
              * 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
+                            const fallbackParentFormValues = parentDocumentMetaToUpdate.collectionType === SINGLE_TYPES ? getInitialFormValues() : parentDocumentData.getInitialFormValues();
+                            const parentDataToUpdate = prepareParentDataForRelationUpdate(getParentFormValues?.(), fallbackParentFormValues, {
+                                schema: parentDocumentData.schema,
+                                components: parentDocumentData.components
+                            });
+                            if (parentDataToUpdate) {
+                                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;
                                     }
-                                });
-                                if ('error' in updateRes) {
+                                } catch (err) {
                                     toggleNotification({
                                         type: 'danger',
-                                        message: formatAPIError(updateRes.error)
+                                        message: formatMessage({
+                                            id: 'notification.error',
+                                            defaultMessage: 'An error occurred'
+                                        })
                                     });
-                                    return;
+                                    throw err;
                                 }
-                            } catch (err) {
-                                toggleNotification({
-                                    type: 'danger',
-                                    message: formatMessage({
-                                        id: 'notification.error',
-                                        defaultMessage: 'An error occurred'
-                                    })
-                                });
-                                throw err;
                             }
                         }
                         dispatch({
@@ -1293,5 +1325,5 @@ const DEFAULT_ACTIONS = [
     DiscardAction
 ];
 
-export { DEFAULT_ACTIONS, DocumentActionButton, DocumentActions, DocumentActionsMenu, openPublishConfirmDialog };
+export { DEFAULT_ACTIONS, DocumentActionButton, DocumentActions, DocumentActionsMenu, PublishAction, UpdateAction, openPublishConfirmDialog };
 //# sourceMappingURL=DocumentActions.mjs.map