From efd70077014cbed62e493372d33a2af5237eaadf Mon Sep 17 00:00:00 2001
From: Ville Brofeldt <33317356+villebro@users.noreply.github.com>
Date: Tue, 8 Jun 2021 14:55:11 +0300
Subject: [PATCH] fix(native-filters): show overridden chart name on scoping
 tree (#15038)

---
 .../FiltersConfigForm/FilterScope/utils.ts                  | 6 +++++-
 superset-frontend/src/dashboard/types.ts                    | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

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 8c74aa751..8cb48c138 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
@@ -45,7 +45,11 @@ export const buildTree = (
   ) {
     const currentTreeItem = {
       key: node.id,
-      title: node.meta.sliceName || node.meta.text || node.id.toString(),
+      title:
+        node.meta.sliceNameOverride ||
+        node.meta.sliceName ||
+        node.meta.text ||
+        node.id.toString(),
       children: [],
     };
     treeItem.children.push(currentTreeItem);
diff --git a/superset-frontend/src/dashboard/types.ts b/superset-frontend/src/dashboard/types.ts
index 9a15b1da7..bd6eeedd2 100644
--- a/superset-frontend/src/dashboard/types.ts
+++ b/superset-frontend/src/dashboard/types.ts
@@ -93,6 +93,7 @@ export type LayoutItem = {
     chartId: number;
     height: number;
     sliceName?: string;
+    sliceNameOverride?: string;
     text?: string;
     uuid: string;
     width: number;