github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-19 21:13:28 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed: Time column is first column on events page

Browse source 
(cherry picked from commit c14ef7bee7477ad5d29498f1cba94267eb11daf0)
This commit is contained in:
Robin Dadswell 2021-10-23 21:33:41 +01:00 • committed by Qstick
commit 85f369b92f
3 changed files with 64 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

23
frontend/src/Store/Actions/systemActions.js
View file

@ -4,6 +4,7 @@ import { setAppValue } from 'Store/Actions/appActions';
import { createThunk, handleThunks } from 'Store/thunks';
import createAjaxRequest from 'Utilities/createAjaxRequest';
import serverSideCollectionHandlers from 'Utilities/serverSideCollectionHandlers';
import translate from 'Utilities/String/translate';
import { pingServer } from './appActions';
import { set } from './baseActions';
import createFetchHandler from './Creators/createFetchHandler';
@ -81,34 +82,34 @@ export const defaultState = {
columns: [
{
name: 'level',
columnLabel: 'Level',
columnLabel: translate('Level'),
isSortable: false,
isVisible: true,
isModifiable: false
},
{
name: 'time',
label: translate('Time'),
isSortable: true,
isVisible: true,
isModifiable: false
},
{
name: 'logger',
label: 'Component',
label: translate('Component'),
isSortable: false,
isVisible: true,
isModifiable: false
},
{
name: 'message',
label: 'Message',
isVisible: true,
isModifiable: false
},
{
name: 'time',
label: 'Time',
isSortable: true,
label: translate('Message'),
isVisible: true,
isModifiable: false
},
{
name: 'actions',
columnLabel: 'Actions',
columnLabel: translate('Actions'),
isSortable: true,
isVisible: true,
isModifiable: false

22
frontend/src/System/Events/LogsTableRow.js
View file

@ -58,9 +58,9 @@ class LogsTableRow extends Component {
render() {
const {
level,
time,
logger,
message,
time,
exception,
columns
} = this.props;
@ -95,6 +95,15 @@ class LogsTableRow extends Component {
);
}
if (name === 'time') {
return (
<RelativeDateCellConnector
key={name}
date={time}
/>
);
}
if (name === 'logger') {
return (
<TableRowCell key={name}>
@ -111,15 +120,6 @@ class LogsTableRow extends Component {
);
}
if (name === 'time') {
return (
<RelativeDateCellConnector
key={name}
date={time}
/>
);
}
if (name === 'actions') {
return (
<TableRowCell
@ -147,9 +147,9 @@ class LogsTableRow extends Component {
LogsTableRow.propTypes = {
level: PropTypes.string.isRequired,
time: PropTypes.string.isRequired,
logger: PropTypes.string.isRequired,
message: PropTypes.string.isRequired,
time: PropTypes.string.isRequired,
exception: PropTypes.string,
columns: PropTypes.arrayOf(PropTypes.object).isRequired
};