From 932d2cb07df2d02d3e70545baaee423dfb8202d3 Mon Sep 17 00:00:00 2001 From: Phillip Kelley-Dotson Date: Thu, 29 Jul 2021 12:02:42 -0700 Subject: [PATCH] add feature flags to pag control (#1251) --- .../plugin-chart-table/src/controlPanel.tsx | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx index 9403a488f22..7041df515be 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-table/src/controlPanel.tsx @@ -261,17 +261,20 @@ const config: ControlPanelConfig = { }, }, ], - [ - { - name: 'server_pagination', - config: { - type: 'CheckboxControl', - label: t('Server pagination'), - description: t('Enable server side pagination of results (experimental feature)'), - default: false, - }, - }, - ], + isFeatureEnabled(FeatureFlag.DASHBOARD_CROSS_FILTERS) || + isFeatureEnabled(FeatureFlag.DASHBOARD_NATIVE_FILTERS) + ? [ + { + name: 'server_pagination', + config: { + type: 'CheckboxControl', + label: t('Server pagination'), + description: t('Enable server side pagination of results (experimental feature)'), + default: false, + }, + }, + ] + : [], [ { name: 'row_limit',