- fix when and how quickactions are fetched #2021

metasfresh · Oct 23, 2018 · 454a8b7 · 454a8b7
1 parent a24d1b5
commit 454a8b7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/src/components/app/DocumentList.js b/src/components/app/DocumentList.js
@@ -787,9 +787,7 @@ class DocumentList extends Component {
       );
     }
 
-    const showQuickActions = Boolean(
-      !isModal || inBackground || selectionValid
-    );
+    const showQuickActions = true;
 
     return (
       <div

diff --git a/src/components/app/QuickActions.js b/src/components/app/QuickActions.js
@@ -44,20 +44,25 @@ class QuickActions extends Component {
   constructor(props) {
     super(props);
 
+    this.state = initialState;
+  }
+
+  componentDidMount = () => {
+    this.mounted = true;
+
     const {
       fetchOnInit,
       selected,
       windowType,
       viewId,
       childView,
       parentView,
-    } = props;
-    this.state = initialState;
+    } = this.props;
 
     if (fetchOnInit) {
       this.fetchActions(windowType, viewId, selected, childView, parentView);
     }
-  }
+  };
 
   componentWillUnmount = () => {
     this.mounted = false;
@@ -86,10 +91,6 @@ class QuickActions extends Component {
     return nextProps.shouldNotUpdate !== true;
   }
 
-  componentDidMount = () => {
-    this.mounted = true;
-  }
-
   componentDidUpdate = prevProps => {
     const { inBackground, inModal } = this.props;
 
@@ -161,7 +162,7 @@ class QuickActions extends Component {
       return;
     }
 
-    if (windowType && viewId && selected && childView && parentView) {
+    if (windowType && viewId && childView && parentView) {
       quickActionsRequest(windowType, viewId, selected, childView, parentView)
         .then(response => {
           this.setState({

diff --git a/src/utils/index.js b/src/utils/index.js
@@ -7,7 +7,7 @@ export const getQueryString = query =>
 
       if (Array.isArray(value) && value.length > 0) {
         parameters[key] = value.join(',');
-      } else {
+      } else if (value) {
         parameters[key] = value;
       }