Merge pull request #35 from navikt/ereg_fetch

Ereg fetch

Author: maccyber

frontend/client/src/hooks/useVirksomhetAdresse.ts

@@ -0,0 +1,34 @@
+import useSWR from "swr";
+import { fetchJson } from "../utils/api";
+import { HttpError } from "../utils/http";
+import { EKSPERTBISTAND_EREG_ADRESSE_PATH } from "../utils/constants";
+
+type AdresseResponse = {
+  adresse: string;
+};
+
+const fetchAdresse = async (url: string): Promise<string | null> => {
+  try {
+    const data = await fetchJson<AdresseResponse>(url);
+    return data?.adresse ?? null;
+  } catch (error) {
+    if (error instanceof HttpError && error.status === 404) {
+      return null;
+    }
+    throw error;
+  }
+};
+
+export const useVirksomhetAdresse = (orgnr: string | null | undefined) => {
+  const shouldFetch = Boolean(orgnr);
+  const { data, error, isLoading } = useSWR<string | null>(
+    shouldFetch ? `${EKSPERTBISTAND_EREG_ADRESSE_PATH}/${orgnr}/adresse` : null,
+    fetchAdresse
+  );
+
+  return {
+    adresse: data ?? null,
+    isLoading,
+    error,
+  };
+};

frontend/client/src/mocks/handlers.ts

@@ -2,7 +2,7 @@ import { http, HttpResponse } from "msw";
 import { createEmptyInputs, type SoknadInputs } from "../features/soknad/schema";
 import { ensureIsoDateString } from "../utils/date";
 import type { Organisasjon } from "@navikt/virksomhetsvelger";
