From 7164303a13b77325007ff24ecb5d8e0546a62cd7 Mon Sep 17 00:00:00 2001
From: Kamil Gabryjelski <kamil.gabryjelski@gmail.com>
Date: Fri, 4 Feb 2022 14:01:16 +0100
Subject: [PATCH] chore(explore): make adhoc columns available without UX BETA
 ff (#17921)

* chore(explore): make adhoc columns available without UX BETA ff

* Remove redundant imports
---
 .../ColumnSelectPopover.tsx                   | 45 +++++++++----------
 .../ColumnSelectPopoverTrigger.tsx            | 12 +----
 2 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx
index 8b2d3b9bc39c7..8be4b10c3f5bd 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx
@@ -59,7 +59,6 @@ interface ColumnSelectPopoverProps {
   setLabel: (title: string) => void;
   getCurrentTab: (tab: string) => void;
   label: string;
-  isAdhocColumnsEnabled: boolean;
 }
 
 const getInitialColumnValues = (
@@ -85,7 +84,6 @@ const ColumnSelectPopover = ({
   setLabel,
   getCurrentTab,
   label,
-  isAdhocColumnsEnabled,
 }: ColumnSelectPopoverProps) => {
   const [initialLabel] = useState(label);
   const [initialAdhocColumn, initialCalculatedColumn, initialSimpleColumn] =
@@ -279,28 +277,27 @@ const ColumnSelectPopover = ({
             />
           </FormItem>
         </Tabs.TabPane>
-        {isAdhocColumnsEnabled && (
-          <Tabs.TabPane key="sqlExpression" tab={t('Custom SQL')}>
-            <SQLEditor
-              value={
-                adhocColumn?.sqlExpression ||
-                selectedSimpleColumn?.column_name ||
-                selectedCalculatedColumn?.expression
-              }
-              onFocus={onSqlEditorFocus}
-              showLoadingForImport
-              onChange={onSqlExpressionChange}
-              width="100%"
-              height={`${POPOVER_INITIAL_HEIGHT - 80}px`}
-              showGutter={false}
-              editorProps={{ $blockScrolling: true }}
-              enableLiveAutocompletion
-              className="filter-sql-editor"
-              wrapEnabled
-              ref={sqlEditorRef}
-            />
-          </Tabs.TabPane>
-        )}
+
+        <Tabs.TabPane key="sqlExpression" tab={t('Custom SQL')}>
+          <SQLEditor
+            value={
+              adhocColumn?.sqlExpression ||
+              selectedSimpleColumn?.column_name ||
+              selectedCalculatedColumn?.expression
+            }
+            onFocus={onSqlEditorFocus}
+            showLoadingForImport
+            onChange={onSqlExpressionChange}
+            width="100%"
+            height={`${POPOVER_INITIAL_HEIGHT - 80}px`}
+            showGutter={false}
+            editorProps={{ $blockScrolling: true }}
+            enableLiveAutocompletion
+            className="filter-sql-editor"
+            wrapEnabled
+            ref={sqlEditorRef}
+          />
+        </Tabs.TabPane>
       </Tabs>
       <div>
         <Button buttonSize="small" onClick={onResetStateAndClose} cta>
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopoverTrigger.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopoverTrigger.tsx
index 4298d2289018b..9f411a951d295 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopoverTrigger.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopoverTrigger.tsx
@@ -17,12 +17,7 @@
  * under the License.
  */
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import {
-  AdhocColumn,
-  FeatureFlag,
-  isFeatureEnabled,
-  t,
-} from '@superset-ui/core';
+import { AdhocColumn, t } from '@superset-ui/core';
 import {
   ColumnMeta,
   isAdhocColumn,
@@ -47,8 +42,6 @@ interface ColumnSelectPopoverTriggerProps {
 const defaultPopoverLabel = t('My column');
 const editableTitleTab = 'sqlExpression';
 
-const isAdhocColumnsEnabled = isFeatureEnabled(FeatureFlag.UX_BETA);
-
 const ColumnSelectPopoverTrigger = ({
   columns,
   editedColumn,
@@ -109,7 +102,6 @@ const ColumnSelectPopoverTrigger = ({
           label={popoverLabel}
           setLabel={setPopoverLabel}
           getCurrentTab={getCurrentTab}
-          isAdhocColumnsEnabled={isAdhocColumnsEnabled}
         />
       </ExplorePopoverContent>
     ),
@@ -148,7 +140,7 @@ const ColumnSelectPopoverTrigger = ({
       defaultVisible={visible}
       visible={visible}
       onVisibleChange={handleTogglePopover}
-      title={isAdhocColumnsEnabled && popoverTitle}
+      title={popoverTitle}
       destroyTooltipOnHide
     >
       {children}