Skip to content

Make signee list form work in Summary2 in different task. #3871

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

Open
bjorntore wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make signee list form work in Summary2 in different task. #3871

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
10 changes: 8 additions & 2 deletions src/layout/SigneeList/SigneeListSummary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { nb } from 'date-fns/locale/nb';
import { FatalError } from 'src/app-components/error/FatalError/FatalError';
import { Label } from 'src/app-components/Label/Label';
import { LoadingWrapper } from 'src/app-components/loading/LoadingWrapper/LoadingWrapper';
import { useTaskOverrides } from 'src/core/contexts/TaskOverrides';
import { Lang } from 'src/features/language/Lang';
import { type SigneeState, useSigneeList } from 'src/layout/SigneeList/api';
import classes from 'src/layout/SigneeList/SigneeListSummary.module.css';
Expand All @@ -22,8 +23,13 @@ interface SigneeListSummaryProps extends Summary2Props {
}

export function SigneeListSummary({ targetBaseComponentId, titleOverride }: SigneeListSummaryProps) {
const { instanceOwnerPartyId, instanceGuid, taskId } = useParams();
const { data, isLoading, error } = useSigneeList(instanceOwnerPartyId, instanceGuid, taskId);
const { instanceOwnerPartyId, instanceGuid, taskId: taskIdFromQuery } = useParams();
const { taskId: taskIdFromTaskOverrides } = useTaskOverrides();
const { data, isLoading, error } = useSigneeList(
instanceOwnerPartyId,
instanceGuid,
taskIdFromTaskOverrides ?? taskIdFromQuery,
);

const originalTitle = useItemWhenType(targetBaseComponentId, 'SigneeList').textResourceBindings?.title;
const title = titleOverride === undefined ? originalTitle : titleOverride;
Expand Down
10 changes: 7 additions & 3 deletions src/layout/SigneeList/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,18 @@ export const signingQueries = {
signeeList: (partyId: string | undefined, instanceGuid: string | undefined, taskId: string | undefined) =>
queryOptions({
queryKey: [...signingQueries.all, 'signeeList', partyId, instanceGuid, taskId],
queryFn: partyId && instanceGuid && taskId ? () => fetchSigneeList(partyId, instanceGuid) : skipToken,
queryFn: partyId && instanceGuid && taskId ? () => fetchSigneeList(partyId, instanceGuid, taskId) : skipToken,
refetchInterval: 1000 * 60, // 1 minute
refetchOnMount: 'always',
}),
};

export async function fetchSigneeList(partyId: string, instanceGuid: string): Promise<SigneeState[]> {
const url = `${appPath}/instances/${partyId}/${instanceGuid}/signing`;
export async function fetchSigneeList(partyId: string, instanceGuid: string, taskId?: string): Promise<SigneeState[]> {
let url = `${appPath}/instances/${partyId}/${instanceGuid}/signing`;

if (taskId) {
url = url.concat(`?taskId=${taskId}`);
}

const response = await httpGet(url);
const parsed = z.object({ signeeStates: z.array(signeeStateSchema) }).parse(response);
Expand Down