From 2cdd88aa4f2cae4e9cafd715946bfe044ada417b Mon Sep 17 00:00:00 2001 From: "JUST.in DO IT" Date: Mon, 26 Sep 2022 15:05:41 -0700 Subject: [PATCH] chore(dashboard): Add filter_scopes warning message for json metadata editor (#21543) Co-authored-by: John Bodley <4567245+john-bodley@users.noreply.github.com> --- .../components/PropertiesModal/index.tsx | 18 ++++++++++++++++++ superset-frontend/src/views/routes.test.tsx | 5 ++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/superset-frontend/src/dashboard/components/PropertiesModal/index.tsx b/superset-frontend/src/dashboard/components/PropertiesModal/index.tsx index 302931a38..9fb63d343 100644 --- a/superset-frontend/src/dashboard/components/PropertiesModal/index.tsx +++ b/superset-frontend/src/dashboard/components/PropertiesModal/index.tsx @@ -36,6 +36,7 @@ import Modal from 'src/components/Modal'; import { JsonEditor } from 'src/components/AsyncAceEditor'; import ColorSchemeControlWrapper from 'src/dashboard/components/ColorSchemeControlWrapper'; +import FilterScopeModal from 'src/dashboard/components/filterscope/FilterScopeModal'; import { getClientErrorObject } from 'src/utils/getClientErrorObject'; import withToasts from 'src/components/MessageToasts/withToasts'; import { FeatureFlag, isFeatureEnabled } from 'src/featureFlags'; @@ -658,6 +659,23 @@ const PropertiesModal = ({ {t( 'This JSON object is generated dynamically when clicking the save or overwrite button in the dashboard view. It is exposed here for reference and for power users who may want to alter specific parameters.', )} + {onlyApply && ( + <> + {' '} + {t( + 'Please DO NOT overwrite the "filter_scopes" key.', + )}{' '} + + {t('Use "%(menuName)s" menu instead.', { + menuName: t('Set filter mapping'), + })} + + } + /> + + )}

)} diff --git a/superset-frontend/src/views/routes.test.tsx b/superset-frontend/src/views/routes.test.tsx index e00c64f4a..2497dce15 100644 --- a/superset-frontend/src/views/routes.test.tsx +++ b/superset-frontend/src/views/routes.test.tsx @@ -16,13 +16,16 @@ * specific language governing permissions and limitations * under the License. */ - +import React from 'react'; import { isFrontendRoute, routes } from './routes'; jest.mock('src/featureFlags', () => ({ ...jest.requireActual('src/featureFlags'), isFeatureEnabled: jest.fn().mockReturnValue(true), })); +jest.mock('src/views/CRUD/welcome/Welcome', () => () => ( +
+)); describe('isFrontendRoute', () => { it('returns true if a route matches', () => {