Merge pull request #111 from premieroctet/fix/search-select

Fix enum search select
premieroctet · Jan 15, 2024 · 470cd9a · 470cd9a
2 parents 4cac944 + 821baf5
commit 470cd9a
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git a/.changeset/brown-apricots-beg.md b/.changeset/brown-apricots-beg.md
@@ -0,0 +1,5 @@
+---
+"@premieroctet/next-admin": patch
+---
+
+Add limit of 20 items on select for relationship
diff --git a/.changeset/fifty-mice-type.md b/.changeset/fifty-mice-type.md
@@ -0,0 +1,5 @@
+---
+"@premieroctet/next-admin": patch
+---
+
+Fix search in enumeration selector
diff --git a/packages/next-admin/src/utils/props.ts b/packages/next-admin/src/utils/props.ts
@@ -24,6 +24,7 @@ import {
   transformData,
   transformSchema,
 } from "./server";
+import { cloneDeep } from "lodash";
 
 export type GetPropsFromParamsParams = {
   params?: string[];
@@ -154,15 +155,17 @@ export async function getPropsFromParams({
       const edit = options?.model?.[resource]?.edit as EditOptions<
         typeof resource
       >;
-      schema = transformSchema(schema, resource, edit);
-      schema = await fillRelationInSchema(
-        schema,
+
+      let deepCopySchema = cloneDeep(schema);
+      deepCopySchema = transformSchema(deepCopySchema, resource, edit);
+      deepCopySchema = await fillRelationInSchema(
+        deepCopySchema,
         prisma,
         resource,
         searchParams,
         options,
       );
-      schema = orderSchema(schema, resource, options);
+      deepCopySchema = orderSchema(deepCopySchema, resource, options);
 
       const customInputs = isAppDir
         ? getCustomInputs(resource, options)
@@ -188,7 +191,7 @@ export async function getPropsFromParams({
           ...defaultProps,
           resource,
           data,
-          schema,
+          schema: deepCopySchema,
           dmmfSchema: dmmfSchema?.fields,
           customInputs,
           actions: isAppDir ? actions : undefined,
@@ -199,7 +202,7 @@ export async function getPropsFromParams({
         return {
           ...defaultProps,
           resource,
-          schema,
+          schema: deepCopySchema,
           dmmfSchema: dmmfSchema?.fields,
           customInputs,
         };

diff --git a/packages/next-admin/src/utils/server.ts b/packages/next-admin/src/utils/server.ts
@@ -130,7 +130,14 @@ export const fillRelationInSchema = async (
           fieldValue.enum = fieldValue.enum?.map((item) =>
             typeof item !== "object" ? { label: item, value: item } : item
           );
+          const search = requestOptions[`${fieldName}search`];
+          if (search) {
+            fieldValue.enum = fieldValue.enum?.filter((item: any) =>
+              item.label.toLowerCase().includes(search.toLowerCase())
+            );
+          }
         }
+
         if (fieldValue?.default) {
           fieldValue.default = typeof fieldValue.default !== "object" ? { label: fieldValue.default, value: fieldValue.default } : fieldValue.default;
         }
@@ -160,6 +167,7 @@ export const fillRelationInSchema = async (
             // @ts-expect-error
             .findMany({
               where,
+              take: 20,
             })
             .then((data: any[]) =>
               data.forEach((item) => {
@@ -195,6 +203,7 @@ export const fillRelationInSchema = async (
               // @ts-expect-error
               .findMany({
                 where,
+                take: 20,
               })
               .then((data: any[]) =>
                 data.forEach((item) => {