From 52cd85ca6fec6c131dda1d523cc507bc77176d39 Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Sun, 6 Oct 2019 23:00:04 -0500
Subject: [PATCH] Refactoring

---
 src/App.js                                    | 25 ++++++++-----------
 .../AddRemoteMount/AddRemoteMount.js          |  8 ++----
 src/utils.js                                  |  7 ++++++
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/App.js b/src/App.js
index 056095e..260e46d 100644
--- a/src/App.js
+++ b/src/App.js
@@ -10,7 +10,6 @@ import Grid from './components/UI/Grid/Grid';
 import InfoDetails from './components/InfoDetails/InfoDetails';
 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 Reboot from './components/Reboot/Reboot';
@@ -28,6 +27,7 @@ import {
   setDismissUIUpgrade
 } from './redux/actions/release_version_actions';
 import YesNo from './components/YesNo/YesNo';
+import {createModalConditionally} from './utils';
 
 const Constants = require('./constants');
 const Scheduler = require('node-schedule');
@@ -66,11 +66,6 @@ class App extends IPCContainer {
     super.componentWillUnmount();
   }
 
-  createModalConditionally = (condition, jsx, critical) => {
-    const modalProps = {critical: critical};
-    return condition ? (<Modal {...modalProps}>{jsx}</Modal>) : null;
-  };
-
   getSelectedVersion = () => {
     return (this.props.ReleaseVersion === -1) ?
       'unavailable' :
@@ -126,15 +121,15 @@ class App extends IPCContainer {
       !this.props.DismissDependencies &&
       this.props.AllowMount;
 
-    const configDisplay = this.createModalConditionally(showConfig, <Configuration version={selectedVersion} remoteSupported={remoteSupported} />);
-    const confirmDisplay = this.createModalConditionally(this.props.DisplayConfirmYesNo, <YesNo/>);
-    const dependencyDisplay = this.createModalConditionally(showDependencies, <DependencyList/>);
-    const downloadDisplay = this.createModalConditionally(this.props.DownloadActive, <DownloadProgress/>);
-    const errorDisplay = this.createModalConditionally(this.props.DisplayError, <ErrorDetails/>, true);
-    const infoDisplay = this.createModalConditionally(this.props.DisplayInfo, <InfoDetails/>, true);
-    const rebootDisplay = this.createModalConditionally(this.props.RebootRequired, <Reboot />);
-    const selectAppPlatformDisplay = this.createModalConditionally(this.props.DisplaySelectAppPlatform, <SelectAppPlatform/>);
-    const upgradeDisplay = this.createModalConditionally(showUpgrade, <UpgradeUI/>);
+    const configDisplay = createModalConditionally(showConfig, <Configuration version={selectedVersion} remoteSupported={remoteSupported} />);
+    const confirmDisplay = createModalConditionally(this.props.DisplayConfirmYesNo, <YesNo/>);
+    const dependencyDisplay = createModalConditionally(showDependencies, <DependencyList/>);
+    const downloadDisplay = createModalConditionally(this.props.DownloadActive, <DownloadProgress/>);
+    const errorDisplay = createModalConditionally(this.props.DisplayError, <ErrorDetails/>, true);
+    const infoDisplay = createModalConditionally(this.props.DisplayInfo, <InfoDetails/>, true);
+    const rebootDisplay = createModalConditionally(this.props.RebootRequired, <Reboot />);
+    const selectAppPlatformDisplay = createModalConditionally(this.props.DisplaySelectAppPlatform, <SelectAppPlatform/>);
+    const upgradeDisplay = createModalConditionally(showUpgrade, <UpgradeUI/>);
 
     let mainContent = [];
     if (this.props.DisplaySelectAppPlatform || !this.props.AppReady) {
diff --git a/src/containers/AddRemoteMount/AddRemoteMount.js b/src/containers/AddRemoteMount/AddRemoteMount.js
index 7f1ad7e..9a6f004 100644
--- a/src/containers/AddRemoteMount/AddRemoteMount.js
+++ b/src/containers/AddRemoteMount/AddRemoteMount.js
@@ -8,6 +8,7 @@ import Box from '../../components/UI/Box/Box';
 import Text from '../../components/UI/Text/Text';
 import {notifyError} from '../../redux/actions/error_actions';
 import {addRemoteMount} from '../../redux/actions/mount_actions';
+import {createModalConditionally} from '../../utils';
 
 const mapStateToProps = state => {
   return {
@@ -52,11 +53,6 @@ export default connect(mapStateToProps, mapDispatchToProps)(class extends Compon
     }
   };
 
-  createModalConditionally = (condition, jsx, critical) => {
-    const modalProps = {critical: critical};
-    return condition ? (<Modal {...modalProps}>{jsx}</Modal>) : null;
-  };
-
   handleAddRemoteMount = () => {
     this.setState({
       Display: true,
@@ -64,7 +60,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(class extends Compon
   };
 
   render() {
-    const displayAdd = this.createModalConditionally(this.state.Display, (
+    const displayAdd = createModalConditionally(this.state.Display, (
       <Box dxDark
            dxStyle={{width: 'auto', height: 'auto', padding: '8px'}}>
         <h1 style={{color: 'var(--text_color_error)', textAlign: 'center', paddingBottom: '8px'}}>Add Remote Mount</h1>
diff --git a/src/utils.js b/src/utils.js
index 6d91104..b263338 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -1,9 +1,16 @@
+import React from 'react';
 import * as Constants from './constants';
+import Modal from './components/UI/Modal/Modal';
 
 const ipcRenderer = (!process.versions.hasOwnProperty('electron') && window && window.require) ?
   window.require('electron').ipcRenderer :
   null;
 
+export const createModalConditionally = (condition, jsx, critical) => {
+  const modalProps = {critical: critical};
+  return condition ? (<Modal {...modalProps}>{jsx}</Modal>) : null;
+};
+
 export const extractFileNameFromURL = url => {
   const parts = url.split('/');
   return parts[parts.length - 1];