Merge branch 'main' into keep-open-version-selector-2

Author: bdahle

xp-archive/client/contentView/ContentView.tsx

@@ -16,12 +16,10 @@ const getDisplayComponent = (viewVariant?: ViewVariant, data?: ContentServiceRes
     const components: Record<ViewVariant, React.ReactElement> = {
         html: (
             <HtmlView
-                nodeId={content._id}
+                content={content}
                 locale={
                     data.versions.find((v) => v.versionId === content._versionKey)?.locale || 'no'
                 }
-                versionId={content._versionKey}
-                originalContentTypeName={content.originalContentTypeName}
             />
         ),
         filepreview: <FilePreviewWrapper content={content} />,

xp-archive/client/contentView/htmlView/HtmlView.tsx

@@ -2,22 +2,30 @@ import React, { useState } from 'react';
 import style from './HtmlView.module.css';
 import { xpArchiveConfig } from '@common/shared/siteConfigs';
 import { Alert, Loader } from '@navikt/ds-react';
+import { Content } from '../../../shared/types';
 
 type Props = {
-    nodeId: string;
+    content: Content;
     locale: string;
-    versionId: string;
-    originalContentTypeName: string | undefined;
+};
+const localeNames: Record<string, string> = {
+    no: 'norsk (bokmål)',
+    nn: 'nynorsk',
+    en: 'engelsk',
+    se: 'samisk',
 };
 
-export const HtmlView = ({ nodeId, locale, versionId, originalContentTypeName }: Props) => {
+export const HtmlView = ({ content, locale }: Props) => {
     const [isLoading, setIsLoading] = useState(true);
-    const htmlPath = `${xpArchiveConfig.basePath}/html/${nodeId}/${locale}/${versionId}`;
+    const htmlPath = `${xpArchiveConfig.basePath}/html/${content._id}/${locale}/${content._versionKey}`;
 
     return (
         <div className={style.wrapper}>
-            {originalContentTypeName ? (
-                <Alert variant="warning">{`Obs! Denne siden var opprinnelig en "${originalContentTypeName}" og inneholder versjonshistorikk.`}</Alert>
+            {content.originalContentTypeName ? (
+                <Alert variant="warning">{`Obs! Denne siden var opprinnelig en "${content.originalContentTypeName}" og inneholder versjonshistorikk.`}</Alert>
+            ) : null}
+            {content.x['no-nav-navno'].redirectToLayer.locale ? (
+                <Alert variant="warning">{`Obs! Denne siden er satt som redirect til språkversjonen for "${localeNames[content.x['no-nav-navno'].redirectToLayer.locale]}". Husk å velge riktig språkversjon for å se korrekt historikk.`}</Alert>
             ) : null}
             {isLoading && (
                 <div className={style.loaderWrapper}>

xp-archive/shared/types.ts

@@ -65,6 +65,13 @@ export type Content = {
         to?: string;
     };
     data: Record<string, unknown>;
+    x: {
+        'no-nav-navno': {
+            redirectToLayer: {
+                locale: string;
+            };
+        };
+    };
     attachment?: Attachment;
     originalContentTypeName?: string;
 };