From c14ef7bee7477ad5d29498f1cba94267eb11daf0 Mon Sep 17 00:00:00 2001 From: Robin Dadswell <19610103+RobinDadswell@users.noreply.github.com> Date: Sat, 23 Oct 2021 21:33:41 +0100 Subject: [PATCH] Fixed: Time column is first column on events page [common] --- frontend/src/Store/Actions/systemActions.js | 14 ++++++------- frontend/src/System/Events/LogsTableRow.js | 22 ++++++++++----------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/frontend/src/Store/Actions/systemActions.js b/frontend/src/Store/Actions/systemActions.js index 94221ed95..4910e462d 100644 --- a/frontend/src/Store/Actions/systemActions.js +++ b/frontend/src/Store/Actions/systemActions.js @@ -87,6 +87,13 @@ export const defaultState = { isVisible: true, isModifiable: false }, + { + name: 'time', + label: translate('Time'), + isSortable: true, + isVisible: true, + isModifiable: false + }, { name: 'logger', label: translate('Component'), @@ -100,13 +107,6 @@ export const defaultState = { isVisible: true, isModifiable: false }, - { - name: 'time', - label: translate('Time'), - isSortable: true, - isVisible: true, - isModifiable: false - }, { name: 'actions', columnLabel: translate('Actions'), diff --git a/frontend/src/System/Events/LogsTableRow.js b/frontend/src/System/Events/LogsTableRow.js index ab7bf8606..bebf80184 100644 --- a/frontend/src/System/Events/LogsTableRow.js +++ b/frontend/src/System/Events/LogsTableRow.js @@ -58,9 +58,9 @@ class LogsTableRow extends Component { render() { const { level, + time, logger, message, - time, exception, columns } = this.props; @@ -96,6 +96,15 @@ class LogsTableRow extends Component { ); } + if (name === 'time') { + return ( + + ); + } + if (name === 'logger') { return ( @@ -112,15 +121,6 @@ class LogsTableRow extends Component { ); } - if (name === 'time') { - return ( - - ); - } - if (name === 'actions') { return (