Feat: link from alert to some page

This commit is contained in:
Cesar 2021-01-06 17:03:44 +00:00 committed by Josh Harvey
parent b8d55e82c4
commit c0106592eb
5 changed files with 18 additions and 24 deletions

View file

@ -33,8 +33,7 @@ const GET_ALERTS = gql`
const useStyles = makeStyles(styles) const useStyles = makeStyles(styles)
const Alerts = props => { const Alerts = ({ cardState, setRightSideState }) => {
const { cardState, setRightSideState } = props
const classes = useStyles() const classes = useStyles()
const [showAllItems, setShowAllItems] = useState(false) const [showAllItems, setShowAllItems] = useState(false)
const { data } = useQuery(GET_ALERTS) const { data } = useQuery(GET_ALERTS)

View file

@ -85,6 +85,10 @@ const styles = {
}, },
listItemText: { listItemText: {
margin: '8px 0 8px 0' margin: '8px 0 8px 0'
},
linkIcon: {
marginLeft: 'auto',
cursor: 'pointer'
} }
} }
export default styles export default styles

View file

@ -2,8 +2,10 @@ import { withStyles, makeStyles } from '@material-ui/core'
import List from '@material-ui/core/List' import List from '@material-ui/core/List'
import ListItem from '@material-ui/core/ListItem' import ListItem from '@material-ui/core/ListItem'
import React from 'react' import React from 'react'
import { useHistory } from 'react-router-dom'
import { P } from 'src/components/typography/index' import { P } from 'src/components/typography/index'
import { ReactComponent as Wrench } from 'src/styling/icons/action/wrench/zodiac.svg' import { ReactComponent as Wrench } from 'src/styling/icons/action/wrench/zodiac.svg'
import { ReactComponent as LinkIcon } from 'src/styling/icons/button/link/zodiac.svg'
import { ReactComponent as CashBoxEmpty } from 'src/styling/icons/cassettes/cashbox-empty.svg' import { ReactComponent as CashBoxEmpty } from 'src/styling/icons/cassettes/cashbox-empty.svg'
import { ReactComponent as WarningIcon } from 'src/styling/icons/warning-icon/tomato.svg' import { ReactComponent as WarningIcon } from 'src/styling/icons/warning-icon/tomato.svg'
@ -23,7 +25,14 @@ const icons = {
) )
} }
const links = {
error: '/maintenance/machine-status',
fiatBalance: '/maintenance/cash-cassettes',
cryptoBalance: '/maintenance/funding'
}
const AlertsTable = ({ numToRender, alerts, machines }) => { const AlertsTable = ({ numToRender, alerts, machines }) => {
const history = useHistory()
const classes = useStyles() const classes = useStyles()
return ( return (
<List dense className={classes.table}> <List dense className={classes.table}>
@ -37,6 +46,10 @@ const AlertsTable = ({ numToRender, alerts, machines }) => {
<P className={classes.listItemText}>{`${alert.message}${alert <P className={classes.listItemText}>{`${alert.message}${alert
.detail.deviceId && .detail.deviceId &&
' - ' + machines[alert.detail.deviceId]}`}</P> ' - ' + machines[alert.detail.deviceId]}`}</P>
<LinkIcon
className={classes.linkIcon}
onClick={() => history.push(links[alert.type] || '/dashboard')}
/>
</StyledListItem> </StyledListItem>
) )
} else return null } else return null

View file

@ -1,8 +1,6 @@
import { useQuery } from '@apollo/react-hooks'
import Grid from '@material-ui/core/Grid' import Grid from '@material-ui/core/Grid'
import { makeStyles } from '@material-ui/core/styles' import { makeStyles } from '@material-ui/core/styles'
import classnames from 'classnames' import classnames from 'classnames'
import gql from 'graphql-tag'
import React from 'react' import React from 'react'
import TitleSection from 'src/components/layout/TitleSection' import TitleSection from 'src/components/layout/TitleSection'
import { ReactComponent as TxInIcon } from 'src/styling/icons/direction/cash-in.svg' import { ReactComponent as TxInIcon } from 'src/styling/icons/direction/cash-in.svg'
@ -13,28 +11,9 @@ import Footer from './Footer'
import LeftSide from './LeftSide' import LeftSide from './LeftSide'
import RightSide from './RightSide' import RightSide from './RightSide'
const useStyles = makeStyles(styles) const useStyles = makeStyles(styles)
const GET_ALERTS = gql`
query getAlerts {
alerts {
id
type
detail
message
created
read
valid
}
machines {
deviceId
name
}
}
`
const Dashboard = () => { const Dashboard = () => {
const { data } = useQuery(GET_ALERTS)
const classes = useStyles() const classes = useStyles()
console.log(data)
return ( return (
<> <>

View file

@ -303,7 +303,6 @@ const Routes = () => {
<Route exact path="/"> <Route exact path="/">
<Redirect to={{ pathname: '/transactions' }} /> <Redirect to={{ pathname: '/transactions' }} />
</Route> </Route>
{/* <Route path="/dashboard" /> */}
<Route path={'/dashboard'}> <Route path={'/dashboard'}>
<Transition <Transition
className={classes.wrapper} className={classes.wrapper}