ViewActions: destructure function parameters

#1407
metasfresh · Dec 4, 2017 · f7a073c · f7a073c
1 parent df5b142
commit f7a073c
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 20 deletions.
diff --git a/src/actions/ViewActions.js b/src/actions/ViewActions.js
@@ -20,13 +20,17 @@ export function getViewRowsByIds(windowId, viewId, docIds) {
     );
 }
 
-export function browseViewRequest(
-    viewId, page, pageLength, orderBy, windowType
-){
+export function browseViewRequest({
+    windowId,
+    viewId,
+    page,
+    pageLength,
+    orderBy
+}){
     return axios.get(
         config.API_URL +
         '/documentView/' +
-        windowType + '/' +
+        windowId + '/' +
         viewId +
         '?firstRow=' + pageLength * (page - 1) +
         '&pageLength=' + pageLength +
@@ -45,10 +49,12 @@ export function deleteView(
     );
 }
 
-export function createViewRequest(
-    windowType, viewType, pageLength, filters, refDocType = null,
-    refDocId = null, refTabId = null, refRowIds = null
-){
+export function createViewRequest({
+    windowId, viewType,
+    pageLength,
+    filters,
+    refDocType = null, refDocId = null, refTabId = null, refRowIds = null
+}){
     let referencing = null;
 
     if (refDocType && refDocId) {
@@ -63,17 +69,19 @@ export function createViewRequest(
         }
     }
 
-    return axios.post(config.API_URL + '/documentView/' + windowType, {
-        'documentType': windowType,
+    return axios.post(config.API_URL + '/documentView/' + windowId, {
+        'documentType': windowId,
         'viewType': viewType,
         'referencing': referencing,
         'filters': filters
     });
 }
 
-export function filterViewRequest(windowType, viewId, filters){
-    return axios.post(config.API_URL + '/documentView/' + windowType +
-    '/'+viewId+'/filter', {
+export function filterViewRequest(windowId, viewId, filters){
+    return axios.post(config.API_URL +
+      '/documentView/' + windowId +
+      '/' + viewId +
+      '/filter', {
         'filters': filters
     });
 }

diff --git a/src/components/app/DocumentList.js b/src/components/app/DocumentList.js
@@ -376,10 +376,16 @@ class DocumentList extends Component {
 
         const {page, sort, filters} = this.state;
 
-        createViewRequest(
-            windowType, type, this.pageLength, filters, refType, refId,
-            refTabId, refRowIds,
-        ).then(response => {
+        createViewRequest({
+            windowId : windowType,
+            viewType : type,
+            pageLength : this.pageLength,
+            filters : filters,
+            refDocType : refType,
+            refDocId : refId,
+            refTabId : refTabId,
+            refRowIds : refRowIds,
+        }).then(response => {
             this.mounted && this.setState({
                 data: response.data,
                 viewId: response.data.viewId
@@ -426,9 +432,13 @@ class DocumentList extends Component {
             sortingQuery && updateUri('sort', sortingQuery);
         }
 
-        return browseViewRequest(
-            id, page, this.pageLength, sortingQuery, windowType
-        ).then( (response) => {
+        return browseViewRequest({
+            windowId : windowType,
+            viewId : id,
+            page : page,
+            pageLength : this.pageLength,
+            orderBy : sortingQuery
+        }).then( (response) => {
             const selection = getSelection({
                 state: store.getState(),
                 windowType,