fix e2e

premieroctet · Dec 11, 2024 · cba1d26 · cba1d26
1 parent 78e6128
commit cba1d26
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 8 deletions.
diff --git a/apps/docs/pages/changelog/_meta.js → apps/docs/pages/changelog/_meta.ts b/apps/docs/pages/changelog/_meta.js → apps/docs/pages/changelog/_meta.ts
diff --git a/apps/docs/pages/v4/docs/_meta.js → apps/docs/pages/v4/docs/_meta.ts b/apps/docs/pages/v4/docs/_meta.js → apps/docs/pages/v4/docs/_meta.ts
diff --git a/apps/docs/pages/v4/docs/api/_meta.js → apps/docs/pages/v4/docs/api/_meta.ts b/apps/docs/pages/v4/docs/api/_meta.js → apps/docs/pages/v4/docs/api/_meta.ts
diff --git a/apps/example/options.tsx b/apps/example/options.tsx
@@ -58,7 +58,7 @@ export const options: NextAdminOptions = {
           birthDate: {
             formatter: (date, context) => {
               return new Date(date as unknown as string)
-                ?.toLocaleString(context?.locale)
+                ?.toLocaleString(context?.locale ?? "en")
                 .split(/[\s,]+/)[0];
             },
           },

diff --git a/apps/example/pageRouterOptions.tsx b/apps/example/pageRouterOptions.tsx
@@ -35,8 +35,9 @@ export const options: NextAdminOptions = {
           },
           birthDate: {
             formatter: (date, context) => {
+              console.log("context", context);
               return new Date(date as unknown as string)
-                ?.toLocaleString(context?.locale)
+                ?.toLocaleString(context?.locale ?? "fr")
                 .split(" ")[0];
             },
           },

diff --git a/packages/next-admin/src/components/Cell.tsx b/packages/next-admin/src/components/Cell.tsx
@@ -3,18 +3,18 @@ import React, { ReactNode } from "react";
 import clsx from "clsx";
 import Link from "next/link";
 import { useConfig } from "../context/ConfigContext";
-import { ListDataFieldValue } from "../types";
+import { ListDataFieldValue, NextAdminContext } from "../types";
 import { getDisplayedValue } from "../utils/tools";
 import Clipboard from "./common/Clipboard";
 
 type Props = {
   cell: ListDataFieldValue;
-  formatter?: (cell: any) => ReactNode;
+  formatter?: (cell: any, context?: NextAdminContext) => ReactNode;
   copyable?: boolean;
 };
 
 export default function Cell({ cell, formatter, copyable }: Props) {
-  const { basePath } = useConfig();
+  const { basePath, nextAdminContext } = useConfig();
 
   let cellValue = cell?.__nextadmin_formatted;
 
@@ -34,7 +34,7 @@ export default function Cell({ cell, formatter, copyable }: Props) {
       );
     } else if (typeof cell === "object" && !isReactNode(cellValue)) {
       if (formatter) {
-        cellValue = formatter(cell?.value);
+        cellValue = formatter(cell?.value, nextAdminContext);
       }
 
       if (cell.type === "link") {

diff --git a/packages/next-admin/src/components/MainLayout.tsx b/packages/next-admin/src/components/MainLayout.tsx
@@ -42,6 +42,7 @@ export const MainLayout = ({
       resource={resource}
       resourcesIdProperty={resourcesIdProperty!}
       schema={schema}
+      nextAdminContext={{ locale }}
     >
       <I18nProvider translations={mergedTranslations}>
         <ThemeProvider

diff --git a/packages/next-admin/src/context/ConfigContext.tsx b/packages/next-admin/src/context/ConfigContext.tsx
@@ -1,6 +1,11 @@
 "use client";
 import React, { useContext, useMemo } from "react";
-import { ModelName, NextAdminOptions, Schema } from "../types";
+import {
+  ModelName,
+  NextAdminContext,
+  NextAdminOptions,
+  Schema,
+} from "../types";
 
 export type ConfigContextType = {
   options?: NextAdminOptions;
@@ -10,6 +15,7 @@ export type ConfigContextType = {
   resource?: ModelName;
   resourcesIdProperty: Record<ModelName, string> | null;
   schema: Schema;
+  nextAdminContext?: NextAdminContext;
 };
 
 const ConfigContext = React.createContext<ConfigContextType>(
@@ -25,6 +31,7 @@ type ProviderProps = {
   resource?: ModelName;
   resourcesIdProperty: Record<ModelName, string> | null;
   schema: Schema;
+  nextAdminContext?: NextAdminContext;
 };
 
 export const ConfigProvider = ({ children, ...props }: ProviderProps) => {

diff --git a/packages/next-admin/src/types.ts b/packages/next-admin/src/types.ts
@@ -920,7 +920,7 @@ export type SubmitFormResult = {
 };
 
 export type NextAdminContext = {
-  locale?: string;
+  locale?: string | null;
   row?: any;
 };