Flytte kode til appstatus-react-ds

Author: frodehansen2

apps/dine-pleiepenger/api-mock-server/mockdata/soker.json

@@ -0,0 +1 @@
+{}

apps/dine-pleiepenger/e2e/playwright/utils/setup-mock-routes.ts

@@ -3,7 +3,6 @@ import { Innsynsdata } from '../../../src/types/InnsynData';
 import { søkerMockData } from '../mockdata/søker.mock';
 import { søknaderMockData } from '../mockdata/søknader.mock';
 import { PleietrengendeMedSak } from '../../../src/server/api-models/PleietrengendeMedSakSchema';
-import { defaultAppStatus } from '../../../src/pages/api/appStatus.api';
 
 const sak: PleietrengendeMedSak = {
     pleietrengende: {
@@ -31,7 +30,6 @@ export const setupMockRoutes = async (page: any) => {
     await page.route('**/innsynsdata', async (route) => {
         const response: Innsynsdata = {
             saker: [sak],
-            appStatus: defaultAppStatus,
             harSak: true,
             søker: søkerMockData as any,
             mellomlagring: {},

apps/dine-pleiepenger/src/pages/_app.page.tsx

@@ -67,7 +67,7 @@ function MyApp({ Component, pageProps }: AppProps): ReactElement {
         <ErrorBoundary>
             <AmplitudeProvider applicationKey={InnsynPsbApp.key}>
                 <main>
-                    {appStatus.message && (
+                    {appStatus?.message && (
                         <div className="max-w-[1128px] mx-auto p-5 mb-5">
                             <StatusMessage message={appStatus.message} />
                         </div>

apps/dine-pleiepenger/src/pages/api/appStatus.api.ts

@@ -2,72 +2,18 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { createChildLogger } from '@navikt/next-logger';
 import { withAuthenticatedApi } from '../../auth/withAuthentication';
 import { getXRequestId } from '../../utils/apiUtils';
-import { getAppSanityClient } from '@navikt/appstatus-react-ds/src/utils/sanityClient';
-import { SanityConfig } from '@navikt/appstatus-react-ds';
+import { SanityConfig, fetchStatus } from '@navikt/appstatus-react-ds';
 import { browserEnv } from '../../utils/env';
 import { APPLICATION_KEY } from '../_app.page';
-import { ApplicationStatus, Status } from '@navikt/appstatus-react-ds/src/types';
-import { SanityStatusMessage } from '@navikt/appstatus-react-ds/src/types/sanityObjects';
-import { getStateForApplication } from '@navikt/appstatus-react-ds/src/hooks/useAppStatus';
+import { ApplicationState } from '@navikt/appstatus-react-ds/src/hooks/useGetApplicationStatus';
 
 const sanityConfig: SanityConfig = {
     projectId: browserEnv.NEXT_PUBLIC_APPSTATUS_PROJECT_ID,
     dataset: browserEnv.NEXT_PUBLIC_APPSTATUS_DATASET,
 };
 
-const getApplicationDocumentStatusQuery = (key: string, team?: string): string => {
-    const teamQuery = team ? `team->.key == "${team}"` : '';
-    return `*[_type == 'application' && key == "${key}"${teamQuery}]{
-        key,
-        applicationStatus,
-        message,
-        liveUpdate,
-        name,
-        team->{key}
-      }`;
-};
-
-const getTeamStatusQuery = (key: string): string => {
-    return `*[_type == 'team' && key == "${key}"]{
-        key,
-        teamApplicationStatus,
-        liveUpdate,
-        message,
-      }`;
-};
-
-export interface ApplicationState {
-    status: ApplicationStatus;
-    message?: SanityStatusMessage;
-}
-
-export const defaultAppStatus: ApplicationState = { status: Status.normal };
-
 export const fetchAppStatus = async (): Promise<ApplicationState> => {
-    const client = getAppSanityClient(sanityConfig);
-    try {
-        const [appResult, teamResult] = await Promise.allSettled([
-            client.fetch(getApplicationDocumentStatusQuery(APPLICATION_KEY)),
-            client.fetch(getTeamStatusQuery(APPLICATION_KEY)),
-        ]);
-
-        const app = appResult.status === 'fulfilled' && appResult.value.length === 1 ? appResult.value[0] : undefined;
-        const team =
-            teamResult.status === 'fulfilled' && teamResult.value.length === 1 ? teamResult.value[0] : undefined;
-
-        if (!app) {
-            return defaultAppStatus;
-        }
-
-        return getStateForApplication(
-            app.applicationStatus.status,
-            app.message ? app.message[0] : undefined,
-            team?.teamApplicationStatus.status,
-            team?.message ? team.message[0] : undefined,
-        );
-    } catch {
-        return Promise.resolve(defaultAppStatus);
-    }
+    return await fetchStatus(APPLICATION_KEY, sanityConfig);
 };
 
 async function handler(req: NextApiRequest, res: NextApiResponse) {

apps/dine-pleiepenger/src/pages/api/innsynsdata.api.ts

@@ -14,7 +14,7 @@ import { Innsynsdata } from '../../types/InnsynData';
 import { getXRequestId } from '../../utils/apiUtils';
 import { Feature } from '../../utils/features';
 import { sortInnsendtSøknadEtterOpprettetDato } from '../../utils/innsendtSøknadUtils';
-import { defaultAppStatus, fetchAppStatus } from './appStatus.api';
+import { fetchAppStatus } from './appStatus.api';
 
 export const innsynsdataFetcher = async (url: string): Promise<Innsynsdata> =>
     axios.get(url, { transformResponse: storageParser }).then((res) => res.data);
@@ -49,7 +49,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
 
         const innsynsdata: Innsynsdata = {
             søker,
-            appStatus: appStatus.status === 'fulfilled' ? appStatus.value : defaultAppStatus,
+            appStatus: appStatus.status === 'fulfilled' ? appStatus.value : undefined,
             innsendteSøknader,
             mellomlagring: mellomlagringReq.status === 'fulfilled' ? mellomlagringReq.value : {},
             saksbehandlingstidUker:

apps/dine-pleiepenger/src/storybook/hooks/withInnsynsdata.tsx

@@ -1,16 +1,15 @@
-import { InnsynsdataContextProvider } from '../../context/InnsynsdataContextProvider';
+import dayjs from 'dayjs';
+import mockSøker from '../../../api-mock-server/mockdata/soker.json';
 import mockSøknader from '../../../api-mock-server/mockdata/soknader.json';
-import mockSøker from '../../../api-mock-server/mockdata/soknader.json';
+import { InnsynsdataContextProvider } from '../../context/InnsynsdataContextProvider';
 import { Søker } from '../../server/api-models/SøkerSchema';
 import { InnsendtSøknad } from '../../types/Søknad';
-import dayjs from 'dayjs';
-import { defaultAppStatus } from '../../pages/api/appStatus.api';
 
 export const withInnsynsdata = (Story) => (
     <InnsynsdataContextProvider
         innsynsdata={{
             saker: [{ saksbehandlingsFrist: dayjs().add(5, 'weeks').toDate() } as any],
-            appStatus: defaultAppStatus,
+
             harSak: true,
             søker: mockSøker as any as Søker,
             mellomlagring: {},

apps/dine-pleiepenger/src/types/InnsynData.ts

@@ -1,12 +1,12 @@
-import { ApplicationState } from '../pages/api/appStatus.api';
+import { ApplicationState } from '@navikt/appstatus-react-ds/src/hooks/useGetApplicationStatus';
 import { PleietrengendeMedSak } from '../server/api-models/PleietrengendeMedSakSchema';
 import { Søker } from '../server/api-models/SøkerSchema';
 import { Mellomlagringer } from './Mellomlagring';
 import { InnsendtSøknad } from './Søknad';
 
 export interface Innsynsdata {
     søker: Søker;
-    appStatus: ApplicationState;
+    appStatus?: ApplicationState;
     innsendteSøknader: InnsendtSøknad[];
     mellomlagring: Mellomlagringer;
     saker: PleietrengendeMedSak[];

packages/appstatus-react-ds/src/hooks/useAppStatus.ts

@@ -11,7 +11,7 @@ interface State {
     error?: SanityError;
 }
 
-const defaultState: State = {
+export const defaultAppStatus: State = {
     status: Status.normal,
     message: undefined,
 };
@@ -34,11 +34,11 @@ export const getStateForApplication = (
             message: appMessage || teamMessage,
         };
     }
-    return defaultState;
+    return defaultAppStatus;
 };
 
 function useAppStatus(applicationKey: string, sanityConfig: SanityConfig): State & { isLoading: boolean } {
-    const [state, setState] = useState<State>(defaultState);
+    const [state, setState] = useState<State>(defaultAppStatus);
     const [config] = useState<SanityConfig>(sanityConfig);
 
     const {

packages/appstatus-react-ds/src/hooks/useGetApplicationStatus.ts

@@ -5,7 +5,7 @@ import { getMessage, sanityConfigIsValid } from '../utils';
 import { getAppSanityClient } from '../utils/sanityClient';
 import { usePrevious } from '@navikt/sif-common-hooks';
 
-const getApplicationDocumentStatusQuery = (key: string, team?: string): string => {
+export const getApplicationDocumentStatusQuery = (key: string, team?: string): string => {
     const teamQuery = team ? `team->.key == "${team}"` : '';
     return `*[_type == 'application' && key == "${key}"${teamQuery}]{
         key,
@@ -31,7 +31,7 @@ export interface ApplicationSanityQueryResult {
     };
 }
 
-interface ApplicationState {
+export interface ApplicationState {
     status: ApplicationStatus;
     message?: SanityStatusMessage;
 }

packages/appstatus-react-ds/src/hooks/useGetTeamStatus.ts

@@ -5,7 +5,7 @@ import { SanityStatusMessage } from '../types/sanityObjects';
 import { getMessage, sanityConfigIsValid } from '../utils';
 import { getAppSanityClient } from '../utils/sanityClient';
 
-const getTeamStatusQuery = (key: string): string => {
+export const getTeamStatusQuery = (key: string): string => {
     return `*[_type == 'team' && key == "${key}"]{
         key,
         teamApplicationStatus,

packages/appstatus-react-ds/src/index.ts

@@ -1,3 +1,4 @@
-export { default as useAppStatus } from './hooks/useAppStatus';
+export { default as useAppStatus, defaultAppStatus } from './hooks/useAppStatus';
 export { default as StatusMessage } from './components/status-message/StatusMessage';
 export { Status, type SanityConfig } from './types/index';
+export { fetchStatus } from './utils/fetchStatus';

packages/appstatus-react-ds/src/utils/fetchStatus.ts

@@ -0,0 +1,32 @@
+import { SanityConfig } from '..';
+import { defaultAppStatus, getStateForApplication } from '../hooks/useAppStatus';
+import { ApplicationState, getApplicationDocumentStatusQuery } from '../hooks/useGetApplicationStatus';
+import { getTeamStatusQuery } from '../hooks/useGetTeamStatus';
+import { getAppSanityClient } from './sanityClient';
+
+export const fetchStatus = async (applicationKey: string, sanityConfig: SanityConfig): Promise<ApplicationState> => {
+    const client = getAppSanityClient(sanityConfig);
+    try {
+        const [appResult, teamResult] = await Promise.allSettled([
+            client.fetch(getApplicationDocumentStatusQuery(applicationKey)),
+            client.fetch(getTeamStatusQuery(applicationKey)),
+        ]);
+
+        const app = appResult.status === 'fulfilled' && appResult.value.length === 1 ? appResult.value[0] : undefined;
+        const team =
+            teamResult.status === 'fulfilled' && teamResult.value.length === 1 ? teamResult.value[0] : undefined;
+
+        if (!app) {
+            return defaultAppStatus;
+        }
+
+        return getStateForApplication(
+            app.applicationStatus.status,
+            app.message ? app.message[0] : undefined,
+            team?.teamApplicationStatus.status,
+            team?.message ? team.message[0] : undefined,
+        );
+    } catch {
+        return Promise.resolve(defaultAppStatus);
+    }
+};