Skip to content

Fix admin view-as-user navigation #1056

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JamieRuderman wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix admin view-as-user navigation #1056

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions frontend/src/pages/AdminUsersPage/AdminUserDetailPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
import React, { useEffect, useState } from 'react'
import { useParams } from 'react-router-dom'
import { useHistory, useParams } from 'react-router-dom'
import { useDispatch } from 'react-redux'
import { Typography, List, ListItemText, Box, Divider } from '@mui/material'
import { Container } from '../../components/Container'
import { ListItemLocation } from '../../components/ListItemLocation'
import { Title } from '../../components/Title'
import { Icon } from '../../components/Icon'
import { Body } from '../../components/Body'
import { IconButton } from '../../buttons/IconButton'
import { LoadingMessage } from '../../components/LoadingMessage'
import { IconButton } from '../../buttons/IconButton'
import { spacing } from '../../styling'
import { Dispatch } from '../../store'
import browser from '../../services/browser'
import { windowOpen } from '../../services/browser'

export const AdminUserDetailPage: React.FC = () => {
const { userId } = useParams<{ userId: string }>()
const history = useHistory()
const dispatch = useDispatch<Dispatch>()
const [user, setUser] = useState<any>(null)
const [loading, setLoading] = useState(true)
Expand All @@ -35,13 +37,6 @@ export const AdminUserDetailPage: React.FC = () => {
setLoading(false)
}

const handleViewAsUser = () => {
if (!user) return
const viewAsParam = `${user.id},${encodeURIComponent(user.email)}`
const url = `${window.location.origin}${window.location.pathname}#/devices?viewAs=${viewAsParam}`
windowOpen(url, '_blank')
}

if (loading) {
return (
<Container gutterBottom>
Expand All @@ -66,6 +61,15 @@ export const AdminUserDetailPage: React.FC = () => {
const deviceCount = user.info?.devices?.total || 0
const deviceOnline = user.info?.devices?.online || 0

const handleViewAsUser = () => {
const viewAs = `/devices?viewAs=${user.id},${encodeURIComponent(user.email || '')}`
if (browser.isElectron || browser.isMobile) {
history.push(viewAs)
return
}
windowOpen(`${window.location.href.split('#')[0]}#${viewAs}`, '_blank')
}

return (
<Container
bodyProps={{ verticalOverflow: true }}
Expand Down
Loading