fastapi-rtk 0.1.20 → 0.1.22

package/dist/.external/cjs/{dompurify@3.2.5 → dompurify@3.2.6}/dompurify/dist/purify.es.cjs

@@ -1,5 +1,5 @@
 "use strict";
-/*! @license DOMPurify 3.2.5 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.2.5/LICENSE */
+/*! @license DOMPurify 3.2.6 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.2.6/LICENSE */
 const {
   entries,
   setPrototypeOf,
@@ -150,7 +150,7 @@ const TMPLIT_EXPR = seal(/\$\{[\w\W]*/gm);
 const DATA_ATTR = seal(/^data-[\-\w.\u00B7-\uFFFF]+$/);
 const ARIA_ATTR = seal(/^aria-[\-\w]+$/);
 const IS_ALLOWED_URI = seal(
-  /^(?:(?:(?:f|ht)tps?|mailto|tel|callto|sms|cid|xmpp):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i
+  /^(?:(?:(?:f|ht)tps?|mailto|tel|callto|sms|cid|xmpp|matrix):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i
   // eslint-disable-line no-useless-escape
 );
 const IS_SCRIPT_OR_DATA = seal(/^(?:\w+script|data):/i);
@@ -224,7 +224,7 @@ const _createHooksMap = function _createHooksMap2() {
 function createDOMPurify() {
   let window2 = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : getGlobal();
   const DOMPurify = (root) => createDOMPurify(root);
-  DOMPurify.version = "3.2.5";
+  DOMPurify.version = "3.2.6";
   DOMPurify.removed = [];
   if (!window2 || !window2.document || window2.document.nodeType !== NODE_TYPE.document || !window2.Element) {
     DOMPurify.isSupported = false;
@@ -371,8 +371,8 @@ function createDOMPurify() {
     URI_SAFE_ATTRIBUTES = objectHasOwnProperty(cfg, "ADD_URI_SAFE_ATTR") ? addToSet(clone(DEFAULT_URI_SAFE_ATTRIBUTES), cfg.ADD_URI_SAFE_ATTR, transformCaseFunc) : DEFAULT_URI_SAFE_ATTRIBUTES;
     DATA_URI_TAGS = objectHasOwnProperty(cfg, "ADD_DATA_URI_TAGS") ? addToSet(clone(DEFAULT_DATA_URI_TAGS), cfg.ADD_DATA_URI_TAGS, transformCaseFunc) : DEFAULT_DATA_URI_TAGS;
     FORBID_CONTENTS = objectHasOwnProperty(cfg, "FORBID_CONTENTS") ? addToSet({}, cfg.FORBID_CONTENTS, transformCaseFunc) : DEFAULT_FORBID_CONTENTS;
-    FORBID_TAGS = objectHasOwnProperty(cfg, "FORBID_TAGS") ? addToSet({}, cfg.FORBID_TAGS, transformCaseFunc) : {};
-    FORBID_ATTR = objectHasOwnProperty(cfg, "FORBID_ATTR") ? addToSet({}, cfg.FORBID_ATTR, transformCaseFunc) : {};
+    FORBID_TAGS = objectHasOwnProperty(cfg, "FORBID_TAGS") ? addToSet({}, cfg.FORBID_TAGS, transformCaseFunc) : clone({});
+    FORBID_ATTR = objectHasOwnProperty(cfg, "FORBID_ATTR") ? addToSet({}, cfg.FORBID_ATTR, transformCaseFunc) : clone({});
     USE_PROFILES = objectHasOwnProperty(cfg, "USE_PROFILES") ? cfg.USE_PROFILES : false;
     ALLOW_ARIA_ATTR = cfg.ALLOW_ARIA_ATTR !== false;
     ALLOW_DATA_ATTR = cfg.ALLOW_DATA_ATTR !== false;
@@ -636,7 +636,7 @@ function createDOMPurify() {
       tagName,
       allowedTags: ALLOWED_TAGS
     });
-    if (currentNode.hasChildNodes() && !_isNode(currentNode.firstElementChild) && regExpTest(/<[/\w!]/g, currentNode.innerHTML) && regExpTest(/<[/\w!]/g, currentNode.textContent)) {
+    if (SAFE_FOR_XML && currentNode.hasChildNodes() && !_isNode(currentNode.firstElementChild) && regExpTest(/<[/\w!]/g, currentNode.innerHTML) && regExpTest(/<[/\w!]/g, currentNode.textContent)) {
       _forceRemove(currentNode);
       return true;
     }
@@ -749,7 +749,8 @@ function createDOMPurify() {
         value: attrValue
       } = attr;
       const lcName = transformCaseFunc(name);
-      let value = name === "value" ? attrValue : stringTrim(attrValue);
+      const initValue = attrValue;
+      let value = name === "value" ? initValue : stringTrim(initValue);
       hookEvent.attrName = lcName;
       hookEvent.attrValue = value;
       hookEvent.keepAttr = true;
@@ -767,8 +768,8 @@ function createDOMPurify() {
       if (hookEvent.forceKeepAttr) {
         continue;
       }
-      _removeAttribute(name, currentNode);
       if (!hookEvent.keepAttr) {
+        _removeAttribute(name, currentNode);
         continue;
       }
       if (!ALLOW_SELF_CLOSE_IN_ATTR && regExpTest(/\/>/i, value)) {
@@ -782,6 +783,7 @@ function createDOMPurify() {
       }
       const lcTag = transformCaseFunc(currentNode.nodeName);
       if (!_isValidAttribute(lcTag, lcName, value)) {
+        _removeAttribute(name, currentNode);
         continue;
       }
       if (trustedTypesPolicy && typeof trustedTypes === "object" && typeof trustedTypes.getAttributeType === "function") {
@@ -799,18 +801,21 @@ function createDOMPurify() {
           }
         }
       }
-      try {
-        if (namespaceURI) {
-          currentNode.setAttributeNS(namespaceURI, name, value);
-        } else {
-          currentNode.setAttribute(name, value);
-        }
-        if (_isClobbered(currentNode)) {
-          _forceRemove(currentNode);
-        } else {
-          arrayPop(DOMPurify.removed);
+      if (value !== initValue) {
+        try {
+          if (namespaceURI) {
+            currentNode.setAttributeNS(namespaceURI, name, value);
+          } else {
+            currentNode.setAttribute(name, value);
+          }
+          if (_isClobbered(currentNode)) {
+            _forceRemove(currentNode);
+          } else {
+            arrayPop(DOMPurify.removed);
+          }
+        } catch (_) {
+          _removeAttribute(name, currentNode);
         }
-      } catch (_) {
       }
     }
     _executeHooks(hooks.afterSanitizeAttributes, currentNode, null);

package/dist/.external/esm/{dompurify@3.2.5 → dompurify@3.2.6}/dompurify/dist/purify.es.mjs

@@ -1,4 +1,4 @@
-/*! @license DOMPurify 3.2.5 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.2.5/LICENSE */
+/*! @license DOMPurify 3.2.6 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.2.6/LICENSE */
 const {
   entries,
   setPrototypeOf,
@@ -149,7 +149,7 @@ const TMPLIT_EXPR = seal(/\$\{[\w\W]*/gm);
 const DATA_ATTR = seal(/^data-[\-\w.\u00B7-\uFFFF]+$/);
 const ARIA_ATTR = seal(/^aria-[\-\w]+$/);
 const IS_ALLOWED_URI = seal(
-  /^(?:(?:(?:f|ht)tps?|mailto|tel|callto|sms|cid|xmpp):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i
+  /^(?:(?:(?:f|ht)tps?|mailto|tel|callto|sms|cid|xmpp|matrix):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i
   // eslint-disable-line no-useless-escape
 );
 const IS_SCRIPT_OR_DATA = seal(/^(?:\w+script|data):/i);
@@ -223,7 +223,7 @@ const _createHooksMap = function _createHooksMap2() {
 function createDOMPurify() {
   let window2 = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : getGlobal();
   const DOMPurify = (root) => createDOMPurify(root);
-  DOMPurify.version = "3.2.5";
+  DOMPurify.version = "3.2.6";
   DOMPurify.removed = [];
   if (!window2 || !window2.document || window2.document.nodeType !== NODE_TYPE.document || !window2.Element) {
     DOMPurify.isSupported = false;
@@ -370,8 +370,8 @@ function createDOMPurify() {
     URI_SAFE_ATTRIBUTES = objectHasOwnProperty(cfg, "ADD_URI_SAFE_ATTR") ? addToSet(clone(DEFAULT_URI_SAFE_ATTRIBUTES), cfg.ADD_URI_SAFE_ATTR, transformCaseFunc) : DEFAULT_URI_SAFE_ATTRIBUTES;
     DATA_URI_TAGS = objectHasOwnProperty(cfg, "ADD_DATA_URI_TAGS") ? addToSet(clone(DEFAULT_DATA_URI_TAGS), cfg.ADD_DATA_URI_TAGS, transformCaseFunc) : DEFAULT_DATA_URI_TAGS;
     FORBID_CONTENTS = objectHasOwnProperty(cfg, "FORBID_CONTENTS") ? addToSet({}, cfg.FORBID_CONTENTS, transformCaseFunc) : DEFAULT_FORBID_CONTENTS;
-    FORBID_TAGS = objectHasOwnProperty(cfg, "FORBID_TAGS") ? addToSet({}, cfg.FORBID_TAGS, transformCaseFunc) : {};
-    FORBID_ATTR = objectHasOwnProperty(cfg, "FORBID_ATTR") ? addToSet({}, cfg.FORBID_ATTR, transformCaseFunc) : {};
+    FORBID_TAGS = objectHasOwnProperty(cfg, "FORBID_TAGS") ? addToSet({}, cfg.FORBID_TAGS, transformCaseFunc) : clone({});
+    FORBID_ATTR = objectHasOwnProperty(cfg, "FORBID_ATTR") ? addToSet({}, cfg.FORBID_ATTR, transformCaseFunc) : clone({});
     USE_PROFILES = objectHasOwnProperty(cfg, "USE_PROFILES") ? cfg.USE_PROFILES : false;
     ALLOW_ARIA_ATTR = cfg.ALLOW_ARIA_ATTR !== false;
     ALLOW_DATA_ATTR = cfg.ALLOW_DATA_ATTR !== false;
@@ -635,7 +635,7 @@ function createDOMPurify() {
       tagName,
       allowedTags: ALLOWED_TAGS
     });
-    if (currentNode.hasChildNodes() && !_isNode(currentNode.firstElementChild) && regExpTest(/<[/\w!]/g, currentNode.innerHTML) && regExpTest(/<[/\w!]/g, currentNode.textContent)) {
+    if (SAFE_FOR_XML && currentNode.hasChildNodes() && !_isNode(currentNode.firstElementChild) && regExpTest(/<[/\w!]/g, currentNode.innerHTML) && regExpTest(/<[/\w!]/g, currentNode.textContent)) {
       _forceRemove(currentNode);
       return true;
     }
@@ -748,7 +748,8 @@ function createDOMPurify() {
         value: attrValue
       } = attr;
       const lcName = transformCaseFunc(name);
-      let value = name === "value" ? attrValue : stringTrim(attrValue);
+      const initValue = attrValue;
+      let value = name === "value" ? initValue : stringTrim(initValue);
       hookEvent.attrName = lcName;
       hookEvent.attrValue = value;
       hookEvent.keepAttr = true;
@@ -766,8 +767,8 @@ function createDOMPurify() {
       if (hookEvent.forceKeepAttr) {
         continue;
       }
-      _removeAttribute(name, currentNode);
       if (!hookEvent.keepAttr) {
+        _removeAttribute(name, currentNode);
         continue;
       }
       if (!ALLOW_SELF_CLOSE_IN_ATTR && regExpTest(/\/>/i, value)) {
@@ -781,6 +782,7 @@ function createDOMPurify() {
       }
       const lcTag = transformCaseFunc(currentNode.nodeName);
       if (!_isValidAttribute(lcTag, lcName, value)) {
+        _removeAttribute(name, currentNode);
         continue;
       }
       if (trustedTypesPolicy && typeof trustedTypes === "object" && typeof trustedTypes.getAttributeType === "function") {
@@ -798,18 +800,21 @@ function createDOMPurify() {
           }
         }
       }
-      try {
-        if (namespaceURI) {
-          currentNode.setAttributeNS(namespaceURI, name, value);
-        } else {
-          currentNode.setAttribute(name, value);
-        }
-        if (_isClobbered(currentNode)) {
-          _forceRemove(currentNode);
-        } else {
-          arrayPop(DOMPurify.removed);
+      if (value !== initValue) {
+        try {
+          if (namespaceURI) {
+            currentNode.setAttributeNS(namespaceURI, name, value);
+          } else {
+            currentNode.setAttribute(name, value);
+          }
+          if (_isClobbered(currentNode)) {
+            _forceRemove(currentNode);
+          } else {
+            arrayPop(DOMPurify.removed);
+          }
+        } catch (_) {
+          _removeAttribute(name, currentNode);
         }
-      } catch (_) {
       }
     }
     _executeHooks(hooks.afterSanitizeAttributes, currentNode, null);

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

@@ -16,7 +16,7 @@ const overlayProps = require("../Modals/overlayProps.cjs");
 const convertToFormInputs$1 = require("../utils/convertToFormInputs.cjs");
 function EditDialog({ jsonForms: __jsonForms, ...props }) {
   const { info, refetch, refetchInfo, updateEntry } = useApi.useApi();
-  const { opened, setOpened, item, state, getState, setState, reset, view, setView } = useForms.useForms("edit");
+  const { opened, setOpened, item, getItem, state, getState, setState, reset, view, setView } = useForms.useForms("edit");
   const [loading, setLoading] = hooks.useDebouncedState(false, constants.DEBOUNCE_LOADING_DELAY);
   const { jsonForms: _jsonForms } = core.useProps("EditDialog", {}, {});
   const jsonForms = React.useMemo(
@@ -27,7 +27,7 @@ function EditDialog({ jsonForms: __jsonForms, ...props }) {
     (e) => {
       e == null ? void 0 : e.preventDefault();
       setLoading(true);
-      updateEntry(item == null ? void 0 : item.id, getState().data).then((res) => {
+      updateEntry(utils.getItemId(getItem()), getState().data).then((res) => {
         if (res) {
           refetch();
           refetchInfo();
@@ -38,7 +38,7 @@ function EditDialog({ jsonForms: __jsonForms, ...props }) {
         setOpened(false);
       });
     },
-    [setLoading, updateEntry, item == null ? void 0 : item.id, getState, refetch, refetchInfo, setOpened]
+    [setLoading, updateEntry, getItem, getState, refetch, refetchInfo, setOpened]
   );
   const { fab } = useInfo.useInfo();
   const initialState = React.useMemo(

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

@@ -18,7 +18,7 @@ function ViewDialog({ item, info, opened, onClose, ...props }) {
     {
       opened,
       onClose,
-      title: `${item == null ? void 0 : item.show_title} (#${convertId.convertId(item == null ? void 0 : item.id)})`,
+      title: `${item == null ? void 0 : item.show_title} (#${convertId.convertId(utils.getItemId(item))})`,
       size: "lg",
       centered: true,
       zIndex: 1e3,
@@ -42,7 +42,7 @@ function ViewDialog({ item, info, opened, onClose, ...props }) {
             RelationPanel,
             {
               relatedPath: relation.path,
-              id: convertId.convertId(item.id),
+              id: convertId.convertId(utils.getItemId(item)),
               foreign_key: relation.foreign_key,
               type: relation.type
             }

package/dist/core/cjs/Tables/DataGrid/FormField/Inputs/FormRelatedListSelect.cjs

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
+const utils = require("fastapi-rtk/utils");
 const core = require("@mantine/core");
 const convertId = require("../../../../Wrappers/ApiProvider/utils/convertId.cjs");
 function FormRelatedListSelect({ form, name, items, ...props }) {
-  const data = items.map((item) => ({ value: String(convertId.convertId(item.id)), label: item.value }));
-  const currentItems = Array.isArray(form.getInputProps(name).value) ? form.getInputProps(name).value.map((value) => typeof value === "object" ? String(convertId.convertId(value.id)) : String(value)) : [];
+  const data = items.map((item) => ({ value: String(convertId.convertId(utils.getItemId(item))), label: item.value }));
+  const currentItems = Array.isArray(form.getInputProps(name).value) ? form.getInputProps(name).value.map((value) => typeof value === "object" ? String(convertId.convertId(utils.getItemId(value))) : String(value)) : [];
   return /* @__PURE__ */ jsxRuntime.jsx(core.MultiSelect, { data, searchable: true, ...form.getInputProps(name), value: currentItems || [], ...props });
 }
 exports.FormRelatedListSelect = FormRelatedListSelect;

package/dist/core/cjs/Tables/DataGrid/FormField/Inputs/FormRelatedSelect.cjs

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
+const utils = require("fastapi-rtk/utils");
 const core = require("@mantine/core");
 const convertId = require("../../../../Wrappers/ApiProvider/utils/convertId.cjs");
 function FormRelatedSelect({ form, name, items, filter, ...props }) {
-  var _a;
   const data = items.map((item) => ({
-    value: String(convertId.convertId(item.id)),
+    value: String(convertId.convertId(utils.getItemId(item))),
     label: item.value
   }));
   return /* @__PURE__ */ jsxRuntime.jsx(
@@ -20,10 +20,10 @@ function FormRelatedSelect({ form, name, items, filter, ...props }) {
           form.setFieldValue(name, value);
           return;
         }
-        const newItem = items.find((item) => String(convertId.convertId(item.id)) === value) || null;
+        const newItem = items.find((item) => String(convertId.convertId(utils.getItemId(item))) === value) || null;
         form.setFieldValue(name, newItem);
       },
-      value: filter ? form.getInputProps(name).value : String(convertId.convertId((_a = form.getInputProps(name).value) == null ? void 0 : _a.id)) || "",
+      value: filter ? form.getInputProps(name).value : String(convertId.convertId(utils.getItemId(form.getInputProps(name).value))) || "",
       ...props
     }
   );

package/dist/core/cjs/Tables/DataGrid/Main/Body/Field/Field.cjs

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
 const core = require("@mantine/core");
-const purify_es = require("../../../../../../../.external/cjs/dompurify@3.2.5/dompurify/dist/purify.es.cjs");
+const purify_es = require("../../../../../../../.external/cjs/dompurify@3.2.6/dompurify/dist/purify.es.cjs");
 const React = require("react");
 const FallbackWrapper = require("../../../../NextGenDataGrid/FallbackWrapper.cjs");
 const Field_module = require("./Field.module.css.cjs");

package/dist/core/cjs/Tables/NextGenDataGrid/NextGenDataGrid.cjs

@@ -149,7 +149,7 @@ const NextGenDataGrid = React.forwardRef((props, ref) => {
   const mrtProps = React.useMemo(
     () => utils.deepMerge(
       baseProps,
-      { mantinePaperProps: { ref }, getRowId: (originalRow) => originalRow.id },
+      { mantinePaperProps: { ref }, getRowId: utils.getItemId },
       columnsProps,
       dataProps,
       sortingProps,

package/dist/core/cjs/Tables/NextGenDataGrid/hooks/useActions.cjs

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
+const utils = require("fastapi-rtk/utils");
 const React = require("react");
 const Actions = require("../../../ActionIcons/Actions.cjs");
 const useApi = require("../../../hooks/api/useApi.cjs");
@@ -13,7 +14,7 @@ function useActions(hideActions, component) {
     ({ row, ...rest }) => /* @__PURE__ */ jsxRuntime.jsx(
       FallbackWrapper.FallbackWrapper,
       {
-        fallback: /* @__PURE__ */ jsxRuntime.jsx(Actions.Actions, { id: row.original.id }),
+        fallback: /* @__PURE__ */ jsxRuntime.jsx(Actions.Actions, { id: utils.getItemId(row.original) }),
         functionProps: {
           api,
           auth,

package/dist/core/cjs/Tables/NextGenDataGrid/hooks/useColumns/ColumnHeaderFilter/ColumnHeaderFilter.cjs

@@ -43,11 +43,14 @@ function ColumnHeaderFilter({
   filterProps,
   filterModeDescription,
   filterMenu,
+  onFilterClear,
+  onFilterMount,
   filters,
   filterFn,
-  mrtProps: { column, table, ...restProps }
+  mrtProps
 }) {
   var _a;
+  const { column, table } = mrtProps;
   const { info, queryParams } = useApi.useApi();
   const api = useApi.useApi();
   const auth = useAuth.useAuth();
@@ -76,6 +79,7 @@ function ColumnHeaderFilter({
   const handleClear = React.useCallback(() => {
     field.reset();
     column.setFilterValue(void 0);
+    onFilterClear == null ? void 0 : onFilterClear();
   }, []);
   const [debounced] = hooks.useDebouncedValue(field.getInputProps().value, constants.DEBOUNCE_DELAY);
   const isMounted = hooks.useMounted();
@@ -108,6 +112,9 @@ function ColumnHeaderFilter({
       handleClear();
     }
   }, [currentHeaderFilter]);
+  React.useEffect(() => {
+    onFilterMount == null ? void 0 : onFilterMount({ api: api.getState(), auth: auth.getState(), mrtProps });
+  }, [onFilterMount]);
   const AIProps = React.useMemo(() => {
     const props = { variant: "subtle" };
     const disabled = !(filters == null ? void 0 : filters.length);
@@ -125,10 +132,7 @@ function ColumnHeaderFilter({
     () => ({ ...AIProps, variant: "transparent", c: void 0, size: "sm", onClick: handleClear }),
     [AIProps, handleClear]
   );
-  const functionProps = React.useMemo(
-    () => ({ api, auth, mrtProps: { column, table, ...restProps } }),
-    [api, auth, column, restProps, table]
-  );
+  const functionProps = React.useMemo(() => ({ api, auth, mrtProps }), [api, auth, mrtProps]);
   const filterMenuFunctionProps = React.useMemo(
     () => ({
       ...functionProps,
@@ -165,54 +169,46 @@ function ColumnHeaderFilter({
         variant: "unstyled",
         disabled: !(filters == null ? void 0 : filters.length),
         title: !filters.length ? "No filters" : void 0,
-        placeholder: (_a2 = table.options.localization.filterByColumn) == null ? void 0 : _a2.replace("{column}", String(column.columnDef.header)),
-        "aria-label": (_b = table.options.localization.filterByColumn) == null ? void 0 : _b.replace("{column}", String(column.columnDef.header)),
+        placeholder: (_a2 = mrtProps.table.options.localization.filterByColumn) == null ? void 0 : _a2.replace(
+          "{column}",
+          String(mrtProps.column.columnDef.header)
+        ),
+        "aria-label": (_b = mrtProps.table.options.localization.filterByColumn) == null ? void 0 : _b.replace(
+          "{column}",
+          String(mrtProps.column.columnDef.header)
+        ),
         style: { fontWeight: "normal" },
         mrtprops: {
-          column,
-          table,
-          ...restProps,
+          ...mrtProps,
           textinputprops: {
             className: clsx.clsx("mrt-filter-text-input", headerinput_module.default.root),
-            ...utils$1.parseFromValuesOrFunc(table.mantineFilterTextInputProps, [{ column, table, ...restProps }]),
-            ...utils$1.parseFromValuesOrFunc(column.columnDef.mantineFilterTextInputProps, [{ column, table, ...restProps }])
+            ...utils$1.parseFromValuesOrFunc(mrtProps.table.mantineFilterTextInputProps, mrtProps),
+            ...utils$1.parseFromValuesOrFunc(mrtProps.column.columnDef.mantineFilterTextInputProps, mrtProps)
           },
           selectprops: {
             className: clsx.clsx("mrt-filter-text-input", headerinput_module.default.root),
-            ...utils$1.parseFromValuesOrFunc(table.mantineFilterSelectProps || { clearable: true }, {
-              column,
-              table,
-              ...restProps
-            }),
-            ...utils$1.parseFromValuesOrFunc(column.columnDef.mantineFilterSelectProps, { column, table, ...restProps })
+            ...utils$1.parseFromValuesOrFunc(mrtProps.table.mantineFilterSelectProps || { clearable: true }, mrtProps),
+            ...utils$1.parseFromValuesOrFunc(mrtProps.column.columnDef.mantineFilterSelectProps, mrtProps)
           },
           multiselectprops: {
             className: clsx.clsx("mrt-filter-text-input", headerinput_module.default.root),
-            ...utils$1.parseFromValuesOrFunc(table.mantineFilterMultiSelectProps || { clearable: true }, {
-              column,
-              table,
-              ...restProps
-            }),
-            ...utils$1.parseFromValuesOrFunc(column.columnDef.mantineFilterMultiSelectProps, { column, table, ...restProps })
+            ...utils$1.parseFromValuesOrFunc(mrtProps.table.mantineFilterMultiSelectProps || { clearable: true }, mrtProps),
+            ...utils$1.parseFromValuesOrFunc(mrtProps.column.columnDef.mantineFilterMultiSelectProps, mrtProps)
           },
           dateinputprops: {
             className: clsx.clsx("mrt-filter-text-input", headerinput_module.default.root, headerinput_module.default["date-filter"]),
-            ...utils$1.parseFromValuesOrFunc(table.mantineFilterDateInputProps, { column, table, ...restProps }),
-            ...utils$1.parseFromValuesOrFunc(column.columnDef.mantineFilterDateInputProps, { column, table, ...restProps })
+            ...utils$1.parseFromValuesOrFunc(mrtProps.table.mantineFilterDateInputProps, mrtProps),
+            ...utils$1.parseFromValuesOrFunc(mrtProps.column.columnDef.mantineFilterDateInputProps, mrtProps)
           },
           autocompleteprops: {
             className: clsx.clsx("mrt-filter-text-input", headerinput_module.default.root),
-            ...utils$1.parseFromValuesOrFunc(table.mantineFilterAutocompleteProps, { column, table, ...restProps }),
-            ...utils$1.parseFromValuesOrFunc(column.columnDef.mantineFilterAutocompleteProps, {
-              column,
-              table,
-              ...restProps
-            })
+            ...utils$1.parseFromValuesOrFunc(mrtProps.table.mantineFilterAutocompleteProps, mrtProps),
+            ...utils$1.parseFromValuesOrFunc(mrtProps.column.columnDef.mantineFilterAutocompleteProps, mrtProps)
           }
         },
         ref: (node) => {
           if (node) {
-            table.refs.filterInputRefs.current[`${column.id}-0`] = node;
+            mrtProps.table.refs.filterInputRefs.current[`${mrtProps.column.id}-0`] = node;
           }
         },
         clearIcon: field.isDirty() && /* @__PURE__ */ jsxRuntime.jsx(core.CloseButton, { ...clearIconProps }),
@@ -220,7 +216,7 @@ function ColumnHeaderFilter({
         cleariconprops: clearIconProps
       };
     },
-    [clearIconProps, column, configuration, field, filters.length, restProps, table]
+    [clearIconProps, configuration, field, filters.length, mrtProps]
   );
   return /* @__PURE__ */ jsxRuntime.jsxs(core.Menu, { opened, closeOnClickOutside: true, onChange: toggle, children: [
     /* @__PURE__ */ jsxRuntime.jsxs(core.Stack, { w: "100%", gap: "0.25rem", children: [

package/dist/core/cjs/Tables/NextGenDataGrid/hooks/useColumns/ColumnHeaderFilter/HeaderInputs/HeaderMultiSelectInput.cjs

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
+const utils = require("fastapi-rtk/utils");
 const core = require("@mantine/core");
 const React = require("react");
 const convertId = require("../../../../../../Wrappers/ApiProvider/utils/convertId.cjs");
 const HeaderMultiSelectInput = React.forwardRef(
   // eslint-disable-next-line no-unused-vars
   ({ data, clearIcon, mrtprops: { multiselectprops }, placeholder, ...props }, ref) => {
-    const value = Array.isArray(props.value) ? props.value.map((value2) => typeof value2 === "object" ? String(convertId.convertId(value2.id)) : String(value2)) : [];
+    const value = Array.isArray(props.value) ? props.value.map((value2) => typeof value2 === "object" ? String(convertId.convertId(utils.getItemId(value2))) : String(value2)) : [];
     return /* @__PURE__ */ jsxRuntime.jsxs(core.Box, { ...props, children: [
       !value.length && /* @__PURE__ */ jsxRuntime.jsx(core.TextInput, { pos: "absolute", placeholder, ...props, value: void 0, onChange: void 0 }),
       /* @__PURE__ */ jsxRuntime.jsx(

package/dist/core/cjs/Tables/NextGenDataGrid/hooks/useColumns/useColumns.cjs

@@ -33,6 +33,8 @@ function useColumns(columnProps, header, body, textFilterSeparator) {
         filterProps,
         filterModeDescription,
         filterMenu,
+        onFilterClear,
+        onFilterMount,
         defaultOpr = ((_d = (_c = (_b = (_a = info == null ? void 0 : info.filters) == null ? void 0 : _a[col]) == null ? void 0 : _b.filters) == null ? void 0 : _c[0]) == null ? void 0 : _d.operator) || ""
       } = utils.getProps(header, specialKey.all, col);
       const filterFn = utils.fromFilterToFilterFn(col, defaultOpr);
@@ -54,6 +56,8 @@ function useColumns(columnProps, header, body, textFilterSeparator) {
             filterProps,
             filterModeDescription,
             filterMenu,
+            onFilterClear,
+            onFilterMount,
             filters,
             filterFn,
             mrtProps: props,
@@ -85,6 +89,7 @@ function useColumns(columnProps, header, body, textFilterSeparator) {
           }
           let truncateObj = {};
           if (truncate) {
+            highlight.push(...highlight.map((h) => `${h.slice(0, truncate)}...`));
             if (Array.isArray(value)) {
               truncateObj = value.map((v) => ({
                 original: v,

package/dist/core/cjs/Tables/NextGenDataGrid/hooks/useColumns/utils.cjs

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
+const utils = require("fastapi-rtk/utils");
 const convertId = require("../../../../Wrappers/ApiProvider/utils/convertId.cjs");
 const HeaderBetweenInput = require("./ColumnHeaderFilter/HeaderInputs/HeaderBetweenInput.cjs");
 const HeaderBooleanInput = require("./ColumnHeaderFilter/HeaderInputs/HeaderBooleanInput.cjs");
@@ -46,7 +47,7 @@ const getBasicInput = (opr, schema) => {
       return ({ componentProps }) => /* @__PURE__ */ jsxRuntime.jsx(
         HeaderSelectInput.HeaderSelectInput,
         {
-          data: schema.values.map((item) => ({ value: String(convertId.convertId(item.id)), label: item.value })),
+          data: schema.values.map((item) => ({ value: String(convertId.convertId(utils.getItemId(item))), label: item.value })),
           ...componentProps
         }
       );
@@ -55,7 +56,7 @@ const getBasicInput = (opr, schema) => {
       return ({ componentProps }) => /* @__PURE__ */ jsxRuntime.jsx(
         HeaderMultiSelectInput.HeaderMultiSelectInput,
         {
-          data: schema.values.map((item) => ({ value: String(convertId.convertId(item.id)), label: item.value })),
+          data: schema.values.map((item) => ({ value: String(convertId.convertId(utils.getItemId(item))), label: item.value })),
           ...componentProps
         }
       );

package/dist/core/cjs/Tables/NextGenDataGrid/hooks/useEvent.cjs

@@ -1,17 +1,13 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const useApi = require("../../../hooks/api/useApi.cjs");
+const utils = require("fastapi-rtk/utils");
 function useEvent(onClickEntry) {
-  const { data } = useApi.useApi();
   if (!onClickEntry) {
     return null;
   }
   return {
     mantineTableBodyRowProps: ({ row }) => ({
-      onClick: () => {
-        const id = data.ids[row.id];
-        onClickEntry(id, row.original);
-      },
+      onClick: () => onClickEntry(utils.getItemId(row.original), row.original),
       style: { cursor: "pointer" }
     })
   };

package/dist/core/cjs/Wrappers/ApiProvider/hooks/useProvideApi.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const React = require("react");
-const utils$1 = require("fastapi-rtk/utils");
+const utils = require("fastapi-rtk/utils");
 const hooks = require("@mantine/hooks");
 const useQuery = require("../../../../../.external/cjs/@tanstack_react-query@5.76.1_react@18.3.1/@tanstack/react-query/build/modern/useQuery.cjs");
 const createItem = require("../utils/api/createItem.cjs");
@@ -15,7 +15,7 @@ const uploadItems = require("../utils/api/uploadItems.cjs");
 const convertId = require("../utils/convertId.cjs");
 const convertInfo = require("../utils/convertInfo.cjs");
 const createQueryParams = require("../utils/createQueryParams.cjs");
-const utils = require("../../../../../.external/cjs/@tanstack_query-core@5.76.0/@tanstack/query-core/build/modern/utils.cjs");
+const utils$1 = require("../../../../../.external/cjs/@tanstack_query-core@5.76.0/@tanstack/query-core/build/modern/utils.cjs");
 function useProvideApi({
   path,
   initialQueryParams,
@@ -45,7 +45,7 @@ function useProvideApi({
         ...relation ? {
           filters: [
             ...queryParams.filters || [],
-            { col: relation.foreign_key, opr: relation.type, value: convertId.convertId(relation.id) }
+            { col: relation.foreign_key, opr: relation.type, value: convertId.convertId(utils.getItemId(relation)) }
           ]
         } : {}
       } : null;
@@ -93,8 +93,8 @@ function useProvideApi({
     error: infoError
   } = useQuery.useQuery({
     queryKey: [`info`, path],
-    queryFn: ({ signal }) => getInfo.getInfo(utils$1.urlJoin(path, "_info"), signal).then((data2) => ({ ...convertInfo.convertInfo(data2), path })),
-    placeholderData: clearInfoOnRefetch ? null : utils.keepPreviousData,
+    queryFn: ({ signal }) => getInfo.getInfo(utils.urlJoin(path, "_info"), signal).then((data2) => ({ ...convertInfo.convertInfo(data2), path })),
+    placeholderData: clearInfoOnRefetch ? null : utils$1.keepPreviousData,
     enabled: fetchInfo,
     retry: false,
     refetchOnMount: false,
@@ -109,12 +109,12 @@ function useProvideApi({
     error: dataError
   } = useQuery.useQuery({
     queryKey: [`data`, memoizedQueryParamsPathRef.current, JSON.stringify(memoizedQueryParams)],
-    queryFn: ({ signal }) => memoizedQueryParams ? getItems.getItems(utils$1.urlJoin(memoizedQueryParamsPathRef.current, "/"), memoizedQueryParams, signal).then((data2) => ({
+    queryFn: ({ signal }) => memoizedQueryParams ? getItems.getItems(utils.urlJoin(memoizedQueryParamsPathRef.current, "/"), memoizedQueryParams, signal).then((data2) => ({
       ...data2,
       result: data2.result.map((item, index) => ({ ...item, id: data2.ids[index] })),
       path: memoizedQueryParamsPathRef.current
     })) : null,
-    placeholderData: clearDataOnRefetch ? null : utils.keepPreviousData,
+    placeholderData: clearDataOnRefetch ? null : utils$1.keepPreviousData,
     retry: false,
     ...dataQueryProps
   });

package/dist/core/cjs/Wrappers/Provider/Provider.cjs

@@ -23,17 +23,16 @@ function useInfo(baseUrl, auth, fab) {
   }
   return useProvideInfo$1.useProvideInfo(baseUrl, auth);
 }
-function InnerProvider(providerProps) {
+function InnerProvider(props) {
   const defaultproviderProps = { baseUrl: new URL(document.baseURI).pathname + "/api/v1", inheritMantineTheme: false };
-  const { baseUrl, authQueryProps, children } = { ...defaultproviderProps, ...providerProps };
-  const auth = useAuth(baseUrl, authQueryProps, providerProps.fab);
+  const { baseUrl, authQueryProps, children } = { ...defaultproviderProps, ...props };
+  const auth = useAuth(baseUrl, authQueryProps, props.fab);
   const authProxy = zustand.useProxy(auth);
-  const info = useInfo(baseUrl, auth, providerProps.fab);
+  const info = useInfo(baseUrl, auth, props.fab);
   const infoProxy = zustand.useProxy(info);
   return /* @__PURE__ */ jsxRuntime.jsx(AuthContext.AuthContext.Provider, { value: authProxy, children: /* @__PURE__ */ jsxRuntime.jsx(InfoContext.InfoContext.Provider, { value: infoProxy, children }) });
 }
-const Provider = ({ fab, baseUrl, authQueryProps, ...rest }) => {
-  const props = { fab, baseUrl, authQueryProps, ...rest };
+const Provider = (props) => {
   const [queryClient$1] = React.useState(() => new queryClient.QueryClient());
   return /* @__PURE__ */ jsxRuntime.jsx(QueryClientProvider.QueryClientProvider, { client: queryClient$1, children: /* @__PURE__ */ jsxRuntime.jsx(InnerProvider, { ...props }) });
 };