diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/Relation/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/Relation/index.js index f53ca2e2a1..7fa999ebc1 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/Relation/index.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/Relation/index.js @@ -6,6 +6,7 @@ import { Typography } from '@strapi/design-system/Typography'; import { Box } from '@strapi/design-system/Box'; import { Badge } from '@strapi/design-system/Badge'; import { SimpleMenu, MenuItem } from '@strapi/design-system/SimpleMenu'; +import { Loader } from '@strapi/design-system/Loader'; import styled from 'styled-components'; import { useNotifyAT } from '@strapi/design-system/LiveRegions'; import { stopPropagation } from '@strapi/helper-plugin'; @@ -19,11 +20,6 @@ const TypographyMaxWidth = styled(Typography)` max-width: 500px; `; -const SimpleMenuAdapted = styled(SimpleMenu)` - margin-left: -6px; - padding-left: 4px; -`; - const fetchRelation = async (endPoint, notifyStatus) => { const { data: { results, pagination }, @@ -64,11 +60,9 @@ const Relation = ({ fieldSchema, metadatas, queryInfos, name, rowId, value }) => const { data, status } = useQuery( [fieldSchema.targetModel, rowId], () => fetchRelation(requestURL, notify), - { - staleTime: 0, - }, { enabled: isOpen, + staleTime: 0, } ); @@ -85,14 +79,20 @@ const Relation = ({ fieldSchema, metadatas, queryInfos, name, rowId, value }) => return ( - setIsOpen(true)} onClose={() => setIsOpen(false)} > {status !== 'success' && ( - Loading ... + + {formatMessage({ + id: getTrad('DynamicTable.relation-loading'), + defaultMessage: 'The relations are loading', + })} + )} @@ -109,11 +109,17 @@ const Relation = ({ fieldSchema, metadatas, queryInfos, name, rowId, value }) => ))} {status === 'success' && data?.pagination.total > 10 && ( - - [...] + + ... )} - + ); }; diff --git a/packages/core/admin/admin/src/translations/en.json b/packages/core/admin/admin/src/translations/en.json index ffa8a9f8c1..a26a70883e 100644 --- a/packages/core/admin/admin/src/translations/en.json +++ b/packages/core/admin/admin/src/translations/en.json @@ -486,6 +486,8 @@ "components.popUpWarning.title": "Please confirm", "content-manager.App.schemas.data-loaded": "The schemas have been successfully loaded", "content-manager.DynamicTable.relation-loaded": "The relations have been loaded", + "content-manager.DynamicTable.relation-loading": "The relations are loading", + "content-manager.DynamicTable.relation-more": "This relation contains more entities than displayed", "content-manager.EditRelations.title": "Relational data", "content-manager.HeaderLayout.button.label-add-entry": "Create new entry", "content-manager.api.id": "API ID",