diff --git a/src/routes/(console)/project-[project]/rawVariableEditor.svelte b/src/routes/(console)/project-[project]/rawVariableEditor.svelte index 00fe71d14..1bf2074ab 100644 --- a/src/routes/(console)/project-[project]/rawVariableEditor.svelte +++ b/src/routes/(console)/project-[project]/rawVariableEditor.svelte @@ -14,21 +14,29 @@ export let showEditor = false; export let variableList: Models.VariableList; - export let sdkCreateVariable: (key: string, value: string) => Promise; + const editableVariables = variableList.variables.filter((variable) => !variable.secret); + const secretVariables = variableList.variables.filter((variable) => variable.secret); + + export let sdkCreateVariable: ( + key: string, + value: string, + secret?: boolean + ) => Promise; export let sdkUpdateVariable: ( variableId: string, key: string, - value: string + value: string, + secret?: boolean ) => Promise; export let sdkDeleteVariable: (variableId: string) => Promise; let error = ''; - let envCode = variableList.variables + let envCode = editableVariables .map((variable) => `${variable.key}=${variable.value}`) .join('\n'); let jsonCode = JSON.stringify( JSON.parse( - `{${variableList.variables + `{${editableVariables .map((variable) => `"${variable.key}":"${variable.value.split('"').join('\\"')}"`) .join(',')}}` ), @@ -57,24 +65,31 @@ } await Promise.all( - variableList.variables.map(async (variable) => { + editableVariables.map(async (variable) => { const newValue = vars[variable.key] ?? null; if (newValue === null) { await sdkDeleteVariable(variable.$id); } else if (newValue !== variable.value) { - await sdkUpdateVariable(variable.$id, variable.key, newValue); + await sdkUpdateVariable(variable.$id, variable.key, newValue, false); } - delete vars[variable.key]; }) ); + // Add new variables, skipping keys that exist in secret variables await Promise.all( Object.keys(vars).map(async (key) => { - await sdkCreateVariable(key, vars[key]); + if (!secretVariables.some((v) => v.key === key)) { + await sdkCreateVariable(key, vars[key], false); + } }) ); + // Ensure secret variables are preserved + variableList.variables = [ + ...secretVariables, + ...variableList.variables.filter((v) => !v.secret) + ]; showEditor = false; diff --git a/src/routes/(console)/project-[project]/updateVariables.svelte b/src/routes/(console)/project-[project]/updateVariables.svelte index d303d8cda..b6b681465 100644 --- a/src/routes/(console)/project-[project]/updateVariables.svelte +++ b/src/routes/(console)/project-[project]/updateVariables.svelte @@ -140,14 +140,28 @@ variable.value, variable.secret ); - await sdk.forProject.functions.deleteVariable(variable.resourceId, variable.$id); + if (product === 'site') { + await sdk.forProject.sites.deleteVariable(variable.resourceId, variable.$id); + } else { + await sdk.forProject.functions.deleteVariable( + variable.resourceId, + variable.$id + ); + } } else { await sdk.forProject.projectApi.createVariable( variable.key, variable.value, variable.secret ); - await sdk.forProject.functions.deleteVariable(variable.resourceId, variable.$id); + if (product === 'site') { + await sdk.forProject.sites.deleteVariable(variable.resourceId, variable.$id); + } else { + await sdk.forProject.functions.deleteVariable( + variable.resourceId, + variable.$id + ); + } } selectedVar = null;