refactor minor functions

luantr · luantr · commit 83e7c816e4e0 · 2025-10-28T23:28:07.000+01:00
diff --git a/.env b/.env
@@ -1,11 +1 @@
 NEXT_PUBLIC_BASE_PATH="/syk/kartleggingssporsmal"
-
-MEROPPFOLGING_BACKEND_URL="dummy-value"
-FLEXJAR_BACKEND_HOST="dummy-value"
-FLEXJAR_BACKEND_CLIENT_ID="dummy-value"
-TOKEN_X_WELL_KNOWN_URL="dummy-value"
-TOKEN_X_CLIENT_ID="dummy-value"
-TOKEN_X_PRIVATE_JWK="dummy-value"
-IDPORTEN_WELL_KNOWN_URL="dummy-value"
-IDPORTEN_CLIENT_ID="dummy-value"
-NAIS_CLUSTER_NAME="dummy-value"
diff --git a/.env.development.local b/.env.development.local
@@ -1 +1,11 @@
 NEXT_PUBLIC_RUNTIME_ENVIRONMENT=local
+
+MEROPPFOLGING_BACKEND_URL="dummy-value"
+FLEXJAR_BACKEND_HOST="dummy-value"
+FLEXJAR_BACKEND_CLIENT_ID="dummy-value"
+TOKEN_X_WELL_KNOWN_URL="dummy-value"
+TOKEN_X_CLIENT_ID="dummy-value"
+TOKEN_X_PRIVATE_JWK="dummy-value"
+IDPORTEN_WELL_KNOWN_URL="dummy-value"
+IDPORTEN_CLIENT_ID="dummy-value"
+NAIS_CLUSTER_NAME="dummy-value"
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/app/Providers.tsx b/src/app/Providers.tsx
@@ -9,6 +9,5 @@ configureLogger({
 })
 
 export default function Providers({ children }: PropsWithChildren) {
-  logger.info('Providers loaded')
   return children
 }
diff --git a/src/auth/tokenUtils.ts b/src/auth/tokenUtils.ts
@@ -1,3 +1,5 @@
+'use server'
+
 import { requestOboToken } from '@navikt/oasis'
 
 import { getServerEnv } from '@/constants/envs'
