From db82fe8ec628e1e1ebd733c32257ee83a75afb37 Mon Sep 17 00:00:00 2001 From: Bram Suurd Date: Wed, 6 Nov 2024 19:51:52 +0100 Subject: [PATCH] Check default settings availability in `DefaultSettings` component and handle undefined values more gracefully in rendering --- .../_components/ScriptItems/DefaultSettings.tsx | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/scripts/_components/ScriptItems/DefaultSettings.tsx b/frontend/src/app/scripts/_components/ScriptItems/DefaultSettings.tsx index 1e9efd36..c7526f5a 100644 --- a/frontend/src/app/scripts/_components/ScriptItems/DefaultSettings.tsx +++ b/frontend/src/app/scripts/_components/ScriptItems/DefaultSettings.tsx @@ -5,23 +5,28 @@ export default function DefaultSettings({ item }: { item: Script }) { (method) => method.type === "default", ); + const defaultSettingsAvailable = + defaultSettings?.resources.cpu !== null || + defaultSettings?.resources.ram !== null || + defaultSettings?.resources.hdd !== null; + const defaultAlpineSettings = item.install_methods.find( (method) => method.type === "alpine", ); return ( <> - {defaultSettings && ( + {defaultSettingsAvailable && (

Default settings

- CPU: {defaultSettings.resources.cpu}vCPU + CPU: {defaultSettings?.resources.cpu}vCPU

- RAM: {defaultSettings.resources.ram}MB + RAM: {defaultSettings?.resources.ram}MB

- HDD: {defaultSettings.resources.hdd}GB + HDD: {defaultSettings?.resources.hdd}GB

)}