hot fix for task and heaters page erroring when nothing was loaded/undefined
This commit is contained in:
parent
f51f98f3ca
commit
3c418343d0
2 changed files with 16 additions and 11 deletions
|
|
@ -40,7 +40,7 @@ export default function Heaters() {
|
||||||
.listObjectHeatersPageData(pageSize, tablePage * pageSize, undefined, undefined, searchText, as)
|
.listObjectHeatersPageData(pageSize, tablePage * pageSize, undefined, undefined, searchText, as)
|
||||||
.then(resp => {
|
.then(resp => {
|
||||||
setTotal(resp.data.total)
|
setTotal(resp.data.total)
|
||||||
setHeaters(resp.data.heaterData);
|
setHeaters(resp.data.heaterData ?? []);
|
||||||
});
|
});
|
||||||
}, [objectHeaterAPI, as, pageSize, tablePage, searchText]);
|
}, [objectHeaterAPI, as, pageSize, tablePage, searchText]);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -138,6 +138,7 @@ export default function TaskViewer(props: ViewProps) {
|
||||||
openDialog();
|
openDialog();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
const loadMultitask = useCallback(() => {
|
const loadMultitask = useCallback(() => {
|
||||||
if (!loadKeys) return;
|
if (!loadKeys) return;
|
||||||
if (loadKeys.length > 0) {
|
if (loadKeys.length > 0) {
|
||||||
|
|
@ -146,11 +147,13 @@ export default function TaskViewer(props: ViewProps) {
|
||||||
taskAPI
|
taskAPI
|
||||||
.getMultiTasks(loadKeys, as)
|
.getMultiTasks(loadKeys, as)
|
||||||
.then(resp => {
|
.then(resp => {
|
||||||
resp.data.tasks.forEach(task => {
|
if(resp.data.tasks){
|
||||||
if (task.settings) {
|
resp.data.tasks.forEach(task => {
|
||||||
temp.set(task.key, Task.any(task));
|
if (task.settings) {
|
||||||
}
|
temp.set(task.key, Task.any(task));
|
||||||
});
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
setTasks(temp);
|
setTasks(temp);
|
||||||
setLoaded(true);
|
setLoaded(true);
|
||||||
})
|
})
|
||||||
|
|
@ -167,11 +170,13 @@ export default function TaskViewer(props: ViewProps) {
|
||||||
taskAPI
|
taskAPI
|
||||||
.listTasks(50, 0, "asc", "start", undefined, undefined, as, prevMonth, nextMonth)
|
.listTasks(50, 0, "asc", "start", undefined, undefined, as, prevMonth, nextMonth)
|
||||||
.then(resp => {
|
.then(resp => {
|
||||||
resp.data.tasks.forEach(task => {
|
if(resp.data.tasks){
|
||||||
if (task.settings) {
|
resp.data.tasks.forEach(task => {
|
||||||
temp.set(task.key, Task.any(task));
|
if (task.settings) {
|
||||||
}
|
temp.set(task.key, Task.any(task));
|
||||||
});
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
setTasks(temp);
|
setTasks(temp);
|
||||||
setLoaded(true);
|
setLoaded(true);
|
||||||
})
|
})
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue