From dd3603ff8a2fcb009be87dd20d21c6bcc4c0e590 Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Mon, 24 Apr 2023 17:42:23 +0000 Subject: [PATCH 1/2] fix(site): Fix default value for options --- site/src/utils/richParameters.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/site/src/utils/richParameters.ts b/site/src/utils/richParameters.ts index cc239f1249dee..62e495fbb06f6 100644 --- a/site/src/utils/richParameters.ts +++ b/site/src/utils/richParameters.ts @@ -16,7 +16,8 @@ export const selectInitialRichParametersValues = ( templateParameters.forEach((parameter) => { if (parameter.options.length > 0) { - let parameterValue = parameter.options[0].value + let parameterValue = parameter.default_value ?? parameter.options[0].value + if (defaultValuesFromQuery && defaultValuesFromQuery[parameter.name]) { parameterValue = defaultValuesFromQuery[parameter.name] } From ac9f587c1a9df5cc386d80f8910d8983a6c5bd91 Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Mon, 24 Apr 2023 17:44:53 +0000 Subject: [PATCH 2/2] Better --- site/src/utils/richParameters.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/site/src/utils/richParameters.ts b/site/src/utils/richParameters.ts index 62e495fbb06f6..764dc1d0896f9 100644 --- a/site/src/utils/richParameters.ts +++ b/site/src/utils/richParameters.ts @@ -15,8 +15,10 @@ export const selectInitialRichParametersValues = ( } templateParameters.forEach((parameter) => { + let parameterValue = parameter.default_value + if (parameter.options.length > 0) { - let parameterValue = parameter.default_value ?? parameter.options[0].value + parameterValue = parameterValue ?? parameter.options[0].value if (defaultValuesFromQuery && defaultValuesFromQuery[parameter.name]) { parameterValue = defaultValuesFromQuery[parameter.name] @@ -30,7 +32,6 @@ export const selectInitialRichParametersValues = ( return } - let parameterValue = parameter.default_value if (defaultValuesFromQuery && defaultValuesFromQuery[parameter.name]) { parameterValue = defaultValuesFromQuery[parameter.name] }