feat: remove status section of the machine status table
fix: remove unnecessary JSX fragment
This commit is contained in:
parent
71cf10f73c
commit
ae92b583f6
2 changed files with 255 additions and 176 deletions
|
|
@ -1,16 +1,16 @@
|
||||||
import { useMutation, useLazyQuery } from '@apollo/react-hooks'
|
import { useMutation, useLazyQuery } from '@apollo/react-hooks'
|
||||||
import { Grid, Divider } from '@material-ui/core'
|
import { Grid /*, Divider */ } from '@material-ui/core'
|
||||||
import { makeStyles } from '@material-ui/core/styles'
|
import { makeStyles } from '@material-ui/core/styles'
|
||||||
import gql from 'graphql-tag'
|
import gql from 'graphql-tag'
|
||||||
import moment from 'moment'
|
import moment from 'moment'
|
||||||
import React, { useState } from 'react'
|
import React, { useState } from 'react'
|
||||||
|
|
||||||
import { ConfirmDialog } from 'src/components/ConfirmDialog'
|
import { ConfirmDialog } from 'src/components/ConfirmDialog'
|
||||||
import { Status } from 'src/components/Status'
|
// import { Status } from 'src/components/Status'
|
||||||
import ActionButton from 'src/components/buttons/ActionButton'
|
import ActionButton from 'src/components/buttons/ActionButton'
|
||||||
import { ReactComponent as EditReversedIcon } from 'src/styling/icons/button/edit/white.svg'
|
import { ReactComponent as EditReversedIcon } from 'src/styling/icons/button/edit/white.svg'
|
||||||
import { ReactComponent as EditIcon } from 'src/styling/icons/button/edit/zodiac.svg'
|
import { ReactComponent as EditIcon } from 'src/styling/icons/button/edit/zodiac.svg'
|
||||||
import { ReactComponent as LinkIcon } from 'src/styling/icons/button/link/zodiac.svg'
|
// import { ReactComponent as LinkIcon } from 'src/styling/icons/button/link/zodiac.svg'
|
||||||
import { ReactComponent as RebootReversedIcon } from 'src/styling/icons/button/reboot/white.svg'
|
import { ReactComponent as RebootReversedIcon } from 'src/styling/icons/button/reboot/white.svg'
|
||||||
import { ReactComponent as RebootIcon } from 'src/styling/icons/button/reboot/zodiac.svg'
|
import { ReactComponent as RebootIcon } from 'src/styling/icons/button/reboot/zodiac.svg'
|
||||||
import { ReactComponent as ShutdownReversedIcon } from 'src/styling/icons/button/shut down/white.svg'
|
import { ReactComponent as ShutdownReversedIcon } from 'src/styling/icons/button/shut down/white.svg'
|
||||||
|
|
@ -42,16 +42,16 @@ const MACHINE = gql`
|
||||||
}
|
}
|
||||||
`
|
`
|
||||||
|
|
||||||
const supportArtices = [
|
// const supportArtices = [
|
||||||
{
|
// {
|
||||||
// Default article for non-maped statuses
|
// // Default article for non-maped statuses
|
||||||
code: undefined,
|
// code: undefined,
|
||||||
label: 'Troubleshooting',
|
// label: 'Troubleshooting',
|
||||||
article:
|
// article:
|
||||||
'https://support.lamassu.is/hc/en-us/categories/115000075249-Troubleshooting'
|
// 'https://support.lamassu.is/hc/en-us/categories/115000075249-Troubleshooting'
|
||||||
}
|
// }
|
||||||
// TODO add Stuck and Fully Functional statuses articles for the new-admins
|
// // TODO add Stuck and Fully Functional statuses articles for the new-admins
|
||||||
]
|
// ]
|
||||||
|
|
||||||
const isStaticState = machineState => {
|
const isStaticState = machineState => {
|
||||||
if (!machineState) {
|
if (!machineState) {
|
||||||
|
|
@ -71,8 +71,8 @@ const isStaticState = machineState => {
|
||||||
return staticStates.includes(machineState)
|
return staticStates.includes(machineState)
|
||||||
}
|
}
|
||||||
|
|
||||||
const article = ({ code: status }) =>
|
// const article = ({ code: status }) =>
|
||||||
supportArtices.find(({ code: article }) => article === status)
|
// supportArtices.find(({ code: article }) => article === status)
|
||||||
|
|
||||||
const useLStyles = makeStyles(labelStyles)
|
const useLStyles = makeStyles(labelStyles)
|
||||||
|
|
||||||
|
|
@ -142,9 +142,8 @@ const MachineDetailsRow = ({ it: machine, onActionSuccess }) => {
|
||||||
const disabled = !!(action?.command === 'restartServices' && loadingEvents)
|
const disabled = !!(action?.command === 'restartServices' && loadingEvents)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
|
||||||
<Container className={classes.wrapper}>
|
<Container className={classes.wrapper}>
|
||||||
<Item xs={5}>
|
{/* <Item xs={5}>
|
||||||
<Container>
|
<Container>
|
||||||
<Item>
|
<Item>
|
||||||
<Label>Statuses</Label>
|
<Label>Statuses</Label>
|
||||||
|
|
@ -180,7 +179,7 @@ const MachineDetailsRow = ({ it: machine, onActionSuccess }) => {
|
||||||
orientation="vertical"
|
orientation="vertical"
|
||||||
flexItem
|
flexItem
|
||||||
className={classes.separator}
|
className={classes.separator}
|
||||||
/>
|
/> */}
|
||||||
<ConfirmDialog
|
<ConfirmDialog
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
open={confirmDialogOpen}
|
open={confirmDialogOpen}
|
||||||
|
|
@ -207,7 +206,7 @@ const MachineDetailsRow = ({ it: machine, onActionSuccess }) => {
|
||||||
/>
|
/>
|
||||||
<Item xs>
|
<Item xs>
|
||||||
<Container className={classes.row}>
|
<Container className={classes.row}>
|
||||||
<Item xs={4}>
|
<Item xs={2}>
|
||||||
<Label>Machine Model</Label>
|
<Label>Machine Model</Label>
|
||||||
<span>{machine.model}</span>
|
<span>{machine.model}</span>
|
||||||
</Item>
|
</Item>
|
||||||
|
|
@ -217,9 +216,7 @@ const MachineDetailsRow = ({ it: machine, onActionSuccess }) => {
|
||||||
{moment(machine.pairedAt).format('YYYY-MM-DD HH:mm:ss')}
|
{moment(machine.pairedAt).format('YYYY-MM-DD HH:mm:ss')}
|
||||||
</span>
|
</span>
|
||||||
</Item>
|
</Item>
|
||||||
</Container>
|
<Item xs={6}>
|
||||||
<Container>
|
|
||||||
<Item>
|
|
||||||
<Label>Actions</Label>
|
<Label>Actions</Label>
|
||||||
<div className={classes.stack}>
|
<div className={classes.stack}>
|
||||||
<ActionButton
|
<ActionButton
|
||||||
|
|
@ -299,9 +296,89 @@ const MachineDetailsRow = ({ it: machine, onActionSuccess }) => {
|
||||||
</div>
|
</div>
|
||||||
</Item>
|
</Item>
|
||||||
</Container>
|
</Container>
|
||||||
|
{/* <Container>
|
||||||
|
<Item>
|
||||||
|
<Label>Actions</Label>
|
||||||
|
<div className={classes.stack}>
|
||||||
|
<ActionButton
|
||||||
|
className={classes.mr}
|
||||||
|
disabled={loading}
|
||||||
|
color="primary"
|
||||||
|
Icon={EditIcon}
|
||||||
|
InverseIcon={EditReversedIcon}
|
||||||
|
onClick={() =>
|
||||||
|
setAction({
|
||||||
|
command: 'rename',
|
||||||
|
display: 'Rename',
|
||||||
|
confirmationMessage: 'Write the new name for this machine'
|
||||||
|
})
|
||||||
|
}>
|
||||||
|
Rename
|
||||||
|
</ActionButton>
|
||||||
|
<ActionButton
|
||||||
|
color="primary"
|
||||||
|
className={classes.mr}
|
||||||
|
Icon={UnpairIcon}
|
||||||
|
InverseIcon={UnpairReversedIcon}
|
||||||
|
disabled={loading}
|
||||||
|
onClick={() =>
|
||||||
|
setAction({
|
||||||
|
command: 'unpair',
|
||||||
|
display: 'Unpair'
|
||||||
|
})
|
||||||
|
}>
|
||||||
|
Unpair
|
||||||
|
</ActionButton>
|
||||||
|
<ActionButton
|
||||||
|
color="primary"
|
||||||
|
className={classes.mr}
|
||||||
|
Icon={RebootIcon}
|
||||||
|
InverseIcon={RebootReversedIcon}
|
||||||
|
disabled={loading}
|
||||||
|
onClick={() =>
|
||||||
|
setAction({
|
||||||
|
command: 'reboot',
|
||||||
|
display: 'Reboot'
|
||||||
|
})
|
||||||
|
}>
|
||||||
|
Reboot
|
||||||
|
</ActionButton>
|
||||||
|
<ActionButton
|
||||||
|
className={classes.mr}
|
||||||
|
disabled={loading}
|
||||||
|
color="primary"
|
||||||
|
Icon={ShutdownIcon}
|
||||||
|
InverseIcon={ShutdownReversedIcon}
|
||||||
|
onClick={() =>
|
||||||
|
setAction({
|
||||||
|
command: 'shutdown',
|
||||||
|
display: 'Shutdown',
|
||||||
|
message:
|
||||||
|
'In order to bring it back online, the machine will need to be visited and its power reset.'
|
||||||
|
})
|
||||||
|
}>
|
||||||
|
Shutdown
|
||||||
|
</ActionButton>
|
||||||
|
<ActionButton
|
||||||
|
color="primary"
|
||||||
|
className={classes.inlineChip}
|
||||||
|
Icon={RebootIcon}
|
||||||
|
InverseIcon={RebootReversedIcon}
|
||||||
|
disabled={loading}
|
||||||
|
onClick={() => {
|
||||||
|
fetchMachineEvents()
|
||||||
|
setAction({
|
||||||
|
command: 'restartServices',
|
||||||
|
display: 'Restart services for'
|
||||||
|
})
|
||||||
|
}}>
|
||||||
|
Restart Services
|
||||||
|
</ActionButton>
|
||||||
|
</div>
|
||||||
|
</Item>
|
||||||
|
</Container> */}
|
||||||
</Item>
|
</Item>
|
||||||
</Container>
|
</Container>
|
||||||
</>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -29,14 +29,16 @@ const machineDetailsStyles = {
|
||||||
},
|
},
|
||||||
wrapper: {
|
wrapper: {
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
marginTop: 24,
|
// marginTop: 24,
|
||||||
marginBottom: 32,
|
// marginBottom: 32,
|
||||||
|
marginTop: 12,
|
||||||
|
marginBottom: 16,
|
||||||
fontSize: fontSize4
|
fontSize: fontSize4
|
||||||
},
|
},
|
||||||
row: {
|
row: {
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
flexDirection: 'row',
|
flexDirection: 'row'
|
||||||
marginBottom: 36
|
// marginBottom: 36
|
||||||
},
|
},
|
||||||
list: {
|
list: {
|
||||||
padding: 0,
|
padding: 0,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue