fix(run-job): navigate to new instance when re-run job button is used

Fixes #1255

Author: OliverDudgeon

components/results/RerunJobButton.tsx

@@ -3,6 +3,7 @@ import { useState } from "react";
 import type { InstanceGetResponse, InstanceSummary } from "@squonk/data-manager-client";
 
 import { Button } from "@mui/material";
+import { useRouter } from "next/router";
 
 import { JobModal } from "../runCards/JobCard/JobModal";
 
@@ -23,6 +24,8 @@ export interface RerunJobButtonProps {
 export const RerunJobButton = ({ instance, disabled = false }: RerunJobButtonProps) => {
   const [open, setOpen] = useState(false);
 
+  const { push } = useRouter();
+
   // If the job id is undefined, it's probably an application which we don't currently let be rerun.
   return instance.job_id !== undefined ? (
     <>
@@ -36,6 +39,9 @@ export const RerunJobButton = ({ instance, disabled = false }: RerunJobButtonPro
           open={open}
           projectId={instance.project_id}
           onClose={() => setOpen(false)}
+          onLaunch={(instanceId) =>
+            push({ pathname: "/results/instance/[instanceId]", query: { instanceId } })
+          }
         />
       )}
     </>

components/runCards/ApplicationCard/ApplicationModal.tsx

@@ -50,7 +50,7 @@ export const ApplicationModal = ({
   const handleCreateInstance = async () => {
     if (projectId) {
       try {
-        await createInstance({
+        const { instance_id: instanceId } = await createInstance({
           data: {
             debug,
             application_id: applicationId,
@@ -62,11 +62,11 @@ export const ApplicationModal = ({
             }),
           },
         });
+        onLaunch && onLaunch(instanceId);
         await queryClient.invalidateQueries({ queryKey: getGetInstancesQueryKey() });
       } catch (error) {
         enqueueError(error);
       } finally {
-        onLaunch && onLaunch();
         onClose();
       }
     } else {

components/runCards/JobCard/JobModal.tsx

@@ -53,11 +53,12 @@ const validateJobInputs = (required: string[], inputsData: InputData) => {
   const inputsDataIsValid = Object.values(inputsData)
     .map((inputValue) => {
       if (inputValue === undefined) {
-        return false;
+        return false; // when does this happen?
       }
       if (Array.isArray(inputValue)) {
         return inputValue.every((v) => v !== "");
       }
+
       return inputValue.split("\n").every((v) => v !== "");
     })
     .every((v) => v);
@@ -118,9 +119,14 @@ export const JobModal = ({
 
   const [inputsData, setInputsData] = useState<InputData>({});
 
+  const inputKeys = Object.keys(job?.variables?.inputs?.properties ?? {});
+  const specInputs = Object.fromEntries(
+    Object.entries(specVariables ?? {}).filter(([key, _]) => inputKeys.includes(key)),
+  );
+
   const inputsValid = validateJobInputs(
     (job?.variables?.inputs as InputSchema | undefined)?.required ?? [],
-    Object.keys(inputsData).length > 0 ? inputsData : specVariables ?? {},
+    Object.keys(inputsData).length > 0 ? inputsData : specInputs,
   );
 
   const formRef = useRef<any>();
@@ -140,7 +146,7 @@ export const JobModal = ({
         variables: { ...optionsFormData, ...inputsData },
       };
       try {
-        await createInstance({
+        const { instance_id: instanceId } = await createInstance({
           data: {
             debug,
             application_id: job.application.application_id,
@@ -150,13 +156,13 @@ export const JobModal = ({
             specification: JSON.stringify(specification),
           },
         });
+        onLaunch && onLaunch(instanceId);
         await queryClient.invalidateQueries({
           queryKey: getGetInstancesQueryKey({ project_id: projectId }),
         });
       } catch (error) {
         enqueueError(error);
       } finally {
-        onLaunch && onLaunch();
         onClose();
       }
     } else {

components/runCards/types.ts

@@ -16,5 +16,5 @@ export interface CommonModalProps {
   /**
    * Called after an instance is created. Optional, skipped if not provided.
    */
-  onLaunch?: () => void;
+  onLaunch?: (instanceId: string) => void;
 }