diff --git a/src/pages/Heaters.tsx b/src/pages/Heaters.tsx index 53e6c0e..226972c 100644 --- a/src/pages/Heaters.tsx +++ b/src/pages/Heaters.tsx @@ -39,8 +39,9 @@ export default function Heaters() { objectHeaterAPI .listObjectHeatersPageData(pageSize, tablePage * pageSize, undefined, undefined, searchText, as) .then(resp => { - setHeaters(resp.data.heaterData ?? []); + // setHeaters(resp.data.heaterData ?? []); setTotal(resp.data.total) + setHeaters(resp.data.heaterData ?? []); }); }, [objectHeaterAPI, as, pageSize, tablePage, searchText]); diff --git a/src/pages/Users.tsx b/src/pages/Users.tsx index c7e155c..b519dd4 100644 --- a/src/pages/Users.tsx +++ b/src/pages/Users.tsx @@ -108,7 +108,8 @@ export default function Users() { "remove-devices", "copy-token", "recluse", - "pause-data" + "pause-data", + "access-object" ].sort(); const features = [ "admin", diff --git a/src/tasks/TaskViewer.tsx b/src/tasks/TaskViewer.tsx index 4cc5d48..12e82d7 100644 --- a/src/tasks/TaskViewer.tsx +++ b/src/tasks/TaskViewer.tsx @@ -142,6 +142,7 @@ export default function TaskViewer(props: ViewProps) { openDialog(); }; + const loadMultitask = useCallback(() => { if (!loadKeys) return; if (loadKeys.length > 0) { diff --git a/src/user/UserMenu.tsx b/src/user/UserMenu.tsx index c7b8ab3..c22b622 100644 --- a/src/user/UserMenu.tsx +++ b/src/user/UserMenu.tsx @@ -266,7 +266,7 @@ export default function UserMenu() { )} - {hasAdmin && ( + {(hasAdmin || user.allowedTo("access-object")) && ( openAccessObject()} aria-label="Access Object" dense> @@ -276,7 +276,7 @@ export default function UserMenu() { )} - + {(hasAdmin || user.allowedTo("access-object")) && }