Merge pull request #1407 from AmruthPillai/fix/id-null-when-section-duplicated-cloned

Fix issue when a section is duplicated/cloned, ID is null
This commit is contained in:
Amruth Pillai
2023-07-27 19:51:01 +02:00
committed by GitHub

View File

@ -44,11 +44,11 @@ const sectionMap = (Section: React.FC<SectionProps>): Record<string, JSX.Element
references: <Section key="references" path="sections.references" titlePath="name" subtitlePath="relationship" />, references: <Section key="references" path="sections.references" titlePath="name" subtitlePath="relationship" />,
}); });
export const getSectionById = (id: string, Section: React.FC<SectionProps>): JSX.Element => { export const getSectionById = (id: string, Section: React.FC<SectionProps>): JSX.Element | null => {
// Check if section id is a custom section (an uuid) if (!id) return null;
if (validate(id)) {
return <Section key={id} path={`sections.${id}`} />; // Check if section id is a custom section (is a valid uuid)
} if (validate(id)) return <Section key={id} path={`sections.${id}`} />;
// Check if section id is a predefined seciton in config // Check if section id is a predefined seciton in config
const predefinedSection = get(sectionMap(Section), id); const predefinedSection = get(sectionMap(Section), id);
@ -57,9 +57,11 @@ export const getSectionById = (id: string, Section: React.FC<SectionProps>): JSX
return predefinedSection; return predefinedSection;
} }
// Other ways section should be a cloned section // Otherwise, section must be a cloned section
const section = find(sectionMap(Section), (element, key) => id.includes(key)); const section = find(sectionMap(Section), (_element, key) => id.includes(key));
return React.cloneElement(section!, { path: `sections.${id}` }); if (section) return React.cloneElement(section, { path: `sections.${id}` });
return null;
}; };
export default sectionMap; export default sectionMap;