Skip to content

fix: avoid fetching list relation records in list view #665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zengraf wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: avoid fetching list relation records in list view #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/tender-experts-stop.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@premieroctet/next-admin": patch
---

fix: avoid fetching list relation records in list view, only count is needed
42 changes: 22 additions & 20 deletions packages/next-admin/src/utils/prisma.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ const preparePrismaListRequest = async <M extends ModelName>(
let select: Select<M> | undefined;
let where = {};
const list = options?.model?.[resource]?.list as ListOptions<M>;
select = selectPayloadForModel(resource, list, "object");
select = selectPayloadForModel(resource, list, "object", "list");
where = createWherePredicate({
resource,
options,
Expand Down Expand Up @@ -715,7 +715,8 @@ const isVirtualField = <M extends ModelName>(
export const selectPayloadForModel = <M extends ModelName>(
resource: M,
options?: EditOptions<M> | ListOptions<M>,
level: "scalar" | "object" = "scalar"
level: "scalar" | "object" = "scalar",
context: "list" | "edit" = "edit"
) => {
const model = getSchema().definitions[
resource
Expand Down Expand Up @@ -753,33 +754,34 @@ export const selectPayloadForModel = <M extends ModelName>(
!displayKeys
) {
if (fieldNextAdmin?.kind === "object" && level === "object") {
if (fieldNextAdmin?.isList) {
if (fieldNextAdmin?.isList && context === "list") {
const countFields = acc["_count"]?.select ?? {};
acc["_count"] = {
select: {
...countFields,
[name]: true,
},
};
}
acc[name] = {
select: selectPayloadForModel(
fieldNextAdmin.type as ModelName,
{},
"scalar"
),
};
} else {
acc[name] = {
select: selectPayloadForModel(
fieldNextAdmin.type as ModelName,
{},
"scalar"
),
};

const orderField =
(options as EditOptions<M>)?.fields?.[
name as Field<M>
// @ts-expect-error
]?.orderField || (options as ListOptions<M>)?.orderField;
const orderField =
(options as EditOptions<M>)?.fields?.[
name as Field<M>
// @ts-expect-error
]?.orderField || (options as ListOptions<M>)?.orderField;

if (orderField) {
acc[name].orderBy = {
[orderField]: "asc",
};
if (orderField) {
acc[name].orderBy = {
[orderField]: "asc",
};
}
}
} else {
acc[name] = true;
Expand Down