From 48b88e52417659a9eddfa7a8f7f0304946a94a58 Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Mon, 28 Aug 2017 14:31:43 -0700
Subject: [PATCH] [dashboard] load list of slices at modal enter time (#3379)

---
 .../javascripts/dashboard/components/SliceAdder.jsx   | 11 ++++++-----
 superset/assets/package.json                          |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/superset/assets/javascripts/dashboard/components/SliceAdder.jsx b/superset/assets/javascripts/dashboard/components/SliceAdder.jsx
index cb9206619e..9d8965cce4 100644
--- a/superset/assets/javascripts/dashboard/components/SliceAdder.jsx
+++ b/superset/assets/javascripts/dashboard/components/SliceAdder.jsx
@@ -37,7 +37,11 @@ class SliceAdder extends React.Component {
     };
   }
 
-  componentDidMount() {
+  componentWillUnmount() {
+    this.slicesRequest.abort();
+  }
+
+  onEnterModal() {
     const uri = '/sliceaddview/api/read?_flt_0_created_by=' + this.props.dashboard.curUserId;
     this.slicesRequest = $.ajax({
       url: uri,
@@ -66,10 +70,6 @@ class SliceAdder extends React.Component {
     });
   }
 
-  componentWillUnmount() {
-    this.slicesRequest.abort();
-  }
-
   addSlices() {
     this.props.dashboard.addSlicesToDashboard(Object.keys(this.state.selectionMap));
   }
@@ -173,6 +173,7 @@ class SliceAdder extends React.Component {
       <ModalTrigger
         triggerNode={this.props.triggerNode}
         tooltip="Add a new slice to the dashboard"
+        beforeOpen={this.onEnterModal.bind(this)}
         isButton
         modalBody={modalContent}
         bsSize="large"
diff --git a/superset/assets/package.json b/superset/assets/package.json
index 3359006b08..6039e6dcb0 100644
--- a/superset/assets/package.json
+++ b/superset/assets/package.json
@@ -67,7 +67,7 @@
     "react-addons-shallow-compare": "^15.4.2",
     "react-alert": "^1.0.14",
     "react-bootstrap": "^0.31.2",
-    "react-bootstrap-table": "^3.1.7",
+    "react-bootstrap-table": "^4.0.2",
     "react-datetime": "^2.9.0",
     "react-dom": "^15.5.1",
     "react-gravatar": "^2.6.1",