fastapi-rtk 1.1.4 → 2.0.0

package/dist/core/esm/Dialogs/AddDialog.mjs

@@ -5,7 +5,7 @@ import { deepMerge } from "fastapi-rtk/utils";
 import { useProps, Stack } from "@mantine/core";
 import { useForm } from "@mantine/form";
 import { useDebouncedState } from "@mantine/hooks";
-import { yupResolver } from "../../../.external/esm/mantine-form-yup-resolver@2.0.0_@mantine_form@8.3.18_yup@1.7.1/mantine-form-yup-resolver/dist/esm/index.mjs";
+import { yupResolver } from "../../../.external/esm/mantine-form-yup-resolver@2.0.0_@mantine_form@9.1.1_yup@1.7.1/mantine-form-yup-resolver/dist/esm/index.mjs";
 import { useMemo, useCallback, useEffect } from "react";
 import { useApi } from "../hooks/api/useApi.mjs";
 import { useForms } from "../hooks/api/useForms.mjs";
@@ -15,7 +15,7 @@ import { CommonModal } from "../Modals/CommonModal.mjs";
 import { normalProps } from "../Modals/normalProps.mjs";
 import { overlayProps } from "../Modals/overlayProps.mjs";
 import { FormField } from "../Tables/DataGrid/FormField/FormField.mjs";
