diff --git a/superset/assets/spec/javascripts/explore/components/ControlPanelsContainer_spec.jsx b/superset/assets/spec/javascripts/explore/components/ControlPanelsContainer_spec.jsx
index 4d9e383f88..11ef2fc0cf 100644
--- a/superset/assets/spec/javascripts/explore/components/ControlPanelsContainer_spec.jsx
+++ b/superset/assets/spec/javascripts/explore/components/ControlPanelsContainer_spec.jsx
@@ -24,14 +24,9 @@ import { defaultControls } from 'src/explore/store';
import { getFormDataFromControls } from 'src/explore/controlUtils';
import { ControlPanelsContainer } from 'src/explore/components/ControlPanelsContainer';
import ControlPanelSection from 'src/explore/components/ControlPanelSection';
-import * as featureFlags from 'src/featureFlags';
describe('ControlPanelsContainer', () => {
let wrapper;
- let scopedFilterOn = false;
- const isFeatureEnabledMock = jest
- .spyOn(featureFlags, 'isFeatureEnabled')
- .mockImplementation(() => scopedFilterOn);
beforeAll(() => {
getChartControlPanelRegistry().registerValue('table', {
@@ -81,7 +76,6 @@ describe('ControlPanelsContainer', () => {
afterAll(() => {
getChartControlPanelRegistry().remove('table');
- isFeatureEnabledMock.mockRestore();
});
function getDefaultProps() {
@@ -100,10 +94,4 @@ describe('ControlPanelsContainer', () => {
wrapper = shallow();
expect(wrapper.find(ControlPanelSection)).toHaveLength(6);
});
-
- it('renders filter panel when SCOPED_FILTER flag is on', () => {
- scopedFilterOn = true;
- wrapper = shallow();
- expect(wrapper.find(ControlPanelSection)).toHaveLength(7);
- });
});
diff --git a/superset/assets/src/explore/components/controls/FilterPanel.tsx b/superset/assets/src/explore/components/controls/FilterPanel.tsx
deleted file mode 100644
index 435740c1a7..0000000000
--- a/superset/assets/src/explore/components/controls/FilterPanel.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import * as React from 'react';
-
-export default function FilterPanel() {
- return (
-
- test filter
-
- );
-}
diff --git a/superset/assets/src/explore/components/controls/index.js b/superset/assets/src/explore/components/controls/index.js
index 5e110a269a..aa084500f0 100644
--- a/superset/assets/src/explore/components/controls/index.js
+++ b/superset/assets/src/explore/components/controls/index.js
@@ -38,7 +38,6 @@ import ViewportControl from './ViewportControl';
import VizTypeControl from './VizTypeControl';
import MetricsControl from './MetricsControl';
import AdhocFilterControl from './AdhocFilterControl';
-import FilterPanel from './FilterPanel';
import FilterBoxItemControl from './FilterBoxItemControl';
import withVerification from './withVerification';
@@ -65,7 +64,6 @@ const controlMap = {
VizTypeControl,
MetricsControl,
AdhocFilterControl,
- FilterPanel,
FilterBoxItemControl,
MetricsControlVerifiedOptions: withVerification(
MetricsControl,
diff --git a/superset/assets/src/explore/controlPanels/sections.jsx b/superset/assets/src/explore/controlPanels/sections.jsx
index 6f530767d0..148b6a92c3 100644
--- a/superset/assets/src/explore/controlPanels/sections.jsx
+++ b/superset/assets/src/explore/controlPanels/sections.jsx
@@ -48,12 +48,6 @@ export const sqlaTimeSeries = {
controlSetRows: [['granularity_sqla'], ['time_range']],
};
-export const filters = {
- label: t('Filters'),
- expanded: true,
- controlSetRows: [['filters']],
-};
-
export const annotations = {
label: t('Annotations and Layers'),
expanded: true,
diff --git a/superset/assets/src/explore/controlUtils.js b/superset/assets/src/explore/controlUtils.js
index bfad374e98..361e162c2e 100644
--- a/superset/assets/src/explore/controlUtils.js
+++ b/superset/assets/src/explore/controlUtils.js
@@ -17,7 +17,6 @@
* under the License.
*/
import { getChartControlPanelRegistry } from '@superset-ui/chart';
-import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags';
import controls from './controls';
import * as sections from './controlPanels/sections';
@@ -168,14 +167,12 @@ export function sectionsToRender(vizType, datasourceType) {
datasourceAndVizType,
sqlaTimeSeries,
druidTimeSeries,
- filters,
} = sectionsCopy;
return []
.concat(
datasourceAndVizType,
datasourceType === 'table' ? sqlaTimeSeries : druidTimeSeries,
- isFeatureEnabled(FeatureFlag.SCOPED_FILTER) ? filters : undefined,
controlPanelSections,
)
.filter(section => section);
diff --git a/superset/assets/src/explore/controls.jsx b/superset/assets/src/explore/controls.jsx
index a2de030c23..05b5d6e04c 100644
--- a/superset/assets/src/explore/controls.jsx
+++ b/superset/assets/src/explore/controls.jsx
@@ -2137,10 +2137,6 @@ export const controls = {
provideFormDataToProps: true,
},
- filters: {
- type: 'FilterPanel',
- },
-
slice_id: {
type: 'HiddenControl',
label: t('Chart ID'),
diff --git a/superset/assets/src/featureFlags.ts b/superset/assets/src/featureFlags.ts
index 07e4da52c4..e8a628784c 100644
--- a/superset/assets/src/featureFlags.ts
+++ b/superset/assets/src/featureFlags.ts
@@ -19,7 +19,6 @@
// We can codegen the enum definition based on a list of supported flags that we
// check into source control. We're hardcoding the supported flags for now.
export enum FeatureFlag {
- SCOPED_FILTER = 'SCOPED_FILTER',
OMNIBAR = 'OMNIBAR',
CLIENT_CACHE = 'CLIENT_CACHE',
SCHEDULED_QUERIES = 'SCHEDULED_QUERIES',