fix failing tests

cherniavskii · Feb 7, 2025 · c44e0cf · c44e0cf
1 parent b5a728a
commit c44e0cf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 23 deletions.
diff --git a/...ges/x-data-grid-premium/src/components/sidebar/columnPanel/GridSidebarColumnPanelBody.tsx b/...ges/x-data-grid-premium/src/components/sidebar/columnPanel/GridSidebarColumnPanelBody.tsx
@@ -152,15 +152,15 @@ export function GridSidebarColumnPanelBody({
     initialModelKey: FieldTransferObject['modelKey'];
   }>(INITIAL_DRAG_STATE);
 
-  const initialColumnsLookup = useLazyRef(() => {
+  const initialColumnsLookup = React.useMemo(() => {
     return columns.reduce(
       (acc, column) => {
         acc[column.field] = column;
         return acc;
       },
       {} as Record<string, GridColDef>,
     );
-  }).current;
+  }, [columns]);
 
   const getColumnName = React.useCallback(
     (field: string) => {

diff --git a/...data-grid-premium/src/components/sidebar/columnPanel/GridSidebarColumnPanelPivotField.tsx b/...data-grid-premium/src/components/sidebar/columnPanel/GridSidebarColumnPanelPivotField.tsx
@@ -166,6 +166,10 @@ function AggregationSelect({
     [colDef, rootProps.aggregationFunctions],
   );
 
+  if (!colDef) {
+    return null;
+  }
+
   return (
     <AggregationSelectRoot
       as={rootProps.slots.baseSelect}

diff --git a/packages/x-data-grid-premium/src/tests/pivoting.DataGridPremium.test.tsx b/packages/x-data-grid-premium/src/tests/pivoting.DataGridPremium.test.tsx
@@ -178,13 +178,8 @@ describe('<DataGridPremium /> - Pivoting', () => {
       />,
     );
 
-    const columnsBtn = screen.getByRole('button', { name: /Columns/i });
-    user.click(columnsBtn);
-
-    await waitFor(() => {
-      const pivotSwitch = screen.getByLabelText('Pivot');
-      user.click(pivotSwitch);
-    });
+    const pivotSwitch = screen.getByLabelText('Pivot');
+    user.click(pivotSwitch);
 
     await waitFor(() => {
       const pivotSwitch = screen.getByLabelText('Pivot');
@@ -213,13 +208,8 @@ describe('<DataGridPremium /> - Pivoting', () => {
       />,
     );
 
-    const columnsBtn = screen.getByRole('button', { name: /Columns/i });
-    user.click(columnsBtn);
-
-    await waitFor(() => {
-      const pivotSwitch = screen.getByLabelText('Pivot');
-      user.click(pivotSwitch);
-    });
+    const pivotSwitch = screen.getByLabelText('Pivot');
+    user.click(pivotSwitch);
 
     await waitFor(() => {
       const pivotSwitch = screen.getByLabelText('Pivot');
@@ -248,13 +238,8 @@ describe('<DataGridPremium /> - Pivoting', () => {
       />,
     );
 
-    const columnsBtn = screen.getByRole('button', { name: /Columns/i });
-    user.click(columnsBtn);
-
-    await waitFor(() => {
-      const pivotSwitch = screen.getByLabelText('Pivot');
-      user.click(pivotSwitch);
-    });
+    const pivotSwitch = screen.getByLabelText('Pivot');
+    user.click(pivotSwitch);
 
     await waitFor(() => {
       const pivotSwitch = screen.getByLabelText('Pivot');