Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Oppgavehåndtering for fortsett dialog #2578

Merged
merged 1 commit into from
Mar 3, 2025
Merged

Oppgavehåndtering for fortsett dialog #2578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 46 additions & 22 deletions src/components/melding/FortsettDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
import { Alert, BodyShort, Box, Button, Checkbox, HStack, Textarea, VStack } from '@navikt/ds-react';
import { Alert, BodyShort, Box, Button, Checkbox, HStack, Loader, Textarea, VStack } from '@navikt/ds-react';
import { type ValidationError, useForm } from '@tanstack/react-form';
import { useAtomValue } from 'jotai';
import { useAtom, useAtomValue } from 'jotai';
import { useCallback, useMemo, useState } from 'react';
import DraftStatus from 'src/app/personside/dialogpanel/DraftStatus';
import type { Draft, DraftContext } from 'src/app/personside/dialogpanel/use-draft';
import useDraft from 'src/app/personside/dialogpanel/use-draft';
import { Link } from 'src/components/Link';
import { useSendMelding } from 'src/lib/clients/modiapersonoversikt-api';
import { useOppgaveForTraad, useSendMelding } from 'src/lib/clients/modiapersonoversikt-api';
import { useEnhetsnavn } from 'src/lib/hooks/useEnhetsnavn';
import { useSuspendingBrukernavn } from 'src/lib/hooks/useSuspendingBrukernavn';
import { aktivEnhetAtom, usePersonAtomValue } from 'src/lib/state/context';
import { dialogUnderArbeidAtom } from 'src/lib/state/dialog';
import {
type SendMeldingRequestV2,
SendMeldingRequestV2TraadType,
Expand All @@ -21,10 +22,11 @@ import { formatterDatoTid } from 'src/utils/date-utils';
import type { z } from 'zod';
import { erJournalfort } from '../Meldinger/List/utils';
import { Oppgaveliste, OppgavelisteRadioKnapper } from './OppgavelisteRadioKnapper';
import { MeldingsType, meldingsTyperTekst, traadTypeToMeldingsType } from './VelgMeldingsType';
import { meldingsTyperTekst, traadTypeToMeldingsType } from './VelgMeldingsType';
import VelgOppgaveliste from './VelgOppgaveliste';
import VelgSak from './VelgSak';
import { fortsettDialogSchema, maksLengdeMelding } from './nyMeldingSchema';
import { useTraadHenvendelse } from './useHenvendelse';

type FortsettDialogForm = z.infer<typeof fortsettDialogSchema>;

Expand All @@ -34,8 +36,10 @@ type Props = {
export const FortsettDialog = ({ traad }: Props) => {
const fnr = usePersonAtomValue();
const enhetsId = useAtomValue(aktivEnhetAtom);
const [, setDialogUnderArbeid] = useAtom(dialogUnderArbeidAtom);
const enhetsNavn = useEnhetsnavn(enhetsId);
const brukerNavn = useSuspendingBrukernavn();
const { oppgave } = useOppgaveForTraad(traad.traadId);

const { error, mutate, isPending, isSuccess } = useSendMelding();

Expand All @@ -49,24 +53,34 @@ export const FortsettDialog = ({ traad }: Props) => {
const defaultFormOptions = {
traadId: traad.traadId,
melding: defaultMessage,
traadType: traadTypeToMeldingsType(traad.traadType),
fnr: fnr,
enhetsId: enhetsId ?? ''
enhetsId: enhetsId ?? '',
oppgaveliste: Oppgaveliste.MinListe
} as FortsettDialogForm;

const { data: henvendelse, isPending: henvendelsePending } = useTraadHenvendelse(traad);
const oppgaveId = oppgave?.oppgaveId ?? henvendelse?.oppgaveId;

const form = useForm({
defaultValues: defaultFormOptions,
validators: {
onSubmit: fortsettDialogSchema
},
onSubmit: ({ value }) => {
console.log(value);
const body = generateRequestBody(value as FortsettDialogForm);
const body = generateRequestBody(value as FortsettDialogForm, traad, oppgaveId, henvendelse?.behandlingsId);
mutate(
{ body: body },
{
onSuccess: () => {
removeDraft();
form.reset(
{
...defaultFormOptions,
melding: ''
},
{ keepDefaultValues: true }
);
setDialogUnderArbeid(undefined);
}
}
);
Expand All @@ -79,6 +93,10 @@ export const FortsettDialog = ({ traad }: Props) => {
const erOksosTraad = traad.meldinger.some((it) => it.temagruppe === 'OKSOS');
const visVelgSak = !erJournalfort(traad) && !erOksosTraad;

if (henvendelsePending) {
return <Loader size="medium" />;
}

return (
<form
onSubmit={async (e) => {
Expand Down Expand Up @@ -192,7 +210,7 @@ export const FortsettDialog = ({ traad }: Props) => {
)}
<HStack gap="2" justify="center">
<Button type="submit" loading={isPending}>
Send til {brukerNavn}
Send til {brukerNavn} {oppgaveId ? 'og avslutt oppgave' : ''}
</Button>
</HStack>
{isSuccess && <Alert variant="success">Meldingen ble sendt</Alert>}
Expand All @@ -202,30 +220,36 @@ export const FortsettDialog = ({ traad }: Props) => {
);
};

function generateRequestBody(value: z.infer<typeof fortsettDialogSchema>) {
function generateRequestBody(
value: z.infer<typeof fortsettDialogSchema>,
traad: Traad,
oppgaveId?: string,
behandlingsId?: string
) {
const common: SendMeldingRequestV2 = {
enhet: value.enhetsId,
fritekst: value.melding,
fnr: value.fnr,
traadType:
value.traadType === MeldingsType.Samtale
? SendMeldingRequestV2TraadType.SAMTALEREFERAT
: SendMeldingRequestV2TraadType.MELDINGSKJEDE,
sak: value.sak
traadType: SendMeldingRequestV2TraadType[traad.traadType],
traadId: traad.traadId,
temagruppe: traad.temagruppe,
behandlingsId,
oppgaveId
};

switch (value.traadType) {
case MeldingsType.Samtale:
switch (common.traadType) {
case SendMeldingRequestV2TraadType.SAMTALEREFERAT:
return {
...common,
traadType: SendMeldingRequestV2TraadType.MELDINGSKJEDE,
erOppgaveTilknyttetAnsatt: value.oppgaveliste === Oppgaveliste.MinListe
erOppgaveTilknyttetAnsatt: true,
avsluttet: value.avsluttet
};
case MeldingsType.Referat:
default:
return {
...common,
traadType: SendMeldingRequestV2TraadType.MELDINGSKJEDE,
avsluttet: true
erOppgaveTilknyttetAnsatt: value.avsluttet ? false : value.oppgaveliste === Oppgaveliste.MinListe,
avsluttet: true,
sak: value.sak
};
}
}
Expand Down
5 changes: 0 additions & 5 deletions src/components/melding/nyMeldingSchema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ export default nyMeldingSchema;

export const fortsettDialogSchema = z
.object({
traadId: z.string(),
traadType: z.enum([MeldingsType.Referat, MeldingsType.Samtale]),
temagruppe: z.string().optional(),
behandlingsId: z.string().optional(),
oppgaveId: z.string().optional(),
avsluttet: z.boolean().optional(),
oppgaveliste: z.nativeEnum(Oppgaveliste).optional(),
sak: sakSchema.optional()
Expand Down
36 changes: 36 additions & 0 deletions src/components/melding/useHenvendelse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import { useAtomValue } from 'jotai';
import { useCallback, useEffect } from 'react';
import { $api, usePersonOppgaver } from 'src/lib/clients/modiapersonoversikt-api';
import { aktivEnhetAtom, usePersonAtomValue } from 'src/lib/state/context';
import type { Traad } from 'src/lib/types/modiapersonoversikt-api';

export const useTraadHenvendelse = (traad: Traad) => {
const enhet = useAtomValue(aktivEnhetAtom);
const fnr = usePersonAtomValue();
const { refetch } = usePersonOppgaver();

const { mutate, data, isSuccess, isPending } = $api.useMutation('post', '/rest/v2/dialog/fortsett/opprett');
const getOppgave = useCallback(async () => {
mutate(
{ body: { fnr, enhet, traadId: traad.traadId } },
{
onError: (e) => {
console.log(e);
},
onSuccess: () => {
refetch();
}
}
);
}, [traad.traadId, fnr, enhet, mutate, refetch]);

useEffect(() => {
getOppgave();
}, [getOppgave]);

return {
isSuccess,
isPending,
data
};
};
31 changes: 30 additions & 1 deletion src/lib/clients/modiapersonoversikt-api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { useQueryClient } from '@tanstack/react-query';
import { useAtomValue } from 'jotai';
import createFetchClient from 'openapi-fetch';
import createClient from 'openapi-react-query';
Expand Down Expand Up @@ -60,7 +61,20 @@ export const useBaseUrls = () => {
};

export const useSendMelding = () => {
return $api.useMutation('post', '/rest/v2/dialog/sendmelding');
const queryClient = useQueryClient();
const fnr = usePersonAtomValue();
const enhet = useAtomValue(aktivEnhetAtom) as string;

return $api.useMutation('post', '/rest/v2/dialog/sendmelding', {
onSuccess: () => {
queryClient.invalidateQueries({
queryKey: $api.queryOptions('post', '/rest/v2/dialog/meldinger', {
body: { fnr },
params: { query: { enhet } }
}).queryKey
});
}
});
};

export const useEnheter = () => {
Expand All @@ -84,6 +98,21 @@ export const usePersonOppgaver = () => {
});
};

export const useOppgaveForTraad = (traadId: string) => {
const aktivBruker = usePersonAtomValue();

const { data: oppgaver } = $api.useSuspenseQuery('post', '/rest/v2/oppgaver/tildelt', {
body: {
fnr: aktivBruker
}
});

const oppgave = oppgaver.find((oppgave) => oppgave.traadId === traadId);
const erSTOOppgave = !!oppgave?.erSTOOppgave;

return { oppgave, erSTOOppgave };
};

export const useMeldinger = () => {
const fnr = usePersonAtomValue();
const enhet = useAtomValue(aktivEnhetAtom) as string;
Expand Down
Loading