-import { useTranslation } from "../../../.external/esm/react-i18next@15.7.4_i18next@25.10.10_react-dom@19.2.5_react@19.2.5_typescript@5.9.3/react-i18next/dist/es/useTranslation.mjs";
+import { useTranslation } from "../../../.external/esm/react-i18next@15.7.4_i18next@25.10.10_react-dom@19.2.6_react@19.2.6_typescript@5.9.3/react-i18next/dist/es/useTranslation.mjs";
 function AddDialog({
   jsonForms: __jsonForms,
   onSuccess,
@@ -26,7 +26,7 @@ function AddDialog({
   ...props
 }) {
   var _a;
-  const { info, refetch, refetchInfo, addEntry } = useApi();
+  const { info, refetch, refetchInfo, addEntry, setError, resetError } = useApi();
   const { t } = useTranslation();
   const { opened, setOpened, state, getState, setState, reset, view, setView } = useForms("add");
   const [loading, setLoading] = useDebouncedState(false, DEBOUNCE_LOADING_DELAY);
@@ -40,18 +40,20 @@ function AddDialog({
     (e) => {
       e == null ? void 0 : e.preventDefault();
       setLoading(true);
+      resetError();
       addEntry(getState().data).then((res) => {
         onSuccess == null ? void 0 : onSuccess(res);
-        if (res) {
-          refetch();
-          refetchInfo();
-        }
-      }).catch(onError).finally(() => {
+        refetch();
+        refetchInfo();
+      }).catch((error) => {
+        setError({ message: "Could not add item", originalError: error });
+        onError == null ? void 0 : onError(error);
+      }).finally(() => {
         setLoading(false);
         setOpened(false);
       });
     },
-    [addEntry, getState, onError, onSuccess, refetch, refetchInfo, setLoading, setOpened]
+    [addEntry, getState, onError, onSuccess, refetch, refetchInfo, resetError, setError, setLoading, setOpened]
   );
   const { fab } = useInfo();
   const form = useForm({ initialValues: info.add.defaultValues, validate: yupResolver(info.add.schema) });

package/dist/core/esm/Dialogs/DeleteDialog.mjs

@@ -8,9 +8,9 @@ import { overlayProps } from "../Modals/overlayProps.mjs";
 import { useApi } from "../hooks/api/useApi.mjs";
 import { useForms } from "../hooks/api/useForms.mjs";
 import "../Wrappers/Provider/Contexts/LangContext.mjs";
-import { useTranslation } from "../../../.external/esm/react-i18next@15.7.4_i18next@25.10.10_react-dom@19.2.5_react@19.2.5_typescript@5.9.3/react-i18next/dist/es/useTranslation.mjs";
+import { useTranslation } from "../../../.external/esm/react-i18next@15.7.4_i18next@25.10.10_react-dom@19.2.6_react@19.2.6_typescript@5.9.3/react-i18next/dist/es/useTranslation.mjs";
 const DeleteDialog = ({ deleteText, onSuccess, onError, ...props }) => {
-  const { refetch, refetchInfo, deleteEntry } = useApi();
+  const { refetch, refetchInfo, deleteEntry, setError, resetError } = useApi();
   const { t } = useTranslation();
   const { opened, setOpened, getItem, reset, view, setView } = useForms("delete");
   const [loading, setLoading] = useDebouncedState(false, DEBOUNCE_LOADING_DELAY);
@@ -21,16 +21,21 @@ const DeleteDialog = ({ deleteText, onSuccess, onError, ...props }) => {
     (e) => {
       e == null ? void 0 : e.preventDefault();
       setLoading(true);
-      deleteEntry(getItem()).then((res) => {
+      resetError();
+      const id = getItem();
+      deleteEntry(id).then((res) => {
         onSuccess == null ? void 0 : onSuccess(res);
         refetch();
         refetchInfo();
-      }).catch(onError).finally(() => {
+      }).catch((error) => {
+        setError({ message: "Could not delete item with id {{id}}", data: { id }, originalError: error });
+        onError == null ? void 0 : onError(error);
+      }).finally(() => {
         setLoading(false);
         setOpened(false);
       });
     },
-    [setLoading, deleteEntry, getItem, onError, onSuccess, refetch, refetchInfo, setOpened]
+    [setLoading, resetError, deleteEntry, getItem, onError, onSuccess, refetch, refetchInfo, setError, setOpened]
   );
   return /* @__PURE__ */ jsx(
     CommonModal,

package/dist/core/esm/Dialogs/EditDialog.mjs

@@ -6,7 +6,7 @@ import { useProps, Stack } from "@mantine/core";
 import { useForm } from "@mantine/form";
 import { useDebouncedState } from "@mantine/hooks";
 import { l as lodashExports } from "../_virtual/lodash.mjs";
-import { yupResolver } from "../../../.external/esm/mantine-form-yup-resolver@2.0.0_@mantine_form@8.3.18_yup@1.7.1/mantine-form-yup-resolver/dist/esm/index.mjs";
+import { yupResolver } from "../../../.external/esm/mantine-form-yup-resolver@2.0.0_@mantine_form@9.1.1_yup@1.7.1/mantine-form-yup-resolver/dist/esm/index.mjs";
 import { useMemo, useRef, useEffect, useCallback } from "react";
 import { convertToFormInputs as convertToFormInputs$1 } from "../ActionIcons/utils/convertToFormInputs.mjs";
 import { convertToFormInputs } from "../fab-react-toolkit-patch/utils/convertToFormInputs.mjs";
@@ -18,7 +18,7 @@ import { CommonModal } from "../Modals/CommonModal.mjs";
 import { normalProps } from "../Modals/normalProps.mjs";
 import { overlayProps } from "../Modals/overlayProps.mjs";
 import { FormField } from "../Tables/DataGrid/FormField/FormField.mjs";
-import { useTranslation } from "../../../.external/esm/react-i18next@15.7.4_i18next@25.10.10_react-dom@19.2.5_react@19.2.5_typescript@5.9.3/react-i18next/dist/es/useTranslation.mjs";
+import { useTranslation } from "../../../.external/esm/react-i18next@15.7.4_i18next@25.10.10_react-dom@19.2.6_react@19.2.6_typescript@5.9.3/react-i18next/dist/es/useTranslation.mjs";
 function EditDialog({
   jsonForms: __jsonForms,
   onSuccess,
@@ -29,7 +29,7 @@ function EditDialog({
   ...props
 }) {
   var _a;
-  const { info, refetch, refetchInfo, updateEntry } = useApi();
+  const { info, refetch, refetchInfo, updateEntry, setError, resetError } = useApi();
   const { t } = useTranslation();
   const { opened, setOpened, item, getItem, state, getState, setState, reset, view, setView } = useForms("edit");
   const [loading, setLoading] = useDebouncedState(false, DEBOUNCE_LOADING_DELAY);
@@ -59,6 +59,7 @@ function EditDialog({
     (e) => {
       e == null ? void 0 : e.preventDefault();
       setLoading(true);
+      resetError();
       const new_data = Object.entries(getState().data).reduce((acc, [key, value]) => {
         if (lodashExports.isEqual(value, initialStateRef.current.data[key])) {
           return acc;
@@ -66,18 +67,32 @@ function EditDialog({
         acc[key] = value;
         return acc;
       }, {});
-      updateEntry(getItemId(getItem()), new_data).then((res) => {
+      const id = getItemId(getItem());
+      updateEntry(id, new_data).then((res) => {
         onSuccess == null ? void 0 : onSuccess(res);
-        if (res) {
-          refetch();
-          refetchInfo();
-        }
-      }).catch(onError).finally(() => {
+        refetch();
+        refetchInfo();
+      }).catch((error) => {
+        setError({ message: "Could not update item with id {{id}}", data: { id }, originalError: error });
+        onError == null ? void 0 : onError(error);
+      }).finally(() => {
         setLoading(false);
         setOpened(false);
       });
     },
-    [setLoading, getState, updateEntry, getItem, onError, onSuccess, refetch, refetchInfo, setOpened]
+    [
+      setLoading,
+      resetError,
+      getState,
+      updateEntry,
+      getItem,
+      onError,
+      onSuccess,
+      refetch,
+      refetchInfo,
+      setError,
+      setOpened
+    ]
   );
   const form = useForm({ initialValues: info.edit.defaultValues, validate: yupResolver(info.edit.schema) });
   const onSubmitFunc = fab ? form.onSubmit((values, e) => {

package/dist/core/esm/Modals/CommonModal.mjs

@@ -8,7 +8,7 @@ import ForwardRef$1 from "../_virtual/stack.mjs";
 import ForwardRef from "../_virtual/stack-forward.mjs";
 import { useInfo } from "../hooks/auth/useInfo.mjs";
 import "../Wrappers/Provider/Contexts/LangContext.mjs";
-import { useTranslation } from "../../../.external/esm/react-i18next@15.7.4_i18next@25.10.10_react-dom@19.2.5_react@19.2.5_typescript@5.9.3/react-i18next/dist/es/useTranslation.mjs";
+import { useTranslation } from "../../../.external/esm/react-i18next@15.7.4_i18next@25.10.10_react-dom@19.2.6_react@19.2.6_typescript@5.9.3/react-i18next/dist/es/useTranslation.mjs";
 function CommonModal({
   children,
   view,

package/dist/core/esm/Tables/DataGrid/ErrorDialog.mjs

@@ -4,7 +4,7 @@ import { useMemo, Fragment } from "react";
 import ForwardRef from "../../_virtual/alert-circle.mjs";
 import { useApi } from "../../hooks/api/useApi.mjs";
 import "../../Wrappers/Provider/Contexts/LangContext.mjs";
-import { useTranslation } from "../../../../.external/esm/react-i18next@15.7.4_i18next@25.10.10_react-dom@19.2.5_react@19.2.5_typescript@5.9.3/react-i18next/dist/es/useTranslation.mjs";
+import { useTranslation } from "../../../../.external/esm/react-i18next@15.7.4_i18next@25.10.10_react-dom@19.2.6_react@19.2.6_typescript@5.9.3/react-i18next/dist/es/useTranslation.mjs";
 const isObject = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 const MessageRenderer = ({ message }) => {
   const { t } = useTranslation();

package/dist/core/esm/Tables/DataGrid/Main/Body/Field/Field.mjs

@@ -1,6 +1,6 @@
 import { jsx } from "react/jsx-runtime";
 import { useProps, useStyles, Table, Box, Skeleton, Text } from "@mantine/core";
-import purify from "../../../../../../../.external/esm/dompurify@3.4.1/dompurify/dist/purify.es.mjs";
+import purify from "../../../../../../../.external/esm/dompurify@3.4.2/dompurify/dist/purify.es.mjs";
 import React__default, { isValidElement } from "react";
 import { FallbackWrapper } from "../../../../NextGenDataGrid/FallbackWrapper.mjs";
 import classes from "./Field.module.css.mjs";

package/dist/core/esm/Tables/DataGrid/Toolbar/Filter/FilterMenu.mjs

@@ -2,7 +2,7 @@ import { jsxs, jsx } from "react/jsx-runtime";
 import { useProps, Box, Flex, ActionIcon, Divider, Text, ScrollArea, Button, Group } from "@mantine/core";
 import { useForm } from "@mantine/form";
 import { randomId } from "@mantine/hooks";
-import { yupResolver } from "../../../../../../.external/esm/mantine-form-yup-resolver@2.0.0_@mantine_form@8.3.18_yup@1.7.1/mantine-form-yup-resolver/dist/esm/index.mjs";
+import { yupResolver } from "../../../../../../.external/esm/mantine-form-yup-resolver@2.0.0_@mantine_form@9.1.1_yup@1.7.1/mantine-form-yup-resolver/dist/esm/index.mjs";
 import { useEffect } from "react";
 import { object as create$3, array as create$2, mixed as create$8, string as create$6 } from "../../../../../../.external/esm/yup@1.7.1/yup/index.esm.mjs";
 import ForwardRef$1 from "../../../../_virtual/plus.mjs";

package/dist/core/esm/Tables/NextGenDataGrid/NextGenDataGrid.mjs

@@ -4,7 +4,7 @@ import { jsxs, jsx } from "react/jsx-runtime";
 import { DEBOUNCE_DELAY } from "fastapi-rtk/constants";
 import { deepMerge, mergeProps, getItemId, parseFromValuesOrFunc } from "fastapi-rtk/utils";
 import { useProps, Box } from "@mantine/core";
-import { useMRT_TableOptions, useMantineReactTable } from "../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.8_@mantine_dates@7.17.8_@mantine_hooks@7._t5ruchzauz2wwsu2z4ey77rd4e/mantine-react-table/dist/index.esm.mjs";
+import { useMRT_TableOptions, useMantineReactTable } from "../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.8_@mantine_dates@7.17.8_@mantine_hooks@7._2zjbhqlotlhjxtgwdmcgs6toey/mantine-react-table/dist/index.esm.mjs";
 import { forwardRef, useMemo, useEffect, useRef } from "react";
 import { AddDialog } from "../../Dialogs/AddDialog.mjs";
 import { DeleteDialog } from "../../Dialogs/DeleteDialog.mjs";
@@ -205,10 +205,10 @@ const NextGenDataGrid = forwardRef((props, ref) => {
   const mrtProps = useMemo(() => deepMerge(_mrtProps, optimizationsProps), [_mrtProps, optimizationsProps]);
   const mrtTable = useMantineReactTable(mrtProps);
   mrtTable.refs.selectionStoreRef = useRef(selectionStoreFactory());
-  mrtTable.refs.options = useRef(tableOptions);
-  mrtTable.refs.options.current = tableOptions;
-  mrtTable.refs.optimizations = useRef(optimizations);
-  mrtTable.refs.optimizations.current = optimizations;
+  mrtTable.refs.optionsRef = useRef(tableOptions);
+  mrtTable.refs.optionsRef.current = tableOptions;
+  mrtTable.refs.optimizationsRef = useRef(optimizations);
+  mrtTable.refs.optimizationsRef.current = optimizations;
   const useOnLoadProps = useMemo(() => fetchOnMount, [fetchOnMount]);
   const useViewProps = useMemo(() => form, [form]);
   const useTableSelectionProps = useMemo(

package/dist/core/esm/Tables/NextGenDataGrid/components/OptimizedMRT_RowSelectColumn/getOptimizedMRT_RowSelectColumnDef.mjs

@@ -1,6 +1,6 @@
 import { jsx } from "react/jsx-runtime";
 import { parseFromValuesOrFunc } from "fastapi-rtk/utils";
-import { defaultDisplayColumnProps, MRT_SelectCheckbox } from "../../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.8_@mantine_dates@7.17.8_@mantine_hooks@7._t5ruchzauz2wwsu2z4ey77rd4e/mantine-react-table/dist/index.esm.mjs";
+import { defaultDisplayColumnProps, MRT_SelectCheckbox } from "../../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.8_@mantine_dates@7.17.8_@mantine_hooks@7._2zjbhqlotlhjxtgwdmcgs6toey/mantine-react-table/dist/index.esm.mjs";
 import { useMemo } from "react";
 import { useSelectionStore } from "./zustand.mjs";
 const Cell = ({ renderedRowIndex, row, table }) => {
@@ -16,10 +16,10 @@ const Cell = ({ renderedRowIndex, row, table }) => {
     [storeOnChange, rowId]
   );
   row.getCanSelect = () => {
-    if (typeof table.refs.options.enableRowSelection === "function") {
-      return table.refs.options.enableRowSelection(row);
+    if (typeof table.refs.optionsRef.current.enableRowSelection === "function") {
+      return table.refs.optionsRef.current.enableRowSelection(row);
     }
-    return table.refs.options.enableRowSelection ?? true;
+    return table.refs.optionsRef.current.enableRowSelection ?? true;
   };
   const {
     options: { mantineSelectCheckboxProps }

package/dist/core/esm/Tables/NextGenDataGrid/components/OptimizedMRT_RowSelectColumn/zustand.mjs

@@ -1,4 +1,4 @@
-import { create } from "../../../../../../.external/esm/zustand@5.0.12_@types_react@19.2.14_react@19.2.5/zustand/esm/react.mjs";
+import { create } from "../../../../../../.external/esm/zustand@5.0.13_@types_react@19.2.14_react@19.2.6/zustand/esm/react.mjs";
 const selectionStoreFactory = () => create((set, get) => ({
   rowSelection: {},
   refs: /* @__PURE__ */ new Set(),

package/dist/core/esm/Tables/NextGenDataGrid/hooks/useColumns/AdvancedFilters.mjs

@@ -62,7 +62,7 @@ function AdvancedFilters({ col }) {
       index >= 0 && index + 1 < formFilters.length && /* @__PURE__ */ jsx(Grid.Col, { span: 12, py: 0, children: /* @__PURE__ */ jsx(Divider, { my: "sm", label: "AND", align: "center" }) })
     ] }, `${filter.col}-${index}`) : null
   ).filter(Boolean);
-  return /* @__PURE__ */ jsxs(Grid, { w: fields.length ? "25rem" : "100%", gap: "md", gutter: "xs", children: [
+  return /* @__PURE__ */ jsxs(Grid, { w: fields.length ? "25rem" : "100%", gap: "xs", children: [
     fields.length ? fields : /* @__PURE__ */ jsx(Grid.Col, { span: 12, children: /* @__PURE__ */ jsx(Text, { align: "center", c: "gray", style: { fontStyle: "italic" }, children: "No filters" }) }),
     /* @__PURE__ */ jsx(Grid.Col, { span: 12, children: /* @__PURE__ */ jsx(Stack, { children: /* @__PURE__ */ jsx(
       AdvancedFiltersMenu,

package/dist/core/esm/Tables/NextGenDataGrid/hooks/useColumns/ColumnHeaderFilterInput/ColumnHeaderFilterInput.mjs

@@ -11,7 +11,7 @@ import { useApi } from "../../../../../hooks/api/useApi.mjs";
 import "../../../../../Wrappers/Provider/Contexts/LangContext.mjs";
 import { getBasicInput } from "../utils.mjs";
 import { HeaderInput } from "./HeaderInput.mjs";
-import { useTranslation } from "../../../../../../../.external/esm/react-i18next@15.7.4_i18next@25.10.10_react-dom@19.2.5_react@19.2.5_typescript@5.9.3/react-i18next/dist/es/useTranslation.mjs";
+import { useTranslation } from "../../../../../../../.external/esm/react-i18next@15.7.4_i18next@25.10.10_react-dom@19.2.6_react@19.2.6_typescript@5.9.3/react-i18next/dist/es/useTranslation.mjs";
 const getLocalStorageValue = (key, defaultValue) => {
   const value = localStorage.getItem(key);
   if (value === null) {

package/dist/core/esm/Tables/NextGenDataGrid/hooks/useColumns/ColumnHeaderFilterInput/HeaderInputs/HeaderBetweenInput.mjs

@@ -3,7 +3,7 @@ import { ActionIcon, Group, NumberInput } from "@mantine/core";
 import { forwardRef, useState, useEffect, useCallback } from "react";
 import ForwardRef from "../../../../../../_virtual/x.mjs";
 import "../../../../../../Wrappers/Provider/Contexts/LangContext.mjs";
-import { useTranslation } from "../../../../../../../../.external/esm/react-i18next@15.7.4_i18next@25.10.10_react-dom@19.2.5_react@19.2.5_typescript@5.9.3/react-i18next/dist/es/useTranslation.mjs";
+import { useTranslation } from "../../../../../../../../.external/esm/react-i18next@15.7.4_i18next@25.10.10_react-dom@19.2.6_react@19.2.6_typescript@5.9.3/react-i18next/dist/es/useTranslation.mjs";
 const criteria = (v) => v !== void 0 && v !== null && v !== "";
 const HeaderBetweenInput = forwardRef(({ clearIcon: _, mrtprops: { textinputprops }, ...props }, ref) => {
   const { value, onChange, leftInputProps, rightInputProps, groupProps, cleariconprops, ...rest } = props;

package/dist/core/esm/Tables/NextGenDataGrid/hooks/useColumns/FilterModeDescription.mjs

@@ -1,7 +1,7 @@
 import { jsx } from "react/jsx-runtime";
 import { mergeProps } from "fastapi-rtk/utils";
 import { Input } from "@mantine/core";
-import { localizedFilterOption } from "../../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.8_@mantine_dates@7.17.8_@mantine_hooks@7._t5ruchzauz2wwsu2z4ey77rd4e/mantine-react-table/dist/index.esm.mjs";
+import { localizedFilterOption } from "../../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.8_@mantine_dates@7.17.8_@mantine_hooks@7._2zjbhqlotlhjxtgwdmcgs6toey/mantine-react-table/dist/index.esm.mjs";
 import { useMemo } from "react";
 import { FallbackWrapper } from "../../FallbackWrapper.mjs";
 const FilterModeDescription = ({ table, column, opr, filters, filterModeDescription, functionProps }) => {

package/dist/core/esm/Tables/NextGenDataGrid/hooks/useColumns/HeaderAdvancedFiltersMenuButton.mjs

@@ -6,7 +6,7 @@ import { useAuth } from "../../../../hooks/auth/useAuth.mjs";
 import "../../../../Wrappers/Provider/Contexts/LangContext.mjs";
 import { AdvancedFilters } from "./AdvancedFilters.mjs";
 import { FilterMenuButton } from "./FilterMenuButton.mjs";
-import { useTranslation } from "../../../../../../.external/esm/react-i18next@15.7.4_i18next@25.10.10_react-dom@19.2.5_react@19.2.5_typescript@5.9.3/react-i18next/dist/es/useTranslation.mjs";
+import { useTranslation } from "../../../../../../.external/esm/react-i18next@15.7.4_i18next@25.10.10_react-dom@19.2.6_react@19.2.6_typescript@5.9.3/react-i18next/dist/es/useTranslation.mjs";
 const HeaderAdvancedFiltersMenuButton = ({ filters, mrtProps }) => {
   const { t } = useTranslation();
   const { table, column } = mrtProps;

package/dist/core/esm/Tables/NextGenDataGrid/hooks/usePagination.mjs

@@ -1,15 +1,19 @@
-import { DEFAULT_PAGE_SIZE, DEFAULT_PAGE, DEFAULT_PAGE_SIZE_OPTIONS } from "fastapi-rtk/constants";
+import { DEFAULT_PAGE, DEFAULT_PAGE_SIZE_OPTIONS } from "fastapi-rtk/constants";
 import { isTruthy } from "fastapi-rtk/utils";
 import { useMemo, useCallback } from "react";
 import { useApi } from "../../../hooks/api/useApi.mjs";
 function usePagination(hidePagination) {
+  var _a, _b;
   const { data, queryParams, setQueryParams } = useApi();
   const pagination = useMemo(
-    () => ({
-      pageIndex: (queryParams == null ? void 0 : queryParams.page) || DEFAULT_PAGE,
-      pageSize: (queryParams == null ? void 0 : queryParams.page_size) || DEFAULT_PAGE_SIZE
-    }),
-    [queryParams == null ? void 0 : queryParams.page, queryParams == null ? void 0 : queryParams.page_size]
+    () => {
+      var _a2;
+      return {
+        pageIndex: (queryParams == null ? void 0 : queryParams.page) ?? DEFAULT_PAGE,
+        pageSize: (queryParams == null ? void 0 : queryParams.page_size) ?? ((_a2 = data == null ? void 0 : data.result) == null ? void 0 : _a2.length) ?? 0
+      };
+    },
+    [(_a = data == null ? void 0 : data.result) == null ? void 0 : _a.length, queryParams == null ? void 0 : queryParams.page, queryParams == null ? void 0 : queryParams.page_size]
   );
   const onPaginationChange = useCallback(
     (func) => {
@@ -24,13 +28,18 @@ function usePagination(hidePagination) {
     },
     [data == null ? void 0 : data.count, pagination, setQueryParams]
   );
-  const rowsPerPageOptions = useMemo(
-    () => [
-      ...DEFAULT_PAGE_SIZE_OPTIONS,
-      ...isTruthy(queryParams == null ? void 0 : queryParams.page_size) && !DEFAULT_PAGE_SIZE_OPTIONS.includes(String(queryParams == null ? void 0 : queryParams.page_size)) ? [String(queryParams == null ? void 0 : queryParams.page_size)] : []
-    ],
-    [queryParams == null ? void 0 : queryParams.page_size]
-  );
+  const rowsPerPageOptions = useMemo(() => {
+    var _a2;
+    const effective = isTruthy(queryParams == null ? void 0 : queryParams.page_size) ? queryParams == null ? void 0 : queryParams.page_size : (_a2 = data == null ? void 0 : data.result) == null ? void 0 : _a2.length;
+    if (!isTruthy(effective)) {
+      return [...DEFAULT_PAGE_SIZE_OPTIONS];
+    }
+    const effectiveStr = String(effective);
+    if (DEFAULT_PAGE_SIZE_OPTIONS.includes(effectiveStr)) {
+      return [...DEFAULT_PAGE_SIZE_OPTIONS];
+    }
+    return [...DEFAULT_PAGE_SIZE_OPTIONS, effectiveStr].sort((a, b) => Number(a) - Number(b));
+  }, [queryParams == null ? void 0 : queryParams.page_size, (_b = data == null ? void 0 : data.result) == null ? void 0 : _b.length]);
   return {
     enablePagination: !hidePagination,
     manualPagination: true,

package/dist/core/esm/Tables/NextGenDataGrid/hooks/useToolbar/basicToolbars.mjs

@@ -1,21 +1,21 @@
 import { jsx } from "react/jsx-runtime";
-import { MRT_ToggleFullScreenButton, MRT_ToggleDensePaddingButton, MRT_ShowHideColumnsButton, MRT_ToggleFiltersButton, MRT_ToggleGlobalFilterButton } from "../../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.8_@mantine_dates@7.17.8_@mantine_hooks@7._t5ruchzauz2wwsu2z4ey77rd4e/mantine-react-table/dist/index.esm.mjs";
 import { Add } from "../../../../ActionIcons/Add/Add.mjs";
 import { Download } from "../../../../ActionIcons/Download/Download.mjs";
 import { Refresh } from "../../../../ActionIcons/Refresh/Refresh.mjs";
+import { ToggleFullScreenButton, ToggleDensePaddingButton, ShowHideColumnsButton, ToggleFiltersButton, ToggleGlobalFilterButton } from "./mrtToolbars.mjs";
 function getBasicToolbars(table, rules) {
   const toolbars = {
-    toggleGlobalFilter: (props) => /* @__PURE__ */ jsx(MRT_ToggleGlobalFilterButton, { table, disabled: false, ...props }, "basic-toggleGlobalFilter"),
-    filter: (props) => /* @__PURE__ */ jsx(MRT_ToggleFiltersButton, { table, ...props }, "basic-filter"),
+    toggleGlobalFilter: (props) => /* @__PURE__ */ jsx(ToggleGlobalFilterButton, { table, ...props }, "basic-toggleGlobalFilter"),
+    filter: (props) => /* @__PURE__ */ jsx(ToggleFiltersButton, { table, ...props }, "basic-filter"),
     refresh: (props) => /* @__PURE__ */ jsx(Refresh, { tooltipProps: { label: table.options.localization.refresh }, ...props }, "basic-refresh"),
     add: (props) => /* @__PURE__ */ jsx(Add, { tooltipProps: { label: table.options.localization.add }, ...props }, "basic-add"),
     download: (props) => /* @__PURE__ */ jsx(Download, { tooltipProps: { label: table.options.localization.download }, ...props }, "basic-download"),
     // upload: (props) => (
     //   <Upload key="basic-upload" tooltipProps={{ label: table.options.localization.upload }} {...props} />
     // ), //! Disabled until further notice
-    showHideColumns: (props) => /* @__PURE__ */ jsx(MRT_ShowHideColumnsButton, { table, ...props }, "basic-showHideColumns"),
-    toggleDensePadding: (props) => /* @__PURE__ */ jsx(MRT_ToggleDensePaddingButton, { table, ...props }, "basic-toggleDensePadding"),
-    toggleFullScreen: (props) => /* @__PURE__ */ jsx(MRT_ToggleFullScreenButton, { table, ...props }, "basic-toggleFullScreen")
+    showHideColumns: (props) => /* @__PURE__ */ jsx(ShowHideColumnsButton, { table, ...props }, "basic-showHideColumns"),
+    toggleDensePadding: (props) => /* @__PURE__ */ jsx(ToggleDensePaddingButton, { table, ...props }, "basic-toggleDensePadding"),
+    toggleFullScreen: (props) => /* @__PURE__ */ jsx(ToggleFullScreenButton, { table, ...props }, "basic-toggleFullScreen")
   };
   Object.entries(rules).forEach(([key, value]) => {
     if (!value) {

package/dist/core/esm/Tables/NextGenDataGrid/hooks/useToolbar/mrtToolbars.mjs

@@ -0,0 +1,96 @@
+import { jsx, jsxs } from "react/jsx-runtime";
+import { useActionIcon } from "fastapi-rtk/hooks";
+import { Menu, Tooltip, ActionIcon } from "@mantine/core";
+import { MRT_ShowHideColumnsMenu } from "../../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.8_@mantine_dates@7.17.8_@mantine_hooks@7._2zjbhqlotlhjxtgwdmcgs6toey/mantine-react-table/dist/index.esm.mjs";
+import { memo, useState } from "react";
+import { BaseActionIcon } from "../../../../ActionIcons/utils/BaseActionIcon.mjs";
+const DENSITY_NEXT = { md: "xs", xl: "md", xs: "xl" };
+const ToggleGlobalFilterButton = memo(({ table, ...props }) => {
+  const { globalFilter, showGlobalFilter } = table.getState();
+  const { IconSearch, IconSearchOff } = table.options.icons;
+  return /* @__PURE__ */ jsx(
+    BaseActionIcon,
+    {
+      Icon: showGlobalFilter ? IconSearchOff : IconSearch,
+      label: table.options.localization.showHideSearch,
+      disabled: !!globalFilter,
+      onClick: () => {
+        table.setShowGlobalFilter(!showGlobalFilter);
+        setTimeout(() => {
+          var _a;
+          return (_a = table.refs.searchInputRef.current) == null ? void 0 : _a.focus();
+        }, 100);
+      },
+      ...props
+    }
+  );
+});
+ToggleGlobalFilterButton.displayName = "ToggleGlobalFilterButton";
+const ToggleFiltersButton = memo(({ table, ...props }) => {
+  const { showColumnFilters } = table.getState();
+  const { IconFilter, IconFilterOff } = table.options.icons;
+  return /* @__PURE__ */ jsx(
+    BaseActionIcon,
+    {
+      Icon: showColumnFilters ? IconFilterOff : IconFilter,
+      label: table.options.localization.showHideFilters,
+      onClick: () => table.setShowColumnFilters((current) => !current),
+      ...props
+    }
+  );
+});
+ToggleFiltersButton.displayName = "ToggleFiltersButton";
+const ToggleDensePaddingButton = memo(({ table, ...props }) => {
+  const { density } = table.getState();
+  const { IconBaselineDensityLarge, IconBaselineDensityMedium, IconBaselineDensitySmall } = table.options.icons;
+  const Icon = density === "xs" ? IconBaselineDensitySmall : density === "md" ? IconBaselineDensityMedium : IconBaselineDensityLarge;
+  return /* @__PURE__ */ jsx(
+    BaseActionIcon,
+    {
+      Icon,
+      label: table.options.localization.toggleDensity,
+      onClick: () => table.setDensity((current) => DENSITY_NEXT[current]),
+      ...props
+    }
+  );
+});
+ToggleDensePaddingButton.displayName = "ToggleDensePaddingButton";
+const ToggleFullScreenButton = memo(({ table, tooltipProps, ...props }) => {
+  const { isFullScreen } = table.getState();
+  const { IconMaximize, IconMinimize } = table.options.icons;
+  const [tooltipOpened, setTooltipOpened] = useState(false);
+  const label = table.options.localization.toggleFullScreen;
+  return /* @__PURE__ */ jsx(
+    BaseActionIcon,
+    {
+      Icon: isFullScreen ? IconMinimize : IconMaximize,
+      label,
+      tooltipProps: { opened: tooltipOpened, ...tooltipProps },
+      onClick: () => {
+        setTooltipOpened(false);
+        table.setIsFullScreen((current) => !current);
+      },
+      onMouseEnter: () => setTooltipOpened(true),
+      onMouseLeave: () => setTooltipOpened(false),
+      ...props
+    }
+  );
+});
+ToggleFullScreenButton.displayName = "ToggleFullScreenButton";
+const ShowHideColumnsButton = memo(({ table, tooltipProps, iconProps, ...props }) => {
+  const { IconColumns } = table.options.icons;
+  const label = table.options.localization.showHideColumns;
+  const actionIconProps = useActionIcon(props);
+  return /* @__PURE__ */ jsxs(Menu, { closeOnItemClick: false, withinPortal: true, children: [
+    /* @__PURE__ */ jsx(Tooltip, { withinPortal: true, ...tooltipProps, label: (tooltipProps == null ? void 0 : tooltipProps.label) ?? label, children: /* @__PURE__ */ jsx(Menu.Target, { children: /* @__PURE__ */ jsx(ActionIcon, { "aria-label": label, ...actionIconProps, children: /* @__PURE__ */ jsx(IconColumns, { ...iconProps }) }) }) }),
+    /* @__PURE__ */ jsx(MRT_ShowHideColumnsMenu, { table })
+  ] });
+});
+ShowHideColumnsButton.displayName = "ShowHideColumnsButton";
+export {
+  ShowHideColumnsButton,
+  ToggleDensePaddingButton,
+  ToggleFiltersButton,
+  ToggleFullScreenButton,
+  ToggleGlobalFilterButton
+};

package/dist/core/esm/Tables/NextGenDataGrid/hooks/useToolbarAlertBanner/FASTAPI_RTK_ToolbarAlertBanner.mjs

@@ -2,7 +2,7 @@ import { jsxs, jsx } from "react/jsx-runtime";
 import { parseFromValuesOrFunc, getValueOrDefault } from "fastapi-rtk/utils";
 import { Flex, Group, Stack } from "@mantine/core";
 import { clsx } from "../../../../../../.external/esm/clsx@2.1.1/clsx/dist/clsx.mjs";
-import { MRT_SelectCheckbox } from "../../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.8_@mantine_dates@7.17.8_@mantine_hooks@7._t5ruchzauz2wwsu2z4ey77rd4e/mantine-react-table/dist/index.esm.mjs";
+import { MRT_SelectCheckbox } from "../../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.8_@mantine_dates@7.17.8_@mantine_hooks@7._2zjbhqlotlhjxtgwdmcgs6toey/mantine-react-table/dist/index.esm.mjs";
 import classes from "./FASTAPI_RTK_ToolbarAlertBanner.module.css.mjs";
 const FASTAPI_RTK_ToolbarAlertBanner = ({ groupedAlert, selectedAlert, table, alertBanner, ...rest }) => {
   const {

package/dist/core/esm/Tables/NextGenDataGrid/patch/MRT_TableContainer.mjs

@@ -2,7 +2,7 @@ import { jsxs, jsx } from "react/jsx-runtime";
 import { parseFromValuesOrFunc, RenderWrapper } from "fastapi-rtk/utils";
 import { Box, LoadingOverlay } from "@mantine/core";
 import { clsx } from "../../../../../.external/esm/clsx@2.1.1/clsx/dist/clsx.mjs";
-import { MRT_EditRowModal } from "../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.8_@mantine_dates@7.17.8_@mantine_hooks@7._t5ruchzauz2wwsu2z4ey77rd4e/mantine-react-table/dist/index.esm.mjs";
+import { MRT_EditRowModal } from "../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.8_@mantine_dates@7.17.8_@mantine_hooks@7._2zjbhqlotlhjxtgwdmcgs6toey/mantine-react-table/dist/index.esm.mjs";
 import { useState, useLayoutEffect, useEffect } from "react";
 import classes from "./MRT_TableContainer.module.css.mjs";
 import { MRT_Table } from "./table/MRT_Table.mjs";
@@ -36,7 +36,7 @@ const MRT_TableContainer = ({ table, ...rest }) => {
   const createModalOpen = createDisplayMode === "modal" && creatingRow;
   const editModalOpen = editDisplayMode === "modal" && editingRow;
   const tableContainerWrapperProps = parseFromValuesOrFunc(mantineTableContainerWrapperProps, { table });
-  const optimizations = table.refs.optimizations.current;
+  const optimizations = table.refs.optimizationsRef.current;
   return /* @__PURE__ */ jsxs(
     Box,
     {

package/dist/core/esm/Tables/NextGenDataGrid/patch/MantineReactTable.mjs

@@ -1,5 +1,5 @@
 import { jsx } from "react/jsx-runtime";
-import { useMantineReactTable } from "../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.8_@mantine_dates@7.17.8_@mantine_hooks@7._t5ruchzauz2wwsu2z4ey77rd4e/mantine-react-table/dist/index.esm.mjs";
+import { useMantineReactTable } from "../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.8_@mantine_dates@7.17.8_@mantine_hooks@7._2zjbhqlotlhjxtgwdmcgs6toey/mantine-react-table/dist/index.esm.mjs";
 import { MRT_TablePaper } from "./MRT_TablePaper.mjs";
 const isTableInstanceProp = (props) => props.table !== void 0;
 const MantineReactTable = (props) => {

package/dist/core/esm/Tables/NextGenDataGrid/patch/body/MRT_TableBody.mjs

@@ -4,7 +4,7 @@ import classes from "./MRT_TableBody.module.css.mjs";
 import { memo, useMemo } from "react";
 import { parseFromValuesOrFunc } from "fastapi-rtk/utils";
 import { TableTbody } from "@mantine/core";
-import { useMRT_Rows, useMRT_RowVirtualizer, MRT_TableBodyEmptyRow } from "../../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.8_@mantine_dates@7.17.8_@mantine_hooks@7._t5ruchzauz2wwsu2z4ey77rd4e/mantine-react-table/dist/index.esm.mjs";
+import { useMRT_Rows, useMRT_RowVirtualizer, MRT_TableBodyEmptyRow } from "../../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.8_@mantine_dates@7.17.8_@mantine_hooks@7._2zjbhqlotlhjxtgwdmcgs6toey/mantine-react-table/dist/index.esm.mjs";
 import { Memo_MRT_TableBodyRow, MRT_TableBodyRow } from "./MRT_TableBodyRow.mjs";
 const MRT_TableBody = ({ columnVirtualizer, table, tableProps, ...rest }) => {
   var _a, _b;

package/dist/core/esm/Tables/NextGenDataGrid/patch/body/MRT_TableBodyRow.mjs

@@ -4,7 +4,7 @@ import classes from "./MRT_TableBodyRow.module.css.mjs";
 import { memo, useMemo, useRef } from "react";
 import { parseFromValuesOrFunc, MemoWrapper } from "fastapi-rtk/utils";
 import { TableTr, Box } from "@mantine/core";
-import { getIsRowSelected, Memo_MRT_TableBodyCell, MRT_TableBodyCell, MRT_TableDetailPanel } from "../../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.8_@mantine_dates@7.17.8_@mantine_hooks@7._t5ruchzauz2wwsu2z4ey77rd4e/mantine-react-table/dist/index.esm.mjs";
+import { getIsRowSelected, Memo_MRT_TableBodyCell, MRT_TableBodyCell, MRT_TableDetailPanel } from "../../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.8_@mantine_dates@7.17.8_@mantine_hooks@7._2zjbhqlotlhjxtgwdmcgs6toey/mantine-react-table/dist/index.esm.mjs";
 import { useSelectionStore } from "../../components/OptimizedMRT_RowSelectColumn/zustand.mjs";
 const MRT_TableBodyRow = ({
   children,
@@ -40,7 +40,7 @@ const MRT_TableBodyRow = ({
   const visibleCells = row.getVisibleCells();
   const { virtualColumns, virtualPaddingLeft, virtualPaddingRight } = columnVirtualizer ?? {};
   const store = table.refs.selectionStoreRef.current;
-  const optimizations = table.refs.optimizations.current;
+  const optimizations = table.refs.optimizationsRef.current;
   const isOptimizedRowSelected = useSelectionStore(store, (state) => state.rowSelection[row.id] ?? false);
   const isRowSelected = getIsRowSelected({ row, table }) || isOptimizedRowSelected;
   const isRowPinned = enableRowPinning && row.getIsPinned();

package/dist/core/esm/Tables/NextGenDataGrid/patch/head/MRT_TableHead.mjs

@@ -3,7 +3,7 @@ import { clsx } from "../../../../../../.external/esm/clsx@2.1.1/clsx/dist/clsx.
 import classes from "./MRT_TableHead.module.css.mjs";
 import { parseFromValuesOrFunc } from "fastapi-rtk/utils";
 import { TableThead, TableTr, TableTh } from "@mantine/core";
-import { MRT_TableHeadRow } from "../../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.8_@mantine_dates@7.17.8_@mantine_hooks@7._t5ruchzauz2wwsu2z4ey77rd4e/mantine-react-table/dist/index.esm.mjs";
+import { MRT_TableHeadRow } from "../../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.8_@mantine_dates@7.17.8_@mantine_hooks@7._2zjbhqlotlhjxtgwdmcgs6toey/mantine-react-table/dist/index.esm.mjs";
 import { useMemo } from "react";
 import { useSelectionStore } from "../../components/OptimizedMRT_RowSelectColumn/zustand.mjs";
 import { MRT_ToolbarAlertBanner } from "../toolbar/MRT_ToolbarAlertBanner.mjs";
@@ -29,7 +29,7 @@ const MRT_TableHead = ({ columnVirtualizer, table, ...rest }) => {
   } = table;
   const { rowSelection } = getState();
   const totalRowCount = rowCount ?? getPrePaginationRowModel().flatRows.length;
-  const optimizations = table.refs.optimizations.current;
+  const optimizations = table.refs.optimizationsRef.current;
   const store = table.refs.selectionStoreRef.current;
   const optimizedRowSelection = useSelectionStore(store, (state) => state.rowSelection);
   const selectedRowCount = useMemo(

package/dist/core/esm/Tables/NextGenDataGrid/patch/table/MRT_Table.mjs

@@ -4,7 +4,7 @@ import classes from "./MRT_Table.module.css.mjs";
 import { useMemo } from "react";
 import { parseFromValuesOrFunc } from "fastapi-rtk/utils";
 import { useMantineColorScheme, Table, lighten, darken } from "@mantine/core";
-import { parseCSSVarId, useMRT_ColumnVirtualizer, MRT_TableFooter } from "../../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.8_@mantine_dates@7.17.8_@mantine_hooks@7._t5ruchzauz2wwsu2z4ey77rd4e/mantine-react-table/dist/index.esm.mjs";
+import { parseCSSVarId, useMRT_ColumnVirtualizer, MRT_TableFooter } from "../../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.8_@mantine_dates@7.17.8_@mantine_hooks@7._2zjbhqlotlhjxtgwdmcgs6toey/mantine-react-table/dist/index.esm.mjs";
 import { Memo_MRT_TableBody, MRT_TableBody } from "../body/MRT_TableBody.mjs";
 import { MRT_TableHead } from "../head/MRT_TableHead.mjs";
 const MRT_Table = ({ table, ...rest }) => {

package/dist/core/esm/Tables/NextGenDataGrid/patch/toolbar/MRT_BottomToolbar.mjs

@@ -5,7 +5,7 @@ import classes from "./MRT_BottomToolbar.module.css.mjs";
 import { parseFromValuesOrFunc } from "fastapi-rtk/utils";
 import { Box } from "@mantine/core";
 import { useMediaQuery } from "@mantine/hooks";
-import { MRT_ProgressBar, MRT_ToolbarDropZone, MRT_TablePagination } from "../../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.8_@mantine_dates@7.17.8_@mantine_hooks@7._t5ruchzauz2wwsu2z4ey77rd4e/mantine-react-table/dist/index.esm.mjs";
+import { MRT_ProgressBar, MRT_ToolbarDropZone, MRT_TablePagination } from "../../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.8_@mantine_dates@7.17.8_@mantine_hooks@7._2zjbhqlotlhjxtgwdmcgs6toey/mantine-react-table/dist/index.esm.mjs";
 import { MRT_ToolbarAlertBanner } from "./MRT_ToolbarAlertBanner.mjs";
 const MRT_BottomToolbar = ({ table, ...rest }) => {
   const {