BlockStorage/repertory-ui
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix updated version check

Browse Source
This commit is contained in:
sgraves76
2020-04-03 15:53:56 -05:00
parent 1144dbe81c
commit c9316cef93
2 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/redux/actions/release_version_actions.js
View File

@@ -16,7 +16,7 @@ import {unmountAll} from './mount_actions';
import { import {
checkNewReleases, checkNewReleases,
getIPCRenderer, getIPCRenderer,
getNewReleases getNewReleases, getSelectedVersionFromState
} from '../../utils'; } from '../../utils';
export const CLEAR_UI_UPGRADE = 'relver/clearUIUpgrade'; export const CLEAR_UI_UPGRADE = 'relver/clearUIUpgrade';
@@ -130,7 +130,7 @@ export const loadReleases = () => {
const storedReleases = localStorage.getItem('releases'); const storedReleases = localStorage.getItem('releases');
let newReleases = []; let newReleases = [];
if (storedReleases && (storedReleases.length > 0)) { 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({ localStorage.setItem('releases', JSON.stringify({
@@ -144,7 +144,7 @@ export const loadReleases = () => {
dispatch(setNewReleasesAvailable2(newReleases)); dispatch(setNewReleasesAvailable2(newReleases));
localStorage.setItem('previous_releases', storedReleases); localStorage.setItem('previous_releases', storedReleases);
dispatch(showWindow()); dispatch(showWindow());
} else if ((newReleases = checkNewReleases()).length > 0) { } else if ((newReleases = checkNewReleases(getSelectedVersionFromState(getState()))).length > 0) {
dispatch(setNewReleasesAvailable2(newReleases)); dispatch(setNewReleasesAvailable2(newReleases));
} }
}).catch(error => { }).catch(error => {

22
src/utils.js
View File

@@ -7,7 +7,7 @@ const ipcRenderer = (!process.versions.hasOwnProperty('electron') && window && w
window.require('electron').ipcRenderer : window.require('electron').ipcRenderer :
null; null;
export const checkNewReleases = () => { export const checkNewReleases = selectedVersion => {
let previousReleases = localStorage.getItem('previous_releases'); let previousReleases = localStorage.getItem('previous_releases');
if (previousReleases) { if (previousReleases) {
previousReleases = JSON.parse(previousReleases).VersionLookup; previousReleases = JSON.parse(previousReleases).VersionLookup;
@@ -15,7 +15,7 @@ export const checkNewReleases = () => {
let currentReleases = localStorage.getItem('releases'); let currentReleases = localStorage.getItem('releases');
if (currentReleases) { if (currentReleases) {
currentReleases = JSON.parse(currentReleases).VersionLookup; currentReleases = JSON.parse(currentReleases).VersionLookup;
return getNewReleases(previousReleases, currentReleases); return getNewReleases(previousReleases, currentReleases, selectedVersion);
} }
} }
@@ -77,18 +77,13 @@ export const getIPCRenderer = () => {
return ipcRenderer; return ipcRenderer;
}; };
export const getNewReleases = (existingLocations, newLocations) => { export const getNewReleases = (existingLocations, newLocations, selectedVersion) => {
const ret = []; const ret = [];
console.log(selectedVersion);
/*existingReleases = Constants.RELEASE_TYPES.reduce((map, release) => {
map[release] = [];
return map;
}, {});*/
if (existingLocations && newLocations) { if (existingLocations && newLocations) {
Constants.RELEASE_TYPES.forEach(release => { Constants.RELEASE_TYPES.forEach(release => {
newLocations[release] newLocations[release]
.filter(version => !existingLocations[release].includes(version) && (version !== 'unavailable')) .filter(version => (version !== selectedVersion) && !existingLocations[release].includes(version) && (version !== 'unavailable'))
.forEach(version => { .forEach(version => {
ret.splice(0, 0, { ret.splice(0, 0, {
Display: version, 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; return ret;
}; };