From 11eaa58c1c205997b4bc0014577f61bb524dacec Mon Sep 17 00:00:00 2001 From: Qstick Date: Sat, 6 Apr 2019 22:50:53 -0400 Subject: [PATCH] Fixed: Highlight currently install version of Lidarr in Updates --- frontend/src/System/Updates/Updates.css | 2 +- frontend/src/System/Updates/Updates.js | 18 ++++++++++++++++-- .../src/System/Updates/UpdatesConnector.js | 10 +++++++++- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/frontend/src/System/Updates/Updates.css b/frontend/src/System/Updates/Updates.css index 86968845c..f563cb743 100644 --- a/frontend/src/System/Updates/Updates.css +++ b/frontend/src/System/Updates/Updates.css @@ -49,7 +49,7 @@ font-size: 16px; } -.branch { +.label { composes: label from '~Components/Label.css'; margin-left: 10px; diff --git a/frontend/src/System/Updates/Updates.js b/frontend/src/System/Updates/Updates.js index ee6b8873e..d35ecd23a 100644 --- a/frontend/src/System/Updates/Updates.js +++ b/frontend/src/System/Updates/Updates.js @@ -19,6 +19,7 @@ class Updates extends Component { render() { const { + currentVersion, isFetching, isPopulated, error, @@ -119,13 +120,25 @@ class Updates extends Component {
{formatDate(update.releaseDate, shortDateFormat)}
{ - update.branch !== 'master' && + update.branch === 'master' ? + null : } + + { + update.version === currentVersion ? + : + null + } { @@ -168,6 +181,7 @@ class Updates extends Component { } Updates.propTypes = { + currentVersion: PropTypes.string.isRequired, isFetching: PropTypes.bool.isRequired, isPopulated: PropTypes.bool.isRequired, error: PropTypes.object, diff --git a/frontend/src/System/Updates/UpdatesConnector.js b/frontend/src/System/Updates/UpdatesConnector.js index 638a9790a..7c40069d4 100644 --- a/frontend/src/System/Updates/UpdatesConnector.js +++ b/frontend/src/System/Updates/UpdatesConnector.js @@ -12,11 +12,18 @@ import Updates from './Updates'; function createMapStateToProps() { return createSelector( + (state) => state.app.version, (state) => state.system.updates, createUISettingsSelector(), createCommandExecutingSelector(commandNames.APPLICATION_UPDATE), createSystemStatusSelector(), - (updates, uiSettings, isInstallingUpdate, systemStatus) => { + ( + currentVersion, + updates, + uiSettings, + isInstallingUpdate, + systemStatus + ) => { const { isFetching, isPopulated, @@ -25,6 +32,7 @@ function createMapStateToProps() { } = updates; return { + currentVersion, isFetching, isPopulated, error,