[Display window if dependencies are required] [Display window if UI upgrade is available]

This commit is contained in:
Scott E. Graves
2019-07-15 17:13:50 -05:00
parent f006beb8d9
commit 2c0bb97d10
2 changed files with 11 additions and 1 deletions

View File

@@ -13,6 +13,7 @@ import {
} from './release_version_actions'; } from './release_version_actions';
import { import {
setApplicationReady, setApplicationReady,
showWindow,
shutdownApplication shutdownApplication
} from './common_actions'; } from './common_actions';
@@ -41,6 +42,9 @@ export const checkInstalled = (dependencies, version) => {
dispatch(setReleaseUpgradeAvailable(upgradeAvailable)); dispatch(setReleaseUpgradeAvailable(upgradeAvailable));
dispatch(setMissingDependencies(result.Dependencies)); dispatch(setMissingDependencies(result.Dependencies));
dispatch(setAllowDownload(true)); dispatch(setAllowDownload(true));
if (result.Dependencies && (result.Dependencies.length > 0)) {
dispatch(showWindow());
}
}; };
if (result.Success) { if (result.Success) {

View File

@@ -2,7 +2,10 @@ import axios from 'axios';
import * as Constants from '../../constants'; import * as Constants from '../../constants';
import {createAction} from 'redux-starter-kit'; import {createAction} from 'redux-starter-kit';
import {notifyError} from './error_actions'; import {notifyError} from './error_actions';
import {setApplicationReady} from './common_actions'; import {
setApplicationReady,
showWindow
} from './common_actions';
export const CLEAR_UI_UPGRADE = 'relver/clearUIUpgrade'; export const CLEAR_UI_UPGRADE = 'relver/clearUIUpgrade';
export const clearUIUpgrade = () => { export const clearUIUpgrade = () => {
@@ -27,6 +30,9 @@ export const detectUIUpgrade = () => {
(data.Versions[appPlatform].length > 0) && (data.Versions[appPlatform].length > 0) &&
(data.Versions[appPlatform][0] !== version)) { (data.Versions[appPlatform][0] !== version)) {
dispatch(setUIUpgradeData(data.Locations[appPlatform][data.Versions[appPlatform][0]], data.Versions[appPlatform][0])); dispatch(setUIUpgradeData(data.Locations[appPlatform][data.Versions[appPlatform][0]], data.Versions[appPlatform][0]));
if (!state.relver.UpgradeDismissed) {
dispatch(showWindow());
}
} else { } else {
dispatch(clearUIUpgrade()); dispatch(clearUIUpgrade());
} }