From 69a5ed9a1e6b04df9dfa9f95c83d4832d732beb1 Mon Sep 17 00:00:00 2001 From: Jesse Yang Date: Thu, 18 Mar 2021 09:13:50 -0700 Subject: [PATCH] fix: use FeatureFlags in @superset-ui/core (#13679) --- superset-frontend/src/featureFlags.ts | 41 ++----------------------- superset-frontend/src/setup/setupApp.ts | 12 ++++++-- 2 files changed, 12 insertions(+), 41 deletions(-) diff --git a/superset-frontend/src/featureFlags.ts b/superset-frontend/src/featureFlags.ts index 6c9521353c9..118f0c3a44a 100644 --- a/superset-frontend/src/featureFlags.ts +++ b/superset-frontend/src/featureFlags.ts @@ -16,46 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -// 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 { - ALLOW_DASHBOARD_DOMAIN_SHARDING = 'ALLOW_DASHBOARD_DOMAIN_SHARDING', - OMNIBAR = 'OMNIBAR', - CLIENT_CACHE = 'CLIENT_CACHE', - DYNAMIC_PLUGINS = 'DYNAMIC_PLUGINS', - SCHEDULED_QUERIES = 'SCHEDULED_QUERIES', - SQL_VALIDATORS_BY_ENGINE = 'SQL_VALIDATORS_BY_ENGINE', - ESTIMATE_QUERY_COST = 'ESTIMATE_QUERY_COST', - SHARE_QUERIES_VIA_KV_STORE = 'SHARE_QUERIES_VIA_KV_STORE', - SQLLAB_BACKEND_PERSISTENCE = 'SQLLAB_BACKEND_PERSISTENCE', - THUMBNAILS = 'THUMBNAILS', - LISTVIEWS_DEFAULT_CARD_VIEW = 'LISTVIEWS_DEFAULT_CARD_VIEW', - ENABLE_REACT_CRUD_VIEWS = 'ENABLE_REACT_CRUD_VIEWS', - DISABLE_DATASET_SOURCE_EDIT = 'DISABLE_DATASET_SOURCE_EDIT', - DISPLAY_MARKDOWN_HTML = 'DISPLAY_MARKDOWN_HTML', - ESCAPE_MARKDOWN_HTML = 'ESCAPE_MARKDOWN_HTML', - DASHBOARD_NATIVE_FILTERS = 'DASHBOARD_NATIVE_FILTERS', - DASHBOARD_CROSS_FILTERS = 'DASHBOARD_CROSS_FILTERS', - DASHBOARD_RBAC = 'DASHBOARD_RBAC', - DASHBOARD_NATIVE_FILTERS_SET = 'DASHBOARD_NATIVE_FILTERS_SET', - VERSIONED_EXPORT = 'VERSIONED_EXPORT', - GLOBAL_ASYNC_QUERIES = 'GLOBAL_ASYNC_QUERIES', - ENABLE_TEMPLATE_PROCESSING = 'ENABLE_TEMPLATE_PROCESSING', - ENABLE_EXPLORE_DRAG_AND_DROP = 'ENABLE_EXPLORE_DRAG_AND_DROP', -} +import { FeatureFlagMap, FeatureFlag } from '@superset-ui/core'; -export type FeatureFlagMap = { - [key in FeatureFlag]?: boolean; -}; - -// eslint-disable-next-line @typescript-eslint/no-unused-vars -declare global { - interface Window { - featureFlags: FeatureFlagMap; - $: any; - jQuery: any; - } -} +export { FeatureFlagMap, FeatureFlag } from '@superset-ui/core'; export function initFeatureFlags(featureFlags: FeatureFlagMap) { if (!window.featureFlags) { diff --git a/superset-frontend/src/setup/setupApp.ts b/superset-frontend/src/setup/setupApp.ts index 740c97b3557..ba3b9ac9614 100644 --- a/superset-frontend/src/setup/setupApp.ts +++ b/superset-frontend/src/setup/setupApp.ts @@ -22,8 +22,16 @@ import { SupersetClient } from '@superset-ui/core'; import { getClientErrorObject, ClientErrorObject, -} from '../utils/getClientErrorObject'; -import setupErrorMessages from './setupErrorMessages'; +} from 'src/utils/getClientErrorObject'; +import setupErrorMessages from 'src/setup/setupErrorMessages'; + +// eslint-disable-next-line @typescript-eslint/no-unused-vars +declare global { + interface Window { + $: any; + jQuery: any; + } +} function showApiMessage(resp: ClientErrorObject) { const template =