Skip to content

The open alternative to Salesforce, designed for AI.

Partners app: list-form reads and shared-module dedup (#24784)

Rashad Karanouh692837235b0f
diff --git a/packages/twenty-apps/internal/twenty-partners/.gitignore b/packages/twenty-apps/internal/twenty-partners/.gitignore
index 60aa5f23e9f..fa1744219fe 100644
--- a/packages/twenty-apps/internal/twenty-partners/.gitignore
+++ b/packages/twenty-apps/internal/twenty-partners/.gitignore
@@ -44,3 +44,6 @@ yarn-error.log*
# local graphify index (never commit — run `graphify update .` locally)
graphify-out/
+
+.superpowers/
+docs/
diff --git a/packages/twenty-apps/internal/twenty-partners/src/constants/universal-identifiers.ts b/packages/twenty-apps/internal/twenty-partners/src/constants/universal-identifiers.ts
index 14bfebd480d..e0c392fc0c9 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/constants/universal-identifiers.ts
+++ b/packages/twenty-apps/internal/twenty-partners/src/constants/universal-identifiers.ts
@@ -15,6 +15,8 @@ export const ON_PARTNER_LINK_CREATED_FN_UNIVERSAL_IDENTIFIER = 'a80a85f8-e32b-42
export const ON_PARTNER_SERVICE_CREATED_FN_UNIVERSAL_IDENTIFIER = '20129ceb-981e-43da-a25d-0ff6fbe52060';
export const ON_PARTNER_CONTENT_CREATED_FN_UNIVERSAL_IDENTIFIER = '18d0f329-d4a6-4b82-87ea-b78aa1a73e47';
export const ON_WORKSPACE_MEMBER_CREATED_FN_UNIVERSAL_IDENTIFIER = '30c0857b-acd9-4362-b50c-4557d18a13b0';
+export const ON_OPPORTUNITY_INTRO_SENT_FN_UNIVERSAL_IDENTIFIER = 'c55a14db-e8ed-4d08-963a-65c44b50bee9';
+export const ON_OPPORTUNITY_LISTED_FN_UNIVERSAL_IDENTIFIER = 'ebbb2911-57e5-4edd-bd93-4a28939115c0';
export const INTRO_SENT_AT_FIELD_UNIVERSAL_IDENTIFIER = 'fcf39b0c-0547-415e-806d-b238131ad7cc';
// Roles (Task 2)
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/application/__tests__/on-application-created.test.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/application/__tests__/on-application-created.test.ts
index 82e9b53cb58..a1d5d20cdb7 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/application/__tests__/on-application-created.test.ts
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/application/__tests__/on-application-created.test.ts
@@ -44,7 +44,7 @@ describe('on-application-created', () => {
it('stamps partnerUser from the partner on an admin-created row', async () => {
queryMock.mockResolvedValue({
- partner: { id: PARTNER_ID, partnerUserId: MEMBER_ID },
+ partners: { edges: [{ node: { id: PARTNER_ID, partnerUserId: MEMBER_ID } }] },
});
const result = await handler(
@@ -60,7 +60,7 @@ describe('on-application-created', () => {
it('leaves an admin-created row alone when the partner has no member', async () => {
queryMock.mockResolvedValue({
- partner: { id: PARTNER_ID, partnerUserId: null },
+ partners: { edges: [{ node: { id: PARTNER_ID, partnerUserId: null } }] },
});
const result = await handler(
@@ -71,6 +71,15 @@ describe('on-application-created', () => {
expect(mutationMock).not.toHaveBeenCalled();
});
+ it('leaves an admin-created row alone when the partner row is absent', async () => {
+ queryMock.mockResolvedValue({ partners: { edges: [] } });
+
+ const result = await handler(event({ id: APPLICATION_ID, partnerId: PARTNER_ID }));
+
+ expect(result).toEqual({ skipped: true, reason: 'partner_has_no_user' });
+ expect(mutationMock).not.toHaveBeenCalled();
+ });
+
it('resolves the candidacy when the self-apply row already carries partnerUser', async () => {
queryMock.mockResolvedValue({
partners: { edges: [{ node: { id: PARTNER_ID } }] },
@@ -134,7 +143,6 @@ describe('on-application-created', () => {
expect(args.data.partnerId).toBe(PARTNER_ID);
expect(args.data.partnerUserId).toBe(MEMBER_ID);
expect(args.data.state).toBe('APPLIED');
- expect(typeof args.data.lastActivityAt).toBe('string');
});
it('stamps normally when no duplicate exists for the same opportunity and partner', async () => {
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/application/__tests__/on-application-set-name.test.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/application/__tests__/on-application-set-name.test.ts
index f5b10ef4983..e98a3d6828c 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/application/__tests__/on-application-set-name.test.ts
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/application/__tests__/on-application-set-name.test.ts
@@ -25,10 +25,16 @@ describe('on-application-set-name', () => {
it('labels the application from partner + opportunity names', async () => {
queryMock.mockResolvedValue({
- application: {
- id: 'a1',
- partner: { name: 'Acme Partners' },
- opportunity: { name: 'Q3 Renewal' },
+ applications: {
+ edges: [
+ {
+ node: {
+ id: 'a1',
+ partner: { name: 'Acme Partners' },
+ opportunity: { name: 'Q3 Renewal' },
+ },
+ },
+ ],
},
});
@@ -47,4 +53,17 @@ describe('on-application-set-name', () => {
expect(queryMock).not.toHaveBeenCalled();
expect(mutationMock).not.toHaveBeenCalled();
});
+
+ it('falls back to the placeholder label when the application row is absent', async () => {
+ queryMock.mockResolvedValue({ applications: { edges: [] } });
+
+ await handler(event({ id: 'a1' }, ['partnerId']));
+
+ expect(mutationMock).toHaveBeenCalledWith({
+ updateApplication: {
+ __args: { id: 'a1', data: { name: 'Unassigned · No brief' } },
+ id: true,
+ },
+ });
+ });
});
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/application/graphql/queries/find-application-with-relations.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/application/graphql/queries/find-application-with-relations.ts
index ef6ff4a5315..8ee0b0dff32 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/application/graphql/queries/find-application-with-relations.ts
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/application/graphql/queries/find-application-with-relations.ts
@@ -1,12 +1,17 @@
import { type CoreApiClient } from 'twenty-client-sdk/core';
+// List form on purpose: the single-record read throws `Record not found` for an unknown id.
export function findApplicationWithRelations(client: CoreApiClient, id: string) {
return client.query({
- application: {
- __args: { filter: { id: { eq: id } } },
- id: true,
- partner: { name: true },
- opportunity: { name: true },
+ applications: {
+ __args: { filter: { id: { eq: id } }, first: 1 },
+ edges: {
+ node: {
+ id: true,
+ partner: { name: true },
+ opportunity: { name: true },
+ },
+ },
},
});
}
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/application/graphql/queries/find-duplicate-application.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/application/graphql/queries/find-duplicate-application.ts
index 6abe2b1e6ea..2057319ccb9 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/application/graphql/queries/find-duplicate-application.ts
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/application/graphql/queries/find-duplicate-application.ts
@@ -14,7 +14,7 @@ export function findDuplicateApplication(
},
first: 1,
},
- edges: { node: { id: true } },
+ edges: { node: { id: true, pitch: true, state: true } },
},
});
}
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/application/on-application-set-name.logic-function.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/application/on-application-set-name.logic-function.ts
index bb0bf75682f..464f06c2cde 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/application/on-application-set-name.logic-function.ts
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/application/on-application-set-name.logic-function.ts
@@ -7,6 +7,7 @@ import {
import { findApplicationWithRelations } from 'src/modules/application/graphql/queries/find-application-with-relations';
import { updateApplication } from 'src/modules/application/graphql/mutations/update-application';
+import { buildApplicationName } from 'src/modules/application/utils/build-application-name';
const ON_APPLICATION_SET_NAME_FN_ID = '8f123b54-a7c5-42d3-8049-a240930257a7';
@@ -21,10 +22,9 @@ export const handler = async (
if (!id) return {};
const client = new CoreApiClient();
const result = await findApplicationWithRelations(client, id);
+ const application = result.applications?.edges?.[0]?.node;
- const partnerName = result.application?.partner?.name ?? 'Unassigned';
- const opportunityName = result.application?.opportunity?.name ?? 'No brief';
- const name = `${partnerName} · ${opportunityName}`;
+ const name = buildApplicationName(application?.partner?.name, application?.opportunity?.name);
await updateApplication(client, id, { name });
return { labelled: name };
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/application/services/resolve-candidacy.service.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/application/services/resolve-candidacy.service.ts
index c31e4b14d8d..c1edd880784 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/application/services/resolve-candidacy.service.ts
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/application/services/resolve-candidacy.service.ts
@@ -4,7 +4,7 @@ import type {
ObjectRecordCreateEvent,
} from 'twenty-sdk/define';
-import { findPartnerByMember } from 'src/modules/application/graphql/queries/find-partner-by-member';
+import { findPartnerByMember } from 'src/modules/shared/graphql/queries/find-partner-by-member';
import { getPartnerOwner } from 'src/modules/shared/graphql/queries/get-partner-owner';
import { findDuplicateApplication } from 'src/modules/application/graphql/queries/find-duplicate-application';
import { deleteApplication } from 'src/modules/application/graphql/mutations/delete-application';
@@ -14,11 +14,12 @@ type ApplicationCreatedProperties = DatabaseEventPayload<
ObjectRecordCreateEvent<CoreSchema.Application>
>['properties'];
-// A partner self-applies via the "Apply to brief as partner" workflow: a Create Record action
-// makes an Application with the opportunity set, createdBy = the clicking member and
-// partnerUser = that member (mandatory — the Partner role's RLS rejects the insert otherwise),
-// but no partner. Resolve the partner from createdBy and complete the candidacy. The name is
-// set by on-application-set-name, which fires on the partnerId update below.
+// The app route POST /apply-to-brief creates the Application with partnerId and
+// partnerUserId already set, so this service returns at its first branch and does nothing.
+// It still serves the admin path: an invite or an import sets partnerId but no
+// partnerUserId, and this service stamps the partner's user so RLS doesn't hide the row
+// from its own partner. The createdBy-based self-apply branch below is a fallback for rows
+// created by a member without a partner set.
export async function resolveCandidacy(
client: CoreApiClient,
after: ApplicationCreatedProperties['after'],
@@ -31,7 +32,7 @@ export async function resolveCandidacy(
if (after.partnerUserId) return {};
const ownerRes = await getPartnerOwner(client, after.partnerId);
- const partnerUserId = ownerRes.partner?.partnerUserId;
+ const partnerUserId = ownerRes.partners?.edges?.[0]?.node?.partnerUserId;
if (!partnerUserId) return { skipped: true, reason: 'partner_has_no_user' };
await updateApplication(client, applicationId, { partnerUserId });
@@ -57,12 +58,10 @@ export async function resolveCandidacy(
}
}
- const now = new Date().toISOString();
await updateApplication(client, applicationId, {
partnerId,
partnerUserId: memberId,
state: 'APPLIED',
- lastActivityAt: now,
});
// ponytail: dedupe by (opportunity, partner) above; two near-simultaneous creates could still both pass before either stamps — acceptable.
return { applied: true, partnerId };
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/application/utils/__tests__/build-application-name.test.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/application/utils/__tests__/build-application-name.test.ts
new file mode 100644
index 00000000000..16326a72507
--- /dev/null
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/application/utils/__tests__/build-application-name.test.ts
@@ -0,0 +1,23 @@
+import { describe, expect, it } from 'vitest';
+
+import { buildApplicationName } from 'src/modules/application/utils/build-application-name';
+
+describe('buildApplicationName', () => {
+ it('joins both names with the separator', () => {
+ expect(buildApplicationName('Acme Partners', 'Q3 Renewal')).toBe('Acme Partners · Q3 Renewal');
+ });
+
+ it('falls back to Unassigned when the partner name is missing', () => {
+ expect(buildApplicationName(null, 'Q3 Renewal')).toBe('Unassigned · Q3 Renewal');
+ expect(buildApplicationName(undefined, 'Q3 Renewal')).toBe('Unassigned · Q3 Renewal');
+ });
+
+ it('falls back to No brief when the opportunity name is missing', () => {
+ expect(buildApplicationName('Acme Partners', null)).toBe('Acme Partners · No brief');
+ expect(buildApplicationName('Acme Partners', undefined)).toBe('Acme Partners · No brief');
+ });
+
+ it('falls back to both defaults when both names are missing', () => {
+ expect(buildApplicationName(null, undefined)).toBe('Unassigned · No brief');
+ });
+});
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/application/utils/build-application-name.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/application/utils/build-application-name.ts
new file mode 100644
index 00000000000..8781a5814f9
--- /dev/null
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/application/utils/build-application-name.ts
@@ -0,0 +1,8 @@
+export const buildApplicationName = (
+ partnerName: string | null | undefined,
+ opportunityName: string | null | undefined,
+): string => {
+ const resolvedPartnerName = partnerName ?? 'Unassigned';
+ const resolvedOpportunityName = opportunityName ?? 'No brief';
+ return `${resolvedPartnerName} · ${resolvedOpportunityName}`;
+};
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/opportunity/matching/graphql/queries/get-company-partner-user.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/opportunity/matching/graphql/queries/get-company-partner-user.ts
deleted file mode 100644
index fabb6bf507f..00000000000
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/opportunity/matching/graphql/queries/get-company-partner-user.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { CoreApiClient } from 'twenty-client-sdk/core';
-
-export function getCompanyPartnerUser(client: CoreApiClient, companyId: string) {
- return client.query({
- company: {
- __args: { filter: { id: { eq: companyId } } },
- id: true,
- partnerUserId: true,
- },
- });
-}
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/opportunity/matching/graphql/queries/get-opportunity-cascade-fields.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/opportunity/matching/graphql/queries/get-opportunity-cascade-fields.ts
index 1055ae65f3b..1876d13c36a 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/opportunity/matching/graphql/queries/get-opportunity-cascade-fields.ts
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/opportunity/matching/graphql/queries/get-opportunity-cascade-fields.ts
@@ -1,12 +1,11 @@
import type { CoreApiClient } from 'twenty-client-sdk/core';
+// List form on purpose: the single-record read throws `Record not found` for an unknown id.
export function getOpportunityCascadeFields(client: CoreApiClient, opportunityId: string) {
return client.query({
- opportunity: {
- __args: { filter: { id: { eq: opportunityId } } },
- id: true,
- partnerUserId: true,
- companyId: true,
+ opportunities: {
+ __args: { filter: { id: { eq: opportunityId } }, first: 1 },
+ edges: { node: { id: true, partnerUserId: true, companyId: true } },
},
});
}
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/opportunity/matching/services/propagate-partner-user.service.test.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/opportunity/matching/services/propagate-partner-user.service.test.ts
new file mode 100644
index 00000000000..69567de088e
--- /dev/null
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/opportunity/matching/services/propagate-partner-user.service.test.ts
@@ -0,0 +1,75 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { type CoreApiClient } from 'twenty-client-sdk/core';
+
+import { propagatePartnerUser } from './propagate-partner-user.service';
+
+describe('propagatePartnerUser absence branches', () => {
+ const query = vi.fn();
+ const mutation = vi.fn();
+ const client = { query, mutation } as unknown as CoreApiClient;
+
+ // Route each read by the shape of its selection, the way the other service tests do.
+ const routeQueries = (overrides: Record<string, unknown> = {}) => {
+ query.mockImplementation((selection: Record<string, unknown>) => {
+ const key = Object.keys(selection)[0] as string;
+ if (key in overrides) return Promise.resolve({ [key]: overrides[key] });
+ if (key === 'people') return Promise.resolve({ people: { edges: [] } });
+ return Promise.resolve({ [key]: { edges: [] } });
+ });
+ };
+
+ beforeEach(() => {
+ query.mockReset();
+ mutation.mockReset();
+ mutation.mockResolvedValue({});
+ routeQueries();
+ });
+
+ it('clears the opportunity when the cascade read finds no opportunity row', async () => {
+ const result = await propagatePartnerUser(client, {
+ opportunityId: 'opportunity-1',
+ before: { partnerId: 'partner-1' } as never,
+ after: {} as never,
+ });
+
+ expect(result).toEqual({ cascaded: true, cleared: true });
+ expect(mutation).toHaveBeenCalledWith({
+ updateOpportunity: {
+ __args: { id: 'opportunity-1', data: { partnerUserId: null } },
+ id: true,
+ },
+ });
+ });
+
+ it('reports partner_has_no_user when the partner row is absent', async () => {
+ const result = await propagatePartnerUser(client, {
+ opportunityId: 'opportunity-1',
+ before: {} as never,
+ after: { partnerId: 'partner-1' } as never,
+ });
+
+ expect(result).toEqual({ cascaded: false, reason: 'partner_has_no_user' });
+ expect(mutation).not.toHaveBeenCalled();
+ });
+
+ it('stamps the company when the company row is absent', async () => {
+ routeQueries({
+ partners: { edges: [{ node: { id: 'partner-1', partnerUserId: 'member-1' } }] },
+ companies: { edges: [] },
+ });
+
+ const result = await propagatePartnerUser(client, {
+ opportunityId: 'opportunity-1',
+ before: {} as never,
+ after: { partnerId: 'partner-1', companyId: 'company-1' } as never,
+ });
+
+ expect(result).toEqual({ cascaded: true, partnerUserId: 'member-1' });
+ expect(mutation).toHaveBeenCalledWith({
+ updateCompany: {
+ __args: { id: 'company-1', data: { partnerUserId: 'member-1' } },
+ id: true,
+ },
+ });
+ });
+});
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/opportunity/matching/services/propagate-partner-user.service.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/opportunity/matching/services/propagate-partner-user.service.ts
index 13629695944..bc1a11cf1ec 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/opportunity/matching/services/propagate-partner-user.service.ts
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/opportunity/matching/services/propagate-partner-user.service.ts
@@ -5,7 +5,7 @@ import type {
} from 'twenty-sdk/define';
import { collectAll } from 'src/modules/shared/utils/paginate.util';
-import { getCompanyPartnerUser } from 'src/modules/opportunity/matching/graphql/queries/get-company-partner-user';
+import { getCompanyPartnerUser } from 'src/modules/shared/graphql/queries/get-company-partner-user';
import { getOpportunityCascadeFields } from 'src/modules/opportunity/matching/graphql/queries/get-opportunity-cascade-fields';
import { getPartnerOwner } from 'src/modules/shared/graphql/queries/get-partner-owner';
import { findOpportunityStillUsingCompany } from 'src/modules/opportunity/matching/graphql/queries/find-opportunity-still-using-company';
@@ -71,8 +71,9 @@ export async function propagatePartnerUser(
if (!removedMemberId || !companyId) {
const oppResult = await getOpportunityCascadeFields(client, opportunityId);
- removedMemberId = removedMemberId ?? oppResult.opportunity?.partnerUserId ?? null;
- companyId = companyId ?? oppResult.opportunity?.companyId ?? null;
+ const opportunity = oppResult.opportunities?.edges?.[0]?.node;
+ removedMemberId = removedMemberId ?? opportunity?.partnerUserId ?? null;
+ companyId = companyId ?? opportunity?.companyId ?? null;
}
await updateOpportunityPartnerUser(client, opportunityId, null);
@@ -96,7 +97,7 @@ export async function propagatePartnerUser(
// Clear the company (only if it belongs to this member) and every person stamped for them.
const companyResult = await getCompanyPartnerUser(client, companyId);
- if (companyResult.company?.partnerUserId === removedMemberId) {
+ if (companyResult.companies?.edges?.[0]?.node?.partnerUserId === removedMemberId) {
await updateCompanyPartnerUser(client, companyId, null);
}
@@ -115,7 +116,7 @@ export async function propagatePartnerUser(
// ── Assign / reassign ────────────────────────────────────────────────────────
const partnerResult = await getPartnerOwner(client, partnerId);
- const partnerUserId = partnerResult.partner?.partnerUserId;
+ const partnerUserId = partnerResult.partners?.edges?.[0]?.node?.partnerUserId;
if (!partnerUserId) return { cascaded: false, reason: 'partner_has_no_user' };
await updateOpportunityPartnerUser(client, opportunityId, partnerUserId);
@@ -128,7 +129,7 @@ export async function propagatePartnerUser(
// here would steal the company (and its contacts) from the other partner and expose their
// data. Stamp only the opportunity in that case and leave the company/people alone.
const companyResult = await getCompanyPartnerUser(client, companyId);
- const companyOwner = companyResult.company?.partnerUserId;
+ const companyOwner = companyResult.companies?.edges?.[0]?.node?.partnerUserId;
if (companyOwner && companyOwner !== partnerUserId) {
return { cascaded: true, partnerUserId, companyShared: true };
}
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/application-intake/__tests__/on-partner-application-created.test.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/application-intake/__tests__/on-partner-application-created.test.ts
index be76934328d..538446d2f58 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/application-intake/__tests__/on-partner-application-created.test.ts
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/application-intake/__tests__/on-partner-application-created.test.ts
@@ -15,22 +15,28 @@ import { handler } from '../on-partner-application-created.logic-function';
const PARTNER_ID = '11111111-1111-1111-1111-111111111111';
const partnerQueryResult = {
- partner: {
- id: PARTNER_ID,
- name: 'Analytical Engines Ltd',
- country: 'FRANCE',
- partnerScope: ['ADVISORY', 'SOLUTIONING'],
- skills: ['Onboarding', 'Migration'],
- languagesSpoken: ['ENGLISH', 'FRENCH'],
- persons: {
- edges: [
- {
- node: {
- name: { firstName: 'Ada', lastName: 'Lovelace' },
+ partners: {
+ edges: [
+ {
+ node: {
+ id: PARTNER_ID,
+ name: 'Analytical Engines Ltd',
+ country: 'FRANCE',
+ partnerScope: ['ADVISORY', 'SOLUTIONING'],
+ skills: ['Onboarding', 'Migration'],
+ languagesSpoken: ['ENGLISH', 'FRENCH'],
+ persons: {
+ edges: [
+ {
+ node: {
+ name: { firstName: 'Ada', lastName: 'Lovelace' },
+ },
+ },
+ ],
},
},
- ],
- },
+ },
+ ],
},
};
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/application-intake/graphql/queries/find-partner-for-embed.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/application-intake/graphql/queries/find-partner-for-embed.ts
index a1d23b9504f..ba828452096 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/application-intake/graphql/queries/find-partner-for-embed.ts
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/application-intake/graphql/queries/find-partner-for-embed.ts
@@ -1,19 +1,24 @@
import type { CoreApiClient } from 'twenty-client-sdk/core';
+// List form on purpose: the single-record read throws `Record not found` for an unknown id.
export function findPartnerForEmbed(client: CoreApiClient, id: string) {
return client.query({
- partner: {
- __args: { filter: { id: { eq: id } } },
- id: true,
- name: true,
- country: true,
- partnerScope: true,
- skills: true,
- languagesSpoken: true,
- persons: {
- edges: {
- node: {
- name: { firstName: true, lastName: true },
+ partners: {
+ __args: { filter: { id: { eq: id } }, first: 1 },
+ edges: {
+ node: {
+ id: true,
+ name: true,
+ country: true,
+ partnerScope: true,
+ skills: true,
+ languagesSpoken: true,
+ persons: {
+ edges: {
+ node: {
+ name: { firstName: true, lastName: true },
+ },
+ },
},
},
},
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/application-intake/services/notify-partner-application.service.test.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/application-intake/services/notify-partner-application.service.test.ts
new file mode 100644
index 00000000000..91c43175d35
--- /dev/null
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/application-intake/services/notify-partner-application.service.test.ts
@@ -0,0 +1,63 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+const { queryMock } = vi.hoisted(() => ({ queryMock: vi.fn() }));
+vi.mock('twenty-client-sdk/core', () => ({
+ CoreApiClient: vi.fn(function () {
+ return { query: queryMock };
+ }),
+}));
+
+import { notifyPartnerApplication } from './notify-partner-application.service';
+
+const PARTNER_ID = '11111111-1111-1111-1111-111111111111';
+const WEBHOOK_URL = 'https://discord.test/webhook';
+
+let fetchMock: ReturnType<typeof vi.fn>;
+
+beforeEach(() => {
+ queryMock.mockReset();
+ fetchMock = vi.fn().mockResolvedValue({ ok: true, status: 204, text: async () => '' });
+ vi.stubGlobal('fetch', fetchMock);
+ process.env.PARTNER_APP_FRONTEND_URL = 'https://partners.twenty.com';
+});
+
+afterEach(() => {
+ vi.unstubAllGlobals();
+ delete process.env.PARTNER_APP_FRONTEND_URL;
+});
+
+describe('notifyPartnerApplication', () => {
+ it('returns {} and posts nothing when the partner row is absent', async () => {
+ queryMock.mockResolvedValue({ partners: { edges: [] } });
+
+ const result = await notifyPartnerApplication(PARTNER_ID, WEBHOOK_URL);
+
+ expect(result).toEqual({});
+ expect(fetchMock).not.toHaveBeenCalled();
+ });
+
+ it('posts the embed when the partner row is present', async () => {
+ queryMock.mockResolvedValue({
+ partners: {
+ edges: [
+ {
+ node: {
+ id: PARTNER_ID,
+ name: 'Analytical Engines Ltd',
+ persons: {
+ edges: [{ node: { name: { firstName: 'Ada', lastName: 'Lovelace' } } }],
+ },
+ },
+ },
+ ],
+ },
+ });
+
+ const result = await notifyPartnerApplication(PARTNER_ID, WEBHOOK_URL);
+
+ expect(result).toEqual({ notified: true });
+ expect(fetchMock).toHaveBeenCalledTimes(1);
+ const body = JSON.parse((fetchMock.mock.calls[0][1] as { body: string }).body);
+ expect(body.embeds[0].url).toBe(`https://partners.twenty.com/object/partner/${PARTNER_ID}`);
+ });
+});
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/application-intake/services/notify-partner-application.service.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/application-intake/services/notify-partner-application.service.ts
index 97da93f1ed5..2807d660da5 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/application-intake/services/notify-partner-application.service.ts
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/application-intake/services/notify-partner-application.service.ts
@@ -17,7 +17,7 @@ export async function notifyPartnerApplication(
const client = new CoreApiClient();
const res = await findPartnerForEmbed(client, partnerId);
- const node = res.partner;
+ const node = res.partners?.edges?.[0]?.node;
if (!node) return {};
const applicantNode = node.persons?.edges?.[0]?.node;
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/onboarding/graphql/queries/get-company-partner-user.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/onboarding/graphql/queries/get-company-partner-user.ts
deleted file mode 100644
index 6fb6381afe4..00000000000
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/onboarding/graphql/queries/get-company-partner-user.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { type CoreApiClient } from 'twenty-client-sdk/core';
-
-export function getCompanyPartnerUser(client: CoreApiClient, companyId: string) {
- return client.query({
- company: { __args: { filter: { id: { eq: companyId } } }, id: true, partnerUserId: true },
- });
-}
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/onboarding/graphql/queries/get-partner-cascade-fields.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/onboarding/graphql/queries/get-partner-cascade-fields.ts
index 5da2ca27196..e4cf1e27a9f 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/onboarding/graphql/queries/get-partner-cascade-fields.ts
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/onboarding/graphql/queries/get-partner-cascade-fields.ts
@@ -2,14 +2,19 @@ import { type CoreApiClient } from 'twenty-client-sdk/core';
// ponytail: applications are capped at 200 (first: 200); persons fetch a single default page.
// A partner has only a handful of each, so neither cap is expected to bind in practice.
+// List form on purpose: the single-record read throws `Record not found` for an unknown id.
export function getPartnerCascadeFields(client: CoreApiClient, partnerId: string) {
return client.query({
- partner: {
- __args: { filter: { id: { eq: partnerId } } },
- id: true,
- companyId: true,
- partnerUserId: true,
- persons: { edges: { node: { id: true, partnerUserId: true } } },
+ partners: {
+ __args: { filter: { id: { eq: partnerId } }, first: 1 },
+ edges: {
+ node: {
+ id: true,
+ companyId: true,
+ partnerUserId: true,
+ persons: { edges: { node: { id: true, partnerUserId: true } } },
+ },
+ },
},
applications: {
__args: {
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/onboarding/services/link-partner-user.service.test.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/onboarding/services/link-partner-user.service.test.ts
index 8de36424823..c1b1f0efea3 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/onboarding/services/link-partner-user.service.test.ts
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/onboarding/services/link-partner-user.service.test.ts
@@ -9,16 +9,28 @@ describe('linkPartnerUser', () => {
const client = { query, mutation } as unknown as CoreApiClient;
// Route each read by the shape of its selection: the cascade query asks for `applications`,
- // getCompanyPartnerUser for `company`, getPartnerOwner for `partner` only.
+ // getCompanyPartnerUser for `companies`, getPartnerOwner for `partners` only.
const routeQueries = (opts: {
cascade: Record<string, unknown>;
companyOwner?: string | null;
ownerRecheck?: string | null;
+ companyMissing?: boolean;
+ ownerMissing?: boolean;
}) => {
query.mockImplementation((q: Record<string, unknown>) => {
if ('applications' in q) return Promise.resolve(opts.cascade);
- if ('company' in q) return Promise.resolve({ company: { id: 'company-1', partnerUserId: opts.companyOwner ?? null } });
- if ('partner' in q) return Promise.resolve({ partner: { id: 'partner-1', partnerUserId: opts.ownerRecheck ?? null } });
+ if ('companies' in q)
+ return Promise.resolve({
+ companies: opts.companyMissing
+ ? { edges: [] }
+ : { edges: [{ node: { id: 'company-1', partnerUserId: opts.companyOwner ?? null } }] },
+ });
+ if ('partners' in q)
+ return Promise.resolve({
+ partners: opts.ownerMissing
+ ? { edges: [] }
+ : { edges: [{ node: { id: 'partner-1', partnerUserId: opts.ownerRecheck ?? null } }] },
+ });
return Promise.resolve({});
});
};
@@ -32,12 +44,12 @@ describe('linkPartnerUser', () => {
it('stamps the partner and cascades to persons, company, applications, links, services and content', async () => {
routeQueries({
cascade: {
- partner: {
+ partners: { edges: [{ node: {
id: 'partner-1',
companyId: 'company-1',
partnerUserId: null,
persons: { edges: [{ node: { id: 'person-1', partnerUserId: null } }, { node: { id: 'person-2', partnerUserId: null } }] },
- },
+ } }] },
applications: { edges: [{ node: { id: 'app-1' } }] },
partnerLinks: { edges: [{ node: { id: 'link-1' } }] },
partnerServices: { edges: [{ node: { id: 'service-1' } }] },
@@ -69,12 +81,12 @@ describe('linkPartnerUser', () => {
it('skips persons already linked to a member', async () => {
routeQueries({
cascade: {
- partner: {
+ partners: { edges: [{ node: {
id: 'partner-1',
companyId: null,
partnerUserId: null,
persons: { edges: [{ node: { id: 'person-1', partnerUserId: 'member-7' } }, { node: { id: 'person-2', partnerUserId: null } }] },
- },
+ } }] },
applications: { edges: [] },
partnerLinks: { edges: [] },
partnerServices: { edges: [] },
@@ -94,7 +106,7 @@ describe('linkPartnerUser', () => {
routeQueries({
companyOwner: 'member-9', // company belongs to another partner's member
cascade: {
- partner: { id: 'partner-1', companyId: 'company-1', partnerUserId: null, persons: { edges: [{ node: { id: 'person-1', partnerUserId: null } }] } },
+ partners: { edges: [{ node: { id: 'partner-1', companyId: 'company-1', partnerUserId: null, persons: { edges: [{ node: { id: 'person-1', partnerUserId: null } }] } } }] },
applications: { edges: [] },
partnerLinks: { edges: [] },
partnerServices: { edges: [] },
@@ -114,7 +126,7 @@ describe('linkPartnerUser', () => {
routeQueries({
ownerRecheck: 'member-9', // a concurrent onboarding won the claim between read and stamp
cascade: {
- partner: { id: 'partner-1', companyId: null, partnerUserId: null, persons: { edges: [{ node: { id: 'person-1', partnerUserId: null } }] } },
+ partners: { edges: [{ node: { id: 'partner-1', companyId: null, partnerUserId: null, persons: { edges: [{ node: { id: 'person-1', partnerUserId: null } }] } } }] },
applications: { edges: [] },
partnerLinks: { edges: [] },
partnerServices: { edges: [] },
@@ -132,7 +144,7 @@ describe('linkPartnerUser', () => {
it('no-ops when the partner is already linked to the same member', async () => {
routeQueries({
cascade: {
- partner: { id: 'partner-1', companyId: null, partnerUserId: 'member-1', persons: { edges: [] } },
+ partners: { edges: [{ node: { id: 'partner-1', companyId: null, partnerUserId: 'member-1', persons: { edges: [] } } }] },
applications: { edges: [] },
},
});
@@ -144,7 +156,7 @@ describe('linkPartnerUser', () => {
it('reports partner_already_linked_other when claimed by a different member', async () => {
routeQueries({
cascade: {
- partner: { id: 'partner-1', companyId: null, partnerUserId: 'member-9', persons: { edges: [] } },
+ partners: { edges: [{ node: { id: 'partner-1', companyId: null, partnerUserId: 'member-9', persons: { edges: [] } } }] },
applications: { edges: [] },
},
});
@@ -156,7 +168,7 @@ describe('linkPartnerUser', () => {
it('throws when a cascade write fails (retry semantics)', async () => {
routeQueries({
cascade: {
- partner: { id: 'partner-1', companyId: null, partnerUserId: null, persons: { edges: [{ node: { id: 'person-1', partnerUserId: null } }] } },
+ partners: { edges: [{ node: { id: 'partner-1', companyId: null, partnerUserId: null, persons: { edges: [{ node: { id: 'person-1', partnerUserId: null } }] } } }] },
applications: { edges: [] },
partnerLinks: { edges: [] },
partnerServices: { edges: [] },
@@ -167,4 +179,39 @@ describe('linkPartnerUser', () => {
await expect(linkPartnerUser(client, { partnerId: 'partner-1', memberId: 'member-1' })).rejects.toThrow(/cascade write/);
expect(mutation).not.toHaveBeenCalledWith(expect.objectContaining({ updatePartner: expect.anything() }));
});
+ it('links without throwing when the company and partner rows are absent', async () => {
+ routeQueries({
+ companyMissing: true,
+ ownerMissing: true,
+ cascade: {
+ partners: { edges: [{ node: { id: 'partner-1', companyId: 'company-1', partnerUserId: null, persons: { edges: [] } } }] },
+ applications: { edges: [] },
+ partnerLinks: { edges: [] },
+ partnerServices: { edges: [] },
+ partnerContents: { edges: [] },
+ },
+ });
+
+ const result = await linkPartnerUser(client, { partnerId: 'partner-1', memberId: 'member-1' });
+
+ expect(result).toEqual({ linked: true, partnerId: 'partner-1' });
+ expect(mutation).toHaveBeenCalledWith(expect.objectContaining({ updatePartner: expect.anything() }));
+ });
+ it('runs no cascade write when the cascade read finds no partner row', async () => {
+ routeQueries({
+ cascade: {
+ partners: { edges: [] },
+ applications: { edges: [] },
+ partnerLinks: { edges: [] },
+ partnerServices: { edges: [] },
+ partnerContents: { edges: [] },
+ },
+ });
+
+ const result = await linkPartnerUser(client, { partnerId: 'partner-1', memberId: 'member-1' });
+
+ expect(result).toEqual({ linked: true, partnerId: 'partner-1' });
+ expect(mutation).not.toHaveBeenCalledWith(expect.objectContaining({ updatePerson: expect.anything() }));
+ expect(mutation).not.toHaveBeenCalledWith(expect.objectContaining({ updateCompany: expect.anything() }));
+ });
});
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/onboarding/services/link-partner-user.service.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/onboarding/services/link-partner-user.service.ts
index eac6bc8101e..a542ad779ab 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/onboarding/services/link-partner-user.service.ts
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/onboarding/services/link-partner-user.service.ts
@@ -1,6 +1,6 @@
import { type CoreApiClient } from 'twenty-client-sdk/core';
-import { getCompanyPartnerUser } from 'src/modules/partner/onboarding/graphql/queries/get-company-partner-user';
+import { getCompanyPartnerUser } from 'src/modules/shared/graphql/queries/get-company-partner-user';
import { getPartnerCascadeFields } from 'src/modules/partner/onboarding/graphql/queries/get-partner-cascade-fields';
import { getPartnerOwner } from 'src/modules/shared/graphql/queries/get-partner-owner';
import { updateApplicationPartnerUser } from 'src/modules/shared/graphql/mutations/update-application-partner-user';
@@ -24,8 +24,9 @@ export async function linkPartnerUser(
): Promise<LinkPartnerUserResult> {
const { partnerId, memberId } = input;
const detail = await getPartnerCascadeFields(client, partnerId);
+ const partner = detail.partners?.edges?.[0]?.node;
- const existing = detail.partner?.partnerUserId;
+ const existing = partner?.partnerUserId;
if (existing) {
return existing === memberId
? { linked: false, reason: 'already_linked_same' }
@@ -34,7 +35,7 @@ export async function linkPartnerUser(
// Only stamp persons not already linked. The other cascade collections are filtered
// server-side (partnerUserId IS NULL); persons come nested off the partner, so filter here.
- const personIds = (detail.partner?.persons?.edges ?? [])
+ const personIds = (partner?.persons?.edges ?? [])
.filter((e) => !e?.node?.partnerUserId)
.map((e) => e?.node?.id)
.filter((id): id is string => Boolean(id));
@@ -47,10 +48,11 @@ export async function linkPartnerUser(
// partnerUser column models one owner per company, so overwriting would revoke that
// partner's access to the company and its contacts. Mirrors propagatePartnerUser's
// companyShared guard. Leave the company alone in that case; stamp only the rest.
- const companyId = detail.partner?.companyId;
+ const companyId = partner?.companyId;
const companyWrites: Promise<unknown>[] = [];
if (companyId) {
- const companyOwner = (await getCompanyPartnerUser(client, companyId)).company?.partnerUserId;
+ const companyOwner = (await getCompanyPartnerUser(client, companyId)).companies?.edges?.[0]
+ ?.node?.partnerUserId;
if (!companyOwner || companyOwner === memberId) {
companyWrites.push(updateCompanyPartnerUser(client, companyId, memberId));
}
@@ -74,7 +76,8 @@ export async function linkPartnerUser(
// race (two members whose emails resolve to the same partner, created at once). This is NOT
// atomic — the API has no conditional update — so a simultaneous claim can still interleave;
// it only shrinks the window. Known limitation, consistent with the rest of the app.
- const claimant = (await getPartnerOwner(client, partnerId)).partner?.partnerUserId;
+ const claimant = (await getPartnerOwner(client, partnerId)).partners?.edges?.[0]?.node
+ ?.partnerUserId;
if (claimant && claimant !== memberId) {
return { linked: false, reason: 'partner_already_linked_other' };
}
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/front-components/my-case-studies.front-component.tsx b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/front-components/my-case-studies.front-component.tsx
index 4429744ef7f..91a29f93a17 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/front-components/my-case-studies.front-component.tsx
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/front-components/my-case-studies.front-component.tsx
@@ -12,7 +12,7 @@ import {
toSaveBody,
type CaseStudyRow,
} from './my-case-studies/case-study-rows';
-import { COLORS, FONT } from './my-profile/form-fields';
+import { COLORS, FONT } from 'src/modules/shared/front-components/palette';
import type { MyProfilePayload, SaveContentResult } from './my-profile/types';
type LoadResult = { ok: true; profile: MyProfilePayload } | { ok: false; reason: string };
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/front-components/my-case-studies/case-study-card.tsx b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/front-components/my-case-studies/case-study-card.tsx
index d86398ac037..1100ec26f7a 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/front-components/my-case-studies/case-study-card.tsx
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/front-components/my-case-studies/case-study-card.tsx
@@ -1,6 +1,8 @@
import { type CSSProperties } from 'react';
-import { COLORS, Field, FONT, TextInput, UrlInput } from '../my-profile/form-fields';
+import { COLORS, FONT } from 'src/modules/shared/front-components/palette';
+
+import { Field, TextInput, UrlInput } from '../my-profile/form-fields';
import { MarkdownEditor } from '../my-profile/markdown-editor';
import { type CaseStudyRow } from './case-study-rows';
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/front-components/my-profile.front-component.tsx b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/front-components/my-profile.front-component.tsx
index 8df99301991..57b7c383e02 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/front-components/my-profile.front-component.tsx
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/front-components/my-profile.front-component.tsx
@@ -4,15 +4,14 @@ import { enqueueSnackbar } from 'twenty-sdk/front-component';
import { MY_PROFILE_FRONT_COMPONENT_ID } from 'src/modules/partner/self-service/constants/my-profile.constants';
import { callAppRoute } from 'src/modules/shared/front-components/call-app-route';
+import { COLORS, FONT } from 'src/modules/shared/front-components/palette';
import { MarkdownEditor } from './my-profile/markdown-editor';
import { ProfilePictureUpload } from './my-profile/profile-picture-upload';
import {
ChipMultiSelect,
- COLORS,
CurrencyInput,
Field,
- FONT,
SelectInput,
TagInput,
TextInput,
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/front-components/my-profile/form-fields.tsx b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/front-components/my-profile/form-fields.tsx
index bd227602556..eb39a440e8b 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/front-components/my-profile/form-fields.tsx
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/front-components/my-profile/form-fields.tsx
@@ -1,20 +1,8 @@
import { useState, type ReactNode } from 'react';
-export type SelectOption = { value: string; label: string };
-
-export const COLORS = {
- bg: '#f7f7f8',
- surface: '#ffffff',
- surfaceAlt: '#f4f5f7',
- fg: '#1c1c1c',
- muted: '#66646a',
- border: '#e7e7eb',
- accent: '#4a38f5',
- accentSoft: 'rgba(74, 56, 245, 0.1)',
-} as const;
+import { COLORS, FONT } from 'src/modules/shared/front-components/palette';
-export const FONT =
- '"Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", Arial, sans-serif';
+export type SelectOption = { value: string; label: string };
const controlBase = {
width: '100%',
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/front-components/my-profile/markdown-editor.tsx b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/front-components/my-profile/markdown-editor.tsx
index b33df5537b5..a5b82752d9d 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/front-components/my-profile/markdown-editor.tsx
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/front-components/my-profile/markdown-editor.tsx
@@ -2,7 +2,7 @@ import { type ReactNode } from 'react';
import { copyToClipboard } from 'twenty-sdk/front-component';
-import { COLORS, FONT } from './form-fields';
+import { COLORS, FONT } from 'src/modules/shared/front-components/palette';
import { MarkdownContent } from './markdown-render';
// The sandboxed worker exposes no cursor/selection API (DOM refs are method-less proxies,
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/front-components/my-profile/markdown-render.tsx b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/front-components/my-profile/markdown-render.tsx
index fa006f23d5b..91969a92ce3 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/front-components/my-profile/markdown-render.tsx
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/front-components/my-profile/markdown-render.tsx
@@ -1,6 +1,6 @@
import Markdown from 'react-markdown';
-import { COLORS, FONT } from './form-fields';
+import { COLORS, FONT } from 'src/modules/shared/front-components/palette';
// Mirrors the public website renderer (partners-marketplace/RichText.tsx): same allow-list,
// unwrapDisallowed, and h1/h2 demoted to h3 — so the in-app preview renders exactly what a
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/front-components/my-profile/profile-picture-upload.tsx b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/front-components/my-profile/profile-picture-upload.tsx
index 284d464eac4..13829bc1c90 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/front-components/my-profile/profile-picture-upload.tsx
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/front-components/my-profile/profile-picture-upload.tsx
@@ -1,7 +1,7 @@
import { useState } from 'react';
import { AppPath, enqueueSnackbar, navigate } from 'twenty-sdk/front-component';
-import { COLORS, FONT } from './form-fields';
+import { COLORS, FONT } from 'src/modules/shared/front-components/palette';
const avatarStyle = {
width: 72,
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/graphql/queries/find-partner-by-member.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/graphql/queries/find-partner-by-member.ts
deleted file mode 100644
index c2cdc6d6c22..00000000000
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/graphql/queries/find-partner-by-member.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { type CoreApiClient } from 'twenty-client-sdk/core';
-
-export function findPartnerByMember(client: CoreApiClient, memberId: string) {
- return client.query({
- partners: {
- __args: { filter: { partnerUserId: { eq: memberId } }, first: 1 },
- edges: { node: { id: true } },
- },
- });
-}
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/services/on-partner-content-created.service.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/services/on-partner-content-created.service.ts
index 452379f8fa4..f8f80cd4072 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/services/on-partner-content-created.service.ts
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/services/on-partner-content-created.service.ts
@@ -5,7 +5,7 @@ import {
} from 'twenty-sdk/define';
import { updatePartnerContent } from 'src/modules/partner/self-service/graphql/mutations/update-partner-content';
-import { findPartnerByMember } from 'src/modules/partner/self-service/graphql/queries/find-partner-by-member';
+import { findPartnerByMember } from 'src/modules/shared/graphql/queries/find-partner-by-member';
import { stampPartnerUserFromPartner } from 'src/modules/partner/self-service/services/stamp-partner-user-on-child.service';
const CASE_STUDY_CONTENT_TYPE: CoreSchema.PartnerContent['contentType'] = [
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/services/on-partner-link-created.service.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/services/on-partner-link-created.service.ts
index e42dcfcf3bb..e13a5f71ca0 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/services/on-partner-link-created.service.ts
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/services/on-partner-link-created.service.ts
@@ -5,7 +5,7 @@ import {
} from 'twenty-sdk/define';
import { updatePartnerLink } from 'src/modules/partner/self-service/graphql/mutations/update-partner-link';
-import { findPartnerByMember } from 'src/modules/partner/self-service/graphql/queries/find-partner-by-member';
+import { findPartnerByMember } from 'src/modules/shared/graphql/queries/find-partner-by-member';
import { stampPartnerUserFromPartner } from 'src/modules/partner/self-service/services/stamp-partner-user-on-child.service';
export const onPartnerLinkCreated = async (
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/services/on-partner-service-created.service.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/services/on-partner-service-created.service.ts
index 3e484f9d72f..09902c51421 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/services/on-partner-service-created.service.ts
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/services/on-partner-service-created.service.ts
@@ -5,7 +5,7 @@ import {
} from 'twenty-sdk/define';
import { updatePartnerService } from 'src/modules/partner/self-service/graphql/mutations/update-partner-service';
-import { findPartnerByMember } from 'src/modules/partner/self-service/graphql/queries/find-partner-by-member';
+import { findPartnerByMember } from 'src/modules/shared/graphql/queries/find-partner-by-member';
import { stampPartnerUserFromPartner } from 'src/modules/partner/self-service/services/stamp-partner-user-on-child.service';
export const onPartnerServiceCreated = async (
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/services/resolve-partner-from-request.service.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/services/resolve-partner-from-request.service.ts
index 4ddd0ffd3cd..16f1550bb67 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/services/resolve-partner-from-request.service.ts
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/services/resolve-partner-from-request.service.ts
@@ -1,6 +1,6 @@
import { CoreApiClient } from 'twenty-client-sdk/core';
-import { findPartnerByMember } from 'src/modules/partner/self-service/graphql/queries/find-partner-by-member';
+import { findPartnerByMember } from 'src/modules/shared/graphql/queries/find-partner-by-member';
// Self-service routes run with the app-privileged token in production. Under the vitest
// harness TWENTY_APP_ACCESS_TOKEN is a crafted identity-only token (decoded for userId but
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/services/stamp-partner-user-on-child.service.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/services/stamp-partner-user-on-child.service.ts
index 17c1af06019..abed595977f 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/services/stamp-partner-user-on-child.service.ts
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/services/stamp-partner-user-on-child.service.ts
@@ -31,7 +31,7 @@ export const stampPartnerUserFromPartner = async (
childObject: PartnerChildObject,
childId: string,
): Promise<void> => {
- const partnerUserId = (await getPartnerOwner(client, partnerId)).partner
+ const partnerUserId = (await getPartnerOwner(client, partnerId)).partners?.edges?.[0]?.node
?.partnerUserId;
if (!partnerUserId) return;
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/services/stamp-partner-user-on-child.test.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/services/stamp-partner-user-on-child.test.ts
index 32a98bbed54..913845eaa1d 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/services/stamp-partner-user-on-child.test.ts
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/partner/self-service/services/stamp-partner-user-on-child.test.ts
@@ -3,6 +3,9 @@ import { type CoreApiClient } from 'twenty-client-sdk/core';
import { stampPartnerUserFromPartner } from './stamp-partner-user-on-child.service';
+const oneEdge = (node: Record<string, unknown>) => ({ edges: [{ node }] });
+const noEdges = { edges: [] };
+
describe('stampPartnerUserFromPartner', () => {
const query = vi.fn();
const mutation = vi.fn();
@@ -20,8 +23,8 @@ describe('stampPartnerUserFromPartner', () => {
it('stamps partnerLink partnerUserId when missing', async () => {
query
- .mockResolvedValueOnce({ partner: { id: 'partner-1', partnerUserId: 'member-1' } })
- .mockResolvedValueOnce({ partnerLink: { id: 'link-1', partnerUserId: null } });
+ .mockResolvedValueOnce({ partners: oneEdge({ id: 'partner-1', partnerUserId: 'member-1' }) })
+ .mockResolvedValueOnce({ partnerLinks: oneEdge({ id: 'link-1', partnerUserId: null }) });
await stampPartnerUserFromPartner(client, 'partner-1', 'partnerLink', 'link-1');
@@ -32,8 +35,8 @@ describe('stampPartnerUserFromPartner', () => {
it('stamps application partnerUserId when missing', async () => {
query
- .mockResolvedValueOnce({ partner: { id: 'partner-1', partnerUserId: 'member-1' } })
- .mockResolvedValueOnce({ application: { id: 'application-1', partnerUserId: null } });
+ .mockResolvedValueOnce({ partners: oneEdge({ id: 'partner-1', partnerUserId: 'member-1' }) })
+ .mockResolvedValueOnce({ applications: oneEdge({ id: 'application-1', partnerUserId: null }) });
await stampPartnerUserFromPartner(client, 'partner-1', 'application', 'application-1');
@@ -47,8 +50,8 @@ describe('stampPartnerUserFromPartner', () => {
it('stamps partnerService partnerUserId when missing', async () => {
query
- .mockResolvedValueOnce({ partner: { id: 'partner-1', partnerUserId: 'member-1' } })
- .mockResolvedValueOnce({ partnerService: { id: 'service-1', partnerUserId: null } });
+ .mockResolvedValueOnce({ partners: oneEdge({ id: 'partner-1', partnerUserId: 'member-1' }) })
+ .mockResolvedValueOnce({ partnerServices: oneEdge({ id: 'service-1', partnerUserId: null }) });
await stampPartnerUserFromPartner(client, 'partner-1', 'partnerService', 'service-1');
@@ -61,7 +64,7 @@ describe('stampPartnerUserFromPartner', () => {
});
it('does nothing when partner has no partnerUserId', async () => {
- query.mockResolvedValueOnce({ partner: { id: 'partner-1', partnerUserId: null } });
+ query.mockResolvedValueOnce({ partners: oneEdge({ id: 'partner-1', partnerUserId: null }) });
await stampPartnerUserFromPartner(client, 'partner-1', 'partnerService', 'service-1');
@@ -71,11 +74,29 @@ describe('stampPartnerUserFromPartner', () => {
it('does not rewrite when partnerContent already has matching partnerUserId', async () => {
query
- .mockResolvedValueOnce({ partner: { id: 'partner-1', partnerUserId: 'member-1' } })
- .mockResolvedValueOnce({ partnerContent: { id: 'content-1', partnerUserId: 'member-1' } });
+ .mockResolvedValueOnce({ partners: oneEdge({ id: 'partner-1', partnerUserId: 'member-1' }) })
+ .mockResolvedValueOnce({ partnerContents: oneEdge({ id: 'content-1', partnerUserId: 'member-1' }) });
await stampPartnerUserFromPartner(client, 'partner-1', 'partnerContent', 'content-1');
+ expect(mutation).not.toHaveBeenCalled();
+ });
+ it('does nothing when the partner row is absent', async () => {
+ query.mockResolvedValueOnce({ partners: noEdges });
+
+ await stampPartnerUserFromPartner(client, 'partner-1', 'partnerService', 'service-1');
+
+ expect(query).toHaveBeenCalledTimes(1);
+ expect(mutation).not.toHaveBeenCalled();
+ });
+
+ it('does nothing when the child row is absent', async () => {
+ query
+ .mockResolvedValueOnce({ partners: oneEdge({ id: 'partner-1', partnerUserId: 'member-1' }) })
+ .mockResolvedValueOnce({ partnerLinks: noEdges });
+
+ await stampPartnerUserFromPartner(client, 'partner-1', 'partnerLink', 'link-1');
+
expect(mutation).not.toHaveBeenCalled();
});
});
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/shared/front-components/palette.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/shared/front-components/palette.ts
new file mode 100644
index 00000000000..f11267a32fa
--- /dev/null
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/shared/front-components/palette.ts
@@ -0,0 +1,16 @@
+// Front components render outside the host app's theme, so every panel restates the Twenty
+// palette inline. Keep one copy here rather than one per domain.
+export const COLORS = {
+ bg: '#f7f7f8',
+ surface: '#ffffff',
+ surfaceAlt: '#f4f5f7',
+ fg: '#1c1c1c',
+ muted: '#66646a',
+ border: '#e7e7eb',
+ accent: '#4a38f5',
+ accentSoft: 'rgba(74, 56, 245, 0.1)',
+ danger: '#b42318',
+} as const;
+
+export const FONT =
+ '"Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", Arial, sans-serif';
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/application/graphql/queries/find-partner-by-member.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/shared/graphql/queries/find-partner-by-member.ts
similarity index 84%
rename from packages/twenty-apps/internal/twenty-partners/src/modules/application/graphql/queries/find-partner-by-member.ts
rename to packages/twenty-apps/internal/twenty-partners/src/modules/shared/graphql/queries/find-partner-by-member.ts
index c2cdc6d6c22..d499c6e407e 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/application/graphql/queries/find-partner-by-member.ts
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/shared/graphql/queries/find-partner-by-member.ts
@@ -4,7 +4,7 @@ export function findPartnerByMember(client: CoreApiClient, memberId: string) {
return client.query({
partners: {
__args: { filter: { partnerUserId: { eq: memberId } }, first: 1 },
- edges: { node: { id: true } },
+ edges: { node: { id: true, name: true } },
},
});
}
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/shared/graphql/queries/get-child-partner-user.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/shared/graphql/queries/get-child-partner-user.ts
index 5bcd6bfd8ef..4b78e4b6d3e 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/shared/graphql/queries/get-child-partner-user.ts
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/shared/graphql/queries/get-child-partner-user.ts
@@ -1,25 +1,46 @@
import { type CoreApiClient } from 'twenty-client-sdk/core';
+// List form on purpose: the single-record read throws `Record not found` for an unknown id.
export function getPartnerLinkPartnerUser(client: CoreApiClient, id: string) {
return client
- .query({ partnerLink: { __args: { filter: { id: { eq: id } } }, id: true, partnerUserId: true } })
- .then((res) => res.partnerLink);
+ .query({
+ partnerLinks: {
+ __args: { filter: { id: { eq: id } }, first: 1 },
+ edges: { node: { id: true, partnerUserId: true } },
+ },
+ })
+ .then((res) => res.partnerLinks?.edges?.[0]?.node ?? null);
}
export function getPartnerServicePartnerUser(client: CoreApiClient, id: string) {
return client
- .query({ partnerService: { __args: { filter: { id: { eq: id } } }, id: true, partnerUserId: true } })
- .then((res) => res.partnerService);
+ .query({
+ partnerServices: {
+ __args: { filter: { id: { eq: id } }, first: 1 },
+ edges: { node: { id: true, partnerUserId: true } },
+ },
+ })
+ .then((res) => res.partnerServices?.edges?.[0]?.node ?? null);
}
export function getPartnerContentPartnerUser(client: CoreApiClient, id: string) {
return client
- .query({ partnerContent: { __args: { filter: { id: { eq: id } } }, id: true, partnerUserId: true } })
- .then((res) => res.partnerContent);
+ .query({
+ partnerContents: {
+ __args: { filter: { id: { eq: id } }, first: 1 },
+ edges: { node: { id: true, partnerUserId: true } },
+ },
+ })
+ .then((res) => res.partnerContents?.edges?.[0]?.node ?? null);
}
export function getApplicationPartnerUser(client: CoreApiClient, id: string) {
return client
- .query({ application: { __args: { filter: { id: { eq: id } } }, id: true, partnerUserId: true } })
- .then((res) => res.application);
+ .query({
+ applications: {
+ __args: { filter: { id: { eq: id } }, first: 1 },
+ edges: { node: { id: true, partnerUserId: true } },
+ },
+ })
+ .then((res) => res.applications?.edges?.[0]?.node ?? null);
}
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/shared/graphql/queries/get-company-partner-user.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/shared/graphql/queries/get-company-partner-user.ts
new file mode 100644
index 00000000000..08c988c8d4c
--- /dev/null
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/shared/graphql/queries/get-company-partner-user.ts
@@ -0,0 +1,11 @@
+import { type CoreApiClient } from 'twenty-client-sdk/core';
+
+// List form on purpose: the single-record read throws `Record not found` for an unknown id.
+export function getCompanyPartnerUser(client: CoreApiClient, companyId: string) {
+ return client.query({
+ companies: {
+ __args: { filter: { id: { eq: companyId } }, first: 1 },
+ edges: { node: { id: true, partnerUserId: true } },
+ },
+ });
+}
diff --git a/packages/twenty-apps/internal/twenty-partners/src/modules/shared/graphql/queries/get-partner-owner.ts b/packages/twenty-apps/internal/twenty-partners/src/modules/shared/graphql/queries/get-partner-owner.ts
index 6c6de332b3f..c27fe889d85 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/modules/shared/graphql/queries/get-partner-owner.ts
+++ b/packages/twenty-apps/internal/twenty-partners/src/modules/shared/graphql/queries/get-partner-owner.ts
@@ -1,7 +1,11 @@
import { type CoreApiClient } from 'twenty-client-sdk/core';
+// List form on purpose: the single-record read throws `Record not found` for an unknown id.
export function getPartnerOwner(client: CoreApiClient, partnerId: string) {
return client.query({
- partner: { __args: { filter: { id: { eq: partnerId } } }, id: true, partnerUserId: true },
+ partners: {
+ __args: { filter: { id: { eq: partnerId } }, first: 1 },
+ edges: { node: { id: true, partnerUserId: true } },
+ },
});
}
diff --git a/packages/twenty-apps/internal/twenty-partners/src/roles/partner.role.ts b/packages/twenty-apps/internal/twenty-partners/src/roles/partner.role.ts
index 738b244d155..9fa913a8c84 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/roles/partner.role.ts
+++ b/packages/twenty-apps/internal/twenty-partners/src/roles/partner.role.ts
@@ -13,7 +13,6 @@ import {
PARTNER_SERVICE_OBJECT_UNIVERSAL_IDENTIFIER,
} from 'src/constants/universal-identifiers';
import {
- APPLICATION_LAST_ACTIVITY_AT_FIELD_ID,
APPLICATION_NAME_FIELD_ID,
APPLICATION_OBJECT_UNIVERSAL_IDENTIFIER,
APPLICATION_PARTNER_FIELD_ID,
@@ -55,23 +54,27 @@ import { REFERRED_BY_PARTNER_ON_OPPORTUNITY_FIELD_ID } from 'src/modules/opportu
// Shared with configure-partner-rls.ts, which locates the role by this label.
export const PARTNER_ROLE_LABEL = 'Partner';
-// External partner self-service role: a partner sees only its own records, can edit its
-// own Partner profile and an Application's pitch (and set opportunity on apply/create); Company/
-// Person are read-only. Opportunity stage/amount are admin-only (read-only for partners).
-// Application rows are scoped to own partnerUser (RLS). Row-level predicates can't ship in
-// the manifest, so run `yarn rls:configure` after install.
+// External partner self-service role: a partner sees only its own records and can edit its
+// own Partner profile. Company, Person, Opportunity and Application are read-only — the
+// pitch is set once by the apply route (application role) at creation and is never editable
+// by the partner afterwards. Application rows are scoped to own partnerUser (RLS).
+// Row-level predicates can't ship in the manifest, so run `yarn rls:configure` after install.
//
-// `updatedBy` and `position` must stay editable even though they're not partner-facing: the
-// server injects `updatedBy` into every update (ActorFromAuthContextService) and co-writes
-// `position` with `stage` on a kanban drag, so locking either makes ALL opportunity updates
-// fail with PERMISSION_DENIED. The server overwrites both regardless, so there's nothing to
-// protect. `createdBy` stays locked (not injected on update); `searchVector` is a generated
-// column, so its lock is an inert no-op.
+// The Opportunity and Application field locks below are moot now that neither object is
+// writable at all. They stay because configure-partner-rls.ts asserts on them and exits
+// non-zero on drift, and because they still describe intent if object access ever reopens.
+//
+// `updatedBy` and `position` are left unlocked on purpose: the server injects `updatedBy`
+// into every update (ActorFromAuthContextService) and co-writes `position` with `stage` on a
+// kanban drag, so locking either would make every opportunity update fail with
+// PERMISSION_DENIED if object-level write returned. The server overwrites both regardless,
+// so there's nothing to protect. `createdBy` stays locked (not injected on update);
+// `searchVector` is a generated column, so its lock is an inert no-op.
export default defineRole({
universalIdentifier: PARTNER_ROLE_UNIVERSAL_IDENTIFIER,
label: PARTNER_ROLE_LABEL,
description:
- 'External partner self-service role. Sees only its own Partner/Person/Company/PartnerLink/PartnerService/PartnerContent/Opportunity/Application records (row-level). Can edit its own Partner profile and an Application’s pitch; Opportunity stage/amount are read-only. Configure predicates with `yarn rls:configure` after install.',
+ 'External partner self-service role. Sees only its own Partner/Person/Company/PartnerLink/PartnerService/PartnerContent/Opportunity/Application records (row-level). Can edit its own Partner profile; Application is read-only (the pitch is set once at apply time and cannot be edited afterwards); Opportunity stage/amount are read-only. Configure predicates with `yarn rls:configure` after install.',
icon: 'IconBuildingStore',
canBeAssignedToUsers: true,
canUpdateAllSettings: false,
@@ -409,10 +412,12 @@ export default defineRole({
fieldUniversalIdentifier: PARTNER_USER_ON_PARTNER_CONTENT_FIELD_ID,
canUpdateFieldValue: false,
},
- // Application — lock every field except pitch and opportunity (partner sets opportunity
- // on apply/create; state is populated by on-application-created as the app). partnerUser
- // is listed as locked but stays writable at insert — the server exempts RLS predicate
- // fields there (permissions.utils.ts, insert case only).
+ // Application — lock every field except pitch and opportunity: the apply route sets
+ // both once, at creation, under the application role — not the partner role, which
+ // cannot write this object at all (canUpdateObjectRecords: false). state is populated
+ // by on-application-created as the app. partnerUser is listed as locked but stays
+ // writable at insert — the server exempts RLS predicate fields there
+ // (permissions.utils.ts, insert case only).
// System/server-managed fields (id, timestamps, updatedBy, position, searchVector) stay
// out — locking updatedBy/position breaks every update (same trap as Opportunity above).
{
@@ -435,11 +440,6 @@ export default defineRole({
fieldUniversalIdentifier: APPLICATION_STATE_FIELD_ID,
canUpdateFieldValue: false,
},
- {
- objectUniversalIdentifier: APPLICATION_OBJECT_UNIVERSAL_IDENTIFIER,
- fieldUniversalIdentifier: APPLICATION_LAST_ACTIVITY_AT_FIELD_ID,
- canUpdateFieldValue: false,
- },
],
objectPermissions: [
{
@@ -452,8 +452,10 @@ export default defineRole({
{
objectUniversalIdentifier:
STANDARD_OBJECT_UNIVERSAL_IDENTIFIERS.opportunity.universalIdentifier,
+ // Also what hides the "New Opportunity" button: the standard command menu item is
+ // gated on objectPermissions.canUpdateObjectRecords.
canReadObjectRecords: true,
- canUpdateObjectRecords: true,
+ canUpdateObjectRecords: false,
canSoftDeleteObjectRecords: false,
canDestroyObjectRecords: false,
},
@@ -475,8 +477,10 @@ export default defineRole({
},
{
objectUniversalIdentifier: APPLICATION_OBJECT_UNIVERSAL_IDENTIFIER,
+ // Insert permission checks canUpdateObjectRecords; disabling prevents
+ // partners from creating bare Applications (created by apply-to-brief route instead).
canReadObjectRecords: true,
- canUpdateObjectRecords: true,
+ canUpdateObjectRecords: false,
canSoftDeleteObjectRecords: false,
canDestroyObjectRecords: false,
},
diff --git a/packages/twenty-apps/internal/twenty-partners/src/scripts/configure-partner-rls.ts b/packages/twenty-apps/internal/twenty-partners/src/scripts/configure-partner-rls.ts
index 8511ccdb637..71dba20a45d 100644
--- a/packages/twenty-apps/internal/twenty-partners/src/scripts/configure-partner-rls.ts
+++ b/packages/twenty-apps/internal/twenty-partners/src/scripts/configure-partner-rls.ts
@@ -3,9 +3,9 @@
//
// 1. Upserts row-level-permission predicates on the Partner role:
// - "partnerUser IS the current member" on partner/person/company/partnerLink/partnerService/
-// partnerContent/application. The Apply workflow must map Partner User to the clicking
-// member at insert (see src/workflows/README.md) — RLS validates the insert against the
-// row as submitted, so a row created without partnerUser is rejected.
+// partnerContent/application. RLS validates an insert against the row as submitted, so a
+// row created without partnerUser is rejected — which is why the apply route sets
+// partnerUser when it creates the Application.
// - "(partnerUser IS me) OR (isListed = true)" on opportunity (marketplace briefs)
// - "id IS the current member" on workspaceMember (self-scope; internal roster hidden)
//
@@ -14,12 +14,16 @@
// (ROLE_BELONGS_TO_ANOTHER_APPLICATION), so those must come from the manifest; if any
// expected lock is missing, the script exits non-zero and tells you to re-sync.
//
-// 3. Verifies Application field permissions the same way (pitch editable; rest locked).
+// 3. Verifies Application field permissions the same way. The Partner role cannot write
+// Application at all (canUpdateObjectRecords: false); the field locks are kept as
+// intent on top of that object-level block, not as the mechanism.
//
// Usage:
// yarn rls:configure # against .env.local
// yarn rls:configure:prod # against .env.prod
+import { createHash } from 'node:crypto';
+
import { config } from 'dotenv';
config({ path: process.env.ENV_FILE ?? '.env.local' });
@@ -43,13 +47,26 @@ const SIMPLE_TARGET_OBJECTS = [
] as const;
type SimpleTargetObject = (typeof SIMPLE_TARGET_OBJECTS)[number];
+// A UUIDv5-shaped id derived from a seed: stable across re-runs, distinct per workspace.
+const deriveUuid = (seed: string): string => {
+ const hex = createHash('sha1').update(seed).digest('hex');
+ const version = `5${hex.slice(13, 16)}`;
+ const variant = ((parseInt(hex.slice(16, 18), 16) & 0x3f) | 0x80)
+ .toString(16)
+ .padStart(2, '0');
+
+ return [
+ hex.slice(0, 8),
+ hex.slice(8, 12),
+ version,
+ variant + hex.slice(18, 20),
+ hex.slice(20, 32),
+ ].join('-');
+};
+
// opportunity uses an OR group (handled separately), but still needs an existence check.
const ALL_TARGET_OBJECTS = [...SIMPLE_TARGET_OBJECTS, 'opportunity'] as const;
-// Stable id for the OR predicate group — re-runs upsert in place instead of creating
-// a duplicate group.
-const OPPORTUNITY_RLS_OR_GROUP_ID = 'b7e7f3a0-4c5d-4e8f-9a1b-2c3d4e5f6789';
-
// Opportunity fields that must NOT be locked: system columns and updatedBy/position
// (server-managed — locking them breaks every update; see src/roles/partner.role.ts).
// Stage + amount are expected locked (admin-only for partners). Everything else too.
@@ -62,17 +79,19 @@ const OPPORTUNITY_FIELD_LOCK_SKIP = new Set([
'position',
]);
-// Application fields that must be locked (pitch + opportunity are partner-editable).
+// Application fields that must be locked. pitch + opportunity are exempt from this set —
+// not because a partner can edit them (they can't; the whole object is write-blocked) but
+// because the apply route sets both once, at creation, under the application role.
const APPLICATION_FIELD_LOCK_EXPECTED = new Set([
'name',
'partner',
'partnerUser',
'state',
- 'lastActivityAt',
]);
// Application fields that must NOT be locked: system columns, pitch + opportunity
-// (editable), and updatedBy/position (server-managed — locking them breaks every update).
+// (set once by the apply route, not by the partner), and updatedBy/position
+// (server-managed — locking them breaks every update).
const APPLICATION_FIELD_LOCK_SKIP = new Set([
'id',
'createdAt',
@@ -86,11 +105,10 @@ const APPLICATION_FIELD_LOCK_SKIP = new Set([
]);
const APPLY_WORKFLOW_WARNING =
- `[rls:configure] \u26a0 The "Apply to Brief" workflow in this workspace MUST map\n` +
- ` Partner User -> {{trigger.workspaceMember}} and map no other field, and every\n` +
- ` Application created before this run needs \`yarn backfill:partner-user\`.\n` +
- ` Otherwise partners cannot apply, and admin invites stay invisible to them.\n` +
- ` See src/workflows/README.md.\n`;
+ `[rls:configure] The apply path ships in the app manifest: a command menu item\n` +
+ ` opens a front component that calls POST /apply-to-brief. No workflow needs\n` +
+ ` building for it. That app route creates the Application under the\n` +
+ ` application role.\n`;
type ObjectInfo = {
objectMetadataId: string;
@@ -363,6 +381,12 @@ async function main() {
'id',
);
+ const workspaceData = await metadataFetch<{
+ currentWorkspace: { id: string };
+ }>(metadataUrl, apiKey, `{ currentWorkspace { id } }`);
+
+ const workspaceId = workspaceData.currentWorkspace.id;
+
// ── 3. Resolve Partner role id and fetch field permissions in one request ──────
//
// getRoles returns a flat array (not a connection) and does NOT expose
@@ -500,13 +524,19 @@ async function main() {
// Opportunity: (partnerUser IS me) OR (isListed = true) — listed briefs visible to all partners.
{
+ // Predicate-group ids are unique across the whole metadata schema, not per workspace,
+ // so a hardcoded id collides on a server that hosts more than one workspace.
+ const opportunityGroupId = deriveUuid(
+ `${workspaceId}:opportunity-rls-or-group`,
+ );
+
const oppPredicates = await upsertPredicates(
{
roleId: partnerRole.id,
objectMetadataId: opportunityObjectId,
predicateGroups: [
{
- id: OPPORTUNITY_RLS_OR_GROUP_ID,
+ id: opportunityGroupId,
objectMetadataId: opportunityObjectId,
logicalOperator: 'OR',
parentRowLevelPermissionPredicateGroupId: null,
@@ -517,14 +547,14 @@ async function main() {
fieldMetadataId: opportunityPartnerUserFieldId,
operand: 'IS',
workspaceMemberFieldMetadataId: workspaceMemberIdFieldId,
- rowLevelPermissionPredicateGroupId: OPPORTUNITY_RLS_OR_GROUP_ID,
+ rowLevelPermissionPredicateGroupId: opportunityGroupId,
positionInRowLevelPermissionPredicateGroup: 0,
},
{
fieldMetadataId: opportunityIsListedFieldId,
operand: 'IS',
value: true,
- rowLevelPermissionPredicateGroupId: OPPORTUNITY_RLS_OR_GROUP_ID,
+ rowLevelPermissionPredicateGroupId: opportunityGroupId,
positionInRowLevelPermissionPredicateGroup: 1,
},
],
@@ -543,7 +573,7 @@ async function main() {
}
console.log(
- `[rls:configure] ✓ opportunity: OR group id=${OPPORTUNITY_RLS_OR_GROUP_ID} ` +
+ `[rls:configure] ✓ opportunity: OR group id=${opportunityGroupId} ` +
`(${oppPredicates.length} predicates: partnerUser IS me OR isListed = true)`,
);
}
@@ -636,7 +666,7 @@ async function main() {
}
console.log(
- `[rls:configure] ✓ ${oppLockedFps.length} Opportunity fields locked (stage + amount read-only) — field permissions verified`,
+ `[rls:configure] ✓ ${oppLockedFps.length} Opportunity fields locked (Partner role cannot write Opportunity at all; locks kept as intent) — field permissions verified`,
);
// ── 6. Verify Application field permissions (set via manifest, not here — see header) ─
@@ -684,8 +714,9 @@ async function main() {
if (pitchIsLocked) {
console.warn(
- `[rls:configure] WARNING: pitch field is locked — it should be editable. ` +
- `Remove it from fieldPermissions in partner.role.ts and re-sync.`,
+ `[rls:configure] NOTE: pitch field is locked on the Partner role, beyond the ` +
+ `expected set. Harmless — canUpdateObjectRecords already blocks every Partner ` +
+ `write to Application, so this lock has no additional effect.`,
);
}
@@ -713,7 +744,7 @@ async function main() {
}
console.log(
- `[rls:configure] ✓ ${appLockedFps.length} Application fields locked (pitch editable) — field permissions verified`,
+ `[rls:configure] ✓ ${appLockedFps.length} Application fields locked (Partner role cannot write Application at all; locks kept as intent) — field permissions verified`,
);
}