Skip to content

The open alternative to Salesforce, designed for AI.

Type composite raw JSON sub-fields in the workspace GraphQL schema (#25116)

martmull8684e7b6ed85
diff --git a/packages/twenty-client-sdk/src/generate/__tests__/__snapshots__/genql-engine-output.test.ts.snap b/packages/twenty-client-sdk/src/generate/__tests__/__snapshots__/genql-engine-output.test.ts.snap
deleted file mode 100644
index 1c0407ddd0a..00000000000
--- a/packages/twenty-client-sdk/src/generate/__tests__/__snapshots__/genql-engine-output.test.ts.snap
+++ /dev/null
@@ -1,347 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`Vendored genql engine output > renders schema types byte-identically 1`] = `
-"// @ts-nocheck
-export type Scalars = {
- JSON: Record<string, unknown>,
- DateTime: string,
- UUID: string,
- String: string,
- Boolean: boolean,
-}
-
-export type CompanyStage = 'LEAD' | 'CUSTOMER'
-
-export type Node = (Person | Company) & { __isUnion?: true }
-
-export type SearchResult = (Person | Company) & { __isUnion?: true }
-
-export interface Person {
- id: Scalars['UUID']
- name?: Scalars['String']
- stage?: CompanyStage
- settings?: Scalars['JSON']
- createdAt: Scalars['DateTime']
- employer?: Company
- __typename: 'Person'
-}
-
-export interface Company {
- id: Scalars['UUID']
- domainName?: Scalars['String']
- people?: (Person | undefined)[]
- __typename: 'Company'
-}
-
-export interface Query {
- node?: Node
- person?: Person
- search?: SearchResult
- __typename: 'Query'
-}
-
-export interface Mutation {
- createPerson?: Person
- __typename: 'Mutation'
-}
-
-export interface NodeGenqlSelection{
- id?: boolean | number
- on_Person?: PersonGenqlSelection
- on_Company?: CompanyGenqlSelection
- __typename?: boolean | number
- __scalar?: boolean | number
-}
-
-export interface SearchResultGenqlSelection{
- on_Person?:PersonGenqlSelection,
- on_Company?:CompanyGenqlSelection,
- on_Node?: NodeGenqlSelection,
- __typename?: boolean | number
-}
-
-export interface PersonGenqlSelection{
- id?: boolean | number
- name?: boolean | number
- stage?: boolean | number
- settings?: boolean | number
- createdAt?: boolean | number
- employer?: CompanyGenqlSelection
- __typename?: boolean | number
- __scalar?: boolean | number
-}
-
-export interface CompanyGenqlSelection{
- id?: boolean | number
- domainName?: boolean | number
- people?: PersonGenqlSelection
- __typename?: boolean | number
- __scalar?: boolean | number
-}
-
-export interface PersonCreateInput {name: Scalars['String'],stage?: (CompanyStage | null),settings?: (Scalars['JSON'] | null)}
-
-export interface QueryGenqlSelection{
- node?: (NodeGenqlSelection & { __args: {id: Scalars['UUID']} })
- person?: (PersonGenqlSelection & { __args: {id: Scalars['UUID']} })
- search?: (SearchResultGenqlSelection & { __args: {term: Scalars['String']} })
- __typename?: boolean | number
- __scalar?: boolean | number
-}
-
-export interface MutationGenqlSelection{
- createPerson?: (PersonGenqlSelection & { __args: {input: PersonCreateInput} })
- __typename?: boolean | number
- __scalar?: boolean | number
-}
-
-
- const Node_possibleTypes: string[] = ['Person','Company']
- export const isNode = (obj?: { __typename?: any } | null): obj is Node => {
- if (!obj?.__typename) throw new Error('__typename is missing in "isNode"')
- return Node_possibleTypes.includes(obj.__typename)
- }
-
-
-
- const SearchResult_possibleTypes: string[] = ['Person','Company']
- export const isSearchResult = (obj?: { __typename?: any } | null): obj is SearchResult => {
- if (!obj?.__typename) throw new Error('__typename is missing in "isSearchResult"')
- return SearchResult_possibleTypes.includes(obj.__typename)
- }
-
-
-
- const Person_possibleTypes: string[] = ['Person']
- export const isPerson = (obj?: { __typename?: any } | null): obj is Person => {
- if (!obj?.__typename) throw new Error('__typename is missing in "isPerson"')
- return Person_possibleTypes.includes(obj.__typename)
- }
-
-
-
- const Company_possibleTypes: string[] = ['Company']
- export const isCompany = (obj?: { __typename?: any } | null): obj is Company => {
- if (!obj?.__typename) throw new Error('__typename is missing in "isCompany"')
- return Company_possibleTypes.includes(obj.__typename)
- }
-
-
-
- const Query_possibleTypes: string[] = ['Query']
- export const isQuery = (obj?: { __typename?: any } | null): obj is Query => {
- if (!obj?.__typename) throw new Error('__typename is missing in "isQuery"')
- return Query_possibleTypes.includes(obj.__typename)
- }
-
-
-
- const Mutation_possibleTypes: string[] = ['Mutation']
- export const isMutation = (obj?: { __typename?: any } | null): obj is Mutation => {
- if (!obj?.__typename) throw new Error('__typename is missing in "isMutation"')
- return Mutation_possibleTypes.includes(obj.__typename)
- }
-
-
-export const enumCompanyStage = {
- LEAD: 'LEAD' as const,
- CUSTOMER: 'CUSTOMER' as const
-}
-"
-`;
-
-exports[`Vendored genql engine output > renders the SDL byte-identically 1`] = `
-"scalar JSON
-
-scalar DateTime
-
-scalar UUID
-
-enum CompanyStage {
- LEAD
- CUSTOMER
-}
-
-interface Node {
- id: UUID!
-}
-
-union SearchResult = Person | Company
-
-type Person implements Node {
- id: UUID!
- name: String
- stage: CompanyStage
- settings: JSON
- createdAt: DateTime!
- employer: Company
-}
-
-type Company implements Node {
- id: UUID!
- domainName: String
- people: [Person]
-}
-
-input PersonCreateInput {
- name: String!
- stage: CompanyStage
- settings: JSON
-}
-
-type Query {
- node(id: UUID!): Node
- person(id: UUID!): Person
- search(term: String!): SearchResult
-}
-
-type Mutation {
- createPerson(input: PersonCreateInput!): Person
-}"
-`;
-
-exports[`Vendored genql engine output > renders the runtime type map byte-identically 1`] = `
-"export default {
- "scalars": [
- 0,
- 1,
- 2,
- 3,
- 7,
- 12
- ],
- "types": {
- "JSON": {},
- "DateTime": {},
- "UUID": {},
- "CompanyStage": {},
- "Node": {
- "id": [
- 2
- ],
- "on_Person": [
- 6
- ],
- "on_Company": [
- 8
- ],
- "__typename": [
- 7
- ]
- },
- "SearchResult": {
- "on_Person": [
- 6
- ],
- "on_Company": [
- 8
- ],
- "on_Node": [
- 4
- ],
- "__typename": [
- 7
- ]
- },
- "Person": {
- "id": [
- 2
- ],
- "name": [
- 7
- ],
- "stage": [
- 3
- ],
- "settings": [
- 0
- ],
- "createdAt": [
- 1
- ],
- "employer": [
- 8
- ],
- "__typename": [
- 7
- ]
- },
- "String": {},
- "Company": {
- "id": [
- 2
- ],
- "domainName": [
- 7
- ],
- "people": [
- 6
- ],
- "__typename": [
- 7
- ]
- },
- "PersonCreateInput": {
- "name": [
- 7
- ],
- "stage": [
- 3
- ],
- "settings": [
- 0
- ],
- "__typename": [
- 7
- ]
- },
- "Query": {
- "node": [
- 4,
- {
- "id": [
- 2,
- "UUID!"
- ]
- }
- ],
- "person": [
- 6,
- {
- "id": [
- 2,
- "UUID!"
- ]
- }
- ],
- "search": [
- 5,
- {
- "term": [
- 7,
- "String!"
- ]
- }
- ],
- "__typename": [
- 7
- ]
- },
- "Mutation": {
- "createPerson": [
- 6,
- {
- "input": [
- 9,
- "PersonCreateInput!"
- ]
- }
- ],
- "__typename": [
- 7
- ]
- },
- "Boolean": {}
- }
-}"
-`;
diff --git a/packages/twenty-client-sdk/src/generate/__tests__/composite-field-type-overrides.test.ts b/packages/twenty-client-sdk/src/generate/__tests__/composite-field-type-overrides.test.ts
deleted file mode 100644
index bb859ee10ea..00000000000
--- a/packages/twenty-client-sdk/src/generate/__tests__/composite-field-type-overrides.test.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import { mkdtemp, readFile, rm } from 'node:fs/promises';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-
-import { afterAll, beforeAll, describe, expect, it } from 'vitest';
-
-import { generateCoreClientFromSchema } from '../generate-core-client';
-
-const SCHEMA = `
-scalar JSON
-
-type Query {
- person: Person
-}
-
-type Mutation {
- createPerson(emails: EmailsCreateInput): Person
-}
-
-type Person {
- id: ID!
- emails: Emails
- phones: Phones
- settings: JSON
-}
-
-type Emails {
- primaryEmail: String
- additionalEmails: JSON
-}
-
-type Phones {
- primaryPhoneNumber: String
- additionalPhones: JSON
-}
-
-input EmailsCreateInput {
- primaryEmail: String
- additionalEmails: JSON
-}
-
-schema {
- query: Query
- mutation: Mutation
-}
-`;
-
-describe('Composite RAW_JSON field type overrides in the generated client', () => {
- let temporaryDir: string;
- let generatedTypes: string;
-
- beforeAll(async () => {
- temporaryDir = await mkdtemp(join(tmpdir(), 'twenty-genql-overrides-'));
- const outputPath = join(temporaryDir, 'client');
-
- await generateCoreClientFromSchema({ schema: SCHEMA, outputPath });
-
- generatedTypes = await readFile(join(outputPath, 'schema.ts'), 'utf-8');
- }, 60000);
-
- afterAll(async () => {
- if (temporaryDir) {
- await rm(temporaryDir, { recursive: true, force: true });
- }
- });
-
- it('types Emails.additionalEmails as a string array in response types', () => {
- expect(generatedTypes).toContain('additionalEmails?: string[]');
- expect(generatedTypes).not.toMatch(/additionalEmails\?: Scalars/);
- });
-
- it('types EmailsCreateInput.additionalEmails as a nullable string array', () => {
- expect(generatedTypes).toContain('additionalEmails?: (string[] | null)');
- });
-
- it('types Phones.additionalPhones with the additional phone shape', () => {
- expect(generatedTypes).toContain(
- 'additionalPhones?: Array<{ number: string; callingCode: string; countryCode: string }>',
- );
- });
-
- it('keeps non-composite JSON fields on the scalar mapping', () => {
- expect(generatedTypes).toContain("settings?: Scalars['JSON']");
- });
-});
diff --git a/packages/twenty-client-sdk/src/generate/__tests__/genql-engine-output.test.ts b/packages/twenty-client-sdk/src/generate/__tests__/genql-engine-output.test.ts
deleted file mode 100644
index babaace318a..00000000000
--- a/packages/twenty-client-sdk/src/generate/__tests__/genql-engine-output.test.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import { mkdtemp, readFile, rm } from 'node:fs/promises';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-
-import { afterAll, beforeAll, describe, expect, it } from 'vitest';
-
-import { generate } from '../genql';
-
-const FIXTURE_SCHEMA = `
-scalar JSON
-scalar DateTime
-scalar UUID
-
-enum CompanyStage {
- LEAD
- CUSTOMER
-}
-
-interface Node {
- id: UUID!
-}
-
-union SearchResult = Person | Company
-
-type Person implements Node {
- id: UUID!
- name: String
- stage: CompanyStage
- settings: JSON
- createdAt: DateTime!
- employer: Company
-}
-
-type Company implements Node {
- id: UUID!
- domainName: String
- people: [Person]
-}
-
-input PersonCreateInput {
- name: String!
- stage: CompanyStage
- settings: JSON
-}
-
-type Query {
- node(id: UUID!): Node
- person(id: UUID!): Person
- search(term: String!): SearchResult
-}
-
-type Mutation {
- createPerson(input: PersonCreateInput!): Person
-}
-
-schema {
- query: Query
- mutation: Mutation
-}
-`;
-
-const SCALAR_TYPES = {
- DateTime: 'string',
- JSON: 'Record<string, unknown>',
- UUID: 'string',
-};
-
-describe('Vendored genql engine output', () => {
- let temporaryDir: string;
- let outputPath: string;
-
- beforeAll(async () => {
- temporaryDir = await mkdtemp(join(tmpdir(), 'twenty-genql-engine-'));
- outputPath = join(temporaryDir, 'client');
-
- await generate({
- schema: FIXTURE_SCHEMA,
- output: outputPath,
- scalarTypes: SCALAR_TYPES,
- });
- }, 60000);
-
- afterAll(async () => {
- if (temporaryDir) {
- await rm(temporaryDir, { recursive: true, force: true });
- }
- });
-
- it('renders schema types byte-identically', async () => {
- const schemaTypes = await readFile(join(outputPath, 'schema.ts'), 'utf-8');
-
- expect(schemaTypes).toMatchSnapshot();
- });
-
- it('renders the runtime type map byte-identically', async () => {
- const typeMap = await readFile(join(outputPath, 'types.ts'), 'utf-8');
-
- expect(typeMap).toMatchSnapshot();
- });
-
- it('renders the SDL byte-identically', async () => {
- const schemaGql = await readFile(
- join(outputPath, 'schema.graphql'),
- 'utf-8',
- );
-
- expect(schemaGql).toMatchSnapshot();
- });
-});
diff --git a/packages/twenty-client-sdk/src/generate/composite-field-type-overrides.ts b/packages/twenty-client-sdk/src/generate/composite-field-type-overrides.ts
deleted file mode 100644
index 16c5e1330be..00000000000
--- a/packages/twenty-client-sdk/src/generate/composite-field-type-overrides.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-import type { Equal, Expect } from 'twenty-shared/testing';
-import type {
- ActorMetadata,
- AdditionalPhoneMetadata,
- EmailsMetadata,
- LinkMetadata,
-} from 'twenty-shared/types';
-
-const ADDITIONAL_EMAILS_TYPE_TEXT = 'string[]';
-const ADDITIONAL_PHONES_TYPE_TEXT =
- 'Array<{ number: string; callingCode: string; countryCode: string }>';
-const SECONDARY_LINKS_TYPE_TEXT = 'Array<{ label: string; url: string }>';
-const ACTOR_CONTEXT_TYPE_TEXT = '{ provider?: string }';
-
-type WidenStringValues<TObject> = {
- [TKey in keyof TObject]: TObject[TKey] extends string | undefined
- ? string
- : TObject[TKey];
-};
-
-export type CompositeFieldTypeOverrideDriftGuards = [
- Expect<Equal<string[], NonNullable<EmailsMetadata['additionalEmails']>>>,
- Expect<
- Equal<
- { number: string; callingCode: string; countryCode: string },
- WidenStringValues<AdditionalPhoneMetadata>
- >
- >,
- Expect<Equal<{ label: string; url: string }, LinkMetadata>>,
- Expect<
- Equal<{ provider?: string }, WidenStringValues<ActorMetadata['context']>>
- >,
-];
-
-export const COMPOSITE_FIELD_TYPE_OVERRIDES: {
- [typeName: string]: { [fieldName: string]: string };
-} = {
- Emails: { additionalEmails: ADDITIONAL_EMAILS_TYPE_TEXT },
- EmailsCreateInput: { additionalEmails: ADDITIONAL_EMAILS_TYPE_TEXT },
- EmailsUpdateInput: { additionalEmails: ADDITIONAL_EMAILS_TYPE_TEXT },
- Phones: { additionalPhones: ADDITIONAL_PHONES_TYPE_TEXT },
- PhonesCreateInput: { additionalPhones: ADDITIONAL_PHONES_TYPE_TEXT },
- PhonesUpdateInput: { additionalPhones: ADDITIONAL_PHONES_TYPE_TEXT },
- Links: { secondaryLinks: SECONDARY_LINKS_TYPE_TEXT },
- LinksCreateInput: { secondaryLinks: SECONDARY_LINKS_TYPE_TEXT },
- LinksUpdateInput: { secondaryLinks: SECONDARY_LINKS_TYPE_TEXT },
- Actor: { context: ACTOR_CONTEXT_TYPE_TEXT },
- ActorCreateInput: { context: ACTOR_CONTEXT_TYPE_TEXT },
- ActorUpdateInput: { context: ACTOR_CONTEXT_TYPE_TEXT },
-};
-
-const findMatchingBrace = (source: string, openBraceIndex: number): number => {
- let depth = 0;
-
- for (let index = openBraceIndex; index < source.length; index++) {
- if (source[index] === '{') {
- depth++;
- }
-
- if (source[index] === '}') {
- depth--;
-
- if (depth === 0) {
- return index;
- }
- }
- }
-
- throw new Error('Unbalanced braces in generated schema types');
-};
-
-export const applyCompositeFieldTypeOverrides = (
- schemaTypesSource: string,
-): string => {
- let source = schemaTypesSource;
-
- for (const [typeName, fieldOverrides] of Object.entries(
- COMPOSITE_FIELD_TYPE_OVERRIDES,
- )) {
- const interfaceHeader = `export interface ${typeName} {`;
- const headerIndex = source.indexOf(interfaceHeader);
-
- if (headerIndex === -1) {
- continue;
- }
-
- const blockStart = headerIndex + interfaceHeader.length - 1;
- const blockEnd = findMatchingBrace(source, blockStart);
- let block = source.slice(blockStart, blockEnd + 1);
-
- for (const [fieldName, overriddenType] of Object.entries(fieldOverrides)) {
- const fieldPattern = new RegExp(
- `(${fieldName}\\?: \\(?)Scalars\\['JSON'\\]`,
- );
-
- if (!fieldPattern.test(block)) {
- throw new Error(
- `Expected ${typeName}.${fieldName} to render as the JSON scalar in the generated client; the genql engine output changed shape`,
- );
- }
-
- block = block.replace(
- fieldPattern,
- (_match, fieldPrefix) => `${fieldPrefix}${overriddenType}`,
- );
- }
-
- source = source.slice(0, blockStart) + block + source.slice(blockEnd + 1);
- }
-
- return source;
-};
diff --git a/packages/twenty-client-sdk/src/generate/generate-core-client.ts b/packages/twenty-client-sdk/src/generate/generate-core-client.ts
index a23fa1d6011..b293701f4cb 100644
--- a/packages/twenty-client-sdk/src/generate/generate-core-client.ts
+++ b/packages/twenty-client-sdk/src/generate/generate-core-client.ts
@@ -1,11 +1,10 @@
-import { appendFile, copyFile, readFile, writeFile } from 'node:fs/promises';
+import { appendFile, copyFile, writeFile } from 'node:fs/promises';
import { join } from 'node:path';
import { build } from 'esbuild';
import { DEFAULT_API_URL_NAME } from 'twenty-shared/application';
import { buildClientWrapperSource } from './client-wrapper';
-import { applyCompositeFieldTypeOverrides } from './composite-field-type-overrides';
import { emptyDir, ensureDir, move, remove } from './fs-utils';
import { generate } from './genql';
import twentyClientTemplateSource from './twenty-client-template.ts?raw';
@@ -43,14 +42,6 @@ export const generateCoreClientFromSchema = async ({
scalarTypes: COMMON_SCALAR_TYPES,
});
- const schemaTypesPath = join(tempPath, 'schema.ts');
- const schemaTypesSource = await readFile(schemaTypesPath, 'utf-8');
-
- await writeFile(
- schemaTypesPath,
- applyCompositeFieldTypeOverrides(schemaTypesSource),
- );
-
const clientContent = buildClientWrapperSource(templateSource, {
apiClientName: 'CoreApiClient',
defaultUrl: `\`\${process.env.${DEFAULT_API_URL_NAME}}/graphql\``,
diff --git a/packages/twenty-client-sdk/src/generate/genql/README.md b/packages/twenty-client-sdk/src/generate/genql/README.md
index bb9e2f9ab90..bb82561309c 100644
--- a/packages/twenty-client-sdk/src/generate/genql/README.md
+++ b/packages/twenty-client-sdk/src/generate/genql/README.md
@@ -41,13 +41,6 @@ in abandoned and vulnerable transitive packages (`undici`, `native-fetch`,
generated client still defaults its url/fetch to `undefined` (Twenty's wrapper
supplies them) and the output is unchanged.
-Twenty-specific typing tweaks live OUTSIDE this tree so the vendored engine
-stays verbatim: composite RAW_JSON sub-fields (e.g. `Emails.additionalEmails`)
-get their real TypeScript shape via a post-processing pass over the generated
-`schema.ts` (`../composite-field-type-overrides.ts`), never via renderer edits.
-The engine's own output is pinned byte-for-byte by the snapshot test in
-`../__tests__/genql-engine-output.test.ts`.
-
The renderers are vendored verbatim from `@genql/[email protected]`. Formatting now runs
on `prettier@^3` (the version the monorepo resolves): it needs the explicit
`prettier/plugins/estree` printer and an awaited, async `format()`. The runtime
diff --git a/packages/twenty-e2e-testing/tests/create-record.spec.ts b/packages/twenty-e2e-testing/tests/create-record.spec.ts
index f202c75c61c..151b937721a 100644
--- a/packages/twenty-e2e-testing/tests/create-record.spec.ts
+++ b/packages/twenty-e2e-testing/tests/create-record.spec.ts
@@ -25,7 +25,10 @@ const query = `query FindOnePerson($objectRecordId: UUID!) {
linkedinLink {
primaryLinkUrl
primaryLinkLabel
- secondaryLinks
+ secondaryLinks {
+ label
+ url
+ }
__typename
}
name {
@@ -38,7 +41,11 @@ const query = `query FindOnePerson($objectRecordId: UUID!) {
primaryPhoneNumber
primaryPhoneCountryCode
primaryPhoneCallingCode
- additionalPhones
+ additionalPhones {
+ number
+ callingCode
+ countryCode
+ }
__typename
}
position
diff --git a/packages/twenty-front/src/modules/activities/hooks/__tests__/useCreateActivityInDB.test.tsx b/packages/twenty-front/src/modules/activities/hooks/__tests__/useCreateActivityInDB.test.tsx
index 8e8adc13f43..31b114afe6c 100644
--- a/packages/twenty-front/src/modules/activities/hooks/__tests__/useCreateActivityInDB.test.tsx
+++ b/packages/twenty-front/src/modules/activities/hooks/__tests__/useCreateActivityInDB.test.tsx
@@ -25,6 +25,9 @@ const toISOStringMock = jest.fn(() => mockedDate);
global.Date.prototype.toISOString = toISOStringMock;
const { id, title, bodyV2, status, dueAt } = mockedTasks[0];
+const bodyV2WithoutTypename = isDefined(bodyV2)
+ ? { blocknote: bodyV2.blocknote, markdown: bodyV2.markdown }
+ : bodyV2;
const mockedActivity = {
id,
title,
@@ -74,7 +77,10 @@ const mocks: MockedResponse[] = [
request: {
query: createOneTaskMutation,
variables: {
- input: mockedActivity,
+ input: {
+ ...mockedActivity,
+ bodyV2: bodyV2WithoutTypename,
+ },
},
},
result: mockResult,
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/__tests__/mapFieldMetadataToGraphQLQuery.test.ts b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/mapFieldMetadataToGraphQLQuery.test.ts
index 9bd9fec48c4..7886e6f0099 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/__tests__/mapFieldMetadataToGraphQLQuery.test.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/mapFieldMetadataToGraphQLQuery.test.ts
@@ -57,19 +57,28 @@ xLink
{
primaryLinkUrl
primaryLinkLabel
- secondaryLinks
+ secondaryLinks {
+ label
+ url
+ }
}
linkedinLink
{
primaryLinkUrl
primaryLinkLabel
- secondaryLinks
+ secondaryLinks {
+ label
+ url
+ }
}
domainName
{
primaryLinkUrl
primaryLinkLabel
- secondaryLinks
+ secondaryLinks {
+ label
+ url
+ }
}
annualRecurringRevenue
{
@@ -135,7 +144,10 @@ xLink
{
primaryLinkUrl
primaryLinkLabel
- secondaryLinks
+ secondaryLinks {
+ label
+ url
+ }
}
accountOwner
{
@@ -151,13 +163,19 @@ linkedinLink
{
primaryLinkUrl
primaryLinkLabel
- secondaryLinks
+ secondaryLinks {
+ label
+ url
+ }
}
domainName
{
primaryLinkUrl
primaryLinkLabel
- secondaryLinks
+ secondaryLinks {
+ label
+ url
+ }
}
annualRecurringRevenue
{
@@ -186,7 +204,10 @@ xLink
{
primaryLinkUrl
primaryLinkLabel
- secondaryLinks
+ secondaryLinks {
+ label
+ url
+ }
}
id
createdAt
@@ -212,7 +233,10 @@ linkedinLink
{
primaryLinkUrl
primaryLinkLabel
- secondaryLinks
+ secondaryLinks {
+ label
+ url
+ }
}
updatedAt
avatarUrl
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/__tests__/mapObjectMetadataToGraphQLQuery.test.ts b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/mapObjectMetadataToGraphQLQuery.test.ts
index f8514d0d5eb..a7d106ffb71 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/__tests__/mapObjectMetadataToGraphQLQuery.test.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/mapObjectMetadataToGraphQLQuery.test.ts
@@ -71,7 +71,10 @@ describe('mapObjectMetadataToGraphQLQuery', () => {
{
primaryLinkUrl
primaryLinkLabel
- secondaryLinks
+ secondaryLinks {
+ label
+ url
+ }
}
company
{
@@ -82,7 +85,10 @@ describe('mapObjectMetadataToGraphQLQuery', () => {
{
primaryLinkUrl
primaryLinkLabel
- secondaryLinks
+ secondaryLinks {
+ label
+ url
+ }
}
annualRecurringRevenue
{
@@ -107,7 +113,10 @@ describe('mapObjectMetadataToGraphQLQuery', () => {
{
primaryLinkUrl
primaryLinkLabel
- secondaryLinks
+ secondaryLinks {
+ label
+ url
+ }
}
createdAt
accountOwnerId
@@ -115,7 +124,10 @@ describe('mapObjectMetadataToGraphQLQuery', () => {
{
primaryLinkUrl
primaryLinkLabel
- secondaryLinks
+ secondaryLinks {
+ label
+ url
+ }
}
updatedAt
}
@@ -125,7 +137,10 @@ describe('mapObjectMetadataToGraphQLQuery', () => {
{
primaryLinkUrl
primaryLinkLabel
- secondaryLinks
+ secondaryLinks {
+ label
+ url
+ }
}
}`),
);
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/mapFieldMetadataToGraphQLQuery.ts b/packages/twenty-front/src/modules/object-metadata/utils/mapFieldMetadataToGraphQLQuery.ts
index f3ac20e58ee..c52c6496ded 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/mapFieldMetadataToGraphQLQuery.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/mapFieldMetadataToGraphQLQuery.ts
@@ -244,7 +244,10 @@ ${mapObjectMetadataToGraphQLQuery({
{
primaryLinkUrl
primaryLinkLabel
- secondaryLinks
+ secondaryLinks {
+ label
+ url
+ }
}`;
}
@@ -285,7 +288,9 @@ ${mapObjectMetadataToGraphQLQuery({
source
workspaceMemberId
name
- context
+ context {
+ provider
+ }
}`;
}
@@ -303,7 +308,11 @@ ${mapObjectMetadataToGraphQLQuery({
primaryPhoneNumber
primaryPhoneCountryCode
primaryPhoneCallingCode
- additionalPhones
+ additionalPhones {
+ number
+ callingCode
+ countryCode
+ }
}`;
}
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/getRecordNodeFromRecord.ts b/packages/twenty-front/src/modules/object-record/cache/utils/getRecordNodeFromRecord.ts
index e67d35d72cf..8e711e8d3ad 100644
--- a/packages/twenty-front/src/modules/object-record/cache/utils/getRecordNodeFromRecord.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/getRecordNodeFromRecord.ts
@@ -244,7 +244,23 @@ export const getRecordNodeFromRecord = <T extends ObjectRecord>({
},
];
}
- case FieldMetadataType.LINKS:
+ case FieldMetadataType.LINKS: {
+ return [
+ gqlField,
+ {
+ ...value,
+ ...(Array.isArray(value?.secondaryLinks) && {
+ secondaryLinks: value.secondaryLinks.map(
+ (secondaryLink: object) => ({
+ ...secondaryLink,
+ __typename: 'SecondaryLink',
+ }),
+ ),
+ }),
+ __typename: pascalCase(field.type),
+ },
+ ];
+ }
case FieldMetadataType.ADDRESS:
case FieldMetadataType.FULL_NAME:
case FieldMetadataType.CURRENCY: {
diff --git a/packages/twenty-front/src/modules/object-record/hooks/__mocks__/personFragments.ts b/packages/twenty-front/src/modules/object-record/hooks/__mocks__/personFragments.ts
index fce044681e8..b28d633724b 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/__mocks__/personFragments.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/__mocks__/personFragments.ts
@@ -14,7 +14,9 @@ export const PERSON_FRAGMENT_WITH_DEPTH_ZERO_RELATIONS = `
source
workspaceMemberId
name
- context
+ context {
+ provider
+ }
}
deletedAt
emails {
@@ -27,7 +29,10 @@ export const PERSON_FRAGMENT_WITH_DEPTH_ZERO_RELATIONS = `
linkedinLink {
primaryLinkUrl
primaryLinkLabel
- secondaryLinks
+ secondaryLinks {
+ label
+ url
+ }
}
name {
firstName
@@ -38,7 +43,11 @@ export const PERSON_FRAGMENT_WITH_DEPTH_ZERO_RELATIONS = `
primaryPhoneNumber
primaryPhoneCountryCode
primaryPhoneCallingCode
- additionalPhones
+ additionalPhones {
+ number
+ callingCode
+ countryCode
+ }
}
position
updatedAt
@@ -46,19 +55,28 @@ export const PERSON_FRAGMENT_WITH_DEPTH_ZERO_RELATIONS = `
source
workspaceMemberId
name
- context
+ context {
+ provider
+ }
}
whatsapp {
primaryPhoneNumber
primaryPhoneCountryCode
primaryPhoneCallingCode
- additionalPhones
+ additionalPhones {
+ number
+ callingCode
+ countryCode
+ }
}
workPreference
xLink {
primaryLinkUrl
primaryLinkLabel
- secondaryLinks
+ secondaryLinks {
+ label
+ url
+ }
}
`;
@@ -108,7 +126,10 @@ export const PERSON_FRAGMENT_WITH_DEPTH_ONE_RELATIONS = `
domainName {
primaryLinkUrl
primaryLinkLabel
- secondaryLinks
+ secondaryLinks {
+ label
+ url
+ }
}
id
name
@@ -119,7 +140,9 @@ export const PERSON_FRAGMENT_WITH_DEPTH_ONE_RELATIONS = `
source
workspaceMemberId
name
- context
+ context {
+ provider
+ }
}
deletedAt
emails {
@@ -132,7 +155,10 @@ export const PERSON_FRAGMENT_WITH_DEPTH_ONE_RELATIONS = `
linkedinLink {
primaryLinkUrl
primaryLinkLabel
- secondaryLinks
+ secondaryLinks {
+ label
+ url
+ }
}
messageParticipants {
edges {
@@ -165,7 +191,11 @@ export const PERSON_FRAGMENT_WITH_DEPTH_ONE_RELATIONS = `
primaryPhoneNumber
primaryPhoneCountryCode
primaryPhoneCallingCode
- additionalPhones
+ additionalPhones {
+ number
+ callingCode
+ countryCode
+ }
}
pointOfContactForOpportunities {
edges {
@@ -186,7 +216,10 @@ export const PERSON_FRAGMENT_WITH_DEPTH_ONE_RELATIONS = `
domainName {
primaryLinkUrl
primaryLinkLabel
- secondaryLinks
+ secondaryLinks {
+ label
+ url
+ }
}
id
name
@@ -222,18 +255,27 @@ export const PERSON_FRAGMENT_WITH_DEPTH_ONE_RELATIONS = `
source
workspaceMemberId
name
- context
+ context {
+ provider
+ }
}
whatsapp {
primaryPhoneNumber
primaryPhoneCountryCode
primaryPhoneCallingCode
- additionalPhones
+ additionalPhones {
+ number
+ callingCode
+ countryCode
+ }
}
workPreference
xLink {
primaryLinkUrl
primaryLinkLabel
- secondaryLinks
+ secondaryLinks {
+ label
+ url
+ }
}
`;
diff --git a/packages/twenty-front/src/modules/object-record/hooks/__tests__/useRecordIndexTableQuery.test.tsx b/packages/twenty-front/src/modules/object-record/hooks/__tests__/useRecordIndexTableQuery.test.tsx
index 1712a73cc48..b43704b03e8 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/__tests__/useRecordIndexTableQuery.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/hooks/__tests__/useRecordIndexTableQuery.test.tsx
@@ -100,7 +100,10 @@ const mocks: MockedResponse[] = [
domainName {
primaryLinkUrl
primaryLinkLabel
- secondaryLinks
+ secondaryLinks {
+ label
+ url
+ }
}
id
name
diff --git a/packages/twenty-front/src/modules/object-record/utils/removeTypenamesFromCompositeFieldValue.ts b/packages/twenty-front/src/modules/object-record/utils/removeTypenamesFromCompositeFieldValue.ts
new file mode 100644
index 00000000000..f13d01bb41b
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/utils/removeTypenamesFromCompositeFieldValue.ts
@@ -0,0 +1,24 @@
+import { isDefined } from 'twenty-shared/utils';
+
+// Composite sub-fields typed as objects in the schema come back from Apollo with
+// __typename, which composite input types reject
+export const removeTypenamesFromCompositeFieldValue = (
+ value: unknown,
+): unknown => {
+ if (Array.isArray(value)) {
+ return value.map(removeTypenamesFromCompositeFieldValue);
+ }
+
+ if (!isDefined(value) || typeof value !== 'object') {
+ return value;
+ }
+
+ return Object.fromEntries(
+ Object.entries(value)
+ .filter(([key]) => key !== '__typename')
+ .map(([key, subValue]) => [
+ key,
+ removeTypenamesFromCompositeFieldValue(subValue),
+ ]),
+ );
+};
diff --git a/packages/twenty-front/src/modules/object-record/utils/sanitizeRecordInput.ts b/packages/twenty-front/src/modules/object-record/utils/sanitizeRecordInput.ts
index 0e4f47e773b..b5ac39d2ab0 100644
--- a/packages/twenty-front/src/modules/object-record/utils/sanitizeRecordInput.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/sanitizeRecordInput.ts
@@ -1,8 +1,10 @@
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { isManyToOneRelationField } from '@/object-metadata/utils/isManyToOneRelationField';
+import { isCompositeFieldType } from '@/object-record/object-filter-dropdown/utils/isCompositeFieldType';
import { isFieldMorphRelation } from '@/object-record/record-field/ui/types/guards/isFieldMorphRelation';
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
import { isSystemSearchVectorField } from '@/object-record/utils/isSystemSearchVectorField';
+import { removeTypenamesFromCompositeFieldValue } from '@/object-record/utils/removeTypenamesFromCompositeFieldValue';
import {
computeMorphRelationGqlFieldName,
computeRelationGqlFieldJoinColumnName,
@@ -90,6 +92,16 @@ export const sanitizeRecordInput = ({
return [fieldName, cleanedFiles];
}
+ if (
+ isDefined(fieldMetadataItem) &&
+ isCompositeFieldType(fieldMetadataItem.type)
+ ) {
+ return [
+ fieldName,
+ removeTypenamesFromCompositeFieldValue(fieldValue),
+ ];
+ }
+
// Todo: we should check that the fieldValue is a valid value
// (e.g. a string for a string field, following the right composite structure for composite fields)
return [fieldName, fieldValue];
diff --git a/packages/twenty-server/src/engine/api/graphql/direct-execution/utils/__tests__/graphql-format-result-from-selected-fields.util.spec.ts b/packages/twenty-server/src/engine/api/graphql/direct-execution/utils/__tests__/graphql-format-result-from-selected-fields.util.spec.ts
new file mode 100644
index 00000000000..7e6e123df71
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/direct-execution/utils/__tests__/graphql-format-result-from-selected-fields.util.spec.ts
@@ -0,0 +1,85 @@
+import { FieldMetadataType } from 'twenty-shared/types';
+
+import { graphQLFormatResultFromSelectedFields } from 'src/engine/api/graphql/direct-execution/utils/graphql-format-result-from-selected-fields.util';
+import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
+import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
+
+const PERSON_ID = 'person-object-id';
+const PHONES_FIELD_ID = 'phones-field-id';
+
+const flatObjectMetadataMaps = {
+ universalIdentifierById: { [PERSON_ID]: PERSON_ID },
+ byUniversalIdentifier: {
+ [PERSON_ID]: {
+ id: PERSON_ID,
+ nameSingular: 'person',
+ fieldIds: [PHONES_FIELD_ID],
+ },
+ },
+} as unknown as FlatEntityMaps<FlatObjectMetadata>;
+
+const flatFieldMetadataMaps = {
+ universalIdentifierById: { [PHONES_FIELD_ID]: PHONES_FIELD_ID },
+ byUniversalIdentifier: {
+ [PHONES_FIELD_ID]: {
+ id: PHONES_FIELD_ID,
+ name: 'phones',
+ type: FieldMetadataType.PHONES,
+ },
+ },
+} as unknown as FlatEntityMaps<OrmFlatFieldMetadata>;
+
+const formatPerson = (phones: unknown) =>
+ graphQLFormatResultFromSelectedFields(
+ { id: 'record-id', phones },
+ {
+ phones: {
+ primaryPhoneNumber: {},
+ additionalPhones: { number: {}, countryCode: {}, __typename: {} },
+ },
+ },
+ 'person',
+ {
+ flatObjectMetadataMaps,
+ flatFieldMetadataMaps,
+ objectIdByNameSingular: { person: PERSON_ID },
+ method: 'findOne',
+ },
+ );
+
+describe('graphQLFormatResultFromSelectedFields', () => {
+ it('projects selected sub-fields of an object-typed composite sub-field', () => {
+ expect(
+ formatPerson({
+ primaryPhoneNumber: '123456789',
+ additionalPhones: [{ number: '987654321', callingCode: '+33' }],
+ }),
+ ).toStrictEqual({
+ phones: {
+ primaryPhoneNumber: '123456789',
+ additionalPhones: [
+ {
+ number: '987654321',
+ countryCode: null,
+ __typename: 'AdditionalPhone',
+ },
+ ],
+ },
+ });
+ });
+
+ it('passes through a composite sub-field value that is not an object list', () => {
+ expect(
+ formatPerson({
+ primaryPhoneNumber: '123456789',
+ additionalPhones: '[{"number":"987654321"}]',
+ }),
+ ).toStrictEqual({
+ phones: {
+ primaryPhoneNumber: '123456789',
+ additionalPhones: '[{"number":"987654321"}]',
+ },
+ });
+ });
+});
diff --git a/packages/twenty-server/src/engine/api/graphql/direct-execution/utils/graphql-format-result-from-selected-fields.util.ts b/packages/twenty-server/src/engine/api/graphql/direct-execution/utils/graphql-format-result-from-selected-fields.util.ts
index f9f6770a6d9..55cbaefb5c8 100644
--- a/packages/twenty-server/src/engine/api/graphql/direct-execution/utils/graphql-format-result-from-selected-fields.util.ts
+++ b/packages/twenty-server/src/engine/api/graphql/direct-execution/utils/graphql-format-result-from-selected-fields.util.ts
@@ -22,6 +22,7 @@ import { IConnection } from 'src/engine/api/graphql/workspace-query-runner/inter
import { IEdge } from 'src/engine/api/graphql/workspace-query-runner/interfaces/edge.interface';
import { IGroupByConnection } from 'src/engine/api/graphql/workspace-query-runner/interfaces/group-by-connection.interface';
import { ResolverOutput } from 'src/engine/api/graphql/workspace-query-runner/interfaces/resolver-output';
+import { getCompositeSubFieldObjectTypeName } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-composite-sub-field-gql-types.util';
import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
@@ -204,17 +205,64 @@ const backfillNullValuesAndComputeTypeNameForObjectRecord = (
const backfillNullValuesAndComputeTypeNameForCompositeField = (
record: Record<string, unknown>,
selectedFields: Record<string, object>,
- fieldMetadataType: string,
+ fieldMetadataType: FieldMetadataType,
): Record<string, unknown> => {
const formatted: Record<string, unknown> = {};
- for (const key of Object.keys(selectedFields)) {
+ for (const [key, subFields] of Object.entries(selectedFields)) {
if (key === '__typename') {
formatted.__typename = pascalCase(fieldMetadataType);
continue;
}
- formatted[key] = record[key] ?? null;
+ const value = record[key] ?? null;
+ const subFieldTypeName = getCompositeSubFieldObjectTypeName(
+ fieldMetadataType,
+ key,
+ );
+
+ if (
+ !isDefined(subFieldTypeName) ||
+ isNull(value) ||
+ !isDefined(subFields) ||
+ isEmptyObject(subFields)
+ ) {
+ formatted[key] = value;
+ continue;
+ }
+
+ formatted[key] = Array.isArray(value)
+ ? value.map((item) =>
+ backfillNullValuesAndComputeTypeNameForCompositeSubField(
+ item,
+ subFields as Record<string, object>,
+ subFieldTypeName,
+ ),
+ )
+ : backfillNullValuesAndComputeTypeNameForCompositeSubField(
+ value,
+ subFields as Record<string, object>,
+ subFieldTypeName,
+ );
+ }
+
+ return formatted;
+};
+
+const backfillNullValuesAndComputeTypeNameForCompositeSubField = (
+ value: unknown,
+ selectedFields: Record<string, object>,
+ typeName: string,
+): unknown => {
+ if (!isDefined(value) || typeof value !== 'object' || Array.isArray(value)) {
+ return value;
+ }
+
+ const record = value as Record<string, unknown>;
+ const formatted: Record<string, unknown> = {};
+
+ for (const key of Object.keys(selectedFields)) {
+ formatted[key] = key === '__typename' ? typeName : (record[key] ?? null);
}
return formatted;
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/__tests__/composite-sub-field-gql-types.spec.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/__tests__/composite-sub-field-gql-types.spec.ts
new file mode 100644
index 00000000000..18d3e15bba1
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/__tests__/composite-sub-field-gql-types.spec.ts
@@ -0,0 +1,101 @@
+import {
+ type GraphQLInputObjectType,
+ type GraphQLObjectType,
+ isInputObjectType,
+ isObjectType,
+} from 'graphql';
+import {
+ emailsCompositeType,
+ FieldMetadataType,
+ linksCompositeType,
+ phonesCompositeType,
+} from 'twenty-shared/types';
+
+import { CompositeFieldMetadataCreateGqlInputTypeGenerator } from 'src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/input-types/create-input/composite-field-metadata-create-gql-input-type.generator';
+import { CompositeFieldMetadataGqlObjectTypeGenerator } from 'src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/composite-field-metadata-gql-object-type.generator';
+import { TypeMapperService } from 'src/engine/api/graphql/workspace-schema-builder/services/type-mapper.service';
+import { GqlTypesStorage } from 'src/engine/api/graphql/workspace-schema-builder/storages/gql-types.storage';
+import { GqlInputTypeDefinitionKind } from 'src/engine/api/graphql/workspace-schema-builder/enums/gql-input-type-definition-kind.enum';
+import { computeCompositeFieldInputTypeKey } from 'src/engine/api/graphql/workspace-schema-builder/utils/compute-stored-gql-type-key-utils/compute-composite-field-input-type-key.util';
+import { computeCompositeFieldObjectTypeKey } from 'src/engine/api/graphql/workspace-schema-builder/utils/compute-stored-gql-type-key-utils/compute-composite-field-object-type-key.util';
+
+describe('composite sub-field gql types', () => {
+ let gqlTypesStorage: GqlTypesStorage;
+ let objectTypeGenerator: CompositeFieldMetadataGqlObjectTypeGenerator;
+ let createInputTypeGenerator: CompositeFieldMetadataCreateGqlInputTypeGenerator;
+
+ beforeEach(() => {
+ gqlTypesStorage = new GqlTypesStorage();
+ objectTypeGenerator = new CompositeFieldMetadataGqlObjectTypeGenerator(
+ gqlTypesStorage,
+ new TypeMapperService(),
+ );
+ createInputTypeGenerator =
+ new CompositeFieldMetadataCreateGqlInputTypeGenerator(
+ gqlTypesStorage,
+ new TypeMapperService(),
+ );
+ });
+
+ const getObjectType = (fieldMetadataType: FieldMetadataType) => {
+ const type = gqlTypesStorage.getGqlTypeByKey(
+ computeCompositeFieldObjectTypeKey(fieldMetadataType),
+ );
+
+ if (!isObjectType(type)) {
+ throw new Error(`Expected an object type for ${fieldMetadataType}`);
+ }
+
+ return type as GraphQLObjectType;
+ };
+
+ const getCreateInputType = (fieldMetadataType: FieldMetadataType) => {
+ const type = gqlTypesStorage.getGqlTypeByKey(
+ computeCompositeFieldInputTypeKey(
+ fieldMetadataType,
+ GqlInputTypeDefinitionKind.Create,
+ ),
+ );
+
+ if (!isInputObjectType(type)) {
+ throw new Error(`Expected an input type for ${fieldMetadataType}`);
+ }
+
+ return type as GraphQLInputObjectType;
+ };
+
+ it('types raw json sub-fields in output types', () => {
+ objectTypeGenerator.buildAndStore(emailsCompositeType);
+ objectTypeGenerator.buildAndStore(phonesCompositeType);
+ objectTypeGenerator.buildAndStore(linksCompositeType);
+
+ expect(
+ String(
+ getObjectType(FieldMetadataType.EMAILS).getFields().additionalEmails
+ .type,
+ ),
+ ).toBe('[String!]');
+ expect(
+ String(
+ getObjectType(FieldMetadataType.PHONES).getFields().additionalPhones
+ .type,
+ ),
+ ).toBe('[AdditionalPhone!]');
+ expect(
+ String(
+ getObjectType(FieldMetadataType.LINKS).getFields().secondaryLinks.type,
+ ),
+ ).toBe('[SecondaryLink!]');
+ });
+
+ it('types raw json sub-fields in create input types', () => {
+ createInputTypeGenerator.buildAndStore(phonesCompositeType);
+
+ expect(
+ String(
+ getCreateInputType(FieldMetadataType.PHONES).getFields()
+ .additionalPhones.type,
+ ),
+ ).toBe('[AdditionalPhoneInput!]');
+ });
+});
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/input-types/create-input/composite-field-metadata-create-gql-input-type.generator.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/input-types/create-input/composite-field-metadata-create-gql-input-type.generator.ts
index 8f788a15a9d..6403c289eec 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/input-types/create-input/composite-field-metadata-create-gql-input-type.generator.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/input-types/create-input/composite-field-metadata-create-gql-input-type.generator.ts
@@ -16,6 +16,7 @@ import { applyTypeOptionsForCreateInput } from 'src/engine/api/graphql/workspace
import { computeCompositeFieldTypeOptions } from 'src/engine/api/graphql/workspace-schema-builder/utils/compute-composite-field-type-options.util';
import { computeCompositeFieldEnumTypeKey } from 'src/engine/api/graphql/workspace-schema-builder/utils/compute-stored-gql-type-key-utils/compute-composite-field-enum-type-key.util';
import { computeCompositeFieldInputTypeKey } from 'src/engine/api/graphql/workspace-schema-builder/utils/compute-stored-gql-type-key-utils/compute-composite-field-input-type-key.util';
+import { getCompositeSubFieldGqlTypes } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-composite-sub-field-gql-types.util';
import { isEnumFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-enum-field-metadata-type.util';
import { isMorphOrRelationFieldMetadataType } from 'src/engine/utils/is-morph-or-relation-field-metadata-type.util';
@@ -70,12 +71,19 @@ export class CompositeFieldMetadataCreateGqlInputTypeGenerator {
const typeOptions = computeCompositeFieldTypeOptions(property);
- const type = isEnumFieldMetadataType(property.type)
- ? this.gqlTypesStorage.getGqlTypeByKey<GraphQLEnumType>(key)
- : this.typeMapperService.mapToPreBuiltGraphQLInputType({
- fieldMetadataType: property.type,
- typeOptions,
- });
+ const compositeSubFieldGqlTypes = getCompositeSubFieldGqlTypes(
+ compositeType.type,
+ property.name,
+ );
+
+ const type =
+ compositeSubFieldGqlTypes?.input ??
+ (isEnumFieldMetadataType(property.type)
+ ? this.gqlTypesStorage.getGqlTypeByKey<GraphQLEnumType>(key)
+ : this.typeMapperService.mapToPreBuiltGraphQLInputType({
+ fieldMetadataType: property.type,
+ typeOptions,
+ }));
if (!isDefined(type) || isObjectType(type)) {
const message = `Could not find a GraphQL input type for ${compositeType.type} ${property.name}`;
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/input-types/update-input/composite-field-metadata-update-gql-input-type.generator.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/input-types/update-input/composite-field-metadata-update-gql-input-type.generator.ts
index 1849c25782f..3bb9671f193 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/input-types/update-input/composite-field-metadata-update-gql-input-type.generator.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/input-types/update-input/composite-field-metadata-update-gql-input-type.generator.ts
@@ -16,6 +16,7 @@ import { applyTypeOptionsForUpdateInput } from 'src/engine/api/graphql/workspace
import { computeCompositeFieldTypeOptions } from 'src/engine/api/graphql/workspace-schema-builder/utils/compute-composite-field-type-options.util';
import { computeCompositeFieldEnumTypeKey } from 'src/engine/api/graphql/workspace-schema-builder/utils/compute-stored-gql-type-key-utils/compute-composite-field-enum-type-key.util';
import { computeCompositeFieldInputTypeKey } from 'src/engine/api/graphql/workspace-schema-builder/utils/compute-stored-gql-type-key-utils/compute-composite-field-input-type-key.util';
+import { getCompositeSubFieldGqlTypes } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-composite-sub-field-gql-types.util';
import { isEnumFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-enum-field-metadata-type.util';
import { isMorphOrRelationFieldMetadataType } from 'src/engine/utils/is-morph-or-relation-field-metadata-type.util';
@@ -71,12 +72,19 @@ export class CompositeFieldMetadataUpdateGqlInputTypeGenerator {
const typeOptions = computeCompositeFieldTypeOptions(property);
- const type = isEnumFieldMetadataType(property.type)
- ? this.gqlTypesStorage.getGqlTypeByKey<GraphQLEnumType>(key)
- : this.typeMapperService.mapToPreBuiltGraphQLInputType({
- fieldMetadataType: property.type,
- typeOptions,
- });
+ const compositeSubFieldGqlTypes = getCompositeSubFieldGqlTypes(
+ compositeType.type,
+ property.name,
+ );
+
+ const type =
+ compositeSubFieldGqlTypes?.input ??
+ (isEnumFieldMetadataType(property.type)
+ ? this.gqlTypesStorage.getGqlTypeByKey<GraphQLEnumType>(key)
+ : this.typeMapperService.mapToPreBuiltGraphQLInputType({
+ fieldMetadataType: property.type,
+ typeOptions,
+ }));
if (!isDefined(type) || isObjectType(type)) {
const message = `Could not find a GraphQL input type for ${compositeType.type} ${property.name}`;
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/composite-field-metadata-gql-object-type.generator.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/composite-field-metadata-gql-object-type.generator.ts
index 316e27292c6..eb07383edaf 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/composite-field-metadata-gql-object-type.generator.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-type-generators/object-types/composite-field-metadata-gql-object-type.generator.ts
@@ -11,6 +11,7 @@ import { GraphQLOutputTypeFieldConfigMap } from 'src/engine/api/graphql/workspac
import { applyTypeOptionsForOutputType } from 'src/engine/api/graphql/workspace-schema-builder/utils/apply-type-options-for-output-type.util';
import { computeCompositeFieldEnumTypeKey } from 'src/engine/api/graphql/workspace-schema-builder/utils/compute-stored-gql-type-key-utils/compute-composite-field-enum-type-key.util';
import { computeCompositeFieldObjectTypeKey } from 'src/engine/api/graphql/workspace-schema-builder/utils/compute-stored-gql-type-key-utils/compute-composite-field-object-type-key.util';
+import { getCompositeSubFieldGqlTypes } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-composite-sub-field-gql-types.util';
import { isEnumFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-enum-field-metadata-type.util';
import { isMorphOrRelationFieldMetadataType } from 'src/engine/utils/is-morph-or-relation-field-metadata-type.util';
@@ -68,12 +69,19 @@ export class CompositeFieldMetadataGqlObjectTypeGenerator {
property.name,
);
- const type = isEnumFieldMetadataType(property.type)
- ? this.gqlTypesStorage.getGqlTypeByKey(key)
- : this.typeMapperService.mapToPreBuiltGraphQLOutputType({
- fieldMetadataType: property.type,
- typeOptions,
- });
+ const compositeSubFieldGqlTypes = getCompositeSubFieldGqlTypes(
+ compositeType.type,
+ property.name,
+ );
+
+ const type =
+ compositeSubFieldGqlTypes?.output ??
+ (isEnumFieldMetadataType(property.type)
+ ? this.gqlTypesStorage.getGqlTypeByKey(key)
+ : this.typeMapperService.mapToPreBuiltGraphQLOutputType({
+ fieldMetadataType: property.type,
+ typeOptions,
+ }));
if (!isDefined(type) || isInputObjectType(type)) {
const message = `Could not find a GraphQL object type for ${compositeType.type} ${property.name}`;
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/actor-context.input-type.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/actor-context.input-type.ts
new file mode 100644
index 00000000000..5e8d939ac59
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/actor-context.input-type.ts
@@ -0,0 +1,8 @@
+import { GraphQLInputObjectType, GraphQLString } from 'graphql';
+
+export const ActorContextInputType = new GraphQLInputObjectType({
+ name: 'ActorContextInput',
+ fields: {
+ provider: { type: GraphQLString },
+ },
+});
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/additional-phones.input-type.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/additional-phones.input-type.ts
new file mode 100644
index 00000000000..82e46c22c12
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/additional-phones.input-type.ts
@@ -0,0 +1,19 @@
+import {
+ GraphQLInputObjectType,
+ GraphQLList,
+ GraphQLNonNull,
+ GraphQLString,
+} from 'graphql';
+
+const AdditionalPhoneInputType = new GraphQLInputObjectType({
+ name: 'AdditionalPhoneInput',
+ fields: {
+ number: { type: GraphQLString },
+ callingCode: { type: GraphQLString },
+ countryCode: { type: GraphQLString },
+ },
+});
+
+export const AdditionalPhonesInputType = new GraphQLList(
+ new GraphQLNonNull(AdditionalPhoneInputType),
+);
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/secondary-links.input-type.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/secondary-links.input-type.ts
new file mode 100644
index 00000000000..f6c5dc81d34
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/input/secondary-links.input-type.ts
@@ -0,0 +1,18 @@
+import {
+ GraphQLInputObjectType,
+ GraphQLList,
+ GraphQLNonNull,
+ GraphQLString,
+} from 'graphql';
+
+const SecondaryLinkInputType = new GraphQLInputObjectType({
+ name: 'SecondaryLinkInput',
+ fields: {
+ label: { type: GraphQLString },
+ url: { type: GraphQLString },
+ },
+});
+
+export const SecondaryLinksInputType = new GraphQLList(
+ new GraphQLNonNull(SecondaryLinkInputType),
+);
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/object/actor-context.object-type.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/object/actor-context.object-type.ts
new file mode 100644
index 00000000000..ee1ba390460
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/object/actor-context.object-type.ts
@@ -0,0 +1,8 @@
+import { GraphQLObjectType, GraphQLString } from 'graphql';
+
+export const ActorContextObjectType = new GraphQLObjectType({
+ name: 'ActorContext',
+ fields: {
+ provider: { type: GraphQLString },
+ },
+});
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/object/additional-phones.object-type.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/object/additional-phones.object-type.ts
new file mode 100644
index 00000000000..dea6cdcc26e
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/object/additional-phones.object-type.ts
@@ -0,0 +1,19 @@
+import {
+ GraphQLList,
+ GraphQLNonNull,
+ GraphQLObjectType,
+ GraphQLString,
+} from 'graphql';
+
+const AdditionalPhoneObjectType = new GraphQLObjectType({
+ name: 'AdditionalPhone',
+ fields: {
+ number: { type: GraphQLString },
+ callingCode: { type: GraphQLString },
+ countryCode: { type: GraphQLString },
+ },
+});
+
+export const AdditionalPhonesObjectType = new GraphQLList(
+ new GraphQLNonNull(AdditionalPhoneObjectType),
+);
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/object/secondary-links.object-type.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/object/secondary-links.object-type.ts
new file mode 100644
index 00000000000..8713c00af88
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/object/secondary-links.object-type.ts
@@ -0,0 +1,18 @@
+import {
+ GraphQLList,
+ GraphQLNonNull,
+ GraphQLObjectType,
+ GraphQLString,
+} from 'graphql';
+
+const SecondaryLinkObjectType = new GraphQLObjectType({
+ name: 'SecondaryLink',
+ fields: {
+ label: { type: GraphQLString },
+ url: { type: GraphQLString },
+ },
+});
+
+export const SecondaryLinksObjectType = new GraphQLList(
+ new GraphQLNonNull(SecondaryLinkObjectType),
+);
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-composite-sub-field-gql-types.util.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-composite-sub-field-gql-types.util.ts
new file mode 100644
index 00000000000..f6ce7b731af
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-composite-sub-field-gql-types.util.ts
@@ -0,0 +1,109 @@
+import {
+ getNamedType,
+ GraphQLList,
+ GraphQLNonNull,
+ GraphQLString,
+ isObjectType,
+ type GraphQLInputType,
+ type GraphQLOutputType,
+} from 'graphql';
+import { FieldMetadataType } from 'twenty-shared/types';
+import { assertUnreachable, isDefined } from 'twenty-shared/utils';
+
+import { ActorContextInputType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/input/actor-context.input-type';
+import { AdditionalPhonesInputType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/input/additional-phones.input-type';
+import { SecondaryLinksInputType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/input/secondary-links.input-type';
+import { ActorContextObjectType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/object/actor-context.object-type';
+import { AdditionalPhonesObjectType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/object/additional-phones.object-type';
+import { SecondaryLinksObjectType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/object/secondary-links.object-type';
+import { type CompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/types/composite-field-metadata-type.type';
+import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
+
+type CompositeSubFieldGqlTypes = {
+ output: GraphQLOutputType;
+ input: GraphQLInputType;
+};
+
+const AdditionalEmailsType = new GraphQLList(new GraphQLNonNull(GraphQLString));
+
+const EMAILS_SUB_FIELD_GQL_TYPES = {
+ additionalEmails: {
+ output: AdditionalEmailsType,
+ input: AdditionalEmailsType,
+ },
+};
+
+const PHONES_SUB_FIELD_GQL_TYPES = {
+ additionalPhones: {
+ output: AdditionalPhonesObjectType,
+ input: AdditionalPhonesInputType,
+ },
+};
+
+const LINKS_SUB_FIELD_GQL_TYPES = {
+ secondaryLinks: {
+ output: SecondaryLinksObjectType,
+ input: SecondaryLinksInputType,
+ },
+};
+
+const ACTOR_SUB_FIELD_GQL_TYPES = {
+ context: {
+ output: ActorContextObjectType,
+ input: ActorContextInputType,
+ },
+};
+
+const NO_SUB_FIELD_GQL_TYPES = {};
+
+// Composite sub-fields stored as RAW_JSON have a known shape, exposed here as
+// real GraphQL types instead of the opaque JSON scalar
+const getCompositeSubFieldGqlTypesByPropertyName = (
+ compositeFieldMetadataType: CompositeFieldMetadataType,
+): Record<string, CompositeSubFieldGqlTypes> => {
+ switch (compositeFieldMetadataType) {
+ case FieldMetadataType.EMAILS:
+ return EMAILS_SUB_FIELD_GQL_TYPES;
+ case FieldMetadataType.PHONES:
+ return PHONES_SUB_FIELD_GQL_TYPES;
+ case FieldMetadataType.LINKS:
+ return LINKS_SUB_FIELD_GQL_TYPES;
+ case FieldMetadataType.ACTOR:
+ return ACTOR_SUB_FIELD_GQL_TYPES;
+ case FieldMetadataType.ADDRESS:
+ case FieldMetadataType.CURRENCY:
+ case FieldMetadataType.FULL_NAME:
+ case FieldMetadataType.RICH_TEXT:
+ return NO_SUB_FIELD_GQL_TYPES;
+ default:
+ return assertUnreachable(compositeFieldMetadataType);
+ }
+};
+
+export const getCompositeSubFieldGqlTypes = (
+ fieldMetadataType: FieldMetadataType,
+ propertyName: string,
+): CompositeSubFieldGqlTypes | undefined =>
+ isCompositeFieldMetadataType(fieldMetadataType)
+ ? getCompositeSubFieldGqlTypesByPropertyName(fieldMetadataType)[
+ propertyName
+ ]
+ : undefined;
+
+export const getCompositeSubFieldObjectTypeName = (
+ fieldMetadataType: FieldMetadataType,
+ propertyName: string,
+): string | undefined => {
+ const outputType = getCompositeSubFieldGqlTypes(
+ fieldMetadataType,
+ propertyName,
+ )?.output;
+
+ if (!isDefined(outputType)) {
+ return undefined;
+ }
+
+ const namedType = getNamedType(outputType);
+
+ return isObjectType(namedType) ? namedType.name : undefined;
+};
diff --git a/packages/twenty-server/test/integration/constants/company-gql-fields.constants.ts b/packages/twenty-server/test/integration/constants/company-gql-fields.constants.ts
index f4de6354c8f..85546a424a7 100644
--- a/packages/twenty-server/test/integration/constants/company-gql-fields.constants.ts
+++ b/packages/twenty-server/test/integration/constants/company-gql-fields.constants.ts
@@ -4,12 +4,18 @@ export const COMPANY_GQL_FIELDS = `
domainName {
primaryLinkLabel
primaryLinkUrl
- secondaryLinks
+ secondaryLinks {
+ label
+ url
+ }
}
linkedinLink {
primaryLinkLabel
primaryLinkUrl
- secondaryLinks
+ secondaryLinks {
+ label
+ url
+ }
}
createdAt
deletedAt
diff --git a/packages/twenty-server/test/integration/constants/person-gql-fields.constants.ts b/packages/twenty-server/test/integration/constants/person-gql-fields.constants.ts
index 598bab107e5..6244ace9070 100644
--- a/packages/twenty-server/test/integration/constants/person-gql-fields.constants.ts
+++ b/packages/twenty-server/test/integration/constants/person-gql-fields.constants.ts
@@ -22,13 +22,21 @@ export const PERSON_GQL_FIELDS = `
primaryPhoneNumber
primaryPhoneCountryCode
primaryPhoneCallingCode
- additionalPhones
+ additionalPhones {
+ number
+ callingCode
+ countryCode
+ }
}
whatsapp {
primaryPhoneNumber
primaryPhoneCountryCode
primaryPhoneCallingCode
- additionalPhones
+ additionalPhones {
+ number
+ callingCode
+ countryCode
+ }
}
createdAt
deletedAt
diff --git a/packages/twenty-server/test/integration/graphql/suites/inputs-validation/constants/test-object-gql-fields.constant.ts b/packages/twenty-server/test/integration/graphql/suites/inputs-validation/constants/test-object-gql-fields.constant.ts
index 62e58be7ba3..2ae78ad502c 100644
--- a/packages/twenty-server/test/integration/graphql/suites/inputs-validation/constants/test-object-gql-fields.constant.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/inputs-validation/constants/test-object-gql-fields.constant.ts
@@ -17,7 +17,11 @@ export const TEST_OBJECT_GQL_FIELDS = `
primaryPhoneNumber
primaryPhoneCallingCode
primaryPhoneCountryCode
- additionalPhones
+ additionalPhones {
+ number
+ callingCode
+ countryCode
+ }
}
emailsField {
primaryEmail
@@ -30,7 +34,10 @@ export const TEST_OBJECT_GQL_FIELDS = `
linksField {
primaryLinkUrl
primaryLinkLabel
- secondaryLinks
+ secondaryLinks {
+ label
+ url
+ }
}
currencyField {
amountMicros
diff --git a/packages/twenty-server/test/integration/metadata/suites/field-metadata/composite/failing-create-phone-field-metadata.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/field-metadata/composite/failing-create-phone-field-metadata.integration-spec.ts
index fd8159e068c..8d6260cfedf 100644
--- a/packages/twenty-server/test/integration/metadata/suites/field-metadata/composite/failing-create-phone-field-metadata.integration-spec.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/field-metadata/composite/failing-create-phone-field-metadata.integration-spec.ts
@@ -198,7 +198,11 @@ describe('failing create phone field metadata test suite', () => {
primaryPhoneNumber
primaryPhoneCountryCode
primaryPhoneCallingCode
- additionalPhones
+ additionalPhones {
+ number
+ callingCode
+ countryCode
+ }
__typename
}
`,
diff --git a/packages/twenty-server/test/integration/metadata/suites/field-metadata/composite/successful-create-phone-field-metadata.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/field-metadata/composite/successful-create-phone-field-metadata.integration-spec.ts
index 1ad1b381795..a549b9e2927 100644
--- a/packages/twenty-server/test/integration/metadata/suites/field-metadata/composite/successful-create-phone-field-metadata.integration-spec.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/field-metadata/composite/successful-create-phone-field-metadata.integration-spec.ts
@@ -17,7 +17,9 @@ const FIELD_NAME = 'phonenumber';
type TestCaseInputAndExpected = Partial<
Omit<PhonesMetadata, 'additionalPhones'>
> & {
- additionalPhones?: Array<Partial<AdditionalPhoneMetadata>> | null;
+ additionalPhones?: Array<
+ Partial<Record<keyof AdditionalPhoneMetadata, string | null>>
+ > | null;
};
type CreatePhoneFieldMetadataTestCase = {
@@ -183,6 +185,7 @@ const SUCCESSFUL_TEST_CASES: EachTestingContext<CreatePhoneFieldMetadataTestCase
additionalPhones: [
{
callingCode: '+1',
+ countryCode: null,
number: '123456789',
},
],
@@ -212,7 +215,9 @@ const SUCCESSFUL_TEST_CASES: EachTestingContext<CreatePhoneFieldMetadataTestCase
primaryPhoneCallingCode: '',
primaryPhoneCountryCode: '' as CountryCode,
primaryPhoneNumber: '',
- additionalPhones: [{}],
+ additionalPhones: [
+ { callingCode: null, countryCode: null, number: null },
+ ],
},
},
},
@@ -289,7 +294,11 @@ describe('successful create phone field metadata test suite', () => {
primaryPhoneNumber
primaryPhoneCountryCode
primaryPhoneCallingCode
- additionalPhones
+ additionalPhones {
+ number
+ callingCode
+ countryCode
+ }
__typename
}
`,