Merge branch 'main' into olejorgenbakken/issue4566

Author: lmfaole

.gitignore

@@ -24,3 +24,4 @@ cypress/videos
 !portalen/**
 test-results/
 playwright-report/
+storybook-static/

Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.intern.sparebank1.no/base/cicd-container-base-images/node22-ubi9-minimal:latest as base
+FROM docker.intern.sparebank1.no/base/cicd-container-base-images/node22-ubi9-minimal:latest AS base
 
 WORKDIR /app
 USER root
@@ -11,34 +11,40 @@ RUN useradd -ms /bin/bash appuser
 RUN microdnf install tar -y
 RUN microdnf install findutils -y
 
-FROM base as dependencies
+FROM base AS dependencies
+ARG NEXT_PUBLIC_SANITY_STUDIO_PROJECT_ID
 
 WORKDIR /app
 COPY package.json .
 COPY pnpm-lock.yaml .
+COPY server.js .
 COPY patches ./patches
+COPY .storybook ./.storybook
 COPY packages ./packages
 COPY ny-portal ./ny-portal
 COPY pnpm-workspace.yaml .
 RUN pnpm install --frozen-lockfile
 RUN find . -name 'node_modules' -print0 | tar -cf node_modules.tar --null --files-from -
 
-FROM base as builder
+FROM base AS builder
+ARG NEXT_PUBLIC_SANITY_STUDIO_PROJECT_ID
 
 WORKDIR /app
 COPY --from=dependencies /app/node_modules.tar ./node_modules.tar
 COPY . .
 RUN tar -xf node_modules.tar 
-RUN pnpm build
-RUN cd ny-portal && pnpm build
+RUN pnpm --filter "@fremtind/jokul" build
+RUN pnpm build-storybook
+RUN pnpm --filter "ny-portal" build
 
-FROM base as runner
+FROM base AS runner
 
 WORKDIR /app
 COPY --from=builder /app/package.json package.json
+COPY --from=builder /app/server.js server.js
 COPY --from=builder /app/ny-portal ./ny-portal
 COPY --from=builder /app/packages/jokul ./packages/jokul
+COPY --from=builder /app/storybook-static ./storybook-static
 COPY --from=builder /app/node_modules ./node_modules
 EXPOSE 3000
-WORKDIR /app/ny-portal
-CMD pnpm start
+CMD pnpm serve

ny-portal/next.config.mjs

@@ -1,4 +1,3 @@
-import { withPayload } from "@payloadcms/next/withPayload";
 import createMDX from "@next/mdx";
 
 /** @type {import('next').NextConfig} */
