fastapi-rtk 0.1.25 → 0.1.27

package/dist/core/cjs/fab-react-toolkit-patch/auth/hooks/useProvideInfo.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const useQuery = require("../../../../../.external/cjs/@tanstack_react-query@5.77.2_react@18.3.1/@tanstack/react-query/build/modern/useQuery.cjs");
+const useQuery = require("../../../../../.external/cjs/@tanstack_react-query@5.80.6_react@18.3.1/@tanstack/react-query/build/modern/useQuery.cjs");
 const React = require("react");
 const authFetch = require("../utils/authFetch.cjs");
 function useFabProvideInfo(baseUrl, auth) {

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@7.17.7_yup@1.6.1/mantine-form-yup-resolver/dist/esm/index.mjs";
+import { yupResolver } from "../../../../../../.external/esm/mantine-form-yup-resolver@2.0.0_@mantine_form@7.17.8_yup@1.6.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.6.1/yup/index.esm.mjs";
 import { useApi } from "../../../../hooks/api/useApi.mjs";

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

@@ -3,7 +3,7 @@ import { jsxs, jsx } from "react/jsx-runtime";
 /* empty css           */
 import { deepMerge, getItemId } from "fastapi-rtk/utils";
 import { useProps, Box } from "@mantine/core";
-import { useMantineReactTable, MantineReactTable } from "../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.7_@mantine_dates@7.17.7_@mantine_hooks@7._dm3meh6s7t7wwl37at3cedg6gm/mantine-react-table/dist/index.esm.mjs";
+import { useMantineReactTable, MantineReactTable } from "../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.8_@mantine_dates@7.17.8_@mantine_hooks@7._ll5dfnmvjphm4bajaxt6oy7mty/mantine-react-table/dist/index.esm.mjs";
 import { forwardRef, useMemo, useEffect } from "react";
 import { AddDialog } from "../../ActionIcons/Add/AddDialog.mjs";
 import { EditDialog } from "../../ActionIcons/Edit/EditDialog.mjs";
@@ -51,6 +51,7 @@ const NextGenDataGrid = forwardRef((props, ref) => {
     toolbar = {},
     //! Temporary add {} until we remove deprecated props
     textFilterSeparator = ";",
+    enableAdvancedFilters,
     wrapperProps,
     // Deprecated props
     bodySeparator,
@@ -134,11 +135,11 @@ const NextGenDataGrid = forwardRef((props, ref) => {
   const dataProps = useData();
   const sortingProps = useSorting();
   const paginationProps = usePagination(hidePagination);
-  const columnsProps = useColumns(columnProps, header, body, textFilterSeparator);
+  const columnsProps = useColumns(columnProps, header, body, textFilterSeparator, enableAdvancedFilters);
   const sizeProps = useSize(withBorder);
   const actionsProps = useActions(hideActions, (_a = getProps(body, specialKey.actions)) == null ? void 0 : _a.component);
   const globalFilterProps = useGlobalFilter();
-  const toolbarProps = useToolbar(toolbar, quickFilters, hideToolbar);
+  const toolbarProps = useToolbar(toolbar, quickFilters, hideToolbar, enableAdvancedFilters);
   const eventProps = useEvent(onClickEntry);
   const checkboxProps = useCheckbox(onSelectCheckbox, bulkActions);
   const filterProps = useFilters();
@@ -146,7 +147,7 @@ const NextGenDataGrid = forwardRef((props, ref) => {
   const mrtProps = useMemo(
     () => deepMerge(
       baseProps,
-      { mantinePaperProps: { ref }, getRowId: getItemId },
+      { mantinePaperProps: { ref }, getRowId: getItemId, enableColumnFilters: !enableAdvancedFilters },
       columnsProps,
       dataProps,
       sortingProps,
@@ -163,6 +164,7 @@ const NextGenDataGrid = forwardRef((props, ref) => {
     ),
     [
       ref,
+      enableAdvancedFilters,
       columnsProps,
       dataProps,
       sortingProps,

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

@@ -4,13 +4,13 @@ import { useMemo } from "react";
 import { useApi } from "../../../../hooks/api/useApi.mjs";
 import { useAuth } from "../../../../hooks/auth/useAuth.mjs";
 import { fromFilterFnToFilter } from "../../utils.mjs";
+import { BasicFilters } from "./BasicFilters.mjs";
 import { ColumnHeaderFilterInput } from "./ColumnHeaderFilterInput/ColumnHeaderFilterInput.mjs";
 import { FilterMenuButton } from "./FilterMenuButton.mjs";
 import { FilterModeDescription } from "./FilterModeDescription.mjs";
 const ColumnHeaderFilter = ({
   children,
   enableFilterModes,
-  enableAdvancedFilters,
   filters,
   filterFn,
   filterProps,
@@ -59,13 +59,11 @@ const ColumnHeaderFilter = ({
         FilterMenuButton,
         {
           table,
-          column,
-          opr,
           filters,
-          enableAdvancedFilters,
           filterMenu,
           actionIconProps,
-          functionProps
+          functionProps,
+          children: /* @__PURE__ */ jsx(BasicFilters, { filters, col: column.id, opr, table })
         }
       )
     ] }),

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

@@ -52,22 +52,9 @@ function ColumnHeaderFilterInput({
   const field = useField({ mode: "controlled" });
   useSyncValues(
     [
-      {
-        value: field.getValue(),
-        onChange: field.getInputProps().onChange,
-        log: (value) => console.log(`Field value changed to: ${value}`)
-      },
-      ...filterState ? [
-        {
-          ...filterState,
-          log: (value) => console.log(`filterState value changed to: ${value}`)
-        }
-      ] : [],
-      {
-        value: column.getFilterValue(),
-        onChange: column.setFilterValue,
-        log: (value) => console.log(`Column filter value changed to: ${value}`)
-      },
+      { value: field.getValue(), onChange: field.getInputProps().onChange },
+      { value: column.getFilterValue(), onChange: column.setFilterValue },
+      ...filterState ? [filterState] : [],
       ...updateQueryParams ? [
         {
           value: (_b = (_a = queryParams == null ? void 0 : queryParams.filters) == null ? void 0 : _a.find((qpFilter) => qpFilter.id === column.id)) == null ? void 0 : _b.value,
@@ -91,8 +78,7 @@ function ColumnHeaderFilterInput({
               }
               return { ...prev, filters: newFilters };
             });
-          },
-          log: (value) => console.log(`Query Params filter value changed to: ${value}`)
+          }
         }
       ] : []
     ],

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

@@ -1,69 +1,44 @@
-import { jsx, jsxs } from "react/jsx-runtime";
-import { Tooltip, Indicator, Menu, ActionIcon } from "@mantine/core";
-import { useElementSize, useMergedRef, useDisclosure } from "@mantine/hooks";
-import { forwardRef, cloneElement, useState, useMemo } from "react";
-import { useApi } from "../../../../hooks/api/useApi.mjs";
+import { jsxs, jsx } from "react/jsx-runtime";
+import { Menu, ActionIcon, Tooltip } from "@mantine/core";
+import { useDisclosure } from "@mantine/hooks";
+import { forwardRef, cloneElement } from "react";
 import { FallbackWrapper } from "../../FallbackWrapper.mjs";
-import { FilterMenu } from "./FilterMenu.mjs";
 import IconFilterCog from "../../../../../../.external/esm/@tabler_icons-react@3.18.0_react@18.3.1/@tabler/icons-react/dist/esm/icons/IconFilterCog.mjs";
-const FilterMenuButton = ({
-  table,
-  column,
-  opr,
-  filters,
-  enableAdvancedFilters,
-  filterMenu,
-  actionIconProps,
-  functionProps
-}) => {
-  const { queryParams } = useApi();
-  const [opened, { toggle }] = useDisclosure();
-  const [mode, setMode] = useState("Basic");
-  const existingFilters = useMemo(
-    () => (queryParams == null ? void 0 : queryParams.filters.filter((filter) => filter.id !== column.id && filter.col === column.id).map((filter) => ({ ...filter }))) || [],
-    [queryParams, column.id]
-  );
-  return /* @__PURE__ */ jsxs(Menu, { opened, closeOnClickOutside: true, onChange: toggle, children: [
-    /* @__PURE__ */ jsx(Menu.Target, { children: /* @__PURE__ */ jsx(
-      FallbackWrapper,
-      {
-        fallback: filters.length ? /* @__PURE__ */ jsx(
-          FilterIconWrapper,
-          {
-            label: table.options.localization.changeFilterMode,
-            position: "bottom-start",
-            withArrow: true,
-            arrowPosition: "side",
-            children: /* @__PURE__ */ jsx(FilterIndicatorWrapper, { indicator: existingFilters.length, children: /* @__PURE__ */ jsx(ActionIcon, { ...actionIconProps, onClick: toggle, children: /* @__PURE__ */ jsx(IconFilterCog, {}) }) })
-          }
-        ) : null,
-        functionProps: {
-          ...functionProps,
-          componentProps: {
-            label: table.options.localization.changeFilterMode,
-            disabled: !(filters == null ? void 0 : filters.length),
-            indicator: existingFilters.length,
-            actionIconProps,
-            onClick: toggle
-          }
-        },
-        children: filterMenu
-      }
-    ) }),
-    /* @__PURE__ */ jsx(Menu.Dropdown, { children: /* @__PURE__ */ jsx(
-      FilterMenu,
-      {
-        enableAdvancedFilters,
-        mode,
-        setMode,
-        col: column.id,
-        opr,
-        filters,
-        table
-      }
-    ) })
-  ] });
-};
+const FilterMenuButton = forwardRef(
+  ({ table, filters, filterMenu, filterIconWrapperProps, actionIconProps, functionProps, children }, ref) => {
+    const [opened, { toggle }] = useDisclosure();
+    return /* @__PURE__ */ jsxs(Menu, { opened, closeOnClickOutside: true, onChange: toggle, children: [
+      /* @__PURE__ */ jsx(Menu.Target, { ref, children: /* @__PURE__ */ jsx(
+        FallbackWrapper,
+        {
+          fallback: filters.length ? /* @__PURE__ */ jsx(
+            FilterIconWrapper,
+            {
+              label: table.options.localization.changeFilterMode,
+              position: "bottom-start",
+              withArrow: true,
+              arrowPosition: "side",
+              ...filterIconWrapperProps,
+              children: /* @__PURE__ */ jsx(ActionIcon, { ...actionIconProps, onClick: toggle, children: /* @__PURE__ */ jsx(IconFilterCog, {}) })
+            }
+          ) : null,
+          functionProps: {
+            ...functionProps,
+            componentProps: {
+              label: table.options.localization.changeFilterMode,
+              disabled: !(filters == null ? void 0 : filters.length),
+              actionIconProps,
+              onClick: toggle
+            }
+          },
+          children: filterMenu
+        }
+      ) }),
+      /* @__PURE__ */ jsx(Menu.Dropdown, { children })
+    ] });
+  }
+);
+FilterMenuButton.displayName = "FilterMenuButton";
 const FilterIconWrapper = forwardRef(({ label, disabled, children, ...props }, ref) => {
   if (disabled) {
     return cloneElement(children, { ref });
@@ -71,17 +46,6 @@ const FilterIconWrapper = forwardRef(({ label, disabled, children, ...props }, r
   return /* @__PURE__ */ jsx(Tooltip, { label, ...props, children: cloneElement(children, { ref }) });
 });
 FilterIconWrapper.displayName = "FilterIconWrapper";
-const FilterIndicatorWrapper = forwardRef(({ indicator, children, ...props }, ref) => {
-  const { height, ref: elementRef } = useElementSize();
-  const combinedRefs = useMergedRef(ref, elementRef);
-  if (!indicator) {
-    return cloneElement(children, { ref: combinedRefs });
-  }
-  const heightOffset = 2;
-  //! This is the height offset between the button from ActionIcon and the icon itself
-  return /* @__PURE__ */ jsx(Indicator, { zIndex: 20, size: 16, label: indicator, styles: { root: { height: height + heightOffset } }, ...props, children: cloneElement(children, { ref: combinedRefs }) });
-});
-FilterIndicatorWrapper.displayName = "FilterIndicatorWrapper";
 export {
   FilterMenuButton
 };

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

@@ -1,6 +1,6 @@
 import { jsx } from "react/jsx-runtime";
 import { Input } from "@mantine/core";
-import { localizedFilterOption } from "../../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.7_@mantine_dates@7.17.7_@mantine_hooks@7._dm3meh6s7t7wwl37at3cedg6gm/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._ll5dfnmvjphm4bajaxt6oy7mty/mantine-react-table/dist/index.esm.mjs";
 import { useMemo } from "react";
 import { FallbackWrapper } from "../../FallbackWrapper.mjs";
 import { getProps } from "../../utils.mjs";

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

@@ -0,0 +1,58 @@
+import { jsx } from "react/jsx-runtime";
+import { Center, Tooltip, Badge } from "@mantine/core";
+import { useMemo } from "react";
+import { useApi } from "../../../../hooks/api/useApi.mjs";
+import { useAuth } from "../../../../hooks/auth/useAuth.mjs";
+import { AdvancedFilters } from "./AdvancedFilters.mjs";
+import { FilterMenuButton } from "./FilterMenuButton.mjs";
+const HeaderAdvancedFiltersMenuButton = ({ filters, mrtProps }) => {
+  const { table, column } = mrtProps;
+  const api = useApi();
+  const auth = useAuth();
+  const functionProps = useMemo(() => ({ api, auth, mrtProps }), [api, auth, mrtProps]);
+  const actionIconProps = useMemo(() => {
+    const props = { variant: "subtle", size: "xs" };
+    const disabled = !(filters == null ? void 0 : filters.length);
+    if (disabled) {
+      props.disabled = true;
+      props.c = "gray";
+    }
+    return props;
+  }, [filters == null ? void 0 : filters.length]);
+  const { queryParams } = useApi();
+  const existingFilters = useMemo(
+    () => (queryParams == null ? void 0 : queryParams.filters.filter((filter) => filter.id !== column.id && filter.col === column.id).map((filter) => ({ ...filter }))) || [],
+    [queryParams, column.id]
+  );
+  return /* @__PURE__ */ jsx(Center, { onClick: (e) => e.stopPropagation(), children: /* @__PURE__ */ jsx(
+    Tooltip,
+    {
+      label: /* @__PURE__ */ jsx(Badge, { size: "xs", circle: true, children: existingFilters.length }),
+      position: "top",
+      color: "transparent",
+      p: 0,
+      offset: { mainAxis: -8, crossAxis: 8 },
+      opened: true,
+      disabled: !existingFilters.length,
+      children: /* @__PURE__ */ jsx(
+        FilterMenuButton,
+        {
+          table,
+          filters,
+          filterIconWrapperProps: {
+            label: table.options.localization.advancedFilters ?? "Advanced Filters",
+            position: "top",
+            withArrow: false,
+            openDelay: 1e3
+          },
+          actionIconProps,
+          functionProps,
+          children: /* @__PURE__ */ jsx(AdvancedFilters, { col: column.id })
+        }
+      )
+    }
+  ) });
+};
+export {
+  HeaderAdvancedFiltersMenuButton
+};

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

@@ -1,5 +1,6 @@
-import { jsx } from "react/jsx-runtime";
+import { jsx, jsxs } from "react/jsx-runtime";
 import { getValue, parseFromValuesOrFunc } from "fastapi-rtk/utils";
+import { Flex } from "@mantine/core";
 import { useMap, useSetState } from "@mantine/hooks";
 import { useEffect, useMemo } from "react";
 import { useApi } from "../../../../hooks/api/useApi.mjs";
@@ -7,7 +8,8 @@ import { useAuth } from "../../../../hooks/auth/useAuth.mjs";
 import { getProps, fromFilterToFilterFn } from "../../utils.mjs";
 import { Body } from "./Body.mjs";
 import { ColumnHeaderFilter } from "./ColumnHeaderFilter.mjs";
-function useColumns(columnProps, header, body, textFilterSeparator) {
+import { HeaderAdvancedFiltersMenuButton } from "./HeaderAdvancedFiltersMenuButton.mjs";
+function useColumns(columnProps, header, body, textFilterSeparator, enableAdvancedFilters) {
   const { path, info, data, specialKey } = useApi();
   const api = useApi();
   const auth = useAuth();
@@ -25,7 +27,6 @@ function useColumns(columnProps, header, body, textFilterSeparator) {
       const {
         component,
         enableFilterModes,
-        enableAdvancedFilters,
         filterComponent,
         filterProps,
         filterState,
@@ -45,12 +46,18 @@ function useColumns(columnProps, header, body, textFilterSeparator) {
         accessorKey: col,
         accessorFn: (row) => getValue(row, col),
         header: (_g = data == null ? void 0 : data.label_columns) == null ? void 0 : _g[col],
+        Header: enableAdvancedFilters ? (props) => {
+          var _a2, _b2;
+          return /* @__PURE__ */ jsxs(Flex, { gap: "2px", style: { placeItems: "center" }, children: [
+            ((_a2 = getProps(columnProps, specialKey.all, col)) == null ? void 0 : _a2.header) ?? ((_b2 = data == null ? void 0 : data.label_columns) == null ? void 0 : _b2[col]),
+            /* @__PURE__ */ jsx(HeaderAdvancedFiltersMenuButton, { filters, mrtProps: props })
+          ] });
+        } : void 0,
         filterTooltipValueFn: (value) => idValueMap.get(`${data == null ? void 0 : data.path}-${col}-${value}`) ?? value,
-        Filter: (props) => /* @__PURE__ */ jsx(
+        Filter: (props) => enableAdvancedFilters ? null : /* @__PURE__ */ jsx(
           ColumnHeaderFilter,
           {
             enableFilterModes,
-            enableAdvancedFilters,
             filters,
             filterFn,
             filterProps,
@@ -83,6 +90,7 @@ function useColumns(columnProps, header, body, textFilterSeparator) {
       api,
       auth,
       idValueMap,
+      enableAdvancedFilters,
       body,
       textFilterSeparator
     ]

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

@@ -1,20 +1,26 @@
 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.7_@mantine_dates@7.17.7_@mantine_hooks@7._dm3meh6s7t7wwl37at3cedg6gm/mantine-react-table/dist/index.esm.mjs";
+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._ll5dfnmvjphm4bajaxt6oy7mty/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";
 function getBasicToolbars(table, rules) {
-  return {
+  const toolbars = {
     toggleGlobalFilter: /* @__PURE__ */ jsx(MRT_ToggleGlobalFilterButton, { table, disabled: false }, "basic-toggleGlobalFilter"),
     filter: /* @__PURE__ */ jsx(MRT_ToggleFiltersButton, { table }, "basic-filter"),
     refresh: /* @__PURE__ */ jsx(Refresh, { tooltipProps: { label: table.options.localization.refresh } }, "basic-refresh"),
-    add: (rules == null ? void 0 : rules.add) && /* @__PURE__ */ jsx(Add, { tooltipProps: { label: table.options.localization.add } }, "basic-add"),
-    download: (rules == null ? void 0 : rules.download) && /* @__PURE__ */ jsx(Download, { tooltipProps: { label: table.options.localization.download } }, "basic-download"),
-    // upload: rules?.upload && <Upload key="basic-upload" tooltipProps={{ label: table.options.localization.upload }} />, //! Disabled until further notice
+    add: /* @__PURE__ */ jsx(Add, { tooltipProps: { label: table.options.localization.add } }, "basic-add"),
+    download: /* @__PURE__ */ jsx(Download, { tooltipProps: { label: table.options.localization.download } }, "basic-download"),
+    // upload: <Upload key="basic-upload" tooltipProps={{ label: table.options.localization.upload }} />, //! Disabled until further notice
     showHideColumns: /* @__PURE__ */ jsx(MRT_ShowHideColumnsButton, { table }, "basic-showHideColumns"),
     toggleDensePadding: /* @__PURE__ */ jsx(MRT_ToggleDensePaddingButton, { table }, "basic-toggleDensePadding"),
     toggleFullScreen: /* @__PURE__ */ jsx(MRT_ToggleFullScreenButton, { table }, "basic-toggleFullScreen")
   };
+  Object.entries(rules).forEach(([key, value]) => {
+    if (!value) {
+      toolbars[key] = null;
+    }
+  });
+  return toolbars;
 }
 export {
   getBasicToolbars

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

@@ -23,7 +23,7 @@ function renderCustomizedToolbars(customizer, basicToolbarsObj, functionProps, c
   });
   return /* @__PURE__ */ jsx(Flex, { gap: "0.125rem", align: "center", children: toolbars });
 }
-function useToolbar(toolbar = {}, quickFilters, hideToolbar) {
+function useToolbar(toolbar = {}, quickFilters, hideToolbar, enableAdvancedFilters) {
   const { info, queryParams, setQueryParams } = useApi();
   const api = useApi();
   const auth = useAuth();
@@ -58,6 +58,7 @@ function useToolbar(toolbar = {}, quickFilters, hideToolbar) {
         mrtProps: { table }
       };
       const rules = {
+        filter: !enableAdvancedFilters,
         add: info == null ? void 0 : info.permissions.includes("can_post"),
         download: info == null ? void 0 : info.permissions.includes("can_download"),
         upload: info == null ? void 0 : info.permissions.includes("can_upload")
@@ -65,7 +66,7 @@ function useToolbar(toolbar = {}, quickFilters, hideToolbar) {
       const basicToolbarsObj = getBasicToolbars(table, rules);
       return renderCustomizedToolbars(customizer, basicToolbarsObj, functionProps, custom);
     },
-    [api, auth, custom, customizer, info == null ? void 0 : info.permissions]
+    [api, auth, custom, customizer, enableAdvancedFilters, info == null ? void 0 : info.permissions]
   );
   return {
     renderToolbarInternalActions,

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, Button, Group, Badge, ActionIcon, Stack } from "@mantine/core";
 import { clsx } from "../../../../../../.external/esm/clsx@2.1.1/clsx/dist/clsx.mjs";
-import { getMRT_SelectAllHandler, MRT_SelectCheckbox } from "../../../../../../.external/esm/mantine-react-table@2.0.0-beta.9_@mantine_core@7.17.7_@mantine_dates@7.17.7_@mantine_hooks@7._dm3meh6s7t7wwl37at3cedg6gm/mantine-react-table/dist/index.esm.mjs";
+import { getMRT_SelectAllHandler, 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._ll5dfnmvjphm4bajaxt6oy7mty/mantine-react-table/dist/index.esm.mjs";
 import { useMemo, Fragment } from "react";
 import classes from "./FASTAPI_RTK_ToolbarAlertBanner.module.css.mjs";
 const FASTAPI_RTK_ToolbarAlertBanner = ({ alertBanner, table, ...rest }) => {

package/dist/core/esm/Wrappers/ApiProvider/Contexts/ApiContext.mjs

@@ -2,7 +2,7 @@ import { createContext } from "react";
 const ApiContext = createContext({
   path: "",
   /**
-   * @type {{count: number, description_columns: Record<string, string>, ids: number[] | string[], label_columns: Record<string, string>, list_columns: string[], list_title: string, order_columns: string[], result: Record<string, any>[], path: string} | null}
+   * @type {{count: number, description_columns: Record<string, string>, ids: number[] | string[], label_columns: Record<string, string>, list_columns: string[], list_title: string, order_columns: string[], result: Record<string, any>[], path: string, queryParams: Record<string, any>} | null}
    */
   data: null,
   /**

package/dist/core/esm/Wrappers/ApiProvider/hooks/useProvideApi.mjs

@@ -1,7 +1,7 @@
 import { useState, useRef, useEffect, useMemo, useCallback } from "react";
 import { getItemId, urlJoin } from "fastapi-rtk/utils";
 import { useDidUpdate, useSetState } from "@mantine/hooks";
-import { useQuery } from "../../../../../.external/esm/@tanstack_react-query@5.77.2_react@18.3.1/@tanstack/react-query/build/modern/useQuery.mjs";
+import { useQuery } from "../../../../../.external/esm/@tanstack_react-query@5.80.6_react@18.3.1/@tanstack/react-query/build/modern/useQuery.mjs";
 import { createItem } from "../utils/api/createItem.mjs";
 import { deleteItem } from "../utils/api/deleteItem.mjs";
 import { downloadItems } from "../utils/api/downloadItems.mjs";
@@ -13,7 +13,7 @@ import { uploadItems } from "../utils/api/uploadItems.mjs";
 import { convertId } from "../utils/convertId.mjs";
 import { convertInfo } from "../utils/convertInfo.mjs";
 import { createQueryParams } from "../utils/createQueryParams.mjs";
-import { keepPreviousData } from "../../../../../.external/esm/@tanstack_query-core@5.77.2/@tanstack/query-core/build/modern/utils.mjs";
+import { keepPreviousData } from "../../../../../.external/esm/@tanstack_query-core@5.80.6/@tanstack/query-core/build/modern/utils.mjs";
 function useProvideApi({
   path,
   initialQueryParams,
@@ -110,7 +110,8 @@ function useProvideApi({
     queryFn: ({ signal }) => memoizedQueryParams ? getItems(urlJoin(memoizedQueryParamsPathRef.current, "/"), memoizedQueryParams, signal).then((data2) => ({
       ...data2,
       result: data2.result.map((item, index) => ({ ...item, id: data2.ids[index] })),
-      path: memoizedQueryParamsPathRef.current
+      path: memoizedQueryParamsPathRef.current,
+      queryParams: memoizedQueryParams
     })) : null,
     placeholderData: clearDataOnRefetch ? null : keepPreviousData,
     retry: false,
@@ -230,16 +231,8 @@ function useProvideApi({
   const [streaming, setStreaming] = useSetState({
     data: {},
     isEnd: false,
-    fetch: () => null
+    fetch: streamingMode ? () => setQueryParamsCallback({ page: 0, streaming: true }) : () => null
   });
-  useEffect(() => {
-    if (!streamingMode) {
-      return;
-    }
-    setStreaming({
-      fetch: () => setQueryParamsCallback({ page: 0, streaming: true })
-    });
-  }, [setQueryParamsCallback, setStreaming, streamingMode]);
   useEffect(() => {
     if (!streamingMode) {
       return;
@@ -248,19 +241,21 @@ function useProvideApi({
       return;
     }
     setStreaming((prev) => {
-      let latestPage = Object.keys(prev.data).length;
+      var _a;
       const newStreaming = { isEnd: false };
-      if (memoizedQueryParams.page < latestPage) {
-        latestPage = memoizedQueryParams.page;
-        newStreaming.data = { [memoizedQueryParams.page]: data.result };
+      const currentPage = Object.keys(prev.data).length;
+      const nextPage = ((_a = data.queryParams) == null ? void 0 : _a.page) ?? 0;
+      if (nextPage < currentPage) {
+        newStreaming.data = {};
       } else {
-        newStreaming.data = { ...prev.data, [memoizedQueryParams.page]: data.result };
+        newStreaming.data = { ...prev.data };
       }
-      if (data.result.length < memoizedQueryParams.page_size) {
+      newStreaming.data[nextPage] = data.result;
+      if (data.result.length < data.queryParams.page_size) {
         newStreaming.isEnd = true;
         newStreaming.fetch = () => null;
       } else {
-        newStreaming.fetch = () => setQueryParamsCallback({ page: latestPage + 1, streaming: true });
+        newStreaming.fetch = () => setQueryParamsCallback({ page: nextPage + 1, streaming: true });
       }
       return newStreaming;
     });

package/dist/core/esm/Wrappers/InfiniteScroll/InfiniteScroll.mjs

@@ -1,32 +1,33 @@
 import { jsxs, Fragment, jsx } from "react/jsx-runtime";
+import { parseFromValuesOrFunc } from "fastapi-rtk/utils";
 import { Center, Loader } from "@mantine/core";
 import { useInViewport } from "@mantine/hooks";
 import { useMemo, useEffect } from "react";
 import { useApi } from "../../hooks/api/useApi.mjs";
-function InfiniteScroll({
+const InfiniteScroll = ({
   children,
   fetch = true,
-  loading: Loading = /* @__PURE__ */ jsx(Center, { children: /* @__PURE__ */ jsx(Loader, {}) }),
-  end: End = /* @__PURE__ */ jsx(Center, { children: "End of data" }),
-  fetchWrapper: FetchWrapper = Center,
+  components: {
+    Loading = /* @__PURE__ */ jsx(Center, { children: /* @__PURE__ */ jsx(Loader, {}) }),
+    End = /* @__PURE__ */ jsx(Center, { children: "End of data" }),
+    FetchWrapper = Center
+  } = {},
   fetchWrapperProps
-}) {
+}) => {
   const { streaming, loading } = useApi();
   const { ref, inViewport } = useInViewport();
   const items = useMemo(() => Object.values(streaming.data).flat(), [streaming.data]);
-  const Children = useMemo(() => typeof children === "function" ? children(items) : children, [children, items]);
   useEffect(() => {
     if (inViewport && fetch) {
       streaming.fetch();
     }
-  }, [inViewport]);
+  }, [fetch, inViewport]);
   return /* @__PURE__ */ jsxs(Fragment, { children: [
-    Children,
-    loading && Loading,
+    parseFromValuesOrFunc(children, { items, loading }),
     streaming.isEnd && End,
-    /* @__PURE__ */ jsx(FetchWrapper, { ref, id: "IS-load-trigger", mih: "1%", ...fetchWrapperProps })
+    loading ? Loading : /* @__PURE__ */ jsx(FetchWrapper, { ref, id: "IS-load-trigger", mih: "1%", ...fetchWrapperProps })
   ] });
-}
+};
 export {
   InfiniteScroll
 };

package/dist/core/esm/Wrappers/Provider/Provider.mjs

@@ -1,7 +1,7 @@
 import { jsx } from "react/jsx-runtime";
 import { useProxy } from "fastapi-rtk/zustand";
-import { QueryClient } from "../../../../.external/esm/@tanstack_query-core@5.77.2/@tanstack/query-core/build/modern/queryClient.mjs";
-import { QueryClientProvider } from "../../../../.external/esm/@tanstack_react-query@5.77.2_react@18.3.1/@tanstack/react-query/build/modern/QueryClientProvider.mjs";
+import { QueryClient } from "../../../../.external/esm/@tanstack_query-core@5.80.6/@tanstack/query-core/build/modern/queryClient.mjs";
+import { QueryClientProvider } from "../../../../.external/esm/@tanstack_react-query@5.80.6_react@18.3.1/@tanstack/react-query/build/modern/QueryClientProvider.mjs";
 import { useState } from "react";
 import { useFabProvideAuth } from "../../fab-react-toolkit-patch/auth/hooks/useProvideAuth.mjs";
 import { useFabProvideInfo } from "../../fab-react-toolkit-patch/auth/hooks/useProvideInfo.mjs";
@@ -31,7 +31,7 @@ function InnerProvider(props) {
   return /* @__PURE__ */ jsx(AuthContext.Provider, { value: authProxy, children: /* @__PURE__ */ jsx(InfoContext.Provider, { value: infoProxy, children }) });
 }
 const Provider = (props) => {
-  const [queryClient] = useState(() => new QueryClient());
+  const [queryClient] = useState(() => new QueryClient(props.queryClientProps));
   return /* @__PURE__ */ jsx(QueryClientProvider, { client: queryClient, children: /* @__PURE__ */ jsx(InnerProvider, { ...props }) });
 };
 export {

package/dist/core/esm/Wrappers/Provider/hooks/useProvideAuth.mjs

@@ -1,5 +1,5 @@
-import { useQuery } from "../../../../../.external/esm/@tanstack_react-query@5.77.2_react@18.3.1/@tanstack/react-query/build/modern/useQuery.mjs";
-import { useQueryClient } from "../../../../../.external/esm/@tanstack_react-query@5.77.2_react@18.3.1/@tanstack/react-query/build/modern/QueryClientProvider.mjs";
+import { useQuery } from "../../../../../.external/esm/@tanstack_react-query@5.80.6_react@18.3.1/@tanstack/react-query/build/modern/useQuery.mjs";
+import { useQueryClient } from "../../../../../.external/esm/@tanstack_react-query@5.80.6_react@18.3.1/@tanstack/react-query/build/modern/QueryClientProvider.mjs";
 import { useState, useCallback } from "react";
 import { authSignin, authSignout, authResetPassword, authOAuthSignin } from "../utils/authFetch.mjs";
 import { getUser, updateUser } from "../utils/userCRUD.mjs";

package/dist/core/esm/Wrappers/Provider/hooks/useProvideInfo.mjs

@@ -1,4 +1,4 @@
-import { useQuery } from "../../../../../.external/esm/@tanstack_react-query@5.77.2_react@18.3.1/@tanstack/react-query/build/modern/useQuery.mjs";
+import { useQuery } from "../../../../../.external/esm/@tanstack_react-query@5.80.6_react@18.3.1/@tanstack/react-query/build/modern/useQuery.mjs";
 import { useEffect } from "react";
 import { authInfo } from "../utils/authFetch.mjs";
 function useProvideInfo(baseUrl, auth) {