Merge branch 'team_share' into dev_environment
This commit is contained in:
commit
5c4036e974
3 changed files with 6 additions and 5 deletions
|
|
@ -436,7 +436,7 @@ export default function SideNavigator(props: Props) {
|
||||||
</ListItemButton>
|
</ListItemButton>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
}
|
}
|
||||||
{isAg || isStreamline &&
|
{(isAg || isStreamline) &&
|
||||||
<Tooltip title="Marketplace" placement="right">
|
<Tooltip title="Marketplace" placement="right">
|
||||||
<ListItemButton
|
<ListItemButton
|
||||||
id="tour-marketplace"
|
id="tour-marketplace"
|
||||||
|
|
@ -477,7 +477,7 @@ export default function SideNavigator(props: Props) {
|
||||||
{open && <ListItemText primary="Case New Holland" />}
|
{open && <ListItemText primary="Case New Holland" />}
|
||||||
</ListItemButton>
|
</ListItemButton>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
}
|
}
|
||||||
</List>
|
</List>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
import { Container, SxProps, Theme } from "@mui/material";
|
import { Container, SxProps, Theme } from "@mui/material";
|
||||||
import { makeStyles } from "@mui/styles";
|
import { makeStyles } from "@mui/styles";
|
||||||
import classNames from "classnames";
|
import classNames from "classnames";
|
||||||
import { useMobile } from "hooks";
|
// import { useMobile } from "hooks";
|
||||||
import { PropsWithChildren } from "react";
|
import { PropsWithChildren } from "react";
|
||||||
|
|
||||||
const useStyles = makeStyles((theme: Theme) => ({
|
const useStyles = makeStyles((theme: Theme) => ({
|
||||||
|
|
@ -44,11 +44,11 @@ interface Props extends PropsWithChildren{
|
||||||
|
|
||||||
export const PageContainer: React.FunctionComponent<Props> = (props: Props) => {
|
export const PageContainer: React.FunctionComponent<Props> = (props: Props) => {
|
||||||
const classes = useStyles();
|
const classes = useStyles();
|
||||||
const isMobile = useMobile();
|
// const isMobile = useMobile();
|
||||||
const { children, fullViewport, isCenterCenter, sx } = props;
|
const { children, fullViewport, isCenterCenter, sx } = props;
|
||||||
// let fullViewport = false
|
// let fullViewport = false
|
||||||
// let isCenterCenter = false
|
// let isCenterCenter = false
|
||||||
const spacing = props.spacing;
|
const spacing = props.spacing ? props.spacing : 2;
|
||||||
return (
|
return (
|
||||||
<Container
|
<Container
|
||||||
className={classNames(
|
className={classNames(
|
||||||
|
|
|
||||||
|
|
@ -146,6 +146,7 @@ export default function TeamActions(props: Props) {
|
||||||
permissions={permissions}
|
permissions={permissions}
|
||||||
isDialogOpen={openState.share}
|
isDialogOpen={openState.share}
|
||||||
closeDialogCallback={() => setOpenState({ ...openState, share: false })}
|
closeDialogCallback={() => setOpenState({ ...openState, share: false })}
|
||||||
|
useImitation={false}
|
||||||
/>
|
/>
|
||||||
<ObjectUsers
|
<ObjectUsers
|
||||||
scope={teamScope(key)}
|
scope={teamScope(key)}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue