@strapi/content-manager 5.51.0 → 5.51.2

package/dist/admin/layout.mjs

@@ -1,6 +1,7 @@
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
-import 'react';
-import { useIsMobile, Page, SubNav, Layouts, LazyOutlet } from '@strapi/admin/strapi-admin';
+import * as React from 'react';
+import { useIsMobile, useQueryParams, useAuth, Page, SubNav, Layouts, LazyOutlet, useNotification } from '@strapi/admin/strapi-admin';
+import { stringify } from 'qs';
 import { useIntl } from 'react-intl';
 import { useMatch, useLocation, Navigate } from 'react-router-dom';
 import { DragLayer } from './components/DragLayer.mjs';
@@ -24,6 +25,8 @@ import { getTranslation } from './utils/translations.mjs';
     ].sort((a, b)=>a.title.localeCompare(b.title));
     const { pathname } = useLocation();
     const { formatMessage } = useIntl();
+    const [{ query }] = useQueryParams();
+    const permissions = useAuth('Layout', (state)=>state.permissions);
     if (isLoading) {
         return /*#__PURE__*/ jsxs(Fragment, {
             children: [
@@ -41,18 +44,45 @@ import { getTranslation } from './utils/translations.mjs';
     const supportedModelsToDisplay = models.filter(({ isDisplayed })=>isDisplayed);
     // Redirect the user to the 403 page
     if (authorisedModels.length === 0 && supportedModelsToDisplay.length > 0 && pathname !== '/content-manager/403') {
-        return /*#__PURE__*/ jsx(Navigate, {
-            to: "/403"
-        });
+        const requestedLocale = query.plugins?.i18n?.locale;
+        const localeScopedPermissions = permissions.filter((permission)=>permission.action === 'plugin::content-manager.explorer.read' && Array.isArray(permission.properties?.locales));
+        const contentTypePermissions = localeScopedPermissions.filter((permission)=>permission.subject === contentTypeMatch?.params.uid);
+        const accessibleLocales = Array.from(new Set((contentTypePermissions.length > 0 ? contentTypePermissions : localeScopedPermissions).flatMap((permission)=>permission.properties?.locales)));
+        if (typeof requestedLocale === 'string' && accessibleLocales.length > 0) {
+            if (!accessibleLocales.includes(requestedLocale)) {
+                const search = stringify({
+                    ...query,
+                    plugins: {
+                        ...query.plugins,
+                        i18n: {
+                            ...query.plugins?.i18n,
+                            locale: accessibleLocales[0]
+                        }
+                    }
+                });
+                return /*#__PURE__*/ jsx(NavigateWithLocaleWarning, {
+                    to: {
+                        pathname,
+                        search
+                    }
+                });
+            }
+        } else {
+            return /*#__PURE__*/ jsx(Navigate, {
+                to: "/content-manager/403",
+                replace: true
+            });
+        }
     }
     // Redirect the user to the create content type page
-    if (supportedModelsToDisplay.length === 0 && pathname !== '/no-content-types') {
+    if (supportedModelsToDisplay.length === 0 && pathname !== '/content-manager/no-content-types') {
         return /*#__PURE__*/ jsx(Navigate, {
-            to: "/no-content-types"
+            to: "/content-manager/no-content-types",
+            replace: true
         });
     }
     // On /content-manager base route
-    if (!contentTypeMatch && authorisedModels.length > 0) {
+    if (!contentTypeMatch && authorisedModels.length > 0 && pathname !== '/content-manager/403' && pathname !== '/content-manager/no-content-types') {
         // On desktop: redirect to first collection type
         if (!isMobile) {
             return /*#__PURE__*/ jsx(Navigate, {
@@ -102,6 +132,26 @@ import { getTranslation } from './utils/translations.mjs';
         ]
     });
 };
+const NavigateWithLocaleWarning = ({ to })=>{
+    const { toggleNotification } = useNotification();
+    const { formatMessage } = useIntl();
+    React.useEffect(()=>{
+        toggleNotification({
+            type: 'warning',
+            message: formatMessage({
+                id: getTranslation('permissions.not-allowed.locale'),
+                defaultMessage: "You don't have the permissions to access this content for the requested locale"
+            })
+        });
+    }, [
+        toggleNotification,
+        formatMessage
+    ]);
+    return /*#__PURE__*/ jsx(Navigate, {
+        to: to,
+        replace: true
+    });
+};
 /* -------------------------------------------------------------------------------------------------
  * renderDraglayerItem
  * -----------------------------------------------------------------------------------------------*/ function renderDraglayerItem({ type, item }) {

package/dist/admin/layout.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"layout.mjs","sources":["../../admin/src/layout.tsx"],"sourcesContent":["/* eslint-disable check-file/filename-naming-convention */\nimport * as React from 'react';\n\nimport { Page, Layouts, SubNav, useIsMobile, LazyOutlet } from '@strapi/admin/strapi-admin';\nimport { useIntl } from 'react-intl';\nimport { Navigate, useLocation, useMatch } from 'react-router-dom';\n\nimport { DragLayer, DragLayerProps } from './components/DragLayer';\nimport { CardDragPreview } from './components/DragPreviews/CardDragPreview';\nimport { ComponentDragPreview } from './components/DragPreviews/ComponentDragPreview';\nimport { RelationDragPreview } from './components/DragPreviews/RelationDragPreview';\nimport { LeftMenu } from './components/LeftMenu';\nimport { ItemTypes } from './constants/dragAndDrop';\nimport { useContentManagerInitData } from './hooks/useContentManagerInitData';\nimport { getTranslation } from './utils/translations';\n\nimport type { CardDragPreviewProps } from './components/DragPreviews/CardDragPreview';\nimport type { ComponentDragPreviewProps } from './components/DragPreviews/ComponentDragPreview';\nimport type { RelationDragPreviewProps } from './components/DragPreviews/RelationDragPreview';\n\n/* -------------------------------------------------------------------------------------------------\n * Layout\n * -----------------------------------------------------------------------------------------------*/\n\nconst Layout = () => {\n  const contentTypeMatch = useMatch('/content-manager/:kind/:uid/*');\n  const isMobile = useIsMobile();\n\n  const { isLoading, collectionTypeLinks, models, singleTypeLinks } = useContentManagerInitData();\n  const authorisedModels = [...collectionTypeLinks, ...singleTypeLinks].sort((a, b) =>\n    a.title.localeCompare(b.title)\n  );\n\n  const { pathname } = useLocation();\n  const { formatMessage } = useIntl();\n\n  if (isLoading) {\n    return (\n      <>\n        <Page.Title>\n          {formatMessage({\n            id: getTranslation('plugin.name'),\n            defaultMessage: 'Content Manager',\n          })}\n        </Page.Title>\n        <Page.Loading />\n      </>\n    );\n  }\n\n  // Array of models that are displayed in the content manager\n  const supportedModelsToDisplay = models.filter(({ isDisplayed }) => isDisplayed);\n\n  // Redirect the user to the 403 page\n  if (\n    authorisedModels.length === 0 &&\n    supportedModelsToDisplay.length > 0 &&\n    pathname !== '/content-manager/403'\n  ) {\n    return <Navigate to=\"/403\" />;\n  }\n\n  // Redirect the user to the create content type page\n  if (supportedModelsToDisplay.length === 0 && pathname !== '/no-content-types') {\n    return <Navigate to=\"/no-content-types\" />;\n  }\n\n  // On /content-manager base route\n  if (!contentTypeMatch && authorisedModels.length > 0) {\n    // On desktop: redirect to first collection type\n    if (!isMobile) {\n      return (\n        <Navigate\n          to={{\n            pathname: authorisedModels[0].to,\n            search: authorisedModels[0].search ?? '',\n          }}\n          replace\n        />\n      );\n    }\n\n    // On mobile: show navigation page\n    return (\n      <>\n        <Page.Title>\n          {formatMessage({\n            id: getTranslation('plugin.name'),\n            defaultMessage: 'Content Manager',\n          })}\n        </Page.Title>\n        <SubNav.PageWrapper>\n          <LeftMenu isFullPage />\n        </SubNav.PageWrapper>\n      </>\n    );\n  }\n\n  return (\n    <>\n      <Page.Title>\n        {formatMessage({\n          id: getTranslation('plugin.name'),\n          defaultMessage: 'Content Manager',\n        })}\n      </Page.Title>\n      <Layouts.Root sideNav={<LeftMenu />}>\n        <DragLayer renderItem={renderDraglayerItem} />\n        <LazyOutlet nested />\n      </Layouts.Root>\n    </>\n  );\n};\n\n/* -------------------------------------------------------------------------------------------------\n * renderDraglayerItem\n * -----------------------------------------------------------------------------------------------*/\n\nfunction renderDraglayerItem({ type, item }: Parameters<DragLayerProps['renderItem']>[0]) {\n  if (!type || (type && typeof type !== 'string')) {\n    return null;\n  }\n\n  /**\n   * Because a user may have multiple relations / dynamic zones / repeable fields in the same content type,\n   * we append the fieldName for the item type to make them unique, however, we then want to extract that\n   * first type to apply the correct preview.\n   */\n  const [actualType] = type.split('_');\n\n  switch (actualType) {\n    case ItemTypes.EDIT_FIELD:\n    case ItemTypes.FIELD:\n      return isCardDragItem(item) ? <CardDragPreview label={item.label} /> : null;\n    case ItemTypes.COMPONENT:\n    case ItemTypes.DYNAMIC_ZONE:\n      return isComponentDragItem(item) ? (\n        <ComponentDragPreview displayedValue={item.displayedValue} />\n      ) : null;\n\n    case ItemTypes.RELATION:\n      return isRelationDragItem(item) ? <RelationDragPreview {...item} /> : null;\n\n    default:\n      return null;\n  }\n}\n\nconst isRecord = (value: unknown): value is Record<string, unknown> => {\n  return value !== null && typeof value === 'object';\n};\n\nconst isCardDragItem = (item: unknown): item is CardDragPreviewProps => {\n  return isRecord(item) && typeof item.label === 'string';\n};\n\nconst isComponentDragItem = (item: unknown): item is ComponentDragPreviewProps => {\n  return isRecord(item) && typeof item.displayedValue === 'string';\n};\n\nconst isRelationDragItem = (item: unknown): item is RelationDragPreviewProps => {\n  return (\n    isRecord(item) &&\n    typeof item.displayedValue === 'string' &&\n    (typeof item.id === 'string' || typeof item.id === 'number') &&\n    typeof item.index === 'number' &&\n    typeof item.width === 'number' &&\n    (item.status === undefined || typeof item.status === 'string')\n  );\n};\n\nexport { Layout };\n"],"names":["Layout","contentTypeMatch","useMatch","isMobile","useIsMobile","isLoading","collectionTypeLinks","models","singleTypeLinks","useContentManagerInitData","authorisedModels","sort","a","b","title","localeCompare","pathname","useLocation","formatMessage","useIntl","_jsxs","_Fragment","_jsx","Page","Title","id","getTranslation","defaultMessage","Loading","supportedModelsToDisplay","filter","isDisplayed","length","Navigate","to","search","replace","SubNav","PageWrapper","LeftMenu","isFullPage","Layouts","Root","sideNav","DragLayer","renderItem","renderDraglayerItem","LazyOutlet","nested","type","item","actualType","split","ItemTypes","EDIT_FIELD","FIELD","isCardDragItem","CardDragPreview","label","COMPONENT","DYNAMIC_ZONE","isComponentDragItem","ComponentDragPreview","displayedValue","RELATION","isRelationDragItem","RelationDragPreview","isRecord","value","index","width","status","undefined"],"mappings":"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"}
+{"version":3,"file":"layout.mjs","sources":["../../admin/src/layout.tsx"],"sourcesContent":["/* eslint-disable check-file/filename-naming-convention */\nimport * as React from 'react';\n\nimport {\n  Page,\n  Layouts,\n  SubNav,\n  useIsMobile,\n  LazyOutlet,\n  useQueryParams,\n  useNotification,\n  useAuth,\n} from '@strapi/admin/strapi-admin';\nimport { stringify } from 'qs';\nimport { useIntl } from 'react-intl';\nimport { Navigate, useLocation, useMatch } from 'react-router-dom';\n\nimport { DragLayer, DragLayerProps } from './components/DragLayer';\nimport { CardDragPreview } from './components/DragPreviews/CardDragPreview';\nimport { ComponentDragPreview } from './components/DragPreviews/ComponentDragPreview';\nimport { RelationDragPreview } from './components/DragPreviews/RelationDragPreview';\nimport { LeftMenu } from './components/LeftMenu';\nimport { ItemTypes } from './constants/dragAndDrop';\nimport { useContentManagerInitData } from './hooks/useContentManagerInitData';\nimport { getTranslation } from './utils/translations';\n\nimport type { CardDragPreviewProps } from './components/DragPreviews/CardDragPreview';\nimport type { ComponentDragPreviewProps } from './components/DragPreviews/ComponentDragPreview';\nimport type { RelationDragPreviewProps } from './components/DragPreviews/RelationDragPreview';\nimport type { To } from 'react-router-dom';\n\n/* -------------------------------------------------------------------------------------------------\n * Layout\n * -----------------------------------------------------------------------------------------------*/\n\nconst Layout = () => {\n  const contentTypeMatch = useMatch('/content-manager/:kind/:uid/*');\n  const isMobile = useIsMobile();\n\n  const { isLoading, collectionTypeLinks, models, singleTypeLinks } = useContentManagerInitData();\n  const authorisedModels = [...collectionTypeLinks, ...singleTypeLinks].sort((a, b) =>\n    a.title.localeCompare(b.title)\n  );\n\n  const { pathname } = useLocation();\n  const { formatMessage } = useIntl();\n  const [{ query }] = useQueryParams<{ plugins?: { i18n?: { locale?: string } } }>();\n  const permissions = useAuth('Layout', (state) => state.permissions);\n\n  if (isLoading) {\n    return (\n      <>\n        <Page.Title>\n          {formatMessage({\n            id: getTranslation('plugin.name'),\n            defaultMessage: 'Content Manager',\n          })}\n        </Page.Title>\n        <Page.Loading />\n      </>\n    );\n  }\n\n  // Array of models that are displayed in the content manager\n  const supportedModelsToDisplay = models.filter(({ isDisplayed }) => isDisplayed);\n\n  // Redirect the user to the 403 page\n  if (\n    authorisedModels.length === 0 &&\n    supportedModelsToDisplay.length > 0 &&\n    pathname !== '/content-manager/403'\n  ) {\n    const requestedLocale = query.plugins?.i18n?.locale;\n    const localeScopedPermissions = permissions.filter(\n      (permission) =>\n        permission.action === 'plugin::content-manager.explorer.read' &&\n        Array.isArray(permission.properties?.locales)\n    );\n    const contentTypePermissions = localeScopedPermissions.filter(\n      (permission) => permission.subject === contentTypeMatch?.params.uid\n    );\n    const accessibleLocales = Array.from(\n      new Set(\n        (contentTypePermissions.length > 0\n          ? contentTypePermissions\n          : localeScopedPermissions\n        ).flatMap((permission) => permission.properties?.locales as string[])\n      )\n    );\n\n    if (typeof requestedLocale === 'string' && accessibleLocales.length > 0) {\n      if (!accessibleLocales.includes(requestedLocale)) {\n        const search = stringify({\n          ...query,\n          plugins: {\n            ...query.plugins,\n            i18n: { ...query.plugins?.i18n, locale: accessibleLocales[0] },\n          },\n        });\n\n        return <NavigateWithLocaleWarning to={{ pathname, search }} />;\n      }\n    } else {\n      return <Navigate to=\"/content-manager/403\" replace />;\n    }\n  }\n\n  // Redirect the user to the create content type page\n  if (supportedModelsToDisplay.length === 0 && pathname !== '/content-manager/no-content-types') {\n    return <Navigate to=\"/content-manager/no-content-types\" replace />;\n  }\n\n  // On /content-manager base route\n  if (\n    !contentTypeMatch &&\n    authorisedModels.length > 0 &&\n    pathname !== '/content-manager/403' &&\n    pathname !== '/content-manager/no-content-types'\n  ) {\n    // On desktop: redirect to first collection type\n    if (!isMobile) {\n      return (\n        <Navigate\n          to={{\n            pathname: authorisedModels[0].to,\n            search: authorisedModels[0].search ?? '',\n          }}\n          replace\n        />\n      );\n    }\n\n    // On mobile: show navigation page\n    return (\n      <>\n        <Page.Title>\n          {formatMessage({\n            id: getTranslation('plugin.name'),\n            defaultMessage: 'Content Manager',\n          })}\n        </Page.Title>\n        <SubNav.PageWrapper>\n          <LeftMenu isFullPage />\n        </SubNav.PageWrapper>\n      </>\n    );\n  }\n\n  return (\n    <>\n      <Page.Title>\n        {formatMessage({\n          id: getTranslation('plugin.name'),\n          defaultMessage: 'Content Manager',\n        })}\n      </Page.Title>\n      <Layouts.Root sideNav={<LeftMenu />}>\n        <DragLayer renderItem={renderDraglayerItem} />\n        <LazyOutlet nested />\n      </Layouts.Root>\n    </>\n  );\n};\n\nconst NavigateWithLocaleWarning = ({ to }: { to: To }) => {\n  const { toggleNotification } = useNotification();\n  const { formatMessage } = useIntl();\n\n  React.useEffect(() => {\n    toggleNotification({\n      type: 'warning',\n      message: formatMessage({\n        id: getTranslation('permissions.not-allowed.locale'),\n        defaultMessage:\n          \"You don't have the permissions to access this content for the requested locale\",\n      }),\n    });\n  }, [toggleNotification, formatMessage]);\n\n  return <Navigate to={to} replace />;\n};\n\n/* -------------------------------------------------------------------------------------------------\n * renderDraglayerItem\n * -----------------------------------------------------------------------------------------------*/\n\nfunction renderDraglayerItem({ type, item }: Parameters<DragLayerProps['renderItem']>[0]) {\n  if (!type || (type && typeof type !== 'string')) {\n    return null;\n  }\n\n  /**\n   * Because a user may have multiple relations / dynamic zones / repeable fields in the same content type,\n   * we append the fieldName for the item type to make them unique, however, we then want to extract that\n   * first type to apply the correct preview.\n   */\n  const [actualType] = type.split('_');\n\n  switch (actualType) {\n    case ItemTypes.EDIT_FIELD:\n    case ItemTypes.FIELD:\n      return isCardDragItem(item) ? <CardDragPreview label={item.label} /> : null;\n    case ItemTypes.COMPONENT:\n    case ItemTypes.DYNAMIC_ZONE:\n      return isComponentDragItem(item) ? (\n        <ComponentDragPreview displayedValue={item.displayedValue} />\n      ) : null;\n\n    case ItemTypes.RELATION:\n      return isRelationDragItem(item) ? <RelationDragPreview {...item} /> : null;\n\n    default:\n      return null;\n  }\n}\n\nconst isRecord = (value: unknown): value is Record<string, unknown> => {\n  return value !== null && typeof value === 'object';\n};\n\nconst isCardDragItem = (item: unknown): item is CardDragPreviewProps => {\n  return isRecord(item) && typeof item.label === 'string';\n};\n\nconst isComponentDragItem = (item: unknown): item is ComponentDragPreviewProps => {\n  return isRecord(item) && typeof item.displayedValue === 'string';\n};\n\nconst isRelationDragItem = (item: unknown): item is RelationDragPreviewProps => {\n  return (\n    isRecord(item) &&\n    typeof item.displayedValue === 'string' &&\n    (typeof item.id === 'string' || typeof item.id === 'number') &&\n    typeof item.index === 'number' &&\n    typeof item.width === 'number' &&\n    (item.status === undefined || typeof item.status === 'string')\n  );\n};\n\nexport { Layout };\n"],"names":["Layout","contentTypeMatch","useMatch","isMobile","useIsMobile","isLoading","collectionTypeLinks","models","singleTypeLinks","useContentManagerInitData","authorisedModels","sort","a","b","title","localeCompare","pathname","useLocation","formatMessage","useIntl","query","useQueryParams","permissions","useAuth","state","_jsxs","_Fragment","_jsx","Page","Title","id","getTranslation","defaultMessage","Loading","supportedModelsToDisplay","filter","isDisplayed","length","requestedLocale","plugins","i18n","locale","localeScopedPermissions","permission","action","Array","isArray","properties","locales","contentTypePermissions","subject","params","uid","accessibleLocales","from","Set","flatMap","includes","search","stringify","NavigateWithLocaleWarning","to","Navigate","replace","SubNav","PageWrapper","LeftMenu","isFullPage","Layouts","Root","sideNav","DragLayer","renderItem","renderDraglayerItem","LazyOutlet","nested","toggleNotification","useNotification","React","useEffect","type","message","item","actualType","split","ItemTypes","EDIT_FIELD","FIELD","isCardDragItem","CardDragPreview","label","COMPONENT","DYNAMIC_ZONE","isComponentDragItem","ComponentDragPreview","displayedValue","RELATION","isRelationDragItem","RelationDragPreview","isRecord","value","index","width","status","undefined"],"mappings":"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"}

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

@@ -5,10 +5,6 @@ var React = require('react');
 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 attributes = require('../../../constants/attributes.js');
@@ -21,14 +17,13 @@ var Preview = require('../../../preview/pages/Preview.js');
 var router = require('../../../router.js');
 var documents = require('../../../services/documents.js');
 var api = require('../../../utils/api.js');
+var objects = require('../../../utils/objects.js');
 var translations = require('../../../utils/translations.js');
 var data = require('../utils/data.js');
 var draftRelationCounts = require('../utils/draftRelationCounts.js');
 var keyboardShortcuts = require('../utils/keyboardShortcuts.js');
 var RelationModal = require('./FormInputs/Relations/RelationModal.js');
 
-function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
-
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   var n = Object.create(null);
@@ -48,46 +43,48 @@ function _interopNamespace(e) {
 }
 
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
-var mapValues__default = /*#__PURE__*/_interopDefault(mapValues);
-var get__default = /*#__PURE__*/_interopDefault(get);
-var merge__default = /*#__PURE__*/_interopDefault(merge);
-var set__default = /*#__PURE__*/_interopDefault(set);
 
 const publishConfirmDialogOpeners = new Map();
 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__default.default(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 = objects.getIn(parentDataToUpdate, fieldToConnect);
+    const relationFieldValue = objects.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__default.default({}, fieldToConnectPath, fieldToConnectValue);
-    return merge__default.default(parentDataToUpdate, objectToConnect);
+    const dataWithRelation = objects.setIn(parentDataToUpdate, fieldToConnect, relationValue);
+    if (!isFieldPresent && fieldToConnectUID && parentPath) {
+        return objects.setIn(dataWithRelation, `${parentPath}.__component`, fieldToConnectUID);
+    }
+    return dataWithRelation;
 };
 const DocumentActions = ({ actions })=>{
     const { formatMessage } = reactIntl.useIntl();
@@ -260,7 +257,7 @@ const DocumentActionsMenu = ({ actions, children, label, variant = 'tertiary' })
     const [dialogId, setDialogId] = React__namespace.useState(null);
     const { formatMessage } = reactIntl.useIntl();
     const { toggleNotification } = strapiAdmin.useNotification();
-    const isDisabled = actions.every((action)=>action.disabled) || actions.length === 0;
+    const isDisabled = actions.every((action)=>action.disabled);
     const triggerRef = React__namespace.useRef(null);
     const handleClick = (action)=>async (e)=>{
             const { onClick = ()=>false, dialog, id } = action;
@@ -464,11 +461,26 @@ const transformData = (data)=>{
         if ('apiData' in data) {
             return data.apiData;
         }
-        return mapValues__default.default((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: data$1 } = 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$1;
+};
 /* -------------------------------------------------------------------------------------------------
  * DocumentActionComponents
  * -----------------------------------------------------------------------------------------------*/ const PublishAction = ({ activeTab, documentId, model, collectionType, meta, document })=>{
@@ -508,6 +520,7 @@ const transformDocumentData = (data)=>transformData(data);
     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 getParentFormValues = RelationModal.useRelationModal('PublishAction', (state)=>state.state.getParentFormValues, 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);
@@ -678,33 +691,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 === collections.SINGLE_TYPES)) {
-                        const parentDataToUpdate = parentDocumentMetaToUpdate.collectionType === collections.SINGLE_TYPES ? getInitialFormValues() : parentDocumentData.getInitialFormValues();
+                        const fallbackParentFormValues = parentDocumentMetaToUpdate.collectionType === collections.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 !== collections.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 !== 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: 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({
@@ -888,6 +907,7 @@ const UpdateAction = ({ activeTab, documentId, model, collectionType })=>{
     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 getParentFormValues = RelationModal.useRelationModal('UpdateAction', (state)=>state.state.getParentFormValues, false);
     const documentHistory = RelationModal.useRelationModal('UpdateAction', (state)=>state.state.documentHistory, false);
     const rootDocumentMeta = RelationModal.useRelationModal('UpdateAction', (state)=>state.rootDocumentMeta);
     const fromRelationModal = relationContext != undefined;
@@ -998,34 +1018,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 === 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
+                            const fallbackParentFormValues = parentDocumentMetaToUpdate.collectionType === collections.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 !== collections.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({
@@ -1325,5 +1351,7 @@ exports.DEFAULT_ACTIONS = DEFAULT_ACTIONS;
 exports.DocumentActionButton = DocumentActionButton;
 exports.DocumentActions = DocumentActions;
 exports.DocumentActionsMenu = DocumentActionsMenu;
+exports.PublishAction = PublishAction;
+exports.UpdateAction = UpdateAction;
 exports.openPublishConfirmDialog = openPublishConfirmDialog;
 //# sourceMappingURL=DocumentActions.js.map