merged access_object change
This commit is contained in:
commit
d8e4052b87
4 changed files with 7 additions and 4 deletions
|
|
@ -39,8 +39,9 @@ export default function Heaters() {
|
||||||
objectHeaterAPI
|
objectHeaterAPI
|
||||||
.listObjectHeatersPageData(pageSize, tablePage * pageSize, undefined, undefined, searchText, as)
|
.listObjectHeatersPageData(pageSize, tablePage * pageSize, undefined, undefined, searchText, as)
|
||||||
.then(resp => {
|
.then(resp => {
|
||||||
setHeaters(resp.data.heaterData ?? []);
|
// setHeaters(resp.data.heaterData ?? []);
|
||||||
setTotal(resp.data.total)
|
setTotal(resp.data.total)
|
||||||
|
setHeaters(resp.data.heaterData ?? []);
|
||||||
});
|
});
|
||||||
}, [objectHeaterAPI, as, pageSize, tablePage, searchText]);
|
}, [objectHeaterAPI, as, pageSize, tablePage, searchText]);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -108,7 +108,8 @@ export default function Users() {
|
||||||
"remove-devices",
|
"remove-devices",
|
||||||
"copy-token",
|
"copy-token",
|
||||||
"recluse",
|
"recluse",
|
||||||
"pause-data"
|
"pause-data",
|
||||||
|
"access-object"
|
||||||
].sort();
|
].sort();
|
||||||
const features = [
|
const features = [
|
||||||
"admin",
|
"admin",
|
||||||
|
|
|
||||||
|
|
@ -142,6 +142,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) {
|
||||||
|
|
|
||||||
|
|
@ -266,7 +266,7 @@ export default function UserMenu() {
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
)}
|
)}
|
||||||
<Divider />
|
<Divider />
|
||||||
{hasAdmin && (
|
{(hasAdmin || user.allowedTo("access-object")) && (
|
||||||
<Tooltip title="Access Object">
|
<Tooltip title="Access Object">
|
||||||
<MenuItem onClick={() => openAccessObject()} aria-label="Access Object" dense>
|
<MenuItem onClick={() => openAccessObject()} aria-label="Access Object" dense>
|
||||||
<ListItemIcon>
|
<ListItemIcon>
|
||||||
|
|
@ -276,7 +276,7 @@ export default function UserMenu() {
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
)}
|
)}
|
||||||
<Divider />
|
{(hasAdmin || user.allowedTo("access-object")) && <Divider /> }
|
||||||
<MenuItem onClick={handleLogout} aria-label="Sign Out" dense>
|
<MenuItem onClick={handleLogout} aria-label="Sign Out" dense>
|
||||||
<ListItemIcon>
|
<ListItemIcon>
|
||||||
<ExitToApp className={classes.red} />
|
<ExitToApp className={classes.red} />
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue