- fetch actions after edit #2020

- small cleanup
metasfresh · Oct 23, 2018 · a24d1b5 · a24d1b5
1 parent 388de6d
commit a24d1b5
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 19 deletions.
diff --git a/src/actions/WindowActions.js b/src/actions/WindowActions.js
@@ -59,8 +59,8 @@ import { getData, openFile, patchRequest } from './GenericActions';
 import { initLayout } from '../api';
 import { setListIncludedView } from './ListActions';
 import { getWindowBreadcrumb } from './MenuActions';
-import { getScope, toggleFullScreen } from '../utils';
-import { parseToDisplay } from '../utils/documentListHelper';
+import { toggleFullScreen } from '../utils';
+import { getScope, parseToDisplay } from '../utils/documentListHelper';
 
 export function setLatestNewDocument(id) {
   return {

diff --git a/src/components/app/DocumentList.js b/src/components/app/DocumentList.js
@@ -623,9 +623,12 @@ class DocumentList extends Component {
   // END OF MANAGING SORT, PAGINATION, FILTERS -------------------------------
 
   setTableRowEdited = val => {
-    this.setState({
-      rowEdited: val,
-    });
+    this.setState(
+      {
+        rowEdited: val,
+      },
+      () => this.updateQuickActions()
+    );
   };
 
   adjustWidth = () => {

diff --git a/src/components/app/QuickActions.js b/src/components/app/QuickActions.js
@@ -25,7 +25,7 @@ class QuickActions extends Component {
     dispatch: PropTypes.func.isRequired,
 
     // from <DocumentList>
-    rows: ImmutablePropTypes.List.isRequired,
+    rows: ImmutablePropTypes.list,
     childView: PropTypes.object.isRequired,
     parentView: PropTypes.object.isRequired,
     windowType: PropTypes.string.isRequired,
@@ -39,7 +39,7 @@ class QuickActions extends Component {
     processStatus: PropTypes.string,
   };
 
-  unmounted = false;
+  mounted = false;
 
   constructor(props) {
     super(props);
@@ -60,7 +60,7 @@ class QuickActions extends Component {
   }
 
   componentWillUnmount = () => {
-    this.unmounted = true;
+    this.mounted = false;
   };
 
   componentWillReceiveProps = nextProps => {
@@ -86,16 +86,9 @@ class QuickActions extends Component {
     return nextProps.shouldNotUpdate !== true;
   }
 
-  updateActions = (childSelection = this.props.childView.viewSelectedIds) => {
-    const { windowType, viewId, selected, childView, parentView } = this.props;
-    this.fetchActions(
-      windowType,
-      viewId,
-      selected,
-      { ...childView, viewSelectedIds: childSelection },
-      parentView
-    );
-  };
+  componentDidMount = () => {
+    this.mounted = true;
+  }
 
   componentDidUpdate = prevProps => {
     const { inBackground, inModal } = this.props;
@@ -115,6 +108,17 @@ class QuickActions extends Component {
     }
   };
 
+  updateActions = (childSelection = this.props.childView.viewSelectedIds) => {
+    const { windowType, viewId, selected, childView, parentView } = this.props;
+    this.fetchActions(
+      windowType,
+      viewId,
+      selected,
+      { ...childView, viewSelectedIds: childSelection },
+      parentView
+    );
+  };
+
   handleClickOutside = () => {
     this.toggleDropdown();
   };
@@ -153,7 +157,7 @@ class QuickActions extends Component {
   };
 
   fetchActions = (windowType, viewId, selected, childView, parentView) => {
-    if (this.unmounted) {
+    if (!this.mounted) {
       return;
     }