The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
[BREAKING CHANGE] refactor(server): migrate the metadata API off nestjs-query (#23925)
Abdul Rahmanabe3b2d57019
diff --git a/.github/dependabot.yml b/.github/dependabot.ymlindex 55c35911d5d..13281a9fe25 100644--- a/.github/dependabot.yml+++ b/.github/dependabot.yml@@ -16,7 +16,6 @@ updates:ignore:- dependency-name: "@graphql-yoga/nestjs"- dependency-name: "@nestjs/graphql"- - dependency-name: "@ptc-org/nestjs-query-graphql"- dependency-name: "typeorm"# chokidar is pinned to v3 via a resolution: v4+ dropped native macOS# FSEvents and hits EMFILE on a repo this size (see #20316)diff --git a/.yarn/patches/@ptc-org-nestjs-query-graphql-npm-9.4.0-8e6f7894e1.patch b/.yarn/patches/@ptc-org-nestjs-query-graphql-npm-9.4.0-8e6f7894e1.patchdeleted file mode 100644index 79f9069cac0..00000000000--- a/.yarn/patches/@ptc-org-nestjs-query-graphql-npm-9.4.0-8e6f7894e1.patch+++ /dev/null@@ -1,73 +0,0 @@-diff --git a/src/common/external.utils.js b/src/common/external.utils.js-index 1b4ee1bae8436551447e3b03c9f749f172962539..d00a94b0ce38c13cb09423c1dc72c9101b02cba1 100644---- a/src/common/external.utils.js-+++ b/src/common/external.utils.js-@@ -5,7 +5,7 @@ exports.getGraphqlObjectMetadata = getGraphqlObjectMetadata;- exports.getGraphqlObjectName = getGraphqlObjectName;- exports.getGraphqlEnumMetadata = getGraphqlEnumMetadata;- const graphql_1 = require("@nestjs/graphql");--const lazy_metadata_storage_1 = require("@nestjs/graphql/dist/schema-builder/storages/lazy-metadata.storage");-+const lazy_metadata_storage_1 = require("@nestjs/graphql/dist/schema-builder/storages/lazy-metadata.storage.js");- const type_errors_1 = require("../types/type.errors");- /**- * @internal-diff --git a/src/types/connection/cursor/page-info.type.js b/src/types/connection/cursor/page-info.type.js-index 00d836d0b67fba6daae736e4e99d5af2903d1258..c73dd1304611b61f938b75c01f18dbb1edd9ecb4 100644---- a/src/types/connection/cursor/page-info.type.js-+++ b/src/types/connection/cursor/page-info.type.js-@@ -39,7 +39,6 @@ const getOrCreatePageInfoType = () => {- tslib_1.__metadata("design:type", String)- ], PageInfoTypeImpl.prototype, "endCursor", void 0);- PageInfoTypeImpl = tslib_1.__decorate([-- (0, graphql_1.Directive)('@shareable'),- (0, graphql_1.ObjectType)('PageInfo'),- tslib_1.__metadata("design:paramtypes", [Boolean, Boolean, String, String])- ], PageInfoTypeImpl);-diff --git a/src/types/connection/offset/offset-connection.type.js b/src/types/connection/offset/offset-connection.type.js-index e89e5ab573572325aaad024827193e7d06f4e5ba..2878acae20c1367622530c4ea96a76062a84cada 100644---- a/src/types/connection/offset/offset-connection.type.js-+++ b/src/types/connection/offset/offset-connection.type.js-@@ -64,7 +64,6 @@ function getOrCreateOffsetConnectionType(TItemClass, opts) {- tslib_1.__metadata("design:paramtypes", [])- ], AbstractConnection.prototype, "totalCount", null);- AbstractConnection = AbstractConnection_1 = tslib_1.__decorate([-- (0, graphql_1.Directive)('@shareable'),- (0, graphql_1.ObjectType)(connectionName),- tslib_1.__metadata("design:paramtypes", [Object, Array, Function])- ], AbstractConnection);-diff --git a/src/types/connection/offset/offset-page-info.type.js b/src/types/connection/offset/offset-page-info.type.js-index 480330653efc3def8423adbc95d1009d02aa9778..ea55bcf2e45a05a2ba32d0f4185a15abac59d478 100644---- a/src/types/connection/offset/offset-page-info.type.js-+++ b/src/types/connection/offset/offset-page-info.type.js-@@ -25,7 +25,6 @@ const getOrCreateOffsetPageInfoType = () => {- tslib_1.__metadata("design:type", Boolean)- ], PageInfoTypeImpl.prototype, "hasPreviousPage", void 0);- PageInfoTypeImpl = tslib_1.__decorate([-- (0, graphql_1.Directive)('@shareable'),- (0, graphql_1.ObjectType)('OffsetPageInfo'),- tslib_1.__metadata("design:paramtypes", [Boolean, Boolean])- ], PageInfoTypeImpl);-diff --git a/src/types/delete-many-reponse.type.js b/src/types/delete-many-reponse.type.js-index 4de72de3822d9c23c6637bbec0f0be081cc82675..1663e6f62991153f89db08ab966cdef8e01b262f 100644---- a/src/types/delete-many-reponse.type.js-+++ b/src/types/delete-many-reponse.type.js-@@ -16,7 +16,6 @@ const DeleteManyResponseType = () => {- tslib_1.__metadata("design:type", Number)- ], DeleteManyResponseTypeImpl.prototype, "deletedCount", void 0);- DeleteManyResponseTypeImpl = tslib_1.__decorate([-- (0, graphql_1.Directive)('@shareable'),- (0, graphql_1.ObjectType)('DeleteManyResponse')- ], DeleteManyResponseTypeImpl);- deleteManyResponseType = DeleteManyResponseTypeImpl;-diff --git a/src/types/update-many-response.type.js b/src/types/update-many-response.type.js-index c525d1419e27d3714e7a75b4852e605b83bd4b39..a067b5f60922b7e92e985487c7128efe31162b24 100644---- a/src/types/update-many-response.type.js-+++ b/src/types/update-many-response.type.js-@@ -16,7 +16,6 @@ const UpdateManyResponseType = () => {- tslib_1.__metadata("design:type", Number)- ], UpdateManyResponseTypeImpl.prototype, "updatedCount", void 0);- UpdateManyResponseTypeImpl = tslib_1.__decorate([-- (0, graphql_1.Directive)('@shareable'),- (0, graphql_1.ObjectType)('UpdateManyResponse')- ], UpdateManyResponseTypeImpl);- updateManyResponseType = UpdateManyResponseTypeImpl;diff --git a/.yarn/patches/@ptc-org-nestjs-query-typeorm-npm-9.4.0-ca3414967e.patch b/.yarn/patches/@ptc-org-nestjs-query-typeorm-npm-9.4.0-ca3414967e.patchdeleted file mode 100644index dbc4836af75..00000000000--- a/.yarn/patches/@ptc-org-nestjs-query-typeorm-npm-9.4.0-ca3414967e.patch+++ /dev/null@@ -1,47 +0,0 @@-diff --git a/src/query/relation-query.builder.js b/src/query/relation-query.builder.js-index 36deb6bd2758539241262e386da6ebed3b6cc838..d204807419cd641daf5cdf1ba408d48fd87a1cb2 100644---- a/src/query/relation-query.builder.js-+++ b/src/query/relation-query.builder.js-@@ -38,7 +38,20 @@ class RelationQueryBuilder {- qb = this.filterQueryBuilder.applyRelationJoinsRecursive(qb, this.filterQueryBuilder.getReferencedRelationsWithAliasRecursive(this.relationRepo.metadata, query.filter, query.relations), query.relations);- qb = this.filterQueryBuilder.applyFilter(qb, query.filter, qb.alias);- qb = this.filterQueryBuilder.applySorting(qb, query.sorting, qb.alias);-- qb = this.filterQueryBuilder.applyPaging(qb, query.paging);-+ // Paging is per-parent, but this query is batched across all parents:-+ // applying LIMIT here truncates the combined result set (and with no-+ // ORDER BY, arbitrary parents silently lose rows). Only apply it when-+ // the batch has a single parent; multi-parent batches are paged-+ // per-parent in batchQueryRelations after mapRelations. The fetch-+ // stays bounded with parents * (offset + limit) — the upper bound a-+ // correct per-parent pager can need; a SQL-side per-parent quota-+ // (ROW_NUMBER() OVER (PARTITION BY parent)) belongs upstream.-+ if (entities.length === 1) {-+ qb = this.filterQueryBuilder.applyPaging(qb, query.paging);-+ }-+ else if (query.paging?.limit !== undefined) {-+ qb = qb.limit(entities.length * ((query.paging.offset ?? 0) + query.paging.limit));-+ }- if (this.relationRepo.metadata.deleteDateColumn?.propertyName && !withDeleted) {- qb = qb.andWhere(`${qb.alias}.${this.relationRepo.metadata.deleteDateColumn.propertyName} IS NULL`);- }-diff --git a/src/services/relation-query.service.js b/src/services/relation-query.service.js-index 91f7b4a83a5e0cdcd1b23b52fdf2fe6c587f7035..d36b7c3c06d5d76f86ba5fdd42b3be49a9dc4b8a 100644---- a/src/services/relation-query.service.js-+++ b/src/services/relation-query.service.js-@@ -167,7 +167,15 @@ class RelationQueryService {- const results = new Map();- for (const entity of entities) {- const relations = relationQueryBuilder.relationMeta.mapRelations(entity, entityRelations.entities, entityRelations.raw);-- results.set(entity, await assembler.convertToDTOs(relations));-+ // batchSelect skips LIMIT/OFFSET for multi-parent batches (a global-+ // limit truncates arbitrary parents), so enforce paging per-parent.-+ const paging = convertedQuery.paging;-+ const pagedRelations = paging && entities.length > 1-+ ? relations.slice(paging.offset ?? 0, paging.limit !== undefined-+ ? (paging.offset ?? 0) + paging.limit-+ : undefined)-+ : relations;-+ results.set(entity, await assembler.convertToDTOs(pagedRelations));- }- return results;- }diff --git a/package.json b/package.jsonindex 15ed97cf282..e0c60b6cb8e 100644--- a/package.json+++ b/package.json@@ -50,7 +50,6 @@"next/postcss": "8.5.23","sockjs/uuid": "11.1.1","@cypress/request/uuid": "11.1.1",- "@ptc-org/nestjs-query-typeorm/uuid": "11.1.1","googleapis-common/uuid": "11.1.1","googleapis/googleapis-common": "8.0.1","@cyntler/react-doc-viewer/ajv": "8.20.0",@@ -72,7 +71,7 @@"zapier-platform-cli/esbuild": "0.28.1","front-matter@npm:4.0.2": "patch:front-matter@npm%3A4.0.2#~/.yarn/patches/front-matter-npm-4.0.2-e1cc0efa69.patch"},- "//resolutions": "Each entry is load-bearing: it forces a version OUTSIDE some parent's declared range where no fixed upstream release exists; remove each once its blocker ships. @module-federation/dts-plugin/undici + miniflare/undici ^7.29.0 -> five undici advisories with in-major fixes (6.28.0 / 7.29.0 / 8.9.0): CVE-2026-13697 / GHSA-4cwx-7wf7-3272 (critical, cross-user information disclosure + parse-time crash via degenerate private cache directives) and CVE-2026-14643 / GHSA-jr45-8vmc-qm54, both >=7.0.0 <7.29.0 and >=8.0.0 <8.9.0, plus CVE-2026-15157 / GHSA-m8rv-5g2x-5cg5, CVE-2026-16728 / GHSA-8xcm-r25x-g524 and CVE-2026-16729 / GHSA-v3r7-h72x-cjcm (those three also <6.28.0). ^7.29.0 also still covers the six 7.28.0-fixed advisories the previous dts-plugin/undici ^7.28.0 entry was added for (GHSA-pr7r-676h-xcf6, GHSA-35p6-xmwp-9g52, GHSA-p88m-4jfj-68fv, GHSA-g8m3-5g58-fq7m, GHSA-hm92-r4w5-c3mj, GHSA-vmh5-mc38-953g). @module-federation/dts-plugin 2.5.1 pins undici 7.24.7 exact (latest 2.8.1 pins 7.28.0 exact, still vulnerable; transitive via @module-federation/cli + enhanced) and miniflare pins 7.28.0 exact (latest 4.x and the 5-alpha still do; itself exact-pinned by wrangler), so no parent upgrade carries the fix for either; both scoped ^7.29.0 to stay inside major 7 -- no v8 API jump -- and every other consumer resolves a fixed version naturally within its own declared range: e2b's undici ^7.28.0 -> 7.29.0, node-gyp 12.4.0's ^6.25.0 -> 6.28.0, node-gyp 13's ^8.4.1 and jsdom 30's ^8.9.0 -> 8.9.0. Drop each once its pinner depends on undici >=7.29.0. e2b/undici8 npm:undici@^8.9.0 -> e2b additionally ships an OPTIONAL ALIAS dependency undici8 = npm:[email protected] exact (still 8.8.0 in latest 2.38.0), inside the >=8.0.0 <8.9.0 range of all five advisories above; alias descriptors are keyed by the alias name, so plain undici resolution keys cannot reach it, hence the alias-form entry; drop once e2b aliases undici8 to undici >=8.9.0. next/sharp ^0.35.3 -> GHSA-f88m-g3jw-g9cj (sharp inherits four libvips CVEs: CVE-2026-33327/33328/35590/35591, vulnerable <0.35.0, fixed 0.35.0): every stable next pins sharp ^0.34.5 (the fix lands in next 16.3.0, currently held back by the 3d npmMinimalAgeGate, and @react-email/ui exact-pins next 16.2.6 regardless); scoped to next because next's copy ships in scanned images -- twenty-sdk's direct sharp is bumped to ^0.35.3 in its own package.json and miniflare (0.35.2) is >=0.35.0 on its own; @argos-ci/core 6.1.0 also resolves sharp 0.34.5 but is CI-only visual-testing tooling that never ships in an image and is deliberately NOT refreshed: @argos-ci/storybook 6.2.x bundles @argos-ci/vitest, which fails the storybook CI shards on pre-existing unhandled monaco-editor CDN worker errors that vitest otherwise tolerates (bump argos + handle those errors together, separately); sharp 0.33.5 (favicons + @mintlify/prebuild, website/docs build tooling) sits in the advisory range but is not present in the scanned prod images (only 0.34.5 was flagged) and favicons caps sharp <0.34, so it is left to its parents. Drop once twenty-website's next range resolves >=16.3.0 past the age gate and @react-email/ui moves off next 16.2.x. nx/form-data + zapier-platform-core/form-data 4.0.6 -> CVE-2026-12143 / GHSA-hmw2-7cc7-3qxx (form-data CRLF injection via unescaped multipart field names and filenames, vulnerable >=4.0.0 <4.0.6); nx 22.7.5 and zapier-platform-core 19.0.0 each hard-pin form-data 4.0.5 exact (no caret, both still 4.0.5 in their latest) so no parent upgrade carries the fix; scoped to those two as the sole 4.0.5 pinners -- every other form-data consumer resolves 4.0.6 naturally via its ^4.0.x range, so both pins dedupe onto it; drop once nx and zapier-platform-core depend on form-data >=4.0.6. @nestjs/platform-express/multer 2.2.0 -> CVE-2026-5038 & CVE-2026-5079 (multer DoS); @nestjs/platform-express hard-pins multer 2.1.1 exact (no caret, still 2.1.1 in latest 11.1.27) so no parent upgrade carries the fix; scoped to nest as the sole multer consumer; drop once @nestjs/platform-express depends on multer >=2.2.0. @nestjs/graphql/ws 8.21.0 -> CVE-2026-48779; @nestjs/graphql (already latest 13.4.2, only newer is the 14.0.0-next prerelease) pins ws 8.20.1 exact (no caret) so no parent upgrade carries the fix; scoped to @nestjs/graphql as the sole pinner of the vulnerable ws -- the scoped key matches both its npm and patch: locator instances, and every other ws consumer resolves 8.21.0 naturally; drop once @nestjs/graphql depends on ws >=8.21.0. @remote-dom/react/@types/react ^19.2.0 -> React type-identity dedup, SCOPED to @remote-dom/react only (every other package resolves @types/react 19 naturally from the workspace ^19.2.0 ranges). @remote-dom/react (transitive via twenty-front-component-renderer) lists @types/react ^18 in its own dependencies and nests its own copy; React 18 and 19 declare ReactNode differently (19 adds bigint + Promise<AwaitedReactNode>, drops ReactFragment's {}), so the two copies are mutually non-assignable and break twenty-front's typecheck (~156 TS2322 errors). Range-aligning our own packages can't fix a third-party's transitive @types pin, hence this single scoped override (only @types/react splits; runtime react/react-dom are peer-deps that converge naturally, and @types/react-dom does not nest a copy). Drop once @remote-dom/react widens @types/react to ^19 (latest 1.2.2 still pins ^18; tracked upstream in Shopify/remote-dom#153). graphql 16.8.1 -> singleton pin held below msw's ^16.12.0 dep and @nestjs/graphql's ^16.11.0 peer; drop after a validated repo-wide bump to latest 16.x; graphql-redis-subscriptions/ioredis 5.10.1 -> TS type-identity dedup: twenty-server passes its ioredis client into RedisPubSub, so this must equal the exact ioredis version pinned by twenty-server and bullmq (bump in lockstep); @types/qs 6.9.16 -> holdback below the 6.9.17 ParsedQs typing break (node-saml wants ^6.9.18); @opentelemetry/api 1.9.1 -> singleton guard for the NoopMeterProvider bug (#20231): ai 6.0.x pins 1.9.0 exact vs @sentry/node ^1.9.1, drop when workspace ai >=6.0.178 AND @scalar/agent-chat moves off ai 6.0.33; chokidar ^3 -> NestJS CLI watch needs fsevents on macOS, removed in chokidar 4/5 (#20316); tmp ^0.2.7 -> CVE, zapier-platform-cli 19 (latest) pins 0.2.5 and inquirer 7/8's external-editor wants ^0.0.33; @mintlify/previewing/tar ^7.5.16 -> tar PAX-header file-smuggling CVE GHSA-vmf3-w455-68vh (node-tar <=7.5.15, fixed 7.5.16); @mintlify/previewing exact-pins tar 7.5.15 with no fixed upstream release (latest 4.0.1163 still pins it), pulled via mintlify in twenty-docs; scoped as the sole tar holdout below 7.5.16 (every other tar parent permits 7.5.16 within its declared range and resolves there naturally), drop once @mintlify/previewing ships tar >=7.5.16; @angular-devkit/core 19.2.24 -> picomatch CVE, blocked on @nestjs/cli >11.0.23 fixing the dist/src output regression (repo held at 11.0.16); yeoman-environment 6.0.1 -> CVE, zapier-platform-cli 19 (latest) pins 4.4.3; express/qs + @cypress/request/qs + body-parser/qs 6.15.2 -> qs CVE-2026-8723 / GHSA-q8mj-m7cp-5q26 (>=6.11.1 <=6.15.1, fixed 6.15.2) for old express 4.22.x pinned by @mintlify/previewing and verdaccio: express's direct qs (express/qs), verdaccio's @cypress/request 3.0.10 qs (@cypress/request/qs), and express 4.x's bundled body-parser 1.20.4 which pins qs ~6.14.0 (body-parser/qs); the caret-range qs consumers all dedupe to 6.15.2 naturally; drop once @mintlify/previewing + verdaccio move off express 4.x; next/postcss + @mintlify/common/postcss 8.5.23 -> postcss CVEs, latest GHSA-r28c-9q8g-f849 (path traversal in previous source map auto-loading via sourceMappingURL, arbitrary .map file disclosure, vulnerable <=8.5.17, fixed 8.5.18); every stable next pins postcss 8.4.31 exact (still 8.4.31 in latest 16.2.12, fix only in 16.3.0 canaries; @react-email/ui also pins next 16.2.6) and @mintlify/common pins 8.5.14 exact (still 8.5.14 in latest 1.0.1051), so no parent upgrade carries the fix; scoped to those two as the sole exact pinners -- the caret consumers (^8.4.38, ^8.4.47, ^8.5.15) dedupe onto 8.5.23 naturally; drop each once its pinner depends on postcss >=8.5.18; <pkg>/uuid 11.1.1 -> uuid CVE for parents pinning uuid <11 with no fixed release (sockjs dormant since 2021; @cypress/request 3.0.10 via verdaccio; @ptc-org/nestjs-query-typeorm at latest; googleapis 105 -> common 8 drops uuid but needs the googleapis >=152 migration). Preserves the intentional uuid 13.x; @cyntler/react-doc-viewer/ajv 8.20.0 -> CVE, upstream (latest 1.17.1) pins ajv ^7 but never imports it, forcing v8 is safe; */esbuild 0.28.1 -> two esbuild advisories both fixed in 0.28.1: the Deno-module binary-integrity RCE GHSA-gv7w-rqvm-qjhr (vulnerable >=0.17.0 <0.28.1) and the earlier dev-server path-traversal GHSA-g7r4-m6w7-qqqr (Windows, >=0.27.3 <0.28.1). The Deno advisory's range covers every esbuild <0.28.1, so it re-exposed older transitive copies too. Preference is to fix by upgrading the parent, not by resolution -- done where it works: @size-limit/preset-small-lib+size-limit (now ^12.1.0, pin esbuild ^0.28.0) and wrangler (bumped within ^4.0.0 to 4.102.0, which pins esbuild 0.28.1) were bumped and resolve to 0.28.1 on their own, NO resolution needed. The six resolutions below are for parents that cannot be cleanly upgraded. Five pin a vulnerable esbuild OUTSIDE the 0.28.1 range in their latest release: @react-email/ui exact-pins 0.28.0 (still 0.28.0 in latest 6.6.0); @opennextjs/aws exact-pins 0.25.4 (still 0.25.4 in latest 4.0.3); zapier-platform-cli exact-pins 0.25.8 (latest 19.0.0); @lingui/cli pins ^0.25.1 -> caps <0.26 (still ^0.25.1 in latest 6.3.0); storybook pins a range topping out at ^0.27.0 -> caps <0.28 (still capped in latest 10.4.4). react-email allows ^0.28.0 but the npmMinimalAgeGate down-selects it to the still-vulnerable 0.28.0 until 0.28.1 ages past the gate (published 2026-06-11). tsx needs NO resolution: its ^4.x ranges resolve to 4.22.x which pins esbuild ~0.28.0 -> 0.28.1 on its own. (tsx had briefly been pinned to 4.21.0 because tsx 4.22's --import tsx/esm loader feeds esbuild-downleveled enums into jest's type-checking ts-node config compiler, yielding a spurious TS7022 in server-integration-test; that is now fixed at the source by dropping --import tsx/esm from the integration jest invocation in twenty-server project.json (it had been swept in by the Storybook 10 upgrade and is not needed there): ts-node alone now compiles the config + globalSetup, so there is no esbuild enum downleveling to trip TS7022 and decorator metadata is still emitted. tsx version is now irrelevant to the tests, so the pin was dropped.) Drop each entry once its parent ships a range that resolves to >=0.28.1 on its own (react-email drops once 0.28.1 clears the age gate). Our own twenty-client-sdk raises its esbuild floor to ^0.28.1 directly in its package.json instead of via a resolution. googleapis/googleapis-common 8.0.1 -> singleton dedup for the googleapis 173 upgrade. googleapis-common 8.0.2 (published 2026-06-04, AFTER googleapis 173 on 2026-05-28) regressed its google-auth-library dep from a range to exact 10.5.0 (and gaxios to exact 7.1.3), while googleapis itself pulls google-auth-library ^10.2.0 (10.7.0); the two mismatched copies make OAuth2Client's type-identity diverge between the client our provider builds (via googleapis -> 10.7.0) and the one gmail/calendar method options expect (via googleapis-common -> 10.5.0), breaking every gmail/calendar service typecheck (TS2322/TS2769). The parents are already at latest (googleapis 173.0.0, googleapis-common 8.0.2) so we cannot fix by upgrading; instead we pin googleapis' googleapis-common back to 8.0.1, the last version with RANGE deps (google-auth-library ^10.1.0, gaxios ^7.0.0-rc.4) -- and the version googleapis 173 originally shipped against. Ranges resolve to the same hoisted versions googleapis uses, so google-auth-library AND gaxios both collapse to a single copy with no further resolution (a global google-auth-library pin would only dedup one of the two). Scoped to googleapis since it is the sole googleapis-common 8.x consumer. Drop once googleapis-common 8.0.3+ restores range deps or googleapis bumps to a common that does. @mintlify/{cli,common,prebuild,previewing,scraping,validation}/js-yaml + @verdaccio/config/js-yaml 4.3.0 -> CVE-2026-53550 / GHSA-h67p-54hq-rp68 (js-yaml quadratic-complexity DoS in YAML merge-key handling via repeated aliases, vulnerable <=4.1.1, fixed 4.2.0) and its follow-up CVE-2026-59869 / GHSA-52cp-r559-cp3m (merge-key chains force quadratic CPU, vulnerable 4.x <4.3.0, fixed 4.3.0); these seven packages each hard-pin js-yaml 4.1.1 exact (no caret, still 4.1.1 in their latest) so no parent upgrade carries the fix; scoped to those seven as the sole 4.1.1 pinners -- the cosmiconfig-based caret consumers (@graphql-codegen/cli, @lingui/cli, @lingui/vite-plugin, @wyw-in-js/vite, vite-plugin-svgr, all via cosmiconfig ^4.1.0) shared that single 4.1.1 copy and dedupe onto 4.3.0 once it is lifted. Drop these seven once they ship js-yaml >=4.3.0. The remaining js-yaml 3.x holders -- [email protected] (via mintlify in twenty-docs) and @istanbuljs/[email protected] (via babel-plugin-istanbul coverage), both declaring js-yaml ^3.13.1 -> 3.14.2 with no fixed upstream release -- are also forced to 4.3.0 via scoped pins (front-matter/js-yaml + @istanbuljs/load-nyc-config/js-yaml), evicting the last js-yaml 3.14.2 copy and closing alert #1504. load-nyc-config calls yaml.load (present and safe-by-default in 4.x) so its pin alone suffices. front-matter's default loader called the safeLoad API that 4.x removed, so it is also patched (front-matter@npm:4.0.2 -> .yarn/patches/front-matter-npm-4.0.2-e1cc0efa69.patch) to set loader = parser.load (safe-by-default in 4.x; safeLoad is gone and 4.x core has no unsafe/full schema, so the old allowUnsafe ternary is dead). The version move stays a separate resolution because a yarn patch only rewrites a package's files, not its resolved dependency graph -- patching front-matter's own js-yaml range does not change what yarn resolves. Drop the patch + both pins once front-matter/mintlify and load-nyc-config ship js-yaml >=4.",+ "//resolutions": "Each entry is load-bearing: it forces a version OUTSIDE some parent's declared range where no fixed upstream release exists; remove each once its blocker ships. @module-federation/dts-plugin/undici + miniflare/undici ^7.29.0 -> five undici advisories with in-major fixes (6.28.0 / 7.29.0 / 8.9.0): CVE-2026-13697 / GHSA-4cwx-7wf7-3272 (critical, cross-user information disclosure + parse-time crash via degenerate private cache directives) and CVE-2026-14643 / GHSA-jr45-8vmc-qm54, both >=7.0.0 <7.29.0 and >=8.0.0 <8.9.0, plus CVE-2026-15157 / GHSA-m8rv-5g2x-5cg5, CVE-2026-16728 / GHSA-8xcm-r25x-g524 and CVE-2026-16729 / GHSA-v3r7-h72x-cjcm (those three also <6.28.0). ^7.29.0 also still covers the six 7.28.0-fixed advisories the previous dts-plugin/undici ^7.28.0 entry was added for (GHSA-pr7r-676h-xcf6, GHSA-35p6-xmwp-9g52, GHSA-p88m-4jfj-68fv, GHSA-g8m3-5g58-fq7m, GHSA-hm92-r4w5-c3mj, GHSA-vmh5-mc38-953g). @module-federation/dts-plugin 2.5.1 pins undici 7.24.7 exact (latest 2.8.1 pins 7.28.0 exact, still vulnerable; transitive via @module-federation/cli + enhanced) and miniflare pins 7.28.0 exact (latest 4.x and the 5-alpha still do; itself exact-pinned by wrangler), so no parent upgrade carries the fix for either; both scoped ^7.29.0 to stay inside major 7 -- no v8 API jump -- and every other consumer resolves a fixed version naturally within its own declared range: e2b's undici ^7.28.0 -> 7.29.0, node-gyp 12.4.0's ^6.25.0 -> 6.28.0, node-gyp 13's ^8.4.1 and jsdom 30's ^8.9.0 -> 8.9.0. Drop each once its pinner depends on undici >=7.29.0. e2b/undici8 npm:undici@^8.9.0 -> e2b additionally ships an OPTIONAL ALIAS dependency undici8 = npm:[email protected] exact (still 8.8.0 in latest 2.38.0), inside the >=8.0.0 <8.9.0 range of all five advisories above; alias descriptors are keyed by the alias name, so plain undici resolution keys cannot reach it, hence the alias-form entry; drop once e2b aliases undici8 to undici >=8.9.0. next/sharp ^0.35.3 -> GHSA-f88m-g3jw-g9cj (sharp inherits four libvips CVEs: CVE-2026-33327/33328/35590/35591, vulnerable <0.35.0, fixed 0.35.0): every stable next pins sharp ^0.34.5 (the fix lands in next 16.3.0, currently held back by the 3d npmMinimalAgeGate, and @react-email/ui exact-pins next 16.2.6 regardless); scoped to next because next's copy ships in scanned images -- twenty-sdk's direct sharp is bumped to ^0.35.3 in its own package.json and miniflare (0.35.2) is >=0.35.0 on its own; @argos-ci/core 6.1.0 also resolves sharp 0.34.5 but is CI-only visual-testing tooling that never ships in an image and is deliberately NOT refreshed: @argos-ci/storybook 6.2.x bundles @argos-ci/vitest, which fails the storybook CI shards on pre-existing unhandled monaco-editor CDN worker errors that vitest otherwise tolerates (bump argos + handle those errors together, separately); sharp 0.33.5 (favicons + @mintlify/prebuild, website/docs build tooling) sits in the advisory range but is not present in the scanned prod images (only 0.34.5 was flagged) and favicons caps sharp <0.34, so it is left to its parents. Drop once twenty-website's next range resolves >=16.3.0 past the age gate and @react-email/ui moves off next 16.2.x. nx/form-data + zapier-platform-core/form-data 4.0.6 -> CVE-2026-12143 / GHSA-hmw2-7cc7-3qxx (form-data CRLF injection via unescaped multipart field names and filenames, vulnerable >=4.0.0 <4.0.6); nx 22.7.5 and zapier-platform-core 19.0.0 each hard-pin form-data 4.0.5 exact (no caret, both still 4.0.5 in their latest) so no parent upgrade carries the fix; scoped to those two as the sole 4.0.5 pinners -- every other form-data consumer resolves 4.0.6 naturally via its ^4.0.x range, so both pins dedupe onto it; drop once nx and zapier-platform-core depend on form-data >=4.0.6. @nestjs/platform-express/multer 2.2.0 -> CVE-2026-5038 & CVE-2026-5079 (multer DoS); @nestjs/platform-express hard-pins multer 2.1.1 exact (no caret, still 2.1.1 in latest 11.1.27) so no parent upgrade carries the fix; scoped to nest as the sole multer consumer; drop once @nestjs/platform-express depends on multer >=2.2.0. @nestjs/graphql/ws 8.21.0 -> CVE-2026-48779; @nestjs/graphql (already latest 13.4.2, only newer is the 14.0.0-next prerelease) pins ws 8.20.1 exact (no caret) so no parent upgrade carries the fix; scoped to @nestjs/graphql as the sole pinner of the vulnerable ws -- the scoped key matches both its npm and patch: locator instances, and every other ws consumer resolves 8.21.0 naturally; drop once @nestjs/graphql depends on ws >=8.21.0. @remote-dom/react/@types/react ^19.2.0 -> React type-identity dedup, SCOPED to @remote-dom/react only (every other package resolves @types/react 19 naturally from the workspace ^19.2.0 ranges). @remote-dom/react (transitive via twenty-front-component-renderer) lists @types/react ^18 in its own dependencies and nests its own copy; React 18 and 19 declare ReactNode differently (19 adds bigint + Promise<AwaitedReactNode>, drops ReactFragment's {}), so the two copies are mutually non-assignable and break twenty-front's typecheck (~156 TS2322 errors). Range-aligning our own packages can't fix a third-party's transitive @types pin, hence this single scoped override (only @types/react splits; runtime react/react-dom are peer-deps that converge naturally, and @types/react-dom does not nest a copy). Drop once @remote-dom/react widens @types/react to ^19 (latest 1.2.2 still pins ^18; tracked upstream in Shopify/remote-dom#153). graphql 16.8.1 -> singleton pin held below msw's ^16.12.0 dep and @nestjs/graphql's ^16.11.0 peer; drop after a validated repo-wide bump to latest 16.x; graphql-redis-subscriptions/ioredis 5.10.1 -> TS type-identity dedup: twenty-server passes its ioredis client into RedisPubSub, so this must equal the exact ioredis version pinned by twenty-server and bullmq (bump in lockstep); @types/qs 6.9.16 -> holdback below the 6.9.17 ParsedQs typing break (node-saml wants ^6.9.18); @opentelemetry/api 1.9.1 -> singleton guard for the NoopMeterProvider bug (#20231): ai 6.0.x pins 1.9.0 exact vs @sentry/node ^1.9.1, drop when workspace ai >=6.0.178 AND @scalar/agent-chat moves off ai 6.0.33; chokidar ^3 -> NestJS CLI watch needs fsevents on macOS, removed in chokidar 4/5 (#20316); tmp ^0.2.7 -> CVE, zapier-platform-cli 19 (latest) pins 0.2.5 and inquirer 7/8's external-editor wants ^0.0.33; @mintlify/previewing/tar ^7.5.16 -> tar PAX-header file-smuggling CVE GHSA-vmf3-w455-68vh (node-tar <=7.5.15, fixed 7.5.16); @mintlify/previewing exact-pins tar 7.5.15 with no fixed upstream release (latest 4.0.1163 still pins it), pulled via mintlify in twenty-docs; scoped as the sole tar holdout below 7.5.16 (every other tar parent permits 7.5.16 within its declared range and resolves there naturally), drop once @mintlify/previewing ships tar >=7.5.16; @angular-devkit/core 19.2.24 -> picomatch CVE, blocked on @nestjs/cli >11.0.23 fixing the dist/src output regression (repo held at 11.0.16); yeoman-environment 6.0.1 -> CVE, zapier-platform-cli 19 (latest) pins 4.4.3; express/qs + @cypress/request/qs + body-parser/qs 6.15.2 -> qs CVE-2026-8723 / GHSA-q8mj-m7cp-5q26 (>=6.11.1 <=6.15.1, fixed 6.15.2) for old express 4.22.x pinned by @mintlify/previewing and verdaccio: express's direct qs (express/qs), verdaccio's @cypress/request 3.0.10 qs (@cypress/request/qs), and express 4.x's bundled body-parser 1.20.4 which pins qs ~6.14.0 (body-parser/qs); the caret-range qs consumers all dedupe to 6.15.2 naturally; drop once @mintlify/previewing + verdaccio move off express 4.x; next/postcss + @mintlify/common/postcss 8.5.23 -> postcss CVEs, latest GHSA-r28c-9q8g-f849 (path traversal in previous source map auto-loading via sourceMappingURL, arbitrary .map file disclosure, vulnerable <=8.5.17, fixed 8.5.18); every stable next pins postcss 8.4.31 exact (still 8.4.31 in latest 16.2.12, fix only in 16.3.0 canaries; @react-email/ui also pins next 16.2.6) and @mintlify/common pins 8.5.14 exact (still 8.5.14 in latest 1.0.1051), so no parent upgrade carries the fix; scoped to those two as the sole exact pinners -- the caret consumers (^8.4.38, ^8.4.47, ^8.5.15) dedupe onto 8.5.23 naturally; drop each once its pinner depends on postcss >=8.5.18; <pkg>/uuid 11.1.1 -> uuid CVE for parents pinning uuid <11 with no fixed release (sockjs dormant since 2021; @cypress/request 3.0.10 via verdaccio; googleapis 105 -> common 8 drops uuid but needs the googleapis >=152 migration). Preserves the intentional uuid 13.x; @cyntler/react-doc-viewer/ajv 8.20.0 -> CVE, upstream (latest 1.17.1) pins ajv ^7 but never imports it, forcing v8 is safe; */esbuild 0.28.1 -> two esbuild advisories both fixed in 0.28.1: the Deno-module binary-integrity RCE GHSA-gv7w-rqvm-qjhr (vulnerable >=0.17.0 <0.28.1) and the earlier dev-server path-traversal GHSA-g7r4-m6w7-qqqr (Windows, >=0.27.3 <0.28.1). The Deno advisory's range covers every esbuild <0.28.1, so it re-exposed older transitive copies too. Preference is to fix by upgrading the parent, not by resolution -- done where it works: @size-limit/preset-small-lib+size-limit (now ^12.1.0, pin esbuild ^0.28.0) and wrangler (bumped within ^4.0.0 to 4.102.0, which pins esbuild 0.28.1) were bumped and resolve to 0.28.1 on their own, NO resolution needed. The six resolutions below are for parents that cannot be cleanly upgraded. Five pin a vulnerable esbuild OUTSIDE the 0.28.1 range in their latest release: @react-email/ui exact-pins 0.28.0 (still 0.28.0 in latest 6.6.0); @opennextjs/aws exact-pins 0.25.4 (still 0.25.4 in latest 4.0.3); zapier-platform-cli exact-pins 0.25.8 (latest 19.0.0); @lingui/cli pins ^0.25.1 -> caps <0.26 (still ^0.25.1 in latest 6.3.0); storybook pins a range topping out at ^0.27.0 -> caps <0.28 (still capped in latest 10.4.4). react-email allows ^0.28.0 but the npmMinimalAgeGate down-selects it to the still-vulnerable 0.28.0 until 0.28.1 ages past the gate (published 2026-06-11). tsx needs NO resolution: its ^4.x ranges resolve to 4.22.x which pins esbuild ~0.28.0 -> 0.28.1 on its own. (tsx had briefly been pinned to 4.21.0 because tsx 4.22's --import tsx/esm loader feeds esbuild-downleveled enums into jest's type-checking ts-node config compiler, yielding a spurious TS7022 in server-integration-test; that is now fixed at the source by dropping --import tsx/esm from the integration jest invocation in twenty-server project.json (it had been swept in by the Storybook 10 upgrade and is not needed there): ts-node alone now compiles the config + globalSetup, so there is no esbuild enum downleveling to trip TS7022 and decorator metadata is still emitted. tsx version is now irrelevant to the tests, so the pin was dropped.) Drop each entry once its parent ships a range that resolves to >=0.28.1 on its own (react-email drops once 0.28.1 clears the age gate). Our own twenty-client-sdk raises its esbuild floor to ^0.28.1 directly in its package.json instead of via a resolution. googleapis/googleapis-common 8.0.1 -> singleton dedup for the googleapis 173 upgrade. googleapis-common 8.0.2 (published 2026-06-04, AFTER googleapis 173 on 2026-05-28) regressed its google-auth-library dep from a range to exact 10.5.0 (and gaxios to exact 7.1.3), while googleapis itself pulls google-auth-library ^10.2.0 (10.7.0); the two mismatched copies make OAuth2Client's type-identity diverge between the client our provider builds (via googleapis -> 10.7.0) and the one gmail/calendar method options expect (via googleapis-common -> 10.5.0), breaking every gmail/calendar service typecheck (TS2322/TS2769). The parents are already at latest (googleapis 173.0.0, googleapis-common 8.0.2) so we cannot fix by upgrading; instead we pin googleapis' googleapis-common back to 8.0.1, the last version with RANGE deps (google-auth-library ^10.1.0, gaxios ^7.0.0-rc.4) -- and the version googleapis 173 originally shipped against. Ranges resolve to the same hoisted versions googleapis uses, so google-auth-library AND gaxios both collapse to a single copy with no further resolution (a global google-auth-library pin would only dedup one of the two). Scoped to googleapis since it is the sole googleapis-common 8.x consumer. Drop once googleapis-common 8.0.3+ restores range deps or googleapis bumps to a common that does. @mintlify/{cli,common,prebuild,previewing,scraping,validation}/js-yaml + @verdaccio/config/js-yaml 4.3.0 -> CVE-2026-53550 / GHSA-h67p-54hq-rp68 (js-yaml quadratic-complexity DoS in YAML merge-key handling via repeated aliases, vulnerable <=4.1.1, fixed 4.2.0) and its follow-up CVE-2026-59869 / GHSA-52cp-r559-cp3m (merge-key chains force quadratic CPU, vulnerable 4.x <4.3.0, fixed 4.3.0); these seven packages each hard-pin js-yaml 4.1.1 exact (no caret, still 4.1.1 in their latest) so no parent upgrade carries the fix; scoped to those seven as the sole 4.1.1 pinners -- the cosmiconfig-based caret consumers (@graphql-codegen/cli, @lingui/cli, @lingui/vite-plugin, @wyw-in-js/vite, vite-plugin-svgr, all via cosmiconfig ^4.1.0) shared that single 4.1.1 copy and dedupe onto 4.3.0 once it is lifted. Drop these seven once they ship js-yaml >=4.3.0. The remaining js-yaml 3.x holders -- [email protected] (via mintlify in twenty-docs) and @istanbuljs/[email protected] (via babel-plugin-istanbul coverage), both declaring js-yaml ^3.13.1 -> 3.14.2 with no fixed upstream release -- are also forced to 4.3.0 via scoped pins (front-matter/js-yaml + @istanbuljs/load-nyc-config/js-yaml), evicting the last js-yaml 3.14.2 copy and closing alert #1504. load-nyc-config calls yaml.load (present and safe-by-default in 4.x) so its pin alone suffices. front-matter's default loader called the safeLoad API that 4.x removed, so it is also patched (front-matter@npm:4.0.2 -> .yarn/patches/front-matter-npm-4.0.2-e1cc0efa69.patch) to set loader = parser.load (safe-by-default in 4.x; safeLoad is gone and 4.x core has no unsafe/full schema, so the old allowUnsafe ternary is dead). The version move stays a separate resolution because a yarn patch only rewrites a package's files, not its resolved dependency graph -- patching front-matter's own js-yaml range does not change what yarn resolves. Drop the patch + both pins once front-matter/mintlify and load-nyc-config ship js-yaml >=4.","version": "0.2.1","nx": {},"scripts": {diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphqlindex f8b1ed68fb0..9d678f73965 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql@@ -251,81 +251,6 @@ enum LogicFunctionExecutionMode {PREBUILT}-type Field {- id: UUID!- universalIdentifier: String!- type: FieldMetadataType!- name: String!- label: String!- description: String- icon: String- isActive: Boolean- isSystem: Boolean- isUIEditable: Boolean- isUIReadOnly: Boolean @deprecated(reason: "Use isUIEditable")- isNullable: Boolean- isUnique: Boolean- defaultValue: JSON- options: JSON- settings: JSON- objectMetadataId: UUID!- isLabelSyncedWithName: Boolean- morphId: UUID- createdAt: DateTime!- updatedAt: DateTime!- applicationId: UUID!- relation: Relation- morphRelations: [Relation!]- object: Object-}--"""Type of the field"""-enum FieldMetadataType {- ACTOR- ADDRESS- ARRAY- BOOLEAN- CURRENCY- DATE- DATE_TIME- EMAILS- FILES- FULL_NAME- LINKS- MORPH_RELATION- MULTI_SELECT- NUMBER- NUMERIC- PHONES- POSITION- RATING- RAW_JSON- RELATION- RICH_TEXT- SELECT- TEXT- TS_VECTOR- UUID-}--type Index {- id: UUID!- name: String!- isCustom: Boolean- isUnique: Boolean!- indexWhereClause: String- indexType: IndexType!- createdAt: DateTime!- updatedAt: DateTime!- indexFieldMetadataList: [IndexField!]!-}--"""Type of the index"""-enum IndexType {- BTREE- GIN-}-type Object {id: UUID!universalIdentifier: String!@@ -352,9 +277,6 @@ type Object {imageIdentifierFieldMetadataId: UUIDisLabelSyncedWithName: Boolean!duplicateCriteria: [[String!]!]- fieldsList: [Field!]!- indexMetadataList: [Index!]!- searchFieldMetadataList: [SearchField!]!fields("""Limit or page results."""paging: CursorPaging! = {first: 10}@@ -369,6 +291,9 @@ type Object {"""Specify to filter the records returned."""filter: IndexFilter! = {}): ObjectIndexMetadatasConnection!+ fieldsList: [Field!]!+ indexMetadataList: [Index!]!+ searchFieldMetadataList: [SearchField!]!}enum ObjectOpenRecordIn {@@ -2222,6 +2147,93 @@ enum WorkspaceCompanyEnrichmentOutcome {transientError}+type Field {+ id: UUID!+ universalIdentifier: String!+ type: FieldMetadataType!+ name: String!+ label: String!+ description: String+ icon: String+ isActive: Boolean+ isSystem: Boolean+ isUIEditable: Boolean+ isUIReadOnly: Boolean @deprecated(reason: "Use isUIEditable")+ isNullable: Boolean+ isUnique: Boolean+ defaultValue: JSON+ options: JSON+ settings: JSON+ objectMetadataId: UUID!+ isLabelSyncedWithName: Boolean+ morphId: UUID+ createdAt: DateTime!+ updatedAt: DateTime!+ applicationId: UUID!+ object: Object+ relation: Relation+ morphRelations: [Relation!]+}++"""Type of the field"""+enum FieldMetadataType {+ ACTOR+ ADDRESS+ ARRAY+ BOOLEAN+ CURRENCY+ DATE+ DATE_TIME+ EMAILS+ FILES+ FULL_NAME+ LINKS+ MORPH_RELATION+ MULTI_SELECT+ NUMBER+ NUMERIC+ PHONES+ POSITION+ RATING+ RAW_JSON+ RELATION+ RICH_TEXT+ SELECT+ TEXT+ TS_VECTOR+ UUID+}++type PageInfo {+ """true if paging forward and there are more records."""+ hasNextPage: Boolean++ """true if paging backwards and there are more records."""+ hasPreviousPage: Boolean++ """The cursor of the first returned record."""+ startCursor: ConnectionCursor++ """The cursor of the last returned record."""+ endCursor: ConnectionCursor+}++type FieldEdge {+ """The node containing the Field"""+ node: Field!++ """Cursor for this node."""+ cursor: ConnectionCursor!+}++type FieldConnection {+ """Paging information"""+ pageInfo: PageInfo!++ """Array of edges."""+ edges: [FieldEdge!]!+}+type Relation {type: RelationType!sourceObjectMetadata: Object!@@ -2245,40 +2257,38 @@ type IndexField {updatedAt: DateTime!}-type ObjectRecordCount {- objectNamePlural: String!- totalCount: Int!-}--type SearchField {+type Index {id: UUID!- fieldMetadataId: UUID!- tsVectorFieldMetadataId: UUID!- position: Float!+ name: String!+ isCustom: Boolean+ isUnique: Boolean!+ indexWhereClause: String+ indexType: IndexType!createdAt: DateTime!updatedAt: DateTime!+ indexFieldMetadataList: [IndexField!]!}-type ObjectEdge {- """The node containing the Object"""- node: Object!+"""Type of the index"""+enum IndexType {+ BTREE+ GIN+}++type IndexEdge {+ """The node containing the Index"""+ node: Index!"""Cursor for this node."""cursor: ConnectionCursor!}-type PageInfo {- """true if paging forward and there are more records."""- hasNextPage: Boolean-- """true if paging backwards and there are more records."""- hasPreviousPage: Boolean-- """The cursor of the first returned record."""- startCursor: ConnectionCursor+type ObjectEdge {+ """The node containing the Object"""+ node: Object!- """The cursor of the last returned record."""- endCursor: ConnectionCursor+ """Cursor for this node."""+ cursor: ConnectionCursor!}type ObjectConnection {@@ -2289,44 +2299,34 @@ type ObjectConnection {edges: [ObjectEdge!]!}-type IndexEdge {- """The node containing the Index"""- node: Index!-- """Cursor for this node."""- cursor: ConnectionCursor!-}--type ObjectIndexMetadatasConnection {+type ObjectFieldsConnection {"""Paging information"""pageInfo: PageInfo!"""Array of edges."""- edges: [IndexEdge!]!-}--type FieldEdge {- """The node containing the Field"""- node: Field!-- """Cursor for this node."""- cursor: ConnectionCursor!+ edges: [FieldEdge!]!}-type ObjectFieldsConnection {+type ObjectIndexMetadatasConnection {"""Paging information"""pageInfo: PageInfo!"""Array of edges."""- edges: [FieldEdge!]!+ edges: [IndexEdge!]!}-type FieldConnection {- """Paging information"""- pageInfo: PageInfo!+type ObjectRecordCount {+ objectNamePlural: String!+ totalCount: Int!+}- """Array of edges."""- edges: [FieldEdge!]!+type SearchField {+ id: UUID!+ fieldMetadataId: UUID!+ tsVectorFieldMetadataId: UUID!+ position: Float!+ createdAt: DateTime!+ updatedAt: DateTime!}type BillingEntitlement {@@ -3249,12 +3249,6 @@ type Query {getPageLayoutWidget(id: String!): PageLayoutWidget!findManyAgents: [Agent!]!findOneAgent(input: AgentIdInput!): Agent!- objectRecordCounts: [ObjectRecordCount!]!- mostlyEmptyFieldMetadataIds(objectMetadataId: UUID!): [UUID!]!- object(- """The id of the record to find."""- id: UUID!- ): Object!objects("""Limit or page results."""paging: CursorPaging! = {first: 10}@@ -3262,6 +3256,12 @@ type Query {"""Specify to filter the records returned."""filter: ObjectFilter! = {}): ObjectConnection!+ object(+ """The id of the record to find."""+ id: UUID!+ ): Object!+ objectRecordCounts: [ObjectRecordCount!]!+ mostlyEmptyFieldMetadataIds(objectMetadataId: UUID!): [UUID!]!findOneLogicFunction(input: LogicFunctionIdInput!): LogicFunction!findManyLogicFunctions: [LogicFunction!]!getAvailablePackages(input: LogicFunctionIdInput!): JSON!@@ -3288,10 +3288,6 @@ type Query {findMarketplaceAppDetail(universalIdentifier: String!): MarketplaceAppDetail!publicMarketplaceApps(isVetted: Boolean! = true): [MarketplaceApp!]!publicMarketplaceAppDetail(universalIdentifier: String!): MarketplaceAppDetail!- field(- """The id of the record to find."""- id: UUID!- ): Field!fields("""Limit or page results."""paging: CursorPaging! = {first: 10}@@ -3299,6 +3295,10 @@ type Query {"""Specify to filter the records returned."""filter: FieldFilter! = {}): FieldConnection!+ field(+ """The id of the record to find."""+ id: UUID!+ ): Field!getViewGroups(viewId: String): [ViewGroup!]!getViewGroup(id: String!): ViewGroupgetRoles: [Role!]!@@ -3360,13 +3360,13 @@ input ObjectFilter {and: [ObjectFilter!]or: [ObjectFilter!]id: UUIDFilterComparison- isRemote: BooleanFieldComparisonisActive: BooleanFieldComparison+ isRemote: BooleanFieldComparison+ isSearchable: BooleanFieldComparisonisSystem: BooleanFieldComparison- isUIEditable: BooleanFieldComparisonisUICreatable: BooleanFieldComparison+ isUIEditable: BooleanFieldComparisonisUIReadOnly: BooleanFieldComparison- isSearchable: BooleanFieldComparison}input LogicFunctionIdInput {diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.tsindex 40fd330506e..96a9211ba0b 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts@@ -175,57 +175,6 @@ export interface LogicFunction {export type LogicFunctionExecutionMode = 'LIVE' | 'PREBUILT'-export interface Field {- id: Scalars['UUID']- universalIdentifier: Scalars['String']- type: FieldMetadataType- name: Scalars['String']- label: Scalars['String']- description?: Scalars['String']- icon?: Scalars['String']- isActive?: Scalars['Boolean']- isSystem?: Scalars['Boolean']- isUIEditable?: Scalars['Boolean']- /** @deprecated Use isUIEditable */- isUIReadOnly?: Scalars['Boolean']- isNullable?: Scalars['Boolean']- isUnique?: Scalars['Boolean']- defaultValue?: Scalars['JSON']- options?: Scalars['JSON']- settings?: Scalars['JSON']- objectMetadataId: Scalars['UUID']- isLabelSyncedWithName?: Scalars['Boolean']- morphId?: Scalars['UUID']- createdAt: Scalars['DateTime']- updatedAt: Scalars['DateTime']- applicationId: Scalars['UUID']- relation?: Relation- morphRelations?: Relation[]- object?: Object- __typename: 'Field'-}---/** Type of the field */-export type FieldMetadataType = 'ACTOR' | 'ADDRESS' | 'ARRAY' | 'BOOLEAN' | 'CURRENCY' | 'DATE' | 'DATE_TIME' | 'EMAILS' | 'FILES' | 'FULL_NAME' | 'LINKS' | 'MORPH_RELATION' | 'MULTI_SELECT' | 'NUMBER' | 'NUMERIC' | 'PHONES' | 'POSITION' | 'RATING' | 'RAW_JSON' | 'RELATION' | 'RICH_TEXT' | 'SELECT' | 'TEXT' | 'TS_VECTOR' | 'UUID'--export interface Index {- id: Scalars['UUID']- name: Scalars['String']- isCustom?: Scalars['Boolean']- isUnique: Scalars['Boolean']- indexWhereClause?: Scalars['String']- indexType: IndexType- createdAt: Scalars['DateTime']- updatedAt: Scalars['DateTime']- indexFieldMetadataList: IndexField[]- __typename: 'Index'-}---/** Type of the index */-export type IndexType = 'BTREE' | 'GIN'-export interface Object {id: Scalars['UUID']universalIdentifier: Scalars['String']@@ -253,11 +202,11 @@ export interface Object {imageIdentifierFieldMetadataId?: Scalars['UUID']isLabelSyncedWithName: Scalars['Boolean']duplicateCriteria?: Scalars['String'][][]+ fields: ObjectFieldsConnection+ indexMetadatas: ObjectIndexMetadatasConnectionfieldsList: Field[]indexMetadataList: Index[]searchFieldMetadataList: SearchField[]- fields: ObjectFieldsConnection- indexMetadatas: ObjectIndexMetadatasConnection__typename: 'Object'}@@ -1877,6 +1826,68 @@ export interface WorkspaceCompanyEnrichmentResult {export type WorkspaceCompanyEnrichmentOutcome = 'matched' | 'unavailable' | 'transientError'+export interface Field {+ id: Scalars['UUID']+ universalIdentifier: Scalars['String']+ type: FieldMetadataType+ name: Scalars['String']+ label: Scalars['String']+ description?: Scalars['String']+ icon?: Scalars['String']+ isActive?: Scalars['Boolean']+ isSystem?: Scalars['Boolean']+ isUIEditable?: Scalars['Boolean']+ /** @deprecated Use isUIEditable */+ isUIReadOnly?: Scalars['Boolean']+ isNullable?: Scalars['Boolean']+ isUnique?: Scalars['Boolean']+ defaultValue?: Scalars['JSON']+ options?: Scalars['JSON']+ settings?: Scalars['JSON']+ objectMetadataId: Scalars['UUID']+ isLabelSyncedWithName?: Scalars['Boolean']+ morphId?: Scalars['UUID']+ createdAt: Scalars['DateTime']+ updatedAt: Scalars['DateTime']+ applicationId: Scalars['UUID']+ object?: Object+ relation?: Relation+ morphRelations?: Relation[]+ __typename: 'Field'+}+++/** Type of the field */+export type FieldMetadataType = 'ACTOR' | 'ADDRESS' | 'ARRAY' | 'BOOLEAN' | 'CURRENCY' | 'DATE' | 'DATE_TIME' | 'EMAILS' | 'FILES' | 'FULL_NAME' | 'LINKS' | 'MORPH_RELATION' | 'MULTI_SELECT' | 'NUMBER' | 'NUMERIC' | 'PHONES' | 'POSITION' | 'RATING' | 'RAW_JSON' | 'RELATION' | 'RICH_TEXT' | 'SELECT' | 'TEXT' | 'TS_VECTOR' | 'UUID'++export interface PageInfo {+ /** true if paging forward and there are more records. */+ hasNextPage?: Scalars['Boolean']+ /** true if paging backwards and there are more records. */+ hasPreviousPage?: Scalars['Boolean']+ /** The cursor of the first returned record. */+ startCursor?: Scalars['ConnectionCursor']+ /** The cursor of the last returned record. */+ endCursor?: Scalars['ConnectionCursor']+ __typename: 'PageInfo'+}++export interface FieldEdge {+ /** The node containing the Field */+ node: Field+ /** Cursor for this node. */+ cursor: Scalars['ConnectionCursor']+ __typename: 'FieldEdge'+}++export interface FieldConnection {+ /** Paging information */+ pageInfo: PageInfo+ /** Array of edges. */+ edges: FieldEdge[]+ __typename: 'FieldConnection'+}+export interface Relation {type: RelationTypesourceObjectMetadata: Object@@ -1900,20 +1911,29 @@ export interface IndexField {__typename: 'IndexField'}-export interface ObjectRecordCount {- objectNamePlural: Scalars['String']- totalCount: Scalars['Int']- __typename: 'ObjectRecordCount'-}--export interface SearchField {+export interface Index {id: Scalars['UUID']- fieldMetadataId: Scalars['UUID']- tsVectorFieldMetadataId: Scalars['UUID']- position: Scalars['Float']+ name: Scalars['String']+ isCustom?: Scalars['Boolean']+ isUnique: Scalars['Boolean']+ indexWhereClause?: Scalars['String']+ indexType: IndexTypecreatedAt: Scalars['DateTime']updatedAt: Scalars['DateTime']- __typename: 'SearchField'+ indexFieldMetadataList: IndexField[]+ __typename: 'Index'+}+++/** Type of the index */+export type IndexType = 'BTREE' | 'GIN'++export interface IndexEdge {+ /** The node containing the Index */+ node: Index+ /** Cursor for this node. */+ cursor: Scalars['ConnectionCursor']+ __typename: 'IndexEdge'}export interface ObjectEdge {@@ -1924,18 +1944,6 @@ export interface ObjectEdge {__typename: 'ObjectEdge'}-export interface PageInfo {- /** true if paging forward and there are more records. */- hasNextPage?: Scalars['Boolean']- /** true if paging backwards and there are more records. */- hasPreviousPage?: Scalars['Boolean']- /** The cursor of the first returned record. */- startCursor?: Scalars['ConnectionCursor']- /** The cursor of the last returned record. */- endCursor?: Scalars['ConnectionCursor']- __typename: 'PageInfo'-}-export interface ObjectConnection {/** Paging information */pageInfo: PageInfo@@ -1944,12 +1952,12 @@ export interface ObjectConnection {__typename: 'ObjectConnection'}-export interface IndexEdge {- /** The node containing the Index */- node: Index- /** Cursor for this node. */- cursor: Scalars['ConnectionCursor']- __typename: 'IndexEdge'+export interface ObjectFieldsConnection {+ /** Paging information */+ pageInfo: PageInfo+ /** Array of edges. */+ edges: FieldEdge[]+ __typename: 'ObjectFieldsConnection'}export interface ObjectIndexMetadatasConnection {@@ -1960,28 +1968,20 @@ export interface ObjectIndexMetadatasConnection {__typename: 'ObjectIndexMetadatasConnection'}-export interface FieldEdge {- /** The node containing the Field */- node: Field- /** Cursor for this node. */- cursor: Scalars['ConnectionCursor']- __typename: 'FieldEdge'-}--export interface ObjectFieldsConnection {- /** Paging information */- pageInfo: PageInfo- /** Array of edges. */- edges: FieldEdge[]- __typename: 'ObjectFieldsConnection'+export interface ObjectRecordCount {+ objectNamePlural: Scalars['String']+ totalCount: Scalars['Int']+ __typename: 'ObjectRecordCount'}-export interface FieldConnection {- /** Paging information */- pageInfo: PageInfo- /** Array of edges. */- edges: FieldEdge[]- __typename: 'FieldConnection'+export interface SearchField {+ id: Scalars['UUID']+ fieldMetadataId: Scalars['UUID']+ tsVectorFieldMetadataId: Scalars['UUID']+ position: Scalars['Float']+ createdAt: Scalars['DateTime']+ updatedAt: Scalars['DateTime']+ __typename: 'SearchField'}export interface BillingEntitlement {@@ -2876,10 +2876,10 @@ export interface Query {getPageLayoutWidget: PageLayoutWidgetfindManyAgents: Agent[]findOneAgent: Agent+ objects: ObjectConnection+ object: ObjectobjectRecordCounts: ObjectRecordCount[]mostlyEmptyFieldMetadataIds: Scalars['UUID'][]- object: Object- objects: ObjectConnectionfindOneLogicFunction: LogicFunctionfindManyLogicFunctions: LogicFunction[]getAvailablePackages: Scalars['JSON']@@ -2906,8 +2906,8 @@ export interface Query {findMarketplaceAppDetail: MarketplaceAppDetailpublicMarketplaceApps: MarketplaceApp[]publicMarketplaceAppDetail: MarketplaceAppDetail- field: Fieldfields: FieldConnection+ field: FieldgetViewGroups: ViewGroup[]getViewGroup?: ViewGroupgetRoles: Role[]@@ -3399,51 +3399,6 @@ export interface LogicFunctionGenqlSelection{__scalar?: boolean | number}-export interface FieldGenqlSelection{- id?: boolean | number- universalIdentifier?: boolean | number- type?: boolean | number- name?: boolean | number- label?: boolean | number- description?: boolean | number- icon?: boolean | number- isActive?: boolean | number- isSystem?: boolean | number- isUIEditable?: boolean | number- /** @deprecated Use isUIEditable */- isUIReadOnly?: boolean | number- isNullable?: boolean | number- isUnique?: boolean | number- defaultValue?: boolean | number- options?: boolean | number- settings?: boolean | number- objectMetadataId?: boolean | number- isLabelSyncedWithName?: boolean | number- morphId?: boolean | number- createdAt?: boolean | number- updatedAt?: boolean | number- applicationId?: boolean | number- relation?: RelationGenqlSelection- morphRelations?: RelationGenqlSelection- object?: ObjectGenqlSelection- __typename?: boolean | number- __scalar?: boolean | number-}--export interface IndexGenqlSelection{- id?: boolean | number- name?: boolean | number- isCustom?: boolean | number- isUnique?: boolean | number- indexWhereClause?: boolean | number- indexType?: boolean | number- createdAt?: boolean | number- updatedAt?: boolean | number- indexFieldMetadataList?: IndexFieldGenqlSelection- __typename?: boolean | number- __scalar?: boolean | number-}-export interface ObjectGenqlSelection{id?: boolean | numberuniversalIdentifier?: boolean | number@@ -3471,9 +3426,6 @@ export interface ObjectGenqlSelection{imageIdentifierFieldMetadataId?: boolean | numberisLabelSyncedWithName?: boolean | numberduplicateCriteria?: boolean | number- fieldsList?: FieldGenqlSelection- indexMetadataList?: IndexGenqlSelection- searchFieldMetadataList?: SearchFieldGenqlSelectionfields?: (ObjectFieldsConnectionGenqlSelection & { __args: {/** Limit or page results. */paging: CursorPaging,@@ -3484,6 +3436,9 @@ export interface ObjectGenqlSelection{paging: CursorPaging,/** Specify to filter the records returned. */filter: IndexFilter} })+ fieldsList?: FieldGenqlSelection+ indexMetadataList?: IndexGenqlSelection+ searchFieldMetadataList?: SearchFieldGenqlSelection__typename?: boolean | number__scalar?: boolean | number}@@ -5169,6 +5124,68 @@ export interface WorkspaceCompanyEnrichmentResultGenqlSelection{__scalar?: boolean | number}+export interface FieldGenqlSelection{+ id?: boolean | number+ universalIdentifier?: boolean | number+ type?: boolean | number+ name?: boolean | number+ label?: boolean | number+ description?: boolean | number+ icon?: boolean | number+ isActive?: boolean | number+ isSystem?: boolean | number+ isUIEditable?: boolean | number+ /** @deprecated Use isUIEditable */+ isUIReadOnly?: boolean | number+ isNullable?: boolean | number+ isUnique?: boolean | number+ defaultValue?: boolean | number+ options?: boolean | number+ settings?: boolean | number+ objectMetadataId?: boolean | number+ isLabelSyncedWithName?: boolean | number+ morphId?: boolean | number+ createdAt?: boolean | number+ updatedAt?: boolean | number+ applicationId?: boolean | number+ object?: ObjectGenqlSelection+ relation?: RelationGenqlSelection+ morphRelations?: RelationGenqlSelection+ __typename?: boolean | number+ __scalar?: boolean | number+}++export interface PageInfoGenqlSelection{+ /** true if paging forward and there are more records. */+ hasNextPage?: boolean | number+ /** true if paging backwards and there are more records. */+ hasPreviousPage?: boolean | number+ /** The cursor of the first returned record. */+ startCursor?: boolean | number+ /** The cursor of the last returned record. */+ endCursor?: boolean | number+ __typename?: boolean | number+ __scalar?: boolean | number+}++export interface FieldEdgeGenqlSelection{+ /** The node containing the Field */+ node?: FieldGenqlSelection+ /** Cursor for this node. */+ cursor?: boolean | number+ __typename?: boolean | number+ __scalar?: boolean | number+}++export interface FieldConnectionGenqlSelection{+ /** Paging information */+ pageInfo?: PageInfoGenqlSelection+ /** Array of edges. */+ edges?: FieldEdgeGenqlSelection+ __typename?: boolean | number+ __scalar?: boolean | number+}+export interface RelationGenqlSelection{type?: boolean | numbersourceObjectMetadata?: ObjectGenqlSelection@@ -5190,42 +5207,34 @@ export interface IndexFieldGenqlSelection{__scalar?: boolean | number}-export interface ObjectRecordCountGenqlSelection{- objectNamePlural?: boolean | number- totalCount?: boolean | number- __typename?: boolean | number- __scalar?: boolean | number-}--export interface SearchFieldGenqlSelection{+export interface IndexGenqlSelection{id?: boolean | number- fieldMetadataId?: boolean | number- tsVectorFieldMetadataId?: boolean | number- position?: boolean | number+ name?: boolean | number+ isCustom?: boolean | number+ isUnique?: boolean | number+ indexWhereClause?: boolean | number+ indexType?: boolean | numbercreatedAt?: boolean | numberupdatedAt?: boolean | number+ indexFieldMetadataList?: IndexFieldGenqlSelection__typename?: boolean | number__scalar?: boolean | number}-export interface ObjectEdgeGenqlSelection{- /** The node containing the Object */- node?: ObjectGenqlSelection+export interface IndexEdgeGenqlSelection{+ /** The node containing the Index */+ node?: IndexGenqlSelection/** Cursor for this node. */cursor?: boolean | number__typename?: boolean | number__scalar?: boolean | number}-export interface PageInfoGenqlSelection{- /** true if paging forward and there are more records. */- hasNextPage?: boolean | number- /** true if paging backwards and there are more records. */- hasPreviousPage?: boolean | number- /** The cursor of the first returned record. */- startCursor?: boolean | number- /** The cursor of the last returned record. */- endCursor?: boolean | number+export interface ObjectEdgeGenqlSelection{+ /** The node containing the Object */+ node?: ObjectGenqlSelection+ /** Cursor for this node. */+ cursor?: boolean | number__typename?: boolean | number__scalar?: boolean | number}@@ -5239,11 +5248,11 @@ export interface ObjectConnectionGenqlSelection{__scalar?: boolean | number}-export interface IndexEdgeGenqlSelection{- /** The node containing the Index */- node?: IndexGenqlSelection- /** Cursor for this node. */- cursor?: boolean | number+export interface ObjectFieldsConnectionGenqlSelection{+ /** Paging information */+ pageInfo?: PageInfoGenqlSelection+ /** Array of edges. */+ edges?: FieldEdgeGenqlSelection__typename?: boolean | number__scalar?: boolean | number}@@ -5257,29 +5266,20 @@ export interface ObjectIndexMetadatasConnectionGenqlSelection{__scalar?: boolean | number}-export interface FieldEdgeGenqlSelection{- /** The node containing the Field */- node?: FieldGenqlSelection- /** Cursor for this node. */- cursor?: boolean | number- __typename?: boolean | number- __scalar?: boolean | number-}--export interface ObjectFieldsConnectionGenqlSelection{- /** Paging information */- pageInfo?: PageInfoGenqlSelection- /** Array of edges. */- edges?: FieldEdgeGenqlSelection+export interface ObjectRecordCountGenqlSelection{+ objectNamePlural?: boolean | number+ totalCount?: boolean | number__typename?: boolean | number__scalar?: boolean | number}-export interface FieldConnectionGenqlSelection{- /** Paging information */- pageInfo?: PageInfoGenqlSelection- /** Array of edges. */- edges?: FieldEdgeGenqlSelection+export interface SearchFieldGenqlSelection{+ id?: boolean | number+ fieldMetadataId?: boolean | number+ tsVectorFieldMetadataId?: boolean | number+ position?: boolean | number+ createdAt?: boolean | number+ updatedAt?: boolean | number__typename?: boolean | number__scalar?: boolean | number}@@ -6229,16 +6229,16 @@ export interface QueryGenqlSelection{getPageLayoutWidget?: (PageLayoutWidgetGenqlSelection & { __args: {id: Scalars['String']} })findManyAgents?: AgentGenqlSelectionfindOneAgent?: (AgentGenqlSelection & { __args: {input: AgentIdInput} })- objectRecordCounts?: ObjectRecordCountGenqlSelection- mostlyEmptyFieldMetadataIds?: { __args: {objectMetadataId: Scalars['UUID']} }- object?: (ObjectGenqlSelection & { __args: {- /** The id of the record to find. */- id: Scalars['UUID']} })objects?: (ObjectConnectionGenqlSelection & { __args: {/** Limit or page results. */paging: CursorPaging,/** Specify to filter the records returned. */filter: ObjectFilter} })+ object?: (ObjectGenqlSelection & { __args: {+ /** The id of the record to find. */+ id: Scalars['UUID']} })+ objectRecordCounts?: ObjectRecordCountGenqlSelection+ mostlyEmptyFieldMetadataIds?: { __args: {objectMetadataId: Scalars['UUID']} }findOneLogicFunction?: (LogicFunctionGenqlSelection & { __args: {input: LogicFunctionIdInput} })findManyLogicFunctions?: LogicFunctionGenqlSelectiongetAvailablePackages?: { __args: {input: LogicFunctionIdInput} }@@ -6265,14 +6265,14 @@ export interface QueryGenqlSelection{findMarketplaceAppDetail?: (MarketplaceAppDetailGenqlSelection & { __args: {universalIdentifier: Scalars['String']} })publicMarketplaceApps?: (MarketplaceAppGenqlSelection & { __args: {isVetted: Scalars['Boolean']} })publicMarketplaceAppDetail?: (MarketplaceAppDetailGenqlSelection & { __args: {universalIdentifier: Scalars['String']} })- field?: (FieldGenqlSelection & { __args: {- /** The id of the record to find. */- id: Scalars['UUID']} })fields?: (FieldConnectionGenqlSelection & { __args: {/** Limit or page results. */paging: CursorPaging,/** Specify to filter the records returned. */filter: FieldFilter} })+ field?: (FieldGenqlSelection & { __args: {+ /** The id of the record to find. */+ id: Scalars['UUID']} })getViewGroups?: (ViewGroupGenqlSelection & { __args?: {viewId?: (Scalars['String'] | null)} })getViewGroup?: (ViewGroupGenqlSelection & { __args: {id: Scalars['String']} })getRoles?: RoleGenqlSelection@@ -6329,7 +6329,7 @@ export interface AgentIdInput {/** The id of the agent. */id: Scalars['UUID']}-export interface ObjectFilter {and?: (ObjectFilter[] | null),or?: (ObjectFilter[] | null),id?: (UUIDFilterComparison | null),isRemote?: (BooleanFieldComparison | null),isActive?: (BooleanFieldComparison | null),isSystem?: (BooleanFieldComparison | null),isUIEditable?: (BooleanFieldComparison | null),isUICreatable?: (BooleanFieldComparison | null),isUIReadOnly?: (BooleanFieldComparison | null),isSearchable?: (BooleanFieldComparison | null)}+export interface ObjectFilter {and?: (ObjectFilter[] | null),or?: (ObjectFilter[] | null),id?: (UUIDFilterComparison | null),isActive?: (BooleanFieldComparison | null),isRemote?: (BooleanFieldComparison | null),isSearchable?: (BooleanFieldComparison | null),isSystem?: (BooleanFieldComparison | null),isUICreatable?: (BooleanFieldComparison | null),isUIEditable?: (BooleanFieldComparison | null),isUIReadOnly?: (BooleanFieldComparison | null)}export interface LogicFunctionIdInput {/** The id of the function. */@@ -7127,22 +7127,6 @@ export interface LogicFunctionLogsInput {applicationId?: (Scalars['UUID'] | null- const Field_possibleTypes: string[] = ['Field']- export const isField = (obj?: { __typename?: any } | null): obj is Field => {- if (!obj?.__typename) throw new Error('__typename is missing in "isField"')- return Field_possibleTypes.includes(obj.__typename)- }---- const Index_possibleTypes: string[] = ['Index']- export const isIndex = (obj?: { __typename?: any } | null): obj is Index => {- if (!obj?.__typename) throw new Error('__typename is missing in "isIndex"')- return Index_possibleTypes.includes(obj.__typename)- }---const Object_possibleTypes: string[] = ['Object']export const isObject = (obj?: { __typename?: any } | null): obj is Object => {if (!obj?.__typename) throw new Error('__typename is missing in "isObject"')@@ -8287,6 +8271,38 @@ export interface LogicFunctionLogsInput {applicationId?: (Scalars['UUID'] | null+ const Field_possibleTypes: string[] = ['Field']+ export const isField = (obj?: { __typename?: any } | null): obj is Field => {+ if (!obj?.__typename) throw new Error('__typename is missing in "isField"')+ return Field_possibleTypes.includes(obj.__typename)+ }++++ const PageInfo_possibleTypes: string[] = ['PageInfo']+ export const isPageInfo = (obj?: { __typename?: any } | null): obj is PageInfo => {+ if (!obj?.__typename) throw new Error('__typename is missing in "isPageInfo"')+ return PageInfo_possibleTypes.includes(obj.__typename)+ }++++ const FieldEdge_possibleTypes: string[] = ['FieldEdge']+ export const isFieldEdge = (obj?: { __typename?: any } | null): obj is FieldEdge => {+ if (!obj?.__typename) throw new Error('__typename is missing in "isFieldEdge"')+ return FieldEdge_possibleTypes.includes(obj.__typename)+ }++++ const FieldConnection_possibleTypes: string[] = ['FieldConnection']+ export const isFieldConnection = (obj?: { __typename?: any } | null): obj is FieldConnection => {+ if (!obj?.__typename) throw new Error('__typename is missing in "isFieldConnection"')+ return FieldConnection_possibleTypes.includes(obj.__typename)+ }+++const Relation_possibleTypes: string[] = ['Relation']export const isRelation = (obj?: { __typename?: any } | null): obj is Relation => {if (!obj?.__typename) throw new Error('__typename is missing in "isRelation"')@@ -8303,18 +8319,18 @@ export interface LogicFunctionLogsInput {applicationId?: (Scalars['UUID'] | null- const ObjectRecordCount_possibleTypes: string[] = ['ObjectRecordCount']- export const isObjectRecordCount = (obj?: { __typename?: any } | null): obj is ObjectRecordCount => {- if (!obj?.__typename) throw new Error('__typename is missing in "isObjectRecordCount"')- return ObjectRecordCount_possibleTypes.includes(obj.__typename)+ const Index_possibleTypes: string[] = ['Index']+ export const isIndex = (obj?: { __typename?: any } | null): obj is Index => {+ if (!obj?.__typename) throw new Error('__typename is missing in "isIndex"')+ return Index_possibleTypes.includes(obj.__typename)}- const SearchField_possibleTypes: string[] = ['SearchField']- export const isSearchField = (obj?: { __typename?: any } | null): obj is SearchField => {- if (!obj?.__typename) throw new Error('__typename is missing in "isSearchField"')- return SearchField_possibleTypes.includes(obj.__typename)+ const IndexEdge_possibleTypes: string[] = ['IndexEdge']+ export const isIndexEdge = (obj?: { __typename?: any } | null): obj is IndexEdge => {+ if (!obj?.__typename) throw new Error('__typename is missing in "isIndexEdge"')+ return IndexEdge_possibleTypes.includes(obj.__typename)}@@ -8327,14 +8343,6 @@ export interface LogicFunctionLogsInput {applicationId?: (Scalars['UUID'] | null- const PageInfo_possibleTypes: string[] = ['PageInfo']- export const isPageInfo = (obj?: { __typename?: any } | null): obj is PageInfo => {- if (!obj?.__typename) throw new Error('__typename is missing in "isPageInfo"')- return PageInfo_possibleTypes.includes(obj.__typename)- }---const ObjectConnection_possibleTypes: string[] = ['ObjectConnection']export const isObjectConnection = (obj?: { __typename?: any } | null): obj is ObjectConnection => {if (!obj?.__typename) throw new Error('__typename is missing in "isObjectConnection"')@@ -8343,10 +8351,10 @@ export interface LogicFunctionLogsInput {applicationId?: (Scalars['UUID'] | null- const IndexEdge_possibleTypes: string[] = ['IndexEdge']- export const isIndexEdge = (obj?: { __typename?: any } | null): obj is IndexEdge => {- if (!obj?.__typename) throw new Error('__typename is missing in "isIndexEdge"')- return IndexEdge_possibleTypes.includes(obj.__typename)+ const ObjectFieldsConnection_possibleTypes: string[] = ['ObjectFieldsConnection']+ export const isObjectFieldsConnection = (obj?: { __typename?: any } | null): obj is ObjectFieldsConnection => {+ if (!obj?.__typename) throw new Error('__typename is missing in "isObjectFieldsConnection"')+ return ObjectFieldsConnection_possibleTypes.includes(obj.__typename)}@@ -8359,26 +8367,18 @@ export interface LogicFunctionLogsInput {applicationId?: (Scalars['UUID'] | null- const FieldEdge_possibleTypes: string[] = ['FieldEdge']- export const isFieldEdge = (obj?: { __typename?: any } | null): obj is FieldEdge => {- if (!obj?.__typename) throw new Error('__typename is missing in "isFieldEdge"')- return FieldEdge_possibleTypes.includes(obj.__typename)- }---- const ObjectFieldsConnection_possibleTypes: string[] = ['ObjectFieldsConnection']- export const isObjectFieldsConnection = (obj?: { __typename?: any } | null): obj is ObjectFieldsConnection => {- if (!obj?.__typename) throw new Error('__typename is missing in "isObjectFieldsConnection"')- return ObjectFieldsConnection_possibleTypes.includes(obj.__typename)+ const ObjectRecordCount_possibleTypes: string[] = ['ObjectRecordCount']+ export const isObjectRecordCount = (obj?: { __typename?: any } | null): obj is ObjectRecordCount => {+ if (!obj?.__typename) throw new Error('__typename is missing in "isObjectRecordCount"')+ return ObjectRecordCount_possibleTypes.includes(obj.__typename)}- const FieldConnection_possibleTypes: string[] = ['FieldConnection']- export const isFieldConnection = (obj?: { __typename?: any } | null): obj is FieldConnection => {- if (!obj?.__typename) throw new Error('__typename is missing in "isFieldConnection"')- return FieldConnection_possibleTypes.includes(obj.__typename)+ const SearchField_possibleTypes: string[] = ['SearchField']+ export const isSearchField = (obj?: { __typename?: any } | null): obj is SearchField => {+ if (!obj?.__typename) throw new Error('__typename is missing in "isSearchField"')+ return SearchField_possibleTypes.includes(obj.__typename)}@@ -9275,39 +9275,6 @@ export const enumLogicFunctionExecutionMode = {PREBUILT: 'PREBUILT' as const}-export const enumFieldMetadataType = {- ACTOR: 'ACTOR' as const,- ADDRESS: 'ADDRESS' as const,- ARRAY: 'ARRAY' as const,- BOOLEAN: 'BOOLEAN' as const,- CURRENCY: 'CURRENCY' as const,- DATE: 'DATE' as const,- DATE_TIME: 'DATE_TIME' as const,- EMAILS: 'EMAILS' as const,- FILES: 'FILES' as const,- FULL_NAME: 'FULL_NAME' as const,- LINKS: 'LINKS' as const,- MORPH_RELATION: 'MORPH_RELATION' as const,- MULTI_SELECT: 'MULTI_SELECT' as const,- NUMBER: 'NUMBER' as const,- NUMERIC: 'NUMERIC' as const,- PHONES: 'PHONES' as const,- POSITION: 'POSITION' as const,- RATING: 'RATING' as const,- RAW_JSON: 'RAW_JSON' as const,- RELATION: 'RELATION' as const,- RICH_TEXT: 'RICH_TEXT' as const,- SELECT: 'SELECT' as const,- TEXT: 'TEXT' as const,- TS_VECTOR: 'TS_VECTOR' as const,- UUID: 'UUID' as const-}--export const enumIndexType = {- BTREE: 'BTREE' as const,- GIN: 'GIN' as const-}-export const enumObjectOpenRecordIn = {SIDE_PANEL: 'SIDE_PANEL' as const,RECORD_PAGE: 'RECORD_PAGE' as const,@@ -9728,11 +9695,44 @@ export const enumWorkspaceCompanyEnrichmentOutcome = {transientError: 'transientError' as const}+export const enumFieldMetadataType = {+ ACTOR: 'ACTOR' as const,+ ADDRESS: 'ADDRESS' as const,+ ARRAY: 'ARRAY' as const,+ BOOLEAN: 'BOOLEAN' as const,+ CURRENCY: 'CURRENCY' as const,+ DATE: 'DATE' as const,+ DATE_TIME: 'DATE_TIME' as const,+ EMAILS: 'EMAILS' as const,+ FILES: 'FILES' as const,+ FULL_NAME: 'FULL_NAME' as const,+ LINKS: 'LINKS' as const,+ MORPH_RELATION: 'MORPH_RELATION' as const,+ MULTI_SELECT: 'MULTI_SELECT' as const,+ NUMBER: 'NUMBER' as const,+ NUMERIC: 'NUMERIC' as const,+ PHONES: 'PHONES' as const,+ POSITION: 'POSITION' as const,+ RATING: 'RATING' as const,+ RAW_JSON: 'RAW_JSON' as const,+ RELATION: 'RELATION' as const,+ RICH_TEXT: 'RICH_TEXT' as const,+ SELECT: 'SELECT' as const,+ TEXT: 'TEXT' as const,+ TS_VECTOR: 'TS_VECTOR' as const,+ UUID: 'UUID' as const+}+export const enumRelationType = {ONE_TO_MANY: 'ONE_TO_MANY' as const,MANY_TO_ONE: 'MANY_TO_ONE' as const}+export const enumIndexType = {+ BTREE: 'BTREE' as const,+ GIN: 'GIN' as const+}+export const enumBillingEntitlementKey = {SSO: 'SSO' as const,CUSTOM_DOMAIN: 'CUSTOM_DOMAIN' as const,diff --git a/packages/twenty-client-sdk/src/metadata/generated/types.ts b/packages/twenty-client-sdk/src/metadata/generated/types.tsindex 45d10617eba..a217449b234 100644--- a/packages/twenty-client-sdk/src/metadata/generated/types.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/types.ts@@ -12,58 +12,58 @@ export default {23,25,27,- 29,- 31,- 32,- 39,- 40,+ 28,+ 35,+ 36,+ 37,+ 38,41,- 42,- 45,- 47,+ 43,+ 51,+ 53,55,57,- 59,- 61,+ 60,+ 63,64,+ 65,+ 66,67,- 68,69,70,- 71,+ 72,73,- 74,- 76,- 77,- 84,- 87,+ 80,+ 83,+ 88,+ 89,92,93,- 96,- 97,+ 95,+ 98,99,- 102,- 103,- 113,- 127,+ 109,+ 123,+ 129,+ 130,+ 131,133,- 134,- 135,- 137,- 145,- 148,- 156,- 159,- 161,- 176,- 183,- 184,- 191,- 194,- 197,- 209,- 226,- 228,+ 141,+ 144,+ 152,+ 155,+ 157,+ 172,+ 179,+ 180,+ 187,+ 190,+ 193,+ 205,+ 222,+ 224,+ 229,+ 232,241,247,283,@@ -104,13 +104,13 @@ export default {1],"metadata": [- 132+ 128],"on_BillingLicensedProduct": [- 141+ 137],"on_BillingMeteredProduct": [- 142+ 138],"__typename": [1@@ -176,7 +176,7 @@ export default {6],"role": [- 51+ 47],"__typename": [1@@ -503,120 +503,6 @@ export default {]},"LogicFunctionExecutionMode": {},- "Field": {- "id": [- 4- ],- "universalIdentifier": [- 1- ],- "type": [- 25- ],- "name": [- 1- ],- "label": [- 1- ],- "description": [- 1- ],- "icon": [- 1- ],- "isActive": [- 3- ],- "isSystem": [- 3- ],- "isUIEditable": [- 3- ],- "isUIReadOnly": [- 3- ],- "isNullable": [- 3- ],- "isUnique": [- 3- ],- "defaultValue": [- 5- ],- "options": [- 5- ],- "settings": [- 5- ],- "objectMetadataId": [- 4- ],- "isLabelSyncedWithName": [- 3- ],- "morphId": [- 4- ],- "createdAt": [- 6- ],- "updatedAt": [- 6- ],- "applicationId": [- 4- ],- "relation": [- 227- ],- "morphRelations": [- 227- ],- "object": [- 28- ],- "__typename": [- 1- ]- },- "FieldMetadataType": {},- "Index": {- "id": [- 4- ],- "name": [- 1- ],- "isCustom": [- 3- ],- "isUnique": [- 3- ],- "indexWhereClause": [- 1- ],- "indexType": [- 27- ],- "createdAt": [- 6- ],- "updatedAt": [- 6- ],- "indexFieldMetadataList": [- 229- ],- "__typename": [- 1- ]- },- "IndexType": {},"Object": {"id": [4@@ -670,7 +556,7 @@ export default {3],"openRecordIn": [- 29+ 25],"applicationId": [4@@ -693,41 +579,41 @@ export default {"duplicateCriteria": [1],- "fieldsList": [- 24- ],- "indexMetadataList": [- 26- ],- "searchFieldMetadataList": [- 231- ],"fields": [- 238,+ 236,{"paging": [- 30,+ 26,"CursorPaging!"],"filter": [- 33,+ 29,"FieldFilter!"]}],"indexMetadatas": [- 236,+ 237,{"paging": [- 30,+ 26,"CursorPaging!"],"filter": [- 36,+ 32,"IndexFilter!"]}],+ "fieldsList": [+ 223+ ],+ "indexMetadataList": [+ 231+ ],+ "searchFieldMetadataList": [+ 239+ ],"__typename": [1]@@ -735,16 +621,16 @@ export default {"ObjectOpenRecordIn": {},"CursorPaging": {"before": [- 32+ 28],"after": [- 32+ 28],"first": [- 31+ 27],"last": [- 31+ 27],"__typename": [1@@ -754,28 +640,28 @@ export default {"ConnectionCursor": {},"FieldFilter": {"and": [- 33+ 29],"or": [- 33+ 29],"id": [- 34+ 30],"isActive": [- 35+ 31],"isSystem": [- 35+ 31],"isUIEditable": [- 35+ 31],"isUIReadOnly": [- 35+ 31],"objectMetadataId": [- 34+ 30],"__typename": [1@@ -841,16 +727,16 @@ export default {},"IndexFilter": {"and": [- 36+ 32],"or": [- 36+ 32],"id": [- 34+ 30],"isCustom": [- 35+ 31],"__typename": [1@@ -872,7 +758,7 @@ export default {4],"name": [- 37+ 33],"userEmail": [1@@ -881,7 +767,7 @@ export default {1],"openRecordIn": [- 39+ 35],"avatarUrl": [1@@ -890,25 +776,25 @@ export default {1],"calendarStartDay": [- 31+ 27],"timeZone": [1],"dateFormat": [- 40+ 36],"timeFormat": [- 41+ 37],"roles": [- 51+ 47],"userWorkspaceId": [4],"numberFormat": [- 42+ 38],"__typename": [1@@ -949,7 +835,7 @@ export default {1],"logicalOperator": [- 45+ 41],"positionInRowLevelPermissionPredicateGroup": [16@@ -976,7 +862,7 @@ export default {1],"operand": [- 47+ 43],"subFieldName": [1@@ -1024,10 +910,10 @@ export default {5],"rowLevelPermissionPredicates": [- 46+ 42],"rowLevelPermissionPredicateGroups": [- 44+ 40],"__typename": [1@@ -1093,13 +979,13 @@ export default {3],"workspaceMembers": [- 38+ 34],"agents": [11],"apiKeys": [- 50+ 46],"canUpdateAllSettings": [3@@ -1120,19 +1006,19 @@ export default {3],"permissionFlags": [- 49+ 45],"objectPermissions": [- 48+ 44],"fieldPermissions": [- 43+ 39],"rowLevelPermissionPredicates": [- 46+ 42],"rowLevelPermissionPredicateGroups": [- 44+ 40],"__typename": [1@@ -1188,7 +1074,7 @@ export default {4],"defaultLogicFunctionRole": [- 51+ 47],"agents": [11@@ -1203,7 +1089,7 @@ export default {22],"objects": [- 28+ 24],"applicationVariables": [10@@ -1237,7 +1123,7 @@ export default {4],"user": [- 75+ 71],"userId": [4@@ -1255,16 +1141,16 @@ export default {6],"permissionFlags": [- 55+ 51],"objectPermissions": [- 48+ 44],"objectsPermissions": [- 48+ 44],"twoFactorAuthenticationMethodSummary": [- 53+ 49],"isImpersonating": [3@@ -1291,7 +1177,7 @@ export default {16],"aggregateOperation": [- 57+ 53],"viewId": [4@@ -1330,7 +1216,7 @@ export default {4],"logicalOperator": [- 59+ 55],"positionInViewFilterGroup": [16@@ -1363,7 +1249,7 @@ export default {4],"operand": [- 61+ 57],"value": [5@@ -1440,7 +1326,7 @@ export default {4],"direction": [- 64+ 60],"subFieldName": [1@@ -1497,7 +1383,7 @@ export default {6],"viewFields": [- 56+ 52],"isOverridden": [3@@ -1517,10 +1403,10 @@ export default {4],"type": [- 67+ 63],"key": [- 68+ 64],"icon": [1@@ -1535,10 +1421,10 @@ export default {3],"openRecordIn": [- 69+ 65],"kanbanAggregateOperation": [- 57+ 53],"kanbanAggregateOperationFieldMetadataId": [4@@ -1550,7 +1436,7 @@ export default {3],"kanbanColumnWidth": [- 31+ 27],"calendarFieldMetadataId": [4@@ -1565,7 +1451,7 @@ export default {1],"calendarLayout": [- 70+ 66],"createdAt": [6@@ -1577,25 +1463,25 @@ export default {6],"viewFields": [- 56+ 52],"viewFilters": [- 60+ 56],"viewFilterGroups": [- 58+ 54],"viewSorts": [- 63+ 59],"viewGroups": [- 62+ 58],"viewFieldGroups": [- 65+ 61],"visibility": [- 71+ 67],"createdByUserWorkspaceId": [4@@ -1644,7 +1530,7 @@ export default {3],"workspaceDiscoverability": [- 73+ 69],"trashRetentionDays": [16@@ -1656,25 +1542,25 @@ export default {16],"activationStatus": [- 74+ 70],"views": [- 66+ 62],"viewFields": [- 56+ 52],"viewFilters": [- 60+ 56],"viewFilterGroups": [- 58+ 54],"viewGroups": [- 62+ 58],"viewSorts": [- 63+ 59],"metadataVersion": [16@@ -1719,7 +1605,7 @@ export default {1],"defaultRole": [- 51+ 47],"fastModel": [1@@ -1740,22 +1626,22 @@ export default {1],"workspaceCustomApplication": [- 52+ 48],"featureFlags": [- 175+ 171],"billingSubscriptions": [- 144+ 140],"installedApplications": [- 52+ 48],"currentBillingSubscription": [- 144+ 140],"billingCustomer": [- 146+ 142],"billingEntitlements": [240@@ -1767,7 +1653,7 @@ export default {3],"workspaceUrls": [- 177+ 173],"workspaceCustomApplicationId": [1@@ -1816,28 +1702,28 @@ export default {1],"workspaceMember": [- 38+ 34],"userWorkspaces": [- 54+ 50],"onboardingStatus": [- 76+ 72],"currentWorkspace": [- 72+ 68],"currentUserWorkspace": [- 54+ 50],"userVars": [- 77+ 73],"workspaceMembers": [- 38+ 34],"deletedWorkspaceMembers": [- 219+ 215],"hasPassword": [3@@ -1849,10 +1735,10 @@ export default {3],"workspaces": [- 54+ 50],"availableWorkspaces": [- 218+ 214],"__typename": [1@@ -1983,19 +1869,19 @@ export default {1],"type": [- 84+ 80],"objectMetadataId": [4],"gridPosition": [- 82+ 78],"position": [- 85+ 81],"configuration": [- 90+ 86],"conditionalDisplay": [5@@ -2025,13 +1911,13 @@ export default {"WidgetType": {},"PageLayoutWidgetPosition": {"on_PageLayoutWidgetGridPosition": [- 86+ 82],"on_PageLayoutWidgetVerticalListPosition": [- 88+ 84],"on_PageLayoutWidgetCanvasPosition": [- 89+ 85],"__typename": [1@@ -2039,19 +1925,19 @@ export default {},"PageLayoutWidgetGridPosition": {"layoutMode": [- 87+ 83],"row": [- 31+ 27],"column": [- 31+ 27],"rowSpan": [- 31+ 27],"columnSpan": [- 31+ 27],"__typename": [1@@ -2060,10 +1946,10 @@ export default {"PageLayoutTabLayoutMode": {},"PageLayoutWidgetVerticalListPosition": {"layoutMode": [- 87+ 83],"index": [- 31+ 27],"__typename": [1@@ -2071,7 +1957,7 @@ export default {},"PageLayoutWidgetCanvasPosition": {"layoutMode": [- 87+ 83],"__typename": [1@@ -2079,82 +1965,82 @@ export default {},"WidgetConfiguration": {"on_AggregateChartConfiguration": [- 91+ 87],"on_StandaloneRichTextConfiguration": [- 94+ 90],"on_PieChartConfiguration": [- 95+ 91],"on_LineChartConfiguration": [- 98+ 94],"on_IframeConfiguration": [- 100+ 96],"on_BarChartConfiguration": [- 101+ 97],"on_CalendarConfiguration": [- 104+ 100],"on_FrontComponentConfiguration": [- 105+ 101],"on_EmailsConfiguration": [- 106+ 102],"on_EmailThreadConfiguration": [- 107+ 103],"on_CallRecordingSummaryConfiguration": [- 108+ 104],"on_CallRecordingTranscriptConfiguration": [- 109+ 105],"on_MessageCampaignBodyConfiguration": [- 110+ 106],"on_MessageCampaignDetailsConfiguration": [- 111+ 107],"on_FieldConfiguration": [- 112+ 108],"on_FieldRichTextConfiguration": [- 114+ 110],"on_FieldsConfiguration": [- 115+ 111],"on_FilesConfiguration": [- 116+ 112],"on_NotesConfiguration": [- 117+ 113],"on_TasksConfiguration": [- 118+ 114],"on_TimelineConfiguration": [- 119+ 115],"on_ViewConfiguration": [- 120+ 116],"on_RecordTableConfiguration": [- 121+ 117],"on_WorkflowConfiguration": [- 122+ 118],"on_WorkflowRunConfiguration": [- 123+ 119],"on_WorkflowVersionConfiguration": [- 124+ 120],"__typename": [1@@ -2162,13 +2048,13 @@ export default {},"AggregateChartConfiguration": {"configurationType": [- 92+ 88],"aggregateFieldMetadataId": [4],"aggregateOperation": [- 57+ 53],"label": [1@@ -2177,7 +2063,7 @@ export default {3],"numberFormat": [- 93+ 89],"description": [1@@ -2189,7 +2075,7 @@ export default {1],"firstDayOfTheWeek": [- 31+ 27],"prefix": [1@@ -2198,7 +2084,7 @@ export default {1],"ratioAggregateConfig": [- 80+ 76],"__typename": [1@@ -2208,10 +2094,10 @@ export default {"ChartNumberFormat": {},"StandaloneRichTextConfiguration": {"configurationType": [- 92+ 88],"body": [- 81+ 77],"__typename": [1@@ -2219,13 +2105,13 @@ export default {},"PieChartConfiguration": {"configurationType": [- 92+ 88],"aggregateFieldMetadataId": [4],"aggregateOperation": [- 57+ 53],"groupByFieldMetadataId": [4@@ -2234,10 +2120,10 @@ export default {1],"dateGranularity": [- 96+ 92],"orderBy": [- 97+ 93],"manualSortOrder": [1@@ -2255,7 +2141,7 @@ export default {3],"numberFormat": [- 93+ 89],"splitMultiValueFields": [3@@ -2273,7 +2159,7 @@ export default {1],"firstDayOfTheWeek": [- 31+ 27],"__typename": [1@@ -2283,13 +2169,13 @@ export default {"GraphOrderBy": {},"LineChartConfiguration": {"configurationType": [- 92+ 88],"aggregateFieldMetadataId": [4],"aggregateOperation": [- 57+ 53],"primaryAxisGroupByFieldMetadataId": [4@@ -2298,10 +2184,10 @@ export default {1],"primaryAxisDateGranularity": [- 96+ 92],"primaryAxisOrderBy": [- 97+ 93],"primaryAxisManualSortOrder": [1@@ -2313,10 +2199,10 @@ export default {1],"secondaryAxisGroupByDateGranularity": [- 96+ 92],"secondaryAxisOrderBy": [- 97+ 93],"secondaryAxisManualSortOrder": [1@@ -2328,7 +2214,7 @@ export default {3],"axisNameDisplay": [- 99+ 95],"displayDataLabel": [3@@ -2337,7 +2223,7 @@ export default {3],"numberFormat": [- 93+ 89],"rangeMin": [16@@ -2364,7 +2250,7 @@ export default {1],"firstDayOfTheWeek": [- 31+ 27],"__typename": [1@@ -2373,7 +2259,7 @@ export default {"AxisNameDisplay": {},"IframeConfiguration": {"configurationType": [- 92+ 88],"url": [1@@ -2384,13 +2270,13 @@ export default {},"BarChartConfiguration": {"configurationType": [- 92+ 88],"aggregateFieldMetadataId": [4],"aggregateOperation": [- 57+ 53],"primaryAxisGroupByFieldMetadataId": [4@@ -2399,10 +2285,10 @@ export default {1],"primaryAxisDateGranularity": [- 96+ 92],"primaryAxisOrderBy": [- 97+ 93],"primaryAxisManualSortOrder": [1@@ -2414,10 +2300,10 @@ export default {1],"secondaryAxisGroupByDateGranularity": [- 96+ 92],"secondaryAxisOrderBy": [- 97+ 93],"secondaryAxisManualSortOrder": [1@@ -2429,7 +2315,7 @@ export default {3],"axisNameDisplay": [- 99+ 95],"displayDataLabel": [3@@ -2438,7 +2324,7 @@ export default {3],"numberFormat": [- 93+ 89],"rangeMin": [16@@ -2456,10 +2342,10 @@ export default {5],"groupMode": [- 102+ 98],"layout": [- 103+ 99],"isCumulative": [3@@ -2468,7 +2354,7 @@ export default {1],"firstDayOfTheWeek": [- 31+ 27],"__typename": [1@@ -2478,7 +2364,7 @@ export default {"BarChartLayout": {},"CalendarConfiguration": {"configurationType": [- 92+ 88],"__typename": [1@@ -2486,7 +2372,7 @@ export default {},"FrontComponentConfiguration": {"configurationType": [- 92+ 88],"frontComponentId": [4@@ -2497,7 +2383,7 @@ export default {},"EmailsConfiguration": {"configurationType": [- 92+ 88],"__typename": [1@@ -2505,7 +2391,7 @@ export default {},"EmailThreadConfiguration": {"configurationType": [- 92+ 88],"__typename": [1@@ -2513,7 +2399,7 @@ export default {},"CallRecordingSummaryConfiguration": {"configurationType": [- 92+ 88],"__typename": [1@@ -2521,7 +2407,7 @@ export default {},"CallRecordingTranscriptConfiguration": {"configurationType": [- 92+ 88],"__typename": [1@@ -2529,7 +2415,7 @@ export default {},"MessageCampaignBodyConfiguration": {"configurationType": [- 92+ 88],"__typename": [1@@ -2537,7 +2423,7 @@ export default {},"MessageCampaignDetailsConfiguration": {"configurationType": [- 92+ 88],"__typename": [1@@ -2545,13 +2431,13 @@ export default {},"FieldConfiguration": {"configurationType": [- 92+ 88],"fieldMetadataId": [1],"fieldDisplayMode": [- 113+ 109],"viewId": [1@@ -2566,7 +2452,7 @@ export default {"FieldDisplayMode": {},"FieldRichTextConfiguration": {"configurationType": [- 92+ 88],"__typename": [1@@ -2574,7 +2460,7 @@ export default {},"FieldsConfiguration": {"configurationType": [- 92+ 88],"viewId": [1@@ -2591,7 +2477,7 @@ export default {},"FilesConfiguration": {"configurationType": [- 92+ 88],"__typename": [1@@ -2599,7 +2485,7 @@ export default {},"NotesConfiguration": {"configurationType": [- 92+ 88],"__typename": [1@@ -2607,7 +2493,7 @@ export default {},"TasksConfiguration": {"configurationType": [- 92+ 88],"__typename": [1@@ -2615,7 +2501,7 @@ export default {},"TimelineConfiguration": {"configurationType": [- 92+ 88],"__typename": [1@@ -2623,7 +2509,7 @@ export default {},"ViewConfiguration": {"configurationType": [- 92+ 88],"__typename": [1@@ -2631,13 +2517,13 @@ export default {},"RecordTableConfiguration": {"configurationType": [- 92+ 88],"viewId": [1],"recordLimit": [- 31+ 27],"__typename": [1@@ -2645,7 +2531,7 @@ export default {},"WorkflowConfiguration": {"configurationType": [- 92+ 88],"__typename": [1@@ -2653,7 +2539,7 @@ export default {},"WorkflowRunConfiguration": {"configurationType": [- 92+ 88],"__typename": [1@@ -2661,7 +2547,7 @@ export default {},"WorkflowVersionConfiguration": {"configurationType": [- 92+ 88],"__typename": [1@@ -2684,13 +2570,13 @@ export default {4],"widgets": [- 83+ 79],"icon": [1],"layoutMode": [- 87+ 83],"createdAt": [6@@ -2719,13 +2605,13 @@ export default {1],"type": [- 127+ 123],"objectMetadataId": [4],"tabs": [- 125+ 121],"defaultTabToFocusOnMobileAndSidePanelId": [4@@ -2775,7 +2661,7 @@ export default {1],"oauth": [- 128+ 124],"__typename": [1@@ -2800,7 +2686,7 @@ export default {16],"items": [- 130+ 126],"__typename": [1@@ -2808,13 +2694,13 @@ export default {},"BillingProductMetadata": {"planKey": [- 133+ 129],"priceUsageBased": [- 134+ 130],"productKey": [- 135+ 131],"__typename": [1@@ -2825,7 +2711,7 @@ export default {"BillingProductKey": {},"BillingPriceLicensed": {"recurringInterval": [- 137+ 133],"unitAmount": [16@@ -2834,7 +2720,7 @@ export default {1],"priceUsageType": [- 134+ 130],"creditAmount": [16@@ -2860,16 +2746,16 @@ export default {},"BillingPriceMetered": {"tiers": [- 138+ 134],"recurringInterval": [- 137+ 133],"stripePriceId": [1],"priceUsageType": [- 134+ 130],"__typename": [1@@ -2886,7 +2772,7 @@ export default {1],"metadata": [- 132+ 128],"__typename": [1@@ -2903,10 +2789,10 @@ export default {1],"metadata": [- 132+ 128],"prices": [- 136+ 132],"__typename": [1@@ -2923,10 +2809,10 @@ export default {1],"metadata": [- 132+ 128],"prices": [- 139+ 135],"__typename": [1@@ -2957,13 +2843,13 @@ export default {4],"status": [- 145+ 141],"interval": [- 137+ 133],"billingSubscriptionItems": [- 143+ 139],"currentPeriodEnd": [6@@ -2972,7 +2858,7 @@ export default {5],"phases": [- 131+ 127],"cancelAt": [6@@ -3004,7 +2890,7 @@ export default {16],"status": [- 148+ 144],"error": [5@@ -3139,7 +3025,7 @@ export default {4],"type": [- 156+ 152],"name": [1@@ -3172,7 +3058,7 @@ export default {6],"targetRecordIdentifier": [- 154+ 150],"__typename": [1@@ -3198,7 +3084,7 @@ export default {},"MetadataEvent": {"type": [- 159+ 155],"metadataName": [1@@ -3207,7 +3093,7 @@ export default {1],"properties": [- 157+ 153],"updatedCollectionHash": [1@@ -3219,7 +3105,7 @@ export default {"MetadataEventAction": {},"ObjectRecordEvent": {"action": [- 161+ 157],"objectNameSingular": [1@@ -3234,7 +3120,7 @@ export default {1],"properties": [- 157+ 153],"__typename": [1@@ -3246,7 +3132,7 @@ export default {1],"objectRecordEvent": [- 160+ 156],"__typename": [1@@ -3257,10 +3143,10 @@ export default {1],"objectRecordEventsWithQueryIds": [- 162+ 158],"metadataEvents": [- 158+ 154],"__typename": [1@@ -3303,7 +3189,7 @@ export default {},"BillingEndTrialPeriod": {"status": [- 145+ 141],"hasPaymentMethod": [3@@ -3312,10 +3198,10 @@ export default {1],"currentBillingSubscription": [- 144+ 140],"billingSubscriptions": [- 144+ 140],"__typename": [1@@ -3323,7 +3209,7 @@ export default {},"BillingResourceCreditUsage": {"productKey": [- 135+ 131],"periodStart": [6@@ -3352,16 +3238,16 @@ export default {},"BillingPlan": {"planKey": [- 133+ 129],"baseProducts": [- 141+ 137],"resourceCreditProducts": [- 141+ 137],"meteredProducts": [- 142+ 138],"__typename": [1@@ -3388,10 +3274,10 @@ export default {},"BillingUpdate": {"currentBillingSubscription": [- 144+ 140],"billingSubscriptions": [- 144+ 140],"__typename": [1@@ -3441,7 +3327,7 @@ export default {1],"result": [- 173+ 169],"__typename": [1@@ -3449,7 +3335,7 @@ export default {},"FeatureFlag": {"key": [- 176+ 172],"value": [3@@ -3513,7 +3399,7 @@ export default {1],"count": [- 31+ 27],"__typename": [1@@ -3521,13 +3407,13 @@ export default {},"ApplicationRegistrationStats": {"activeInstalls": [- 31+ 27],"mostInstalledVersion": [1],"versionDistribution": [- 179+ 175],"__typename": [1@@ -3552,10 +3438,10 @@ export default {1],"type": [- 183+ 179],"status": [- 184+ 180],"issuer": [1@@ -3568,7 +3454,7 @@ export default {"SSOIdentityProviderStatus": {},"AuthProviders": {"sso": [- 182+ 178],"google": [3@@ -3605,10 +3491,10 @@ export default {4],"authProviders": [- 185+ 181],"authBypassProviders": [- 186+ 182],"logo": [1@@ -3617,7 +3503,7 @@ export default {1],"workspaceUrls": [- 177+ 173],"__typename": [1@@ -3656,7 +3542,7 @@ export default {1],"modelFamily": [- 191+ 187],"modelFamilyLabel": [1@@ -3671,7 +3557,7 @@ export default {16],"nativeCapabilities": [- 189+ 185],"isDeprecated": [3@@ -3710,7 +3596,7 @@ export default {1],"trialPeriods": [- 181+ 177],"__typename": [1@@ -3718,7 +3604,7 @@ export default {},"Support": {"supportDriver": [- 194+ 190],"supportFrontChatId": [1@@ -3744,7 +3630,7 @@ export default {},"Captcha": {"provider": [- 197+ 193],"siteKey": [1@@ -3781,10 +3667,10 @@ export default {},"PublicFeatureFlag": {"key": [- 176+ 172],"metadata": [- 199+ 195],"__typename": [1@@ -3809,13 +3695,13 @@ export default {1],"authProviders": [- 185+ 181],"billing": [- 192+ 188],"aiModels": [- 190+ 186],"signInPrefilled": [3@@ -3842,25 +3728,25 @@ export default {3],"support": [- 193+ 189],"isAttachmentPreviewEnabled": [3],"sentry": [- 195+ 191],"captcha": [- 196+ 192],"api": [- 198+ 194],"canManageFeatureFlags": [3],"publicFeatureFlags": [- 200+ 196],"isCookieSessionEnabled": [3@@ -3914,7 +3800,7 @@ export default {1],"maintenance": [- 201+ 197],"__typename": [1@@ -3965,7 +3851,7 @@ export default {},"CreateApplicationRegistration": {"applicationRegistration": [- 78+ 74],"clientSecret": [1@@ -4004,7 +3890,7 @@ export default {},"AppConnection": {"id": [- 209+ 205],"providerName": [1@@ -4056,7 +3942,7 @@ export default {4],"type": [- 183+ 179],"issuer": [1@@ -4065,7 +3951,7 @@ export default {1],"status": [- 184+ 180],"__typename": [1@@ -4084,7 +3970,7 @@ export default {},"FindAvailableSSOIDP": {"type": [- 183+ 179],"id": [4@@ -4096,10 +3982,10 @@ export default {1],"status": [- 184+ 180],"workspace": [- 213+ 209],"__typename": [1@@ -4110,7 +3996,7 @@ export default {4],"type": [- 183+ 179],"issuer": [1@@ -4119,7 +4005,7 @@ export default {1],"status": [- 184+ 180],"__typename": [1@@ -4127,7 +4013,7 @@ export default {},"SSOConnection": {"type": [- 183+ 179],"id": [4@@ -4139,7 +4025,7 @@ export default {1],"status": [- 184+ 180],"__typename": [1@@ -4162,13 +4048,13 @@ export default {1],"workspaceUrls": [- 177+ 173],"logo": [1],"sso": [- 216+ 212],"__typename": [1@@ -4176,10 +4062,10 @@ export default {},"AvailableWorkspaces": {"availableWorkspacesForSignIn": [- 217+ 213],"availableWorkspacesForSignUp": [- 217+ 213],"__typename": [1@@ -4190,7 +4076,7 @@ export default {4],"name": [- 37+ 33],"userEmail": [1@@ -4312,10 +4198,10 @@ export default {1],"objectPermissions": [- 221+ 217],"fieldPermissions": [- 222+ 218],"__typename": [1@@ -4383,7 +4269,7 @@ export default {1],"roles": [- 223+ 219],"manifest": [5@@ -4394,7 +4280,7 @@ export default {},"WorkspaceCompanyEnrichmentResult": {"outcome": [- 226+ 222],"enrichment": [5@@ -4407,22 +4293,142 @@ export default {]},"WorkspaceCompanyEnrichmentOutcome": {},- "Relation": {+ "Field": {+ "id": [+ 4+ ],+ "universalIdentifier": [+ 1+ ],"type": [+ 224+ ],+ "name": [+ 1+ ],+ "label": [+ 1+ ],+ "description": [+ 1+ ],+ "icon": [+ 1+ ],+ "isActive": [+ 3+ ],+ "isSystem": [+ 3+ ],+ "isUIEditable": [+ 3+ ],+ "isUIReadOnly": [+ 3+ ],+ "isNullable": [+ 3+ ],+ "isUnique": [+ 3+ ],+ "defaultValue": [+ 5+ ],+ "options": [+ 5+ ],+ "settings": [+ 5+ ],+ "objectMetadataId": [+ 4+ ],+ "isLabelSyncedWithName": [+ 3+ ],+ "morphId": [+ 4+ ],+ "createdAt": [+ 6+ ],+ "updatedAt": [+ 6+ ],+ "applicationId": [+ 4+ ],+ "object": [+ 24+ ],+ "relation": [228],- "sourceObjectMetadata": [+ "morphRelations": [+ 228+ ],+ "__typename": [+ 1+ ]+ },+ "FieldMetadataType": {},+ "PageInfo": {+ "hasNextPage": [+ 3+ ],+ "hasPreviousPage": [+ 3+ ],+ "startCursor": [28],- "targetObjectMetadata": [+ "endCursor": [28],- "sourceFieldMetadata": [+ "__typename": [+ 1+ ]+ },+ "FieldEdge": {+ "node": [+ 223+ ],+ "cursor": [+ 28+ ],+ "__typename": [+ 1+ ]+ },+ "FieldConnection": {+ "pageInfo": [+ 225+ ],+ "edges": [+ 226+ ],+ "__typename": [+ 1+ ]+ },+ "Relation": {+ "type": [+ 229+ ],+ "sourceObjectMetadata": [24],- "targetFieldMetadata": [+ "targetObjectMetadata": [24],+ "sourceFieldMetadata": [+ 223+ ],+ "targetFieldMetadata": [+ 223+ ],"__typename": [1]@@ -4451,29 +4457,24 @@ export default {1]},- "ObjectRecordCount": {- "objectNamePlural": [- 1- ],- "totalCount": [- 31- ],- "__typename": [- 1- ]- },- "SearchField": {+ "Index": {"id": [4],- "fieldMetadataId": [- 4- ],- "tsVectorFieldMetadataId": [- 4+ "name": [+ 1],- "position": [- 16+ "isCustom": [+ 3+ ],+ "isUnique": [+ 3+ ],+ "indexWhereClause": [+ 1+ ],+ "indexType": [+ 232],"createdAt": [6@@ -4481,33 +4482,31 @@ export default {"updatedAt": [6],+ "indexFieldMetadataList": [+ 230+ ],"__typename": [1]},- "ObjectEdge": {+ "IndexType": {},+ "IndexEdge": {"node": [- 28+ 231],"cursor": [- 32+ 28],"__typename": [1]},- "PageInfo": {- "hasNextPage": [- 3- ],- "hasPreviousPage": [- 3- ],- "startCursor": [- 32+ "ObjectEdge": {+ "node": [+ 24],- "endCursor": [- 32+ "cursor": [+ 28],"__typename": [1@@ -4515,21 +4514,21 @@ export default {},"ObjectConnection": {"pageInfo": [- 233+ 225],"edges": [- 232+ 234],"__typename": [1]},- "IndexEdge": {- "node": [- 26+ "ObjectFieldsConnection": {+ "pageInfo": [+ 225],- "cursor": [- 32+ "edges": [+ 226],"__typename": [1@@ -4537,43 +4536,44 @@ export default {},"ObjectIndexMetadatasConnection": {"pageInfo": [- 233+ 225],"edges": [- 235+ 233],"__typename": [1]},- "FieldEdge": {- "node": [- 24+ "ObjectRecordCount": {+ "objectNamePlural": [+ 1],- "cursor": [- 32+ "totalCount": [+ 27],"__typename": [1]},- "ObjectFieldsConnection": {- "pageInfo": [- 233+ "SearchField": {+ "id": [+ 4],- "edges": [- 237+ "fieldMetadataId": [+ 4],- "__typename": [- 1- ]- },- "FieldConnection": {- "pageInfo": [- 233+ "tsVectorFieldMetadataId": [+ 4],- "edges": [- 237+ "position": [+ 16+ ],+ "createdAt": [+ 6+ ],+ "updatedAt": [+ 6],"__typename": [1@@ -4630,10 +4630,10 @@ export default {},"UpsertRowLevelPermissionPredicatesResult": {"predicates": [- 46+ 42],"predicateGroups": [- 44+ 40],"__typename": [1@@ -4783,7 +4783,7 @@ export default {254],"availableWorkspaces": [- 218+ 214],"__typename": [1@@ -4821,7 +4821,7 @@ export default {},"WorkspaceUrlsAndId": {"workspaceUrls": [- 177+ 173],"id": [4@@ -4868,7 +4868,7 @@ export default {12],"workspaceUrls": [- 177+ 173],"__typename": [1@@ -4991,13 +4991,13 @@ export default {},"UsageAnalytics": {"usageByUser": [- 203+ 199],"usageByOperationType": [- 203+ 199],"usageByModel": [- 203+ 199],"timeSeries": [273@@ -5244,22 +5244,22 @@ export default {},"CampaignAudiencePreviewDTO": {"totalMembers": [- 31+ 27],"withoutEmail": [- 31+ 27],"duplicateEmails": [- 31+ 27],"globallyUnsubscribed": [- 31+ 27],"topicUnsubscribed": [- 31+ 27],"sendable": [- 31+ 27],"__typename": [1@@ -5275,13 +5275,13 @@ export default {},"CampaignSkippedRecipientsDTO": {"noEmail": [- 31+ 27],"deduped": [- 31+ 27],"overCap": [- 31+ 27],"__typename": [1@@ -5292,7 +5292,7 @@ export default {1],"queuedCount": [- 31+ 27],"skipped": [295@@ -5331,7 +5331,7 @@ export default {297],"totalCount": [- 31+ 27],"__typename": [1@@ -5537,7 +5537,7 @@ export default {4],"orderIndex": [- 31+ 27],"type": [1@@ -5691,10 +5691,10 @@ export default {3],"layout": [- 103+ 99],"groupMode": [- 102+ 98],"hasTooManyGroups": [3@@ -5878,7 +5878,7 @@ export default {326],"totalCount": [- 31+ 27],"pageInfo": [327@@ -5959,22 +5959,22 @@ export default {},"AgentChatThread": {"id": [- 209+ 205],"title": [1],"totalInputTokens": [- 31+ 27],"totalOutputTokens": [- 31+ 27],"contextWindowTokens": [- 31+ 27],"conversationSize": [- 31+ 27],"totalInputCredits": [16@@ -6006,7 +6006,7 @@ export default {1],"estimatedTokenCount": [- 31+ 27],"__typename": [1@@ -6017,7 +6017,7 @@ export default {332],"estimatedTokenCount": [- 31+ 27],"__typename": [1@@ -6039,7 +6039,7 @@ export default {5],"maxSeq": [- 31+ 27],"error": [334@@ -6093,7 +6093,7 @@ export default {4],"score": [- 31+ 27],"comment": [1@@ -6130,13 +6130,13 @@ export default {},"WorkspaceAiStats": {"conversationsCount": [- 31+ 27],"skillsCount": [- 31+ 27],"toolsCount": [- 31+ 27],"__typename": [1@@ -6307,10 +6307,10 @@ export default {4],"type": [- 67+ 63],"key": [- 68+ 64],"objectMetadataId": [4@@ -6335,10 +6335,10 @@ export default {},"Query": {"navigationMenuItems": [- 155+ 151],"navigationMenuItem": [- 155,+ 151,{"id": [4,@@ -6347,7 +6347,7 @@ export default {}],"applicationSdkClientChecksums": [- 79,+ 75,{"applicationId": [4,@@ -6381,10 +6381,10 @@ export default {}],"enterpriseSubscriptionStatus": [- 150+ 146],"getViewFilterGroups": [- 58,+ 54,{"viewId": [1@@ -6392,7 +6392,7 @@ export default {}],"getViewFilterGroup": [- 58,+ 54,{"id": [1,@@ -6401,7 +6401,7 @@ export default {}],"getViewFilters": [- 60,+ 56,{"viewId": [1@@ -6409,7 +6409,7 @@ export default {}],"getViewFilter": [- 60,+ 56,{"id": [1,@@ -6418,19 +6418,19 @@ export default {}],"getViews": [- 66,+ 62,{"objectMetadataId": [1],"viewTypes": [- 67,+ 63,"[ViewType!]"]}],"getView": [- 66,+ 62,{"id": [1,@@ -6439,7 +6439,7 @@ export default {}],"getViewSorts": [- 63,+ 59,{"viewId": [1@@ -6447,7 +6447,7 @@ export default {}],"getViewSort": [- 63,+ 59,{"id": [1,@@ -6456,7 +6456,7 @@ export default {}],"getViewFields": [- 56,+ 52,{"viewId": [1,@@ -6465,7 +6465,7 @@ export default {}],"getViewField": [- 56,+ 52,{"id": [1,@@ -6474,7 +6474,7 @@ export default {}],"getViewFieldGroups": [- 65,+ 61,{"viewId": [1,@@ -6483,7 +6483,7 @@ export default {}],"getViewFieldGroup": [- 65,+ 61,{"id": [1,@@ -6495,7 +6495,7 @@ export default {7],"getApiKeyRoles": [- 51+ 47],"apiKey": [7,@@ -6507,13 +6507,13 @@ export default {}],"currentUserSessions": [- 164+ 160],"getInviteSuggestions": [- 171+ 167],"applicationConnectionProviders": [- 129,+ 125,{"applicationId": [4,@@ -6522,7 +6522,7 @@ export default {}],"billingPortalSession": [- 169,+ 165,{"returnUrlPath": [1@@ -6533,19 +6533,19 @@ export default {}],"listPlans": [- 167+ 163],"getResourceCreditUsage": [- 166+ 162],"findWorkspaceInvitations": [- 173+ 169],"getApprovedAccessDomains": [- 151+ 147],"getPageLayoutTabs": [- 125,+ 121,{"pageLayoutId": [1,@@ -6554,7 +6554,7 @@ export default {}],"getPageLayoutTab": [- 125,+ 121,{"id": [1,@@ -6563,18 +6563,18 @@ export default {}],"getPageLayouts": [- 126,+ 122,{"objectMetadataId": [1],"pageLayoutType": [- 127+ 123]}],"getPageLayout": [- 126,+ 122,{"id": [1,@@ -6583,7 +6583,7 @@ export default {}],"getPageLayoutWidgets": [- 83,+ 79,{"pageLayoutTabId": [1,@@ -6592,7 +6592,7 @@ export default {}],"getPageLayoutWidget": [- 83,+ 79,{"id": [1,@@ -6612,20 +6612,21 @@ export default {]}],- "objectRecordCounts": [- 230- ],- "mostlyEmptyFieldMetadataIds": [- 4,+ "objects": [+ 235,{- "objectMetadataId": [- 4,- "UUID!"+ "paging": [+ 26,+ "CursorPaging!"+ ],+ "filter": [+ 361,+ "ObjectFilter!"]}],"object": [- 28,+ 24,{"id": [4,@@ -6633,16 +6634,15 @@ export default {]}],- "objects": [- 234,+ "objectRecordCounts": [+ 238+ ],+ "mostlyEmptyFieldMetadataIds": [+ 4,{- "paging": [- 30,- "CursorPaging!"- ],- "filter": [- 361,- "ObjectFilter!"+ "objectMetadataId": [+ 4,+ "UUID!"]}],@@ -6701,10 +6701,10 @@ export default {}],"currentWorkspace": [- 72+ 68],"getPublicWorkspaceDataByDomain": [- 187,+ 183,{"origin": [1@@ -6712,7 +6712,7 @@ export default {}],"getPublicWorkspaceDataById": [- 188,+ 184,{"id": [4,@@ -6721,7 +6721,7 @@ export default {}],"findApplicationRegistrationByClientId": [- 206,+ 202,{"clientId": [1,@@ -6730,7 +6730,7 @@ export default {}],"findApplicationRegistrationByUniversalIdentifier": [- 78,+ 74,{"universalIdentifier": [1,@@ -6739,10 +6739,10 @@ export default {}],"findManyApplicationRegistrations": [- 78+ 74],"findOneApplicationRegistration": [- 78,+ 74,{"id": [1,@@ -6751,7 +6751,7 @@ export default {}],"findApplicationRegistrationStats": [- 180,+ 176,{"id": [1,@@ -6760,7 +6760,7 @@ export default {}],"findApplicationRegistrationVariables": [- 178,+ 174,{"applicationRegistrationId": [1,@@ -6778,7 +6778,7 @@ export default {}],"findClaimableApplicationRegistration": [- 204,+ 200,{"sourcePackage": [1@@ -6798,10 +6798,10 @@ export default {}],"findManyApplications": [- 52+ 48],"findOneApplication": [- 52,+ 48,{"id": [4@@ -6812,7 +6812,7 @@ export default {}],"findManyMarketplaceApps": [- 220,+ 216,{"universalIdentifiers": [1,@@ -6821,7 +6821,7 @@ export default {}],"findMarketplaceAppDetail": [- 224,+ 220,{"universalIdentifier": [1,@@ -6830,7 +6830,7 @@ export default {}],"publicMarketplaceApps": [- 220,+ 216,{"isVetted": [3,@@ -6839,38 +6839,38 @@ export default {}],"publicMarketplaceAppDetail": [- 224,- {- "universalIdentifier": [- 1,- "String!"- ]- }- ],- "field": [- 24,+ 220,{- "id": [- 4,- "UUID!"+ "universalIdentifier": [+ 1,+ "String!"]}],"fields": [- 239,+ 227,{"paging": [- 30,+ 26,"CursorPaging!"],"filter": [- 33,+ 29,"FieldFilter!"]}],+ "field": [+ 223,+ {+ "id": [+ 4,+ "UUID!"+ ]+ }+ ],"getViewGroups": [- 62,+ 58,{"viewId": [1@@ -6878,7 +6878,7 @@ export default {}],"getViewGroup": [- 62,+ 58,{"id": [1,@@ -6887,7 +6887,7 @@ export default {}],"getRoles": [- 51+ 47],"previewMessageCampaignAudience": [293,@@ -6980,7 +6980,7 @@ export default {}],"appConnections": [- 208,+ 204,{"filter": [365@@ -6988,10 +6988,10 @@ export default {}],"appConnection": [- 208,+ 204,{"id": [- 209,+ 205,"ID!"]}@@ -7075,7 +7075,7 @@ export default {}],"findWorkspaceFromInviteHash": [- 72,+ 68,{"inviteHash": [1,@@ -7105,10 +7105,10 @@ export default {}],"currentUser": [- 75+ 71],"getSSOIdentityProviders": [- 214+ 210],"eventLogs": [328,@@ -7229,28 +7229,28 @@ export default {361],"id": [- 34+ 30+ ],+ "isActive": [+ 31],"isRemote": [- 35+ 31],- "isActive": [- 35+ "isSearchable": [+ 31],"isSystem": [- 35- ],- "isUIEditable": [- 35+ 31],"isUICreatable": [- 35+ 31],- "isUIReadOnly": [- 35+ "isUIEditable": [+ 31],- "isSearchable": [- 35+ "isUIReadOnly": [+ 31],"__typename": [1@@ -7258,7 +7258,7 @@ export default {},"LogicFunctionIdInput": {"id": [- 209+ 205],"__typename": [1@@ -7286,10 +7286,10 @@ export default {4],"limit": [- 31+ 27],"offset": [- 31+ 27],"__typename": [1@@ -7317,7 +7317,7 @@ export default {368],"first": [- 31+ 27],"after": [1@@ -7429,7 +7429,7 @@ export default {}],"createManyNavigationMenuItems": [- 155,+ 151,{"inputs": [378,@@ -7438,7 +7438,7 @@ export default {}],"createNavigationMenuItem": [- 155,+ 151,{"input": [378,@@ -7447,7 +7447,7 @@ export default {}],"updateManyNavigationMenuItems": [- 155,+ 151,{"inputs": [379,@@ -7456,7 +7456,7 @@ export default {}],"updateNavigationMenuItem": [- 155,+ 151,{"input": [379,@@ -7465,7 +7465,7 @@ export default {}],"deleteManyNavigationMenuItems": [- 155,+ 151,{"ids": [4,@@ -7474,7 +7474,7 @@ export default {}],"deleteNavigationMenuItem": [- 155,+ 151,{"id": [4,@@ -7483,7 +7483,7 @@ export default {}],"createFileUpload": [- 153,+ 149,{"filename": [1,@@ -7506,7 +7506,7 @@ export default {}],"completeFileUpload": [- 152,+ 148,{"fileId": [1,@@ -7518,10 +7518,10 @@ export default {3],"releaseEnterpriseServerBinding": [- 149+ 145],"setEnterpriseKey": [- 149,+ 145,{"enterpriseKey": [1,@@ -7530,7 +7530,7 @@ export default {}],"uploadEmailAttachmentFile": [- 152,+ 148,{"file": [382,@@ -7539,7 +7539,7 @@ export default {}],"uploadAiChatFile": [- 152,+ 148,{"file": [382,@@ -7548,7 +7548,7 @@ export default {}],"uploadWorkflowFile": [- 152,+ 148,{"file": [382,@@ -7557,7 +7557,7 @@ export default {}],"uploadWorkspaceLogo": [- 152,+ 148,{"file": [382,@@ -7566,7 +7566,7 @@ export default {}],"uploadWorkspaceMemberProfilePicture": [- 152,+ 148,{"file": [382,@@ -7575,7 +7575,7 @@ export default {}],"uploadFilesFieldFile": [- 152,+ 148,{"file": [382,@@ -7588,7 +7588,7 @@ export default {}],"uploadFilesFieldFileByUniversalIdentifier": [- 152,+ 148,{"file": [382,@@ -7601,7 +7601,7 @@ export default {}],"createViewFilterGroup": [- 58,+ 54,{"input": [383,@@ -7610,7 +7610,7 @@ export default {}],"updateViewFilterGroup": [- 58,+ 54,{"id": [1,@@ -7641,7 +7641,7 @@ export default {}],"createViewFilter": [- 60,+ 56,{"input": [385,@@ -7650,7 +7650,7 @@ export default {}],"updateViewFilter": [- 60,+ 56,{"input": [386,@@ -7659,7 +7659,7 @@ export default {}],"deleteViewFilter": [- 60,+ 56,{"input": [388,@@ -7668,7 +7668,7 @@ export default {}],"destroyViewFilter": [- 60,+ 56,{"input": [389,@@ -7677,7 +7677,7 @@ export default {}],"createView": [- 66,+ 62,{"input": [390,@@ -7686,7 +7686,7 @@ export default {}],"updateView": [- 66,+ 62,{"id": [1,@@ -7717,7 +7717,7 @@ export default {}],"upsertViewWidget": [- 66,+ 62,{"input": [392,@@ -7726,7 +7726,7 @@ export default {}],"createViewSort": [- 63,+ 59,{"input": [398,@@ -7735,7 +7735,7 @@ export default {}],"updateViewSort": [- 63,+ 59,{"input": [399,@@ -7762,7 +7762,7 @@ export default {}],"updateViewField": [- 56,+ 52,{"input": [403,@@ -7771,7 +7771,7 @@ export default {}],"createViewField": [- 56,+ 52,{"input": [405,@@ -7780,7 +7780,7 @@ export default {}],"createManyViewFields": [- 56,+ 52,{"inputs": [405,@@ -7789,7 +7789,7 @@ export default {}],"deleteViewField": [- 56,+ 52,{"input": [406,@@ -7798,7 +7798,7 @@ export default {}],"destroyViewField": [- 56,+ 52,{"input": [407,@@ -7807,7 +7807,7 @@ export default {}],"updateViewFieldGroup": [- 65,+ 61,{"input": [408,@@ -7816,7 +7816,7 @@ export default {}],"createViewFieldGroup": [- 65,+ 61,{"input": [410,@@ -7825,7 +7825,7 @@ export default {}],"createManyViewFieldGroups": [- 65,+ 61,{"inputs": [410,@@ -7834,7 +7834,7 @@ export default {}],"deleteViewFieldGroup": [- 65,+ 61,{"input": [411,@@ -7843,7 +7843,7 @@ export default {}],"destroyViewFieldGroup": [- 65,+ 61,{"input": [412,@@ -7852,7 +7852,7 @@ export default {}],"upsertFieldsWidget": [- 66,+ 62,{"input": [413,@@ -7910,16 +7910,16 @@ export default {}],"revokeAllOtherUserSessions": [- 31+ 27],"skipSyncEmailOnboardingStep": [- 172+ 168],"completeBookCallOnboardingStep": [- 172+ 168],"triggerInstallAppsOnboardingStep": [- 172,+ 168,{"universalIdentifiers": [1,@@ -7945,14 +7945,14 @@ export default {}],"checkoutSession": [- 169,+ 165,{"recurringInterval": [- 137,+ 133,"SubscriptionInterval!"],"plan": [- 133,+ 129,"BillingPlanKey!"],"requirePaymentMethod": [@@ -7965,14 +7965,14 @@ export default {}],"createSubscriptionPaymentIntent": [- 168,+ 164,{"recurringInterval": [- 137,+ 133,"SubscriptionInterval!"],"plan": [- 133,+ 129,"BillingPlanKey!"],"requirePaymentMethod": [@@ -7989,22 +7989,22 @@ export default {}],"createBillingPaymentMethodSetupIntent": [- 168+ 164],"switchSubscriptionInterval": [- 170+ 166],"switchBillingPlan": [- 170+ 166],"cancelSwitchBillingPlan": [- 170+ 166],"cancelSwitchBillingInterval": [- 170+ 166],"setResourceCreditSubscriptionPrice": [- 170,+ 166,{"priceId": [1,@@ -8013,10 +8013,10 @@ export default {}],"endSubscriptionTrialPeriod": [- 165+ 161],"cancelSwitchResourceCreditPrice": [- 170+ 166],"deleteWorkspaceInvitation": [1,@@ -8028,7 +8028,7 @@ export default {}],"resendWorkspaceInvitation": [- 174,+ 170,{"appTokenId": [1,@@ -8037,7 +8037,7 @@ export default {}],"sendInvitations": [- 174,+ 170,{"emails": [1,@@ -8049,7 +8049,7 @@ export default {}],"createApprovedAccessDomain": [- 151,+ 147,{"input": [419,@@ -8067,7 +8067,7 @@ export default {}],"validateApprovedAccessDomain": [- 151,+ 147,{"input": [421,@@ -8076,7 +8076,7 @@ export default {}],"createPageLayoutTab": [- 125,+ 121,{"input": [422,@@ -8085,7 +8085,7 @@ export default {}],"updatePageLayoutTab": [- 125,+ 121,{"id": [1,@@ -8107,7 +8107,7 @@ export default {}],"createPageLayout": [- 126,+ 122,{"input": [424,@@ -8116,7 +8116,7 @@ export default {}],"updatePageLayout": [- 126,+ 122,{"id": [1,@@ -8138,7 +8138,7 @@ export default {}],"updatePageLayoutWithTabsAndWidgets": [- 126,+ 122,{"id": [1,@@ -8151,7 +8151,7 @@ export default {}],"resetPageLayoutToDefault": [- 126,+ 122,{"id": [1,@@ -8160,7 +8160,7 @@ export default {}],"resetPageLayoutWidgetToDefault": [- 83,+ 79,{"id": [1,@@ -8169,7 +8169,7 @@ export default {}],"resetPageLayoutTabToDefault": [- 125,+ 121,{"id": [1,@@ -8178,7 +8178,7 @@ export default {}],"createPageLayoutWidget": [- 83,+ 79,{"input": [430,@@ -8187,7 +8187,7 @@ export default {}],"updatePageLayoutWidget": [- 83,+ 79,{"id": [1,@@ -8236,7 +8236,7 @@ export default {}],"createOneObject": [- 28,+ 24,{"input": [434,@@ -8245,7 +8245,7 @@ export default {}],"deleteOneObject": [- 28,+ 24,{"input": [436,@@ -8254,7 +8254,7 @@ export default {}],"updateOneObject": [- 28,+ 24,{"input": [437,@@ -8263,7 +8263,7 @@ export default {}],"createOneIndex": [- 26,+ 231,{"input": [439,@@ -8272,7 +8272,7 @@ export default {}],"deleteOneIndex": [- 26,+ 231,{"input": [442,@@ -8299,7 +8299,7 @@ export default {}],"executeOneLogicFunction": [- 147,+ 143,{"input": [444,@@ -8380,7 +8380,7 @@ export default {}],"activateWorkspace": [- 72,+ 68,{"data": [452,@@ -8389,7 +8389,7 @@ export default {}],"updateWorkspace": [- 72,+ 68,{"data": [453,@@ -8398,13 +8398,13 @@ export default {}],"deleteCurrentWorkspace": [- 72+ 68],"checkCustomDomainValidRecords": [243],"enrichWorkspaceCompany": [- 225+ 221],"upgradeApplication": [3,@@ -8420,7 +8420,7 @@ export default {}],"createApplicationRegistration": [- 205,+ 201,{"input": [454,@@ -8429,7 +8429,7 @@ export default {}],"updateApplicationRegistration": [- 78,+ 74,{"input": [455,@@ -8447,7 +8447,7 @@ export default {}],"rotateApplicationRegistrationClientSecret": [- 207,+ 203,{"id": [1,@@ -8483,7 +8483,7 @@ export default {}],"uploadAppTarball": [- 78,+ 74,{"file": [382,@@ -8495,7 +8495,7 @@ export default {}],"claimApplicationRegistrationOwnership": [- 78,+ 74,{"applicationRegistrationId": [1,@@ -8504,7 +8504,7 @@ export default {}],"transferApplicationRegistrationOwnership": [- 78,+ 74,{"applicationRegistrationId": [1,@@ -8529,7 +8529,7 @@ export default {}],"installApplication": [- 52,+ 48,{"universalIdentifier": [1,@@ -8541,7 +8541,7 @@ export default {}],"updateApplication": [- 52,+ 48,{"id": [4,@@ -8566,7 +8566,7 @@ export default {3],"createOneField": [- 24,+ 223,{"input": [461,@@ -8575,7 +8575,7 @@ export default {}],"updateOneField": [- 24,+ 223,{"input": [463,@@ -8584,7 +8584,7 @@ export default {}],"deleteOneField": [- 24,+ 223,{"input": [465,@@ -8593,7 +8593,7 @@ export default {}],"createViewGroup": [- 62,+ 58,{"input": [466,@@ -8602,7 +8602,7 @@ export default {}],"createManyViewGroups": [- 62,+ 58,{"inputs": [466,@@ -8611,7 +8611,7 @@ export default {}],"updateViewGroup": [- 62,+ 58,{"input": [467,@@ -8620,7 +8620,7 @@ export default {}],"updateManyViewGroups": [- 62,+ 58,{"inputs": [467,@@ -8629,7 +8629,7 @@ export default {}],"deleteViewGroup": [- 62,+ 58,{"input": [469,@@ -8638,7 +8638,7 @@ export default {}],"destroyViewGroup": [- 62,+ 58,{"input": [470,@@ -8647,7 +8647,7 @@ export default {}],"updateWorkspaceMemberRole": [- 38,+ 34,{"workspaceMemberId": [4,@@ -8660,7 +8660,7 @@ export default {}],"createOneRole": [- 51,+ 47,{"createRoleInput": [471,@@ -8669,7 +8669,7 @@ export default {}],"updateOneRole": [- 51,+ 47,{"updateRoleInput": [472,@@ -8687,7 +8687,7 @@ export default {}],"upsertObjectPermissions": [- 48,+ 44,{"upsertObjectPermissionsInput": [474,@@ -8696,7 +8696,7 @@ export default {}],"upsertPermissionFlags": [- 49,+ 45,{"upsertPermissionFlagsInput": [476,@@ -8705,7 +8705,7 @@ export default {}],"upsertFieldPermissions": [- 43,+ 39,{"upsertFieldPermissionsInput": [477,@@ -9333,7 +9333,7 @@ export default {}],"uploadNewWorkspaceLogo": [- 152,+ 148,{"workspaceId": [1,@@ -9488,10 +9488,10 @@ export default {}],"deleteUser": [- 75+ 71],"deleteUserFromWorkspace": [- 54,+ 50,{"workspaceMemberIdToDelete": [1,@@ -9521,7 +9521,7 @@ export default {}],"resendEmailVerificationToken": [- 210,+ 206,{"email": [1,@@ -9534,7 +9534,7 @@ export default {}],"createOIDCIdentityProvider": [- 215,+ 211,{"input": [512,@@ -9543,7 +9543,7 @@ export default {}],"createSAMLIdentityProvider": [- 215,+ 211,{"input": [513,@@ -9552,7 +9552,7 @@ export default {}],"deleteSSOIdentityProvider": [- 211,+ 207,{"input": [514,@@ -9561,7 +9561,7 @@ export default {}],"editSSOIdentityProvider": [- 212,+ 208,{"input": [515,@@ -9676,7 +9676,7 @@ export default {}],"updateLabPublicFeatureFlag": [- 175,+ 171,{"input": [522,@@ -9834,7 +9834,7 @@ export default {4],"type": [- 156+ 152],"name": [1@@ -9908,7 +9908,7 @@ export default {4],"logicalOperator": [- 59+ 55],"positionInViewFilterGroup": [16@@ -9928,7 +9928,7 @@ export default {4],"logicalOperator": [- 59+ 55],"positionInViewFilterGroup": [16@@ -9948,7 +9948,7 @@ export default {4],"operand": [- 61+ 57],"value": [5@@ -9988,7 +9988,7 @@ export default {4],"operand": [- 61+ 57],"value": [5@@ -10036,10 +10036,10 @@ export default {4],"type": [- 67+ 63],"key": [- 68+ 64],"icon": [1@@ -10054,13 +10054,13 @@ export default {3],"kanbanColumnWidth": [- 31+ 27],"openRecordIn": [- 69+ 65],"kanbanAggregateOperation": [- 57+ 53],"kanbanAggregateOperationFieldMetadataId": [4@@ -10069,7 +10069,7 @@ export default {1],"calendarLayout": [- 70+ 66],"calendarFieldMetadataId": [4@@ -10081,7 +10081,7 @@ export default {4],"visibility": [- 71+ 67],"__typename": [1@@ -10095,7 +10095,7 @@ export default {1],"type": [- 67+ 63],"icon": [1@@ -10107,10 +10107,10 @@ export default {3],"openRecordIn": [- 69+ 65],"kanbanAggregateOperation": [- 57+ 53],"kanbanAggregateOperationFieldMetadataId": [4@@ -10119,7 +10119,7 @@ export default {1],"calendarLayout": [- 70+ 66],"calendarFieldMetadataId": [4@@ -10128,7 +10128,7 @@ export default {4],"visibility": [- 71+ 67],"mainGroupByFieldMetadataId": [4@@ -10137,7 +10137,7 @@ export default {3],"kanbanColumnWidth": [- 31+ 27],"__typename": [1@@ -10168,7 +10168,7 @@ export default {},"UpsertViewWidgetViewSettingsInput": {"type": [- 67+ 63],"mainGroupByFieldMetadataId": [4@@ -10177,19 +10177,19 @@ export default {3],"openRecordIn": [- 69+ 65],"kanbanAggregateOperation": [- 57+ 53],"kanbanAggregateOperationFieldMetadataId": [4],"kanbanColumnWidth": [- 31+ 27],"calendarLayout": [- 70+ 66],"calendarFieldMetadataId": [4@@ -10218,7 +10218,7 @@ export default {16],"aggregateOperation": [- 57+ 53],"__typename": [1@@ -10232,7 +10232,7 @@ export default {4],"operand": [- 61+ 57],"value": [5@@ -10261,7 +10261,7 @@ export default {4],"logicalOperator": [- 59+ 55],"positionInViewFilterGroup": [16@@ -10278,7 +10278,7 @@ export default {4],"direction": [- 64+ 60],"__typename": [1@@ -10292,7 +10292,7 @@ export default {4],"direction": [- 64+ 60],"subFieldName": [1@@ -10317,7 +10317,7 @@ export default {},"UpdateViewSortInputUpdates": {"direction": [- 64+ 60],"subFieldName": [1@@ -10364,7 +10364,7 @@ export default {16],"aggregateOperation": [- 57+ 53],"viewFieldGroupId": [4@@ -10393,7 +10393,7 @@ export default {16],"aggregateOperation": [- 57+ 53],"viewFieldGroupId": [4@@ -10616,7 +10616,7 @@ export default {4],"layoutMode": [- 87+ 83],"__typename": [1@@ -10633,7 +10633,7 @@ export default {1],"layoutMode": [- 87+ 83],"__typename": [1@@ -10644,7 +10644,7 @@ export default {1],"type": [- 127+ 123],"objectMetadataId": [4@@ -10658,7 +10658,7 @@ export default {1],"type": [- 127+ 123],"objectMetadataId": [4@@ -10672,7 +10672,7 @@ export default {1],"type": [- 127+ 123],"objectMetadataId": [4@@ -10698,7 +10698,7 @@ export default {1],"layoutMode": [- 87+ 83],"widgets": [428@@ -10718,7 +10718,7 @@ export default {1],"type": [- 84+ 80],"objectMetadataId": [4@@ -10767,7 +10767,7 @@ export default {1],"type": [- 84+ 80],"objectMetadataId": [4@@ -10793,7 +10793,7 @@ export default {1],"type": [- 84+ 80],"objectMetadataId": [4@@ -11002,7 +11002,7 @@ export default {3],"openRecordIn": [- 29+ 25],"__typename": [1@@ -11024,7 +11024,7 @@ export default {441],"indexType": [- 27+ 232],"__typename": [1@@ -11311,7 +11311,7 @@ export default {3],"workspaceDiscoverability": [- 73+ 69],"allowImpersonation": [3@@ -11485,7 +11485,7 @@ export default {},"CreateFieldInput": {"type": [- 25+ 224],"name": [1@@ -11875,7 +11875,7 @@ export default {4],"operand": [- 47+ 43],"value": [5@@ -11910,7 +11910,7 @@ export default {4],"logicalOperator": [- 45+ 41],"positionInRowLevelPermissionPredicateGroup": [16@@ -12234,10 +12234,10 @@ export default {5],"retryLimit": [- 31+ 27],"delayMs": [- 31+ 27],"__typename": [1@@ -12256,10 +12256,10 @@ export default {},"AgentChatQuestionAnswerInput": {"questionIndex": [- 31+ 27],"selectedOptionIndices": [- 31+ 27],"freeText": [1@@ -12403,7 +12403,7 @@ export default {4],"status": [- 184+ 180],"__typename": [1@@ -12541,7 +12541,7 @@ export default {},"Subscription": {"onEventSubscription": [- 163,+ 159,{"eventStreamId": [1,diff --git a/packages/twenty-server/package.json b/packages/twenty-server/package.jsonindex e6f97ced85e..577f723ce4b 100644--- a/packages/twenty-server/package.json+++ b/packages/twenty-server/package.json@@ -71,9 +71,6 @@"@opentelemetry/exporter-metrics-otlp-http": "^0.219.0","@opentelemetry/exporter-prometheus": "^0.219.0","@opentelemetry/sdk-metrics": "^2.8.0",- "@ptc-org/nestjs-query-core": "^9.4.0",- "@ptc-org/nestjs-query-graphql": "patch:@ptc-org/nestjs-query-graphql@npm%3A9.4.0#~/.yarn/patches/@ptc-org-nestjs-query-graphql-npm-9.4.0-8e6f7894e1.patch",- "@ptc-org/nestjs-query-typeorm": "patch:@ptc-org/nestjs-query-typeorm@npm%3A9.4.0#~/.yarn/patches/@ptc-org-nestjs-query-typeorm-npm-9.4.0-ca3414967e.patch","@react-pdf/renderer": "^4.1.6","@sentry/nestjs": "^10.59.0","@sentry/node": "^10.59.0",diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-duplicates-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-duplicates-query-runner.service.tsindex d7337a2877f..94dc4515907 100644--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-duplicates-query-runner.service.ts+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-duplicates-query-runner.service.ts@@ -130,14 +130,16 @@ export class CommonFindDuplicatesQueryRunnerService extends CommonBaseQueryRunneconst aggregateQueryBuilder = duplicateRecordsQueryBuilder.clone();const totalCount = await aggregateQueryBuilder.getCount();- const { startCursor, endCursor } = getPageInfo(- duplicates,- [{ id: OrderByDirection.AscNullsFirst }],- QUERY_MAX_RECORDS,- true,+ const { startCursor, endCursor } = getPageInfo({+ records: duplicates,+ orderBy: [{ id: OrderByDirection.AscNullsFirst }],+ pageInfo: {+ hasNextPage: false,+ hasPreviousPage: false,+ },flatObjectMetadata,flatFieldMetadataMaps,- );+ });return {records: duplicates,diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-many-query-runner.service.tsindex f719a64f296..66ae1e5f985 100644--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-many-query-runner.service.ts+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-many-query-runner.service.ts@@ -29,6 +29,7 @@ import {FindManyQueryArgs,} from 'src/engine/api/common/types/common-query-args.type';import { CommonSelectedFieldsResult } from 'src/engine/api/common/types/common-selected-fields-result.type';+import { buildCursorPage } from 'src/engine/api/utils/build-cursor-page.util';import { getPageInfo } from 'src/engine/api/common/utils/get-page-info.util';import { ProcessAggregateHelper } from 'src/engine/api/graphql/graphql-query-runner/helpers/process-aggregate.helper';import { buildColumnsToSelect } from 'src/engine/api/graphql/graphql-query-runner/utils/build-columns-to-select';@@ -178,20 +179,24 @@ export class CommonFindManyQueryRunnerService extends CommonBaseQueryRunnerServicolumnsToSelect,);- const objectRecords = (await queryBuilder.getMany()) as ObjectRecord[];-- const pageInfo = getPageInfo(- objectRecords,- orderByWithIdCondition,+ const fetchedObjectRecords =+ (await queryBuilder.getMany()) as ObjectRecord[];+ const { items: objectRecords, pageInfo: cursorPageInfo } = buildCursorPage({+ fetchedItems: fetchedObjectRecords,limit,- isForwardPagination,+ direction: isForwardPagination ? 'forward' : 'backward',+ // getCursor applies cursors on truthiness, so an empty-string cursor+ // must not advertise navigation from a cursor.+ hasAfterCursor: Boolean(args.after),+ hasBeforeCursor: Boolean(args.before),+ });+ const pageInfo = getPageInfo({+ records: objectRecords,+ orderBy: orderByWithIdCondition,+ pageInfo: cursorPageInfo,flatObjectMetadata,flatFieldMetadataMaps,- );-- if (!isForwardPagination) {- objectRecords.reverse();- }+ });const hasAggregatedFields =Object.keys(args.selectedFieldsResult.aggregate ?? {}).length > 0;diff --git a/packages/twenty-server/src/engine/api/common/utils/get-page-info.util.ts b/packages/twenty-server/src/engine/api/common/utils/get-page-info.util.tsindex ed44fede070..a8fe4132cb4 100644--- a/packages/twenty-server/src/engine/api/common/utils/get-page-info.util.ts+++ b/packages/twenty-server/src/engine/api/common/utils/get-page-info.util.ts@@ -3,32 +3,25 @@ import { type ObjectRecord } from 'twenty-shared/types';import { type ObjectRecordOrderBy } from 'src/engine/api/graphql/workspace-query-builder/interfaces/object-record.interface';import { type CommonPageInfo } from 'src/engine/api/common/types/common-page-info.type';-import {- encodeCursor,- getPaginationInfo,-} from 'src/engine/api/graphql/graphql-query-runner/utils/cursors.util';+import { type CursorPageFlags } from 'src/engine/api/types/cursor-page-flags.type';+import { encodeCursor } from 'src/engine/api/graphql/graphql-query-runner/utils/cursors.util';import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';-export const getPageInfo = (- records: ObjectRecord[],- orderBy: ObjectRecordOrderBy,- limit: number,- isForwardPagination: boolean,- flatObjectMetadata: FlatObjectMetadata,- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>,-): CommonPageInfo => {- const { hasNextPage, hasPreviousPage, hasMoreRecords } = getPaginationInfo(- records,- limit,- isForwardPagination,- );-- if (hasMoreRecords) {- records.pop();- }-+export const getPageInfo = ({+ records,+ orderBy,+ pageInfo,+ flatObjectMetadata,+ flatFieldMetadataMaps,+}: {+ records: ObjectRecord[];+ orderBy: ObjectRecordOrderBy;+ pageInfo: CursorPageFlags;+ flatObjectMetadata: FlatObjectMetadata;+ flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;+}): CommonPageInfo => {const startCursor =records.length > 0? encodeCursor({@@ -48,5 +41,5 @@ export const getPageInfo = (}): null;- return { startCursor, endCursor, hasNextPage, hasPreviousPage };+ return { startCursor, endCursor, ...pageInfo };};diff --git a/packages/twenty-server/src/engine/api/graphql/__tests__/scalars-explorer.service.spec.ts b/packages/twenty-server/src/engine/api/graphql/__tests__/scalars-explorer.service.spec.tsnew file mode 100644index 00000000000..9b58bedeaee--- /dev/null+++ b/packages/twenty-server/src/engine/api/graphql/__tests__/scalars-explorer.service.spec.ts@@ -0,0 +1,15 @@+import { ScalarsExplorerService } from 'src/engine/api/graphql/services/scalars-explorer.service';+import { ConnectionCursorScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';++describe('ScalarsExplorerService', () => {+ it('registers the ConnectionCursor implementation used by rebuilt workspace schemas', () => {+ const scalar = new ScalarsExplorerService().getScalarImplementation(+ 'ConnectionCursor',+ );++ expect(scalar).toBe(ConnectionCursorScalarType);+ expect(() => scalar?.parseValue(42)).toThrow(+ 'ConnectionCursor must be a string',+ );+ });+});diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/cursors.util.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/cursors.util.tsindex f3df0af7400..f6f734f336e 100644--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/cursors.util.ts+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/cursors.util.ts@@ -112,17 +112,3 @@ export const getCursor = (return undefined;};--export const getPaginationInfo = (- objectRecords: ObjectRecord[],- limit: number,- isForwardPagination: boolean,-) => {- const hasMoreRecords = objectRecords.length > limit;-- return {- hasNextPage: isForwardPagination && hasMoreRecords,- hasPreviousPage: !isForwardPagination && hasMoreRecords,- hasMoreRecords,- };-};diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/object/page-into.object-type.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/object/page-into.object-type.tsindex f6618f14226..142a56e3171 100644--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/object/page-into.object-type.ts+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/object/page-into.object-type.ts@@ -1,14 +1,15 @@-import { ConnectionCursorScalar } from '@ptc-org/nestjs-query-graphql';import { GraphQLBoolean, GraphQLNonNull, GraphQLObjectType } from 'graphql';+import { ConnectionCursorScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';+/*** GraphQL PageInfo type.*/export const PageInfoType = new GraphQLObjectType({name: 'PageInfo',fields: {- startCursor: { type: ConnectionCursorScalar },- endCursor: { type: ConnectionCursorScalar },+ startCursor: { type: ConnectionCursorScalarType },+ endCursor: { type: ConnectionCursorScalarType },hasNextPage: { type: new GraphQLNonNull(GraphQLBoolean) },hasPreviousPage: { type: new GraphQLNonNull(GraphQLBoolean) },},diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/connection-cursor.scalar.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/connection-cursor.scalar.tsnew file mode 100644index 00000000000..8a9d32011c5--- /dev/null+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/connection-cursor.scalar.ts@@ -0,0 +1,31 @@+import { GraphQLScalarType, Kind } from 'graphql';++import { ValidationError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';++// Mirrors the ConnectionCursor scalar previously provided by+// @ptc-org/nestjs-query-graphql so the public schema stays unchanged.+export const ConnectionCursorScalarType = new GraphQLScalarType({+ name: 'ConnectionCursor',+ description: 'Cursor for paging through collections',+ serialize(value) {+ if (typeof value !== 'string') {+ throw new ValidationError('ConnectionCursor must be a string');+ }++ return value;+ },+ parseValue(value) {+ if (typeof value !== 'string') {+ throw new ValidationError('ConnectionCursor must be a string');+ }++ return value;+ },+ parseLiteral(ast) {+ if (ast.kind !== Kind.STRING) {+ throw new ValidationError('ConnectionCursor must be a string');+ }++ return ast.value;+ },+});diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/index.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/index.tsindex b834f5dec06..fa1c9124dd8 100644--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/index.ts+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/index.ts@@ -1,5 +1,6 @@import { BigFloatScalarType } from './big-float.scalar';import { BigIntScalarType } from './big-int.scalar';+import { ConnectionCursorScalarType } from './connection-cursor.scalar';import { CursorScalarType } from './cursor.scalar';import { DateScalarType } from './date.scalar';import { PositionScalarType } from './position.scalar';@@ -9,6 +10,7 @@ import { UUIDScalarType } from './uuid.scalar';export * from './big-float.scalar';export * from './big-int.scalar';+export * from './connection-cursor.scalar';export * from './cursor.scalar';export * from './date.scalar';@@ -20,6 +22,7 @@ export * from './uuid.scalar';export const scalars = [BigFloatScalarType,BigIntScalarType,+ ConnectionCursorScalarType,DateScalarType,TimeScalarType,UUIDScalarType,diff --git a/packages/twenty-server/src/engine/api/rest/input-request-parsers/limit-parser-utils/__tests__/parse-limit-rest-request.util.spec.ts b/packages/twenty-server/src/engine/api/rest/input-request-parsers/limit-parser-utils/__tests__/parse-limit-rest-request.util.spec.tsindex 826b0dd6a2a..54ee3e43b37 100644--- a/packages/twenty-server/src/engine/api/rest/input-request-parsers/limit-parser-utils/__tests__/parse-limit-rest-request.util.spec.ts+++ b/packages/twenty-server/src/engine/api/rest/input-request-parsers/limit-parser-utils/__tests__/parse-limit-rest-request.util.spec.ts@@ -13,6 +13,13 @@ describe('parseLimitRestRequest', () => {expect(parseLimitRestRequest(request)).toEqual(10);});+ it('supports caller-specific defaults and maximums', () => {+ expect(parseLimitRestRequest({ query: {} } as any, 1000, 1000)).toBe(1000);+ expect(+ parseLimitRestRequest({ query: { limit: '1500' } } as any, 1000, 1000),+ ).toBe(1000);+ });+it('should throw if not integer', () => {const request: any = { query: { limit: 'aaa' } };diff --git a/packages/twenty-server/src/engine/api/rest/input-request-parsers/limit-parser-utils/parse-limit-rest-request.util.ts b/packages/twenty-server/src/engine/api/rest/input-request-parsers/limit-parser-utils/parse-limit-rest-request.util.tsindex 70db46bfb58..ed6e1687fe5 100644--- a/packages/twenty-server/src/engine/api/rest/input-request-parsers/limit-parser-utils/parse-limit-rest-request.util.ts+++ b/packages/twenty-server/src/engine/api/rest/input-request-parsers/limit-parser-utils/parse-limit-rest-request.util.ts@@ -13,6 +13,7 @@ import { type RequestContext } from 'src/engine/api/rest/types/RequestContext';export const parseLimitRestRequest = (request: AuthenticatedRequest | RequestContext,defaultLimit = QUERY_DEFAULT_LIMIT_RECORDS,+ maxLimit = QUERY_MAX_RECORDS,): number => {if (!request.query?.limit) {return defaultLimit;@@ -26,5 +27,5 @@ export const parseLimitRestRequest = ();}- return Math.min(limit, QUERY_MAX_RECORDS);+ return Math.min(limit, maxLimit);};diff --git a/packages/twenty-server/src/engine/api/rest/metadata/types/metadata-rest-list-response.type.ts b/packages/twenty-server/src/engine/api/rest/metadata/types/metadata-rest-list-response.type.tsnew file mode 100644index 00000000000..762774e2b45--- /dev/null+++ b/packages/twenty-server/src/engine/api/rest/metadata/types/metadata-rest-list-response.type.ts@@ -0,0 +1,7 @@+import { type RestCursorPageInfo } from 'src/engine/api/rest/metadata/types/rest-cursor-page-info.type';++export type MetadataRestListResponse<T> = {+ data: T[];+ pageInfo: RestCursorPageInfo;+ totalCount: number;+};diff --git a/packages/twenty-server/src/engine/api/rest/metadata/types/rest-cursor-page-info.type.ts b/packages/twenty-server/src/engine/api/rest/metadata/types/rest-cursor-page-info.type.tsnew file mode 100644index 00000000000..d0421c6f15b--- /dev/null+++ b/packages/twenty-server/src/engine/api/rest/metadata/types/rest-cursor-page-info.type.ts@@ -0,0 +1,6 @@+export type RestCursorPageInfo = {+ hasNextPage: boolean;+ hasPreviousPage: boolean;+ startCursor: string | null;+ endCursor: string | null;+};diff --git a/packages/twenty-server/src/engine/api/rest/metadata/utils/__tests__/paginate-by-id-cursor.util.spec.ts b/packages/twenty-server/src/engine/api/rest/metadata/utils/__tests__/paginate-by-id-cursor.util.spec.tsnew file mode 100644index 00000000000..da254a07eb1--- /dev/null+++ b/packages/twenty-server/src/engine/api/rest/metadata/utils/__tests__/paginate-by-id-cursor.util.spec.ts@@ -0,0 +1,86 @@+import { BadRequestException } from '@nestjs/common';++import {+ QUERY_DEFAULT_LIMIT_RECORDS,+ QUERY_MAX_RECORDS,+} from 'twenty-shared/constants';++import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';+import { isMetadataRestRequest } from 'src/engine/api/rest/metadata/utils/is-metadata-rest-request.util';+import { paginateMetadataRestItems } from 'src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util';+import { parseMetadataRestPagination } from 'src/engine/api/rest/metadata/utils/parse-metadata-rest-pagination.util';++const UUID_A = '00000000-0000-4000-8000-00000000000a';+const UUID_B = '00000000-0000-4000-8000-00000000000b';+const UUID_C = '00000000-0000-4000-8000-00000000000c';++const requestWithQuery = (+ query: Record<string, string>,+): AuthenticatedRequest => ({ query }) as unknown as AuthenticatedRequest;++describe('paginateMetadataRestItems', () => {+ it('uses the shared REST default and maximum page size', () => {+ expect(parseMetadataRestPagination(requestWithQuery({})).limit).toBe(+ QUERY_DEFAULT_LIMIT_RECORDS,+ );+ expect(+ parseMetadataRestPagination(+ requestWithQuery({ limit: `${QUERY_MAX_RECORDS + 1}` }),+ ).limit,+ ).toBe(QUERY_MAX_RECORDS);+ });++ it('parses REST arguments and returns the unified direct envelope', () => {+ const page = paginateMetadataRestItems({+ items: [{ id: UUID_A }, { id: UUID_B }, { id: UUID_C }],+ request: requestWithQuery({ limit: '1', starting_after: UUID_A }),+ });++ expect(page).toEqual({+ data: [{ id: UUID_B }],+ pageInfo: {+ hasNextPage: true,+ hasPreviousPage: true,+ startCursor: UUID_B,+ endCursor: UUID_B,+ },+ totalCount: 3,+ });+ });++ it('rejects mutually exclusive cursors', () => {+ expect(() =>+ paginateMetadataRestItems({+ items: [],+ request: requestWithQuery({+ starting_after: UUID_A,+ ending_before: UUID_B,+ }),+ }),+ ).toThrow(BadRequestException);+ });++ it('rejects malformed identity cursors', () => {+ expect(() =>+ paginateMetadataRestItems({+ items: [],+ request: requestWithQuery({ starting_after: 'not-a-uuid' }),+ }),+ ).toThrow('Invalid cursor');+ });+});++describe('isMetadataRestRequest', () => {+ it('distinguishes metadata routes from deprecated aliases', () => {+ expect(+ isMetadataRestRequest({+ originalUrl: '/rest/metadata/webhooks?limit=1',+ } as AuthenticatedRequest),+ ).toBe(true);+ expect(+ isMetadataRestRequest({+ originalUrl: '/rest/webhooks?limit=1',+ } as AuthenticatedRequest),+ ).toBe(false);+ });+});diff --git a/packages/twenty-server/src/engine/api/rest/metadata/utils/is-metadata-rest-request.util.ts b/packages/twenty-server/src/engine/api/rest/metadata/utils/is-metadata-rest-request.util.tsnew file mode 100644index 00000000000..9913ed0fe2f--- /dev/null+++ b/packages/twenty-server/src/engine/api/rest/metadata/utils/is-metadata-rest-request.util.ts@@ -0,0 +1,4 @@+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';++export const isMetadataRestRequest = (request: AuthenticatedRequest): boolean =>+ request.originalUrl.startsWith('/rest/metadata/');diff --git a/packages/twenty-server/src/engine/api/rest/metadata/utils/paginate-by-id-cursor.util.ts b/packages/twenty-server/src/engine/api/rest/metadata/utils/paginate-by-id-cursor.util.tsindex e32a372d4a6..e3e55700d73 100644--- a/packages/twenty-server/src/engine/api/rest/metadata/utils/paginate-by-id-cursor.util.ts+++ b/packages/twenty-server/src/engine/api/rest/metadata/utils/paginate-by-id-cursor.util.ts@@ -1,19 +1,9 @@-import { BadRequestException } from '@nestjs/common';+import { type FindOptionsWhere, type Repository } from 'typeorm';-import { isDefined } from 'twenty-shared/utils';-import {- type FindManyOptions,- type FindOptionsWhere,- LessThan,- MoreThan,- type Repository,-} from 'typeorm';--export type RestCursorPageInfo = {- hasNextPage: boolean;- startCursor: string | null;- endCursor: string | null;-};+import { type RestCursorPageInfo } from 'src/engine/api/rest/metadata/types/rest-cursor-page-info.type';+import { parseMetadataRestPagination } from 'src/engine/api/rest/metadata/utils/parse-metadata-rest-pagination.util';+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';+import { paginateMetadataQueryBuilder } from 'src/engine/metadata-modules/pagination/utils/paginate-metadata-query-builder.util';export const paginateByIdCursor = async <T extends { id: string; workspaceId: string },@@ -21,60 +11,34 @@ export const paginateByIdCursor = async <repository,workspaceId,where,- limit,- startingAfter,- endingBefore,+ request,}: {repository: Repository<T>;workspaceId: string;where?: FindOptionsWhere<T>;- limit: number;- startingAfter?: string;- endingBefore?: string;+ request: AuthenticatedRequest;}): Promise<{items: T[];pageInfo: RestCursorPageInfo;totalCount: number;}> => {- if (isDefined(startingAfter) && isDefined(endingBefore)) {- throw new BadRequestException(- `'starting_after' and 'ending_before' cannot be used together.`,- );- }-- const isBackward = isDefined(endingBefore);-- const idCondition = isBackward- ? { id: MoreThan(endingBefore) }- : isDefined(startingAfter)- ? { id: LessThan(startingAfter) }- : {};-const baseWhere = { ...where, workspaceId } as FindOptionsWhere<T>;-- const [rows, totalCount] = await Promise.all([- repository.find({- where: { ...baseWhere, ...idCondition },- order: { id: isBackward ? 'ASC' : 'DESC' },- take: limit + 1,- } as FindManyOptions<T>),- repository.count({ where: baseWhere }),+ const queryBuilder = repository+ .createQueryBuilder('metadata')+ .where(baseWhere);+ const countQueryBuilder = queryBuilder.clone();+ const [page, totalCount] = await Promise.all([+ paginateMetadataQueryBuilder({+ queryBuilder,+ alias: 'metadata',+ pagination: parseMetadataRestPagination(request),+ }),+ countQueryBuilder.getCount(),]);- const hasMore = rows.length > limit;- const items = hasMore ? rows.slice(0, limit) : rows;-- if (isBackward) {- items.reverse();- }-return {- items,- pageInfo: {- hasNextPage: hasMore,- startCursor: items[0]?.id ?? null,- endCursor: items[items.length - 1]?.id ?? null,- },+ items: page.items,+ pageInfo: page.pageInfo,totalCount,};};diff --git a/packages/twenty-server/src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util.ts b/packages/twenty-server/src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util.tsnew file mode 100644index 00000000000..2c13e51f42a--- /dev/null+++ b/packages/twenty-server/src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util.ts@@ -0,0 +1,23 @@+import { type MetadataRestListResponse } from 'src/engine/api/rest/metadata/types/metadata-rest-list-response.type';+import { parseMetadataRestPagination } from 'src/engine/api/rest/metadata/utils/parse-metadata-rest-pagination.util';+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';+import { paginateMetadataOrderedItems } from 'src/engine/metadata-modules/pagination/utils/paginate-metadata-ordered-items.util';++export const paginateMetadataRestItems = <T extends { id: string }>({+ items,+ request,+}: {+ items: T[];+ request: AuthenticatedRequest;+}): MetadataRestListResponse<T> => {+ const page = paginateMetadataOrderedItems({+ items,+ pagination: parseMetadataRestPagination(request),+ });++ return {+ data: page.items,+ pageInfo: page.pageInfo,+ totalCount: items.length,+ };+};diff --git a/packages/twenty-server/src/engine/api/rest/metadata/utils/parse-metadata-rest-pagination.util.ts b/packages/twenty-server/src/engine/api/rest/metadata/utils/parse-metadata-rest-pagination.util.tsnew file mode 100644index 00000000000..1aa545bbef7--- /dev/null+++ b/packages/twenty-server/src/engine/api/rest/metadata/utils/parse-metadata-rest-pagination.util.ts@@ -0,0 +1,50 @@+import { BadRequestException } from '@nestjs/common';++import { isNonEmptyString } from '@sniptt/guards';+import { isDefined } from 'twenty-shared/utils';+import { validate as uuidValidate } from 'uuid';++import { parseEndingBeforeRestRequest } from 'src/engine/api/rest/input-request-parsers/ending-before-parser-utils/parse-ending-before-rest-request.util';+import { parseLimitRestRequest } from 'src/engine/api/rest/input-request-parsers/limit-parser-utils/parse-limit-rest-request.util';+import { parseStartingAfterRestRequest } from 'src/engine/api/rest/input-request-parsers/starting-after-parser-utils/parse-starting-after-rest-request.util';+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';+import { type MetadataCursorPagination } from 'src/engine/metadata-modules/pagination/types/metadata-cursor-pagination.type';++export const parseMetadataRestPagination = (+ request: AuthenticatedRequest,+): MetadataCursorPagination => {+ const startingAfter = parseStartingAfterRestRequest(request);+ const endingBefore = parseEndingBeforeRestRequest(request);++ if (isDefined(startingAfter) && isDefined(endingBefore)) {+ throw new BadRequestException(+ `'starting_after' and 'ending_before' cannot be used together.`,+ );+ }++ const invalidCursor = [startingAfter, endingBefore].find(+ (cursor) => isDefined(cursor) && !uuidValidate(cursor),+ );++ if (isDefined(invalidCursor)) {+ throw new BadRequestException(`Invalid cursor: ${invalidCursor}`);+ }++ // The raw value is checked before parsing because parseLimitRestRequest+ // clamps to the maximum first, which would turn a fractional value above+ // the cap into a valid integer limit.+ const requestedLimit = request.query?.limit;++ if (isNonEmptyString(requestedLimit) && !Number.isInteger(+requestedLimit)) {+ throw new BadRequestException(+ `limit '${requestedLimit}' is invalid. Should be an integer`,+ );+ }++ return {+ limit: parseLimitRestRequest(request),+ direction: isDefined(endingBefore) ? 'backward' : 'forward',+ afterId: startingAfter,+ beforeId: endingBefore,+ };+};diff --git a/packages/twenty-server/src/engine/api/types/cursor-page-flags.type.ts b/packages/twenty-server/src/engine/api/types/cursor-page-flags.type.tsnew file mode 100644index 00000000000..8f6d485ef14--- /dev/null+++ b/packages/twenty-server/src/engine/api/types/cursor-page-flags.type.ts@@ -0,0 +1,4 @@+export type CursorPageFlags = {+ hasNextPage: boolean;+ hasPreviousPage: boolean;+};diff --git a/packages/twenty-server/src/engine/api/types/cursor-page.type.ts b/packages/twenty-server/src/engine/api/types/cursor-page.type.tsnew file mode 100644index 00000000000..68e38cd392e--- /dev/null+++ b/packages/twenty-server/src/engine/api/types/cursor-page.type.ts@@ -0,0 +1,6 @@+import { type CursorPageFlags } from 'src/engine/api/types/cursor-page-flags.type';++export type CursorPage<TItem> = {+ items: TItem[];+ pageInfo: CursorPageFlags;+};diff --git a/packages/twenty-server/src/engine/api/types/cursor-pagination-direction.type.ts b/packages/twenty-server/src/engine/api/types/cursor-pagination-direction.type.tsnew file mode 100644index 00000000000..c8dd20a413c--- /dev/null+++ b/packages/twenty-server/src/engine/api/types/cursor-pagination-direction.type.ts@@ -0,0 +1 @@+export type CursorPaginationDirection = 'forward' | 'backward';diff --git a/packages/twenty-server/src/engine/api/utils/__tests__/build-cursor-page.util.spec.ts b/packages/twenty-server/src/engine/api/utils/__tests__/build-cursor-page.util.spec.tsnew file mode 100644index 00000000000..c883f8dabb3--- /dev/null+++ b/packages/twenty-server/src/engine/api/utils/__tests__/build-cursor-page.util.spec.ts@@ -0,0 +1,44 @@+import { buildCursorPage } from 'src/engine/api/utils/build-cursor-page.util';++describe('buildCursorPage', () => {+ it('trims a forward sentinel without mutating the fetched items', () => {+ const fetchedItems = ['d', 'c', 'b'];++ expect(+ buildCursorPage({+ fetchedItems,+ limit: 2,+ direction: 'forward',+ }),+ ).toEqual({+ items: ['d', 'c'],+ pageInfo: { hasNextPage: true, hasPreviousPage: false },+ });+ expect(fetchedItems).toEqual(['d', 'c', 'b']);+ });++ it('restores presentation order for a backward page', () => {+ expect(+ buildCursorPage({+ fetchedItems: ['b', 'c', 'd'],+ limit: 2,+ direction: 'backward',+ hasBeforeCursor: true,+ }),+ ).toEqual({+ items: ['c', 'b'],+ pageInfo: { hasNextPage: true, hasPreviousPage: true },+ });+ });++ it('reports the opposite side when paging from a cursor', () => {+ expect(+ buildCursorPage({+ fetchedItems: ['c'],+ limit: 2,+ direction: 'forward',+ hasAfterCursor: true,+ }).pageInfo,+ ).toEqual({ hasNextPage: false, hasPreviousPage: true });+ });+});diff --git a/packages/twenty-server/src/engine/api/utils/build-cursor-page.util.ts b/packages/twenty-server/src/engine/api/utils/build-cursor-page.util.tsnew file mode 100644index 00000000000..8bcff4b4bee--- /dev/null+++ b/packages/twenty-server/src/engine/api/utils/build-cursor-page.util.ts@@ -0,0 +1,34 @@+import { type CursorPage } from 'src/engine/api/types/cursor-page.type';+import { type CursorPaginationDirection } from 'src/engine/api/types/cursor-pagination-direction.type';++// Query adapters fetch limit + 1 items in pagination order. This function owns+// the transport-neutral page window: trimming the sentinel item, restoring+// presentation order for backward pages, and deriving both navigation flags.+export const buildCursorPage = <TItem>({+ fetchedItems,+ limit,+ direction,+ hasAfterCursor = false,+ hasBeforeCursor = false,+}: {+ fetchedItems: TItem[];+ limit: number;+ direction: CursorPaginationDirection;+ hasAfterCursor?: boolean;+ hasBeforeCursor?: boolean;+}): CursorPage<TItem> => {+ const hasMoreItems = fetchedItems.length > limit;+ const items = fetchedItems.slice(0, limit);++ if (direction === 'backward') {+ items.reverse();+ }++ return {+ items,+ pageInfo: {+ hasNextPage: direction === 'backward' ? hasBeforeCursor : hasMoreItems,+ hasPreviousPage: direction === 'backward' ? hasMoreItems : hasAfterCursor,+ },+ };+};diff --git a/packages/twenty-server/src/engine/core-modules/api-key/controllers/api-key.controller.ts b/packages/twenty-server/src/engine/core-modules/api-key/controllers/api-key.controller.tsindex 7f151d01c61..bb0055478ef 100644--- a/packages/twenty-server/src/engine/core-modules/api-key/controllers/api-key.controller.ts+++ b/packages/twenty-server/src/engine/core-modules/api-key/controllers/api-key.controller.ts@@ -6,6 +6,7 @@ import {Param,Patch,Post,+ Req,UseFilters,UseGuards,} from '@nestjs/common';@@ -15,6 +16,9 @@ import { PermissionFlagType } from 'twenty-shared/constants';import { ApiPath } from 'twenty-shared/types';import { RestApiExceptionFilter } from 'src/engine/api/rest/rest-api-exception.filter';+import { isMetadataRestRequest } from 'src/engine/api/rest/metadata/utils/is-metadata-rest-request.util';+import { paginateMetadataRestItems } from 'src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util';+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';import { type ApiKeyEntity } from 'src/engine/core-modules/api-key/api-key.entity';import { CreateApiKeyInput } from 'src/engine/core-modules/api-key/dtos/create-api-key.input';import { UpdateApiKeyInput } from 'src/engine/core-modules/api-key/dtos/update-api-key.input';@@ -43,9 +47,16 @@ export class ApiKeyController {@Get()async findAll(+ @Req() request: AuthenticatedRequest,@AuthWorkspace() workspace: WorkspaceEntity,- ): Promise<ApiKeyEntity[]> {- return this.apiKeyService.findActiveByWorkspaceId(workspace.id);+ ) {+ const apiKeys = await this.apiKeyService.findActiveByWorkspaceId(+ workspace.id,+ );++ return isMetadataRestRequest(request)+ ? paginateMetadataRestItems({ items: apiKeys, request })+ : apiKeys;}@Get(':id')diff --git a/packages/twenty-server/src/engine/core-modules/api-key/services/__tests__/api-key.service.spec.ts b/packages/twenty-server/src/engine/core-modules/api-key/services/__tests__/api-key.service.spec.tsindex bbc40e9406f..92912fbf2df 100644--- a/packages/twenty-server/src/engine/core-modules/api-key/services/__tests__/api-key.service.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/api-key/services/__tests__/api-key.service.spec.ts@@ -239,7 +239,9 @@ describe('ApiKeyService', () => {const result = await service.findByWorkspaceId(mockWorkspaceId);- expect(mockApiKeyRepository.find).toHaveBeenCalledWith(mockWorkspaceId);+ expect(mockApiKeyRepository.find).toHaveBeenCalledWith(mockWorkspaceId, {+ order: { createdAt: 'ASC', id: 'ASC' },+ });expect(result).toEqual(mockApiKeys);});});@@ -254,6 +256,7 @@ describe('ApiKeyService', () => {expect(mockApiKeyRepository.find).toHaveBeenCalledWith(mockWorkspaceId, {where: { revokedAt: IsNull() },+ order: { createdAt: 'ASC', id: 'ASC' },});expect(result).toEqual(activeApiKeys);});diff --git a/packages/twenty-server/src/engine/core-modules/api-key/services/api-key.service.ts b/packages/twenty-server/src/engine/core-modules/api-key/services/api-key.service.tsindex 2d978b67308..d8755d641bb 100644--- a/packages/twenty-server/src/engine/core-modules/api-key/services/api-key.service.ts+++ b/packages/twenty-server/src/engine/core-modules/api-key/services/api-key.service.ts@@ -65,12 +65,15 @@ export class ApiKeyService {}async findByWorkspaceId(workspaceId: string): Promise<ApiKeyEntity[]> {- return this.apiKeyRepository.find(workspaceId);+ return this.apiKeyRepository.find(workspaceId, {+ order: { createdAt: 'ASC', id: 'ASC' },+ });}async findActiveByWorkspaceId(workspaceId: string): Promise<ApiKeyEntity[]> {return this.apiKeyRepository.find(workspaceId, {where: { revokedAt: IsNull() },+ order: { createdAt: 'ASC', id: 'ASC' },});}diff --git a/packages/twenty-server/src/engine/core-modules/open-api/open-api.service.ts b/packages/twenty-server/src/engine/core-modules/open-api/open-api.service.tsindex f95bd5ecf3b..bec634f0277 100644--- a/packages/twenty-server/src/engine/core-modules/open-api/open-api.service.ts+++ b/packages/twenty-server/src/engine/core-modules/open-api/open-api.service.ts@@ -332,7 +332,10 @@ export class OpenApiService {{ $ref: '#/components/parameters/endingBefore' },],responses: {- '200': getFindManyResponse200(item),+ '200': getFindManyResponse200({+ item,+ isDirectDataFeatureFlagged: true,+ }),'400': { $ref: '#/components/responses/400' },'401': { $ref: '#/components/responses/401' },},@@ -391,7 +394,7 @@ export class OpenApiService {schema.components = {...schema.components, // components.securitySchemes is defined in base Schemaschemas: computeMetadataSchemaComponents(metadata),- parameters: computeParameterComponents(true),+ parameters: computeParameterComponents(),responses: {'400': get400ErrorResponses(),'401': get401ErrorResponses(),diff --git a/packages/twenty-server/src/engine/core-modules/open-api/utils/__tests__/responses.utils.spec.ts b/packages/twenty-server/src/engine/core-modules/open-api/utils/__tests__/responses.utils.spec.tsnew file mode 100644index 00000000000..18eb774bdb1--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/open-api/utils/__tests__/responses.utils.spec.ts@@ -0,0 +1,70 @@+import { getFindManyResponse200 } from 'src/engine/core-modules/open-api/utils/responses.utils';++describe('getFindManyResponse200', () => {+ it('documents the direct metadata list envelope and complete page info', () => {+ const response = getFindManyResponse200({+ item: { nameSingular: 'view', namePlural: 'views' },+ isDirectDataFeatureFlagged: true,+ });+ expect(response).toMatchObject({+ content: {+ 'application/json': {+ schema: {+ properties: {+ data: {+ oneOf: [+ {+ type: 'array',+ items: { $ref: '#/components/schemas/ViewForResponse' },+ },+ {+ type: 'object',+ properties: {+ views: {+ type: 'array',+ items: {+ $ref: '#/components/schemas/ViewForResponse',+ },+ },+ },+ },+ ],+ },+ pageInfo: {+ properties: {+ hasNextPage: { type: 'boolean' },+ hasPreviousPage: { type: 'boolean' },+ startCursor: { type: ['string', 'null'] },+ endCursor: { type: ['string', 'null'] },+ },+ },+ },+ },+ },+ },+ });+ });++ it('keeps the workspace record REST envelope nested', () => {+ const response = getFindManyResponse200({+ item: { nameSingular: 'company', namePlural: 'companies' },+ });++ expect(response).toMatchObject({+ content: {+ 'application/json': {+ schema: {+ properties: {+ data: {+ type: 'object',+ properties: {+ companies: { type: 'array' },+ },+ },+ },+ },+ },+ },+ });+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/open-api/utils/base-schema.utils.ts b/packages/twenty-server/src/engine/core-modules/open-api/utils/base-schema.utils.tsindex acf4b23e609..f42ebf5444a 100644--- a/packages/twenty-server/src/engine/core-modules/open-api/utils/base-schema.utils.ts+++ b/packages/twenty-server/src/engine/core-modules/open-api/utils/base-schema.utils.ts@@ -69,10 +69,10 @@ Notes: Strings and dates are quoted; numbers are not.All list endpoints use cursor-based pagination.-- Use **limit** to cap page size (default: 60, max: 60).+- Use **limit** to cap page size (default: 60, max: 200).- Use **starting_after** to fetch the next page (forward).- Use **ending_before** to fetch the previous page (backward).-- Responses include **pageInfo** with \`hasNextPage\`, \`startCursor\`, and \`endCursor\`.+- Responses include **pageInfo** with \`hasNextPage\`, \`hasPreviousPage\`, \`startCursor\`, and \`endCursor\`.Examples:diff --git a/packages/twenty-server/src/engine/core-modules/open-api/utils/components.utils.ts b/packages/twenty-server/src/engine/core-modules/open-api/utils/components.utils.tsindex 91a41275a22..bb1f0b34d71 100644--- a/packages/twenty-server/src/engine/core-modules/open-api/utils/components.utils.ts+++ b/packages/twenty-server/src/engine/core-modules/open-api/utils/components.utils.ts@@ -292,9 +292,10 @@ export const computeSchemaComponents = ();};-export const computeParameterComponents = (- fromMetadata = false,-): Record<string, OpenAPIV3_1.ParameterObject> => {+export const computeParameterComponents = (): Record<+ string,+ OpenAPIV3_1.ParameterObject+> => {return {idPath: computeIdPathParameter(),startingAfter: computeStartingAfterParameters(),@@ -304,7 +305,7 @@ export const computeParameterComponents = (upsert: computeUpsertParameters(),softDelete: computeSoftDeleteParameters(),orderBy: computeOrderByParameters(),- limit: computeLimitParameters(fromMetadata),+ limit: computeLimitParameters(),groupBy: computeGroupByParameters(),viewId: computeViewIdParameters(),aggregate: computeAggregateParameters(),diff --git a/packages/twenty-server/src/engine/core-modules/open-api/utils/parameters.utils.ts b/packages/twenty-server/src/engine/core-modules/open-api/utils/parameters.utils.tsindex b4bbeb6a95e..2106ef22c9f 100644--- a/packages/twenty-server/src/engine/core-modules/open-api/utils/parameters.utils.ts+++ b/packages/twenty-server/src/engine/core-modules/open-api/utils/parameters.utils.ts@@ -5,9 +5,7 @@ import {} from 'twenty-shared/constants';import { OrderByDirection } from 'twenty-shared/types';-export const computeLimitParameters = (- fromMetadata = false,-): OpenAPIV3_1.ParameterObject => {+export const computeLimitParameters = (): OpenAPIV3_1.ParameterObject => {return {name: 'limit',in: 'query',@@ -16,8 +14,8 @@ export const computeLimitParameters = (schema: {type: 'integer',minimum: 0,- maximum: fromMetadata ? 1000 : QUERY_MAX_RECORDS,- default: fromMetadata ? 1000 : QUERY_DEFAULT_LIMIT_RECORDS,+ maximum: QUERY_MAX_RECORDS,+ default: QUERY_DEFAULT_LIMIT_RECORDS,},};};diff --git a/packages/twenty-server/src/engine/core-modules/open-api/utils/path.utils.ts b/packages/twenty-server/src/engine/core-modules/open-api/utils/path.utils.tsindex 2ba588f5da3..066ea1a1769 100644--- a/packages/twenty-server/src/engine/core-modules/open-api/utils/path.utils.ts+++ b/packages/twenty-server/src/engine/core-modules/open-api/utils/path.utils.ts@@ -83,7 +83,7 @@ export const computeManyResultPath = ({ $ref: '#/components/parameters/endingBefore' },],responses: {- '200': getFindManyResponse200(item),+ '200': getFindManyResponse200({ item }),'400': { $ref: '#/components/responses/400' },'401': { $ref: '#/components/responses/401' },},diff --git a/packages/twenty-server/src/engine/core-modules/open-api/utils/responses.utils.ts b/packages/twenty-server/src/engine/core-modules/open-api/utils/responses.utils.tsindex bb25e0dfea6..f462b209747 100644--- a/packages/twenty-server/src/engine/core-modules/open-api/utils/responses.utils.ts+++ b/packages/twenty-server/src/engine/core-modules/open-api/utils/responses.utils.ts@@ -1,14 +1,34 @@+import { type OpenAPIV3_1 } from 'openapi-types';import { capitalize } from 'twenty-shared/utils';import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';-export const getFindManyResponse200 = (- item: Pick<FlatObjectMetadata, 'nameSingular' | 'namePlural'>,-) => {+export const getFindManyResponse200 = ({+ item,+ isDirectDataFeatureFlagged = false,+}: {+ item: Pick<FlatObjectMetadata, 'nameSingular' | 'namePlural'>;+ isDirectDataFeatureFlagged?: boolean;+}): OpenAPIV3_1.ResponseObject => {const schemaRef = `#/components/schemas/${capitalize(item.nameSingular,)}ForResponse`;+ const directDataSchema: OpenAPIV3_1.SchemaObject = {+ type: 'array',+ items: { $ref: schemaRef },+ };++ const nestedDataSchema: OpenAPIV3_1.SchemaObject = {+ type: 'object',+ properties: {+ [item.namePlural]: {+ type: 'array',+ items: { $ref: schemaRef },+ },+ },+ };+return {description: 'Successful operation',content: {@@ -16,26 +36,26 @@ export const getFindManyResponse200 = (schema: {type: 'object',properties: {- data: {- type: 'object',- properties: {- [item.namePlural]: {- type: 'array',- items: {- $ref: schemaRef,- },- },- },- },+ // Endpoints behind IS_REST_METADATA_API_NEW_FORMAT_DIRECT answer+ // with either envelope depending on the workspace flag, so both+ // are documented rather than only the post-flag shape.+ data: isDirectDataFeatureFlagged+ ? {+ description:+ 'An array when IS_REST_METADATA_API_NEW_FORMAT_DIRECT is enabled for the workspace, otherwise the legacy nested envelope.',+ oneOf: [directDataSchema, nestedDataSchema],+ }+ : nestedDataSchema,pageInfo: {type: 'object',properties: {hasNextPage: { type: 'boolean' },+ hasPreviousPage: { type: 'boolean' },startCursor: {- type: 'string',+ type: ['string', 'null'],},endCursor: {- type: 'string',+ type: ['string', 'null'],},},},diff --git a/packages/twenty-server/src/engine/dataloaders/dataloader.interface.ts b/packages/twenty-server/src/engine/dataloaders/dataloader.interface.tsindex 8290e5143b7..6b8fd3258e3 100644--- a/packages/twenty-server/src/engine/dataloaders/dataloader.interface.ts+++ b/packages/twenty-server/src/engine/dataloaders/dataloader.interface.ts@@ -3,8 +3,10 @@ import type DataLoader from 'dataloader';import {type ApplicationTranslationCatalogLoaderPayload,type FieldMetadataLoaderPayload,+ type FieldMetadataConnectionLoaderPayload,type IndexFieldMetadataLoaderPayload,type IndexMetadataLoaderPayload,+ type IndexMetadataConnectionLoaderPayload,type SearchFieldMetadataLoaderPayload,type IsConfiguredLoaderPayload,type MorphRelationLoaderPayload,@@ -25,6 +27,7 @@ import { type IndexFieldMetadataDTO } from 'src/engine/metadata-modules/index-meimport { type IndexMetadataDTO } from 'src/engine/metadata-modules/index-metadata/dtos/index-metadata.dto';import { type ObjectMetadataDTO } from 'src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto';import { type SearchFieldMetadataDTO } from 'src/engine/metadata-modules/search-field-metadata/dtos/search-field-metadata.dto';+import { type CursorConnection } from 'src/engine/metadata-modules/pagination/dtos/cursor-connection-type.factory';import { type ViewFieldGroupDTO } from 'src/engine/metadata-modules/view-field-group/dtos/view-field-group.dto';import { type ViewFieldDTO } from 'src/engine/metadata-modules/view-field/dtos/view-field.dto';import { type ViewFilterGroupDTO } from 'src/engine/metadata-modules/view-filter-group/dtos/view-filter-group.dto';@@ -45,11 +48,21 @@ export interface IDataloaders {FieldMetadataDTO[]>;+ fieldMetadataConnectionLoader: DataLoader<+ FieldMetadataConnectionLoaderPayload,+ CursorConnection<FieldMetadataDTO>+ >;+indexMetadataLoader: DataLoader<IndexMetadataLoaderPayload,IndexMetadataDTO[]>;+ indexMetadataConnectionLoader: DataLoader<+ IndexMetadataConnectionLoaderPayload,+ CursorConnection<IndexMetadataDTO>+ >;+indexFieldMetadataLoader: DataLoader<IndexFieldMetadataLoaderPayload,IndexFieldMetadataDTO[]diff --git a/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts b/packages/twenty-server/src/engine/dataloaders/dataloader.service.tsindex bc6f743397a..0feb04da0ad 100644--- a/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts+++ b/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts@@ -13,6 +13,10 @@ import { type FlatApplicationCacheMaps } from 'src/engine/core-modules/applicatiimport { I18nService } from 'src/engine/core-modules/i18n/i18n.service';import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';import { filterMorphRelationDuplicateFields } from 'src/engine/dataloaders/utils/filter-morph-relation-duplicate-fields.util';+import {+ FIELD_FILTER_COLUMN_BY_FILTER_FIELD,+ type FieldFilterInput,+} from 'src/engine/metadata-modules/field-metadata/dtos/field-filter.input';import { type FieldMetadataDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto';import { RelationDTO } from 'src/engine/metadata-modules/field-metadata/dtos/relation.dto';import { type FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';@@ -39,9 +43,17 @@ import { fromFlatViewFilterGroupToViewFilterGroupDto } from 'src/engine/metadataimport { fromFlatViewGroupToViewGroupDto } from 'src/engine/metadata-modules/view-group/utils/from-flat-view-group-to-view-group-dto.util';import { fromFlatViewSortToViewSortDto } from 'src/engine/metadata-modules/view-sort/utils/from-flat-view-sort-to-view-sort-dto.util';import { type IndexFieldMetadataDTO } from 'src/engine/metadata-modules/index-metadata/dtos/index-field-metadata.dto';+import {+ INDEX_FILTER_COLUMN_BY_FILTER_FIELD,+ type IndexFilterInput,+} from 'src/engine/metadata-modules/index-metadata/dtos/index-filter.input';import { type IndexMetadataDTO } from 'src/engine/metadata-modules/index-metadata/dtos/index-metadata.dto';import { ObjectMetadataDTO } from 'src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto';import { type ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';+import { type CursorConnection } from 'src/engine/metadata-modules/pagination/dtos/cursor-connection-type.factory';+import { type CursorPagingInput } from 'src/engine/metadata-modules/pagination/dtos/cursor-paging.input';+import { applyMetadataFilterToItems } from 'src/engine/metadata-modules/pagination/utils/apply-metadata-filter-to-query-builder.util';+import { findManyItemsWithCursorPagination } from 'src/engine/metadata-modules/pagination/utils/find-many-items-with-cursor-pagination.util';import { type SearchFieldMetadataDTO } from 'src/engine/metadata-modules/search-field-metadata/dtos/search-field-metadata.dto';export type RelationMetadataLoaderPayload = {@@ -67,11 +79,23 @@ export type FieldMetadataLoaderPayload = {locale?: keyof typeof APP_LOCALES;};+export type FieldMetadataConnectionLoaderPayload =+ FieldMetadataLoaderPayload & {+ filter: FieldFilterInput;+ paging: CursorPagingInput;+ };+export type IndexMetadataLoaderPayload = {workspaceId: string;objectMetadata: Pick<ObjectMetadataEntity, 'id'>;};+export type IndexMetadataConnectionLoaderPayload =+ IndexMetadataLoaderPayload & {+ filter: IndexFilterInput;+ paging: CursorPagingInput;+ };+export type IndexFieldMetadataLoaderPayload = {workspaceId: string;objectMetadata: Pick<ObjectMetadataEntity, 'id'>;@@ -150,7 +174,11 @@ export class DataloaderService {const relationLoader = this.createRelationLoader();const morphRelationLoader = this.createMorphRelationLoader();const fieldMetadataLoader = this.createFieldMetadataLoader();+ const fieldMetadataConnectionLoader =+ this.createFieldMetadataConnectionLoader();const indexMetadataLoader = this.createIndexMetadataLoader();+ const indexMetadataConnectionLoader =+ this.createIndexMetadataConnectionLoader();const indexFieldMetadataLoader = this.createIndexFieldMetadataLoader();const searchFieldMetadataLoader = this.createSearchFieldMetadataLoader();const objectMetadataLoader = this.createObjectMetadataLoader();@@ -174,7 +202,9 @@ export class DataloaderService {relationLoader,morphRelationLoader,fieldMetadataLoader,+ fieldMetadataConnectionLoader,indexMetadataLoader,+ indexMetadataConnectionLoader,indexFieldMetadataLoader,searchFieldMetadataLoader,objectMetadataLoader,@@ -315,6 +345,59 @@ export class DataloaderService {);}+ private createIndexMetadataConnectionLoader() {+ return new DataLoader<+ IndexMetadataConnectionLoaderPayload,+ CursorConnection<IndexMetadataDTO>+ >(async (dataLoaderParams: IndexMetadataConnectionLoaderPayload[]) => {+ const workspaceId = dataLoaderParams[0].workspaceId;+ const { flatIndexMaps, flatObjectMetadataMaps } =+ await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(+ {+ workspaceId,+ flatMapsKeys: ['flatIndexMaps', 'flatObjectMetadataMaps'],+ },+ );++ return dataLoaderParams.map(({ objectMetadata, paging, filter }) => {+ const flatObjectMetadata = findFlatEntityByIdInFlatEntityMapsOrThrow({+ flatEntityId: objectMetadata.id,+ flatEntityMaps: flatObjectMetadataMaps,+ });+ const flatIndexMetadatas =+ findManyFlatEntityByIdInFlatEntityMapsOrThrow({+ flatEntityIds: flatObjectMetadata.indexMetadataIds,+ flatEntityMaps: flatIndexMaps,+ });+ const filteredFlatIndexMetadatas = applyMetadataFilterToItems({+ items: flatIndexMetadatas,+ filter,+ columnByFilterField: INDEX_FILTER_COLUMN_BY_FILTER_FIELD,+ });+ const connection = findManyItemsWithCursorPagination({+ items: filteredFlatIndexMetadatas,+ paging,+ });++ return {+ ...connection,+ edges: connection.edges.map((edge) => ({+ ...edge,+ node: {+ ...edge.node,+ indexFieldMetadatas: edge.node.flatIndexFieldMetadatas,+ createdAt: new Date(edge.node.createdAt),+ updatedAt: new Date(edge.node.updatedAt),+ indexWhereClause: edge.node.indexWhereClause ?? undefined,+ objectMetadataId: objectMetadata.id,+ workspaceId,+ },+ })),+ };+ });+ });+ }+private createSearchFieldMetadataLoader() {return new DataLoader<SearchFieldMetadataLoaderPayload,@@ -486,6 +569,133 @@ export class DataloaderService {);}+ private createFieldMetadataConnectionLoader() {+ return new DataLoader<+ FieldMetadataConnectionLoaderPayload,+ CursorConnection<FieldMetadataDTO>+ >(async (dataLoaderParams: FieldMetadataConnectionLoaderPayload[]) => {+ const locale = dataLoaderParams[0].locale;+ const safeLocale = locale ?? SOURCE_LOCALE;+ const i18nInstance = this.i18nService.getI18nInstance(safeLocale);+ const workspaceId = dataLoaderParams[0].workspaceId;+ const {+ flatFieldMetadataMaps,+ flatObjectMetadataMaps,+ flatApplicationMaps,+ } =+ await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(+ {+ workspaceId,+ flatMapsKeys: [+ 'flatFieldMetadataMaps',+ 'flatObjectMetadataMaps',+ 'flatApplicationMaps',+ ],+ },+ );++ const connections = dataLoaderParams.map(+ ({ objectMetadata, paging, filter }) => {+ const flatObjectMetadata = findFlatEntityByIdInFlatEntityMapsOrThrow({+ flatEntityId: objectMetadata.id,+ flatEntityMaps: flatObjectMetadataMaps,+ });+ const flatFieldMetadatas =+ findManyFlatEntityByIdInFlatEntityMapsOrThrow({+ flatEntityIds: flatObjectMetadata.fieldIds,+ flatEntityMaps: flatFieldMetadataMaps,+ });+ const filteredFlatFieldMetadatas = applyMetadataFilterToItems({+ items: filterMorphRelationDuplicateFields(flatFieldMetadatas),+ filter,+ columnByFilterField: FIELD_FILTER_COLUMN_BY_FILTER_FIELD,+ });++ return findManyItemsWithCursorPagination({+ items: filteredFlatFieldMetadatas,+ paging,+ });+ },+ );+ const selectedFlatFieldMetadatas = connections.flatMap((connection) =>+ connection.edges.map(({ node }) => node),+ );+ const applicationCatalogByRegistrationId =+ await this.loadApplicationCatalogByRegistrationId({+ applicationIds: selectedFlatFieldMetadatas.map(+ (flatFieldMetadata) => flatFieldMetadata.applicationId,+ ),+ flatApplicationMaps,+ locale: safeLocale,+ });++ return connections.map((connection) => ({+ ...connection,+ edges: connection.edges.map((edge) => {+ const flatFieldMetadata = edge.node;+ const applicationRegistrationId =+ flatApplicationMaps.byId[flatFieldMetadata.applicationId]+ ?.applicationRegistrationId;+ const applicationCatalog = isDefined(applicationRegistrationId)+ ? applicationCatalogByRegistrationId.get(applicationRegistrationId)+ : undefined;+ const overrides = flatFieldMetadata.overrides ?? undefined;+ const i18nContext = {+ locale,+ i18nInstance,+ isStandardApp: belongsToTwentyStandardApp(flatFieldMetadata),+ applicationCatalog,+ };+ const overriddenFlatFieldMetadata =+ ALL_OVERRIDABLE_PROPERTIES_BY_METADATA_NAME.fieldMetadata.reduce(+ (acc, property) => ({+ ...acc,+ [property]: resolveEffectiveEntityProperty({+ metadataName: 'fieldMetadata',+ baseValue: flatFieldMetadata[property],+ overrides,+ property,+ i18nContext,+ }),+ }),+ flatFieldMetadata,+ );+ let renamedFlatFieldMetadata = overriddenFlatFieldMetadata;++ if (+ isFlatFieldMetadataOfType(+ overriddenFlatFieldMetadata,+ FieldMetadataType.MORPH_RELATION,+ )+ ) {+ const relationTargetObjectMetadata =+ findFlatEntityByIdInFlatEntityMapsOrThrow({+ flatEntityId:+ overriddenFlatFieldMetadata.relationTargetObjectMetadataId,+ flatEntityMaps: flatObjectMetadataMaps,+ });++ renamedFlatFieldMetadata = {+ ...overriddenFlatFieldMetadata,+ name: getMorphNameFromMorphFieldMetadataName({+ morphRelationFlatFieldMetadata: overriddenFlatFieldMetadata,+ nameSingular: relationTargetObjectMetadata.nameSingular,+ namePlural: relationTargetObjectMetadata.namePlural,+ }),+ };+ }++ return {+ ...edge,+ node: fromFlatFieldMetadataToFieldMetadataDto(+ renamedFlatFieldMetadata,+ ),+ };+ }),+ }));+ });+ }+private createIndexFieldMetadataLoader() {return new DataLoader<IndexFieldMetadataLoaderPayload,diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/controllers/field-metadata.controller.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/controllers/field-metadata.controller.tsindex c736baef152..df7fc3f9be2 100644--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/controllers/field-metadata.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/controllers/field-metadata.controller.ts@@ -20,13 +20,8 @@ import { PermissionFlagType } from 'twenty-shared/constants';import { ApiPath, FeatureFlagKey } from 'twenty-shared/types';import { Repository } from 'typeorm';-import { parseEndingBeforeRestRequest } from 'src/engine/api/rest/input-request-parsers/ending-before-parser-utils/parse-ending-before-rest-request.util';-import { parseLimitRestRequest } from 'src/engine/api/rest/input-request-parsers/limit-parser-utils/parse-limit-rest-request.util';-import { parseStartingAfterRestRequest } from 'src/engine/api/rest/input-request-parsers/starting-after-parser-utils/parse-starting-after-rest-request.util';-import {- paginateByIdCursor,- type RestCursorPageInfo,-} from 'src/engine/api/rest/metadata/utils/paginate-by-id-cursor.util';+import { type RestCursorPageInfo } from 'src/engine/api/rest/metadata/types/rest-cursor-page-info.type';+import { paginateByIdCursor } from 'src/engine/api/rest/metadata/utils/paginate-by-id-cursor.util';import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';import { ApplicationRestApiExceptionFilter } from 'src/engine/core-modules/application/application-rest-api-exception.filter';import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';@@ -54,9 +49,8 @@ import {toLegacyFieldMetadataUpdateResponse,} from 'src/engine/metadata-modules/field-metadata/utils/to-legacy-field-metadata-response.util';import { FlatEntityMapsRestApiExceptionFilter } from 'src/engine/metadata-modules/flat-entity/filters/flat-entity-maps-rest-api-exception.filter';-import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';import { fromFlatFieldMetadataToFieldMetadataDto } from 'src/engine/metadata-modules/flat-field-metadata/utils/from-flat-field-metadata-to-field-metadata-dto.util';-import { computeUniqueFieldMetadataIdsFromFlatIndexMaps } from 'src/engine/metadata-modules/index-metadata/utils/compute-unique-field-metadata-ids-from-flat-index-maps.util';+import { UniqueFieldMetadataIdsService } from 'src/engine/metadata-modules/index-metadata/services/unique-field-metadata-ids.service';import { PermissionsRestApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-rest-api-exception.filter';@Controller(`${ApiPath.Rest}/metadata/fields`)@@ -78,20 +72,9 @@ export class FieldMetadataController {private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,private readonly fieldMetadataService: FieldMetadataService,private readonly featureFlagService: FeatureFlagService,- private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,+ private readonly uniqueFieldMetadataIdsService: UniqueFieldMetadataIdsService,) {}- private async loadUniqueFieldMetadataIds(- workspaceId: string,- ): Promise<ReadonlySet<string>> {- const { flatIndexMaps } =- await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(- { workspaceId, flatMapsKeys: ['flatIndexMaps'] },- );-- return computeUniqueFieldMetadataIdsFromFlatIndexMaps(flatIndexMaps);- }-@Get()async findMany(@Req() request: AuthenticatedRequest,@@ -100,13 +83,11 @@ export class FieldMetadataController {const { items, pageInfo, totalCount } = await paginateByIdCursor({repository: this.fieldMetadataRepository,workspaceId,- limit: parseLimitRestRequest(request),- startingAfter: parseStartingAfterRestRequest(request),- endingBefore: parseEndingBeforeRestRequest(request),+ request,});const uniqueFieldMetadataIds =- await this.loadUniqueFieldMetadataIds(workspaceId);+ await this.uniqueFieldMetadataIdsService.getForWorkspace(workspaceId);const result: {data: FieldMetadataDTO[];@@ -142,7 +123,7 @@ export class FieldMetadataController {}const uniqueFieldMetadataIds =- await this.loadUniqueFieldMetadataIds(workspaceId);+ await this.uniqueFieldMetadataIdsService.getForWorkspace(workspaceId);const result = fromFieldMetadataEntityToFieldMetadataDto(field,uniqueFieldMetadataIds,diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/field-filter.input.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/field-filter.input.tsnew file mode 100644index 00000000000..21f25e37d7e--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/field-filter.input.ts@@ -0,0 +1,51 @@+import { Field, InputType } from '@nestjs/graphql';++import { BooleanFieldComparisonInput } from 'src/engine/metadata-modules/pagination/dtos/boolean-field-comparison.input';+import { type MetadataFilterColumn } from 'src/engine/metadata-modules/pagination/utils/apply-metadata-filter-to-query-builder.util';+import { UUIDFilterComparisonInput } from 'src/engine/metadata-modules/pagination/dtos/uuid-filter-comparison.input';++@InputType('FieldFilter')+export class FieldFilterInput {+ @Field(() => [FieldFilterInput], { nullable: true })+ and?: FieldFilterInput[];++ @Field(() => [FieldFilterInput], { nullable: true })+ or?: FieldFilterInput[];++ @Field(() => UUIDFilterComparisonInput, { nullable: true })+ id?: UUIDFilterComparisonInput;++ @Field(() => BooleanFieldComparisonInput, { nullable: true })+ isActive?: BooleanFieldComparisonInput;++ @Field(() => BooleanFieldComparisonInput, { nullable: true })+ isSystem?: BooleanFieldComparisonInput;++ @Field(() => BooleanFieldComparisonInput, { nullable: true })+ isUIEditable?: BooleanFieldComparisonInput;++ @Field(() => BooleanFieldComparisonInput, { nullable: true })+ isUIReadOnly?: BooleanFieldComparisonInput;++ @Field(() => UUIDFilterComparisonInput, { nullable: true })+ objectMetadataId?: UUIDFilterComparisonInput;+}++export const FIELD_FILTER_COLUMN_BY_FILTER_FIELD: Record<+ string,+ MetadataFilterColumn+> = {+ id: { column: 'id', type: 'uuid' },+ isActive: { column: 'isActive', type: 'boolean' },+ isSystem: { column: 'isSystem', type: 'boolean' },+ isUIEditable: { column: 'isUIEditable', type: 'boolean' },+ // The legacy isUIReadOnly column is no longer written since the 2.13+ // rename, so the deprecated filter runs inverted against isUIEditable,+ // consistent with how the field itself is resolved.+ isUIReadOnly: {+ column: 'isUIEditable',+ type: 'boolean',+ invertBooleanValues: true,+ },+ objectMetadataId: { column: 'objectMetadataId', type: 'uuid' },+};diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/field-metadata-connection.dto.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/field-metadata-connection.dto.tsnew file mode 100644index 00000000000..baba5fb1581--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/field-metadata-connection.dto.ts@@ -0,0 +1,16 @@+import { FieldMetadataDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto';+import {+ createCursorConnectionType,+ createCursorEdgeType,+} from 'src/engine/metadata-modules/pagination/dtos/cursor-connection-type.factory';++export const FieldEdgeDTO = createCursorEdgeType(+ FieldMetadataDTO,+ 'Field',+ 'FieldEdge',+);++export const FieldConnectionDTO = createCursorConnectionType(+ FieldEdgeDTO,+ 'FieldConnection',+);diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto.tsindex f970d2ecd59..d319367ac9e 100644--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto.ts+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto.ts@@ -5,13 +5,6 @@ import {registerEnumType,} from '@nestjs/graphql';-import {- Authorize,- FilterableField,- IDField,- QueryOptions,- Relation,-} from '@ptc-org/nestjs-query-graphql';import { Transform } from 'class-transformer';import {IsBoolean,@@ -34,7 +27,6 @@ import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/import { IsValidMetadataName } from 'src/engine/decorators/metadata/is-valid-metadata-name.decorator';import { type FieldMetadataOverrides } from 'src/engine/metadata-modules/field-metadata/types/field-metadata-overrides.type';import { type FieldMetadataDefaultOption } from 'src/engine/metadata-modules/field-metadata/dtos/options.input';-import { ObjectMetadataDTO } from 'src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto';import { transformEnumValue } from 'src/engine/utils/transform-enum-value';registerEnumType(FieldMetadataType, {@@ -43,25 +35,11 @@ registerEnumType(FieldMetadataType, {});@ObjectType('Field')-@Authorize({- // oxlint-disable-next-line typescript/no-explicit-any- authorize: (context: any) => ({- workspaceId: { eq: context?.req?.workspace?.id },- }),-})-@QueryOptions({- defaultResultSize: 10,- disableSort: true,- maxResultsSize: 1000,-})-@Relation('object', () => ObjectMetadataDTO, {- nullable: true,-})// TODO refactor nullable fields to be typed as nullable and not optionalexport class FieldMetadataDTO<T extends FieldMetadataType = FieldMetadataType> {@IsUUID()@IsNotEmpty()- @IDField(() => UUIDScalarType)+ @Field(() => UUIDScalarType)id: string;@IsNotEmpty()@@ -99,25 +77,24 @@ export class FieldMetadataDTO<T extends FieldMetadataType = FieldMetadataType> {@IsBoolean()@IsOptional()- @FilterableField({ nullable: true })+ @Field({ nullable: true })isActive?: boolean;@IsBoolean()@IsOptional()- @FilterableField({ nullable: true })+ @Field({ nullable: true })isSystem?: boolean;@IsBoolean()@IsOptional()- @FilterableField({ nullable: true })+ @Field({ nullable: true })isUIEditable?: boolean;- // Deprecated alias kept for one release: stays filterable so the GraphQL- // input types (CreateFieldInput, UpdateFieldInput, FieldFilter) keep their- // isUIReadOnly member and external API consumers are not broken.+ // Deprecated alias kept for one release: stays exposed (and filterable via+ // FieldFilter) so external API consumers are not broken.@IsBoolean()@IsOptional()- @FilterableField({+ @Field({nullable: true,deprecationReason: 'Use isUIEditable',})@@ -151,7 +128,7 @@ export class FieldMetadataDTO<T extends FieldMetadataType = FieldMetadataType> {@HideField()workspaceId: string;- @FilterableField(() => UUIDScalarType)+ @Field(() => UUIDScalarType)objectMetadataId: string;@IsBoolean()diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.module.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.module.tsindex 0d50f5b2ac8..20bce3c1e3d 100644--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.module.ts@@ -1,11 +1,5 @@import { Module } from '@nestjs/common';--import { SortDirection } from '@ptc-org/nestjs-query-core';-import {- NestjsQueryGraphQLModule,- PagingStrategies,-} from '@ptc-org/nestjs-query-graphql';-import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';+import { TypeOrmModule } from '@nestjs/typeorm';import { TypeORMModule } from 'src/database/typeorm/typeorm.module';import { ActorModule } from 'src/engine/core-modules/actor/actor.module';@@ -13,11 +7,8 @@ import { ApplicationModule } from 'src/engine/core-modules/application/applicatiimport { ApplicationTranslationModule } from 'src/engine/core-modules/application/application-translation/application-translation.module';import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';import { FieldMetadataController } from 'src/engine/metadata-modules/field-metadata/controllers/field-metadata.controller';-import { FieldMetadataDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto';import { FieldMetadataResolver } from 'src/engine/metadata-modules/field-metadata/field-metadata.resolver';-import { FieldMetadataGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/field-metadata/interceptors/field-metadata-graphql-api-exception.interceptor';import { FieldMetadataService } from 'src/engine/metadata-modules/field-metadata/services/field-metadata.service';import { FieldMetadataToolsFactory } from 'src/engine/metadata-modules/field-metadata/tools/field-metadata-tools.factory';import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';@@ -36,64 +27,27 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cacheimport { FieldMetadataEntity } from './field-metadata.entity';-import { CreateFieldInput } from './dtos/create-field.input';-import { UpdateFieldInput } from './dtos/update-field.input';-@Module({imports: [+ TypeOrmModule.forFeature([FieldMetadataEntity, ObjectMetadataEntity]),ApplicationModule,ApplicationTranslationModule,TokenModule,WorkspaceCacheStorageModule,FeatureFlagModule,WorkspaceManyOrAllFlatEntityMapsCacheModule,- NestjsQueryGraphQLModule.forFeature({- imports: [- NestjsQueryTypeOrmModule.forFeature([- FieldMetadataEntity,- ObjectMetadataEntity,- ]),- WorkspaceCacheStorageModule,- ObjectMetadataModule,- TypeORMModule,- ActorModule,- ApplicationModule,- FeatureFlagModule,- ViewModule,- ViewFieldModule,- ViewFilterModule,- ViewGroupModule,- PermissionsModule,- WorkspaceMigrationModule,- FlatFieldMetadataModule,- IndexMetadataModule,- WorkspaceManyOrAllFlatEntityMapsCacheModule,- WorkspaceCacheModule,- ],- services: [FieldMetadataService],- resolvers: [- {- EntityClass: FieldMetadataEntity,- DTOClass: FieldMetadataDTO,- CreateDTOClass: CreateFieldInput,- UpdateDTOClass: UpdateFieldInput,- ServiceClass: FieldMetadataService,- pagingStrategy: PagingStrategies.CURSOR,- read: {- defaultSort: [{ field: 'id', direction: SortDirection.DESC }],- },- create: {- disabled: true,- },- update: {- disabled: true,- },- delete: { disabled: true },- guards: [WorkspaceAuthGuard],- interceptors: [FieldMetadataGraphqlApiExceptionInterceptor],- },- ],- }),+ ObjectMetadataModule,+ TypeORMModule,+ ActorModule,+ ViewModule,+ ViewFieldModule,+ ViewFilterModule,+ ViewGroupModule,+ PermissionsModule,+ WorkspaceMigrationModule,+ FlatFieldMetadataModule,+ IndexMetadataModule,+ WorkspaceCacheModule,],controllers: [FieldMetadataController],providers: [diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.resolver.tsindex a0778794a2c..e503ffed686 100644--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.resolver.ts@@ -1,28 +1,55 @@import { UseFilters, UseGuards, UsePipes } from '@nestjs/common';-import { Args, Context, Mutation, Parent, ResolveField } from '@nestjs/graphql';+import {+ Args,+ Context,+ Mutation,+ Parent,+ Query,+ ResolveField,+} from '@nestjs/graphql';+import { InjectRepository } from '@nestjs/typeorm';import { PermissionFlagType } from 'twenty-shared/constants';import { isDefined } from 'twenty-shared/utils';+import { Repository } from 'typeorm';import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';-import { ForbiddenError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';+import {+ ForbiddenError,+ NotFoundError,+} from 'src/engine/core-modules/graphql/utils/graphql-errors.util';import { I18nService } from 'src/engine/core-modules/i18n/i18n.service';import { I18nContext } from 'src/engine/core-modules/i18n/types/i18n-context.type';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';+import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';import { CreateOneFieldMetadataInput } from 'src/engine/metadata-modules/field-metadata/dtos/create-field.input';import { DeleteOneFieldInput } from 'src/engine/metadata-modules/field-metadata/dtos/delete-field.input';+import {+ FIELD_FILTER_COLUMN_BY_FILTER_FIELD,+ FieldFilterInput,+} from 'src/engine/metadata-modules/field-metadata/dtos/field-filter.input';import { FieldMetadataDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto';+import { FieldConnectionDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-metadata-connection.dto';import { RelationDTO } from 'src/engine/metadata-modules/field-metadata/dtos/relation.dto';import { UpdateOneFieldMetadataInput } from 'src/engine/metadata-modules/field-metadata/dtos/update-field.input';+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';import { FieldMetadataService } from 'src/engine/metadata-modules/field-metadata/services/field-metadata.service';+import { fromFieldMetadataEntityToFieldMetadataDto } from 'src/engine/metadata-modules/field-metadata/utils/from-field-metadata-entity-to-field-metadata-dto.util';+import { ObjectMetadataDTO } from 'src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto';+import { CursorPagingInput } from 'src/engine/metadata-modules/pagination/dtos/cursor-paging.input';+import { type CursorConnection } from 'src/engine/metadata-modules/pagination/dtos/cursor-connection-type.factory';+import { applyMetadataFilterToQueryBuilder } from 'src/engine/metadata-modules/pagination/utils/apply-metadata-filter-to-query-builder.util';+import { findManyWithCursorPagination } from 'src/engine/metadata-modules/pagination/utils/find-many-with-cursor-pagination.util';import { fieldMetadataGraphqlApiExceptionHandler } from 'src/engine/metadata-modules/field-metadata/utils/field-metadata-graphql-api-exception-handler.util';import { fromFlatFieldMetadataToFieldMetadataDto } from 'src/engine/metadata-modules/flat-field-metadata/utils/from-flat-field-metadata-to-field-metadata-dto.util';+import { UniqueFieldMetadataIdsService } from 'src/engine/metadata-modules/index-metadata/services/unique-field-metadata-ids.service';import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/utils/resolve-effective-entity-property.util';import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';@@ -44,8 +71,101 @@ export class FieldMetadataResolver {constructor(private readonly fieldMetadataService: FieldMetadataService,private readonly i18nService: I18nService,+ @InjectRepository(FieldMetadataEntity)+ private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,+ private readonly uniqueFieldMetadataIdsService: UniqueFieldMetadataIdsService,) {}+ @UseGuards(NoPermissionGuard)+ @Query(() => FieldConnectionDTO)+ async fields(+ @AuthWorkspace() { id: workspaceId }: WorkspaceEntity,+ @Args('paging', {+ type: () => CursorPagingInput,+ defaultValue: { first: 10 },+ description: 'Limit or page results.',+ })+ paging: CursorPagingInput,+ @Args('filter', {+ type: () => FieldFilterInput,+ defaultValue: {},+ description: 'Specify to filter the records returned.',+ })+ filter: FieldFilterInput,+ ): Promise<CursorConnection<FieldMetadataDTO>> {+ const queryBuilder = this.fieldMetadataRepository+ .createQueryBuilder('fieldMetadata')+ .where('"fieldMetadata"."workspaceId" = :workspaceId', { workspaceId });++ applyMetadataFilterToQueryBuilder({+ whereBuilder: queryBuilder,+ alias: 'fieldMetadata',+ filter,+ columnByFilterField: FIELD_FILTER_COLUMN_BY_FILTER_FIELD,+ });++ const connection = await findManyWithCursorPagination({+ queryBuilder,+ alias: 'fieldMetadata',+ paging,+ });+ const uniqueFieldMetadataIds =+ await this.uniqueFieldMetadataIdsService.getForWorkspace(workspaceId);++ return {+ ...connection,+ edges: connection.edges.map((edge) => ({+ ...edge,+ node: fromFieldMetadataEntityToFieldMetadataDto(+ edge.node,+ uniqueFieldMetadataIds,+ ),+ })),+ };+ }++ @UseGuards(NoPermissionGuard)+ @Query(() => FieldMetadataDTO)+ async field(+ @Args('id', {+ type: () => UUIDScalarType,+ description: 'The id of the record to find.',+ })+ id: string,+ @AuthWorkspace() { id: workspaceId }: WorkspaceEntity,+ ): Promise<FieldMetadataDTO> {+ const fieldMetadata = await this.fieldMetadataRepository.findOne({+ where: { id, workspaceId },+ });++ if (!isDefined(fieldMetadata)) {+ throw new NotFoundError(+ `Unable to find FieldMetadataEntity with id: ${id}`,+ );+ }++ const uniqueFieldMetadataIds =+ await this.uniqueFieldMetadataIdsService.getForWorkspace(workspaceId);++ return fromFieldMetadataEntityToFieldMetadataDto(+ fieldMetadata,+ uniqueFieldMetadataIds,+ );+ }++ @ResolveField(() => ObjectMetadataDTO, { nullable: true })+ async object(+ @AuthWorkspace() workspace: WorkspaceEntity,+ @Parent()+ { objectMetadataId }: Pick<FieldMetadataDTO, 'objectMetadataId'>,+ @Context() context: { loaders: IDataloaders },+ ): Promise<ObjectMetadataDTO | null> {+ return context.loaders.objectMetadataLoader.load({+ workspaceId: workspace.id,+ objectMetadataId,+ });+ }+@ResolveField(() => Boolean, {nullable: true,deprecationReason: 'Use isUIEditable',diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/interceptors/field-metadata-graphql-api-exception.interceptor.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interceptors/field-metadata-graphql-api-exception.interceptor.tsdeleted file mode 100644index c24e85eb472..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/interceptors/field-metadata-graphql-api-exception.interceptor.ts+++ /dev/null@@ -1,20 +0,0 @@-import {- type CallHandler,- type ExecutionContext,- Injectable,- type NestInterceptor,-} from '@nestjs/common';--import { type Observable, catchError } from 'rxjs';--import { fieldMetadataGraphqlApiExceptionHandler } from 'src/engine/metadata-modules/field-metadata/utils/field-metadata-graphql-api-exception-handler.util';--@Injectable()-export class FieldMetadataGraphqlApiExceptionInterceptor implements NestInterceptor {- // oxlint-disable-next-line typescript/no-explicit-any- intercept(_context: ExecutionContext, next: CallHandler): Observable<any> {- return next- .handle()- .pipe(catchError((err) => fieldMetadataGraphqlApiExceptionHandler(err)));- }-}diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata.service.tsindex 11925c8c255..dd2318f54e7 100644--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/services/field-metadata.service.ts@@ -1,7 +1,6 @@import { Injectable } from '@nestjs/common';import { InjectRepository } from '@nestjs/typeorm';-import { TypeOrmQueryService } from '@ptc-org/nestjs-query-typeorm';import { isDefined } from 'twenty-shared/utils';import { type FindOneOptions, type Repository } from 'typeorm';@@ -33,7 +32,7 @@ import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspaimport { UniversalFlatViewField } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-view-field.type';@Injectable()-export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntity> {+export class FieldMetadataService {constructor(@InjectRepository(FieldMetadataEntity)private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,@@ -41,8 +40,27 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntitprivate readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,private readonly applicationService: ApplicationService,private readonly workspaceCacheService: WorkspaceCacheService,- ) {- super(fieldMetadataRepository);+ ) {}++ async findManyWithinWorkspace({+ workspaceId,+ fieldMetadataId,+ objectMetadataId,+ limit,+ }: {+ workspaceId: string;+ fieldMetadataId?: string;+ objectMetadataId?: string;+ limit: number;+ }): Promise<FieldMetadataEntity[]> {+ return this.fieldMetadataRepository.find({+ where: {+ workspaceId,+ ...(isDefined(fieldMetadataId) ? { id: fieldMetadataId } : {}),+ ...(isDefined(objectMetadataId) ? { objectMetadataId } : {}),+ },+ take: limit,+ });}async createOneField({diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/tools/field-metadata-tools.factory.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/tools/field-metadata-tools.factory.tsindex dcda6502e6e..c275be19be4 100644--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/tools/field-metadata-tools.factory.ts+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/tools/field-metadata-tools.factory.ts@@ -227,18 +227,13 @@ export class FieldMetadataToolsFactory {): undefined);- const rawResults = await this.fieldMetadataService.query({- filter: {- workspaceId: { eq: workspaceId },- ...(parameters.id ? { id: { eq: parameters.id } } : {}),- ...(isDefined(objectMetadataId)- ? {- objectMetadataId: { eq: objectMetadataId },- }- : {}),- },- paging: { limit: parameters.limit ?? 100 },- });+ const rawResults =+ await this.fieldMetadataService.findManyWithinWorkspace({+ workspaceId,+ fieldMetadataId: parameters.id,+ objectMetadataId,+ limit: parameters.limit ?? 100,+ });const compactedFields = (rawResults as unknown as Record<string, unknown>[]diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/field-metadata-graphql-api-exception-handler.util.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/field-metadata-graphql-api-exception-handler.util.tsindex 55b430050c2..0291d8c07c4 100644--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/field-metadata-graphql-api-exception-handler.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/field-metadata-graphql-api-exception-handler.util.ts@@ -14,7 +14,7 @@ import { InvalidMetadataException } from 'src/engine/metadata-modules/utils/exceimport { WorkspaceMigrationBuilderException } from 'src/engine/workspace-manager/workspace-migration/exceptions/workspace-migration-builder-exception';import { workspaceMigrationBuilderGraphqlApiExceptionHandler } from 'src/engine/workspace-manager/workspace-migration/interceptors/utils/workspace-migration-builder-graphql-api-exception-handler.util';-export const fieldMetadataGraphqlApiExceptionHandler = (error: Error) => {+export const fieldMetadataGraphqlApiExceptionHandler = (error: unknown) => {if (error instanceof WorkspaceMigrationBuilderException) {return workspaceMigrationBuilderGraphqlApiExceptionHandler(error);}diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/to-legacy-field-metadata-response.util.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/to-legacy-field-metadata-response.util.tsindex c0a2c3751c6..5f6c846f33e 100644--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/to-legacy-field-metadata-response.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/to-legacy-field-metadata-response.util.ts@@ -1,4 +1,4 @@-import { type RestCursorPageInfo } from 'src/engine/api/rest/metadata/utils/paginate-by-id-cursor.util';+import { type RestCursorPageInfo } from 'src/engine/api/rest/metadata/types/rest-cursor-page-info.type';import { type FieldMetadataDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto';export const toLegacyFieldMetadataListResponse = ({diff --git a/packages/twenty-server/src/engine/metadata-modules/index-metadata/dtos/index-field-metadata.dto.ts b/packages/twenty-server/src/engine/metadata-modules/index-metadata/dtos/index-field-metadata.dto.tsindex 681d7142bae..a92d487af97 100644--- a/packages/twenty-server/src/engine/metadata-modules/index-metadata/dtos/index-field-metadata.dto.ts+++ b/packages/twenty-server/src/engine/metadata-modules/index-metadata/dtos/index-field-metadata.dto.ts@@ -1,12 +1,5 @@import { Field, HideField, ObjectType } from '@nestjs/graphql';-import {- Authorize,- FilterableField,- IDField,- QueryOptions,- Relation,-} from '@ptc-org/nestjs-query-graphql';import {IsDateString,IsNotEmpty,@@ -17,39 +10,19 @@ import {} from 'class-validator';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';-import { FieldMetadataDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto';--import { IndexMetadataDTO } from './index-metadata.dto';@ObjectType('IndexField')-@Authorize({- // oxlint-disable-next-line typescript/no-explicit-any- authorize: (context: any) => ({- workspaceId: { eq: context?.req?.workspace?.id },- }),-})-@QueryOptions({- defaultResultSize: 10,- disableSort: true,- maxResultsSize: 1000,-})-@Relation('indexMetadata', () => IndexMetadataDTO, {- nullable: true,-})-@Relation('fieldMetadata', () => FieldMetadataDTO, {- nullable: true,-})export class IndexFieldMetadataDTO {@IsUUID()@IsNotEmpty()- @IDField(() => UUIDScalarType)+ @Field(() => UUIDScalarType)id: string;indexMetadataId: string;@IsUUID()@IsNotEmpty()- @FilterableField(() => UUIDScalarType)+ @Field(() => UUIDScalarType)fieldMetadataId: string;@IsNumber()diff --git a/packages/twenty-server/src/engine/metadata-modules/index-metadata/dtos/index-filter.input.ts b/packages/twenty-server/src/engine/metadata-modules/index-metadata/dtos/index-filter.input.tsnew file mode 100644index 00000000000..ba17657f7c5--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/index-metadata/dtos/index-filter.input.ts@@ -0,0 +1,28 @@+import { Field, InputType } from '@nestjs/graphql';++import { BooleanFieldComparisonInput } from 'src/engine/metadata-modules/pagination/dtos/boolean-field-comparison.input';+import { UUIDFilterComparisonInput } from 'src/engine/metadata-modules/pagination/dtos/uuid-filter-comparison.input';+import { type MetadataFilterColumn } from 'src/engine/metadata-modules/pagination/utils/apply-metadata-filter-to-query-builder.util';++@InputType('IndexFilter')+export class IndexFilterInput {+ @Field(() => [IndexFilterInput], { nullable: true })+ and?: IndexFilterInput[];++ @Field(() => [IndexFilterInput], { nullable: true })+ or?: IndexFilterInput[];++ @Field(() => UUIDFilterComparisonInput, { nullable: true })+ id?: UUIDFilterComparisonInput;++ @Field(() => BooleanFieldComparisonInput, { nullable: true })+ isCustom?: BooleanFieldComparisonInput;+}++export const INDEX_FILTER_COLUMN_BY_FILTER_FIELD: Record<+ string,+ MetadataFilterColumn+> = {+ id: { column: 'id', type: 'uuid' },+ isCustom: { column: 'isCustom', type: 'boolean' },+};diff --git a/packages/twenty-server/src/engine/metadata-modules/index-metadata/dtos/index-metadata-edge.dto.ts b/packages/twenty-server/src/engine/metadata-modules/index-metadata/dtos/index-metadata-edge.dto.tsnew file mode 100644index 00000000000..6c4677a367d--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/index-metadata/dtos/index-metadata-edge.dto.ts@@ -0,0 +1,8 @@+import { IndexMetadataDTO } from 'src/engine/metadata-modules/index-metadata/dtos/index-metadata.dto';+import { createCursorEdgeType } from 'src/engine/metadata-modules/pagination/dtos/cursor-connection-type.factory';++export const IndexEdgeDTO = createCursorEdgeType(+ IndexMetadataDTO,+ 'Index',+ 'IndexEdge',+);diff --git a/packages/twenty-server/src/engine/metadata-modules/index-metadata/dtos/index-metadata.dto.ts b/packages/twenty-server/src/engine/metadata-modules/index-metadata/dtos/index-metadata.dto.tsindex 2f621a2d212..13aa5d55555 100644--- a/packages/twenty-server/src/engine/metadata-modules/index-metadata/dtos/index-metadata.dto.ts+++ b/packages/twenty-server/src/engine/metadata-modules/index-metadata/dtos/index-metadata.dto.ts@@ -5,12 +5,6 @@ import {registerEnumType,} from '@nestjs/graphql';-import {- Authorize,- FilterableField,- IDField,- QueryOptions,-} from '@ptc-org/nestjs-query-graphql';import {IsBoolean,IsDate,@@ -30,24 +24,11 @@ registerEnumType(IndexType, {description: 'Type of the index',});-// TODO: drop these nestjs-query decorators once ObjectMetadataDTO's-// @CursorConnection('indexMetadatas') relation is migrated off nestjs-query.@ObjectType('Index')-@Authorize({- // oxlint-disable-next-line typescript/no-explicit-any- authorize: (context: any) => ({- workspaceId: { eq: context?.req?.workspace?.id },- }),-})-@QueryOptions({- defaultResultSize: 10,- disableSort: true,- maxResultsSize: 1000,-})export class IndexMetadataDTO {@IsUUID()@IsNotEmpty()- @IDField(() => UUIDScalarType)+ @Field(() => UUIDScalarType)id: string;@IsString()@@ -58,7 +39,7 @@ export class IndexMetadataDTO {@IsBoolean()@IsOptional()- @FilterableField({ nullable: true })+ @Field({ nullable: true })isCustom?: boolean;@IsBoolean()diff --git a/packages/twenty-server/src/engine/metadata-modules/index-metadata/index-metadata.module.ts b/packages/twenty-server/src/engine/metadata-modules/index-metadata/index-metadata.module.tsindex 465971cdd53..cc9528e6b2d 100644--- a/packages/twenty-server/src/engine/metadata-modules/index-metadata/index-metadata.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/index-metadata/index-metadata.module.ts@@ -6,6 +6,7 @@ import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadataimport { IndexMetadataEntity } from 'src/engine/metadata-modules/index-metadata/index-metadata.entity';import { IndexMetadataResolver } from 'src/engine/metadata-modules/index-metadata/index-metadata.resolver';import { IndexMetadataService } from 'src/engine/metadata-modules/index-metadata/services/index-metadata.service';+import { UniqueFieldMetadataIdsService } from 'src/engine/metadata-modules/index-metadata/services/unique-field-metadata-ids.service';import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';@@ -17,7 +18,11 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspaceWorkspaceMigrationModule,WorkspaceManyOrAllFlatEntityMapsCacheModule,],- providers: [IndexMetadataResolver, IndexMetadataService],- exports: [IndexMetadataService],+ providers: [+ IndexMetadataResolver,+ IndexMetadataService,+ UniqueFieldMetadataIdsService,+ ],+ exports: [IndexMetadataService, UniqueFieldMetadataIdsService],})export class IndexMetadataModule {}diff --git a/packages/twenty-server/src/engine/metadata-modules/index-metadata/services/unique-field-metadata-ids.service.ts b/packages/twenty-server/src/engine/metadata-modules/index-metadata/services/unique-field-metadata-ids.service.tsnew file mode 100644index 00000000000..cd1438bc621--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/index-metadata/services/unique-field-metadata-ids.service.ts@@ -0,0 +1,20 @@+import { Injectable } from '@nestjs/common';++import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';+import { computeUniqueFieldMetadataIdsFromFlatIndexMaps } from 'src/engine/metadata-modules/index-metadata/utils/compute-unique-field-metadata-ids-from-flat-index-maps.util';++@Injectable()+export class UniqueFieldMetadataIdsService {+ constructor(+ private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,+ ) {}++ async getForWorkspace(workspaceId: string): Promise<ReadonlySet<string>> {+ const { flatIndexMaps } =+ await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(+ { workspaceId, flatMapsKeys: ['flatIndexMaps'] },+ );++ return computeUniqueFieldMetadataIdsFromFlatIndexMaps(flatIndexMaps);+ }+}diff --git a/packages/twenty-server/src/engine/metadata-modules/logic-function/dtos/logic-function.dto.ts b/packages/twenty-server/src/engine/metadata-modules/logic-function/dtos/logic-function.dto.tsindex 9e8ec381df4..128aa057e0b 100644--- a/packages/twenty-server/src/engine/metadata-modules/logic-function/dtos/logic-function.dto.ts+++ b/packages/twenty-server/src/engine/metadata-modules/logic-function/dtos/logic-function.dto.ts@@ -5,11 +5,6 @@ import {registerEnumType,} from '@nestjs/graphql';-import {- Authorize,- IDField,- QueryOptions,-} from '@ptc-org/nestjs-query-graphql';import {IsDateString,IsEnum,@@ -37,20 +32,10 @@ registerEnumType(LogicFunctionExecutionMode, {});@ObjectType('LogicFunction')-@Authorize({- // oxlint-disable-next-line typescript/no-explicit-any- authorize: (context: any) => ({- workspaceId: { eq: context?.req?.workspace?.id },- }),-})-@QueryOptions({- defaultResultSize: 10,- maxResultsSize: 1000,-})export class LogicFunctionDTO {@IsUUID()@IsNotEmpty()- @IDField(() => UUIDScalarType)+ @Field(() => UUIDScalarType)id: string;@IsString()diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/controllers/object-metadata.controller.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/controllers/object-metadata.controller.tsindex a626a1db940..a326c7b6936 100644--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/controllers/object-metadata.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/controllers/object-metadata.controller.ts@@ -20,13 +20,8 @@ import { PermissionFlagType } from 'twenty-shared/constants';import { ApiPath, FeatureFlagKey } from 'twenty-shared/types';import { In, Repository } from 'typeorm';-import { parseEndingBeforeRestRequest } from 'src/engine/api/rest/input-request-parsers/ending-before-parser-utils/parse-ending-before-rest-request.util';-import { parseLimitRestRequest } from 'src/engine/api/rest/input-request-parsers/limit-parser-utils/parse-limit-rest-request.util';-import { parseStartingAfterRestRequest } from 'src/engine/api/rest/input-request-parsers/starting-after-parser-utils/parse-starting-after-rest-request.util';-import {- paginateByIdCursor,- type RestCursorPageInfo,-} from 'src/engine/api/rest/metadata/utils/paginate-by-id-cursor.util';+import { type RestCursorPageInfo } from 'src/engine/api/rest/metadata/types/rest-cursor-page-info.type';+import { paginateByIdCursor } from 'src/engine/api/rest/metadata/utils/paginate-by-id-cursor.util';import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';import { ApplicationRestApiExceptionFilter } from 'src/engine/core-modules/application/application-rest-api-exception.filter';import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';@@ -38,9 +33,8 @@ import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';import { fromFieldMetadataEntityToFieldMetadataDto } from 'src/engine/metadata-modules/field-metadata/utils/from-field-metadata-entity-to-field-metadata-dto.util';import { FlatEntityMapsRestApiExceptionFilter } from 'src/engine/metadata-modules/flat-entity/filters/flat-entity-maps-rest-api-exception.filter';-import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';import { fromFlatObjectMetadataToObjectMetadataDto } from 'src/engine/metadata-modules/flat-object-metadata/utils/from-flat-object-metadata-to-object-metadata-dto.util';-import { computeUniqueFieldMetadataIdsFromFlatIndexMaps } from 'src/engine/metadata-modules/index-metadata/utils/compute-unique-field-metadata-ids-from-flat-index-maps.util';+import { UniqueFieldMetadataIdsService } from 'src/engine/metadata-modules/index-metadata/services/unique-field-metadata-ids.service';import { CreateObjectInput } from 'src/engine/metadata-modules/object-metadata/dtos/create-object.input';import { type ObjectMetadataWithFieldsDTO } from 'src/engine/metadata-modules/object-metadata/dtos/object-metadata-with-fields.dto';import { UpdateObjectPayload } from 'src/engine/metadata-modules/object-metadata/dtos/update-object.input';@@ -82,20 +76,9 @@ export class ObjectMetadataController {private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,private readonly objectMetadataService: ObjectMetadataService,private readonly featureFlagService: FeatureFlagService,- private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,+ private readonly uniqueFieldMetadataIdsService: UniqueFieldMetadataIdsService,) {}- private async loadUniqueFieldMetadataIds(- workspaceId: string,- ): Promise<ReadonlySet<string>> {- const { flatIndexMaps } =- await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(- { workspaceId, flatMapsKeys: ['flatIndexMaps'] },- );-- return computeUniqueFieldMetadataIdsFromFlatIndexMaps(flatIndexMaps);- }-@Get()async findMany(@Req() request: AuthenticatedRequest,@@ -104,9 +87,7 @@ export class ObjectMetadataController {const { items, pageInfo, totalCount } = await paginateByIdCursor({repository: this.objectMetadataRepository,workspaceId,- limit: parseLimitRestRequest(request),- startingAfter: parseStartingAfterRestRequest(request),- endingBefore: parseEndingBeforeRestRequest(request),+ request,});const [fields, uniqueFieldMetadataIds] = await Promise.all([@@ -114,7 +95,7 @@ export class ObjectMetadataController {workspaceId,items.map((object) => object.id),),- this.loadUniqueFieldMetadataIds(workspaceId),+ this.uniqueFieldMetadataIdsService.getForWorkspace(workspaceId),]);const data = items.map((object) =>@@ -156,7 +137,7 @@ export class ObjectMetadataController {this.fieldMetadataRepository.find({where: { objectMetadataId: object.id, workspaceId },}),- this.loadUniqueFieldMetadataIds(workspaceId),+ this.uniqueFieldMetadataIdsService.getForWorkspace(workspaceId),]);const result = this.toObjectWithFieldsDto(@@ -184,7 +165,7 @@ export class ObjectMetadataController {this.fieldMetadataRepository.find({where: { objectMetadataId: flatObject.id, workspaceId },}),- this.loadUniqueFieldMetadataIds(workspaceId),+ this.uniqueFieldMetadataIdsService.getForWorkspace(workspaceId),]);const result: ObjectMetadataWithFieldsDTO = {@@ -255,7 +236,7 @@ export class ObjectMetadataController {this.fieldMetadataRepository.find({where: { objectMetadataId: flatObject.id, workspaceId },}),- this.loadUniqueFieldMetadataIds(workspaceId),+ this.uniqueFieldMetadataIdsService.getForWorkspace(workspaceId),]);const result: ObjectMetadataWithFieldsDTO = {diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/object-filter.input.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/object-filter.input.tsnew file mode 100644index 00000000000..3747f4bee23--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/object-filter.input.ts@@ -0,0 +1,59 @@+import { Field, InputType } from '@nestjs/graphql';++import { BooleanFieldComparisonInput } from 'src/engine/metadata-modules/pagination/dtos/boolean-field-comparison.input';+import { type MetadataFilterColumn } from 'src/engine/metadata-modules/pagination/utils/apply-metadata-filter-to-query-builder.util';+import { UUIDFilterComparisonInput } from 'src/engine/metadata-modules/pagination/dtos/uuid-filter-comparison.input';++@InputType('ObjectFilter')+export class ObjectFilterInput {+ @Field(() => [ObjectFilterInput], { nullable: true })+ and?: ObjectFilterInput[];++ @Field(() => [ObjectFilterInput], { nullable: true })+ or?: ObjectFilterInput[];++ @Field(() => UUIDFilterComparisonInput, { nullable: true })+ id?: UUIDFilterComparisonInput;++ @Field(() => BooleanFieldComparisonInput, { nullable: true })+ isActive?: BooleanFieldComparisonInput;++ @Field(() => BooleanFieldComparisonInput, { nullable: true })+ isRemote?: BooleanFieldComparisonInput;++ @Field(() => BooleanFieldComparisonInput, { nullable: true })+ isSearchable?: BooleanFieldComparisonInput;++ @Field(() => BooleanFieldComparisonInput, { nullable: true })+ isSystem?: BooleanFieldComparisonInput;++ @Field(() => BooleanFieldComparisonInput, { nullable: true })+ isUICreatable?: BooleanFieldComparisonInput;++ @Field(() => BooleanFieldComparisonInput, { nullable: true })+ isUIEditable?: BooleanFieldComparisonInput;++ @Field(() => BooleanFieldComparisonInput, { nullable: true })+ isUIReadOnly?: BooleanFieldComparisonInput;+}++export const OBJECT_FILTER_COLUMN_BY_FILTER_FIELD: Record<+ string,+ MetadataFilterColumn+> = {+ id: { column: 'id', type: 'uuid' },+ isActive: { column: 'isActive', type: 'boolean' },+ isRemote: { column: 'isRemote', type: 'boolean' },+ isSearchable: { column: 'isSearchable', type: 'boolean' },+ isSystem: { column: 'isSystem', type: 'boolean' },+ isUICreatable: { column: 'isUICreatable', type: 'boolean' },+ isUIEditable: { column: 'isUIEditable', type: 'boolean' },+ // The legacy isUIReadOnly column is no longer written since the 2.13+ // rename, so the deprecated filter runs inverted against isUIEditable,+ // consistent with how the field itself is resolved.+ isUIReadOnly: {+ column: 'isUIEditable',+ type: 'boolean',+ invertBooleanValues: true,+ },+};diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/object-metadata-connection.dto.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/object-metadata-connection.dto.tsnew file mode 100644index 00000000000..c91a43c555a--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/object-metadata-connection.dto.ts@@ -0,0 +1,28 @@+import { FieldEdgeDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-metadata-connection.dto';+import { IndexEdgeDTO } from 'src/engine/metadata-modules/index-metadata/dtos/index-metadata-edge.dto';+import { ObjectMetadataDTO } from 'src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto';+import {+ createCursorConnectionType,+ createCursorEdgeType,+} from 'src/engine/metadata-modules/pagination/dtos/cursor-connection-type.factory';++export const ObjectEdgeDTO = createCursorEdgeType(+ ObjectMetadataDTO,+ 'Object',+ 'ObjectEdge',+);++export const ObjectConnectionDTO = createCursorConnectionType(+ ObjectEdgeDTO,+ 'ObjectConnection',+);++export const ObjectFieldsConnectionDTO = createCursorConnectionType(+ FieldEdgeDTO,+ 'ObjectFieldsConnection',+);++export const ObjectIndexMetadatasConnectionDTO = createCursorConnectionType(+ IndexEdgeDTO,+ 'ObjectIndexMetadatasConnection',+);diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto.tsindex 67b0e089a2e..182f2d50b4e 100644--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto.ts+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto.ts@@ -7,38 +7,15 @@ import {import { ObjectOpenRecordIn } from 'twenty-shared/types';-import {- Authorize,- CursorConnection,- FilterableField,- IDField,- QueryOptions,-} from '@ptc-org/nestjs-query-graphql';-import { type WorkspaceEntityDuplicateCriteria } from 'src/engine/api/graphql/workspace-query-builder/types/workspace-entity-duplicate-criteria.type';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';-import { FieldMetadataDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto';-import { IndexMetadataDTO } from 'src/engine/metadata-modules/index-metadata/dtos/index-metadata.dto';import { type ObjectMetadataOverrides } from 'src/engine/metadata-modules/object-metadata/types/object-metadata-overrides.type';registerEnumType(ObjectOpenRecordIn, { name: 'ObjectOpenRecordIn' });@ObjectType('Object')-@Authorize({- // oxlint-disable-next-line typescript/no-explicit-any- authorize: (context: any) => ({- workspaceId: { eq: context?.req?.workspace?.id },- }),-})-@QueryOptions({- defaultResultSize: 10,- disableSort: true,- maxResultsSize: 1000,-})-@CursorConnection('fields', () => FieldMetadataDTO)-@CursorConnection('indexMetadatas', () => IndexMetadataDTO)export class ObjectMetadataDTO {- @IDField(() => UUIDScalarType)+ @Field(() => UUIDScalarType)id: string;@Field()@@ -71,29 +48,29 @@ export class ObjectMetadataDTO {@Field({ nullable: true })color?: string;- @FilterableField()+ @Field()isRemote: boolean;- @FilterableField()+ @Field()isActive: boolean;- @FilterableField()+ @Field()isSystem: boolean;- @FilterableField()+ @Field()isUIEditable: boolean;- @FilterableField()+ @Field()isUICreatable: boolean;- // Deprecated alias kept for one release: stays filterable so ObjectFilter- // keeps its isUIReadOnly member and external API consumers are not broken.- @FilterableField({+ // Deprecated alias kept for one release: stays exposed (and filterable via+ // ObjectFilter) so external API consumers are not broken.+ @Field({deprecationReason: 'Use isUIEditable',})isUIReadOnly: boolean;- @FilterableField()+ @Field()isSearchable: boolean;@Field(() => ObjectOpenRecordIn)diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/interceptors/object-metadata-graphql-api-exception.interceptor.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/interceptors/object-metadata-graphql-api-exception.interceptor.tsdeleted file mode 100644index 258b18f3885..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/interceptors/object-metadata-graphql-api-exception.interceptor.ts+++ /dev/null@@ -1,20 +0,0 @@-import {- type CallHandler,- type ExecutionContext,- Injectable,- type NestInterceptor,-} from '@nestjs/common';--import { type Observable, catchError } from 'rxjs';--import { objectMetadataGraphqlApiExceptionHandler } from 'src/engine/metadata-modules/object-metadata/utils/object-metadata-graphql-api-exception-handler.util';--@Injectable()-export class ObjectMetadataGraphqlApiExceptionInterceptor implements NestInterceptor {- // oxlint-disable-next-line typescript/no-explicit-any- intercept(_context: ExecutionContext, next: CallHandler): Observable<any> {- return next- .handle()- .pipe(catchError((err) => objectMetadataGraphqlApiExceptionHandler(err)));- }-}diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.module.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.module.tsindex 77a588aa507..ee856ec8e3c 100644--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.module.ts+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.module.ts@@ -1,29 +1,16 @@import { Module } from '@nestjs/common';import { TypeOrmModule } from '@nestjs/typeorm';-import { SortDirection } from '@ptc-org/nestjs-query-core';-import {- NestjsQueryGraphQLModule,- PagingStrategies,-} from '@ptc-org/nestjs-query-graphql';-import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';-import { TypeORMModule } from 'src/database/typeorm/typeorm.module';import { ApplicationTranslationModule } from 'src/engine/core-modules/application/application-translation/application-translation.module';import { ApplicationModule } from 'src/engine/core-modules/application/application.module';import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';-import { FlatFieldMetadataTypeValidatorService } from 'src/engine/metadata-modules/flat-field-metadata/services/flat-field-metadata-type-validator.service';import { IndexMetadataModule } from 'src/engine/metadata-modules/index-metadata/index-metadata.module';import { ObjectMetadataController } from 'src/engine/metadata-modules/object-metadata/controllers/object-metadata.controller';-import { CreateObjectInput } from 'src/engine/metadata-modules/object-metadata/dtos/create-object.input';-import { ObjectMetadataDTO } from 'src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto';-import { UpdateObjectPayload } from 'src/engine/metadata-modules/object-metadata/dtos/update-object.input';-import { ObjectMetadataGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/object-metadata/interceptors/object-metadata-graphql-api-exception.interceptor';import { MostlyEmptyFieldsService } from 'src/engine/metadata-modules/object-metadata/mostly-empty-fields.service';import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';import { ObjectMetadataResolver } from 'src/engine/metadata-modules/object-metadata/object-metadata.resolver';@@ -31,71 +18,36 @@ import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadaimport { ObjectRecordCountService } from 'src/engine/metadata-modules/object-metadata/object-record-count.service';import { ObjectMetadataToolsFactory } from 'src/engine/metadata-modules/object-metadata/tools/object-metadata-tools.factory';import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';-import { PermissionsGraphqlApiExceptionFilter } from 'src/engine/metadata-modules/permissions/utils/permissions-graphql-api-exception.filter';import { ViewFieldModule } from 'src/engine/metadata-modules/view-field/view-field.module';import { ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';import { ViewModule } from 'src/engine/metadata-modules/view/view.module';import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';-import { FlatFieldMetadataValidatorService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-field-metadata-validator.service';import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';@Module({imports: [+ TypeOrmModule.forFeature([+ ObjectMetadataEntity,+ FieldMetadataEntity,+ FeatureFlagEntity,+ ViewEntity,+ ]),TokenModule,WorkspaceCacheStorageModule,FeatureFlagModule,ApplicationModule,ApplicationTranslationModule,WorkspaceManyOrAllFlatEntityMapsCacheModule,- NestjsQueryGraphQLModule.forFeature({- imports: [- TypeORMModule,- NestjsQueryTypeOrmModule.forFeature([- ObjectMetadataEntity,- FieldMetadataEntity,- ]),- TypeOrmModule.forFeature([FeatureFlagEntity, ViewEntity]),- ApplicationModule,- IndexMetadataModule,- PermissionsModule,- WorkspaceCacheStorageModule,- WorkspaceDataSourceModule,- FeatureFlagModule,- WorkspaceMigrationModule,- ViewModule,- ViewFieldModule,- WorkspaceManyOrAllFlatEntityMapsCacheModule,- WorkspaceCacheModule,- ],- services: [- ObjectMetadataService,- FlatFieldMetadataValidatorService,- FlatFieldMetadataTypeValidatorService,- ],- resolvers: [- {- EntityClass: ObjectMetadataEntity,- DTOClass: ObjectMetadataDTO,- CreateDTOClass: CreateObjectInput,- UpdateDTOClass: UpdateObjectPayload,- ServiceClass: ObjectMetadataService,- pagingStrategy: PagingStrategies.CURSOR,- read: {- defaultSort: [{ field: 'id', direction: SortDirection.DESC }],- },- create: {- disabled: true,- },- update: { disabled: true },- delete: { disabled: true },- guards: [WorkspaceAuthGuard],- interceptors: [ObjectMetadataGraphqlApiExceptionInterceptor],- filters: [PermissionsGraphqlApiExceptionFilter],- },- ],- }),+ TypeORMModule,+ IndexMetadataModule,+ PermissionsModule,+ WorkspaceDataSourceModule,+ WorkspaceMigrationModule,+ ViewModule,+ ViewFieldModule,+ WorkspaceCacheModule,],controllers: [ObjectMetadataController],providers: [diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.resolver.tsindex abdae6b5246..3ce9b8c85ad 100644--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.resolver.ts@@ -7,10 +7,15 @@ import {Query,ResolveField,} from '@nestjs/graphql';+import { InjectRepository } from '@nestjs/typeorm';import { PermissionFlagType } from 'twenty-shared/constants';+import { isDefined } from 'twenty-shared/utils';+import { Repository } from 'typeorm';+import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';+import { NotFoundError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';import { PreventNestToAutoLogGraphqlErrorsFilter } from 'src/engine/core-modules/graphql/filters/prevent-nest-to-auto-log-graphql-errors.filter';import { ResolverValidationPipe } from 'src/engine/core-modules/graphql/pipes/resolver-validation.pipe';import { I18nService } from 'src/engine/core-modules/i18n/i18n.service';@@ -18,16 +23,33 @@ import { I18nContext } from 'src/engine/core-modules/i18n/types/i18n-context.typimport { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';+import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';import { FieldMetadataDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto';+import { FieldFilterInput } from 'src/engine/metadata-modules/field-metadata/dtos/field-filter.input';import { fromFlatObjectMetadataToObjectMetadataDto } from 'src/engine/metadata-modules/flat-object-metadata/utils/from-flat-object-metadata-to-object-metadata-dto.util';import { IndexMetadataDTO } from 'src/engine/metadata-modules/index-metadata/dtos/index-metadata.dto';+import { IndexFilterInput } from 'src/engine/metadata-modules/index-metadata/dtos/index-filter.input';import { CreateOneObjectInput } from 'src/engine/metadata-modules/object-metadata/dtos/create-object.input';import { DeleteOneObjectInput } from 'src/engine/metadata-modules/object-metadata/dtos/delete-object.input';import { ObjectMetadataDTO } from 'src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto';+import {+ ObjectConnectionDTO,+ ObjectFieldsConnectionDTO,+ ObjectIndexMetadatasConnectionDTO,+} from 'src/engine/metadata-modules/object-metadata/dtos/object-metadata-connection.dto';+import {+ OBJECT_FILTER_COLUMN_BY_FILTER_FIELD,+ ObjectFilterInput,+} from 'src/engine/metadata-modules/object-metadata/dtos/object-filter.input';+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';import { ObjectRecordCountDTO } from 'src/engine/metadata-modules/object-metadata/dtos/object-record-count.dto';import { UpdateOneObjectInput } from 'src/engine/metadata-modules/object-metadata/dtos/update-object.input';+import { CursorPagingInput } from 'src/engine/metadata-modules/pagination/dtos/cursor-paging.input';+import { type CursorConnection } from 'src/engine/metadata-modules/pagination/dtos/cursor-connection-type.factory';+import { applyMetadataFilterToQueryBuilder } from 'src/engine/metadata-modules/pagination/utils/apply-metadata-filter-to-query-builder.util';+import { findManyWithCursorPagination } from 'src/engine/metadata-modules/pagination/utils/find-many-with-cursor-pagination.util';import { getEffectiveImageIdentifierFieldMetadataId } from 'src/engine/metadata-modules/object-metadata/utils/get-effective-image-identifier-field-metadata-id.util';import { MostlyEmptyFieldsService } from 'src/engine/metadata-modules/object-metadata/mostly-empty-fields.service';import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';@@ -50,8 +72,121 @@ export class ObjectMetadataResolver {private readonly objectRecordCountService: ObjectRecordCountService,private readonly mostlyEmptyFieldsService: MostlyEmptyFieldsService,private readonly i18nService: I18nService,+ @InjectRepository(ObjectMetadataEntity)+ private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,) {}+ @UseGuards(NoPermissionGuard)+ @Query(() => ObjectConnectionDTO)+ async objects(+ @AuthWorkspace() { id: workspaceId }: WorkspaceEntity,+ @Args('paging', {+ type: () => CursorPagingInput,+ defaultValue: { first: 10 },+ description: 'Limit or page results.',+ })+ paging: CursorPagingInput,+ @Args('filter', {+ type: () => ObjectFilterInput,+ defaultValue: {},+ description: 'Specify to filter the records returned.',+ })+ filter: ObjectFilterInput,+ ): Promise<CursorConnection<ObjectMetadataEntity>> {+ const queryBuilder = this.objectMetadataRepository+ .createQueryBuilder('objectMetadata')+ .where('"objectMetadata"."workspaceId" = :workspaceId', { workspaceId });++ applyMetadataFilterToQueryBuilder({+ whereBuilder: queryBuilder,+ alias: 'objectMetadata',+ filter,+ columnByFilterField: OBJECT_FILTER_COLUMN_BY_FILTER_FIELD,+ });++ return findManyWithCursorPagination({+ queryBuilder,+ alias: 'objectMetadata',+ paging,+ });+ }++ @UseGuards(NoPermissionGuard)+ @Query(() => ObjectMetadataDTO)+ async object(+ @Args('id', {+ type: () => UUIDScalarType,+ description: 'The id of the record to find.',+ })+ id: string,+ @AuthWorkspace() { id: workspaceId }: WorkspaceEntity,+ ): Promise<ObjectMetadataEntity> {+ const objectMetadata = await this.objectMetadataRepository.findOne({+ where: { id, workspaceId },+ });++ if (!isDefined(objectMetadata)) {+ throw new NotFoundError(+ `Unable to find ObjectMetadataEntity with id: ${id}`,+ );+ }++ return objectMetadata;+ }++ @ResolveField(() => ObjectFieldsConnectionDTO)+ async fields(+ @AuthWorkspace() workspace: WorkspaceEntity,+ @Parent() objectMetadata: Pick<ObjectMetadataDTO, 'id'>,+ @Context() context: { loaders: IDataloaders } & I18nContext,+ @Args('paging', {+ type: () => CursorPagingInput,+ defaultValue: { first: 10 },+ description: 'Limit or page results.',+ })+ paging: CursorPagingInput,+ @Args('filter', {+ type: () => FieldFilterInput,+ defaultValue: {},+ description: 'Specify to filter the records returned.',+ })+ filter: FieldFilterInput,+ ): Promise<CursorConnection<FieldMetadataDTO>> {+ return context.loaders.fieldMetadataConnectionLoader.load({+ objectMetadata,+ workspaceId: workspace.id,+ locale: context.req.locale,+ filter,+ paging,+ });+ }++ @ResolveField(() => ObjectIndexMetadatasConnectionDTO)+ async indexMetadatas(+ @AuthWorkspace() workspace: WorkspaceEntity,+ @Parent() objectMetadata: Pick<ObjectMetadataDTO, 'id'>,+ @Context() context: { loaders: IDataloaders },+ @Args('paging', {+ type: () => CursorPagingInput,+ defaultValue: { first: 10 },+ description: 'Limit or page results.',+ })+ paging: CursorPagingInput,+ @Args('filter', {+ type: () => IndexFilterInput,+ defaultValue: {},+ description: 'Specify to filter the records returned.',+ })+ filter: IndexFilterInput,+ ): Promise<CursorConnection<IndexMetadataDTO>> {+ return context.loaders.indexMetadataConnectionLoader.load({+ objectMetadata,+ workspaceId: workspace.id,+ filter,+ paging,+ });+ }+@ResolveField(() => Boolean, {deprecationReason: 'Use isUIEditable',})diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.tsindex 81137721206..7d8fcda9500 100644--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts@@ -1,7 +1,6 @@import { Injectable } from '@nestjs/common';import { InjectRepository } from '@nestjs/typeorm';-import { TypeOrmQueryService } from '@ptc-org/nestjs-query-typeorm';import { fromArrayToUniqueKeyRecord, isDefined } from 'twenty-shared/utils';import { FindManyOptions, FindOneOptions, Repository } from 'typeorm';import { v4, v5 } from 'uuid';@@ -48,7 +47,7 @@ import { type UniversalFlatObjectMetadata } from 'src/engine/workspace-manager/wimport { type UniversalFlatView } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-view.type';@Injectable()-export class ObjectMetadataService extends TypeOrmQueryService<ObjectMetadataEntity> {+export class ObjectMetadataService {constructor(@InjectRepository(ObjectMetadataEntity)private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,@@ -56,9 +55,7 @@ export class ObjectMetadataService extends TypeOrmQueryService<ObjectMetadataEntprivate readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,private readonly workspaceCacheService: WorkspaceCacheService,private readonly applicationService: ApplicationService,- ) {- super(objectMetadataRepository);- }+ ) {}async updateOneObject({updateObjectInput,diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/object-metadata-graphql-api-exception-handler.util.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/object-metadata-graphql-api-exception-handler.util.tsindex 66fcf242815..d05c68dff5f 100644--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/object-metadata-graphql-api-exception-handler.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/object-metadata-graphql-api-exception-handler.util.ts@@ -15,7 +15,7 @@ import { InvalidMetadataException } from 'src/engine/metadata-modules/utils/exceimport { WorkspaceMigrationBuilderException } from 'src/engine/workspace-manager/workspace-migration/exceptions/workspace-migration-builder-exception';import { workspaceMigrationBuilderGraphqlApiExceptionHandler } from 'src/engine/workspace-manager/workspace-migration/interceptors/utils/workspace-migration-builder-graphql-api-exception-handler.util';-export const objectMetadataGraphqlApiExceptionHandler = (error: Error) => {+export const objectMetadataGraphqlApiExceptionHandler = (error: unknown) => {if (error instanceof WorkspaceMigrationBuilderException) {return workspaceMigrationBuilderGraphqlApiExceptionHandler(error);}diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/to-legacy-object-metadata-response.util.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/to-legacy-object-metadata-response.util.tsindex ac63d1e9aa8..0685e295749 100644--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/to-legacy-object-metadata-response.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/to-legacy-object-metadata-response.util.ts@@ -1,4 +1,4 @@-import { type RestCursorPageInfo } from 'src/engine/api/rest/metadata/utils/paginate-by-id-cursor.util';+import { type RestCursorPageInfo } from 'src/engine/api/rest/metadata/types/rest-cursor-page-info.type';import { type ObjectMetadataWithFieldsDTO } from 'src/engine/metadata-modules/object-metadata/dtos/object-metadata-with-fields.dto';import { type ObjectMetadataDTO } from 'src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto';diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/controllers/page-layout-tab.controller.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/controllers/page-layout-tab.controller.tsindex 0317ee095ad..8e935a9f307 100644--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/controllers/page-layout-tab.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/controllers/page-layout-tab.controller.ts@@ -7,6 +7,7 @@ import {Patch,Post,Query,+ Req,UseFilters,UseGuards,} from '@nestjs/common';@@ -16,6 +17,8 @@ import { ApiPath } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { paginateMetadataRestItems } from 'src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util';+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';@@ -49,9 +52,10 @@ export class PageLayoutTabController {@Get()@UseGuards(NoPermissionGuard)async findMany(+ @Req() request: AuthenticatedRequest,@AuthWorkspace() workspace: WorkspaceEntity,@Query('pageLayoutId') pageLayoutId: string,- ): Promise<PageLayoutTabDTO[]> {+ ) {if (!isDefined(pageLayoutId)) {throw new PageLayoutTabException(generatePageLayoutTabExceptionMessage(@@ -61,10 +65,12 @@ export class PageLayoutTabController {);}- return this.pageLayoutTabService.findByPageLayoutId({+ const items = await this.pageLayoutTabService.findByPageLayoutId({workspaceId: workspace.id,pageLayoutId,});++ return paginateMetadataRestItems({ items, request });}@Get(':id')diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/services/page-layout-tab.service.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/services/page-layout-tab.service.tsindex 9aa5145748e..0714d47fa01 100644--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/services/page-layout-tab.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-tab/services/page-layout-tab.service.ts@@ -54,7 +54,10 @@ export class PageLayoutTabService {.filter((tab) => tab.pageLayoutId === pageLayoutId && !isDefined(tab.deletedAt),)- .sort((a, b) => (a.position ?? 0) - (b.position ?? 0))+ .sort(+ (a, b) =>+ (a.position ?? 0) - (b.position ?? 0) || a.id.localeCompare(b.id),+ ).map((tab) =>fromFlatPageLayoutTabWithWidgetsToPageLayoutTabDto(reconstructFlatPageLayoutTabWithWidgets({diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/controllers/page-layout-widget.controller.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/controllers/page-layout-widget.controller.tsindex 44cc37418e2..6cecd76ee14 100644--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/controllers/page-layout-widget.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/controllers/page-layout-widget.controller.ts@@ -7,6 +7,7 @@ import {Patch,Post,Query,+ Req,UseFilters,UseGuards,} from '@nestjs/common';@@ -16,6 +17,8 @@ import { PermissionFlagType } from 'twenty-shared/constants';import { ApiPath } from 'twenty-shared/types';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { paginateMetadataRestItems } from 'src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util';+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';@@ -51,9 +54,10 @@ export class PageLayoutWidgetController {@Get()@UseGuards(NoPermissionGuard)async findMany(+ @Req() request: AuthenticatedRequest,@AuthWorkspace() workspace: WorkspaceEntity,@Query('pageLayoutTabId') pageLayoutTabId: string,- ): Promise<PageLayoutWidgetDTO[]> {+ ) {if (!isDefined(pageLayoutTabId)) {throw new PageLayoutWidgetException(generatePageLayoutWidgetExceptionMessage(@@ -63,10 +67,12 @@ export class PageLayoutWidgetController {);}- return this.pageLayoutWidgetService.findByPageLayoutTabId({+ const items = await this.pageLayoutWidgetService.findByPageLayoutTabId({workspaceId: workspace.id,pageLayoutTabId,});++ return paginateMetadataRestItems({ items, request });}@Get(':id')diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service.tsindex 817432d4529..a653de12efd 100644--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service.ts@@ -174,11 +174,13 @@ export class PageLayoutWidgetService {resolveOverridableEntityProperty(widget, 'pageLayoutTabId') ===pageLayoutTabId && !isDefined(widget.deletedAt),)- .sort(- (widgetA, widgetB) =>+ .sort((widgetA, widgetB) => {+ const createdAtComparison =new Date(widgetA.createdAt).getTime() -- new Date(widgetB.createdAt).getTime(),- )+ new Date(widgetB.createdAt).getTime();++ return createdAtComparison || widgetA.id.localeCompare(widgetB.id);+ }).map(fromFlatPageLayoutWidgetToPageLayoutWidgetDto);}diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/controllers/page-layout.controller.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/controllers/page-layout.controller.tsindex a969a6e7dc8..0c63437d95b 100644--- a/packages/twenty-server/src/engine/metadata-modules/page-layout/controllers/page-layout.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/controllers/page-layout.controller.ts@@ -7,15 +7,17 @@ import {Patch,Post,Query,+ Req,UseFilters,UseGuards,} from '@nestjs/common';import { PermissionFlagType } from 'twenty-shared/constants';import { ApiPath } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { parseMetadataRestPagination } from 'src/engine/api/rest/metadata/utils/parse-metadata-rest-pagination.util';+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';@@ -44,21 +46,23 @@ export class PageLayoutController {@Get()@UseGuards(NoPermissionGuard)async findMany(+ @Req() request: AuthenticatedRequest,@AuthWorkspace() workspace: WorkspaceEntity,@Query('objectMetadataId') objectMetadataId?: string,@Query('pageLayoutType') pageLayoutType?: PageLayoutType,- ): Promise<PageLayoutDTO[]> {- if (isDefined(objectMetadataId)) {- return this.pageLayoutService.findBy({- workspaceId: workspace.id,- filter: {- objectMetadataId,- pageLayoutType,- },- });- }+ ) {+ const page = await this.pageLayoutService.findManyPaginated({+ workspaceId: workspace.id,+ objectMetadataId,+ pageLayoutType,+ pagination: parseMetadataRestPagination(request),+ });- return this.pageLayoutService.findByWorkspaceId(workspace.id);+ return {+ data: page.items,+ pageInfo: page.pageInfo,+ totalCount: page.totalCount,+ };}@Get(':id')diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout.service.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout.service.tsindex df0857648ce..b602a18e4bc 100644--- a/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout.service.ts@@ -10,6 +10,7 @@ import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/import { type FlatPageLayoutTabMaps } from 'src/engine/metadata-modules/flat-page-layout-tab/types/flat-page-layout-tab-maps.type';import { type FlatPageLayoutWidgetMaps } from 'src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget-maps.type';import { type FlatPageLayoutMaps } from 'src/engine/metadata-modules/flat-page-layout/types/flat-page-layout-maps.type';+import { compareFlatPageLayoutsByCreation } from 'src/engine/metadata-modules/page-layout/utils/compare-flat-page-layouts-by-creation.util';import { fromCreatePageLayoutInputToFlatPageLayoutToCreate } from 'src/engine/metadata-modules/flat-page-layout/utils/from-create-page-layout-input-to-flat-page-layout-to-create.util';import { fromDestroyPageLayoutInputToFlatPageLayoutOrThrow } from 'src/engine/metadata-modules/flat-page-layout/utils/from-destroy-page-layout-input-to-flat-page-layout-or-throw.util';import {@@ -29,6 +30,9 @@ import {} from 'src/engine/metadata-modules/page-layout/exceptions/page-layout.exception';import { fromFlatPageLayoutToPageLayoutDto } from 'src/engine/metadata-modules/page-layout/utils/from-flat-page-layout-to-page-layout-dto.util';import { fromFlatPageLayoutWithTabsAndWidgetsToPageLayoutDto } from 'src/engine/metadata-modules/page-layout/utils/from-flat-page-layout-with-tabs-and-widgets-to-page-layout-dto.util';+import { type MetadataCursorPage } from 'src/engine/metadata-modules/pagination/types/metadata-cursor-page.type';+import { type MetadataCursorPagination } from 'src/engine/metadata-modules/pagination/types/metadata-cursor-pagination.type';+import { paginateMetadataOrderedItems } from 'src/engine/metadata-modules/pagination/utils/paginate-metadata-ordered-items.util';import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';import { WorkspaceMigrationBuilderException } from 'src/engine/workspace-manager/workspace-migration/exceptions/workspace-migration-builder-exception';@@ -56,7 +60,8 @@ export class PageLayoutService {flatPageLayoutMaps.byUniversalIdentifier,).filter(isDefined)- .filter((layout) => !isDefined(layout.deletedAt));+ .filter((layout) => !isDefined(layout.deletedAt))+ .sort(compareFlatPageLayoutsByCreation);return activeLayouts.map((layout) =>fromFlatPageLayoutWithTabsAndWidgetsToPageLayoutDto(@@ -99,7 +104,8 @@ export class PageLayoutService {: true;return isNotDeleted && matchesObjectMetadataId && matchesPageLayoutType;- });+ })+ .sort(compareFlatPageLayoutsByCreation);return activeLayouts.map((layout) =>fromFlatPageLayoutWithTabsAndWidgetsToPageLayoutDto(@@ -112,6 +118,54 @@ export class PageLayoutService {);}+ async findManyPaginated({+ workspaceId,+ objectMetadataId,+ pageLayoutType,+ pagination,+ }: {+ workspaceId: string;+ objectMetadataId?: string;+ pageLayoutType?: PageLayoutType;+ pagination: MetadataCursorPagination;+ }): Promise<MetadataCursorPage<PageLayoutDTO> & { totalCount: number }> {+ const {+ flatPageLayoutMaps,+ flatPageLayoutTabMaps,+ flatPageLayoutWidgetMaps,+ } = await this.getPageLayoutFlatEntityMaps(workspaceId);+ const activeLayouts = Object.values(+ flatPageLayoutMaps.byUniversalIdentifier,+ )+ .filter(isDefined)+ .filter(+ (layout) =>+ !isDefined(layout.deletedAt) &&+ (!isNonEmptyString(objectMetadataId) ||+ layout.objectMetadataId === objectMetadataId) &&+ (!isDefined(pageLayoutType) || layout.type === pageLayoutType),+ )+ .sort(compareFlatPageLayoutsByCreation);+ const page = paginateMetadataOrderedItems({+ items: activeLayouts,+ pagination,+ });++ return {+ ...page,+ items: page.items.map((layout) =>+ fromFlatPageLayoutWithTabsAndWidgetsToPageLayoutDto(+ reconstructFlatPageLayoutWithTabsAndWidgets({+ layout,+ flatPageLayoutTabMaps,+ flatPageLayoutWidgetMaps,+ }),+ ),+ ),+ totalCount: activeLayouts.length,+ };+ }+async findByIdOrThrow({id,workspaceId,diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/compare-flat-page-layouts-by-creation.util.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/compare-flat-page-layouts-by-creation.util.tsnew file mode 100644index 00000000000..643ff4c57fe--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/utils/compare-flat-page-layouts-by-creation.util.ts@@ -0,0 +1,10 @@+import { type FlatPageLayout } from 'src/engine/metadata-modules/flat-page-layout/types/flat-page-layout.type';++// Page layout lists are cursor-paginated, so they need one deterministic order+// shared by every read path; id breaks ties on identical creation timestamps.+export const compareFlatPageLayoutsByCreation = (+ first: Pick<FlatPageLayout, 'createdAt' | 'id'>,+ second: Pick<FlatPageLayout, 'createdAt' | 'id'>,+): number =>+ first.createdAt.localeCompare(second.createdAt) ||+ first.id.localeCompare(second.id);diff --git a/packages/twenty-server/src/engine/metadata-modules/pagination/dtos/boolean-field-comparison.input.ts b/packages/twenty-server/src/engine/metadata-modules/pagination/dtos/boolean-field-comparison.input.tsnew file mode 100644index 00000000000..d3ed3363073--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/pagination/dtos/boolean-field-comparison.input.ts@@ -0,0 +1,10 @@+import { Field, InputType } from '@nestjs/graphql';++@InputType('BooleanFieldComparison')+export class BooleanFieldComparisonInput {+ @Field(() => Boolean, { nullable: true })+ is?: boolean | null;++ @Field(() => Boolean, { nullable: true })+ isNot?: boolean | null;+}diff --git a/packages/twenty-server/src/engine/metadata-modules/pagination/dtos/cursor-connection-type.factory.ts b/packages/twenty-server/src/engine/metadata-modules/pagination/dtos/cursor-connection-type.factory.tsnew file mode 100644index 00000000000..7e8307d99b5--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/pagination/dtos/cursor-connection-type.factory.ts@@ -0,0 +1,55 @@+import { type Type } from '@nestjs/common';+import { Field, ObjectType } from '@nestjs/graphql';++import { ConnectionCursorScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';+import { PageInfoDTO } from 'src/engine/metadata-modules/pagination/dtos/page-info.dto';++// These factories mirror the edge/connection object types that+// @ptc-org/nestjs-query-graphql used to generate, so type names, field+// descriptions and shapes stay identical in the public metadata schema.+export type CursorEdge<TNode> = {+ node: TNode;+ cursor: string;+};++export type CursorConnection<TNode> = {+ edges: CursorEdge<TNode>[];+ pageInfo: PageInfoDTO;+};++export const createCursorEdgeType = <TNode>(+ nodeClassReference: Type<TNode>,+ nodeGraphqlTypeName: string,+ edgeGraphqlTypeName: string,+): Type<CursorEdge<TNode>> => {+ @ObjectType(edgeGraphqlTypeName)+ class EdgeType {+ @Field(() => nodeClassReference, {+ description: `The node containing the ${nodeGraphqlTypeName}`,+ })+ node: TNode;++ @Field(() => ConnectionCursorScalarType, {+ description: 'Cursor for this node.',+ })+ cursor: string;+ }++ return EdgeType;+};++export const createCursorConnectionType = <TNode>(+ edgeClassReference: Type<CursorEdge<TNode>>,+ connectionGraphqlTypeName: string,+): Type<CursorConnection<TNode>> => {+ @ObjectType(connectionGraphqlTypeName)+ class ConnectionType {+ @Field(() => PageInfoDTO, { description: 'Paging information' })+ pageInfo: PageInfoDTO;++ @Field(() => [edgeClassReference], { description: 'Array of edges.' })+ edges: CursorEdge<TNode>[];+ }++ return ConnectionType;+};diff --git a/packages/twenty-server/src/engine/metadata-modules/pagination/dtos/cursor-paging.input.ts b/packages/twenty-server/src/engine/metadata-modules/pagination/dtos/cursor-paging.input.tsnew file mode 100644index 00000000000..3cf62b47b1f--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/pagination/dtos/cursor-paging.input.ts@@ -0,0 +1,24 @@+import { Field, InputType, Int } from '@nestjs/graphql';++import { ConnectionCursorScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';++@InputType('CursorPaging')+export class CursorPagingInput {+ @Field(() => ConnectionCursorScalarType, {+ nullable: true,+ description: 'Paginate before opaque cursor',+ })+ before?: string;++ @Field(() => ConnectionCursorScalarType, {+ nullable: true,+ description: 'Paginate after opaque cursor',+ })+ after?: string;++ @Field(() => Int, { nullable: true, description: 'Paginate first' })+ first?: number;++ @Field(() => Int, { nullable: true, description: 'Paginate last' })+ last?: number;+}diff --git a/packages/twenty-server/src/engine/metadata-modules/pagination/dtos/page-info.dto.ts b/packages/twenty-server/src/engine/metadata-modules/pagination/dtos/page-info.dto.tsnew file mode 100644index 00000000000..4989ed084b5--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/pagination/dtos/page-info.dto.ts@@ -0,0 +1,30 @@+import { Field, ObjectType } from '@nestjs/graphql';++import { ConnectionCursorScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';++@ObjectType('PageInfo')+export class PageInfoDTO {+ @Field(() => Boolean, {+ nullable: true,+ description: 'true if paging forward and there are more records.',+ })+ hasNextPage?: boolean;++ @Field(() => Boolean, {+ nullable: true,+ description: 'true if paging backwards and there are more records.',+ })+ hasPreviousPage?: boolean;++ @Field(() => ConnectionCursorScalarType, {+ nullable: true,+ description: 'The cursor of the first returned record.',+ })+ startCursor?: string | null;++ @Field(() => ConnectionCursorScalarType, {+ nullable: true,+ description: 'The cursor of the last returned record.',+ })+ endCursor?: string | null;+}diff --git a/packages/twenty-server/src/engine/metadata-modules/pagination/dtos/uuid-filter-comparison.input.ts b/packages/twenty-server/src/engine/metadata-modules/pagination/dtos/uuid-filter-comparison.input.tsnew file mode 100644index 00000000000..ecfde6b07ef--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/pagination/dtos/uuid-filter-comparison.input.ts@@ -0,0 +1,48 @@+import { Field, InputType } from '@nestjs/graphql';++import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';++@InputType('UUIDFilterComparison')+export class UUIDFilterComparisonInput {+ @Field(() => Boolean, { nullable: true })+ is?: boolean | null;++ @Field(() => Boolean, { nullable: true })+ isNot?: boolean | null;++ @Field(() => UUIDScalarType, { nullable: true })+ eq?: string;++ @Field(() => UUIDScalarType, { nullable: true })+ neq?: string;++ @Field(() => UUIDScalarType, { nullable: true })+ gt?: string;++ @Field(() => UUIDScalarType, { nullable: true })+ gte?: string;++ @Field(() => UUIDScalarType, { nullable: true })+ lt?: string;++ @Field(() => UUIDScalarType, { nullable: true })+ lte?: string;++ @Field(() => UUIDScalarType, { nullable: true })+ like?: string;++ @Field(() => UUIDScalarType, { nullable: true })+ notLike?: string;++ @Field(() => UUIDScalarType, { nullable: true })+ iLike?: string;++ @Field(() => UUIDScalarType, { nullable: true })+ notILike?: string;++ @Field(() => [UUIDScalarType], { nullable: true })+ in?: string[];++ @Field(() => [UUIDScalarType], { nullable: true })+ notIn?: string[];+}diff --git a/packages/twenty-server/src/engine/metadata-modules/pagination/types/metadata-cursor-page-info.type.ts b/packages/twenty-server/src/engine/metadata-modules/pagination/types/metadata-cursor-page-info.type.tsnew file mode 100644index 00000000000..874d0cb58d3--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/pagination/types/metadata-cursor-page-info.type.ts@@ -0,0 +1,6 @@+export type MetadataCursorPageInfo = {+ hasNextPage: boolean;+ hasPreviousPage: boolean;+ startCursor: string | null;+ endCursor: string | null;+};diff --git a/packages/twenty-server/src/engine/metadata-modules/pagination/types/metadata-cursor-page.type.ts b/packages/twenty-server/src/engine/metadata-modules/pagination/types/metadata-cursor-page.type.tsnew file mode 100644index 00000000000..1e466ebc089--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/pagination/types/metadata-cursor-page.type.ts@@ -0,0 +1,6 @@+import { type MetadataCursorPageInfo } from 'src/engine/metadata-modules/pagination/types/metadata-cursor-page-info.type';++export type MetadataCursorPage<TEntity extends { id: string }> = {+ items: TEntity[];+ pageInfo: MetadataCursorPageInfo;+};diff --git a/packages/twenty-server/src/engine/metadata-modules/pagination/types/metadata-cursor-pagination.type.ts b/packages/twenty-server/src/engine/metadata-modules/pagination/types/metadata-cursor-pagination.type.tsnew file mode 100644index 00000000000..1b163907dec--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/pagination/types/metadata-cursor-pagination.type.ts@@ -0,0 +1,8 @@+import { type CursorPaginationDirection } from 'src/engine/api/types/cursor-pagination-direction.type';++export type MetadataCursorPagination = {+ limit: number;+ direction: CursorPaginationDirection;+ afterId?: string;+ beforeId?: string;+};diff --git a/packages/twenty-server/src/engine/metadata-modules/pagination/utils/__tests__/apply-metadata-filter-to-query-builder.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/pagination/utils/__tests__/apply-metadata-filter-to-query-builder.util.spec.tsnew file mode 100644index 00000000000..49bcbcf2a5e--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/pagination/utils/__tests__/apply-metadata-filter-to-query-builder.util.spec.ts@@ -0,0 +1,267 @@+import { Brackets, type WhereExpressionBuilder } from 'typeorm';++import { UserInputError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';+import {+ applyMetadataFilterToItems,+ applyMetadataFilterToQueryBuilder,+} from 'src/engine/metadata-modules/pagination/utils/apply-metadata-filter-to-query-builder.util';++class FakeWhereBuilder {+ conditions: string[] = [];+ parameters: Record<string, unknown> = {};++ andWhere(+ condition: string | Brackets,+ parameters?: Record<string, unknown>,+ ): this {+ this.append('AND', condition, parameters);++ return this;+ }++ orWhere(+ condition: string | Brackets,+ parameters?: Record<string, unknown>,+ ): this {+ this.append('OR', condition, parameters);++ return this;+ }++ render(): string {+ return this.conditions+ .map((condition, index) =>+ index === 0 ? condition.replace(/^(AND|OR) /, '') : condition,+ )+ .join(' ');+ }++ private append(+ operator: 'AND' | 'OR',+ condition: string | Brackets,+ parameters?: Record<string, unknown>,+ ): void {+ if (condition instanceof Brackets) {+ const nestedBuilder = new FakeWhereBuilder();++ condition.whereFactory(+ nestedBuilder as unknown as WhereExpressionBuilder,+ );+ this.conditions.push(`${operator} (${nestedBuilder.render()})`);+ Object.assign(this.parameters, nestedBuilder.parameters);+ } else {+ this.conditions.push(`${operator} ${condition}`);+ Object.assign(this.parameters, parameters ?? {});+ }+ }+}++const applyFilter = (+ filter: object,+ columnByFilterField: Parameters<+ typeof applyMetadataFilterToQueryBuilder+ >[0]['columnByFilterField'] = {+ id: { column: 'id', type: 'uuid' },+ isActive: { column: 'isActive', type: 'boolean' },+ },+) => {+ const whereBuilder = new FakeWhereBuilder();++ applyMetadataFilterToQueryBuilder({+ whereBuilder: whereBuilder as unknown as WhereExpressionBuilder,+ alias: 'entity',+ filter,+ columnByFilterField,+ });++ return whereBuilder;+};++describe('applyMetadataFilterToQueryBuilder', () => {+ it('translates eq comparisons into parameterized conditions', () => {+ const whereBuilder = applyFilter({ id: { eq: 'some-id' } });++ expect(whereBuilder.render()).toBe(+ '"entity"."id" = :metadataFilterParameter0',+ );+ expect(whereBuilder.parameters).toEqual({+ metadataFilterParameter0: 'some-id',+ });+ });++ it('combines multiple comparisons on one field with AND', () => {+ const whereBuilder = applyFilter({+ id: { gt: 'a', lt: 'b' },+ });++ expect(whereBuilder.render()).toBe(+ '"entity"."id" > :metadataFilterParameter0 AND "entity"."id" < :metadataFilterParameter1',+ );+ });++ it('translates in comparisons and renders an empty in as a false condition', () => {+ expect(applyFilter({ id: { in: ['a', 'b'] } }).render()).toBe(+ '"entity"."id" IN (:...metadataFilterParameter0)',+ );+ expect(applyFilter({ id: { in: [] } }).render()).toBe('1 = 0');+ });++ it('translates is and isNot including explicit null', () => {+ expect(applyFilter({ isActive: { is: true } }).render()).toBe(+ '"entity"."isActive" IS TRUE',+ );+ expect(applyFilter({ isActive: { is: null } }).render()).toBe(+ '"entity"."isActive" IS NULL',+ );+ expect(applyFilter({ isActive: { isNot: false } }).render()).toBe(+ '"entity"."isActive" IS NOT FALSE',+ );+ });++ it('inverts boolean values for columns flagged with invertBooleanValues', () => {+ const columnByFilterField = {+ isUIReadOnly: {+ column: 'isUIEditable',+ type: 'boolean',+ invertBooleanValues: true,+ },+ } as const;++ expect(+ applyFilter({ isUIReadOnly: { is: true } }, columnByFilterField).render(),+ ).toBe('"entity"."isUIEditable" IS FALSE');+ expect(+ applyFilter(+ { isUIReadOnly: { isNot: false } },+ columnByFilterField,+ ).render(),+ ).toBe('"entity"."isUIEditable" IS NOT TRUE');+ expect(+ applyFilter({ isUIReadOnly: { is: null } }, columnByFilterField).render(),+ ).toBe('"entity"."isUIEditable" IS NULL');+ });++ it('nests and groups with AND and or groups with OR', () => {+ const whereBuilder = applyFilter({+ and: [{ isActive: { is: true } }],+ or: [{ id: { eq: 'a' } }, { id: { eq: 'b' } }],+ });++ expect(whereBuilder.render()).toBe(+ '("entity"."isActive" IS TRUE) AND (("entity"."id" = :metadataFilterParameter0) OR ("entity"."id" = :metadataFilterParameter1))',+ );+ });++ it('supports nested and inside or', () => {+ const whereBuilder = applyFilter({+ or: [+ { and: [{ id: { eq: 'a' } }, { isActive: { is: false } }] },+ { id: { eq: 'b' } },+ ],+ });++ expect(whereBuilder.render()).toContain('IS FALSE');+ expect(Object.keys(whereBuilder.parameters)).toHaveLength(2);+ });++ it('rejects unknown filter fields', () => {+ expect(() => applyFilter({ unknownField: { eq: 'x' } })).toThrow(+ UserInputError,+ );+ });++ it('rejects boolean is operators on UUID columns before reaching postgres', () => {+ expect(() => applyFilter({ id: { is: true } })).toThrow(UserInputError);+ });++ it('normalizes UUID operands for database and in-memory filters', () => {+ type UuidFilter = {+ and?: UuidFilter[];+ or?: UuidFilter[];+ id?: { eq?: string; in?: string[] };+ };++ const lowerCaseUuid = 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa';+ const upperCaseUuid = lowerCaseUuid.toUpperCase();+ const filter: UuidFilter = {+ id: { eq: upperCaseUuid, in: [upperCaseUuid] },+ };+ const whereBuilder = applyFilter({+ id: { eq: upperCaseUuid, in: [upperCaseUuid] },+ });++ expect(whereBuilder.parameters).toEqual({+ metadataFilterParameter0: lowerCaseUuid,+ metadataFilterParameter1: [lowerCaseUuid],+ });+ expect(+ applyMetadataFilterToItems({+ items: [{ id: lowerCaseUuid }],+ filter,+ columnByFilterField: {+ id: { column: 'id', type: 'uuid' },+ },+ }),+ ).toEqual([{ id: lowerCaseUuid }]);+ });++ it('applies the same filter semantics to batched in-memory relations', () => {+ type TestFilter = {+ and?: TestFilter[];+ id?: { gt?: string; lt?: string };+ isActive?: { is?: boolean };+ };++ const items = [+ { id: 'a', isActive: true },+ { id: 'b', isActive: false },+ { id: 'c', isActive: true },+ ];++ expect(+ applyMetadataFilterToItems<(typeof items)[number], TestFilter>({+ items,+ filter: {+ and: [{ isActive: { is: true } }],+ id: { gt: 'a', lt: 'c' },+ },+ columnByFilterField: {+ id: { column: 'id', type: 'uuid' },+ isActive: { column: 'isActive', type: 'boolean' },+ },+ }),+ ).toEqual([]);+ });++ it('matches uuid filters regardless of operand casing', () => {+ type UuidFilter = {+ and?: UuidFilter[];+ or?: UuidFilter[];+ id?: { eq?: string; neq?: string; in?: string[]; notIn?: string[] };+ };++ const items = [{ id: '00000000-0000-4000-8000-00000000000a' }];+ const columnByFilterField = {+ id: { column: 'id', type: 'uuid' },+ } as const;+ const upperCasedId = items[0].id.toUpperCase();++ const matching = (filter: UuidFilter) =>+ applyMetadataFilterToItems<(typeof items)[number], UuidFilter>({+ items,+ filter,+ columnByFilterField,+ });++ expect(matching({ id: { eq: upperCasedId } })).toEqual(items);+ expect(matching({ id: { in: [upperCasedId] } })).toEqual(items);+ expect(matching({ id: { neq: upperCasedId } })).toEqual([]);+ expect(matching({ id: { notIn: [upperCasedId] } })).toEqual([]);+ });++ it('ignores undefined filter values', () => {+ const whereBuilder = applyFilter({ id: undefined });++ expect(whereBuilder.conditions).toHaveLength(0);+ });+});diff --git a/packages/twenty-server/src/engine/metadata-modules/pagination/utils/__tests__/find-many-with-cursor-pagination.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/pagination/utils/__tests__/find-many-with-cursor-pagination.util.spec.tsnew file mode 100644index 00000000000..a90a3f3ab51--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/pagination/utils/__tests__/find-many-with-cursor-pagination.util.spec.ts@@ -0,0 +1,227 @@+import { type SelectQueryBuilder } from 'typeorm';++import { UserInputError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';+import { encodeCursorData } from 'src/engine/api/graphql/graphql-query-runner/utils/cursors.util';+import { findManyItemsWithCursorPagination } from 'src/engine/metadata-modules/pagination/utils/find-many-items-with-cursor-pagination.util';+import { findManyWithCursorPagination } from 'src/engine/metadata-modules/pagination/utils/find-many-with-cursor-pagination.util';++type FakeEntity = { id: string };++const UUID_A = '00000000-0000-4000-8000-00000000000a';+const UUID_B = '00000000-0000-4000-8000-00000000000b';+const UUID_C = '00000000-0000-4000-8000-00000000000c';+const UUID_D = '00000000-0000-4000-8000-00000000000d';++const createFakeQueryBuilder = (rows: FakeEntity[]) => {+ const calls = {+ orderBy: [] as [string, string][],+ andWhere: [] as [string, Record<string, unknown> | undefined][],+ take: [] as number[],+ };+ let takenAmount: number | undefined;++ const queryBuilder = {+ orderBy(column: string, direction: string) {+ calls.orderBy.push([column, direction]);++ return queryBuilder;+ },+ andWhere(condition: string, parameters?: Record<string, unknown>) {+ calls.andWhere.push([condition, parameters]);++ return queryBuilder;+ },+ take(amount: number) {+ calls.take.push(amount);+ takenAmount = amount;++ return queryBuilder;+ },+ // Rows are supplied in the order the query would return them, so honouring+ // take keeps the fake faithful to a real keyset window.+ getMany: async () => rows.slice(0, takenAmount ?? rows.length),+ };++ return {+ queryBuilder: queryBuilder as unknown as SelectQueryBuilder<FakeEntity>,+ calls,+ };+};++const paginate = (+ rows: FakeEntity[],+ paging: Parameters<typeof findManyWithCursorPagination>[0]['paging'],+) => {+ const { queryBuilder, calls } = createFakeQueryBuilder(rows);++ return {+ calls,+ result: findManyWithCursorPagination({+ queryBuilder,+ alias: 'entity',+ paging,+ defaultResultSize: 10,+ maxResultsSize: 1000,+ }),+ };+};++const cursorFor = (id: string) => encodeCursorData({ id });++describe('findManyWithCursorPagination', () => {+ it.each([+ [{ first: 1, last: 1 }],+ [{ first: 1, before: cursorFor(UUID_A) }],+ [{ last: 1, after: cursorFor(UUID_A) }],+ [{ after: cursorFor(UUID_A), before: cursorFor(UUID_B) }],+ [{ first: -1 }],+ [{ last: -1 }],+ [{ first: 1001 }],+ ])('rejects invalid paging %j', async (paging) => {+ await expect(paginate([], paging).result).rejects.toThrow(UserInputError);+ });++ it.each([+ ['not-base64-json'],+ [Buffer.from('null').toString('base64')],+ [Buffer.from('42').toString('base64')],+ [Buffer.from('[]').toString('base64')],+ [Buffer.from('{"noId":true}').toString('base64')],+ [Buffer.from('{"id":42}').toString('base64')],+ [Buffer.from('{"id":"not-a-uuid"}').toString('base64')],+ ])('rejects malformed cursor %s as user input error', async (after) => {+ await expect(paginate([], { after }).result).rejects.toThrow(+ UserInputError,+ );+ });++ it('pages forward with id DESC ordering and a keyset condition', async () => {+ const rows = [{ id: UUID_C }, { id: UUID_B }, { id: UUID_A }];+ const { result, calls } = paginate(rows, {+ first: 2,+ after: cursorFor(UUID_D),+ });+ const connection = await result;++ expect(calls.orderBy).toEqual([['"entity"."id"', 'DESC']]);+ expect(calls.andWhere).toEqual([+ [+ '"entity"."id" < :metadataPaginationCursorId',+ { metadataPaginationCursorId: UUID_D },+ ],+ ]);+ expect(calls.take).toEqual([3]);+ expect(connection.edges.map(({ node }) => node.id)).toEqual([+ UUID_C,+ UUID_B,+ ]);+ expect(connection.pageInfo).toEqual({+ hasNextPage: true,+ hasPreviousPage: true,+ startCursor: cursorFor(UUID_C),+ endCursor: cursorFor(UUID_B),+ });+ });++ it('reports no previous page when paging forward from the start', async () => {+ const { result } = paginate([{ id: UUID_B }, { id: UUID_A }], {+ first: 10,+ });+ const connection = await result;++ expect(connection.pageInfo.hasNextPage).toBe(false);+ expect(connection.pageInfo.hasPreviousPage).toBe(false);+ });++ it('pages backward with reversed ordering and reversed results', async () => {+ const rows = [{ id: UUID_B }, { id: UUID_C }, { id: UUID_D }];+ const { result, calls } = paginate(rows, {+ last: 2,+ before: cursorFor(UUID_A),+ });+ const connection = await result;++ expect(calls.orderBy).toEqual([['"entity"."id"', 'ASC']]);+ expect(calls.andWhere).toEqual([+ [+ '"entity"."id" > :metadataPaginationCursorId',+ { metadataPaginationCursorId: UUID_A },+ ],+ ]);+ expect(connection.edges.map(({ node }) => node.id)).toEqual([+ UUID_C,+ UUID_B,+ ]);+ expect(connection.pageInfo.hasPreviousPage).toBe(true);+ expect(connection.pageInfo.hasNextPage).toBe(true);+ });++ it('supports fetching the last page without a before cursor', async () => {+ // Presentation order is id DESC, so the last page holds the smallest ids.+ // Rows are listed ASC because that is the order the backward query walks,+ // and the dataset is larger than the page so the window is not trivial.+ const rows = [+ { id: UUID_A },+ { id: UUID_B },+ { id: UUID_C },+ { id: UUID_D },+ ];+ const { result, calls } = paginate(rows, { last: 2 });+ const connection = await result;++ expect(calls.orderBy).toEqual([['"entity"."id"', 'ASC']]);+ expect(calls.andWhere).toEqual([]);+ expect(connection.edges.map(({ node }) => node.id)).toEqual([+ UUID_B,+ UUID_A,+ ]);+ expect(connection.pageInfo).toMatchObject({+ hasNextPage: false,+ hasPreviousPage: true,+ });++ const fullDatasetConnection = findManyItemsWithCursorPagination({+ items: [{ id: UUID_D }, { id: UUID_C }, { id: UUID_B }, { id: UUID_A }],+ paging: { last: 2 },+ });++ expect(fullDatasetConnection.edges.map(({ node }) => node.id)).toEqual([+ UUID_B,+ UUID_A,+ ]);+ });++ it('uses the default result size when paging is omitted', async () => {+ const { result, calls } = paginate([{ id: UUID_A }], undefined);++ await result;++ expect(calls.take).toEqual([11]);+ });++ it('returns null cursors for an empty page', async () => {+ const connection = await paginate([], { first: 5 }).result;++ expect(connection.edges).toEqual([]);+ expect(connection.pageInfo.startCursor).toBeNull();+ expect(connection.pageInfo.endCursor).toBeNull();+ });++ it('uses the same cursor semantics for batched relation items', () => {+ const connection = findManyItemsWithCursorPagination({+ items: [{ id: UUID_A }, { id: UUID_D }, { id: UUID_B }, { id: UUID_C }],+ paging: { first: 2, after: cursorFor(UUID_D) },+ defaultResultSize: 10,+ maxResultsSize: 1000,+ });++ expect(connection.edges.map(({ node }) => node.id)).toEqual([+ UUID_C,+ UUID_B,+ ]);+ expect(connection.pageInfo).toMatchObject({+ hasNextPage: true,+ hasPreviousPage: true,+ });+ });+});diff --git a/packages/twenty-server/src/engine/metadata-modules/pagination/utils/__tests__/paginate-metadata.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/pagination/utils/__tests__/paginate-metadata.util.spec.tsnew file mode 100644index 00000000000..27f255b7e21--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/pagination/utils/__tests__/paginate-metadata.util.spec.ts@@ -0,0 +1,64 @@+import { paginateMetadataOrderedItems } from 'src/engine/metadata-modules/pagination/utils/paginate-metadata-ordered-items.util';++const items = ['first', 'second', 'third', 'fourth'].map((id) => ({ id }));++describe('paginateMetadataOrderedItems', () => {+ it('preserves domain order while paging forward', () => {+ const page = paginateMetadataOrderedItems({+ items,+ pagination: {+ limit: 2,+ direction: 'forward',+ afterId: 'first',+ },+ });++ expect(page).toEqual({+ items: [{ id: 'second' }, { id: 'third' }],+ pageInfo: {+ hasNextPage: true,+ hasPreviousPage: true,+ startCursor: 'second',+ endCursor: 'third',+ },+ });+ });++ it('returns the preceding window in domain order', () => {+ const page = paginateMetadataOrderedItems({+ items,+ pagination: {+ limit: 2,+ direction: 'backward',+ beforeId: 'fourth',+ },+ });++ expect(page).toEqual({+ items: [{ id: 'second' }, { id: 'third' }],+ pageInfo: {+ hasNextPage: true,+ hasPreviousPage: true,+ startCursor: 'second',+ endCursor: 'third',+ },+ });+ });++ it('does not reinterpret an unknown identity cursor as the first page', () => {+ const page = paginateMetadataOrderedItems({+ items,+ pagination: {+ limit: 2,+ direction: 'forward',+ afterId: 'missing',+ },+ });++ expect(page.items).toEqual([]);+ expect(page.pageInfo).toMatchObject({+ hasNextPage: false,+ hasPreviousPage: true,+ });+ });+});diff --git a/packages/twenty-server/src/engine/metadata-modules/pagination/utils/apply-metadata-filter-to-query-builder.util.ts b/packages/twenty-server/src/engine/metadata-modules/pagination/utils/apply-metadata-filter-to-query-builder.util.tsnew file mode 100644index 00000000000..96471b157bc--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/pagination/utils/apply-metadata-filter-to-query-builder.util.ts@@ -0,0 +1,519 @@+import { isDefined } from 'twenty-shared/utils';+import { Brackets, type WhereExpressionBuilder } from 'typeorm';++import { UserInputError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';++export type MetadataFilterComparison = {+ eq?: unknown;+ neq?: unknown;+ gt?: unknown;+ gte?: unknown;+ lt?: unknown;+ lte?: unknown;+ like?: unknown;+ notLike?: unknown;+ iLike?: unknown;+ notILike?: unknown;+ in?: unknown[];+ notIn?: unknown[];+ is?: boolean | null;+ isNot?: boolean | null;+};++// invertBooleanValues supports deprecated boolean aliases whose backing+// column has the opposite meaning (isUIReadOnly filters run against+// isUIEditable, since the legacy column is no longer written).+export type MetadataFilterColumn =+ | { column: string; type: 'uuid' }+ | { column: string; type: 'boolean'; invertBooleanValues?: true };++type MetadataFilterShape<TFilter> = {+ and?: TFilter[];+ or?: TFilter[];+};++type ParameterCounter = { value: number };++const buildBooleanCondition = (+ column: string,+ operator: 'IS' | 'IS NOT',+ value: boolean | null,+): string => {+ if (value === null) {+ return `${column} ${operator} NULL`;+ }++ return `${column} ${operator} ${value ? 'TRUE' : 'FALSE'}`;+};++const invertBooleanComparisonValue = (+ value: boolean | null | undefined,+): boolean | null | undefined => {+ if (typeof value === 'boolean') {+ return !value;+ }++ return value;+};++const normalizeMetadataComparison = ({+ comparison,+ column,+}: {+ comparison: MetadataFilterComparison;+ column: MetadataFilterColumn;+}): MetadataFilterComparison => {+ const normalizedComparison = { ...comparison };++ if (column.type === 'boolean' && column.invertBooleanValues) {+ normalizedComparison.is = invertBooleanComparisonValue(comparison.is);+ normalizedComparison.isNot = invertBooleanComparisonValue(comparison.isNot);+ }++ if (column.type === 'uuid') {+ if (+ (normalizedComparison.is !== undefined &&+ normalizedComparison.is !== null) ||+ (normalizedComparison.isNot !== undefined &&+ normalizedComparison.isNot !== null)+ ) {+ throw new UserInputError(+ 'UUID is/isNot comparisons only support null values',+ );+ }++ // Postgres compares uuid columns canonically, but the in-memory matcher+ // compares raw strings, so operands are lowercased to keep both paths+ // agreeing on differently-cased but equal ids.+ return lowercaseComparisonOperands(normalizedComparison);+ }++ return normalizedComparison;+};++const lowercaseValue = (value: unknown): unknown =>+ typeof value === 'string' ? value.toLowerCase() : value;++const lowercaseComparisonOperands = (+ comparison: MetadataFilterComparison,+): MetadataFilterComparison => {+ const lowercasedComparison: MetadataFilterComparison = { ...comparison };++ for (const operand of [+ 'eq',+ 'neq',+ 'gt',+ 'gte',+ 'lt',+ 'lte',+ 'like',+ 'notLike',+ 'iLike',+ 'notILike',+ ] as const) {+ if (isDefined(lowercasedComparison[operand])) {+ lowercasedComparison[operand] = lowercaseValue(+ lowercasedComparison[operand],+ );+ }+ }++ for (const operand of ['in', 'notIn'] as const) {+ const values = lowercasedComparison[operand];++ if (isDefined(values)) {+ lowercasedComparison[operand] = values.map(lowercaseValue);+ }+ }++ return lowercasedComparison;+};++const applyComparisonToQueryBuilder = ({+ whereBuilder,+ column,+ comparison,+ parameterCounter,+}: {+ whereBuilder: WhereExpressionBuilder;+ column: string;+ comparison: MetadataFilterComparison;+ parameterCounter: ParameterCounter;+}): void => {+ const nextParameterName = () =>+ `metadataFilterParameter${parameterCounter.value++}`;++ const simpleOperators: Partial<+ Record<keyof MetadataFilterComparison, string>+ > = {+ eq: '=',+ neq: '!=',+ gt: '>',+ gte: '>=',+ lt: '<',+ lte: '<=',+ };++ for (const [comparisonKey, sqlOperator] of Object.entries(simpleOperators)) {+ const value = comparison[comparisonKey as keyof MetadataFilterComparison];++ if (isDefined(value)) {+ const parameterName = nextParameterName();++ whereBuilder.andWhere(`${column} ${sqlOperator} :${parameterName}`, {+ [parameterName]: value,+ });+ }+ }++ const likeOperators: Partial<Record<keyof MetadataFilterComparison, string>> =+ {+ like: 'LIKE',+ notLike: 'NOT LIKE',+ iLike: 'ILIKE',+ notILike: 'NOT ILIKE',+ };++ for (const [comparisonKey, sqlOperator] of Object.entries(likeOperators)) {+ const value = comparison[comparisonKey as keyof MetadataFilterComparison];++ if (isDefined(value)) {+ const parameterName = nextParameterName();++ whereBuilder.andWhere(+ `${column}::text ${sqlOperator} :${parameterName}`,+ {+ [parameterName]: value,+ },+ );+ }+ }++ if (isDefined(comparison.in)) {+ if (comparison.in.length === 0) {+ whereBuilder.andWhere('1 = 0');+ } else {+ const parameterName = nextParameterName();++ whereBuilder.andWhere(`${column} IN (:...${parameterName})`, {+ [parameterName]: comparison.in,+ });+ }+ }++ if (isDefined(comparison.notIn) && comparison.notIn.length > 0) {+ const parameterName = nextParameterName();++ whereBuilder.andWhere(`${column} NOT IN (:...${parameterName})`, {+ [parameterName]: comparison.notIn,+ });+ }++ if (comparison.is !== undefined) {+ whereBuilder.andWhere(+ buildBooleanCondition(column, 'IS', comparison.is ?? null),+ );+ }++ if (comparison.isNot !== undefined) {+ whereBuilder.andWhere(+ buildBooleanCondition(column, 'IS NOT', comparison.isNot ?? null),+ );+ }+};++// Translates a nestjs-query style filter ({ and, or, field: { eq, in, ... } })+// into TypeORM query builder conditions. Top-level field conditions, `and`+// entries and separate comparisons on one field are combined with AND; `or`+// groups are bracketed and combined with OR.+export const applyMetadataFilterToQueryBuilder = <+ TFilter extends MetadataFilterShape<TFilter>,+>({+ whereBuilder,+ alias,+ filter,+ columnByFilterField,+ parameterCounter = { value: 0 },+}: {+ whereBuilder: WhereExpressionBuilder;+ alias: string;+ filter: TFilter;+ columnByFilterField: Record<string, MetadataFilterColumn>;+ parameterCounter?: ParameterCounter;+}): void => {+ for (const [filterField, filterValue] of Object.entries(filter)) {+ if (!isDefined(filterValue)) {+ continue;+ }++ if (filterField === 'and') {+ for (const subFilter of filterValue as TFilter[]) {+ whereBuilder.andWhere(+ new Brackets((subWhereBuilder) =>+ applyMetadataFilterToQueryBuilder({+ whereBuilder: subWhereBuilder,+ alias,+ filter: subFilter,+ columnByFilterField,+ parameterCounter,+ }),+ ),+ );+ }+ continue;+ }++ if (filterField === 'or') {+ whereBuilder.andWhere(+ new Brackets((orWhereBuilder) => {+ for (const subFilter of filterValue as TFilter[]) {+ orWhereBuilder.orWhere(+ new Brackets((subWhereBuilder) =>+ applyMetadataFilterToQueryBuilder({+ whereBuilder: subWhereBuilder,+ alias,+ filter: subFilter,+ columnByFilterField,+ parameterCounter,+ }),+ ),+ );+ }+ }),+ );+ continue;+ }++ const filterColumn = columnByFilterField[filterField];++ if (!isDefined(filterColumn)) {+ throw new UserInputError(`Unknown filter field: ${filterField}`);+ }++ const { column } = filterColumn;+ const comparison = normalizeMetadataComparison({+ comparison: filterValue as MetadataFilterComparison,+ column: filterColumn,+ });++ applyComparisonToQueryBuilder({+ whereBuilder,+ column: `"${alias}"."${column}"`,+ comparison,+ parameterCounter,+ });+ }+};++const matchesSqlLikePattern = (value: string, pattern: string): boolean => {+ const escapedPattern = pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');+ const regularExpressionPattern = escapedPattern+ .replace(/%/g, '.*')+ .replace(/_/g, '.');++ return new RegExp(`^${regularExpressionPattern}$`).test(value);+};++const matchesMetadataComparison = ({+ value,+ comparison,+ column,+}: {+ value: unknown;+ comparison: MetadataFilterComparison;+ column: MetadataFilterColumn;+}): boolean => {+ const normalizedComparison = normalizeMetadataComparison({+ comparison,+ column,+ });+ const normalizedValue =+ column.type === 'uuid' ? lowercaseValue(value) : value;++ const stringValue =+ typeof normalizedValue === 'string' ? normalizedValue : undefined;+ const simpleComparisons: [+ keyof MetadataFilterComparison,+ (comparisonValue: unknown) => boolean,+ ][] = [+ ['eq', (comparisonValue) => normalizedValue === comparisonValue],+ ['neq', (comparisonValue) => normalizedValue !== comparisonValue],+ [+ 'gt',+ (comparisonValue) =>+ isDefined(stringValue) &&+ typeof comparisonValue === 'string' &&+ stringValue > comparisonValue,+ ],+ [+ 'gte',+ (comparisonValue) =>+ isDefined(stringValue) &&+ typeof comparisonValue === 'string' &&+ stringValue >= comparisonValue,+ ],+ [+ 'lt',+ (comparisonValue) =>+ isDefined(stringValue) &&+ typeof comparisonValue === 'string' &&+ stringValue < comparisonValue,+ ],+ [+ 'lte',+ (comparisonValue) =>+ isDefined(stringValue) &&+ typeof comparisonValue === 'string' &&+ stringValue <= comparisonValue,+ ],+ ];++ for (const [comparisonKey, matches] of simpleComparisons) {+ const comparisonValue = normalizedComparison[comparisonKey];++ if (isDefined(comparisonValue) && !matches(comparisonValue)) {+ return false;+ }+ }++ const likeComparisons: [keyof MetadataFilterComparison, boolean, boolean][] =+ [+ ['like', false, false],+ ['notLike', false, true],+ ['iLike', true, false],+ ['notILike', true, true],+ ];++ for (const [comparisonKey, caseInsensitive, negate] of likeComparisons) {+ const comparisonValue = normalizedComparison[comparisonKey];++ if (!isDefined(comparisonValue)) {+ continue;+ }++ if (!isDefined(stringValue) || typeof comparisonValue !== 'string') {+ return false;+ }++ const candidate = caseInsensitive ? stringValue.toLowerCase() : stringValue;+ const pattern = caseInsensitive+ ? comparisonValue.toLowerCase()+ : comparisonValue;+ const matches = matchesSqlLikePattern(candidate, pattern);++ if (negate ? matches : !matches) {+ return false;+ }+ }++ if (+ isDefined(normalizedComparison.in) &&+ !normalizedComparison.in.includes(normalizedValue)+ ) {+ return false;+ }++ if (+ isDefined(normalizedComparison.notIn) &&+ normalizedComparison.notIn.includes(normalizedValue)+ ) {+ return false;+ }++ if (+ normalizedComparison.is !== undefined &&+ (normalizedComparison.is === null+ ? normalizedValue !== null && normalizedValue !== undefined+ : normalizedValue !== normalizedComparison.is)+ ) {+ return false;+ }++ if (+ normalizedComparison.isNot !== undefined &&+ (normalizedComparison.isNot === null+ ? normalizedValue === null || normalizedValue === undefined+ : normalizedValue === normalizedComparison.isNot)+ ) {+ return false;+ }++ return true;+};++export const applyMetadataFilterToItems = <+ TEntity extends { id: string },+ TFilter extends MetadataFilterShape<TFilter>,+>({+ items,+ filter,+ columnByFilterField,+}: {+ items: TEntity[];+ filter: TFilter;+ columnByFilterField: Record<string, MetadataFilterColumn>;+}): TEntity[] =>+ items.filter((item) => {+ for (const [filterField, filterValue] of Object.entries(filter)) {+ if (!isDefined(filterValue)) {+ continue;+ }++ if (filterField === 'and') {+ if (+ !(filterValue as TFilter[]).every(+ (subFilter) =>+ applyMetadataFilterToItems({+ items: [item],+ filter: subFilter,+ columnByFilterField,+ }).length === 1,+ )+ ) {+ return false;+ }++ continue;+ }++ if (filterField === 'or') {+ const subFilters = filterValue as TFilter[];++ if (+ subFilters.length > 0 &&+ !subFilters.some(+ (subFilter) =>+ applyMetadataFilterToItems({+ items: [item],+ filter: subFilter,+ columnByFilterField,+ }).length === 1,+ )+ ) {+ return false;+ }++ continue;+ }++ const column = columnByFilterField[filterField];++ if (!isDefined(column)) {+ throw new UserInputError(`Unknown filter field: ${filterField}`);+ }++ const value: unknown = Reflect.get(item, column.column);++ if (+ !matchesMetadataComparison({+ value,+ comparison: filterValue as MetadataFilterComparison,+ column,+ })+ ) {+ return false;+ }+ }++ return true;+ });diff --git a/packages/twenty-server/src/engine/metadata-modules/pagination/utils/build-metadata-cursor-page.util.ts b/packages/twenty-server/src/engine/metadata-modules/pagination/utils/build-metadata-cursor-page.util.tsnew file mode 100644index 00000000000..d4fdf9d2896--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/pagination/utils/build-metadata-cursor-page.util.ts@@ -0,0 +1,30 @@+import { isDefined } from 'twenty-shared/utils';++import { buildCursorPage } from 'src/engine/api/utils/build-cursor-page.util';+import { type MetadataCursorPage } from 'src/engine/metadata-modules/pagination/types/metadata-cursor-page.type';+import { type MetadataCursorPagination } from 'src/engine/metadata-modules/pagination/types/metadata-cursor-pagination.type';++export const buildMetadataCursorPage = <TEntity extends { id: string }>({+ fetchedItems,+ pagination,+}: {+ fetchedItems: TEntity[];+ pagination: MetadataCursorPagination;+}): MetadataCursorPage<TEntity> => {+ const { items, pageInfo } = buildCursorPage({+ fetchedItems,+ limit: pagination.limit,+ direction: pagination.direction,+ hasAfterCursor: isDefined(pagination.afterId),+ hasBeforeCursor: isDefined(pagination.beforeId),+ });++ return {+ items,+ pageInfo: {+ ...pageInfo,+ startCursor: items[0]?.id ?? null,+ endCursor: items[items.length - 1]?.id ?? null,+ },+ };+};diff --git a/packages/twenty-server/src/engine/metadata-modules/pagination/utils/find-many-items-with-cursor-pagination.util.ts b/packages/twenty-server/src/engine/metadata-modules/pagination/utils/find-many-items-with-cursor-pagination.util.tsnew file mode 100644index 00000000000..b338b204057--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/pagination/utils/find-many-items-with-cursor-pagination.util.ts@@ -0,0 +1,27 @@+import { type CursorConnection } from 'src/engine/metadata-modules/pagination/dtos/cursor-connection-type.factory';+import { type CursorPagingInput } from 'src/engine/metadata-modules/pagination/dtos/cursor-paging.input';+import { paginateMetadataItemsById } from 'src/engine/metadata-modules/pagination/utils/paginate-metadata-items-by-id.util';+import { parseGraphqlMetadataPagination } from 'src/engine/metadata-modules/pagination/utils/parse-graphql-metadata-pagination.util';+import { toCursorConnection } from 'src/engine/metadata-modules/pagination/utils/to-cursor-connection.util';++export const findManyItemsWithCursorPagination = <+ TEntity extends { id: string },+>({+ items,+ paging,+ defaultResultSize,+ maxResultsSize,+}: {+ items: TEntity[];+ paging: CursorPagingInput | undefined;+ defaultResultSize?: number;+ maxResultsSize?: number;+}): CursorConnection<TEntity> => {+ const pagination = parseGraphqlMetadataPagination({+ paging,+ defaultResultSize,+ maxResultsSize,+ });++ return toCursorConnection(paginateMetadataItemsById({ items, pagination }));+};diff --git a/packages/twenty-server/src/engine/metadata-modules/pagination/utils/find-many-with-cursor-pagination.util.ts b/packages/twenty-server/src/engine/metadata-modules/pagination/utils/find-many-with-cursor-pagination.util.tsnew file mode 100644index 00000000000..28d449d8d29--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/pagination/utils/find-many-with-cursor-pagination.util.ts@@ -0,0 +1,39 @@+import { type ObjectLiteral, type SelectQueryBuilder } from 'typeorm';++import { type CursorConnection } from 'src/engine/metadata-modules/pagination/dtos/cursor-connection-type.factory';+import { type CursorPagingInput } from 'src/engine/metadata-modules/pagination/dtos/cursor-paging.input';+import { paginateMetadataQueryBuilder } from 'src/engine/metadata-modules/pagination/utils/paginate-metadata-query-builder.util';+import { parseGraphqlMetadataPagination } from 'src/engine/metadata-modules/pagination/utils/parse-graphql-metadata-pagination.util';+import { toCursorConnection } from 'src/engine/metadata-modules/pagination/utils/to-cursor-connection.util';++type EntityWithId = ObjectLiteral & { id: string };++// Cursor pagination over core metadata entities, replacing the resolvers+// auto-generated by @ptc-org/nestjs-query-graphql. Sorting is fixed to+// id DESC, which both the objects and fields queries used as default sort+// with sorting disabled. Cursors are keyset cursors on id.+export const findManyWithCursorPagination = async <+ TEntity extends EntityWithId,+>({+ queryBuilder,+ alias,+ paging,+ defaultResultSize,+ maxResultsSize,+}: {+ queryBuilder: SelectQueryBuilder<TEntity>;+ alias: string;+ paging: CursorPagingInput | undefined;+ defaultResultSize?: number;+ maxResultsSize?: number;+}): Promise<CursorConnection<TEntity>> => {+ const pagination = parseGraphqlMetadataPagination({+ paging,+ defaultResultSize,+ maxResultsSize,+ });++ return toCursorConnection(+ await paginateMetadataQueryBuilder({ queryBuilder, alias, pagination }),+ );+};diff --git a/packages/twenty-server/src/engine/metadata-modules/pagination/utils/paginate-metadata-items-by-id.util.ts b/packages/twenty-server/src/engine/metadata-modules/pagination/utils/paginate-metadata-items-by-id.util.tsnew file mode 100644index 00000000000..b9fdd1a596b--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/pagination/utils/paginate-metadata-items-by-id.util.ts@@ -0,0 +1,35 @@+import { isDefined } from 'twenty-shared/utils';++import { type MetadataCursorPage } from 'src/engine/metadata-modules/pagination/types/metadata-cursor-page.type';+import { type MetadataCursorPagination } from 'src/engine/metadata-modules/pagination/types/metadata-cursor-pagination.type';+import { buildMetadataCursorPage } from 'src/engine/metadata-modules/pagination/utils/build-metadata-cursor-page.util';++export const paginateMetadataItemsById = <TEntity extends { id: string }>({+ items,+ pagination,+}: {+ items: TEntity[];+ pagination: MetadataCursorPagination;+}): MetadataCursorPage<TEntity> => {+ const isBackwardPagination = pagination.direction === 'backward';+ const fetchedItems = items+ .filter(({ id }) => {+ if (isDefined(pagination.afterId)) {+ return id < pagination.afterId;+ }++ if (isDefined(pagination.beforeId)) {+ return id > pagination.beforeId;+ }++ return true;+ })+ .sort(({ id: firstId }, { id: secondId }) =>+ isBackwardPagination+ ? firstId.localeCompare(secondId)+ : secondId.localeCompare(firstId),+ )+ .slice(0, pagination.limit + 1);++ return buildMetadataCursorPage({ fetchedItems, pagination });+};diff --git a/packages/twenty-server/src/engine/metadata-modules/pagination/utils/paginate-metadata-ordered-items.util.ts b/packages/twenty-server/src/engine/metadata-modules/pagination/utils/paginate-metadata-ordered-items.util.tsnew file mode 100644index 00000000000..ed3be3c2e88--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/pagination/utils/paginate-metadata-ordered-items.util.ts@@ -0,0 +1,41 @@+import { isDefined } from 'twenty-shared/utils';++import { type MetadataCursorPage } from 'src/engine/metadata-modules/pagination/types/metadata-cursor-page.type';+import { type MetadataCursorPagination } from 'src/engine/metadata-modules/pagination/types/metadata-cursor-pagination.type';+import { buildMetadataCursorPage } from 'src/engine/metadata-modules/pagination/utils/build-metadata-cursor-page.util';++// Some metadata collections have meaningful domain ordering (for example view+// fields by position). Their cursor is an identity marker within that stable+// ordered result, not a sortable key.+export const paginateMetadataOrderedItems = <TEntity extends { id: string }>({+ items,+ pagination,+}: {+ items: TEntity[];+ pagination: MetadataCursorPagination;+}): MetadataCursorPage<TEntity> => {+ const cursorId = pagination.afterId ?? pagination.beforeId;+ // Cursors are accepted in any UUID casing, so identity is matched+ // case-insensitively against the canonical lowercase ids.+ const normalizedCursorId = cursorId?.toLowerCase();+ const cursorIndex = isDefined(normalizedCursorId)+ ? items.findIndex(({ id }) => id.toLowerCase() === normalizedCursorId)+ : undefined;++ if (cursorIndex === -1) {+ return buildMetadataCursorPage({ fetchedItems: [], pagination });+ }++ const fetchedItems =+ pagination.direction === 'backward'+ ? items+ .slice(0, cursorIndex ?? items.length)+ .reverse()+ .slice(0, pagination.limit + 1)+ : items.slice(+ (cursorIndex ?? -1) + 1,+ (cursorIndex ?? -1) + pagination.limit + 2,+ );++ return buildMetadataCursorPage({ fetchedItems, pagination });+};diff --git a/packages/twenty-server/src/engine/metadata-modules/pagination/utils/paginate-metadata-query-builder.util.ts b/packages/twenty-server/src/engine/metadata-modules/pagination/utils/paginate-metadata-query-builder.util.tsnew file mode 100644index 00000000000..ecf9760cdfb--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/pagination/utils/paginate-metadata-query-builder.util.ts@@ -0,0 +1,41 @@+import { isDefined } from 'twenty-shared/utils';+import { type ObjectLiteral, type SelectQueryBuilder } from 'typeorm';++import { type MetadataCursorPage } from 'src/engine/metadata-modules/pagination/types/metadata-cursor-page.type';+import { type MetadataCursorPagination } from 'src/engine/metadata-modules/pagination/types/metadata-cursor-pagination.type';+import { buildMetadataCursorPage } from 'src/engine/metadata-modules/pagination/utils/build-metadata-cursor-page.util';++export const paginateMetadataQueryBuilder = async <+ TEntity extends ObjectLiteral & { id: string },+>({+ queryBuilder,+ alias,+ pagination,+}: {+ queryBuilder: SelectQueryBuilder<TEntity>;+ alias: string;+ pagination: MetadataCursorPagination;+}): Promise<MetadataCursorPage<TEntity>> => {+ const isBackwardPagination = pagination.direction === 'backward';++ queryBuilder.orderBy(+ `"${alias}"."id"`,+ isBackwardPagination ? 'ASC' : 'DESC',+ );++ if (isDefined(pagination.afterId)) {+ queryBuilder.andWhere(`"${alias}"."id" < :metadataPaginationCursorId`, {+ metadataPaginationCursorId: pagination.afterId,+ });+ }++ if (isDefined(pagination.beforeId)) {+ queryBuilder.andWhere(`"${alias}"."id" > :metadataPaginationCursorId`, {+ metadataPaginationCursorId: pagination.beforeId,+ });+ }++ const fetchedItems = await queryBuilder.take(pagination.limit + 1).getMany();++ return buildMetadataCursorPage({ fetchedItems, pagination });+};diff --git a/packages/twenty-server/src/engine/metadata-modules/pagination/utils/parse-graphql-metadata-pagination.util.ts b/packages/twenty-server/src/engine/metadata-modules/pagination/utils/parse-graphql-metadata-pagination.util.tsnew file mode 100644index 00000000000..921918561f1--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/pagination/utils/parse-graphql-metadata-pagination.util.ts@@ -0,0 +1,79 @@+import { isDefined } from 'twenty-shared/utils';+import { validate as uuidValidate } from 'uuid';++import { decodeCursor } from 'src/engine/api/graphql/graphql-query-runner/utils/cursors.util';+import { UserInputError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';+import { type CursorPagingInput } from 'src/engine/metadata-modules/pagination/dtos/cursor-paging.input';+import { type MetadataCursorPagination } from 'src/engine/metadata-modules/pagination/types/metadata-cursor-pagination.type';++const DEFAULT_METADATA_GRAPHQL_PAGE_SIZE = 10;+const MAX_METADATA_GRAPHQL_PAGE_SIZE = 1000;++const decodeCursorIdOrThrow = (cursor: string): string => {+ let cursorData: unknown;++ try {+ cursorData = decodeCursor(cursor);+ } catch {+ throw new UserInputError(`Invalid cursor: ${cursor}`);+ }++ if (+ typeof cursorData !== 'object' ||+ cursorData === null ||+ Array.isArray(cursorData) ||+ typeof (cursorData as { id?: unknown }).id !== 'string' ||+ !uuidValidate((cursorData as { id: string }).id)+ ) {+ throw new UserInputError(`Invalid cursor: ${cursor}`);+ }++ return (cursorData as { id: string }).id;+};++export const parseGraphqlMetadataPagination = ({+ paging,+ defaultResultSize = DEFAULT_METADATA_GRAPHQL_PAGE_SIZE,+ maxResultsSize = MAX_METADATA_GRAPHQL_PAGE_SIZE,+}: {+ paging: CursorPagingInput | undefined;+ defaultResultSize?: number;+ maxResultsSize?: number;+}): MetadataCursorPagination => {+ const { first, last, after, before } = paging ?? {};++ if (isDefined(first) && isDefined(last)) {+ throw new UserInputError('Cannot use both first and last');+ }++ if (isDefined(first) && isDefined(before)) {+ throw new UserInputError('Cannot use first with before');+ }++ if (isDefined(last) && isDefined(after)) {+ throw new UserInputError('Cannot use last with after');+ }++ if (isDefined(after) && isDefined(before)) {+ throw new UserInputError('Cannot use both after and before');+ }++ if ((isDefined(first) && first < 0) || (isDefined(last) && last < 0)) {+ throw new UserInputError('Page size cannot be negative');+ }++ const limit = first ?? last ?? defaultResultSize;++ if (limit > maxResultsSize) {+ throw new UserInputError(+ `Requested page size of ${limit} exceeds the maximum size of ${maxResultsSize}`,+ );+ }++ return {+ limit,+ direction: isDefined(last) || isDefined(before) ? 'backward' : 'forward',+ afterId: isDefined(after) ? decodeCursorIdOrThrow(after) : undefined,+ beforeId: isDefined(before) ? decodeCursorIdOrThrow(before) : undefined,+ };+};diff --git a/packages/twenty-server/src/engine/metadata-modules/pagination/utils/to-cursor-connection.util.ts b/packages/twenty-server/src/engine/metadata-modules/pagination/utils/to-cursor-connection.util.tsnew file mode 100644index 00000000000..8ab9c7ff7c7--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/pagination/utils/to-cursor-connection.util.ts@@ -0,0 +1,25 @@+import { isDefined } from 'twenty-shared/utils';++import { encodeCursorData } from 'src/engine/api/graphql/graphql-query-runner/utils/cursors.util';+import { type CursorConnection } from 'src/engine/metadata-modules/pagination/dtos/cursor-connection-type.factory';+import { type MetadataCursorPage } from 'src/engine/metadata-modules/pagination/types/metadata-cursor-page.type';++export const toCursorConnection = <TEntity extends { id: string }>({+ items,+ pageInfo,+}: MetadataCursorPage<TEntity>): CursorConnection<TEntity> => ({+ edges: items.map((node) => ({+ node,+ cursor: encodeCursorData({ id: node.id }),+ })),+ pageInfo: {+ hasNextPage: pageInfo.hasNextPage,+ hasPreviousPage: pageInfo.hasPreviousPage,+ startCursor: isDefined(pageInfo.startCursor)+ ? encodeCursorData({ id: pageInfo.startCursor })+ : null,+ endCursor: isDefined(pageInfo.endCursor)+ ? encodeCursorData({ id: pageInfo.endCursor })+ : null,+ },+});diff --git a/packages/twenty-server/src/engine/metadata-modules/search-field-metadata/dtos/search-field-metadata.dto.ts b/packages/twenty-server/src/engine/metadata-modules/search-field-metadata/dtos/search-field-metadata.dto.tsindex 9510c9ceb21..a594a6d0bb2 100644--- a/packages/twenty-server/src/engine/metadata-modules/search-field-metadata/dtos/search-field-metadata.dto.ts+++ b/packages/twenty-server/src/engine/metadata-modules/search-field-metadata/dtos/search-field-metadata.dto.ts@@ -1,30 +1,14 @@import { Field, HideField, ObjectType } from '@nestjs/graphql';-import {- Authorize,- IDField,- QueryOptions,-} from '@ptc-org/nestjs-query-graphql';import { IsDateString, IsNotEmpty, IsNumber, IsUUID } from 'class-validator';import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';@ObjectType('SearchField')-@Authorize({- // oxlint-disable-next-line typescript/no-explicit-any- authorize: (context: any) => ({- workspaceId: { eq: context?.req?.workspace?.id },- }),-})-@QueryOptions({- defaultResultSize: 10,- disableSort: true,- maxResultsSize: 1000,-})export class SearchFieldMetadataDTO {@IsUUID()@IsNotEmpty()- @IDField(() => UUIDScalarType)+ @Field(() => UUIDScalarType)id: string;objectMetadataId: string;diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field/controllers/view-field.controller.ts b/packages/twenty-server/src/engine/metadata-modules/view-field/controllers/view-field.controller.tsindex 64607abefef..2751ee4bb88 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-field/controllers/view-field.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-field/controllers/view-field.controller.ts@@ -7,6 +7,7 @@ import {Patch,Post,Query,+ Req,UseFilters,UseGuards,} from '@nestjs/common';@@ -15,6 +16,8 @@ import { ApiPath } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { paginateMetadataRestItems } from 'src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util';+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';@@ -51,14 +54,15 @@ export class ViewFieldController {@Get()@UseGuards(NoPermissionGuard)async findMany(+ @Req() request: AuthenticatedRequest,@AuthWorkspace() workspace: WorkspaceEntity,@Query('viewId') viewId?: string,- ): Promise<ViewFieldDTO[]> {- if (viewId) {- return this.viewFieldService.findByViewId(workspace.id, viewId);- }+ ) {+ const items = viewId+ ? await this.viewFieldService.findByViewId(workspace.id, viewId)+ : await this.viewFieldService.findByWorkspaceId(workspace.id);- return this.viewFieldService.findByWorkspaceId(workspace.id);+ return paginateMetadataRestItems({ items, request });}@Get(':id')diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field/services/view-field.service.ts b/packages/twenty-server/src/engine/metadata-modules/view-field/services/view-field.service.tsindex af84cd446f5..6f710f6d095 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-field/services/view-field.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-field/services/view-field.service.ts@@ -354,7 +354,7 @@ export class ViewFieldService {.filter(isDefined).filter((field) => !isDefined(field.deletedAt)).map(fromFlatViewFieldToViewFieldDto)- .sort((a, b) => a.position - b.position);+ .sort((a, b) => a.position - b.position || a.id.localeCompare(b.id));}async findByViewId(@@ -373,7 +373,7 @@ export class ViewFieldService {.filter(isDefined).filter((field) => field.viewId === viewId && !isDefined(field.deletedAt)).map(fromFlatViewFieldToViewFieldDto)- .sort((a, b) => a.position - b.position);+ .sort((a, b) => a.position - b.position || a.id.localeCompare(b.id));}async findById(diff --git a/packages/twenty-server/src/engine/metadata-modules/view-filter-group/controllers/view-filter-group.controller.ts b/packages/twenty-server/src/engine/metadata-modules/view-filter-group/controllers/view-filter-group.controller.tsindex 7463dd65d5e..5762072cad9 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-filter-group/controllers/view-filter-group.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-filter-group/controllers/view-filter-group.controller.ts@@ -7,6 +7,7 @@ import {Patch,Post,Query,+ Req,UseFilters,UseGuards,} from '@nestjs/common';@@ -15,6 +16,8 @@ import { ApiPath } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { paginateMetadataRestItems } from 'src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util';+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';@@ -53,14 +56,15 @@ export class ViewFilterGroupController {@Get()@UseGuards(NoPermissionGuard)async findMany(+ @Req() request: AuthenticatedRequest,@AuthWorkspace() workspace: WorkspaceEntity,@Query('viewId') viewId?: string,- ): Promise<ViewFilterGroupDTO[]> {- if (viewId) {- return this.viewFilterGroupService.findByViewId(workspace.id, viewId);- }+ ) {+ const items = viewId+ ? await this.viewFilterGroupService.findByViewId(workspace.id, viewId)+ : await this.viewFilterGroupService.findByWorkspaceId(workspace.id);- return this.viewFilterGroupService.findByWorkspaceId(workspace.id);+ return paginateMetadataRestItems({ items, request });}@Get(':id')diff --git a/packages/twenty-server/src/engine/metadata-modules/view-filter-group/services/tests/view-filter-group.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/view-filter-group/services/tests/view-filter-group.service.spec.tsindex 24d65675f61..fe088dc3449 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-filter-group/services/tests/view-filter-group.service.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-filter-group/services/tests/view-filter-group.service.spec.ts@@ -88,7 +88,7 @@ describe('ViewFilterGroupService', () => {where: {deletedAt: expect.anything(),},- order: { positionInViewFilterGroup: 'ASC' },+ order: { positionInViewFilterGroup: 'ASC', id: 'ASC' },relations: ['workspace','view',@@ -121,7 +121,7 @@ describe('ViewFilterGroupService', () => {viewId,deletedAt: expect.anything(),},- order: { positionInViewFilterGroup: 'ASC' },+ order: { positionInViewFilterGroup: 'ASC', id: 'ASC' },relations: ['workspace','view',diff --git a/packages/twenty-server/src/engine/metadata-modules/view-filter-group/services/view-filter-group.service.ts b/packages/twenty-server/src/engine/metadata-modules/view-filter-group/services/view-filter-group.service.tsindex 6823eddab6f..4c5046faf30 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-filter-group/services/view-filter-group.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-filter-group/services/view-filter-group.service.ts@@ -325,7 +325,7 @@ export class ViewFilterGroupService {where: {deletedAt: IsNull(),},- order: { positionInViewFilterGroup: 'ASC' },+ order: { positionInViewFilterGroup: 'ASC', id: 'ASC' },relations: ['workspace','view',@@ -345,7 +345,7 @@ export class ViewFilterGroupService {viewId,deletedAt: IsNull(),},- order: { positionInViewFilterGroup: 'ASC' },+ order: { positionInViewFilterGroup: 'ASC', id: 'ASC' },relations: ['workspace','view',diff --git a/packages/twenty-server/src/engine/metadata-modules/view-filter/controllers/view-filter.controller.ts b/packages/twenty-server/src/engine/metadata-modules/view-filter/controllers/view-filter.controller.tsindex c3f7bb920d7..095e04eb9c3 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-filter/controllers/view-filter.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-filter/controllers/view-filter.controller.ts@@ -7,6 +7,7 @@ import {Patch,Post,Query,+ Req,UseFilters,UseGuards,} from '@nestjs/common';@@ -15,6 +16,8 @@ import { ApiPath } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { parseMetadataRestPagination } from 'src/engine/api/rest/metadata/utils/parse-metadata-rest-pagination.util';+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';@@ -51,14 +54,23 @@ export class ViewFilterController {@Get()@UseGuards(NoPermissionGuard)async findMany(+ @Req() request: AuthenticatedRequest,@AuthWorkspace() workspace: WorkspaceEntity,@Query('viewId') viewId?: string,- ): Promise<ViewFilterDTO[]> {- if (viewId) {- return this.viewFilterService.findByViewId(workspace.id, viewId);- }+ ) {+ const page = await this.viewFilterService.findManyPaginated({+ workspaceId: workspace.id,+ // An empty viewId means "no filter", matching the sibling view+ // controllers, rather than filtering on the empty string.+ viewId: viewId === '' ? undefined : viewId,+ pagination: parseMetadataRestPagination(request),+ });- return this.viewFilterService.findByWorkspaceId(workspace.id);+ return {+ data: page.items,+ pageInfo: page.pageInfo,+ totalCount: page.totalCount,+ };}@Get(':id')diff --git a/packages/twenty-server/src/engine/metadata-modules/view-filter/services/view-filter.service.ts b/packages/twenty-server/src/engine/metadata-modules/view-filter/services/view-filter.service.tsindex 0c40260c719..56825669cc9 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-filter/services/view-filter.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-filter/services/view-filter.service.ts@@ -1,5 +1,6 @@import { Injectable } from '@nestjs/common';+import { isDefined } from 'twenty-shared/utils';import { IsNull } from 'typeorm';import { ApplicationService } from 'src/engine/core-modules/application/application.service';@@ -10,6 +11,9 @@ import { fromCreateViewFilterInputToFlatViewFilterToCreate } from 'src/engine/meimport { fromDeleteViewFilterInputToFlatViewFilterOrThrow } from 'src/engine/metadata-modules/flat-view-filter/utils/from-delete-view-filter-input-to-flat-view-filter-or-throw.util';import { fromDestroyViewFilterInputToFlatViewFilterOrThrow } from 'src/engine/metadata-modules/flat-view-filter/utils/from-destroy-view-filter-input-to-flat-view-filter-or-throw.util';import { fromUpdateViewFilterInputToFlatViewFilterToUpdateOrThrow } from 'src/engine/metadata-modules/flat-view-filter/utils/from-update-view-filter-input-to-flat-view-filter-to-update-or-throw.util';+import { type MetadataCursorPage } from 'src/engine/metadata-modules/pagination/types/metadata-cursor-page.type';+import { type MetadataCursorPagination } from 'src/engine/metadata-modules/pagination/types/metadata-cursor-pagination.type';+import { paginateMetadataOrderedItems } from 'src/engine/metadata-modules/pagination/utils/paginate-metadata-ordered-items.util';import { CreateViewFilterInput } from 'src/engine/metadata-modules/view-filter/dtos/inputs/create-view-filter.input';import { DeleteViewFilterInput } from 'src/engine/metadata-modules/view-filter/dtos/inputs/delete-view-filter.input';import { DestroyViewFilterInput } from 'src/engine/metadata-modules/view-filter/dtos/inputs/destroy-view-filter.input';@@ -324,11 +328,55 @@ export class ViewFilterService {where: {deletedAt: IsNull(),},- order: { positionInViewFilterGroup: 'ASC' },+ order: { positionInViewFilterGroup: 'ASC', id: 'ASC' },relations: ['workspace', 'view', 'viewFilterGroup'],});}+ async findManyPaginated({+ workspaceId,+ viewId,+ pagination,+ }: {+ workspaceId: string;+ viewId?: string;+ pagination: MetadataCursorPagination;+ }): Promise<MetadataCursorPage<ViewFilterDTO> & { totalCount: number }> {+ const { flatViewFilterMaps } =+ await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(+ {+ workspaceId,+ flatMapsKeys: ['flatViewFilterMaps'],+ },+ );+ const flatViewFilters = Object.values(+ flatViewFilterMaps.byUniversalIdentifier,+ )+ .filter(isDefined)+ .filter(+ (flatViewFilter) =>+ flatViewFilter.workspaceId === workspaceId &&+ flatViewFilter.deletedAt === null &&+ (!isDefined(viewId) || flatViewFilter.viewId === viewId),+ )+ .sort(+ (first, second) =>+ (first.positionInViewFilterGroup ?? Number.POSITIVE_INFINITY) -+ (second.positionInViewFilterGroup ?? Number.POSITIVE_INFINITY) ||+ first.id.localeCompare(second.id),+ );+ const page = paginateMetadataOrderedItems({+ items: flatViewFilters,+ pagination,+ });++ return {+ ...page,+ items: page.items.map(fromFlatViewFilterToViewFilterDto),+ totalCount: flatViewFilters.length,+ };+ }+async findByViewId(workspaceId: string,viewId: string,@@ -338,7 +386,7 @@ export class ViewFilterService {viewId,deletedAt: IsNull(),},- order: { positionInViewFilterGroup: 'ASC' },+ order: { positionInViewFilterGroup: 'ASC', id: 'ASC' },relations: ['workspace', 'view', 'viewFilterGroup'],});}diff --git a/packages/twenty-server/src/engine/metadata-modules/view-group/controllers/view-group.controller.ts b/packages/twenty-server/src/engine/metadata-modules/view-group/controllers/view-group.controller.tsindex cb35b865482..461b9955ab0 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-group/controllers/view-group.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-group/controllers/view-group.controller.ts@@ -7,6 +7,7 @@ import {Patch,Post,Query,+ Req,UseFilters,UseGuards,} from '@nestjs/common';@@ -15,6 +16,8 @@ import { ApiPath } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { paginateMetadataRestItems } from 'src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util';+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';@@ -51,14 +54,15 @@ export class ViewGroupController {@Get()@UseGuards(NoPermissionGuard)async findMany(+ @Req() request: AuthenticatedRequest,@AuthWorkspace() workspace: WorkspaceEntity,@Query('viewId') viewId?: string,- ): Promise<ViewGroupDTO[]> {- if (viewId) {- return this.viewGroupService.findByViewId(workspace.id, viewId);- }+ ) {+ const items = viewId+ ? await this.viewGroupService.findByViewId(workspace.id, viewId)+ : await this.viewGroupService.findByWorkspaceId(workspace.id);- return this.viewGroupService.findByWorkspaceId(workspace.id);+ return paginateMetadataRestItems({ items, request });}@Get(':id')diff --git a/packages/twenty-server/src/engine/metadata-modules/view-group/services/view-group.service.ts b/packages/twenty-server/src/engine/metadata-modules/view-group/services/view-group.service.tsindex bc780a18e1a..02db9a6691f 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-group/services/view-group.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-group/services/view-group.service.ts@@ -384,7 +384,7 @@ export class ViewGroupService {where: {deletedAt: IsNull(),},- order: { position: 'ASC' },+ order: { position: 'ASC', id: 'ASC' },relations: ['workspace', 'view'],});}@@ -398,7 +398,7 @@ export class ViewGroupService {viewId,deletedAt: IsNull(),},- order: { position: 'ASC' },+ order: { position: 'ASC', id: 'ASC' },relations: ['workspace', 'view'],});}diff --git a/packages/twenty-server/src/engine/metadata-modules/view-sort/controllers/view-sort.controller.ts b/packages/twenty-server/src/engine/metadata-modules/view-sort/controllers/view-sort.controller.tsindex d5f8949db52..bd22afe0bef 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-sort/controllers/view-sort.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-sort/controllers/view-sort.controller.ts@@ -7,6 +7,7 @@ import {Patch,Post,Query,+ Req,UseFilters,UseGuards,} from '@nestjs/common';@@ -15,6 +16,8 @@ import { ApiPath, ViewSortDirection } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { paginateMetadataRestItems } from 'src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util';+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';@@ -49,14 +52,15 @@ export class ViewSortController {@Get()@UseGuards(NoPermissionGuard)async findMany(+ @Req() request: AuthenticatedRequest,@AuthWorkspace() workspace: WorkspaceEntity,@Query('viewId') viewId?: string,- ): Promise<ViewSortDTO[]> {- if (viewId) {- return this.viewSortService.findByViewId(workspace.id, viewId);- }+ ) {+ const items = viewId+ ? await this.viewSortService.findByViewId(workspace.id, viewId)+ : await this.viewSortService.findByWorkspaceId(workspace.id);- return this.viewSortService.findByWorkspaceId(workspace.id);+ return paginateMetadataRestItems({ items, request });}@Get(':id')diff --git a/packages/twenty-server/src/engine/metadata-modules/view-sort/services/view-sort.service.ts b/packages/twenty-server/src/engine/metadata-modules/view-sort/services/view-sort.service.tsindex 7a8bfa44866..7cf799f3a9b 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-sort/services/view-sort.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-sort/services/view-sort.service.ts@@ -306,6 +306,7 @@ export class ViewSortService {where: {deletedAt: IsNull(),},+ order: { createdAt: 'ASC', id: 'ASC' },relations: ['workspace', 'view'],});}@@ -319,6 +320,7 @@ export class ViewSortService {viewId,deletedAt: IsNull(),},+ order: { createdAt: 'ASC', id: 'ASC' },relations: ['workspace', 'view'],});}diff --git a/packages/twenty-server/src/engine/metadata-modules/view/controllers/view.controller.ts b/packages/twenty-server/src/engine/metadata-modules/view/controllers/view.controller.tsindex 3c127244e93..ad3fa97ae26 100644--- a/packages/twenty-server/src/engine/metadata-modules/view/controllers/view.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view/controllers/view.controller.ts@@ -7,6 +7,7 @@ import {Patch,Post,Query,+ Req,UseFilters,UseGuards,} from '@nestjs/common';@@ -16,6 +17,8 @@ import { ApiPath } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { I18nService } from 'src/engine/core-modules/i18n/i18n.service';+import { parseMetadataRestPagination } from 'src/engine/api/rest/metadata/utils/parse-metadata-rest-pagination.util';+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';@@ -64,24 +67,29 @@ export class ViewController {@Get()@UseGuards(CustomPermissionGuard)async findMany(+ @Req() request: AuthenticatedRequest,@RequestLocale() locale: keyof typeof APP_LOCALES | undefined,@AuthWorkspace() workspace: WorkspaceEntity,@AuthUserWorkspaceId({ allowUndefined: true })userWorkspaceId: string | undefined,@Query('objectMetadataId') objectMetadataId?: string,- ): Promise<ViewDTO[]> {- const views = objectMetadataId- ? await this.viewService.findByObjectMetadataIdWithRelations(- workspace.id,- objectMetadataId,- userWorkspaceId,- )- : await this.viewService.findByWorkspaceIdWithRelations(- workspace.id,- userWorkspaceId,- );+ ) {+ const page = await this.viewService.findManyWithRelationsPaginated({+ workspaceId: workspace.id,+ objectMetadataId,+ userWorkspaceId,+ pagination: parseMetadataRestPagination(request),+ });- return this.processViewsWithTemplates(views, workspace.id, locale);+ return {+ pageInfo: page.pageInfo,+ totalCount: page.totalCount,+ data: await this.processViewsWithTemplates(+ page.items,+ workspace.id,+ locale,+ ),+ };}@Get(':id')diff --git a/packages/twenty-server/src/engine/metadata-modules/view/services/view.service.ts b/packages/twenty-server/src/engine/metadata-modules/view/services/view.service.tsindex 4095ac291b9..cd573f2c8ff 100644--- a/packages/twenty-server/src/engine/metadata-modules/view/services/view.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view/services/view.service.ts@@ -24,6 +24,9 @@ import { fromFlatViewFilterGroupToViewFilterGroupDto } from 'src/engine/metadataimport { fromFlatViewFilterToViewFilterDto } from 'src/engine/metadata-modules/view-filter/utils/from-flat-view-filter-to-view-filter-dto.util';import { fromFlatViewGroupToViewGroupDto } from 'src/engine/metadata-modules/view-group/utils/from-flat-view-group-to-view-group-dto.util';import { fromFlatViewSortToViewSortDto } from 'src/engine/metadata-modules/view-sort/utils/from-flat-view-sort-to-view-sort-dto.util';+import { type MetadataCursorPage } from 'src/engine/metadata-modules/pagination/types/metadata-cursor-page.type';+import { type MetadataCursorPagination } from 'src/engine/metadata-modules/pagination/types/metadata-cursor-pagination.type';+import { paginateMetadataOrderedItems } from 'src/engine/metadata-modules/pagination/utils/paginate-metadata-ordered-items.util';import { CreateViewInput } from 'src/engine/metadata-modules/view/dtos/inputs/create-view.input';import { DeleteViewInput } from 'src/engine/metadata-modules/view/dtos/inputs/delete-view.input';import { DestroyViewInput } from 'src/engine/metadata-modules/view/dtos/inputs/destroy-view.input';@@ -466,7 +469,7 @@ export class ViewService {viewTypes.includes(flatView.type),).filter((flatView) => this.isViewVisibleToUser(flatView, userWorkspaceId))- .sort((a, b) => a.position - b.position);+ .sort((a, b) => a.position - b.position || a.id.localeCompare(b.id));}async findByWorkspaceId(@@ -609,6 +612,34 @@ export class ViewService {return this.findManyWithRelationsFromCache(flatViews, workspaceId);}+ async findManyWithRelationsPaginated({+ workspaceId,+ objectMetadataId,+ userWorkspaceId,+ pagination,+ }: {+ workspaceId: string;+ objectMetadataId?: string;+ userWorkspaceId?: string;+ pagination: MetadataCursorPagination;+ }): Promise<MetadataCursorPage<ViewDTO> & { totalCount: number }> {+ const flatViews = await this.getFilteredFlatViews({+ workspaceId,+ objectMetadataId,+ userWorkspaceId,+ });+ const page = paginateMetadataOrderedItems({+ items: flatViews,+ pagination,+ });++ return {+ ...page,+ items: await this.findManyWithRelationsFromCache(page.items, workspaceId),+ totalCount: flatViews.length,+ };+ }+async findByObjectMetadataIdWithRelations(workspaceId: string,objectMetadataId: string,diff --git a/packages/twenty-server/src/engine/metadata-modules/webhook/controllers/webhook.controller.ts b/packages/twenty-server/src/engine/metadata-modules/webhook/controllers/webhook.controller.tsindex 465842c4cad..5d87f903b2b 100644--- a/packages/twenty-server/src/engine/metadata-modules/webhook/controllers/webhook.controller.ts+++ b/packages/twenty-server/src/engine/metadata-modules/webhook/controllers/webhook.controller.ts@@ -6,6 +6,7 @@ import {Param,Patch,Post,+ Req,UseFilters,UseGuards,} from '@nestjs/common';@@ -14,6 +15,9 @@ import { PermissionFlagType } from 'twenty-shared/constants';import { ApiPath } from 'twenty-shared/types';import { RestApiExceptionFilter } from 'src/engine/api/rest/rest-api-exception.filter';+import { isMetadataRestRequest } from 'src/engine/api/rest/metadata/utils/is-metadata-rest-request.util';+import { paginateMetadataRestItems } from 'src/engine/api/rest/metadata/utils/paginate-metadata-rest-items.util';+import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';import { JwtAuthGuard } from 'src/engine/guards/jwt-auth.guard';@@ -44,9 +48,14 @@ export class WebhookController {@Get()async findAll(+ @Req() request: AuthenticatedRequest,@AuthWorkspace() workspace: WorkspaceEntity,- ): Promise<WebhookDTO[]> {- return this.webhookService.findAll(workspace.id);+ ) {+ const webhooks = await this.webhookService.findAll(workspace.id);++ return isMetadataRestRequest(request)+ ? paginateMetadataRestItems({ items: webhooks, request })+ : webhooks;}@Get(':id')diff --git a/packages/twenty-server/src/engine/metadata-modules/webhook/webhook.service.ts b/packages/twenty-server/src/engine/metadata-modules/webhook/webhook.service.tsindex dbd9a772ef0..cb4a86e5c48 100644--- a/packages/twenty-server/src/engine/metadata-modules/webhook/webhook.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/webhook/webhook.service.ts@@ -41,7 +41,10 @@ export class WebhookService {return Object.values(flatWebhookMaps.byUniversalIdentifier).filter(isDefined)- .sort((a, b) => a.createdAt.localeCompare(b.createdAt))+ .sort(+ (a, b) =>+ a.createdAt.localeCompare(b.createdAt) || a.id.localeCompare(b.id),+ ).map(fromFlatWebhookToWebhookDto);}diff --git a/packages/twenty-server/test/integration/graphql/suites/composite-field-pagination.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/composite-field-pagination.integration-spec.tsindex a94de023953..cf74f6b37cf 100644--- a/packages/twenty-server/test/integration/graphql/suites/composite-field-pagination.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/composite-field-pagination.integration-spec.ts@@ -85,6 +85,9 @@ describe('GraphQL People Pagination with Composite Field Sorting', () => {expect(firstPagePeople).toHaveLength(2);expect(firstPageResponse.body.data.people.pageInfo.hasNextPage).toBe(true);+ expect(firstPageResponse.body.data.people.pageInfo.hasPreviousPage).toBe(+ false,+ );expect(firstPagePeople[0].name.firstName).toBe('Alice');expect(firstPagePeople[0].name.lastName).toBe('Brown');@@ -113,6 +116,9 @@ describe('GraphQL People Pagination with Composite Field Sorting', () => {);expect(secondPagePeople).toHaveLength(2);+ expect(secondPageResponse.body.data.people.pageInfo.hasPreviousPage).toBe(+ true,+ );expect(secondPagePeople[0].name.firstName).toBe('Bob');expect(secondPagePeople[0].name.lastName).toBe('Johnson');diff --git a/packages/twenty-server/test/integration/metadata/suites/pagination/metadata-list-pagination.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/pagination/metadata-list-pagination.integration-spec.tsnew file mode 100644index 00000000000..203acb996cc--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/pagination/metadata-list-pagination.integration-spec.ts@@ -0,0 +1,276 @@+import gql from 'graphql-tag';+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';+import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';++import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';++type ObjectPage = {+ data: {+ objects: {+ edges: {+ cursor: string;+ node: {+ id: string;+ fields: {+ edges: {+ cursor: string;+ node: { id: string; objectMetadataId: string; isUnique: boolean };+ }[];+ pageInfo: {+ hasNextPage: boolean;+ hasPreviousPage: boolean;+ };+ };+ indexMetadatas: {+ edges: { node: { id: string } }[];+ };+ };+ }[];+ pageInfo: {+ hasNextPage: boolean;+ hasPreviousPage: boolean;+ startCursor: string | null;+ endCursor: string | null;+ };+ };+ } | null;+ errors?: { message: string }[];+};++const OBJECTS_WITH_FIELDS_QUERY = gql`+ query ObjectsWithFields($objectPaging: CursorPaging!) {+ objects(filter: { isActive: { is: true } }, paging: $objectPaging) {+ edges {+ cursor+ node {+ id+ fields(paging: { first: 1 }, filter: { isActive: { is: true } }) {+ edges {+ cursor+ node {+ id+ objectMetadataId+ isUnique+ }+ }+ pageInfo {+ hasNextPage+ hasPreviousPage+ }+ }+ indexMetadatas(paging: { first: 1 }) {+ edges {+ node {+ id+ }+ }+ }+ }+ }+ pageInfo {+ hasNextPage+ hasPreviousPage+ startCursor+ endCursor+ }+ }+ }+`;++describe('metadata list pagination', () => {+ const queryObjects = async (paging: Record<string, unknown>) => {+ const response = await makeMetadataAPIRequest({+ query: OBJECTS_WITH_FIELDS_QUERY,+ variables: { objectPaging: paging },+ });++ return response.body as ObjectPage;+ };++ it('paginates top-level metadata forward and backward with opaque cursors', async () => {+ const firstPage = await queryObjects({ first: 1 });++ expect(firstPage.errors).toBeUndefined();+ expect(firstPage.data?.objects.edges).toHaveLength(1);+ expect(firstPage.data?.objects.pageInfo).toMatchObject({+ hasNextPage: true,+ hasPreviousPage: false,+ });++ const firstPageEndCursor = firstPage.data?.objects.pageInfo.endCursor;++ expect(firstPageEndCursor).toBeTruthy();++ const secondPage = await queryObjects({+ first: 1,+ after: firstPageEndCursor,+ });++ expect(secondPage.errors).toBeUndefined();+ expect(secondPage.data?.objects.edges).toHaveLength(1);+ expect(secondPage.data?.objects.pageInfo.hasPreviousPage).toBe(true);+ expect(secondPage.data?.objects.edges[0].node.id).not.toBe(+ firstPage.data?.objects.edges[0].node.id,+ );++ const secondPageStartCursor = secondPage.data?.objects.pageInfo.startCursor;+ const backPage = await queryObjects({+ last: 1,+ before: secondPageStartCursor,+ });++ expect(backPage.errors).toBeUndefined();+ expect(backPage.data?.objects.edges[0].node.id).toBe(+ firstPage.data?.objects.edges[0].node.id,+ );+ expect(backPage.data?.objects.pageInfo.hasNextPage).toBe(true);+ });++ it('batches bounded nested pagination independently for every parent', async () => {+ const cacheService =+ getAppProviderByClassName<WorkspaceManyOrAllFlatEntityMapsCacheService>(+ 'WorkspaceManyOrAllFlatEntityMapsCacheService',+ );+ const cacheSpy = jest.spyOn(+ cacheService,+ 'getOrRecomputeManyOrAllFlatEntityMaps',+ );+ try {+ const page = await queryObjects({ first: 2 });++ expect(page.errors).toBeUndefined();+ expect(page.data?.objects.edges).toHaveLength(2);++ for (const { node: objectMetadata } of page.data?.objects.edges ?? []) {+ expect(objectMetadata.fields.edges).toHaveLength(1);+ expect(objectMetadata.fields.edges[0].node.objectMetadataId).toBe(+ objectMetadata.id,+ );+ expect(objectMetadata.fields.edges[0].cursor).toBeTruthy();+ expect(objectMetadata.fields.pageInfo.hasPreviousPage).toBe(false);+ }++ const fieldBatchCalls = cacheSpy.mock.calls.filter(([parameters]) =>+ parameters.flatMapsKeys?.includes('flatFieldMetadataMaps'),+ );+ const indexBatchCalls = cacheSpy.mock.calls.filter(([parameters]) =>+ parameters.flatMapsKeys?.includes('flatIndexMaps'),+ );++ expect(fieldBatchCalls).toHaveLength(1);+ expect(indexBatchCalls).toHaveLength(1);+ } finally {+ cacheSpy.mockRestore();+ }+ });++ it('hydrates isUnique in top-level and nested field connections', async () => {+ const fieldsResponse = await makeMetadataAPIRequest({+ query: gql`+ query UniqueFields {+ fields(filter: { isActive: { is: true } }, paging: { first: 1000 }) {+ edges {+ node {+ id+ objectMetadataId+ isUnique+ }+ }+ }+ }+ `,+ });+ const uniqueField = fieldsResponse.body.data.fields.edges+ .map(+ ({ node }: { node: Record<string, unknown> }) =>+ node as {+ id: string;+ objectMetadataId: string;+ isUnique: boolean;+ },+ )+ .find(({ isUnique }: { isUnique: boolean }) => isUnique);++ expect(fieldsResponse.body.errors).toBeUndefined();+ expect(uniqueField).toBeDefined();++ const objectResponse = await makeMetadataAPIRequest({+ query: gql`+ query NestedUniqueField($fieldId: UUID!, $objectId: UUID!) {+ field(id: $fieldId) {+ id+ isUnique+ }+ object(id: $objectId) {+ fields(filter: { id: { eq: $fieldId } }, paging: { first: 1 }) {+ edges {+ node {+ id+ isUnique+ }+ }+ }+ indexMetadatas(paging: { first: 1 }) {+ edges {+ node {+ id+ }+ }+ }+ }+ }+ `,+ variables: {+ fieldId: uniqueField?.id,+ objectId: uniqueField?.objectMetadataId,+ },+ });++ expect(objectResponse.body.errors).toBeUndefined();+ expect(objectResponse.body.data.field).toEqual({+ id: uniqueField?.id,+ isUnique: true,+ });+ expect(objectResponse.body.data.object.fields.edges[0].node).toEqual({+ id: uniqueField?.id,+ isUnique: true,+ });+ expect(+ objectResponse.body.data.object.indexMetadatas.edges[0].node.id,+ ).toBeTruthy();+ });++ it('rejects malformed cursor IDs and invalid UUID operators as user input', async () => {+ const malformedCursor = Buffer.from(+ JSON.stringify({ id: 'not-a-uuid' }),+ ).toString('base64');+ const malformedCursorResponse = await queryObjects({+ first: 1,+ after: malformedCursor,+ });++ expect(malformedCursorResponse.data).toBeNull();+ expect(malformedCursorResponse.errors?.[0].message).toContain(+ 'Invalid cursor',+ );++ const invalidFilterResponse = await makeMetadataAPIRequest({+ query: gql`+ query InvalidUuidFilter {+ objects(filter: { id: { is: true } }, paging: { first: 1 }) {+ edges {+ node {+ id+ }+ }+ }+ }+ `,+ });++ expect(invalidFilterResponse.body.data).toBeNull();+ expect(invalidFilterResponse.body.errors[0].message).toContain(+ 'UUID is/isNot comparisons only support null values',+ );+ });+});diff --git a/packages/twenty-server/test/integration/rest/suites/field-metadata.integration-spec.ts b/packages/twenty-server/test/integration/rest/suites/field-metadata.integration-spec.tsindex 040b8641d33..8944b5a4d47 100644--- a/packages/twenty-server/test/integration/rest/suites/field-metadata.integration-spec.ts+++ b/packages/twenty-server/test/integration/rest/suites/field-metadata.integration-spec.ts@@ -63,7 +63,11 @@ describe.each([});afterAll(async () => {- await Promise.all(seededIds.map(cleanupTestField));+ // Field deletion runs schema migrations that acquire exclusive locks.+ // Keep teardown serial so the suite cannot deadlock against itself.+ for (const id of seededIds) {+ await cleanupTestField(id);+ }seededIds.length = 0;});@@ -75,13 +79,16 @@ describe.each([});assertRestApiSuccessfulResponse(response);+if (isNewFormat) {expect(response.body).not.toHaveProperty('data.fields');expect(Array.isArray(response.body.data)).toBe(true);} else {- expect(Array.isArray(response.body.data?.fields)).toBe(true);+ expect(Array.isArray(response.body.data.fields)).toBe(true);}+expect(response.body).toHaveProperty('pageInfo.hasNextPage');+ expect(response.body).toHaveProperty('pageInfo.hasPreviousPage');expect(response.body).toHaveProperty('pageInfo.startCursor');expect(response.body).toHaveProperty('pageInfo.endCursor');expect(typeof response.body.totalCount).toBe('number');@@ -103,6 +110,7 @@ describe.each([expect(items.length).toBe(1);expect(pageInfo.hasNextPage).toBe(true);+ expect(pageInfo.hasPreviousPage).toBe(false);});it('paginates forward with starting_after without overlap', async () => {@@ -174,6 +182,7 @@ describe.each([const backIds = backPayload.items.map((f) => f.id);expect(backIds.every((id) => firstIds.includes(id))).toBe(true);+ expect(backPayload.pageInfo.hasNextPage).toBe(true);});it('rejects combining starting_after and ending_before with 400', async () => {@@ -186,6 +195,16 @@ describe.each([assertRestApiErrorResponse(response, 400);});+ it('rejects malformed cursor IDs with 400', async () => {+ const response = await makeRestAPIRequest({+ method: 'get',+ path: '/metadata/fields?starting_after=not-a-uuid',+ bearer: APPLE_JANE_ADMIN_ACCESS_TOKEN,+ });++ assertRestApiErrorResponse(response, 400);+ });+it('keeps totalCount stable across pages', async () => {const firstPage = await makeRestAPIRequest({method: 'get',diff --git a/packages/twenty-server/test/integration/rest/suites/metadata-list-contract.integration-spec.ts b/packages/twenty-server/test/integration/rest/suites/metadata-list-contract.integration-spec.tsnew file mode 100644index 00000000000..a0accbfaedf--- /dev/null+++ b/packages/twenty-server/test/integration/rest/suites/metadata-list-contract.integration-spec.ts@@ -0,0 +1,63 @@+import { updateFeatureFlag } from 'test/integration/metadata/suites/utils/update-feature-flag.util';+import { makeRestAPIRequest } from 'test/integration/rest/utils/make-rest-api-request.util';+import { assertMetadataRestListResponse } from 'test/integration/rest/utils/rest-test-assertions.util';+import { FeatureFlagKey } from 'twenty-shared/types';++const EMPTY_PARENT_ID = '00000000-0000-4000-8000-000000000000';++describe('Metadata REST list contract', () => {+ // objects and fields still serve the legacy envelope when the flag is off,+ // so pin it on for the unified-envelope contract.+ beforeAll(async () => {+ await updateFeatureFlag({+ featureFlag: FeatureFlagKey.IS_REST_METADATA_API_NEW_FORMAT_DIRECT,+ value: true,+ expectToFail: false,+ });+ });++ afterAll(async () => {+ await updateFeatureFlag({+ featureFlag: FeatureFlagKey.IS_REST_METADATA_API_NEW_FORMAT_DIRECT,+ value: false,+ expectToFail: false,+ });+ });++ it.each([+ '/metadata/objects',+ '/metadata/fields',+ '/metadata/webhooks',+ '/metadata/apiKeys',+ '/metadata/views',+ '/metadata/viewFields',+ '/metadata/viewFilters',+ '/metadata/viewSorts',+ '/metadata/viewGroups',+ '/metadata/viewFilterGroups',+ '/metadata/pageLayouts',+ `/metadata/pageLayoutTabs?pageLayoutId=${EMPTY_PARENT_ID}`,+ `/metadata/pageLayoutWidgets?pageLayoutTabId=${EMPTY_PARENT_ID}`,+ ])('returns the unified page envelope from GET %s', async (path) => {+ const response = await makeRestAPIRequest({+ method: 'get',+ path,+ bearer: APPLE_JANE_ADMIN_ACCESS_TOKEN,+ });++ assertMetadataRestListResponse(response);+ });++ it('keeps deprecated non-metadata aliases as raw arrays', async () => {+ for (const path of ['/webhooks', '/apiKeys']) {+ const response = await makeRestAPIRequest({+ method: 'get',+ path,+ bearer: APPLE_JANE_ADMIN_ACCESS_TOKEN,+ });++ expect(response.status).toBe(200);+ expect(Array.isArray(response.body)).toBe(true);+ }+ });+});diff --git a/packages/twenty-server/test/integration/rest/suites/object-metadata.integration-spec.ts b/packages/twenty-server/test/integration/rest/suites/object-metadata.integration-spec.tsindex eb65786b779..3b3e704f87a 100644--- a/packages/twenty-server/test/integration/rest/suites/object-metadata.integration-spec.ts+++ b/packages/twenty-server/test/integration/rest/suites/object-metadata.integration-spec.ts@@ -49,7 +49,11 @@ describe.each([});afterAll(async () => {- await Promise.all(seededIds.map(cleanupTestObject));+ // Object deletion runs schema migrations that acquire exclusive locks.+ // Keep teardown serial so the suite cannot deadlock against itself.+ for (const id of seededIds) {+ await cleanupTestObject(id);+ }seededIds.length = 0;});@@ -61,13 +65,16 @@ describe.each([});assertRestApiSuccessfulResponse(response);+if (isNewFormat) {expect(response.body).not.toHaveProperty('data.objects');expect(Array.isArray(response.body.data)).toBe(true);} else {- expect(Array.isArray(response.body.data?.objects)).toBe(true);+ expect(Array.isArray(response.body.data.objects)).toBe(true);}+expect(response.body).toHaveProperty('pageInfo.hasNextPage');+ expect(response.body).toHaveProperty('pageInfo.hasPreviousPage');expect(response.body).toHaveProperty('pageInfo.startCursor');expect(response.body).toHaveProperty('pageInfo.endCursor');expect(typeof response.body.totalCount).toBe('number');@@ -107,6 +114,7 @@ describe.each([expect(items.length).toBe(1);expect(pageInfo.hasNextPage).toBe(true);+ expect(pageInfo.hasPreviousPage).toBe(false);expect(pageInfo.startCursor).toBe(items[0].id);expect(pageInfo.endCursor).toBe(items[0].id);});@@ -181,6 +189,7 @@ describe.each([const backIds = backPayload.items.map((o) => o.id);expect(backIds.every((id) => firstIds.includes(id))).toBe(true);+ expect(backPayload.pageInfo.hasNextPage).toBe(true);});it('rejects combining starting_after and ending_before with 400', async () => {@@ -193,6 +202,16 @@ describe.each([assertRestApiErrorResponse(response, 400);});+ it('rejects malformed cursor IDs with 400', async () => {+ const response = await makeRestAPIRequest({+ method: 'get',+ path: '/metadata/objects?starting_after=not-a-uuid',+ bearer: APPLE_JANE_ADMIN_ACCESS_TOKEN,+ });++ assertRestApiErrorResponse(response, 400);+ });+it('keeps totalCount stable across pages', async () => {const firstPage = await makeRestAPIRequest({method: 'get',diff --git a/packages/twenty-server/test/integration/rest/suites/rest-api-core-find-many.integration-spec.ts b/packages/twenty-server/test/integration/rest/suites/rest-api-core-find-many.integration-spec.tsindex 91e6f901a0c..1da42f113e3 100644--- a/packages/twenty-server/test/integration/rest/suites/rest-api-core-find-many.integration-spec.ts+++ b/packages/twenty-server/test/integration/rest/suites/rest-api-core-find-many.integration-spec.ts@@ -90,6 +90,7 @@ describe('Core REST API Find Many endpoint', () => {expect(typeof totalCount).toBe('number');expect(totalCount).toEqual(testPersonIds.length);expect(response.body.pageInfo.hasNextPage).toBe(false);+ expect(response.body.pageInfo.hasPreviousPage).toBe(false);});it('should limit results based on the limit parameter', async () => {@@ -159,6 +160,7 @@ describe('Core REST API Find Many endpoint', () => {expect(nextPagePeople).toBeDefined();expect(nextPagePeople.length).toBe(1);expect(nextPagePeople[0].id).toBe(people[1].id);+ expect(nextPageResponse.body.pageInfo.hasPreviousPage).toBe(true);});it('should support cursor-based pagination with ending_before', async () => {@@ -185,6 +187,7 @@ describe('Core REST API Find Many endpoint', () => {expect(nextPagePeople.length).toBe(2);expect(nextPagePeople[0].id).toBe(people[1].id);expect(nextPagePeople[1].id).toBe(people[2].id);+ expect(nextPageResponse.body.pageInfo.hasNextPage).toBe(true);});it('should support ordering Asc of results', async () => {diff --git a/packages/twenty-server/test/integration/rest/suites/view-field.integration-spec.ts b/packages/twenty-server/test/integration/rest/suites/view-field.integration-spec.tsindex 9e38c54f58d..6c654f9c4ce 100644--- a/packages/twenty-server/test/integration/rest/suites/view-field.integration-spec.ts+++ b/packages/twenty-server/test/integration/rest/suites/view-field.integration-spec.ts@@ -4,6 +4,7 @@ import { deleteOneObjectMetadata } from 'test/integration/metadata/suites/objectimport { updateOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/update-one-object-metadata.util';import { makeRestAPIRequest } from 'test/integration/rest/utils/make-rest-api-request.util';import {+ assertMetadataRestListResponse,assertRestApiErrorNotFoundResponse,assertRestApiErrorResponse,assertRestApiSuccessfulResponse,@@ -116,8 +117,10 @@ describe('View Field REST API', () => {bearer: APPLE_JANE_ADMIN_ACCESS_TOKEN,});- assertRestApiSuccessfulResponse(response);- expect(response.body).toEqual([]);+ expect(assertMetadataRestListResponse<ViewFieldDTO>(response)).toEqual(+ [],+ );+ expect(response.body.totalCount).toBe(0);});it('should return all view fields for workspace when no viewId provided', async () => {@@ -127,8 +130,7 @@ describe('View Field REST API', () => {bearer: APPLE_JANE_ADMIN_ACCESS_TOKEN,});- assertRestApiSuccessfulResponse(response);- expect(Array.isArray(response.body)).toBe(true);+ assertMetadataRestListResponse<ViewFieldDTO>(response);});it('should return view fields for a specific view after creating one', async () => {@@ -148,10 +150,8 @@ describe('View Field REST API', () => {bearer: APPLE_JANE_ADMIN_ACCESS_TOKEN,});- assertRestApiSuccessfulResponse(response);- expect(Array.isArray(response.body)).toBe(true);-- const returnedViewField = response.body.find(+ const viewFields = assertMetadataRestListResponse<ViewFieldDTO>(response);+ const returnedViewField = viewFields.find((el: ViewFieldDTO) => el.id === viewField.id,);diff --git a/packages/twenty-server/test/integration/rest/suites/view-filter-group.integration-spec.ts b/packages/twenty-server/test/integration/rest/suites/view-filter-group.integration-spec.tsindex e767bc92ab5..89cbc636faa 100644--- a/packages/twenty-server/test/integration/rest/suites/view-filter-group.integration-spec.ts+++ b/packages/twenty-server/test/integration/rest/suites/view-filter-group.integration-spec.ts@@ -4,6 +4,7 @@ import { deleteOneObjectMetadata } from 'test/integration/metadata/suites/objectimport { updateOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/update-one-object-metadata.util';import { makeRestAPIRequest } from 'test/integration/rest/utils/make-rest-api-request.util';import {+ assertMetadataRestListResponse,assertRestApiErrorNotFoundResponse,assertRestApiErrorResponse,assertRestApiSuccessfulResponse,@@ -104,8 +105,10 @@ describe('View Filter Group REST API', () => {bearer: APPLE_JANE_ADMIN_ACCESS_TOKEN,});- assertRestApiSuccessfulResponse(response);- expect(response.body).toEqual([]);+ expect(+ assertMetadataRestListResponse<ViewFilterGroupDTO>(response),+ ).toEqual([]);+ expect(response.body.totalCount).toBe(0);});it('should return all view filter groups for workspace when no viewId provided', async () => {@@ -115,8 +118,7 @@ describe('View Filter Group REST API', () => {bearer: APPLE_JANE_ADMIN_ACCESS_TOKEN,});- assertRestApiSuccessfulResponse(response);- expect(Array.isArray(response.body)).toBe(true);+ assertMetadataRestListResponse<ViewFilterGroupDTO>(response);});it('should return view filter groups for a specific view after creating one', async () => {@@ -133,10 +135,9 @@ describe('View Filter Group REST API', () => {bearer: APPLE_JANE_ADMIN_ACCESS_TOKEN,});- assertRestApiSuccessfulResponse(response);- expect(Array.isArray(response.body)).toBe(true);-- const returnedViewFilterGroup = response.body.find(+ const viewFilterGroups =+ assertMetadataRestListResponse<ViewFilterGroupDTO>(response);+ const returnedViewFilterGroup = viewFilterGroups.find((el: ViewFilterGroupDTO) => el.id === viewFilterGroup.id,);@@ -189,22 +190,22 @@ describe('View Filter Group REST API', () => {bearer: APPLE_JANE_ADMIN_ACCESS_TOKEN,});- assertRestApiSuccessfulResponse(response);- expect(Array.isArray(response.body)).toBe(true);- expect(response.body).toHaveLength(2);+ const viewFilterGroups =+ assertMetadataRestListResponse<ViewFilterGroupDTO>(response);+ expect(viewFilterGroups).toHaveLength(2);- const parentGroup = response.body.find(- (group: any) => group.parentViewFilterGroupId === null,+ const parentGroup = viewFilterGroups.find(+ (group) => group.parentViewFilterGroupId === null,);- const childGroup = response.body.find(- (group: any) => group.parentViewFilterGroupId !== null,+ const childGroup = viewFilterGroups.find(+ (group) => group.parentViewFilterGroupId !== null,);- expect(parentGroup).toBeDefined();+ jestExpectToBeDefined(parentGroup);expect(parentGroup.logicalOperator).toBe('AND');expect(parentGroup.parentViewFilterGroupId).toBeNull();- expect(childGroup).toBeDefined();+ jestExpectToBeDefined(childGroup);expect(childGroup.parentViewFilterGroupId).toBe(parentId);expect(childGroup.logicalOperator).toBe('OR');diff --git a/packages/twenty-server/test/integration/rest/suites/view-filter.integration-spec.ts b/packages/twenty-server/test/integration/rest/suites/view-filter.integration-spec.tsindex 50e024dcf66..2f9d2e6fca9 100644--- a/packages/twenty-server/test/integration/rest/suites/view-filter.integration-spec.ts+++ b/packages/twenty-server/test/integration/rest/suites/view-filter.integration-spec.ts@@ -5,6 +5,7 @@ import { updateOneObjectMetadata } from 'test/integration/metadata/suites/objectimport { destroyOneViewFilter } from 'test/integration/metadata/suites/view-filter/utils/destroy-one-view-filter.util';import { makeRestAPIRequest } from 'test/integration/rest/utils/make-rest-api-request.util';import {+ assertMetadataRestListResponse,assertRestApiErrorNotFoundResponse,assertRestApiSuccessfulResponse,} from 'test/integration/rest/utils/rest-test-assertions.util';@@ -108,8 +109,10 @@ describe('View Filter REST API', () => {bearer: APPLE_JANE_ADMIN_ACCESS_TOKEN,});- assertRestApiSuccessfulResponse(response);- expect(response.body).toEqual([]);+ expect(assertMetadataRestListResponse<ViewFilterDTO>(response)).toEqual(+ [],+ );+ expect(response.body.totalCount).toBe(0);});it('should return all view filters for workspace when no viewId provided', async () => {@@ -119,8 +122,7 @@ describe('View Filter REST API', () => {bearer: APPLE_JANE_ADMIN_ACCESS_TOKEN,});- assertRestApiSuccessfulResponse(response);- expect(Array.isArray(response.body)).toBe(true);+ assertMetadataRestListResponse<ViewFilterDTO>(response);});it('should return view filters for a specific view after creating one', async () => {@@ -139,10 +141,9 @@ describe('View Filter REST API', () => {bearer: APPLE_JANE_ADMIN_ACCESS_TOKEN,});- assertRestApiSuccessfulResponse(response);- expect(Array.isArray(response.body)).toBe(true);-- const returnedViewFilter = response.body.find(+ const viewFilters =+ assertMetadataRestListResponse<ViewFilterDTO>(response);+ const returnedViewFilter = viewFilters.find((el: ViewFilterDTO) => el.id === viewFilter.id,);diff --git a/packages/twenty-server/test/integration/rest/suites/view-group.integration-spec.ts b/packages/twenty-server/test/integration/rest/suites/view-group.integration-spec.tsindex 53d0263fb68..9d0102c68a2 100644--- a/packages/twenty-server/test/integration/rest/suites/view-group.integration-spec.ts+++ b/packages/twenty-server/test/integration/rest/suites/view-group.integration-spec.ts@@ -5,6 +5,7 @@ import { updateOneObjectMetadata } from 'test/integration/metadata/suites/objectimport { destroyOneViewGroup } from 'test/integration/metadata/suites/view-group/utils/destroy-one-view-group.util';import { makeRestAPIRequest } from 'test/integration/rest/utils/make-rest-api-request.util';import {+ assertMetadataRestListResponse,assertRestApiErrorNotFoundResponse,assertRestApiSuccessfulResponse,} from 'test/integration/rest/utils/rest-test-assertions.util';@@ -14,8 +15,11 @@ import {} from 'test/integration/rest/utils/view-rest-api.util';import { assertViewGroupStructure } from 'test/integration/utils/view-test.util';import { extractRecordIdsAndDatesAsExpectAny } from 'test/utils/extract-record-ids-and-dates-as-expect-any';+import { jestExpectToBeDefined } from 'test/utils/jest-expect-to-be-defined.util.test';import { FieldMetadataType } from 'twenty-shared/types';+import { type ViewGroupDTO } from 'src/engine/metadata-modules/view-group/dtos/view-group.dto';+describe('View Group REST API', () => {let testObjectMetadataId: string;let testFieldMetadataId: string;@@ -115,8 +119,7 @@ describe('View Group REST API', () => {bearer: APPLE_JANE_ADMIN_ACCESS_TOKEN,});- assertRestApiSuccessfulResponse(response);- expect(Array.isArray(response.body)).toBe(true);+ assertMetadataRestListResponse<ViewGroupDTO>(response);});it('should return view groups for a specific view after creating one', async () => {@@ -126,10 +129,8 @@ describe('View Group REST API', () => {bearer: APPLE_JANE_ADMIN_ACCESS_TOKEN,});- assertRestApiSuccessfulResponse(response);- expect(Array.isArray(response.body)).toBe(true);-- const returnedViewGroups = response.body;+ const returnedViewGroups =+ assertMetadataRestListResponse<ViewGroupDTO>(response);expect(returnedViewGroups).toHaveLength(4);// For a nullable field with three options, we expect groups for OPTION_1, OPTION_2, OPTION_3, and '' (empty string)@@ -138,14 +139,57 @@ describe('View Group REST API', () => {// Check structure and visibility for each groupexpectedFieldValues.forEach((expectedFieldValue) => {const group = returnedViewGroups.find(- (group: any) => group.fieldValue === expectedFieldValue,+ (group) => group.fieldValue === expectedFieldValue,);- expect(group).toBeDefined();+ jestExpectToBeDefined(group);expect(group.isVisible).toBe(true);expect(group.viewId).toBe(testViewId);});});++ it('paginates the position-ordered result in both directions', async () => {+ const firstResponse = await makeRestAPIRequest({+ method: 'get',+ path: `/metadata/viewGroups?viewId=${testViewId}&limit=2`,+ bearer: APPLE_JANE_ADMIN_ACCESS_TOKEN,+ });+ const firstPage =+ assertMetadataRestListResponse<ViewGroupDTO>(firstResponse);++ expect(firstPage).toHaveLength(2);+ expect(firstResponse.body.totalCount).toBe(4);+ expect(firstResponse.body.pageInfo).toMatchObject({+ hasNextPage: true,+ hasPreviousPage: false,+ });++ const secondResponse = await makeRestAPIRequest({+ method: 'get',+ path: `/metadata/viewGroups?viewId=${testViewId}&limit=2&starting_after=${firstResponse.body.pageInfo.endCursor}`,+ bearer: APPLE_JANE_ADMIN_ACCESS_TOKEN,+ });+ const secondPage =+ assertMetadataRestListResponse<ViewGroupDTO>(secondResponse);++ expect(secondPage).toHaveLength(2);+ expect(secondResponse.body.pageInfo).toMatchObject({+ hasNextPage: false,+ hasPreviousPage: true,+ });++ const previousResponse = await makeRestAPIRequest({+ method: 'get',+ path: `/metadata/viewGroups?viewId=${testViewId}&limit=2&ending_before=${secondResponse.body.pageInfo.startCursor}`,+ bearer: APPLE_JANE_ADMIN_ACCESS_TOKEN,+ });+ const previousPage =+ assertMetadataRestListResponse<ViewGroupDTO>(previousResponse);++ expect(previousPage.map(({ id }) => id)).toEqual(+ firstPage.map(({ id }) => id),+ );+ });});describe('GET /metadata/viewGroups/:id', () => {@@ -156,9 +200,11 @@ describe('View Group REST API', () => {bearer: APPLE_JANE_ADMIN_ACCESS_TOKEN,});- const viewGroup = viewGroupsFromViewReponse.body.find(- (group: any) => group.fieldValue === 'OPTION_1',- );+ const viewGroup = assertMetadataRestListResponse<ViewGroupDTO>(+ viewGroupsFromViewReponse,+ ).find((group) => group.fieldValue === 'OPTION_1');++ jestExpectToBeDefined(viewGroup);const response = await makeRestAPIRequest({method: 'get',diff --git a/packages/twenty-server/test/integration/rest/suites/view-sort.integration-spec.ts b/packages/twenty-server/test/integration/rest/suites/view-sort.integration-spec.tsindex c721fcef2d0..1712398640d 100644--- a/packages/twenty-server/test/integration/rest/suites/view-sort.integration-spec.ts+++ b/packages/twenty-server/test/integration/rest/suites/view-sort.integration-spec.ts@@ -4,6 +4,7 @@ import { deleteOneObjectMetadata } from 'test/integration/metadata/suites/objectimport { updateOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/update-one-object-metadata.util';import { makeRestAPIRequest } from 'test/integration/rest/utils/make-rest-api-request.util';import {+ assertMetadataRestListResponse,assertRestApiErrorNotFoundResponse,assertRestApiErrorResponse,assertRestApiSuccessfulResponse,@@ -108,8 +109,8 @@ describe('View Sort REST API', () => {bearer: APPLE_JANE_ADMIN_ACCESS_TOKEN,});- assertRestApiSuccessfulResponse(response);- expect(response.body).toEqual([]);+ expect(assertMetadataRestListResponse<ViewSortDTO>(response)).toEqual([]);+ expect(response.body.totalCount).toBe(0);});it('should return all view sorts for workspace when no viewId provided', async () => {@@ -119,8 +120,7 @@ describe('View Sort REST API', () => {bearer: APPLE_JANE_ADMIN_ACCESS_TOKEN,});- assertRestApiSuccessfulResponse(response);- expect(Array.isArray(response.body)).toBe(true);+ assertMetadataRestListResponse<ViewSortDTO>(response);});it('should return view sorts for a specific view after creating one', async () => {@@ -138,10 +138,8 @@ describe('View Sort REST API', () => {bearer: APPLE_JANE_ADMIN_ACCESS_TOKEN,});- assertRestApiSuccessfulResponse(response);- expect(Array.isArray(response.body)).toBe(true);-- const returnedViewSort = response.body.find(+ const viewSorts = assertMetadataRestListResponse<ViewSortDTO>(response);+ const returnedViewSort = viewSorts.find((el: ViewSortDTO) => el.id === viewSort.id,);diff --git a/packages/twenty-server/test/integration/rest/suites/view.integration-spec.ts b/packages/twenty-server/test/integration/rest/suites/view.integration-spec.tsindex afee466c090..36294ebf50d 100644--- a/packages/twenty-server/test/integration/rest/suites/view.integration-spec.ts+++ b/packages/twenty-server/test/integration/rest/suites/view.integration-spec.ts@@ -5,6 +5,7 @@ import { updateOneObjectMetadata } from 'test/integration/metadata/suites/objectimport { destroyOneView } from 'test/integration/metadata/suites/view/utils/destroy-one-view.util';import { makeRestAPIRequest } from 'test/integration/rest/utils/make-rest-api-request.util';import {+ assertMetadataRestListResponse,assertRestApiErrorNotFoundResponse,assertRestApiSuccessfulResponse,} from 'test/integration/rest/utils/rest-test-assertions.util';@@ -13,6 +14,8 @@ import { generateRecordName } from 'test/integration/utils/generate-record-name'import { assertViewStructure } from 'test/integration/utils/view-test.util';import { ViewOpenRecordIn, ViewType } from 'twenty-shared/types';+import { type ViewDTO } from 'src/engine/metadata-modules/view/dtos/view.dto';+describe('View REST API', () => {let testObjectMetadataId: string;let testSelectFieldMetadataId: string;@@ -78,8 +81,7 @@ describe('View REST API', () => {bearer: APPLE_JANE_ADMIN_ACCESS_TOKEN,});- assertRestApiSuccessfulResponse(response);- expect(Array.isArray(response.body)).toBe(true);+ assertMetadataRestListResponse<ViewDTO>(response);});it('should return views filtered by objectMetadataId', async () => {@@ -89,11 +91,10 @@ describe('View REST API', () => {bearer: APPLE_JANE_ADMIN_ACCESS_TOKEN,});- assertRestApiSuccessfulResponse(response);- expect(Array.isArray(response.body)).toBe(true);+ const views = assertMetadataRestListResponse<ViewDTO>(response);- if (response.body.length > 0) {- assertViewStructure(response.body[0]);+ if (views.length > 0) {+ assertViewStructure(views[0]);}});});diff --git a/packages/twenty-server/test/integration/rest/utils/metadata-rest-api.util.ts b/packages/twenty-server/test/integration/rest/utils/metadata-rest-api.util.tsindex 4ab1eb61d1d..1f6a1b4e215 100644--- a/packages/twenty-server/test/integration/rest/utils/metadata-rest-api.util.ts+++ b/packages/twenty-server/test/integration/rest/utils/metadata-rest-api.util.ts@@ -111,6 +111,7 @@ export const cleanupTestField = async (id: string): Promise<void> => {export type MetadataListPageInfo = {hasNextPage: boolean;+ hasPreviousPage: boolean;startCursor: string | null;endCursor: string | null;};diff --git a/packages/twenty-server/test/integration/rest/utils/rest-test-assertions.util.ts b/packages/twenty-server/test/integration/rest/utils/rest-test-assertions.util.tsindex 85097b26c5e..b7dffa23ade 100644--- a/packages/twenty-server/test/integration/rest/utils/rest-test-assertions.util.ts+++ b/packages/twenty-server/test/integration/rest/utils/rest-test-assertions.util.ts@@ -11,6 +11,12 @@ export const assertRestApiSuccessfulResponse = <T = Record<string, unknown>>(response: RestResponse<T>,expectedStatus = 200,) => {+ if (response.status !== expectedStatus) {+ throw new Error(+ `Expected status ${expectedStatus}, received ${response.status}: ${JSON.stringify(response.body)}`,+ );+ }+expect(response.status).toBe(expectedStatus);expect(response.body).toBeDefined();@@ -21,6 +27,31 @@ export const assertRestApiSuccessfulResponse = <T = Record<string, unknown>>(}};+export const assertMetadataRestListResponse = <T>(+ response: RestResponse<{+ data: T[];+ pageInfo: {+ hasNextPage: boolean;+ hasPreviousPage: boolean;+ startCursor: string | null;+ endCursor: string | null;+ };+ totalCount: number;+ }>,+): T[] => {+ assertRestApiSuccessfulResponse(response);+ expect(Array.isArray(response.body.data)).toBe(true);+ expect(response.body.pageInfo).toEqual({+ hasNextPage: expect.any(Boolean),+ hasPreviousPage: expect.any(Boolean),+ startCursor: response.body.data.length > 0 ? expect.any(String) : null,+ endCursor: response.body.data.length > 0 ? expect.any(String) : null,+ });+ expect(response.body.totalCount).toEqual(expect.any(Number));++ return response.body.data;+};+export const assertRestApiErrorResponse = <T = Record<string, unknown>>(response: RestResponse<T>,expectedStatus = 400,diff --git a/packages/twenty-server/test/integration/utils/view-test.util.ts b/packages/twenty-server/test/integration/utils/view-test.util.tsindex b7dca9f1efe..3b50d1cdb33 100644--- a/packages/twenty-server/test/integration/utils/view-test.util.ts+++ b/packages/twenty-server/test/integration/utils/view-test.util.ts@@ -1,16 +1,17 @@import { ViewFilterGroupLogicalOperator } from 'twenty-shared/types';import { type ViewFieldGroupDTO } from 'src/engine/metadata-modules/view-field-group/dtos/view-field-group.dto';-import { type ViewFieldEntity } from 'src/engine/metadata-modules/view-field/entities/view-field.entity';-import { type ViewFilterGroupEntity } from 'src/engine/metadata-modules/view-filter-group/entities/view-filter-group.entity';-import { type ViewFilterEntity } from 'src/engine/metadata-modules/view-filter/entities/view-filter.entity';-import { type ViewGroupEntity } from 'src/engine/metadata-modules/view-group/entities/view-group.entity';-import { type ViewSortEntity } from 'src/engine/metadata-modules/view-sort/entities/view-sort.entity';+import { type ViewFieldDTO } from 'src/engine/metadata-modules/view-field/dtos/view-field.dto';+import { type ViewFilterGroupDTO } from 'src/engine/metadata-modules/view-filter-group/dtos/view-filter-group.dto';+import { type ViewFilterDTO } from 'src/engine/metadata-modules/view-filter/dtos/view-filter.dto';+import { type ViewGroupDTO } from 'src/engine/metadata-modules/view-group/dtos/view-group.dto';+import { type ViewSortDTO } from 'src/engine/metadata-modules/view-sort/dtos/view-sort.dto';+import { type ViewDTO } from 'src/engine/metadata-modules/view/dtos/view.dto';import { type ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';export const assertViewStructure = (- view: ViewEntity,- expectedFields?: Partial<ViewEntity>,+ view: ViewDTO | ViewEntity,+ expectedFields?: Partial<ViewDTO | ViewEntity>,) => {expect(view).toBeDefined();expect(view.id).toBeDefined();@@ -42,8 +43,8 @@ export const assertViewFieldGroupStructure = (};export const assertViewFieldStructure = (- viewField: ViewFieldEntity,- expectedFields?: Partial<ViewFieldEntity>,+ viewField: ViewFieldDTO,+ expectedFields?: Partial<ViewFieldDTO>,) => {expect(viewField).toBeDefined();expect(viewField.id).toBeDefined();@@ -59,8 +60,8 @@ export const assertViewFieldStructure = (};export const assertViewSortStructure = (- viewSort: ViewSortEntity,- expectedFields?: Partial<ViewSortEntity>,+ viewSort: ViewSortDTO,+ expectedFields?: Partial<ViewSortDTO>,) => {expect(viewSort).toBeDefined();expect(viewSort.id).toBeDefined();@@ -75,8 +76,8 @@ export const assertViewSortStructure = (};export const assertViewFilterStructure = (- viewFilter: ViewFilterEntity,- expectedFields?: Partial<ViewFilterEntity>,+ viewFilter: ViewFilterDTO,+ expectedFields?: Partial<ViewFilterDTO>,) => {expect(viewFilter).toBeDefined();expect(viewFilter.id).toBeDefined();@@ -91,8 +92,8 @@ export const assertViewFilterStructure = (};export const assertViewGroupStructure = (- viewGroup: ViewGroupEntity,- expectedFields?: Partial<ViewGroupEntity>,+ viewGroup: ViewGroupDTO,+ expectedFields?: Partial<ViewGroupDTO>,) => {expect(viewGroup).toBeDefined();expect(viewGroup.id).toBeDefined();@@ -107,8 +108,8 @@ export const assertViewGroupStructure = (};export const assertViewFilterGroupStructure = (- viewFilterGroup: ViewFilterGroupEntity,- expectedFields?: Partial<ViewFilterGroupEntity>,+ viewFilterGroup: ViewFilterGroupDTO,+ expectedFields?: Partial<ViewFilterGroupDTO>,validLogicalOperators: string[] = [ViewFilterGroupLogicalOperator.AND,ViewFilterGroupLogicalOperator.OR,diff --git a/yarn.lock b/yarn.lockindex 8d603c8120e..c4146a0e42c 100644--- a/yarn.lock+++ b/yarn.lock@@ -14739,114 +14739,6 @@ __metadata:languageName: nodelinkType: hard-"@ptc-org/nestjs-query-core@npm:9.4.0, @ptc-org/nestjs-query-core@npm:^9.4.0":- version: 9.4.0- resolution: "@ptc-org/nestjs-query-core@npm:9.4.0"- dependencies:- lodash.merge: "npm:^4.6.2"- reflect-metadata: "npm:^0.2.2"- tslib: "npm:^2.8.1"- peerDependencies:- "@nestjs/common": ^9.0.0 || ^10.0.0 || ^11.0.0- class-transformer: ^0.5- checksum: 10c0/0d6b2275cf572a9ac6e13ae4080c3a8c23049dced2dfc80a38413ef39b85fa7fac409ce5b1036707c6bc6841045089f6a8cdabf3c89253e331aef9e7664b9f19- languageName: node- linkType: hard--"@ptc-org/nestjs-query-graphql@npm:9.4.0":- version: 9.4.0- resolution: "@ptc-org/nestjs-query-graphql@npm:9.4.0"- dependencies:- "@ptc-org/nestjs-query-core": "npm:9.4.0"- dataloader: "npm:^2.2.3"- graphql-fields: "npm:^2.0.3"- lodash.merge: "npm:4.6.2"- lodash.omit: "npm:^4.5.0"- pluralize: "npm:^8.0.0"- reflect-metadata: "npm:0.2.2"- tslib: "npm:^2.8.1"- peerDependencies:- "@apollo/gateway": ^0.44.1 || ^0.46.0 || ^0.48.0 || ^0.49.0 || ^0.50.0 || ^2.0.0- "@nestjs/common": ^9.0.0 || ^10.0.0 || ^11.0.0- "@nestjs/core": ^9.0.0 || ^10.0.0 || ^11.0.0- "@nestjs/graphql": ^11.0.0 || ^12.0.0 || ^13.0.0- class-transformer: ^0.5- class-validator: ^0.14.0- graphql: ^16.0.0- graphql-subscriptions: ^3.0.0- ts-morph: ^19.0.0 || ^20.0.0 || ^21.0.0 || ^24.0.0 || ^25.0.0- checksum: 10c0/651d0be3ff77fd922ea29a621ca4c96e98df1ea15e05742cbe1fe10a157d46c019d728a38418662aa83414e1e6c78a3d2c9f6f25eec61f79075884dc4d1c1935- languageName: node- linkType: hard--"@ptc-org/nestjs-query-graphql@patch:@ptc-org/nestjs-query-graphql@npm%3A9.4.0#~/.yarn/patches/@ptc-org-nestjs-query-graphql-npm-9.4.0-8e6f7894e1.patch":- version: 9.4.0- resolution: "@ptc-org/nestjs-query-graphql@patch:@ptc-org/nestjs-query-graphql@npm%3A9.4.0#~/.yarn/patches/@ptc-org-nestjs-query-graphql-npm-9.4.0-8e6f7894e1.patch::version=9.4.0&hash=ac8761"- dependencies:- "@ptc-org/nestjs-query-core": "npm:9.4.0"- dataloader: "npm:^2.2.3"- graphql-fields: "npm:^2.0.3"- lodash.merge: "npm:4.6.2"- lodash.omit: "npm:^4.5.0"- pluralize: "npm:^8.0.0"- reflect-metadata: "npm:0.2.2"- tslib: "npm:^2.8.1"- peerDependencies:- "@apollo/gateway": ^0.44.1 || ^0.46.0 || ^0.48.0 || ^0.49.0 || ^0.50.0 || ^2.0.0- "@nestjs/common": ^9.0.0 || ^10.0.0 || ^11.0.0- "@nestjs/core": ^9.0.0 || ^10.0.0 || ^11.0.0- "@nestjs/graphql": ^11.0.0 || ^12.0.0 || ^13.0.0- class-transformer: ^0.5- class-validator: ^0.14.0- graphql: ^16.0.0- graphql-subscriptions: ^3.0.0- ts-morph: ^19.0.0 || ^20.0.0 || ^21.0.0 || ^24.0.0 || ^25.0.0- checksum: 10c0/338194d3290c63edf14979fcc28293fbe6574a4698e1c0421c33e450b1ae4667ea18950ecd4c95db0f1f245c8c03ca422a40fd54895497f529080324ed1517d3- languageName: node- linkType: hard--"@ptc-org/nestjs-query-typeorm@npm:9.4.0":- version: 9.4.0- resolution: "@ptc-org/nestjs-query-typeorm@npm:9.4.0"- dependencies:- "@ptc-org/nestjs-query-core": "npm:9.4.0"- camel-case: "npm:^4.1.2"- lodash.filter: "npm:^4.6.0"- lodash.merge: "npm:^4.6.2"- lodash.omit: "npm:^4.5.0"- reflect-metadata: "npm:0.2.2"- tslib: "npm:^2.8.1"- uuid: "npm:^10.0.0"- peerDependencies:- "@nestjs/common": ^9.0.0 || ^10.0.0 || ^11.0.0- "@nestjs/typeorm": ^9.0.0 || ^10.0.0 || ^11.0.0- class-transformer: ^0.5- typeorm: ^0.3.15- checksum: 10c0/8732a44b1fd311be5e58dd14b99005ee27106f8ad3408e17d68b411a36b4910c40d07f9c429c9322af95bd625810c106b2473a494c096817ade38a338c8956f5- languageName: node- linkType: hard--"@ptc-org/nestjs-query-typeorm@patch:@ptc-org/nestjs-query-typeorm@npm%3A9.4.0#~/.yarn/patches/@ptc-org-nestjs-query-typeorm-npm-9.4.0-ca3414967e.patch":- version: 9.4.0- resolution: "@ptc-org/nestjs-query-typeorm@patch:@ptc-org/nestjs-query-typeorm@npm%3A9.4.0#~/.yarn/patches/@ptc-org-nestjs-query-typeorm-npm-9.4.0-ca3414967e.patch::version=9.4.0&hash=c30501"- dependencies:- "@ptc-org/nestjs-query-core": "npm:9.4.0"- camel-case: "npm:^4.1.2"- lodash.filter: "npm:^4.6.0"- lodash.merge: "npm:^4.6.2"- lodash.omit: "npm:^4.5.0"- reflect-metadata: "npm:0.2.2"- tslib: "npm:^2.8.1"- uuid: "npm:^10.0.0"- peerDependencies:- "@nestjs/common": ^9.0.0 || ^10.0.0 || ^11.0.0- "@nestjs/typeorm": ^9.0.0 || ^10.0.0 || ^11.0.0- class-transformer: ^0.5- typeorm: ^0.3.15- checksum: 10c0/93c81d7a787992a227be643ee03d211fabda9ecd30ffb0116c4d60244cde666c096ad7330d8969e1390d24f876e51ee11545033ea6e8b41cf656defe94c28899- languageName: node- linkType: hard-"@puppeteer/browsers@npm:2.3.0":version: 2.3.0resolution: "@puppeteer/browsers@npm:2.3.0"@@ -32544,7 +32436,7 @@ __metadata:languageName: nodelinkType: hard-"graphql-fields@npm:2.0.3, graphql-fields@npm:^2.0.3":+"graphql-fields@npm:2.0.3":version: 2.0.3resolution: "graphql-fields@npm:2.0.3"checksum: 10c0/943c6ac8dba1320c1b81873e9e847aaec073d952de988f0d77047aafe7bef60c743ebc5974cf04fe27477e33d9c067a5bd45d95c784d64c37a1e743fd3a23b0d@@ -37397,13 +37289,6 @@ __metadata:languageName: nodelinkType: hard-"lodash.filter@npm:^4.6.0":- version: 4.6.0- resolution: "lodash.filter@npm:4.6.0"- checksum: 10c0/bb65002f3ee02b94400b9d8728a46d3ac9fc3eb7df387b3c642f36eff82d716714283ca674889a29edae3c28ea8a4048e6c7bb90598670ab9c97b5d125bffda2- languageName: node- linkType: hard-"lodash.get@npm:^4.4.2":version: 4.4.2resolution: "lodash.get@npm:4.4.2"@@ -37509,7 +37394,7 @@ __metadata:languageName: nodelinkType: hard-"lodash.merge@npm:4.6.2, lodash.merge@npm:^4.6.2":+"lodash.merge@npm:^4.6.2":version: 4.6.2resolution: "lodash.merge@npm:4.6.2"checksum: 10c0/402fa16a1edd7538de5b5903a90228aa48eb5533986ba7fa26606a49db2572bf414ff73a2c9f5d5fd36b31c46a5d5c7e1527749c07cbcf965ccff5fbdf32c506@@ -49811,9 +49696,6 @@ __metadata:"@opentelemetry/exporter-metrics-otlp-http": "npm:^0.219.0""@opentelemetry/exporter-prometheus": "npm:^0.219.0""@opentelemetry/sdk-metrics": "npm:^2.8.0"- "@ptc-org/nestjs-query-core": "npm:^9.4.0"- "@ptc-org/nestjs-query-graphql": "patch:@ptc-org/nestjs-query-graphql@npm%3A9.4.0#~/.yarn/patches/@ptc-org-nestjs-query-graphql-npm-9.4.0-8e6f7894e1.patch"- "@ptc-org/nestjs-query-typeorm": "patch:@ptc-org/nestjs-query-typeorm@npm%3A9.4.0#~/.yarn/patches/@ptc-org-nestjs-query-typeorm-npm-9.4.0-ca3414967e.patch""@react-pdf/renderer": "npm:^4.1.6""@sentry/nestjs": "npm:^10.59.0""@sentry/node": "npm:^10.59.0"