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>
|
||||
</Tooltip>
|
||||
}
|
||||
{isAg || isStreamline &&
|
||||
{(isAg || isStreamline) &&
|
||||
<Tooltip title="Marketplace" placement="right">
|
||||
<ListItemButton
|
||||
id="tour-marketplace"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import { Container, SxProps, Theme } from "@mui/material";
|
||||
import { makeStyles } from "@mui/styles";
|
||||
import classNames from "classnames";
|
||||
import { useMobile } from "hooks";
|
||||
// import { useMobile } from "hooks";
|
||||
import { PropsWithChildren } from "react";
|
||||
|
||||
const useStyles = makeStyles((theme: Theme) => ({
|
||||
|
|
@ -44,11 +44,11 @@ interface Props extends PropsWithChildren{
|
|||
|
||||
export const PageContainer: React.FunctionComponent<Props> = (props: Props) => {
|
||||
const classes = useStyles();
|
||||
const isMobile = useMobile();
|
||||
// const isMobile = useMobile();
|
||||
const { children, fullViewport, isCenterCenter, sx } = props;
|
||||
// let fullViewport = false
|
||||
// let isCenterCenter = false
|
||||
const spacing = props.spacing;
|
||||
const spacing = props.spacing ? props.spacing : 2;
|
||||
return (
|
||||
<Container
|
||||
className={classNames(
|
||||
|
|
|
|||
|
|
@ -146,6 +146,7 @@ export default function TeamActions(props: Props) {
|
|||
permissions={permissions}
|
||||
isDialogOpen={openState.share}
|
||||
closeDialogCallback={() => setOpenState({ ...openState, share: false })}
|
||||
useImitation={false}
|
||||
/>
|
||||
<ObjectUsers
|
||||
scope={teamScope(key)}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue