lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed when the empty message should appear

Browse source
This commit is contained in:
José Oliveira 2021-02-04 13:44:29 +00:00 • committed by Josh Harvey
parent d2fd305329
commit 037f383540
2 changed files with 30 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

31
new-lamassu-admin/src/pages/MachineLogs.js
View file

@ -16,7 +16,7 @@ import {
TableBody,
TableCell
} from 'src/components/table'
import { Info3 } from 'src/components/typography'
import { Info3, H4 } from 'src/components/typography'
import styles from './Logs.styles'
@ -74,7 +74,7 @@ const Logs = () => {
const { data: machineResponse } = useQuery(GET_MACHINES)
const { data: logsResponse } = useQuery(GET_MACHINE_LOGS, {
const { data: logsResponse, loading } = useQuery(GET_MACHINE_LOGS, {
variables: { deviceId, limit: NUM_LOG_RESULTS },
skip: !selected,
onCompleted: () => setSaveMessage('')
@ -123,22 +123,19 @@ const Logs = () => {
<TableHeader className={classes.fillColumn} />
</TableRow>
</TableHead>
{logsResponse &&
(!logsResponse.machineLogs.length ? (
<p>{'No activity so far'}</p>
) : (
<TableBody>
{logsResponse &&
logsResponse.machineLogs.map((log, idx) => (
<TableRow key={idx} size="sm">
<TableCell>{formatDate(log.timestamp)}</TableCell>
<TableCell>{log.logLevel}</TableCell>
<TableCell>{log.message}</TableCell>
</TableRow>
))}
</TableBody>
))}
<TableBody>
{logsResponse &&
logsResponse.machineLogs.map((log, idx) => (
<TableRow key={idx} size="sm">
<TableCell>{formatDate(log.timestamp)}</TableCell>
<TableCell>{log.logLevel}</TableCell>
<TableCell>{log.message}</TableCell>
</TableRow>
))}
</TableBody>
</Table>
{loading && <H4>{'Loading...'}</H4>}
{!loading && !logsResponse && <H4>{'No activity so far'}</H4>}
</div>
</div>
</>

34
new-lamassu-admin/src/pages/ServerLogs.js
View file

@ -17,7 +17,7 @@ import {
TableBody,
TableCell
} from 'src/components/table'
import { Info3 } from 'src/components/typography'
import { Info3, H4 } from 'src/components/typography'
import typographyStyles from 'src/components/typography/styles'
import { offColor } from 'src/styling/variables'
import { startCase } from 'src/utils/string'
@ -91,7 +91,7 @@ const Logs = () => {
const [saveMessage, setSaveMessage] = useState(null)
const [logLevel, setLogLevel] = useState(SHOW_ALL)
const { data } = useQuery(GET_DATA, {
const { data, loading } = useQuery(GET_DATA, {
onCompleted: () => setSaveMessage(''),
variables: {
limit: NUM_LOG_RESULTS
@ -174,24 +174,22 @@ const Logs = () => {
</TableHead>
<TableBody>
{data &&
(!data.serverLogs.length ? (
<p>{'No activity so far'} </p>
) : (
data.serverLogs
.filter(
log =>
logLevel === SHOW_ALL || log.logLevel === logLevel.code
)
.map((log, idx) => (
<TableRow key={idx} size="sm">
<TableCell>{formatDate(log.timestamp)}</TableCell>
<TableCell>{log.logLevel}</TableCell>
<TableCell>{log.message}</TableCell>
</TableRow>
))
))}
data.serverLogs
.filter(
log =>
logLevel === SHOW_ALL || log.logLevel === logLevel.code
)
.map((log, idx) => (
<TableRow key={idx} size="sm">
<TableCell>{formatDate(log.timestamp)}</TableCell>
<TableCell>{log.logLevel}</TableCell>
<TableCell>{log.message}</TableCell>
</TableRow>
))}
</TableBody>
</Table>
{loading && <H4>{'Loading...'}</H4>}
{!loading && !data && <H4>{'No activity so far'}</H4>}
</div>
</div>
</>