Skip to content

The open alternative to Salesforce, designed for AI.

Add calendar event composer to record timeline (#24667)

Félix Malfaitd14069353fe2
diff --git a/packages/twenty-front/codegen-metadata.cjs b/packages/twenty-front/codegen-metadata.cjs
index ac8ce9fce45..88d41dc8537 100644
--- a/packages/twenty-front/codegen-metadata.cjs
+++ b/packages/twenty-front/codegen-metadata.cjs
@@ -33,6 +33,7 @@ module.exports = {
'./src/modules/front-components/graphql/**/*.{ts,tsx}',
'./src/modules/page-layout/widgets/**/graphql/**/*.{ts,tsx}',
+ './src/modules/activities/calendar/graphql/mutations/**/*.{ts,tsx}',
'./src/modules/activities/emails/graphql/mutations/**/*.{ts,tsx}',
'./src/modules/activities/timeline-activities/graphql/**/*.{ts,tsx}',
'./src/modules/activities/emails/graphql/metadata-queries/**/*.{ts,tsx}',
diff --git a/packages/twenty-front/codegen.cjs b/packages/twenty-front/codegen.cjs
index fccefa35fd7..ea426e135b2 100644
--- a/packages/twenty-front/codegen.cjs
+++ b/packages/twenty-front/codegen.cjs
@@ -9,7 +9,7 @@ module.exports = {
'./src/modules/object-core/**/graphql/**/*.{ts,tsx}',
'./src/modules/activities/emails/graphql/queries/**/*.{ts,tsx}',
'./src/modules/activities/emails/graphql/operation-signatures/**/*.{ts,tsx}',
- './src/modules/activities/calendar/graphql/**/*.{ts,tsx}',
+ './src/modules/activities/calendar/graphql/queries/**/*.{ts,tsx}',
'./src/modules/search/graphql/**/*.{ts,tsx}',
'./src/modules/command-menu/graphql/**/*.{ts,tsx}',
diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.ts
index 7d7be8761b6..223bd697f52 100644
--- a/packages/twenty-front/src/generated-metadata/graphql.ts
+++ b/packages/twenty-front/src/generated-metadata/graphql.ts
@@ -6901,6 +6901,13 @@ export type WorkspaceUrlsAndId = {
workspaceUrls: WorkspaceUrls;
};
+export type CreateCalendarEventMutationVariables = Exact<{
+ input: CreateCalendarEventInput;
+}>;
+
+
+export type CreateCalendarEventMutation = { __typename?: 'Mutation', createCalendarEvent: { __typename?: 'CreateCalendarEventOutput', success: boolean, error?: string | null, iCalUid?: string | null, conferenceLink?: string | null } };
+
export type PreviewMessageCampaignAudienceQueryVariables = Exact<{
input: PreviewMessageCampaignAudienceInput;
}>;
@@ -9549,6 +9556,7 @@ export const ViewFilterGroupFragmentFragmentDoc = {"kind":"Document","definition
export const ViewSortFragmentFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewSortFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewSort"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"fieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"direction"}},{"kind":"Field","name":{"kind":"Name","value":"subFieldName"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<ViewSortFragmentFragment, unknown>;
export const ViewGroupFragmentFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewGroupFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewGroup"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"isVisible"}},{"kind":"Field","name":{"kind":"Name","value":"fieldValue"}},{"kind":"Field","name":{"kind":"Name","value":"position"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}}]}}]} as unknown as DocumentNode<ViewGroupFragmentFragment, unknown>;
export const ViewFragmentFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"View"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"objectMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"key"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"position"}},{"kind":"Field","name":{"kind":"Name","value":"isCompact"}},{"kind":"Field","name":{"kind":"Name","value":"kanbanAggregateOperation"}},{"kind":"Field","name":{"kind":"Name","value":"kanbanAggregateOperationFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"mainGroupByFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"shouldHideEmptyGroups"}},{"kind":"Field","name":{"kind":"Name","value":"kanbanColumnWidth"}},{"kind":"Field","name":{"kind":"Name","value":"anyFieldFilterValue"}},{"kind":"Field","name":{"kind":"Name","value":"calendarFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"calendarEndFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"calendarLayout"}},{"kind":"Field","name":{"kind":"Name","value":"visibility"}},{"kind":"Field","name":{"kind":"Name","value":"createdByUserWorkspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"viewFields"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewFieldFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"viewFieldGroups"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewFieldGroupFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"viewFilters"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewFilterFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"viewFilterGroups"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewFilterGroupFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"viewSorts"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewSortFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"viewGroups"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewGroupFragment"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewFieldFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewField"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"fieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"isVisible"}},{"kind":"Field","name":{"kind":"Name","value":"position"}},{"kind":"Field","name":{"kind":"Name","value":"size"}},{"kind":"Field","name":{"kind":"Name","value":"aggregateOperation"}},{"kind":"Field","name":{"kind":"Name","value":"viewFieldGroupId"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewFieldGroupFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewFieldGroup"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"position"}},{"kind":"Field","name":{"kind":"Name","value":"isVisible"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}},{"kind":"Field","name":{"kind":"Name","value":"viewFields"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewFieldFragment"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewFilterFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewFilter"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"fieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"operand"}},{"kind":"Field","name":{"kind":"Name","value":"value"}},{"kind":"Field","name":{"kind":"Name","value":"viewFilterGroupId"}},{"kind":"Field","name":{"kind":"Name","value":"positionInViewFilterGroup"}},{"kind":"Field","name":{"kind":"Name","value":"subFieldName"}},{"kind":"Field","name":{"kind":"Name","value":"relationTargetFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewFilterGroupFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewFilterGroup"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"parentViewFilterGroupId"}},{"kind":"Field","name":{"kind":"Name","value":"logicalOperator"}},{"kind":"Field","name":{"kind":"Name","value":"positionInViewFilterGroup"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewSortFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewSort"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"fieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"direction"}},{"kind":"Field","name":{"kind":"Name","value":"subFieldName"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewGroupFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewGroup"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"isVisible"}},{"kind":"Field","name":{"kind":"Name","value":"fieldValue"}},{"kind":"Field","name":{"kind":"Name","value":"position"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}}]}}]} as unknown as DocumentNode<ViewFragmentFragment, unknown>;
+export const CreateCalendarEventDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateCalendarEvent"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateCalendarEventInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createCalendarEvent"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"success"}},{"kind":"Field","name":{"kind":"Name","value":"error"}},{"kind":"Field","name":{"kind":"Name","value":"iCalUid"}},{"kind":"Field","name":{"kind":"Name","value":"conferenceLink"}}]}}]}}]} as unknown as DocumentNode<CreateCalendarEventMutation, CreateCalendarEventMutationVariables>;
export const PreviewMessageCampaignAudienceDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"PreviewMessageCampaignAudience"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"PreviewMessageCampaignAudienceInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"previewMessageCampaignAudience"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalMembers"}},{"kind":"Field","name":{"kind":"Name","value":"withoutEmail"}},{"kind":"Field","name":{"kind":"Name","value":"duplicateEmails"}},{"kind":"Field","name":{"kind":"Name","value":"globallyUnsubscribed"}},{"kind":"Field","name":{"kind":"Name","value":"topicUnsubscribed"}},{"kind":"Field","name":{"kind":"Name","value":"sendable"}}]}}]}}]} as unknown as DocumentNode<PreviewMessageCampaignAudienceQuery, PreviewMessageCampaignAudienceQueryVariables>;
export const UnsubscribeTopicsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"UnsubscribeTopics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"unsubscribeTopics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"visibility"}}]}}]}}]} as unknown as DocumentNode<UnsubscribeTopicsQuery, UnsubscribeTopicsQueryVariables>;
export const SendEmailDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SendEmail"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"SendEmailInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"sendEmail"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"success"}},{"kind":"Field","name":{"kind":"Name","value":"error"}},{"kind":"Field","name":{"kind":"Name","value":"messageThreadId"}}]}}]}}]} as unknown as DocumentNode<SendEmailMutation, SendEmailMutationVariables>;
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventComposerFields.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventComposerFields.tsx
new file mode 100644
index 00000000000..087bc0cb36f
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventComposerFields.tsx
@@ -0,0 +1,342 @@
+import { ComposerFieldRow } from '@/activities/components/ComposerFieldRow';
+import { ComposerHeader } from '@/activities/components/ComposerHeader';
+import { StyledComposerTextInput } from '@/activities/components/ComposerTextInput';
+import { type useCalendarEventComposer } from '@/activities/calendar/hooks/useCalendarEventComposer';
+import { EmailRecipientsFieldInput } from '@/activities/emails/recipients/components/EmailRecipientsFieldInput';
+import { useEmailRecipientsDragAndDrop } from '@/activities/emails/recipients/hooks/useEmailRecipientsDragAndDrop';
+import { type EmailComposerContextRecord } from '@/activities/emails/recipients/types/EmailComposerContextRecord';
+import { type EmailRecipientDragData } from '@/activities/emails/recipients/types/EmailRecipientDragData';
+import { getEmailRecipientKey } from '@/activities/emails/recipients/utils/getEmailRecipientKey';
+import { type EmailRecipientsByFieldId } from '@/activities/emails/recipients/utils/moveEmailRecipientsBetweenFields';
+import { FormDateFieldInput } from '@/object-record/record-field/ui/form-types/components/FormDateFieldInput';
+import { FormDateTimeFieldInput } from '@/object-record/record-field/ui/form-types/components/FormDateTimeFieldInput';
+import { AVAILABLE_TIMEZONE_OPTIONS } from '@/settings/experience/constants/AvailableTimezoneOptions';
+import { Select } from '@/ui/input/components/Select';
+import { TextArea } from '@/ui/input/components/TextArea';
+import { DND_KIT_PROVIDER_PLUGINS_WITHOUT_DROP_ANIMATION } from '@/ui/utilities/drag-and-drop/constants/DndKitProviderPluginsWithoutDropAnimation';
+import { DND_KIT_SENSORS } from '@/ui/utilities/drag-and-drop/constants/DndKitSensors';
+import { DragDropItemDndContext } from '@/ui/utilities/drag-and-drop/context/DragDropItemDndContext';
+import { DragDropProvider } from '@dnd-kit/react';
+import { styled } from '@linaria/react';
+import { t } from '@lingui/core/macro';
+import { Callout } from 'twenty-ui/feedback';
+import { Toggle } from 'twenty-ui/input';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
+
+const COMPOSER_LABEL_MIN_WIDTH = '80px';
+
+const StyledFieldsContainer = styled.div`
+ display: flex;
+ flex: 1;
+ flex-direction: column;
+ min-height: 0;
+ overflow-y: auto;
+ width: 100%;
+`;
+
+const StyledRowDescription = styled.span`
+ color: ${themeCssVariables.font.color.secondary};
+ font-size: ${themeCssVariables.font.size.md};
+`;
+
+const StyledNoticesContainer = styled.div`
+ display: flex;
+ flex-direction: column;
+ gap: ${themeCssVariables.spacing[2]};
+ padding: ${themeCssVariables.spacing[2]};
+`;
+
+type CalendarEventComposerFieldsProps = {
+ composerState: ReturnType<typeof useCalendarEventComposer>;
+ contextRecord: EmailComposerContextRecord;
+ onAddAccount: () => void;
+ onReauthorize: () => void;
+};
+
+export const CalendarEventComposerFields = ({
+ composerState,
+ contextRecord,
+ onAddAccount,
+ onReauthorize,
+}: CalendarEventComposerFieldsProps) => {
+ const recipientsByFieldId: EmailRecipientsByFieldId = {
+ to: composerState.attendees,
+ cc: [],
+ bcc: [],
+ };
+
+ const { contextValues, draggedRecipients, handlers } =
+ useEmailRecipientsDragAndDrop({
+ recipientsByFieldId,
+ onRecipientsByFieldIdChange: ({ to }) => composerState.setAttendees(to),
+ });
+
+ const allRecipientKeys = composerState.attendees.map(({ address }) =>
+ getEmailRecipientKey(address),
+ );
+
+ const draggedSourceIndices =
+ draggedRecipients?.fieldId === 'to' ? draggedRecipients.indices : null;
+
+ const hasNotices =
+ composerState.accountOptions.length === 0 ||
+ composerState.missingScopes.length > 0 ||
+ !composerState.hasValidDateRange ||
+ composerState.hasTooManyAttendees ||
+ !composerState.hasTargetAssociation;
+
+ return (
+ <StyledFieldsContainer>
+ <DragDropItemDndContext.Provider value={contextValues}>
+ <DragDropProvider<EmailRecipientDragData>
+ sensors={DND_KIT_SENSORS}
+ plugins={DND_KIT_PROVIDER_PLUGINS_WITHOUT_DROP_ANIMATION}
+ onDragStart={handlers.onDragStart}
+ onDragMove={handlers.onDragMove}
+ onDragEnd={handlers.onDragEnd}
+ >
+ <ComposerHeader>
+ <ComposerFieldRow
+ label={t`Calendar`}
+ labelMinWidth={COMPOSER_LABEL_MIN_WIDTH}
+ >
+ <Select
+ dropdownId="calendar-event-composer-account"
+ fullWidth
+ variant="transparent"
+ value={composerState.connectedAccountId}
+ options={composerState.accountOptions}
+ onChange={composerState.setConnectedAccountId}
+ />
+ </ComposerFieldRow>
+ <ComposerFieldRow
+ label={t`Guests`}
+ labelMinWidth={COMPOSER_LABEL_MIN_WIDTH}
+ >
+ <EmailRecipientsFieldInput
+ fieldId="to"
+ draggedSourceIndices={draggedSourceIndices}
+ label={t`Guests`}
+ recipients={composerState.attendees}
+ onChange={composerState.setAttendees}
+ onSubmit={composerState.handleCreate}
+ excludedSuggestionKeys={allRecipientKeys}
+ contextRecord={contextRecord}
+ />
+ </ComposerFieldRow>
+ <ComposerFieldRow
+ label={t`Title`}
+ labelMinWidth={COMPOSER_LABEL_MIN_WIDTH}
+ >
+ <StyledComposerTextInput
+ type="text"
+ aria-label={t`Title`}
+ placeholder={t`Add an event title`}
+ onChange={(event) => composerState.setTitle(event.target.value)}
+ />
+ </ComposerFieldRow>
+ <ComposerFieldRow
+ label={t`Location`}
+ labelMinWidth={COMPOSER_LABEL_MIN_WIDTH}
+ >
+ <StyledComposerTextInput
+ type="text"
+ aria-label={t`Location`}
+ placeholder={t`Add a location`}
+ onChange={(event) =>
+ composerState.setLocation(event.target.value)
+ }
+ />
+ </ComposerFieldRow>
+ <ComposerFieldRow
+ label={t`All day`}
+ labelMinWidth={COMPOSER_LABEL_MIN_WIDTH}
+ onClick={() =>
+ composerState.handleIsFullDayChange(!composerState.isFullDay)
+ }
+ trailing={
+ <Toggle
+ aria-label={t`All day`}
+ toggleSize="small"
+ centered
+ value={composerState.isFullDay}
+ onChange={composerState.handleIsFullDayChange}
+ />
+ }
+ >
+ <StyledRowDescription>
+ {t`Create an all-day event`}
+ </StyledRowDescription>
+ </ComposerFieldRow>
+ {composerState.isFullDay ? (
+ <>
+ <ComposerFieldRow
+ label={t`Starts`}
+ labelMinWidth={COMPOSER_LABEL_MIN_WIDTH}
+ >
+ <FormDateFieldInput
+ variant="transparent"
+ defaultValue={composerState.dates.startsAt}
+ onChange={composerState.handleStartsAtChange}
+ />
+ </ComposerFieldRow>
+ <ComposerFieldRow
+ label={t`Ends`}
+ labelMinWidth={COMPOSER_LABEL_MIN_WIDTH}
+ >
+ <FormDateFieldInput
+ key={composerState.dates.endsAt}
+ variant="transparent"
+ defaultValue={composerState.dates.endsAt}
+ onChange={composerState.setEndsAt}
+ />
+ </ComposerFieldRow>
+ </>
+ ) : (
+ <>
+ <ComposerFieldRow
+ label={t`Starts`}
+ labelMinWidth={COMPOSER_LABEL_MIN_WIDTH}
+ >
+ <FormDateTimeFieldInput
+ key={`starts-at-${composerState.timeZone}`}
+ variant="transparent"
+ defaultValue={composerState.dates.startsAt}
+ onChange={composerState.handleStartsAtChange}
+ timeZone={composerState.timeZone}
+ />
+ </ComposerFieldRow>
+ <ComposerFieldRow
+ label={t`Ends`}
+ labelMinWidth={COMPOSER_LABEL_MIN_WIDTH}
+ >
+ <FormDateTimeFieldInput
+ key={`ends-at-${composerState.dates.endsAt}-${composerState.timeZone}`}
+ variant="transparent"
+ defaultValue={composerState.dates.endsAt}
+ onChange={composerState.setEndsAt}
+ timeZone={composerState.timeZone}
+ />
+ </ComposerFieldRow>
+ </>
+ )}
+ <ComposerFieldRow
+ label={t`Time zone`}
+ labelMinWidth={COMPOSER_LABEL_MIN_WIDTH}
+ >
+ <Select
+ dropdownId="calendar-event-composer-time-zone"
+ fullWidth
+ variant="transparent"
+ withSearchInput
+ value={composerState.timeZone}
+ options={AVAILABLE_TIMEZONE_OPTIONS}
+ onChange={composerState.setTimeZone}
+ />
+ </ComposerFieldRow>
+ <ComposerFieldRow
+ label={t`Invitations`}
+ labelMinWidth={COMPOSER_LABEL_MIN_WIDTH}
+ onClick={() =>
+ composerState.setSendInvitations(!composerState.sendInvitations)
+ }
+ trailing={
+ <Toggle
+ aria-label={t`Send invitations`}
+ toggleSize="small"
+ centered
+ value={composerState.sendInvitations}
+ onChange={composerState.setSendInvitations}
+ />
+ }
+ >
+ <StyledRowDescription>
+ {t`Email guests an invitation`}
+ </StyledRowDescription>
+ </ComposerFieldRow>
+ <ComposerFieldRow
+ label={t`Video call`}
+ labelMinWidth={COMPOSER_LABEL_MIN_WIDTH}
+ onClick={() =>
+ composerState.setAddConferencing(!composerState.addConferencing)
+ }
+ trailing={
+ <Toggle
+ aria-label={t`Video conferencing`}
+ toggleSize="small"
+ centered
+ value={composerState.addConferencing}
+ onChange={composerState.setAddConferencing}
+ />
+ }
+ >
+ <StyledRowDescription>
+ {t`Add a meeting link`}
+ </StyledRowDescription>
+ </ComposerFieldRow>
+ <ComposerFieldRow
+ label={t`Description`}
+ labelMinWidth={COMPOSER_LABEL_MIN_WIDTH}
+ >
+ <TextArea
+ textAreaId="calendar-event-composer-description"
+ variant="transparent"
+ minRows={1}
+ maxRows={8}
+ value={composerState.description}
+ placeholder={t`Add details for guests`}
+ onChange={composerState.setDescription}
+ />
+ </ComposerFieldRow>
+ </ComposerHeader>
+ </DragDropProvider>
+ </DragDropItemDndContext.Provider>
+
+ {hasNotices && (
+ <StyledNoticesContainer>
+ {composerState.accountOptions.length === 0 && (
+ <Callout
+ variant="warning"
+ title={t`Connect a calendar account`}
+ description={t`Connect Google, Microsoft or CalDAV and enable calendar sync before creating an event.`}
+ action={{ label: t`Add account`, onClick: onAddAccount }}
+ />
+ )}
+ {composerState.missingScopes.length > 0 && (
+ <Callout
+ variant="error"
+ title={t`Calendar access needs approval`}
+ description={t`Reconnect this account to grant permission to create calendar events.`}
+ action={{ label: t`Reconnect`, onClick: onReauthorize }}
+ />
+ )}
+ {!composerState.hasValidDateRange && (
+ <Callout
+ variant="warning"
+ title={t`Check the event dates`}
+ description={
+ composerState.isFullDay
+ ? t`The end date must be later than the start date.`
+ : t`The end time must be after the start time.`
+ }
+ />
+ )}
+ {composerState.hasTooManyAttendees && (
+ <Callout
+ variant="warning"
+ title={t`Too many guests`}
+ description={t`Remove some guests before creating this event.`}
+ />
+ )}
+ {!composerState.hasTargetAssociation && (
+ <Callout
+ variant="warning"
+ title={t`Keep this event related`}
+ description={t`Keep the current record in the guest list and leave invitations on so the event remains visible on this record.`}
+ />
+ )}
+ </StyledNoticesContainer>
+ )}
+ </StyledFieldsContainer>
+ );
+};
diff --git a/packages/twenty-front/src/modules/activities/calendar/graphql/mutations/createCalendarEvent.ts b/packages/twenty-front/src/modules/activities/calendar/graphql/mutations/createCalendarEvent.ts
new file mode 100644
index 00000000000..1099d6bc9e1
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/graphql/mutations/createCalendarEvent.ts
@@ -0,0 +1,12 @@
+import { gql } from '@apollo/client';
+
+export const CREATE_CALENDAR_EVENT = gql`
+ mutation CreateCalendarEvent($input: CreateCalendarEventInput!) {
+ createCalendarEvent(input: $input) {
+ success
+ error
+ iCalUid
+ conferenceLink
+ }
+ }
+`;
diff --git a/packages/twenty-front/src/modules/activities/calendar/hooks/__tests__/useCalendarEventComposer.test.ts b/packages/twenty-front/src/modules/activities/calendar/hooks/__tests__/useCalendarEventComposer.test.ts
new file mode 100644
index 00000000000..1a701bfca1e
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/hooks/__tests__/useCalendarEventComposer.test.ts
@@ -0,0 +1,129 @@
+import { act, renderHook } from '@testing-library/react';
+import { Temporal } from 'temporal-polyfill';
+
+import { useCalendarEventComposer } from '@/activities/calendar/hooks/useCalendarEventComposer';
+
+const mockCreateCalendarEvent = jest.fn();
+
+jest.mock('@/activities/calendar/hooks/useCreateCalendarEvent', () => ({
+ useCreateCalendarEvent: () => ({
+ createCalendarEvent: mockCreateCalendarEvent,
+ loading: false,
+ }),
+}));
+
+jest.mock('@/settings/accounts/hooks/useMyConnectedAccounts', () => ({
+ useMyConnectedAccounts: () => ({
+ accounts: [
+ {
+ id: 'account-id',
+ handle: '[email protected]',
+ },
+ ],
+ loading: false,
+ }),
+}));
+
+jest.mock(
+ '@/activities/calendar/utils/isCalendarCreationEnabledForAccount',
+ () => ({
+ isCalendarCreationEnabledForAccount: () => true,
+ }),
+);
+
+jest.mock('@/accounts/utils/hasMissingCreateCalendarEventScopes', () => ({
+ getMissingCreateCalendarEventScopes: () => [],
+}));
+
+jest.mock(
+ '@/activities/calendar/hooks/useCalendarEventTargetRelatedPersonIds',
+ () => ({
+ useCalendarEventTargetRelatedPersonIds: () => ['person-id'],
+ }),
+);
+
+describe('useCalendarEventComposer', () => {
+ beforeEach(() => {
+ jest.clearAllMocks();
+ });
+
+ it('submits only once while creation is pending', async () => {
+ let resolveCreation: ((success: boolean) => void) | undefined;
+
+ mockCreateCalendarEvent.mockReturnValue(
+ new Promise<boolean>((resolve) => {
+ resolveCreation = resolve;
+ }),
+ );
+
+ const onCreated = jest.fn();
+ const { result } = renderHook(() =>
+ useCalendarEventComposer({
+ initialValues: {
+ connectedAccountId: 'account-id',
+ contextRecord: {
+ objectNameSingular: 'person',
+ recordId: 'person-id',
+ },
+ defaultAttendees: '[email protected]',
+ timeZone: 'UTC',
+ },
+ onCreated,
+ }),
+ );
+
+ act(() => {
+ result.current.setTitle('Planning session');
+ });
+
+ let firstCreation: Promise<void> | undefined;
+ let secondCreation: Promise<void> | undefined;
+
+ act(() => {
+ firstCreation = result.current.handleCreate();
+ secondCreation = result.current.handleCreate();
+ });
+
+ expect(mockCreateCalendarEvent).toHaveBeenCalledTimes(1);
+
+ resolveCreation?.(true);
+
+ await act(async () => {
+ await Promise.all([firstCreation, secondCreation]);
+ });
+
+ expect(onCreated).toHaveBeenCalledTimes(1);
+ });
+
+ it('keeps an all-day event at least one day long', () => {
+ const { result } = renderHook(() =>
+ useCalendarEventComposer({
+ initialValues: {
+ connectedAccountId: 'account-id',
+ contextRecord: {
+ objectNameSingular: 'person',
+ recordId: 'person-id',
+ },
+ defaultAttendees: '',
+ timeZone: 'UTC',
+ },
+ onCreated: jest.fn(),
+ }),
+ );
+
+ act(() => {
+ result.current.handleIsFullDayChange(true);
+ });
+
+ const startsAt = result.current.dates.startsAt;
+
+ act(() => {
+ result.current.setEndsAt(startsAt);
+ });
+
+ expect(result.current.dates.endsAt).toBe(
+ Temporal.PlainDate.from(startsAt).add({ days: 1 }).toString(),
+ );
+ expect(result.current.hasValidDateRange).toBe(true);
+ });
+});
diff --git a/packages/twenty-front/src/modules/activities/calendar/hooks/useCalendarEventComposer.ts b/packages/twenty-front/src/modules/activities/calendar/hooks/useCalendarEventComposer.ts
new file mode 100644
index 00000000000..4c2ca304eb2
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/hooks/useCalendarEventComposer.ts
@@ -0,0 +1,223 @@
+import { getMissingCreateCalendarEventScopes } from '@/accounts/utils/hasMissingCreateCalendarEventScopes';
+import { useCalendarEventTargetRelatedPersonIds } from '@/activities/calendar/hooks/useCalendarEventTargetRelatedPersonIds';
+import { useCreateCalendarEvent } from '@/activities/calendar/hooks/useCreateCalendarEvent';
+import { isCalendarEventComposerCreatingState } from '@/activities/calendar/states/isCalendarEventComposerCreatingState';
+import { type CalendarEventComposerInitialValues } from '@/activities/calendar/types/CalendarEventComposerInitialValues';
+import { getCalendarEventComposerDefaultDates } from '@/activities/calendar/utils/getCalendarEventComposerDefaultDates';
+import { getCalendarEventDatesAfterModeChange } from '@/activities/calendar/utils/getCalendarEventDatesAfterModeChange';
+import { getCalendarEventDatesAfterStartChange } from '@/activities/calendar/utils/getCalendarEventDatesAfterStartChange';
+import { hasCalendarEventTargetAssociation } from '@/activities/calendar/utils/hasCalendarEventTargetAssociation';
+import { isCalendarCreationEnabledForAccount } from '@/activities/calendar/utils/isCalendarCreationEnabledForAccount';
+import { type EmailRecipient } from '@/activities/emails/recipients/types/EmailRecipient';
+import { isValidEmailRecipientAddress } from '@/activities/emails/recipients/utils/isValidEmailRecipientAddress';
+import { parseEmailRecipients } from '@/activities/emails/recipients/utils/parseEmailRecipients';
+import { serializeEmailRecipients } from '@/activities/emails/recipients/utils/serializeEmailRecipients';
+import { useMyConnectedAccounts } from '@/settings/accounts/hooks/useMyConnectedAccounts';
+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
+import { isNonEmptyString } from '@sniptt/guards';
+import { useStore } from 'jotai';
+import { useCallback, useState } from 'react';
+import { MAX_EMAIL_RECIPIENTS } from 'twenty-shared/constants';
+import { isDefined } from 'twenty-shared/utils';
+import { type SelectOption } from 'twenty-ui/input';
+import { Temporal } from 'temporal-polyfill';
+
+export const useCalendarEventComposer = ({
+ initialValues,
+ onCreated,
+}: {
+ initialValues: CalendarEventComposerInitialValues | null;
+ onCreated: () => void;
+}) => {
+ const { accounts, loading: accountsLoading } = useMyConnectedAccounts();
+ const { createCalendarEvent, loading: isCreating } = useCreateCalendarEvent();
+ const store = useStore();
+ const isCalendarEventComposerCreating = useAtomStateValue(
+ isCalendarEventComposerCreatingState,
+ );
+
+ const [connectedAccountId, setConnectedAccountId] = useState(
+ initialValues?.connectedAccountId ?? '',
+ );
+ const [title, setTitle] = useState('');
+ const [description, setDescription] = useState('');
+ const [location, setLocation] = useState('');
+ const [timeZone, setTimeZone] = useState(initialValues?.timeZone ?? 'UTC');
+ const [isFullDay, setIsFullDay] = useState(false);
+ const [attendees, setAttendees] = useState<EmailRecipient[]>(() =>
+ parseEmailRecipients(initialValues?.defaultAttendees ?? '').map(
+ (attendee) => ({
+ ...attendee,
+ personId: initialValues?.defaultAttendeePersonId,
+ }),
+ ),
+ );
+ const [sendInvitations, setSendInvitations] = useState(true);
+ const [addConferencing, setAddConferencing] = useState(false);
+ const [dates, setDates] = useState(() =>
+ getCalendarEventComposerDefaultDates({
+ now: Temporal.Now.instant(),
+ timeZone: initialValues?.timeZone ?? 'UTC',
+ }),
+ );
+
+ const calendarAccounts = accounts.filter(isCalendarCreationEnabledForAccount);
+ const relatedPersonIds = useCalendarEventTargetRelatedPersonIds(
+ initialValues?.contextRecord,
+ );
+ const accountOptions: SelectOption<string>[] = calendarAccounts.map(
+ (account) => ({ label: account.handle, value: account.id }),
+ );
+ const selectedAccount = calendarAccounts.find(
+ (account) => account.id === connectedAccountId,
+ );
+ const missingScopes = isDefined(selectedAccount)
+ ? getMissingCreateCalendarEventScopes(selectedAccount)
+ : [];
+
+ const attendeeEmails = attendees.map(({ address }) => address);
+ const invalidAttendeeEmails = sendInvitations
+ ? attendeeEmails.filter((email) => !isValidEmailRecipientAddress(email))
+ : [];
+ const hasTooManyAttendees =
+ sendInvitations && attendeeEmails.length > MAX_EMAIL_RECIPIENTS;
+ const hasTargetAssociation = hasCalendarEventTargetAssociation({
+ attendees,
+ relatedPersonIds,
+ requiredAttendee: initialValues?.defaultAttendees,
+ sendInvitations,
+ });
+ const hasValidDateRange = isFullDay
+ ? dates.endsAt.slice(0, 10) > dates.startsAt.slice(0, 10)
+ : Date.parse(dates.endsAt) > Date.parse(dates.startsAt);
+
+ const canCreate =
+ isNonEmptyString(title.trim()) &&
+ isDefined(selectedAccount) &&
+ missingScopes.length === 0 &&
+ invalidAttendeeEmails.length === 0 &&
+ !hasTooManyAttendees &&
+ hasTargetAssociation &&
+ hasValidDateRange &&
+ !isCreating &&
+ !isCalendarEventComposerCreating;
+
+ const handleIsFullDayChange = (nextIsFullDay: boolean) => {
+ setDates(
+ getCalendarEventDatesAfterModeChange({
+ dates,
+ isFullDay: nextIsFullDay,
+ timeZone,
+ }),
+ );
+
+ setIsFullDay(nextIsFullDay);
+ };
+
+ const handleStartsAtChange = (value: string | null) => {
+ if (!isDefined(value)) {
+ return;
+ }
+
+ setDates((currentDates) =>
+ getCalendarEventDatesAfterStartChange({
+ dates: currentDates,
+ startsAt: value,
+ isFullDay,
+ }),
+ );
+ };
+
+ const setEndsAt = (value: string | null) => {
+ if (isDefined(value)) {
+ setDates((currentDates) => ({
+ ...currentDates,
+ endsAt:
+ isFullDay && value.slice(0, 10) <= currentDates.startsAt.slice(0, 10)
+ ? Temporal.PlainDate.from(currentDates.startsAt.slice(0, 10))
+ .add({ days: 1 })
+ .toString()
+ : value,
+ }));
+ }
+ };
+
+ const handleCreate = useCallback(async () => {
+ if (!canCreate || store.get(isCalendarEventComposerCreatingState.atom)) {
+ return;
+ }
+
+ store.set(isCalendarEventComposerCreatingState.atom, true);
+
+ try {
+ const success = await createCalendarEvent({
+ connectedAccountId,
+ title: title.trim(),
+ description: description.trim() || undefined,
+ location: location.trim() || undefined,
+ startsAt: dates.startsAt,
+ endsAt: dates.endsAt,
+ isFullDay,
+ timeZone,
+ attendees: serializeEmailRecipients(attendees),
+ sendInvitations,
+ addConferencing,
+ });
+
+ if (success) {
+ onCreated();
+ }
+ } finally {
+ store.set(isCalendarEventComposerCreatingState.atom, false);
+ }
+ }, [
+ addConferencing,
+ attendees,
+ canCreate,
+ connectedAccountId,
+ createCalendarEvent,
+ dates.endsAt,
+ dates.startsAt,
+ description,
+ isFullDay,
+ location,
+ onCreated,
+ sendInvitations,
+ store,
+ timeZone,
+ title,
+ ]);
+
+ return {
+ accountOptions,
+ accountsLoading,
+ addConferencing,
+ attendees,
+ attendeeEmails,
+ canCreate,
+ connectedAccountId,
+ dates,
+ description,
+ handleCreate,
+ handleIsFullDayChange,
+ handleStartsAtChange,
+ hasTooManyAttendees,
+ hasTargetAssociation,
+ hasValidDateRange,
+ invalidAttendeeEmails,
+ isFullDay,
+ missingScopes,
+ selectedAccount,
+ sendInvitations,
+ setAddConferencing,
+ setAttendees,
+ setConnectedAccountId,
+ setDescription,
+ setEndsAt,
+ setLocation,
+ setSendInvitations,
+ setTimeZone,
+ setTitle,
+ timeZone,
+ };
+};
diff --git a/packages/twenty-front/src/modules/activities/calendar/hooks/useCalendarEventTargetRelatedPersonIds.ts b/packages/twenty-front/src/modules/activities/calendar/hooks/useCalendarEventTargetRelatedPersonIds.ts
new file mode 100644
index 00000000000..22afa61fd13
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/hooks/useCalendarEventTargetRelatedPersonIds.ts
@@ -0,0 +1,32 @@
+import { TIMELINE_CALENDAR_EVENTS_DEFAULT_PAGE_SIZE } from '@/activities/calendar/constants/Calendar';
+import { getTimelineCalendarEventsFromObjectRecord } from '@/activities/calendar/graphql/queries/getTimelineCalendarEventsFromObjectRecord';
+import { type EmailComposerContextRecord } from '@/activities/emails/recipients/types/EmailComposerContextRecord';
+import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
+import { useQuery } from '@apollo/client/react';
+import { isDefined } from 'twenty-shared/utils';
+import {
+ type GetTimelineCalendarEventsFromObjectRecordQuery,
+ type GetTimelineCalendarEventsFromObjectRecordQueryVariables,
+} from '~/generated/graphql';
+
+export const useCalendarEventTargetRelatedPersonIds = (
+ contextRecord: EmailComposerContextRecord | undefined,
+) => {
+ const apolloCoreClient = useApolloCoreClient();
+
+ const { data } = useQuery<
+ GetTimelineCalendarEventsFromObjectRecordQuery,
+ GetTimelineCalendarEventsFromObjectRecordQueryVariables
+ >(getTimelineCalendarEventsFromObjectRecord, {
+ client: apolloCoreClient,
+ skip: !isDefined(contextRecord),
+ variables: {
+ objectNameSingular: contextRecord?.objectNameSingular ?? '',
+ recordId: contextRecord?.recordId ?? '',
+ page: 1,
+ pageSize: TIMELINE_CALENDAR_EVENTS_DEFAULT_PAGE_SIZE,
+ },
+ });
+
+ return data?.getTimelineCalendarEventsFromObjectRecord.relatedPersonIds ?? [];
+};
diff --git a/packages/twenty-front/src/modules/activities/calendar/hooks/useComposeCalendarEventForTargetRecord.ts b/packages/twenty-front/src/modules/activities/calendar/hooks/useComposeCalendarEventForTargetRecord.ts
new file mode 100644
index 00000000000..a745bacd7b9
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/hooks/useComposeCalendarEventForTargetRecord.ts
@@ -0,0 +1,66 @@
+import { getMissingCreateCalendarEventScopes } from '@/accounts/utils/hasMissingCreateCalendarEventScopes';
+import { useResolveDefaultEmailRecipient } from '@/activities/emails/hooks/useResolveDefaultEmailRecipient';
+import { isCalendarCreationEnabledForAccount } from '@/activities/calendar/utils/isCalendarCreationEnabledForAccount';
+import { useMyConnectedAccounts } from '@/settings/accounts/hooks/useMyConnectedAccounts';
+import { useOpenComposeCalendarEventInSidePanel } from '@/side-panel/hooks/useOpenComposeCalendarEventInSidePanel';
+import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUserTimezone';
+import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';
+import { isNonEmptyString } from '@sniptt/guards';
+import { SettingsPath } from 'twenty-shared/types';
+import { isDefined } from 'twenty-shared/utils';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
+
+export const useComposeCalendarEventForTargetRecord = () => {
+ const targetRecord = useTargetRecord();
+ const navigateSettings = useNavigateSettings();
+ const { userTimezone } = useUserTimezone();
+ const { accounts, loading: accountsLoading } = useMyConnectedAccounts();
+ const { openComposeCalendarEventInSidePanel } =
+ useOpenComposeCalendarEventInSidePanel();
+
+ const {
+ defaultRecipientPersonId,
+ defaultTo,
+ loading: recipientLoading,
+ } = useResolveDefaultEmailRecipient({
+ objectNameSingular: targetRecord.targetObjectNameSingular,
+ recordId: targetRecord.id,
+ });
+
+ const calendarAccounts = accounts.filter(isCalendarCreationEnabledForAccount);
+
+ const preferredAccount =
+ calendarAccounts.find(
+ (account) => getMissingCreateCalendarEventScopes(account).length === 0,
+ ) ?? calendarAccounts[0];
+
+ const openComposer = () => {
+ if (!isNonEmptyString(defaultTo)) {
+ return;
+ }
+
+ if (!isDefined(preferredAccount)) {
+ navigateSettings(SettingsPath.NewAccount);
+
+ return;
+ }
+
+ openComposeCalendarEventInSidePanel({
+ connectedAccountId: preferredAccount.id,
+ contextRecord: {
+ objectNameSingular: targetRecord.targetObjectNameSingular,
+ recordId: targetRecord.id,
+ },
+ defaultAttendees: defaultTo,
+ defaultAttendeePersonId: defaultRecipientPersonId,
+ timeZone: userTimezone,
+ });
+ };
+
+ return {
+ openComposer,
+ loading: accountsLoading || recipientLoading,
+ disabled:
+ accountsLoading || recipientLoading || !isNonEmptyString(defaultTo),
+ };
+};
diff --git a/packages/twenty-front/src/modules/activities/calendar/hooks/useCreateCalendarEvent.ts b/packages/twenty-front/src/modules/activities/calendar/hooks/useCreateCalendarEvent.ts
new file mode 100644
index 00000000000..45c87ebc815
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/hooks/useCreateCalendarEvent.ts
@@ -0,0 +1,66 @@
+import { CREATE_CALENDAR_EVENT } from '@/activities/calendar/graphql/mutations/createCalendarEvent';
+import { getTimelineCalendarEventsFromObjectRecord } from '@/activities/calendar/graphql/queries/getTimelineCalendarEventsFromObjectRecord';
+import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
+import { useMutation } from '@apollo/client/react';
+import { t } from '@lingui/core/macro';
+import { useCallback } from 'react';
+import {
+ type CreateCalendarEventInput,
+ type CreateCalendarEventOutput,
+ type MutationCreateCalendarEventArgs,
+} from '~/generated-metadata/graphql';
+
+export const useCreateCalendarEvent = () => {
+ const apolloCoreClient = useApolloCoreClient();
+ const { enqueueErrorSnackBar, enqueueSuccessSnackBar } = useSnackBar();
+
+ const [createCalendarEventMutation, { loading }] = useMutation<
+ { createCalendarEvent: CreateCalendarEventOutput },
+ MutationCreateCalendarEventArgs
+ >(CREATE_CALENDAR_EVENT);
+
+ const createCalendarEvent = useCallback(
+ async (input: CreateCalendarEventInput) => {
+ try {
+ const result = await createCalendarEventMutation({
+ variables: { input },
+ });
+
+ if (!result.data?.createCalendarEvent.success) {
+ enqueueErrorSnackBar({
+ message:
+ result.data?.createCalendarEvent.error ??
+ t`Failed to create calendar event`,
+ });
+
+ return false;
+ }
+
+ enqueueSuccessSnackBar({
+ message: t`Calendar event created successfully`,
+ });
+
+ await apolloCoreClient.refetchQueries({
+ include: [getTimelineCalendarEventsFromObjectRecord],
+ });
+
+ return true;
+ } catch {
+ enqueueErrorSnackBar({
+ message: t`Failed to create calendar event`,
+ });
+
+ return false;
+ }
+ },
+ [
+ apolloCoreClient,
+ createCalendarEventMutation,
+ enqueueErrorSnackBar,
+ enqueueSuccessSnackBar,
+ ],
+ );
+
+ return { createCalendarEvent, loading };
+};
diff --git a/packages/twenty-front/src/modules/activities/calendar/states/isCalendarEventComposerCreatingState.ts b/packages/twenty-front/src/modules/activities/calendar/states/isCalendarEventComposerCreatingState.ts
new file mode 100644
index 00000000000..14fa614be6a
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/states/isCalendarEventComposerCreatingState.ts
@@ -0,0 +1,6 @@
+import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';
+
+export const isCalendarEventComposerCreatingState = createAtomState<boolean>({
+ key: 'activities/calendar/isCalendarEventComposerCreatingState',
+ defaultValue: false,
+});
diff --git a/packages/twenty-front/src/modules/activities/calendar/types/CalendarEventComposerInitialValues.ts b/packages/twenty-front/src/modules/activities/calendar/types/CalendarEventComposerInitialValues.ts
new file mode 100644
index 00000000000..73d41c3f642
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/types/CalendarEventComposerInitialValues.ts
@@ -0,0 +1,9 @@
+import { type EmailComposerContextRecord } from '@/activities/emails/recipients/types/EmailComposerContextRecord';
+
+export type CalendarEventComposerInitialValues = {
+ connectedAccountId: string;
+ contextRecord: EmailComposerContextRecord;
+ defaultAttendees: string;
+ defaultAttendeePersonId?: string;
+ timeZone: string;
+};
diff --git a/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/calendarEventComposerDateTransitions.test.ts b/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/calendarEventComposerDateTransitions.test.ts
new file mode 100644
index 00000000000..84de3bdaf07
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/calendarEventComposerDateTransitions.test.ts
@@ -0,0 +1,56 @@
+import { getCalendarEventDatesAfterModeChange } from '@/activities/calendar/utils/getCalendarEventDatesAfterModeChange';
+import { getCalendarEventDatesAfterStartChange } from '@/activities/calendar/utils/getCalendarEventDatesAfterStartChange';
+
+describe('calendar event composer date transitions', () => {
+ it('converts a timed event to a one-day all-day event in its timezone', () => {
+ expect(
+ getCalendarEventDatesAfterModeChange({
+ dates: {
+ startsAt: '2026-03-28T23:30:00Z',
+ endsAt: '2026-03-29T00:30:00Z',
+ },
+ isFullDay: true,
+ timeZone: 'Europe/Paris',
+ }),
+ ).toEqual({ startsAt: '2026-03-29', endsAt: '2026-03-30' });
+ });
+
+ it('converts an all-day event back to a local 9 AM one-hour event', () => {
+ expect(
+ getCalendarEventDatesAfterModeChange({
+ dates: { startsAt: '2026-03-29', endsAt: '2026-03-30' },
+ isFullDay: false,
+ timeZone: 'Europe/Paris',
+ }),
+ ).toEqual({
+ startsAt: '2026-03-29T07:00:00Z',
+ endsAt: '2026-03-29T08:00:00Z',
+ });
+ });
+
+ it('clamps an all-day end to one day after a later start', () => {
+ expect(
+ getCalendarEventDatesAfterStartChange({
+ dates: { startsAt: '2026-08-23', endsAt: '2026-08-24' },
+ startsAt: '2026-08-25',
+ isFullDay: true,
+ }),
+ ).toEqual({ startsAt: '2026-08-25', endsAt: '2026-08-26' });
+ });
+
+ it('clamps a timed end to one hour after a later start', () => {
+ expect(
+ getCalendarEventDatesAfterStartChange({
+ dates: {
+ startsAt: '2026-08-23T09:00:00Z',
+ endsAt: '2026-08-23T10:00:00Z',
+ },
+ startsAt: '2026-08-23T11:00:00Z',
+ isFullDay: false,
+ }),
+ ).toEqual({
+ startsAt: '2026-08-23T11:00:00Z',
+ endsAt: '2026-08-23T12:00:00Z',
+ });
+ });
+});
diff --git a/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/getCalendarEventComposerDefaultDates.test.ts b/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/getCalendarEventComposerDefaultDates.test.ts
new file mode 100644
index 00000000000..2e8f47e35eb
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/getCalendarEventComposerDefaultDates.test.ts
@@ -0,0 +1,40 @@
+import { getCalendarEventComposerDefaultDates } from '@/activities/calendar/utils/getCalendarEventComposerDefaultDates';
+import { Temporal } from 'temporal-polyfill';
+
+describe('getCalendarEventComposerDefaultDates', () => {
+ it('starts at the next half-hour and lasts one hour', () => {
+ expect(
+ getCalendarEventComposerDefaultDates({
+ now: Temporal.Instant.from('2026-08-23T19:16:47Z'),
+ timeZone: 'Europe/Paris',
+ }),
+ ).toEqual({
+ startsAt: '2026-08-23T19:30:00Z',
+ endsAt: '2026-08-23T20:30:00Z',
+ });
+ });
+
+ it('uses the following interval when already on a half-hour boundary', () => {
+ expect(
+ getCalendarEventComposerDefaultDates({
+ now: Temporal.Instant.from('2026-08-23T10:30:00Z'),
+ timeZone: 'UTC',
+ }),
+ ).toEqual({
+ startsAt: '2026-08-23T11:00:00Z',
+ endsAt: '2026-08-23T12:00:00Z',
+ });
+ });
+
+ it('rounds safely across a daylight-saving transition', () => {
+ expect(
+ getCalendarEventComposerDefaultDates({
+ now: Temporal.Instant.from('2026-03-29T00:45:00Z'),
+ timeZone: 'Europe/Paris',
+ }),
+ ).toEqual({
+ startsAt: '2026-03-29T01:00:00Z',
+ endsAt: '2026-03-29T02:00:00Z',
+ });
+ });
+});
diff --git a/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/hasCalendarEventTargetAssociation.test.ts b/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/hasCalendarEventTargetAssociation.test.ts
new file mode 100644
index 00000000000..586c998f0c3
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/hasCalendarEventTargetAssociation.test.ts
@@ -0,0 +1,68 @@
+import { hasCalendarEventTargetAssociation } from '@/activities/calendar/utils/hasCalendarEventTargetAssociation';
+
+describe('hasCalendarEventTargetAssociation', () => {
+ it('requires invitations to preserve the provider participant', () => {
+ expect(
+ hasCalendarEventTargetAssociation({
+ attendees: [{ address: '[email protected]' }],
+ relatedPersonIds: [],
+ requiredAttendee: '[email protected]',
+ sendInvitations: false,
+ }),
+ ).toBe(false);
+ });
+
+ it('requires the current record email in the attendee list', () => {
+ expect(
+ hasCalendarEventTargetAssociation({
+ attendees: [{ address: '[email protected]' }],
+ relatedPersonIds: [],
+ requiredAttendee: '[email protected]',
+ sendInvitations: true,
+ }),
+ ).toBe(false);
+ });
+
+ it('matches the current record email case-insensitively', () => {
+ expect(
+ hasCalendarEventTargetAssociation({
+ attendees: [{ address: '[email protected]' }],
+ relatedPersonIds: [],
+ requiredAttendee: '[email protected]',
+ sendInvitations: true,
+ }),
+ ).toBe(true);
+ });
+
+ it('accepts another person related to the timeline record', () => {
+ expect(
+ hasCalendarEventTargetAssociation({
+ attendees: [
+ {
+ address: '[email protected]',
+ personId: 'related-person-id',
+ },
+ ],
+ relatedPersonIds: ['related-person-id'],
+ requiredAttendee: '[email protected]',
+ sendInvitations: true,
+ }),
+ ).toBe(true);
+ });
+
+ it('rejects a person unrelated to the timeline record', () => {
+ expect(
+ hasCalendarEventTargetAssociation({
+ attendees: [
+ {
+ address: '[email protected]',
+ personId: 'unrelated-person-id',
+ },
+ ],
+ relatedPersonIds: ['related-person-id'],
+ requiredAttendee: '[email protected]',
+ sendInvitations: true,
+ }),
+ ).toBe(false);
+ });
+});
diff --git a/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/isCalendarCreationEnabledForAccount.test.ts b/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/isCalendarCreationEnabledForAccount.test.ts
new file mode 100644
index 00000000000..4a7f8e8ac35
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/isCalendarCreationEnabledForAccount.test.ts
@@ -0,0 +1,57 @@
+import { isCalendarCreationEnabledForAccount } from '@/activities/calendar/utils/isCalendarCreationEnabledForAccount';
+import { ConnectedAccountProvider } from 'twenty-shared/types';
+
+const makeAccount = (
+ overrides: Partial<
+ Parameters<typeof isCalendarCreationEnabledForAccount>[0]
+ > = {},
+) =>
+ ({
+ archivedAt: null,
+ provider: ConnectedAccountProvider.GOOGLE,
+ calendarChannels: [{ isSyncEnabled: true }],
+ connectionParameters: null,
+ ...overrides,
+ }) satisfies Parameters<typeof isCalendarCreationEnabledForAccount>[0];
+
+describe('isCalendarCreationEnabledForAccount', () => {
+ it('accepts an active supported account with calendar sync enabled', () => {
+ expect(isCalendarCreationEnabledForAccount(makeAccount())).toBe(true);
+ });
+
+ it('rejects archived accounts and accounts without calendar sync', () => {
+ expect(
+ isCalendarCreationEnabledForAccount(
+ makeAccount({ archivedAt: '2026-08-23T00:00:00Z' }),
+ ),
+ ).toBe(false);
+ expect(
+ isCalendarCreationEnabledForAccount(
+ makeAccount({ calendarChannels: [{ isSyncEnabled: false }] }),
+ ),
+ ).toBe(false);
+ });
+
+ it('requires CalDAV connection parameters for a CalDAV account', () => {
+ const calDavAccount = makeAccount({
+ provider: ConnectedAccountProvider.IMAP_SMTP_CALDAV,
+ });
+
+ expect(isCalendarCreationEnabledForAccount(calDavAccount)).toBe(false);
+ expect(
+ isCalendarCreationEnabledForAccount(
+ makeAccount({
+ provider: ConnectedAccountProvider.IMAP_SMTP_CALDAV,
+ connectionParameters: {
+ CALDAV: {
+ host: 'https://calendar.example.com',
+ port: 443,
+ username: '[email protected]',
+ password: 'secret',
+ },
+ },
+ }),
+ ),
+ ).toBe(true);
+ });
+});
diff --git a/packages/twenty-front/src/modules/activities/calendar/utils/getCalendarEventComposerDefaultDates.ts b/packages/twenty-front/src/modules/activities/calendar/utils/getCalendarEventComposerDefaultDates.ts
new file mode 100644
index 00000000000..3b0fae30560
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/utils/getCalendarEventComposerDefaultDates.ts
@@ -0,0 +1,29 @@
+import type { Temporal } from 'temporal-polyfill';
+
+const CALENDAR_EVENT_DEFAULT_DURATION_MINUTES = 60;
+const CALENDAR_EVENT_START_INTERVAL_MINUTES = 30;
+
+export const getCalendarEventComposerDefaultDates = ({
+ now,
+ timeZone,
+}: {
+ now: Temporal.Instant;
+ timeZone: string;
+}) => {
+ const zonedNow = now.toZonedDateTimeISO(timeZone);
+ const minutesUntilNextInterval =
+ CALENDAR_EVENT_START_INTERVAL_MINUTES -
+ (zonedNow.minute % CALENDAR_EVENT_START_INTERVAL_MINUTES);
+
+ const startsAt = zonedNow
+ .add({ minutes: minutesUntilNextInterval })
+ .with({ second: 0, millisecond: 0, microsecond: 0, nanosecond: 0 });
+
+ return {
+ startsAt: startsAt.toInstant().toString(),
+ endsAt: startsAt
+ .add({ minutes: CALENDAR_EVENT_DEFAULT_DURATION_MINUTES })
+ .toInstant()
+ .toString(),
+ };
+};
diff --git a/packages/twenty-front/src/modules/activities/calendar/utils/getCalendarEventDatesAfterModeChange.ts b/packages/twenty-front/src/modules/activities/calendar/utils/getCalendarEventDatesAfterModeChange.ts
new file mode 100644
index 00000000000..dac20162e6a
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/utils/getCalendarEventDatesAfterModeChange.ts
@@ -0,0 +1,33 @@
+import { Temporal } from 'temporal-polyfill';
+
+export const getCalendarEventDatesAfterModeChange = ({
+ dates,
+ isFullDay,
+ timeZone,
+}: {
+ dates: { startsAt: string; endsAt: string };
+ isFullDay: boolean;
+ timeZone: string;
+}) => {
+ if (isFullDay) {
+ const startDate = Temporal.Instant.from(dates.startsAt)
+ .toZonedDateTimeISO(timeZone)
+ .toPlainDate();
+
+ return {
+ startsAt: startDate.toString(),
+ endsAt: startDate.add({ days: 1 }).toString(),
+ };
+ }
+
+ const startDate = Temporal.PlainDate.from(dates.startsAt.slice(0, 10));
+ const startsAt = startDate.toZonedDateTime({
+ timeZone,
+ plainTime: Temporal.PlainTime.from('09:00'),
+ });
+
+ return {
+ startsAt: startsAt.toInstant().toString(),
+ endsAt: startsAt.add({ hours: 1 }).toInstant().toString(),
+ };
+};
diff --git a/packages/twenty-front/src/modules/activities/calendar/utils/getCalendarEventDatesAfterStartChange.ts b/packages/twenty-front/src/modules/activities/calendar/utils/getCalendarEventDatesAfterStartChange.ts
new file mode 100644
index 00000000000..f9eed254655
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/utils/getCalendarEventDatesAfterStartChange.ts
@@ -0,0 +1,29 @@
+import { Temporal } from 'temporal-polyfill';
+
+export const getCalendarEventDatesAfterStartChange = ({
+ dates,
+ startsAt,
+ isFullDay,
+}: {
+ dates: { startsAt: string; endsAt: string };
+ startsAt: string;
+ isFullDay: boolean;
+}) => {
+ if (isFullDay) {
+ return {
+ startsAt,
+ endsAt:
+ dates.endsAt > startsAt
+ ? dates.endsAt
+ : Temporal.PlainDate.from(startsAt).add({ days: 1 }).toString(),
+ };
+ }
+
+ return {
+ startsAt,
+ endsAt:
+ Date.parse(dates.endsAt) > Date.parse(startsAt)
+ ? dates.endsAt
+ : Temporal.Instant.from(startsAt).add({ hours: 1 }).toString(),
+ };
+};
diff --git a/packages/twenty-front/src/modules/activities/calendar/utils/hasCalendarEventTargetAssociation.ts b/packages/twenty-front/src/modules/activities/calendar/utils/hasCalendarEventTargetAssociation.ts
new file mode 100644
index 00000000000..30d41d8a671
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/utils/hasCalendarEventTargetAssociation.ts
@@ -0,0 +1,30 @@
+import { isNonEmptyString } from '@sniptt/guards';
+import { isDefined } from 'twenty-shared/utils';
+
+import { type EmailRecipient } from '@/activities/emails/recipients/types/EmailRecipient';
+
+export const hasCalendarEventTargetAssociation = ({
+ attendees,
+ relatedPersonIds,
+ requiredAttendee,
+ sendInvitations,
+}: {
+ attendees: EmailRecipient[];
+ relatedPersonIds: string[];
+ requiredAttendee: string | undefined;
+ sendInvitations: boolean;
+}) => {
+ if (!sendInvitations) {
+ return false;
+ }
+
+ const relatedPersonIdSet = new Set(relatedPersonIds);
+
+ return attendees.some(
+ (attendee) =>
+ (isDefined(attendee.personId) &&
+ relatedPersonIdSet.has(attendee.personId)) ||
+ (isNonEmptyString(requiredAttendee) &&
+ attendee.address.toLowerCase() === requiredAttendee.toLowerCase()),
+ );
+};
diff --git a/packages/twenty-front/src/modules/activities/calendar/utils/isCalendarCreationEnabledForAccount.ts b/packages/twenty-front/src/modules/activities/calendar/utils/isCalendarCreationEnabledForAccount.ts
new file mode 100644
index 00000000000..930a89dd957
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/calendar/utils/isCalendarCreationEnabledForAccount.ts
@@ -0,0 +1,24 @@
+import { type ConnectedAccount } from '@/accounts/types/ConnectedAccount';
+import { type CalendarChannel } from '@/accounts/types/CalendarChannel';
+import { ConnectedAccountProvider } from 'twenty-shared/types';
+import { isDefined } from 'twenty-shared/utils';
+
+const CALENDAR_CREATION_PROVIDERS = new Set([
+ ConnectedAccountProvider.GOOGLE,
+ ConnectedAccountProvider.MICROSOFT,
+ ConnectedAccountProvider.IMAP_SMTP_CALDAV,
+]);
+
+export const isCalendarCreationEnabledForAccount = (
+ account: Pick<
+ ConnectedAccount,
+ 'archivedAt' | 'provider' | 'connectionParameters'
+ > & {
+ calendarChannels: Pick<CalendarChannel, 'isSyncEnabled'>[];
+ },
+) =>
+ !isDefined(account.archivedAt) &&
+ CALENDAR_CREATION_PROVIDERS.has(account.provider) &&
+ account.calendarChannels.some((channel) => channel.isSyncEnabled) &&
+ (account.provider !== ConnectedAccountProvider.IMAP_SMTP_CALDAV ||
+ isDefined(account.connectionParameters?.CALDAV));
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailComposerFieldRow.tsx b/packages/twenty-front/src/modules/activities/components/ComposerFieldRow.tsx
similarity index 68%
rename from packages/twenty-front/src/modules/activities/emails/components/EmailComposerFieldRow.tsx
rename to packages/twenty-front/src/modules/activities/components/ComposerFieldRow.tsx
index 9942eb49af4..e4fe9a139de 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailComposerFieldRow.tsx
+++ b/packages/twenty-front/src/modules/activities/components/ComposerFieldRow.tsx
@@ -1,13 +1,15 @@
import { styled } from '@linaria/react';
-import { type ReactNode } from 'react';
+import { type MouseEventHandler, type ReactNode } from 'react';
+import { isDefined } from 'twenty-shared/utils';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const ROW_MIN_HEIGHT = '40px';
-const StyledRow = styled.div`
+const StyledRow = styled.div<{ $clickable: boolean }>`
align-items: center;
border-bottom: 1px solid ${themeCssVariables.border.color.light};
box-sizing: border-box;
+ cursor: ${({ $clickable }) => ($clickable ? 'pointer' : 'default')};
display: flex;
gap: ${themeCssVariables.spacing[2]};
min-height: ${ROW_MIN_HEIGHT};
@@ -35,10 +37,16 @@ const StyledContent = styled.div`
min-width: 0;
`;
-type EmailComposerFieldRowProps = {
+const StyledTrailing = styled.div`
+ align-items: center;
+ display: flex;
+`;
+
+type ComposerFieldRowProps = {
label: string;
children: ReactNode;
trailing?: ReactNode;
+ onClick?: MouseEventHandler<HTMLDivElement>;
// A floor, not a fixed width: mixed-length labels line up without a long
// translation running underneath its control.
labelMinWidth?: string;
@@ -47,17 +55,27 @@ type EmailComposerFieldRowProps = {
// The visible label is a plain span, so it cannot be associated with whatever
// control the row wraps. Naming the row as a group gives assistive technology
// the field name even for controls that take no label of their own.
-export const EmailComposerFieldRow = ({
+export const ComposerFieldRow = ({
label,
children,
trailing,
+ onClick,
labelMinWidth,
-}: EmailComposerFieldRowProps) => (
- <StyledRow role="group" aria-label={label}>
+}: ComposerFieldRowProps) => (
+ <StyledRow
+ role="group"
+ aria-label={label}
+ $clickable={isDefined(onClick)}
+ onClick={onClick}
+ >
<StyledLabel aria-hidden="true" $minWidth={labelMinWidth}>
{label}
</StyledLabel>
<StyledContent>{children}</StyledContent>
- {trailing}
+ {isDefined(trailing) && (
+ <StyledTrailing onClick={(event) => event.stopPropagation()}>
+ {trailing}
+ </StyledTrailing>
+ )}
</StyledRow>
);
diff --git a/packages/twenty-front/src/modules/activities/components/ComposerHeader.tsx b/packages/twenty-front/src/modules/activities/components/ComposerHeader.tsx
new file mode 100644
index 00000000000..cdb3306978f
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/components/ComposerHeader.tsx
@@ -0,0 +1,15 @@
+import { styled } from '@linaria/react';
+import { type ReactNode } from 'react';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
+
+const StyledHeader = styled.div`
+ background-color: ${themeCssVariables.background.secondary};
+ border-bottom: 1px solid ${themeCssVariables.border.color.medium};
+ display: flex;
+ flex-direction: column;
+ width: 100%;
+`;
+
+export const ComposerHeader = ({ children }: { children: ReactNode }) => (
+ <StyledHeader>{children}</StyledHeader>
+);
diff --git a/packages/twenty-front/src/modules/activities/components/ComposerTextInput.tsx b/packages/twenty-front/src/modules/activities/components/ComposerTextInput.tsx
new file mode 100644
index 00000000000..c1908d4baae
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/components/ComposerTextInput.tsx
@@ -0,0 +1,19 @@
+import { FORM_FIELD_PLACEHOLDER_STYLES } from '@/ui/input/constants/FormFieldPlaceholderStyles';
+import { styled } from '@linaria/react';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
+
+export const StyledComposerTextInput = styled.input`
+ background: transparent;
+ border: none;
+ color: ${themeCssVariables.font.color.primary};
+ font-family: inherit;
+ font-size: ${themeCssVariables.font.size.md};
+ font-weight: ${themeCssVariables.font.weight.regular};
+ outline: none;
+ padding: 0;
+ width: 100%;
+
+ &::placeholder {
+ ${FORM_FIELD_PLACEHOLDER_STYLES}
+ }
+`;
diff --git a/packages/twenty-front/src/modules/activities/emails/components/CampaignDetailsFields.tsx b/packages/twenty-front/src/modules/activities/emails/components/CampaignDetailsFields.tsx
index f8ea00c9672..2794b910cff 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/CampaignDetailsFields.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/CampaignDetailsFields.tsx
@@ -12,7 +12,7 @@ import {
CAMPAIGN_ENVELOPE_LABEL_MIN_WIDTH,
CampaignEnvelopeBox,
} from '@/activities/emails/components/CampaignEnvelopeBox';
-import { EmailComposerFieldRow } from '@/activities/emails/components/EmailComposerFieldRow';
+import { ComposerFieldRow } from '@/activities/components/ComposerFieldRow';
import { useCampaignAudiencePreview } from '@/activities/emails/hooks/useCampaignAudiencePreview';
import { useCampaignDetailsState } from '@/activities/emails/hooks/useCampaignDetailsState';
import { useUnsubscribeTopics } from '@/activities/emails/hooks/useUnsubscribeTopics';
@@ -144,7 +144,7 @@ export const CampaignDetailsFields = ({
)
}
>
- <EmailComposerFieldRow
+ <ComposerFieldRow
label={t`From`}
labelMinWidth={CAMPAIGN_ENVELOPE_LABEL_MIN_WIDTH}
>
@@ -156,8 +156,8 @@ export const CampaignDetailsFields = ({
emptyOption={{ label: t`Select a sender`, value: '' }}
onChange={detailsState.setFromAddress}
/>
- </EmailComposerFieldRow>
- <EmailComposerFieldRow
+ </ComposerFieldRow>
+ <ComposerFieldRow
label={t`To`}
labelMinWidth={CAMPAIGN_ENVELOPE_LABEL_MIN_WIDTH}
>
@@ -168,9 +168,9 @@ export const CampaignDetailsFields = ({
onChange={detailsState.setListId}
onCreate={handleCreateList}
/>
- </EmailComposerFieldRow>
+ </ComposerFieldRow>
{hasTopicOptions && (
- <EmailComposerFieldRow
+ <ComposerFieldRow
label={t`Unsubscribe topic`}
labelMinWidth={CAMPAIGN_ENVELOPE_LABEL_MIN_WIDTH}
>
@@ -184,9 +184,9 @@ export const CampaignDetailsFields = ({
detailsState.setUnsubscribeTopicId(value === '' ? null : value)
}
/>
- </EmailComposerFieldRow>
+ </ComposerFieldRow>
)}
- <EmailComposerFieldRow
+ <ComposerFieldRow
label={t`Subject`}
labelMinWidth={CAMPAIGN_ENVELOPE_LABEL_MIN_WIDTH}
>
@@ -197,7 +197,7 @@ export const CampaignDetailsFields = ({
defaultValue={detailsState.subject}
onChange={(event) => detailsState.setSubject(event.target.value)}
/>
- </EmailComposerFieldRow>
+ </ComposerFieldRow>
</CampaignEnvelopeBox>
);
};
diff --git a/packages/twenty-front/src/modules/activities/emails/components/CampaignSentEnvelope.tsx b/packages/twenty-front/src/modules/activities/emails/components/CampaignSentEnvelope.tsx
index 5ea7b616d11..40d34e0d16a 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/CampaignSentEnvelope.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/CampaignSentEnvelope.tsx
@@ -9,7 +9,7 @@ import {
CAMPAIGN_ENVELOPE_LABEL_MIN_WIDTH,
CampaignEnvelopeBox,
} from '@/activities/emails/components/CampaignEnvelopeBox';
-import { EmailComposerFieldRow } from '@/activities/emails/components/EmailComposerFieldRow';
+import { ComposerFieldRow } from '@/activities/components/ComposerFieldRow';
import { useUnsubscribeTopics } from '@/activities/emails/hooks/useUnsubscribeTopics';
import { type MessageCampaign } from '@/activities/emails/types/MessageCampaign';
import { RecordChip } from '@/object-record/components/RecordChip';
@@ -82,7 +82,7 @@ export const CampaignSentEnvelope = ({
return (
<CampaignEnvelopeBox width={width}>
- <EmailComposerFieldRow
+ <ComposerFieldRow
label={t`From`}
labelMinWidth={CAMPAIGN_ENVELOPE_LABEL_MIN_WIDTH}
>
@@ -91,8 +91,8 @@ export const CampaignSentEnvelope = ({
) : (
<StyledEmptyValue>{t`No sender`}</StyledEmptyValue>
)}
- </EmailComposerFieldRow>
- <EmailComposerFieldRow
+ </ComposerFieldRow>
+ <ComposerFieldRow
label={t`To`}
labelMinWidth={CAMPAIGN_ENVELOPE_LABEL_MIN_WIDTH}
>
@@ -108,9 +108,9 @@ export const CampaignSentEnvelope = ({
<StyledEmptyValue>{t`Unavailable`}</StyledEmptyValue>
)
)}
- </EmailComposerFieldRow>
+ </ComposerFieldRow>
{hasUnsubscribeTopic && (
- <EmailComposerFieldRow
+ <ComposerFieldRow
label={t`Unsubscribe topic`}
labelMinWidth={CAMPAIGN_ENVELOPE_LABEL_MIN_WIDTH}
>
@@ -123,9 +123,9 @@ export const CampaignSentEnvelope = ({
<StyledEmptyValue>{t`Unavailable`}</StyledEmptyValue>
)
)}
- </EmailComposerFieldRow>
+ </ComposerFieldRow>
)}
- <EmailComposerFieldRow
+ <ComposerFieldRow
label={t`Subject`}
labelMinWidth={CAMPAIGN_ENVELOPE_LABEL_MIN_WIDTH}
>
@@ -134,7 +134,7 @@ export const CampaignSentEnvelope = ({
) : (
<StyledEmptyValue>{t`No subject`}</StyledEmptyValue>
)}
- </EmailComposerFieldRow>
+ </ComposerFieldRow>
</CampaignEnvelopeBox>
);
};
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailComposerFields.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailComposerFields.tsx
index f13d563c0b2..e581ec9ccb5 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailComposerFields.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailComposerFields.tsx
@@ -8,8 +8,10 @@ import { IconPaperclip } from 'twenty-ui/icon';
import { type SelectOption } from 'twenty-ui/input';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
+import { ComposerFieldRow } from '@/activities/components/ComposerFieldRow';
+import { ComposerHeader } from '@/activities/components/ComposerHeader';
+import { StyledComposerTextInput } from '@/activities/components/ComposerTextInput';
import { EmailAttachmentsField } from '@/activities/emails/components/EmailAttachmentsField';
-import { EmailComposerFieldRow } from '@/activities/emails/components/EmailComposerFieldRow';
import { INLINE_EMAIL_BODY_EDITOR_PROFILE } from '@/activities/emails/editor/constants/InlineEmailBodyEditorProfile';
import { useUploadEmailImage } from '@/activities/emails/hooks/useUploadEmailImage';
import { EmailRecipientsFieldInput } from '@/activities/emails/recipients/components/EmailRecipientsFieldInput';
@@ -21,7 +23,6 @@ import { getEmailRecipientKey } from '@/activities/emails/recipients/utils/getEm
import { type EmailRecipientsByFieldId } from '@/activities/emails/recipients/utils/moveEmailRecipientsBetweenFields';
import { type EmailComposerState } from '@/activities/emails/types/EmailComposerState';
import { FormAdvancedTextFieldInput } from '@/advanced-text-editor/components/FormAdvancedTextFieldInput';
-import { FORM_FIELD_PLACEHOLDER_STYLES } from '@/ui/input/constants/FormFieldPlaceholderStyles';
import { Select } from '@/ui/input/components/Select';
import { DND_KIT_PROVIDER_PLUGINS_WITHOUT_DROP_ANIMATION } from '@/ui/utilities/drag-and-drop/constants/DndKitProviderPluginsWithoutDropAnimation';
import { DND_KIT_SENSORS } from '@/ui/utilities/drag-and-drop/constants/DndKitSensors';
@@ -36,14 +37,6 @@ const StyledFieldsContainer = styled.div`
width: 100%;
`;
-const StyledHeaderRows = styled.div`
- background-color: ${themeCssVariables.background.secondary};
- border-bottom: 1px solid ${themeCssVariables.border.color.medium};
- display: flex;
- flex-direction: column;
- width: 100%;
-`;
-
const StyledCcBccToggle = styled.button`
all: unset;
color: ${themeCssVariables.font.color.tertiary};
@@ -62,22 +55,6 @@ const StyledCcBccToggle = styled.button`
}
`;
-const StyledSubjectInput = styled.input`
- background: transparent;
- border: none;
- color: ${themeCssVariables.font.color.primary};
- font-family: inherit;
- font-size: ${themeCssVariables.font.size.md};
- font-weight: ${themeCssVariables.font.weight.regular};
- outline: none;
- padding: 0;
- width: 100%;
-
- &::placeholder {
- ${FORM_FIELD_PLACEHOLDER_STYLES}
- }
-`;
-
const StyledBody = styled.div`
display: flex;
flex: 1;
@@ -196,9 +173,9 @@ export const EmailComposerFields = ({
onDragMove={handlers.onDragMove}
onDragEnd={handlers.onDragEnd}
>
- <StyledHeaderRows>
+ <ComposerHeader>
{hasMultipleAccounts && (
- <EmailComposerFieldRow label={t`From`}>
+ <ComposerFieldRow label={t`From`}>
<Select
dropdownId="email-composer-from-account"
fullWidth
@@ -208,9 +185,9 @@ export const EmailComposerFields = ({
composerState.setConnectedAccountId(value)
}
/>
- </EmailComposerFieldRow>
+ </ComposerFieldRow>
)}
- <EmailComposerFieldRow
+ <ComposerFieldRow
label={t`To`}
trailing={
!areCcBccFieldsVisible && (
@@ -232,10 +209,10 @@ export const EmailComposerFields = ({
excludedSuggestionKeys={allRecipientKeys}
contextRecord={contextRecord}
/>
- </EmailComposerFieldRow>
+ </ComposerFieldRow>
{areCcBccFieldsVisible && (
<>
- <EmailComposerFieldRow label={t`Cc`}>
+ <ComposerFieldRow label={t`Cc`}>
<EmailRecipientsFieldInput
fieldId="cc"
draggedSourceIndices={getDraggedIndicesForField('cc')}
@@ -246,8 +223,8 @@ export const EmailComposerFields = ({
excludedSuggestionKeys={allRecipientKeys}
contextRecord={contextRecord}
/>
- </EmailComposerFieldRow>
- <EmailComposerFieldRow label={t`Bcc`}>
+ </ComposerFieldRow>
+ <ComposerFieldRow label={t`Bcc`}>
<EmailRecipientsFieldInput
fieldId="bcc"
draggedSourceIndices={getDraggedIndicesForField('bcc')}
@@ -258,11 +235,11 @@ export const EmailComposerFields = ({
excludedSuggestionKeys={allRecipientKeys}
contextRecord={contextRecord}
/>
- </EmailComposerFieldRow>
+ </ComposerFieldRow>
</>
)}
- <EmailComposerFieldRow label={t`Subject`}>
- <StyledSubjectInput
+ <ComposerFieldRow label={t`Subject`}>
+ <StyledComposerTextInput
type="text"
aria-label={t`Subject`}
defaultValue={composerState.initialSubject}
@@ -270,8 +247,8 @@ export const EmailComposerFields = ({
composerState.setSubject(event.target.value)
}
/>
- </EmailComposerFieldRow>
- </StyledHeaderRows>
+ </ComposerFieldRow>
+ </ComposerHeader>
</DragDropProvider>
</DragDropItemDndContext.Provider>
{composerState.exceedsRecipientLimit && (
diff --git a/packages/twenty-front/src/modules/activities/emails/hooks/__tests__/useResolveDefaultEmailRecipient.test.ts b/packages/twenty-front/src/modules/activities/emails/hooks/__tests__/useResolveDefaultEmailRecipient.test.ts
index a2d924a5925..bd55012e0dd 100644
--- a/packages/twenty-front/src/modules/activities/emails/hooks/__tests__/useResolveDefaultEmailRecipient.test.ts
+++ b/packages/twenty-front/src/modules/activities/emails/hooks/__tests__/useResolveDefaultEmailRecipient.test.ts
@@ -33,7 +33,10 @@ describe('useResolveDefaultEmailRecipient', () => {
(args: { objectNameSingular: string }) => {
if (args.objectNameSingular === CoreObjectNameSingular.Person) {
return {
- record: { emails: { primaryEmail: '[email protected]' } },
+ record: {
+ id: 'person-id',
+ emails: { primaryEmail: '[email protected]' },
+ },
loading: false,
};
}
@@ -50,12 +53,18 @@ describe('useResolveDefaultEmailRecipient', () => {
);
expect(result.current.defaultTo).toBe('[email protected]');
+ expect(result.current.defaultRecipientPersonId).toBe('person-id');
expect(result.current.loading).toBe(false);
});
it('should return the first company employee email for a Company record', () => {
mockUseFindManyRecords.mockReturnValue({
- records: [{ emails: { primaryEmail: '[email protected]' } }],
+ records: [
+ {
+ id: 'employee-id',
+ emails: { primaryEmail: '[email protected]' },
+ },
+ ],
loading: false,
});
@@ -67,6 +76,7 @@ describe('useResolveDefaultEmailRecipient', () => {
);
expect(result.current.defaultTo).toBe('[email protected]');
+ expect(result.current.defaultRecipientPersonId).toBe('employee-id');
});
it('should return the opportunity point of contact email', () => {
@@ -76,6 +86,7 @@ describe('useResolveDefaultEmailRecipient', () => {
return {
record: {
pointOfContact: {
+ id: 'contact-id',
emails: { primaryEmail: '[email protected]' },
},
},
@@ -95,6 +106,7 @@ describe('useResolveDefaultEmailRecipient', () => {
);
expect(result.current.defaultTo).toBe('[email protected]');
+ expect(result.current.defaultRecipientPersonId).toBe('contact-id');
});
it('should return empty string for unknown object types', () => {
diff --git a/packages/twenty-front/src/modules/activities/emails/hooks/useResolveDefaultEmailRecipient.ts b/packages/twenty-front/src/modules/activities/emails/hooks/useResolveDefaultEmailRecipient.ts
index bd636c437cf..d0b005a7fd1 100644
--- a/packages/twenty-front/src/modules/activities/emails/hooks/useResolveDefaultEmailRecipient.ts
+++ b/packages/twenty-front/src/modules/activities/emails/hooks/useResolveDefaultEmailRecipient.ts
@@ -55,10 +55,18 @@ export const useResolveDefaultEmailRecipient = ({
? (opportunityRecord?.pointOfContact?.emails?.primaryEmail ?? '')
: '';
+ const defaultRecipientPersonId = isPerson
+ ? personRecord?.id
+ : isCompany
+ ? companyPeople[0]?.id
+ : isOpportunity
+ ? opportunityRecord?.pointOfContact?.id
+ : undefined;
+
const loading =
(isPerson && personLoading) ||
(isCompany && companyPeopleLoading) ||
(isOpportunity && opportunityLoading);
- return { defaultTo, loading };
+ return { defaultRecipientPersonId, defaultTo, loading };
};
diff --git a/packages/twenty-front/src/modules/activities/emails/recipients/hooks/useEmailRecipientSuggestions.ts b/packages/twenty-front/src/modules/activities/emails/recipients/hooks/useEmailRecipientSuggestions.ts
index 9403dc7d413..48004df9319 100644
--- a/packages/twenty-front/src/modules/activities/emails/recipients/hooks/useEmailRecipientSuggestions.ts
+++ b/packages/twenty-front/src/modules/activities/emails/recipients/hooks/useEmailRecipientSuggestions.ts
@@ -6,6 +6,7 @@ import { isDefined } from 'twenty-shared/utils';
import { EMAIL_RECIPIENT_MEMBER_SUGGESTIONS_LIMIT } from '@/activities/emails/recipients/constants/EmailRecipientMemberSuggestionsLimit';
import { EMAIL_RECIPIENT_PEOPLE_SUGGESTIONS_LIMIT } from '@/activities/emails/recipients/constants/EmailRecipientPeopleSuggestionsLimit';
import { type EmailComposerContextRecord } from '@/activities/emails/recipients/types/EmailComposerContextRecord';
+import { type EmailRecipient } from '@/activities/emails/recipients/types/EmailRecipient';
import { type EmailRecipientPerson } from '@/activities/emails/recipients/types/EmailRecipientPerson';
import { getEmailRecipientKey } from '@/activities/emails/recipients/utils/getEmailRecipientKey';
import { getEmailRecipientPersonFromRecord } from '@/activities/emails/recipients/utils/getEmailRecipientPersonFromRecord';
@@ -18,7 +19,7 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
export type EmailRecipientSuggestion = {
suggestionId: string;
- recipient: { address: string; displayName?: string };
+ recipient: EmailRecipient;
label: string;
secondaryText: string;
avatarUrl: string | null;
@@ -38,6 +39,7 @@ const getSuggestion = ({
secondaryText,
avatarUrl,
avatarColorSeed,
+ personId,
}: {
suggestionId: string;
fullName: string;
@@ -45,11 +47,13 @@ const getSuggestion = ({
secondaryText: string;
avatarUrl: string | null;
avatarColorSeed: string;
+ personId?: string;
}): EmailRecipientSuggestion => ({
suggestionId,
recipient: {
address,
displayName: isNonEmptyString(fullName) ? fullName : undefined,
+ personId,
},
label: isNonEmptyString(fullName) ? fullName : address,
secondaryText,
@@ -67,6 +71,7 @@ const getPersonSuggestion = (
secondaryText: person.primaryEmail,
avatarUrl: person.avatarUrl,
avatarColorSeed: person.id,
+ personId: person.id,
});
export const useEmailRecipientSuggestions = ({
diff --git a/packages/twenty-front/src/modules/activities/emails/recipients/types/EmailRecipient.ts b/packages/twenty-front/src/modules/activities/emails/recipients/types/EmailRecipient.ts
index 10369a652ed..beb2dcb0997 100644
--- a/packages/twenty-front/src/modules/activities/emails/recipients/types/EmailRecipient.ts
+++ b/packages/twenty-front/src/modules/activities/emails/recipients/types/EmailRecipient.ts
@@ -1,4 +1,5 @@
export type EmailRecipient = {
address: string;
displayName?: string;
+ personId?: string;
};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateFieldInput.tsx
index 3c2eb1e9df7..d4b290947cb 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateFieldInput.tsx
@@ -11,6 +11,7 @@ import {
} from '@/ui/input/components/internal/date/components/DatePicker';
import { DatePickerInput } from '@/ui/input/components/internal/date/components/DatePickerInput';
import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUserTimezone';
+import { type FormFieldInputVariant } from '@/ui/input/types/FormFieldInputVariant';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { OverlayContainer } from '@/ui/layout/overlay/components/OverlayContainer';
@@ -77,6 +78,7 @@ type FormDateFieldInputProps = {
placeholder?: string;
VariablePicker?: VariablePickerComponent;
readonly?: boolean;
+ variant?: FormFieldInputVariant;
};
export const FormDateFieldInput = ({
@@ -85,6 +87,7 @@ export const FormDateFieldInput = ({
onChange,
VariablePicker,
readonly,
+ variant = 'default',
}: FormDateFieldInputProps) => {
const instanceId = useId();
@@ -272,6 +275,7 @@ export const FormDateFieldInput = ({
ref={refs.setReference}
formFieldInputInstanceId={instanceId}
hasRightElement={isDefined(VariablePicker) && !readonly}
+ variant={variant}
>
{draftValue.type === 'static' ? (
<StyledDateInputTextContainer
@@ -282,6 +286,7 @@ export const FormDateFieldInput = ({
date={plainDateValue}
onChange={handleInputChange}
readonly={readonly}
+ variant={variant}
/>
</StyledDateInputTextContainer>
) : (
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateTimeFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateTimeFieldInput.tsx
index 3fcce1760ff..c32d1ad8447 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateTimeFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateTimeFieldInput.tsx
@@ -12,6 +12,7 @@ import {
} from '@/ui/input/components/internal/date/components/DateTimePicker';
import { DateTimePickerInput } from '@/ui/input/components/internal/date/components/DateTimePickerInput';
import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUserTimezone';
+import { type FormFieldInputVariant } from '@/ui/input/types/FormFieldInputVariant';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { OverlayContainer } from '@/ui/layout/overlay/components/OverlayContainer';
@@ -72,6 +73,7 @@ type FormDateTimeFieldInputProps = {
VariablePicker?: VariablePickerComponent;
readonly?: boolean;
timeZone?: string;
+ variant?: FormFieldInputVariant;
};
export const FormDateTimeFieldInput = ({
@@ -81,6 +83,7 @@ export const FormDateTimeFieldInput = ({
VariablePicker,
readonly,
timeZone,
+ variant = 'default',
}: FormDateTimeFieldInputProps) => {
const instanceId = useId();
@@ -267,6 +270,7 @@ export const FormDateTimeFieldInput = ({
ref={refs.setReference}
formFieldInputInstanceId={instanceId}
hasRightElement={isDefined(VariablePicker) && !readonly}
+ variant={variant}
>
{draftValue.type === 'static' ? (
<StyledDateInputTextContainer
@@ -279,6 +283,7 @@ export const FormDateTimeFieldInput = ({
onFocus={handleOpenPicker}
readonly={readonly}
timeZone={timeZone}
+ variant={variant}
/>
</StyledDateInputTextContainer>
) : (
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormFieldInputInnerContainer.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormFieldInputInnerContainer.tsx
index 799b64d44ce..d57a58479a1 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormFieldInputInnerContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormFieldInputInnerContainer.tsx
@@ -1,3 +1,4 @@
+import { type FormFieldInputVariant } from '@/ui/input/types/FormFieldInputVariant';
import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack';
import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById';
import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';
@@ -12,24 +13,45 @@ type FormFieldInputInnerContainerProps = {
readonly?: boolean;
preventFocusStackUpdate?: boolean;
formFieldInputInstanceId: string;
+ variant?: FormFieldInputVariant;
};
const StyledFormFieldInputInnerContainer = styled.div<
- Omit<FormFieldInputInnerContainerProps, 'formFieldInputInstanceId'>
+ Omit<FormFieldInputInnerContainerProps, 'formFieldInputInstanceId'> & {
+ $variant: FormFieldInputVariant;
+ }
>`
align-items: ${({ multiline }) => (multiline ? 'flex-start' : 'center')};
- background-color: ${themeCssVariables.background.transparent.lighter};
- border: 1px solid ${themeCssVariables.border.color.medium};
- border-bottom-left-radius: ${themeCssVariables.border.radius.md};
- border-bottom-right-radius: ${({ multiline, hasRightElement }) =>
- multiline || !hasRightElement ? themeCssVariables.border.radius.md : '0'};
- border-right: ${({ multiline, hasRightElement }) =>
- multiline || !hasRightElement
- ? `1px solid ${themeCssVariables.border.color.medium}`
- : 'none'};
- border-top-left-radius: ${themeCssVariables.border.radius.md};
- border-top-right-radius: ${({ multiline, hasRightElement }) =>
- multiline || !hasRightElement ? themeCssVariables.border.radius.md : '0'};
+ background-color: ${({ $variant }) =>
+ $variant === 'transparent'
+ ? 'transparent'
+ : themeCssVariables.background.transparent.lighter};
+ border: ${({ $variant }) =>
+ $variant === 'transparent'
+ ? 'none'
+ : `1px solid ${themeCssVariables.border.color.medium}`};
+ border-bottom-left-radius: ${({ $variant }) =>
+ $variant === 'transparent' ? '0' : themeCssVariables.border.radius.md};
+ border-bottom-right-radius: ${({ multiline, hasRightElement, $variant }) =>
+ $variant === 'transparent'
+ ? '0'
+ : multiline || !hasRightElement
+ ? themeCssVariables.border.radius.md
+ : '0'};
+ border-right: ${({ multiline, hasRightElement, $variant }) =>
+ $variant === 'transparent'
+ ? 'none'
+ : multiline || !hasRightElement
+ ? `1px solid ${themeCssVariables.border.color.medium}`
+ : 'none'};
+ border-top-left-radius: ${({ $variant }) =>
+ $variant === 'transparent' ? '0' : themeCssVariables.border.radius.md};
+ border-top-right-radius: ${({ multiline, hasRightElement, $variant }) =>
+ $variant === 'transparent'
+ ? '0'
+ : multiline || !hasRightElement
+ ? themeCssVariables.border.radius.md
+ : '0'};
box-sizing: border-box;
display: flex;
justify-content: space-between;
@@ -44,10 +66,12 @@ const StyledFormFieldInputInnerContainer = styled.div<
&:hover,
&[data-open='true'] {
- background-color: ${({ hoverable }) =>
- hoverable
- ? themeCssVariables.background.transparent.light
- : themeCssVariables.background.transparent.lighter};
+ background-color: ${({ hoverable, $variant }) =>
+ $variant === 'transparent'
+ ? 'transparent'
+ : hoverable
+ ? themeCssVariables.background.transparent.light
+ : themeCssVariables.background.transparent.lighter};
}
`;
@@ -65,6 +89,7 @@ export const FormFieldInputInnerContainer = forwardRef(
preventFocusStackUpdate = false,
onClick,
formFieldInputInstanceId,
+ variant = 'default',
}: HTMLAttributes<HTMLDivElement> & FormFieldInputInnerContainerProps,
ref: Ref<HTMLDivElement>,
) => {
@@ -107,6 +132,7 @@ export const FormFieldInputInnerContainer = forwardRef(
hoverable={hoverable}
multiline={multiline}
readonly={readonly}
+ $variant={variant}
onFocus={handleFocus}
onBlur={handleBlur}
onClick={onClick}
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/calendar/components/WidgetActionCalendarEventCreate.tsx b/packages/twenty-front/src/modules/page-layout/widgets/calendar/components/WidgetActionCalendarEventCreate.tsx
new file mode 100644
index 00000000000..d9ad8f7a47a
--- /dev/null
+++ b/packages/twenty-front/src/modules/page-layout/widgets/calendar/components/WidgetActionCalendarEventCreate.tsx
@@ -0,0 +1,47 @@
+import { useComposeCalendarEventForTargetRecord } from '@/activities/calendar/hooks/useComposeCalendarEventForTargetRecord';
+import { WidgetCardHeaderActionButton } from '@/page-layout/widgets/widget-card/components/WidgetCardHeaderActionButton';
+import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
+import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';
+import { t } from '@lingui/core/macro';
+import { CoreObjectNameSingular } from 'twenty-shared/types';
+import { IconPlus } from 'twenty-ui/icon';
+import { PermissionFlagType } from '~/generated-metadata/graphql';
+
+export const WidgetActionCalendarEventCreate = () => {
+ const targetRecord = useTargetRecord();
+ const { openComposer, disabled, loading } =
+ useComposeCalendarEventForTargetRecord();
+ const hasCreateCalendarEventPermission = useHasPermissionFlag(
+ PermissionFlagType.CREATE_CALENDAR_EVENT_TOOL,
+ );
+
+ if (!hasCreateCalendarEventPermission) {
+ return null;
+ }
+
+ const disabledLabel = (() => {
+ if (!disabled || loading) {
+ return t`Create event`;
+ }
+
+ switch (targetRecord.targetObjectNameSingular) {
+ case CoreObjectNameSingular.Person:
+ return t`Add an email to this person first`;
+ case CoreObjectNameSingular.Company:
+ return t`Add a person with an email to this company first`;
+ case CoreObjectNameSingular.Opportunity:
+ return t`Add an email to the point of contact first`;
+ default:
+ return t`Calendar events cannot be linked to this record type`;
+ }
+ })();
+
+ return (
+ <WidgetCardHeaderActionButton
+ Icon={IconPlus}
+ label={disabledLabel}
+ onClick={openComposer}
+ disabled={disabled}
+ />
+ );
+};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/constants/WidgetHeaderActionComponentByWidgetType.ts b/packages/twenty-front/src/modules/page-layout/widgets/constants/WidgetHeaderActionComponentByWidgetType.ts
index f3238b93045..3c3c73109be 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/constants/WidgetHeaderActionComponentByWidgetType.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/constants/WidgetHeaderActionComponentByWidgetType.ts
@@ -1,5 +1,6 @@
import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
import { WidgetFieldActions } from '@/page-layout/widgets/components/WidgetFieldActions';
+import { WidgetActionCalendarEventCreate } from '@/page-layout/widgets/calendar/components/WidgetActionCalendarEventCreate';
import { WidgetActionEmailCompose } from '@/page-layout/widgets/emails/components/WidgetActionEmailCompose';
import { WidgetActionFileAttach } from '@/page-layout/widgets/files/components/WidgetActionFileAttach';
import { WidgetActionNoteCreate } from '@/page-layout/widgets/notes/components/WidgetActionNoteCreate';
@@ -16,6 +17,7 @@ export const WIDGET_HEADER_ACTION_COMPONENT_BY_WIDGET_TYPE: Partial<
Record<WidgetType, ComponentType<WidgetHeaderActionComponentProps>>
> = {
[WidgetType.FIELD]: WidgetFieldActions,
+ [WidgetType.CALENDAR]: WidgetActionCalendarEventCreate,
[WidgetType.EMAILS]: WidgetActionEmailCompose,
[WidgetType.TASKS]: WidgetActionTaskCreate,
[WidgetType.NOTES]: WidgetActionNoteCreate,
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/constants/WidgetTypesWithAlwaysVisibleSoloHeader.ts b/packages/twenty-front/src/modules/page-layout/widgets/constants/WidgetTypesWithAlwaysVisibleSoloHeader.ts
index f7d0c66d61d..53e5563cdcc 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/constants/WidgetTypesWithAlwaysVisibleSoloHeader.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/constants/WidgetTypesWithAlwaysVisibleSoloHeader.ts
@@ -1,6 +1,7 @@
import { WidgetType } from '~/generated-metadata/graphql';
export const WIDGET_TYPES_WITH_ALWAYS_VISIBLE_SOLO_HEADER: WidgetType[] = [
+ WidgetType.CALENDAR,
WidgetType.EMAILS,
WidgetType.TASKS,
WidgetType.NOTES,
diff --git a/packages/twenty-front/src/modules/side-panel/constants/SidePanelPagesConfig.tsx b/packages/twenty-front/src/modules/side-panel/constants/SidePanelPagesConfig.tsx
index 2e58a68efcf..89575cbac6b 100644
--- a/packages/twenty-front/src/modules/side-panel/constants/SidePanelPagesConfig.tsx
+++ b/packages/twenty-front/src/modules/side-panel/constants/SidePanelPagesConfig.tsx
@@ -6,6 +6,7 @@ import { SidePanelNewSidebarItemPage } from '@/navigation-menu-item/edit/side-pa
import { SidePanelEmailBlockSettingsPage } from '@/side-panel/pages/email-block-settings/components/SidePanelEmailBlockSettingsPage';
import { SidePanelAskAiPage } from '@/side-panel/pages/ask-ai/components/SidePanelAskAiPage';
import { SidePanelComposeEmailPage } from '@/side-panel/pages/compose-email/components/SidePanelComposeEmailPage';
+import { SidePanelComposeCalendarEventPage } from '@/side-panel/pages/compose-calendar-event/components/SidePanelComposeCalendarEventPage';
import { SidePanelSendCampaignTestPage } from '@/side-panel/pages/send-campaign-test/components/SidePanelSendCampaignTestPage';
import { SidePanelFrontComponentPage } from '@/side-panel/pages/front-component/components/SidePanelFrontComponentPage';
import { SidePanelDashboardChartSettings } from '@/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardChartSettings';
@@ -88,6 +89,10 @@ export const SIDE_PANEL_PAGES_CONFIG = new Map<SidePanelPages, React.ReactNode>(
],
[SidePanelPages.NavigationMenuAddItem, <SidePanelNewSidebarItemPage />],
[SidePanelPages.CommandMenuEdit, <SidePanelCommandMenuItemEditPage />],
+ [
+ SidePanelPages.ComposeCalendarEvent,
+ <SidePanelComposeCalendarEventPage />,
+ ],
[SidePanelPages.ComposeEmail, <SidePanelComposeEmailPage />],
[SidePanelPages.SendCampaignTest, <SidePanelSendCampaignTestPage />],
[SidePanelPages.EmailBlockSettings, <SidePanelEmailBlockSettingsPage />],
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useOpenComposeCalendarEventInSidePanel.ts b/packages/twenty-front/src/modules/side-panel/hooks/useOpenComposeCalendarEventInSidePanel.ts
new file mode 100644
index 00000000000..f2d2b11c48b
--- /dev/null
+++ b/packages/twenty-front/src/modules/side-panel/hooks/useOpenComposeCalendarEventInSidePanel.ts
@@ -0,0 +1,37 @@
+import { type CalendarEventComposerInitialValues } from '@/activities/calendar/types/CalendarEventComposerInitialValues';
+import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
+import { composeCalendarEventInitialValuesComponentState } from '@/side-panel/pages/compose-calendar-event/states/composeCalendarEventInitialValuesComponentState';
+import { t } from '@lingui/core/macro';
+import { useStore } from 'jotai';
+import { useCallback } from 'react';
+import { SidePanelPages } from 'twenty-shared/types';
+import { IconCalendarEvent } from 'twenty-ui/icon';
+import { v4 } from 'uuid';
+
+export const useOpenComposeCalendarEventInSidePanel = () => {
+ const store = useStore();
+ const { navigateSidePanelMenu } = useSidePanelMenu();
+
+ const openComposeCalendarEventInSidePanel = useCallback(
+ (initialValues: CalendarEventComposerInitialValues) => {
+ const pageId = v4();
+
+ store.set(
+ composeCalendarEventInitialValuesComponentState.atomFamily({
+ instanceId: pageId,
+ }),
+ initialValues,
+ );
+
+ navigateSidePanelMenu({
+ page: SidePanelPages.ComposeCalendarEvent,
+ pageTitle: t`New calendar event`,
+ pageIcon: IconCalendarEvent,
+ pageId,
+ });
+ },
+ [navigateSidePanelMenu, store],
+ );
+
+ return { openComposeCalendarEventInSidePanel };
+};
diff --git a/packages/twenty-front/src/modules/side-panel/pages/compose-calendar-event/components/SidePanelComposeCalendarEventPage.tsx b/packages/twenty-front/src/modules/side-panel/pages/compose-calendar-event/components/SidePanelComposeCalendarEventPage.tsx
new file mode 100644
index 00000000000..4c4fe221765
--- /dev/null
+++ b/packages/twenty-front/src/modules/side-panel/pages/compose-calendar-event/components/SidePanelComposeCalendarEventPage.tsx
@@ -0,0 +1,116 @@
+import { CalendarEventComposerFields } from '@/activities/calendar/components/CalendarEventComposerFields';
+import { useCalendarEventComposer } from '@/activities/calendar/hooks/useCalendarEventComposer';
+import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth';
+import { SIDE_PANEL_FOCUS_ID } from '@/side-panel/constants/SidePanelFocusId';
+import { useSidePanelHistory } from '@/side-panel/hooks/useSidePanelHistory';
+import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
+import { composeCalendarEventInitialValuesComponentState } from '@/side-panel/pages/compose-calendar-event/states/composeCalendarEventInitialValuesComponentState';
+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
+import { SidePanelFooter } from '@/ui/layout/side-panel/components/SidePanelFooter';
+import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';
+import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
+import { styled } from '@linaria/react';
+import { t } from '@lingui/core/macro';
+import { ConnectedAccountProvider, SettingsPath } from 'twenty-shared/types';
+import { isDefined } from 'twenty-shared/utils';
+import { IconCalendarEvent, IconTrash } from 'twenty-ui/icon';
+import { Button, IconButton } from 'twenty-ui/input';
+import { getOsControlSymbol } from 'twenty-ui/utilities';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
+
+const StyledContainer = styled.div`
+ display: flex;
+ flex-direction: column;
+ height: 100%;
+`;
+
+export const SidePanelComposeCalendarEventPage = () => {
+ const composeCalendarEventInitialValues = useAtomComponentStateValue(
+ composeCalendarEventInitialValuesComponentState,
+ );
+ const { goBackFromSidePanel } = useSidePanelHistory();
+ const { closeSidePanelMenu } = useSidePanelMenu();
+ const navigateSettings = useNavigateSettings();
+ const { triggerApisOAuth } = useTriggerApisOAuth();
+ const { enqueueErrorSnackBar } = useSnackBar();
+
+ const composerState = useCalendarEventComposer({
+ initialValues: composeCalendarEventInitialValues,
+ onCreated: goBackFromSidePanel,
+ });
+
+ useHotkeysOnFocusedElement({
+ keys: ['ctrl+Enter,meta+Enter'],
+ callback: composerState.handleCreate,
+ focusId: SIDE_PANEL_FOCUS_ID,
+ dependencies: [composerState.handleCreate],
+ });
+
+ const handleAddAccount = () => {
+ closeSidePanelMenu();
+ navigateSettings(SettingsPath.NewAccount);
+ };
+
+ const handleReauthorize = async () => {
+ const selectedAccount = composerState.selectedAccount;
+
+ if (
+ !isDefined(selectedAccount) ||
+ selectedAccount.provider === ConnectedAccountProvider.IMAP_SMTP_CALDAV
+ ) {
+ return;
+ }
+
+ try {
+ await triggerApisOAuth(selectedAccount.provider, {
+ redirectLocation: `${window.location.pathname}${window.location.search}${window.location.hash}`,
+ loginHint: selectedAccount.handle,
+ });
+ } catch {
+ enqueueErrorSnackBar({
+ message: t`Failed to reconnect calendar account`,
+ });
+ }
+ };
+
+ if (
+ !isDefined(composeCalendarEventInitialValues) ||
+ composerState.accountsLoading
+ ) {
+ return null;
+ }
+
+ return (
+ <StyledContainer>
+ <CalendarEventComposerFields
+ composerState={composerState}
+ contextRecord={composeCalendarEventInitialValues.contextRecord}
+ onAddAccount={handleAddAccount}
+ onReauthorize={handleReauthorize}
+ />
+ <SidePanelFooter
+ actions={[
+ <IconButton
+ key="discard"
+ size="small"
+ variant="primary"
+ Icon={IconTrash}
+ ariaLabel={t`Discard`}
+ onClick={goBackFromSidePanel}
+ />,
+ <Button
+ key="create"
+ size="small"
+ variant="primary"
+ accent="blue"
+ title={t`Create event`}
+ Icon={IconCalendarEvent}
+ hotkeys={[getOsControlSymbol(), '⏎']}
+ onClick={composerState.handleCreate}
+ disabled={!composerState.canCreate}
+ />,
+ ]}
+ />
+ </StyledContainer>
+ );
+};
diff --git a/packages/twenty-front/src/modules/side-panel/pages/compose-calendar-event/states/composeCalendarEventInitialValuesComponentState.ts b/packages/twenty-front/src/modules/side-panel/pages/compose-calendar-event/states/composeCalendarEventInitialValuesComponentState.ts
new file mode 100644
index 00000000000..dbcc8c52c6f
--- /dev/null
+++ b/packages/twenty-front/src/modules/side-panel/pages/compose-calendar-event/states/composeCalendarEventInitialValuesComponentState.ts
@@ -0,0 +1,10 @@
+import { type CalendarEventComposerInitialValues } from '@/activities/calendar/types/CalendarEventComposerInitialValues';
+import { SidePanelPageComponentInstanceContext } from '@/side-panel/states/contexts/SidePanelPageComponentInstanceContext';
+import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';
+
+export const composeCalendarEventInitialValuesComponentState =
+ createAtomComponentState<CalendarEventComposerInitialValues | null>({
+ key: 'side-panel/compose-calendar-event-initial-values',
+ defaultValue: null,
+ componentInstanceContext: SidePanelPageComponentInstanceContext,
+ });
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/__tests__/isPageLayoutSidePanelPage.test.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/__tests__/isPageLayoutSidePanelPage.test.ts
index 13362d4141a..08a56389cf8 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/__tests__/isPageLayoutSidePanelPage.test.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/__tests__/isPageLayoutSidePanelPage.test.ts
@@ -23,6 +23,7 @@ describe('isPageLayoutSidePanelPage', () => {
const nonPageLayoutPages: SidePanelPages[] = [
SidePanelPages.ViewRecord,
SidePanelPages.AskAI,
+ SidePanelPages.ComposeCalendarEvent,
SidePanelPages.ComposeEmail,
SidePanelPages.SearchRecords,
SidePanelPages.ViewFrontComponent,
diff --git a/packages/twenty-front/src/modules/ui/input/components/Select.tsx b/packages/twenty-front/src/modules/ui/input/components/Select.tsx
index 1a267403d7b..723526a1d78 100644
--- a/packages/twenty-front/src/modules/ui/input/components/Select.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/Select.tsx
@@ -8,6 +8,7 @@ import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownM
import { type SelectValue } from '@/ui/input/components/internal/select/types';
import { SelectControl } from '@/ui/input/components/SelectControl';
+import { type FormFieldInputVariant } from '@/ui/input/types/FormFieldInputVariant';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
@@ -56,6 +57,7 @@ export type SelectProps<Value extends SelectValue> = {
hasRightElement?: boolean;
showContextualTextInControl?: boolean;
isDropdownInModal?: boolean;
+ variant?: FormFieldInputVariant;
};
const StyledContainer = styled.div<{ fullWidth?: boolean }>`
@@ -98,6 +100,7 @@ export const Select = <Value extends SelectValue>({
hasRightElement,
showContextualTextInControl = true,
isDropdownInModal = false,
+ variant = 'default',
}: SelectProps<Value>) => {
const selectContainerRef = useRef<HTMLDivElement>(null);
@@ -203,6 +206,7 @@ export const Select = <Value extends SelectValue>({
isDisabled={isDisabled}
selectSizeVariant={selectSizeVariant}
hasRightElement={hasRightElement}
+ variant={variant}
/>
) : (
<Dropdown
@@ -217,6 +221,7 @@ export const Select = <Value extends SelectValue>({
isDisabled={isDisabled}
selectSizeVariant={selectSizeVariant}
hasRightElement={hasRightElement}
+ variant={variant}
/>
}
dropdownComponents={
diff --git a/packages/twenty-front/src/modules/ui/input/components/SelectControl.tsx b/packages/twenty-front/src/modules/ui/input/components/SelectControl.tsx
index 0730d865647..3515f5a087f 100644
--- a/packages/twenty-front/src/modules/ui/input/components/SelectControl.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/SelectControl.tsx
@@ -1,4 +1,5 @@
import { type SelectSizeVariant } from '@/ui/input/components/Select';
+import { type FormFieldInputVariant } from '@/ui/input/types/FormFieldInputVariant';
import { styled } from '@linaria/react';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
@@ -17,20 +18,39 @@ export const StyledControlContainer = styled.div<{
selectSizeVariant?: SelectSizeVariant;
textAccent: SelectControlTextAccent;
hasRightElement?: boolean;
+ $variant?: FormFieldInputVariant;
}>`
align-items: center;
- background-color: ${themeCssVariables.background.transparent.lighter};
- border: 1px solid ${themeCssVariables.border.color.medium};
- border-bottom-left-radius: ${themeCssVariables.border.radius.md};
- border-bottom-right-radius: ${({ hasRightElement }) =>
- hasRightElement ? '0' : themeCssVariables.border.radius.md};
- border-right: ${({ hasRightElement }) =>
- hasRightElement
+ background-color: ${({ $variant }) =>
+ $variant === 'transparent'
+ ? 'transparent'
+ : themeCssVariables.background.transparent.lighter};
+ border: ${({ $variant }) =>
+ $variant === 'transparent'
? 'none'
: `1px solid ${themeCssVariables.border.color.medium}`};
- border-top-left-radius: ${themeCssVariables.border.radius.md};
- border-top-right-radius: ${({ hasRightElement }) =>
- hasRightElement ? '0' : themeCssVariables.border.radius.md};
+ border-bottom-left-radius: ${({ $variant }) =>
+ $variant === 'transparent' ? '0' : themeCssVariables.border.radius.md};
+ border-bottom-right-radius: ${({ hasRightElement, $variant }) =>
+ $variant === 'transparent'
+ ? '0'
+ : hasRightElement
+ ? '0'
+ : themeCssVariables.border.radius.md};
+ border-right: ${({ hasRightElement, $variant }) =>
+ $variant === 'transparent'
+ ? 'none'
+ : hasRightElement
+ ? 'none'
+ : `1px solid ${themeCssVariables.border.color.medium}`};
+ border-top-left-radius: ${({ $variant }) =>
+ $variant === 'transparent' ? '0' : themeCssVariables.border.radius.md};
+ border-top-right-radius: ${({ hasRightElement, $variant }) =>
+ $variant === 'transparent'
+ ? '0'
+ : hasRightElement
+ ? '0'
+ : themeCssVariables.border.radius.md};
box-sizing: border-box;
color: ${({ disabled, textAccent }) =>
disabled
@@ -44,13 +64,16 @@ export const StyledControlContainer = styled.div<{
gap: ${themeCssVariables.spacing[1]};
grid-template-columns: ${({ hasIcon }) =>
hasIcon ? 'auto 1fr auto' : '1fr auto'};
- height: ${({ selectSizeVariant }) =>
- selectSizeVariant === 'small'
+ height: ${({ selectSizeVariant, $variant }) =>
+ $variant === 'transparent'
? themeCssVariables.spacing[6]
- : themeCssVariables.spacing[8]};
+ : selectSizeVariant === 'small'
+ ? themeCssVariables.spacing[6]
+ : themeCssVariables.spacing[8]};
max-width: 100%;
- padding: 0 ${themeCssVariables.spacing[2]};
+ padding: ${({ $variant }) =>
+ $variant === 'transparent' ? '0' : `0 ${themeCssVariables.spacing[2]}`};
text-align: left;
`;
@@ -70,6 +93,7 @@ export type SelectControlProps = {
selectSizeVariant?: SelectSizeVariant;
textAccent?: SelectControlTextAccent;
hasRightElement?: boolean;
+ variant?: FormFieldInputVariant;
};
export const SelectControl = ({
@@ -78,6 +102,7 @@ export const SelectControl = ({
selectSizeVariant,
textAccent = 'default',
hasRightElement,
+ variant = 'default',
}: SelectControlProps) => {
const { theme } = useContext(ThemeContext);
return (
@@ -87,6 +112,7 @@ export const SelectControl = ({
selectSizeVariant={selectSizeVariant}
textAccent={textAccent}
hasRightElement={hasRightElement}
+ $variant={variant}
title={selectedOption.fullLabel}
>
{isDefined(selectedOption?.Icon) ? (
diff --git a/packages/twenty-front/src/modules/ui/input/components/TextArea.tsx b/packages/twenty-front/src/modules/ui/input/components/TextArea.tsx
index 45ac4795ab2..ad979b08704 100644
--- a/packages/twenty-front/src/modules/ui/input/components/TextArea.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/TextArea.tsx
@@ -5,12 +5,11 @@ import TextareaAutosize from 'react-textarea-autosize';
import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack';
import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById';
import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';
+import { type FormFieldInputVariant } from '@/ui/input/types/FormFieldInputVariant';
import { isDefined } from 'twenty-shared/utils';
import { turnIntoEmptyStringIfWhitespacesOnly } from '~/utils/string/turnIntoEmptyStringIfWhitespacesOnly';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-type TextAreaVariant = 'default' | 'transparent';
-
export type TextAreaProps = {
textAreaId: string;
label?: string;
@@ -25,7 +24,7 @@ export type TextAreaProps = {
onFocus?: () => void;
onBlur?: () => void;
readOnly?: boolean;
- variant?: TextAreaVariant;
+ variant?: FormFieldInputVariant;
};
const StyledContainer = styled.div`
@@ -42,7 +41,9 @@ const StyledLabel = styled.label`
margin-bottom: ${themeCssVariables.spacing[1]};
`;
-const StyledTextAreaContainer = styled.div<{ variant: TextAreaVariant }>`
+const StyledTextAreaContainer = styled.div<{
+ variant: FormFieldInputVariant;
+}>`
> textarea {
background-color: ${({ variant }) =>
variant === 'transparent'
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePickerInput.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePickerInput.tsx
index 26304b43b83..14ffeb56376 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePickerInput.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePickerInput.tsx
@@ -9,23 +9,35 @@ import { MIN_DATE } from '@/ui/input/components/internal/date/constants/MinDate'
import { useParseDateInputStringToJSDate } from '@/ui/input/components/internal/date/hooks/useParseDateInputStringToJSDate';
import { useParsePlainDateToDateInputString } from '@/ui/input/components/internal/date/hooks/useParsePlainDateToDateInputString';
import { getDateMask } from '@/ui/input/components/internal/date/utils/getDateMask';
+import { type FormFieldInputVariant } from '@/ui/input/types/FormFieldInputVariant';
import { useParseDateInputStringToPlainDate } from '@/ui/input/components/internal/date/hooks/useParseDateInputStringToPlainDate';
import { useParseJSDateToIMaskDateInputString } from '@/ui/input/components/internal/date/hooks/useParseJSDateToIMaskDateInputString';
import { isDefined } from 'twenty-shared/utils';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-const StyledInputContainer = styled.div`
+const StyledInputContainer = styled.div<{
+ $variant: FormFieldInputVariant;
+}>`
align-items: center;
- border-bottom: 1px solid ${themeCssVariables.border.color.light};
+ border-bottom: ${({ $variant }) =>
+ $variant === 'transparent'
+ ? 'none'
+ : `1px solid ${themeCssVariables.border.color.light}`};
border-top-left-radius: ${themeCssVariables.border.radius.md};
border-top-right-radius: ${themeCssVariables.border.radius.md};
display: flex;
- height: ${themeCssVariables.spacing[8]};
+ height: ${({ $variant }) =>
+ $variant === 'transparent'
+ ? themeCssVariables.spacing[6]
+ : themeCssVariables.spacing[8]};
width: 100%;
`;
-const StyledInput = styled.input<{ hasError?: boolean }>`
+const StyledInput = styled.input<{
+ hasError?: boolean;
+ $variant: FormFieldInputVariant;
+}>`
background: transparent;
border: none;
color: ${({ hasError }) =>
@@ -33,9 +45,10 @@ const StyledInput = styled.input<{ hasError?: boolean }>`
? themeCssVariables.color.red
: themeCssVariables.font.color.primary};
font-size: ${themeCssVariables.font.size.md};
- font-weight: 500;
+ font-weight: ${({ $variant }) =>
+ $variant === 'transparent' ? themeCssVariables.font.weight.regular : 500};
outline: none;
- padding: 4px 8px 4px 8px;
+ padding: ${({ $variant }) => ($variant === 'transparent' ? '0' : '4px 8px')};
width: 100%;
`;
@@ -43,12 +56,14 @@ type DatePickerInputProps = {
onChange?: (date: string | null) => void;
date: string | null;
readonly?: boolean;
+ variant?: FormFieldInputVariant;
};
export const DatePickerInput = ({
date,
onChange,
readonly = false,
+ variant = 'default',
}: DatePickerInputProps) => {
const { dateFormat } = useDateTimeFormat();
@@ -111,8 +126,9 @@ export const DatePickerInput = ({
}, [date, internalDate, parsePlainDateToDateInputString, setValue]);
return (
- <StyledInputContainer>
+ <StyledInputContainer $variant={variant}>
<StyledInput
+ $variant={variant}
type="text"
disabled={readonly}
ref={ref as any}
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePickerInput.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePickerInput.tsx
index b62d1ee55f6..16c96436f1f 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePickerInput.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePickerInput.tsx
@@ -7,6 +7,7 @@ import { MAX_DATE } from '@/ui/input/components/internal/date/constants/MaxDate'
import { MIN_DATE } from '@/ui/input/components/internal/date/constants/MinDate';
import { getDateTimeMask } from '@/ui/input/components/internal/date/utils/getDateTimeMask';
import { getTimeBlocks } from '@/ui/input/components/internal/date/utils/getTimeBlocks';
+import { type FormFieldInputVariant } from '@/ui/input/types/FormFieldInputVariant';
import { TimeZoneAbbreviation } from '@/ui/input/components/internal/date/components/TimeZoneAbbreviation';
import { useGetShiftedDateToCustomTimeZone } from '@/ui/input/components/internal/date/hooks/useGetShiftedDateToCustomTimeZone';
@@ -20,24 +21,34 @@ import { isDefined } from 'twenty-shared/utils';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { isDifferentZonedDateTime } from '~/utils/dates/isDifferentZonedDateTime';
-const StyledInputContainer = styled.div`
+const StyledInputContainer = styled.div<{
+ $variant: FormFieldInputVariant;
+}>`
align-items: center;
border-top-left-radius: ${themeCssVariables.border.radius.md};
border-top-right-radius: ${themeCssVariables.border.radius.md};
display: flex;
- height: ${themeCssVariables.spacing[8]};
+ height: ${({ $variant }) =>
+ $variant === 'transparent'
+ ? themeCssVariables.spacing[6]
+ : themeCssVariables.spacing[8]};
width: 100%;
`;
-const StyledInput = styled.input<{ hasError?: boolean }>`
+const StyledInput = styled.input<{
+ hasError?: boolean;
+ $variant: FormFieldInputVariant;
+}>`
background: transparent;
border: none;
color: ${themeCssVariables.font.color.primary};
font-size: ${themeCssVariables.font.size.md};
- font-weight: 500;
+ font-weight: ${({ $variant }) =>
+ $variant === 'transparent' ? themeCssVariables.font.weight.regular : 500};
outline: none;
- padding-left: ${themeCssVariables.spacing[2]};
+ padding-left: ${({ $variant }) =>
+ $variant === 'transparent' ? '0' : themeCssVariables.spacing[2]};
width: 140px;
`;
@@ -47,6 +58,7 @@ type DateTimePickerInputProps = {
onFocus?: () => void;
readonly?: boolean;
timeZone?: string;
+ variant?: FormFieldInputVariant;
};
export const DateTimePickerInput = ({
@@ -55,6 +67,7 @@ export const DateTimePickerInput = ({
onFocus,
readonly,
timeZone,
+ variant = 'default',
}: DateTimePickerInputProps) => {
const [internalDate, setInternalDate] = useState(date);
@@ -168,8 +181,9 @@ export const DateTimePickerInput = ({
internalDate?.toInstant() ?? Temporal.Now.instant();
return (
- <StyledInputContainer>
+ <StyledInputContainer $variant={variant}>
<StyledInput
+ $variant={variant}
disabled={shouldDisplayReadOnly}
type="text"
ref={ref as any}
diff --git a/packages/twenty-front/src/modules/ui/input/types/FormFieldInputVariant.ts b/packages/twenty-front/src/modules/ui/input/types/FormFieldInputVariant.ts
new file mode 100644
index 00000000000..3e34db1a5f4
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/input/types/FormFieldInputVariant.ts
@@ -0,0 +1 @@
+export type FormFieldInputVariant = 'default' | 'transparent';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateCalendarEvent.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateCalendarEvent.tsx
index a41402e7983..c148bd2bf30 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateCalendarEvent.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateCalendarEvent.tsx
@@ -1,4 +1,5 @@
import { getMissingCreateCalendarEventScopes } from '@/accounts/utils/hasMissingCreateCalendarEventScopes';
+import { isCalendarCreationEnabledForAccount } from '@/activities/calendar/utils/isCalendarCreationEnabledForAccount';
import { FormBooleanFieldToggleInput } from '@/object-record/record-field/ui/form-types/components/FormBooleanFieldToggleInput';
import { FormDateTimeFieldInput } from '@/object-record/record-field/ui/form-types/components/FormDateTimeFieldInput';
import { FormMultiTextFieldInput } from '@/object-record/record-field/ui/form-types/components/FormMultiTextFieldInput';
@@ -17,18 +18,13 @@ import { useCalendarEventForm } from '@/workflow/workflow-steps/workflow-actions
import { WorkflowVariablePicker } from '@/workflow/workflow-variables/components/WorkflowVariablePicker';
import { t } from '@lingui/core/macro';
import { useEffect } from 'react';
-import { ConnectedAccountProvider, SettingsPath } from 'twenty-shared/types';
+import { SettingsPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { Callout } from 'twenty-ui/feedback';
import { type SelectOption } from 'twenty-ui/input';
import { IconPlus } from 'twenty-ui/icon';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
-const CALENDAR_CAPABLE_PROVIDERS = [
- ConnectedAccountProvider.GOOGLE,
- ConnectedAccountProvider.MICROSOFT,
-];
-
type WorkflowEditActionCreateCalendarEventProps = {
action: WorkflowCreateCalendarEventAction;
actionOptions:
@@ -65,13 +61,7 @@ export const WorkflowEditActionCreateCalendarEvent = ({
const redirectUrl = `/object/workflow/${workflowVisualizerWorkflowId}`;
const connectedAccountOptions: SelectOption<string>[] = myAccounts
- .filter((account) => {
- if (account.provider === ConnectedAccountProvider.IMAP_SMTP_CALDAV) {
- return isDefined(account.connectionParameters?.CALDAV);
- }
-
- return CALENDAR_CAPABLE_PROVIDERS.includes(account.provider);
- })
+ .filter(isCalendarCreationEnabledForAccount)
.map((account) => ({ label: account.handle, value: account.id }));
const selectedAccount = myAccounts.find(
diff --git a/packages/twenty-shared/src/types/SidePanelPages.ts b/packages/twenty-shared/src/types/SidePanelPages.ts
index b1f0dca190a..c8f8a98b91e 100644
--- a/packages/twenty-shared/src/types/SidePanelPages.ts
+++ b/packages/twenty-shared/src/types/SidePanelPages.ts
@@ -27,6 +27,7 @@ export enum SidePanelPages {
CommandMenuEdit = 'command-menu-edit',
PageLayoutRecordPageWidgetTypeSelect = 'page-layout-record-page-widget-type-select',
ComposeEmail = 'compose-email',
+ ComposeCalendarEvent = 'compose-calendar-event',
SendCampaignTest = 'send-campaign-test',
EmailBlockSettings = 'email-block-settings',
SettingsMetadataTranslations = 'settings-metadata-translations',