adding new feature flag for datasource editor

apache · Jan 12, 2022 · 92578d5 · 92578d5
1 parent d1ece46
commit 92578d5
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 11 deletions.
diff --git a/superset-frontend/packages/superset-ui-core/src/utils/featureFlags.ts b/superset-frontend/packages/superset-ui-core/src/utils/featureFlags.ts
@@ -31,6 +31,7 @@ export enum FeatureFlag {
   SQLLAB_BACKEND_PERSISTENCE = 'SQLLAB_BACKEND_PERSISTENCE',
   THUMBNAILS = 'THUMBNAILS',
   LISTVIEWS_DEFAULT_CARD_VIEW = 'LISTVIEWS_DEFAULT_CARD_VIEW',
+  DISABLE_LEGACY_DATASOURCE_EDITOR = 'DISABLE_LEGACY_DATASOURCE_EDITOR',
   ENABLE_REACT_CRUD_VIEWS = 'ENABLE_REACT_CRUD_VIEWS',
   DISABLE_DATASET_SOURCE_EDIT = 'DISABLE_DATASET_SOURCE_EDIT',
   DISPLAY_MARKDOWN_HTML = 'DISPLAY_MARKDOWN_HTML',

diff --git a/superset-frontend/src/SqlLab/components/App/index.jsx b/superset-frontend/src/SqlLab/components/App/index.jsx
@@ -37,8 +37,6 @@ import QuerySearch from '../QuerySearch';
 class App extends React.PureComponent {
   constructor(props) {
     super(props);
-    console.log('this is App');
-    console.log(props);
     this.state = {
       hash: window.location.hash,
     };

diff --git a/superset-frontend/src/SqlLab/components/SqlEditor/index.jsx b/superset-frontend/src/SqlLab/components/SqlEditor/index.jsx
@@ -630,7 +630,6 @@ class SqlEditor extends React.PureComponent {
         )}
       </Menu>
     );
-
     return (
       <StyledToolbar className="sql-toolbar" id="js-sql-toolbar">
         <div className="leftItems">

diff --git a/superset-frontend/src/SqlLab/components/TabbedSqlEditors/index.jsx b/superset-frontend/src/SqlLab/components/TabbedSqlEditors/index.jsx
@@ -75,7 +75,6 @@ const userOS = detectOS();
 class TabbedSqlEditors extends React.PureComponent {
   constructor(props) {
     super(props);
-    console.log('this is the tabbed', props);
     const sqlLabUrl = '/superset/sqllab';
     this.state = {
       sqlLabUrl,
@@ -94,8 +93,6 @@ class TabbedSqlEditors extends React.PureComponent {
 
   componentDidMount() {
     // migrate query editor and associated tables state to server
-    console.log('we here boys');
-    console.log(this.props);
     if (isFeatureEnabled(FeatureFlag.SQLLAB_BACKEND_PERSISTENCE)) {
       const localStorageTables = this.props.tables.filter(
         table => table.inLocalStorage,
@@ -437,7 +434,6 @@ TabbedSqlEditors.propTypes = propTypes;
 TabbedSqlEditors.defaultProps = defaultProps;
 
 function mapStateToProps({ sqlLab, common, requestedQuery }) {
-  console.log(sqlLab);
   return {
     databases: sqlLab.databases,
     queryEditors: sqlLab.queryEditors,

diff --git a/superset-frontend/src/SqlLab/reducers/getInitialState.js b/superset-frontend/src/SqlLab/reducers/getInitialState.js
@@ -85,7 +85,6 @@ export default function getInitialState({
         functionNames: [],
         schema: activeTab.schema,
         queryLimit: activeTab.query_limit,
-        remoteId: activeTab.remoteId,
         validationResult: {
           id: null,
           errors: [],

diff --git a/superset-frontend/src/components/Datasource/DatasourceModal.test.jsx b/superset-frontend/src/components/Datasource/DatasourceModal.test.jsx
@@ -24,7 +24,7 @@ import { Provider } from 'react-redux';
 import fetchMock from 'fetch-mock';
 import thunk from 'redux-thunk';
 import sinon from 'sinon';
-import { supersetTheme, ThemeProvider } from '@superset-ui/core';
+import { supersetTheme, ThemeProvider, FeatureFlag } from '@superset-ui/core';
 
 import waitForComponentToPaint from 'spec/helpers/waitForComponentToPaint';
 import Modal from 'src/components/Modal';
@@ -72,7 +72,9 @@ describe('DatasourceModal', () => {
   beforeEach(async () => {
     isFeatureEnabledMock = jest
       .spyOn(featureFlags, 'isFeatureEnabled')
-      .mockReturnValue(true);
+      .mockImplementation(
+        featureFlag => featureFlag === FeatureFlag.ENABLE_REACT_CRUD_VIEWS,
+      );
     fetchMock.reset();
     wrapper = await mountAndWait();
   });
@@ -117,6 +119,7 @@ describe('DatasourceModal', () => {
   });
 
   it('renders a legacy data source btn', () => {
+    featureFlags.DISABLE_LEGACY_DATASOURCE_EDITOR = false;
     expect(
       wrapper.find('button[data-test="datasource-modal-legacy-edit"]'),
     ).toExist();

diff --git a/superset-frontend/src/components/Datasource/DatasourceModal.tsx b/superset-frontend/src/components/Datasource/DatasourceModal.tsx
@@ -183,6 +183,10 @@ const DatasourceModal: FunctionComponent<DatasourceModalProps> = ({
     });
   };
 
+  const showLegacyDatasourceEditor =
+    isFeatureEnabled(FeatureFlag.ENABLE_REACT_CRUD_VIEWS) &&
+    !isFeatureEnabled(FeatureFlag.DISABLE_LEGACY_DATASOURCE_EDITOR);
+
   return (
     <StyledDatasourceModal
       show={show}
@@ -195,7 +199,7 @@ const DatasourceModal: FunctionComponent<DatasourceModalProps> = ({
       }
       footer={
         <>
-          {isFeatureEnabled(FeatureFlag.ENABLE_REACT_CRUD_VIEWS) && (
+          {showLegacyDatasourceEditor && (
             <Button
               buttonSize="small"
               buttonStyle="default"

diff --git a/superset/config.py b/superset/config.py
@@ -350,6 +350,10 @@ def _try_json_readsha(filepath: str, length: int) -> Optional[str]:
     # When using a recent version of Druid that supports JOINs turn this on
     "DRUID_JOINS": False,
     "DYNAMIC_PLUGINS": False,
+    # With Superset 2.0, we are updating the default so that the legacy datasource
+    # editor no longer shows. Currently this is set to false so that the editor
+    # option does show, but we will be depreciating it.
+    "DISABLE_LEGACY_DATASOURCE_EDITOR": False,
     # For some security concerns, you may need to enforce CSRF protection on
     # all query request to explore_json endpoint. In Superset, we use
     # `flask-csrf <https://sjl.bitbucket.io/flask-csrf/>`_ add csrf protection