muffin-admin 3.12.2 → 3.12.4

package/dist/utils.d.ts

@@ -23,3 +23,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;

package/dist/utils.js

@@ -55,3 +55,24 @@ export function buildIcon(icon) {
     if (Icon)
         return _jsx(Icon, {});
 }
+function isObject(item) {
+    return item && typeof item === "object" && !Array.isArray(item);
+}
+export function deepMerge(target, ...sources) {
+    if (!sources.length)
+        return target;
+    const source = sources.shift();
+    if (isObject(target) && isObject(source)) {
+        for (const key in source) {
+            if (isObject(source[key])) {
+                if (!target[key])
+                    Object.assign(target, { [key]: {} });
+                deepMerge(target[key], source[key]);
+            }
+            else {
+                Object.assign(target, { [key]: source[key] });
+            }
+        }
+    }
+    return deepMerge(target, ...sources);
+}

package/package.json

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

package/src/MuffinAdmin.tsx

@@ -17,7 +17,7 @@ import {
 import { ConfirmationProvider } from "./common"
 import { useMuffinAdminOpts } from "./hooks"
 import { buildProvider, muffinTranslations } from "./i18n"
-import { buildAdmin, findBuilder, findIcon, setupAdmin } from "./utils"
+import { buildAdmin, deepMerge, findBuilder, findIcon, setupAdmin } from "./utils"
 
 export function MuffinAdmin(props: AdminProps) {
   const opts = useMuffinAdminOpts()
@@ -29,7 +29,7 @@ export function MuffinAdmin(props: AdminProps) {
       ? Object.fromEntries(
           Object.entries(muffinTranslations).map(([locale, messages]) => [
             locale,
-            { ...messages, ...backendLocales[locale], ...(buildAdmin(["locale", locale]) || {}) },
+            deepMerge({}, messages, backendLocales[locale], buildAdmin(["locale", locale]) || {}),
           ])
         )
       : muffinTranslations

package/src/actions/LinkAction.tsx

@@ -3,7 +3,7 @@ import LinkButton from "../buttons/LinkButton"
 import { useMuffinAdminOpts } from "../hooks"
 import { AdminShowLink } from "../types"
 
-export function LinkAction({ field, icon, ...props }: AdminShowLink & { resource: string }) {
+export function LinkAction({ field, icon, label, ...props }: AdminShowLink & { resource: string }) {
   const { resources } = useMuffinAdminOpts()
   const record = useRecordContext()
   const currentResource = useResourceContext()
@@ -15,6 +15,7 @@ export function LinkAction({ field, icon, ...props }: AdminShowLink & { resource
     <LinkButton
       {...props}
       icon={icon || resource?.icon}
+      label={label || `resources.${props.resource}.name`}
       filters={{ [currentResource]: encodeURIComponent(record[field || "id"]) }}
     />
   )

package/src/utils.tsx

@@ -64,3 +64,24 @@ export function buildIcon(icon?: string) {
   const Icon = findIcon(icon)
   if (Icon) return <Icon />
 }
+
+function isObject(item: any) {
+  return item && typeof item === "object" && !Array.isArray(item)
+}
+
+export function deepMerge(target: any, ...sources: any[]): any {
+  if (!sources.length) return target
+  const source = sources.shift()
+
+  if (isObject(target) && isObject(source)) {
+    for (const key in source) {
+      if (isObject(source[key])) {
+        if (!target[key]) Object.assign(target, { [key]: {} })
+        deepMerge(target[key], source[key])
+      } else {
+        Object.assign(target, { [key]: source[key] })
+      }
+    }
+  }
+  return deepMerge(target, ...sources)
+}