From b17cc23d89d030a0135630f202538f22db140a17 Mon Sep 17 00:00:00 2001 From: Oliver Dudgeon <22367286+OliverDudgeon@users.noreply.github.com> Date: Sun, 5 Jan 2025 19:28:42 +0000 Subject: [PATCH] fix: fix issues with the ui test job --- .../instances/JobDetails/JobInputSection/useGetJobInputs.ts | 3 ++- src/components/runCards/JobCard/JobModal.tsx | 6 ++++-- src/pages/run.tsx | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/components/instances/JobDetails/JobInputSection/useGetJobInputs.ts b/src/components/instances/JobDetails/JobInputSection/useGetJobInputs.ts index 7bfc8e460..aea58e2b7 100644 --- a/src/components/instances/JobDetails/JobInputSection/useGetJobInputs.ts +++ b/src/components/instances/JobDetails/JobInputSection/useGetJobInputs.ts @@ -2,6 +2,7 @@ import { type InstanceGetResponse, type InstanceSummary } from "@squonk/data-man import { useGetJob } from "@squonk/data-manager-client/job"; import { type InputFieldSchema } from "../../../runCards/JobCard/JobInputFields"; +import { TEST_JOB_ID } from "../../../runCards/TestJob/jobId"; // Contains only fields we are interested in type ApplicationSpecification = { @@ -31,7 +32,7 @@ export const useGetJobInputs = (instance: InstanceGetResponse | InstanceSummary) instance.job_id ?? -1, undefined, { - query: { enabled: inputsEnabled }, + query: { enabled: inputsEnabled, retry: instance.job_id === TEST_JOB_ID ? 1 : 3 }, }, ); diff --git a/src/components/runCards/JobCard/JobModal.tsx b/src/components/runCards/JobCard/JobModal.tsx index 511d61795..0ddc6e044 100644 --- a/src/components/runCards/JobCard/JobModal.tsx +++ b/src/components/runCards/JobCard/JobModal.tsx @@ -19,6 +19,7 @@ import { useEnqueueError } from "../../../hooks/useEnqueueStackError"; import { CenterLoader } from "../../CenterLoader"; import { ModalWrapper } from "../../modals/ModalWrapper"; import { DebugCheckbox, type DebugValue } from "../DebugCheckbox"; +import { TEST_JOB_ID } from "../TestJob/jobId"; import { type CommonModalProps } from "../types"; import { type InputSchema, type JobInputFieldsProps, validateInputData } from "./JobInputFields"; @@ -85,8 +86,9 @@ export const JobModal = ({ const { mutateAsync: createInstance } = useCreateInstance(); // Get extra details about the job - const { data: job } = useGetJob(jobId); - + const { data: job } = useGetJob(jobId, undefined, { + query: { retry: jobId === TEST_JOB_ID ? 1 : 3 }, + }); const name = nameState || (job?.job ?? ""); const spec = instance?.application_specification; diff --git a/src/pages/run.tsx b/src/pages/run.tsx index f66e2ec8a..1bf1a58de 100644 --- a/src/pages/run.tsx +++ b/src/pages/run.tsx @@ -82,6 +82,8 @@ const Run = () => { )) ?? []; + process.env.NODE_ENV === "development" && jobCards.push(); + const showApplications = executionTypes.includes("application"); const showJobs = executionTypes.includes("job"); @@ -100,8 +102,6 @@ const Run = () => { hasPermissionToRun, ]); - process.env.NODE_ENV === "development" && cards.push(); - return ( <>