brandxtech/frontend
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added back the task viewer on the bin page, fixed up some more styling

Browse source
This commit is contained in:
csawatzky 2025-04-23 16:29:41 -06:00
parent 5c6be7c850
commit 9105b4be3a
4 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/pages/Bin.tsx
View file

@ -43,7 +43,6 @@ import BindaptIcon from "products/Bindapt/BindaptIcon";
import Close from "@mui/icons-material/Close";
import Chat from "chat/Chat";
import TasksIcon from "products/Construction/TasksIcon";
// import TaskViewer from "tasks/TaskViewer";
import FieldsIcon from "products/AgIcons/FieldsIcon";
import BinComponentTypes from "bin/BinComponentTypes";
import { Plenum } from "models/Plenum";
@ -66,6 +65,7 @@ import BinConditioningCard from "bin/BinConditioningCard";
import { makeStyles, styled } from "@mui/styles";
import { useNavigate, useParams } from "react-router-dom";
import { Controller } from "models/Controller";
import TaskViewer from "tasks/TaskViewer";
interface TabPanelProps {
children?: React.ReactNode;
@ -547,10 +547,11 @@ export default function Bin(props: Props) {
};
const tasks = () => {
console.log(showTasks())
if (showTasks()) {
return (
<React.Fragment>
{/* <TaskViewer drawerView objectKey={binID} loadKeys={[binID]} /> */}
<TaskViewer drawerView objectKey={binID} loadKeys={[binID]} />
</React.Fragment>
);
}
@ -1144,11 +1145,11 @@ export default function Bin(props: Props) {
anchor="right"
classes={{ paper: classes.drawerPaper }}
onClose={() => setTaskDrawer(false)}>
<Box paddingTop={10}>
<Box>
<IconButton style={{ width: 50 }} onClick={() => setTaskDrawer(false)}>
<Close />
</IconButton>
{/* <TaskViewer drawerView objectKey={binID} loadKeys={[binID]} /> */}
<TaskViewer drawerView objectKey={binID} loadKeys={[binID]} />
</Box>
</Drawer>
)}

6
src/pages/Gate.tsx
View file

@ -87,7 +87,7 @@ export default function Gate(props: Props) {
//const match = useRouteMatch<MatchParams>();
//const gateID = props.gateID ?? match.params.gateID;
const { gateKey } = props
const gateID = gateKey ?? useParams<{ gateID: string }>()?.gateID ?? "";
const gateID = gateKey ?? useParams<{ gateKey: string }>()?.gateKey ?? "";
const classes = useStyles();
const gateAPI = useGateAPI();
const userAPI = useUserAPI();
@ -115,13 +115,17 @@ export default function Gate(props: Props) {
};
useEffect(() => {
console.log(gateID)
let key = gateID;
let kind = "gate";
if (as) {
key = as;
kind = "team";
}
console.log(key)
console.log(kind)
userAPI.getUser(user.id(), { key: key, kind: kind } as Scope).then(resp => {
console.log(resp)
setPermissions(resp.permissions);
});
}, [as, gateID, userAPI, user]);