@mui/x-data-grid 6.11.1 → 6.12.0

package/models/props/DataGridProps.d.ts

@@ -162,6 +162,12 @@ export interface DataGridPropsWithDefaultValues {
      * @default false
      */
     disableDensitySelector: boolean;
+    /**
+     * If `true`, `eval()` is not used for performance optimization.
+     * @default false
+     * @ignore - do not document
+     */
+    disableEval: boolean;
     /**
      * If `true`, filtering with multiple columns is disabled.
      * @default false
@@ -198,6 +204,11 @@ export interface DataGridPropsWithDefaultValues {
      * @default "client"
      */
     filterMode: GridFeatureMode;
+    /**
+     * The milliseconds delay to wait after a keystroke before triggering filtering.
+     * @default 150
+     */
+    filterDebounceMs: number;
     /**
      * Sets the height in pixel of the column headers in the grid.
      * @default 56

package/modern/DataGrid/DataGrid.js

@@ -5,7 +5,7 @@ import { chainPropTypes } from '@mui/utils';
 import { GridBody, GridFooterPlaceholder, GridHeader, GridRoot } from '../components';
 import { GridContextProvider } from '../context/GridContextProvider';
 import { useDataGridComponent } from './useDataGridComponent';
-import { useDataGridProps } from './useDataGridProps';
+import { useDataGridProps, DATA_GRID_PROPS_DEFAULT_VALUES } from './useDataGridProps';
 import { DataGridVirtualScroller } from '../components/DataGridVirtualScroller';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -28,6 +28,18 @@ const DataGridRaw = /*#__PURE__*/React.forwardRef(function DataGrid(inProps, ref
   });
 });
 export const DataGrid = /*#__PURE__*/React.memo(DataGridRaw);
