next-data-kit 8.0.0 → 8.1.0

package/dist/index.cjs

@@ -137,6 +137,7 @@ var mongooseAdapter = (model, options = {}) => {
     if (filter && !customFilter) {
       if (input.filterConfig) {
         Object.entries(filter).forEach(([key, value]) => {
+          if (filterCustom && filterCustom[key]) return;
           if (isProvided(value) && isSafeKey(key) && input.filterConfig?.[key]) {
             const config = input.filterConfig[key];
             const fieldName = config?.field ?? key;
@@ -152,6 +153,7 @@ var mongooseAdapter = (model, options = {}) => {
         });
       } else {
         Object.entries(filter).forEach(([key, value]) => {
+          if (filterCustom && filterCustom[key]) return;
           if (isProvided(value) && isSafeKey(key)) {
             if (typeof value === "string") {
               filterQuery[key] = {
@@ -248,8 +250,7 @@ async function executeDataKit(input, adapter, item, maxLimit, filterAllowed, que
 }
 async function dataKitServerAction(props) {
   const { input, item, maxLimit = 100, queryAllowed, filterAllowed: explicitFilterAllowed, sortAllowed } = props;
-  const filterCustom = "filterCustom" in props ? props.filterCustom : void 0;
-  const filterAllowed = explicitFilterAllowed ?? (filterCustom ? Object.keys(filterCustom) : void 0);
+  const filterAllowed = explicitFilterAllowed;
   let finalAdapter;
   if ("adapter" in props && props.adapter) {
     finalAdapter = props.adapter;
@@ -436,7 +437,7 @@ var stateToUrlParams = (state) => {
 
 // src/client/hooks/useDataKit.ts
 var useDataKit = (props) => {
-  const { initial = {}, memory: memoryMode = "memory", filterConfig, action, onSuccess, onError, autoFetch = true, debounce: debounceDelay = 300 } = props;
+  const { initial = {}, memory: memoryMode = "memory", filters, action, onSuccess, onError, autoFetch = true, debounce: debounceDelay = 300 } = props;
   const { page: initialPage = 1, limit: initialLimit = 10, sorts: initialSorts = [], filter: initialFilter = {}, query: initialQuery = {} } = initial;
   const [page, setPageState] = React2.useState(initialPage);
   const [limit, setLimitState] = React2.useState(initialLimit);
@@ -454,11 +455,11 @@ var useDataKit = (props) => {
   const actionRef = React2.useRef(action);
   const onSuccessRef = React2.useRef(onSuccess);
   const onErrorRef = React2.useRef(onError);
-  const filterConfigRef = React2.useRef(filterConfig);
+  const filtersRef = React2.useRef(filters);
   actionRef.current = action;
   onSuccessRef.current = onSuccess;
   onErrorRef.current = onError;
-  filterConfigRef.current = filterConfig;
+  filtersRef.current = filters;
   const getInput = React2.useCallback(() => {
     const input = {
       action: "FETCH",
@@ -468,8 +469,11 @@ var useDataKit = (props) => {
       filter: debouncedFilter,
       query
     };
-    if (filterConfigRef.current) {
-      input.filterConfig = filterConfigRef.current;
+    if (filtersRef.current) {
+      input.filterConfig = filtersRef.current.reduce((acc, f) => {
+        if (f.configuration) acc[f.id] = f.configuration;
+        return acc;
+      }, {});
     }
     return input;
   }, [page, limit, sorts, debouncedFilter, query]);
@@ -523,8 +527,8 @@ var useDataKit = (props) => {
     setFilterState((prev) => ({ ...prev, [key]: value }));
     setPageState(1);
   }, []);
-  const setFilters = React2.useCallback((filters) => {
-    setFilterState((prev) => ({ ...prev, ...filters }));
+  const setFilters = React2.useCallback((filters2) => {
+    setFilterState((prev) => ({ ...prev, ...filters2 }));
     setPageState(1);
   }, []);
   const clearFilters = React2.useCallback(() => {
@@ -618,7 +622,10 @@ var useDataKit = (props) => {
     limit,
     sorts,
     filter,
-    filterConfig,
+    filterConfig: filters?.reduce((acc, f) => {
+      if (f.configuration) acc[f.id] = f.configuration;
+      return acc;
+    }, {}),
     query,
     items,
     total,
@@ -951,7 +958,7 @@ function Switch({
     {
       "data-slot": "switch",
       className: cn(
-        "peer data-[state=checked]:bg-gray-900 data-[state=unchecked]:bg-gray-200 dark:data-[state=checked]:bg-gray-100 dark:data-[state=unchecked]:bg-gray-800 focus-visible:ring-black/20 dark:focus-visible:ring-white/20 inline-flex h-[1.15rem] w-8 shrink-0 items-center rounded-full border border-transparent shadow-xs transition-all outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50",
+        "peer data-[state=checked]:bg-primary data-[state=unchecked]:bg-input focus-visible:border-ring focus-visible:ring-ring/50 dark:data-[state=unchecked]:bg-input/80 inline-flex h-[1.15rem] w-8 shrink-0 items-center rounded-full border border-transparent shadow-xs transition-all outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50",
         className
       ),
       ...props,
@@ -960,7 +967,7 @@ function Switch({
         {
           "data-slot": "switch-thumb",
           className: cn(
-            "pointer-events-none block size-4 rounded-full ring-0 transition-transform data-[state=checked]:translate-x-[calc(100%-2px)] data-[state=unchecked]:translate-x-0 bg-white dark:data-[state=unchecked]:bg-gray-100 dark:data-[state=checked]:bg-gray-900"
+            "bg-background dark:data-[state=unchecked]:bg-foreground dark:data-[state=checked]:bg-primary-foreground pointer-events-none block size-4 rounded-full ring-0 transition-transform data-[state=checked]:translate-x-[calc(100%-2px)] data-[state=unchecked]:translate-x-0"
           )
         }
       )
@@ -1258,7 +1265,6 @@ var DataKitRoot = (props) => {
   const {
     action,
     query,
-    filterConfig,
     table: columns,
     filters = [],
     selectable,
@@ -1295,7 +1301,7 @@ var DataKitRoot = (props) => {
   }, [initialState]);
   const dataKit = useDataKit({
     action,
-    filterConfig,
+    filters,
     autoFetch,
     debounce: debounce2,
     memory: memoryMode,
@@ -1519,18 +1525,20 @@ var DataKitRoot = (props) => {
         ] }, rowId);
       }) })
     ] }) }),
-    /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-between", children: [
-      /* @__PURE__ */ jsxRuntime.jsxs("p", { className: "text-sm text-muted-foreground", children: [
-        "Page ",
-        dataKit.page,
-        " of ",
-        pagination.totalPages,
-        selectable?.enabled && selectedCount > 0 && /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "ml-2 text-foreground", children: [
-          "(",
+    /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-between gap-4", children: [
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "min-w-[140px]", children: [
+        /* @__PURE__ */ jsxRuntime.jsxs("p", { className: "text-sm text-muted-foreground", children: [
+          "Page ",
+          dataKit.page,
+          " of ",
+          pagination.totalPages
+        ] }),
+        selectable?.enabled && selectedCount > 0 && /* @__PURE__ */ jsxRuntime.jsxs("p", { className: "text-sm text-foreground", children: [
           selectedCount,
-          " selected)"
+          " selected"
         ] })
       ] }),
+      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex-1" }),
       paginationType === "SIMPLE" ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-1", children: [
         /* @__PURE__ */ jsxRuntime.jsx(
           Button,
@@ -1605,7 +1613,6 @@ var DataKitInner = (props, ref) => {
   const {
     action,
     query,
-    filterConfig,
     filters = [],
     limit: limitConfig,
     defaultSort = [],
@@ -1625,7 +1632,7 @@ var DataKitInner = (props, ref) => {
   const overlayContainer = containerRef.current;
   const dataKit = useDataKit({
     action,
-    filterConfig,
+    filters,
     autoFetch,
     debounce: debounce2,
     memory: memoryMode,