mirror of
https://github.com/Sonarr/Sonarr
synced 2024-12-26 09:47:39 +00:00
New: Highlight currently installed version on System: Updates
This commit is contained in:
parent
29f905b942
commit
69627911b3
3 changed files with 26 additions and 4 deletions
|
@ -45,7 +45,7 @@
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.branch {
|
.label {
|
||||||
composes: label from 'Components/Label.css';
|
composes: label from 'Components/Label.css';
|
||||||
|
|
||||||
margin-left: 10px;
|
margin-left: 10px;
|
||||||
|
|
|
@ -19,6 +19,7 @@ class Updates extends Component {
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const {
|
const {
|
||||||
|
currentVersion,
|
||||||
isFetching,
|
isFetching,
|
||||||
isPopulated,
|
isPopulated,
|
||||||
updatesError,
|
updatesError,
|
||||||
|
@ -133,13 +134,25 @@ class Updates extends Component {
|
||||||
<div className={styles.date}>{formatDate(update.releaseDate, shortDateFormat)}</div>
|
<div className={styles.date}>{formatDate(update.releaseDate, shortDateFormat)}</div>
|
||||||
|
|
||||||
{
|
{
|
||||||
update.branch !== 'master' &&
|
update.branch === 'master' ?
|
||||||
|
null:
|
||||||
<Label
|
<Label
|
||||||
className={styles.branch}
|
className={styles.label}
|
||||||
>
|
>
|
||||||
{update.branch}
|
{update.branch}
|
||||||
</Label>
|
</Label>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
update.version === currentVersion ?
|
||||||
|
<Label
|
||||||
|
className={styles.label}
|
||||||
|
kind={kinds.SUCCESS}
|
||||||
|
>
|
||||||
|
Currently Installed
|
||||||
|
</Label> :
|
||||||
|
null
|
||||||
|
}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{
|
{
|
||||||
|
@ -189,6 +202,7 @@ class Updates extends Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
Updates.propTypes = {
|
Updates.propTypes = {
|
||||||
|
currentVersion: PropTypes.string.isRequired,
|
||||||
isFetching: PropTypes.bool.isRequired,
|
isFetching: PropTypes.bool.isRequired,
|
||||||
isPopulated: PropTypes.bool.isRequired,
|
isPopulated: PropTypes.bool.isRequired,
|
||||||
updatesError: PropTypes.object,
|
updatesError: PropTypes.object,
|
||||||
|
|
|
@ -12,11 +12,18 @@ import Updates from './Updates';
|
||||||
|
|
||||||
function createMapStateToProps() {
|
function createMapStateToProps() {
|
||||||
return createSelector(
|
return createSelector(
|
||||||
|
(state) => state.app.version,
|
||||||
(state) => state.system.updates,
|
(state) => state.system.updates,
|
||||||
(state) => state.settings.general,
|
(state) => state.settings.general,
|
||||||
createUISettingsSelector(),
|
createUISettingsSelector(),
|
||||||
createCommandExecutingSelector(commandNames.APPLICATION_UPDATE),
|
createCommandExecutingSelector(commandNames.APPLICATION_UPDATE),
|
||||||
(updates, generalSettings, uiSettings, isInstallingUpdate) => {
|
(
|
||||||
|
currentVersion,
|
||||||
|
updates,
|
||||||
|
generalSettings,
|
||||||
|
uiSettings,
|
||||||
|
isInstallingUpdate
|
||||||
|
) => {
|
||||||
const {
|
const {
|
||||||
error: updatesError,
|
error: updatesError,
|
||||||
items
|
items
|
||||||
|
@ -26,6 +33,7 @@ function createMapStateToProps() {
|
||||||
const isPopulated = updates.isPopulated && generalSettings.isPopulated;
|
const isPopulated = updates.isPopulated && generalSettings.isPopulated;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
currentVersion,
|
||||||
isFetching,
|
isFetching,
|
||||||
isPopulated,
|
isPopulated,
|
||||||
updatesError,
|
updatesError,
|
||||||
|
|
Loading…
Reference in a new issue