From 524d4bb06d582d99270516a8ce6d26bdecc61cd1 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Fri, 7 Jun 2019 23:24:19 -0500 Subject: [PATCH] Refactoring --- src/App.js | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/src/App.js b/src/App.js index e7685dd..65e2ba8 100644 --- a/src/App.js +++ b/src/App.js @@ -11,15 +11,30 @@ import IPCContainer from './containers/IPCContainer/IPCContainer'; import Loading from './components/UI/Loading/Loading'; import Modal from './components/UI/Modal/Modal'; import MountItems from './containers/MountItems/MountItems'; +import {notifyError} from './redux/actions/error_actions'; import ReleaseVersionDisplay from './components/ReleaseVersionDisplay/ReleaseVersionDisplay'; +import {setProviderState} from './redux/actions/mount_actions'; import Text from './components/UI/Text/Text'; import UpgradeIcon from './components/UpgradeIcon/UpgradeIcon'; import UpgradeUI from './components/UpgradeUI/UpgradeUI'; -import {setProviderState} from './redux/actions/mount_actions'; -import {detectUIUpgrade, loadReleases, setActiveRelease, setDismissUIUpgrade, setInstalledVersion, setReleaseUpgradeAvailable} from './redux/actions/release_version_actions'; -import {downloadItem, setAllowDownload} from './redux/actions/download_actions'; -import {installDependency, installRelease, installUpgrade, setMissingDependencies} from './redux/actions/install_actions'; -import {notifyError} from './redux/actions/error_actions'; +import { + downloadItem, + setAllowDownload +} from './redux/actions/download_actions'; +import { + installDependency, + installRelease, + installUpgrade, + setMissingDependencies +} from './redux/actions/install_actions'; +import { + detectUIUpgrade, + loadReleases, + setActiveRelease, + setDismissUIUpgrade, + setInstalledVersion, + setReleaseUpgradeAvailable +} from './redux/actions/release_version_actions'; const Constants = require('./constants'); const Scheduler = require('node-schedule'); @@ -71,11 +86,6 @@ class App extends IPCContainer { super.componentWillUnmount(); } - extractFileNameFromURL = url => { - const parts = url.split('/'); - return parts[parts.length - 1]; - }; - detectUpgrades = () => { if (this.props.AppPlatform !== 'unknown') { this.props.loadReleases(); @@ -83,6 +93,11 @@ class App extends IPCContainer { } }; + extractFileNameFromURL = url => { + const parts = url.split('/'); + return parts[parts.length - 1]; + }; + getSelectedVersion = () => { return (this.props.ReleaseVersion === -1) ? 'unavailable' :