diff --git a/skyvern-frontend/src/routes/workflows/RunWorkflowForm.tsx b/skyvern-frontend/src/routes/workflows/RunWorkflowForm.tsx index 53b84be9..b7974a7b 100644 --- a/skyvern-frontend/src/routes/workflows/RunWorkflowForm.tsx +++ b/skyvern-frontend/src/routes/workflows/RunWorkflowForm.tsx @@ -25,7 +25,7 @@ import { z } from "zod"; import { WorkflowParameter } from "./types/workflowTypes"; import { WorkflowParameterInput } from "./WorkflowParameterInput"; import { AxiosError } from "axios"; - +import { getLabelForWorkflowParameterType } from "./editor/workflowEditorUtils"; type Props = { workflowParameters: Array; initialValues: Record; @@ -206,7 +206,9 @@ function RunWorkflowForm({
{parameter.key} - {parameter.workflow_parameter_type} + {getLabelForWorkflowParameterType( + parameter.workflow_parameter_type, + )}

diff --git a/skyvern-frontend/src/routes/workflows/editor/FlowRenderer.tsx b/skyvern-frontend/src/routes/workflows/editor/FlowRenderer.tsx index f4947d0e..50906a41 100644 --- a/skyvern-frontend/src/routes/workflows/editor/FlowRenderer.tsx +++ b/skyvern-frontend/src/routes/workflows/editor/FlowRenderer.tsx @@ -38,6 +38,7 @@ import { WorkflowApiResponse, WorkflowEditorParameterTypes, WorkflowParameterTypes, + WorkflowParameterValueType, WorkflowSettings, } from "../types/workflowTypes"; import { @@ -163,10 +164,11 @@ function convertToParametersYAML( }; } else { return { - parameter_type: WorkflowParameterTypes.Credential, + parameter_type: WorkflowParameterTypes.Workflow, + workflow_parameter_type: WorkflowParameterValueType.CredentialId, + default_value: parameter.credentialId, key: parameter.key, description: parameter.description || null, - credential_id: parameter.credentialId, }; } } diff --git a/skyvern-frontend/src/routes/workflows/editor/WorkflowEditor.tsx b/skyvern-frontend/src/routes/workflows/editor/WorkflowEditor.tsx index 183fb49f..70728ea8 100644 --- a/skyvern-frontend/src/routes/workflows/editor/WorkflowEditor.tsx +++ b/skyvern-frontend/src/routes/workflows/editor/WorkflowEditor.tsx @@ -11,6 +11,7 @@ import { isDisplayedInWorkflowEditor, WorkflowEditorParameterTypes, WorkflowParameterTypes, + WorkflowParameterValueType, WorkflowSettings, } from "../types/workflowTypes"; import { useGlobalWorkflowsQuery } from "../hooks/useGlobalWorkflowsQuery"; @@ -78,6 +79,17 @@ function WorkflowEditor() { if ( parameter.parameter_type === WorkflowParameterTypes.Workflow ) { + if ( + parameter.workflow_parameter_type === + WorkflowParameterValueType.CredentialId + ) { + return { + key: parameter.key, + parameterType: WorkflowEditorParameterTypes.Credential, + credentialId: parameter.default_value as string, + description: parameter.description, + }; + } return { key: parameter.key, parameterType: WorkflowEditorParameterTypes.Workflow, diff --git a/skyvern-frontend/src/routes/workflows/editor/panels/WorkflowParameterAddPanel.tsx b/skyvern-frontend/src/routes/workflows/editor/panels/WorkflowParameterAddPanel.tsx index ff889f5a..623a8351 100644 --- a/skyvern-frontend/src/routes/workflows/editor/panels/WorkflowParameterAddPanel.tsx +++ b/skyvern-frontend/src/routes/workflows/editor/panels/WorkflowParameterAddPanel.tsx @@ -39,7 +39,6 @@ const workflowParameterTypeOptions = [ { label: "integer", value: WorkflowParameterValueType.Integer }, { label: "boolean", value: WorkflowParameterValueType.Boolean }, { label: "file", value: WorkflowParameterValueType.FileURL }, - { label: "credential", value: WorkflowParameterValueType.CredentialId }, { label: "JSON", value: WorkflowParameterValueType.JSON }, ]; diff --git a/skyvern-frontend/src/routes/workflows/editor/panels/WorkflowParametersPanel.tsx b/skyvern-frontend/src/routes/workflows/editor/panels/WorkflowParametersPanel.tsx index d2703905..4101d798 100644 --- a/skyvern-frontend/src/routes/workflows/editor/panels/WorkflowParametersPanel.tsx +++ b/skyvern-frontend/src/routes/workflows/editor/panels/WorkflowParametersPanel.tsx @@ -31,6 +31,7 @@ import { WorkflowEditorParameterType, WorkflowEditorParameterTypes, } from "../../types/workflowTypes"; +import { getLabelForWorkflowParameterType } from "../workflowEditorUtils"; const WORKFLOW_EDIT_PANEL_WIDTH = 20 * 16; const WORKFLOW_EDIT_PANEL_GAP = 1 * 16; @@ -134,7 +135,7 @@ function WorkflowParametersPanel() { {parameter.key} {parameter.parameterType === "workflow" ? ( - {parameter.dataType} + {getLabelForWorkflowParameterType(parameter.dataType)} ) : ( diff --git a/skyvern-frontend/src/routes/workflows/editor/workflowEditorUtils.ts b/skyvern-frontend/src/routes/workflows/editor/workflowEditorUtils.ts index 0a5dd57e..8d57c980 100644 --- a/skyvern-frontend/src/routes/workflows/editor/workflowEditorUtils.ts +++ b/skyvern-frontend/src/routes/workflows/editor/workflowEditorUtils.ts @@ -5,12 +5,12 @@ import { nanoid } from "nanoid"; import { WorkflowBlockTypes, WorkflowParameterTypes, + WorkflowParameterValueType, type AWSSecretParameter, type OutputParameter, type Parameter, type WorkflowApiResponse, type WorkflowBlock, - type WorkflowParameterValueType, type WorkflowSettings, } from "../types/workflowTypes"; import { @@ -1960,6 +1960,31 @@ function getWorkflowErrors(nodes: Array): Array { return errors; } +function getLabelForWorkflowParameterType(type: WorkflowParameterValueType) { + if (type === WorkflowParameterValueType.String) { + return "string"; + } + if (type === WorkflowParameterValueType.Float) { + return "float"; + } + if (type === WorkflowParameterValueType.Integer) { + return "integer"; + } + if (type === WorkflowParameterValueType.Boolean) { + return "boolean"; + } + if (type === WorkflowParameterValueType.FileURL) { + return "file_url"; + } + if (type === WorkflowParameterValueType.JSON) { + return "json"; + } + if (type === WorkflowParameterValueType.CredentialId) { + return "credential"; + } + return type; +} + export { convert, convertEchoParameters, @@ -1971,6 +1996,7 @@ export { getBlockNameOfOutputParameterKey, getDefaultValueForParameterType, getElements, + getLabelForWorkflowParameterType, getWorkflowSettings, getOutputParameterKey, getPreviousNodeIds,