fastapi-rtk 2.1.5 → 2.2.0

package/dist/contexts/lib/ApiContext/types.d.ts

@@ -0,0 +1,166 @@
+import { BaseResponseMany, BaseResponseSingle, ColumnFilterOperator, ColumnInfo, ColumnRelationInfo, ConvertedInfo, FilterInfo, InfoResponse, JsonSchema, Layout, PrimaryKey, QueryFilter, QueryParams } from 'fastapi-rtk/api-types';
+import { InfiniteData, UseInfiniteQueryResult, UseQueryResult } from '@tanstack/react-query';
+import { Schema as ValidationSchema } from '../../../.external/lib/yup';
+/** A non-null CRUD result row, mirroring the unwrapped `BaseResponseSingle.result`. */
+type EntryRow = NonNullable<BaseResponseSingle['result']>;
+export type APIColumnInfo = ColumnInfo;
+export type APIColumnRelationInfo = ColumnRelationInfo;
+export type APIColumnFilter = ColumnFilterOperator;
+export type APIFilter = FilterInfo;
+/** The backend `/_info` add/edit schema is a JsonForms JSON Schema. */
+export type APIJSONFormsSchema = JsonSchema;
+/** The backend `/_info` add/edit UI schema is a JsonForms layout. */
+export type APIJSONFormsUISchema = Layout;
+export type APIInfo = InfoResponse;
+/** A query filter (`QueryFilter`) plus the per-column grid-tracking `id` set by the grid UI (absent on the wire). */
+export interface APIQueryParamsFilter extends QueryFilter {
+    /** Per-column grid-tracking id; set by the grid UI, absent on the wire. */
+    id?: string;
+}
+/** A column-less query filter (operator + value); mirrors `Omit<QueryFilter, 'col'>`. */
+export type APIQueryParamsOprFilter = Omit<QueryFilter, 'col'>;
+/**
+ * The resolved query state held by the `ApiProvider`. Derived from the wire-bound `QueryParams`
+ * bag: `page` / `page_size` / `columns` / `filters` are always present (vs. all-optional on the
+ * patch bag), `order_column` / `order_direction` drop the `| null` the wire allows, `filters`
+ * carry the grid-tracking `id`, and the download / streaming keys are excluded.
+ */
+export type APIQueryParams = Required<Pick<QueryParams, 'page' | 'page_size' | 'columns'>> & Pick<QueryParams, 'global_filter' | 'with_count'> & {
+    /** The column name to order the results by. */
+    order_column?: string;
+    /** The direction of the order ('asc' or 'desc'). */
+    order_direction?: 'asc' | 'desc';
+    /** An array of filters to apply to the query. */
+    filters: APIQueryParamsFilter[];
+    /** An array of opr filters to apply to the query. */
+    opr_filters?: APIQueryParamsOprFilter[];
+};
+/**
+ * The resolved list data held by the `ApiProvider`. The client-side counterpart of the wire
+ * `BaseResponseMany`: `count` / `result` are guaranteed non-null after a successful fetch, and
+ * `path` / `queryParams` (the resolved `APIQueryParams`) are always present.
+ */
+export interface APIData extends Omit<BaseResponseMany, 'count' | 'result'> {
+    /** The total count of items existing in the database for the given query parameters. */
+    count: number;
+    /** An array of objects representing the API response data. */
+    result: EntryRow[];
+    /** The API path. */
+    path: string;
+    /** The query parameters used in the API request. */
+    queryParams: APIQueryParams;
+}
+export interface APISpecialKey {
+    /** The key to be used when retrieving general props for `NextGenDataGrid`. Typically `all`, but can be `_all` if `all` is in the list of columns. */
+    all: string;
+    /** The key to be used when retrieving actions for `NextGenDataGrid`. Typically `actions`, but can be `_actions` if `actions` is in the list of columns. */
+    actions: string;
+}
+export interface APIStreaming {
+    /** The streaming data, organized by the page number. */
+    data: {
+        [pageNumber: string]: EntryRow[];
+    };
+    /** Indicates whether the streaming has ended. */
+    isEnd: boolean;
+    /** A function to fetch the next page of streaming data. */
+    fetch: () => Promise<any>;
+    /** A function to reset the streaming data and start over. */
+    reset: () => Promise<any>;
+}
+export interface APIDownloadOptions {
+    /** Whether to export the data in basic or detailed mode. */
+    export_mode?: 'basic' | 'detailed';
+    /** The delimiter to use in the exported file (e.g., ',', ';'). Default is `,`. */
+    delimiter?: string;
+    /** The character to use for quoting in the exported file. Default is `"`. */
+    quotechar?: string;
+}
+export interface APIUploadOptions {
+    /** The delimiter used in the uploaded file (e.g., ',', ';'). Default is `,`. */
+    delimiter?: string;
+    /** The character used for quoting in the uploaded file. Default is `"`. */
+    quotechar?: string;
+}
+export interface APIError {
+    message: string;
+    originalError: Error;
+}
+export interface APISetErrorPayload {
+    message: string;
+    originalError: Error;
+    data?: EntryRow;
+}
+/**
+ * `APIInfo` augmented with the normalized add/edit form blocks produced by
+ * `convertInfo` (in core's ApiProvider) — `defaultValues`, the yup validation
+ * schema, and the column list per form. Carried as the live shape of
+ * `useApi().info` so consumers read `info.add.schema` / `info.edit.defaultValues`
+ * without casting.
+ */
+export type APIInfoCanonical = ConvertedInfo<ValidationSchema> & {
+    path?: string;
+};
+export interface ApiContextValue {
+    /** The API path. */
+    path: string;
+    /** Information about the API, including schemas, UI schemas, and the normalized add/edit form blocks. */
+    info?: APIInfoCanonical;
+    /** The data returned by the API. */
+    data?: APIData;
+    /** The query parameters used in the API request. */
+    queryParams?: APIQueryParams;
+    /** Indicates whether the API request is currently loading. */
+    loading: boolean;
+    /** Indicates whether the API info request is currently loading. */
+    infoLoading: boolean;
+    /** Indicates whether the API data request is currently loading. */
+    dataLoading: boolean;
+    /** An error object if the API request failed. */
+    error?: APIError;
+    /** An error object if the API info request failed. */
+    infoError?: Error;
+    /** An error object if the API data request failed. */
+    dataError?: Error;
+    /** The raw React Query object for the info request. */
+    infoQuery: UseQueryResult<APIInfoCanonical | undefined>;
+    /** The raw React Query object for the data request. */
+    dataQuery: UseQueryResult<APIData | null>;
+    /** The raw React Query infinite query object for streaming requests. */
+    streamingQuery: UseInfiniteQueryResult<InfiniteData<APIData | null>>;
+    /** An object containing streaming data and a function to fetch more data. Only available when the `ApiProvider` is configured for streaming. */
+    streaming: APIStreaming;
+    /** An object containing special keys for the API query, such as 'all' and 'actions'. */
+    specialKey: APISpecialKey;
+    /** A function to update the query parameters. */
+    setQueryParams: (partialQueryParams: Partial<APIQueryParams> | ((prev: APIQueryParams) => Partial<APIQueryParams>)) => void;
+    /** A function to refetch the data from the API. */
+    refetch: (options?: {
+        force?: boolean;
+    }) => Promise<void>;
+    /** A function to refetch the API information. */
+    refetchInfo: (options?: {
+        force?: boolean;
+    }) => Promise<void>;
+    /** A function to retrieve a specific entry by ID. */
+    getEntry: (id: PrimaryKey) => Promise<EntryRow>;
+    /** A function to add a new entry to the API. */
+    addEntry: (item: EntryRow) => Promise<EntryRow>;
+    /** A function to edit an existing entry in the API. */
+    updateEntry: (id: PrimaryKey, item: EntryRow) => Promise<EntryRow>;
+    /** A function to delete an entry from the API. */
+    deleteEntry: (id: PrimaryKey) => Promise<EntryRow>;
+    /** A function to download data from the API. */
+    download: (label?: string, options?: APIDownloadOptions) => Promise<void>;
+    /** A function to upload a file to the API. */
+    upload: (file: File, options?: APIUploadOptions) => Promise<EntryRow>;
+    /** A function to get the URL for a file item (file name or File object). */
+    getFileURL: (item: string | File) => string;
+    /** A function to get the URL for an image item (image name or File object). */
+    getImageURL: (item: string | File) => string;
+    /** A function to set the error state, surfacing errors thrown by the action functions (`addEntry`, `updateEntry`, ...) through the shared `ErrorDialog`. */
+    setError: (error: APISetErrorPayload | undefined) => void;
+    /** A function to reset the error state. */
+    resetError: () => void;
+}
+export {};

