yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 08:19:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

DynamicZone - extend FriendlyName with MainValue like RepeatableComponent

Browse Source 
This commit fixes #12499
This commit is contained in:
godzzo 2022-02-13 07:27:31 +01:00 committed by Gustav Hansen
parent a13b60d441
commit 469ff7e100
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/index.js
View File

@ -14,10 +14,12 @@ import { Loader } from '@strapi/design-system/Loader';
import Trash from '@strapi/icons/Trash';
import ArrowDown from '@strapi/icons/ArrowDown';
import ArrowUp from '@strapi/icons/ArrowUp';
import { useCMEditViewDataManager } from '@strapi/helper-plugin';
import { useContentTypeLayout } from '../../../../hooks';
import { getTrad } from '../../../../utils';
import FieldComponent from '../../../FieldComponent';
import Rectangle from './Rectangle';
import useMainValue from './util';
const ActionStack = styled(Stack)`
svg {
@ -58,6 +60,21 @@ const Component = ({
}) => {
const { formatMessage } = useIntl();
const { getComponentLayout } = useContentTypeLayout();
const { modifiedData } = useCMEditViewDataManager();
const componentLayoutData = useMemo(() => {
const layout = getComponentLayout(componentUid);
console.log('DZone/Component componentLayoutData', {
componentUid,
layout,
name,
index,
modifiedData,
});
return layout;
}, [componentUid, getComponentLayout, index, name, modifiedData]);
const mainValue = useMainValue(componentLayoutData, `${name}.${index}`);
const { icon, friendlyName } = useMemo(() => {
const {
info: { icon, displayName },
@ -144,7 +161,7 @@ const Component = ({
)}
</ActionStack>
}
title={friendlyName}
title={`${friendlyName} - ${mainValue}`}
togglePosition="left"
/>
<AccordionContent>

16
packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/util.js Normal file
View File

@ -0,0 +1,16 @@
import { useMemo } from 'react';
import { get, toString } from 'lodash';
import { useCMEditViewDataManager } from '@strapi/helper-plugin';
function useMainValue(schema, componentFieldName) {
const { modifiedData } = useCMEditViewDataManager();
const mainField = useMemo(() => get(schema, ['settings', 'mainField'], 'id'), [schema]);
const displayedValue = toString(
get(modifiedData, [...componentFieldName.split('.'), mainField], '')
);
return displayedValue;
}
export default useMainValue;