Automate browser based workflows with AI
Python aiapiautomationbrowserbrowser-automationcomputergptllmplaywrightpowerautomatepuppeteerpythonrpaseleniumvisionworkflow
fix(SKY-12078): restore run-level editable credential input for single-credential login blocks (#7219)
Shuchang Zheng26f73ec0445b
diff --git a/skyvern-frontend/src/routes/workflows/editor/FlowRenderer.tsx b/skyvern-frontend/src/routes/workflows/editor/FlowRenderer.tsxindex 5e2f38fdf..02739fded 100644--- a/skyvern-frontend/src/routes/workflows/editor/FlowRenderer.tsx+++ b/skyvern-frontend/src/routes/workflows/editor/FlowRenderer.tsx@@ -69,7 +69,6 @@ import {WorkflowApiResponse,WorkflowEditorParameterTypes,WorkflowParameterTypes,- WorkflowParameterValueType,} from "../types/workflowTypes";import {BitwardenCreditCardDataParameterYAML,@@ -123,6 +122,7 @@ import {parameterIsBitwardenCredential,parameterIsAzureVaultCredential,} from "./types";+import { skyvernCredentialToParameterYAML } from "./utils";import "./reactFlowOverrideStyles.css";import {convertEchoParameters,@@ -316,29 +316,7 @@ function convertToParametersYAML(BITWARDEN_MASTER_PASSWORD_AWS_SECRET_KEY,};} else if (parameterIsSkyvernCredential(parameter)) {- const hasCredentialRotation =- (parameter.credentialIds?.length ?? 0) >= 2;- if (- parameter.dataType === WorkflowParameterValueType.CredentialId &&- !hasCredentialRotation- ) {- return {- parameter_type: WorkflowParameterTypes.Workflow,- workflow_parameter_type:- WorkflowParameterValueType.CredentialId,- default_value: parameter.credentialId,- key: parameter.key,- description: parameter.description || null,- };- }- return {- parameter_type: WorkflowParameterTypes.Credential,- credential_id: parameter.credentialId,- credential_ids: parameter.credentialIds ?? null,- selection_strategy: parameter.selectionStrategy ?? null,- key: parameter.key,- description: parameter.description || null,- };+ return skyvernCredentialToParameterYAML(parameter);} else if (parameterIsOnePasswordCredential(parameter)) {return {parameter_type: WorkflowParameterTypes.OnePassword,diff --git a/skyvern-frontend/src/routes/workflows/editor/utils.test.ts b/skyvern-frontend/src/routes/workflows/editor/utils.test.tsindex 3a50bcfbb..7efa34fe4 100644--- a/skyvern-frontend/src/routes/workflows/editor/utils.test.ts+++ b/skyvern-frontend/src/routes/workflows/editor/utils.test.ts@@ -4,7 +4,11 @@ import {type WorkflowApiResponse,WorkflowParameterValueType,} from "../types/workflowTypes";-import { getInitialParameters } from "./utils";+import {+ getInitialParameters,+ skyvernCredentialToParameterYAML,+} from "./utils";+import { SkyvernCredential } from "./types";const baseWorkflow = {workflow_id: "w_test",@@ -98,3 +102,57 @@ describe("getInitialParameters", () => {]);});});++describe("skyvernCredentialToParameterYAML", () => {+ test("serializes a freshly selected single credential (no dataType) as an editable workflow credential_id parameter", () => {+ const parameter: SkyvernCredential = {+ key: "credentials",+ parameterType: "credential",+ credentialId: "cred_123",+ };++ expect(skyvernCredentialToParameterYAML(parameter)).toEqual({+ parameter_type: "workflow",+ workflow_parameter_type: WorkflowParameterValueType.CredentialId,+ default_value: "cred_123",+ key: "credentials",+ description: null,+ });+ });++ test("serializes a legacy single credential (dataType set) as an editable workflow credential_id parameter", () => {+ const parameter: SkyvernCredential = {+ key: "credentials",+ parameterType: "credential",+ credentialId: "cred_123",+ dataType: WorkflowParameterValueType.CredentialId,+ };++ expect(skyvernCredentialToParameterYAML(parameter)).toEqual({+ parameter_type: "workflow",+ workflow_parameter_type: WorkflowParameterValueType.CredentialId,+ default_value: "cred_123",+ key: "credentials",+ description: null,+ });+ });++ test("serializes a rotation pool (2+ credentials) as a credential parameter", () => {+ const parameter: SkyvernCredential = {+ key: "credentials",+ parameterType: "credential",+ credentialId: "cred_1",+ credentialIds: ["cred_1", "cred_2"],+ selectionStrategy: "round_robin",+ };++ expect(skyvernCredentialToParameterYAML(parameter)).toEqual({+ parameter_type: "credential",+ credential_id: "cred_1",+ credential_ids: ["cred_1", "cred_2"],+ selection_strategy: "round_robin",+ key: "credentials",+ description: null,+ });+ });+});diff --git a/skyvern-frontend/src/routes/workflows/editor/utils.ts b/skyvern-frontend/src/routes/workflows/editor/utils.tsindex b22d2bc22..121de56b1 100644--- a/skyvern-frontend/src/routes/workflows/editor/utils.ts+++ b/skyvern-frontend/src/routes/workflows/editor/utils.ts@@ -6,7 +6,39 @@ import {WorkflowParameterTypes,WorkflowParameterValueType,} from "../types/workflowTypes";-import { ParametersState } from "./types";+import {+ CredentialParameterYAML,+ WorkflowParameterYAML,+} from "../types/workflowYamlTypes";+import { ParametersState, SkyvernCredential } from "./types";++/**+ * A single credential serializes to an editable workflow `credential_id`+ * parameter (overridable at run/rerun time); only a rotation pool (2++ * credentials) becomes a block-scoped credential parameter.+ */+function skyvernCredentialToParameterYAML(+ parameter: SkyvernCredential,+): WorkflowParameterYAML | CredentialParameterYAML {+ const hasCredentialRotation = (parameter.credentialIds?.length ?? 0) >= 2;+ if (!hasCredentialRotation) {+ return {+ parameter_type: WorkflowParameterTypes.Workflow,+ workflow_parameter_type: WorkflowParameterValueType.CredentialId,+ default_value: parameter.credentialId,+ key: parameter.key,+ description: parameter.description || null,+ };+ }+ return {+ parameter_type: WorkflowParameterTypes.Credential,+ credential_id: parameter.credentialId,+ credential_ids: parameter.credentialIds ?? null,+ selection_strategy: parameter.selectionStrategy ?? null,+ key: parameter.key,+ description: parameter.description || null,+ };+}const getInitialParameters = (workflow: WorkflowApiResponse) => {return workflow.workflow_definition.parameters@@ -173,4 +205,5 @@ export {constructCacheKeyValue,constructCacheKeyValueFromParameters,getInitialParameters,+ skyvernCredentialToParameterYAML,};