Fix duplicate calls to quickAction while selection still not completed …

…#1078
metasfresh · Jul 29, 2017 · f64443d · f64443d
1 parent 45d1d5c
commit f64443d
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 26 deletions.
diff --git a/src/components/Container.js b/src/components/Container.js
@@ -86,7 +86,6 @@ class Container extends Component {
                      {rawModal.visible &&
                          <RawModal
                              modalTitle={modalTitle}
-                             modalDescription={this.modalDescription}
                              modalDescription={modalDescription}
                              windowType={rawModal.type}
                              viewId={rawModal.viewId}
@@ -100,7 +99,7 @@ class Container extends Component {
                                      selectedWindowType={selectedWindowType}
                                      setModalTitle={setModalTitle}
                                      setModalDescription={setModalDescription}
-                                     fetchQuickActionsOnInit={true}
+                                     fetchQuickActionsOnInit={!(includedView.windowType && includedView.viewId)}
                                      modalDescription={this.modalDescription}
                                      isModal={true}
                                      processStatus={processStatus}

diff --git a/src/components/app/DocumentList.js b/src/components/app/DocumentList.js
@@ -524,6 +524,11 @@ class DocumentList extends Component {
             />
         }
 
+        let showQuickActions = true;
+        if (isModal && !inBackground && !selectionValid) {
+            showQuickActions = false;
+        }
+
         if(layout && data) {
             return (
                 <div
@@ -560,22 +565,25 @@ class DocumentList extends Component {
                                     clearFilters={this.clearStaticFilters}
                                 />}
                             </div>
-                            <QuickActions
-                                {...{
-                                    selectedWindowType,
-                                    refresh,
-                                    processStatus
-                                }}
-                                ref={ (c) => this.quickActionsComponent = (c && c.getWrappedInstance()) }
-                                selected={selected}
-                                viewId={viewId}
-                                windowType={windowType}
-                                fetchOnInit={fetchQuickActionsOnInit}
-                                disabled={hasIncluded}
-                                shouldNotUpdate={inBackground && !hasIncluded}
-                                inBackground={disablePaginationShortcuts}
-                                inModal={inModal}
-                            />
+
+                            {showQuickActions && (
+                                <QuickActions
+                                    {...{
+                                        selectedWindowType,
+                                        refresh,
+                                        processStatus
+                                    }}
+                                    ref={ (c) => this.quickActionsComponent = (c && c.getWrappedInstance()) }
+                                    selected={selected}
+                                    viewId={viewId}
+                                    windowType={windowType}
+                                    fetchOnInit={fetchQuickActionsOnInit}
+                                    disabled={hasIncluded}
+                                    shouldNotUpdate={inBackground && !hasIncluded}
+                                    inBackground={disablePaginationShortcuts}
+                                    inModal={inModal}
+                                />
+                            )}
                         </div>}
                         <div className="document-list-body">
                             <Table

diff --git a/src/components/app/QuickActions.js b/src/components/app/QuickActions.js
@@ -113,7 +113,7 @@ class QuickActions extends Component {
             loading: true
         });
 
-        let result = dispatch(
+        dispatch(
             openModal(
                 action.caption, action.processId, 'process', null, null, false,
                 viewId, selected
@@ -196,9 +196,7 @@ class QuickActions extends Component {
                             onClick={(e) => {
                                 e.preventDefault();
 
-                                if (!disabledDuringProcessing) {
-                                    this.handleClick(actions[0])
-                                }
+                                this.handleClick(actions[0])
                             }}
                             title={actions[0].caption}
                         >
@@ -214,9 +212,7 @@ class QuickActions extends Component {
                             onMouseLeave={() => this.toggleTooltip(false)}
                             onClick={
                                 () => {
-                                    if (!disabledDuringProcessing) {
-                                        this.toggleDropdown(!isDropdownOpen)
-                                    }
+                                    this.toggleDropdown(!isDropdownOpen)
                                 }
                             }
                         >

diff --git a/src/components/app/RawModal.js b/src/components/app/RawModal.js
@@ -5,7 +5,8 @@ import counterpart from 'counterpart';
 
 import Indicator from './Indicator';
 import {
-    closeRawModal
+    closeRawModal,
+    closeModal
 } from '../../actions/WindowActions';
 
 import {
@@ -80,6 +81,7 @@ class RawModal extends Component {
         const {dispatch, modalVisible} = this.props;
 
         dispatch(closeRawModal());
+        dispatch(closeModal());
 
         if (!modalVisible){
             document.body.style.overflow = 'auto';