vmario/wisemapping-frontend
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-frontend.git synced 2024-11-22 06:37:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix dialog action filtering

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2021-02-06 08:27:37 -08:00
parent 5f41821f00
commit d2a4fa0365
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/webapp/src/components/maps-page/action-chooser/index.tsx
View File

@ -11,17 +11,18 @@ import PrintOutlinedIcon from '@material-ui/icons/PrintOutlined';
import ShareOutlinedIcon from '@material-ui/icons/ShareOutlined'; import ShareOutlinedIcon from '@material-ui/icons/ShareOutlined';
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
import { LabelOutlined } from '@material-ui/icons'; import { LabelOutlined } from '@material-ui/icons';
import { fetchMapById } from '../action-dispatcher';
export type ActionType = 'open' | 'share' | 'import' | 'delete' | 'info' | 'create' | 'duplicate' | 'export' | 'label' | 'rename' | 'print' | 'info' | 'publish' | 'history' | undefined; export type ActionType = 'open' | 'share' | 'import' | 'delete' | 'info' | 'create' | 'duplicate' | 'export' | 'label' | 'rename' | 'print' | 'info' | 'publish' | 'history' | undefined;
interface ActionProps { interface ActionProps {
onClose: (action: ActionType) => void; onClose: (action: ActionType) => void;
anchor: undefined | HTMLElement; anchor?: HTMLElement;
role: 'owner' | 'editor' | 'viewer' mapId?: number
} }
const ActionChooser = (props: ActionProps) => { const ActionChooser = (props: ActionProps) => {
const { anchor, onClose, role } = props; const { anchor, onClose, mapId } = props;
const handleOnClose = (action: ActionType): ((event: React.MouseEvent<HTMLLIElement>) => void) => { const handleOnClose = (action: ActionType): ((event: React.MouseEvent<HTMLLIElement>) => void) => {
return (event): void => { return (event): void => {
@ -30,8 +31,8 @@ const ActionChooser = (props: ActionProps) => {
}; };
} }
const role = mapId ? fetchMapById(mapId)?.map?.role : undefined;
return ( return (
<Menu <Menu
anchorEl={anchor} anchorEl={anchor}
keepMounted keepMounted
@ -45,7 +46,7 @@ const ActionChooser = (props: ActionProps) => {
</ListItemIcon> </ListItemIcon>
<FormattedMessage id="action.open" defaultMessage="Open" /> <FormattedMessage id="action.open" defaultMessage="Open" />
</MenuItem> </MenuItem>
<Divider /> <Divider />
<MenuItem onClick={handleOnClose('duplicate')}> <MenuItem onClick={handleOnClose('duplicate')}>

4
packages/webapp/src/components/maps-page/maps-list/index.tsx
View File

@ -319,6 +319,8 @@ export const MapsList = (props: MapsListProps) => {
const isSelected = (id: number) => selected.indexOf(id) !== -1; const isSelected = (id: number) => selected.indexOf(id) !== -1;
return ( return (
<div className={classes.root}> <div className={classes.root}>
<ActionChooser anchor={activeRowAction?.el} onClose={handleActionMenuClose} mapId={activeRowAction?.mapId} />
<Paper className={classes.paper} elevation={0}> <Paper className={classes.paper} elevation={0}>
<Toolbar className={classes.toolbar} variant="dense"> <Toolbar className={classes.toolbar} variant="dense">
@ -467,7 +469,6 @@ export const MapsList = (props: MapsListProps) => {
<MoreHorizIcon color="action" /> <MoreHorizIcon color="action" />
</IconButton> </IconButton>
</Tooltip> </Tooltip>
<ActionChooser anchor={activeRowAction?.el} onClose={handleActionMenuClose} role={row.role} />
</TableCell> </TableCell>
</TableRow> </TableRow>
); );
@ -478,7 +479,6 @@ export const MapsList = (props: MapsListProps) => {
</Paper> </Paper>
{/* Action Dialog */}
<ActionDispatcher action={activeDialog?.actionType} onClose={() => setActiveDialog(undefined)} mapId={activeDialog ? activeDialog.mapId : -1} /> <ActionDispatcher action={activeDialog?.actionType} onClose={() => setActiveDialog(undefined)} mapId={activeDialog ? activeDialog.mapId : -1} />
</div > </div >
); );