From 85f369b92fc49d67048d7b102f8d058199205553 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 | 21 +++--- frontend/src/System/Events/LogsTableRow.js | 22 +++--- src/NzbDrone.Core/Localization/Core/en.json | 76 +++++++++++---------- 3 files changed, 62 insertions(+), 57 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: 'logger', - label: 'Component', - isSortable: false, + name: 'time', + label: translate('Time'), + isSortable: true, isVisible: true, isModifiable: false }, { - name: 'message', - label: 'Message', + name: 'logger', + label: translate('Component'), + isSortable: false, isVisible: true, isModifiable: false }, { - name: 'time', - label: 'Time', - isSortable: true, + name: 'message', + 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 ( + + ); + } + if (name === 'logger') { return ( @@ -111,15 +120,6 @@ class LogsTableRow extends Component { ); } - if (name === 'time') { - return ( - - ); - } - if (name === 'actions') { return ( here to find out more about tags in Lidarr.", - "NoUpdatesAreAvailable": "No updates are available", "None": "None", "NoneData": "No albums will be monitored", + "NoTagsHaveBeenAddedYetAddTagsToLinkArtistsWithDelayProfilesRestrictionsOrNotificationsClickLinkTohttpswikiservarrcomlidarrsettingstagshereLinkToFindOutMoreAboutTagsInLidarr": "No tags have been added yet. Add tags to link artists with delay profiles, restrictions, or notifications. Click here to find out more about tags in Lidarr.", "NotificationTriggers": "Notification Triggers", + "NoUpdatesAreAvailable": "No updates are available", "OnDownloadFailureHelpText": "On Download Failure", "OnGrabHelpText": "On Grab", "OnHealthIssueHelpText": "On Health Issue", @@ -425,11 +428,9 @@ "QualityProfiles": "Quality Profiles", "QualitySettings": "Quality Settings", "Queue": "Queue", - "RSSSync": "RSS Sync", - "RSSSyncInterval": "RSS Sync Interval", "Radarr": "Radarr", - "ReadTheWikiForMoreInformation": "Read the Wiki for more information", "Readarr": "Readarr", + "ReadTheWikiForMoreInformation": "Read the Wiki for more information", "Real": "Real", "Reason": "Reason", "RecycleBinCleanupDaysHelpText": "Set to 0 to disable automatic cleanup", @@ -447,15 +448,16 @@ "ReleaseGroup": "Release Group", "ReleaseProfiles": "Release Profiles", "ReleaseRejected": "Release Rejected", + "ReleasesHelpText": "Change release for this album", "ReleaseStatuses": "Release Statuses", "ReleaseWillBeProcessedInterp": "Release will be processed {0}", - "ReleasesHelpText": "Change release for this album", "Reload": "Reload", "RemotePath": "Remote Path", "RemotePathHelpText": "Root path to the directory that the Download Client accesses", "RemotePathMappings": "Remote Path Mappings", "Remove": "Remove", "RemoveCompletedDownloadsHelpText": "Remove imported downloads from download client history", + "RemovedFromTaskQueue": "Removed from task queue", "RemoveFailedDownloadsHelpText": "Remove failed downloads from download client history", "RemoveFilter": "Remove filter", "RemoveFromBlocklist": "Remove from blocklist", @@ -466,7 +468,6 @@ "RemoveSelectedMessageText": "Are you sure you want to remove the selected items from the blocklist?", "RemoveTagExistingTag": "Existing tag", "RemoveTagRemovingTag": "Removing tag", - "RemovedFromTaskQueue": "Removed from task queue", "RenameTracks": "Rename Tracks", "RenameTracksHelpText": "Lidarr will use the existing file name if renaming is disabled", "Reorder": "Reorder", @@ -493,10 +494,9 @@ "RootFolder": "Root Folder", "RootFolderPathHelpText": "Root Folder list items will be added to", "RootFolders": "Root Folders", + "RSSSync": "RSS Sync", + "RSSSyncInterval": "RSS Sync Interval", "RssSyncIntervalHelpText": "Interval in minutes. Set to zero to disable (this will stop all automatic release grabbing)", - "SSLCertPassword": "SSL Cert Password", - "SSLCertPath": "SSL Cert Path", - "SSLPort": "SSL Port", "SceneInformation": "Scene Information", "SceneNumberHasntBeenVerifiedYet": "Scene number hasn't been verified yet", "Scheduled": "Scheduled", @@ -534,6 +534,7 @@ "ShowLastAlbum": "Show Last Album", "ShowMonitored": "Show Monitored", "ShowMonitoredHelpText": "Show monitored status under poster", + "ShownAboveEachColumnWhenWeekIsTheActiveView": "Shown above each column when week is the active view", "ShowName": "Show Name", "ShowPath": "Show Path", "ShowQualityProfile": "Show Quality Profile", @@ -545,7 +546,6 @@ "ShowSizeOnDisk": "Show Size on Disk", "ShowTitleHelpText": "Show artist name under poster", "ShowUnknownArtistItems": "Show Unknown Artist Items", - "ShownAboveEachColumnWhenWeekIsTheActiveView": "Shown above each column when week is the active view", "Size": " Size", "SkipFreeSpaceCheck": "Skip Free Space Check", "SkipFreeSpaceCheckWhenImportingHelpText": "Use when Lidarr is unable to detect free space from your artist root folder", @@ -557,10 +557,13 @@ "Source": "Source", "SourcePath": "Source Path", "SpecificAlbum": "Specific Album", + "SSLCertPassword": "SSL Cert Password", "SslCertPasswordHelpText": "Password for pfx file", "SslCertPasswordHelpTextWarning": "Requires restart to take effect", + "SSLCertPath": "SSL Cert Path", "SslCertPathHelpText": "Path to pfx file", "SslCertPathHelpTextWarning": "Requires restart to take effect", + "SSLPort": "SSL Port", "SslPortHelpTextWarning": "Requires restart to take effect", "StandardTrackFormat": "Standard Track Format", "StartTypingOrSelectAPathBelow": "Start typing or select a path below", @@ -574,12 +577,12 @@ "SupportsSearchvalueSearchIsNotSupportedWithThisIndexer": "Search is not supported with this indexer", "SupportsSearchvalueWillBeUsedWhenAutomaticSearchesArePerformedViaTheUIOrByLidarr": "Will be used when automatic searches are performed via the UI or by Lidarr", "SupportsSearchvalueWillBeUsedWhenInteractiveSearchIsUsed": "Will be used when interactive search is used", - "TBA": "TBA", "TagAudioFilesWithMetadata": "Tag Audio Files with Metadata", "TagIsNotUsedAndCanBeDeleted": "Tag is not used and can be deleted", "Tags": "Tags", "TagsHelpText": "Release profiles will apply to artists with at least one matching tag. Leave blank to apply to all artists", "Tasks": "Tasks", + "TBA": "TBA", "Term": "Term", "TestAll": "Test All", "TestAllClients": "Test All Clients", @@ -588,6 +591,7 @@ "TheAlbumsFilesWillBeDeleted": "The album's files will be deleted.", "TheArtistFolderStrongpathstrongAndAllOfItsContentWillBeDeleted": "The artist folder {path} and all of its content will be deleted.", "ThisWillApplyToAllIndexersPleaseFollowTheRulesSetForthByThem": "This will apply to all indexers, please follow the rules set forth by them", + "Time": "Time", "TimeFormat": "Time Format", "TorrentDelay": "Torrent Delay", "TorrentDelayHelpText": "Delay in minutes to wait before grabbing a torrent", @@ -597,19 +601,18 @@ "Track": "Track", "TrackArtist": "Track Artist", "TrackDownloaded": "Track Downloaded", - "TrackFileCountTrackCountTotalTotalTrackCountInterp": "{0} / {1} (Total: {2})", "TrackFileCounttotalTrackCountTracksDownloadedInterp": "{0}/{1} tracks downloaded", + "TrackFileCountTrackCountTotalTotalTrackCountInterp": "{0} / {1} (Total: {2})", "TrackFilesCountMessage": "No track files", "TrackMissingFromDisk": "Track missing from disk", "TrackNaming": "Track Naming", "TrackNumber": "Track Number", + "Tracks": "Tracks", "TrackStatus": "Track status", "TrackTitle": "Track Title", - "Tracks": "Tracks", "Type": "Type", "UILanguage": "UI Language", "UISettings": "UI Settings", - "URLBase": "URL Base", "UnableToAddANewDownloadClientPleaseTryAgain": "Unable to add a new download client, please try again.", "UnableToAddANewImportListExclusionPleaseTryAgain": "Unable to add a new import list exclusion, please try again.", "UnableToAddANewIndexerPleaseTryAgain": "Unable to add a new indexer, please try again.", @@ -652,18 +655,19 @@ "UpdateAll": "Update all", "UpdateAutomaticallyHelpText": "Automatically download and install updates. You will still be able to install from System: Updates", "UpdateMechanismHelpText": "Use Lidarr's built-in updater or a script", - "UpdateScriptPathHelpText": "Path to a custom script that takes an extracted update package and handle the remainder of the update process", "Updates": "Updates", + "UpdateScriptPathHelpText": "Path to a custom script that takes an extracted update package and handle the remainder of the update process", "UpdatingIsDisabledInsideADockerContainerUpdateTheContainerImageInstead": "Updating is disabled inside a docker container. Update the container image instead.", "UpgradeAllowedHelpText": "If disabled qualities will not be upgraded", "Uptime": "Uptime", + "URLBase": "URL Base", "UrlBaseHelpText": "For reverse proxy support, default is empty", "UrlBaseHelpTextWarning": "Requires restart to take effect", "UseHardlinksInsteadOfCopy": "Use Hardlinks instead of Copy", - "UseProxy": "Use Proxy", "Usenet": "Usenet", "UsenetDelay": "Usenet Delay", "UsenetDelayHelpText": "Delay in minutes to wait before grabbing a release from Usenet", + "UseProxy": "Use Proxy", "UserAgentProvidedByTheAppThatCalledTheAPI": "User-Agent provided by the app that called the API", "Username": "Username", "UsingExternalUpdateMechanismBranchToUseToUpdateLidarr": "Branch to use to update Lidarr",