Add type for popupOptions

Author: Alyar

packages/devextreme/js/__internal/grids/new/grid_core/filtering/header_filter/legacy_header_filter.ts

@@ -25,6 +25,8 @@ import { updateHeaderFilterItemSelectionState } from '@ts/grids/grid_core/header
 import gridCoreUtils from '@ts/grids/grid_core/m_utils';
 import type { Column } from '@ts/grids/new/grid_core/columns_controller/types';
 
+import type { HeaderFilterListType } from './types';
+
 export const getHeaderItemText = (
   displayValue,
   column,
@@ -211,9 +213,9 @@ export const getDataSourceOptions = (
   return options.dataSource;
 };
 
-export const getFilterType = (
+export const getHeaderFilterListType = (
   column: Column,
-): 'tree' | 'list' => {
+): HeaderFilterListType => {
   const groupInterval = filteringUtils.getGroupInterval(column);
   return groupInterval && groupInterval.length > 1 ? 'tree' : 'list';
 };

packages/devextreme/js/__internal/grids/new/grid_core/filtering/header_filter/types.ts

@@ -1,12 +1,28 @@
+import type { FilterType } from '@js/common/grids';
 import type { DataSourceLike } from '@js/data/data_source';
 
+import type { Column } from '../../columns_controller/types';
+
 export type HeaderFilterSearchMode = 'contains' | 'startswith' | 'equals';
 export type HeaderFilterType = 'include' | 'exclude';
+export type HeaderFilterListType = 'tree' | 'list';
+
+export interface PopupOptions {
+  type: HeaderFilterListType;
+  column: Column;
+  headerFilter: HeaderFilterColumnOptions;
+  dataSource?: DataSourceLike<unknown>;
+  isFilterBuilder?: boolean;
+  filterType?: FilterType;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  filterValues?: any[];
+  apply: () => void;
+  hidePopupCallback: () => void;
+}
 
 export type PopupState = {
   element: Element;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  options: Record<string, any>;
+  options: PopupOptions;
 } | null;
 
 export interface HeaderFilterTextOptions {

packages/devextreme/js/__internal/grids/new/grid_core/filtering/header_filter/view.test.tsx

@@ -114,7 +114,7 @@ describe('HeaderFilter', () => {
         { popupState } as any,
       );
 
-      popupState.value = { element: {} as any, options: expectedOptions };
+      popupState.value = { element: {} as any, options: expectedOptions as any };
 
       expect(oldHeaderFilterMock.showHeaderFilterMenu)
         .toHaveBeenCalledTimes(1);
@@ -130,7 +130,7 @@ describe('HeaderFilter', () => {
         { popupState } as any,
       );
 
-      popupState.value = { element: {} as any, options: {} };
+      popupState.value = { element: {} as any, options: {} as any };
       popupState.value = null;
 
       expect(oldHeaderFilterMock.showHeaderFilterMenu)

packages/devextreme/js/__internal/grids/new/grid_core/filtering/header_filter/view_controller.test.ts

@@ -156,8 +156,8 @@ describe('HeaderFilter', () => {
 
         const state = viewController.popupState.peek();
 
-        expect(typeof state?.options.dataSource.load).toBe('function');
-        expect(typeof state?.options.dataSource.postProcess).toBe('function');
+        expect(typeof (state?.options.dataSource as any).load).toBe('function');
+        expect(typeof (state?.options.dataSource as any).postProcess).toBe('function');
       });
 
       // NOTE: Unfortunately, we cannot test perfectly local group functions here
@@ -195,8 +195,8 @@ describe('HeaderFilter', () => {
 
             const state = viewController.popupState.peek();
 
-            expect(state?.options.dataSource.group).toBeTruthy();
-            expect(checkFn(state?.options.dataSource.group)).toBeTruthy();
+            expect((state?.options.dataSource as any).group).toBeTruthy();
+            expect(checkFn((state?.options.dataSource as any).group)).toBeTruthy();
           });
     });
   });

packages/devextreme/js/__internal/grids/new/grid_core/filtering/header_filter/view_controller.ts

@@ -12,8 +12,8 @@ import { OptionsController } from '../../options_controller/options_controller';
 import { FilterController } from '../filter_controller';
 import type { AppliedFilters } from '../types';
 import { getAppliedFilterExpressions } from '../utils';
-import { getDataSourceOptions, getFilterType } from './legacy_header_filter';
-import type { PopupState } from './types';
+import { getDataSourceOptions, getHeaderFilterListType } from './legacy_header_filter';
+import type { PopupOptions, PopupState } from './types';
 import { getColumnIdentifier } from './utils';
 
 export class HeaderFilterViewController {
@@ -45,10 +45,9 @@ export class HeaderFilterViewController {
     const rootDataSource = this.dataController.getStoreLoadAdapter();
     const rootHeaderFilterOptions = this.options.oneWay('headerFilter').peek();
     const filterExpression = this.getFilterExpressionWithoutCurrentColumn(column);
-    const type = getFilterType(column);
+    const type = getHeaderFilterListType(column);
     const { columnsController } = this;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const popupOptions: any = {
+    const popupOptions: PopupOptions = {
       type,
       column: { ...column },
       isFilterBuilder,