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

Added a message when no logs found

Browse source
This commit is contained in:
José Oliveira 2021-01-29 15:37:08 +00:00 • committed by Josh Harvey
parent ae92b583f6
commit d2fd305329
2 changed files with 31 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -123,16 +123,21 @@ const Logs = () => {
<TableHeader className={classes.fillColumn} /> <TableHeader className={classes.fillColumn} />
</TableRow> </TableRow>
</TableHead> </TableHead>
<TableBody> {logsResponse &&
{logsResponse && (!logsResponse.machineLogs.length ? (
logsResponse.machineLogs.map((log, idx) => ( <p>{'No activity so far'}</p>
<TableRow key={idx} size="sm"> ) : (
<TableCell>{formatDate(log.timestamp)}</TableCell> <TableBody>
<TableCell>{log.logLevel}</TableCell> {logsResponse &&
<TableCell>{log.message}</TableCell> logsResponse.machineLogs.map((log, idx) => (
</TableRow> <TableRow key={idx} size="sm">
))} <TableCell>{formatDate(log.timestamp)}</TableCell>
</TableBody> <TableCell>{log.logLevel}</TableCell>
<TableCell>{log.message}</TableCell>
</TableRow>
))}
</TableBody>
))}
</Table> </Table>
</div> </div>
</div> </div>

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

@ -174,18 +174,22 @@ const Logs = () => {
</TableHead> </TableHead>
<TableBody> <TableBody>
{data && {data &&
data.serverLogs (!data.serverLogs.length ? (
.filter( <p>{'No activity so far'} </p>
log => ) : (
logLevel === SHOW_ALL || log.logLevel === logLevel.code data.serverLogs
) .filter(
.map((log, idx) => ( log =>
<TableRow key={idx} size="sm"> logLevel === SHOW_ALL || log.logLevel === logLevel.code
<TableCell>{formatDate(log.timestamp)}</TableCell> )
<TableCell>{log.logLevel}</TableCell> .map((log, idx) => (
<TableCell>{log.message}</TableCell> <TableRow key={idx} size="sm">
</TableRow> <TableCell>{formatDate(log.timestamp)}</TableCell>
))} <TableCell>{log.logLevel}</TableCell>
<TableCell>{log.message}</TableCell>
</TableRow>
))
))}
</TableBody> </TableBody>
</Table> </Table>
</div> </div>