Merge pull request #1781 from navikt/sla-sammen-lokalkontor-og-kontorsider

Slå sammen lokalkontor og kontorsider

Author: terjeofnorway

Diff for: src/components/ContentMapper.tsx

@@ -16,7 +16,6 @@ import { SituationPage } from './pages/situation-page/SituationPage';
 import { GuidePage } from './pages/guide-page/GuidePage';
 import { OverviewPage } from './pages/overview-page/OverviewPage';
 import { OfficeEditorialPage } from './pages/office-editorial-page/OfficeEditorialPage';
-import { OfficeBranchPage } from './pages/office-branch-page/OfficeBranchPage';
 import { ThemedArticlePage } from './pages/themed-article-page/ThemedArticlePage';
 import { ProductPage } from './pages/product-page/ProductPage';
 import { ProductDetailsPage } from './pages/product-details-page/ProductDetailsPage';
@@ -53,7 +52,6 @@ const contentToReactComponent: {
     [ContentType.Overview]: OverviewPage,
     [ContentType.GenericPage]: GenericPage,
     [ContentType.OfficeEditorialPage]: OfficeEditorialPage,
-    [ContentType.OfficeBranchPage]: OfficeBranchPage,
     [ContentType.OfficePage]: OfficePage,
     [ContentType.CurrentTopicPage]: CurrentTopicPage,
     [ContentType.PressLandingPage]: PressLandingPage,

Diff for: src/components/pages/office-branch-page/OfficeBranchPage.module.scss

@@ -2,7 +2,7 @@
 
 $margin: 2rem;
 
-.officeBranchPage {
+.officePage {
     display: flex;
     flex-direction: column;
 }

Diff for: src/components/pages/office-branch-page/OfficeBranchPage.tsx

@@ -2,23 +2,38 @@ import React from 'react';
 import { ComponentMapper } from 'components/ComponentMapper';
 import { OfficePageProps } from 'types/content-props/dynamic-page-props';
 import { classNames } from 'utils/classnames';
+import { logger } from 'srcCommon/logger';
 
-import { OfficePageHeader } from 'components/pages/office-branch-page/office-page-header/OfficePageHeader';
-import { OfficeDetails } from 'components/pages/office-branch-page/office-details/OfficeDetails';
+import { OfficePageHeader } from 'components/pages/office-page/office-page-header/OfficePageHeader';
+import { OfficeDetails } from 'components/pages/office-page/office-details/OfficeDetails';
 
 import styles from './OfficePage.module.scss';
 
 export const OfficePage = (props: OfficePageProps) => {
     const officeNorgData = props.data.officeNorgData.data;
+    const isOfficeBranch = officeNorgData.type === 'LOKAL';
+    const editorialPage = props.editorial;
+
+    if (!officeNorgData) {
+        logger.error('No office data exists for this office page');
+        return null;
+    }
+
+    if (isOfficeBranch && !editorialPage) {
+        logger.error(`No editorial page found for office branch ${props.displayName}`);
+        return null;
+    }
+
+    const page = isOfficeBranch && editorialPage ? editorialPage.page : props.page;
 
     return (
-        <div className={styles.officeBranchPage}>
+        <div className={styles.officePage}>
             {officeNorgData && (
                 <OfficePageHeader officeDetails={officeNorgData} showTimeStamp={false} />
             )}
             {officeNorgData && <OfficeDetails officeData={officeNorgData} />}
             <div className={classNames(styles.content, styles.pageContent)}>
-                <ComponentMapper componentProps={props.page} pageProps={props} />
+                <ComponentMapper componentProps={page} pageProps={props} />
             </div>
         </div>
     );

Diff for: src/components/pages/office-page/OfficePage.module.scss

@@ -2,7 +2,7 @@ import { ExpansionCard, BodyShort, Heading } from '@navikt/ds-react';
 import { usePageContentProps } from 'store/pageContext';
 import { translator } from 'translations';
 import { OfficeDetailsData } from 'types/content-props/office-details-props';
-import { officeDetailsFormatAddress } from 'components/pages/office-branch-page/office-details/utils';
+import { officeDetailsFormatAddress } from 'components/pages/office-page/office-details/utils';
 
 import styles from './OfficeInformation.module.scss';
 

Diff for: src/components/pages/office-page/OfficePage.tsx

@@ -1,7 +1,7 @@
 import { BodyShort } from '@navikt/ds-react';
 import { LenkeBase } from 'components/_common/lenke/LenkeBase';
 import { AudienceContact } from 'types/content-props/office-details-props';
-import { officeDetailsFormatPhoneNumber } from 'components/pages/office-branch-page/office-details/utils';
+import { officeDetailsFormatPhoneNumber } from 'components/pages/office-page/office-details/utils';
 
 import styles from './AudienceChannels.module.scss';
 

Diff for: src/components/pages/office-branch-page/office-details/OfficeDetails.module.scss renamed to src/components/pages/office-page/office-details/OfficeDetails.module.scss

@@ -1,9 +1,9 @@
 import React from 'react';
 import { BodyLong, BodyShort, Heading } from '@navikt/ds-react';
 import { PhoneFillIcon } from '@navikt/aksel-icons';
-import { OfficeDetailsProps } from 'components/pages/office-branch-page/office-details/OfficeDetails';
+import { OfficeDetailsProps } from 'components/pages/office-page/office-details/OfficeDetails';
 import { translator } from 'translations';
-import { officeDetailsFormatPhoneNumber } from 'components/pages/office-branch-page/office-details/utils';
+import { officeDetailsFormatPhoneNumber } from 'components/pages/office-page/office-details/utils';
 import { usePageContentProps } from 'store/pageContext';
 import { forceArray } from 'utils/arrays';
 import { LenkeBase } from 'components/_common/lenke/LenkeBase';

Diff for: src/components/pages/office-branch-page/office-details/OfficeDetails.tsx renamed to src/components/pages/office-page/office-details/OfficeDetails.tsx

@@ -3,7 +3,7 @@ import { Heading, BodyLong, BodyShort } from '@navikt/ds-react';
 import {
     officeDetailsFormatAddress,
     officeDetailsFormatPhoneNumber,
-} from 'components/pages/office-branch-page/office-details/utils';
+} from 'components/pages/office-page/office-details/utils';
 import { OfficeInfoEmail } from 'components/parts/_legacy/office-information/OfficeInfoEmail';
 import ArtikkelDato from 'components/parts/_legacy/main-article/komponenter/ArtikkelDato';
 import { LenkeInline } from 'components/_common/lenke/LenkeInline';

Diff for: src/components/pages/office-branch-page/office-details/officeInformation/OfficeInformation.module.scss renamed to src/components/pages/office-page/office-details/officeInformation/OfficeInformation.module.scss

@@ -7,7 +7,7 @@ import {
     LegacyOfficeOpeningHoursProps,
 } from 'types/content-props/office-information-props';
 import { forceArray } from 'utils/arrays';
-import { officeDetailsFormatAddress } from 'components/pages/office-branch-page/office-details/utils';
+import { officeDetailsFormatAddress } from 'components/pages/office-page/office-details/utils';
 import { OpeningHours } from './OpeningHours';
 
 import style from './Reception.module.scss';

Diff for: src/components/pages/office-branch-page/office-details/officeInformation/OfficeInformation.tsx renamed to src/components/pages/office-page/office-details/officeInformation/OfficeInformation.tsx

@@ -64,7 +64,13 @@ export const OfficeEditorialDetailPart = ({
         );
     }
 
-    if (pageProps.type !== ContentType.OfficeBranchPage) {
+    if (pageProps.type !== ContentType.OfficePage) {
+        return null;
+    }
+
+    const officeData = pageProps.data.officeNorgData.data;
+
+    if (!officeData) {
         return null;
     }
 
@@ -73,5 +79,5 @@ export const OfficeEditorialDetailPart = ({
         return null;
     }
 
-    return <DetailComponent officeData={pageProps.data} />;
+    return <DetailComponent officeData={officeData} />;
 };

Diff for: src/components/pages/office-branch-page/office-details/phonePoster/AudienceChannels.module.scss renamed to src/components/pages/office-page/office-details/phonePoster/AudienceChannels.module.scss

@@ -24,7 +24,6 @@ import {
     DynamicPageProps,
     GenericPageProps,
     GuidePageProps,
-    OfficeBranchPageProps,
     OfficeEditorialPageProps,
     CurrentTopicPageProps,
     ProductDetailsProps,
@@ -72,7 +71,6 @@ export enum ContentType {
     ProductPage = 'no.nav.navno:content-page-with-sidemenus',
     ProductDetails = 'no.nav.navno:product-details',
     OfficeEditorialPage = 'no.nav.navno:office-editorial-page',
-    OfficeBranchPage = 'no.nav.navno:office-branch',
     GuidePage = 'no.nav.navno:guide-page',
     ThemedArticlePage = 'no.nav.navno:themed-article-page',
     CurrentTopicPage = 'no.nav.navno:current-topic-page',
@@ -174,7 +172,6 @@ type SpecificContentProps =
     | ProductPageProps
     | SituationPageProps
     | OfficeEditorialPageProps
-    | OfficeBranchPageProps
     | OfficePageProps
     | PictogramsProps
     | GlobalValuesProps

Diff for: src/components/pages/office-branch-page/office-details/phonePoster/AudienceChannels.tsx renamed to src/components/pages/office-page/office-details/phonePoster/AudienceChannels.tsx

@@ -62,19 +62,14 @@ export type OfficeEditorialPageProps = ContentCommonProps & {
     page: LayoutComponentProps;
 };
 
-export type OfficeBranchPageProps = ContentCommonProps & {
-    type: ContentType.OfficeBranchPage;
-    data: OfficeDetailsData;
-    editorial: OfficeEditorialPageProps;
-};
-
 export type OfficePageProps = ContentCommonProps & {
     type: ContentType.OfficePage;
     data: {
         title: string;
         officeNorgData: OptionSetSingle<{ data: OfficeDetailsData }>;
     };
     page: LayoutComponentProps;
+    editorial?: OfficeEditorialPageProps;
 };
 
 export type CurrentTopicPageProps = ContentCommonProps & {

Diff for: src/components/pages/office-branch-page/office-details/phonePoster/PhonePoster.module.scss renamed to src/components/pages/office-page/office-details/phonePoster/PhonePoster.module.scss

@@ -22,7 +22,6 @@ const contentTypesWithWhiteHeader: ReadonlySet<ContentType> = new Set([
     ContentType.FrontPageNested,
     ContentType.GenericPage,
     ContentType.GuidePage,
-    ContentType.OfficeBranchPage,
     ContentType.OfficePage,
     ContentType.OfficeEditorialPage,
     ContentType.Overview,