From c0106592eb6482df60e200074f55cd594621d4cd Mon Sep 17 00:00:00 2001 From: Cesar <26280794+csrapr@users.noreply.github.com> Date: Wed, 6 Jan 2021 17:03:44 +0000 Subject: [PATCH] Feat: link from alert to some page --- .../src/pages/Dashboard/Alerts/Alerts.js | 3 +-- .../pages/Dashboard/Alerts/Alerts.styles.js | 4 ++++ .../src/pages/Dashboard/Alerts/AlertsTable.js | 13 ++++++++++++ .../src/pages/Dashboard/Dashboard.js | 21 ------------------- new-lamassu-admin/src/routing/routes.js | 1 - 5 files changed, 18 insertions(+), 24 deletions(-) diff --git a/new-lamassu-admin/src/pages/Dashboard/Alerts/Alerts.js b/new-lamassu-admin/src/pages/Dashboard/Alerts/Alerts.js index 1c24124c..d0ad8adb 100644 --- a/new-lamassu-admin/src/pages/Dashboard/Alerts/Alerts.js +++ b/new-lamassu-admin/src/pages/Dashboard/Alerts/Alerts.js @@ -33,8 +33,7 @@ const GET_ALERTS = gql` const useStyles = makeStyles(styles) -const Alerts = props => { - const { cardState, setRightSideState } = props +const Alerts = ({ cardState, setRightSideState }) => { const classes = useStyles() const [showAllItems, setShowAllItems] = useState(false) const { data } = useQuery(GET_ALERTS) diff --git a/new-lamassu-admin/src/pages/Dashboard/Alerts/Alerts.styles.js b/new-lamassu-admin/src/pages/Dashboard/Alerts/Alerts.styles.js index e9043c2e..8b0d0c5f 100644 --- a/new-lamassu-admin/src/pages/Dashboard/Alerts/Alerts.styles.js +++ b/new-lamassu-admin/src/pages/Dashboard/Alerts/Alerts.styles.js @@ -85,6 +85,10 @@ const styles = { }, listItemText: { margin: '8px 0 8px 0' + }, + linkIcon: { + marginLeft: 'auto', + cursor: 'pointer' } } export default styles diff --git a/new-lamassu-admin/src/pages/Dashboard/Alerts/AlertsTable.js b/new-lamassu-admin/src/pages/Dashboard/Alerts/AlertsTable.js index 713ffc41..f5a8c416 100644 --- a/new-lamassu-admin/src/pages/Dashboard/Alerts/AlertsTable.js +++ b/new-lamassu-admin/src/pages/Dashboard/Alerts/AlertsTable.js @@ -2,8 +2,10 @@ import { withStyles, makeStyles } from '@material-ui/core' import List from '@material-ui/core/List' import ListItem from '@material-ui/core/ListItem' import React from 'react' +import { useHistory } from 'react-router-dom' import { P } from 'src/components/typography/index' 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 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 history = useHistory() const classes = useStyles() return ( @@ -37,6 +46,10 @@ const AlertsTable = ({ numToRender, alerts, machines }) => {

{`${alert.message}${alert .detail.deviceId && ' - ' + machines[alert.detail.deviceId]}`}

+ history.push(links[alert.type] || '/dashboard')} + /> ) } else return null diff --git a/new-lamassu-admin/src/pages/Dashboard/Dashboard.js b/new-lamassu-admin/src/pages/Dashboard/Dashboard.js index c6176eea..c345be9c 100644 --- a/new-lamassu-admin/src/pages/Dashboard/Dashboard.js +++ b/new-lamassu-admin/src/pages/Dashboard/Dashboard.js @@ -1,8 +1,6 @@ -import { useQuery } from '@apollo/react-hooks' import Grid from '@material-ui/core/Grid' import { makeStyles } from '@material-ui/core/styles' import classnames from 'classnames' -import gql from 'graphql-tag' import React from 'react' import TitleSection from 'src/components/layout/TitleSection' 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 RightSide from './RightSide' const useStyles = makeStyles(styles) -const GET_ALERTS = gql` - query getAlerts { - alerts { - id - type - detail - message - created - read - valid - } - machines { - deviceId - name - } - } -` const Dashboard = () => { - const { data } = useQuery(GET_ALERTS) const classes = useStyles() - console.log(data) return ( <> diff --git a/new-lamassu-admin/src/routing/routes.js b/new-lamassu-admin/src/routing/routes.js index 9bb29fde..d7714a12 100644 --- a/new-lamassu-admin/src/routing/routes.js +++ b/new-lamassu-admin/src/routing/routes.js @@ -303,7 +303,6 @@ const Routes = () => { - {/* */}