REST API FINALIZATION (quickfix #2)

metasfresh · Jan 11, 2017 · ae4aec0 · ae4aec0
1 parent 4617c11
commit ae4aec0
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 41 deletions.
diff --git a/src/actions/GenericActions.js b/src/actions/GenericActions.js
@@ -126,3 +126,23 @@ export function deleteRequest(entity, docType, docId, tabId, rowId) {
         (rowId ? "/" + rowId : "")
     );
 }
+
+export function actionsRequest(entity, type, id){
+    return () => axios.get(
+        config.API_URL + '/' +
+        entity + '/' +
+        type + '/' +
+        id +
+        '/actions'
+    );
+}
+
+export function referencesRequest(entity, type, id){
+    return () => axios.get(
+        config.API_URL + '/' +
+        entity + '/' +
+        type + '/' + 
+        id +
+        '/references'
+    );
+}
diff --git a/src/actions/MenuActions.js b/src/actions/MenuActions.js
@@ -113,25 +113,6 @@ export function getWindowBreadcrumb(id){
     }
 }
 
-export function getRelatedDocuments(type, id){
-    return () => axios.get(
-        config.API_URL + '/window/' + type + '/' + id + '/references'
-    );
-}
-
-export function getDocumentActions(type, id){
-    return () => axios.get(
-        config.API_URL + '/window/' + type + '/' + id + '/actions'
-    );
-}
-
-export function getViewActions(type, viewId){
-    return () => axios.get(
-        config.API_URL + '/documentView/' + type + '/' + viewId + '/actions'
-    );
-}
-
-
 //END OF THUNK ACTIONS
 
 // UTILITIES

diff --git a/src/components/Container.js b/src/components/Container.js
@@ -7,16 +7,18 @@ class Container extends Component {
     constructor(props){
         super(props);
     }
+
     render() {
         const {
             docActionElem, docStatusData, docNoElement, docNoData, docSummaryData,
             dataId, windowType, breadcrumb, references, actions, showSidelist,
-            siteName, connectionError, noMargin
+            siteName, connectionError, noMargin, entity, children
         } = this.props;
 
         return (
             <div>
                 <Header
+                    entity={entity}
                     docStatus = {docActionElem}
                     docStatusData = {docStatusData}
                     docNo = {docNoElement}
@@ -32,8 +34,13 @@ class Container extends Component {
                 />
                 {connectionError && <ErrorScreen />}
                 <NotificationHandler />
-                <div className={"header-sticky-distance js-unselect " + (!!noMargin ? "dashboard" : "container-fluid")}>
-                    {this.props.children}
+                <div
+                    className={
+                        "header-sticky-distance js-unselect " +
+                        (!!noMargin ? "dashboard" : "container-fluid")
+                    }
+                >
+                    {children}
                 </div>
             </div>
         );

diff --git a/src/components/header/Header.js b/src/components/header/Header.js
@@ -253,7 +253,7 @@ class Header extends Component {
         const {
             docSummaryData, siteName, docNoData, docNo, docStatus, docStatusData,
             windowType, dataId, breadcrumb, showSidelist, references, actions, indicator,
-            viewId, inbox, homemenu, selected
+            viewId, inbox, homemenu, selected, entity
         } = this.props;
 
         const {
@@ -414,6 +414,7 @@ class Header extends Component {
                     handleClone={this.handleClone}
                     redirect={this.redirect}
                     selected={selected}
+                    entity={entity}
                 />}
 
                 {showSidelist && <SideList

diff --git a/src/components/header/SubHeader.js b/src/components/header/SubHeader.js
@@ -11,13 +11,16 @@ import {
 import keymap from '../../keymap.js';
 
 import {
-    getRelatedDocuments,
     setReferences,
-    getDocumentActions,
     setActions,
     getViewActions
 } from '../../actions/MenuActions';
 
+import {
+    actionsRequest,
+    referencesRequest
+} from '../../actions/GenericActions';
+
 class Subheader extends Component {
     constructor(props){
         super(props);
@@ -28,30 +31,23 @@ class Subheader extends Component {
     }
 
     componentDidMount() {
-        const {dispatch, windowType, dataId, viewId, selected} = this.props;
+        const {
+            dispatch, windowType, dataId, viewId, selected, entity
+        } = this.props;
+
         dispatch(setActions([]));
 
         document.getElementsByClassName('js-subheader-column')[0].focus();
 
-        if(windowType && dataId){
-            dispatch(getRelatedDocuments(windowType, dataId)).then((response) => {
+        if(selected.length === 1 || dataId){
+            dispatch(referencesRequest("window", windowType, dataId ? dataId : selected[0])).then((response) => {
                 dispatch(setReferences(response.data.references));
             });
-
-            dispatch(getDocumentActions(windowType,dataId)).then((response) => {
-                dispatch(setActions(response.data.actions));
-            });
-        }else if (viewId && !dataId){
-            dispatch(getViewActions(windowType, viewId)).then((response) => {
-                dispatch(setActions(response.data.actions));
-            });
-            if(selected && selected.length === 1){
-                dispatch(getRelatedDocuments(windowType, selected[0])).then((response) => {
-                    dispatch(setReferences(response.data.references));
-                });
-            }
         }
 
+        dispatch(actionsRequest(entity, windowType, dataId ? dataId : viewId)).then((response) => {
+            dispatch(setActions(response.data.actions));
+        });
     }
 
     handleReferenceClick = (type, filter) => {

diff --git a/src/containers/DocList.js b/src/containers/DocList.js
@@ -47,6 +47,7 @@ class DocList extends Component {
 
         return (
             <Container
+                entity="documentView"
                 breadcrumb={breadcrumb}
                 windowType={windowType}
                 actions={actions}

diff --git a/src/containers/MasterWindow.js b/src/containers/MasterWindow.js
@@ -66,6 +66,7 @@ class MasterWindow extends Component {
 
         return (
             <Container
+                entity="window"
                 docActionElem = {docActionElement}
                 docStatusData = {docStatusData}
                 docNoElement = {documentNoElement}