Revert "Unngå doble serverkall pga <LoadingPanel /> (#5380)" (#5438)

This reverts commit ccf5a0c.
navikt · Dec 12, 2023 · e129c8c · e129c8c
1 parent 834e2cc
commit e129c8c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/packages/rest-api-hooks/src/RestApiState.ts b/packages/rest-api-hooks/src/RestApiState.ts
@@ -6,6 +6,3 @@ enum RestApiState {
 }
 
 export default RestApiState;
-
-export const isRequestNotDone = (state: RestApiState): boolean =>
-  state === RestApiState.NOT_STARTED || state === RestApiState.LOADING;
diff --git a/packages/sak-app/src/behandlingsupport/historikk/HistorikkIndex.tsx b/packages/sak-app/src/behandlingsupport/historikk/HistorikkIndex.tsx
@@ -2,11 +2,11 @@ import React, { useCallback, useMemo } from 'react';
 import { useLocation } from 'react-router-dom';
 import moment from 'moment';
 
+import { RestApiState } from '@k9-sak-web/rest-api-hooks';
 import HistorikkSakIndex from '@fpsak-frontend/sak-historikk';
 import { KodeverkMedNavn, Historikkinnslag } from '@k9-sak-web/types';
 import { LoadingPanel, usePrevious } from '@fpsak-frontend/shared-components';
 
-import { isRequestNotDone } from "@k9-sak-web/rest-api-hooks/src/RestApiState";
 import useBehandlingEndret from '../../behandling/useBehandlingEndret';
 import { K9sakApiKeys, restApiHooks } from '../../data/k9sakApi';
 import { pathToBehandling, createLocationForSkjermlenke } from '../../app/paths';
@@ -109,9 +109,9 @@ const HistorikkIndex = ({ saksnummer, behandlingId, behandlingVersjon }: OwnProp
   );
 
   if (
-    isRequestNotDone(historikkK9SakState) ||
-    (skalBrukeFpTilbakeHistorikk && isRequestNotDone(historikkTilbakeState)) ||
-    (skalBrukeKlageHistorikk && isRequestNotDone(historikkKlageState))
+    historikkK9SakState === RestApiState.LOADING ||
+    (skalBrukeFpTilbakeHistorikk && historikkTilbakeState === RestApiState.LOADING) ||
+    (skalBrukeKlageHistorikk && historikkKlageState === RestApiState.LOADING)
   ) {
     return <LoadingPanel />;
   }

diff --git a/packages/sak-app/src/fagsak/FagsakIndex.tsx b/packages/sak-app/src/fagsak/FagsakIndex.tsx
@@ -7,6 +7,7 @@ import {
   LoadingPanel,
   Punsjstripe,
 } from '@fpsak-frontend/shared-components';
+import { RestApiState } from '@k9-sak-web/rest-api-hooks';
 import { Merknadkode } from '@k9-sak-web/sak-meny-marker-behandling';
 import Soknadsperiodestripe from '@k9-sak-web/sak-soknadsperiodestripe';
 import {
@@ -27,7 +28,6 @@ import React, { useCallback, useMemo, useState } from 'react';
 import { Navigate, Route, Routes, useLocation } from 'react-router-dom';
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import { QueryClient, QueryClientProvider } from 'react-query';
-import { isRequestNotDone } from "@k9-sak-web/rest-api-hooks/src/RestApiState";
 import {
   behandlingerRoutePath,
   erBehandlingValgt,
@@ -216,13 +216,14 @@ const FagsakIndex = () => {
   const erHastesak = merknaderFraLos && merknaderFraLos.merknadKoder?.includes(Merknadkode.HASTESAK);
 
   if (!fagsak) {
-    if (isRequestNotDone(fagsakState)) {
+    if (fagsakState === RestApiState.NOT_STARTED || fagsakState === RestApiState.LOADING) {
       return <LoadingPanel />;
     }
     return <Navigate to={pathToMissingPage()} />;
   }
 
-  const harIkkeHentetfagsakPersonData = isRequestNotDone(fagsakPersonState);
+  const harIkkeHentetfagsakPersonData =
+    fagsakPersonState === RestApiState.LOADING || fagsakPersonState === RestApiState.NOT_STARTED;
 
   if (harIkkeHentetfagsakPersonData || !harFerdighentetfagsakRettigheter) {
     return <LoadingPanel />;
@@ -273,7 +274,7 @@ const FagsakIndex = () => {
           />
         }
         supportContent={() => {
-          if (isRequestNotDone(personopplysningerState)) {
+          if (personopplysningerState === RestApiState.LOADING) {
             return <LoadingPanel />;
           }
 
@@ -298,7 +299,7 @@ const FagsakIndex = () => {
             return null;
           }
 
-          if (isRequestNotDone(personopplysningerState)) {
+          if (personopplysningerState === RestApiState.LOADING) {
             return <LoadingPanel />;
           }