Merge pull request #100 from navikt/siste-versjon

Design datoer versjonsvelger

Author: bdahle

common/src/shared/timestamp.ts

@@ -1,5 +1,22 @@
-export const formatTimestamp = (tsRaw: string) =>
-    new Date(tsRaw).toLocaleString('no', {
-        dateStyle: 'medium',
-        timeStyle: 'short',
+export const formatTimestamp = (timestamp: string, excludeTime?: boolean) => {
+    const date = new Date(timestamp);
+    const dateString = date.toLocaleString('no', {
+        day: 'numeric',
+        month: 'long',
+        year: 'numeric',
     });
+
+    if (excludeTime) {
+        return dateString;
+    }
+
+    const timeString = date
+        .toLocaleString('no', {
+            hour: '2-digit',
+            minute: '2-digit',
+            hour12: false,
+        })
+        .replace(':', '.');
+
+    return `${dateString}, kl. ${timeString}`;
+};

xp-archive/client/content/Content.tsx

@@ -80,7 +80,9 @@ export const Content = () => {
                                   data.versions.find((v) => v.versionId === selectedVersion)
                                       ?.timestamp ?? ''
                               )
-                            : 'Siste versjon'}
+                            : data?.versions?.[0]
+                              ? `${formatTimestamp(data.versions[0].timestamp, true)} (Siste versjon)`
+                              : 'Laster...'}
                     </Button>
                     <VersionSelector
                         versions={data?.versions || []}

xp-archive/client/versionSelector/VersionSelector.tsx

@@ -74,7 +74,14 @@ export const VersionSelector = ({ versions, isOpen, onClose }: Props) => {
             />
             <div className={style.versionList}>
                 <VersionButton isSelected={!selectedVersion} onClick={() => selectVersion('')}>
-                    Siste versjon
+                    {versions[0] ? (
+                        <>
+                            {formatTimestamp(versions[0].timestamp, true)}
+                            <span style={{ fontWeight: 'normal' }}> (Siste versjon)</span>
+                        </>
+                    ) : (
+                        'Laster...'
+                    )}
                 </VersionButton>
                 {filteredVersions.map((version) => (
                     <VersionButton