From 837b0a3d43c08c0ab7ed4b02820f8115b006237d Mon Sep 17 00:00:00 2001 From: dswbx Date: Fri, 21 Feb 2025 11:12:58 +0100 Subject: [PATCH] fix ManyToManyRelation to respect `select` from `with` query --- app/src/App.ts | 4 +++- app/src/data/relations/ManyToManyRelation.ts | 2 +- app/src/data/server/data-query-impl.ts | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/App.ts b/app/src/App.ts index 868b11a..8765a13 100644 --- a/app/src/App.ts +++ b/app/src/App.ts @@ -1,4 +1,3 @@ -import { Api, type ApiOptions } from "Api"; import type { CreateUserPayload } from "auth/AppAuth"; import { $console } from "core"; import { Event } from "core/events"; @@ -15,6 +14,9 @@ import * as SystemPermissions from "modules/permissions"; import { AdminController, type AdminControllerOptions } from "modules/server/AdminController"; import { SystemController } from "modules/server/SystemController"; +// biome-ignore +import { Api, type ApiOptions } from "Api"; + export type AppPlugin = (app: App) => Promise | void; abstract class AppEvent extends Event<{ app: App } & A> {} diff --git a/app/src/data/relations/ManyToManyRelation.ts b/app/src/data/relations/ManyToManyRelation.ts index f96ab74..3f5f20c 100644 --- a/app/src/data/relations/ManyToManyRelation.ts +++ b/app/src/data/relations/ManyToManyRelation.ts @@ -143,7 +143,7 @@ export class ManyToManyRelation extends EntityRelation { - const select: any[] = other.entity.getSelect(other.entity.name); + const select: any[] = []; if (additionalFields.length > 0) { const conn = this.connectionEntity.name; select.push( diff --git a/app/src/data/server/data-query-impl.ts b/app/src/data/server/data-query-impl.ts index 5507c3c..ba72c40 100644 --- a/app/src/data/server/data-query-impl.ts +++ b/app/src/data/server/data-query-impl.ts @@ -82,7 +82,6 @@ export const withSchema = (Self: TSelf) => // { "images": {} } if (!Array.isArray(value) && isObject(value)) { - console.log("is object"); return value as RepoWithSchema; }