Merge pull request #282 from premieroctet/changeset-release/main

Version Packages
premieroctet · May 17, 2024 · 6b14540 · 6b14540
2 parents 23786c5 + f2551a3
commit 6b14540
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 2 deletions.
diff --git a/packages/next-admin/CHANGELOG.md b/packages/next-admin/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @premieroctet/next-admin
 
+## 4.2.2
+
+### Patch Changes
+
+- 6cd3362: Add slug inside breadcrumb (#263)
+
 ## 4.2.1
 
 ### Patch Changes

diff --git a/packages/next-admin/package.json b/packages/next-admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@premieroctet/next-admin",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "license": "MIT",

diff --git a/packages/next-admin/src/components/Form.tsx b/packages/next-admin/src/components/Form.tsx
@@ -78,6 +78,7 @@ export type FormProps = {
   schema: any;
   dmmfSchema: readonly Prisma.DMMF.Field[];
   resource: ModelName;
+  slug?: string;
   validation?: PropertyValidationError[];
   action?: (formData: FormData) => Promise<SubmitFormResult | undefined>;
   title: string;
@@ -107,6 +108,7 @@ const Form = ({
   schema,
   dmmfSchema,
   resource,
+  slug,
   validation: validationProp,
   action,
   title,
@@ -479,7 +481,7 @@ const Form = ({
 
   if (edit && id) {
     breadcrumItems.push({
-      label: id.toString(),
+      label: slug ?? id.toString(),
       href: `${basePath}/${slugify(resource)}/${id}`,
       current: true,
     });

diff --git a/packages/next-admin/src/components/NextAdmin.tsx b/packages/next-admin/src/components/NextAdmin.tsx
@@ -15,6 +15,7 @@ export function NextAdmin({
   resource,
   schema,
   resources,
+  slug,
   message,
   error,
   total,
@@ -79,6 +80,7 @@ export function NextAdmin({
       return (
         <Form
           data={data}
+          slug={slug}
           schema={modelSchema}
           dmmfSchema={dmmfSchema!}
           resource={resource!}

diff --git a/packages/next-admin/src/types.ts b/packages/next-admin/src/types.ts
@@ -548,6 +548,7 @@ export type AdminComponentProps = {
   schema?: Schema;
   data?: ListData<ModelName>;
   resource?: ModelName;
+  slug?: string;
   /**
    * Page router only
    */

diff --git a/packages/next-admin/src/utils/props.ts b/packages/next-admin/src/utils/props.ts
@@ -26,6 +26,7 @@ import {
   getResourceFromParams,
   getResourceIdFromParam,
   getResources,
+  getToStringForModel,
   transformData,
   transformSchema,
 } from "./server";
@@ -273,11 +274,18 @@ export async function getPropsFromParams({
           }
         });
 
+        const toStringFunction = getToStringForModel(
+          options?.model?.[resource]
+        );
+        const slug = toStringFunction
+          ? toStringFunction(data)
+          : resourceId.toString();
         data = transformData(data, resource, edit, options);
         return {
           ...defaultProps,
           resource,
           data,
+          slug,
           schema: deepCopySchema,
           dmmfSchema: dmmfSchema?.fields,
           customInputs,

diff --git a/packages/next-admin/src/utils/server.ts b/packages/next-admin/src/utils/server.ts
@@ -8,6 +8,7 @@ import {
   EditOptions,
   Enumeration,
   Field,
+  Model,
   ModelName,
   ModelWithoutRelationships,
   NextAdminOptions,
@@ -78,6 +79,17 @@ export const getToStringForRelations = <M extends ModelName>(
   return toStringForRelations;
 };
 
+export const getToStringForModel = <M extends ModelName>(
+  options: Required<NextAdminOptions>["model"][M]
+): ((item: Model<M>) => string) | undefined => {
+  const nonCheckedToString = options?.toString;
+  const toStringForRelations =
+    nonCheckedToString && !isNativeFunction(nonCheckedToString)
+      ? nonCheckedToString
+      : undefined;
+  return toStringForRelations;
+};
+
 /**
  * Order the fields in the schema according to the display option
  *