-import { EKSPERTBISTAND_API_PATH } from "../utils/constants";
+import { EKSPERTBISTAND_API_PATH, EKSPERTBISTAND_EREG_ADRESSE_PATH } from "../utils/constants";
 
 const organisasjoner: Organisasjon[] = [
   {
@@ -36,6 +36,8 @@ const organisasjoner: Organisasjon[] = [
 
 const eregAdresser: Record<string, string> = {
   "123456789": "Testveien 1, 0557 Oslo",
+  "123456780": "Storgata 12, 0155 Oslo",
+  "123456781": "Bryggen 5, 5003 Bergen",
   "987654321": "Eksempelveien 2, 7010 Trondheim",
   "111222333": "Demogata 3, 5003 Bergen",
   "444555666": "Mockveien 4, 2317 Hamar",
@@ -249,7 +251,7 @@ export const handlers = [
   http.get("/ekspertbistand-backend/api/organisasjoner/v1", () =>
     HttpResponse.json({ hierarki: organisasjoner })
   ),
-  http.get("/api/ereg/:orgnr/adresse", ({ params }) => {
+  http.get(`${EKSPERTBISTAND_EREG_ADRESSE_PATH}/:orgnr/adresse`, ({ params }) => {
     const orgnr = getParamValue(params.orgnr);
     if (!orgnr || !/^\d{9}$/.test(orgnr)) {
       return HttpResponse.json({ message: "ugyldig orgnr" }, { status: 400 });

frontend/client/src/pages/OppsummeringPage.tsx

@@ -33,6 +33,7 @@ import {
 } from "../components/summaryFormatters";
 import type { SoknadInputs } from "../features/soknad/schema";
 import { FormSummaryAnswer } from "@navikt/ds-react/FormSummary";
+import { useVirksomhetAdresse } from "../hooks/useVirksomhetAdresse";
 
 type SoknadSummaryProps = {
   data: SoknadInputs;
@@ -43,6 +44,11 @@ type SoknadSummaryProps = {
 
 function SoknadSummary({ data, editable = false, onEditStep1, onEditStep2 }: SoknadSummaryProps) {
   const { virksomhet, ansatt, ekspert, behovForBistand, nav } = data;
+  const {
+    adresse,
+    isLoading: adresseLoading,
+    error: adresseError,
+  } = useVirksomhetAdresse(virksomhet.virksomhetsnummer);
 
   return (
     <>
@@ -59,6 +65,16 @@ function SoknadSummary({ data, editable = false, onEditStep1, onEditStep2 }: Sok
             <FormSummary.Label>Organisasjonsnummer</FormSummary.Label>
             <FormSummary.Value>{formatValue(virksomhet.virksomhetsnummer)}</FormSummary.Value>
           </FormSummary.Answer>
+          <FormSummary.Answer>
+            <FormSummary.Label>Beliggenhetsadresse</FormSummary.Label>
+            <FormSummary.Value>
+              {adresseError
+                ? "Kunne ikke hente beliggenhetsadresse."
+                : adresseLoading
+                  ? "Laster ..."
+                  : formatValue(adresse)}
+            </FormSummary.Value>
+          </FormSummary.Answer>
           <FormSummaryAnswer>
             <FormSummary.Label>Kontaktperson i virksomheten</FormSummary.Label>
             <FormSummary.Value>

frontend/client/src/pages/SkjemaSteg1Page.tsx

@@ -1,7 +1,18 @@
 import { type FormEvent } from "react";
-import { Controller, useFormContext } from "react-hook-form";
+import { Controller, useFormContext, useWatch } from "react-hook-form";
 import { ArrowLeftIcon, ArrowRightIcon } from "@navikt/aksel-icons";
-import { Button, HGrid, Heading, TextField, VStack, Fieldset } from "@navikt/ds-react";
+import {
+  BodyShort,
+  Button,
+  ErrorMessage,
+  Fieldset,
+  HGrid,
+  Heading,
+  Label,
+  Loader,
+  TextField,
+  VStack,
+} from "@navikt/ds-react";
 import DecoratedPage from "../components/DecoratedPage";
 import { FORM_COLUMN_STYLE } from "../styles/forms";
 import type { SoknadInputs } from "../features/soknad/schema";
@@ -17,6 +28,7 @@ import { SkjemaFormProgress } from "../components/SkjemaFormProgress";
 import { useSkjemaNavigation } from "../hooks/useSkjemaNavigation";
 import { SOKNADER_PATH } from "../utils/constants";
 import { SistLagretInfo } from "../components/SistLagretInfo.tsx";
+import { useVirksomhetAdresse } from "../hooks/useVirksomhetAdresse";
 
 export default function SkjemaSteg1Page() {
   const form = useFormContext<SoknadInputs>();
@@ -26,6 +38,13 @@ export default function SkjemaSteg1Page() {
 
   const { clearDraft, lastPersistedAt } = useSoknadDraft();
   const { goToSoknader, goToStep2, goToSummary, createLinkHandler } = useSkjemaNavigation();
+  const virksomhetsnummer = useWatch({ control, name: "virksomhet.virksomhetsnummer" });
+  const {
+    adresse,
+    isLoading: adresseLoading,
+    error: adresseError,
+  } = useVirksomhetAdresse(virksomhetsnummer);
+  const hasVirksomhet = Boolean(virksomhetsnummer?.trim());
 
   useAttemptedSubmitRedirect(form, { fields: STEP1_FIELDS, onValidationFailed: bumpFocusKey });
 
@@ -86,6 +105,25 @@ export default function SkjemaSteg1Page() {
                   />
                 )}
               />
+              {hasVirksomhet ? (
+                <VStack gap="1" style={{ marginTop: "1rem" }}>
+                  <Label>Beliggenhetsadresse (hentet fra brreg.no)</Label>
+                  {adresseLoading ? (
+                    <BodyShort size="small">
+                      <Loader size="small" title="Laster beliggenhetsadresse" aria-live="polite" />{" "}
+                      Laster beliggenhetsadresse ...
+                    </BodyShort>
+                  ) : null}
+                  {!adresseLoading && !adresseError ? (
+                    <BodyShort size="small">
+                      {adresse ?? "Fant ikke beliggenhetsadresse."}
+                    </BodyShort>
+                  ) : null}
+                  {adresseError ? (
+                    <ErrorMessage>Kunne ikke hente beliggenhetsadresse.</ErrorMessage>
+                  ) : null}
+                </VStack>
+              ) : null}
             </div>
             <input type="hidden" {...register("virksomhet.navn")} />
 

frontend/client/src/utils/constants.ts

@@ -28,6 +28,7 @@ export const EKSPERTBISTAND_API_PATH = withBasePath("/ekspertbistand-backend/api
 export const EKSPERTBISTAND_ORGANISASJONER_PATH = withBasePath(
   "/ekspertbistand-backend/api/organisasjoner/v1"
 );
+export const EKSPERTBISTAND_EREG_ADRESSE_PATH = withBasePath("/ekspertbistand-backend/api/ereg");
 
 export const SOKNADER_PATH = "/soknader";