Refactor dialogs

src/components/YesNo/YesNo.js

@@ -3,7 +3,7 @@ import Button from '../UI/Button/Button';
 import Box from '../UI/Box/Box';
 import React from 'react';
 import './YesNo.css';
-import { hideConfirmYesNo } from '../../redux/actions/common_actions';
+import { confirmYesNoAction } from '../../redux/actions/common_actions';
 
 const mapStateToProps = (state) => {
   return {
@@ -13,7 +13,7 @@ const mapStateToProps = (state) => {
 
 const mapDispatchToProps = (dispatch) => {
   return {
-    hideConfirmYesNo: (confirmed) => dispatch(hideConfirmYesNo(confirmed)),
+    confirm: (confirmed) => dispatch(confirmYesNoAction.complete(confirmed)),
   };
 };
 
@@ -35,14 +35,12 @@ export default connect(
         <tbody>
           <tr>
             <td width="50%">
-              <Button buttonStyles={{ width: '100%' }} clicked={() => props.hideConfirmYesNo(true)}>
+              <Button buttonStyles={{ width: '100%' }} clicked={() => props.confirm(true)}>
                 Yes
               </Button>
             </td>
             <td width="50%">
-              <Button
+              <Button buttonStyles={{ width: '100%' }} clicked={() => props.confirm(false)}>
-                buttonStyles={{ width: '100%' }}
-                clicked={() => props.hideConfirmYesNo(false)}>
                 No
               </Button>
             </td>

src/containers/AddEditHost/AddEditHost.js

@@ -5,7 +5,7 @@ import DropDown from '../../components/UI/DropDown/DropDown';
 import PropTypes from 'prop-types';
 import Text from '../../components/UI/Text/Text';
 import { Component } from 'react';
-import { addEditHost, completeAddEditHost } from '../../redux/actions/host_actions';
+import { addEditHostAction } from '../../redux/actions/host_actions';
 import { connect } from 'react-redux';
 import { createDismissDisplay } from '../../utils.jsx';
 import { notifyError } from '../../redux/actions/error_actions';
@@ -217,8 +217,8 @@ const mapStateToProps = (state) => {
 
 const mapDispatchToProps = (dispatch) => {
   return {
-    Close: () => dispatch(addEditHost(false)),
+    Close: () => dispatch(addEditHostAction.complete(false)),
-    completeAddEditHost: (host_data) => dispatch(completeAddEditHost(true, host_data)),
+    completeAddEditHost: (host_data) => dispatch(addEditHostAction.complete(true, { host_data })),
     notifyError: (msg) => dispatch(notifyError(msg)),
   };
 };

src/containers/AddMount/AddMount.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import { Component } from 'react';
 import './AddMount.css';
 import { connect } from 'react-redux';
@@ -11,6 +12,272 @@ import { createModalConditionally } from '../../utils.jsx';
 import DropDown from '../../components/UI/DropDown/DropDown';
 import * as Constants from '../../constants';
 
+const default_state = {
+  AccessKey: '',
+  BucketName: '',
+  DisplayRemote: false,
+  DisplayS3: false,
+  HostNameOrIp: '',
+  Name: '',
+  Port: 20000,
+  Provider: Constants.S3_PROVIDER_LIST[0],
+  Region: Constants.S3_REGION_PROVIDER_REGION[0],
+  SecretKey: '',
+  Token: '',
+};
+
+class AddMount extends Component {
+  state = {
+    ...default_state,
+  };
+
+  addRemoteMount = () => {
+    if (this.state.HostNameOrIp.length === 0) {
+      this.props.notifyError('Hostname or IP cannot be empty.');
+    } else {
+      const provider = 'Remote' + this.state.HostNameOrIp + ':' + this.state.Port;
+      if (this.props.RemoteMounts.includes(provider)) {
+        this.props.notifyError('Remote host already exists');
+      } else {
+        this.setState(
+          {
+            DisplayRemote: false,
+          },
+          () => {
+            this.props.addRemoteMount(this.state.HostNameOrIp, this.state.Port, this.state.Token);
+            this.setState({
+              ...default_state,
+            });
+          }
+        );
+      }
+    }
+  };
+
+  addS3Mount = () => {
+    if (this.state.Name.length === 0) {
+      this.props.notifyError('Name cannot be empty.');
+    } else if (this.state.AccessKey.length === 0) {
+      this.props.notifyError('AccessKey cannot be empty.');
+    } else if (this.state.SecretKey.length === 0) {
+      this.props.notifyError('SecretKey cannot be empty.');
+    } else {
+      const provider = 'S3' + this.state.Name;
+      if (this.props.S3Mounts.includes(provider)) {
+        this.props.notifyError('Remote host already exists');
+      } else {
+        this.setState(
+          {
+            DisplayS3: false,
+          },
+          () => {
+            this.props.addS3Mount(
+              this.state.Name,
+              this.state.AccessKey,
+              this.state.SecretKey,
+              this.state.Region,
+              this.state.BucketName,
+              Constants.S3_PROVIDER_URL[this.state.Provider]
+            );
+            this.setState({
+              ...default_state,
+            });
+          }
+        );
+      }
+    }
+  };
+
+  handleAddS3Mount = () => {
+    this.setState({
+      DisplayRemote: false,
+      DisplayS3: true,
+    });
+  };
+
+  handleAddRemoteMount = () => {
+    this.setState({
+      DisplayRemote: true,
+      DisplayS3: false,
+    });
+  };
+
+  render() {
+    const displayAddRemote = createModalConditionally(
+      this.state.DisplayRemote,
+      <Box
+        dxDark
+        dxStyle={{
+          width: 'auto',
+          height: 'auto',
+          padding: 'var(--default_spacing)',
+        }}>
+        <h1
+          style={{
+            textAlign: 'center',
+            paddingBottom: 'var(--default_spacing)',
+          }}>
+          Add Remote Mount
+        </h1>
+        <Text text={'Hostname or IP'} textAlign={'left'} type={'Heading2'} />
+        <input
+          onChange={(e) => this.setState({ HostNameOrIp: e.target.value.trim() })}
+          className={'ConfigurationItemInput'}
+          type={'text'}
+          value={this.state.HostNameOrIp}
+        />
+        <div style={{ paddingTop: 'var(--default_spacing)' }} />
+        <Text text={'Port'} textAlign={'left'} type={'Heading2'} />
+        <input
+          max={65535}
+          min={1025}
+          onChange={(e) => this.setState({ Port: e.target.value })}
+          className={'ConfigurationItemInput'}
+          type={'number'}
+          value={this.state.Port}
+        />
+        <div style={{ paddingTop: 'var(--default_spacing)' }} />
+        <Text text={'Remote Token'} textAlign={'left'} type={'Heading2'} />
+        <input
+          onChange={(e) => this.setState({ Token: e.target.value })}
+          className={'ConfigurationItemInput'}
+          type={'text'}
+          value={this.state.Token}
+        />
+        <div style={{ paddingTop: 'var(--default_spacing)' }} />
+        <div style={{ display: 'flex', flexDirection: 'row' }}>
+          <Button buttonStyles={{ width: '100%' }} clicked={() => this.addRemoteMount()}>
+            OK
+          </Button>
+          <div style={{ paddingLeft: 'var(--default_spacing)' }} />
+          <Button
+            buttonStyles={{ width: '100%' }}
+            clicked={() => this.setState({ DisplayRemote: false })}>
+            Cancel
+          </Button>
+        </div>
+      </Box>
+    );
+
+    const displayAddS3 = createModalConditionally(
+      this.state.DisplayS3,
+      <Box
+        dxDark
+        dxStyle={{
+          width: 'auto',
+          height: 'auto',
+          padding: 'var(--default_spacing)',
+        }}>
+        <h1
+          style={{
+            textAlign: 'center',
+            paddingBottom: 'var(--default_spacing)',
+          }}>
+          Add S3 Mount
+        </h1>
+        <div style={{ display: 'flex', flexDirection: 'row' }}>
+          <Text text={'Name'} textAlign={'left'} type={'Heading2'} />
+          <div style={{ paddingLeft: 'var(--default_spacing)' }} />
+          <Text text={'Provider'} textAlign={'left'} type={'Heading2'} />
+        </div>
+        <div style={{ display: 'flex', flexDirection: 'row' }}>
+          <input
+            onChange={(e) => this.setState({ Name: e.target.value.trim() })}
+            className={'ConfigurationItemInput'}
+            style={{ width: '100%' }}
+            type={'text'}
+            value={this.state.Name}
+          />
+          <div style={{ paddingLeft: 'var(--default_spacing)' }} />
+          <DropDown
+            changed={(e) => this.setState({ Provider: e.target.value })}
+            items={Constants.S3_PROVIDER_LIST}
+            selected={this.state.Provider}
+          />
+        </div>
+        <div style={{ paddingTop: 'var(--default_spacing)' }} />
+        <div style={{ display: 'flex', flexDirection: 'row' }}>
+          <Text text={'Bucket Name (optional)'} textAlign={'left'} type={'Heading2'} />
+          <div style={{ paddingLeft: 'var(--default_spacing)' }} />
+          <Text text={'Region'} textAlign={'left'} type={'Heading2'} />
+        </div>
+        <div style={{ display: 'flex', flexDirection: 'row' }}>
+          <input
+            onChange={(e) => this.setState({ BucketName: e.target.value })}
+            className={'ConfigurationItemInput'}
+            style={{ width: '100%' }}
+            type={'text'}
+            value={this.state.BucketName}
+          />
+          <div style={{ paddingLeft: 'var(--default_spacing)' }} />
+          <input
+            onChange={(e) => this.setState({ Region: e.target.value })}
+            className={'ConfigurationItemInput'}
+            type={'text'}
+            value={this.state.Region}
+          />
+        </div>
+        <div style={{ paddingTop: 'var(--default_spacing)' }} />
+        <div style={{ display: 'flex', flexDirection: 'row' }}>
+          <Text text={'Access Key'} textAlign={'left'} type={'Heading2'} />
+          <div style={{ paddingLeft: 'var(--default_spacing)' }} />
+          <Text text={'Secret Key'} textAlign={'left'} type={'Heading2'} />
+        </div>
+        <div style={{ display: 'flex', flexDirection: 'row' }}>
+          <input
+            onChange={(e) => this.setState({ AccessKey: e.target.value })}
+            className={'ConfigurationItemInput'}
+            type={'text'}
+            value={this.state.AccessKey}
+          />
+          <div style={{ paddingLeft: 'var(--default_spacing)' }} />
+          <input
+            onChange={(e) => this.setState({ SecretKey: e.target.value })}
+            className={'ConfigurationItemInput'}
+            type={'text'}
+            value={this.state.SecretKey}
+          />
+        </div>
+        <div style={{ paddingTop: 'calc(var(--default_spacing) * 2)' }} />
+        <div style={{ display: 'flex', flexDirection: 'row' }}>
+          <div style={{ width: '200%' }} />
+          <Button buttonStyles={{ width: '100%' }} clicked={() => this.addS3Mount()}>
+            OK
+          </Button>
+          <div style={{ paddingLeft: 'var(--default_spacing)' }} />
+          <Button
+            buttonStyles={{ width: '100%' }}
+            clicked={() => this.setState({ DisplayS3: false })}>
+            Cancel
+          </Button>
+        </div>
+      </Box>
+    );
+
+    return (
+      <div className={'AddMount'}>
+        {displayAddRemote}
+        {displayAddS3}
+        <div className={'AddMountButtons'}>
+          {this.props.remoteSupported ? (
+            <Button className={'AddMountButton'} clicked={this.handleAddRemoteMount}>
+              Add Remote Mount
+            </Button>
+          ) : null}
+          {this.props.remoteSupported && this.props.s3Supported ? (
+            <div style={{ paddingRight: 'var(--default_spacing)' }} />
+          ) : null}
+          {this.props.s3Supported ? (
+            <Button className={'AddMountButton'} clicked={this.handleAddS3Mount}>
+              Add S3 Mount
+            </Button>
+          ) : null}
+        </div>
+      </div>
+    );
+  }
+}
+
 const mapStateToProps = (state) => {
   return {
     RemoteMounts: state.mounts.RemoteMounts,
@@ -28,273 +295,14 @@ const mapDispatchToProps = (dispatch) => {
   };
 };
 
-const default_state = {
+AddMount.propTypes = {
-  AccessKey: '',
+  RemoteMounts: PropTypes.array.isRequired,
-  BucketName: '',
+  S3Mounts: PropTypes.array.isRequired,
-  DisplayRemote: false,
+  addRemoteMount: PropTypes.func.isRequired,
-  DisplayS3: false,
+  addS3Mount: PropTypes.func.isRequired,
-  HostNameOrIp: '',
+  notifyError: PropTypes.func.isRequired,
-  Name: '',
+  remoteSupported: PropTypes.bool,
-  Port: 2000,
+  s3Supported: PropTypes.bool,
-  Provider: Constants.S3_PROVIDER_LIST[0],
-  Region: Constants.S3_REGION_PROVIDER_REGION[0],
-  SecretKey: '',
-  Token: '',
 };
 
-export default connect(
+export default connect(mapStateToProps, mapDispatchToProps)(AddMount);
-  mapStateToProps,
-  mapDispatchToProps
-)(
-  class AddMount extends Component {
-    state = {
-      ...default_state,
-    };
-
-    addRemoteMount = () => {
-      if (this.state.HostNameOrIp.length === 0) {
-        this.props.notifyError('Hostname or IP cannot be empty.');
-      } else {
-        const provider = 'Remote' + this.state.HostNameOrIp + ':' + this.state.Port;
-        if (this.props.RemoteMounts.includes(provider)) {
-          this.props.notifyError('Remote host already exists');
-        } else {
-          this.setState(
-            {
-              DisplayRemote: false,
-            },
-            () => {
-              this.props.addRemoteMount(this.state.HostNameOrIp, this.state.Port, this.state.Token);
-              this.setState({
-                ...default_state,
-              });
-            }
-          );
-        }
-      }
-    };
-
-    addS3Mount = () => {
-      if (this.state.Name.length === 0) {
-        this.props.notifyError('Name cannot be empty.');
-      } else if (this.state.AccessKey.length === 0) {
-        this.props.notifyError('AccessKey cannot be empty.');
-      } else if (this.state.SecretKey.length === 0) {
-        this.props.notifyError('SecretKey cannot be empty.');
-      } else {
-        const provider = 'S3' + this.state.Name;
-        if (this.props.S3Mounts.includes(provider)) {
-          this.props.notifyError('Remote host already exists');
-        } else {
-          this.setState(
-            {
-              DisplayS3: false,
-            },
-            () => {
-              this.props.addS3Mount(
-                this.state.Name,
-                this.state.AccessKey,
-                this.state.SecretKey,
-                this.state.Region,
-                this.state.BucketName,
-                Constants.S3_PROVIDER_URL[this.state.Provider]
-              );
-              this.setState({
-                ...default_state,
-              });
-            }
-          );
-        }
-      }
-    };
-
-    handleAddS3Mount = () => {
-      this.setState({
-        DisplayRemote: false,
-        DisplayS3: true,
-      });
-    };
-
-    handleAddRemoteMount = () => {
-      this.setState({
-        DisplayRemote: true,
-        DisplayS3: false,
-      });
-    };
-
-    render() {
-      const displayAddRemote = createModalConditionally(
-        this.state.DisplayRemote,
-        <Box
-          dxDark
-          dxStyle={{
-            width: 'auto',
-            height: 'auto',
-            padding: 'var(--default_spacing)',
-          }}>
-          <h1
-            style={{
-              textAlign: 'center',
-              paddingBottom: 'var(--default_spacing)',
-            }}>
-            Add Remote Mount
-          </h1>
-          <Text text={'Hostname or IP'} textAlign={'left'} type={'Heading2'} />
-          <input
-            onChange={(e) => this.setState({ HostNameOrIp: e.target.value.trim() })}
-            className={'ConfigurationItemInput'}
-            type={'text'}
-            value={this.state.HostNameOrIp}
-          />
-          <div style={{ paddingTop: 'var(--default_spacing)' }} />
-          <Text text={'Port'} textAlign={'left'} type={'Heading2'} />
-          <input
-            max={65535}
-            min={1025}
-            onChange={(e) => this.setState({ Port: e.target.value })}
-            className={'ConfigurationItemInput'}
-            type={'number'}
-            value={this.state.Port}
-          />
-          <div style={{ paddingTop: 'var(--default_spacing)' }} />
-          <Text text={'Remote Token'} textAlign={'left'} type={'Heading2'} />
-          <input
-            onChange={(e) => this.setState({ Token: e.target.value })}
-            className={'ConfigurationItemInput'}
-            type={'text'}
-            value={this.state.Token}
-          />
-          <div style={{ paddingTop: 'var(--default_spacing)' }} />
-          <div style={{ display: 'flex', flexDirection: 'row' }}>
-            <Button buttonStyles={{ width: '100%' }} clicked={() => this.addRemoteMount()}>
-              OK
-            </Button>
-            <div style={{ paddingLeft: 'var(--default_spacing)' }} />
-            <Button
-              buttonStyles={{ width: '100%' }}
-              clicked={() => this.setState({ DisplayRemote: false })}>
-              Cancel
-            </Button>
-          </div>
-        </Box>
-      );
-
-      const displayAddS3 = createModalConditionally(
-        this.state.DisplayS3,
-        <Box
-          dxDark
-          dxStyle={{
-            width: 'auto',
-            height: 'auto',
-            padding: 'var(--default_spacing)',
-          }}>
-          <h1
-            style={{
-              textAlign: 'center',
-              paddingBottom: 'var(--default_spacing)',
-            }}>
-            Add S3 Mount
-          </h1>
-          <div style={{ display: 'flex', flexDirection: 'row' }}>
-            <Text text={'Name'} textAlign={'left'} type={'Heading2'} />
-            <div style={{ paddingLeft: 'var(--default_spacing)' }} />
-            <Text text={'Provider'} textAlign={'left'} type={'Heading2'} />
-          </div>
-          <div style={{ display: 'flex', flexDirection: 'row' }}>
-            <input
-              onChange={(e) => this.setState({ Name: e.target.value.trim() })}
-              className={'ConfigurationItemInput'}
-              style={{ width: '100%' }}
-              type={'text'}
-              value={this.state.Name}
-            />
-            <div style={{ paddingLeft: 'var(--default_spacing)' }} />
-            <DropDown
-              changed={(e) => this.setState({ Provider: e.target.value })}
-              items={Constants.S3_PROVIDER_LIST}
-              selected={this.state.Provider}
-            />
-          </div>
-          <div style={{ paddingTop: 'var(--default_spacing)' }} />
-          <div style={{ display: 'flex', flexDirection: 'row' }}>
-            <Text text={'Bucket Name (optional)'} textAlign={'left'} type={'Heading2'} />
-            <div style={{ paddingLeft: 'var(--default_spacing)' }} />
-            <Text text={'Region'} textAlign={'left'} type={'Heading2'} />
-          </div>
-          <div style={{ display: 'flex', flexDirection: 'row' }}>
-            <input
-              onChange={(e) => this.setState({ BucketName: e.target.value })}
-              className={'ConfigurationItemInput'}
-              style={{ width: '100%' }}
-              type={'text'}
-              value={this.state.BucketName}
-            />
-            <div style={{ paddingLeft: 'var(--default_spacing)' }} />
-            <input
-              onChange={(e) => this.setState({ Region: e.target.value })}
-              className={'ConfigurationItemInput'}
-              type={'text'}
-              value={this.state.Region}
-            />
-          </div>
-          <div style={{ paddingTop: 'var(--default_spacing)' }} />
-          <div style={{ display: 'flex', flexDirection: 'row' }}>
-            <Text text={'Access Key'} textAlign={'left'} type={'Heading2'} />
-            <div style={{ paddingLeft: 'var(--default_spacing)' }} />
-            <Text text={'Secret Key'} textAlign={'left'} type={'Heading2'} />
-          </div>
-          <div style={{ display: 'flex', flexDirection: 'row' }}>
-            <input
-              onChange={(e) => this.setState({ AccessKey: e.target.value })}
-              className={'ConfigurationItemInput'}
-              type={'text'}
-              value={this.state.AccessKey}
-            />
-            <div style={{ paddingLeft: 'var(--default_spacing)' }} />
-            <input
-              onChange={(e) => this.setState({ SecretKey: e.target.value })}
-              className={'ConfigurationItemInput'}
-              type={'text'}
-              value={this.state.SecretKey}
-            />
-          </div>
-          <div style={{ paddingTop: 'calc(var(--default_spacing) * 2)' }} />
-          <div style={{ display: 'flex', flexDirection: 'row' }}>
-            <div style={{ width: '200%' }} />
-            <Button buttonStyles={{ width: '100%' }} clicked={() => this.addS3Mount()}>
-              OK
-            </Button>
-            <div style={{ paddingLeft: 'var(--default_spacing)' }} />
-            <Button
-              buttonStyles={{ width: '100%' }}
-              clicked={() => this.setState({ DisplayS3: false })}>
-              Cancel
-            </Button>
-          </div>
-        </Box>
-      );
-
-      return (
-        <div className={'AddMount'}>
-          {displayAddRemote}
-          {displayAddS3}
-          <div className={'AddMountButtons'}>
-            {this.props.remoteSupported ? (
-              <Button className={'AddMountButton'} clicked={this.handleAddRemoteMount}>
-                Add Remote Mount
-              </Button>
-            ) : null}
-            {this.props.remoteSupported && this.props.s3Supported ? (
-              <div style={{ paddingRight: 'var(--default_spacing)' }} />
-            ) : null}
-            {this.props.s3Supported ? (
-              <Button className={'AddMountButton'} clicked={this.handleAddS3Mount}>
-                Add S3 Mount
-              </Button>
-            ) : null}
-          </div>
-        </div>
-      );
-    }
-  }
-);

src/containers/HostList/Host/Host.js

@@ -1,24 +1,20 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { addEditHost } from '../../../redux/actions/host_actions';
+import { addEditHostAction } from '../../../redux/actions/host_actions';
 import { connect } from 'react-redux';
 import { faTrashAlt, faEdit } from '@fortawesome/free-solid-svg-icons';
 
-// const mapStateToProps = (state) => {
-//   return {};
-// };
-//
 const mapDispatchToProps = (dispatch) => {
   return {
-    addEditHost: (host_list, host_data, cb) =>
+    editHost: (host_list, host_data, cb) =>
-      dispatch(addEditHost(true, host_list, host_data, cb)),
+      dispatch(addEditHostAction.display(true, cb, { host_list, host_data })),
   };
 };
 
-const Host = ({ allowDelete, addEditHost, host_list, host_data, onChange, onDelete }) => {
+const Host = ({ allowDelete, editHost, host_list, host_data, onChange, onDelete }) => {
   const handleEditHost = () => {
-    addEditHost(host_list, host_data, (changed, host_data) => {
+    editHost(host_list, host_data, (changed, { host_data }) => {
       if (changed) {
         onChange(host_data);
       }
@@ -74,7 +70,7 @@ const Host = ({ allowDelete, addEditHost, host_list, host_data, onChange, onDele
 
 Host.propTypes = {
   allowDelete: PropTypes.bool.isRequired,
-  addEditHost: PropTypes.func.isRequired,
+  editHost: PropTypes.func.isRequired,
   onChange: PropTypes.func.isRequired,
   onDelete: PropTypes.func.isRequired,
   host_data: PropTypes.object.isRequired,

src/containers/HostList/HostList.js

@@ -4,9 +4,9 @@ import Host from './Host/Host';
 import PropTypes from 'prop-types';
 import { Component } from 'react';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { confirmYesNo } from '../../redux/actions/common_actions';
+import { confirmYesNoAction } from '../../redux/actions/common_actions';
 import { connect } from 'react-redux';
-import { addEditHost } from '../../redux/actions/host_actions';
+import { addEditHostAction } from '../../redux/actions/host_actions';
 import { faPlusCircle } from '@fortawesome/free-solid-svg-icons';
 
 class HostList extends Component {
@@ -24,7 +24,7 @@ class HostList extends Component {
   componentWillUnmount() {}
 
   handleAddHost = () => {
-    this.props.addEditHost(this.state.items, (changed, host_data) => {
+    this.props.AddHost(this.state.items, (changed, host_data) => {
       if (changed) {
         const items = [...this.state.items, host_data];
         this.updateItems(items);
@@ -104,13 +104,13 @@ class HostList extends Component {
 
 const mapDispatchToProps = (dispatch) => {
   return {
-    addEditHost: (list, cb) => dispatch(addEditHost(true, list, null, cb)),
+    AddHost: (host_list, cb) => dispatch(addEditHostAction.display(true, cb, { host_list })),
-    ConfirmRemoveHost: (title, cb) => dispatch(confirmYesNo(title, cb)),
+    ConfirmRemoveHost: (title, cb) => dispatch(confirmYesNoAction.display(true, cb, { title })),
   };
 };
 
 HostList.propTypes = {
-  addEditHost: PropTypes.func.isRequired,
+  AddHost: PropTypes.func.isRequired,
   ConfirmRemoveHost: PropTypes.func.isRequired,
   onChange: PropTypes.func.isRequired,
   value: PropTypes.array.isRequired,

src/redux/actions/common_actions.js

@@ -1,30 +1,12 @@
 import { createAction } from '@reduxjs/toolkit';
+import { createResponseDialogAction } from '../utils';
+
+export const confirmYesNoAction = createResponseDialogAction('common', 'confirmYesNo');
 
 import * as Constants from '../../constants';
 import { getIPCRenderer } from '../../utils.jsx';
 
 const ipcRenderer = getIPCRenderer();
-let yesNoResolvers = [];
-
-export const confirmYesNo = (title, cb) => {
-  return (dispatch) => {
-    if (cb) {
-      dispatch(confirmYesNo(title)).then((confirmed) => cb(confirmed));
-    } else {
-      return new Promise((resolve) => {
-        dispatch(handleConfirmYesNo(true, title, resolve));
-      });
-    }
-  };
-};
-
-export const DISPLAY_CONFIRM_YES_NO = 'common/displayConfirmYesNo';
-const displayConfirmYesNo = (show, title) => {
-  return {
-    type: DISPLAY_CONFIRM_YES_NO,
-    payload: { show, title },
-  };
-};
 
 export const displaySelectAppPlatform = (display) => {
   return (dispatch) => {
@@ -36,25 +18,6 @@ export const displaySelectAppPlatform = (display) => {
   };
 };
 
-export const hideConfirmYesNo = (confirmed) => {
-  return (dispatch) => {
-    dispatch(handleConfirmYesNo(false, confirmed));
-  };
-};
-
-const handleConfirmYesNo = (show, titleOrConfirmed, resolve) => {
-  return (dispatch) => {
-    if (show) {
-      yesNoResolvers.push(resolve);
-      dispatch(displayConfirmYesNo(show, titleOrConfirmed));
-    } else {
-      yesNoResolvers[0](titleOrConfirmed);
-      yesNoResolvers.splice(0, 1);
-      dispatch(displayConfirmYesNo(false));
-    }
-  };
-};
-
 export const NOTIFY_APPLICATION_BUSY = 'common/notifyApplicationBusy';
 export const notifyApplicationBusy = (busy, transparent) => {
   return {

src/redux/actions/host_actions.js

@@ -1,41 +1,3 @@
-let addEditHostResolvers = [];
+import { createResponseDialogAction } from '../utils';
 
-export const addEditHost = (display, host_list, host_data, cb) => {
+export const addEditHostAction = createResponseDialogAction('host', 'displayAddEditHost');
-  return (dispatch) => {
-    if (cb) {
-      dispatch(addEditHost(display, host_list, host_data)).then(({ changed, host_data }) =>
-        cb(changed, host_data)
-      );
-    } else {
-      return new Promise((resolve) => {
-        dispatch(handleDisplayAddEditHost(display, host_list, host_data, resolve));
-      });
-    }
-  };
-};
-
-const handleDisplayAddEditHost = (display, host_list, host_data, resolve) => {
-  return (dispatch) => {
-    if (display) {
-      addEditHostResolvers.push(resolve);
-      dispatch(displayAddEditHost(display, host_list, host_data));
-    } else {
-      dispatch(completeAddEditHost(false));
-    }
-  };
-};
-
-export const completeAddEditHost = (changed, host_data) => {
-  return (dispatch) => {
-    if (changed) {
-      addEditHostResolvers[0]({ changed, host_data });
-    }
-    addEditHostResolvers.splice(0, 1);
-    dispatch(displayAddEditHost(false));
-  };
-};
-
-export const DISPLAY_ADD_EDIT_HOST = 'host/displayAddEditHost';
-export const displayAddEditHost = (display, host_list, host_data) => {
-  return { type: DISPLAY_ADD_EDIT_HOST, payload: { display, host_data, host_list } };
-};

src/redux/actions/install_actions.js

@@ -4,7 +4,7 @@ import * as Constants from '../../constants';
 import { getIPCRenderer, getSelectedVersionFromState } from '../../utils.jsx';
 
 import {
-  confirmYesNo,
+  confirmYesNoAction,
   displaySelectAppPlatform,
   setAllowMount,
   setApplicationReady,
@@ -206,9 +206,9 @@ export const installReleaseByVersion = (release, version) => {
     };
 
     if (getState().mounts.MountsBusy) {
-      dispatch(confirmYesNo('Unmount all drives?'))
+      dispatch(confirmYesNoAction.display(true, null, { title: 'Unmount all drives?' }))
-        .then((confirmed) => {
+        .then(({ changed }) => {
-          if (confirmed) {
+          if (changed) {
             dispatch(unmountAll(install));
           }
         })

src/redux/actions/mount_actions.js

@@ -3,7 +3,7 @@ import { createAction } from '@reduxjs/toolkit';
 import * as Constants from '../../constants';
 import { getIPCRenderer } from '../../utils.jsx';
 
-import { confirmYesNo, saveState } from './common_actions';
+import { confirmYesNoAction, saveState } from './common_actions';
 import { notifyError } from './error_actions';
 
 export const addRemoteMount = (hostNameOrIp, port, token) => {
@@ -23,7 +23,7 @@ export const addRemoteMount = (hostNameOrIp, port, token) => {
           Version: getState().relver.InstalledVersion,
         });
       } else {
-        dispatch(notifyError('Failed to create S3 instance: ' + arg.data.Error));
+        dispatch(notifyError('Failed to create remote mount: ' + arg.data.Error));
         dispatch(setBusy(false));
       }
     });
@@ -32,7 +32,7 @@ export const addRemoteMount = (hostNameOrIp, port, token) => {
       Items: [
         { Name: 'RemoteMount.RemoteHostNameOrIp', Value: hostNameOrIp },
         { Name: 'RemoteMount.RemoteToken', Value: token },
-        { Name: 'RemoteMount.RemotePort', Value: port },
+        { Name: 'RemoteMount.RemotePort', Value: port.toString() },
         { Name: 'RemoteMount.IsRemoteMount', Value: 'true' },
       ],
       Provider: provider,
@@ -96,13 +96,15 @@ export const displayConfiguration = (provider, remote, s3) => {
 export const removeMount = (provider) => {
   return (dispatch) => {
     const isRemote = provider.startsWith('Remote');
-    dispatch(confirmYesNo('Delete [' + provider.substr(isRemote ? 6 : 2) + ']?')).then(
+    dispatch(
-      (confirmed) => {
+      confirmYesNoAction.display(true, null, {
-        if (confirmed) {
+        title: 'Delete [' + provider.substr(isRemote ? 6 : 2) + ']?',
-          dispatch(removeMount2(provider));
+      })
-        }
+    ).then(({ changed }) => {
+      if (changed) {
+        dispatch(removeMount2(provider));
       }
-    );
+    });
   };
 };
 

src/redux/reducers/common_reducer.js

@@ -1,7 +1,6 @@
 import { createReducer } from '@reduxjs/toolkit';
-
 import {
-  DISPLAY_CONFIRM_YES_NO,
+  confirmYesNoAction,
   NOTIFY_APPLICATION_BUSY,
   notifyRebootRequired,
   SET_DISPLAY_SELECT_APPPLATFORM,
@@ -26,11 +25,12 @@ export const createCommonReducer = (platformInfo, version) => {
       Version: version,
     },
     {
-      [DISPLAY_CONFIRM_YES_NO]: (state, action) => {
+      [confirmYesNoAction.action_type]: (state, action) => {
         return {
           ...state,
-          DisplayConfirmYesNo: action.payload.show,
+          DisplayConfirmYesNo: action.payload.display,
-          ConfirmTitle: action.payload.show ? action.payload.title : null,
+          ConfirmTitle:
+            action.payload.display && action.payload.data ? action.payload.data.title : null,
         };
       },
       [SET_DISPLAY_SELECT_APPPLATFORM]: (state, action) => {

src/redux/reducers/host_reducer.js

@@ -1,21 +1,19 @@
 import { createReducer } from '@reduxjs/toolkit';
-import * as Actions from '../actions/host_actions';
+import { addEditHostAction } from '../actions/host_actions';
 
 export const hostReducer = createReducer(
   {
     DisplayAddEditHost: false,
-    Edit: false,
     HostData: {},
     HostList: [],
   },
   {
-    [Actions.DISPLAY_ADD_EDIT_HOST]: (state, action) => {
+    [addEditHostAction.action_type]: (state, action) => {
       return {
         ...state,
         DisplayAddEditHost: action.payload.display,
-        Edit: !!action.payload.host_data,
+        HostData: action.payload.data ? action.payload.data.host_data || {} : {},
-        HostData: action.payload.host_data || {},
+        HostList: action.payload.data ? action.payload.data.host_list || [] : [],
-        HostList: action.payload.host_list || [],
       };
     },
   }

src/redux/utils.js

@@ -0,0 +1,47 @@
+export const createResponseDialogAction = (type, name) => {
+  let resolverList = [];
+
+  const display = (show, cb, data) => {
+    return (dispatch) => {
+      if (cb) {
+        dispatch(display(show, null, data)).then(({ changed, data }) => cb(changed, data));
+      } else {
+        return new Promise((resolve) => {
+          dispatch(handleDisplay(show, data, resolve));
+        });
+      }
+    };
+  };
+
+  const handleDisplay = (show, data, resolve) => {
+    return (dispatch) => {
+      if (show) {
+        resolverList.push(resolve);
+        dispatch(displayAction(show, data));
+      } else {
+        dispatch(complete(false));
+      }
+    };
+  };
+
+  const complete = (changed, data) => {
+    return (dispatch) => {
+      if (changed) {
+        resolverList[0]({ changed, data });
+      }
+      resolverList.splice(0, 1);
+      dispatch(displayAction(false));
+    };
+  };
+
+  const DISPLAY_ACTION = type + '/' + name;
+  const displayAction = (display, data) => {
+    return { type: DISPLAY_ACTION, payload: { display, data } };
+  };
+
+  return {
+    action_type: DISPLAY_ACTION,
+    complete,
+    display,
+  };
+};