muffin-admin 8.5.5 → 8.5.6

package/dist/utils.d.ts

@@ -25,3 +25,4 @@ export declare function makeRequest(url: string, params?: APIParams): Promise<{
 export declare function findIcon(icon?: string): any;
 export declare function buildIcon(icon?: string): import("react/jsx-runtime").JSX.Element;
 export declare function deepMerge(target: any, ...sources: any[]): any;
+export declare function prepareFilters(filter: any): string;

package/dist/utils.js

@@ -76,3 +76,9 @@ export function deepMerge(target, ...sources) {
     }
     return deepMerge(target, ...sources);
 }
+export function prepareFilters(filter) {
+    return JSON.stringify(Object.entries(filter).reduce((acc, [key, value]) => {
+        acc[key] = Array.isArray(value) ? { $in: value } : value;
+        return acc;
+    }, {}));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muffin-admin",
-  "version": "8.5.5",
+  "version": "8.5.6",
   "description": "NPM package for https://github.com/klen/muffin-admin",
   "files": [
     "src",

package/src/buttons/ActionButton.tsx

@@ -17,7 +17,7 @@ import { HelpLink } from "../common/HelpLink"
 import { useMuffinAdminOpts } from "../hooks"
 import { useAction } from "../hooks/useAction"
 import { AdminAction, AdminPayloadProps } from "../types"
-import { buildIcon, findBuilder, requestHeaders } from "../utils"
+import { buildIcon, findBuilder, prepareFilters, requestHeaders } from "../utils"
 
 export type ActionPayloadProps = {
   active: boolean
@@ -38,9 +38,9 @@ export function ActionButton({ paths, confirm, file, ...props }: AdminAction) {
   const confirmMessage =
     typeof confirm === "string" ? translate(confirm) : "Do you confirm this action?"
 
-  const onHandle = async (payload?) => {
+  const onHandle = async (payload?: any) => {
     const process = confirm ? await confirmation.confirm({ message: confirmMessage }) : true
-    if (process) await mutate({ record, payload })
+    if (process) mutate({ record, payload })
   }
 
   return <ActionButtonBase {...props} isPending={isPending} onHandle={onHandle} />
@@ -200,7 +200,7 @@ function FileButton({
   if (record) url = url.replace("{id}", record.id as string)
   const authorization = requestHeaders["Authorization"]
   if (authorization) url += `&t=${authorization}`
-  if (Object.keys(filterValues).length) url += `&where=${JSON.stringify(filterValues)}`
+  if (Object.keys(filterValues).length) url += `&where=${prepareFilters(filterValues)}`
 
   return (
     <Button href={url} label={label} component={Link}>

package/src/dataprovider.ts

@@ -1,5 +1,5 @@
 import { TID } from "./types"
-import { APIParams, makeRequest, setupAdmin } from "./utils"
+import { APIParams, makeRequest, prepareFilters, setupAdmin } from "./utils"
 
 export function MuffinDataprovider(apiUrl: string) {
   async function request(url: string, options?: APIParams) {
@@ -13,14 +13,7 @@ export function MuffinDataprovider(apiUrl: string) {
     getList: async (resource: string, params: any) => {
       const { filter, pagination, sort } = params
       const query: APIParams["query"] = {}
-      if (filter) {
-        query.where = JSON.stringify(
-          Object.entries(filter).reduce((acc, [key, value]) => {
-            acc[key] = Array.isArray(value) ? { $in: value } : value
-            return acc
-          }, {})
-        )
-      }
+      if (filter) query.where = prepareFilters(filter)
       if (pagination) {
         const { page, perPage: limit } = pagination
         query.limit = limit

package/src/i18n/ru.ts

@@ -9,4 +9,6 @@ const muffinRussianMessages = {
   },
 } as unknown as TranslationMessages
 
+muffinRussianMessages.ra.action.edit = "Изменить"
+
 export default muffinRussianMessages

package/src/index.tsx

@@ -36,4 +36,4 @@ export async function initAdmin(prefix = "", containerId: string = "root") {
   )
 }
 
-export const VERSION = "8.5.5"
+export const VERSION = "8.5.6"

package/src/utils.tsx

@@ -86,3 +86,12 @@ export function deepMerge(target: any, ...sources: any[]): any {
   }
   return deepMerge(target, ...sources)
 }
+
+export function prepareFilters(filter: any) {
+  return JSON.stringify(
+    Object.entries(filter).reduce((acc, [key, value]) => {
+      acc[key] = Array.isArray(value) ? { $in: value } : value
+      return acc
+    }, {})
+  )
+}