Merge pull request #85 from navikt/dev

dependency upgrade and update on hovercard

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:22-alpine AS base
+FROM node:23-alpine AS base
 
 # Install dependencies only when needed
 FROM base AS deps

docker-compose.yaml

@@ -1,8 +1,8 @@
 version: '3.9'
 services:
   mongo-db:
-    #image: mongo:6-nanoserver
-    image: mongo:5
+    image: mongo:6
+    #image: mongo:5
     container_name: mongo-db
     volumes:
       - ./docker-mounts/mongo/db/:/data/db

package.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "dev": "next dev",
+    "dev": "next dev --turbopack",
     "prebuild": "next telemetry disable",
     "build": "next build",
     "start": "node .next/standalone/server.js",
@@ -13,35 +13,35 @@
     "prettier:check": "prettier -c src"
   },
   "dependencies": {
-    "@navikt/ds-css": "^5.15.1",
-    "@navikt/ds-react": "^5.13.1",
-    "@radix-ui/react-hover-card": "^1.0.7",
-    "@radix-ui/react-toggle-group": "^1.0.4",
-    "axios": "^1.7.x",
-    "clsx": "^2.1.x",
-    "csv42": "^5.0.x",
-    "moment": "^2.30.x",
-    "mongoose": "^8.5.x",
-    "next": "14.2.x",
-    "prettier": "^3.3.x",
-    "react": "18.3.x",
-    "react-dom": "18.3.x",
-    "uuid": "^10.0.x"
+    "@navikt/ds-css": "^7.9.0",
+    "@navikt/ds-react": "^7.9.0",
+    "@radix-ui/react-hover-card": "^1.1.4",
+    "@radix-ui/react-toggle-group": "^1.1.1",
+    "axios": "^1.7.9",
+    "clsx": "^2.1.1",
+    "csv42": "^5.0.3",
+    "moment": "^2.30.1",
+    "mongoose": "^8.9.3",
+    "next": "15.1.3",
+    "prettier": "^3.4.2",
+    "react": "19.0.0",
+    "react-dom": "19.0.0",
+    "uuid": "^11.0.4"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.x",
-    "@types/node": "22.5.x",
-    "@types/react": "18.3.x",
-    "@types/react-dom": "18.3.x",
-    "@types/uuid": "^10.0.x",
-    "@typescript-eslint/eslint-plugin": "^8.3.x",
-    "@typescript-eslint/parser": "^8.3.x",
-    "eslint": "^8.x",
-    "eslint-config-next": "14.2.x",
-    "jest": "^29.7.x",
-    "mongodb-memory-server": "^10.0.x",
-    "supertest": "^7.0.x",
-    "ts-jest": "^29.2.x",
-    "typescript": "5.5.x"
+    "@types/jest": "^29.5.14",
+    "@types/node": "22.10.5",
+    "@types/react": "19.0.3",
+    "@types/react-dom": "19.0.2",
+    "@types/uuid": "^10.0.0",
+    "@typescript-eslint/eslint-plugin": "^8.19.0",
+    "@typescript-eslint/parser": "^8.19.0",
+    "eslint": "^9.17.0",
+    "eslint-config-next": "15.1.3",
+    "jest": "^29.7.0",
+    "mongodb-memory-server": "^10.1.3",
+    "supertest": "^7.0.0",
+    "ts-jest": "^29.2.5",
+    "typescript": "5.7.2"
   }
 }

src/app/log/logTable.tsx

@@ -199,7 +199,7 @@ export default function LogTable() {
                         <Table.DataCell>{deployer}</Table.DataCell>
                         <Table.DataCell>{version ? version: <div><TrashIcon title="Undeployed"/>Undeployed</div>}</Table.DataCell>
                         {/* <Table.DataCell>{deployed_timestamp ? deployed_timestamp.toLocaleDateString : ""}</Table.DataCell> */}
-                        <Table.DataCell>{moment(deployed_timestamp).fromNow()}</Table.DataCell>
+                        <Table.DataCell>{moment(deployed_timestamp).fromNow() + " (" + moment(deployed_timestamp).format('lll') + ")"}</Table.DataCell>
                       </Table.Row>
                     )
                   })}

src/app/versionTable.tsx

@@ -105,7 +105,7 @@ function CellContent({
 
         return (
             <>
-                <div style={{fontSize: "1.0rem"}}>{moment(versionEntry.momentTimestamp).fromNow() + " by: " + versionEntry.deployer}</div>
+                <div style={{fontSize: "1.0rem"}}>{moment(versionEntry.momentTimestamp).fromNow() +" (" + moment(versionEntry.momentTimestamp).format('lll') + ") by: " + versionEntry.deployer}</div>
                 {versionEntry.newDeployment ? newDeploymentLegend : null}
             </>
         )