yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-03 19:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing 'id' mainField (no title field), and empty display value not need separator.

Browse Source
This commit is contained in:
Gindilla Péter 2022-11-04 13:26:48 +01:00 committed by Gustav Hansen
parent 20ccfeb2ac
commit 46851af65a
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/core/admin/admin/src/content-manager/components/DynamicZone/components/Component/hooks/useMainValue.js
View File

@ -10,10 +10,17 @@ export function getDisplayedValue(modifiedData, componentFieldPath, mainField) {
function useMainValue(schema, componentFieldPath) {
const { modifiedData } = useCMEditViewDataManager();
const mainField = useMemo(() => get(schema, ['settings', 'mainField'], 'id'), [schema]);
let displayedValue = getDisplayedValue(modifiedData, componentFieldPath, mainField);
const mainField = useMemo(
() => get(schema, ["settings", "mainField"], "id"),
[schema]
);
return displayedValue;
const displayedValue =
mainField === "id"
? ""
: getDisplayedValue(modifiedData, componentFieldPath, mainField);
return displayedValue.trim().length < 1 ? "" : ` - ${displayedValue}`;
}
export default useMainValue;

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

@ -147,7 +147,7 @@ const Component = ({
)}
</ActionStack>
}
title={`${friendlyName} - ${mainValue}`}
title={`${friendlyName}${mainValue}`}
togglePosition="left"
/>
<AccordionContent>