+
+/**
+ * Remove at v7
+ * @deprecated
+ */
+export const SUBMIT_FILTER_STROKE_TIME = DATA_GRID_PROPS_DEFAULT_VALUES.filterDebounceMs;
+
+/**
+ * Remove at v7
+ * @deprecated
+ */
+export const SUBMIT_FILTER_DATE_STROKE_TIME = DATA_GRID_PROPS_DEFAULT_VALUES.filterDebounceMs;
 DataGridRaw.propTypes = {
   // ----------------------------- Warning --------------------------------
   // | These PropTypes are generated from the TypeScript type definitions |
@@ -141,6 +153,12 @@ DataGridRaw.propTypes = {
    * @default false
    */
   disableDensitySelector: PropTypes.bool,
+  /**
+   * If `true`, `eval()` is not used for performance optimization.
+   * @default false
+   * @ignore - do not document
+   */
+  disableEval: PropTypes.bool,
   /**
    * If `true`, the selection on click on a row or cell is disabled.
    * @default false
@@ -165,6 +183,11 @@ DataGridRaw.propTypes = {
     columnGrouping: PropTypes.bool,
     warnIfFocusStateIsNotSynced: PropTypes.bool
   }),
+  /**
+   * The milliseconds delay to wait after a keystroke before triggering filtering.
+   * @default 150
+   */
+  filterDebounceMs: PropTypes.number,
   /**
    * Filtering can be processed on the server or client-side.
    * Set it to 'server' if you would like to handle filtering on the server-side.

package/modern/DataGrid/useDataGridProps.js

@@ -37,6 +37,7 @@ export const DATA_GRID_PROPS_DEFAULT_VALUES = {
   disableColumnMenu: false,
   disableColumnSelector: false,
   disableDensitySelector: false,
+  disableEval: false,
   disableMultipleColumnsFiltering: false,
   disableMultipleRowSelection: false,
   disableMultipleColumnsSorting: false,
@@ -44,6 +45,7 @@ export const DATA_GRID_PROPS_DEFAULT_VALUES = {
   disableVirtualization: false,
   editMode: GridEditModes.Cell,
   filterMode: 'client',
+  filterDebounceMs: 150,
   columnHeaderHeight: 56,
   hideFooter: false,
   hideFooterPagination: false,

package/modern/components/panel/filterPanel/GridFilterInputDate.js

@@ -4,9 +4,9 @@ const _excluded = ["item", "applyValue", "type", "apiRef", "focusElementRef", "I
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { unstable_useId as useId } from '@mui/utils';
+import { useTimeout } from '../../../hooks/utils/useTimeout';
 import { useGridRootProps } from '../../../hooks/utils/useGridRootProps';
 import { jsx as _jsx } from "react/jsx-runtime";
-export const SUBMIT_FILTER_DATE_STROKE_TIME = 500;
 function GridFilterInputDate(props) {
   const {
       item,
@@ -20,28 +20,22 @@ function GridFilterInputDate(props) {
       disabled
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
-  const filterTimeout = React.useRef();
+  const filterTimeout = useTimeout();
   const [filterValueState, setFilterValueState] = React.useState(item.value ?? '');
   const [applying, setIsApplying] = React.useState(false);
   const id = useId();
   const rootProps = useGridRootProps();
   const onFilterChange = React.useCallback(event => {
     const value = event.target.value;
-    clearTimeout(filterTimeout.current);
     setFilterValueState(String(value));
     setIsApplying(true);
-    filterTimeout.current = setTimeout(() => {
+    filterTimeout.start(rootProps.filterDebounceMs, () => {
       applyValue(_extends({}, item, {
         value
       }));
       setIsApplying(false);
-    }, SUBMIT_FILTER_DATE_STROKE_TIME);
-  }, [applyValue, item]);
-  React.useEffect(() => {
-    return () => {
-      clearTimeout(filterTimeout.current);
-    };
-  }, []);
+    });
+  }, [applyValue, item, rootProps.filterDebounceMs, filterTimeout]);
   React.useEffect(() => {
     const itemValue = item.value ?? '';
     setFilterValueState(String(itemValue));

package/modern/components/panel/filterPanel/GridFilterInputValue.js

@@ -4,9 +4,9 @@ const _excluded = ["item", "applyValue", "type", "apiRef", "focusElementRef", "t
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { unstable_useId as useId } from '@mui/utils';
+import { useTimeout } from '../../../hooks/utils/useTimeout';
 import { useGridRootProps } from '../../../hooks/utils/useGridRootProps';
 import { jsx as _jsx } from "react/jsx-runtime";
-export const SUBMIT_FILTER_STROKE_TIME = 500;
 function GridFilterInputValue(props) {
   const {
       item,
@@ -20,7 +20,7 @@ function GridFilterInputValue(props) {
       InputProps
     } = props,
     others = _objectWithoutPropertiesLoose(props, _excluded);
-  const filterTimeout = React.useRef();
+  const filterTimeout = useTimeout();
   const [filterValueState, setFilterValueState] = React.useState(item.value ?? '');
   const [applying, setIsApplying] = React.useState(false);
   const id = useId();
@@ -29,25 +29,23 @@ function GridFilterInputValue(props) {
     const {
       value
     } = event.target;
-    clearTimeout(filterTimeout.current);
     setFilterValueState(String(value));
     setIsApplying(true);
-    filterTimeout.current = setTimeout(() => {
-      applyValue(_extends({}, item, {
-        value
-      }));
+    filterTimeout.start(rootProps.filterDebounceMs, () => {
+      const newItem = _extends({}, item, {
+        value,
+        fromInput: id
+      });
+      applyValue(newItem);
       setIsApplying(false);
-    }, SUBMIT_FILTER_STROKE_TIME);
-  }, [applyValue, item]);
+    });
+  }, [id, applyValue, item, rootProps.filterDebounceMs, filterTimeout]);
   React.useEffect(() => {
-    return () => {
-      clearTimeout(filterTimeout.current);
-    };
-  }, []);
-  React.useEffect(() => {
-    const itemValue = item.value ?? '';
-    setFilterValueState(String(itemValue));
-  }, [item.value]);
+    const itemPlusTag = item;
+    if (itemPlusTag.fromInput !== id) {
+      setFilterValueState(String(item.value ?? ''));
+    }
+  }, [id, item]);
   return /*#__PURE__*/_jsx(rootProps.slots.baseTextField, _extends({
     id: id,
     label: apiRef.current.getLocaleText('filterPanelInputLabel'),

package/modern/components/panel/filterPanel/GridFilterPanel.js

@@ -36,9 +36,7 @@ const GridFilterPanel = /*#__PURE__*/React.forwardRef(function GridFilterPanel(p
       disableRemoveAllButton = false
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
-  const applyFilter = React.useCallback(item => {
-    apiRef.current.upsertFilterItem(item);
-  }, [apiRef]);
+  const applyFilter = apiRef.current.upsertFilterItem;
   const applyFilterLogicOperator = React.useCallback(operator => {
     apiRef.current.setFilterLogicOperator(operator);
   }, [apiRef]);

package/modern/components/toolbar/GridToolbarQuickFilter.js

@@ -45,15 +45,15 @@ const GridToolbarQuickFilterRoot = styled(TextField, {
 const defaultSearchValueParser = searchText => searchText.split(' ').filter(word => word !== '');
 const defaultSearchValueFormatter = values => values.join(' ');
 function GridToolbarQuickFilter(props) {
+  const apiRef = useGridApiContext();
+  const rootProps = useGridRootProps();
+  const quickFilterValues = useGridSelector(apiRef, gridQuickFilterValuesSelector);
   const {
       quickFilterParser = defaultSearchValueParser,
       quickFilterFormatter = defaultSearchValueFormatter,
-      debounceMs = 500
+      debounceMs = rootProps.filterDebounceMs
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
-  const apiRef = useGridApiContext();
-  const rootProps = useGridRootProps();
-  const quickFilterValues = useGridSelector(apiRef, gridQuickFilterValuesSelector);
   const [searchValue, setSearchValue] = React.useState(() => quickFilterFormatter(quickFilterValues ?? []));
   const prevQuickFilterValuesRef = React.useRef(quickFilterValues);
   React.useEffect(() => {
@@ -116,7 +116,7 @@ process.env.NODE_ENV !== "production" ? GridToolbarQuickFilter.propTypes = {
   // ----------------------------------------------------------------------
   /**
    * The debounce time in milliseconds.
-   * @default 500
+   * @default 150
    */
   debounceMs: PropTypes.number,
   /**

package/modern/hooks/features/export/useGridPrintExport.js

@@ -8,6 +8,7 @@ import { gridClasses } from '../../../constants/gridClasses';
 import { useGridApiMethod } from '../../utils/useGridApiMethod';
 import { gridRowsMetaSelector } from '../rows/gridRowsMetaSelector';
 import { getColumnsToExport } from './utils';
+import { mergeStateWithPaginationModel } from '../pagination/useGridPagination';
 import { useGridRegisterPipeProcessor } from '../../core/pipeProcessing';
 import { GridPrintExportMenuItem } from '../../../components/toolbar/GridToolbarExport';
 import { getTotalHeaderHeight } from '../columns/gridColumnsUtils';
@@ -46,11 +47,6 @@ export const useGridPrintExport = (apiRef, props) => {
   // Returns a promise because updateColumns triggers state update and
   // the new state needs to be in place before the grid can be sized correctly
   const updateGridColumnsForPrint = React.useCallback((fields, allColumns) => new Promise(resolve => {
-    // TODO remove unused Promise
-    if (!fields && !allColumns) {
-      resolve();
-      return;
-    }
     const exportedColumnFields = getColumnsToExport({
       apiRef,
       options: {
@@ -193,7 +189,14 @@ export const useGridPrintExport = (apiRef, props) => {
     previousColumnVisibility.current = gridColumnVisibilityModelSelector(apiRef);
     if (props.pagination) {
       const visibleRowCount = gridExpandedRowCountSelector(apiRef);
-      apiRef.current.setPageSize(visibleRowCount);
+      const paginationModel = {
+        page: 0,
+        pageSize: visibleRowCount
+      };
+      apiRef.current.updateControlState('pagination',
+      // Using signature `DataGridPro` to allow more than 100 rows in the print export
+      mergeStateWithPaginationModel(visibleRowCount, 'DataGridPro', paginationModel));
+      apiRef.current.forceUpdate();
     }
     await updateGridColumnsForPrint(options?.fields, options?.allColumns);
     apiRef.current.unstable_disableVirtualization();

package/modern/hooks/features/export/utils.js

@@ -7,7 +7,13 @@ export const getColumnsToExport = ({
 }) => {
   const columns = gridColumnDefinitionsSelector(apiRef);
   if (options.fields) {
-    return options.fields.map(field => columns.find(column => column.field === field)).filter(column => !!column);
+    return options.fields.reduce((currentColumns, field) => {
+      const column = columns.find(col => col.field === field);
+      if (column) {
+        currentColumns.push(column);
+      }
+      return currentColumns;
+    }, []);
   }
   const validColumns = options.allColumns ? columns : gridVisibleColumnDefinitionsSelector(apiRef);
   return validColumns.filter(column => !column.disableExport);

package/modern/hooks/features/filter/gridFilterUtils.js

@@ -4,6 +4,13 @@ import { GLOBAL_API_REF, isInternalFilter } from '../../../colDef/utils';
 import { getDefaultGridFilterModel } from './gridFilterState';
 import { buildWarning } from '../../../utils/warning';
 import { gridColumnFieldsSelector, gridColumnLookupSelector, gridVisibleColumnFieldsSelector } from '../columns';
+let hasEval;
+try {
+  // eslint-disable-next-line no-eval
+  hasEval = eval('true');
+} catch (_) {
+  hasEval = false;
+}
 /**
  * Adds default values to the optional fields of a filter items.
  * @param {GridFilterItem} item The raw filter item.
@@ -126,7 +133,7 @@ let filterItemsApplierId = 1;
  * @param {React.MutableRefObject<GridApiCommunity>} apiRef The API of the grid.
  * @returns {GridAggregatedFilterItemApplier | null} A method that checks if a row is matching the current filter model. If `null`, we consider that all the rows are matching the filters.
  */
-export const buildAggregatedFilterItemsApplier = (getRowId, filterModel, apiRef) => {
+export const buildAggregatedFilterItemsApplier = (getRowId, filterModel, apiRef, disableEval) => {
   const {
     items
   } = filterModel;
@@ -134,22 +141,19 @@ export const buildAggregatedFilterItemsApplier = (getRowId, filterModel, apiRef)
   if (appliers.length === 0) {
     return null;
   }
-
-  // Original logic:
-  // return (row, shouldApplyFilter) => {
-  //   const resultPerItemId: GridFilterItemResult = {};
-  //
-  //   for (let i = 0; i < appliers.length; i += 1) {
-  //     const applier = appliers[i];
-  //     if (!shouldApplyFilter || shouldApplyFilter(applier.item.field)) {
-  //       resultPerItemId[applier.item.id!] = applier.v7
-  //         ? applier.fn(row)
-  //         : applier.fn(getRowId ? getRowId(row) : row.id);
-  //     }
-  //   }
-  //
-  //   return resultPerItemId;
-  // };
+  if (!hasEval || disableEval) {
+    // This is the original logic, which is used if `eval()` is not supported (aka prevented by CSP).
+    return (row, shouldApplyFilter) => {
+      const resultPerItemId = {};
+      for (let i = 0; i < appliers.length; i += 1) {
+        const applier = appliers[i];
+        if (!shouldApplyFilter || shouldApplyFilter(applier.item.field)) {
+          resultPerItemId[applier.item.id] = applier.v7 ? applier.fn(row) : applier.fn(getRowId ? getRowId(row) : row.id);
+        }
+      }
+      return resultPerItemId;
+    };
+  }
 
   // We generate a new function with `eval()` to avoid expensive patterns for JS engines
   // such as a dynamic object assignment, e.g. `{ [dynamicKey]: value }`.
@@ -257,8 +261,8 @@ export const buildAggregatedQuickFilterApplier = (getRowId, filterModel, apiRef)
     return result;
   };
 };
-export const buildAggregatedFilterApplier = (getRowId, filterModel, apiRef) => {
-  const isRowMatchingFilterItems = buildAggregatedFilterItemsApplier(getRowId, filterModel, apiRef);
+export const buildAggregatedFilterApplier = (getRowId, filterModel, apiRef, disableEval) => {
+  const isRowMatchingFilterItems = buildAggregatedFilterItemsApplier(getRowId, filterModel, apiRef, disableEval);
   const isRowMatchingQuickFilter = buildAggregatedQuickFilterApplier(getRowId, filterModel, apiRef);
   return function isRowMatchingFilters(row, shouldApplyFilter, result) {
     result.passingFilterItems = isRowMatchingFilterItems?.(row, shouldApplyFilter) ?? null;

package/modern/hooks/features/filter/useGridFilter.js

@@ -59,7 +59,7 @@ export const useGridFilter = (apiRef, props) => {
   const updateFilteredRows = React.useCallback(() => {
     apiRef.current.setState(state => {
       const filterModel = gridFilterModelSelector(state, apiRef.current.instanceId);
-      const isRowMatchingFilters = props.filterMode === 'client' ? buildAggregatedFilterApplier(props.getRowId, filterModel, apiRef) : null;
+      const isRowMatchingFilters = props.filterMode === 'client' ? buildAggregatedFilterApplier(props.getRowId, filterModel, apiRef, props.disableEval) : null;
       const filteringResult = apiRef.current.applyStrategyProcessor('filtering', {
         isRowMatchingFilters,
         filterModel: filterModel ?? getDefaultGridFilterModel()
@@ -73,7 +73,7 @@ export const useGridFilter = (apiRef, props) => {
       });
     });
     apiRef.current.publishEvent('filteredRowsSet');
-  }, [apiRef, props.filterMode, props.getRowId]);
+  }, [apiRef, props.filterMode, props.getRowId, props.disableEval]);
   const addColumnMenuItem = React.useCallback((columnMenuItems, colDef) => {
     if (colDef == null || colDef.filterable === false || props.disableColumnFilter) {
       return columnMenuItems;

package/modern/hooks/features/pagination/useGridPagination.js

@@ -16,7 +16,7 @@ export const paginationStateInitializer = (state, props) => {
     }
   });
 };
-const mergeStateWithPaginationModel = (rowCount, signature, paginationModelProp) => paginationState => {
+export const mergeStateWithPaginationModel = (rowCount, signature, paginationModelProp) => paginationState => {
   let paginationModel = paginationState.paginationModel;
   const pageSize = paginationModelProp?.pageSize ?? paginationModel.pageSize;
   const pageCount = getPageCount(rowCount, pageSize);

package/modern/hooks/features/rows/useGridRows.js

@@ -52,6 +52,16 @@ export const useGridRows = (apiRef, props) => {
     }
     return null;
   }, [apiRef]);
+  const getRowIdProp = props.getRowId;
+  const getRowId = React.useCallback(row => {
+    if (GRID_ID_AUTOGENERATED in row) {
+      return row[GRID_ID_AUTOGENERATED];
+    }
+    if (getRowIdProp) {
+      return getRowIdProp(row);
+    }
+    return row.id;
+  }, [getRowIdProp]);
   const lookup = React.useMemo(() => currentPage.rows.reduce((acc, {
     id
   }, index) => {
@@ -291,6 +301,7 @@ export const useGridRows = (apiRef, props) => {
   }, [apiRef, props.signature, props.getRowId]);
   const rowApi = {
     getRow,
+    getRowId,
     getRowModels,
     getRowsCount,
     getAllRowIds,

package/modern/hooks/utils/useLazyRef.js

@@ -1,5 +1,7 @@
 import * as React from 'react';
 const UNINITIALIZED = {};
+
+// See https://github.com/facebook/react/issues/14490 for when to use this.
 export function useLazyRef(init, initArg) {
   const ref = React.useRef(UNINITIALIZED);
   if (ref.current === UNINITIALIZED) {

package/modern/hooks/utils/useTimeout.js

@@ -0,0 +1,28 @@
+import { useLazyRef } from './useLazyRef';
+import { useOnMount } from './useOnMount';
+class Timeout {
+  constructor() {
+    this.currentId = 0;
+    this.clear = () => {
+      if (this.currentId !== 0) {
+        clearTimeout(this.currentId);
+        this.currentId = 0;
+      }
+    };
+    this.disposeEffect = () => {
+      return this.clear;
+    };
+  }
+  static create() {
+    return new Timeout();
+  }
+  start(delay, fn) {
+    this.clear();
+    this.currentId = setTimeout(fn, delay);
+  }
+}
+export function useTimeout() {
+  const timeout = useLazyRef(Timeout.create).current;
+  useOnMount(timeout.disposeEffect);
+  return timeout;
+}

package/modern/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid v6.11.1
+ * @mui/x-data-grid v6.12.0
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/modern/locales/esES.js

@@ -57,37 +57,35 @@ const esESGrid = {
   filterOperatorOnOrAfter: 'es en o posterior',
   filterOperatorBefore: 'es anterior',
   filterOperatorOnOrBefore: 'es en o anterior',
-  filterOperatorIsEmpty: 'está vacío',
+  filterOperatorIsEmpty: 'esta vacío',
   filterOperatorIsNotEmpty: 'no esta vacío',
   filterOperatorIsAnyOf: 'es cualquiera de',
-  // 'filterOperator=': '=',
-  // 'filterOperator!=': '!=',
-  // 'filterOperator>': '>',
-  // 'filterOperator>=': '>=',
-  // 'filterOperator<': '<',
-  // 'filterOperator<=': '<=',
-
+  'filterOperator=': '=',
+  'filterOperator!=': '!=',
+  'filterOperator>': '>',
+  'filterOperator>=': '>=',
+  'filterOperator<': '<',
+  'filterOperator<=': '<=',
   // Header filter operators text
-  // headerFilterOperatorContains: 'Contains',
-  // headerFilterOperatorEquals: 'Equals',
-  // headerFilterOperatorStartsWith: 'Starts with',
-  // headerFilterOperatorEndsWith: 'Ends with',
-  // headerFilterOperatorIs: 'Is',
-  // headerFilterOperatorNot: 'Is not',
-  // headerFilterOperatorAfter: 'Is after',
-  // headerFilterOperatorOnOrAfter: 'Is on or after',
-  // headerFilterOperatorBefore: 'Is before',
-  // headerFilterOperatorOnOrBefore: 'Is on or before',
-  // headerFilterOperatorIsEmpty: 'Is empty',
-  // headerFilterOperatorIsNotEmpty: 'Is not empty',
-  // headerFilterOperatorIsAnyOf: 'Is any of',
-  // 'headerFilterOperator=': 'Equals',
-  // 'headerFilterOperator!=': 'Not equals',
-  // 'headerFilterOperator>': 'Greater than',
-  // 'headerFilterOperator>=': 'Greater than or equal to',
-  // 'headerFilterOperator<': 'Less than',
-  // 'headerFilterOperator<=': 'Less than or equal to',
-
+  headerFilterOperatorContains: 'Contiene',
+  headerFilterOperatorEquals: 'Es igual a',
+  headerFilterOperatorStartsWith: 'Comienza con',
+  headerFilterOperatorEndsWith: 'Termina con',
+  headerFilterOperatorIs: 'Es',
+  headerFilterOperatorNot: 'No es',
+  headerFilterOperatorAfter: 'Esta después de',
+  headerFilterOperatorOnOrAfter: 'Esta en o después de',
+  headerFilterOperatorBefore: 'Esta antes de',
+  headerFilterOperatorOnOrBefore: 'Esta en o antes de',
+  headerFilterOperatorIsEmpty: 'Esta vacío',
+  headerFilterOperatorIsNotEmpty: 'No esta vacío',
+  headerFilterOperatorIsAnyOf: 'Es cualquiera de',
+  'headerFilterOperator=': 'Es igual a',
+  'headerFilterOperator!=': 'Es diferente a',
+  'headerFilterOperator>': 'Es mayor que',
+  'headerFilterOperator>=': 'Es mayor o igual que',
+  'headerFilterOperator<': 'Es menor que',
+  'headerFilterOperator<=': 'Es menor o igual que',
   // Filter values text
   filterValueAny: 'cualquiera',
   filterValueTrue: 'verdadero',

package/modern/locales/ukUA.js

@@ -74,34 +74,32 @@ const ukUAGrid = {
   filterOperatorIsEmpty: 'порожній',
   filterOperatorIsNotEmpty: 'не порожній',
   filterOperatorIsAnyOf: 'будь-що із',
-  // 'filterOperator=': '=',
-  // 'filterOperator!=': '!=',
-  // 'filterOperator>': '>',
-  // 'filterOperator>=': '>=',
-  // 'filterOperator<': '<',
-  // 'filterOperator<=': '<=',
-
+  'filterOperator=': '=',
+  'filterOperator!=': '!=',
+  'filterOperator>': '>',
+  'filterOperator>=': '>=',
+  'filterOperator<': '<',
+  'filterOperator<=': '<=',
   // Header filter operators text
-  // headerFilterOperatorContains: 'Contains',
-  // headerFilterOperatorEquals: 'Equals',
-  // headerFilterOperatorStartsWith: 'Starts with',
-  // headerFilterOperatorEndsWith: 'Ends with',
-  // headerFilterOperatorIs: 'Is',
-  // headerFilterOperatorNot: 'Is not',
-  // headerFilterOperatorAfter: 'Is after',
-  // headerFilterOperatorOnOrAfter: 'Is on or after',
-  // headerFilterOperatorBefore: 'Is before',
-  // headerFilterOperatorOnOrBefore: 'Is on or before',
-  // headerFilterOperatorIsEmpty: 'Is empty',
-  // headerFilterOperatorIsNotEmpty: 'Is not empty',
-  // headerFilterOperatorIsAnyOf: 'Is any of',
-  // 'headerFilterOperator=': 'Equals',
-  // 'headerFilterOperator!=': 'Not equals',
-  // 'headerFilterOperator>': 'Greater than',
-  // 'headerFilterOperator>=': 'Greater than or equal to',
-  // 'headerFilterOperator<': 'Less than',
-  // 'headerFilterOperator<=': 'Less than or equal to',
-
+  headerFilterOperatorContains: 'Містить',
+  headerFilterOperatorEquals: 'Дорівнює',
+  headerFilterOperatorStartsWith: 'Починається з',
+  headerFilterOperatorEndsWith: 'Закінчується на',
+  headerFilterOperatorIs: 'Дорівнює',
+  headerFilterOperatorNot: 'Не дорівнює',
+  headerFilterOperatorAfter: 'Після',
+  headerFilterOperatorOnOrAfter: 'Після (включаючи)',
+  headerFilterOperatorBefore: 'Раніше',
+  headerFilterOperatorOnOrBefore: 'Раніше (включаючи)',
+  headerFilterOperatorIsEmpty: 'Порожнє',
+  headerFilterOperatorIsNotEmpty: 'Не порожнє',
+  headerFilterOperatorIsAnyOf: 'Будь-що із',
+  'headerFilterOperator=': 'Дорівнює',
+  'headerFilterOperator!=': 'Не дорівнює',
+  'headerFilterOperator>': 'Більше ніж',
+  'headerFilterOperator>=': 'Більше або дорівнює',
+  'headerFilterOperator<': 'Менше ніж',
+  'headerFilterOperator<=': 'Менше або дорівнює',
   // Filter values text
   filterValueAny: 'будь-який',
   filterValueTrue: 'так',