add a specific isRerun prop to make these changes specific to reruns

This separates the implementation of setting the `requestState` for workflow landings and workflow reruns. Also adds indication on the workflow execute button on whether a rerun will be done or not.

Author: ahmedhamidawan

client/src/components/Form/Elements/FormInputMismatchBadge.vue

@@ -13,7 +13,7 @@ const emit = defineEmits(["stop-flagging"]);
         <span
             v-localize
             v-b-tooltip.hover.noninteractive
-            title="The value of this input does not match the original/expected request">
+            title="This input has a different value than in the original run">
             Changed Input
         </span>
         <GButton
@@ -22,7 +22,7 @@ const emit = defineEmits(["stop-flagging"]);
             size="small"
             icon-only
             pill
-            title="Stop flagging inputs that do not match the request"
+            title="Stop flagging inputs that do not match the original run"
             tooltip
             @click="emit('stop-flagging')">
             <FontAwesomeIcon :icon="faTimes" fixed-width />

client/src/components/Workflow/Run/WorkflowRerun.vue

@@ -42,7 +42,7 @@ watch(
         :workflow-id="requestData.workflow_id"
         :instance="requestData.instance"
         :request-state="requestData.inputs"
-        :append-step-labels-for-request="false"
         prefer-simple-form
+        is-rerun
         :simple-form-use-job-cache="requestData.use_cached_job" />
 </template>

client/src/components/Workflow/Run/WorkflowRun.vue

@@ -35,7 +35,7 @@ interface Props {
     simpleFormUseJobCache?: boolean;
     requestState?: WorkflowInvocationRequestInputs;
     instance?: boolean;
-    appendStepLabelsForRequest?: boolean;
+    isRerun?: boolean;
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -45,7 +45,7 @@ const props = withDefaults(defineProps<Props>(), {
     simpleFormUseJobCache: false,
     requestState: undefined,
     instance: false,
-    appendStepLabelsForRequest: true,
+    isRerun: false,
 });
 
 const loading = ref(true);
@@ -251,7 +251,7 @@ defineExpose({
                         :use-job-cache="simpleFormUseJobCache"
                         :can-mutate-current-history="canRunOnHistory"
                         :request-state="requestState"
-                        :append-step-labels-for-request="appendStepLabelsForRequest"
+                        :is-rerun="props.isRerun"
                         @submissionSuccess="handleInvocations"
                         @submissionError="handleSubmissionError"
                         @showAdvanced="showAdvanced" />

client/src/components/Workflow/Run/WorkflowRunFormSimple.vue

@@ -38,14 +38,14 @@ interface Props {
     useJobCache?: boolean;
     canMutateCurrentHistory: boolean;
     requestState?: WorkflowInvocationRequestInputs;
-    appendStepLabelsForRequest?: boolean;
+    isRerun?: boolean;
 }
 
 const props = withDefaults(defineProps<Props>(), {
     targetHistory: "current",
     useJobCache: false,
     requestState: undefined,
-    appendStepLabelsForRequest: true,
+    isRerun: false,
 });
 
 const emit = defineEmits<{
@@ -128,8 +128,7 @@ const formInputs = computed(() => {
 
             // For the `WorkflowInvocationRequestModel`, (used in `WorkflowRerun`) if there is no step_label, it does not have
             // `step.step_index + 1` as a label, and has `step.step_index` instead.
-            const requestStateIndex =
-                !props.appendStepLabelsForRequest && !step.step_label ? new String(step.step_index) : stepLabel;
+            const rerunStateIndex = !step.step_label ? new String(step.step_index) : stepLabel;
 
             const stepType = step.step_type;
             const help = step.annotation;
@@ -139,18 +138,25 @@ const formInputs = computed(() => {
                 help: help,
                 label: stepLabel,
             });
-            if (props.requestState && props.requestState[requestStateIndex]) {
-                const value = props.requestState[requestStateIndex];
-                // TODO: Will this break workflow landings? Done for `WorkflowRereun` since
-                //       `WorkflowInvocationRequestModel` does not provide an object with `values` property.
-                if (stepType === "data_input" || stepType === "data_collection_input") {
-                    stepAsInput.value = {
-                        values: !Array.isArray(value) ? [value] : value,
-                    };
-                } else {
+
+            if (props.requestState) {
+                if (props.isRerun && props.requestState[rerunStateIndex]) {
+                    const value = props.requestState[rerunStateIndex];
+                    if (stepType === "data_input" || stepType === "data_collection_input") {
+                        // Note: This is different from workflow landings because `WorkflowInvocationRequestModel`
+                        //       does not provide an object with `values` property.
+                        stepAsInput.value = {
+                            values: !Array.isArray(value) ? [value] : value,
+                        };
+                    } else {
+                        stepAsInput.value = value;
+                    }
+                } else if (props.requestState[stepLabel]) {
+                    const value = props.requestState[stepLabel];
                     stepAsInput.value = value;
                 }
             }
+
             // disable collection mapping...
             stepAsInput.flavor = "module";
             inputs.push(stepAsInput);
@@ -161,15 +167,15 @@ const formInputs = computed(() => {
 });
 
 /**
- * Returns the list of steps that do not match the `props.requestState`.
+ * Returns the list of steps that do not match the workflow rerun `props.requestState`.
  *
  * TODO: Until form elements are typed better, this is a little shady.
  * We do not compare values for the types in the last `else if` statement.
  * And for the `select` type, we assume that the values are arrays of strings or numbers.
  * @returns {string[]} The list of steps indices that do not match the request state.
  */
 const stepsNotMatchingRequest = computed<string[]>(() => {
-    if (!checkInputMatching.value || !props.requestState) {
+    if (!props.isRerun || !checkInputMatching.value || !props.requestState) {
         return [];
     }
 
@@ -226,6 +232,10 @@ const stepsNotMatchingRequest = computed<string[]>(() => {
     return notMatching;
 });
 
+const isValidRerun = computed(
+    () => Boolean(props.isRerun) && checkInputMatching.value && stepsNotMatchingRequest.value.length === 0
+);
+
 const hasValidationErrors = computed(() => stepValidation.value !== null);
 
 const canRunOnHistory = computed(() => props.canMutateCurrentHistory || sendToNewHistory.value);
@@ -317,6 +327,7 @@ async function onExecute() {
                     :workflow-id="model.runData.workflow_id"
                     :run-disabled="hasValidationErrors || !canRunOnHistory"
                     :run-waiting="waitingForRequest"
+                    :valid-rerun="isValidRerun"
                     @on-execute="onExecute">
                     <template v-slot:workflow-title-actions>
                         <GButtonGroup>

client/src/components/Workflow/WorkflowNavigationTitle.vue

@@ -27,6 +27,7 @@ interface Props {
     runDisabled?: boolean;
     runWaiting?: boolean;
     success?: boolean;
+    validRerun?: boolean;
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -74,6 +75,16 @@ const workflowImportTitle = computed(() => {
         return localize("Import this workflow");
     }
 });
+
+const executeButtonTooltip = computed(() => {
+    if (props.runDisabled) {
+        return localize("Fix the errors in the workflow before running it");
+    } else if (props.validRerun) {
+        return localize("Rerun this workflow with the original inputs");
+    } else {
+        return localize("Execute this workflow");
+    }
+});
 </script>
 
 <template>
@@ -136,7 +147,8 @@ const workflowImportTitle = computed(() => {
                         :wait="runWaiting"
                         :disabled="runDisabled"
                         size="small"
-                        title="Run Workflow"
+                        :tooltip="executeButtonTooltip"
+                        :title="!props.validRerun ? 'Run Workflow' : 'Rerun Workflow'"
                         @onClick="emit('on-execute')" />
                     <GButton
                         v-else