Support S3 delete

src/redux/actions/mount_actions.js

@@ -95,31 +95,36 @@ export const displayConfiguration = (provider, remote, s3) => {
   };
 };
 
-export const removeRemoteMount = provider => {
+export const removeMount = provider => {
   return dispatch => {
-    dispatch(confirmYesNo('Delete [' + provider.substr(6) + ']?'))
+    const isRemote = provider.startsWith('Remote');
+    dispatch(confirmYesNo('Delete [' + provider.substr(isRemote ? 6 : 2) + ']?'))
     .then(confirmed => {
       if (confirmed) {
-        dispatch(removeRemoteMount2(provider));
+        dispatch(removeMount2(provider));
       }
     });
   };
 };
 
-const removeRemoteMount2 = provider => {
+const removeMount2 = provider => {
   return dispatch => {
     const ipcRenderer = getIPCRenderer();
-    ipcRenderer.once(Constants.IPC_Remove_Remote_Mount_Reply, (_, arg) => {
+    ipcRenderer.once(Constants.IPC_Remove_Mount_Reply, (_, arg) => {
       if (arg.data.Success) {
-        dispatch(removeRemoteMount3(provider));
+        dispatch(removeMount3(provider));
         dispatch(saveState());
       }
     });
-    ipcRenderer.send(Constants.IPC_Remove_Remote_Mount, provider.substr(6));
+    const isRemote = provider.startsWith('Remote');
+    ipcRenderer.send(Constants.IPC_Remove_Mount, {
+      Remote: isRemote,
+      Name: provider.substr(isRemote ? 6 : 2)
+    });
   };
 };
 
-export const removeRemoteMount3 = createAction('mounts/removeRemoteMount3');
+export const removeMount3 = createAction('mounts/removeMount3');
 
 export const RESET_MOUNTS_STATE = 'mounts/resetMountsState';
 export const resetMountsState = () => {

src/redux/reducers/mount_reducer.js

@@ -5,7 +5,7 @@ import {
   addRemoteMount2,
   addS3Mount2,
   DISPLAY_CONFIGURATION,
-  removeRemoteMount3,
+  removeMount3,
   RESET_MOUNTS_STATE,
   SET_ALLOW_MOUNT,
   SET_AUTO_MOUNT_PROCESSED,
@@ -126,7 +126,7 @@ export const createMountReducer = state => {
           DisplayS3Configuration: action.payload.s3,
         };
       },
-      [removeRemoteMount3]: (state, action) => {
+      [removeMount3]: (state, action) => {
         let mountState = {...state.MountState};
         delete mountState[action.payload];
 
@@ -138,12 +138,15 @@ export const createMountReducer = state => {
 
         const remoteMounts =
           state.RemoteMounts.filter(i => i !== action.payload);
+        const s3Mounts =
+          state.S3Mounts.filter(i => i !== action.payload);
         return {
           ...state,
           AutoMountProcessed: autoMountProcessed,
           MountState: mountState,
           ProviderState: providerState,
           RemoteMounts: remoteMounts,
+          S3Mounts: s3Mounts,
         };
       },
       [RESET_MOUNTS_STATE]: (state, action) => {