From 5dce2ecc560ca2121b1cd9e38f56cb11d3129d24 Mon Sep 17 00:00:00 2001 From: remyvdwereld <86827854+remyvdwereld@users.noreply.github.com> Date: Wed, 12 Jul 2023 13:56:53 +0200 Subject: [PATCH 1/2] 86833 --- .../components/case/forms/SummonForm/SummonForm.tsx | 9 +++------ src/app/state/rest/tasks.ts | 12 ++++++++++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/app/components/case/forms/SummonForm/SummonForm.tsx b/src/app/components/case/forms/SummonForm/SummonForm.tsx index 8b27065d5..99401f67a 100644 --- a/src/app/components/case/forms/SummonForm/SummonForm.tsx +++ b/src/app/components/case/forms/SummonForm/SummonForm.tsx @@ -1,7 +1,7 @@ import { FormTitle } from "@amsterdam/asc-ui" -import { useCase, useSummons, useSummonTypes } from "app/state/rest/" +import { useSummons, useSummonTypesByTaskId } from "app/state/rest/" import WorkflowForm from "app/components/case/WorkflowForm/WorkflowForm" import scaffold from "app/components/case/forms/SummonForm/scaffold" import useScaffoldedFields from "app/components/shared/ConfirmScaffoldForm/hooks/useScaffoldedFields" @@ -52,12 +52,9 @@ const mapData = (data: SummonData) => { } const SummonForm: React.FC = ({ id, caseUserTaskId }) => { - - const themeId = useCase(id)[0]?.theme.id - const [data] = useSummonTypes(themeId) + const [data] = useSummonTypesByTaskId(caseUserTaskId) const summonTypes = data?.results - const summonTypesWithoutBoete = summonTypes?.filter((summonType) => summonType.workflow_option !== "besluit") - const fields = useScaffoldedFields(scaffold, id, summonTypesWithoutBoete) + const fields = useScaffoldedFields(scaffold, id, summonTypes) const [, { execPost }] = useSummons({ lazy: true }) return ( diff --git a/src/app/state/rest/tasks.ts b/src/app/state/rest/tasks.ts index 8a2048960..d6be8b929 100644 --- a/src/app/state/rest/tasks.ts +++ b/src/app/state/rest/tasks.ts @@ -169,3 +169,15 @@ export const useTaskNames = (role: string) => { isProtected: true }) } + +// useSummonTypes for getting the available summonTypes for a specific task +export const useSummonTypesByTaskId = (id: number | string, options?: Options) => { + const handleError = useErrorHandler() + return useApiRequest({ + ...options, + url: makeApiUrl("tasks", id, "summon-types"), + groupName: "task", + handleError, + isProtected: true + }) +} From 872ab6ea9ee01f9b70c05dc7efdd7f4252f3743b Mon Sep 17 00:00:00 2001 From: remyvdwereld <86827854+remyvdwereld@users.noreply.github.com> Date: Thu, 13 Jul 2023 15:39:03 +0200 Subject: [PATCH 2/2] Id declaration and docker critical update --- Dockerfile | 2 ++ src/app/state/rest/tasks.ts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e11355e3a..988ff1bc0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,5 +28,7 @@ RUN mv $DIR/build/* $DIR/builds/acceptance/ FROM nginx:stable-alpine ADD nginx.conf /etc/nginx/nginx.conf +RUN apk update && apk upgrade libx11 + COPY --from=builder /var/www/builds /var/www CMD nginx -g 'daemon off;' diff --git a/src/app/state/rest/tasks.ts b/src/app/state/rest/tasks.ts index d6be8b929..4837d5344 100644 --- a/src/app/state/rest/tasks.ts +++ b/src/app/state/rest/tasks.ts @@ -171,7 +171,7 @@ export const useTaskNames = (role: string) => { } // useSummonTypes for getting the available summonTypes for a specific task -export const useSummonTypesByTaskId = (id: number | string, options?: Options) => { +export const useSummonTypesByTaskId = (id: Components.Schemas.CaseUserTaskWorkdflow["case_user_task_id"], options?: Options) => { const handleError = useErrorHandler() return useApiRequest({ ...options,