fastapi-rtk 2.1.5 → 2.2.0

package/dist/core/esm/ActionIcons/utils/BaseActionIcon.mjs

@@ -2,8 +2,9 @@ import { jsx } from "react/jsx-runtime";
 import { useActionIcon } from "fastapi-rtk/hooks";
 import { ThemeIcon, Loader, Tooltip, ActionIcon } from "@mantine/core";
 import { memo } from "react";
-const BaseActionIcon = memo(({ Icon, label, tooltipProps, iconProps, loading, ...props }) => {
-  const actionIconProps = useActionIcon(props);
+const BaseActionIcon = memo((props) => {
+  const { Icon, label, tooltipProps, iconProps, loading, ...rest } = props;
+  const actionIconProps = useActionIcon(rest);
   if (loading) {
     return /* @__PURE__ */ jsx(ThemeIcon, { variant: "transparent", size: actionIconProps.size, c: actionIconProps.c, children: /* @__PURE__ */ jsx(Loader, { size: "100%", color: actionIconProps.c }) });
   }

package/dist/core/esm/ActionIcons/utils/convertToFormInputs.mjs

@@ -2,16 +2,17 @@ import { isSchemaTypeInclude } from "fastapi-rtk/.bundled-jsonforms";
 import { getItemId } from "fastapi-rtk/utils";
 function convertToFormInputs(item, schema) {
   const result = {};
-  Object.entries(schema.properties || {}).forEach(([key, value]) => {
+  Object.entries(schema.properties ?? {}).forEach(([key, value]) => {
     var _a;
-    const schemaOptions = value.items ? value.items : value;
-    const options = schemaOptions.oneOf ? schemaOptions.oneOf.map((option) => option.const) : schemaOptions.enum;
+    const itemsSchema = value.items && !Array.isArray(value.items) ? value.items : void 0;
+    const schemaOptions = itemsSchema ?? value;
+    const options = schemaOptions.oneOf ? schemaOptions.oneOf.map((option) => String(option.const)) : (_a = schemaOptions.enum) == null ? void 0 : _a.map((option) => String(option));
     if (options) {
-      if (isSchemaTypeInclude(value.type, "array") && Array.isArray(item[key])) {
-        const existingValues = ((_a = item[key]) == null ? void 0 : _a.map((item2) => String(getItemId(item2) ?? item2))) || [];
-        result[key] = options.filter((val) => existingValues.includes(val));
+      if (isSchemaTypeInclude(value.type ?? "", "array") && Array.isArray(item[key])) {
+        const existingValues = item[key].map((entry) => String(getItemId(entry) ?? entry));
+        result[key] = options.filter((option) => existingValues.includes(option));
       } else {
-        result[key] = options.find((val) => val === String(getItemId(item[key]) ?? item[key]));
+        result[key] = options.find((option) => option === String(getItemId(item[key]) ?? item[key]));
       }
     } else {
       result[key] = getItemId(item[key]) ?? item[key] ?? void 0;

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

@@ -7,30 +7,38 @@ import { useForm } from "@mantine/form";
 import { useDebouncedState } from "@mantine/hooks";
 import { yupResolver } from "../../../.external/esm/mantine-form-yup-resolver@2.0.0_@mantine_form@9.1.0_react@19.2.3__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 { useApi, useTranslation } from "fastapi-rtk/contexts";
 import { useForms } from "../hooks/api/useForms.mjs";
 import { useInfo } from "../hooks/auth/useInfo.mjs";
-import "../Wrappers/Provider/Contexts/LangContext.mjs";
 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.8.0_typescript@5.9.3__react-dom@19.2.3_react@19.2.3__react@19.2.3_typescript@5.9.3/react-i18next/dist/es/useTranslation.mjs";
-function AddDialog({
-  jsonForms: __jsonForms,
-  onSuccess,
-  onError,
-  translations,
-  hideWarnings,
-  jsonFormsProps,
-  ...props
-}) {
+function AddDialog(props) {
   var _a;
-  const { info, refetch, refetchInfo, addEntry, setError, resetError } = useApi();
+  const {
+    jsonForms: __jsonForms,
+    onSuccess,
+    onError,
+    closeOnSuccess,
+    closeOnError,
+    translations,
+    hideWarnings,
+    jsonFormsProps,
+    ...rest
+  } = props;
+  const { info: _info, refetch, refetchInfo, addEntry, setError, resetError } = useApi();
+  const info = _info;
   const { t } = useTranslation();
   const { opened, setOpened, state, getState, setState, reset, view, setView } = useForms("add");
   const [loading, setLoading] = useDebouncedState(false, DEBOUNCE_LOADING_DELAY);
-  const { jsonForms: _jsonForms } = useProps("AddDialog", {}, {});
+  const {
+    jsonForms: _jsonForms,
+    closeOnSuccess: _closeOnSuccess = true,
+    closeOnError: _closeOnError = true
+  } = useProps("AddDialog", {}, {});
+  const shouldCloseOnSuccess = closeOnSuccess ?? _closeOnSuccess;
+  const shouldCloseOnError = closeOnError ?? _closeOnError;
   const jsonForms = useMemo(() => deepMerge(_jsonForms, __jsonForms), [_jsonForms, __jsonForms]);
   const mergedTranslations = useMemo(
     () => (info == null ? void 0 : info.add_translations) ?? translations ? deepMerge(info.add_translations, translations) : void 0,
@@ -45,25 +53,50 @@ function AddDialog({
         onSuccess == null ? void 0 : onSuccess(res);
         refetch();
         refetchInfo();
+        if (shouldCloseOnSuccess) {
+          setOpened(false);
+        } else {
+          reset();
+        }
       }).catch((error) => {
         setError({ message: "Could not add item", originalError: error });
         onError == null ? void 0 : onError(error);
+        if (shouldCloseOnError) {
+          setOpened(false);
+        }
       }).finally(() => {
         setLoading(false);
-        setOpened(false);
       });
     },
-    [addEntry, getState, onError, onSuccess, refetch, refetchInfo, resetError, setError, setLoading, setOpened]
+    [
+      addEntry,
+      getState,
+      onError,
+      onSuccess,
+      refetch,
+      refetchInfo,
+      resetError,
+      setError,
+      setLoading,
+      setOpened,
+      shouldCloseOnSuccess,
+      shouldCloseOnError,
+      reset
+    ]
   );
   const { fab } = useInfo();
-  const form = useForm({ initialValues: info.add.defaultValues, validate: yupResolver(info.add.schema) });
+  const form = useForm({
+    initialValues: info.add.defaultValues,
+    // #MUSTASSERT info.add.schema is a runtime yup schema object that the /_info JSON type cannot express
+    validate: yupResolver(info.add.schema)
+  });
   const onSubmitFunc = fab ? form.onSubmit((values, e) => {
     setState({ data: values });
     onSubmit(e);
   }) : onSubmit;
   useEffect(() => {
     if (JSON.stringify(state.data) !== JSON.stringify(form.getValues())) {
-      form.setValues(state.data);
+      form.setValues(state.data ?? {});
     }
   }, [state.data]);
   return /* @__PURE__ */ jsx(
@@ -80,8 +113,8 @@ function AddDialog({
       onExitTransitionEnd: reset,
       ...view === VIEW_MODE.OVERLAY ? overlayProps : {},
       ...view === VIEW_MODE.NORMAL ? normalProps : {},
-      ...props,
-      title: props.title ?? (info == null ? void 0 : info.add_title),
+      ...rest,
+      title: rest.title ?? (info == null ? void 0 : info.add_title),
       children: fab ? (
         //* Backward compatibility to fab-react-toolkit
         /* @__PURE__ */ jsx(Stack, { gap: "xs", children: (_a = info.add.columns) == null ? void 0 : _a.map((item, index) => /* @__PURE__ */ jsx(
@@ -89,10 +122,8 @@ function AddDialog({
           {
             form,
             name: item.name,
-            label: item.label,
-            description: item.description,
             schema: item,
-            withAsterisk: item.required
+            ...{ label: item.label, description: item.description, withAsterisk: item.required }
           },
           index
         )) })

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

@@ -5,11 +5,10 @@ import { useDebouncedState } from "@mantine/hooks";
 import { useCallback } from "react";
 import { CommonModal } from "../Modals/CommonModal.mjs";
 import { overlayProps } from "../Modals/overlayProps.mjs";
-import { useApi } from "../hooks/api/useApi.mjs";
+import { useApi, useTranslation } from "fastapi-rtk/contexts";
 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.8.0_typescript@5.9.3__react-dom@19.2.3_react@19.2.3__react@19.2.3_typescript@5.9.3/react-i18next/dist/es/useTranslation.mjs";
-const DeleteDialog = ({ deleteText, onSuccess, onError, ...props }) => {
+const DeleteDialog = (props) => {
+  const { deleteText, onSuccess, onError, ...rest } = props;
   const { refetch, refetchInfo, deleteEntry, setError, resetError } = useApi();
   const { t } = useTranslation();
   const { opened, setOpened, getItem, reset, view, setView } = useForms("delete");
@@ -23,6 +22,11 @@ const DeleteDialog = ({ deleteText, onSuccess, onError, ...props }) => {
       setLoading(true);
       resetError();
       const id = getItem();
+      if (!id) {
+        setError({ message: "No item selected for deletion", data: { id }, originalError: new Error("No ID") });
+        setLoading(false);
+        return;
+      }
       deleteEntry(id).then((res) => {
         onSuccess == null ? void 0 : onSuccess(res);
         refetch();
@@ -54,8 +58,8 @@ const DeleteDialog = ({ deleteText, onSuccess, onError, ...props }) => {
       onClose: () => setOpened(false),
       onExitTransitionEnd: reset,
       ...view === VIEW_MODE.OVERLAY ? overlayProps : {},
-      ...props,
-      title: props.title ?? t("Delete Item?"),
+      ...rest,
+      title: rest.title ?? t("Delete Item?"),
       children: deleteText ?? /* @__PURE__ */ jsx(Text, { children: t("Are you sure you want to delete this item?") })
     }
   );

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

@@ -10,30 +10,38 @@ import { yupResolver } from "../../../.external/esm/mantine-form-yup-resolver@2.
 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";
-import { useApi } from "../hooks/api/useApi.mjs";
+import { useApi, useTranslation } from "fastapi-rtk/contexts";
 import { useForms } from "../hooks/api/useForms.mjs";
 import { useInfo } from "../hooks/auth/useInfo.mjs";
-import "../Wrappers/Provider/Contexts/LangContext.mjs";
 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.8.0_typescript@5.9.3__react-dom@19.2.3_react@19.2.3__react@19.2.3_typescript@5.9.3/react-i18next/dist/es/useTranslation.mjs";
-function EditDialog({
-  jsonForms: __jsonForms,
-  onSuccess,
-  onError,
-  translations,
-  hideWarnings,
-  jsonFormsProps,
-  ...props
-}) {
+function EditDialog(props) {
   var _a;
-  const { info, refetch, refetchInfo, updateEntry, setError, resetError } = useApi();
+  const {
+    jsonForms: __jsonForms,
+    onSuccess,
+    onError,
+    closeOnSuccess,
+    closeOnError,
+    translations,
+    hideWarnings,
+    jsonFormsProps,
+    ...rest
+  } = props;
+  const { info: _info, refetch, refetchInfo, updateEntry, setError, resetError } = useApi();
+  const info = _info;
   const { t } = useTranslation();
   const { opened, setOpened, item, getItem, state, getState, setState, reset, view, setView } = useForms("edit");
   const [loading, setLoading] = useDebouncedState(false, DEBOUNCE_LOADING_DELAY);
-  const { jsonForms: _jsonForms } = useProps("EditDialog", {}, {});
+  const {
+    jsonForms: _jsonForms,
+    closeOnSuccess: _closeOnSuccess = true,
+    closeOnError: _closeOnError = true
+  } = useProps("EditDialog", {}, {});
+  const shouldCloseOnSuccess = closeOnSuccess ?? _closeOnSuccess;
+  const shouldCloseOnError = closeOnError ?? _closeOnError;
   const jsonForms = useMemo(
     () => deepMerge({ __: { setNull: true } }, _jsonForms, __jsonForms),
     [_jsonForms, __jsonForms]
@@ -60,24 +68,39 @@ function EditDialog({
       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])) {
+      const new_data = Object.entries(getState().data).reduce(
+        (acc, [key, value]) => {
+          if (lodashExports.isEqual(value, initialStateRef.current.data[key])) {
+            return acc;
+          }
+          acc[key] = value;
           return acc;
-        }
-        acc[key] = value;
-        return acc;
-      }, {});
+        },
+        {}
+      );
       const id = getItemId(getItem());
+      if (!id) {
+        setError({ message: "No item selected for update", data: { id }, originalError: new Error("No ID") });
+        setLoading(false);
+        return;
+      }
       updateEntry(id, new_data).then((res) => {
         onSuccess == null ? void 0 : onSuccess(res);
         refetch();
         refetchInfo();
+        if (shouldCloseOnSuccess) {
+          setOpened(false);
+        } else {
+          initialStateRef.current = { ...initialStateRef.current, data: { ...getState().data } };
+        }
       }).catch((error) => {
         setError({ message: "Could not update item with id {{id}}", data: { id }, originalError: error });
         onError == null ? void 0 : onError(error);
+        if (shouldCloseOnError) {
+          setOpened(false);
+        }
       }).finally(() => {
         setLoading(false);
-        setOpened(false);
       });
     },
     [
@@ -91,17 +114,23 @@ function EditDialog({
       refetch,
       refetchInfo,
       setError,
-      setOpened
+      setOpened,
+      shouldCloseOnSuccess,
+      shouldCloseOnError
     ]
   );
-  const form = useForm({ initialValues: info.edit.defaultValues, validate: yupResolver(info.edit.schema) });
+  const form = useForm({
+    initialValues: info.edit.defaultValues,
+    // #MUSTASSERT info.edit.schema is a runtime yup schema object that the /_info JSON type cannot express
+    validate: yupResolver(info.edit.schema)
+  });
   const onSubmitFunc = fab ? form.onSubmit((values, e) => {
     setState({ data: values });
     onSubmit(e);
   }) : onSubmit;
   useEffect(() => {
     if (JSON.stringify(state.data) !== JSON.stringify(form.getValues())) {
-      form.setValues(state.data);
+      form.setValues(state.data ?? {});
     }
   }, [state.data]);
   return /* @__PURE__ */ jsx(
@@ -118,8 +147,8 @@ function EditDialog({
       onExitTransitionEnd: reset,
       ...view === VIEW_MODE.OVERLAY ? overlayProps : {},
       ...view === VIEW_MODE.NORMAL ? normalProps : {},
-      ...props,
-      title: props.title ?? (info == null ? void 0 : info.edit_title),
+      ...rest,
+      title: rest.title ?? (info == null ? void 0 : info.edit_title),
       children: fab ? (
         //* Backward compatibility to fab-react-toolkit
         /* @__PURE__ */ jsx(Stack, { gap: "xs", children: (_a = info.edit.columns) == null ? void 0 : _a.map((item2, index) => /* @__PURE__ */ jsx(
@@ -127,10 +156,8 @@ function EditDialog({
           {
             form,
             name: item2.name,
-            label: item2.label,
-            description: item2.description,
             schema: item2,
-            withAsterisk: item2.required
+            ...{ label: item2.label, description: item2.description, withAsterisk: item2.required }
           },
           index
         )) })

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

@@ -7,7 +7,8 @@ import { useForms } from "../hooks/api/useForms.mjs";
 import { CommonModal } from "../Modals/CommonModal.mjs";
 import { normalProps } from "../Modals/normalProps.mjs";
 import { overlayProps } from "../Modals/overlayProps.mjs";
-function ViewDialog({ ...props }) {
+function ViewDialog(props) {
+  const { ...rest } = props;
   const { opened, setOpened, item, reset, view, setView } = useForms("view");
   return /* @__PURE__ */ jsx(
     CommonModal,
@@ -20,8 +21,8 @@ function ViewDialog({ ...props }) {
       onExitTransitionEnd: reset,
       ...view === VIEW_MODE.OVERLAY ? overlayProps : {},
       ...view === VIEW_MODE.NORMAL ? normalProps : {},
-      ...props,
-      title: props.title ?? `${item == null ? void 0 : item.show_title} (#${convertId(getItemId(item))})`,
+      ...rest,
+      title: rest.title ?? `${item == null ? void 0 : item.show_title} (#${convertId(getItemId(item))})`,
       children: /* @__PURE__ */ jsxs(Tabs, { defaultValue: "details", children: [
         /* @__PURE__ */ jsx(Tabs.List, { children: /* @__PURE__ */ jsx(Tabs.Tab, { value: "details", children: "Details" }) }),
         /* @__PURE__ */ jsx(Tabs.Panel, { value: "details", children: item && /* @__PURE__ */ jsx(
@@ -37,7 +38,8 @@ function ViewDialog({ ...props }) {
     }
   );
 }
-const TabsDisplay = ({ columns, data, label_columns, gridProps }) => {
+const TabsDisplay = (props) => {
+  const { columns, data, label_columns, gridProps } = props;
   return /* @__PURE__ */ jsx(Grid, { ...gridProps, children: columns.map((column) => /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(Grid.Col, { span: 3, children: /* @__PURE__ */ jsx(Text, { size: "md", children: label_columns[column] }) }),
     /* @__PURE__ */ jsx(Grid.Col, { span: 1, children: /* @__PURE__ */ jsx(Text, { size: "xs", children: ":" }) }),

package/dist/core/esm/Menu/UserMenu/UserMenu.mjs

@@ -10,7 +10,8 @@ import ForwardRef$5 from "../../_virtual/logout.mjs";
 import ForwardRef from "../../_virtual/users.mjs";
 import { useAuth } from "../../hooks/auth/useAuth.mjs";
 import classes from "./user.module.css.mjs";
-function UserMenu({ basePath = "/security", Target, children }) {
+function UserMenu(props) {
+  const { basePath = "/security", Target, children } = props;
   const navigate = useNavigate();
   const { user, signout } = useAuth();
   const [opened, setOpened] = useState(false);
@@ -32,19 +33,20 @@ function UserMenu({ basePath = "/security", Target, children }) {
     { resource_name: basePath + "/viewsmenus", label: "Views/Menus", name: "ViewsMenusApi", Icon: ForwardRef$3 }
   ];
   const availableRoutes = securityRoutes.filter((route) => user.permissions.includes(route.name));
+  const weightProp = { weight: 500 };
   return /* @__PURE__ */ jsxs(
     Menu,
     {
       width: 260,
       position: "bottom-end",
-      transition: "pop-top-right",
+      ...{ transition: "pop-top-right" },
       withinPortal: true,
       opened,
       onClose: () => setOpened(false),
       onOpen: () => setOpened(true),
       children: [
-        /* @__PURE__ */ jsx(Menu.Target, { children: Target || /* @__PURE__ */ jsx(UnstyledButton, { className: classes.btn, style: { borderRadius: 4 }, p: "xs", children: /* @__PURE__ */ jsxs(Group, { style: { flexWrap: "nowrap" }, spacing: 7, children: [
-          /* @__PURE__ */ jsx(Text, { weight: 500, size: "sm", style: { lineHeight: 1, whiteSpace: "nowrap" }, mr: 3, children: `${user.first_name} ${user.last_name}` }),
+        /* @__PURE__ */ jsx(Menu.Target, { children: Target || /* @__PURE__ */ jsx(UnstyledButton, { className: classes.btn, style: { borderRadius: 4 }, p: "xs", children: /* @__PURE__ */ jsxs(Group, { style: { flexWrap: "nowrap" }, ...{ spacing: 7 }, children: [
+          /* @__PURE__ */ jsx(Text, { size: "sm", style: { lineHeight: 1, whiteSpace: "nowrap" }, mr: 3, ...weightProp, children: `${user.first_name} ${user.last_name}` }),
           /* @__PURE__ */ jsx(ForwardRef$4, { style: { height: 12, width: 12 } })
         ] }) }) }),
         /* @__PURE__ */ jsxs(Menu.Dropdown, { children: [

package/dist/core/esm/Menu/UserMenu/user.module.css.mjs

@@ -1,5 +1,5 @@
-const iconSmall = "_iconSmall_sxv3z_1";
-const btn = "_btn_sxv3z_17";
+const iconSmall = "_iconSmall_v0sfh_1";
+const btn = "_btn_v0sfh_17";
 const classes = {
   iconSmall,
   btn

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

@@ -7,24 +7,24 @@ import ForwardRef$3 from "../_virtual/minimize.mjs";
 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.8.0_typescript@5.9.3__react-dom@19.2.3_react@19.2.3__react@19.2.3_typescript@5.9.3/react-i18next/dist/es/useTranslation.mjs";
-function CommonModal({
-  children,
-  view,
-  setView,
-  onReset,
-  onSubmit,
-  boxProps,
-  resetButtonText,
-  buttonText,
-  buttonLoading,
-  withTitleOptions = true,
-  withButtons = true,
-  titleOptions,
-  actionButtons,
-  ...props
-}) {
+import { useTranslation } from "fastapi-rtk/contexts";
+function CommonModal(props) {
+  const {
+    children,
+    view,
+    setView,
+    onReset,
+    onSubmit,
+    boxProps,
+    resetButtonText,
+    buttonText,
+    buttonLoading,
+    withTitleOptions = true,
+    withButtons = true,
+    titleOptions,
+    actionButtons,
+    ...rest
+  } = props;
   const { fab } = useInfo();
   const { t } = useTranslation();
   return /* @__PURE__ */ jsx(
@@ -35,9 +35,9 @@ function CommonModal({
       fullScreen: view === VIEW_MODE.FULL_SCREEN,
       radius: view !== VIEW_MODE.NORMAL ? 0 : void 0,
       transitionProps: view !== VIEW_MODE.NORMAL ? { transition: "fade", duration: 200 } : void 0,
-      ...props,
+      ...rest,
       title: /* @__PURE__ */ jsxs(Fragment, { children: [
-        props.title,
+        rest.title,
         !fab && withTitleOptions && //* Backward compatibility to fab-react-toolkit
         /* @__PURE__ */ jsxs(Group, { gap: "xs", pr: "xs", children: [
           parseFromValuesOrFunc(titleOptions == null ? void 0 : titleOptions.left, { view, setView }),
@@ -101,7 +101,7 @@ function CommonModal({
         ] })
       ] }),
       classNames: { content: "mrt-table-container" },
-      styles: deepMerge(props.styles, {
+      styles: deepMerge(rest.styles, {
         title: { width: "100%", display: "flex", alignItems: "center", justifyContent: "space-between" }
       }),
       children: /* @__PURE__ */ jsxs(

package/dist/core/esm/Selectors/LanguageSelector.mjs

@@ -1,10 +1,19 @@
 import { jsx } from "react/jsx-runtime";
 import { BASE_LANGUAGES } from "fastapi-rtk/constants";
 import { Select } from "@mantine/core";
-import { useLang } from "../hooks/lang/useLang.mjs";
+import { useLang } from "fastapi-rtk/contexts";
 const LanguageSelector = (props) => {
   const { currentLanguage, setLanguage } = useLang();
-  return /* @__PURE__ */ jsx(Select, { data: BASE_LANGUAGES, value: currentLanguage, allowDeselect: false, onChange: setLanguage, ...props });
+  return /* @__PURE__ */ jsx(
+    Select,
+    {
+      data: BASE_LANGUAGES,
+      value: currentLanguage,
+      allowDeselect: false,
+      onChange: setLanguage,
+      ...props
+    }
+  );
 };
 export {
   LanguageSelector

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

@@ -6,7 +6,7 @@ import { DeleteDialog } from "../../Dialogs/DeleteDialog.mjs";
 import { EditDialog } from "../../Dialogs/EditDialog.mjs";
 import { ViewDialog } from "../../Dialogs/ViewDialog.mjs";
 import { LazyLoadWrapper } from "../../Wrappers/LazyLoadWrapper/LazyLoadWrapper.mjs";
-import { useApi } from "../../hooks/api/useApi.mjs";
+import { useApi } from "fastapi-rtk/contexts";
 import { useForms } from "../../hooks/api/useForms.mjs";
 import { ErrorDialog } from "./ErrorDialog.mjs";
 import { Main } from "./Main/Main.mjs";

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

@@ -2,11 +2,10 @@ import { jsx, jsxs } from "react/jsx-runtime";
 import { Modal, Group, Text, List, Grid, Card } from "@mantine/core";
 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.8.0_typescript@5.9.3__react-dom@19.2.3_react@19.2.3__react@19.2.3_typescript@5.9.3/react-i18next/dist/es/useTranslation.mjs";
+import { useApi, useTranslation } from "fastapi-rtk/contexts";
 const isObject = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
-const MessageRenderer = ({ message }) => {
+const MessageRenderer = (props) => {
+  const { message } = props;
   const { t } = useTranslation();
   if (Array.isArray(message)) {
     return /* @__PURE__ */ jsx(List, { size: "sm", children: message.map((item, index) => /* @__PURE__ */ jsx(List.Item, { children: /* @__PURE__ */ jsx(MessageRenderer, { message: item }) }, index)) });
@@ -24,7 +23,7 @@ const MessageRenderer = ({ message }) => {
       ] }, key);
     }) });
   }
-  return /* @__PURE__ */ jsx(Text, { size: "sm", children: t(message) });
+  return /* @__PURE__ */ jsx(Text, { size: "sm", children: t(String(message)) });
 };
 function ErrorDialog() {
   var _a;
@@ -46,7 +45,7 @@ function ErrorDialog() {
   return /* @__PURE__ */ jsx(
     Modal,
     {
-      opened: error,
+      opened: !!error,
       onClose: resetError,
       size: isObject(parsedOriginalErrorMsg) ? "xl" : void 0,
       centered: true,

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

@@ -7,7 +7,8 @@ import { FormRelatedListSelect } from "./Inputs/FormRelatedListSelect.mjs";
 import { FormRelatedSelect } from "./Inputs/FormRelatedSelect.mjs";
 import { FormSelect } from "./Inputs/FormSelect.mjs";
 import { FormTextField } from "./Inputs/FormTextField.mjs";
-function FormField({ form, name, schema, filter, withinPortal = true, ...props }) {
+function FormField(props) {
+  const { form, name, schema, filter, withinPortal = true, ...rest } = props;
   if (!schema.type) {
     return null;
   }
@@ -22,7 +23,7 @@ function FormField({ form, name, schema, filter, withinPortal = true, ...props }
             { label: "true", value: filter ? "1" : "true" },
             { label: "false", value: filter ? "0" : "false" }
           ],
-          ...props
+          ...rest
         }
       );
     case "RelatedList":
@@ -33,7 +34,7 @@ function FormField({ form, name, schema, filter, withinPortal = true, ...props }
           name,
           items: schema.values,
           comboboxProps: { withinPortal },
-          ...props
+          ...rest
         }
       );
     case "Related":
@@ -45,7 +46,7 @@ function FormField({ form, name, schema, filter, withinPortal = true, ...props }
           items: schema.values,
           filter,
           comboboxProps: { withinPortal },
-          ...props
+          ...rest
         }
       );
     case "DateTime":
@@ -57,7 +58,7 @@ function FormField({ form, name, schema, filter, withinPortal = true, ...props }
           valueFormat: "DD.MM.YYYY HH:mm:ss",
           schema,
           popoverProps: { withinPortal },
-          ...props
+          ...rest
         }
       );
     case "Date":
@@ -69,20 +70,29 @@ function FormField({ form, name, schema, filter, withinPortal = true, ...props }
           valueFormat: "DD.MM.YYYY",
           schema,
           popoverProps: { withinPortal },
-          ...props
+          ...rest
         }
       );
     case "Geometry":
-      return /* @__PURE__ */ jsx(FormGeometryField, { form, name, filter, ...props });
+      return /* @__PURE__ */ jsx(FormGeometryField, { form, name, filter, ...rest });
     case "Raw":
-      return /* @__PURE__ */ jsx(FormJsonField, { form, name, filter, ...props });
+      return /* @__PURE__ */ jsx(FormJsonField, { form, name, filter, ...rest });
     case "Integer":
     case "Float":
-      return /* @__PURE__ */ jsx(FormTextField, { form, name, ...props });
+      return /* @__PURE__ */ jsx(FormTextField, { form, name, ...rest });
     case "Enum":
-      return /* @__PURE__ */ jsx(FormSelect, { form, name, items: schema.values, comboboxProps: { withinPortal }, ...props });
+      return /* @__PURE__ */ jsx(
+        FormSelect,
+        {
+          form,
+          name,
+          items: schema.values,
+          comboboxProps: { withinPortal },
+          ...rest
+        }
+      );
     default:
-      return /* @__PURE__ */ jsx(FormTextField, { form, name, ...props });
+      return /* @__PURE__ */ jsx(FormTextField, { form, name, ...rest });
   }
 }
 export {

package/dist/core/esm/Tables/DataGrid/FormField/Inputs/FormDatePicker.mjs

@@ -1,7 +1,8 @@
 import { jsx, Fragment } from "react/jsx-runtime";
 import { DateInput } from "@mantine/dates";
-function FormDatePicker({ form, name, ...props }) {
-  return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(DateInput, { ...form.getInputProps(name), ...props }) });
+function FormDatePicker(props) {
+  const { form, name, ...rest } = props;
+  return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(DateInput, { ...form.getInputProps(name), ...rest }) });
 }
 export {
   FormDatePicker