UI Action Handler Changes, Misc Fixes

frontend/src/Store/Actions/Creators/createRemoveItemHandler.js

@@ -3,44 +3,42 @@ import { batchActions } from 'redux-batched-actions';
 import { set, removeItem } from '../baseActions';
 
 function createRemoveItemHandler(section, url) {
-  return function(payload) {
-    return function(dispatch, getState) {
-      const {
-        id,
-        ...queryParms
-      } = payload;
+  return function(getState, payload, dispatch) {
+    const {
+      id,
+      ...queryParms
+    } = payload;
 
-      dispatch(set({ section, isDeleting: true }));
+    dispatch(set({ section, isDeleting: true }));
 
-      const ajaxOptions = {
-        url: `${url}/${id}?${$.param(queryParms, true)}`,
-        method: 'DELETE'
-      };
+    const ajaxOptions = {
+      url: `${url}/${id}?${$.param(queryParms, true)}`,
+      method: 'DELETE'
+    };
 
-      const promise = $.ajax(ajaxOptions);
+    const promise = $.ajax(ajaxOptions);
 
-      promise.done((data) => {
-        dispatch(batchActions([
-          removeItem({ section, id }),
+    promise.done((data) => {
+      dispatch(batchActions([
+        removeItem({ section, id }),
 
-          set({
-            section,
-            isDeleting: false,
-            deleteError: null
-          })
-        ]));
-      });
-
-      promise.fail((xhr) => {
-        dispatch(set({
+        set({
           section,
           isDeleting: false,
-          deleteError: xhr
-        }));
-      });
+          deleteError: null
+        })
+      ]));
+    });
 
-      return promise;
-    };
+    promise.fail((xhr) => {
+      dispatch(set({
+        section,
+        isDeleting: false,
+        deleteError: xhr
+      }));
+    });
+
+    return promise;
   };
 }