Fix updated version check
This commit is contained in:
@@ -16,7 +16,7 @@ import {unmountAll} from './mount_actions';
|
||||
import {
|
||||
checkNewReleases,
|
||||
getIPCRenderer,
|
||||
getNewReleases
|
||||
getNewReleases, getSelectedVersionFromState
|
||||
} from '../../utils';
|
||||
|
||||
export const CLEAR_UI_UPGRADE = 'relver/clearUIUpgrade';
|
||||
@@ -130,7 +130,7 @@ export const loadReleases = () => {
|
||||
const storedReleases = localStorage.getItem('releases');
|
||||
let newReleases = [];
|
||||
if (storedReleases && (storedReleases.length > 0)) {
|
||||
newReleases = getNewReleases(JSON.parse(storedReleases).VersionLookup, versionLookup);
|
||||
newReleases = getNewReleases(JSON.parse(storedReleases).VersionLookup, versionLookup, getSelectedVersionFromState(getState()));
|
||||
}
|
||||
|
||||
localStorage.setItem('releases', JSON.stringify({
|
||||
@@ -144,7 +144,7 @@ export const loadReleases = () => {
|
||||
dispatch(setNewReleasesAvailable2(newReleases));
|
||||
localStorage.setItem('previous_releases', storedReleases);
|
||||
dispatch(showWindow());
|
||||
} else if ((newReleases = checkNewReleases()).length > 0) {
|
||||
} else if ((newReleases = checkNewReleases(getSelectedVersionFromState(getState()))).length > 0) {
|
||||
dispatch(setNewReleasesAvailable2(newReleases));
|
||||
}
|
||||
}).catch(error => {
|
||||
|
||||
22
src/utils.js
22
src/utils.js
@@ -7,7 +7,7 @@ const ipcRenderer = (!process.versions.hasOwnProperty('electron') && window && w
|
||||
window.require('electron').ipcRenderer :
|
||||
null;
|
||||
|
||||
export const checkNewReleases = () => {
|
||||
export const checkNewReleases = selectedVersion => {
|
||||
let previousReleases = localStorage.getItem('previous_releases');
|
||||
if (previousReleases) {
|
||||
previousReleases = JSON.parse(previousReleases).VersionLookup;
|
||||
@@ -15,7 +15,7 @@ export const checkNewReleases = () => {
|
||||
let currentReleases = localStorage.getItem('releases');
|
||||
if (currentReleases) {
|
||||
currentReleases = JSON.parse(currentReleases).VersionLookup;
|
||||
return getNewReleases(previousReleases, currentReleases);
|
||||
return getNewReleases(previousReleases, currentReleases, selectedVersion);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -77,18 +77,13 @@ export const getIPCRenderer = () => {
|
||||
return ipcRenderer;
|
||||
};
|
||||
|
||||
export const getNewReleases = (existingLocations, newLocations) => {
|
||||
export const getNewReleases = (existingLocations, newLocations, selectedVersion) => {
|
||||
const ret = [];
|
||||
|
||||
/*existingReleases = Constants.RELEASE_TYPES.reduce((map, release) => {
|
||||
map[release] = [];
|
||||
return map;
|
||||
}, {});*/
|
||||
|
||||
console.log(selectedVersion);
|
||||
if (existingLocations && newLocations) {
|
||||
Constants.RELEASE_TYPES.forEach(release => {
|
||||
newLocations[release]
|
||||
.filter(version => !existingLocations[release].includes(version) && (version !== 'unavailable'))
|
||||
.filter(version => (version !== selectedVersion) && !existingLocations[release].includes(version) && (version !== 'unavailable'))
|
||||
.forEach(version => {
|
||||
ret.splice(0, 0, {
|
||||
Display: version,
|
||||
@@ -100,13 +95,6 @@ export const getNewReleases = (existingLocations, newLocations) => {
|
||||
});
|
||||
}
|
||||
|
||||
/*ret.push({
|
||||
Display: '1.2.2-release',
|
||||
Release: 0,
|
||||
Version: 3,
|
||||
VersionString: '1.2.2-release',
|
||||
});*/
|
||||
|
||||
return ret;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user