From 225f0b310a319856933a52baa23cc5886fec592a 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

(cherry picked from commit c14ef7bee7477ad5d29498f1cba94267eb11daf0)
---
 frontend/src/Store/Actions/systemActions.js | 23 +++++++++++----------
 frontend/src/System/Events/LogsTableRow.js  | 22 ++++++++++----------
 src/NzbDrone.Core/Localization/Core/en.json |  7 +++++--
 3 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/frontend/src/Store/Actions/systemActions.js b/frontend/src/Store/Actions/systemActions.js
index 61b25d9bb..eac93e69c 100644
--- a/frontend/src/Store/Actions/systemActions.js
+++ b/frontend/src/Store/Actions/systemActions.js
@@ -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
diff --git a/frontend/src/System/Events/LogsTableRow.js b/frontend/src/System/Events/LogsTableRow.js
index cf485941b..5eca0f7db 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;
@@ -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
 };
diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json
index 6d1da270e..5df1e43f6 100644
--- a/src/NzbDrone.Core/Localization/Core/en.json
+++ b/src/NzbDrone.Core/Localization/Core/en.json
@@ -117,6 +117,7 @@
   "CollapseMultipleBooksHelpText": "Collapse multiple books releasing on the same day",
   "Columns": "Columns",
   "CompletedDownloadHandling": "Completed Download Handling",
+  "Component": "Component",
   "Connections": "Connections",
   "ConnectSettings": "Connect Settings",
   "ConsoleLogLevel": "Console Log Level",
@@ -317,6 +318,7 @@
   "Language": "Language",
   "LatestBook": "Latest Book",
   "LaunchBrowserHelpText": " Open a web browser and navigate to Readarr homepage on app start.",
+  "Level": "Level",
   "LibraryHelpText": "Calibre content server library name.  Leave blank for default.",
   "LoadingBookFilesFailed": "Loading book files failed",
   "LoadingBooksFailed": "Loading books failed",
@@ -404,10 +406,10 @@
   "NoMinimumForAnyRuntime": "No minimum for any runtime",
   "NoName": "Do not show name",
   "None": "None",
-  "NotAvailable": "Not Available",
-  "NotMonitored": "Not Monitored",
   "NoTagsHaveBeenAddedYet": "No tags have been added yet. Add tags to link authors with delay profiles, restrictions, or notifications. Click {0} to find out more about tags in Readarr.",
+  "NotAvailable": "Not Available",
   "NotificationTriggers": "Notification Triggers",
+  "NotMonitored": "Not Monitored",
   "NoUpdatesAreAvailable": "No updates are available",
   "OnBookRetagHelpText": "On Book Retag",
   "OnDownloadFailureHelpText": "On Download Failure",
@@ -639,6 +641,7 @@
   "TheAuthorFolderAndAllOfItsContentWillBeDeleted": "The author folder {0} and all of its content will be deleted.",
   "TheBooksFilesWillBeDeleted": "The book's files will be deleted.",
   "ThisWillApplyToAllIndexersPleaseFollowTheRulesSetForthByThem": "This will apply to all indexers, please follow the rules set forth by them",
+  "Time": "Time",
   "TimeFormat": "Time Format",
   "Timeleft": "Time Left",
   "Title": "Title",