package/dist/contexts/lib/LangContext/LangContext.d.ts

@@ -0,0 +1,12 @@
+import { SafeContextOptions } from 'fastapi-rtk/utils';
+import { useTranslation } from '../../../.external/lib/react-i18next';
+import { LangContextValue } from './types';
+export declare const InnerInnerLangContextProvider: import('react').Provider<LangContextValue | null>, useLangProvider: (options?: SafeContextOptions<LangContextValue>) => LangContextValue;
+/**
+ * Access the language context.
+ *
+ * @param options - Options for the context hook.
+ * @returns The language context object.
+ */
+export declare const useLang: (options?: SafeContextOptions<LangContextValue>) => LangContextValue;
+export { useTranslation };

package/dist/contexts/lib/LangContext/index.d.ts

@@ -0,0 +1,2 @@
+export * from './LangContext';
+export type * from './types';

package/dist/contexts/lib/LangContext/types.d.ts

@@ -0,0 +1,15 @@
+import { useTranslation } from '../../../.external/lib/react-i18next';
+export interface LangContextValue {
+    /** The current language code (e.g., 'en', 'de'). */
+    currentLanguage: string;
+    /** Function to change the current language. */
+    setLanguage: (lng: string) => void;
+    /** The translation object from `react-i18next`, same as calling `useTranslation`. */
+    translation: ReturnType<typeof useTranslation>;
+    /** `useTranslation` from `react-i18next`. */
+    useTranslation: typeof useTranslation;
+    /** The language code stored in local storage. */
+    localStorageLanguage: string;
+    /** Function to set the language code in local storage. */
+    setLocalStorageLanguage: (lng: string) => void;
+}

