The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Type applyManuallyAssignedDefault generically to keep hook payload types (#24921)
Félix Malfait7e906d53b2f3
diff --git a/packages/twenty-server/src/modules/calendar/common/query-hooks/calendar-event-target/calendar-event-target-create-many.pre-query-hook.ts b/packages/twenty-server/src/modules/calendar/common/query-hooks/calendar-event-target/calendar-event-target-create-many.pre-query-hook.tsindex e1980c37a10..e867114dcf8 100644--- a/packages/twenty-server/src/modules/calendar/common/query-hooks/calendar-event-target/calendar-event-target-create-many.pre-query-hook.ts+++ b/packages/twenty-server/src/modules/calendar/common/query-hooks/calendar-event-target/calendar-event-target-create-many.pre-query-hook.ts@@ -2,18 +2,15 @@ import { type WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/worksimport { type CreateManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';-import {- applyManuallyAssignedDefault,- type TargetJunctionRecordInput,-} from 'src/modules/match-participant/utils/apply-manually-assigned-default.util';+import { applyManuallyAssignedDefault } from 'src/modules/match-participant/utils/apply-manually-assigned-default.util';@WorkspaceQueryHook('calendarEventTarget.createMany')export class CalendarEventTargetCreateManyPreQueryHook implements WorkspacePreQueryHookInstance {async execute(_authContext: WorkspaceAuthContext,_objectName: string,- payload: CreateManyResolverArgs<TargetJunctionRecordInput>,- ): Promise<CreateManyResolverArgs<TargetJunctionRecordInput>> {+ payload: CreateManyResolverArgs,+ ): Promise<CreateManyResolverArgs> {return {...payload,data: payload.data.map(applyManuallyAssignedDefault),diff --git a/packages/twenty-server/src/modules/calendar/common/query-hooks/calendar-event-target/calendar-event-target-create-one.pre-query-hook.ts b/packages/twenty-server/src/modules/calendar/common/query-hooks/calendar-event-target/calendar-event-target-create-one.pre-query-hook.tsindex b5fe3547015..aa348d449df 100644--- a/packages/twenty-server/src/modules/calendar/common/query-hooks/calendar-event-target/calendar-event-target-create-one.pre-query-hook.ts+++ b/packages/twenty-server/src/modules/calendar/common/query-hooks/calendar-event-target/calendar-event-target-create-one.pre-query-hook.ts@@ -2,18 +2,15 @@ import { type WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/worksimport { type CreateOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';-import {- applyManuallyAssignedDefault,- type TargetJunctionRecordInput,-} from 'src/modules/match-participant/utils/apply-manually-assigned-default.util';+import { applyManuallyAssignedDefault } from 'src/modules/match-participant/utils/apply-manually-assigned-default.util';@WorkspaceQueryHook('calendarEventTarget.createOne')export class CalendarEventTargetCreateOnePreQueryHook implements WorkspacePreQueryHookInstance {async execute(_authContext: WorkspaceAuthContext,_objectName: string,- payload: CreateOneResolverArgs<TargetJunctionRecordInput>,- ): Promise<CreateOneResolverArgs<TargetJunctionRecordInput>> {+ payload: CreateOneResolverArgs,+ ): Promise<CreateOneResolverArgs> {return {...payload,data: applyManuallyAssignedDefault(payload.data),diff --git a/packages/twenty-server/src/modules/match-participant/utils/apply-manually-assigned-default.util.ts b/packages/twenty-server/src/modules/match-participant/utils/apply-manually-assigned-default.util.tsindex 836da7b6f15..457d5559e8f 100644--- a/packages/twenty-server/src/modules/match-participant/utils/apply-manually-assigned-default.util.ts+++ b/packages/twenty-server/src/modules/match-participant/utils/apply-manually-assigned-default.util.ts@@ -1,15 +1,13 @@-export type TargetJunctionRecordInput = Record<string, unknown> & {- isManuallyAssigned?: boolean;-};-// API writes to target junctions are user attachments. The field default// covers plain inserts, but an upsert that matches an existing row (an// automatic row, or an exclusion tombstone being restored) only applies the// caller's input, so the manual provenance has to ride the input itself or// reconciliation will reap the row as obsolete automatic state.-export const applyManuallyAssignedDefault = (- record: TargetJunctionRecordInput,-): TargetJunctionRecordInput => ({+export const applyManuallyAssignedDefault = <+ TRecord extends { isManuallyAssigned?: boolean; [key: string]: unknown },+>(+ record: TRecord,+): TRecord & { isManuallyAssigned: boolean } => ({...record,isManuallyAssigned: record.isManuallyAssigned ?? true,});diff --git a/packages/twenty-server/src/modules/messaging/common/query-hooks/message-thread-target/message-thread-target-create-many.pre-query-hook.ts b/packages/twenty-server/src/modules/messaging/common/query-hooks/message-thread-target/message-thread-target-create-many.pre-query-hook.tsindex 268f8554642..92f2a01e522 100644--- a/packages/twenty-server/src/modules/messaging/common/query-hooks/message-thread-target/message-thread-target-create-many.pre-query-hook.ts+++ b/packages/twenty-server/src/modules/messaging/common/query-hooks/message-thread-target/message-thread-target-create-many.pre-query-hook.ts@@ -2,18 +2,15 @@ import { type WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/worksimport { type CreateManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';-import {- applyManuallyAssignedDefault,- type TargetJunctionRecordInput,-} from 'src/modules/match-participant/utils/apply-manually-assigned-default.util';+import { applyManuallyAssignedDefault } from 'src/modules/match-participant/utils/apply-manually-assigned-default.util';@WorkspaceQueryHook('messageThreadTarget.createMany')export class MessageThreadTargetCreateManyPreQueryHook implements WorkspacePreQueryHookInstance {async execute(_authContext: WorkspaceAuthContext,_objectName: string,- payload: CreateManyResolverArgs<TargetJunctionRecordInput>,- ): Promise<CreateManyResolverArgs<TargetJunctionRecordInput>> {+ payload: CreateManyResolverArgs,+ ): Promise<CreateManyResolverArgs> {return {...payload,data: payload.data.map(applyManuallyAssignedDefault),diff --git a/packages/twenty-server/src/modules/messaging/common/query-hooks/message-thread-target/message-thread-target-create-one.pre-query-hook.ts b/packages/twenty-server/src/modules/messaging/common/query-hooks/message-thread-target/message-thread-target-create-one.pre-query-hook.tsindex de0f98303f1..140af5c94fc 100644--- a/packages/twenty-server/src/modules/messaging/common/query-hooks/message-thread-target/message-thread-target-create-one.pre-query-hook.ts+++ b/packages/twenty-server/src/modules/messaging/common/query-hooks/message-thread-target/message-thread-target-create-one.pre-query-hook.ts@@ -2,18 +2,15 @@ import { type WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/worksimport { type CreateOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';-import {- applyManuallyAssignedDefault,- type TargetJunctionRecordInput,-} from 'src/modules/match-participant/utils/apply-manually-assigned-default.util';+import { applyManuallyAssignedDefault } from 'src/modules/match-participant/utils/apply-manually-assigned-default.util';@WorkspaceQueryHook('messageThreadTarget.createOne')export class MessageThreadTargetCreateOnePreQueryHook implements WorkspacePreQueryHookInstance {async execute(_authContext: WorkspaceAuthContext,_objectName: string,- payload: CreateOneResolverArgs<TargetJunctionRecordInput>,- ): Promise<CreateOneResolverArgs<TargetJunctionRecordInput>> {+ payload: CreateOneResolverArgs,+ ): Promise<CreateOneResolverArgs> {return {...payload,data: applyManuallyAssignedDefault(payload.data),