feat: Query History CRUD list view

apache · Nov 12, 2020 · 6020af4 · 6020af4
1 parent 12cb27f
commit 6020af4
Show file tree

Hide file tree

Showing 21 changed files with 678 additions and 82 deletions.
diff --git a/superset-frontend/images/icons/offline.svg b/superset-frontend/images/icons/offline.svg
diff --git a/superset-frontend/images/icons/queued.svg b/superset-frontend/images/icons/queued.svg
diff --git a/superset-frontend/images/icons/running.svg b/superset-frontend/images/icons/running.svg
diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
diff --git a/superset-frontend/spec/javascripts/views/CRUD/annotation/AnnotationList_spec.jsx b/superset-frontend/spec/javascripts/views/CRUD/annotation/AnnotationList_spec.jsx
@@ -103,15 +103,15 @@ describe('AnnotationList', () => {
 
   it('fetches annotation layer', () => {
     const callsQ = fetchMock.calls(/annotation_layer\/1/);
-    expect(callsQ).toHaveLength(3);
-    expect(callsQ[2][0]).toMatchInlineSnapshot(
+    expect(callsQ).toHaveLength(2);
+    expect(callsQ[1][0]).toMatchInlineSnapshot(
       `"http://localhost/api/v1/annotation_layer/1"`,
     );
   });
 
   it('fetches annotations', () => {
     const callsQ = fetchMock.calls(/annotation_layer\/1\/annotation/);
-    expect(callsQ).toHaveLength(2);
+    expect(callsQ).toHaveLength(1);
     expect(callsQ[0][0]).toMatchInlineSnapshot(
       `"http://localhost/api/v1/annotation_layer/1/annotation/?q=(order_column:short_descr,order_direction:desc,page:0,page_size:25)"`,
     );

diff --git a/superset-frontend/src/SqlLab/components/App.jsx b/superset-frontend/src/SqlLab/components/App.jsx
@@ -21,6 +21,7 @@ import PropTypes from 'prop-types';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 import { t, supersetTheme, ThemeProvider } from '@superset-ui/core';
+import { FeatureFlag, isFeatureEnabled } from 'src/featureFlags';
 import throttle from 'lodash/throttle';
 import TabbedSqlEditors from './TabbedSqlEditors';
 import QueryAutoRefresh from './QueryAutoRefresh';
@@ -86,7 +87,13 @@ class App extends React.PureComponent {
 
   render() {
     let content;
-    if (this.state.hash) {
+    if (this.state.hash && this.state.hash === '#search') {
+      if (
+        isFeatureEnabled(FeatureFlag.ENABLE_REACT_CRUD_VIEWS) &&
+        isFeatureEnabled(FeatureFlag.SIP_34_QUERY_SEARCH_UI)
+      ) {
+        return window.location.replace('/superset/sqllab/history/');
+      }
       content = (
         <QuerySearch
           actions={this.props.actions}