bug fix

apache · Apr 12, 2023 · afc4510 · afc4510
1 parent 8da28e5
commit afc4510
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/superset-frontend/src/components/Chart/DrillBy/DrillByModal.tsx b/superset-frontend/src/components/Chart/DrillBy/DrillByModal.tsx
@@ -131,7 +131,12 @@ export default function DrillByModal({
   const [currentColumn, setCurrentColumn] = useState(column);
   const [currentFormData, setCurrentFormData] = useState(formData);
   const [currentFilters, setCurrentFilters] = useState(filters);
-  const [usedGroupbyColumns, setUsedGroupbyColumns] = useState([column]);
+  const [usedGroupbyColumns, setUsedGroupbyColumns] = useState([
+    ...ensureIsArray(formData[groupbyFieldName]).map(colName =>
+      dataset.columns?.find(col => col.column_name === colName),
+    ),
+    column,
+  ]);
 
   const updatedFormData = useMemo(() => {
     let updatedFormData = { ...currentFormData };

diff --git a/superset-frontend/src/components/Chart/types.ts b/superset-frontend/src/components/Chart/types.ts
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { Column } from '@superset-ui/core';
 
 export enum DrillByType {
   Chart,
@@ -39,4 +40,5 @@ export type Dataset = {
     first_name: string;
     last_name: string;
   }[];
+  columns?: Column[];
 };