From 7590fb8b7754a9d6f41c119f425af7e032e7b1b4 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Tue, 4 Mar 2025 12:59:04 +0100 Subject: [PATCH 1/2] fix: display all available settings --- site/src/pages/DeploymentSettingsPage/OptionsTable.tsx | 7 ------- site/src/pages/DeploymentSettingsPage/optionValue.ts | 3 +++ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/site/src/pages/DeploymentSettingsPage/OptionsTable.tsx b/site/src/pages/DeploymentSettingsPage/OptionsTable.tsx index 0cf3534a536ef..ea9fadb4b0c72 100644 --- a/site/src/pages/DeploymentSettingsPage/OptionsTable.tsx +++ b/site/src/pages/DeploymentSettingsPage/OptionsTable.tsx @@ -49,13 +49,6 @@ const OptionsTable: FC = ({ options, additionalValues }) => { {Object.values(options).map((option) => { - if ( - option.value === null || - option.value === "" || - option.value === undefined - ) { - return null; - } return ( diff --git a/site/src/pages/DeploymentSettingsPage/optionValue.ts b/site/src/pages/DeploymentSettingsPage/optionValue.ts index b959814dccca5..c958c8d466f14 100644 --- a/site/src/pages/DeploymentSettingsPage/optionValue.ts +++ b/site/src/pages/DeploymentSettingsPage/optionValue.ts @@ -6,6 +6,9 @@ export function optionValue( option: SerpentOption, additionalValues?: readonly string[], ) { + if (!option.value) { + return ""; + } // If option annotations are present, use them to format the value. if (option.annotations) { for (const [k, v] of Object.entries(option.annotations)) { From 27fce3ba78c5e61bc0d8cf872759b8b160e5468d Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Tue, 4 Mar 2025 13:38:54 +0100 Subject: [PATCH 2/2] one more time --- site/src/pages/DeploymentSettingsPage/optionValue.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/site/src/pages/DeploymentSettingsPage/optionValue.ts b/site/src/pages/DeploymentSettingsPage/optionValue.ts index c958c8d466f14..7e689c0e83dad 100644 --- a/site/src/pages/DeploymentSettingsPage/optionValue.ts +++ b/site/src/pages/DeploymentSettingsPage/optionValue.ts @@ -6,9 +6,6 @@ export function optionValue( option: SerpentOption, additionalValues?: readonly string[], ) { - if (!option.value) { - return ""; - } // If option annotations are present, use them to format the value. if (option.annotations) { for (const [k, v] of Object.entries(option.annotations)) { @@ -54,6 +51,10 @@ export function optionValue( break; } + if (!option.value) { + return ""; + } + // We show all experiments (including unsafe) that are currently enabled on a deployment // but only show safe experiments that are not. // biome-ignore lint/suspicious/noExplicitAny: opt.value is any @@ -62,7 +63,6 @@ export function optionValue( experimentMap[v] = true; } } - return experimentMap; } default: