From b3cdff49954a7cd366ab93cf1f20200af5465f84 Mon Sep 17 00:00:00 2001
From: Ville Brofeldt <33317356+villebro@users.noreply.github.com>
Date: Thu, 24 Jun 2021 11:01:24 +0300
Subject: [PATCH] fix(native-filters): show default text on filter scoping tree
 (#15351)

---
 superset-frontend/spec/fixtures/mockDashboardLayout.js          | 2 +-
 .../FiltersConfigModal/FiltersConfigForm/FilterScope/utils.ts   | 1 +
 superset-frontend/src/dashboard/types.ts                        | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/superset-frontend/spec/fixtures/mockDashboardLayout.js b/superset-frontend/spec/fixtures/mockDashboardLayout.js
index 90918d388..404b415d7 100644
--- a/superset-frontend/spec/fixtures/mockDashboardLayout.js
+++ b/superset-frontend/spec/fixtures/mockDashboardLayout.js
@@ -129,7 +129,7 @@ export const dashboardLayoutWithTabs = {
       children: ['ROW_ID2'],
       parents: ['ROOT_ID', 'TABS_ID'],
       meta: {
-        text: 'tab2',
+        text: '',
         defaultText: 'tab2',
       },
     },
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/utils.ts b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/utils.ts
index bbb896e64..555b87ff7 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/utils.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/utils.ts
@@ -50,6 +50,7 @@ export const buildTree = (
       node.meta.sliceNameOverride ||
         node.meta.sliceName ||
         node.meta.text ||
+        node.meta.defaultText ||
         node.id.toString(),
       initiallyExcludedCharts.includes(node.meta?.chartId),
       t(
diff --git a/superset-frontend/src/dashboard/types.ts b/superset-frontend/src/dashboard/types.ts
index 3fef394ab..7c1edae96 100644
--- a/superset-frontend/src/dashboard/types.ts
+++ b/superset-frontend/src/dashboard/types.ts
@@ -105,7 +105,9 @@ export type LayoutItem = {
   id: string;
   meta: {
     chartId: number;
+    defaultText?: string;
     height: number;
+    placeholder?: string;
     sliceName?: string;
     sliceNameOverride?: string;
     text?: string;