The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Declare the connected account shape for workflow step resolution once (#29148)
Félix Malfait8e8246ac0db0
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-flat-workflow-to-workflow-manifest.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-flat-workflow-to-workflow-manifest.util.spec.tsindex d460dd55a7a..38c5673d832 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-flat-workflow-to-workflow-manifest.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-flat-workflow-to-workflow-manifest.util.spec.ts@@ -16,10 +16,8 @@ import { WorkflowActionType } from 'twenty-shared/workflow';import { fromFlatWorkflowToWorkflowManifest } from 'src/engine/core-modules/application/application-manifest/converters/from-flat-workflow-to-workflow-manifest.util';import { fromWorkflowManifestToUniversalFlatWorkflowOrThrow } from 'src/engine/core-modules/application/application-manifest/converters/from-workflow-manifest-to-universal-flat-workflow-or-throw.util';-import {- type WorkflowManifestConnectedAccountReference,- type WorkflowManifestReferences,-} from 'src/engine/core-modules/application/application-manifest/types/workflow-manifest-references.type';+import { type WorkflowManifestReferences } from 'src/engine/core-modules/application/application-manifest/types/workflow-manifest-references.type';+import { type ConnectedAccountForWorkflowStepResolution } from 'src/engine/metadata-modules/connected-account/types/connected-account-for-workflow-step-resolution.type';import { type FlatWorkflow } from 'src/engine/metadata-modules/flat-workflow/types/flat-workflow.type';import { type FlatWorkflowVersion } from 'src/engine/metadata-modules/flat-workflow-version/types/flat-workflow-version.type';@@ -41,8 +39,8 @@ const SALES_HANDLE = '[email protected]';const WORKSPACE_MEMBER_ID = 'a0000000-0000-4000-8000-000000000000';const connectedAccount = (- overrides: Partial<WorkflowManifestConnectedAccountReference>,-): WorkflowManifestConnectedAccountReference => ({+ overrides: Partial<ConnectedAccountForWorkflowStepResolution>,+): ConnectedAccountForWorkflowStepResolution => ({id: 'sales-account-id',handle: SALES_HANDLE,provider: ConnectedAccountProvider.GOOGLE,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-workflow-step-manifest-to-action-or-throw.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-workflow-step-manifest-to-action-or-throw.util.spec.tsindex a964128e7cf..efdcf66ec56 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-workflow-step-manifest-to-action-or-throw.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-workflow-step-manifest-to-action-or-throw.util.spec.ts@@ -10,7 +10,7 @@ import {import { WorkflowActionType } from 'twenty-shared/workflow';import { fromWorkflowStepManifestToActionOrThrow } from 'src/engine/core-modules/application/application-manifest/converters/from-workflow-step-manifest-to-action-or-throw.util';-import { type WorkflowManifestConnectedAccountReference } from 'src/engine/core-modules/application/application-manifest/types/workflow-manifest-references.type';+import { type ConnectedAccountForWorkflowStepResolution } from 'src/engine/metadata-modules/connected-account/types/connected-account-for-workflow-step-resolution.type';const STEP_ID = '11111111-1111-4111-8111-111111111111';const REFERENCE_ID = '22222222-2222-4222-8222-222222222222';@@ -386,8 +386,8 @@ describe('application workflow actions', () => {const GOOGLE_CALENDAR_EVENTS_SCOPE ='https://www.googleapis.com/auth/calendar.events';const connectedAccount = (- overrides: Partial<WorkflowManifestConnectedAccountReference>,- ): WorkflowManifestConnectedAccountReference => ({+ overrides: Partial<ConnectedAccountForWorkflowStepResolution>,+ ): ConnectedAccountForWorkflowStepResolution => ({id: 'account-id',handle: '[email protected]',provider: ConnectedAccountProvider.GOOGLE,@@ -405,7 +405,7 @@ describe('application workflow actions', () => {provider: ConnectedAccountProvider.IMAP_SMTP_CALDAV,connectionParameters: {IMAP: { host: 'imap.example.com', port: 993 },- } as WorkflowManifestConnectedAccountReference['connectionParameters'],+ } as ConnectedAccountForWorkflowStepResolution['connectionParameters'],scopes: null,calendarChannels: [],}),@@ -418,7 +418,7 @@ describe('application workflow actions', () => {}: {type: 'SEND_EMAIL' | 'DRAFT_EMAIL' | 'CREATE_CALENDAR_EVENT';handle: string;- accounts?: WorkflowManifestConnectedAccountReference[];+ accounts?: ConnectedAccountForWorkflowStepResolution[];}) => {const { connectedAccountId: _connectedAccountId, ...input } =inputs[type];diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/types/workflow-manifest-references.type.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/types/workflow-manifest-references.type.tsindex d0939f29339..6ee0556040a 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/types/workflow-manifest-references.type.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/types/workflow-manifest-references.type.ts@@ -1,6 +1,5 @@import { type BaseOutputSchemaV2 } from 'twenty-shared/workflow';-import { type CalendarChannelEntity } from 'src/engine/metadata-modules/calendar-channel/entities/calendar-channel.entity';-import { type ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';+import { type ConnectedAccountForWorkflowStepResolution } from 'src/engine/metadata-modules/connected-account/types/connected-account-for-workflow-step-resolution.type';import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';@@ -27,17 +26,6 @@ export type WorkflowManifestFieldReference = {> &Partial<Pick<FlatFieldMetadata, 'universalSettings'>>;-export type WorkflowManifestConnectedAccountReference = Pick<- ConnectedAccountEntity,- | 'id'- | 'handle'- | 'provider'- | 'connectionParameters'- | 'archivedAt'- | 'scopes'- | 'scope'-> & { calendarChannels: Pick<CalendarChannelEntity, 'isSyncEnabled'>[] };-export type WorkflowManifestReferences = {logicFunctionOutputSchemaByUniversalIdentifier?: ReadonlyMap<string,@@ -58,5 +46,5 @@ export type WorkflowManifestReferences = {WorkflowManifestFieldReference>;// Oldest first, which decides between accounts sharing a handle- connectedAccounts?: readonly WorkflowManifestConnectedAccountReference[];+ connectedAccounts?: readonly ConnectedAccountForWorkflowStepResolution[];};diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/add-workflow-manifests-to-flat-entity-maps-or-throw.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/add-workflow-manifests-to-flat-entity-maps-or-throw.util.tsindex 034b597d661..1cbd61b960a 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/add-workflow-manifests-to-flat-entity-maps-or-throw.util.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/add-workflow-manifests-to-flat-entity-maps-or-throw.util.ts@@ -7,7 +7,7 @@ import {import { isDefined } from 'twenty-shared/utils';import { fromWorkflowManifestToUniversalFlatWorkflowOrThrow } from 'src/engine/core-modules/application/application-manifest/converters/from-workflow-manifest-to-universal-flat-workflow-or-throw.util';-import { type WorkflowManifestConnectedAccountReference } from 'src/engine/core-modules/application/application-manifest/types/workflow-manifest-references.type';+import { type ConnectedAccountForWorkflowStepResolution } from 'src/engine/metadata-modules/connected-account/types/connected-account-for-workflow-step-resolution.type';import { findActiveFlatWorkflowVersionByWorkflowId } from 'src/engine/core-modules/application/application-manifest/utils/find-active-flat-workflow-version-by-workflow-id.util';import { prepareWorkflowManifestReferences } from 'src/engine/core-modules/application/application-manifest/utils/prepare-workflow-manifest-references.util';import { validateWorkflowManifestRecordFields } from 'src/engine/core-modules/application/application-manifest/utils/validate-workflow-manifest-record-fields.util';@@ -64,7 +64,7 @@ export const addWorkflowManifestsToFlatEntityMapsOrThrow = ({existingAllFlatEntityMaps: AllFlatEntityMaps;idByUniversalIdentifierByMetadataName: IdByUniversalIdentifierByMetadataName;isWorkspaceCustomApplication: boolean;- connectedAccounts: readonly WorkflowManifestConnectedAccountReference[];+ connectedAccounts: readonly ConnectedAccountForWorkflowStepResolution[];now: string;}): (UniversalFlatWorkflow & { id: string })[] => {const applicationUniversalIdentifier =diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/find-workflow-step-connected-account.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/find-workflow-step-connected-account.util.tsindex c56f6d397c0..9403c173c98 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/find-workflow-step-connected-account.util.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/find-workflow-step-connected-account.util.ts@@ -5,7 +5,7 @@ import {} from 'twenty-shared/utils';import { type WorkflowConnectedAccountStepType } from 'src/engine/core-modules/application/application-manifest/types/workflow-connected-account-step-type.type';-import { type WorkflowManifestConnectedAccountReference } from 'src/engine/core-modules/application/application-manifest/types/workflow-manifest-references.type';+import { type ConnectedAccountForWorkflowStepResolution } from 'src/engine/metadata-modules/connected-account/types/connected-account-for-workflow-step-resolution.type';import { canConnectedAccountCreateCalendarEvents } from 'src/modules/calendar/calendar-event-creation-manager/utils/can-connected-account-create-calendar-events.util';const canConnectedAccountRunStep = ({@@ -13,7 +13,7 @@ const canConnectedAccountRunStep = ({connectedAccount,}: {stepType: WorkflowConnectedAccountStepType;- connectedAccount: WorkflowManifestConnectedAccountReference;+ connectedAccount: ConnectedAccountForWorkflowStepResolution;}): boolean => {switch (stepType) {case 'SEND_EMAIL':@@ -39,8 +39,8 @@ export const findWorkflowStepConnectedAccount = ({}: {stepType: WorkflowConnectedAccountStepType;handle: string;- connectedAccounts: readonly WorkflowManifestConnectedAccountReference[];-}): WorkflowManifestConnectedAccountReference | undefined =>+ connectedAccounts: readonly ConnectedAccountForWorkflowStepResolution[];+}): ConnectedAccountForWorkflowStepResolution | undefined =>connectedAccounts.find((connectedAccount) =>// Sync acts for no member, so a handle can only name an account shared with the workspacediff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/reconstruct-workflows-manifest.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/reconstruct-workflows-manifest.util.tsindex e20188318e2..d05665699ea 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/reconstruct-workflows-manifest.util.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/reconstruct-workflows-manifest.util.ts@@ -8,7 +8,7 @@ import { isDefined } from 'twenty-shared/utils';import { WORKFLOW_CHANGED_IN_BUILDER_REASON } from 'src/engine/core-modules/application/application-manifest/constants/workflow-changed-in-builder-reason.constant';import { fromFlatWorkflowToWorkflowManifest } from 'src/engine/core-modules/application/application-manifest/converters/from-flat-workflow-to-workflow-manifest.util';import { type ApplicationExportCoverageEntry } from 'src/engine/core-modules/application/application-manifest/types/application-export.type';-import { type WorkflowManifestConnectedAccountReference } from 'src/engine/core-modules/application/application-manifest/types/workflow-manifest-references.type';+import { type ConnectedAccountForWorkflowStepResolution } from 'src/engine/metadata-modules/connected-account/types/connected-account-for-workflow-step-resolution.type';import { buildExportedCoverageEntry } from 'src/engine/core-modules/application/application-manifest/utils/build-exported-coverage-entry.util';import { buildWorkflowManifestExportReferences } from 'src/engine/core-modules/application/application-manifest/utils/build-workflow-manifest-export-references.util';import { sortFlatEntitiesByUniversalIdentifier } from 'src/engine/core-modules/application/application-manifest/utils/sort-flat-entities-by-universal-identifier.util';@@ -96,7 +96,7 @@ export const reconstructWorkflowsManifest = ({exportedObjectUniversalIdentifiers: ReadonlySet<string>;resolvableFieldUniversalIdentifiers: ReadonlySet<string>;isWorkspaceCustomApplication: boolean;- connectedAccounts: readonly WorkflowManifestConnectedAccountReference[];+ connectedAccounts: readonly ConnectedAccountForWorkflowStepResolution[];}): {workflows: WorkflowManifest[];coverage: ApplicationExportCoverageEntry[];diff --git a/packages/twenty-server/src/engine/metadata-modules/connected-account/connected-account-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/connected-account/connected-account-metadata.service.tsindex 2e5f79d6c95..a4d32deff71 100644--- a/packages/twenty-server/src/engine/metadata-modules/connected-account/connected-account-metadata.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/connected-account/connected-account-metadata.service.ts@@ -27,6 +27,7 @@ import {} from 'src/engine/metadata-modules/connected-account/connected-account.exception';import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';import { type ConnectedAccountDeletedEvent } from 'src/engine/metadata-modules/connected-account/types/connected-account-deleted.type';+import { type ConnectedAccountForWorkflowStepResolution } from 'src/engine/metadata-modules/connected-account/types/connected-account-for-workflow-step-resolution.type';import { type ConnectedAccountUsableByCaller } from 'src/engine/metadata-modules/connected-account/types/connected-account-usable-by-caller.type';import { buildConnectedAccountUsableByCallerWhere } from 'src/engine/metadata-modules/connected-account/utils/build-connected-account-usable-by-caller-where.util';import { getConnectedAccountAdministrationPermissionFlag } from 'src/engine/metadata-modules/connected-account/utils/get-connected-account-administration-permission-flag.util';@@ -317,20 +318,7 @@ export class ConnectedAccountMetadataService {workspaceId,}: {workspaceId: string;- }): Promise<- (Pick<- ConnectedAccountEntity,- | 'id'- | 'handle'- | 'provider'- | 'connectionParameters'- | 'archivedAt'- | 'scopes'- | 'scope'- > & {- calendarChannels: Pick<CalendarChannelEntity, 'isSyncEnabled'>[];- })[]- > {+ }): Promise<ConnectedAccountForWorkflowStepResolution[]> {return this.repository.find({where: { workspaceId },relations: { calendarChannels: true },diff --git a/packages/twenty-server/src/engine/metadata-modules/connected-account/types/connected-account-for-workflow-step-resolution.type.ts b/packages/twenty-server/src/engine/metadata-modules/connected-account/types/connected-account-for-workflow-step-resolution.type.tsnew file mode 100644index 00000000000..50f89e9534f--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/connected-account/types/connected-account-for-workflow-step-resolution.type.ts@@ -0,0 +1,13 @@+import { type CalendarChannelEntity } from 'src/engine/metadata-modules/calendar-channel/entities/calendar-channel.entity';+import { type ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';++export type ConnectedAccountForWorkflowStepResolution = Pick<+ ConnectedAccountEntity,+ | 'id'+ | 'handle'+ | 'provider'+ | 'connectionParameters'+ | 'archivedAt'+ | 'scopes'+ | 'scope'+> & { calendarChannels: Pick<CalendarChannelEntity, 'isSyncEnabled'>[] };