diff --git a/src/components/form-components/RadioGroup.tsx b/src/components/form-components/RadioGroup.tsx
diff --git a/src/components/form-components/TextArea.tsx b/src/components/form-components/TextArea.tsx
diff --git a/src/features/kartleggingssporsmal/form/KartleggingssporsmalForm.tsx b/src/features/kartleggingssporsmal/form/KartleggingssporsmalForm.tsx
@@ -8,13 +8,13 @@ import {
 import { useAppForm } from '@/hooks/form'
 import { Alert, Button, Heading } from '@navikt/ds-react'
 import { revalidateLogic } from '@tanstack/form-core'
-import { type Dispatch, type SetStateAction, useState } from 'react'
+import { useState } from 'react'
 import { NullableKartleggingssporsmalFormResponse } from '@/features/kartleggingssporsmal/KartleggingssporsmalLanding'
-import { submitFormAction } from '@/services/meroppfolging/meroppfolgingService'
 import { logger } from '@navikt/next-logger'
+import { submitFormAction } from '@/services/meroppfolging/actions/submitFormAction'
 
 type Props = {
-  setSummaryItems: Dispatch<SetStateAction<NullableKartleggingssporsmalFormResponse>>
+  setSummaryItems: (data: NullableKartleggingssporsmalFormResponse) => void
 }
 
 export default function KartleggingssporsmalForm({ setSummaryItems }: Props) {
@@ -23,12 +23,9 @@ export default function KartleggingssporsmalForm({ setSummaryItems }: Props) {
 
   const form = useAppForm({
     defaultValues: kartleggingssporsmalFormDefaults,
-    validationLogic: revalidateLogic({
-      mode: 'submit',
-      modeAfterSubmission: 'change',
-    }),
+    validationLogic: revalidateLogic(),
     validators: {
-      onSubmit: kartleggingssporsmalFormSchema,
+      onDynamic: kartleggingssporsmalFormSchema,
     },
     onSubmit: async ({ value }) => {
       try {
@@ -37,7 +34,7 @@ export default function KartleggingssporsmalForm({ setSummaryItems }: Props) {
         const formResponse = await submitFormAction(value)
         setSummaryItems(formResponse)
       } catch (e) {
-        logger.error(`Feil ved innsending av kartleggingssporsmal: ${e}`)
+        logger.error(`[Frontend] Feil ved innsending av kartleggingssporsmal: ${e}`)
         setSubmitError(true)
       } finally {
         setSubmitting(false)
@@ -54,7 +51,7 @@ export default function KartleggingssporsmalForm({ setSummaryItems }: Props) {
       className="mt-8"
     >
       <form.AppForm>
-        <div className={'grid gap-4 mb-4'}>
+        <div className="grid gap-4 mb-4">
           <form.AppField name="hvorSannsynligTilbakeTilJobben">
             {(field) => (
               <field.RadioGroup question={kartleggingsspormalFormQuestions['hvorSannsynligTilbakeTilJobben']} />
diff --git a/src/features/kartleggingssporsmal/form/KartleggingssporsmalFormPage.tsx b/src/features/kartleggingssporsmal/form/KartleggingssporsmalFormPage.tsx
@@ -1,10 +1,9 @@
 import KartleggingssporsmalForm from './KartleggingssporsmalForm'
-import { type Dispatch, type SetStateAction } from 'react'
 import { BodyShort, Heading } from '@navikt/ds-react'
 import { NullableKartleggingssporsmalFormResponse } from '@/features/kartleggingssporsmal/KartleggingssporsmalLanding'
 
 type KartleggingssporsmalFormPageProps = {
-  setSummaryItems: Dispatch<SetStateAction<NullableKartleggingssporsmalFormResponse>>
+  setSummaryItems: (data: NullableKartleggingssporsmalFormResponse) => void
 }
 
 export default function KartleggingssporsmalFormPage({ setSummaryItems }: KartleggingssporsmalFormPageProps) {
diff --git a/src/features/kartleggingssporsmal/summary/KartleggingssporsmalFormSummaryPage.tsx b/src/features/kartleggingssporsmal/summary/KartleggingssporsmalFormSummaryPage.tsx
@@ -1,6 +1,6 @@
 import { BodyShort, Heading, Link, VStack } from '@navikt/ds-react'
 import KartleggingssporsmalFormSummary from './KartleggingssporsmalFormSummary'
-import { mapFormSnapshotToSummaryItems } from '@/utils/form'
+import { mapFormSnapshotToSummaryItems } from '@/utils/kartleggingssporsmalForm'
 import NextLink from 'next/link'
 import { CONTACT_NAV_URL } from '@/constants'
 import ThankYouAlert from '@/features/kartleggingssporsmal/summary/ThankYouAlert'
diff --git a/src/forms/kartleggingssporsmalForm.ts b/src/forms/kartleggingssporsmalForm.ts
@@ -1,5 +1,5 @@
 import { z, ZodType } from 'zod/v4'
-import { RadioGroupQuestion } from '@/components/formComponents/RadioGroup'
+import { RadioGroupQuestion } from '@/components/form-components/RadioGroup'
 
 export const kartleggingsspormalFormQuestions = {
   hvorSannsynligTilbakeTilJobben: {
@@ -31,15 +31,22 @@ export const kartleggingsspormalFormQuestions = {
 
 type KartleggingsspormalFormQuestionId = keyof typeof kartleggingsspormalFormQuestions
 
+function getOptionIds<T extends KartleggingsspormalFormQuestionId>(
+  fieldId: T,
+): (typeof kartleggingsspormalFormQuestions)[T]['options'][number]['id'][] {
+  const question = kartleggingsspormalFormQuestions[fieldId]
+  return question.options.map((option) => option.id)
+}
+
 export const kartleggingssporsmalFormSchema = z.object({
-  hvorSannsynligTilbakeTilJobben: z.string().nonempty('Feltet er påkrevd'),
-  samarbeidOgRelasjonTilArbeidsgiver: z.string().nonempty('Feltet er påkrevd'),
-  naarTilbakeTilJobben: z.string().nonempty('Feltet er påkrevd'),
+  hvorSannsynligTilbakeTilJobben: z.enum(getOptionIds('hvorSannsynligTilbakeTilJobben'), 'Feltet er påkrevd'),
+  samarbeidOgRelasjonTilArbeidsgiver: z.enum(getOptionIds('samarbeidOgRelasjonTilArbeidsgiver'), 'Feltet er påkrevd'),
+  naarTilbakeTilJobben: z.enum(getOptionIds('naarTilbakeTilJobben'), 'Feltet er påkrevd'),
 } satisfies Record<KartleggingsspormalFormQuestionId, ZodType>)
 export type KartleggingssporsmalForm = z.infer<typeof kartleggingssporsmalFormSchema>
 
 export const kartleggingssporsmalFormDefaults = {
   hvorSannsynligTilbakeTilJobben: '',
   samarbeidOgRelasjonTilArbeidsgiver: '',
   naarTilbakeTilJobben: '',
-} satisfies KartleggingssporsmalForm
+}
diff --git a/src/hooks/form.tsx b/src/hooks/form.tsx
@@ -1,9 +1,9 @@
 import { createFormHook } from '@tanstack/react-form'
 import { createFormHookContexts } from '@tanstack/react-form'
-import RadioGroup from '@/components/formComponents/RadioGroup'
-import TextArea from '@/components/formComponents/TextArea'
+import RadioGroup from '@/components/form-components/RadioGroup'
+import TextArea from '@/components/form-components/TextArea'
 
-export const { fieldContext, useFieldContext, formContext, useFormContext } = createFormHookContexts()
+export const { fieldContext, useFieldContext, formContext } = createFormHookContexts()
 
 export const { useAppForm } = createFormHook({
   fieldComponents: { RadioGroup, TextArea },
diff --git a/src/services/meroppfolging/actions/submitFormAction.ts b/src/services/meroppfolging/actions/submitFormAction.ts
@@ -0,0 +1,72 @@
+'use server'
+
+import { kartleggingssporsmalFormSchema } from '@/forms/kartleggingssporsmalForm'
+import {
+  FormSnapshotRequest,
+  SubmitKartleggingssporsmalResponse,
+  submitKartleggingssporsmalResponseSchema,
+} from '@/services/meroppfolging/schemas/formSnapshotSchema'
+import { mapAppFormToSnapshot } from '@/utils/kartleggingssporsmalForm'
+import { getServerEnv, isLocalOrDemo } from '@/constants/envs'
+import { verifyUserLoggedIn } from '@/auth/rsc'
+import { exchangeIdportenTokenForMeroppfolgingBackendTokenx } from '@/auth/tokenUtils'
+import { logger } from '@navikt/next-logger'
+
+export async function submitFormAction(formValues: unknown): Promise<SubmitKartleggingssporsmalResponse> {
+  const parsed = kartleggingssporsmalFormSchema.safeParse(formValues)
+  if (!parsed.success) {
+    logger.error(`[Backend] Failed to parse kartleggingsspørsmål on post with error: ${parsed.error.issues}`)
+    throw new Error('Invalid form values when submitting kartleggingssporsmal form')
+  }
+
+  const fieldSnapshots = mapAppFormToSnapshot({ values: parsed.data })
+
+  if (isLocalOrDemo) {
+    return {
+      formSnapshot: { fieldSnapshots: fieldSnapshots },
+      createdAt: new Date(),
+    }
+  }
+
+  const idportenToken = await verifyUserLoggedIn()
+  const exchangedToken = await exchangeIdportenTokenForMeroppfolgingBackendTokenx(idportenToken)
+
+  const { MEROPPFOLGING_BACKEND_URL } = getServerEnv()
+  const url = new URL('/api/v1/kartleggingssporsmal', MEROPPFOLGING_BACKEND_URL)
+
+  const payload: FormSnapshotRequest = {
+    formSnapshot: {
+      formIdentifier: 'kartleggingsporsmal',
+      formSemanticVersion: '1.0.0',
+      formSnapshotVersion: '1.0.0',
+      fieldSnapshots: fieldSnapshots,
+    },
+  }
+
+  try {
+    const res = await fetch(url, {
+      cache: 'no-store',
+      method: 'POST',
+      headers: {
+        Authorization: `Bearer ${exchangedToken}`,
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify(payload),
+    })
+    const json = await res.json()
+
+    const parsed = submitKartleggingssporsmalResponseSchema.safeParse(json)
+    if (!parsed.success) {
+      const formattedErrorText = `[backend] Parsing failed on url: ${url} with zod issues: ${parsed.error.issues}`
+      logger.error(formattedErrorText)
+
+      throw new Error('Invalid response when posting kartleggingssporsmal form')
+    }
+
+    return parsed.data
+  } catch (error) {
+    logger.error(`[Backend] Failed to fetch from ${url}: with error: ${error}`)
+
+    throw new Error(`Error on posting kartleggingssporsmal form.`)
+  }
+}
diff --git a/src/services/meroppfolging/meroppfolgingService.ts b/src/services/meroppfolging/meroppfolgingService.ts
@@ -1,17 +1,12 @@
 'use server'
 
 import {
-  FormSnapshotRequest,
   KandidatStatusResponse,
   kandidatStatusResponseSchema,
-  SubmitKartleggingssporsmalResponse,
-  submitKartleggingssporsmalResponseSchema,
 } from '@/services/meroppfolging/schemas/formSnapshotSchema'
 import { getServerEnv, isLocalOrDemo } from '@/constants/envs'
 import { verifyUserLoggedIn } from '@/auth/rsc'
 import { exchangeIdportenTokenForMeroppfolgingBackendTokenx } from '@/auth/tokenUtils'
-import { KartleggingssporsmalForm, kartleggingssporsmalFormSchema } from '@/forms/kartleggingssporsmalForm'
-import { mapAppFormToSnapshot } from '@/utils/form'
 import { logger } from '@navikt/next-logger'
 
 export async function fetchKandidatStatus(): Promise<KandidatStatusResponse> {
@@ -51,67 +46,6 @@ export async function fetchKandidatStatus(): Promise<KandidatStatusResponse> {
   } catch (error) {
     logger.error(`[Backend] Failed to fetch from ${url}: with error: ${error}`)
 
-    throw new Error(`Error on fetching kandidat status. Error: ${error}`)
-  }
-}
-
-export async function submitFormAction(
-  formValues: KartleggingssporsmalForm,
-): Promise<SubmitKartleggingssporsmalResponse> {
-  const parsed = kartleggingssporsmalFormSchema.safeParse(formValues)
-  if (!parsed.success) {
-    const issues = parsed.error.message
-    throw new Error(issues)
-  }
-
-  const fieldSnapshots = mapAppFormToSnapshot({ values: parsed.data })
-
-  if (isLocalOrDemo) {
-    return {
-      formSnapshot: { fieldSnapshots: fieldSnapshots },
-      createdAt: new Date(),
-    }
-  }
-
-  const idportenToken = await verifyUserLoggedIn()
-  const exchangedToken = await exchangeIdportenTokenForMeroppfolgingBackendTokenx(idportenToken)
-
-  const { MEROPPFOLGING_BACKEND_URL } = getServerEnv()
-  const url = new URL('/api/v1/kartleggingssporsmal', MEROPPFOLGING_BACKEND_URL)
-
-  const payload: FormSnapshotRequest = {
-    formSnapshot: {
-      formIdentifier: 'kartleggingsporsmal',
-      formSemanticVersion: '1.0.0',
-      formSnapshotVersion: '1.0.0',
-      fieldSnapshots: fieldSnapshots,
-    },
-  }
-
-  try {
-    const res = await fetch(url, {
-      cache: 'no-store',
-      method: 'POST',
-      headers: {
-        Authorization: `Bearer ${exchangedToken}`,
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify(payload),
-    })
-    const json = await res.json()
-
-    const parsed = submitKartleggingssporsmalResponseSchema.safeParse(json)
-    if (!parsed.success) {
-      const formattedErrorText = `[backend] Parsing failed on url: ${url} with zod issues: ${parsed.error.issues}`
-      logger.error(formattedErrorText)
-
-      throw new Error('Invalid response when posting kartleggingssporsmal form')
-    }
-
-    return parsed.data
-  } catch (error) {
-    logger.error(`[Backend] Failed to fetch from ${url}: with error: ${error}`)
-
-    throw new Error(`Error on posting kartleggingssporsmal form. Error: ${error}`)
+    throw new Error(`Error on fetching kandidat status.`)
   }
 }
diff --git a/src/utils/kartleggingssporsmalForm.ts b/src/utils/kartleggingssporsmalForm.ts

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,5 @@ configureLogger({`
`9`	`9`	`})`
`10`	`10`
`11`	`11`	`export default function Providers({ children }: PropsWithChildren) {`
`12`		`- logger.info('Providers loaded')`
`13`	`12`	`return children`
`14`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+'use server'`
	`2`	`+`
`1`	`3`	`import { requestOboToken } from '@navikt/oasis'`
`2`	`4`
`3`	`5`	`import { getServerEnv } from '@/constants/envs'`