Merge pull request #4114 from dfe-analytical-services/EES-4379

EES-4379 fix prerelease methodology page
dfe-analytical-services · Jun 28, 2023 · 4d20c0b · 4d20c0b
2 parents 2b9c2e7 + 75ea162
commit 4d20c0b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...-admin/src/pages/methodology/edit-methodology/content/components/MethodologyAccordion.tsx b/...-admin/src/pages/methodology/edit-methodology/content/components/MethodologyAccordion.tsx
@@ -73,6 +73,7 @@ const MethodologyAccordion = ({
           key={section.id}
           id={`${id}-${section.id}`}
           methodologyId={methodology.id}
+          methodologySlug={methodology.slug}
           section={section}
           sectionKey={sectionKey}
         />

diff --git a/...src/pages/methodology/edit-methodology/content/components/MethodologyAccordionSection.tsx b/...src/pages/methodology/edit-methodology/content/components/MethodologyAccordionSection.tsx
@@ -2,7 +2,6 @@ import EditableAccordionSection from '@admin/components/editable/EditableAccordi
 import EditableSectionBlocks from '@admin/components/editable/EditableSectionBlocks';
 import { useEditingContext } from '@admin/contexts/EditingContext';
 import { useConfig } from '@admin/contexts/ConfigContext';
-import { useMethodologyContext } from '@admin/pages/methodology/contexts/MethodologyContext';
 import MethodologyEditableBlock from '@admin/pages/methodology/edit-methodology/content/components/MethodologyEditableBlock';
 import { EditableContentBlock } from '@admin/services/types/content';
 import Button from '@common/components/Button';
@@ -18,17 +17,18 @@ interface MethodologyAccordionSectionProps {
   section: ContentSection<EditableContentBlock>;
   sectionKey: ContentSectionKeys;
   methodologyId: string;
+  methodologySlug: string;
 }
 
 const MethodologyAccordionSection = ({
   sectionKey,
   section: { id: sectionId, caption, heading, content: sectionContent = [] },
   methodologyId,
+  methodologySlug,
   ...props
 }: MethodologyAccordionSectionProps) => {
   const { editingMode } = useEditingContext();
   const { PublicAppUrl } = useConfig();
-  const { methodology: currentMethodology } = useMethodologyContext();
 
   const {
     addContentSectionBlock,
@@ -130,7 +130,7 @@ const MethodologyAccordionSection = ({
       anchorLinkIdPrefix={sectionKey}
       anchorLinkUrl={
         editingMode === 'preview'
-          ? id => `${PublicAppUrl}/methodology/${currentMethodology.slug}#${id}`
+          ? id => `${PublicAppUrl}/methodology/${methodologySlug}#${id}`
           : undefined
       }
       heading={heading}