+
@@ -221,60 +251,64 @@ const MapsPage = (): ReactElement => {
- );
+ )
}
interface ListItemProps {
- icon: React.ReactElement,
- label: string,
- filter: Filter,
+ icon: React.ReactElement
+ label: string
+ filter: Filter
active?: Filter
- onClick: (filter: Filter) => void;
- onDelete?: (id: number) => void;
+ onClick: (filter: Filter) => void
+ onDelete?: (id: number) => void
}
const StyleListItem = (props: ListItemProps) => {
- const icon = props.icon;
- const label = props.label;
- const filter = props.filter;
- const activeFilter = props.active;
- const onClick = props.onClick;
- const onDeleteLabel = props.onDelete;
- const isSelected = activeFilter
- && (activeFilter.type == filter.type)
- && (activeFilter.type != 'label' || ((activeFilter as LabelFilter).label == (filter as LabelFilter).label));
-
+ const icon = props.icon
+ const label = props.label
+ const filter = props.filter
+ const activeFilter = props.active
+ const onClick = props.onClick
+ const onDeleteLabel = props.onDelete
+ const isSelected =
+ activeFilter &&
+ activeFilter.type == filter.type &&
+ (activeFilter.type != 'label' ||
+ (activeFilter as LabelFilter).label == (filter as LabelFilter).label)
const handleOnClick = (event: React.MouseEvent
, filter: Filter) => {
- event.stopPropagation();
- onClick(filter);
+ event.stopPropagation()
+ onClick(filter)
}
- const handleOnDelete = (event: React.MouseEvent, filter: Filter) => {
- event.stopPropagation();
+ const handleOnDelete = (
+ event: React.MouseEvent,
+ filter: Filter
+ ) => {
+ event.stopPropagation()
if (!onDeleteLabel) {
- throw "Illegal state exeption";
+ throw 'Illegal state exeption'
}
- onDeleteLabel((filter as LabelFilter).label.id);
+ onDeleteLabel((filter as LabelFilter).label.id)
}
return (
- handleOnClick(e, filter)}>
-
- {icon}
-
+ handleOnClick(e, filter)}>
+ {icon}
- {filter.type == 'label' &&
+ {filter.type == 'label' && (
- handleOnDelete(e, filter)}>
+ handleOnDelete(e, filter)}
+ >
- }
+ )}
- );
+ )
}
-export default MapsPage;
+export default MapsPage
diff --git a/packages/webapp/src/components/maps-page/language-menu/index.tsx b/packages/webapp/src/components/maps-page/language-menu/index.tsx
index 28ae4d55..f223c1f9 100644
--- a/packages/webapp/src/components/maps-page/language-menu/index.tsx
+++ b/packages/webapp/src/components/maps-page/language-menu/index.tsx
@@ -1,61 +1,64 @@
-import TranslateTwoTone from '@material-ui/icons/TranslateTwoTone';
-import React from "react";
-import { useMutation, useQueryClient } from "react-query";
-import Client from "../../../classes/client";
-import { useSelector } from 'react-redux';
-import { activeInstance, fetchAccount } from '../../../redux/clientSlice';
-import { FormattedMessage, useIntl } from 'react-intl';
-import { LocaleCode, Locales } from '../../../classes/app-i18n';
-import Tooltip from '@material-ui/core/Tooltip';
-import Button from '@material-ui/core/Button';
-import Menu from '@material-ui/core/Menu';
-import MenuItem from '@material-ui/core/MenuItem';
-import Dialog from '@material-ui/core/Dialog';
-import DialogTitle from '@material-ui/core/DialogTitle';
-import DialogContent from '@material-ui/core/DialogContent';
-import DialogContentText from '@material-ui/core/DialogContentText';
-import DialogActions from '@material-ui/core/DialogActions';
-import Divider from '@material-ui/core/Divider';
-
+import TranslateTwoTone from '@material-ui/icons/TranslateTwoTone'
+import React from 'react'
+import { useMutation, useQueryClient } from 'react-query'
+import Client from '../../../classes/client'
+import { useSelector } from 'react-redux'
+import { activeInstance, fetchAccount } from '../../../redux/clientSlice'
+import { FormattedMessage, useIntl } from 'react-intl'
+import { LocaleCode, Locales } from '../../../classes/app-i18n'
+import Tooltip from '@material-ui/core/Tooltip'
+import Button from '@material-ui/core/Button'
+import Menu from '@material-ui/core/Menu'
+import MenuItem from '@material-ui/core/MenuItem'
+import Dialog from '@material-ui/core/Dialog'
+import DialogTitle from '@material-ui/core/DialogTitle'
+import DialogContent from '@material-ui/core/DialogContent'
+import DialogContentText from '@material-ui/core/DialogContentText'
+import DialogActions from '@material-ui/core/DialogActions'
+import Divider from '@material-ui/core/Divider'
const LanguageMenu = (): React.ReactElement => {
- const queryClient = useQueryClient();
- const client: Client = useSelector(activeInstance);
- const [anchorEl, setAnchorEl] = React.useState(null);
- const [openHelpDialog, setHelpDialogOpen] = React.useState(false);
+ const queryClient = useQueryClient()
+ const client: Client = useSelector(activeInstance)
+ const [anchorEl, setAnchorEl] = React.useState(null)
+ const [openHelpDialog, setHelpDialogOpen] = React.useState(false)
- const open = Boolean(anchorEl);
- const intl = useIntl();
+ const open = Boolean(anchorEl)
+ const intl = useIntl()
- const mutation = useMutation((locale: LocaleCode) => client.updateAccountLanguage(locale),
- {
- onSuccess: () => {
- queryClient.invalidateQueries('account')
- handleClose();
- },
- onError: (error) => {
- console.error(`Unexpected error ${error}`)
- }
- }
- );
+ const mutation = useMutation((locale: LocaleCode) => client.updateAccountLanguage(locale), {
+ onSuccess: () => {
+ queryClient.invalidateQueries('account')
+ handleClose()
+ },
+ onError: (error) => {
+ console.error(`Unexpected error ${error}`)
+ },
+ })
const handleMenu = (event: React.MouseEvent) => {
- setAnchorEl(event.currentTarget);
- };
-
- const handleClose = () => {
- setAnchorEl(null);
- };
-
- const handleOnClick = (event: React.MouseEvent) => {
- const localeCode = event.target['id'];
- mutation.mutate(localeCode);
+ setAnchorEl(event.currentTarget)
}
- const accountInfo = fetchAccount();
+ const handleClose = () => {
+ setAnchorEl(null)
+ }
+
+ const handleOnClick = (event: React.MouseEvent