Merge branch 'contact-step-page' into contact-step-page-external-links

Author: bdahle

packages/nextjs/src/components/_common/headers/contactPageHeader/ContactPageHeader.module.scss packages/nextjs/src/components/_common/headers/headerWithParent/HeaderWithParent.module.scss

@@ -1,4 +1,4 @@
-.contactPageHeader {
+.headerContainer {
     display: flex;
     flex-direction: column;
     justify-content: center;

packages/nextjs/src/components/_common/headers/contactPageHeader/ContactPageHeader.tsx packages/nextjs/src/components/_common/headers/headerWithParent/HeaderWithParent.tsx

@@ -2,7 +2,7 @@ import { BodyShort, Heading } from '@navikt/ds-react';
 import { ProductDataMixin } from 'types/component-props/_mixins';
 import { ContentProps } from 'types/content-props/_content-common';
 import { classNames } from 'utils/classnames';
-import style from './ContactPageHeader.module.scss';
+import style from './HeaderWithParent.module.scss';
 
 type Props = {
     contentProps: Pick<ContentProps, 'data'> & {
@@ -12,11 +12,11 @@ type Props = {
     className?: string;
 };
 
-export const ContactPageHeader = ({ contentProps, textAboveTitle, className }: Props) => {
+export const HeaderWithParent = ({ contentProps, textAboveTitle, className }: Props) => {
     const { data } = contentProps;
 
     return (
-        <div className={classNames(style.contactPageHeader, className)}>
+        <div className={classNames(style.headerContainer, className)}>
             <BodyShort textColor="subtle" className={style.textAboveTitle}>
                 {textAboveTitle}
             </BodyShort>

packages/nextjs/src/components/_common/metatags/HeadWithMetatags.tsx

@@ -23,7 +23,11 @@ const getDescription = (content: ContentProps) => {
     return description.slice(0, DESCRIPTION_MAX_LENGTH);
 };
 
-const contentTypesWithNoIndex = new Set([ContentType.Error, ContentType.FormIntermediateStepPage]);
+const contentTypesWithNoIndex = new Set([
+    ContentType.Error,
+    ContentType.FormIntermediateStepPage,
+    ContentType.ContactStepPage,
+]);
 
 const isNoIndex = (content: ContentProps) =>
     content.isPagePreview || contentTypesWithNoIndex.has(content.type) || content.data?.noindex;

packages/nextjs/src/components/pages/contact-step-page/ContactStepPage.tsx

@@ -1,5 +1,5 @@
 import { BodyShort, Heading, LinkPanel } from '@navikt/ds-react';
-import { ContactPageHeader } from 'components/_common/headers/contactPageHeader/ContactPageHeader';
+import { HeaderWithParent } from 'components/_common/headers/headerWithParent/HeaderWithParent';
 import { ParsedHtml } from 'components/_common/parsedHtml/ParsedHtml';
 import { ContentType, ContentCommonProps } from 'types/content-props/_content-common';
 import { IllustrationStatic } from 'components/_common/illustration/static/IllustrationStatic';
@@ -23,8 +23,7 @@ export type ContactStepPageProps = ContentCommonProps & {
     };
 };
 
-export const ContactStepPage = (props: ContactStepPageProps) => {
-    const { data } = props;
+export const ContactStepPage = ({ data }: ContactStepPageProps) => {
     const {
         title,
         illustration,
@@ -39,13 +38,8 @@ export const ContactStepPage = (props: ContactStepPageProps) => {
     return (
         <div className={style.contactStepPage}>
             <IllustrationStatic illustration={illustration} className={style.pictogram} />
-            <ContactPageHeader
-                contentProps={{
-                    data: {
-                        title,
-                        illustration,
-                    },
-                }}
+            <HeaderWithParent
+                contentProps={{ data: { title, illustration } }}
                 textAboveTitle={textAboveTitle}
                 className={style.header}
             />