@redsift/table 11.4.1 → 11.5.0-muiv5

package/index.js

@@ -1,4 +1,4 @@
-import { GRID_DETAIL_PANEL_TOGGLE_COL_DEF, getGridNumericOperators as getGridNumericOperators$1, GridFilterInputValue, GridFilterInputSingleSelect, GridFilterInputMultipleValue, GridFilterInputMultipleSingleSelect, getGridStringOperators as getGridStringOperators$1, getGridBooleanOperators, getGridDateOperators, getGridSingleSelectOperators, GridLogicOperator, GridToolbarContainer, GridToolbarFilterButton, GridToolbarColumnsButton, GridToolbarDensitySelector, GridToolbarExport, gridExpandedSortedRowIdsSelector, GridToolbarQuickFilter, gridPaginatedVisibleSortedGridRowEntriesSelector, gridPaginatedVisibleSortedGridRowIdsSelector, gridFilteredSortedRowEntriesSelector, gridFilteredSortedRowIdsSelector, useGridApiRef, DataGridPro } from '@mui/x-data-grid-pro';
+import { GRID_DETAIL_PANEL_TOGGLE_COL_DEF, getGridNumericOperators as getGridNumericOperators$1, GridFilterInputValue, GridFilterInputSingleSelect, GridFilterInputMultipleValue, GridFilterInputMultipleSingleSelect, getGridStringOperators as getGridStringOperators$1, getGridBooleanOperators, getGridDateOperators, getGridSingleSelectOperators, GridLinkOperator, GridToolbarContainer, GridToolbarFilterButton, GridToolbarColumnsButton, GridToolbarDensitySelector, GridToolbarExport, gridVisibleSortedRowIdsSelector, GridToolbarQuickFilter, gridPaginatedVisibleSortedGridRowEntriesSelector, gridPaginatedVisibleSortedGridRowIdsSelector, gridFilteredSortedRowEntriesSelector, gridFilteredSortedRowIdsSelector, useGridApiRef, DataGridPro } from '@mui/x-data-grid-pro';
 export { getGridBooleanOperators, getGridDateOperators, getGridSingleSelectOperators } from '@mui/x-data-grid-pro';
 import * as React from 'react';
 import React__default, { Children, isValidElement, cloneElement, forwardRef, useLayoutEffect, useEffect, useRef, useContext, useState, useCallback, createElement, useMemo } from 'react';