@@ -9,4 +8,4 @@ const nextConfig = {
 
 const withMdx = createMDX({});
 
-export default withPayload(withMdx(nextConfig));
+export default withMdx(nextConfig);

ny-portal/package.json

@@ -11,22 +11,16 @@
         "generate:importmap": "cross-env NODE_OPTIONS=--no-deprecation payload generate:importmap",
         "generate:types": "cross-env NODE_OPTIONS=--no-deprecation payload generate:types",
         "lint": "cross-env NODE_OPTIONS=--no-deprecation next lint",
-        "payload": "cross-env NODE_OPTIONS=--no-deprecation payload",
         "start": "cross-env NODE_OPTIONS=--no-deprecation next start -p 3333",
         "typegen": "sanity schema extract --path=src/sanity/extract.json && sanity typegen generate"
     },
     "dependencies": {
-        "@aws-sdk/client-sts": "^3.731.1",
-        "@aws-sdk/rds-signer": "^3.731.1",
         "@fremtind/jokul": "^0.37.11",
         "@mdx-js/loader": "^3.1.0",
         "@mdx-js/react": "^2.3.0",
         "@next/mdx": "^15.1.6",
-        "@payloadcms/db-postgres": "latest",
-        "@payloadcms/next": "latest",
-        "@payloadcms/richtext-lexical": "latest",
-        "@payloadcms/ui": "latest",
         "@portabletext/react": "^3.2.1",
+        "@portabletext/types": "^2.0.13",
         "@sanity/client": "^6.28.1",
         "@sanity/image-url": "^1.1.0",
         "@sanity/ui": "^2.14.3",
@@ -37,7 +31,6 @@
         "graphql": "^16.8.1",
         "next": "15.1.0",
         "next-sanity": "^9.8.59",
-        "payload": "latest",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
         "react-live": "^4.1.8",

ny-portal/sanity.config.ts

@@ -1,16 +1,18 @@
 import { visionTool } from "@sanity/vision";
 import { defineConfig } from "sanity";
+import type { Config } from "sanity";
 import { structureTool } from "sanity/structure";
 import { schemaTypes } from "@/sanity/schemas";
 
-export default defineConfig({
-    name: "default",
-    basePath: "/studio",
-    title: "Jøkul Portal Studio",
-    projectId: process.env.NEXT_PUBLIC_SANITY_STUDIO_PROJECT_ID || "",
-    dataset: process.env.NEXT_PUBLIC_SANITY_STUDIO_DATASET || "test",
-    plugins: [structureTool(), visionTool()],
-    schema: {
-        types: schemaTypes,
-    },
-});
+export function getSanityConfig(config: Config) {
+    return defineConfig({
+        name: "default",
+        basePath: "/studio",
+        title: "Jøkul Portal Studio",
+        plugins: [structureTool(), visionTool()],
+        schema: {
+            types: schemaTypes,
+        },
+        ...config,
+    });
+}

ny-portal/src/app/(frontend)/komponenter/[slug]/page.tsx

@@ -1,5 +1,4 @@
-import PortableTextRenderer from "@/components/portable-text";
-import { PropDocumentation } from "@/components/prop-documentation/PropDocumentation";
+import { PortableText } from "@/components/portable-text/PortableText";
 import { client } from "@/sanity/client";
 import { componentPageBySlugQuery } from "@/sanity/queries/componentPage";
 
@@ -16,13 +15,9 @@ export default async function Page({
         <>
             <div>Hei jeg er {data?.title || "ikke i databasen"}</div>
 
-            {data?.lede && <PortableTextRenderer value={data.lede} />}
+            {data?.lede && <PortableText blocks={data.lede} />}
 
-            {data?.content && <PortableTextRenderer value={data.content} />}
-
-            {data?.component_folder && (
-                <PropDocumentation component={data.component_folder} />
-            )}
+            {data?.content && <PortableText blocks={data.content} />}
         </>
     );
 }

ny-portal/src/app/(frontend)/layout.tsx

@@ -1,5 +1,5 @@
 import Link from "next/link";
-import { Navigation } from "@/components/navigation";
+import { Navigation } from "@/components/Navigation";
 import "./global.scss";
 import styles from "./layout.module.scss";
 

ny-portal/src/app/(payload)/admin/[[...segments]]/not-found.tsx

@@ -0,0 +1,32 @@
+import nodePath, { resolve } from "node:path";
+import { NextResponse } from "next/server";
+import glob from "tiny-glob";
+import { PATH_SEPARATOR } from "@/components/portable-text/code-example/CodeExample";
+
+export async function GET() {
+    try {
+        const codeExamplePaths = await glob("**/documentation/*.tsx", {
+            cwd: resolve("..", "packages", "jokul", "src", "components"),
+        });
+
+        const optionGroups = Object.groupBy(
+            codeExamplePaths.sort().map((examplePath) => ({
+                label: examplePath.substring(
+                    examplePath.lastIndexOf(nodePath.sep) + 1,
+                    examplePath.lastIndexOf("."),
+                ),
+                value: examplePath.replaceAll(nodePath.sep, PATH_SEPARATOR),
+                group: examplePath.split(nodePath.sep)[0],
+            })),
+            (examplePaths) => examplePaths.group,
+        );
+
+        return NextResponse.json(optionGroups);
+    } catch (error) {
+        console.error("Error reading code example files", error);
+        return NextResponse.json(
+            { error: "Failed to read code example files" },
+            { status: 500 },
+        );
+    }
+}

ny-portal/src/app/(payload)/admin/[[...segments]]/page.tsx

@@ -0,0 +1,11 @@
+"use client";
+
+import { NextStudio } from "next-sanity/studio";
+import type { Config } from "sanity";
+import { getSanityConfig } from "sanity.config";
+
+export default function Studio(config: Config) {
+    const sanityConfig = getSanityConfig(config);
+
+    return <NextStudio config={sanityConfig} />;
+}

ny-portal/src/app/(payload)/admin/importMap.js

@@ -1,8 +1,10 @@
-"use client";
+import Studio from "../Studio";
 
-import { NextStudio } from "next-sanity/studio";
-import config from "../../../../sanity.config";
-
-export default function Studio() {
-    return <NextStudio config={config} />;
+export default async function StudioPage() {
+    return (
+        <Studio
+            projectId={process.env.SANITY_PROJECT_ID || ""}
+            dataset={process.env.SANITY_DATASET || "test"}
+        />
+    );
 }