From 3c418343d00b1c254d911bc258c373975443d7ee Mon Sep 17 00:00:00 2001 From: csawatzky Date: Tue, 14 Oct 2025 15:00:31 -0600 Subject: [PATCH] hot fix for task and heaters page erroring when nothing was loaded/undefined --- src/pages/Heaters.tsx | 2 +- src/tasks/TaskViewer.tsx | 25 +++++++++++++++---------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/pages/Heaters.tsx b/src/pages/Heaters.tsx index df716a0..d2d19ba 100644 --- a/src/pages/Heaters.tsx +++ b/src/pages/Heaters.tsx @@ -40,7 +40,7 @@ export default function Heaters() { .listObjectHeatersPageData(pageSize, tablePage * pageSize, undefined, undefined, searchText, as) .then(resp => { setTotal(resp.data.total) - setHeaters(resp.data.heaterData); + setHeaters(resp.data.heaterData ?? []); }); }, [objectHeaterAPI, as, pageSize, tablePage, searchText]); diff --git a/src/tasks/TaskViewer.tsx b/src/tasks/TaskViewer.tsx index 68ebf43..d8c03db 100644 --- a/src/tasks/TaskViewer.tsx +++ b/src/tasks/TaskViewer.tsx @@ -138,6 +138,7 @@ export default function TaskViewer(props: ViewProps) { openDialog(); }; + const loadMultitask = useCallback(() => { if (!loadKeys) return; if (loadKeys.length > 0) { @@ -146,11 +147,13 @@ export default function TaskViewer(props: ViewProps) { taskAPI .getMultiTasks(loadKeys, as) .then(resp => { - resp.data.tasks.forEach(task => { - if (task.settings) { - temp.set(task.key, Task.any(task)); - } - }); + if(resp.data.tasks){ + resp.data.tasks.forEach(task => { + if (task.settings) { + temp.set(task.key, Task.any(task)); + } + }); + } setTasks(temp); setLoaded(true); }) @@ -167,11 +170,13 @@ export default function TaskViewer(props: ViewProps) { taskAPI .listTasks(50, 0, "asc", "start", undefined, undefined, as, prevMonth, nextMonth) .then(resp => { - resp.data.tasks.forEach(task => { - if (task.settings) { - temp.set(task.key, Task.any(task)); - } - }); + if(resp.data.tasks){ + resp.data.tasks.forEach(task => { + if (task.settings) { + temp.set(task.key, Task.any(task)); + } + }); + } setTasks(temp); setLoaded(true); })