@@ -17639,7 +17639,7 @@ const isBetweenOperator = {
   label: 'is between',
   value: 'isBetween',
   getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
+    if (!filterItem.columnField || !filterItem.value || !filterItem.operatorValue) {
       return null;
     }
     if (!Array.isArray(filterItem.value) || filterItem.value.length !== 2) {
@@ -17652,7 +17652,7 @@ const isBetweenOperator = {
       return null;
     }
     return params => {
-      return params.value !== null && params.value !== undefined && filterItem.value[0] <= params.value && params.value <= filterItem.value[1];
+      return params.value !== null && filterItem.value[0] <= params.value && params.value <= filterItem.value[1];
     };
   },
   InputComponent: InputNumberInterval
@@ -17665,7 +17665,7 @@ const doesNotContain = {
   label: 'does not contain',
   value: 'doesNotContain',
   getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
+    if (!filterItem.columnField || !filterItem.value || !filterItem.operatorValue) {
       return null;
     }
     return params => {
@@ -17686,7 +17686,7 @@ const doesNotEqual = {
   label: 'does not equal',
   value: 'doesNotEqual',
   getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.value) {
+    if (!filterItem.columnField || !filterItem.value || !filterItem.operatorValue) {
       return null;
     }
     return params => {
@@ -17707,7 +17707,7 @@ const doesNotHaveOperator = {
   label: "doesn't have",
   value: 'doesNotHave',
   getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
+    if (!filterItem.columnField || !filterItem.value || !filterItem.operatorValue) {
       return null;
     }
     return params => {
@@ -17726,7 +17726,7 @@ const hasOperator = {
   label: 'has',
   value: 'has',
   getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
+    if (!filterItem.columnField || !filterItem.value || !filterItem.operatorValue) {
       return null;
     }
     return params => {
@@ -17745,7 +17745,7 @@ const hasOnlyOperator = {
   label: 'has only',
   value: 'hasOnly',
   getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
+    if (!filterItem.columnField || !filterItem.value || !filterItem.operatorValue) {
       return null;
     }
     return params => {
@@ -17764,7 +17764,7 @@ const isOperator = {
   label: 'is',
   value: 'is',
   getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
+    if (!filterItem.columnField || !filterItem.value || !filterItem.operatorValue) {
       return null;
     }
     return params => {
@@ -17785,7 +17785,7 @@ const isNotOperator = {
   label: 'is not',
   value: 'isNot',
   getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
+    if (!filterItem.columnField || !filterItem.value || !filterItem.operatorValue) {
       return null;
     }
     return params => {
@@ -17806,7 +17806,7 @@ const containsAnyOfOperator = {
   label: 'contains any of',
   value: 'containsAnyOf',
   getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
+    if (!filterItem.columnField || !filterItem.value || !filterItem.operatorValue) {
       return null;
     }
     return params => {
@@ -17831,7 +17831,7 @@ const containsAnyOfCIOperator = {
   label: 'contains any of (case insensitive)',
   value: 'containsAnyOf',
   getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
+    if (!filterItem.columnField || !filterItem.value || !filterItem.operatorValue) {
       return null;
     }
     return params => {
@@ -17858,7 +17858,7 @@ const endsWithAnyOfOperator = {
   label: 'ends with any of',
   value: 'endsWithAnyOf',
   getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
+    if (!filterItem.columnField || !filterItem.value || !filterItem.operatorValue) {
       return null;
     }
     return params => {
@@ -17885,7 +17885,7 @@ const isAnyOfOperator = {
   label: 'is any of',
   value: 'isAnyOf',
   getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
+    if (!filterItem.columnField || !filterItem.value || !filterItem.operatorValue) {
       return null;
     }
     return params => {
@@ -17912,7 +17912,7 @@ const hasAnyOfOperator = {
   label: 'has any of',
   value: 'hasAnyOf',
   getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
+    if (!filterItem.columnField || !filterItem.value || !filterItem.operatorValue) {
       return null;
     }
     return params => {
@@ -17935,7 +17935,7 @@ const isNotAnyOfOperator = {
   label: 'is not any of',
   value: 'isNotAnyOf',
   getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
+    if (!filterItem.columnField || !filterItem.value || !filterItem.operatorValue) {
       return null;
     }
     return params => {
@@ -17954,15 +17954,12 @@ const isNotAnyOfOperator = {
   InputComponent: GridFilterInputMultipleValue
 };
 const IS_NOT_ANY_OF = isNotAnyOfOperator;
-const IS_NOT_ANY_OF_WITH_SELECT = _objectSpread2(_objectSpread2({}, IS_NOT_ANY_OF), {}, {
-  InputComponent: GridFilterInputMultipleSingleSelect
-});
 
 const startsWithAnyOfOperator = {
   label: 'starts with any of',
   value: 'startsWithAnyOf',
   getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
+    if (!filterItem.columnField || !filterItem.value || !filterItem.operatorValue) {
       return null;
     }
     return params => {
@@ -17989,7 +17986,7 @@ const doesNotHaveAnyOf = {
   label: "doesn't have any of",
   value: 'doesNotHaveAnyOf',
   getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !Array.isArray(filterItem.value) || filterItem.value.length === 0) {
+    if (!filterItem.columnField || !filterItem.value || !Array.isArray(filterItem.value) || filterItem.value.length === 0) {
       return null;
     }
     return params => {
@@ -18034,37 +18031,37 @@ const operatorList = {
 
 const getRsStringColumnType = () => {
   return {
-    type: 'string',
+    extendType: 'string',
     filterOperators: operatorList.rsString
   };
 };
 const getRsNumberColumnType = () => {
   return {
-    type: 'number',
+    extendType: 'number',
     filterOperators: operatorList.rsNumber
   };
 };
 const getRsSingleSelectColumnType = () => {
   return {
-    type: 'singleSelect',
+    extendType: 'singleSelect',
     filterOperators: operatorList.rsSingleSelect
   };
 };
 const getRsSingleSelectWithShortOperatorListColumnType = () => {
   return {
-    type: 'singleSelect',
+    extendType: 'singleSelect',
     filterOperators: operatorList.rsSingleSelectWithShortOperatorList
   };
 };
 const getRsMultipleSelectColumnType = () => {
   return {
-    type: 'singleSelect',
+    extendType: 'singleSelect',
     filterOperators: operatorList.rsMultipleSelect
   };
 };
 const getRsMultipleSelectWithShortOperatorListColumnType = () => {
   return {
-    type: 'singleSelect',
+    extendType: 'singleSelect',
     filterOperators: operatorList.rsMultipleSelectWithShortOperatorList
   };
 };
@@ -18079,7 +18076,7 @@ const customColumnTypes = {
 
 const API_URL = 'https://api.openai.com/v1/chat/completions';
 async function getCompletion(text, role, openai_api_key) {
-  let model = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'gpt-3.5-turbo-1106';
+  let model = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'gpt-3.5-turbo-0613';
   try {
     const messages = [{
       role: 'system',
@@ -18246,39 +18243,42 @@ const numberOperatorDecoder = {
   lt: '<',
   lte: '<='
 };
-const isOperatorValueValid = (field, operator, columns) => {
-  const column = columns.find(column => column.field === field);
+const isOperatorValueValid = (columnField, operatorValue, columns) => {
+  const column = columns.find(column => column.field === columnField);
   if (!column) {
     return false;
   }
   const columnType = (column === null || column === void 0 ? void 0 : column.type) || 'string';
-  const operators = column.filterOperators || operatorList[columnType];
+  const operators = operatorList[columnType];
   if (!operators) {
     return false;
   }
-  return !!operators.find(op => columnType === 'number' && Object.keys(numberOperatorEncoder).includes(op.value) ? numberOperatorEncoder[op.value] === operator : op.value === operator);
+  if ('filterOperators' in operators) {
+    return !!operators.filterOperators.find(op => columnType === 'number' && Object.keys(numberOperatorEncoder).includes(op.value) ? numberOperatorEncoder[op.value] === operatorValue : op['value'] === operatorValue);
+  }
+  return !!operators.find(op => ['number', 'rsNumber'].includes(columnType) && Object.keys(numberOperatorEncoder).includes(op.value) ? numberOperatorEncoder[op.value] === operatorValue : op['value'] === operatorValue);
 };
 const listOperators = ['containsAnyOf', 'doesNotContainAnyOf', 'endsWithAnyOf', 'doesNotEndWithAnyOf', 'hasAnyOf', 'doesNotHaveAnyOf', 'isAnyOf', 'isNotAnyOf', 'startsWithAnyOf', 'doesNotStartWithAnyOf'];
 
 // Check if the value doesn't break
-const isValueValid = (value, field, columns, operator) => {
+const isValueValid = (value, columnField, columns, operatorValue) => {
   var _column$type;
   // every field accepts undefined as value for default
   if (value === undefined || value === '') {
     return true;
   }
 
-  // xxxAnyOf accepts as value only lists, and we are declaring them in the
+  // xxxAnyOf accepts as value only lists, and we are declearing them in the
   // URL as `list=[...]`
-  if (listOperators.includes(operator)) {
+  if (listOperators.includes(operatorValue)) {
     return Array.isArray(value) || value === '';
   }
 
   // We are accepting arrays only if they are of the 'xxxAnyOf' type
-  if (Array.isArray(value) && !listOperators.includes(operator)) {
+  if (Array.isArray(value) && !listOperators.includes(operatorValue)) {
     return false;
   }
-  const column = columns.find(column => column.field === field);
+  const column = columns.find(column => column.field === columnField);
   if (!column) {
     return false;
   }
@@ -18316,7 +18316,7 @@ const getFilterModelFromString = (searchString, columns) => {
   if (!searchString) {
     return 'invalid';
   }
-  let logicOperator = GridLogicOperator.And;
+  let linkOperator = GridLinkOperator.And;
   let quickFilterValues = [];
   const searchParams = new URLSearchParams();
   for (const [key, value] of new URLSearchParams(searchString)) {
@@ -18324,7 +18324,7 @@ const getFilterModelFromString = (searchString, columns) => {
       searchParams.set(key, value);
     }
     if (key === '_logicOperator') {
-      logicOperator = value === GridLogicOperator.And || value === GridLogicOperator.Or ? value : GridLogicOperator.And;
+      linkOperator = value;
     }
     if (key === '_quickFilterValues') {
       try {
@@ -18343,7 +18343,7 @@ const getFilterModelFromString = (searchString, columns) => {
     if (isInvalid) {
       return;
     }
-    const field = key.split('[')[0].slice(1);
+    const field = key.split('[')[0].slice(1); // Slice to remove the _ at the beginning
     if (!fields.includes(field)) {
       return;
     }
@@ -18360,6 +18360,7 @@ const getFilterModelFromString = (searchString, columns) => {
       return;
     }
     const operator = splitRight[0];
+    // if the operator is not part of the valid operators invalidate the URL
     if (!isOperatorValueValid(field, operator, columns) || Array.isArray(operator)) {
       isInvalid = true;
       return;
@@ -18371,37 +18372,41 @@ const getFilterModelFromString = (searchString, columns) => {
       return;
     }
     items.push({
-      field,
-      operator: columnType === 'number' && Object.keys(numberOperatorDecoder).includes(operator) ? numberOperatorDecoder[operator] : operator,
+      columnField: field,
+      operatorValue: ['number', 'rsNumber'].includes(columnType) && Object.keys(numberOperatorDecoder).includes(operator) ? numberOperatorDecoder[operator] : operator,
       id,
       value: listOperators.includes(operator) && decodedValue === '' ? [] : decodedValue,
       type
     });
   });
+
+  // If we found some condition that results in an invalid URL,
+  // return the empty filterModel (this will trigger the localStorage)
+  // and will pick up the last valid search
   if (isInvalid) {
     return 'invalid';
   }
   return {
     items,
-    logicOperator,
+    linkOperator,
     quickFilterValues
   };
 };
 const getSearchParamsFromFilterModel = filterModel => {
   var _filterModel$quickFil;
   const searchParams = new URLSearchParams();
-  searchParams.set('_logicOperator', filterModel['logicOperator'] || '');
+  searchParams.set('_logicOperator', filterModel['linkOperator'] || '');
   filterModel['items'].forEach(item => {
     const {
-      field,
-      operator,
+      columnField,
+      operatorValue,
       value,
       type
     } = item;
-    if (Object.keys(numberOperatorEncoder).includes(operator)) {
-      searchParams.set(`_${field}[${numberOperatorEncoder[operator]},${encodeValue(type)}]`, encodeValue(value));
+    if (Object.keys(numberOperatorEncoder).includes(operatorValue)) {
+      searchParams.set(`_${columnField}[${numberOperatorEncoder[operatorValue]},${encodeValue(type)}]`, encodeValue(value));
     } else {
-      searchParams.set(`_${field}[${encodeValue(operator)},${encodeValue(type)}]`, encodeValue(value));
+      searchParams.set(`_${columnField}[${encodeValue(operatorValue)},${encodeValue(type)}]`, encodeValue(value));
     }
   });
   if ((_filterModel$quickFil = filterModel.quickFilterValues) !== null && _filterModel$quickFil !== void 0 && _filterModel$quickFil.length) {
@@ -18417,7 +18422,7 @@ const getSearchParamsFromFilterModel = filterModel => {
 const getFilterModel = (search, columns, localStorageFilters, setLocalStorageFilters, initialState, isNewVersion) => {
   const defaultValue = initialState && initialState.filter && initialState.filter.filterModel ? initialState.filter.filterModel : {
     items: [],
-    logicOperator: GridLogicOperator.And
+    linkOperator: GridLinkOperator.And
   };
   if (isNewVersion) {
     return defaultValue;
@@ -18556,38 +18561,13 @@ const getPaginationModel = (search, localStoragePagination, setLocalStoragePagin
 
 /** COLUMN VISIBILITY */
 
-const getColumnVisibilityFromString = (searchString, columns) => {
-  if (!searchString) {
-    return 'invalid';
-  }
-  const searchParams = new URLSearchParams(searchString);
-  const value = searchParams.get('_columnVisibility');
-  if (value === '' || value === null || value === '[]') {
-    return 'invalid';
-  }
-  const parsedFields = value.slice(1, value.length - 1).split(',');
-  const fields = columns.map(column => column.field);
-  const visibility = {};
-  for (const field of fields) {
-    visibility[field] = false;
-  }
-  for (const parsedField of parsedFields) {
-    if (fields.includes(parsedField)) {
-      visibility[parsedField] = true;
-    }
-  }
-  if (Object.values(visibility).filter(v => v === true).length === 0) {
-    return 'invalid';
-  }
-  return visibility;
-};
 const getSearchParamsFromColumnVisibility = (columnVisibility, columns) => {
   const searchParams = new URLSearchParams();
-  const fields = columns.map(column => column.field);
+  const columnFields = columns.map(column => column.field);
 
   // if column visibility model is empty, show all columns
   if (Object.keys(columnVisibility).length == 0) {
-    searchParams.set('_columnVisibility', `[${fields.join(',')}]`);
+    searchParams.set('_columnVisibility', `[${columnFields.join(',')}]`);
     return searchParams;
   }
   const finalColumnVisibility = columns.filter(c => {
@@ -18598,10 +18578,63 @@ const getSearchParamsFromColumnVisibility = (columnVisibility, columns) => {
       [colName]: true
     });
   }, columnVisibility);
-  const visibleColumns = fields.filter(column => finalColumnVisibility[column] !== false);
+  const visibleColumns = Object.entries(finalColumnVisibility)
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  .filter(_ref => {
+    let [_, visible] = _ref;
+    return visible;
+  })
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  .map(_ref2 => {
+    let [column, _] = _ref2;
+    return encodeValue(column);
+  });
   searchParams.set('_columnVisibility', `[${visibleColumns.join(',')}]`);
   return searchParams;
 };
+const getColumnVisibilityFromString = (notParsed, tableColumns) => {
+  if (!notParsed || notParsed.length === 1 && notParsed[0] === '?') {
+    return 'invalid';
+  }
+  // remove the initial ? if present
+  const parsed = notParsed[0] === '?' ? notParsed.slice(1) : notParsed;
+  const visibility = {};
+  let exist = false;
+  let visibleColumnsCount = 0;
+  for (const item of parsed.split('&')) {
+    // if it's not column visibility field, skip
+    const fieldURL = item.split('=')[0];
+    if (fieldURL !== '_columnVisibility') {
+      continue;
+    }
+    // e.g. item = _columnVisibility[abc,def]
+    const left = item.split(']')[0];
+    if (left.split('[').length < 2) {
+      continue;
+    }
+    const encodedValues = item.split('[')[1].split(']')[0];
+    if (typeof encodedValues !== 'string') {
+      continue;
+    }
+    exist = true;
+    const columnFields = tableColumns.map(column => column.field);
+    // TODO: Add validation that , is present
+    const columns = encodedValues.split(',').map(value => decodeValue(value));
+
+    // for each column, check if it's visible and add it to visibility model
+    for (const column of columnFields) {
+      const isColumnVisible = columns.includes(column);
+      visibility[column] = isColumnVisible;
+      if (isColumnVisible) {
+        visibleColumnsCount += 1;
+      }
+    }
+  }
+  if (visibleColumnsCount === 0 && !exist) {
+    return 'invalid';
+  }
+  return visibility;
+};
 
 // Rules:
 // - if we have something in the URL, use that info
@@ -18662,8 +18695,8 @@ const getPinnedColumnsFromString = (notParsed, tableColumns) => {
     if (typeof encodedValues !== 'string') {
       continue;
     }
-    const fields = [...tableColumns.map(column => column.field), '__check__'];
-    const columns = encodedValues.split(',').map(value => decodeValue(value)).filter(val => typeof val === 'string' && fields.includes(val));
+    const columnFields = [...tableColumns.map(column => column.field), '__check__'];
+    const columns = encodedValues.split(',').map(value => decodeValue(value)).filter(val => typeof val === 'string' && columnFields.includes(val));
     if (fieldURL === '_pinnedColumnsLeft') {
       pinnedColumns['left'] = columns;
     }
@@ -18671,9 +18704,9 @@ const getPinnedColumnsFromString = (notParsed, tableColumns) => {
       pinnedColumns['right'] = columns;
     }
   }
-  return pinnedColumns.left && pinnedColumns.left.length > 0 || pinnedColumns.right && pinnedColumns.right.length > 0 ? {
-    left: pinnedColumns.left || [],
-    right: pinnedColumns.right || []
+  return pinnedColumns['left'] || pinnedColumns['right'] ? {
+    left: pinnedColumns['left'] || [],
+    right: pinnedColumns['right'] || []
   } : 'invalid';
 };
 const getSearchParamsFromPinnedColumns = pinnedColumns => {
@@ -18723,7 +18756,7 @@ const getSearchParamsFromTab = search => {
   }
   return searchParams;
 };
-const getFinalSearch = _ref => {
+const getFinalSearch = _ref3 => {
   let {
     search,
     localStorageVersion,
@@ -18733,7 +18766,7 @@ const getFinalSearch = _ref => {
     columnsVisibilityModel,
     pinnedColumnsModel,
     columns
-  } = _ref;
+  } = _ref3;
   const filterModelSearch = getSearchParamsFromFilterModel(filterModel);
   const sortModelSearch = getSearchParamsFromSorting(sortModel);
   const paginationModelSearch = getSearchParamsFromPagination(paginationModel);
@@ -18798,14 +18831,14 @@ const getModelsParsedOrUpdateLocalStorage = (search, localStorageVersion, column
     pinnedColumnsModel
   };
 };
-const updateUrl = (_ref2, search, localStorageVersion, historyReplace, columns) => {
+const updateUrl = (_ref4, search, localStorageVersion, historyReplace, columns) => {
   let {
     filterModel,
     sortModel,
     paginationModel,
     columnsModel: columnsVisibilityModel,
     pinnedColumnsModel
-  } = _ref2;
+  } = _ref4;
   const newSearch = getFinalSearch({
     search,
     localStorageVersion,
@@ -18826,17 +18859,17 @@ const updateUrl = (_ref2, search, localStorageVersion, historyReplace, columns)
 // do not use it for equivalence (e.g. with value `3` and undefined we
 // will get 0).
 const compareFilters = (firstFilter, secondFilter) => {
-  if (firstFilter.field < secondFilter.field) {
+  if (firstFilter.columnField < secondFilter.columnField) {
     return -1;
-  } else if (firstFilter.field > secondFilter.field) {
+  } else if (firstFilter.columnField > secondFilter.columnField) {
     return 1;
   }
-  if (firstFilter.operator === undefined || secondFilter.operator === undefined) {
+  if (firstFilter.operatorValue === undefined || secondFilter.operatorValue === undefined) {
     return 0;
   }
-  if (firstFilter.operator < secondFilter.operator) {
+  if (firstFilter.operatorValue < secondFilter.operatorValue) {
     return -1;
-  } else if (firstFilter.operator > secondFilter.operator) {
+  } else if (firstFilter.operatorValue > secondFilter.operatorValue) {
     return 1;
   }
   if (firstFilter.value < secondFilter.value) {
@@ -18847,18 +18880,18 @@ const compareFilters = (firstFilter, secondFilter) => {
   return 0;
 };
 const areFiltersEquivalent = (firstFilter, secondFilter) => {
-  return firstFilter.field === secondFilter.field && firstFilter.operator === secondFilter.operator && firstFilter.value === secondFilter.value;
+  return firstFilter.columnField === secondFilter.columnField && firstFilter.operatorValue === secondFilter.operatorValue && firstFilter.value === secondFilter.value;
 };
 const areFilterModelsEquivalent = (filterModel, filterModelToMatch) => {
   const {
     items,
-    logicOperator
+    linkOperator
   } = filterModel;
   const {
     items: itemsToMatch,
-    logicOperator: logicOperatorToMatch
+    linkOperator: linkOperatorToMatch
   } = filterModelToMatch;
-  if (logicOperator !== logicOperatorToMatch) {
+  if (linkOperator !== linkOperatorToMatch) {
     return false;
   }
   if (items.length !== itemsToMatch.length) {
@@ -18871,7 +18904,7 @@ const areFilterModelsEquivalent = (filterModel, filterModelToMatch) => {
     const filterToCompare = itemsToMatch[i];
 
     // compareFilters return 0 if and only if the filters have the same
-    // field, operator, and value
+    // columnField, operatorValue, and value
     if (!areFiltersEquivalent(filter, filterToCompare)) {
       return false;
     }
@@ -24682,16 +24715,16 @@ const getRole = (config, dateFormat) => {
   }).join('\n');
   return `The AI assistant parses user input to generate a JSON object that will be used as a row filter for a data table MUI Data Grid.
 The filter supports mulitple conditions using only two logical operator "and", "or". It only allows "and" between all conditions or "or" between all conditions. It can't mix the two types.
-The AI assistant extracts information from the user input and generates a JSON object with exactly the two keys "logicOperator" and "items":
-- "logicOperator": the logical operator, only "and" or "or" are allowed. If there is only one condition in the "items", use "and".
-- "items": a list of conditions, each is an object with exactly the three keys "field", "operator" and "value":
-  - "field": the column name, must be one of ${columns}
+The AI assistant extracts information from the user input and generates a JSON object with exactly the two keys "linkOperator" and "items":
+- "linkOperator": the logical operator, only "and" or "or" are allowed. If there is only one condition in the "items", use "and".
+- "items": a list of conditions, each is an object with exactly the three keys "columnField", "operatorValue" and "value":
+  - "columnField": the column name, must be one of ${columns}
   - "value":
-    - this can be skipped if the "operator" is either "isEmpty" or "isNotEmpty"
-    - a list of multiple values if the "operator" ends with "AnyOf"
+    - this can be skipped if the "operatorValue" is either "isEmpty" or "isNotEmpty"
+    - a list of multiple values if the "operatorValue" ends with "AnyOf"
     - otherwise, it's a single value represented as a string: "true" instead of true, "false" instead of false, "0.6" instead of 0.6.
     For "date" data type, use ${dateFormat}. If relative date is input, convert to the actual date given today is ${today}.
-  - "operator": the comparison operator, accepted values depend on the data type of the column
+  - "operatorValue": the comparison operator, accepted values depend on the data type of the column
 ${operators}
 
 Below is the datatype in square bracket, constraints on the data range if any, followed by the description of each column used in the data table:
@@ -24728,10 +24761,10 @@ const GridToolbarFilterSemanticField = /*#__PURE__*/forwardRef((props, ref) => {
       nlpFilterConfig,
       onFilterModelChange,
       dateFormat = 'yyyy-mm-dd',
-      defaultModel = 'gpt-4-1106-preview',
+      defaultModel = 'gpt-4-0613',
       defaultFilter = {
         items: [],
-        logicOperator: 'and'
+        linkOperator: 'and'
       },
       disablePower = false,
       localeText
@@ -24809,7 +24842,7 @@ const GridToolbarFilterSemanticField = /*#__PURE__*/forwardRef((props, ref) => {
     value: prompt
   }), /*#__PURE__*/React__default.createElement(Button, {
     variant: "primary",
-    "aria-label": buttonAriaLabel,
+    "aira-label": buttonAriaLabel,
     type: "submit",
     isLoading: isLoading
   }, buttonText)), !disablePower && /*#__PURE__*/React__default.createElement(Tooltip, null, /*#__PURE__*/React__default.createElement(Tooltip.Trigger, null, /*#__PURE__*/React__default.createElement(Switch, {
@@ -24871,7 +24904,7 @@ const Toolbar$2 = props => {
         let {
           apiRef
         } = _ref;
-        return gridExpandedSortedRowIdsSelector(apiRef);
+        return gridVisibleSortedRowIdsSelector(apiRef);
       }
     },
     printOptions: {
@@ -27105,10 +27138,12 @@ const ServerSideControlledPagination = _ref3 => {
     selectionStatus,
     displaySelection,
     displayPagination,
-    paginationModel,
-    onPaginationModelChange,
-    pageSizeOptions,
+    page,
+    onPageChange,
+    pageSize,
+    onPageSizeChange,
     displayRowsPerPage,
+    rowsPerPageOptions,
     paginationProps,
     rowCount
   } = _ref3;
@@ -27127,17 +27162,13 @@ const ServerSideControlledPagination = _ref3 => {
   }, totalRowsLabel) : /*#__PURE__*/React__default.createElement(Text, null)) : null, displayPagination ? /*#__PURE__*/React__default.createElement(TablePagination$1, _extends$1({
     component: "div",
     count: totalNumberOfRowsInTable,
-    page: paginationModel.page,
-    onPageChange: (event, page) => onPaginationModelChange({
-      page,
-      pageSize: paginationModel.pageSize
-    }),
-    rowsPerPage: paginationModel.pageSize,
-    onRowsPerPageChange: event => onPaginationModelChange({
-      page: paginationModel.page,
-      pageSize: parseInt(event.target.value, 10)
-    }),
-    rowsPerPageOptions: displayRowsPerPage ? pageSizeOptions : []
+    page: page,
+    onPageChange: (event, newPage) => onPageChange(newPage),
+    rowsPerPage: pageSize,
+    onRowsPerPageChange: event => {
+      onPageSizeChange(parseInt(event.target.value, 10));
+    },
+    rowsPerPageOptions: displayRowsPerPage ? rowsPerPageOptions : []
   }, paginationProps)) : null);
 };
 
@@ -27163,9 +27194,11 @@ const ControlledPagination = _ref3 => {
     displayPagination = false,
     selectionStatus,
     apiRef,
-    paginationModel,
-    onPaginationModelChange,
-    pageSizeOptions,
+    page,
+    onPageChange,
+    pageSize,
+    onPageSizeChange,
+    rowsPerPageOptions,
     isRowSelectable,
     paginationProps
   } = _ref3;
@@ -27195,25 +27228,17 @@ const ControlledPagination = _ref3 => {
   }, `${selectionStatus.numberOfSelectedRows} row${selectionStatus.numberOfSelectedRows > 1 ? 's' : ''} selected`) : /*#__PURE__*/React__default.createElement(Text, null)) : null, displayPagination ? /*#__PURE__*/React__default.createElement(TablePagination$1, _extends$1({
     component: "div",
     count: numberOfFilteredRowsInTable,
-    page: paginationModel.page,
-    onPageChange: (event, page) => {
-      onPaginationModelChange({
-        page,
-        pageSize: paginationModel.pageSize
-      });
-    },
-    rowsPerPage: paginationModel.pageSize,
+    page: page,
+    onPageChange: (event, newPage) => onPageChange(newPage),
+    rowsPerPage: pageSize,
     onRowsPerPageChange: event => {
-      onPaginationModelChange({
-        page: paginationModel.page,
-        pageSize: parseInt(event.target.value, 10)
-      });
+      onPageSizeChange(parseInt(event.target.value, 10));
     },
-    rowsPerPageOptions: displayRowsPerPage ? pageSizeOptions : []
+    rowsPerPageOptions: displayRowsPerPage ? rowsPerPageOptions : []
   }, paginationProps)) : null);
 };
 
-const _excluded$3 = ["hideToolbar", "RenderedToolbar", "filterModel", "onFilterModelChange", "pagination", "paginationPlacement", "selectionStatus", "apiRef", "isRowSelectable", "paginationModel", "onPaginationModelChange", "pageSizeOptions", "paginationProps", "paginationMode", "rowCount"];
+const _excluded$3 = ["hideToolbar", "RenderedToolbar", "filterModel", "onFilterModelChange", "pagination", "paginationPlacement", "selectionStatus", "apiRef", "isRowSelectable", "page", "onPageChange", "pageSize", "onPageSizeChange", "rowsPerPageOptions", "paginationProps", "paginationMode", "rowCount"];
 const ToolbarWrapper = _ref => {
   let {
       hideToolbar,
@@ -27225,9 +27250,11 @@ const ToolbarWrapper = _ref => {
       selectionStatus,
       apiRef,
       isRowSelectable,
-      paginationModel,
-      onPaginationModelChange,
-      pageSizeOptions,
+      page,
+      onPageChange,
+      pageSize,
+      onPageSizeChange,
+      rowsPerPageOptions,
       paginationProps,
       paginationMode = 'client',
       rowCount
@@ -27241,9 +27268,11 @@ const ToolbarWrapper = _ref => {
     displayRowsPerPage: false,
     displayPagination: ['top', 'both'].includes(paginationPlacement),
     selectionStatus: selectionStatus.current,
-    paginationModel: paginationModel,
-    onPaginationModelChange: onPaginationModelChange,
-    pageSizeOptions: pageSizeOptions,
+    page: page,
+    onPageChange: onPageChange,
+    pageSize: pageSize,
+    onPageSizeChange: onPageSizeChange,
+    rowsPerPageOptions: rowsPerPageOptions,
     paginationProps: paginationProps,
     rowCount: rowCount
   }) : /*#__PURE__*/React__default.createElement(ControlledPagination, {
@@ -27253,26 +27282,30 @@ const ToolbarWrapper = _ref => {
     selectionStatus: selectionStatus.current,
     apiRef: apiRef,
     isRowSelectable: isRowSelectable,
-    paginationModel: paginationModel,
-    onPaginationModelChange: onPaginationModelChange,
-    pageSizeOptions: pageSizeOptions,
+    page: page,
+    onPageChange: onPageChange,
+    pageSize: pageSize,
+    onPageSizeChange: onPageSizeChange,
+    rowsPerPageOptions: rowsPerPageOptions,
     paginationProps: paginationProps
   }) : null);
 };
 
 const useControlledDatagridState = _ref => {
-  var _ref2, _ref3, _propsPaginationModel, _initialState$paginat, _initialState$paginat2, _pageSizeOptions$, _ref4, _propsPaginationModel2, _initialState$paginat3, _initialState$paginat4;
+  var _initialState$paginat, _initialState$paginat2;
   let {
     initialState,
-    pageSizeOptions,
+    rowsPerPageOptions,
     propsColumnVisibilityModel,
     propsFilterModel,
     propsOnColumnVisibilityModelChange,
     propsOnFilterModelChange,
-    propsOnPaginationModelChange,
+    propsOnPageChange,
+    propsOnPageSizeChange,
     propsOnPinnedColumnsChange,
     propsOnSortModelChange,
-    propsPaginationModel,
+    propsPage,
+    propsPageSize,
     propsPinnedColumns,
     propsSortModel
   } = _ref;
@@ -27320,22 +27353,33 @@ const useControlledDatagridState = _ref => {
       setSortModel(model);
     }
   };
-  const [paginationModel, setPaginationModel] = useState({
-    pageSize: (_ref2 = (_ref3 = (_propsPaginationModel = propsPaginationModel === null || propsPaginationModel === void 0 ? void 0 : propsPaginationModel.pageSize) !== null && _propsPaginationModel !== void 0 ? _propsPaginationModel : initialState === null || initialState === void 0 ? void 0 : (_initialState$paginat = initialState.pagination) === null || _initialState$paginat === void 0 ? void 0 : (_initialState$paginat2 = _initialState$paginat.paginationModel) === null || _initialState$paginat2 === void 0 ? void 0 : _initialState$paginat2.pageSize) !== null && _ref3 !== void 0 ? _ref3 : typeof (pageSizeOptions === null || pageSizeOptions === void 0 ? void 0 : pageSizeOptions[0]) === 'number' ? pageSizeOptions === null || pageSizeOptions === void 0 ? void 0 : pageSizeOptions[0] : pageSizeOptions === null || pageSizeOptions === void 0 ? void 0 : (_pageSizeOptions$ = pageSizeOptions[0]) === null || _pageSizeOptions$ === void 0 ? void 0 : _pageSizeOptions$.value) !== null && _ref2 !== void 0 ? _ref2 : 25,
-    page: (_ref4 = (_propsPaginationModel2 = propsPaginationModel === null || propsPaginationModel === void 0 ? void 0 : propsPaginationModel.page) !== null && _propsPaginationModel2 !== void 0 ? _propsPaginationModel2 : initialState === null || initialState === void 0 ? void 0 : (_initialState$paginat3 = initialState.pagination) === null || _initialState$paginat3 === void 0 ? void 0 : (_initialState$paginat4 = _initialState$paginat3.paginationModel) === null || _initialState$paginat4 === void 0 ? void 0 : _initialState$paginat4.page) !== null && _ref4 !== void 0 ? _ref4 : 0
-  });
-  const onPaginationModelChange = (model, details) => {
-    if (propsOnPaginationModelChange) {
-      propsOnPaginationModelChange(model, details);
+  const [page, setPage] = useState((initialState === null || initialState === void 0 ? void 0 : (_initialState$paginat = initialState.pagination) === null || _initialState$paginat === void 0 ? void 0 : _initialState$paginat.page) || propsPage || 0);
+  const [pageSize, setPageSize] = useState((initialState === null || initialState === void 0 ? void 0 : (_initialState$paginat2 = initialState.pagination) === null || _initialState$paginat2 === void 0 ? void 0 : _initialState$paginat2.pageSize) || propsPageSize || (rowsPerPageOptions === null || rowsPerPageOptions === void 0 ? void 0 : rowsPerPageOptions[0]) || 25);
+  const onPageChange = page => {
+    if (propsOnPageChange) {
+      propsOnPageChange(page, undefined);
     } else {
-      setPaginationModel(model);
+      setPage(page);
     }
   };
   useEffect(() => {
-    if (propsPaginationModel) {
-      setPaginationModel(propsPaginationModel);
+    if (propsPage || propsPage === 0) {
+      setPage(propsPage);
+    }
+  }, [propsPage]);
+  const onPageSizeChange = pageSize => {
+    onPageChange(0);
+    if (propsOnPageSizeChange) {
+      propsOnPageSizeChange(pageSize, undefined);
+    } else {
+      setPageSize(pageSize);
     }
-  }, [propsPaginationModel]);
+  };
+  useEffect(() => {
+    if (propsPageSize) {
+      setPageSize(propsPageSize);
+    }
+  }, [propsPageSize]);
   return {
     filterModel,
     onFilterModelChange,
@@ -27345,12 +27389,14 @@ const useControlledDatagridState = _ref => {
     onPinnedColumnsChange,
     sortModel,
     onSortModelChange,
-    paginationModel,
-    onPaginationModelChange
+    page,
+    pageSize,
+    onPageChange,
+    onPageSizeChange
   };
 };
 
-const _excluded$2 = ["apiRef", "autoHeight", "className", "slots", "slotProps", "filterModel", "columnVisibilityModel", "pinnedColumns", "sortModel", "paginationModel", "height", "hideToolbar", "initialState", "isRowSelectable", "license", "onFilterModelChange", "rowSelectionModel", "onPaginationModelChange", "onRowSelectionModelChange", "onColumnVisibilityModelChange", "onPinnedColumnsChange", "onSortModelChange", "pagination", "paginationPlacement", "paginationProps", "rows", "pageSizeOptions", "sx", "theme", "paginationMode", "rowCount"];
+const _excluded$2 = ["apiRef", "autoHeight", "className", "columnTypes", "components", "componentsProps", "filterModel", "columnVisibilityModel", "pinnedColumns", "sortModel", "height", "hideToolbar", "initialState", "isRowSelectable", "license", "onFilterModelChange", "onPageChange", "onPageSizeChange", "onColumnVisibilityModelChange", "onPinnedColumnsChange", "onSortModelChange", "selectionModel", "onSelectionModelChange", "page", "pageSize", "pagination", "paginationPlacement", "paginationProps", "rows", "rowsPerPageOptions", "sx", "theme", "paginationMode", "rowCount"];
 const COMPONENT_NAME$2 = 'DataGrid';
 const CLASSNAME$2 = 'redsift-datagrid';
 const DataGrid = /*#__PURE__*/forwardRef((props, ref) => {
@@ -27359,30 +27405,33 @@ const DataGrid = /*#__PURE__*/forwardRef((props, ref) => {
       apiRef: propsApiRef,
       autoHeight,
       className,
-      slots,
-      slotProps,
+      columnTypes: propsColumnTypes,
+      components,
+      componentsProps,
       filterModel: propsFilterModel,
       columnVisibilityModel: propsColumnVisibilityModel,
       pinnedColumns: propsPinnedColumns,
       sortModel: propsSortModel,
-      paginationModel: propsPaginationModel,
       height: propsHeight,
       hideToolbar,
       initialState,
       isRowSelectable,
       license = process.env.MUI_LICENSE_KEY,
       onFilterModelChange: propsOnFilterModelChange,
-      rowSelectionModel: propsRowSelectionModel,
-      onPaginationModelChange: propsOnPaginationModelChange,
-      onRowSelectionModelChange: propsOnRowSelectionModelChange,
+      onPageChange: propsOnPageChange,
+      onPageSizeChange: propsOnPageSizeChange,
       onColumnVisibilityModelChange: propsOnColumnVisibilityModelChange,
       onPinnedColumnsChange: propsOnPinnedColumnsChange,
       onSortModelChange: propsOnSortModelChange,
+      selectionModel: propsSelectionModel,
+      onSelectionModelChange: propsOnSelectionModelChange,
+      page: propsPage,
+      pageSize: propsPageSize,
       pagination,
       paginationPlacement = 'both',
       paginationProps,
       rows,
-      pageSizeOptions,
+      rowsPerPageOptions,
       sx,
       theme: propsTheme,
       paginationMode = 'client',
@@ -27392,7 +27441,7 @@ const DataGrid = /*#__PURE__*/forwardRef((props, ref) => {
   const theme = useTheme$4(propsTheme);
   const _apiRef = useGridApiRef();
   const apiRef = propsApiRef !== null && propsApiRef !== void 0 ? propsApiRef : _apiRef;
-  const RenderedToolbar = slots !== null && slots !== void 0 && slots.toolbar ? slots.toolbar : Toolbar$2;
+  const RenderedToolbar = components !== null && components !== void 0 && components.Toolbar ? components.Toolbar : Toolbar$2;
   LicenseInfo.setLicenseKey(license);
   const height = propsHeight !== null && propsHeight !== void 0 ? propsHeight : autoHeight ? undefined : '500px';
   const {
@@ -27400,52 +27449,56 @@ const DataGrid = /*#__PURE__*/forwardRef((props, ref) => {
     filterModel,
     onColumnVisibilityModelChange,
     onFilterModelChange,
-    onPaginationModelChange,
+    onPageChange,
+    onPageSizeChange,
     onPinnedColumnsChange,
     onSortModelChange,
-    paginationModel,
+    page,
+    pageSize,
     pinnedColumns,
     sortModel
   } = useControlledDatagridState({
     initialState,
-    pageSizeOptions,
+    rowsPerPageOptions,
     propsColumnVisibilityModel,
     propsFilterModel,
     propsOnColumnVisibilityModelChange,
     propsOnFilterModelChange,
     propsOnPinnedColumnsChange,
     propsOnSortModelChange,
-    propsPaginationModel,
+    propsPage,
+    propsPageSize,
     propsPinnedColumns,
     propsSortModel,
-    propsOnPaginationModelChange
+    propsOnPageChange,
+    propsOnPageSizeChange
   });
-  const [rowSelectionModel, setRowSelectionModel] = useState(propsRowSelectionModel !== null && propsRowSelectionModel !== void 0 ? propsRowSelectionModel : []);
+  const [selectionModel, setSelectionModel] = useState(propsSelectionModel !== null && propsSelectionModel !== void 0 ? propsSelectionModel : []);
   useEffect(() => {
-    setRowSelectionModel(propsRowSelectionModel !== null && propsRowSelectionModel !== void 0 ? propsRowSelectionModel : []);
-  }, [propsRowSelectionModel]);
-  const onRowSelectionModelChange = (selectionModel, details) => {
-    if (propsOnRowSelectionModelChange) {
-      propsOnRowSelectionModelChange(selectionModel, details);
+    setSelectionModel(propsSelectionModel !== null && propsSelectionModel !== void 0 ? propsSelectionModel : []);
+  }, [propsSelectionModel]);
+  const onSelectionModelChange = (selectionModel, details) => {
+    if (propsOnSelectionModelChange) {
+      propsOnSelectionModelChange(selectionModel, details);
     } else {
-      setRowSelectionModel(selectionModel);
+      setSelectionModel(selectionModel);
     }
   };
   const selectionStatus = useRef({
     type: 'none',
     numberOfSelectedRows: 0,
     numberOfSelectedRowsInPage: 0,
-    page: paginationModel.page,
-    pageSize: paginationModel.pageSize
+    page,
+    pageSize
   });
 
   // in server-side pagination we want to update the selection status
   // every time we navigate between pages, resize our page or select something
   useEffect(() => {
     if (paginationMode == 'server') {
-      onServerSideSelectionStatusChange(Array.isArray(rowSelectionModel) ? rowSelectionModel : [rowSelectionModel], apiRef, selectionStatus, isRowSelectable, paginationModel.page, paginationModel.pageSize);
+      onServerSideSelectionStatusChange(Array.isArray(selectionModel) ? selectionModel : [selectionModel], apiRef, selectionStatus, isRowSelectable, page, pageSize);
     }
-  }, [rowSelectionModel, paginationModel.page, paginationModel.pageSize]);
+  }, [selectionModel, page, pageSize]);
   if (!Array.isArray(rows)) {
     return null;
   }
@@ -27476,54 +27529,57 @@ const DataGrid = /*#__PURE__*/forwardRef((props, ref) => {
     apiRef: apiRef,
     autoHeight: autoHeight,
     checkboxSelectionVisibleOnly: Boolean(pagination),
-    slots: _objectSpread2(_objectSpread2({
-      baseButton: BaseButton,
-      baseCheckbox: BaseCheckbox,
-      // baseTextField,
-      basePopper: BasePopper,
-      columnFilteredIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+    columnTypes: _objectSpread2(_objectSpread2({}, customColumnTypes), propsColumnTypes),
+    components: _objectSpread2(_objectSpread2({
+      BaseButton,
+      BaseCheckbox,
+      // BaseTextField,
+      BasePopper,
+      ColumnFilteredIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
         displayName: "ColumnFilteredIcon"
       })),
-      columnSelectorIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+      ColumnSelectorIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
         displayName: "ColumnSelectorIcon"
       })),
-      columnSortedAscendingIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+      ColumnSortedAscendingIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
         displayName: "ColumnSortedAscendingIcon"
       })),
-      columnSortedDescendingIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+      ColumnSortedDescendingIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
         displayName: "ColumnSortedDescendingIcon"
       })),
-      densityCompactIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+      DensityCompactIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
         displayName: "DensityCompactIcon"
       })),
-      densityStandardIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+      DensityStandardIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
         displayName: "DensityStandardIcon"
       })),
-      densityComfortableIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+      DensityComfortableIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
         displayName: "DensityComfortableIcon"
       })),
-      detailPanelCollapseIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+      DetailPanelCollapseIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
         displayName: "DetailPanelCollapseIcon"
       })),
-      detailPanelExpandIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+      DetailPanelExpandIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
         displayName: "DetailPanelExpandIcon"
       })),
-      exportIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+      ExportIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
         displayName: "ExportIcon"
       })),
-      openFilterButtonIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({
+      OpenFilterButtonIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({
         displayName: "OpenFilterButtonIcon"
       }, props))
-    }, slots), {}, {
-      toolbar: ToolbarWrapper,
-      pagination: props => pagination ? paginationMode == 'server' ? /*#__PURE__*/React__default.createElement(ServerSideControlledPagination, _extends$1({}, props, {
+    }, components), {}, {
+      Toolbar: ToolbarWrapper,
+      Pagination: props => pagination ? paginationMode == 'server' ? /*#__PURE__*/React__default.createElement(ServerSideControlledPagination, _extends$1({}, props, {
         displaySelection: false,
         displayRowsPerPage: ['bottom', 'both'].includes(paginationPlacement),
         displayPagination: ['bottom', 'both'].includes(paginationPlacement),
         selectionStatus: selectionStatus.current,
-        paginationModel: paginationModel,
-        onPaginationModelChange: onPaginationModelChange,
-        pageSizeOptions: pageSizeOptions,
+        page: page,
+        onPageChange: onPageChange,
+        pageSize: pageSize,
+        onPageSizeChange: onPageSizeChange,
+        rowsPerPageOptions: rowsPerPageOptions,
         paginationProps: paginationProps,
         paginationMode: paginationMode,
         rowCount: rowCount
@@ -27534,14 +27590,16 @@ const DataGrid = /*#__PURE__*/forwardRef((props, ref) => {
         selectionStatus: selectionStatus.current,
         apiRef: apiRef,
         isRowSelectable: isRowSelectable,
-        paginationModel: paginationModel,
-        onPaginationModelChange: onPaginationModelChange,
-        pageSizeOptions: pageSizeOptions,
+        page: page,
+        onPageChange: onPageChange,
+        pageSize: pageSize,
+        onPageSizeChange: onPageSizeChange,
+        rowsPerPageOptions: rowsPerPageOptions,
         paginationProps: paginationProps,
         paginationMode: paginationMode
       })) : null
     }),
-    slotProps: _objectSpread2(_objectSpread2({}, slotProps), {}, {
+    componentsProps: _objectSpread2(_objectSpread2({}, componentsProps), {}, {
       toolbar: _objectSpread2({
         hideToolbar,
         RenderedToolbar,
@@ -27552,13 +27610,15 @@ const DataGrid = /*#__PURE__*/forwardRef((props, ref) => {
         selectionStatus,
         apiRef,
         isRowSelectable,
-        paginationModel,
-        onPaginationModelChange,
-        pageSizeOptions,
+        page,
+        onPageChange,
+        pageSize,
+        onPageSizeChange,
+        rowsPerPageOptions,
         paginationProps,
         paginationMode,
         rowCount
-      }, slotProps === null || slotProps === void 0 ? void 0 : slotProps.toolbar)
+      }, componentsProps === null || componentsProps === void 0 ? void 0 : componentsProps.toolbar)
     }),
     filterModel: filterModel,
     columnVisibilityModel: columnVisibilityModel,
@@ -27574,11 +27634,13 @@ const DataGrid = /*#__PURE__*/forwardRef((props, ref) => {
     paginationMode: paginationMode,
     keepNonExistentRowsSelected: paginationMode == 'server',
     rows: rows,
-    pageSizeOptions: pageSizeOptions,
-    paginationModel: paginationModel,
-    onPaginationModelChange: onPaginationModelChange,
-    rowSelectionModel: rowSelectionModel,
-    onRowSelectionModelChange: (newSelectionModel, details) => {
+    rowsPerPageOptions: rowsPerPageOptions,
+    page: page,
+    onPageChange: onPageChange,
+    pageSize: pageSize,
+    onPageSizeChange: onPageSizeChange,
+    selectionModel: selectionModel,
+    onSelectionModelChange: (newSelectionModel, details) => {
       if (pagination && paginationMode != 'server') {
         const selectableRowsInPage = isRowSelectable ? gridPaginatedVisibleSortedGridRowEntriesSelector(apiRef).filter(_ref => {
           let {
@@ -27636,7 +27698,7 @@ const DataGrid = /*#__PURE__*/forwardRef((props, ref) => {
           };
         }
       }
-      onRowSelectionModelChange === null || onRowSelectionModelChange === void 0 ? void 0 : onRowSelectionModelChange(newSelectionModel, details);
+      onSelectionModelChange === null || onSelectionModelChange === void 0 ? void 0 : onSelectionModelChange(newSelectionModel, details);
     },
     sx: _objectSpread2(_objectSpread2({}, sx), {}, {
       '.MuiDataGrid-columnHeaders': {
@@ -27653,6 +27715,8 @@ DataGrid.className = CLASSNAME$2;
 DataGrid.displayName = COMPONENT_NAME$2;
 
 // Get and Set data from LocalStorage WITHOUT useState
+
+// triggering a state update and consecutive re-render
 const useFetchState = (defaultValue, key) => {
   let stickyValue = null;
   try {
@@ -27660,7 +27724,16 @@ const useFetchState = (defaultValue, key) => {
   } catch (e) {
     console.error('StatefulDataGrid: error getting item from local storage: ', e);
   }
-  const parsedValue = stickyValue !== null && stickyValue !== undefined && stickyValue !== 'undefined' ? JSON.parse(stickyValue) : defaultValue;
+  let parsedValue = stickyValue !== null && stickyValue !== undefined && stickyValue !== 'undefined' ? JSON.parse(stickyValue) : defaultValue;
+
+  // TODO: temporary workaround to avoid clashes when someone had sorting on the now-removed screenshot field (renamed to num_annotations)
+  // Consider upgrading the Datagrid component library as the exception handling was added in this PR: https://github.com/mui-org/material-ui-x/pull/3224
+  if (parsedValue instanceof Array) {
+    const fields = (parsedValue || []).map(item => item.field);
+    if (fields.includes('screenshot') || fields.includes('diffs')) {
+      parsedValue = defaultValue;
+    }
+  }
   const updateValue = useCallback(value => {
     try {
       window.localStorage.setItem(key, JSON.stringify(value));
@@ -27671,8 +27744,6 @@ const useFetchState = (defaultValue, key) => {
   return [parsedValue, updateValue];
 };
 
-// import useLocalStorage from './useLocalStorage';
-
 const useTableStates = (id, version) => {
   const [paginationModel, setPaginationModel] = useFetchState('', buildStorageKey({
     id,
@@ -27729,7 +27800,8 @@ const useStatefulTable = props => {
     onColumnVisibilityModelChange: propsOnColumnVisibilityModelChange,
     onColumnWidthChange: propsOnColumnWidthChange,
     onFilterModelChange: propsOnFilterModelChange,
-    onPaginationModelChange: propsOnPaginationModelChange,
+    onPageChange: propsOnPageChange,
+    onPageSizeChange: propsOnPageSizeChange,
     onPinnedColumnsChange: propsOnPinnedColumnsChange,
     onSortModelChange: propsOnSortModelChange,
     useRouter,
@@ -27759,7 +27831,7 @@ const useStatefulTable = props => {
     setDimensionModel
   } = useTableStates(id, localStorageVersion);
 
-  // clearing up old version keys, triggering only on first render
+  // clearing up old version keys
   useEffect(() => clearPreviousVersionStorage(id, previousLocalStorageVersions), [id, previousLocalStorageVersions]);
   const onColumnDimensionChange = useCallback(_ref => {
     let {
@@ -27792,6 +27864,7 @@ const useStatefulTable = props => {
     column.width = dimensionModel[column.field] || column.width || 100;
     return column;
   }), [propsColumns, dimensionModel]);
+
   /** Add resetPage method to apiRef. */
   apiRef.current.resetPage = () => {
     apiRef.current.setPage(0);
@@ -27802,7 +27875,7 @@ const useStatefulTable = props => {
     onFilterModelChange: (model, details) => {
       const filterModel = _objectSpread2(_objectSpread2({}, model), {}, {
         items: model.items.map(item => {
-          const column = apiRef.current.getColumn(item.field);
+          const column = apiRef.current.getColumn(item.columnField);
           item.type = column.type || 'string';
           return item;
         }),
@@ -27840,16 +27913,33 @@ const useStatefulTable = props => {
       }, search, localStorageVersion, historyReplace, columns);
     },
     pinnedColumns: pinnedColumnsModel,
-    paginationModel: paginationModelParsed,
-    onPaginationModelChange: (model, details) => {
-      const paginationModel = _objectSpread2(_objectSpread2({}, model), {}, {
-        direction: paginationModelParsed.page < model.page ? 'next' : 'back'
-      });
-      propsOnPaginationModelChange === null || propsOnPaginationModelChange === void 0 ? void 0 : propsOnPaginationModelChange(paginationModel, details);
+    page: paginationModelParsed.page,
+    pageSize: paginationModelParsed.pageSize,
+    onPageChange: (page, details) => {
+      const direction = paginationModelParsed.page < page ? 'next' : 'back';
+      propsOnPageChange === null || propsOnPageChange === void 0 ? void 0 : propsOnPageChange(page, details);
       updateUrl({
         filterModel: filterParsed,
         sortModel: sortModelParsed,
-        paginationModel: paginationModel,
+        paginationModel: {
+          page,
+          pageSize: paginationModelParsed.pageSize,
+          direction
+        },
+        columnsModel: apiRef.current.state.columns.columnVisibilityModel,
+        pinnedColumnsModel: pinnedColumnsModel
+      }, search, localStorageVersion, historyReplace, columns);
+    },
+    onPageSizeChange: (pageSize, details) => {
+      propsOnPageSizeChange === null || propsOnPageSizeChange === void 0 ? void 0 : propsOnPageSizeChange(pageSize, details);
+      updateUrl({
+        filterModel: filterParsed,
+        sortModel: sortModelParsed,
+        paginationModel: {
+          page: paginationModelParsed.page,
+          pageSize,
+          direction: paginationModelParsed.direction
+        },
         columnsModel: apiRef.current.state.columns.columnVisibilityModel,
         pinnedColumnsModel: pinnedColumnsModel
       }, search, localStorageVersion, historyReplace, columns);
@@ -27875,7 +27965,7 @@ const useStatefulTable = props => {
   };
 };
 
-const _excluded$1 = ["apiRef", "autoHeight", "className", "columns", "slots", "slotProps", "filterModel", "columnVisibilityModel", "pinnedColumns", "sortModel", "paginationModel", "height", "hideToolbar", "initialState", "isRowSelectable", "license", "localStorageVersion", "previousLocalStorageVersions", "onFilterModelChange", "rowSelectionModel", "onColumnWidthChange", "onPaginationModelChange", "onRowSelectionModelChange", "onColumnVisibilityModelChange", "onPinnedColumnsChange", "onSortModelChange", "pagination", "paginationPlacement", "paginationProps", "rows", "pageSizeOptions", "sx", "theme", "useRouter", "paginationMode", "rowCount"];
+const _excluded$1 = ["apiRef", "autoHeight", "className", "columns", "columnTypes", "components", "componentsProps", "filterModel", "columnVisibilityModel", "pinnedColumns", "sortModel", "page", "pageSize", "height", "hideToolbar", "initialState", "isRowSelectable", "license", "localStorageVersion", "previousLocalStorageVersions", "onFilterModelChange", "selectionModel", "onColumnWidthChange", "onPageChange", "onPageSizeChange", "onSelectionModelChange", "onColumnVisibilityModelChange", "onPinnedColumnsChange", "onSortModelChange", "pagination", "paginationPlacement", "paginationProps", "rows", "rowsPerPageOptions", "sx", "theme", "useRouter", "paginationMode", "rowCount"];
 const COMPONENT_NAME$1 = 'DataGrid';
 const CLASSNAME$1 = 'redsift-datagrid';
 const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
@@ -27885,13 +27975,15 @@ const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
       autoHeight,
       className,
       columns,
-      slots,
-      slotProps,
+      columnTypes: propsColumnTypes,
+      components,
+      componentsProps,
       filterModel: propsFilterModel,
       columnVisibilityModel: propsColumnVisibilityModel,
       pinnedColumns: propsPinnedColumns,
       sortModel: propsSortModel,
-      paginationModel: propsPaginationModel,
+      page: propsPage,
+      pageSize: propsPageSize,
       height: propsHeight,
       hideToolbar,
       initialState,
@@ -27900,10 +27992,11 @@ const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
       localStorageVersion,
       previousLocalStorageVersions,
       onFilterModelChange: propsOnFilterModelChange,
-      rowSelectionModel: propsRowSelectionModel,
+      selectionModel: propsSelectionModel,
       onColumnWidthChange: propsOnColumnWidthChange,
-      onPaginationModelChange: propsOnPaginationModelChange,
-      onRowSelectionModelChange: propsOnRowSelectionModelChange,
+      onPageChange: propsOnPageChange,
+      onPageSizeChange: propsOnPageSizeChange,
+      onSelectionModelChange: propsOnSelectionModelChange,
       onColumnVisibilityModelChange: propsOnColumnVisibilityModelChange,
       onPinnedColumnsChange: propsOnPinnedColumnsChange,
       onSortModelChange: propsOnSortModelChange,
@@ -27911,7 +28004,7 @@ const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
       paginationPlacement = 'both',
       paginationProps,
       rows,
-      pageSizeOptions,
+      rowsPerPageOptions,
       sx,
       theme: propsTheme,
       useRouter,
@@ -27922,38 +28015,43 @@ const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
   const theme = useTheme$4(propsTheme);
   const _apiRef = useGridApiRef();
   const apiRef = propsApiRef !== null && propsApiRef !== void 0 ? propsApiRef : _apiRef;
-  const RenderedToolbar = slots !== null && slots !== void 0 && slots.toolbar ? slots.toolbar : Toolbar$2;
+  const RenderedToolbar = components !== null && components !== void 0 && components.Toolbar ? components.Toolbar : Toolbar$2;
   LicenseInfo.setLicenseKey(license);
   const height = propsHeight !== null && propsHeight !== void 0 ? propsHeight : autoHeight ? undefined : '500px';
   const {
     onColumnVisibilityModelChange: controlledOnColumnVisibilityModelChange,
     onFilterModelChange: controlledOnFilterModelChange,
-    onPaginationModelChange: controlledOnPaginationModelChange,
+    onPageChange: controlledOnPageChange,
+    onPageSizeChange: controlledOnPageSizeChange,
     onPinnedColumnsChange: controlledOnPinnedColumnsChange,
     onSortModelChange: controlledOnSortModelChange
   } = useControlledDatagridState({
     initialState,
-    pageSizeOptions,
+    rowsPerPageOptions,
     propsColumnVisibilityModel,
     propsFilterModel,
     propsOnColumnVisibilityModelChange,
     propsOnFilterModelChange,
     propsOnPinnedColumnsChange,
     propsOnSortModelChange,
-    propsPaginationModel,
+    propsPage,
+    propsPageSize,
     propsPinnedColumns,
     propsSortModel,
-    propsOnPaginationModelChange
+    propsOnPageChange,
+    propsOnPageSizeChange
   });
   const {
     columnVisibilityModel,
     filterModel,
     onColumnVisibilityModelChange,
     onFilterModelChange,
-    onPaginationModelChange,
+    onPageChange,
+    onPageSizeChange,
     onPinnedColumnsChange,
     onSortModelChange,
-    paginationModel,
+    page,
+    pageSize,
     pinnedColumns,
     sortModel,
     onColumnWidthChange
@@ -27964,39 +28062,40 @@ const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
     onColumnVisibilityModelChange: controlledOnColumnVisibilityModelChange,
     onColumnWidthChange: propsOnColumnWidthChange,
     onFilterModelChange: controlledOnFilterModelChange,
-    onPaginationModelChange: controlledOnPaginationModelChange,
+    onPageChange: controlledOnPageChange,
+    onPageSizeChange: controlledOnPageSizeChange,
     onPinnedColumnsChange: controlledOnPinnedColumnsChange,
     onSortModelChange: controlledOnSortModelChange,
     useRouter: useRouter,
     localStorageVersion,
     previousLocalStorageVersions
   });
-  const [rowSelectionModel, setRowSelectionModel] = useState(propsRowSelectionModel !== null && propsRowSelectionModel !== void 0 ? propsRowSelectionModel : []);
+  const [selectionModel, setSelectionModel] = useState(propsSelectionModel !== null && propsSelectionModel !== void 0 ? propsSelectionModel : []);
   useEffect(() => {
-    setRowSelectionModel(propsRowSelectionModel !== null && propsRowSelectionModel !== void 0 ? propsRowSelectionModel : []);
-  }, [propsRowSelectionModel]);
-  const onRowSelectionModelChange = (selectionModel, details) => {
-    if (propsOnRowSelectionModelChange) {
-      propsOnRowSelectionModelChange(selectionModel, details);
+    setSelectionModel(propsSelectionModel !== null && propsSelectionModel !== void 0 ? propsSelectionModel : []);
+  }, [propsSelectionModel]);
+  const onSelectionModelChange = (selectionModel, details) => {
+    if (propsOnSelectionModelChange) {
+      propsOnSelectionModelChange(selectionModel, details);
     } else {
-      setRowSelectionModel(selectionModel);
+      setSelectionModel(selectionModel);
     }
   };
   const selectionStatus = useRef({
     type: 'none',
     numberOfSelectedRows: 0,
     numberOfSelectedRowsInPage: 0,
-    page: paginationModel.page,
-    pageSize: paginationModel.pageSize
+    page,
+    pageSize: pageSize
   });
 
   // in server-side pagination we want to update the selection status
   // every time we navigate between pages, resize our page or select something
   useEffect(() => {
     if (paginationMode == 'server') {
-      onServerSideSelectionStatusChange(Array.isArray(rowSelectionModel) ? rowSelectionModel : [rowSelectionModel], apiRef, selectionStatus, isRowSelectable, paginationModel.page, paginationModel.pageSize);
+      onServerSideSelectionStatusChange(Array.isArray(selectionModel) ? selectionModel : [selectionModel], apiRef, selectionStatus, isRowSelectable, page, pageSize);
     }
-  }, [rowSelectionModel, paginationModel.page, paginationModel.pageSize]);
+  }, [selectionModel, page, pageSize]);
   if (!Array.isArray(rows)) {
     return null;
   }
@@ -28029,13 +28128,15 @@ const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
     filterModel: filterModel,
     onColumnVisibilityModelChange: onColumnVisibilityModelChange,
     onFilterModelChange: onFilterModelChange,
-    onPaginationModelChange: onPaginationModelChange,
+    onPageChange: onPageChange,
+    onPageSizeChange: onPageSizeChange,
     onPinnedColumnsChange: onPinnedColumnsChange,
     onSortModelChange: onSortModelChange,
-    paginationModel: paginationModel,
+    page: page,
+    pageSize: pageSize,
     pinnedColumns: pinnedColumns,
     sortModel: sortModel,
-    pageSizeOptions: pageSizeOptions,
+    rowsPerPageOptions: rowsPerPageOptions,
     onColumnWidthChange: onColumnWidthChange,
     initialState: initialState,
     isRowSelectable: isRowSelectable,
@@ -28046,55 +28147,58 @@ const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
     rowCount: rowCount,
     autoHeight: autoHeight,
     checkboxSelectionVisibleOnly: Boolean(pagination),
-    slots: _objectSpread2(_objectSpread2({
-      baseButton: BaseButton,
-      baseCheckbox: BaseCheckbox,
-      // baseTextField,
-      basePopper: BasePopper,
-      columnFilteredIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+    columnTypes: _objectSpread2(_objectSpread2({}, customColumnTypes), propsColumnTypes),
+    components: _objectSpread2(_objectSpread2({
+      BaseButton,
+      BaseCheckbox,
+      // BaseTextField,
+      BasePopper,
+      ColumnFilteredIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
         displayName: "ColumnFilteredIcon"
       })),
-      columnSelectorIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+      ColumnSelectorIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
         displayName: "ColumnSelectorIcon"
       })),
-      columnSortedAscendingIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+      ColumnSortedAscendingIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
         displayName: "ColumnSortedAscendingIcon"
       })),
-      columnSortedDescendingIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+      ColumnSortedDescendingIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
         displayName: "ColumnSortedDescendingIcon"
       })),
-      densityCompactIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+      DensityCompactIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
         displayName: "DensityCompactIcon"
       })),
-      densityStandardIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+      DensityStandardIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
         displayName: "DensityStandardIcon"
       })),
-      densityComfortableIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+      DensityComfortableIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
         displayName: "DensityComfortableIcon"
       })),
-      detailPanelCollapseIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+      DetailPanelCollapseIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
         displayName: "DetailPanelCollapseIcon"
       })),
-      detailPanelExpandIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+      DetailPanelExpandIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
         displayName: "DetailPanelExpandIcon"
       })),
-      exportIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+      ExportIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
         displayName: "ExportIcon"
       })),
-      openFilterButtonIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({
+      OpenFilterButtonIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({
         displayName: "OpenFilterButtonIcon"
       }, props))
-    }, slots), {}, {
-      toolbar: ToolbarWrapper,
-      pagination: props => {
+    }, components), {}, {
+      Toolbar: ToolbarWrapper,
+      Pagination: props => {
         return pagination ? paginationMode == 'server' ? /*#__PURE__*/React__default.createElement(ServerSideControlledPagination, _extends$1({}, props, {
           displaySelection: false,
           displayRowsPerPage: ['bottom', 'both'].includes(paginationPlacement),
           displayPagination: ['bottom', 'both'].includes(paginationPlacement),
           selectionStatus: selectionStatus.current,
-          paginationModel: paginationModel,
-          onPaginationModelChange: onPaginationModelChange,
-          pageSizeOptions: pageSizeOptions,
+          page: page,
+          pageSize: pageSize,
+          onPageChange: onPageChange,
+          onPageSizeChange: onPageSizeChange,
+          rowsPerPageOptions: rowsPerPageOptions,
           paginationProps: paginationProps,
           paginationMode: paginationMode,
           rowCount: rowCount
@@ -28105,15 +28209,17 @@ const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
           selectionStatus: selectionStatus.current,
           apiRef: apiRef,
           isRowSelectable: isRowSelectable,
-          paginationModel: paginationModel,
-          onPaginationModelChange: onPaginationModelChange,
-          pageSizeOptions: pageSizeOptions,
+          page: page,
+          pageSize: pageSize,
+          onPageChange: onPageChange,
+          onPageSizeChange: onPageSizeChange,
+          rowsPerPageOptions: rowsPerPageOptions,
           paginationProps: paginationProps,
           paginationMode: paginationMode
         })) : null;
       }
     }),
-    slotProps: _objectSpread2(_objectSpread2({}, slotProps), {}, {
+    componentsProps: _objectSpread2(_objectSpread2({}, componentsProps), {}, {
       toolbar: _objectSpread2({
         hideToolbar,
         RenderedToolbar,
@@ -28124,16 +28230,18 @@ const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
         selectionStatus,
         apiRef,
         isRowSelectable,
-        paginationModel,
-        onPaginationModelChange,
-        pageSizeOptions,
+        page,
+        pageSize,
+        onPageChange,
+        onPageSizeChange,
+        rowsPerPageOptions,
         paginationProps,
         paginationMode,
         rowCount
-      }, slotProps === null || slotProps === void 0 ? void 0 : slotProps.toolbar)
+      }, componentsProps === null || componentsProps === void 0 ? void 0 : componentsProps.toolbar)
     }),
-    rowSelectionModel: rowSelectionModel,
-    onRowSelectionModelChange: (newSelectionModel, details) => {
+    selectionModel: selectionModel,
+    onSelectionModelChange: (newSelectionModel, details) => {
       if (pagination && paginationMode != 'server') {
         const selectableRowsInPage = isRowSelectable ? gridPaginatedVisibleSortedGridRowEntriesSelector(apiRef).filter(_ref => {
           let {
@@ -28191,7 +28299,7 @@ const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
           };
         }
       }
-      onRowSelectionModelChange === null || onRowSelectionModelChange === void 0 ? void 0 : onRowSelectionModelChange(newSelectionModel, details);
+      onSelectionModelChange === null || onSelectionModelChange === void 0 ? void 0 : onSelectionModelChange(newSelectionModel, details);
     },
     sx: _objectSpread2(_objectSpread2({}, sx), {}, {
       '.MuiDataGrid-columnHeaders': {
@@ -28265,5 +28373,5 @@ const TextCell = /*#__PURE__*/forwardRef((props, ref) => {
 TextCell.className = CLASSNAME;
 TextCell.displayName = COMPONENT_NAME;
 
-export { BaseButton, BaseCheckbox, BaseIcon, BasePopper, BaseTextField, CATEGORIES, CONTAINS_ANY_OF, CONTAINS_ANY_OF_I, ControlledPagination, DEFAULT_OPERATORS, DETAIL_PANEL_TOGGLE_COL_DEF, DIMENSION_MODEL_KEY, DOES_NOT_CONTAIN, DOES_NOT_EQUAL, DOES_NOT_HAVE, DOES_NOT_HAVE_WITH_SELECT, DataGrid, ENDS_WITH_ANY_OF, FILTER_MODEL_KEY, FILTER_SEARCH_KEY, GridToolbarFilterSemanticField, HAS, HAS_ANY_OF, HAS_ANY_OF_WITH_SELECT, HAS_ONLY, HAS_ONLY_WITH_SELECT, HAS_WITH_SELECT, IS, IS_ANY_OF, IS_ANY_OF_WITH_SELECT, IS_BETWEEN, IS_NOT, IS_NOT_ANY_OF, IS_NOT_ANY_OF_WITH_SELECT, IS_NOT_WITH_SELECT, IS_WITH_SELECT, PAGINATION_MODEL_KEY, PINNED_COLUMNS, SORT_MODEL_KEY, STARTS_WITH_ANY_OF, ServerSideControlledPagination, StatefulDataGrid, TextCell, Toolbar$2 as Toolbar, ToolbarWrapper, VISIBILITY_MODEL_KEY, areFilterModelsEquivalent, buildStorageKey, clearPreviousVersionStorage, customColumnTypes, decodeValue, encodeValue, getColumnVisibilityFromString, getCompletion, getFilterModelFromString, getFinalSearch, getGridNumericOperators, getGridStringArrayOperators, getGridStringArrayOperatorsWithSelect, getGridStringArrayOperatorsWithSelectOnStringArrayColumns, getGridStringOperators, getModelsParsedOrUpdateLocalStorage, getPaginationFromString, getPinnedColumnsFromString, getRsMultipleSelectColumnType, getRsMultipleSelectWithShortOperatorListColumnType, getRsNumberColumnType, getRsSingleSelectColumnType, getRsSingleSelectWithShortOperatorListColumnType, getRsStringColumnType, getSearchParamsFromColumnVisibility, getSearchParamsFromFilterModel, getSearchParamsFromPagination, getSearchParamsFromPinnedColumns, getSearchParamsFromSorting, getSearchParamsFromTab, getSortingFromString, isOperatorValueValid, isValueValid, muiIconToDSIcon, numberOperatorDecoder, numberOperatorEncoder, onServerSideSelectionStatusChange, operatorList, updateUrl, urlSearchParamsToString };
+export { BaseButton, BaseCheckbox, BaseIcon, BasePopper, BaseTextField, CATEGORIES, CONTAINS_ANY_OF, CONTAINS_ANY_OF_I, ControlledPagination, DEFAULT_OPERATORS, DETAIL_PANEL_TOGGLE_COL_DEF, DIMENSION_MODEL_KEY, DOES_NOT_CONTAIN, DOES_NOT_EQUAL, DOES_NOT_HAVE, DOES_NOT_HAVE_WITH_SELECT, DataGrid, ENDS_WITH_ANY_OF, FILTER_MODEL_KEY, FILTER_SEARCH_KEY, GridToolbarFilterSemanticField, HAS, HAS_ANY_OF, HAS_ANY_OF_WITH_SELECT, HAS_ONLY, HAS_ONLY_WITH_SELECT, HAS_WITH_SELECT, IS, IS_ANY_OF, IS_ANY_OF_WITH_SELECT, IS_BETWEEN, IS_NOT, IS_NOT_ANY_OF, IS_NOT_WITH_SELECT, IS_WITH_SELECT, PAGINATION_MODEL_KEY, PINNED_COLUMNS, SORT_MODEL_KEY, STARTS_WITH_ANY_OF, ServerSideControlledPagination, StatefulDataGrid, TextCell, Toolbar$2 as Toolbar, ToolbarWrapper, VISIBILITY_MODEL_KEY, areFilterModelsEquivalent, buildStorageKey, clearPreviousVersionStorage, customColumnTypes, decodeValue, encodeValue, getColumnVisibilityFromString, getCompletion, getFilterModelFromString, getFinalSearch, getGridNumericOperators, getGridStringArrayOperators, getGridStringArrayOperatorsWithSelect, getGridStringArrayOperatorsWithSelectOnStringArrayColumns, getGridStringOperators, getModelsParsedOrUpdateLocalStorage, getPaginationFromString, getPinnedColumnsFromString, getRsMultipleSelectColumnType, getRsMultipleSelectWithShortOperatorListColumnType, getRsNumberColumnType, getRsSingleSelectColumnType, getRsSingleSelectWithShortOperatorListColumnType, getRsStringColumnType, getSearchParamsFromColumnVisibility, getSearchParamsFromFilterModel, getSearchParamsFromPagination, getSearchParamsFromPinnedColumns, getSearchParamsFromSorting, getSearchParamsFromTab, getSortingFromString, muiIconToDSIcon, numberOperatorDecoder, numberOperatorEncoder, onServerSideSelectionStatusChange, operatorList, updateUrl, urlSearchParamsToString };
 //# sourceMappingURL=index.js.map