Flytter notat i sak inn i v2 (#7014)

* Flytter notat i sak inn i v2
Gjør nødvendige justeringer

* Fiks

* Oppdaterer loosely type

* Oppdaterer importer fra generert ts-typer

* Bruker genererte endepunkter for kommunikasjon med backend

* Fikser refetching

* Tar bort ubrukt kode

* Bruker den genererte backendklienten et sted til

* Oppdateringer etter code review

---------

Co-authored-by: Thomas H. Wiberg <[email protected]>

Author: hallvardastark

loosely-type-checked-files.json

@@ -500,8 +500,6 @@
   "packages/sak-meny-sett-pa-vent/src/MenySettPaVentIndex.tsx",
   "packages/sak-meny-ta-av-vent/src/MenyTaAvVentIndex.tsx",
   "packages/sak-meny-verge/src/MenyVergeIndex.tsx",
-  "packages/sak-notat/src/NotatISakIndex.stories.tsx",
-  "packages/sak-notat/src/NotaterIndex.tsx",
   "packages/sak-sok/src/components/FagsakList.spec.tsx",
   "packages/sak-sok/src/components/FagsakList.tsx",
   "packages/sak-sok/src/components/SearchForm.spec.tsx",

packages/rest-api/index.ts

@@ -5,7 +5,6 @@ import RequestApiMock from './src/requestApi/RequestApiMock';
 import RequestConfig from './src/RequestConfig';
 
 export { default as AbstractRequestApi } from './src/requestApi/AbstractRequestApi';
-export { default as apiPaths } from './src/requestApi/apiPaths';
 export type { default as ErrorType } from './src/requestApi/error/errorTsType';
 export { ErrorTypes, errorOfType, getErrorResponseData } from './src/requestApi/error/ErrorTypes';
 export type { default as Link } from './src/requestApi/LinkTsType';

packages/rest-api/src/requestApi/apiPaths.ts

@@ -38,7 +38,6 @@
     "@k9-sak-web/sak-behandling-velger": "1.0.0",
     "@k9-sak-web/sak-meldinger": "1.0.0",
     "@k9-sak-web/sak-meny-marker-behandling": "1.0.0",
-    "@k9-sak-web/sak-notat": "1.0.0",
     "@k9-sak-web/types": "1.0.0",
     "@navikt/ds-react": "7.10.0",
     "@navikt/ft-fakta-beregning": "^8.2.2",

packages/sak-app/package.json

@@ -1,16 +1,14 @@
-import { httpErrorHandler } from '@fpsak-frontend/utils';
+import { kjønn } from '@k9-sak-web/backend/k9sak/kodeverk/Kjønn.js';
 import { FormidlingClientContext } from '@k9-sak-web/gui/app/FormidlingClientContext.js';
 import { K9SakClientContext } from '@k9-sak-web/gui/app/K9SakClientContext.js';
 import MeldingerBackendClient from '@k9-sak-web/gui/sak/meldinger/MeldingerBackendClient.js';
-import { apiPaths } from '@k9-sak-web/rest-api';
-import { useRestApiErrorDispatcher } from '@k9-sak-web/rest-api-hooks';
+import NotatBackendClient from '@k9-sak-web/gui/sak/notat/NotatBackendClient.js';
 import {
   ArbeidsgiverOpplysningerWrapper,
   BehandlingAppKontekst,
   Fagsak,
   FeatureToggles,
   NavAnsatt,
-  NotatResponse,
   Personopplysninger,
 } from '@k9-sak-web/types';
 import {
@@ -27,7 +25,6 @@ import {
 } from '@navikt/aksel-icons';
 import { BodyShort, Tabs, Tooltip } from '@navikt/ds-react';
 import { useQuery } from '@tanstack/react-query';
-import axios from 'axios';
 import { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
 import { useNavigate } from 'react-router';
 import { getSupportPanelLocationCreator } from '../app/paths';
@@ -37,10 +34,9 @@ import styles from './behandlingSupportIndex.module.css';
 import DokumentIndex from './dokument/DokumentIndex';
 import HistorikkIndex from './historikk/HistorikkIndex';
 import MeldingIndex from './melding/MeldingIndex';
-import NotaterIndex from './notater/NotaterIndex';
+import Notater from './notater/Notater';
 import SupportTabs from './supportTabs';
 import TotrinnskontrollIndex from './totrinnskontroll/TotrinnskontrollIndex';
-import { kjønn } from '@k9-sak-web/backend/k9sak/kodeverk/Kjønn.js';
 
 export const hentSynligePaneler = (behandlingRettigheter?: BehandlingRettigheter): string[] =>
   Object.values(SupportTabs).filter(supportPanel => {
@@ -160,12 +156,12 @@ const BehandlingSupportIndex = ({
   navAnsatt,
   featureToggles,
 }: OwnProps) => {
-  const { addErrorMessage } = useRestApiErrorDispatcher();
   const [antallUlesteNotater, setAntallUlesteNotater] = useState(0);
 
   const k9SakClient = useContext(K9SakClientContext);
   const formidlingClient = useContext(FormidlingClientContext);
   const meldingerBackendClient = new MeldingerBackendClient(k9SakClient, formidlingClient);
+  const notatBackendClient = new NotatBackendClient(k9SakClient);
   const [toTrinnskontrollFormState, setToTrinnskontrollFormState] = useState(undefined);
 
   const currentResetValue = `${fagsak.saksnummer}-${behandlingId}-${personopplysninger?.aktoerId}`;
@@ -178,23 +174,10 @@ const BehandlingSupportIndex = ({
     prevResetValue.current = currentResetValue;
   }, [currentResetValue]);
 
-  const getNotater = (signal: AbortSignal) =>
-    axios
-      .get<NotatResponse[]>(apiPaths.notatISak, {
-        signal,
-        params: {
-          saksnummer: fagsak.saksnummer,
-        },
-      })
-      .then(({ data }) => data)
-      .catch(error => {
-        httpErrorHandler(error?.response?.status, addErrorMessage, error?.response?.headers?.location);
-      });
-
   const notaterQueryKey = ['notater', fagsak?.saksnummer];
   const { data: notater } = useQuery({
     queryKey: notaterQueryKey,
-    queryFn: ({ signal }) => getNotater(signal),
+    queryFn: () => notatBackendClient.getNotater(fagsak.saksnummer),
     enabled: !!fagsak,
     refetchOnWindowFocus: false,
   });
@@ -337,7 +320,7 @@ const BehandlingSupportIndex = ({
             />
           </Tabs.Panel>
           <Tabs.Panel value={SupportTabs.NOTATER}>
-            <NotaterIndex navAnsatt={navAnsatt} fagsak={fagsak} />
+            <Notater navAnsatt={navAnsatt} fagsak={fagsak} />
           </Tabs.Panel>
         </div>
       </div>

packages/sak-app/src/behandlingsupport/BehandlingSupportIndex.tsx

@@ -1,31 +1,33 @@
-import { LoadingPanel, requireProps } from '@fpsak-frontend/shared-components';
-import Notater from '@k9-sak-web/sak-notat';
-import { Fagsak, NavAnsatt } from '@k9-sak-web/types';
-import React from 'react';
-import ErrorBoundary from '@k9-sak-web/sak-app/src/app/ErrorBoundary';
+import { LoadingPanel } from '@fpsak-frontend/shared-components';
+import NotaterIndex from '@k9-sak-web/gui/sak/notat/NotaterIndex.js';
 import { useRestApiErrorDispatcher } from '@k9-sak-web/rest-api-hooks';
+import ErrorBoundary from '@k9-sak-web/sak-app/src/app/ErrorBoundary';
+import { Fagsak } from '@k9-sak-web/types';
+import { InnloggetAnsattDto } from '@navikt/k9-sak-typescript-client';
 
 interface OwnProps {
-  navAnsatt: NavAnsatt;
+  navAnsatt: Pick<InnloggetAnsattDto, 'brukernavn'>;
   fagsak: Fagsak;
 }
 
 /**
- * NotaterIndex
+ * Notater
  *
  * Container komponent. Har ansvar for å vise notater i saken.
  */
-export const NotaterIndex = ({ fagsak, navAnsatt }: OwnProps) => {
+const Notater = ({ fagsak, navAnsatt }: OwnProps) => {
   const { addErrorMessage } = useRestApiErrorDispatcher();
-
+  if (!fagsak) {
+    return <LoadingPanel />;
+  }
   return (
     <ErrorBoundary errorMessageCallback={addErrorMessage}>
-      <Notater
+      <NotaterIndex
         fagsakId={fagsak.saksnummer}
         navAnsatt={navAnsatt}
         fagsakHarPleietrengende={!!fagsak.pleietrengendeAktørId}
       />
     </ErrorBoundary>
   );
 };
-export default requireProps(['fagsak'], <LoadingPanel />)(NotaterIndex);
+export default Notater;