update chart name with layoutItem

apache · Mar 29, 2023 · 85ac0e9 · 85ac0e9
1 parent ba60278
commit 85ac0e9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/superset-frontend/src/components/Chart/DrillBy/DrillByMenuItems.tsx b/superset-frontend/src/components/Chart/DrillBy/DrillByMenuItems.tsx
@@ -232,7 +232,6 @@ export const DrillByMenuItems = ({
         </div>
       </Menu.SubMenu>
       <DrillByModal
-        chartId={chartId}
         column={currentColumn}
         filters={filters}
         formData={formData}

diff --git a/superset-frontend/src/components/Chart/DrillBy/DrillByModal.tsx b/superset-frontend/src/components/Chart/DrillBy/DrillByModal.tsx
@@ -28,7 +28,7 @@ import {
 import Modal from 'src/components/Modal';
 import Button from 'src/components/Button';
 import { useSelector } from 'react-redux';
-import { Slice } from 'src/types/Chart';
+import { DashboardLayout, RootState } from 'src/dashboard/types';
 
 interface ModalFooterProps {
   exploreChart: () => void;
@@ -52,7 +52,6 @@ const ModalFooter = ({ exploreChart, closeModal }: ModalFooterProps) => (
 );
 
 interface DrillByModalProps {
-  chartId: number;
   column?: Column;
   filters?: BinaryQueryObjectFilterClause[];
   formData: { [key: string]: any; viz_type: string };
@@ -61,7 +60,6 @@ interface DrillByModalProps {
 }
 
 export default function DrillByModal({
-  chartId,
   column,
   formData,
   filters,
@@ -72,11 +70,14 @@ export default function DrillByModal({
   console.log(formData);
   console.log(filters);
   const theme = useTheme();
-  const { slice_name: chartName } = useSelector(
-    (state: { sliceEntities: { slices: Record<number, Slice> } }) =>
-      state.sliceEntities.slices[chartId],
+  const dashboardLayout = useSelector<RootState, DashboardLayout>(
+    state => state.dashboardLayout.present,
   );
-
+  const chartLayoutItem = Object.values(dashboardLayout).find(
+    layoutItem => layoutItem.meta?.chartId === formData.slice_id,
+  );
+  const chartName =
+    chartLayoutItem?.meta.sliceName || chartLayoutItem?.meta.sliceNameOverride;
   const exploreChart = () => {};
 
   return (