commit 2199f65373c2ca9ccc51e1d2b046f14c1e801cdb
author Grace Guo <grace.guo@airbnb.com> Mon Aug 30 15:47:00 2021 -0700
committer GitHub <noreply@github.com> Mon Aug 30 15:47:00 2021 -0700
tree a230fcf90cbfd88cb68b075dd9a4b3e249ab3f66
parent 8aa24e50d91211c3347623eec11fdf96002d9de6

fix: sql lab refetch button (#16469)

* fix: SQL Lab show "Refetch Results" button while fetching new query results (#15109)

* fix: SQL Lab show "Refetch Results" button while fetching new query results

* fix comments

(cherry picked from commit 408d58f937a544190ca64d13942a6a7b04b95615)

* handle exception caused by invalid query id

superset-frontend/src/SqlLab/reducers/sqlLab.js

diff --git a/superset-frontend/src/SqlLab/reducers/sqlLab.js b/superset-frontend/src/SqlLab/reducers/sqlLab.js
index 9e423ba..68de3eb 100644
--- a/superset-frontend/src/SqlLab/reducers/sqlLab.js
+++ b/superset-frontend/src/SqlLab/reducers/sqlLab.js
@@ -520,7 +520,20 @@
           if (changedQuery.changedOn > queriesLastUpdate) {
             queriesLastUpdate = changedQuery.changedOn;
           }
-          newQueries[id] = { ...state.queries[id], ...changedQuery };
+          const prevState = state.queries[id]?.state;
+          const currentState = changedQuery.state;
+          newQueries[id] = {
+            ...state.queries[id],
+            ...changedQuery,
+            // race condition:
+            // because of async behavior, sql lab may still poll a couple of seconds
+            // when it started fetching or finished rendering results
+            state:
+              currentState === 'success' &&
+              ['fetching', 'success'].includes(prevState)
+                ? prevState
+                : currentState,
+          };
           change = true;
         }
       });