muffin-admin 3.10.0 → 3.11.0

package/dist/types.d.ts

@@ -94,5 +94,6 @@ export type AdminOpts = {
     dashboard: AdminDashboardBlock[] | AdminDashboardBlock;
     resources: AdminResourceProps[];
     help?: string;
+    locales: Record<string, Record<string, any>>;
     version: string;
 };

package/package.json

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

package/src/MuffinAdmin.tsx

@@ -16,14 +16,26 @@ import {
 
 import { ConfirmationProvider } from "./common"
 import { useMuffinAdminOpts } from "./hooks"
-import { muffinI18nProvider } from "./i18n"
+import { buildProvider, muffinTranslations } from "./i18n"
 import { buildAdmin, findBuilder, findIcon, setupAdmin } from "./utils"
 
 export function MuffinAdmin(props: AdminProps) {
   const opts = useMuffinAdminOpts()
-  const { resources = [], auth, adminProps, apiUrl } = opts
+  const { resources = [], auth, adminProps, apiUrl, locales } = opts
 
   document.title = adminProps?.title || "Muffin Admin"
+  const muffinI18nProvider = buildProvider(
+    locales
+      ? Object.fromEntries(
+          Object.entries(muffinTranslations).map(([locale, messages]) => [
+            locale,
+            { ...messages, ...locales[locale] },
+          ])
+        )
+      : muffinTranslations
+  )
+
+  console.log(999, muffinI18nProvider.getLocale())
 
   const {
     basename,

package/src/MuffinResourceList.tsx

@@ -80,8 +80,8 @@ function MuffinListToolbar() {
   const actions = baseActions.filter((a) => a.view.includes("list"))
   return (
     <TopToolbar>
-      <SelectColumnsButton />
       {help && <HelpLink href={help} />}
+      <SelectColumnsButton />
       <FilterButton />
       {actions.length ? actions.map((props) => <ActionButton key={props.id} {...props} />) : null}
       {create && <CreateButton />}

package/src/hooks/index.ts

@@ -1,3 +1,4 @@
 export * from "./useAction"
+export * from "./useForceUpdate"
 export * from "./useMuffinAdminOpts"
 export * from "./useMuffinResourceOpts"

package/src/hooks/useForceUpdate.ts

@@ -0,0 +1,6 @@
+import { useState } from "react"
+
+export function useForceUpdate() {
+  const [, setTick] = useState(0)
+  return () => setTick((tick) => tick + 1)
+}

package/src/i18n/en.ts

@@ -1,4 +1,8 @@
-const muffinEnglishMessages = {
+import { TranslationMessages } from "ra-core"
+import raEnglishMessages from "ra-language-english"
+
+const muffinEnglishMessages: TranslationMessages = {
+  ...raEnglishMessages,
   muffin: {
     instructions: "Instructions",
     how_to_use_admin: "How to use Admin?",

package/src/i18n/index.ts

@@ -1 +1,3 @@
+export * from "./en"
 export * from "./provider"
+export * from "./ru"

package/src/i18n/provider.ts

@@ -1,21 +1,23 @@
 import polyglotI18nProvider from "ra-i18n-polyglot"
-import raEnglishMessages from "ra-language-english"
-import raRussianMessages from "ra-language-russian"
 import { resolveBrowserLocale } from "react-admin"
 import muffinEnglishMessages from "./en"
 import muffinRussianMessages from "./ru"
 
-const translations = {
-  en: { ...raEnglishMessages, ...muffinEnglishMessages },
-  ru: { ...raRussianMessages, ...muffinRussianMessages },
+export const muffinTranslations = {
+  en: muffinEnglishMessages,
+  ru: muffinRussianMessages,
 }
 
-export const muffinI18nProvider = polyglotI18nProvider(
-  (locale) => (translations[locale] ? translations[locale] : translations.en),
-  resolveBrowserLocale(),
-  [
-    { locale: "en", name: "English" },
-    { locale: "ru", name: "Русский" },
-  ],
-  { allowMissing: true }
-)
+const defaultLocale = "en"
+
+export const buildProvider = (translations) => {
+  return polyglotI18nProvider(
+    (locale) => (translations[locale] ? translations[locale] : translations[defaultLocale]),
+    resolveBrowserLocale(),
+    [
+      { locale: "en", name: "English" },
+      { locale: "ru", name: "Русский" },
+    ],
+    { allowMissing: true }
+  )
+}

package/src/i18n/ru.ts

@@ -1,4 +1,8 @@
-const muffinRussianMessages = {
+import { TranslationMessages } from "ra-core"
+import raRussianMessages from "ra-language-russian"
+
+const muffinRussianMessages: TranslationMessages = {
+  ...raRussianMessages,
   muffin: {
     instructions: "Инструкции",
     how_to_use_admin: "Как использовать админку?",

package/src/types.ts

@@ -15,7 +15,7 @@ export type AdminAction = {
 }
 
 export type AdminField = [string, { source: string }]
-export type AdminInput = [string, { required: boolean; source: string;[key: string]: any }]
+export type AdminInput = [string, { required: boolean; source: string; [key: string]: any }]
 
 export type AdminShowLink = {
   label: string
@@ -46,11 +46,11 @@ export type AdminResourceProps = {
   actions: AdminAction[]
   create: AdminInput[] | false
   edit:
-  | {
-    inputs: AdminInput[]
-    remove?: boolean
-  }
-  | false
+    | {
+        inputs: AdminInput[]
+        remove?: boolean
+      }
+    | false
   list: {
     limit: number
     limitMax: number
@@ -96,5 +96,6 @@ export type AdminOpts = {
   dashboard: AdminDashboardBlock[] | AdminDashboardBlock
   resources: AdminResourceProps[]
   help?: string
+  locales: Record<string, Record<string, any>>
   version: string
 }