legg til versionId i html-visningen

Author: bdahle

xp-archive/client/contentView/ContentView.tsx

@@ -11,7 +11,13 @@ import style from './ContentView.module.css';
 const getDisplayComponent = (viewVariant: ViewVariant, data?: ContentServiceResponse | null) => {
     if (!data) return null;
     const components: Record<ViewVariant, React.ReactElement> = {
-        html: <HtmlView nodeId={data.json._id} locale={data.json.language} />,
+        html: (
+            <HtmlView
+                nodeId={data.json._id}
+                locale={data.json.language}
+                versionId={data.json._versionKey}
+            />
+        ),
         filepreview: <FilePreviewWrapper content={data.json} />,
         pdf: <PdfExport versions={data.versions} />,
     };

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

@@ -7,11 +7,12 @@ import { Button, Loader } from '@navikt/ds-react';
 type Props = {
     nodeId: string;
     locale: string;
+    versionId: string;
 };
 
-export const HtmlView = ({ nodeId, locale }: Props) => {
+export const HtmlView = ({ nodeId, locale, versionId }: Props) => {
     const [isLoading, setIsLoading] = useState(true);
-    const htmlPath = `${xpArchiveConfig.basePath}/html/${nodeId}/${locale || ''}`;
+    const htmlPath = `${xpArchiveConfig.basePath}/html/${nodeId}/${locale || ''}/${versionId || ''}`;
 
     return (
         <div className={style.wrapper}>

xp-archive/server/src/routing/site.ts

@@ -49,10 +49,10 @@ const setupApiRoutes = async (router: Router) => {
 const setupBrowserRoutes = async (router: Router, htmlRenderer: HtmlRenderer) => {
     const contentService = new ContentService();
 
-    router.get('/html/:contentId/:locale', async (req, res, next) => {
-        const { contentId, locale } = req.params;
+    router.get('/html/:contentId/:locale/:versionId', async (req, res, next) => {
+        const { contentId, locale, versionId } = req.params;
 
-        const content = await contentService.fetchContent(contentId, locale);
+        const content = await contentService.fetchContent(contentId, locale, versionId);
         if (!content) {
             return next();
         }
@@ -64,10 +64,10 @@ const setupBrowserRoutes = async (router: Router, htmlRenderer: HtmlRenderer) =>
         return res.send(content.html);
     });
 
-    router.get('/:contentId/:locale', async (req, res, next) => {
-        const { contentId, locale } = req.params;
+    router.get('/:contentId/:locale/:versionId', async (req, res, next) => {
+        const { contentId, locale, versionId } = req.params;
 
-        const content = await contentService.fetchContent(contentId, locale);
+        const content = await contentService.fetchContent(contentId, locale, versionId);
         if (!content) {
             return next();
         }