This commit is contained in:
2021-03-10 21:23:36 -06:00
parent 0924490a6f
commit c8b5d2351e

View File

@@ -1,10 +1,10 @@
import {createAction} from '@reduxjs/toolkit'; import { createAction } from '@reduxjs/toolkit';
import * as Constants from '../../constants'; import * as Constants from '../../constants';
import {getIPCRenderer} from '../../utils.jsx'; import { getIPCRenderer } from '../../utils.jsx';
import {confirmYesNo, saveState} from './common_actions'; import { confirmYesNo, saveState } from './common_actions';
import {notifyError} from './error_actions'; import { notifyError } from './error_actions';
export const addRemoteMount = (hostNameOrIp, port, token) => { export const addRemoteMount = (hostNameOrIp, port, token) => {
return (dispatch, getState) => { return (dispatch, getState) => {
@@ -23,20 +23,19 @@ export const addRemoteMount = (hostNameOrIp, port, token) => {
Version: getState().relver.InstalledVersion, Version: getState().relver.InstalledVersion,
}); });
} else { } else {
dispatch(noti dispatch(
'Failed to set \'RemoteToken\': ' notifyError('Failed to create S3 instance: ' + arg.data.Error)
oken );
': " + arg.data.Error));
dispatch(setBusy(false)); dispatch(setBusy(false));
} }
}); });
ipcRenderer.send(Constants.IPC_Set_Config_Values, { ipcRenderer.send(Constants.IPC_Set_Config_Values, {
Items: [ Items: [
{Name: 'RemoteMount.RemoteHostNameOrIp', Value: hostNameOrIp}, { Name: 'RemoteMount.RemoteHostNameOrIp', Value: hostNameOrIp },
{Name: 'RemoteMount.RemoteToken', Value: token}, { Name: 'RemoteMount.RemoteToken', Value: token },
{Name: 'RemoteMount.RemotePort', Value: port}, { Name: 'RemoteMount.RemotePort', Value: port },
{Name: 'RemoteMount.IsRemoteMount', Value: 'true'}, { Name: 'RemoteMount.IsRemoteMount', Value: 'true' },
], ],
Provider: provider, Provider: provider,
Remote: true, Remote: true,
@@ -77,11 +76,11 @@ export const addS3Mount = (
ipcRenderer.send(Constants.IPC_Set_Config_Values, { ipcRenderer.send(Constants.IPC_Set_Config_Values, {
Items: [ Items: [
{Name: 'S3Config.AccessKey', Value: accessKey}, { Name: 'S3Config.AccessKey', Value: accessKey },
{Name: 'S3Config.SecretKey', Value: secretKey}, { Name: 'S3Config.SecretKey', Value: secretKey },
{Name: 'S3Config.Region', Value: region}, { Name: 'S3Config.Region', Value: region },
{Name: 'S3Config.BucketName', Value: bucketName}, { Name: 'S3Config.BucketName', Value: bucketName },
{Name: 'S3Config.URL', Value: url}, { Name: 'S3Config.URL', Value: url },
], ],
Provider: provider, Provider: provider,
S3: true, S3: true,
@@ -139,34 +138,34 @@ export const removeMount3 = createAction('mounts/removeMount3');
export const RESET_MOUNTS_STATE = 'mounts/resetMountsState'; export const RESET_MOUNTS_STATE = 'mounts/resetMountsState';
export const resetMountsState = () => { export const resetMountsState = () => {
return {type: RESET_MOUNTS_STATE, payload: null}; return { type: RESET_MOUNTS_STATE, payload: null };
}; };
export const SET_ALLOW_MOUNT = 'mounts/setAllowMount'; export const SET_ALLOW_MOUNT = 'mounts/setAllowMount';
export const setAllowMount = (provider, allow) => { export const setAllowMount = (provider, allow) => {
return {type: SET_ALLOW_MOUNT, payload: {provider, allow}}; return { type: SET_ALLOW_MOUNT, payload: { provider, allow } };
}; };
export const SET_AUTO_MOUNT_PROCESSED = 'mounts/setAutoMountProcessed'; export const SET_AUTO_MOUNT_PROCESSED = 'mounts/setAutoMountProcessed';
export const setAutoMountProcessed = (provider, processed) => { export const setAutoMountProcessed = (provider, processed) => {
return {type: SET_AUTO_MOUNT_PROCESSED, payload: {provider, processed}}; return { type: SET_AUTO_MOUNT_PROCESSED, payload: { provider, processed } };
}; };
export const setBusy = createAction('mounts/setBusy'); export const setBusy = createAction('mounts/setBusy');
export const SET_MOUNT_STATE = 'mounts/setMountState'; export const SET_MOUNT_STATE = 'mounts/setMountState';
export const setMountState = (provider, state) => { export const setMountState = (provider, state) => {
return {type: SET_MOUNT_STATE, payload: {provider, state}}; return { type: SET_MOUNT_STATE, payload: { provider, state } };
}; };
export const SET_MOUNTED = 'mounts/setMounted'; export const SET_MOUNTED = 'mounts/setMounted';
export const setMounted = (provider, mounted) => { export const setMounted = (provider, mounted) => {
return {type: SET_MOUNTED, payload: {provider, mounted}}; return { type: SET_MOUNTED, payload: { provider, mounted } };
}; };
export const SET_PROVIDER_STATE = 'mounts/setProviderState'; export const SET_PROVIDER_STATE = 'mounts/setProviderState';
export const setProviderState = (provider, state) => { export const setProviderState = (provider, state) => {
return {type: SET_PROVIDER_STATE, payload: {provider, state}}; return { type: SET_PROVIDER_STATE, payload: { provider, state } };
}; };
export const unmountAll = (completedCallback) => { export const unmountAll = (completedCallback) => {