Merge pull request #2363 from navikt/archived-old-versions-preview

Archived old versions preview

Author: talepre

src/main/resources/lib/external-archive/get-archived-content.ts

@@ -63,7 +63,12 @@ const getPreArchivedVersions = (contentId: string, repoId: string) => {
     }).filter((version) => version.nodePath.startsWith('/content'));
 };
 
-export const getArchivedContent = (idOrArchivedPath: string, repoId: string, time?: string) => {
+export const getArchivedContent = (
+    idOrArchivedPath: string,
+    repoId: string,
+    time?: string,
+    versionId?: string
+) => {
     const contentRef = getArchivedContentRef(idOrArchivedPath);
 
     const repoConnection = getRepoConnection({ branch: 'draft', repoId });
@@ -76,18 +81,24 @@ export const getArchivedContent = (idOrArchivedPath: string, repoId: string, tim
 
     const preArchivedVersions = getPreArchivedVersions(archivedNode._id, repoId);
 
-    const requestedVersion = time
+    const versionNode = versionId
+        ? preArchivedVersions.find((v) => v.versionId === versionId)
+        : undefined;
+
+    const contentTime = versionNode ? versionNode.timestamp : time;
+
+    const requestedVersion = contentTime
         ? getContentVersionFromTime({
               nodeKey: contentRef,
-              unixTime: getUnixTimeFromDateTimeString(time),
+              unixTime: getUnixTimeFromDateTimeString(contentTime),
               repoId,
               branch: 'draft',
               getOldestIfNotFound: false,
           })
         : preArchivedVersions[0];
     if (!requestedVersion) {
         logger.info(
-            `No live version found for content - ${contentRef} in repo ${repoId} (time: ${time})`
+            `No live version found for content - ${contentRef} in repo ${repoId} (time: ${contentTime})`
         );
         return null;
     }

src/main/resources/lib/utils/version-utils.ts

@@ -82,7 +82,6 @@ export const getContentVersionFromTime = ({
     if (!length) {
         return null;
     }
-
     // Return the newest version which is equal to or older than the requested time
     const foundVersion = contentVersions.find((version) => {
         const versionUnixTime = getUnixTimeFromDateTimeString(version.timestamp);

src/main/resources/services/externalArchive/content/content.ts

@@ -38,14 +38,16 @@ const resolveToContentTimestamp = (content: Content, locale: string) => {
 const getContentRenderProps = (
     content: Content,
     locale: string,
-    resolveToTs: boolean,
+    versionId: string | undefined,
     isArchived: boolean
 ) => {
+    const resolveToTs = !!versionId;
     if (isArchived) {
         return getArchivedContent(
             content._id,
             getLayersData().localeToRepoIdMap[locale],
-            content.archivedTime || content.modifiedTime || content.createdTime
+            undefined,
+            versionId
         );
     }
 
@@ -93,7 +95,7 @@ export const externalArchiveContentService = (req: XP.Request) => {
         };
     }
 
-    const contentRenderProps = getContentRenderProps(content, locale, !!versionId, isArchived);
+    const contentRenderProps = getContentRenderProps(content, locale, versionId, isArchived);
 
     const versions = getPublishedAndModifiedVersions(content._id, locale).filter(
         (v) => !v.shouldExclude