u

src/components/UserMenu.jsx

@@ -8,7 +8,6 @@ import MenuItem from '@mui/material/MenuItem';
 import ListItemIcon from '@mui/material/ListItemIcon';
 import ListItemText from '@mui/material/ListItemText';
 import LogoutIcon from '@mui/icons-material/Logout';
-import BusinessIcon from '@mui/icons-material/Business';
 import SettingsIcon from '@mui/icons-material/Settings';
 import HelpOutlineRoundedIcon from '@mui/icons-material/HelpOutlineRounded';
 import SystemUpdateAltIcon from '@mui/icons-material/SystemUpdateAlt';
@@ -16,7 +15,6 @@ import Switch from '@mui/material/Switch';
 import Divider from '@mui/material/Divider';
 import authAutomat, { bootstrapAuthMe } from '../automats/authAutomat';
 import { helpAutomat, toggleHelp, pwaAutomat, openPwaDialog } from '../automats';
-import CompanySettingsDialog from './CompanySettingsDialog';
 import SettingsDialog from './settings/SettingsDialog';
 import { notifyError } from '../utils/notify';
 
@@ -26,17 +24,15 @@ class UserMenu extends PureComponent {
     this.state = {
       anchorEl: null,
       settingsOpen: false,
-      numbersOpen: false,
       user: authAutomat.state.user,
       helpEnabled: helpAutomat.state?.enabled ?? false,
       pwaUpdateAvailable: pwaAutomat.state.needRefresh,
     };
     this.handleOpenMenu = this.handleOpenMenu.bind(this);
+    this.handleContextMenu = this.handleContextMenu.bind(this);
     this.handleCloseMenu = this.handleCloseMenu.bind(this);
     this.handleOpenSettings = this.handleOpenSettings.bind(this);
     this.handleCloseSettings = this.handleCloseSettings.bind(this);
-    this.handleOpenNumbers = this.handleOpenNumbers.bind(this);
-    this.handleCloseNumbers = this.handleCloseNumbers.bind(this);
     this.handleToggleHelp = this.handleToggleHelp.bind(this);
     this.handleOpenPwaUpdate = this.handleOpenPwaUpdate.bind(this);
     this.handleLogout = this.handleLogout.bind(this);
@@ -67,6 +63,11 @@ class UserMenu extends PureComponent {
     this.setState({ anchorEl: event.currentTarget });
   }
 
+  handleContextMenu(event) {
+    event?.preventDefault?.();
+    this.setState({ anchorEl: event.currentTarget });
+  }
+
   handleCloseMenu() {
     this.setState({ anchorEl: null });
   }
@@ -79,14 +80,6 @@ class UserMenu extends PureComponent {
     this.setState({ settingsOpen: false });
   }
 
-  handleOpenNumbers() {
-    this.setState({ anchorEl: null, numbersOpen: true });
-  }
-
-  handleCloseNumbers() {
-    this.setState({ numbersOpen: false });
-  }
-
   handleToggleHelp(e) {
     e?.preventDefault?.();
     e?.stopPropagation?.();
@@ -104,7 +97,7 @@ class UserMenu extends PureComponent {
   }
 
   render() {
-    const { user, anchorEl, settingsOpen, numbersOpen, helpEnabled, pwaUpdateAvailable } = this.state;
+    const { user, anchorEl, settingsOpen, helpEnabled, pwaUpdateAvailable } = this.state;
     const open = Boolean(anchorEl);
 
     const pictureSrc = (() => {
@@ -122,7 +115,10 @@ class UserMenu extends PureComponent {
         <Box sx={{ px: 1.5, py: 1.5, alignSelf: 'flex-start' }}>
           <IconButton
             onClick={this.handleOpenMenu}
-            onMouseDown={(e) => e.preventDefault()}
+            onContextMenu={this.handleContextMenu}
+            onMouseDown={(e) => {
+              if (e.button === 0) e.preventDefault();
+            }}
             sx={{ p: 0, width: 32, height: 32, borderRadius: '50%' }}
           >
             <Badge
@@ -159,12 +155,6 @@ class UserMenu extends PureComponent {
           )}
           <MenuItem disabled>{user?.email}</MenuItem>
           <MenuItem disabled={!user?.selectedCompanyId} onClick={this.handleOpenSettings}>
-            <ListItemIcon>
-              <BusinessIcon fontSize="small" />
-            </ListItemIcon>
-            <ListItemText>Unternehmen</ListItemText>
-          </MenuItem>
-          <MenuItem disabled={!user?.selectedCompanyId} onClick={this.handleOpenNumbers}>
             <ListItemIcon>
               <SettingsIcon fontSize="small" />
             </ListItemIcon>
@@ -190,8 +180,7 @@ class UserMenu extends PureComponent {
             <ListItemText>Sign out</ListItemText>
           </MenuItem>
         </Menu>
-        <CompanySettingsDialog open={settingsOpen} onClose={this.handleCloseSettings} />
-        <SettingsDialog open={numbersOpen} onClose={this.handleCloseNumbers} />
+        <SettingsDialog open={settingsOpen} onClose={this.handleCloseSettings} />
       </>
     );
   }