package/dist/contexts/lib/index.d.ts

@@ -0,0 +1,4 @@
+export * from './ApiContext';
+export * from './LangContext';
+export type * from './ApiContext/types';
+export type * from './LangContext/types';

package/dist/contexts/lib/index.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/core/cjs/ActionIcons/Actions.cjs

@@ -3,12 +3,13 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
 const core = require("@mantine/core");
 const React = require("react");
-const useApi = require("../hooks/api/useApi.cjs");
+const contexts = require("fastapi-rtk/contexts");
 const Delete = require("./Delete/Delete.cjs");
 const Edit = require("./Edit/Edit.cjs");
 const View = require("./View/View.cjs");
-const Actions = React.memo(({ id, viewProps, editProps, deleteProps }) => {
-  const { info } = useApi.useApi();
+const Actions = React.memo((props) => {
+  const { id, viewProps, editProps, deleteProps } = props;
+  const { info } = contexts.useApi();
   return /* @__PURE__ */ jsxRuntime.jsxs(
     core.Flex,
     {

package/dist/core/cjs/ActionIcons/Add/Add.cjs

@@ -4,11 +4,10 @@ const jsxRuntime = require("react/jsx-runtime");
 const React = require("react");
 const plus = require("../../_virtual/plus.cjs");
 const useForms = require("../../hooks/api/useForms.cjs");
-require("../../Wrappers/Provider/Contexts/LangContext.cjs");
+const contexts = require("fastapi-rtk/contexts");
 const BaseActionIcon = require("../utils/BaseActionIcon.cjs");
-const useTranslation = require("../../../../.external/cjs/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.cjs");
 const Add = React.memo((props) => {
-  const { t } = useTranslation.useTranslation();
+  const { t } = contexts.useTranslation();
   const { setOpened } = useForms.useForms("add");
   return /* @__PURE__ */ jsxRuntime.jsx(BaseActionIcon.BaseActionIcon, { Icon: plus, label: t("Add Item"), onClick: () => setOpened(true), ...props });
 });

package/dist/core/cjs/ActionIcons/Delete/Delete.cjs

@@ -4,11 +4,11 @@ const jsxRuntime = require("react/jsx-runtime");
 const React = require("react");
 const trash = require("../../_virtual/trash.cjs");
 const useForms = require("../../hooks/api/useForms.cjs");
-require("../../Wrappers/Provider/Contexts/LangContext.cjs");
+const contexts = require("fastapi-rtk/contexts");
 const BaseActionIcon = require("../utils/BaseActionIcon.cjs");
-const useTranslation = require("../../../../.external/cjs/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.cjs");
-const Delete = React.memo(({ id, ...props }) => {
-  const { t } = useTranslation.useTranslation();
+const Delete = React.memo((props) => {
+  const { id, ...rest } = props;
+  const { t } = contexts.useTranslation();
   const { setOpened, setItem } = useForms.useForms("delete");
   return /* @__PURE__ */ jsxRuntime.jsx(
     BaseActionIcon.BaseActionIcon,
@@ -21,7 +21,7 @@ const Delete = React.memo(({ id, ...props }) => {
         setItem(id);
         setOpened(true);
       },
-      ...props
+      ...rest
     }
   );
 });

package/dist/core/cjs/ActionIcons/Download/Download.cjs

@@ -7,20 +7,18 @@ const hooks = require("@mantine/hooks");
 const React = require("react");
 const download = require("../../_virtual/download.cjs");
 const separatorVertical = require("../../_virtual/separator-vertical.cjs");
-const useApi = require("../../hooks/api/useApi.cjs");
-require("../../Wrappers/Provider/Contexts/LangContext.cjs");
+const contexts = require("fastapi-rtk/contexts");
 const BaseActionIcon = require("../utils/BaseActionIcon.cjs");
-const useTranslation = require("../../../../.external/cjs/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.cjs");
 const Download = React.memo((props) => {
-  const { download: download$1, setError, resetError } = useApi.useApi();
-  const { t } = useTranslation.useTranslation();
+  const { download: download$1, setError, resetError } = contexts.useApi();
+  const { t } = contexts.useTranslation();
   const [opened, { toggle, close }] = hooks.useDisclosure();
   const [loading, setLoading] = hooks.useDebouncedState(false, constants.DEBOUNCE_LOADING_DELAY);
   const [delimiter, setDelimiter] = React.useState(constants.DEFAULT_DELIMITER);
   const onDownload = () => {
     setLoading(true);
     resetError();
-    download$1(void 0, { delimiter }).catch((error) => {
+    download$1(void 0, { delimiter: delimiter ?? void 0 }).catch((error) => {
       setError({ message: "Could not download", originalError: error });
     }).finally(() => {
       setLoading(false);
@@ -35,7 +33,7 @@ const Download = React.memo((props) => {
           label: "Delimiter",
           description: "Select the delimiter used in the CSV file",
           value: delimiter,
-          onChange: setDelimiter,
+          onChange: (value) => setDelimiter(value),
           data: constants.DELIMITER_DATA,
           placeholder: "Select delimiter",
           allowDeselect: false,

package/dist/core/cjs/ActionIcons/Edit/Edit.cjs

@@ -5,14 +5,13 @@ const constants = require("fastapi-rtk/constants");
 const hooks = require("@mantine/hooks");
 const React = require("react");
 const pencil = require("../../_virtual/pencil.cjs");
-const useApi = require("../../hooks/api/useApi.cjs");
+const contexts = require("fastapi-rtk/contexts");
 const useForms = require("../../hooks/api/useForms.cjs");
-require("../../Wrappers/Provider/Contexts/LangContext.cjs");
 const BaseActionIcon = require("../utils/BaseActionIcon.cjs");
-const useTranslation = require("../../../../.external/cjs/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.cjs");
-const Edit = React.memo(({ id, ...props }) => {
-  const { getEntry, setError, resetError } = useApi.useApi();
-  const { t } = useTranslation.useTranslation();
+const Edit = React.memo((props) => {
+  const { id, ...rest } = props;
+  const { getEntry, setError, resetError } = contexts.useApi();
+  const { t } = contexts.useTranslation();
   const { setOpened, setItem } = useForms.useForms("edit");
   const [loading, setLoading] = hooks.useDebouncedState(false, constants.DEBOUNCE_LOADING_DELAY);
   return /* @__PURE__ */ jsxRuntime.jsx(
@@ -32,7 +31,7 @@ const Edit = React.memo(({ id, ...props }) => {
           setError({ message: "Could not fetch item with id {{id}}", data: { id }, originalError: error });
         }).finally(() => setLoading(false));
       },
-      ...props
+      ...rest
     }
   );
 });

package/dist/core/cjs/ActionIcons/Refresh/Refresh.cjs

@@ -3,14 +3,12 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
 const React = require("react");
 const refresh = require("../../_virtual/refresh.cjs");
-const useApi = require("../../hooks/api/useApi.cjs");
-require("../../Wrappers/Provider/Contexts/LangContext.cjs");
+const contexts = require("fastapi-rtk/contexts");
 const BaseActionIcon = require("../utils/BaseActionIcon.cjs");
-const useTranslation = require("../../../../.external/cjs/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.cjs");
 const Refresh = React.memo((props) => {
-  const { t } = useTranslation.useTranslation();
+  const { t } = contexts.useTranslation();
   const [loading, setLoading] = React.useState(false);
-  const { refetch } = useApi.useApi();
+  const { refetch } = contexts.useApi();
   return /* @__PURE__ */ jsxRuntime.jsx(
     BaseActionIcon.BaseActionIcon,
     {

package/dist/core/cjs/ActionIcons/Upload/Upload.cjs

@@ -9,19 +9,19 @@ const fileTypeCsv = require("../../_virtual/file-type-csv.cjs");
 const quote = require("../../_virtual/quote.cjs");
 const separatorVertical = require("../../_virtual/separator-vertical.cjs");
 const upload = require("../../_virtual/upload.cjs");
-const useApi = require("../../hooks/api/useApi.cjs");
+const contexts = require("fastapi-rtk/contexts");
 const BaseActionIcon = require("../utils/BaseActionIcon.cjs");
 const Upload = React.memo((props) => {
-  const { upload: upload$1, refetch, setError, resetError } = useApi.useApi();
+  const { upload: upload$1, refetch, setError, resetError } = contexts.useApi();
   const [opened, { toggle, close }] = hooks.useDisclosure();
   const [loading, setLoading] = hooks.useDebouncedState(false, constants.DEBOUNCE_LOADING_DELAY);
-  const [file, setFile] = React.useState();
+  const [file, setFile] = React.useState(null);
   const [delimiter, setDelimiter] = React.useState(constants.DEFAULT_DELIMITER);
   const [quotechar, setQuotechar] = React.useState(constants.DEFAULT_QUOTECHAR);
   const onUpload = () => {
     setLoading(true);
     resetError();
-    upload$1(file, { delimiter, quotechar }).then(() => {
+    upload$1(file, { delimiter: delimiter ?? void 0, quotechar: quotechar ?? void 0 }).then(() => {
       refetch();
     }).catch((error) => {
       setError({ message: "Could not upload", originalError: error });
@@ -50,7 +50,7 @@ const Upload = React.memo((props) => {
                 label: "Delimiter",
                 description: "Select the delimiter used in the CSV file",
                 value: delimiter,
-                onChange: setDelimiter,
+                onChange: (value) => setDelimiter(value),
                 data: constants.DELIMITER_DATA,
                 placeholder: "Select delimiter",
                 leftSection: /* @__PURE__ */ jsxRuntime.jsx(separatorVertical, {})
@@ -62,7 +62,7 @@ const Upload = React.memo((props) => {
                 label: "Quote character",
                 description: "Select the quote character used in the CSV file",
                 value: quotechar,
-                onChange: setQuotechar,
+                onChange: (value) => setQuotechar(value),
                 data: constants.QUOTECHAR_DATA,
                 placeholder: "Select quote character",
                 leftSection: /* @__PURE__ */ jsxRuntime.jsx(quote, {})

package/dist/core/cjs/ActionIcons/View/View.cjs

@@ -5,14 +5,13 @@ const constants = require("fastapi-rtk/constants");
 const hooks = require("@mantine/hooks");
 const React = require("react");
 const eye = require("../../_virtual/eye.cjs");
-const useApi = require("../../hooks/api/useApi.cjs");
+const contexts = require("fastapi-rtk/contexts");
 const useForms = require("../../hooks/api/useForms.cjs");
-require("../../Wrappers/Provider/Contexts/LangContext.cjs");
 const BaseActionIcon = require("../utils/BaseActionIcon.cjs");
-const useTranslation = require("../../../../.external/cjs/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.cjs");
-const View = React.memo(({ id, ...props }) => {
-  const { getEntry, setError, resetError } = useApi.useApi();
-  const { t } = useTranslation.useTranslation();
+const View = React.memo((props) => {
+  const { id, ...rest } = props;
+  const { getEntry, setError, resetError } = contexts.useApi();
+  const { t } = contexts.useTranslation();
   const { setOpened, setItem } = useForms.useForms("view");
   const [loading, setLoading] = hooks.useDebouncedState(false, constants.DEBOUNCE_LOADING_DELAY);
   return /* @__PURE__ */ jsxRuntime.jsx(
@@ -32,7 +31,7 @@ const View = React.memo(({ id, ...props }) => {
           setError({ message: "Could not fetch item with id {{id}}", data: { id }, originalError: error });
         }).finally(() => setLoading(false));
       },
-      ...props
+      ...rest
     }
   );
 });

package/dist/core/cjs/ActionIcons/utils/BaseActionIcon.cjs

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

package/dist/core/cjs/ActionIcons/utils/convertToFormInputs.cjs

@@ -4,16 +4,17 @@ const _bundledJsonforms = require("fastapi-rtk/.bundled-jsonforms");
 const utils = require("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 (_bundledJsonforms.isSchemaTypeInclude(value.type, "array") && Array.isArray(item[key])) {
-        const existingValues = ((_a = item[key]) == null ? void 0 : _a.map((item2) => String(utils.getItemId(item2) ?? item2))) || [];
-        result[key] = options.filter((val) => existingValues.includes(val));
+      if (_bundledJsonforms.isSchemaTypeInclude(value.type ?? "", "array") && Array.isArray(item[key])) {
+        const existingValues = item[key].map((entry) => String(utils.getItemId(entry) ?? entry));
+        result[key] = options.filter((option) => existingValues.includes(option));
       } else {
-        result[key] = options.find((val) => val === String(utils.getItemId(item[key]) ?? item[key]));
+        result[key] = options.find((option) => option === String(utils.getItemId(item[key]) ?? item[key]));
       }
     } else {
       result[key] = utils.getItemId(item[key]) ?? item[key] ?? void 0;

package/dist/core/cjs/Dialogs/AddDialog.cjs

@@ -9,30 +9,38 @@ const form = require("@mantine/form");
 const hooks = require("@mantine/hooks");
 const index = require("../../../.external/cjs/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.cjs");
 const React = require("react");
-const useApi = require("../hooks/api/useApi.cjs");
+const contexts = require("fastapi-rtk/contexts");
 const useForms = require("../hooks/api/useForms.cjs");
 const useInfo = require("../hooks/auth/useInfo.cjs");
-require("../Wrappers/Provider/Contexts/LangContext.cjs");
 const CommonModal = require("../Modals/CommonModal.cjs");
 const normalProps = require("../Modals/normalProps.cjs");
 const overlayProps = require("../Modals/overlayProps.cjs");
 const FormField = require("../Tables/DataGrid/FormField/FormField.cjs");
-const useTranslation = require("../../../.external/cjs/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.cjs");
-function AddDialog({
-  jsonForms: __jsonForms,
-  onSuccess,
-  onError,
-  translations,
-  hideWarnings,
-  jsonFormsProps,
-  ...props
-}) {
+function AddDialog(props) {
   var _a;
-  const { info, refetch, refetchInfo, addEntry, setError, resetError } = useApi.useApi();
-  const { t } = useTranslation.useTranslation();
+  const {
+    jsonForms: __jsonForms,
+    onSuccess,
+    onError,
+    closeOnSuccess,
+    closeOnError,
+    translations,
+    hideWarnings,
+    jsonFormsProps,
+    ...rest
+  } = props;
+  const { info: _info, refetch, refetchInfo, addEntry, setError, resetError } = contexts.useApi();
+  const info = _info;
+  const { t } = contexts.useTranslation();
   const { opened, setOpened, state, getState, setState, reset, view, setView } = useForms.useForms("add");
   const [loading, setLoading] = hooks.useDebouncedState(false, constants.DEBOUNCE_LOADING_DELAY);
-  const { jsonForms: _jsonForms } = core.useProps("AddDialog", {}, {});
+  const {
+    jsonForms: _jsonForms,
+    closeOnSuccess: _closeOnSuccess = true,
+    closeOnError: _closeOnError = true
+  } = core.useProps("AddDialog", {}, {});
+  const shouldCloseOnSuccess = closeOnSuccess ?? _closeOnSuccess;
+  const shouldCloseOnError = closeOnError ?? _closeOnError;
   const jsonForms = React.useMemo(() => utils.deepMerge(_jsonForms, __jsonForms), [_jsonForms, __jsonForms]);
   const mergedTranslations = React.useMemo(
     () => (info == null ? void 0 : info.add_translations) ?? translations ? utils.deepMerge(info.add_translations, translations) : void 0,
@@ -47,25 +55,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.useInfo();
-  const form$1 = form.useForm({ initialValues: info.add.defaultValues, validate: index.yupResolver(info.add.schema) });
+  const form$1 = form.useForm({
+    initialValues: info.add.defaultValues,
+    // #MUSTASSERT info.add.schema is a runtime yup schema object that the /_info JSON type cannot express
+    validate: index.yupResolver(info.add.schema)
+  });
   const onSubmitFunc = fab ? form$1.onSubmit((values, e) => {
     setState({ data: values });
     onSubmit(e);
   }) : onSubmit;
   React.useEffect(() => {
     if (JSON.stringify(state.data) !== JSON.stringify(form$1.getValues())) {
-      form$1.setValues(state.data);
+      form$1.setValues(state.data ?? {});
     }
   }, [state.data]);
   return /* @__PURE__ */ jsxRuntime.jsx(
@@ -82,8 +115,8 @@ function AddDialog({
       onExitTransitionEnd: reset,
       ...view === constants.VIEW_MODE.OVERLAY ? overlayProps.overlayProps : {},
       ...view === constants.VIEW_MODE.NORMAL ? normalProps.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__ */ jsxRuntime.jsx(core.Stack, { gap: "xs", children: (_a = info.add.columns) == null ? void 0 : _a.map((item, index2) => /* @__PURE__ */ jsxRuntime.jsx(
@@ -91,10 +124,8 @@ function AddDialog({
           {
             form: form$1,
             name: item.name,
-            label: item.label,
-            description: item.description,
             schema: item,
-            withAsterisk: item.required
+            ...{ label: item.label, description: item.description, withAsterisk: item.required }
           },
           index2
         )) })

package/dist/core/cjs/Dialogs/DeleteDialog.cjs

@@ -7,13 +7,12 @@ const hooks = require("@mantine/hooks");
 const React = require("react");
 const CommonModal = require("../Modals/CommonModal.cjs");
 const overlayProps = require("../Modals/overlayProps.cjs");
-const useApi = require("../hooks/api/useApi.cjs");
+const contexts = require("fastapi-rtk/contexts");
 const useForms = require("../hooks/api/useForms.cjs");
-require("../Wrappers/Provider/Contexts/LangContext.cjs");
-const useTranslation = require("../../../.external/cjs/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.cjs");
-const DeleteDialog = ({ deleteText, onSuccess, onError, ...props }) => {
-  const { refetch, refetchInfo, deleteEntry, setError, resetError } = useApi.useApi();
-  const { t } = useTranslation.useTranslation();
+const DeleteDialog = (props) => {
+  const { deleteText, onSuccess, onError, ...rest } = props;
+  const { refetch, refetchInfo, deleteEntry, setError, resetError } = contexts.useApi();
+  const { t } = contexts.useTranslation();
   const { opened, setOpened, getItem, reset, view, setView } = useForms.useForms("delete");
   const [loading, setLoading] = hooks.useDebouncedState(false, constants.DEBOUNCE_LOADING_DELAY);
   const onReset = React.useCallback(() => {
@@ -25,6 +24,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();
@@ -56,8 +60,8 @@ const DeleteDialog = ({ deleteText, onSuccess, onError, ...props }) => {
       onClose: () => setOpened(false),
       onExitTransitionEnd: reset,
       ...view === constants.VIEW_MODE.OVERLAY ? overlayProps.overlayProps : {},
-      ...props,
-      title: props.title ?? t("Delete Item?"),
+      ...rest,
+      title: rest.title ?? t("Delete Item?"),
       children: deleteText ?? /* @__PURE__ */ jsxRuntime.jsx(core.Text, { children: t("Are you sure you want to delete this item?") })
     }
   );