The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Simplify calendar week day views (#24868)
Weiko06e7b99a3f81
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarDateFieldsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarDateFieldsContent.tsxdeleted file mode 100644index d92683672be..00000000000--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarDateFieldsContent.tsx+++ /dev/null@@ -1,103 +0,0 @@-import { OBJECT_OPTIONS_DROPDOWN_ID } from '@/object-record/object-options-dropdown/constants/ObjectOptionsDropdownId';-import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';-import { recordIndexCalendarEndFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarEndFieldMetadataIdComponentState';-import { recordIndexCalendarFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarFieldMetadataIdComponentState';-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';-import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';-import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';-import { useLingui } from '@lingui/react/macro';-import { isDefined } from 'twenty-shared/utils';-import { IconCalendar, IconChevronLeft } from 'twenty-ui/icon';-import { MenuItem } from 'twenty-ui/navigation';--export const ObjectOptionsDropdownCalendarDateFieldsContent = () => {- const { t } = useLingui();-- const { objectMetadataItem, resetContent, onContentChange } =- useObjectOptionsDropdown();-- const { currentView } = useGetCurrentViewOnly();- const recordIndexCalendarFieldMetadataId = useAtomComponentStateValue(- recordIndexCalendarFieldMetadataIdComponentState,- );- const recordIndexCalendarEndFieldMetadataId = useAtomComponentStateValue(- recordIndexCalendarEndFieldMetadataIdComponentState,- );-- const selectedItemId = useAtomComponentStateValue(- selectedItemIdComponentState,- OBJECT_OPTIONS_DROPDOWN_ID,- );-- if (!isDefined(currentView)) {- return null;- }-- const calendarFieldMetadata = objectMetadataItem.fields.find(- (field) => field.id === recordIndexCalendarFieldMetadataId,- );-- const calendarEndFieldMetadata = objectMetadataItem.fields.find(- (field) => field.id === recordIndexCalendarEndFieldMetadataId,- );-- const selectableItemIdArray = ['CalendarDateField', 'CalendarEndDateField'];-- return (- <DropdownContent widthInPixels={GenericDropdownContentWidth.Large}>- <DropdownMenuHeader- StartComponent={- <DropdownMenuHeaderLeftComponent- onClick={() => resetContent()}- Icon={IconChevronLeft}- />- }- >- {t`Date fields`}- </DropdownMenuHeader>- <DropdownMenuItemsContainer scrollable={false}>- <SelectableList- selectableListInstanceId={OBJECT_OPTIONS_DROPDOWN_ID}- focusId={OBJECT_OPTIONS_DROPDOWN_ID}- selectableItemIdArray={selectableItemIdArray}- >- <SelectableListItem- itemId="CalendarDateField"- onEnter={() => onContentChange('calendarFields')}- >- <MenuItem- focused={selectedItemId === 'CalendarDateField'}- onClick={() => onContentChange('calendarFields')}- LeftIcon={IconCalendar}- text={t`Date field`}- contextualText={calendarFieldMetadata?.label}- contextualTextPosition="right"- hasSubMenu- />- </SelectableListItem>- <SelectableListItem- itemId="CalendarEndDateField"- onEnter={() => onContentChange('calendarEndFields')}- >- <MenuItem- focused={selectedItemId === 'CalendarEndDateField'}- onClick={() => onContentChange('calendarEndFields')}- LeftIcon={IconCalendar}- text={t`End date field`}- contextualText={calendarEndFieldMetadata?.label ?? t`None`}- contextualTextPosition="right"- hasSubMenu- />- </SelectableListItem>- </SelectableList>- </DropdownMenuItemsContainer>- </DropdownContent>- );-};diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarEndFieldsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarEndFieldsContent.tsxdeleted file mode 100644index 07750a9a193..00000000000--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarEndFieldsContent.tsx+++ /dev/null@@ -1,133 +0,0 @@-import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';-import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';-import { recordIndexCalendarEndFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarEndFieldMetadataIdComponentState';-import { recordIndexCalendarFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarFieldMetadataIdComponentState';-import { groupCalendarFieldMetadataItemsByType } from '@/object-record/record-calendar/utils/groupCalendarFieldMetadataItemsByType';-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';-import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';-import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';-import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';-import { DropdownMenuSectionLabel } from '@/ui/layout/dropdown/components/DropdownMenuSectionLabel';-import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';-import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useUpdateCurrentView } from '@/views/hooks/useUpdateCurrentView';-import { useGetAvailableFieldsForCalendar } from '@/views/view-picker/hooks/useGetAvailableFieldsForCalendar';-import { getAvailableCalendarEndFieldMetadataItems } from '@/views/view-picker/utils/getAvailableCalendarEndFieldMetadataItems';-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';-import { useLingui } from '@lingui/react/macro';-import { Fragment, useState } from 'react';-import { isDefined } from 'twenty-shared/utils';-import { IconChevronLeft, useIcons } from 'twenty-ui/icon';-import { MenuItemSelect } from 'twenty-ui/navigation';-import { FeatureFlagKey } from '~/generated-metadata/graphql';--export const ObjectOptionsDropdownCalendarEndFieldsContent = () => {- const { t } = useLingui();- const { getIcon } = useIcons();- const [searchInput, setSearchInput] = useState('');- const isCalendarWeekViewEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED,- );-- const { onContentChange, closeDropdown } = useObjectOptionsDropdown();-- const { updateCurrentView } = useUpdateCurrentView();- const { availableFieldsForCalendar } = useGetAvailableFieldsForCalendar();-- const recordIndexCalendarFieldMetadataId = useAtomComponentStateValue(- recordIndexCalendarFieldMetadataIdComponentState,- );- const [- recordIndexCalendarEndFieldMetadataId,- setRecordIndexCalendarEndFieldMetadataId,- ] = useAtomComponentState(- recordIndexCalendarEndFieldMetadataIdComponentState,- );-- const availableCalendarEndFieldMetadataItems =- getAvailableCalendarEndFieldMetadataItems({- availableFieldsForCalendar,- calendarFieldMetadataId: recordIndexCalendarFieldMetadataId,- });-- const filteredCalendarEndFields =- availableCalendarEndFieldMetadataItems.filter((field) =>- field.label.toLowerCase().includes(searchInput.toLowerCase()),- );-- const calendarEndFieldGroups = groupCalendarFieldMetadataItemsByType(- filteredCalendarEndFields,- );-- const handleCalendarEndFieldChange = async (- fieldMetadataItem: FieldMetadataItem | null,- ) => {- if (!isCalendarWeekViewEnabled) {- return;- }-- const calendarEndFieldMetadataId = fieldMetadataItem?.id ?? null;-- setRecordIndexCalendarEndFieldMetadataId(calendarEndFieldMetadataId);- try {- await updateCurrentView({ calendarEndFieldMetadataId });- } catch (error) {- setRecordIndexCalendarEndFieldMetadataId(- recordIndexCalendarEndFieldMetadataId,- );- throw error;- }- closeDropdown();- };-- if (!isCalendarWeekViewEnabled) {- return null;- }-- return (- <DropdownContent>- <DropdownMenuHeader- StartComponent={- <DropdownMenuHeaderLeftComponent- onClick={() => onContentChange('calendarDateFields')}- Icon={IconChevronLeft}- />- }- >- {t`End date field`}- </DropdownMenuHeader>- <DropdownMenuSearchInput- autoFocus- value={searchInput}- placeholder={t`Search fields`}- onChange={(event) => setSearchInput(event.target.value)}- />- <DropdownMenuSeparator />- <DropdownMenuItemsContainer>- <MenuItemSelect- selected={!isDefined(recordIndexCalendarEndFieldMetadataId)}- onClick={() => handleCalendarEndFieldChange(null)}- text={t`None`}- />- {calendarEndFieldGroups.map((group) => (- <Fragment key={group.label}>- <DropdownMenuSectionLabel label={group.label} />- {group.fields.map((fieldMetadataItem) => (- <MenuItemSelect- key={fieldMetadataItem.id}- selected={- fieldMetadataItem.id === recordIndexCalendarEndFieldMetadataId- }- onClick={() => handleCalendarEndFieldChange(fieldMetadataItem)}- LeftIcon={getIcon(fieldMetadataItem.icon)}- text={fieldMetadataItem.label}- />- ))}- </Fragment>- ))}- </DropdownMenuItemsContainer>- </DropdownContent>- );-};diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarFieldsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarFieldsContent.tsxindex e2946ff9bcf..a4c4d890d55 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarFieldsContent.tsx+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarFieldsContent.tsx@@ -1,35 +1,26 @@import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';-import { recordIndexCalendarEndFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarEndFieldMetadataIdComponentState';import { recordIndexCalendarFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarFieldMetadataIdComponentState';-import { groupCalendarFieldMetadataItemsByType } from '@/object-record/record-calendar/utils/groupCalendarFieldMetadataItemsByType';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';-import { DropdownMenuSectionLabel } from '@/ui/layout/dropdown/components/DropdownMenuSectionLabel';import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';import { useUpdateCurrentView } from '@/views/hooks/useUpdateCurrentView';import { useGetAvailableFieldsForCalendar } from '@/views/view-picker/hooks/useGetAvailableFieldsForCalendar';-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';import { useLingui } from '@lingui/react/macro';-import { Fragment, useState } from 'react';-import { isDefined } from 'twenty-shared/utils';+import { useState } from 'react';import { IconChevronLeft, IconSettings, useIcons } from 'twenty-ui/icon';import { MenuItem, MenuItemSelect } from 'twenty-ui/navigation';-import { FeatureFlagKey } from '~/generated-metadata/graphql';export const ObjectOptionsDropdownCalendarFieldsContent = () => {const { t } = useLingui();const { getIcon } = useIcons();const [searchInput, setSearchInput] = useState('');- const isCalendarWeekViewEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED,- );- const { objectMetadataItem, resetContent, onContentChange, closeDropdown } =+ const { objectMetadataItem, resetContent, closeDropdown } =useObjectOptionsDropdown();const { updateCurrentView } = useUpdateCurrentView();@@ -40,12 +31,6 @@ export const ObjectOptionsDropdownCalendarFieldsContent = () => {recordIndexCalendarFieldMetadataId,setRecordIndexCalendarFieldMetadataId,] = useAtomComponentState(recordIndexCalendarFieldMetadataIdComponentState);- const [- recordIndexCalendarEndFieldMetadataId,- setRecordIndexCalendarEndFieldMetadataId,- ] = useAtomComponentState(- recordIndexCalendarEndFieldMetadataIdComponentState,- );const calendarFieldMetadata = recordIndexCalendarFieldMetadataId? objectMetadataItem.fields.find(@@ -53,62 +38,22 @@ export const ObjectOptionsDropdownCalendarFieldsContent = () => {): undefined;- const calendarEndFieldMetadata = recordIndexCalendarEndFieldMetadataId- ? objectMetadataItem.fields.find(- (field) => field.id === recordIndexCalendarEndFieldMetadataId,- )- : undefined;-- const availableCalendarFields = isDefined(calendarEndFieldMetadata)- ? availableFieldsForCalendar.filter(- (field) => field.type === calendarEndFieldMetadata.type,- )- : availableFieldsForCalendar;-- const filteredCalendarFields = availableCalendarFields.filter((field) =>+ const filteredCalendarFields = availableFieldsForCalendar.filter((field) =>field.label.toLowerCase().includes(searchInput.toLowerCase()),);- const calendarFieldGroups = groupCalendarFieldMetadataItemsByType(- filteredCalendarFields,- );-- const handleBack = () => {- if (isCalendarWeekViewEnabled) {- onContentChange('calendarDateFields');- return;- }- resetContent();- };-const handleCalendarFieldChange = async (fieldMetadataItem: FieldMetadataItem,) => {- const shouldClearCalendarEndField =- isDefined(recordIndexCalendarEndFieldMetadataId) &&- (!isDefined(calendarEndFieldMetadata) ||- calendarEndFieldMetadata.id === fieldMetadataItem.id ||- calendarEndFieldMetadata.type !== fieldMetadataItem.type);-setRecordIndexCalendarFieldMetadataId(fieldMetadataItem.id);- if (shouldClearCalendarEndField) {- setRecordIndexCalendarEndFieldMetadataId(null);- }try {await updateCurrentView({calendarFieldMetadataId: fieldMetadataItem.id,- ...(shouldClearCalendarEndField- ? { calendarEndFieldMetadataId: null }- : {}),+ calendarEndFieldMetadataId: null,});} catch (error) {setRecordIndexCalendarFieldMetadataId(recordIndexCalendarFieldMetadataId);- if (shouldClearCalendarEndField) {- setRecordIndexCalendarEndFieldMetadataId(- recordIndexCalendarEndFieldMetadataId,- );- }throw error;}closeDropdown();@@ -119,7 +64,7 @@ export const ObjectOptionsDropdownCalendarFieldsContent = () => {<DropdownMenuHeaderStartComponent={<DropdownMenuHeaderLeftComponent- onClick={handleBack}+ onClick={resetContent}Icon={IconChevronLeft}/>}@@ -134,19 +79,14 @@ export const ObjectOptionsDropdownCalendarFieldsContent = () => {/><DropdownMenuSeparator /><DropdownMenuItemsContainer>- {calendarFieldGroups.map((group) => (- <Fragment key={group.label}>- <DropdownMenuSectionLabel label={group.label} />- {group.fields.map((fieldMetadataItem) => (- <MenuItemSelect- key={fieldMetadataItem.id}- selected={fieldMetadataItem.id === calendarFieldMetadata?.id}- onClick={() => handleCalendarFieldChange(fieldMetadataItem)}- LeftIcon={getIcon(fieldMetadataItem.icon)}- text={fieldMetadataItem.label}- />- ))}- </Fragment>+ {filteredCalendarFields.map((fieldMetadataItem) => (+ <MenuItemSelect+ key={fieldMetadataItem.id}+ selected={fieldMetadataItem.id === calendarFieldMetadata?.id}+ onClick={() => handleCalendarFieldChange(fieldMetadataItem)}+ LeftIcon={getIcon(fieldMetadataItem.icon)}+ text={fieldMetadataItem.label}+ />))}</DropdownMenuItemsContainer><DropdownMenuSeparator />diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarViewContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarViewContent.tsxindex 7b05116626a..0bb3d609b07 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarViewContent.tsx+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarViewContent.tsx@@ -62,11 +62,11 @@ export const ObjectOptionsDropdownCalendarViewContent = () => {];const handleCalendarViewChange = async (calendarView: ViewCalendarLayout) => {- const isTimeGridLayout =+ const isWeekOrDayLayout =calendarView === ViewCalendarLayout.DAY ||calendarView === ViewCalendarLayout.WEEK;- if (isTimeGridLayout && !isCalendarWeekViewEnabled) {+ if (isWeekOrDayLayout && !isCalendarWeekViewEnabled) {return;}diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownContent.tsxindex 324b1819b73..0f010fa7aab 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownContent.tsx+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownContent.tsx@@ -1,7 +1,5 @@import { ObjectOptionsDropdownAddRecordGroupContent } from '@/object-record/object-options-dropdown/components/ObjectOptionsDropdownAddRecordGroupContent';-import { ObjectOptionsDropdownCalendarDateFieldsContent } from '@/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarDateFieldsContent';import { ObjectOptionsDropdownCalendarFieldsContent } from '@/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarFieldsContent';-import { ObjectOptionsDropdownCalendarEndFieldsContent } from '@/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarEndFieldsContent';import { ObjectOptionsDropdownCalendarViewContent } from '@/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarViewContent';import { ObjectOptionsDropdownFieldsContent } from '@/object-record/object-options-dropdown/components/ObjectOptionsDropdownFieldsContent';import { ObjectOptionsDropdownHiddenFieldsContent } from '@/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenFieldsContent';@@ -13,14 +11,9 @@ import { ObjectOptionsDropdownRecordGroupsContent } from '@/object-record/objectimport { ObjectOptionsDropdownRecordGroupSortContent } from '@/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupSortContent';import { ObjectOptionsDropdownVisibilityContent } from '@/object-record/object-options-dropdown/components/ObjectOptionsDropdownVisibilityContent';import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';-import { FeatureFlagKey } from '~/generated-metadata/graphql';export const ObjectOptionsDropdownContent = () => {const { currentContentId } = useObjectOptionsDropdown();- const isCalendarWeekViewEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED,- );switch (currentContentId) {case 'layout':@@ -41,20 +34,8 @@ export const ObjectOptionsDropdownContent = () => {return <ObjectOptionsDropdownAddRecordGroupContent />;case 'calendarView':return <ObjectOptionsDropdownCalendarViewContent />;- case 'calendarDateFields':- return isCalendarWeekViewEnabled ? (- <ObjectOptionsDropdownCalendarDateFieldsContent />- ) : (- <ObjectOptionsDropdownMenuContent />- );case 'calendarFields':return <ObjectOptionsDropdownCalendarFieldsContent />;- case 'calendarEndFields':- return isCalendarWeekViewEnabled ? (- <ObjectOptionsDropdownCalendarEndFieldsContent />- ) : (- <ObjectOptionsDropdownMenuContent />- );case 'visibility':return <ObjectOptionsDropdownVisibilityContent />;default:diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsxindex ac0b741a26e..4df2bb9442a 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx@@ -126,12 +126,7 @@ export const ObjectOptionsDropdownCustomView = ({'Visibility','Fields',...(customViewData?.type === ViewType.CALENDAR- ? [- isCalendarWeekViewEnabled- ? 'CalendarDateFields'- : 'CalendarDateField',- 'CalendarView',- ]+ ? ['CalendarDateField', 'CalendarView']: []),...(customViewData?.type !== ViewType.CALENDAR ? ['Group'] : []),'Delete view',@@ -195,51 +190,27 @@ export const ObjectOptionsDropdownCustomView = ({<DropdownMenuItemsContainer scrollable={false}>{customViewData?.type === ViewType.CALENDAR && (<>- {isCalendarWeekViewEnabled ? (- <div id="calendar-date-fields-picker-menu-item">- <SelectableListItem- itemId="CalendarDateFields"- onEnter={() => onContentChange('calendarDateFields')}- >- <MenuItem- focused={selectedItemId === 'CalendarDateFields'}- onClick={() => onContentChange('calendarDateFields')}- LeftIcon={IconCalendar}- text={t`Date fields`}- contextualText={- isDefaultView- ? t`Not available on Default View`- : calendarFieldMetadata?.label- }- contextualTextPosition="right"- hasSubMenu- disabled={isDefaultView}- />- </SelectableListItem>- </div>- ) : (- <div id="calendar-date-field-picker-menu-item">- <SelectableListItem- itemId="CalendarDateField"- onEnter={() => onContentChange('calendarFields')}- >- <MenuItem- focused={selectedItemId === 'CalendarDateField'}- onClick={() => onContentChange('calendarFields')}- LeftIcon={IconCalendar}- text={t`Date field`}- contextualText={- isDefaultView- ? t`Not available on Default View`- : calendarFieldMetadata?.label- }- contextualTextPosition="right"- hasSubMenu- disabled={isDefaultView}- />- </SelectableListItem>- </div>- )}+ <div id="calendar-date-field-picker-menu-item">+ <SelectableListItem+ itemId="CalendarDateField"+ onEnter={() => onContentChange('calendarFields')}+ >+ <MenuItem+ focused={selectedItemId === 'CalendarDateField'}+ onClick={() => onContentChange('calendarFields')}+ LeftIcon={IconCalendar}+ text={t`Date field`}+ contextualText={+ isDefaultView+ ? t`Not available on Default View`+ : calendarFieldMetadata?.label+ }+ contextualTextPosition="right"+ hasSubMenu+ disabled={isDefaultView}+ />+ </SelectableListItem>+ </div><SelectableListItemitemId="CalendarView"onEnter={() => onContentChange('calendarView')}diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsxindex a79333fdac1..6d5ccd3ce4c 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownLayoutContent.tsx@@ -132,12 +132,7 @@ export const ObjectOptionsDropdownLayoutContent = () => {...(isDefaultView ? [] : [ViewType.KANBAN]),...(currentView?.type === ViewType.KANBAN ? ['Group'] : []),...(currentView?.type === ViewType.CALENDAR- ? [- 'CalendarView',- isCalendarWeekViewEnabled- ? 'CalendarDateFields'- : 'CalendarDateField',- ]+ ? ['CalendarView', 'CalendarDateField']: []),...(currentView?.type !== ViewType.TABLE &¤tView?.type !== ViewType.LIST@@ -255,37 +250,20 @@ export const ObjectOptionsDropdownLayoutContent = () => {<DropdownMenuItemsContainer scrollable={false}>{currentView?.type === ViewType.CALENDAR && (<>- {isCalendarWeekViewEnabled ? (- <SelectableListItem- itemId="CalendarDateFields"- onEnter={() => onContentChange('calendarDateFields')}- >- <MenuItem- focused={selectedItemId === 'CalendarDateFields'}- onClick={() => onContentChange('calendarDateFields')}- LeftIcon={IconCalendar}- text={t`Date fields`}- contextualText={calendarFieldMetadata?.label}- contextualTextPosition="right"- hasSubMenu- />- </SelectableListItem>- ) : (- <SelectableListItem- itemId="CalendarDateField"- onEnter={() => onContentChange('calendarFields')}- >- <MenuItem- focused={selectedItemId === 'CalendarDateField'}- onClick={() => onContentChange('calendarFields')}- LeftIcon={IconCalendar}- text={t`Date field`}- contextualText={calendarFieldMetadata?.label}- contextualTextPosition="right"- hasSubMenu- />- </SelectableListItem>- )}+ <SelectableListItem+ itemId="CalendarDateField"+ onEnter={() => onContentChange('calendarFields')}+ >+ <MenuItem+ focused={selectedItemId === 'CalendarDateField'}+ onClick={() => onContentChange('calendarFields')}+ LeftIcon={IconCalendar}+ text={t`Date field`}+ contextualText={calendarFieldMetadata?.label}+ contextualTextPosition="right"+ hasSubMenu+ />+ </SelectableListItem><SelectableListItemitemId="CalendarView"onEnter={() => onContentChange('calendarView')}diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/__tests__/ObjectOptionsDropdownCalendarViewContent.test.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/__tests__/ObjectOptionsDropdownCalendarViewContent.test.tsxindex 4ad7155754e..4af2d311d52 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/__tests__/ObjectOptionsDropdownCalendarViewContent.test.tsx+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/__tests__/ObjectOptionsDropdownCalendarViewContent.test.tsx@@ -1,8 +1,32 @@import { fireEvent, render, screen, waitFor } from '@testing-library/react';+import userEvent from '@testing-library/user-event';+import { I18nProvider } from '@lingui/react';+import { i18n } from '@lingui/core';+import { ObjectOptionsDropdownCalendarFieldsContent } from '@/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarFieldsContent';import { ObjectOptionsDropdownCalendarViewContent } from '@/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarViewContent';import { ViewCalendarLayout } from '~/generated-metadata/graphql';+const mockCalendarFields = [+ { id: 'date-field', label: 'Due date', type: 'DATE' },+ { id: 'date-time-field', label: 'Created at', type: 'DATE_TIME' },+];+const mockSetCalendarField = jest.fn();++jest.mock('@/views/view-picker/hooks/useGetAvailableFieldsForCalendar', () => ({+ useGetAvailableFieldsForCalendar: () => ({+ availableFieldsForCalendar: mockCalendarFields,+ navigateToDateFieldSettings: jest.fn(),+ }),+}));+jest.mock('@/ui/utilities/state/jotai/hooks/useAtomComponentState', () => ({+ useAtomComponentState: () => ['date-field', mockSetCalendarField],+}));+jest.mock('twenty-ui/icon', () => ({+ ...jest.requireActual('twenty-ui/icon'),+ useIcons: () => ({ getIcon: () => () => null }),+}));+const mockCloseDropdown = jest.fn();const mockResetContent = jest.fn();const mockSetRecordIndexCalendarLayout = jest.fn();@@ -14,6 +38,7 @@ jest.mock('@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown',() => ({useObjectOptionsDropdown: jest.fn(() => ({+ objectMetadataItem: { fields: mockCalendarFields },closeDropdown: mockCloseDropdown,resetContent: mockResetContent,})),@@ -72,6 +97,7 @@ jest.mock('twenty-ui/data-display', () => ({Pill: ({ label }: { label: string }) => <span>{label}</span>,}));jest.mock('twenty-ui/navigation', () => ({+ MenuItem: ({ text }: { text: string }) => <span>{text}</span>,MenuItemSelect: ({contextualText,disabled,@@ -145,3 +171,57 @@ describe('ObjectOptionsDropdownCalendarViewContent', () => {expect(mockUpdateCurrentView).not.toHaveBeenCalled();});});++describe('ObjectOptionsDropdownCalendarFieldsContent', () => {+ beforeEach(() => {+ jest.clearAllMocks();+ mockUseIsFeatureEnabled.mockReturnValue(true);+ mockUpdateCurrentView.mockResolvedValue(undefined);+ });++ it.each(mockCalendarFields)(+ 'selects $label directly and clears legacy end-field configuration',+ async ({ id, label }) => {+ const user = userEvent.setup();+ render(+ <I18nProvider i18n={i18n}>+ <ObjectOptionsDropdownCalendarFieldsContent />+ </I18nProvider>,+ );++ expect(+ screen.getByRole('button', { name: 'Due date' }),+ ).toBeInTheDocument();+ expect(+ screen.getByRole('button', { name: 'Created at' }),+ ).toBeInTheDocument();+ expect(screen.queryByText('End date field')).not.toBeInTheDocument();+ await user.click(screen.getByRole('button', { name: label }));++ expect(mockSetCalendarField).toHaveBeenCalledWith(id);+ expect(mockUpdateCurrentView).toHaveBeenCalledWith({+ calendarFieldMetadataId: id,+ calendarEndFieldMetadataId: null,+ });+ expect(mockCloseDropdown).toHaveBeenCalled();+ },+ );++ it('searches Date and DateTime fields in the same picker', async () => {+ const user = userEvent.setup();+ render(+ <I18nProvider i18n={i18n}>+ <ObjectOptionsDropdownCalendarFieldsContent />+ </I18nProvider>,+ );++ await user.type(screen.getByPlaceholderText('Search fields'), 'created');++ expect(+ screen.queryByRole('button', { name: 'Due date' }),+ ).not.toBeInTheDocument();+ expect(+ screen.getByRole('button', { name: 'Created at' }),+ ).toBeInTheDocument();+ });+});diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/types/ObjectOptionsContentId.ts b/packages/twenty-front/src/modules/object-record/object-options-dropdown/types/ObjectOptionsContentId.tsindex a996a85fe80..701b5b8e1ce 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/types/ObjectOptionsContentId.ts+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/types/ObjectOptionsContentId.ts@@ -7,8 +7,6 @@ export type ObjectOptionsContentId =| 'recordGroupFields'| 'recordGroupSort'| 'addRecordGroup'- | 'calendarDateFields'| 'calendarFields'- | 'calendarEndFields'| 'calendarView'| 'visibility';diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendar.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendar.tsxindex c18d13bacb6..f3054e50cbb 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendar.tsx+++ b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendar.tsx@@ -3,12 +3,10 @@ import { styled } from '@linaria/react';import { COMMAND_MENU_DROPDOWN_CLICK_OUTSIDE_ID } from '@/command-menu-item/constants/CommandMenuDropdownClickOutsideId';import { COMMAND_MENU_CLICK_OUTSIDE_ID } from '@/command-menu/constants/CommandMenuClickOutsideId';+import { RecordCalendarGrid } from '@/object-record/record-calendar/grid/components/RecordCalendarGrid';import { RecordCalendarTopBar } from '@/object-record/record-calendar/components/RecordCalendarTopBar';import { RECORD_CALENDAR_CLICK_OUTSIDE_LISTENER_ID } from '@/object-record/record-calendar/constants/RecordCalendarClickOutsideListenerId';import { RecordCalendarEscapeHotkeyEffect } from '@/object-record/record-calendar/components/RecordCalendarEscapeHotkeyEffect';-import { RecordCalendarDay } from '@/object-record/record-calendar/day/components/RecordCalendarDay';-import { RecordCalendarMonth } from '@/object-record/record-calendar/month/components/RecordCalendarMonth';-import { RecordCalendarWeek } from '@/object-record/record-calendar/week/components/RecordCalendarWeek';import { RECORD_CALENDAR_CARD_CLICK_OUTSIDE_ID } from '@/object-record/record-calendar/record-calendar-card/constants/RecordCalendarCardClickOutsideId';import { recordIndexCalendarLayoutComponentState } from '@/object-record/record-index/states/recordIndexCalendarLayoutComponentState';import { RecordCalendarComponentInstanceContext } from '@/object-record/record-calendar/states/contexts/RecordCalendarComponentInstanceContext';@@ -23,10 +21,7 @@ import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';import { useEffect } from 'react';import { LINK_CHIP_CLICK_OUTSIDE_ID } from 'twenty-ui/data-display';import { themeCssVariables } from 'twenty-ui/theme-constants';-import {- FeatureFlagKey,- ViewCalendarLayout,-} from '~/generated-metadata/graphql';+import { FeatureFlagKey } from '~/generated-metadata/graphql';const StyledContainerContainer = styled.div`box-sizing: border-box;@@ -84,13 +79,7 @@ export const RecordCalendar = () => {<ScrollWrappercomponentInstanceId={`scroll-wrapper-record-calendar-${recordCalendarId}`}>- {supportedCalendarLayout === ViewCalendarLayout.DAY ? (- <RecordCalendarDay />- ) : supportedCalendarLayout === ViewCalendarLayout.WEEK ? (- <RecordCalendarWeek />- ) : (- <RecordCalendarMonth />- )}+ <RecordCalendarGrid calendarLayout={supportedCalendarLayout} /></ScrollWrapper></StyledContainerContainer>);diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarAddNew.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarAddNew.tsxindex dfd5a6777d1..4b652a2dfaf 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarAddNew.tsx+++ b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarAddNew.tsx@@ -4,7 +4,6 @@ import { isFieldMetadataReadOnlyByPermissions } from '@/object-record/read-only/import { useRecordCalendarContextOrThrow } from '@/object-record/record-calendar/contexts/RecordCalendarContext';import { isRecordCalendarReadOnlyComponentState } from '@/object-record/record-calendar/states/isRecordCalendarReadOnlyComponentState';import { hasAnySoftDeleteFilterOnViewComponentSelector } from '@/object-record/record-filter/states/hasAnySoftDeleteFilterOnView';-import { recordIndexCalendarEndFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarEndFieldMetadataIdComponentState';import { recordIndexCalendarFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarFieldMetadataIdComponentState';import { useCreateNewIndexRecord } from '@/object-record/record-table/hooks/useCreateNewIndexRecord';import { RecordTableWidgetContext } from '@/object-record/record-table-widget/contexts/RecordTableWidgetContext';@@ -21,22 +20,18 @@ import { IconPlus } from 'twenty-ui/icon';import { Button } from 'twenty-ui/input';import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';-const StyledButtonContainer = styled.div<{ compact: boolean }>`+const StyledButtonContainer = styled.div`height: auto;min-width: unset;- padding: ${({ compact }) => (compact ? 0 : themeCssVariables.spacing['0.5'])};+ padding: ${themeCssVariables.spacing['0.5']};`;type RecordCalendarAddNewProps = {cardDate: Temporal.PlainDate;- cardTime?: Temporal.PlainTime;- compact?: boolean;};export const RecordCalendarAddNew = ({cardDate,- cardTime,- compact = false,}: RecordCalendarAddNewProps) => {const isRecordCalendarReadOnly = useAtomComponentStateValue(isRecordCalendarReadOnlyComponentState,@@ -60,16 +55,10 @@ export const RecordCalendarAddNew = ({const recordIndexCalendarFieldMetadataId = useAtomComponentStateValue(recordIndexCalendarFieldMetadataIdComponentState,);- const recordIndexCalendarEndFieldMetadataId = useAtomComponentStateValue(- recordIndexCalendarEndFieldMetadataIdComponentState,- );const calendarFieldMetadataItem = objectMetadataItem.fields.find((field) => field.id === recordIndexCalendarFieldMetadataId,);- const calendarEndFieldMetadataItem = objectMetadataItem.fields.find(- (field) => field.id === recordIndexCalendarEndFieldMetadataId,- );const isCalendarFieldReadOnly = calendarFieldMetadataItem? calendarFieldMetadataItem.isUIEditable === false ||@@ -79,14 +68,6 @@ export const RecordCalendarAddNew = ({}): false;- const isCalendarEndFieldReadOnly = calendarEndFieldMetadataItem- ? calendarEndFieldMetadataItem.isUIEditable === false ||- isFieldMetadataReadOnlyByPermissions({- objectPermissions,- fieldMetadataId: calendarEndFieldMetadataItem.id,- })- : false;-// Creating in a nested relation widget requires picking the related record// to create through, which only the table layout offers today.const nestedRelationCreateThrough = useContext(@@ -107,22 +88,15 @@ export const RecordCalendarAddNew = ({return null;}- const createRecordAriaLabel = cardTime- ? t`Create record on ${cardDate.toLocaleString(undefined, {- dateStyle: 'full',- })} at ${cardTime.toLocaleString(undefined, { timeStyle: 'short' })}`- : t`Create record`;-return (- <StyledButtonContainer compact={compact}>+ <StyledButtonContainer><Button- ariaLabel={createRecordAriaLabel}+ ariaLabel={t`Create record`}onClick={async (event) => {event.stopPropagation();const startDateTime = cardDate.toZonedDateTime({timeZone: userTimezone,- plainTime: cardTime,});const startValue =calendarFieldMetadataItem.type === FieldMetadataType.DATE@@ -131,24 +105,9 @@ export const RecordCalendarAddNew = ({await createNewIndexRecord({[calendarFieldMetadataItem.name]: startValue,- ...(calendarFieldMetadataItem.type === FieldMetadataType.DATE &&- isCalendarEndFieldReadOnly === false &&- calendarEndFieldMetadataItem?.type === FieldMetadataType.DATE && {- [calendarEndFieldMetadataItem.name]: cardDate.toString(),- }),- ...(calendarFieldMetadataItem.type ===- FieldMetadataType.DATE_TIME &&- isCalendarEndFieldReadOnly === false &&- calendarEndFieldMetadataItem?.type ===- FieldMetadataType.DATE_TIME && {- [calendarEndFieldMetadataItem.name]: startDateTime- .add({ hours: 1 })- .toInstant()- .toString(),- }),});}}- size={compact ? 'small' : 'medium'}+ size="medium"type="button"variant="tertiary"Icon={() => <IconPlus size={theme.icon.size.sm} />}diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthDragDropContext.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarDragDropContext.tsxsimilarity index 79%rename from packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthDragDropContext.tsxrename to packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarDragDropContext.tsxindex 69d9ced3061..933c9609bca 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthDragDropContext.tsx+++ b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarDragDropContext.tsx@@ -1,21 +1,21 @@import { DragDropProvider, DragOverlay } from '@dnd-kit/react';import type { ReactNode } from 'react';-import { useRecordCalendarMonthDndKit } from '@/object-record/record-calendar/month/hooks/useRecordCalendarMonthDndKit';+import { useRecordCalendarDndKit } from '@/object-record/record-calendar/hooks/useRecordCalendarDndKit';import { RecordCalendarCardDragOverlayContent } from '@/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardDragOverlayContent';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 { type DragDropItemData } from '@/ui/utilities/drag-and-drop/types/DragDropItemData';-type RecordCalendarMonthDragDropContextProps = {+type RecordCalendarDragDropContextProps = {children: ReactNode;};-export const RecordCalendarMonthDragDropContext = ({+export const RecordCalendarDragDropContext = ({children,-}: RecordCalendarMonthDragDropContextProps) => {- const { contextValues, handlers } = useRecordCalendarMonthDndKit();+}: RecordCalendarDragDropContextProps) => {+ const { contextValues, handlers } = useRecordCalendarDndKit();return (<DragDropItemDndContext.Provider value={contextValues}>diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarSSESubscribeEffect.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarSSESubscribeEffect.tsxindex 8d3c492e685..72ff27d8e87 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarSSESubscribeEffect.tsx+++ b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarSSESubscribeEffect.tsx@@ -1,6 +1,6 @@import { hasObjectMetadataItemPositionField } from '@/object-metadata/utils/hasObjectMetadataItemPositionField';import { useRecordCalendarContextOrThrow } from '@/object-record/record-calendar/contexts/RecordCalendarContext';-import { useRecordCalendarQueryDateRangeFilter } from '@/object-record/record-calendar/month/hooks/useRecordCalendarQueryDateRangeFilter';+import { useRecordCalendarQueryDateRangeFilter } from '@/object-record/record-calendar/hooks/useRecordCalendarQueryDateRangeFilter';import { RecordCalendarComponentInstanceContext } from '@/object-record/record-calendar/states/contexts/RecordCalendarComponentInstanceContext';import { recordCalendarSelectedDateComponentState } from '@/object-record/record-calendar/states/recordCalendarSelectedDateComponentState';import { useListenToEventsForQuery } from '@/sse-db-event/hooks/useListenToEventsForQuery';diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarTopBar.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarTopBar.tsxindex dd6956d9269..6510ddcc33a 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarTopBar.tsx+++ b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarTopBar.tsx@@ -3,8 +3,8 @@ import { RecordCalendarComponentInstanceContext } from '@/object-record/record-cimport { isRecordCalendarReadOnlyComponentState } from '@/object-record/record-calendar/states/isRecordCalendarReadOnlyComponentState';import { recordCalendarSelectedDateComponentState } from '@/object-record/record-calendar/states/recordCalendarSelectedDateComponentState';import { getSupportedRecordCalendarLayout } from '@/object-record/record-calendar/utils/getSupportedRecordCalendarLayout';-import { useRecordCalendarWeekDaysRange } from '@/object-record/record-calendar/week/hooks/useRecordCalendarWeekDaysRange';-import { formatRecordCalendarWeekRange } from '@/object-record/record-calendar/week/utils/formatRecordCalendarWeekRange';+import { useRecordCalendarDaysRange } from '@/object-record/record-calendar/hooks/useRecordCalendarDaysRange';+import { formatRecordCalendarWeekRange } from '@/object-record/record-calendar/utils/formatRecordCalendarWeekRange';import { recordIndexCalendarLayoutComponentState } from '@/object-record/record-index/states/recordIndexCalendarLayoutComponentState';import { WidgetComponentInstanceContext } from '@/page-layout/widgets/states/contexts/WidgetComponentInstanceContext';import { DatePickerWithoutCalendar } from '@/ui/input/components/internal/date/components/DatePickerWithoutCalendar';@@ -97,9 +97,11 @@ export const RecordCalendarTopBar = () => {const dateLocale = useAtomStateValue(dateLocaleState);const { timeZone } = useDateTimeFormat();- const { firstDayOfWeek, lastDayOfWeek } = useRecordCalendarWeekDaysRange(- recordCalendarSelectedDate,- );+ const { firstDay: firstDayOfWeek, lastDay: lastDayOfWeek } =+ useRecordCalendarDaysRange(+ recordCalendarSelectedDate,+ supportedCalendarLayout,+ );const { updateCurrentView } = useUpdateCurrentView();@@ -136,11 +138,11 @@ export const RecordCalendarTopBar = () => {};const handleCalendarLayoutChange = (calendarLayout: ViewCalendarLayout) => {- const isTimeGridLayout =+ const isWeekOrDayLayout =calendarLayout === ViewCalendarLayout.DAY ||calendarLayout === ViewCalendarLayout.WEEK;- if (isTimeGridLayout && !isCalendarWeekViewEnabled) {+ if (isWeekOrDayLayout && !isCalendarWeekViewEnabled) {return;}@@ -217,9 +219,7 @@ export const RecordCalendarTopBar = () => {}dropdownOffset={dropdownContentOffset}/>- {supportedCalendarLayout === ViewCalendarLayout.MONTH && (- <TimeZoneAbbreviation instant={Temporal.Now.instant()} />- )}+ <TimeZoneAbbreviation instant={Temporal.Now.instant()} /></StyledLeftSection><StyledNavigationSection>diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/components/__tests__/RecordCalendar.test.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/components/__tests__/RecordCalendar.test.tsxindex b66d7646c93..ad3f1437a18 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/components/__tests__/RecordCalendar.test.tsx+++ b/packages/twenty-front/src/modules/object-record/record-calendar/components/__tests__/RecordCalendar.test.tsx@@ -1,4 +1,6 @@import { render, screen } from '@testing-library/react';+import { Temporal } from 'temporal-polyfill';+import { recordCalendarSelectedDateComponentState } from '@/object-record/record-calendar/states/recordCalendarSelectedDateComponentState';import { RecordCalendar } from '@/object-record/record-calendar/components/RecordCalendar';import {@@ -13,23 +15,73 @@ jest.mock(}),);jest.mock(- '@/object-record/record-calendar/day/components/RecordCalendarDay',+ '@/object-record/record-calendar/components/RecordCalendarDragDropContext',() => ({- RecordCalendarDay: () => <div data-testid="calendar-day" />,+ RecordCalendarDragDropContext: ({+ children,+ }: {+ children: React.ReactNode;+ }) => children,}),);jest.mock(- '@/object-record/record-calendar/month/components/RecordCalendarMonth',+ '@/object-record/record-calendar/components/RecordCalendarEscapeHotkeyEffect',+ () => ({ RecordCalendarEscapeHotkeyEffect: () => null }),+);+jest.mock(+ '@/object-record/record-calendar/components/RecordCalendarAddNew',() => ({- RecordCalendarMonth: () => <div data-testid="calendar-month" />,+ RecordCalendarAddNew: () => null,}),);jest.mock(- '@/object-record/record-calendar/week/components/RecordCalendarWeek',+ '@/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard',() => ({- RecordCalendarWeek: () => <div data-testid="calendar-week" />,+ RecordCalendarCard: ({ recordId }: { recordId: string }) => (+ <article>{recordId}</article>+ ),}),);+jest.mock(+ '@/object-record/record-calendar/record-calendar-card/hooks/useIsRecordCalendarCardDragDisabled',+ () => ({+ useIsRecordCalendarCardDragDisabled: () => false,+ }),+);+jest.mock(+ '@/ui/utilities/drag-and-drop/components/DragDropItemSortableCell',+ () => ({+ DragDropItemSortableCell: ({ children }: { children: React.ReactNode }) =>+ children,+ }),+);+jest.mock(+ '@/ui/utilities/drag-and-drop/components/DragDropItemDropTarget',+ () => ({+ DragDropItemDropTarget: () => null,+ }),+);+jest.mock('@dnd-kit/react', () => ({+ useDroppable: () => ({ isDropTarget: false, ref: jest.fn() }),+}));+jest.mock('@/ui/input/components/internal/date/hooks/useUserTimezone', () => ({+ useUserTimezone: () => ({ userTimezone: 'Europe/Paris' }),+}));+jest.mock(+ '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorValue',+ () => ({+ useAtomComponentFamilySelectorValue: (+ _state: unknown,+ { day }: { day: Temporal.PlainDate },+ ) => [day.toString()],+ }),+);+jest.mock('@/ui/utilities/state/jotai/hooks/useAtomStateValue', () => {+ const { enUS } = jest.requireActual('date-fns/locale');+ return {+ useAtomStateValue: () => ({ calendarStartDay: 1, localeCatalog: enUS }),+ };+});jest.mock('@/ui/utilities/scroll/components/ScrollWrapper', () => ({ScrollWrapper: ({ children }: { children: React.ReactNode }) => children,}));@@ -68,46 +120,49 @@ const useIsFeatureEnabledMock = jest.requireMock().useIsFeatureEnabled;describe('RecordCalendar', () => {- beforeEach(() => {- jest.clearAllMocks();- useAtomComponentStateValueMock.mockReturnValue(ViewCalendarLayout.WEEK);- });+ const renderCalendar = (+ calendarLayout: ViewCalendarLayout,+ isEnabled = true,+ ) => {+ useAtomComponentStateValueMock.mockImplementation((state: unknown) =>+ state === recordCalendarSelectedDateComponentState+ ? Temporal.PlainDate.from('2026-07-15')+ : calendarLayout,+ );+ useIsFeatureEnabledMock.mockReturnValue(isEnabled);+ return render(<RecordCalendar />);+ };- it.each([ViewCalendarLayout.DAY, ViewCalendarLayout.WEEK])(- 'renders month when a persisted %s layout is disabled',- (calendarLayout) => {- useAtomComponentStateValueMock.mockReturnValue(calendarLayout);- useIsFeatureEnabledMock.mockReturnValue(false);+ beforeEach(() => jest.clearAllMocks());++ it.each([+ [ViewCalendarLayout.DAY, 1, '2026-07-15', '2026-07-15'],+ [ViewCalendarLayout.WEEK, 7, '2026-07-13', '2026-07-19'],+ [ViewCalendarLayout.MONTH, 35, '2026-06-29', '2026-08-02'],+ ])(+ 'renders %s with the same record cards for each visible day',+ (layout, count, firstDay, lastDay) => {+ renderCalendar(layout);++ const cards = screen.getAllByRole('article');+ expect(cards).toHaveLength(count);+ expect(cards[0]).toHaveTextContent(firstDay);+ expect(cards[cards.length - 1]).toHaveTextContent(lastDay);+ expect(screen.getByText('Wed')).toBeInTheDocument();+ expect(screen.queryByText('All day')).not.toBeInTheDocument();+ expect(screen.queryByText(/\d{1,2}:00/)).not.toBeInTheDocument();+ },+ );- render(<RecordCalendar />);+ it.each([ViewCalendarLayout.DAY, ViewCalendarLayout.WEEK])(+ 'renders the month grid when a persisted %s layout is disabled',+ (layout) => {+ renderCalendar(layout, false);- expect(screen.getByTestId('calendar-month')).toBeInTheDocument();- expect(screen.queryByTestId('calendar-day')).not.toBeInTheDocument();- expect(screen.queryByTestId('calendar-week')).not.toBeInTheDocument();+ expect(screen.getAllByRole('article')).toHaveLength(35);expect(useIsFeatureEnabledMock).toHaveBeenCalledWith(FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED,);},);-- it('renders day when the day layout is enabled', () => {- useAtomComponentStateValueMock.mockReturnValue(ViewCalendarLayout.DAY);- useIsFeatureEnabledMock.mockReturnValue(true);-- render(<RecordCalendar />);-- expect(screen.getByTestId('calendar-day')).toBeInTheDocument();- expect(screen.queryByTestId('calendar-week')).not.toBeInTheDocument();- expect(screen.queryByTestId('calendar-month')).not.toBeInTheDocument();- });-- it('renders week when the week layout is enabled', () => {- useIsFeatureEnabledMock.mockReturnValue(true);-- render(<RecordCalendar />);-- expect(screen.getByTestId('calendar-week')).toBeInTheDocument();- expect(screen.queryByTestId('calendar-day')).not.toBeInTheDocument();- expect(screen.queryByTestId('calendar-month')).not.toBeInTheDocument();- });});diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/components/__tests__/RecordCalendarTopBar.test.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/components/__tests__/RecordCalendarTopBar.test.tsxindex d5f1070873d..6748938573e 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/components/__tests__/RecordCalendarTopBar.test.tsx+++ b/packages/twenty-front/src/modules/object-record/record-calendar/components/__tests__/RecordCalendarTopBar.test.tsx@@ -12,16 +12,16 @@ const mockSetRecordIndexCalendarLayout = jest.fn();const mockUpdateCurrentView = jest.fn();const mockUseAtomComponentState = jest.fn();const mockUseAtomStateValue = jest.fn();-const mockUseRecordCalendarWeekDaysRange = jest.fn();+const mockUseRecordCalendarDaysRange = jest.fn();jest.mock('@/localization/hooks/useDateTimeFormat', () => ({useDateTimeFormat: jest.fn(() => ({ timeZone: 'UTC' })),}));jest.mock(- '@/object-record/record-calendar/week/hooks/useRecordCalendarWeekDaysRange',+ '@/object-record/record-calendar/hooks/useRecordCalendarDaysRange',() => ({- useRecordCalendarWeekDaysRange: (...args: unknown[]) =>- mockUseRecordCalendarWeekDaysRange(...args),+ useRecordCalendarDaysRange: (...args: unknown[]) =>+ mockUseRecordCalendarDaysRange(...args),}),);jest.mock(@@ -117,9 +117,9 @@ describe('RecordCalendarTopBar', () => {locale: 'en-US',localeCatalog: enUS,});- mockUseRecordCalendarWeekDaysRange.mockReturnValue({- firstDayOfWeek: Temporal.PlainDate.from('2026-07-13'),- lastDayOfWeek: Temporal.PlainDate.from('2026-07-19'),+ mockUseRecordCalendarDaysRange.mockReturnValue({+ firstDay: Temporal.PlainDate.from('2026-07-13'),+ lastDay: Temporal.PlainDate.from('2026-07-19'),});});@@ -134,7 +134,7 @@ describe('RecordCalendarTopBar', () => {screen.getByTestId('layout-select').querySelectorAll('option'),).map((option) => option.textContent),).toEqual(['Day', 'Week', 'Month']);- expect(screen.queryByTestId('time-zone')).not.toBeInTheDocument();+ expect(screen.getByTestId('time-zone')).toBeInTheDocument();});it('navigates the Day layout one day at a time', () => {diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/month/constants/RecordCalendarCardDndType.ts b/packages/twenty-front/src/modules/object-record/record-calendar/constants/RecordCalendarCardDndType.tssimilarity index 100%rename from packages/twenty-front/src/modules/object-record/record-calendar/month/constants/RecordCalendarCardDndType.tsrename to packages/twenty-front/src/modules/object-record/record-calendar/constants/RecordCalendarCardDndType.tsdiff --git a/packages/twenty-front/src/modules/object-record/record-calendar/constants/RecordCalendarDayCollisionPriority.ts b/packages/twenty-front/src/modules/object-record/record-calendar/constants/RecordCalendarDayCollisionPriority.tsnew file mode 100644index 00000000000..44bc45b58f5--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-calendar/constants/RecordCalendarDayCollisionPriority.ts@@ -0,0 +1 @@+export const RECORD_CALENDAR_DAY_COLLISION_PRIORITY = 2.5;diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/constants/RecordCalendarMonthVisibleRecordLimit.ts b/packages/twenty-front/src/modules/object-record/record-calendar/constants/RecordCalendarMonthVisibleRecordLimit.tsdeleted file mode 100644index 3aa80b8ca94..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/constants/RecordCalendarMonthVisibleRecordLimit.ts+++ /dev/null@@ -1 +0,0 @@-export const RECORD_CALENDAR_MONTH_VISIBLE_RECORD_LIMIT = 5;diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/constants/RecordCalendarVisibleRecordLimit.ts b/packages/twenty-front/src/modules/object-record/record-calendar/constants/RecordCalendarVisibleRecordLimit.tsnew file mode 100644index 00000000000..a54911d2bef--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-calendar/constants/RecordCalendarVisibleRecordLimit.ts@@ -0,0 +1 @@+export const RECORD_CALENDAR_VISIBLE_RECORD_LIMIT = 5;diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/day/components/RecordCalendarDay.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/day/components/RecordCalendarDay.tsxdeleted file mode 100644index 258e04dffec..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/day/components/RecordCalendarDay.tsx+++ /dev/null@@ -1,37 +0,0 @@-import { RecordCalendarComponentInstanceContext } from '@/object-record/record-calendar/states/contexts/RecordCalendarComponentInstanceContext';-import { recordCalendarSelectedDateComponentState } from '@/object-record/record-calendar/states/recordCalendarSelectedDateComponentState';-import { RecordCalendarTimeGrid } from '@/object-record/record-calendar/time-grid/components/RecordCalendarTimeGrid';-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { format } from 'date-fns';-import { turnPlainDateToShiftedDateInSystemTimeZone } from 'twenty-shared/utils';-import { dateLocaleState } from '~/localization/states/dateLocaleState';--export const RecordCalendarDay = () => {- const recordCalendarId = useAvailableComponentInstanceIdOrThrow(- RecordCalendarComponentInstanceContext,- );- const recordCalendarSelectedDate = useAtomComponentStateValue(- recordCalendarSelectedDateComponentState,- recordCalendarId,- );- const dateLocale = useAtomStateValue(dateLocaleState);-- return (- <RecordCalendarTimeGrid- days={[- {- date: recordCalendarSelectedDate,- label: format(- turnPlainDateToShiftedDateInSystemTimeZone(- recordCalendarSelectedDate,- ),- 'EEE',- { locale: dateLocale.localeCatalog },- ),- },- ]}- />- );-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/day/components/__tests__/RecordCalendarDay.test.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/day/components/__tests__/RecordCalendarDay.test.tsxdeleted file mode 100644index 543b65c1527..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/day/components/__tests__/RecordCalendarDay.test.tsx+++ /dev/null@@ -1,53 +0,0 @@-import { render, screen } from '@testing-library/react';-import { type Temporal } from 'temporal-polyfill';--import { RecordCalendarDay } from '@/object-record/record-calendar/day/components/RecordCalendarDay';--jest.mock(- '@/object-record/record-calendar/time-grid/components/RecordCalendarTimeGrid',- () => ({- RecordCalendarTimeGrid: ({- days,- }: {- days: { date: Temporal.PlainDate; label: string }[];- }) => (- <div data-testid="time-grid" data-day-count={days.length}>- {days.map(({ date, label }) => `${date.toString()}:${label}`).join(',')}- </div>- ),- }),-);-jest.mock(- '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow',- () => ({- useAvailableComponentInstanceIdOrThrow: jest.fn(() => 'calendar-id'),- }),-);-jest.mock('@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue', () => {- const { Temporal } = jest.requireActual('temporal-polyfill');-- return {- useAtomComponentStateValue: jest.fn(() =>- Temporal.PlainDate.from('2026-07-15'),- ),- };-});-jest.mock('@/ui/utilities/state/jotai/hooks/useAtomStateValue', () => {- const { enUS } = jest.requireActual('date-fns/locale');-- return {- useAtomStateValue: jest.fn(() => ({ localeCatalog: enUS })),- };-});--describe('RecordCalendarDay', () => {- it('renders the selected date as the only time-grid day', () => {- render(<RecordCalendarDay />);-- expect(screen.getByTestId('time-grid')).toHaveAttribute(- 'data-day-count',- '1',- );- expect(screen.getByTestId('time-grid')).toHaveTextContent('2026-07-15:Wed');- });-});diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/grid/components/RecordCalendarGrid.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/grid/components/RecordCalendarGrid.tsxnew file mode 100644index 00000000000..af2ec2e84c9--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-calendar/grid/components/RecordCalendarGrid.tsx@@ -0,0 +1,95 @@+import { RecordCalendarGridDay } from '@/object-record/record-calendar/grid/components/RecordCalendarGridDay';+import { RecordCalendarDragDropContext } from '@/object-record/record-calendar/components/RecordCalendarDragDropContext';+import { useRecordCalendarDaysRange } from '@/object-record/record-calendar/hooks/useRecordCalendarDaysRange';+import { recordCalendarSelectedDateComponentState } from '@/object-record/record-calendar/states/recordCalendarSelectedDateComponentState';+import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';+import { styled } from '@linaria/react';+import { isPlainDateInSameMonth } from 'twenty-shared/utils';+import { themeCssVariables } from 'twenty-ui/theme-constants';+import { ViewCalendarLayout } from '~/generated-metadata/graphql';++const StyledContainer = styled.div<{ isDayLayout: boolean }>`+ display: flex;+ flex-direction: column;+ min-height: 100%;+ min-width: ${({ isDayLayout }) => (isDayLayout ? '0' : '1000px')};+`;++const StyledHeader = styled.div`+ display: flex;+ height: 24px;+ width: 100%;+`;++const StyledHeaderDay = styled.div`+ color: ${themeCssVariables.font.color.light};+ display: flex;+ flex: 1;+ font-size: ${themeCssVariables.font.size.sm};+ height: 24px;+ justify-content: flex-end;+ padding: ${themeCssVariables.spacing[0]} ${themeCssVariables.spacing[1]};+`;++const StyledBody = styled.div`+ border: 1px solid ${themeCssVariables.border.color.light};+ border-radius: ${themeCssVariables.border.radius.sm};+ display: flex;+ flex: 1;+ flex-direction: column;+ overflow: hidden;+`;++const StyledRow = styled.div`+ align-items: stretch;+ display: flex;+ flex: 1;++ &:not(:last-of-type) {+ border-bottom: 1px solid ${themeCssVariables.border.color.light};+ }+`;++type RecordCalendarGridProps = {+ calendarLayout: ViewCalendarLayout;+};++export const RecordCalendarGrid = ({+ calendarLayout,+}: RecordCalendarGridProps) => {+ const recordCalendarSelectedDate = useAtomComponentStateValue(+ recordCalendarSelectedDateComponentState,+ );+ const { days, weekDayLabels } = useRecordCalendarDaysRange(+ recordCalendarSelectedDate,+ calendarLayout,+ );++ return (+ <RecordCalendarDragDropContext>+ <StyledContainer isDayLayout={calendarLayout === ViewCalendarLayout.DAY}>+ <StyledHeader>+ {weekDayLabels.map((label, index) => (+ <StyledHeaderDay key={index}>{label}</StyledHeaderDay>+ ))}+ </StyledHeader>+ <StyledBody>+ {days.map((row) => (+ <StyledRow key={row[0].toString()}>+ {row.map((day) => (+ <RecordCalendarGridDay+ key={day.toString()}+ day={day}+ isOtherMonth={+ calendarLayout === ViewCalendarLayout.MONTH &&+ !isPlainDateInSameMonth(day, recordCalendarSelectedDate)+ }+ />+ ))}+ </StyledRow>+ ))}+ </StyledBody>+ </StyledContainer>+ </RecordCalendarDragDropContext>+ );+};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthBodyDay.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/grid/components/RecordCalendarGridDay.tsxsimilarity index 80%rename from packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthBodyDay.tsxrename to packages/twenty-front/src/modules/object-record/record-calendar/grid/components/RecordCalendarGridDay.tsxindex 5dff11fd5b6..06eff25c0f4 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthBodyDay.tsx+++ b/packages/twenty-front/src/modules/object-record/record-calendar/grid/components/RecordCalendarGridDay.tsx@@ -1,24 +1,17 @@import { RecordCalendarCardDraggableContainer } from '@/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardDraggableContainer';-import { RECORD_CALENDAR_MONTH_VISIBLE_RECORD_LIMIT } from '@/object-record/record-calendar/constants/RecordCalendarMonthVisibleRecordLimit';-import { recordCalendarSelectedDateComponentState } from '@/object-record/record-calendar/states/recordCalendarSelectedDateComponentState';+import { RECORD_CALENDAR_VISIBLE_RECORD_LIMIT } from '@/object-record/record-calendar/constants/RecordCalendarVisibleRecordLimit';import { calendarDayRecordIdsComponentFamilySelector } from '@/object-record/record-calendar/states/selectors/calendarDayRecordsComponentFamilySelector';import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUserTimezone';import { useAtomComponentFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorValue';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { styled } from '@linaria/react';import { pointerIntersection } from '@dnd-kit/collision';import { useDroppable } from '@dnd-kit/react';import { Fragment, useState } from 'react';import { Temporal } from 'temporal-polyfill';-import {- isDefined,- isPlainDateInSameMonth,- isPlainDateInWeekend,- isSamePlainDate,-} from 'twenty-shared/utils';+import { isPlainDateInWeekend, isSamePlainDate } from 'twenty-shared/utils';import { RecordCalendarAddNew } from '@/object-record/record-calendar/components/RecordCalendarAddNew';-import { RECORD_CALENDAR_CARD_DND_TYPE } from '@/object-record/record-calendar/month/constants/RecordCalendarCardDndType';-import { RECORD_CALENDAR_MONTH_DAY_COLLISION_PRIORITY } from '@/object-record/record-calendar/month/constants/RecordCalendarMonthDayCollisionPriority';+import { RECORD_CALENDAR_CARD_DND_TYPE } from '@/object-record/record-calendar/constants/RecordCalendarCardDndType';+import { RECORD_CALENDAR_DAY_COLLISION_PRIORITY } from '@/object-record/record-calendar/constants/RecordCalendarDayCollisionPriority';import { DragDropItemDropTarget } from '@/ui/utilities/drag-and-drop/components/DragDropItemDropTarget';import { themeCssVariables } from 'twenty-ui/theme-constants';@@ -35,11 +28,11 @@ const StyledContainer = styled.div<{? themeCssVariables.font.color.light: themeCssVariables.font.color.primary};display: flex;+ flex: 1;flex-direction: column;min-height: 122px;min-width: 0;padding: ${themeCssVariables.spacing[1]};- width: calc(100% / 7);&:not(:last-child) {border-right: 1px solid ${themeCssVariables.border.color.light};@@ -98,19 +91,17 @@ const StyledCardsContainer = styled.div<{ isDraggedOver?: boolean }>`transition: background-color 0.1s ease;`;-type RecordCalendarMonthBodyDayProps = {+type RecordCalendarGridDayProps = {day: Temporal.PlainDate;+ isOtherMonth: boolean;};-export const RecordCalendarMonthBodyDay = ({+export const RecordCalendarGridDay = ({day,-}: RecordCalendarMonthBodyDayProps) => {+ isOtherMonth,+}: RecordCalendarGridDayProps) => {const { userTimezone } = useUserTimezone();- const recordCalendarSelectedDate = useAtomComponentStateValue(- recordCalendarSelectedDateComponentState,- );-const dayKey = day.toString();const recordIds = useAtomComponentFamilySelectorValue(@@ -128,15 +119,11 @@ export const RecordCalendarMonthBodyDay = ({const isToday = isSamePlainDate(day, todayInUserTimeZone);- const isOtherMonth = isDefined(recordCalendarSelectedDate)- ? !isPlainDateInSameMonth(day, recordCalendarSelectedDate)- : false;-const isDayOfWeekend = isPlainDateInWeekend(day);const { isDropTarget, ref: dropRef } = useDroppable({id: dayKey,- collisionPriority: RECORD_CALENDAR_MONTH_DAY_COLLISION_PRIORITY,+ collisionPriority: RECORD_CALENDAR_DAY_COLLISION_PRIORITY,collisionDetector: pointerIntersection,type: RECORD_CALENDAR_CARD_DND_TYPE,accept: RECORD_CALENDAR_CARD_DND_TYPE,@@ -144,7 +131,7 @@ export const RecordCalendarMonthBodyDay = ({const visibleRecordIds = recordIds.slice(0,- RECORD_CALENDAR_MONTH_VISIBLE_RECORD_LIMIT,+ RECORD_CALENDAR_VISIBLE_RECORD_LIMIT,);return (diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/month/components/__stories__/RecordCalendarMonth.stories.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/grid/components/__stories__/RecordCalendarGrid.stories.tsxsimilarity index 92%rename from packages/twenty-front/src/modules/object-record/record-calendar/month/components/__stories__/RecordCalendarMonth.stories.tsxrename to packages/twenty-front/src/modules/object-record/record-calendar/grid/components/__stories__/RecordCalendarGrid.stories.tsxindex 2212a551b5c..8f7b06f4802 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/month/components/__stories__/RecordCalendarMonth.stories.tsx+++ b/packages/twenty-front/src/modules/object-record/record-calendar/grid/components/__stories__/RecordCalendarGrid.stories.tsx@@ -1,7 +1,6 @@import { type Meta, type StoryObj } from '@storybook/react-vite';import { useEffect, useMemo, useState } from 'react';-import { type TaskGroups } from '@/activities/tasks/components/TaskGroups';import { contextStoreCurrentViewIdComponentState } from '@/context-store/states/contextStoreCurrentViewIdComponentState';import { CoreObjectNamePlural } from '@/object-metadata/types/CoreObjectNamePlural';import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';@@ -14,7 +13,7 @@ import { CoreObjectNameSingular } from 'twenty-shared/types';import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId';import { RecordComponentInstanceContextsWrapper } from '@/object-record/components/RecordComponentInstanceContextsWrapper';import { RecordCalendarContextProvider } from '@/object-record/record-calendar/contexts/RecordCalendarContext';-import { RecordCalendarMonth } from '@/object-record/record-calendar/month/components/RecordCalendarMonth';+import { RecordCalendarGrid } from '@/object-record/record-calendar/grid/components/RecordCalendarGrid';import { currentRecordFieldsComponentState } from '@/object-record/record-field/states/currentRecordFieldsComponentState';import { type RecordField } from '@/object-record/record-field/types/RecordField';import { useRecordIndexFieldMetadataDerivedStates } from '@/object-record/record-index/hooks/useRecordIndexFieldMetadataDerivedStates';@@ -29,9 +28,12 @@ import { mockedViews } from '~/testing/mock-data/generated/metadata/views/mock-vimport { getTestEnrichedObjectMetadataItemsMock } from '~/testing/utils/getTestEnrichedObjectMetadataItemsMock';import { setTestViewsInMetadataStore } from '~/testing/utils/setTestViewsInMetadataStore';-const meta: Meta<typeof RecordCalendarMonth> = {- title: 'Modules/ObjectRecord/RecordCalendar/Month',- component: RecordCalendarMonth,+import { ViewCalendarLayout } from '~/generated-metadata/graphql';++const meta: Meta<typeof RecordCalendarGrid> = {+ title: 'Modules/ObjectRecord/RecordCalendar/Grid',+ component: RecordCalendarGrid,+ args: { calendarLayout: ViewCalendarLayout.MONTH },decorators: [(Story) => {const companyObjectMetadataItem =@@ -161,8 +163,14 @@ const meta: Meta<typeof RecordCalendarMonth> = {};export default meta;-type Story = StoryObj<typeof TaskGroups>;+type Story = StoryObj<typeof RecordCalendarGrid>;++export const Month: Story = {};++export const Week: Story = {+ args: { calendarLayout: ViewCalendarLayout.WEEK },+};-export const Default: Story = {- play: async () => {},+export const Day: Story = {+ args: { calendarLayout: ViewCalendarLayout.DAY },};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/hooks/__tests__/useRecordCalendarQueryDateRangeFilter.test.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/hooks/__tests__/useRecordCalendarQueryDateRangeFilter.test.tsxnew file mode 100644index 00000000000..7427efde117--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-calendar/hooks/__tests__/useRecordCalendarQueryDateRangeFilter.test.tsx@@ -0,0 +1,111 @@+import { useRecordCalendarQueryDateRangeFilter } from '@/object-record/record-calendar/hooks/useRecordCalendarQueryDateRangeFilter';+import { recordIndexCalendarFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarFieldMetadataIdComponentState';+import { recordIndexCalendarLayoutComponentState } from '@/object-record/record-index/states/recordIndexCalendarLayoutComponentState';+import { renderHook } from '@testing-library/react';+import { Temporal } from 'temporal-polyfill';+import {+ FieldMetadataType,+ ViewCalendarLayout,+} from '~/generated-metadata/graphql';++const mockCalendarField = {+ id: 'calendar-field',+ name: 'scheduledAt',+ type: FieldMetadataType.DATE_TIME,+};+let mockLayout = ViewCalendarLayout.DAY;+let mockFeatureEnabled = true;++jest.mock(+ '@/object-record/record-calendar/contexts/RecordCalendarContext',+ () => ({+ useRecordCalendarContextOrThrow: () => ({+ objectMetadataItem: { fields: [mockCalendarField] },+ viewBarInstanceId: 'view-id',+ }),+ }),+);+jest.mock('@/ui/input/components/internal/date/hooks/useUserTimezone', () => ({+ useUserTimezone: () => ({ userTimezone: 'America/Los_Angeles' }),+}));+jest.mock('@/workspace/hooks/useIsFeatureEnabled', () => ({+ useIsFeatureEnabled: () => mockFeatureEnabled,+}));+jest.mock(+ '@/object-record/record-filter/hooks/useFilterValueDependencies',+ () => ({+ useFilterValueDependencies: () => ({ filterValueDependencies: {} }),+ }),+);+jest.mock(+ '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue',+ () => ({+ useAtomComponentStateValue: (state: unknown) => {+ if (state === recordIndexCalendarFieldMetadataIdComponentState)+ return mockCalendarField.id;+ if (state === recordIndexCalendarLayoutComponentState) return mockLayout;+ return [];+ },+ }),+);+jest.mock('@/ui/utilities/state/jotai/hooks/useAtomStateValue', () => {+ const { enUS } = jest.requireActual('date-fns/locale');+ return {+ useAtomStateValue: () => ({ calendarStartDay: 1, localeCatalog: enUS }),+ };+});+jest.mock('twenty-shared/utils', () => ({+ ...jest.requireActual('twenty-shared/utils'),+ computeRecordGqlOperationFilter: () => ({ status: { eq: 'OPEN' } }),+ turnAnyFieldFilterIntoRecordGqlFilter: () => ({+ recordGqlOperationFilter: { name: { ilike: '%Acme%' } },+ }),+}));++const getFilter = (selectedDate = '2026-03-08') =>+ renderHook(() =>+ useRecordCalendarQueryDateRangeFilter(+ Temporal.PlainDate.from(selectedDate),+ ),+ ).result.current.dateRangeFilter;++const withViewFilters = (gte: string, lt: string) => ({+ and: [+ { scheduledAt: { gte } },+ { scheduledAt: { lt } },+ { status: { eq: 'OPEN' } },+ { name: { ilike: '%Acme%' } },+ ],+});++describe('useRecordCalendarQueryDateRangeFilter', () => {+ beforeEach(() => {+ mockFeatureEnabled = true;+ mockCalendarField.type = FieldMetadataType.DATE_TIME;+ mockLayout = ViewCalendarLayout.DAY;+ });++ it.each([+ [ViewCalendarLayout.DAY, '2026-03-08T08:00:00Z', '2026-03-09T07:00:00Z'],+ [ViewCalendarLayout.WEEK, '2026-03-02T08:00:00Z', '2026-03-09T07:00:00Z'],+ [ViewCalendarLayout.MONTH, '2026-02-23T08:00:00Z', '2026-04-06T07:00:00Z'],+ ])(+ 'queries the %s grid across DST with separate bounds and preserves view/search filters',+ (layout, gte, lt) => {+ mockLayout = layout;+ expect(getFilter()).toEqual(withViewFilters(gte, lt));+ },+ );++ it('uses plain dates without shifting Date fields by the timezone', () => {+ mockCalendarField.type = FieldMetadataType.DATE;+ expect(getFilter()).toEqual(withViewFilters('2026-03-08', '2026-03-09'));+ });++ it('queries the month when a saved day layout is disabled by the feature flag', () => {+ mockFeatureEnabled = false;+ expect(getFilter()).toEqual(+ withViewFilters('2026-02-23T08:00:00Z', '2026-04-06T07:00:00Z'),+ );+ });+});diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/hooks/useRecordCalendarWeekDaysRange.ts b/packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarDaysRange.tssimilarity index 60%rename from packages/twenty-front/src/modules/object-record/record-calendar/week/hooks/useRecordCalendarWeekDaysRange.tsrename to packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarDaysRange.tsindex a696bd380aa..6ca440cd365 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/hooks/useRecordCalendarWeekDaysRange.ts+++ b/packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarDaysRange.ts@@ -1,48 +1,38 @@import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';import { detectCalendarStartDay } from '@/localization/utils/detection/detectCalendarStartDay';+import { getRecordCalendarDaysRange } from '@/object-record/record-calendar/utils/getRecordCalendarDaysRange';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { format } from 'date-fns';import { type Temporal } from 'temporal-polyfill';import { CalendarStartDay } from 'twenty-shared/constants';import { turnPlainDateToShiftedDateInSystemTimeZone } from 'twenty-shared/utils';+import { type ViewCalendarLayout } from '~/generated-metadata/graphql';import { dateLocaleState } from '~/localization/states/dateLocaleState';-export const useRecordCalendarWeekDaysRange = (+export const useRecordCalendarDaysRange = (selectedDate: Temporal.PlainDate,+ calendarLayout: ViewCalendarLayout,) => {const currentWorkspaceMember = useAtomStateValue(currentWorkspaceMemberState);const dateLocale = useAtomStateValue(dateLocaleState);-const calendarStartDay =currentWorkspaceMember?.calendarStartDay ?? CalendarStartDay.SYSTEM;-- const weekStartsOnDayIndex = (+ const weekStartsOnDayIndex =calendarStartDay === CalendarStartDay.SYSTEM? CalendarStartDay[detectCalendarStartDay()]- : calendarStartDay- ) as 0 | 1 | 2 | 3 | 4 | 5 | 6;-- const selectedDayIndex = selectedDate.dayOfWeek % 7;- const daysSinceStartOfWeek =- (selectedDayIndex - weekStartsOnDayIndex + 7) % 7;- const firstDayOfWeek = selectedDate.subtract({- days: daysSinceStartOfWeek,+ : calendarStartDay;+ const range = getRecordCalendarDaysRange({+ selectedDate,+ calendarLayout,+ weekStartsOnDayIndex,});- const weekDays = Array.from({ length: 7 }, (_, index) => {- const date = firstDayOfWeek.add({ days: index });-- return {- date,- label: format(turnPlainDateToShiftedDateInSystemTimeZone(date), 'EEE', {+ return {+ ...range,+ weekDayLabels: range.days[0].map((day) =>+ format(turnPlainDateToShiftedDateInSystemTimeZone(day), 'EEE', {locale: dateLocale.localeCatalog,}),- };- });-- return {- firstDayOfWeek,- lastDayOfWeek: firstDayOfWeek.add({ days: 6 }),- weekDays,+ ),};};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/month/hooks/useRecordCalendarMonthDndKit.ts b/packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarDndKit.tssimilarity index 95%rename from packages/twenty-front/src/modules/object-record/record-calendar/month/hooks/useRecordCalendarMonthDndKit.tsrename to packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarDndKit.tsindex a543482618b..84aee3ec783 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/month/hooks/useRecordCalendarMonthDndKit.ts+++ b/packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarDndKit.ts@@ -14,7 +14,7 @@ import { type DragDropItemData } from '@/ui/utilities/drag-and-drop/types/DragDrimport { getDestinationIndex } from '@/ui/utilities/drag-and-drop/utils/getDestinationIndex';import { resolveDropFromPointer } from '@/ui/utilities/drag-and-drop/utils/resolveDropFromPointer';import { useAtomComponentFamilySelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorCallbackState';-import { recordCalendarMonthSelectedRecordIdsComponentSelector } from '@/object-record/record-calendar/states/selectors/recordCalendarMonthSelectedRecordIdsComponentSelector';+import { recordCalendarSelectedRecordIdsComponentSelector } from '@/object-record/record-calendar/states/selectors/recordCalendarSelectedRecordIdsComponentSelector';import { originalDragSelectionComponentState } from '@/object-record/record-drag/states/originalDragSelectionComponentState';import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorCallbackState';import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';@@ -33,7 +33,7 @@ export type RecordCalendarDndKitContextValues = {activeDroppableId: string | null;};-export const useRecordCalendarMonthDndKit = (): {+export const useRecordCalendarDndKit = (): {contextValues: RecordCalendarDndKitContextValues;handlers: {onDragStart: (event: DragStartPayload) => void;@@ -57,7 +57,7 @@ export const useRecordCalendarMonthDndKit = (): {);const recordCalendarSelectedRecordIds = useAtomComponentSelectorCallbackState(- recordCalendarMonthSelectedRecordIdsComponentSelector,+ recordCalendarSelectedRecordIdsComponentSelector,);const originalDragSelectionCallbackState = useAtomComponentStateCallbackState(diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarGroupByRecords.ts b/packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarGroupByRecords.tsindex c6f4456d398..c88c0ebfd54 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarGroupByRecords.ts+++ b/packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarGroupByRecords.ts@@ -4,9 +4,8 @@ import { hasObjectMetadataItemPositionField } from '@/object-metadata/utils/hasOimport { getRecordsFromRecordConnection } from '@/object-record/cache/utils/getRecordsFromRecordConnection';import { useGroupByRecordsQuery } from '@/object-record/hooks/useGroupByRecordsQuery';import { useRecordCalendarContextOrThrow } from '@/object-record/record-calendar/contexts/RecordCalendarContext';-import { useRecordCalendarQueryDateRangeFilter } from '@/object-record/record-calendar/month/hooks/useRecordCalendarQueryDateRangeFilter';+import { useRecordCalendarQueryDateRangeFilter } from '@/object-record/record-calendar/hooks/useRecordCalendarQueryDateRangeFilter';import { useRelevantRecordsGqlFields } from '@/object-record/record-field/hooks/useRelevantRecordsGqlFields';-import { recordIndexCalendarEndFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarEndFieldMetadataIdComponentState';import { recordIndexCalendarFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarFieldMetadataIdComponentState';import { type ObjectRecord } from '@/object-record/types/ObjectRecord';import { buildGroupByFieldObject } from '@/page-layout/widgets/graph/utils/buildGroupByFieldObject';@@ -30,16 +29,10 @@ export const useRecordCalendarGroupByRecords = (const recordIndexCalendarFieldMetadataId = useAtomComponentStateValue(recordIndexCalendarFieldMetadataIdComponentState,);- const recordIndexCalendarEndFieldMetadataId = useAtomComponentStateValue(- recordIndexCalendarEndFieldMetadataIdComponentState,- );const recordGqlFields = useRelevantRecordsGqlFields({objectMetadataItem,- additionalFieldMetadataIds: [- recordIndexCalendarFieldMetadataId,- recordIndexCalendarEndFieldMetadataId,- ],+ additionalFieldMetadataIds: [recordIndexCalendarFieldMetadataId],});const { dateRangeFilter } =diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarQueryDateRangeFilter.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarQueryDateRangeFilter.tsxnew file mode 100644index 00000000000..2d975edf9ad--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarQueryDateRangeFilter.tsx@@ -0,0 +1,113 @@+import { flattenedFieldMetadataItemsSelector } from '@/object-metadata/states/flattenedFieldMetadataItemsSelector';+import { useRecordCalendarContextOrThrow } from '@/object-record/record-calendar/contexts/RecordCalendarContext';+import { useRecordCalendarDaysRange } from '@/object-record/record-calendar/hooks/useRecordCalendarDaysRange';+import { getSupportedRecordCalendarLayout } from '@/object-record/record-calendar/utils/getSupportedRecordCalendarLayout';+import { recordIndexCalendarFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarFieldMetadataIdComponentState';+import { recordIndexCalendarLayoutComponentState } from '@/object-record/record-index/states/recordIndexCalendarLayoutComponentState';+import { currentRecordFilterGroupsComponentState } from '@/object-record/record-filter-group/states/currentRecordFilterGroupsComponentState';+import { useFilterValueDependencies } from '@/object-record/record-filter/hooks/useFilterValueDependencies';+import { anyFieldFilterValueComponentState } from '@/object-record/record-filter/states/anyFieldFilterValueComponentState';+import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';+import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUserTimezone';+import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';+import { type Temporal } from 'temporal-polyfill';+import {+ combineFilters,+ computeRecordGqlOperationFilter,+ isDefined,+ turnAnyFieldFilterIntoRecordGqlFilter,+ turnPlainDateIntoUserTimeZoneInstantString,+} from 'twenty-shared/utils';+import {+ FeatureFlagKey,+ FieldMetadataType,+} from '~/generated-metadata/graphql';++export const useRecordCalendarQueryDateRangeFilter = (+ selectedDate: Temporal.PlainDate,+) => {+ const { objectMetadataItem, viewBarInstanceId } =+ useRecordCalendarContextOrThrow();+ const recordIndexCalendarLayout = useAtomComponentStateValue(+ recordIndexCalendarLayoutComponentState,+ );+ const isCalendarWeekViewEnabled = useIsFeatureEnabled(+ FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED,+ );+ const supportedCalendarLayout = getSupportedRecordCalendarLayout({+ calendarLayout: recordIndexCalendarLayout,+ isCalendarWeekViewEnabled,+ });+ const { firstDay, lastDay } = useRecordCalendarDaysRange(+ selectedDate,+ supportedCalendarLayout,+ );+ const { userTimezone } = useUserTimezone();+ const currentRecordFilterGroups = useAtomComponentStateValue(+ currentRecordFilterGroupsComponentState,+ viewBarInstanceId,+ );+ const currentRecordFilters = useAtomComponentStateValue(+ currentRecordFiltersComponentState,+ viewBarInstanceId,+ );+ const { filterValueDependencies } = useFilterValueDependencies();+ const flattenedFieldMetadataItems = useAtomStateValue(+ flattenedFieldMetadataItemsSelector,+ );+ // Widget drafts only exist in the calendar instance until the dashboard is saved.+ const recordIndexCalendarFieldMetadataId = useAtomComponentStateValue(+ recordIndexCalendarFieldMetadataIdComponentState,+ );+ const anyFieldFilterValue = useAtomComponentStateValue(+ anyFieldFilterValueComponentState,+ viewBarInstanceId,+ );+ const calendarFieldMetadataItem = objectMetadataItem.fields.find(+ (field) => field.id === recordIndexCalendarFieldMetadataId,+ );++ if (!isDefined(calendarFieldMetadataItem)) {+ return { dateRangeFilter: {} };+ }++ const nextDay = lastDay.add({ days: 1 });+ const isDateTimeField =+ calendarFieldMetadataItem.type === FieldMetadataType.DATE_TIME;+ const dateRangeFilterAfter = {+ [calendarFieldMetadataItem.name]: {+ gte: isDateTimeField+ ? turnPlainDateIntoUserTimeZoneInstantString(firstDay, userTimezone)+ : firstDay.toString(),+ },+ };+ const dateRangeFilterBefore = {+ [calendarFieldMetadataItem.name]: {+ lt: isDateTimeField+ ? turnPlainDateIntoUserTimeZoneInstantString(nextDay, userTimezone)+ : nextDay.toString(),+ },+ };+ const viewFilter = computeRecordGqlOperationFilter({+ filterValueDependencies,+ recordFilters: currentRecordFilters,+ recordFilterGroups: currentRecordFilterGroups,+ fieldMetadataItems: flattenedFieldMetadataItems,+ });+ const { recordGqlOperationFilter: anyFieldFilter } =+ turnAnyFieldFilterIntoRecordGqlFilter({+ fields: objectMetadataItem.fields,+ filterValue: anyFieldFilterValue,+ });++ return {+ dateRangeFilter: combineFilters([+ dateRangeFilterAfter,+ dateRangeFilterBefore,+ viewFilter,+ anyFieldFilter,+ ]),+ };+};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonth.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonth.tsxdeleted file mode 100644index ae6394c27dc..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonth.tsx+++ /dev/null@@ -1,57 +0,0 @@-import { RecordCalendarMonthBody } from '@/object-record/record-calendar/month/components/RecordCalendarMonthBody';-import { RecordCalendarMonthDragDropContext } from '@/object-record/record-calendar/month/components/RecordCalendarMonthDragDropContext';-import { RecordCalendarMonthHeader } from '@/object-record/record-calendar/month/components/RecordCalendarMonthHeader';-import { RecordCalendarMonthContextProvider } from '@/object-record/record-calendar/month/contexts/RecordCalendarMonthContext';-import { useRecordCalendarMonthDaysRange } from '@/object-record/record-calendar/month/hooks/useRecordCalendarMonthDaysRange';-import { recordCalendarSelectedDateComponentState } from '@/object-record/record-calendar/states/recordCalendarSelectedDateComponentState';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { styled } from '@linaria/react';-import { isDefined } from 'twenty-shared/utils';--const StyledContainer = styled.div`- display: flex;- flex-direction: column;- min-height: 100%;- min-width: 1000px;-`;--export const RecordCalendarMonth = () => {- const recordCalendarSelectedDate = useAtomComponentStateValue(- recordCalendarSelectedDateComponentState,- );-- if (!isDefined(recordCalendarSelectedDate)) {- throw new Error(`Cannot show RecordCalendarMonth without a selected date`);- }-- const {- firstDayOfMonth,- lastDayOfMonth,- firstDayOfFirstWeek,- lastDayOfLastWeek,- weekDayLabels,- weekFirstDays,- weekStartsOnDayIndex,- } = useRecordCalendarMonthDaysRange(recordCalendarSelectedDate);-- return (- <RecordCalendarMonthContextProvider- value={{- firstDayOfMonth,- lastDayOfMonth,- firstDayOfFirstWeek,- lastDayOfLastWeek,- weekDayLabels,- weekFirstDays,- weekStartsOnDayIndex,- }}- >- <RecordCalendarMonthDragDropContext>- <StyledContainer>- <RecordCalendarMonthHeader />- <RecordCalendarMonthBody />- </StyledContainer>- </RecordCalendarMonthDragDropContext>- </RecordCalendarMonthContextProvider>- );-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthBody.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthBody.tsxdeleted file mode 100644index ab16c5f8801..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthBody.tsx+++ /dev/null@@ -1,28 +0,0 @@-import { RecordCalendarMonthBodyWeek } from '@/object-record/record-calendar/month/components/RecordCalendarMonthBodyWeek';-import { useRecordCalendarMonthContextOrThrow } from '@/object-record/record-calendar/month/contexts/RecordCalendarMonthContext';-import { styled } from '@linaria/react';-import { themeCssVariables } from 'twenty-ui/theme-constants';--const StyledContainer = styled.div`- border: 1px solid ${themeCssVariables.border.color.light};- border-radius: ${themeCssVariables.border.radius.sm};- display: flex;- flex: 1;- flex-direction: column;- overflow: hidden;-`;--export const RecordCalendarMonthBody = () => {- const { weekFirstDays } = useRecordCalendarMonthContextOrThrow();-- return (- <StyledContainer>- {weekFirstDays.map((weekFirstDay) => (- <RecordCalendarMonthBodyWeek- key={`week-${weekFirstDay.toString()}`}- startDayOfWeek={weekFirstDay}- />- ))}- </StyledContainer>- );-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthBodyWeek.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthBodyWeek.tsxdeleted file mode 100644index 73cc0668d61..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthBodyWeek.tsx+++ /dev/null@@ -1,48 +0,0 @@-import { RecordCalendarMonthBodyDay } from '@/object-record/record-calendar/month/components/RecordCalendarMonthBodyDay';-import { useRecordCalendarMonthContextOrThrow } from '@/object-record/record-calendar/month/contexts/RecordCalendarMonthContext';-import { styled } from '@linaria/react';-import { themeCssVariables } from 'twenty-ui/theme-constants';-import { eachDayOfInterval, endOfWeek } from 'date-fns';-import { type Temporal } from 'temporal-polyfill';-import {- turnJSDateToPlainDate,- turnPlainDateToShiftedDateInSystemTimeZone,-} from 'twenty-shared/utils';--const StyledContainer = styled.div`- align-items: stretch;- display: flex;- flex: 1;-- &:not(:last-of-type) {- border-bottom: 1px solid ${themeCssVariables.border.color.light};- }-`;--type RecordCalendarMonthBodyWeekProps = {- startDayOfWeek: Temporal.PlainDate;-};--export const RecordCalendarMonthBodyWeek = ({- startDayOfWeek,-}: RecordCalendarMonthBodyWeekProps) => {- const { weekStartsOnDayIndex } = useRecordCalendarMonthContextOrThrow();-- const daysOfWeek = eachDayOfInterval({- start: turnPlainDateToShiftedDateInSystemTimeZone(startDayOfWeek),- end: endOfWeek(turnPlainDateToShiftedDateInSystemTimeZone(startDayOfWeek), {- weekStartsOn: weekStartsOnDayIndex,- }),- });-- return (- <StyledContainer>- {daysOfWeek.map((day, index) => (- <RecordCalendarMonthBodyDay- key={`day-${index}`}- day={turnJSDateToPlainDate(day)}- />- ))}- </StyledContainer>- );-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthHeader.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthHeader.tsxdeleted file mode 100644index ed2a7200e41..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthHeader.tsx+++ /dev/null@@ -1,21 +0,0 @@-import { RecordCalendarMonthHeaderDay } from '@/object-record/record-calendar/month/components/RecordCalendarMonthHeaderDay';-import { useRecordCalendarMonthContextOrThrow } from '@/object-record/record-calendar/month/contexts/RecordCalendarMonthContext';-import { styled } from '@linaria/react';--const StyledContainer = styled.div`- display: flex;- height: 24px;- width: 100%;-`;--export const RecordCalendarMonthHeader = () => {- const { weekDayLabels } = useRecordCalendarMonthContextOrThrow();-- return (- <StyledContainer>- {weekDayLabels.map((label, index) => (- <RecordCalendarMonthHeaderDay key={`label-${index}`} label={label} />- ))}- </StyledContainer>- );-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthHeaderDay.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthHeaderDay.tsxdeleted file mode 100644index 1d339550901..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthHeaderDay.tsx+++ /dev/null@@ -1,22 +0,0 @@-import { styled } from '@linaria/react';-import { themeCssVariables } from 'twenty-ui/theme-constants';--type RecordCalendarMonthHeaderDayProps = {- label: string;-};--const StyledLabel = styled.div`- color: ${themeCssVariables.font.color.light};- display: flex;- font-size: ${themeCssVariables.font.size.sm};- height: 24px;- justify-content: flex-end;- padding: ${themeCssVariables.spacing[0]} ${themeCssVariables.spacing[1]};- width: calc(100% / 7);-`;--export const RecordCalendarMonthHeaderDay = ({- label,-}: RecordCalendarMonthHeaderDayProps) => {- return <StyledLabel>{label}</StyledLabel>;-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/month/constants/RecordCalendarMonthDayCollisionPriority.ts b/packages/twenty-front/src/modules/object-record/record-calendar/month/constants/RecordCalendarMonthDayCollisionPriority.tsdeleted file mode 100644index e7cd8839771..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/month/constants/RecordCalendarMonthDayCollisionPriority.ts+++ /dev/null@@ -1 +0,0 @@-export const RECORD_CALENDAR_MONTH_DAY_COLLISION_PRIORITY = 2.5;diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/month/contexts/RecordCalendarMonthContext.ts b/packages/twenty-front/src/modules/object-record/record-calendar/month/contexts/RecordCalendarMonthContext.tsdeleted file mode 100644index 3cd2208e3d5..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/month/contexts/RecordCalendarMonthContext.ts+++ /dev/null@@ -1,19 +0,0 @@-import { type Temporal } from 'temporal-polyfill';-import { createRequiredContext } from '~/utils/createRequiredContext';--type RecordCalendarMonthContextValue = {- firstDayOfMonth: Temporal.PlainDate;- lastDayOfMonth: Temporal.PlainDate;- firstDayOfFirstWeek: Temporal.PlainDate;- lastDayOfLastWeek: Temporal.PlainDate;- weekDayLabels: string[];- weekFirstDays: Temporal.PlainDate[];- weekStartsOnDayIndex: 0 | 1 | 2 | 3 | 4 | 5 | 6;-};--export const [- RecordCalendarMonthContextProvider,- useRecordCalendarMonthContextOrThrow,-] = createRequiredContext<RecordCalendarMonthContextValue>(- 'RecordCalendarMonthContext',-);diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/month/hooks/useRecordCalendarMonthDaysRange.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/month/hooks/useRecordCalendarMonthDaysRange.tsxdeleted file mode 100644index b5a21e3bef3..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/month/hooks/useRecordCalendarMonthDaysRange.tsx+++ /dev/null@@ -1,93 +0,0 @@-import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';-import { CalendarStartDay } from 'twenty-shared/constants';--import { detectCalendarStartDay } from '@/localization/utils/detection/detectCalendarStartDay';-import {- addDays,- eachWeekOfInterval,- endOfWeek,- format,- startOfWeek,-} from 'date-fns';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';--import { type Temporal } from 'temporal-polyfill';-import {- turnJSDateToPlainDate,- turnPlainDateToShiftedDateInSystemTimeZone,-} from 'twenty-shared/utils';-import { dateLocaleState } from '~/localization/states/dateLocaleState';--// TODO: we could refactor this to use Temporal.PlainDate directly-// But it would require recoding the utils here, not really worth it for now-export const useRecordCalendarMonthDaysRange = (- selectedDate: Temporal.PlainDate,-) => {- const currentWorkspaceMember = useAtomStateValue(currentWorkspaceMemberState);- const dateLocale = useAtomStateValue(dateLocaleState);-- const calendarStartDay =- currentWorkspaceMember?.calendarStartDay ?? CalendarStartDay.SYSTEM;- const weekStartsOnDayIndex = (- calendarStartDay === CalendarStartDay.SYSTEM- ? CalendarStartDay[detectCalendarStartDay()]- : calendarStartDay- ) as 0 | 1 | 2 | 3 | 4 | 5 | 6;-- const firstDayOfMonth = selectedDate.with({ day: 1 });- const lastDayOfMonth = selectedDate- .with({ day: 1 })- .add({ months: 1 })- .subtract({ days: 1 });-- const shiftedFirstDayOfMonth =- turnPlainDateToShiftedDateInSystemTimeZone(firstDayOfMonth);-- const firstDayOfFirstWeek = turnJSDateToPlainDate(- startOfWeek(shiftedFirstDayOfMonth, {- weekStartsOn: weekStartsOnDayIndex,- locale: dateLocale.localeCatalog,- }),- );-- const shiftedLastDayOfMonth =- turnPlainDateToShiftedDateInSystemTimeZone(lastDayOfMonth);-- const lastDayOfLastWeek = turnJSDateToPlainDate(- endOfWeek(shiftedLastDayOfMonth, {- weekStartsOn: weekStartsOnDayIndex,- locale: dateLocale.localeCatalog,- }),- );-- const daysOfWeekLabels: string[] = [];-- for (let i = 0; i < 7; i++) {- const day = addDays(- turnPlainDateToShiftedDateInSystemTimeZone(firstDayOfFirstWeek),- i,- );- const label = format(day, 'EEE', { locale: dateLocale.localeCatalog });- daysOfWeekLabels.push(label);- }-- const weekFirstDays = eachWeekOfInterval(- {- start: turnPlainDateToShiftedDateInSystemTimeZone(firstDayOfFirstWeek),- end: turnPlainDateToShiftedDateInSystemTimeZone(lastDayOfLastWeek),- },- {- weekStartsOn: weekStartsOnDayIndex,- },- ).map(turnJSDateToPlainDate);-- return {- weekStartsOnDayIndex,- weekDayLabels: daysOfWeekLabels,- firstDayOfFirstWeek,- firstDayOfMonth,- lastDayOfMonth,- lastDayOfLastWeek,- weekFirstDays,- };-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/month/hooks/useRecordCalendarQueryDateRangeFilter.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/month/hooks/useRecordCalendarQueryDateRangeFilter.tsxdeleted file mode 100644index 4201284dc5b..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/month/hooks/useRecordCalendarQueryDateRangeFilter.tsx+++ /dev/null@@ -1,161 +0,0 @@-import { flattenedFieldMetadataItemsSelector } from '@/object-metadata/states/flattenedFieldMetadataItemsSelector';-import { useRecordCalendarContextOrThrow } from '@/object-record/record-calendar/contexts/RecordCalendarContext';-import { useRecordCalendarMonthDaysRange } from '@/object-record/record-calendar/month/hooks/useRecordCalendarMonthDaysRange';-import { getRecordCalendarDateRangeOverlapFilter } from '@/object-record/record-calendar/month/utils/getRecordCalendarDateRangeOverlapFilter';-import { recordIndexCalendarEndFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarEndFieldMetadataIdComponentState';-import { recordIndexCalendarFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarFieldMetadataIdComponentState';-import { currentRecordFilterGroupsComponentState } from '@/object-record/record-filter-group/states/currentRecordFilterGroupsComponentState';-import { useFilterValueDependencies } from '@/object-record/record-filter/hooks/useFilterValueDependencies';-import { anyFieldFilterValueComponentState } from '@/object-record/record-filter/states/anyFieldFilterValueComponentState';-import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';-import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilter';-import { RecordFilterOperand } from '@/object-record/record-filter/types/RecordFilterOperand';-import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUserTimezone';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { t } from '@lingui/core/macro';-import { type Temporal } from 'temporal-polyfill';-import {- combineFilters,- computeRecordGqlOperationFilter,- isDefined,- turnAnyFieldFilterIntoRecordGqlFilter,- turnPlainDateIntoUserTimeZoneInstantString,-} from 'twenty-shared/utils';-import { FieldMetadataType } from '~/generated-metadata/graphql';--const DATE_RANGE_FILTER_AFTER_ID = 'DATE_RANGE_FILTER_AFTER_ID';-const DATE_RANGE_FILTER_BEFORE_ID = 'DATE_RANGE_FILTER_BEFORE_ID';--export const useRecordCalendarQueryDateRangeFilter = (- selectedDate: Temporal.PlainDate,-) => {- const { objectMetadataItem, viewBarInstanceId } =- useRecordCalendarContextOrThrow();- const { firstDayOfFirstWeek, lastDayOfLastWeek } =- useRecordCalendarMonthDaysRange(selectedDate);-- const { userTimezone } = useUserTimezone();-- const currentRecordFilterGroups = useAtomComponentStateValue(- currentRecordFilterGroupsComponentState,- viewBarInstanceId,- );-- const currentRecordFilters = useAtomComponentStateValue(- currentRecordFiltersComponentState,- viewBarInstanceId,- );-- const { filterValueDependencies } = useFilterValueDependencies();-- const flattenedFieldMetadataItems = useAtomStateValue(- flattenedFieldMetadataItemsSelector,- );- // Read per calendar instance (hydrated from the draft view in widget- // edit mode, from the persisted view elsewhere) instead of the current- // view store: a widget's pending view only exists after dashboard save.- const recordIndexCalendarFieldMetadataId = useAtomComponentStateValue(- recordIndexCalendarFieldMetadataIdComponentState,- );- const recordIndexCalendarEndFieldMetadataId = useAtomComponentStateValue(- recordIndexCalendarEndFieldMetadataIdComponentState,- );-- const anyFieldFilterValue = useAtomComponentStateValue(- anyFieldFilterValueComponentState,- viewBarInstanceId,- );-- if (!isDefined(recordIndexCalendarFieldMetadataId)) {- return {- dateRangeFilter: {},- };- }-- const firstDayOfFirstWeekISOString =- turnPlainDateIntoUserTimeZoneInstantString(- firstDayOfFirstWeek,- userTimezone,- );-- const nextDayAfterLastDayOfLastWeekISOString =- turnPlainDateIntoUserTimeZoneInstantString(- lastDayOfLastWeek.add({ days: 1 }),- userTimezone,- );-- const dateRangeFilterFieldMetadataId = recordIndexCalendarFieldMetadataId;-- const calendarFieldMetadataItem = objectMetadataItem.fields.find(- (fieldMetadataItem) =>- fieldMetadataItem.id === recordIndexCalendarFieldMetadataId,- );-- const calendarEndFieldMetadataItem = objectMetadataItem.fields.find(- (fieldMetadataItem) =>- fieldMetadataItem.id === recordIndexCalendarEndFieldMetadataId,- );-- const dateRangeOverlapFilter = isDefined(calendarFieldMetadataItem)- ? getRecordCalendarDateRangeOverlapFilter({- calendarField: calendarFieldMetadataItem,- calendarEndField: calendarEndFieldMetadataItem,- firstDayOfRange:- calendarFieldMetadataItem.type === FieldMetadataType.DATE_TIME- ? firstDayOfFirstWeekISOString- : firstDayOfFirstWeek.toString(),- nextDayAfterLastDayOfRange:- calendarFieldMetadataItem.type === FieldMetadataType.DATE_TIME- ? nextDayAfterLastDayOfLastWeekISOString- : lastDayOfLastWeek.add({ days: 1 }).toString(),- })- : undefined;-- const dateRangeFilterAfter: RecordFilter = {- id: DATE_RANGE_FILTER_AFTER_ID,- fieldMetadataId: dateRangeFilterFieldMetadataId,- value: `${firstDayOfFirstWeekISOString}`,- operand: RecordFilterOperand.IS_AFTER,- type: 'DATE_TIME',- label: t`After or equal`,- displayValue: `${firstDayOfFirstWeek.toString()}`,- };-- const dateRangeFilterBefore: RecordFilter = {- id: DATE_RANGE_FILTER_BEFORE_ID,- fieldMetadataId: dateRangeFilterFieldMetadataId,- value: `${nextDayAfterLastDayOfLastWeekISOString}`,- operand: RecordFilterOperand.IS_BEFORE,- type: 'DATE_TIME',- label: t`Before`,- displayValue: `${lastDayOfLastWeek.toString()}`,- };-- const calendarRecordFilters = isDefined(dateRangeOverlapFilter)- ? currentRecordFilters- : [...currentRecordFilters, dateRangeFilterAfter, dateRangeFilterBefore];-- const dateRangeFilter = computeRecordGqlOperationFilter({- filterValueDependencies,- recordFilters: calendarRecordFilters,- recordFilterGroups: currentRecordFilterGroups,- fieldMetadataItems: flattenedFieldMetadataItems,- });-- const { recordGqlOperationFilter: anyFieldFilter } =- turnAnyFieldFilterIntoRecordGqlFilter({- fields: objectMetadataItem.fields,- filterValue: anyFieldFilterValue,- });-- const combinedFilter = combineFilters([- dateRangeFilter,- dateRangeOverlapFilter ?? {},- anyFieldFilter,- ]);-- return {- dateRangeFilter: combinedFilter,- };-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/month/utils/__tests__/getRecordCalendarDateRangeOverlapFilter.test.ts b/packages/twenty-front/src/modules/object-record/record-calendar/month/utils/__tests__/getRecordCalendarDateRangeOverlapFilter.test.tsdeleted file mode 100644index d0f72caee64..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/month/utils/__tests__/getRecordCalendarDateRangeOverlapFilter.test.ts+++ /dev/null@@ -1,113 +0,0 @@-import { getRecordCalendarDateRangeOverlapFilter } from '@/object-record/record-calendar/month/utils/getRecordCalendarDateRangeOverlapFilter';-import { FieldMetadataType } from 'twenty-shared/types';--describe('getRecordCalendarDateRangeOverlapFilter', () => {- it('matches DATE ranges that overlap the visible range', () => {- expect(- getRecordCalendarDateRangeOverlapFilter({- calendarField: {- name: 'startDate',- type: FieldMetadataType.DATE,- },- calendarEndField: {- name: 'endDate',- type: FieldMetadataType.DATE,- },- firstDayOfRange: '2026-06-29',- nextDayAfterLastDayOfRange: '2026-08-10',- }),- ).toEqual({- and: [- {- startDate: {- lt: '2026-08-10',- },- },- {- or: [- {- startDate: {- gte: '2026-06-29',- },- },- {- endDate: {- gte: '2026-06-29',- },- },- ],- },- ],- });- });-- it('returns undefined when no end field is configured', () => {- expect(- getRecordCalendarDateRangeOverlapFilter({- calendarField: {- name: 'startDate',- type: FieldMetadataType.DATE,- },- calendarEndField: undefined,- firstDayOfRange: '2026-06-29',- nextDayAfterLastDayOfRange: '2026-08-10',- }),- ).toBeUndefined();- });-- it('matches DATE_TIME ranges that overlap the visible range', () => {- expect(- getRecordCalendarDateRangeOverlapFilter({- calendarField: {- name: 'startsAt',- type: FieldMetadataType.DATE_TIME,- },- calendarEndField: {- name: 'endsAt',- type: FieldMetadataType.DATE_TIME,- },- firstDayOfRange: '2026-06-28T22:00:00Z',- nextDayAfterLastDayOfRange: '2026-08-09T22:00:00Z',- }),- ).toEqual({- and: [- {- startsAt: {- lt: '2026-08-09T22:00:00Z',- },- },- {- or: [- {- startsAt: {- gte: '2026-06-28T22:00:00Z',- },- },- {- endsAt: {- gte: '2026-06-28T22:00:00Z',- },- },- ],- },- ],- });- });-- it('returns undefined for incompatible calendar field types', () => {- expect(- getRecordCalendarDateRangeOverlapFilter({- calendarField: {- name: 'startsAt',- type: FieldMetadataType.DATE_TIME,- },- calendarEndField: {- name: 'endDate',- type: FieldMetadataType.DATE,- },- firstDayOfRange: '2026-06-28T22:00:00Z',- nextDayAfterLastDayOfRange: '2026-08-09T22:00:00Z',- }),- ).toBeUndefined();- });-});diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/month/utils/getRecordCalendarDateRangeOverlapFilter.ts b/packages/twenty-front/src/modules/object-record/record-calendar/month/utils/getRecordCalendarDateRangeOverlapFilter.tsdeleted file mode 100644index e68114e35f5..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/month/utils/getRecordCalendarDateRangeOverlapFilter.ts+++ /dev/null@@ -1,59 +0,0 @@-import {- FieldMetadataType,- type RecordGqlOperationFilter,-} from 'twenty-shared/types';--type CalendarDateField = {- name: string;- type: FieldMetadataType;-};--type GetRecordCalendarDateRangeOverlapFilterParams = {- calendarField: CalendarDateField;- calendarEndField: CalendarDateField | undefined;- firstDayOfRange: string;- nextDayAfterLastDayOfRange: string;-};--export const getRecordCalendarDateRangeOverlapFilter = ({- calendarField,- calendarEndField,- firstDayOfRange,- nextDayAfterLastDayOfRange,-}: GetRecordCalendarDateRangeOverlapFilterParams):- | RecordGqlOperationFilter- | undefined => {- const hasCompatibleDateRangeFields =- (calendarField.type === FieldMetadataType.DATE &&- calendarEndField?.type === FieldMetadataType.DATE) ||- (calendarField.type === FieldMetadataType.DATE_TIME &&- calendarEndField?.type === FieldMetadataType.DATE_TIME);-- if (!hasCompatibleDateRangeFields) {- return undefined;- }-- return {- and: [- {- [calendarField.name]: {- lt: nextDayAfterLastDayOfRange,- },- },- {- or: [- {- [calendarField.name]: {- gte: firstDayOfRange,- },- },- {- [calendarEndField.name]: {- gte: firstDayOfRange,- },- },- ],- },- ],- };-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardDragOverlayContent.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardDragOverlayContent.tsxindex fd3b6b5ba4b..7612c414605 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardDragOverlayContent.tsx+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardDragOverlayContent.tsx@@ -1,13 +1,9 @@import { type Draggable } from '@dnd-kit/dom';import { isDefined } from 'twenty-shared/utils';-import { RecordCalendarMonthContextProvider } from '@/object-record/record-calendar/month/contexts/RecordCalendarMonthContext';import { RECORD_CALENDAR_CARD_DRAG_OVERLAY_CALENDAR_DAY } from '@/object-record/record-calendar/record-calendar-card/constants/RecordCalendarCardDragOverlayCalendarDay';import { RecordCalendarCard } from '@/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard';-import { useRecordCalendarMonthDaysRange } from '@/object-record/record-calendar/month/hooks/useRecordCalendarMonthDaysRange';import { getRecordIdFromRecordCalendarCardDraggableId } from '@/object-record/record-calendar/record-calendar-card/utils/getRecordCalendarCardDraggableId';-import { recordCalendarSelectedDateComponentState } from '@/object-record/record-calendar/states/recordCalendarSelectedDateComponentState';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { RecordCalendarCardMultiDragPreview } from '@/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardMultiDragPreview';type RecordCalendarCardDragOverlayContentProps = {@@ -20,42 +16,18 @@ export const RecordCalendarCardDragOverlayContent = ({? getRecordIdFromRecordCalendarCardDraggableId(String(source.id)): '';- const recordCalendarSelectedDate = useAtomComponentStateValue(- recordCalendarSelectedDateComponentState,- );-- const {- firstDayOfMonth,- lastDayOfMonth,- firstDayOfFirstWeek,- lastDayOfLastWeek,- weekDayLabels,- weekFirstDays,- weekStartsOnDayIndex,- } = useRecordCalendarMonthDaysRange(recordCalendarSelectedDate);-if (!isDefined(source)) {return null;}return (- <RecordCalendarMonthContextProvider- value={{- firstDayOfMonth,- lastDayOfMonth,- firstDayOfFirstWeek,- lastDayOfLastWeek,- weekDayLabels,- weekFirstDays,- weekStartsOnDayIndex,- }}- >+ <><RecordCalendarCardrecordId={recordId}calendarDay={RECORD_CALENDAR_CARD_DRAG_OVERLAY_CALENDAR_DAY}isDragOverlay/><RecordCalendarCardMultiDragPreview recordId={recordId} />- </RecordCalendarMonthContextProvider>+ </>);};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardDraggableContainer.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardDraggableContainer.tsxindex 6bf590295df..9e05a83013e 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardDraggableContainer.tsx+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardDraggableContainer.tsx@@ -1,6 +1,6 @@import { styled } from '@linaria/react';-import { RECORD_CALENDAR_CARD_DND_TYPE } from '@/object-record/record-calendar/month/constants/RecordCalendarCardDndType';+import { RECORD_CALENDAR_CARD_DND_TYPE } from '@/object-record/record-calendar/constants/RecordCalendarCardDndType';import { RecordCalendarCard } from '@/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard';import { useIsRecordCalendarCardDragDisabled } from '@/object-record/record-calendar/record-calendar-card/hooks/useIsRecordCalendarCardDragDisabled';import { getRecordCalendarCardDraggableId } from '@/object-record/record-calendar/record-calendar-card/utils/getRecordCalendarCardDraggableId';diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/hooks/useIsRecordCalendarCardDragDisabled.ts b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/hooks/useIsRecordCalendarCardDragDisabled.tsindex 6c3a9afa17e..f154b4fb495 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/hooks/useIsRecordCalendarCardDragDisabled.ts+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/hooks/useIsRecordCalendarCardDragDisabled.ts@@ -4,7 +4,6 @@ import { useIsRecordReadOnly } from '@/object-record/read-only/hooks/useIsRecordimport { isFieldMetadataReadOnlyByPermissions } from '@/object-record/read-only/utils/internal/isFieldMetadataReadOnlyByPermissions';import { useRecordCalendarContextOrThrow } from '@/object-record/record-calendar/contexts/RecordCalendarContext';import { isRecordCalendarReadOnlyComponentState } from '@/object-record/record-calendar/states/isRecordCalendarReadOnlyComponentState';-import { recordIndexCalendarEndFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarEndFieldMetadataIdComponentState';import { recordIndexCalendarFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarFieldMetadataIdComponentState';import { isDefined } from 'twenty-shared/utils';@@ -24,16 +23,10 @@ export const useIsRecordCalendarCardDragDisabled = (recordId: string) => {const recordIndexCalendarFieldMetadataId = useAtomComponentStateValue(recordIndexCalendarFieldMetadataIdComponentState,);- const recordIndexCalendarEndFieldMetadataId = useAtomComponentStateValue(- recordIndexCalendarEndFieldMetadataIdComponentState,- );const calendarFieldMetadataItem = objectMetadataItem.fields.find((field) => field.id === recordIndexCalendarFieldMetadataId,);- const calendarEndFieldMetadataItem = objectMetadataItem.fields.find(- (field) => field.id === recordIndexCalendarEndFieldMetadataId,- );const calendarFieldIsReadOnly =calendarFieldMetadataItem?.isUIEditable === false ||@@ -42,18 +35,8 @@ export const useIsRecordCalendarCardDragDisabled = (recordId: string) => {objectPermissions,fieldMetadataId: calendarFieldMetadataItem.id,}));- const calendarEndFieldIsReadOnly =- calendarEndFieldMetadataItem?.isUIEditable === false ||- (isDefined(calendarEndFieldMetadataItem) &&- isFieldMetadataReadOnlyByPermissions({- objectPermissions,- fieldMetadataId: calendarEndFieldMetadataItem.id,- }));return (- isRecordCalendarReadOnly ||- recordIsReadOnly ||- calendarFieldIsReadOnly ||- calendarEndFieldIsReadOnly+ isRecordCalendarReadOnly || recordIsReadOnly || calendarFieldIsReadOnly);};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/__tests__/calendarDayRecordsComponentFamilySelector.test.ts b/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/__tests__/calendarDayRecordsComponentFamilySelector.test.tsnew file mode 100644index 00000000000..66f2e0046fa--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/__tests__/calendarDayRecordsComponentFamilySelector.test.ts@@ -0,0 +1,88 @@+import { recordCalendarRecordIdsComponentState } from '@/object-record/record-calendar/states/recordCalendarRecordIdsComponentState';+import { calendarDayRecordIdsComponentFamilySelector } from '@/object-record/record-calendar/states/selectors/calendarDayRecordsComponentFamilySelector';+import { recordIndexCalendarFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarFieldMetadataIdComponentState';+import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';+import { createStore } from 'jotai';+import { Temporal } from 'temporal-polyfill';+import { FieldMetadataType } from '~/generated-metadata/graphql';+import { getTestEnrichedObjectMetadataItemsMock } from '~/testing/utils/getTestEnrichedObjectMetadataItemsMock';+import { setTestObjectMetadataItemsInMetadataStore } from '~/testing/utils/setTestObjectMetadataItemsInMetadataStore';++const instanceId = 'calendar-test';++const createCalendarStore = (fieldType: FieldMetadataType) => {+ const store = createStore();+ const objectMetadataItem = getTestEnrichedObjectMetadataItemsMock().find(+ (object) => object.nameSingular === 'company',+ )!;+ const calendarField = {+ ...objectMetadataItem.fields.find((field) => field.name === 'createdAt')!,+ type: fieldType,+ };+ setTestObjectMetadataItemsInMetadataStore(store, [+ {+ ...objectMetadataItem,+ fields: objectMetadataItem.fields.map((field) =>+ field.id === calendarField.id ? calendarField : field,+ ),+ },+ ]);+ store.set(+ recordIndexCalendarFieldMetadataIdComponentState.atomFamily({ instanceId }),+ calendarField.id,+ );+ return store;+};++const getRecordIds = (store: ReturnType<typeof createStore>, day: string) =>+ store.get(+ calendarDayRecordIdsComponentFamilySelector.selectorFamily({+ instanceId,+ familyKey: {+ day: Temporal.PlainDate.from(day),+ timeZone: 'America/Los_Angeles',+ },+ }),+ );++describe('calendarDayRecordIdsComponentFamilySelector', () => {+ it('shows a Date record only on its selected date, ignoring other date fields', () => {+ const store = createCalendarStore(FieldMetadataType.DATE);+ store.set(recordStoreFamilyState.atomFamily('record-id'), {+ id: 'record-id',+ __typename: 'Company',+ createdAt: '2026-07-15',+ endAt: '2026-07-18',+ });+ store.set(+ recordCalendarRecordIdsComponentState.atomFamily({ instanceId }),+ ['record-id'],+ );++ expect(getRecordIds(store, '2026-07-15')).toEqual(['record-id']);+ expect(getRecordIds(store, '2026-07-16')).toEqual([]);+ });++ it('groups DateTime records by the user day, not UTC or hour, and keeps card order', () => {+ const store = createCalendarStore(FieldMetadataType.DATE_TIME);+ const records = [+ { id: 'early', createdAt: '2026-07-15T08:00:00Z', position: 2 },+ { id: 'late', createdAt: '2026-07-16T06:30:00Z', position: 1 },+ { id: 'next-day', createdAt: '2026-07-16T08:00:00Z', position: 3 },+ { id: 'invalid', createdAt: 'not-a-date', position: 4 },+ ];+ for (const record of records) {+ store.set(recordStoreFamilyState.atomFamily(record.id), {+ ...record,+ __typename: 'Company',+ });+ }+ store.set(+ recordCalendarRecordIdsComponentState.atomFamily({ instanceId }),+ records.map((record) => record.id),+ );++ expect(getRecordIds(store, '2026-07-15')).toEqual(['late', 'early']);+ expect(getRecordIds(store, '2026-07-16')).toEqual(['next-day']);+ });+});diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/calendarDayRecordsComponentFamilySelector.ts b/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/calendarDayRecordsComponentFamilySelector.tsindex 1477e584f01..d3be5c827d3 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/calendarDayRecordsComponentFamilySelector.ts+++ b/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/calendarDayRecordsComponentFamilySelector.ts@@ -3,9 +3,6 @@ import { hasObjectMetadataItemPositionField } from '@/object-metadata/utils/hasOimport { RecordCalendarComponentInstanceContext } from '@/object-record/record-calendar/states/contexts/RecordCalendarComponentInstanceContext';import { recordCalendarRecordIdsComponentState } from '@/object-record/record-calendar/states/recordCalendarRecordIdsComponentState';-import { isRecordCalendarDayInDateRange } from '@/object-record/record-calendar/utils/isRecordCalendarDayInDateRange';-import { isRecordCalendarDayInDateTimeRange } from '@/object-record/record-calendar/utils/isRecordCalendarDayInDateTimeRange';-import { recordIndexCalendarEndFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarEndFieldMetadataIdComponentState';import { recordIndexCalendarFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarFieldMetadataIdComponentState';import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';import { createAtomComponentFamilySelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentFamilySelector';@@ -29,10 +26,6 @@ export const calendarDayRecordIdsComponentFamilySelector =recordIndexCalendarFieldMetadataIdComponentState,{ instanceId },);- const calendarEndFieldMetadataId = get(- recordIndexCalendarEndFieldMetadataIdComponentState,- { instanceId },- );const objectMetadataItems = get(objectMetadataItemsSelector);const objectMetadataItem = objectMetadataItems.find(@@ -56,11 +49,6 @@ export const calendarDayRecordIdsComponentFamilySelector =return [];}- const endFieldMetadataItem = objectMetadataItem.fields.find(- (fieldMetadataItem) =>- fieldMetadataItem.id === calendarEndFieldMetadataId,- );-const allRecordIds = get(recordCalendarRecordIdsComponentState, {instanceId,});@@ -74,43 +62,18 @@ export const calendarDayRecordIdsComponentFamilySelector =return false;}- if (fieldMetadataItem.type === FieldMetadataType.DATE) {- const recordStartDate = Temporal.PlainDate.from(recordDate);- const recordEndDateValue = isDefined(endFieldMetadataItem)- ? record?.[endFieldMetadataItem.name]- : undefined;-- if (- endFieldMetadataItem?.type === FieldMetadataType.DATE &&- isNonEmptyString(recordEndDateValue)- ) {- try {- return isRecordCalendarDayInDateRange({- day,- startDate: recordStartDate,- endDate: Temporal.PlainDate.from(recordEndDateValue),- });- } catch {- return isSamePlainDate(day, recordStartDate);- }- }-- return isSamePlainDate(day, recordStartDate);- }+ try {+ const recordDay =+ fieldMetadataItem.type === FieldMetadataType.DATE+ ? Temporal.PlainDate.from(recordDate)+ : Temporal.Instant.from(recordDate)+ .toZonedDateTimeISO(timeZone)+ .toPlainDate();- const recordEndDateValue = isDefined(endFieldMetadataItem)- ? record?.[endFieldMetadataItem.name]- : undefined;-- return isRecordCalendarDayInDateTimeRange({- day,- startDateTime: recordDate,- endDateTime:- endFieldMetadataItem?.type === FieldMetadataType.DATE_TIME- ? recordEndDateValue- : undefined,- timeZone,- });+ return isSamePlainDate(day, recordDay);+ } catch {+ return false;+ }});if (diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/recordCalendarMonthSelectedRecordIdsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/recordCalendarMonthSelectedRecordIdsComponentSelector.tsdeleted file mode 100644index f0cc1407969..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/recordCalendarMonthSelectedRecordIdsComponentSelector.ts+++ /dev/null@@ -1,25 +0,0 @@-import { RecordCalendarComponentInstanceContext } from '@/object-record/record-calendar/states/contexts/RecordCalendarComponentInstanceContext';-import { isRecordCalendarCardSelectedComponentFamilyState } from '@/object-record/record-calendar/record-calendar-card/states/isRecordCalendarCardSelectedComponentFamilyState';-import { recordCalendarRecordIdsComponentState } from '@/object-record/record-calendar/states/recordCalendarRecordIdsComponentState';-import { createAtomComponentSelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentSelector';--export const recordCalendarMonthSelectedRecordIdsComponentSelector =- createAtomComponentSelector<string[]>({- key: 'recordCalendarMonthSelectedRecordIdsComponentSelector',- componentInstanceContext: RecordCalendarComponentInstanceContext,- get:- ({ instanceId }) =>- ({ get }) => {- const allRecordIds = get(recordCalendarRecordIdsComponentState, {- instanceId,- });-- return allRecordIds.filter(- (recordId) =>- get(isRecordCalendarCardSelectedComponentFamilyState, {- instanceId,- familyKey: recordId,- }) === true,- );- },- });diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/time-grid/components/RecordCalendarTimeGrid.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/time-grid/components/RecordCalendarTimeGrid.tsxdeleted file mode 100644index 6aa40a8602c..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/time-grid/components/RecordCalendarTimeGrid.tsx+++ /dev/null@@ -1,657 +0,0 @@-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useDateTimeFormat } from '@/localization/hooks/useDateTimeFormat';-import { RecordCalendarAddNew } from '@/object-record/record-calendar/components/RecordCalendarAddNew';-import { useRecordCalendarContextOrThrow } from '@/object-record/record-calendar/contexts/RecordCalendarContext';-import { calendarDayRecordIdsComponentFamilySelector } from '@/object-record/record-calendar/states/selectors/calendarDayRecordsComponentFamilySelector';-import { RecordCalendarTimeGridAllDayCell } from '@/object-record/record-calendar/time-grid/components/RecordCalendarTimeGridAllDayCell';-import { RecordCalendarWeekEvent } from '@/object-record/record-calendar/week/components/RecordCalendarWeekEvent';-import { RecordCalendarWeekDragDropContext } from '@/object-record/record-calendar/week/components/RecordCalendarWeekDragDropContext';-import { RECORD_CALENDAR_WEEK_DIMENSIONS } from '@/object-record/record-calendar/week/constants/RecordCalendarWeekDimensions';-import { computeRecordCalendarWeekEventLayouts } from '@/object-record/record-calendar/week/utils/computeRecordCalendarWeekEventLayouts';-import { getRecordCalendarWeekTimedEventMetrics } from '@/object-record/record-calendar/week/utils/getRecordCalendarWeekTimedEventMetrics';-import { getRecordCalendarWeekSlotIndex } from '@/object-record/record-calendar/week/utils/getRecordCalendarWeekSlotIndex';-import {- type RecordCalendarWeekActiveSlot,- type RecordCalendarWeekSlotInteractionMode,- updateRecordCalendarWeekActiveSlot,-} from '@/object-record/record-calendar/week/utils/updateRecordCalendarWeekActiveSlot';-import { recordIndexCalendarEndFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarEndFieldMetadataIdComponentState';-import { recordIndexCalendarFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarFieldMetadataIdComponentState';-import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';-import { TimeZoneAbbreviation } from '@/ui/input/components/internal/date/components/TimeZoneAbbreviation';-import { useAtomComponentFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorValue';-import { styled } from '@linaria/react';-import { t } from '@lingui/core/macro';-import { format } from 'date-fns';-import { formatInTimeZone } from 'date-fns-tz';-import { useStore } from 'jotai';-import {- type FocusEvent,- type KeyboardEvent,- type MouseEvent,- memo,- useCallback,- useEffect,- useRef,- useState,-} from 'react';-import { Temporal } from 'temporal-polyfill';-import {- isDefined,- isPlainDateInWeekend,- isSamePlainDate,-} from 'twenty-shared/utils';-import { themeCssVariables } from 'twenty-ui/theme-constants';-import { FieldMetadataType } from '~/generated-metadata/graphql';--const CURRENT_TIME_REFRESH_INTERVAL_IN_MILLISECONDS = 60_000;-const DEFAULT_KEYBOARD_SLOT_INDEX = 18;--const StyledContainer = styled.div<{ minWidthInPixels: number }>`- background: ${themeCssVariables.background.primary};- border: 1px solid ${themeCssVariables.border.color.light};- border-radius: ${themeCssVariables.border.radius.sm};- border-top: 0;- min-width: ${({ minWidthInPixels }) => `${minWidthInPixels}px`};- overflow: clip;-`;--const StyledHeader = styled.div<{ dayCount: number }>`- background: ${themeCssVariables.background.primary};- border-bottom: 1px solid ${themeCssVariables.border.color.light};- border-top: 1px solid ${themeCssVariables.border.color.light};- display: grid;- grid-template-columns:- ${RECORD_CALENDAR_WEEK_DIMENSIONS.timeGutterWidth}px- repeat(${({ dayCount }) => dayCount}, minmax(120px, 1fr));- position: sticky;- top: 0;- z-index: 3;-`;--const StyledHeaderGutter = styled.div`- align-items: center;- color: ${themeCssVariables.font.color.light};- display: flex;- font-size: ${themeCssVariables.font.size.xs};- height: 32px;- justify-content: flex-end;- padding-right: ${themeCssVariables.spacing[1]};-`;--const StyledDayHeader = styled.div`- align-items: center;- border-left: 1px solid ${themeCssVariables.border.color.light};- color: ${themeCssVariables.font.color.light};- display: flex;- font-size: ${themeCssVariables.font.size.sm};- gap: ${themeCssVariables.spacing[1]};- height: 32px;- justify-content: center;-`;--const StyledDayNumber = styled.span<{ isToday: boolean }>`- align-items: center;- background: ${({ isToday }) =>- isToday ? themeCssVariables.color.blue : 'transparent'};- border-radius: ${themeCssVariables.border.radius.sm};- color: ${({ isToday }) =>- isToday- ? themeCssVariables.font.color.inverted- : themeCssVariables.font.color.primary};- display: flex;- font-size: ${themeCssVariables.font.size.sm};- font-weight: ${({ isToday }) =>- isToday- ? themeCssVariables.font.weight.medium- : themeCssVariables.font.weight.regular};- height: 20px;- justify-content: center;- width: 20px;-`;--const StyledAllDayLabel = styled(StyledHeaderGutter)`- align-items: flex-start;- height: auto;- min-height: 28px;- padding-top: ${themeCssVariables.spacing[1]};-`;--const StyledAllDayGrid = styled.div<{ dayCount: number }>`- display: grid;- grid-template-columns:- ${RECORD_CALENDAR_WEEK_DIMENSIONS.timeGutterWidth}px- repeat(${({ dayCount }) => dayCount}, minmax(120px, 1fr));-`;--const StyledGrid = styled.div<{ dayCount: number }>`- display: grid;- grid-template-columns:- ${RECORD_CALENDAR_WEEK_DIMENSIONS.timeGutterWidth}px- repeat(${({ dayCount }) => dayCount}, minmax(120px, 1fr));- height: ${RECORD_CALENDAR_WEEK_DIMENSIONS.gridHeight}px;- position: relative;-`;--const StyledTimeGutter = styled.div`- height: ${RECORD_CALENDAR_WEEK_DIMENSIONS.gridHeight}px;- position: relative;-`;--const StyledHourLabel = styled.span<{ topInPixels: number }>`- color: ${themeCssVariables.font.color.light};- font-size: ${themeCssVariables.font.size.xs};- position: absolute;- right: ${themeCssVariables.spacing[1]};- top: ${({ topInPixels }) => `${topInPixels}px`};- transform: translateY(-50%);- white-space: nowrap;-`;--const StyledDayColumn = styled.div<{ isWeekend: boolean }>`- background-color: ${({ isWeekend }) =>- isWeekend- ? themeCssVariables.background.secondary- : themeCssVariables.background.primary};- background-image: repeating-linear-gradient(- to bottom,- ${themeCssVariables.border.color.light} 0,- ${themeCssVariables.border.color.light} 1px,- transparent 1px,- transparent ${RECORD_CALENDAR_WEEK_DIMENSIONS.hourHeight}px- );- border-left: 1px solid ${themeCssVariables.border.color.light};- height: ${RECORD_CALENDAR_WEEK_DIMENSIONS.gridHeight}px;- isolation: isolate;- overflow: hidden;- position: relative;-`;--const StyledSlotAddNewPositioner = styled.div<{ topInPixels: number }>`- align-items: center;- display: flex;- height: ${RECORD_CALENDAR_WEEK_DIMENSIONS.slotHeight}px;- left: ${themeCssVariables.spacing['0.5']};- pointer-events: none;- position: absolute;- right: 0;- top: ${({ topInPixels }) => `${topInPixels}px`};- z-index: 0;-- > div {- pointer-events: auto;- }-`;--const StyledCurrentTimeLine = styled.div<{ topInPixels: number }>`- background: ${themeCssVariables.color.red8};- height: 1px;- left: ${RECORD_CALENDAR_WEEK_DIMENSIONS.timeGutterWidth}px;- pointer-events: none;- position: absolute;- right: 0;- top: ${({ topInPixels }) => `${topInPixels}px`};- z-index: 2;-- &::after {- background: ${themeCssVariables.color.red8};- border-radius: 50%;- content: '';- height: 5px;- left: -2px;- position: absolute;- top: -2px;- width: 5px;- }-`;--const StyledCurrentTimeLabel = styled.span<{ topInPixels: number }>`- background: ${themeCssVariables.background.primary};- color: ${themeCssVariables.color.red9};- font-size: ${themeCssVariables.font.size.xs};- padding-right: ${themeCssVariables.spacing['0.5']};- position: absolute;- right: calc(100% - ${RECORD_CALENDAR_WEEK_DIMENSIONS.timeGutterWidth - 1}px);- top: ${({ topInPixels }) => `${topInPixels}px`};- transform: translateY(-50%);- white-space: nowrap;- z-index: 3;-`;--const StyledScrollAnchor = styled.div<{ topInPixels: number }>`- height: 1px;- left: 0;- pointer-events: none;- position: absolute;- top: ${({ topInPixels }) => `${topInPixels}px`};- width: 1px;-`;--type WeekDayCellProps = {- calendarEndFieldName?: string;- calendarFieldName: string;- calendarFieldType: FieldMetadataType;- day: Temporal.PlainDate;- timeFormat: string;- timeZone: string;-};--type RecordCalendarWeekDayColumnProps = Omit<WeekDayCellProps, 'day'> & {- activeSlotIndex: number | null;- dayString: string;- onActiveSlotIndexChange: (- day: string,- slotIndex: number | null,- interactionMode: RecordCalendarWeekSlotInteractionMode,- ) => void;-};--const RecordCalendarWeekDayColumn = memo(- ({- activeSlotIndex,- calendarEndFieldName,- calendarFieldName,- calendarFieldType,- dayString,- onActiveSlotIndexChange,- timeFormat,- timeZone,- }: RecordCalendarWeekDayColumnProps) => {- const day = Temporal.PlainDate.from(dayString);- const store = useStore();- const recordIds = useAtomComponentFamilySelectorValue(- calendarDayRecordIdsComponentFamilySelector,- { day, timeZone },- );-- const eventLayoutInputs =- calendarFieldType === FieldMetadataType.DATE- ? []- : recordIds- .map((recordId) => {- const record = store.get(- recordStoreFamilyState.atomFamily(recordId),- );- const recordDate = record?.[calendarFieldName];- const recordEndDate = isDefined(calendarEndFieldName)- ? record?.[calendarEndFieldName]- : undefined;- const metrics = getRecordCalendarWeekTimedEventMetrics({- day,- startDateTime: recordDate,- endDateTime: recordEndDate,- timeZone,- });-- if (metrics === null) {- return null;- }-- return {- ...metrics,- recordId,- };- })- .filter(isDefined);-- const eventLayouts =- computeRecordCalendarWeekEventLayouts(eventLayoutInputs);-- const handleMouseMove = (event: MouseEvent<HTMLDivElement>) => {- if (- event.target instanceof Element &&- event.target.closest('[data-selectable-id]') !== null- ) {- onActiveSlotIndexChange(dayString, null, 'pointer');- return;- }-- const columnRect = event.currentTarget.getBoundingClientRect();-- onActiveSlotIndexChange(- dayString,- getRecordCalendarWeekSlotIndex({- columnHeight: columnRect.height,- columnTop: columnRect.top,- pointerY: event.clientY,- }),- 'pointer',- );- };-- const handleFocus = (event: FocusEvent<HTMLDivElement>) => {- if (- event.target === event.currentTarget &&- event.currentTarget.matches(':focus-visible')- ) {- onActiveSlotIndexChange(- dayString,- activeSlotIndex ?? DEFAULT_KEYBOARD_SLOT_INDEX,- 'keyboard',- );- }- };-- const handleBlur = (event: FocusEvent<HTMLDivElement>) => {- if (!event.currentTarget.contains(event.relatedTarget)) {- onActiveSlotIndexChange(dayString, null, 'keyboard');- }- };-- const handleKeyDown = (event: KeyboardEvent<HTMLDivElement>) => {- if (event.target !== event.currentTarget) {- return;- }-- const slotCount =- (RECORD_CALENDAR_WEEK_DIMENSIONS.hoursInDay * 60) /- RECORD_CALENDAR_WEEK_DIMENSIONS.snapIntervalInMinutes;-- if (event.key === 'ArrowDown' || event.key === 'ArrowUp') {- event.preventDefault();-- const slotDelta = event.key === 'ArrowDown' ? 1 : -1;-- onActiveSlotIndexChange(- dayString,- Math.min(- slotCount - 1,- Math.max(- 0,- (activeSlotIndex ?? DEFAULT_KEYBOARD_SLOT_INDEX) + slotDelta,- ),- ),- 'keyboard',- );- }- };-- return (- <StyledDayColumn- aria-label={day.toLocaleString(undefined, { dateStyle: 'full' })}- isWeekend={isPlainDateInWeekend(day)}- onBlur={handleBlur}- onFocus={handleFocus}- onKeyDown={handleKeyDown}- onMouseLeave={() => onActiveSlotIndexChange(dayString, null, 'pointer')}- onMouseMove={handleMouseMove}- tabIndex={0}- >- {isDefined(activeSlotIndex) && (- <StyledSlotAddNewPositioner- data-testid="record-calendar-week-slot-add"- topInPixels={- activeSlotIndex * RECORD_CALENDAR_WEEK_DIMENSIONS.slotHeight- }- >- <RecordCalendarAddNew- cardDate={day}- cardTime={Temporal.PlainTime.from('00:00').add({- minutes:- activeSlotIndex *- RECORD_CALENDAR_WEEK_DIMENSIONS.snapIntervalInMinutes,- })}- compact- />- </StyledSlotAddNewPositioner>- )}- {eventLayouts.map(- ({- columnCount,- columnIndex,- endInPixels,- recordId,- startInPixels,- }) => (- <RecordCalendarWeekEvent- key={recordId}- calendarDay={day}- calendarEndFieldName={calendarEndFieldName}- calendarFieldName={calendarFieldName}- calendarFieldType={calendarFieldType}- columnCount={columnCount}- columnIndex={columnIndex}- endInPixels={endInPixels}- isAllDay={false}- recordId={recordId}- startInPixels={startInPixels}- timeFormat={timeFormat}- timeZone={timeZone}- />- ),- )}- </StyledDayColumn>- );- },-);--export type RecordCalendarTimeGridDay = {- date: Temporal.PlainDate;- label: string;-};--type RecordCalendarTimeGridProps = {- days: readonly RecordCalendarTimeGridDay[];- minWidthInPixels?: number;-};--export const RecordCalendarTimeGrid = ({- days,- minWidthInPixels = 0,-}: RecordCalendarTimeGridProps) => {- const { objectMetadataItem } = useRecordCalendarContextOrThrow();- const { timeFormat, timeZone } = useDateTimeFormat();- const recordIndexCalendarFieldMetadataId = useAtomComponentStateValue(- recordIndexCalendarFieldMetadataIdComponentState,- );- const recordIndexCalendarEndFieldMetadataId = useAtomComponentStateValue(- recordIndexCalendarEndFieldMetadataIdComponentState,- );- const scrollAnchorRef = useRef<HTMLDivElement>(null);- const gridRef = useRef<HTMLDivElement>(null);- const [currentInstant, setCurrentInstant] = useState(() =>- Temporal.Now.instant(),- );- const [activeSlot, setActiveSlot] =- useState<RecordCalendarWeekActiveSlot | null>(null);-- const handleActiveSlotIndexChange = useCallback(- (- day: string,- slotIndex: number | null,- interactionMode: RecordCalendarWeekSlotInteractionMode,- ) => {- setActiveSlot((currentActiveSlot) =>- updateRecordCalendarWeekActiveSlot({- currentActiveSlot,- day,- interactionMode,- slotIndex,- }),- );- },- [],- );-- const clearActivePointerSlot = useCallback(() => {- setActiveSlot((currentActiveSlot) =>- currentActiveSlot?.interactionMode === 'pointer'- ? null- : currentActiveSlot,- );- }, []);-- useEffect(() => {- const handleDocumentMouseMove = (event: globalThis.MouseEvent) => {- const eventTarget = event.target;-- if (- !(eventTarget instanceof Node) ||- gridRef.current?.contains(eventTarget) !== true- ) {- clearActivePointerSlot();- }- };-- const clearActiveSlot = () => setActiveSlot(null);-- document.addEventListener('mousemove', handleDocumentMouseMove);- document.addEventListener('mouseleave', clearActivePointerSlot);- window.addEventListener('blur', clearActiveSlot);-- return () => {- document.removeEventListener('mousemove', handleDocumentMouseMove);- document.removeEventListener('mouseleave', clearActivePointerSlot);- window.removeEventListener('blur', clearActiveSlot);- };- }, [clearActivePointerSlot]);-- const calendarFieldMetadataItem = objectMetadataItem.fields.find(- (field) => field.id === recordIndexCalendarFieldMetadataId,- );- const calendarEndFieldMetadataItem = objectMetadataItem.fields.find(- (field) => field.id === recordIndexCalendarEndFieldMetadataId,- );-- const now = currentInstant.toZonedDateTimeISO(timeZone);- const today = now.toPlainDate();- const isCurrentPeriod = days.some(({ date }) => isSamePlainDate(date, today));- const currentTimeTopInPixels =- (now.hour + now.minute / 60) * RECORD_CALENDAR_WEEK_DIMENSIONS.hourHeight;- const initialScrollHour = isCurrentPeriod ? Math.max(now.hour - 2, 0) : 8;- const periodKey = days.map(({ date }) => date.toString()).join(',');-- useEffect(() => {- const intervalId = window.setInterval(() => {- setCurrentInstant(Temporal.Now.instant());- }, CURRENT_TIME_REFRESH_INTERVAL_IN_MILLISECONDS);-- return () => window.clearInterval(intervalId);- }, []);-- const isAllDayView =- calendarFieldMetadataItem?.type === FieldMetadataType.DATE;- const isTimedView =- calendarFieldMetadataItem?.type === FieldMetadataType.DATE_TIME;- const compatibleCalendarEndFieldName =- isTimedView &&- calendarEndFieldMetadataItem?.type === FieldMetadataType.DATE_TIME- ? calendarEndFieldMetadataItem.name- : undefined;-- useEffect(() => {- if (!isTimedView) {- return;- }-- scrollAnchorRef.current?.scrollIntoView({- block: 'center',- inline: 'nearest',- });- }, [isTimedView, periodKey]);-- if (- !isDefined(calendarFieldMetadataItem) ||- (!isAllDayView && !isTimedView)- ) {- return null;- }-- return (- <RecordCalendarWeekDragDropContext- days={days.map(({ date }) => date)}- gridRef={gridRef}- >- <StyledContainer minWidthInPixels={minWidthInPixels}>- <StyledHeader dayCount={days.length}>- <StyledHeaderGutter>- {isTimedView && <TimeZoneAbbreviation instant={currentInstant} />}- </StyledHeaderGutter>- {days.map(({ date, label }) => {- const isToday = isSamePlainDate(date, today);-- return (- <StyledDayHeader key={date.toString()}>- <span>{label}</span>- <StyledDayNumber isToday={isToday}>{date.day}</StyledDayNumber>- </StyledDayHeader>- );- })}- </StyledHeader>- {isAllDayView && (- <StyledAllDayGrid dayCount={days.length}>- <StyledAllDayLabel>{t`All day`}</StyledAllDayLabel>- {days.map(({ date }) => (- <RecordCalendarTimeGridAllDayCell- key={`all-day-${date.toString()}`}- calendarFieldType={calendarFieldMetadataItem.type}- day={date}- timeZone={timeZone}- />- ))}- </StyledAllDayGrid>- )}- {isTimedView && (- <StyledGrid- ref={gridRef}- dayCount={days.length}- onMouseLeave={clearActivePointerSlot}- >- <StyledTimeGutter>- {Array.from(- { length: RECORD_CALENDAR_WEEK_DIMENSIONS.hoursInDay },- (_, hour) => (- <StyledHourLabel- key={hour}- topInPixels={- hour * RECORD_CALENDAR_WEEK_DIMENSIONS.hourHeight- }- >- {format(new Date(2000, 0, 1, hour), timeFormat)}- </StyledHourLabel>- ),- )}- <StyledScrollAnchor- ref={scrollAnchorRef}- topInPixels={- initialScrollHour * RECORD_CALENDAR_WEEK_DIMENSIONS.hourHeight- }- />- </StyledTimeGutter>- {days.map(({ date }) => {- const dateString = date.toString();-- return (- <RecordCalendarWeekDayColumn- key={dateString}- activeSlotIndex={- activeSlot?.day === dateString ? activeSlot.slotIndex : null- }- calendarEndFieldName={compatibleCalendarEndFieldName}- calendarFieldName={calendarFieldMetadataItem.name}- calendarFieldType={calendarFieldMetadataItem.type}- dayString={dateString}- onActiveSlotIndexChange={handleActiveSlotIndexChange}- timeFormat={timeFormat}- timeZone={timeZone}- />- );- })}- {isCurrentPeriod && (- <>- <StyledCurrentTimeLine topInPixels={currentTimeTopInPixels} />- <StyledCurrentTimeLabel topInPixels={currentTimeTopInPixels}>- {formatInTimeZone(- new Date(currentInstant.toString()),- timeZone,- timeFormat,- )}- </StyledCurrentTimeLabel>- </>- )}- </StyledGrid>- )}- </StyledContainer>- </RecordCalendarWeekDragDropContext>- );-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/time-grid/components/RecordCalendarTimeGridAllDayCell.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/time-grid/components/RecordCalendarTimeGridAllDayCell.tsxdeleted file mode 100644index cf272f1672b..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/time-grid/components/RecordCalendarTimeGridAllDayCell.tsx+++ /dev/null@@ -1,55 +0,0 @@-import { RecordCalendarCard } from '@/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard';-import { calendarDayRecordIdsComponentFamilySelector } from '@/object-record/record-calendar/states/selectors/calendarDayRecordsComponentFamilySelector';-import { useAtomComponentFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorValue';-import { styled } from '@linaria/react';-import { type Temporal } from 'temporal-polyfill';-import { themeCssVariables } from 'twenty-ui/theme-constants';-import { FieldMetadataType } from '~/generated-metadata/graphql';--const StyledAllDayCell = styled.div`- border-left: 1px solid ${themeCssVariables.border.color.light};- display: flex;- flex-direction: column;- gap: ${themeCssVariables.spacing['0.5']};- min-height: 28px;- min-width: 0;- padding: ${themeCssVariables.spacing['0.5']};-`;--const StyledCardContainer = styled.div`- min-width: 0;- position: relative;-`;--type RecordCalendarTimeGridAllDayCellProps = {- calendarFieldType: FieldMetadataType;- day: Temporal.PlainDate;- timeZone: string;-};--export const RecordCalendarTimeGridAllDayCell = ({- calendarFieldType,- day,- timeZone,-}: RecordCalendarTimeGridAllDayCellProps) => {- const recordIds = useAtomComponentFamilySelectorValue(- calendarDayRecordIdsComponentFamilySelector,- { day, timeZone },- );-- const allDayRecordIds =- calendarFieldType === FieldMetadataType.DATE ? recordIds : [];-- return (- <StyledAllDayCell>- {allDayRecordIds.map((recordId) => (- <StyledCardContainer key={recordId} data-selectable-id={recordId}>- <RecordCalendarCard- recordId={recordId}- calendarDay={day.toString()}- />- </StyledCardContainer>- ))}- </StyledAllDayCell>- );-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/time-grid/components/__tests__/RecordCalendarTimeGridAllDayCell.test.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/time-grid/components/__tests__/RecordCalendarTimeGridAllDayCell.test.tsxdeleted file mode 100644index 255d3f677d3..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/time-grid/components/__tests__/RecordCalendarTimeGridAllDayCell.test.tsx+++ /dev/null@@ -1,64 +0,0 @@-import { render, screen } from '@testing-library/react';-import { Temporal } from 'temporal-polyfill';--import { RecordCalendarTimeGridAllDayCell } from '@/object-record/record-calendar/time-grid/components/RecordCalendarTimeGridAllDayCell';-import { FieldMetadataType } from '~/generated-metadata/graphql';--const mockUseAtomComponentFamilySelectorValue = jest.fn();--jest.mock(- '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorValue',- () => ({- useAtomComponentFamilySelectorValue: (...args: unknown[]) =>- mockUseAtomComponentFamilySelectorValue(...args),- }),-);-jest.mock(- '@/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard',- () => ({- RecordCalendarCard: ({ recordId }: { recordId: string }) => (- <div data-testid="all-day-card" data-record-id={recordId} />- ),- }),-);--describe('RecordCalendarTimeGridAllDayCell', () => {- it('renders every all-day record in order', () => {- mockUseAtomComponentFamilySelectorValue.mockReturnValue([- 'first',- 'second',- 'third',- 'fourth',- 'fifth',- ]);-- render(- <RecordCalendarTimeGridAllDayCell- calendarFieldType={FieldMetadataType.DATE}- day={Temporal.PlainDate.from('2026-07-15')}- timeZone="UTC"- />,- );-- expect(- screen- .getAllByTestId('all-day-card')- .map((element) => element.dataset.recordId),- ).toEqual(['first', 'second', 'third', 'fourth', 'fifth']);- expect(screen.queryByText(/^\+\d+$/)).not.toBeInTheDocument();- });-- it('does not render DATE_TIME records in the all-day cell', () => {- mockUseAtomComponentFamilySelectorValue.mockReturnValue(['first']);-- render(- <RecordCalendarTimeGridAllDayCell- calendarFieldType={FieldMetadataType.DATE_TIME}- day={Temporal.PlainDate.from('2026-07-15')}- timeZone="UTC"- />,- );-- expect(screen.queryByTestId('all-day-card')).not.toBeInTheDocument();- });-});diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/formatRecordCalendarWeekRange.test.ts b/packages/twenty-front/src/modules/object-record/record-calendar/utils/__tests__/formatRecordCalendarWeekRange.test.tssimilarity index 95%rename from packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/formatRecordCalendarWeekRange.test.tsrename to packages/twenty-front/src/modules/object-record/record-calendar/utils/__tests__/formatRecordCalendarWeekRange.test.tsindex 72497954c53..cb3f5daf502 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/formatRecordCalendarWeekRange.test.ts+++ b/packages/twenty-front/src/modules/object-record/record-calendar/utils/__tests__/formatRecordCalendarWeekRange.test.ts@@ -1,4 +1,4 @@-import { formatRecordCalendarWeekRange } from '@/object-record/record-calendar/week/utils/formatRecordCalendarWeekRange';+import { formatRecordCalendarWeekRange } from '@/object-record/record-calendar/utils/formatRecordCalendarWeekRange';import { enUS } from 'date-fns/locale';import { Temporal } from 'temporal-polyfill';diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/utils/__tests__/getEffectiveRecordCalendarEndFieldMetadataId.test.ts b/packages/twenty-front/src/modules/object-record/record-calendar/utils/__tests__/getEffectiveRecordCalendarEndFieldMetadataId.test.tsdeleted file mode 100644index badc68104d2..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/utils/__tests__/getEffectiveRecordCalendarEndFieldMetadataId.test.ts+++ /dev/null@@ -1,33 +0,0 @@-import { getEffectiveRecordCalendarEndFieldMetadataId } from '@/object-record/record-calendar/utils/getEffectiveRecordCalendarEndFieldMetadataId';--describe('getEffectiveRecordCalendarEndFieldMetadataId', () => {- it('keeps the configured end field when the week view is enabled', () => {- expect(- getEffectiveRecordCalendarEndFieldMetadataId({- calendarEndFieldMetadataId: 'end-field-id',- isCalendarWeekViewEnabled: true,- }),- ).toBe('end-field-id');- });-- it.each([null, undefined])(- 'normalizes %s to null when the week view is enabled',- (calendarEndFieldMetadataId) => {- expect(- getEffectiveRecordCalendarEndFieldMetadataId({- calendarEndFieldMetadataId,- isCalendarWeekViewEnabled: true,- }),- ).toBeNull();- },- );-- it('makes a configured end field inert when the week view is disabled', () => {- expect(- getEffectiveRecordCalendarEndFieldMetadataId({- calendarEndFieldMetadataId: 'end-field-id',- isCalendarWeekViewEnabled: false,- }),- ).toBeNull();- });-});diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/utils/__tests__/getRecordCalendarDaysRange.test.ts b/packages/twenty-front/src/modules/object-record/record-calendar/utils/__tests__/getRecordCalendarDaysRange.test.tsnew file mode 100644index 00000000000..74ac7b4f611--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-calendar/utils/__tests__/getRecordCalendarDaysRange.test.ts@@ -0,0 +1,42 @@+import { getRecordCalendarDaysRange } from '@/object-record/record-calendar/utils/getRecordCalendarDaysRange';+import { Temporal } from 'temporal-polyfill';+import { ViewCalendarLayout } from '~/generated-metadata/graphql';++describe('getRecordCalendarDaysRange', () => {+ it.each([+ [ViewCalendarLayout.DAY, '2026-07-15', 1, '2026-07-15', '2026-07-15', 1],+ [ViewCalendarLayout.WEEK, '2026-07-15', 1, '2026-07-13', '2026-07-19', 1],+ [ViewCalendarLayout.WEEK, '2026-01-01', 0, '2025-12-28', '2026-01-03', 1],+ [ViewCalendarLayout.MONTH, '2026-07-15', 1, '2026-06-29', '2026-08-02', 5],+ [ViewCalendarLayout.MONTH, '2026-08-15', 1, '2026-07-27', '2026-09-06', 6],+ [ViewCalendarLayout.MONTH, '2024-02-15', 0, '2024-01-28', '2024-03-02', 5],+ [ViewCalendarLayout.MONTH, '2026-02-15', 0, '2026-02-01', '2026-02-28', 4],+ ])(+ '%s around %s with week start %s covers %s through %s in %s rows',+ (+ calendarLayout,+ selectedDate,+ weekStartsOnDayIndex,+ firstDay,+ lastDay,+ rowCount,+ ) => {+ const range = getRecordCalendarDaysRange({+ selectedDate: Temporal.PlainDate.from(selectedDate),+ calendarLayout,+ weekStartsOnDayIndex,+ });++ expect(range.firstDay.toString()).toBe(firstDay);+ expect(range.lastDay.toString()).toBe(lastDay);+ expect(range.days).toHaveLength(rowCount);+ const daysPerRow = calendarLayout === ViewCalendarLayout.DAY ? 1 : 7;+ expect(range.days.every((row) => row.length === daysPerRow)).toBe(true);+ expect(range.days.flat().map((day) => day.toString())).toEqual(+ Array.from({ length: rowCount * daysPerRow }, (_, index) =>+ Temporal.PlainDate.from(firstDay).add({ days: index }).toString(),+ ),+ );+ },+ );+});diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/utils/__tests__/isRecordCalendarDayInDateRange.test.ts b/packages/twenty-front/src/modules/object-record/record-calendar/utils/__tests__/isRecordCalendarDayInDateRange.test.tsdeleted file mode 100644index 6857105b444..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/utils/__tests__/isRecordCalendarDayInDateRange.test.ts+++ /dev/null@@ -1,43 +0,0 @@-import { isRecordCalendarDayInDateRange } from '@/object-record/record-calendar/utils/isRecordCalendarDayInDateRange';-import { Temporal } from 'temporal-polyfill';--describe('isRecordCalendarDayInDateRange', () => {- const startDate = Temporal.PlainDate.from('2026-07-06');- const endDate = Temporal.PlainDate.from('2026-07-08');-- it.each([- ['2026-07-05', false],- ['2026-07-06', true],- ['2026-07-07', true],- ['2026-07-08', true],- ['2026-07-09', false],- ])('checks whether %s is inside the inclusive range', (day, expected) => {- expect(- isRecordCalendarDayInDateRange({- day: Temporal.PlainDate.from(day),- startDate,- endDate,- }),- ).toBe(expected);- });-- it.each([undefined, null, Temporal.PlainDate.from('2026-07-05')])(- 'falls back to the start day for an unusable end date',- (unusableEndDate) => {- expect(- isRecordCalendarDayInDateRange({- day: startDate,- startDate,- endDate: unusableEndDate,- }),- ).toBe(true);- expect(- isRecordCalendarDayInDateRange({- day: startDate.add({ days: 1 }),- startDate,- endDate: unusableEndDate,- }),- ).toBe(false);- },- );-});diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/utils/__tests__/isRecordCalendarDayInDateTimeRange.test.ts b/packages/twenty-front/src/modules/object-record/record-calendar/utils/__tests__/isRecordCalendarDayInDateTimeRange.test.tsdeleted file mode 100644index 6371d88bf1e..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/utils/__tests__/isRecordCalendarDayInDateTimeRange.test.ts+++ /dev/null@@ -1,55 +0,0 @@-import { isRecordCalendarDayInDateTimeRange } from '@/object-record/record-calendar/utils/isRecordCalendarDayInDateTimeRange';-import { Temporal } from 'temporal-polyfill';--const timeZone = 'Europe/Paris';--describe('isRecordCalendarDayInDateTimeRange', () => {- it.each([- ['2026-07-07', false],- ['2026-07-08', true],- ['2026-07-09', true],- ['2026-07-10', true],- ['2026-07-11', false],- ])('matches the overlapping days of a multi-day event: %s', (day, result) => {- expect(- isRecordCalendarDayInDateTimeRange({- day: Temporal.PlainDate.from(day),- startDateTime: '2026-07-08T15:59:00Z',- endDateTime: '2026-07-10T18:59:00Z',- timeZone,- }),- ).toBe(result);- });-- it('does not include the next day when an event ends exactly at midnight', () => {- expect(- isRecordCalendarDayInDateTimeRange({- day: Temporal.PlainDate.from('2026-07-10'),- startDateTime: '2026-07-08T15:59:00Z',- endDateTime: '2026-07-09T22:00:00Z',- timeZone,- }),- ).toBe(false);- });-- it('uses the one-hour fallback when the end is unusable', () => {- expect(- isRecordCalendarDayInDateTimeRange({- day: Temporal.PlainDate.from('2026-07-09'),- startDateTime: '2026-07-08T21:30:00Z',- endDateTime: 'not-a-date',- timeZone,- }),- ).toBe(true);- });-- it('returns false when the start is unusable', () => {- expect(- isRecordCalendarDayInDateTimeRange({- day: Temporal.PlainDate.from('2026-07-08'),- startDateTime: 'not-a-date',- timeZone,- }),- ).toBe(false);- });-});diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/formatRecordCalendarWeekRange.ts b/packages/twenty-front/src/modules/object-record/record-calendar/utils/formatRecordCalendarWeekRange.tssimilarity index 100%rename from packages/twenty-front/src/modules/object-record/record-calendar/week/utils/formatRecordCalendarWeekRange.tsrename to packages/twenty-front/src/modules/object-record/record-calendar/utils/formatRecordCalendarWeekRange.tsdiff --git a/packages/twenty-front/src/modules/object-record/record-calendar/utils/getEffectiveRecordCalendarEndFieldMetadataId.ts b/packages/twenty-front/src/modules/object-record/record-calendar/utils/getEffectiveRecordCalendarEndFieldMetadataId.tsdeleted file mode 100644index d5896b528bf..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/utils/getEffectiveRecordCalendarEndFieldMetadataId.ts+++ /dev/null@@ -1,10 +0,0 @@-type GetEffectiveRecordCalendarEndFieldMetadataIdArgs = {- calendarEndFieldMetadataId: string | null | undefined;- isCalendarWeekViewEnabled: boolean;-};--export const getEffectiveRecordCalendarEndFieldMetadataId = ({- calendarEndFieldMetadataId,- isCalendarWeekViewEnabled,-}: GetEffectiveRecordCalendarEndFieldMetadataIdArgs) =>- isCalendarWeekViewEnabled ? (calendarEndFieldMetadataId ?? null) : null;diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/utils/getRecordCalendarDateTimeRange.ts b/packages/twenty-front/src/modules/object-record/record-calendar/utils/getRecordCalendarDateTimeRange.tsdeleted file mode 100644index 691bc466920..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/utils/getRecordCalendarDateTimeRange.ts+++ /dev/null@@ -1,45 +0,0 @@-import { Temporal } from 'temporal-polyfill';--type GetRecordCalendarDateTimeRangeArgs = {- endDateTime?: unknown;- startDateTime: unknown;- timeZone: string;-};--export type RecordCalendarDateTimeRange = {- end: Temporal.ZonedDateTime;- isEndDateTimeFallback: boolean;- start: Temporal.ZonedDateTime;-};--const getZonedDateTimeFromValue = (value: unknown, timeZone: string) => {- if (typeof value !== 'string') {- return null;- }-- try {- return Temporal.Instant.from(value).toZonedDateTimeISO(timeZone);- } catch {- return null;- }-};--export const getRecordCalendarDateTimeRange = ({- endDateTime,- startDateTime,- timeZone,-}: GetRecordCalendarDateTimeRangeArgs): RecordCalendarDateTimeRange | null => {- const start = getZonedDateTimeFromValue(startDateTime, timeZone);-- if (start === null) {- return null;- }-- const configuredEnd = getZonedDateTimeFromValue(endDateTime, timeZone);- const isEndDateTimeFallback =- configuredEnd === null ||- Temporal.Instant.compare(configuredEnd.toInstant(), start.toInstant()) <= 0;- const end = isEndDateTimeFallback ? start.add({ hours: 1 }) : configuredEnd;-- return { end, isEndDateTimeFallback, start };-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/utils/getRecordCalendarDaysRange.ts b/packages/twenty-front/src/modules/object-record/record-calendar/utils/getRecordCalendarDaysRange.tsnew file mode 100644index 00000000000..c868a693bfc--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-calendar/utils/getRecordCalendarDaysRange.ts@@ -0,0 +1,38 @@+import { type Temporal } from 'temporal-polyfill';+import { ViewCalendarLayout } from '~/generated-metadata/graphql';++export const getRecordCalendarDaysRange = ({+ selectedDate,+ calendarLayout,+ weekStartsOnDayIndex,+}: {+ selectedDate: Temporal.PlainDate;+ calendarLayout: ViewCalendarLayout;+ weekStartsOnDayIndex: number;+}) => {+ const isDayLayout = calendarLayout === ViewCalendarLayout.DAY;+ const isMonthLayout = calendarLayout === ViewCalendarLayout.MONTH;+ const periodStart = isMonthLayout+ ? selectedDate.with({ day: 1 })+ : selectedDate;+ const daysSinceStartOfWeek =+ ((periodStart.dayOfWeek % 7) - weekStartsOnDayIndex + 7) % 7;+ const firstDay = isDayLayout+ ? selectedDate+ : periodStart.subtract({ days: daysSinceStartOfWeek });+ const daysPerRow = isDayLayout ? 1 : 7;+ const rowCount = isMonthLayout+ ? Math.ceil((daysSinceStartOfWeek + selectedDate.daysInMonth) / 7)+ : 1;+ const days = Array.from({ length: rowCount }, (_, rowIndex) =>+ Array.from({ length: daysPerRow }, (_, dayIndex) =>+ firstDay.add({ days: rowIndex * daysPerRow + dayIndex }),+ ),+ );++ return {+ firstDay,+ lastDay: firstDay.add({ days: rowCount * daysPerRow - 1 }),+ days,+ };+};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/utils/getSupportedRecordCalendarLayout.ts b/packages/twenty-front/src/modules/object-record/record-calendar/utils/getSupportedRecordCalendarLayout.tsindex 2ccff378b88..3f6e79f7209 100644--- a/packages/twenty-front/src/modules/object-record/record-calendar/utils/getSupportedRecordCalendarLayout.ts+++ b/packages/twenty-front/src/modules/object-record/record-calendar/utils/getSupportedRecordCalendarLayout.ts@@ -9,11 +9,11 @@ export const getSupportedRecordCalendarLayout = ({calendarLayout,isCalendarWeekViewEnabled,}: GetSupportedRecordCalendarLayoutArgs) => {- const isTimeGridLayout =+ const isWeekOrDayLayout =calendarLayout === ViewCalendarLayout.DAY ||calendarLayout === ViewCalendarLayout.WEEK;- return isCalendarWeekViewEnabled && isTimeGridLayout+ return isCalendarWeekViewEnabled && isWeekOrDayLayout? calendarLayout: ViewCalendarLayout.MONTH;};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/utils/groupCalendarFieldMetadataItemsByType.ts b/packages/twenty-front/src/modules/object-record/record-calendar/utils/groupCalendarFieldMetadataItemsByType.tsdeleted file mode 100644index 586e771292d..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/utils/groupCalendarFieldMetadataItemsByType.ts+++ /dev/null@@ -1,20 +0,0 @@-import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';-import { SETTINGS_NON_COMPOSITE_FIELD_TYPE_CONFIGS } from '@/settings/data-model/constants/SettingsNonCompositeFieldTypeConfigs';-import { FieldMetadataType } from '~/generated-metadata/graphql';--const CALENDAR_FIELD_METADATA_TYPES = [- FieldMetadataType.DATE,- FieldMetadataType.DATE_TIME,-] as const;--export const groupCalendarFieldMetadataItemsByType = <- T extends Pick<FieldMetadataItem, 'type'>,->(- fieldMetadataItems: T[],-) =>- CALENDAR_FIELD_METADATA_TYPES.map((fieldMetadataType) => ({- label: SETTINGS_NON_COMPOSITE_FIELD_TYPE_CONFIGS[fieldMetadataType].label,- fields: fieldMetadataItems.filter(- (fieldMetadataItem) => fieldMetadataItem.type === fieldMetadataType,- ),- })).filter((group) => group.fields.length > 0);diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/utils/isRecordCalendarDayInDateRange.ts b/packages/twenty-front/src/modules/object-record/record-calendar/utils/isRecordCalendarDayInDateRange.tsdeleted file mode 100644index f93270da552..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/utils/isRecordCalendarDayInDateRange.ts+++ /dev/null@@ -1,25 +0,0 @@-import { Temporal } from 'temporal-polyfill';--type IsRecordCalendarDayInDateRangeArgs = {- day: Temporal.PlainDate;- endDate?: Temporal.PlainDate | null;- startDate: Temporal.PlainDate;-};--export const isRecordCalendarDayInDateRange = ({- day,- endDate,- startDate,-}: IsRecordCalendarDayInDateRangeArgs) => {- const validEndDate =- endDate !== null &&- endDate !== undefined &&- Temporal.PlainDate.compare(endDate, startDate) >= 0- ? endDate- : startDate;-- return (- Temporal.PlainDate.compare(day, startDate) >= 0 &&- Temporal.PlainDate.compare(day, validEndDate) <= 0- );-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/utils/isRecordCalendarDayInDateTimeRange.ts b/packages/twenty-front/src/modules/object-record/record-calendar/utils/isRecordCalendarDayInDateTimeRange.tsdeleted file mode 100644index 420c40e84ee..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/utils/isRecordCalendarDayInDateTimeRange.ts+++ /dev/null@@ -1,37 +0,0 @@-import { getRecordCalendarDateTimeRange } from '@/object-record/record-calendar/utils/getRecordCalendarDateTimeRange';-import { Temporal } from 'temporal-polyfill';--type IsRecordCalendarDayInDateTimeRangeArgs = {- day: Temporal.PlainDate;- endDateTime?: unknown;- startDateTime: unknown;- timeZone: string;-};--export const isRecordCalendarDayInDateTimeRange = ({- day,- endDateTime,- startDateTime,- timeZone,-}: IsRecordCalendarDayInDateTimeRangeArgs) => {- const range = getRecordCalendarDateTimeRange({- endDateTime,- startDateTime,- timeZone,- });-- if (range === null) {- return false;- }-- const dayStart = day.toZonedDateTime({ timeZone }).toInstant();- const nextDayStart = day- .add({ days: 1 })- .toZonedDateTime({ timeZone })- .toInstant();-- return (- Temporal.Instant.compare(range.start.toInstant(), nextDayStart) < 0 &&- Temporal.Instant.compare(range.end.toInstant(), dayStart) > 0- );-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/components/RecordCalendarWeek.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/week/components/RecordCalendarWeek.tsxdeleted file mode 100644index f5d6e78559b..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/components/RecordCalendarWeek.tsx+++ /dev/null@@ -1,28 +0,0 @@-import { RecordCalendarComponentInstanceContext } from '@/object-record/record-calendar/states/contexts/RecordCalendarComponentInstanceContext';-import { recordCalendarSelectedDateComponentState } from '@/object-record/record-calendar/states/recordCalendarSelectedDateComponentState';-import { RecordCalendarTimeGrid } from '@/object-record/record-calendar/time-grid/components/RecordCalendarTimeGrid';-import { useRecordCalendarWeekDaysRange } from '@/object-record/record-calendar/week/hooks/useRecordCalendarWeekDaysRange';-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';--const RECORD_CALENDAR_WEEK_MIN_WIDTH_IN_PIXELS = 1000;--export const RecordCalendarWeek = () => {- const recordCalendarId = useAvailableComponentInstanceIdOrThrow(- RecordCalendarComponentInstanceContext,- );- const recordCalendarSelectedDate = useAtomComponentStateValue(- recordCalendarSelectedDateComponentState,- recordCalendarId,- );- const { weekDays } = useRecordCalendarWeekDaysRange(- recordCalendarSelectedDate,- );-- return (- <RecordCalendarTimeGrid- days={weekDays}- minWidthInPixels={RECORD_CALENDAR_WEEK_MIN_WIDTH_IN_PIXELS}- />- );-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/components/RecordCalendarWeekDragDropContext.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/week/components/RecordCalendarWeekDragDropContext.tsxdeleted file mode 100644index 67c9e0a9eff..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/components/RecordCalendarWeekDragDropContext.tsx+++ /dev/null@@ -1,141 +0,0 @@-import { recordCalendarSelectedRecordIdsComponentSelector } from '@/object-record/record-calendar/states/selectors/recordCalendarSelectedRecordIdsComponentSelector';-import { useProcessRecordCalendarWeekEventDrop } from '@/object-record/record-calendar/week/hooks/useProcessRecordCalendarWeekEventDrop';-import { type RecordCalendarWeekDndData } from '@/object-record/record-calendar/week/types/RecordCalendarWeekDndData';-import { resolveRecordCalendarWeekEventDrop } from '@/object-record/record-calendar/week/utils/resolveRecordCalendarWeekEventDrop';-import { useEndRecordDrag } from '@/object-record/record-drag/hooks/useEndRecordDrag';-import { useStartRecordDrag } from '@/object-record/record-drag/hooks/useStartRecordDrag';-import { originalDragSelectionComponentState } from '@/object-record/record-drag/states/originalDragSelectionComponentState';-import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';-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 { type DragDropProviderDragEndEvent } from '@/ui/utilities/drag-and-drop/types/DragDropProviderDragEndEvent';-import { type DragDropProviderDragStartEvent } from '@/ui/utilities/drag-and-drop/types/DragDropProviderDragStartEvent';-import { useAtomComponentSelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorCallbackState';-import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';-import { DragDropProvider } from '@dnd-kit/react';-import { t } from '@lingui/core/macro';-import { useStore } from 'jotai';-import { type ReactNode, type RefObject, useState } from 'react';-import type { Temporal } from 'temporal-polyfill';-import { isDefined } from 'twenty-shared/utils';-import { logError } from '~/utils/logError';--type DragStartPayload =- DragDropProviderDragStartEvent<RecordCalendarWeekDndData>;-type DragEndPayload = DragDropProviderDragEndEvent<RecordCalendarWeekDndData>;--type RecordCalendarWeekDragDropContextProps = {- children: ReactNode;- days: Temporal.PlainDate[];- gridRef: RefObject<HTMLDivElement | null>;-};--export const RecordCalendarWeekDragDropContext = ({- children,- days,- gridRef,-}: RecordCalendarWeekDragDropContextProps) => {- const [grabOffsetY, setGrabOffsetY] = useState(0);- const { processRecordCalendarWeekEventDrop } =- useProcessRecordCalendarWeekEventDrop();- const { enqueueErrorSnackBar } = useSnackBar();-- const store = useStore();- const { startRecordDrag } = useStartRecordDrag();- const { endRecordDrag } = useEndRecordDrag();-- const recordCalendarSelectedRecordIds = useAtomComponentSelectorCallbackState(- recordCalendarSelectedRecordIdsComponentSelector,- );-- const originalDragSelectionCallbackState = useAtomComponentStateCallbackState(- originalDragSelectionComponentState,- );-- const handleDragStart = ({ operation }: DragStartPayload) => {- const source = operation.source;- const sourceData = source?.data;-- if (!isDefined(sourceData)) {- return;- }-- const currentSelectedRecordIds = store.get(recordCalendarSelectedRecordIds);- startRecordDrag(sourceData.recordId, currentSelectedRecordIds);-- const sourceElement = source?.element;-- if (!isDefined(sourceElement)) {- setGrabOffsetY(0);- return;- }-- setGrabOffsetY(- operation.position.current.y - sourceElement.getBoundingClientRect().top,- );- };-- const handleDragEnd = ({ canceled, operation }: DragEndPayload) => {- if (- canceled ||- !isDefined(operation.source) ||- !isDefined(gridRef.current)- ) {- endRecordDrag();- return;- }-- const sourceData = operation.source.data;-- if (sourceData.kind !== 'record-calendar-week-event') {- endRecordDrag();- return;- }-- const gridRect = gridRef.current.getBoundingClientRect();- const resolvedDrop = resolveRecordCalendarWeekEventDrop({- dayCount: days.length,- grabOffsetY,- gridRect,- pointerX: operation.position.current.x,- pointerY: operation.position.current.y,- });-- if (!isDefined(resolvedDrop)) {- endRecordDrag();- return;- }-- const destinationDay = days[resolvedDrop.dayIndex];-- if (!isDefined(destinationDay)) {- endRecordDrag();- return;- }-- const originalDragSelection = store.get(originalDragSelectionCallbackState);-- void processRecordCalendarWeekEventDrop({- destinationDay,- destinationMinutes: resolvedDrop.destinationMinutes,- recordId: sourceData.recordId,- selectedRecordIds: originalDragSelection,- }).catch((error) => {- logError(error);- enqueueErrorSnackBar({ message: t`Failed to move record` });- });-- endRecordDrag();- };-- return (- <DragDropProvider<RecordCalendarWeekDndData>- sensors={DND_KIT_SENSORS}- plugins={DND_KIT_PROVIDER_PLUGINS_WITHOUT_DROP_ANIMATION}- onDragStart={handleDragStart}- onDragEnd={handleDragEnd}- >- {children}- </DragDropProvider>- );-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/components/RecordCalendarWeekEvent.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/week/components/RecordCalendarWeekEvent.tsxdeleted file mode 100644index 115d861139a..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/components/RecordCalendarWeekEvent.tsx+++ /dev/null@@ -1,324 +0,0 @@-import { RecordChip } from '@/object-record/components/RecordChip';-import { StopPropagationContainer } from '@/object-record/record-board/record-board-card/components/StopPropagationContainer';-import { useRecordCalendarContextOrThrow } from '@/object-record/record-calendar/contexts/RecordCalendarContext';-import { RECORD_CALENDAR_CARD_CLICK_OUTSIDE_ID } from '@/object-record/record-calendar/record-calendar-card/constants/RecordCalendarCardClickOutsideId';-import { useIsRecordCalendarCardDragDisabled } from '@/object-record/record-calendar/record-calendar-card/hooks/useIsRecordCalendarCardDragDisabled';-import { isRecordCalendarCardSelectedComponentFamilyState } from '@/object-record/record-calendar/record-calendar-card/states/isRecordCalendarCardSelectedComponentFamilyState';-import { getRecordCalendarCardDraggableId } from '@/object-record/record-calendar/record-calendar-card/utils/getRecordCalendarCardDraggableId';-import { RECORD_CALENDAR_WEEK_DIMENSIONS } from '@/object-record/record-calendar/week/constants/RecordCalendarWeekDimensions';-import { type RecordCalendarWeekDndData } from '@/object-record/record-calendar/week/types/RecordCalendarWeekDndData';-import { formatRecordCalendarWeekEventTimes } from '@/object-record/record-calendar/week/utils/formatRecordCalendarWeekEventTimes';-import { getRecordCalendarWeekEventHorizontalPosition } from '@/object-record/record-calendar/week/utils/getRecordCalendarWeekEventHorizontalPosition';-import { getRecordCalendarWeekTimedEventHeight } from '@/object-record/record-calendar/week/utils/getRecordCalendarWeekTimedEventMetrics';-import { RecordCard } from '@/object-record/record-card/components/RecordCard';-import { useOpenRecordFromIndexView } from '@/object-record/record-index/hooks/useOpenRecordFromIndexView';-import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';-import { DRAG_SOURCE_OPACITY } from '@/ui/utilities/drag-and-drop/constants/DragSourceOpacity';-import { useAtomComponentFamilyState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyState';-import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';-import { useDraggable } from '@dnd-kit/react';-import { styled } from '@linaria/react';-import { type Temporal } from 'temporal-polyfill';-import { isDefined } from 'twenty-shared/utils';-import { ChipVariant } from 'twenty-ui/data-display';-import { Checkbox, CheckboxVariant } from 'twenty-ui/input';-import { themeCssVariables } from 'twenty-ui/theme-constants';-import { FieldMetadataType } from '~/generated-metadata/graphql';--const RECORD_CALENDAR_WEEK_EVENT_TIME_ROW_HEIGHT = 14;-const RECORD_CALENDAR_WEEK_EVENT_EXPANDED_MIN_HEIGHT =- RECORD_CALENDAR_WEEK_DIMENSIONS.minimumEventSlotHeight +- RECORD_CALENDAR_WEEK_EVENT_TIME_ROW_HEIGHT;--const StyledEventPositioner = styled.div<{- $isDragSourceFaded: boolean;- columnCount: number;- columnIndex: number;- heightInPixels: number;- isAllDay: boolean;- topInPixels: number;-}>`- box-sizing: border-box;- height: ${({ heightInPixels, isAllDay }) =>- isAllDay ? '22px' : `${heightInPixels}px`};- left: ${({ columnCount, columnIndex, isAllDay }) =>- isAllDay- ? 'auto'- : getRecordCalendarWeekEventHorizontalPosition({- columnCount,- columnIndex,- }).left};- min-width: 0;- opacity: ${({ $isDragSourceFaded }) =>- $isDragSourceFaded ? DRAG_SOURCE_OPACITY : 1};- overflow: hidden;- position: ${({ isAllDay }) => (isAllDay ? 'relative' : 'absolute')};- right: auto;- top: ${({ isAllDay, topInPixels }) =>- isAllDay- ? 'auto'- : `${topInPixels + RECORD_CALENDAR_WEEK_DIMENSIONS.eventVerticalGap / 2}px`};- width: ${({ columnCount, columnIndex, isAllDay }) =>- isAllDay- ? '100%'- : getRecordCalendarWeekEventHorizontalPosition({- columnCount,- columnIndex,- }).width};- z-index: ${({ columnCount, columnIndex, isAllDay }) =>- isAllDay- ? 1- : getRecordCalendarWeekEventHorizontalPosition({- columnCount,- columnIndex,- }).stackingOrder};-- &:focus-within,- &:hover {- z-index: ${({ columnCount, columnIndex, isAllDay }) =>- isAllDay- ? 1- : getRecordCalendarWeekEventHorizontalPosition({- columnCount,- columnIndex,- }).hoverStackingOrder};- }-- > div {- height: 100%;- }-`;--const StyledEventContent = styled.div<{ isAllDay: boolean }>`- align-items: ${({ isAllDay }) => (isAllDay ? 'center' : 'flex-start')};- box-sizing: border-box;- display: flex;- flex-direction: ${({ isAllDay }) => (isAllDay ? 'row' : 'column')};- height: 100%;- min-width: 0;- overflow: hidden;- padding: ${({ isAllDay }) =>- isAllDay- ? `0 ${themeCssVariables.spacing['0.5']}`- : `${themeCssVariables.spacing['0.5']} ${themeCssVariables.spacing[1]}`};- position: relative;- width: 100%;-`;--const StyledEventHeader = styled.div`- align-items: center;- display: flex;- height: 20px;- min-width: 0;- width: 100%;-`;--const StyledEventLabel = styled.div`- align-items: center;- display: flex;- flex: 1;- font-size: ${themeCssVariables.font.size.xs};- height: 20px;- min-width: 0;- overflow: hidden;-`;--const StyledRecordChipContainer = styled.div`- display: flex;- flex: 0 1 auto;- min-width: 0;- overflow: hidden;-- [data-testid='chip'],- [data-testid='chip'] > * {- color: ${themeCssVariables.font.color.primary};- }-- [data-testid='chip'] {- min-width: 0;- padding-right: 0;- }-`;--const StyledCompactEventStartTime = styled.span`- color: ${themeCssVariables.font.color.tertiary};- flex-shrink: 0;- font-size: ${themeCssVariables.font.size.xxs};- font-weight: ${themeCssVariables.font.weight.medium};- line-height: 12px;- white-space: nowrap;-`;--const StyledCheckboxContainer = styled.div`- align-items: center;- display: flex;- flex-shrink: 0;- height: 20px;- margin-left: auto;-`;--const StyledEventTimeRow = styled.div`- align-items: center;- display: flex;- height: ${RECORD_CALENDAR_WEEK_EVENT_TIME_ROW_HEIGHT}px;- min-width: 0;- overflow: hidden;- width: 100%;-`;--const StyledEventTime = styled.span`- color: ${themeCssVariables.font.color.tertiary};- font-size: ${themeCssVariables.font.size.xxs};- line-height: 12px;- white-space: nowrap;-`;--type RecordCalendarWeekEventProps = {- calendarDay: Temporal.PlainDate;- calendarEndFieldName?: string;- calendarFieldName: string;- calendarFieldType: FieldMetadataType;- columnCount?: number;- columnIndex?: number;- endInPixels?: number;- isAllDay: boolean;- recordId: string;- startInPixels?: number;- timeFormat: string;- timeZone: string;-};--export const RecordCalendarWeekEvent = ({- calendarDay,- calendarEndFieldName,- calendarFieldName,- calendarFieldType,- columnCount = 1,- columnIndex = 0,- endInPixels = 0,- isAllDay,- recordId,- startInPixels = 0,- timeFormat,- timeZone,-}: RecordCalendarWeekEventProps) => {- const { objectNameSingular } = useRecordCalendarContextOrThrow();- const { openRecordFromIndexView } = useOpenRecordFromIndexView();- const dragIsDisabled = useIsRecordCalendarCardDragDisabled(recordId);- const draggableId = getRecordCalendarCardDraggableId({- calendarDay: calendarDay.toString(),- recordId,- });- const { isDragSource, ref: draggableRef } =- useDraggable<RecordCalendarWeekDndData>({- id: draggableId,- data: {- kind: 'record-calendar-week-event',- recordId,- },- disabled: isAllDay || dragIsDisabled,- feedback: 'clone',- });- const recordStore = useAtomFamilyStateValue(recordStoreFamilyState, recordId);- const recordDate = recordStore?.[calendarFieldName];- const recordEndDate = isDefined(calendarEndFieldName)- ? recordStore?.[calendarEndFieldName]- : undefined;-- const [isRecordCalendarCardSelected, setIsRecordCalendarCardSelected] =- useAtomComponentFamilyState(- isRecordCalendarCardSelectedComponentFamilyState,- recordId,- );-- const isDateOnly = calendarFieldType === FieldMetadataType.DATE;-- if (- !isDefined(recordStore) ||- typeof recordDate !== 'string' ||- isAllDay !== isDateOnly- ) {- return null;- }-- const eventTimes = !isDateOnly- ? formatRecordCalendarWeekEventTimes({- startDateTime: recordDate,- endDateTime: recordEndDate,- timeFormat,- timeZone,- })- : null;- const heightInPixels = getRecordCalendarWeekTimedEventHeight({- endInPixels,- startInPixels,- });- const isCompactTimedEvent =- !isAllDay &&- heightInPixels < RECORD_CALENDAR_WEEK_EVENT_EXPANDED_MIN_HEIGHT;- const expandedEventTime = eventTimes?.timeRange;-- return (- <StyledEventPositioner- ref={draggableRef}- $isDragSourceFaded={isDragSource}- columnCount={columnCount}- columnIndex={columnIndex}- heightInPixels={heightInPixels}- isAllDay={isAllDay}- topInPixels={startInPixels}- data-selectable-id={recordId}- >- <RecordCard- data-click-outside-id={RECORD_CALENDAR_CARD_CLICK_OUTSIDE_ID}- data-selected={isRecordCalendarCardSelected}- onClick={() => {- if (!isDragSource) {- openRecordFromIndexView({ recordId });- }- }}- >- <StyledEventContent isAllDay={isAllDay}>- <StyledEventHeader>- <StyledEventLabel>- <StyledRecordChipContainer>- <RecordChip- objectNameSingular={objectNameSingular}- record={recordStore}- variant={ChipVariant.Transparent}- isIconHidden- forceDisableClick- triggerEvent="CLICK"- />- </StyledRecordChipContainer>- {isCompactTimedEvent && isDefined(eventTimes) && (- <StyledCompactEventStartTime>- {`, ${eventTimes.startTime}`}- </StyledCompactEventStartTime>- )}- </StyledEventLabel>- <StyledCheckboxContainer className="checkbox-container">- <StopPropagationContainer>- <Checkbox- hoverable- checked={isRecordCalendarCardSelected}- onChange={(event) => {- setIsRecordCalendarCardSelected(event.target.checked);- }}- variant={CheckboxVariant.Secondary}- />- </StopPropagationContainer>- </StyledCheckboxContainer>- </StyledEventHeader>- {!isAllDay &&- !isCompactTimedEvent &&- isDefined(expandedEventTime) && (- <StyledEventTimeRow>- <StyledEventTime>{expandedEventTime}</StyledEventTime>- </StyledEventTimeRow>- )}- </StyledEventContent>- </RecordCard>- </StyledEventPositioner>- );-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/constants/RecordCalendarWeekDimensions.ts b/packages/twenty-front/src/modules/object-record/record-calendar/week/constants/RecordCalendarWeekDimensions.tsdeleted file mode 100644index c2dcc312e98..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/constants/RecordCalendarWeekDimensions.ts+++ /dev/null@@ -1,27 +0,0 @@-function createRecordCalendarWeekDimensions({- hourHeight,- hoursInDay,- snapIntervalInMinutes,-}: {- hourHeight: number;- hoursInDay: number;- snapIntervalInMinutes: number;-}) {- return {- eventVerticalGap: 8,- gridHeight: hoursInDay * hourHeight,- hourHeight,- hoursInDay,- minimumEventSlotHeight: 24,- slotHeight: (hourHeight * snapIntervalInMinutes) / 60,- snapIntervalInMinutes,- timeGutterWidth: 56,- } as const;-}--export const RECORD_CALENDAR_WEEK_DIMENSIONS =- createRecordCalendarWeekDimensions({- hourHeight: 48,- hoursInDay: 24,- snapIntervalInMinutes: 30,- });diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/hooks/useProcessRecordCalendarWeekEventDrop.ts b/packages/twenty-front/src/modules/object-record/record-calendar/week/hooks/useProcessRecordCalendarWeekEventDrop.tsdeleted file mode 100644index a8d36bdeb30..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/hooks/useProcessRecordCalendarWeekEventDrop.ts+++ /dev/null@@ -1,155 +0,0 @@-import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';-import { useRecordCalendarContextOrThrow } from '@/object-record/record-calendar/contexts/RecordCalendarContext';-import { getRecordCalendarWeekEventDropDateTime } from '@/object-record/record-calendar/week/utils/getRecordCalendarWeekEventDropDateTime';-import { getRecordCalendarWeekEventDropShift } from '@/object-record/record-calendar/week/utils/getRecordCalendarWeekEventDropShift';-import { getShiftedRecordCalendarWeekEventUpdateInput } from '@/object-record/record-calendar/week/utils/getShiftedRecordCalendarWeekEventUpdateInput';-import { getDragOperationType } from '@/object-record/record-drag/utils/getDragOperationType';-import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';-import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUserTimezone';-import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';-import { useStore } from 'jotai';-import { useCallback } from 'react';-import { type Temporal } from 'temporal-polyfill';-import { isDefined } from 'twenty-shared/utils';-import { FieldMetadataType } from '~/generated-metadata/graphql';--type ProcessRecordCalendarWeekEventDropArgs = {- destinationDay: Temporal.PlainDate;- destinationMinutes: number;- recordId: string;- selectedRecordIds: string[];-};--export const useProcessRecordCalendarWeekEventDrop = () => {- const store = useStore();- const { objectMetadataItem } = useRecordCalendarContextOrThrow();- const { currentView } = useGetCurrentViewOnly();- const { updateOneRecord } = useUpdateOneRecord();- const { userTimezone } = useUserTimezone();-- const processRecordCalendarWeekEventDrop = useCallback(- async ({- destinationDay,- destinationMinutes,- recordId,- selectedRecordIds,- }: ProcessRecordCalendarWeekEventDropArgs) => {- const calendarFieldMetadataItem = objectMetadataItem.fields.find(- (field) => field.id === currentView?.calendarFieldMetadataId,- );-- if (calendarFieldMetadataItem?.type !== FieldMetadataType.DATE_TIME) {- return;- }-- const calendarEndFieldMetadataItem = objectMetadataItem.fields.find(- (field) => field.id === currentView?.calendarEndFieldMetadataId,- );- const record = store.get(recordStoreFamilyState.atomFamily(recordId));-- if (!isDefined(record)) {- return;- }-- const primaryOriginalStart = record[calendarFieldMetadataItem.name];-- // The primary dragged record lands exactly where it was dropped.- const shiftedDateTime = getRecordCalendarWeekEventDropDateTime({- destinationDay,- destinationMinutes,- startDateTime: primaryOriginalStart,- endDateTime:- calendarEndFieldMetadataItem?.type === FieldMetadataType.DATE_TIME- ? record[calendarEndFieldMetadataItem.name]- : undefined,- timeZone: userTimezone,- });-- if (shiftedDateTime === null) {- return;- }-- await updateOneRecord({- objectNameSingular: objectMetadataItem.nameSingular,- idToUpdate: recordId,- updateOneRecordInput: {- [calendarFieldMetadataItem.name]: shiftedDateTime.startDateTime,- ...(isDefined(calendarEndFieldMetadataItem) &&- isDefined(shiftedDateTime.endDateTime) && {- [calendarEndFieldMetadataItem.name]: shiftedDateTime.endDateTime,- }),- },- });-- const dragOperationType = getDragOperationType({- draggedRecordId: recordId,- selectedRecordIds,- });-- const recordIdsToShift =- dragOperationType === 'multi'- ? selectedRecordIds.filter((selectedId) => selectedId !== recordId)- : [];-- // Measure how far the primary dragged record moved, then move every other- // selected record by that same amount.- const dropShift = getRecordCalendarWeekEventDropShift({- destinationDay,- destinationMinutes,- startDateTime: primaryOriginalStart,- timeZone: userTimezone,- });-- if (!isDefined(dropShift)) {- return;- }-- const { dayOffset, timeOfDayDeltaNanoseconds } = dropShift;-- const calendarEndFieldName =- calendarEndFieldMetadataItem?.type === FieldMetadataType.DATE_TIME- ? calendarEndFieldMetadataItem.name- : undefined;-- for (const idToUpdate of recordIdsToShift) {- const recordToShift = store.get(- recordStoreFamilyState.atomFamily(idToUpdate),- );- if (!isDefined(recordToShift)) {- continue;- }-- const updateOneRecordInput =- getShiftedRecordCalendarWeekEventUpdateInput({- record: recordToShift,- calendarFieldName: calendarFieldMetadataItem.name,- calendarEndFieldName,- dayOffset,- timeOfDayDeltaNanoseconds,- timeZone: userTimezone,- });-- if (!isDefined(updateOneRecordInput)) {- continue;- }-- await updateOneRecord({- objectNameSingular: objectMetadataItem.nameSingular,- idToUpdate,- updateOneRecordInput,- });- }- },- [- currentView?.calendarEndFieldMetadataId,- currentView?.calendarFieldMetadataId,- objectMetadataItem.fields,- objectMetadataItem.nameSingular,- store,- updateOneRecord,- userTimezone,- ],- );-- return { processRecordCalendarWeekEventDrop };-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/types/RecordCalendarWeekDndData.ts b/packages/twenty-front/src/modules/object-record/record-calendar/week/types/RecordCalendarWeekDndData.tsdeleted file mode 100644index 5205d8a52b5..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/types/RecordCalendarWeekDndData.ts+++ /dev/null@@ -1,4 +0,0 @@-export type RecordCalendarWeekDndData = {- kind: 'record-calendar-week-event';- recordId: string;-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/computeRecordCalendarWeekEventLayouts.test.ts b/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/computeRecordCalendarWeekEventLayouts.test.tsdeleted file mode 100644index 44fa3ed4095..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/computeRecordCalendarWeekEventLayouts.test.ts+++ /dev/null@@ -1,141 +0,0 @@-import { computeRecordCalendarWeekEventLayouts } from '@/object-record/record-calendar/week/utils/computeRecordCalendarWeekEventLayouts';--describe('computeRecordCalendarWeekEventLayouts', () => {- it('gives non-overlapping events the full column width', () => {- const layouts = computeRecordCalendarWeekEventLayouts([- { recordId: 'first', startInPixels: 0, endInPixels: 44 },- { recordId: 'second', startInPixels: 44, endInPixels: 88 },- ]);-- expect(layouts).toEqual([- {- recordId: 'first',- startInPixels: 0,- endInPixels: 44,- columnIndex: 0,- columnCount: 1,- },- {- recordId: 'second',- startInPixels: 44,- endInPixels: 88,- columnIndex: 0,- columnCount: 1,- },- ]);- });-- it('places overlapping events in adjacent columns', () => {- const layouts = computeRecordCalendarWeekEventLayouts([- { recordId: 'first', startInPixels: 0, endInPixels: 44 },- { recordId: 'second', startInPixels: 10, endInPixels: 54 },- { recordId: 'third', startInPixels: 20, endInPixels: 64 },- ]);-- expect(- layouts.map(({ recordId, columnIndex, columnCount }) => ({- recordId,- columnIndex,- columnCount,- })),- ).toEqual([- { recordId: 'first', columnIndex: 0, columnCount: 3 },- { recordId: 'second', columnIndex: 1, columnCount: 3 },- { recordId: 'third', columnIndex: 2, columnCount: 3 },- ]);- });-- it('keeps every event in a larger overlapping group', () => {- const layouts = computeRecordCalendarWeekEventLayouts([- { recordId: 'first', startInPixels: 0, endInPixels: 60 },- { recordId: 'second', startInPixels: 0, endInPixels: 60 },- { recordId: 'third', startInPixels: 0, endInPixels: 60 },- { recordId: 'fourth', startInPixels: 15, endInPixels: 75 },- { recordId: 'fifth', startInPixels: 30, endInPixels: 90 },- ]);-- expect(- layouts.map(({ recordId, columnIndex, columnCount }) => ({- recordId,- columnIndex,- columnCount,- })),- ).toEqual([- { recordId: 'first', columnIndex: 0, columnCount: 5 },- { recordId: 'second', columnIndex: 1, columnCount: 5 },- { recordId: 'third', columnIndex: 2, columnCount: 5 },- { recordId: 'fourth', columnIndex: 3, columnCount: 5 },- { recordId: 'fifth', columnIndex: 4, columnCount: 5 },- ]);- });-- it('reuses a free column within an overlapping group', () => {- const layouts = computeRecordCalendarWeekEventLayouts([- { recordId: 'first', startInPixels: 0, endInPixels: 44 },- { recordId: 'second', startInPixels: 10, endInPixels: 54 },- { recordId: 'third', startInPixels: 44, endInPixels: 88 },- ]);-- expect(- layouts.map(({ recordId, columnIndex, columnCount }) => ({- recordId,- columnIndex,- columnCount,- })),- ).toEqual([- { recordId: 'first', columnIndex: 0, columnCount: 2 },- { recordId: 'second', columnIndex: 1, columnCount: 2 },- { recordId: 'third', columnIndex: 0, columnCount: 2 },- ]);- });-- it('keeps a long event in the first column while shorter events reuse the overlay column', () => {- const layouts = computeRecordCalendarWeekEventLayouts([- { recordId: 'long', startInPixels: 0, endInPixels: 180 },- { recordId: 'first-short', startInPixels: 30, endInPixels: 60 },- { recordId: 'second-short', startInPixels: 60, endInPixels: 90 },- ]);-- expect(- layouts.map(({ recordId, columnIndex, columnCount }) => ({- recordId,- columnIndex,- columnCount,- })),- ).toEqual([- { recordId: 'long', columnIndex: 0, columnCount: 2 },- { recordId: 'first-short', columnIndex: 1, columnCount: 2 },- { recordId: 'second-short', columnIndex: 1, columnCount: 2 },- ]);- });-- it('places the longer event behind shorter events with the same start', () => {- const layouts = computeRecordCalendarWeekEventLayouts([- { recordId: 'short', startInPixels: 0, endInPixels: 60 },- { recordId: 'long', startInPixels: 0, endInPixels: 180 },- ]);-- expect(- layouts.map(({ recordId, columnIndex, columnCount }) => ({- recordId,- columnIndex,- columnCount,- })),- ).toEqual([- { recordId: 'long', columnIndex: 0, columnCount: 2 },- { recordId: 'short', columnIndex: 1, columnCount: 2 },- ]);- });-- it('sorts events before assigning columns', () => {- const layouts = computeRecordCalendarWeekEventLayouts([- { recordId: 'second', startInPixels: 10, endInPixels: 54 },- { recordId: 'first', startInPixels: 0, endInPixels: 44 },- ]);-- expect(layouts.map(({ recordId }) => recordId)).toEqual([- 'first',- 'second',- ]);- });-});diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/formatRecordCalendarWeekEventTimes.test.ts b/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/formatRecordCalendarWeekEventTimes.test.tsdeleted file mode 100644index c7cc4a04746..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/formatRecordCalendarWeekEventTimes.test.ts+++ /dev/null@@ -1,50 +0,0 @@-import { formatRecordCalendarWeekEventTimes } from '@/object-record/record-calendar/week/utils/formatRecordCalendarWeekEventTimes';--const timeZone = 'Europe/Paris';-const timeFormat = 'HH:mm';--describe('formatRecordCalendarWeekEventTimes', () => {- it('formats the start time and configured time range', () => {- expect(- formatRecordCalendarWeekEventTimes({- startDateTime: '2026-07-08T15:59:00Z',- endDateTime: '2026-07-10T18:59:00Z',- timeFormat,- timeZone,- }),- ).toEqual({- startTime: '17:59',- timeRange: '17:59 - 20:59',- });- });-- it.each([- ['missing', undefined],- ['null', null],- ['invalid', 'not-a-date'],- ['equal to the start', '2026-07-08T15:59:00Z'],- ['before the start', '2026-07-08T14:59:00Z'],- ])('uses only the start time when the end is %s', (_label, endDateTime) => {- expect(- formatRecordCalendarWeekEventTimes({- startDateTime: '2026-07-08T15:59:00Z',- endDateTime,- timeFormat,- timeZone,- }),- ).toEqual({- startTime: '17:59',- timeRange: '17:59',- });- });-- it('returns null when the start is unusable', () => {- expect(- formatRecordCalendarWeekEventTimes({- startDateTime: 'not-a-date',- timeFormat,- timeZone,- }),- ).toBeNull();- });-});diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/getRecordCalendarWeekEventDropDateTime.test.ts b/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/getRecordCalendarWeekEventDropDateTime.test.tsdeleted file mode 100644index 5924b2aa021..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/getRecordCalendarWeekEventDropDateTime.test.ts+++ /dev/null@@ -1,93 +0,0 @@-import { getRecordCalendarWeekEventDropDateTime } from '@/object-record/record-calendar/week/utils/getRecordCalendarWeekEventDropDateTime';-import { Temporal } from 'temporal-polyfill';--describe('getRecordCalendarWeekEventDropDateTime', () => {- it('moves a multi-day event start to the drop position from any fragment', () => {- expect(- getRecordCalendarWeekEventDropDateTime({- destinationDay: Temporal.PlainDate.from('2026-07-10'),- destinationMinutes: 10 * 60,- startDateTime: '2026-07-07T07:00:00Z',- endDateTime: '2026-07-09T10:00:00Z',- timeZone: 'Europe/Paris',- }),- ).toEqual({- startDateTime: '2026-07-10T08:00:00Z',- endDateTime: '2026-07-12T11:00:00Z',- });- });-- it('lands at the drop time when the original start is the later repeated DST time', () => {- expect(- getRecordCalendarWeekEventDropDateTime({- destinationDay: Temporal.PlainDate.from('2026-10-26'),- destinationMinutes: 10 * 60,- startDateTime: '2026-10-25T01:30:00Z',- endDateTime: '2026-10-25T02:30:00Z',- timeZone: 'Europe/Paris',- }),- ).toEqual({- startDateTime: '2026-10-26T09:00:00Z',- endDateTime: '2026-10-26T10:00:00Z',- });- });-- it('shifts an end that is equal to the start', () => {- expect(- getRecordCalendarWeekEventDropDateTime({- destinationDay: Temporal.PlainDate.from('2026-07-10'),- destinationMinutes: 10 * 60,- startDateTime: '2026-07-07T07:00:00Z',- endDateTime: '2026-07-07T07:00:00Z',- timeZone: 'Europe/Paris',- }),- ).toEqual({- startDateTime: '2026-07-10T08:00:00Z',- endDateTime: '2026-07-10T08:00:00Z',- });- });-- it.each([undefined, null, 42])(- 'returns null for a non-string start: %s',- (startDateTime) => {- expect(- getRecordCalendarWeekEventDropDateTime({- destinationDay: Temporal.PlainDate.from('2026-07-10'),- destinationMinutes: 10 * 60,- startDateTime,- timeZone: 'Europe/Paris',- }),- ).toBeNull();- },- );-- it('returns null for a malformed start', () => {- expect(- getRecordCalendarWeekEventDropDateTime({- destinationDay: Temporal.PlainDate.from('2026-07-10'),- destinationMinutes: 10 * 60,- startDateTime: 'not-a-date',- timeZone: 'Europe/Paris',- }),- ).toBeNull();- });-- it.each([- ['missing', undefined],- ['non-string', 42],- ['malformed', 'not-a-date'],- ['before the start', '2026-07-07T06:59:00Z'],- ])('moves only the start when the end is %s', (_label, endDateTime) => {- expect(- getRecordCalendarWeekEventDropDateTime({- destinationDay: Temporal.PlainDate.from('2026-07-10'),- destinationMinutes: 10 * 60,- startDateTime: '2026-07-07T07:00:00Z',- endDateTime,- timeZone: 'Europe/Paris',- }),- ).toEqual({- startDateTime: '2026-07-10T08:00:00Z',- });- });-});diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/getRecordCalendarWeekEventDropShift.test.ts b/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/getRecordCalendarWeekEventDropShift.test.tsdeleted file mode 100644index e5646c1ee83..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/getRecordCalendarWeekEventDropShift.test.ts+++ /dev/null@@ -1,70 +0,0 @@-import { getRecordCalendarWeekEventDropShift } from '@/object-record/record-calendar/week/utils/getRecordCalendarWeekEventDropShift';-import { Temporal } from 'temporal-polyfill';--const timeZone = 'Europe/Paris';--describe('getRecordCalendarWeekEventDropShift', () => {- it('computes the day offset and time-of-day delta', () => {- expect(- getRecordCalendarWeekEventDropShift({- destinationDay: Temporal.PlainDate.from('2026-07-09'),- destinationMinutes: 18 * 60 + 59,- startDateTime: '2026-07-08T15:59:00Z',- timeZone,- }),- ).toEqual({- dayOffset: 1,- timeOfDayDeltaNanoseconds: 3_600_000_000_000n,- });- });-- it('returns a zero delta for a same-time drop when the start day springs forward', () => {- expect(- getRecordCalendarWeekEventDropShift({- destinationDay: Temporal.PlainDate.from('2026-03-30'),- destinationMinutes: 10 * 60,- startDateTime: '2026-03-29T08:00:00Z',- timeZone,- }),- ).toEqual({- dayOffset: 1,- timeOfDayDeltaNanoseconds: 0n,- });- });-- it('returns a zero delta for a same-time drop when the start day falls back', () => {- expect(- getRecordCalendarWeekEventDropShift({- destinationDay: Temporal.PlainDate.from('2026-10-26'),- destinationMinutes: 10 * 60,- startDateTime: '2026-10-25T09:00:00Z',- timeZone,- }),- ).toEqual({- dayOffset: 1,- timeOfDayDeltaNanoseconds: 0n,- });- });-- it('returns null when the start is not a string', () => {- expect(- getRecordCalendarWeekEventDropShift({- destinationDay: Temporal.PlainDate.from('2026-07-09'),- destinationMinutes: 600,- startDateTime: undefined,- timeZone,- }),- ).toBeNull();- });-- it('returns null when the start is malformed', () => {- expect(- getRecordCalendarWeekEventDropShift({- destinationDay: Temporal.PlainDate.from('2026-07-09'),- destinationMinutes: 600,- startDateTime: 'not-a-date',- timeZone,- }),- ).toBeNull();- });-});diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/getRecordCalendarWeekEventHorizontalPosition.test.ts b/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/getRecordCalendarWeekEventHorizontalPosition.test.tsdeleted file mode 100644index 69f0bd879bf..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/getRecordCalendarWeekEventHorizontalPosition.test.ts+++ /dev/null@@ -1,59 +0,0 @@-import { getRecordCalendarWeekEventHorizontalPosition } from '@/object-record/record-calendar/week/utils/getRecordCalendarWeekEventHorizontalPosition';--describe('getRecordCalendarWeekEventHorizontalPosition', () => {- it('uses the available width for a non-overlapping event', () => {- expect(- getRecordCalendarWeekEventHorizontalPosition({- columnCount: 1,- columnIndex: 0,- }),- ).toEqual({- hoverStackingOrder: 2,- left: 'calc(0% + 4px)',- stackingOrder: 1,- width: 'calc(100% - 8px)',- });- });-- it('cascades overlapping events from their column to the right edge', () => {- expect(- Array.from({ length: 5 }, (_, columnIndex) =>- getRecordCalendarWeekEventHorizontalPosition({- columnCount: 5,- columnIndex,- }),- ),- ).toEqual([- {- hoverStackingOrder: 6,- left: 'calc(0% + 4px)',- stackingOrder: 1,- width: 'calc(100% - 8px)',- },- {- hoverStackingOrder: 6,- left: 'calc(20% + 2.8px)',- stackingOrder: 2,- width: 'calc(80% - 6.8px)',- },- {- hoverStackingOrder: 6,- left: 'calc(40% + 1.6px)',- stackingOrder: 3,- width: 'calc(60% - 5.6px)',- },- {- hoverStackingOrder: 6,- left: 'calc(60% + 0.4px)',- stackingOrder: 4,- width: 'calc(40% - 4.4px)',- },- {- hoverStackingOrder: 6,- left: 'calc(80% - 0.8px)',- stackingOrder: 5,- width: 'calc(20% - 3.2px)',- },- ]);- });-});diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/getRecordCalendarWeekSlotIndex.test.ts b/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/getRecordCalendarWeekSlotIndex.test.tsdeleted file mode 100644index dbb0f5f7173..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/getRecordCalendarWeekSlotIndex.test.ts+++ /dev/null@@ -1,35 +0,0 @@-import { RECORD_CALENDAR_WEEK_DIMENSIONS } from '@/object-record/record-calendar/week/constants/RecordCalendarWeekDimensions';-import { getRecordCalendarWeekSlotIndex } from '@/object-record/record-calendar/week/utils/getRecordCalendarWeekSlotIndex';--const columnTop = 100;-const columnHeight = RECORD_CALENDAR_WEEK_DIMENSIONS.gridHeight;--describe('getRecordCalendarWeekSlotIndex', () => {- it.each([- [columnTop, 0],- [columnTop + 23.9, 0],- [columnTop + 24, 1],- [columnTop + columnHeight - 0.1, 47],- ])('maps pointer position %s to slot %s', (pointerY, expectedSlot) => {- expect(- getRecordCalendarWeekSlotIndex({- columnHeight,- columnTop,- pointerY,- }),- ).toBe(expectedSlot);- });-- it.each([columnTop - 0.1, columnTop + columnHeight])(- 'returns null outside the day column at %s',- (pointerY) => {- expect(- getRecordCalendarWeekSlotIndex({- columnHeight,- columnTop,- pointerY,- }),- ).toBeNull();- },- );-});diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/getRecordCalendarWeekTimedEventMetrics.test.ts b/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/getRecordCalendarWeekTimedEventMetrics.test.tsdeleted file mode 100644index 3fbd03de9c8..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/getRecordCalendarWeekTimedEventMetrics.test.ts+++ /dev/null@@ -1,159 +0,0 @@-import { RECORD_CALENDAR_WEEK_DIMENSIONS } from '@/object-record/record-calendar/week/constants/RecordCalendarWeekDimensions';-import {- getRecordCalendarWeekTimedEventHeight,- getRecordCalendarWeekTimedEventMetrics,-} from '@/object-record/record-calendar/week/utils/getRecordCalendarWeekTimedEventMetrics';-import { Temporal } from 'temporal-polyfill';--const timeZone = 'Europe/Paris';-const day = Temporal.PlainDate.from('2026-07-06');--describe('getRecordCalendarWeekTimedEventMetrics', () => {- it('uses the configured duration', () => {- expect(- getRecordCalendarWeekTimedEventMetrics({- day,- startDateTime: '2026-07-06T07:00:00Z',- endDateTime: '2026-07-06T08:30:00Z',- timeZone,- }),- ).toEqual({- startInPixels: 9 * RECORD_CALENDAR_WEEK_DIMENSIONS.hourHeight,- endInPixels: 10.5 * RECORD_CALENDAR_WEEK_DIMENSIONS.hourHeight,- });- });-- it('renders a one-hour event with the vertical inset from the design', () => {- const metrics = getRecordCalendarWeekTimedEventMetrics({- day,- startDateTime: '2026-07-06T07:00:00Z',- timeZone,- });-- expect(getRecordCalendarWeekTimedEventHeight(metrics!)).toBe(40);- });-- it.each([undefined, null, 'not-a-date', '2026-07-06T06:00:00Z'])(- 'falls back to one hour for an unusable end value: %s',- (endDateTime) => {- expect(- getRecordCalendarWeekTimedEventMetrics({- day,- startDateTime: '2026-07-06T07:00:00Z',- endDateTime,- timeZone,- }),- ).toEqual({- startInPixels: 9 * RECORD_CALENDAR_WEEK_DIMENSIONS.hourHeight,- endInPixels: 10 * RECORD_CALENDAR_WEEK_DIMENSIONS.hourHeight,- });- },- );-- it('keeps short events large enough to interact with', () => {- const metrics = getRecordCalendarWeekTimedEventMetrics({- day,- startDateTime: '2026-07-06T07:00:00Z',- endDateTime: '2026-07-06T07:05:00Z',- timeZone,- });-- expect(metrics).toEqual({- startInPixels: 9 * RECORD_CALENDAR_WEEK_DIMENSIONS.hourHeight,- endInPixels: 9.5 * RECORD_CALENDAR_WEEK_DIMENSIONS.hourHeight,- });- expect(getRecordCalendarWeekTimedEventHeight(metrics!)).toBe(- RECORD_CALENDAR_WEEK_DIMENSIONS.minimumEventSlotHeight,- );- });-- it('renders the start-day fragment of a multi-day event to midnight', () => {- expect(- getRecordCalendarWeekTimedEventMetrics({- day: Temporal.PlainDate.from('2026-07-08'),- startDateTime: '2026-07-08T15:59:00Z',- endDateTime: '2026-07-10T18:59:00Z',- timeZone,- }),- ).toEqual({- startInPixels:- (17 + 59 / 60) * RECORD_CALENDAR_WEEK_DIMENSIONS.hourHeight,- endInPixels: RECORD_CALENDAR_WEEK_DIMENSIONS.gridHeight,- });- });-- it('renders a full-day middle fragment of a multi-day event', () => {- expect(- getRecordCalendarWeekTimedEventMetrics({- day: Temporal.PlainDate.from('2026-07-09'),- startDateTime: '2026-07-08T15:59:00Z',- endDateTime: '2026-07-10T18:59:00Z',- timeZone,- }),- ).toEqual({- startInPixels: 0,- endInPixels: RECORD_CALENDAR_WEEK_DIMENSIONS.gridHeight,- });- });-- it('renders the end-day fragment of a multi-day event to its end time', () => {- expect(- getRecordCalendarWeekTimedEventMetrics({- day: Temporal.PlainDate.from('2026-07-10'),- startDateTime: '2026-07-08T15:59:00Z',- endDateTime: '2026-07-10T18:59:00Z',- timeZone,- }),- ).toEqual({- startInPixels: 0,- endInPixels: (20 + 59 / 60) * RECORD_CALENDAR_WEEK_DIMENSIONS.hourHeight,- });- });-- it('does not render a multi-day event outside its range', () => {- expect(- getRecordCalendarWeekTimedEventMetrics({- day: Temporal.PlainDate.from('2026-07-11'),- startDateTime: '2026-07-08T15:59:00Z',- endDateTime: '2026-07-10T18:59:00Z',- timeZone,- }),- ).toBeNull();- });-- it('clips the one-hour fallback at the grid boundary', () => {- expect(- getRecordCalendarWeekTimedEventMetrics({- day,- startDateTime: '2026-07-06T21:30:00Z',- timeZone,- }),- ).toEqual({- startInPixels: 23.5 * RECORD_CALENDAR_WEEK_DIMENSIONS.hourHeight,- endInPixels: RECORD_CALENDAR_WEEK_DIMENSIONS.gridHeight,- });- });-- it('positions instants using the configured timezone', () => {- expect(- getRecordCalendarWeekTimedEventMetrics({- day,- startDateTime: '2026-07-06T09:00:00Z',- timeZone,- }),- ).toEqual({- startInPixels: 11 * RECORD_CALENDAR_WEEK_DIMENSIONS.hourHeight,- endInPixels: 12 * RECORD_CALENDAR_WEEK_DIMENSIONS.hourHeight,- });- });-- it('returns null for an unusable start value', () => {- expect(- getRecordCalendarWeekTimedEventMetrics({- day,- startDateTime: 'not-a-date',- timeZone,- }),- ).toBeNull();- });-});diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/getShiftedRecordCalendarWeekEventUpdateInput.test.ts b/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/getShiftedRecordCalendarWeekEventUpdateInput.test.tsdeleted file mode 100644index 983c31b962f..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/getShiftedRecordCalendarWeekEventUpdateInput.test.ts+++ /dev/null@@ -1,96 +0,0 @@-import { type ObjectRecord } from '@/object-record/types/ObjectRecord';-import { getShiftedRecordCalendarWeekEventUpdateInput } from '@/object-record/record-calendar/week/utils/getShiftedRecordCalendarWeekEventUpdateInput';--const timeZone = 'Europe/Paris';--const buildRecord = (fields: Record<string, unknown>): ObjectRecord =>- ({- id: 'record-id',- __typename: 'Record',- ...fields,- }) as ObjectRecord;--describe('getShiftedRecordCalendarWeekEventUpdateInput', () => {- it('moves the start by the day offset while keeping the local time', () => {- expect(- getShiftedRecordCalendarWeekEventUpdateInput({- record: buildRecord({ startAt: '2026-07-08T15:59:00Z' }),- calendarFieldName: 'startAt',- dayOffset: 1,- timeOfDayDeltaNanoseconds: 0n,- timeZone,- }),- ).toEqual({ startAt: '2026-07-09T15:59:00Z' });- });-- it('applies the time-of-day delta on top of the day offset', () => {- expect(- getShiftedRecordCalendarWeekEventUpdateInput({- record: buildRecord({ startAt: '2026-07-08T15:59:00Z' }),- calendarFieldName: 'startAt',- dayOffset: 1,- timeOfDayDeltaNanoseconds: 3_600_000_000_000n,- timeZone,- }),- ).toEqual({ startAt: '2026-07-09T16:59:00Z' });- });-- it('shifts the end and preserves the duration', () => {- expect(- getShiftedRecordCalendarWeekEventUpdateInput({- record: buildRecord({- startAt: '2026-07-08T15:59:00Z',- endAt: '2026-07-10T18:59:00Z',- }),- calendarFieldName: 'startAt',- calendarEndFieldName: 'endAt',- dayOffset: 1,- timeOfDayDeltaNanoseconds: 0n,- timeZone,- }),- ).toEqual({- startAt: '2026-07-09T15:59:00Z',- endAt: '2026-07-11T18:59:00Z',- });- });-- it('omits the end when it precedes the start', () => {- expect(- getShiftedRecordCalendarWeekEventUpdateInput({- record: buildRecord({- startAt: '2026-07-08T15:59:00Z',- endAt: '2026-07-07T18:59:00Z',- }),- calendarFieldName: 'startAt',- calendarEndFieldName: 'endAt',- dayOffset: 1,- timeOfDayDeltaNanoseconds: 0n,- timeZone,- }),- ).toEqual({ startAt: '2026-07-09T15:59:00Z' });- });-- it('returns null when the stored start is missing', () => {- expect(- getShiftedRecordCalendarWeekEventUpdateInput({- record: buildRecord({}),- calendarFieldName: 'startAt',- dayOffset: 1,- timeOfDayDeltaNanoseconds: 0n,- timeZone,- }),- ).toBeNull();- });-- it('returns null when the stored start is malformed', () => {- expect(- getShiftedRecordCalendarWeekEventUpdateInput({- record: buildRecord({ startAt: 'not-a-date' }),- calendarFieldName: 'startAt',- dayOffset: 1,- timeOfDayDeltaNanoseconds: 0n,- timeZone,- }),- ).toBeNull();- });-});diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/resolveRecordCalendarWeekEventDrop.test.ts b/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/resolveRecordCalendarWeekEventDrop.test.tsdeleted file mode 100644index b662fd3b011..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/resolveRecordCalendarWeekEventDrop.test.ts+++ /dev/null@@ -1,94 +0,0 @@-import { RECORD_CALENDAR_WEEK_DIMENSIONS } from '@/object-record/record-calendar/week/constants/RecordCalendarWeekDimensions';-import { resolveRecordCalendarWeekEventDrop } from '@/object-record/record-calendar/week/utils/resolveRecordCalendarWeekEventDrop';--const gridRect = {- height: RECORD_CALENDAR_WEEK_DIMENSIONS.gridHeight,- left: 100,- top: 200,- width: 756,-};--describe('resolveRecordCalendarWeekEventDrop', () => {- it('resolves a day and snaps the event start to 30 minutes', () => {- expect(- resolveRecordCalendarWeekEventDrop({- dayCount: 7,- grabOffsetY: 10,- gridRect,- pointerX:- gridRect.left +- RECORD_CALENDAR_WEEK_DIMENSIONS.timeGutterWidth +- 2.5 * 100,- pointerY:- gridRect.top + 10 * RECORD_CALENDAR_WEEK_DIMENSIONS.hourHeight + 17,- }),- ).toEqual({- dayIndex: 2,- destinationMinutes: 10 * 60,- });- });-- it('resolves every valid horizontal position to the only visible day', () => {- expect(- resolveRecordCalendarWeekEventDrop({- dayCount: 1,- grabOffsetY: 0,- gridRect,- pointerX: gridRect.left + gridRect.width - 1,- pointerY:- gridRect.top + 14.25 * RECORD_CALENDAR_WEEK_DIMENSIONS.hourHeight,- }),- ).toEqual({ dayIndex: 0, destinationMinutes: 14 * 60 });- });-- it.each([- ['time gutter', gridRect.left + 20, gridRect.top + 100],- ['left of grid', gridRect.left - 1, gridRect.top + 100],- ['right of grid', gridRect.left + gridRect.width, gridRect.top + 100],- [- 'above grid',- gridRect.left + RECORD_CALENDAR_WEEK_DIMENSIONS.timeGutterWidth + 10,- gridRect.top - 1,- ],- [- 'below grid',- gridRect.left + RECORD_CALENDAR_WEEK_DIMENSIONS.timeGutterWidth + 10,- gridRect.top + gridRect.height,- ],- ])('rejects a drop in the %s', (_label, pointerX, pointerY) => {- expect(- resolveRecordCalendarWeekEventDrop({- dayCount: 7,- grabOffsetY: 0,- gridRect,- pointerX,- pointerY,- }),- ).toBeNull();- });-- it('clamps the first event start to midnight', () => {- expect(- resolveRecordCalendarWeekEventDrop({- dayCount: 7,- grabOffsetY: 20,- gridRect,- pointerX:- gridRect.left + RECORD_CALENDAR_WEEK_DIMENSIONS.timeGutterWidth + 10,- pointerY: gridRect.top + 1,- }),- ).toMatchObject({ destinationMinutes: 0 });- });-- it('clamps the last event start to 23:30', () => {- expect(- resolveRecordCalendarWeekEventDrop({- dayCount: 7,- grabOffsetY: 0,- gridRect,- pointerX: gridRect.left + gridRect.width - 1,- pointerY: gridRect.top + gridRect.height - 1,- }),- ).toEqual({ dayIndex: 6, destinationMinutes: 23.5 * 60 });- });-});diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/updateRecordCalendarWeekActiveSlot.test.ts b/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/updateRecordCalendarWeekActiveSlot.test.tsdeleted file mode 100644index a87def5199c..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/__tests__/updateRecordCalendarWeekActiveSlot.test.ts+++ /dev/null@@ -1,105 +0,0 @@-import { updateRecordCalendarWeekActiveSlot } from '@/object-record/record-calendar/week/utils/updateRecordCalendarWeekActiveSlot';--describe('updateRecordCalendarWeekActiveSlot', () => {- it('replaces the active slot when another day becomes active', () => {- expect(- updateRecordCalendarWeekActiveSlot({- currentActiveSlot: {- day: '2026-07-13',- interactionMode: 'pointer',- slotIndex: 18,- },- day: '2026-07-14',- interactionMode: 'pointer',- slotIndex: 20,- }),- ).toEqual({- day: '2026-07-14',- interactionMode: 'pointer',- slotIndex: 20,- });- });-- it('clears the active day', () => {- expect(- updateRecordCalendarWeekActiveSlot({- currentActiveSlot: {- day: '2026-07-13',- interactionMode: 'pointer',- slotIndex: 18,- },- day: '2026-07-13',- interactionMode: 'pointer',- slotIndex: null,- }),- ).toBeNull();- });-- it('does not clear another active day', () => {- const currentActiveSlot = {- day: '2026-07-14',- interactionMode: 'pointer' as const,- slotIndex: 20,- };-- expect(- updateRecordCalendarWeekActiveSlot({- currentActiveSlot,- day: '2026-07-13',- interactionMode: 'pointer',- slotIndex: null,- }),- ).toBe(currentActiveSlot);- });-- it('preserves the active slot reference when the pointer stays in one slot', () => {- const currentActiveSlot = {- day: '2026-07-13',- interactionMode: 'pointer' as const,- slotIndex: 18,- };-- expect(- updateRecordCalendarWeekActiveSlot({- currentActiveSlot,- day: '2026-07-13',- interactionMode: 'pointer',- slotIndex: 18,- }),- ).toBe(currentActiveSlot);- });-- it('keeps a keyboard slot active while the pointer moves', () => {- const currentActiveSlot = {- day: '2026-07-13',- interactionMode: 'keyboard' as const,- slotIndex: 18,- };-- expect(- updateRecordCalendarWeekActiveSlot({- currentActiveSlot,- day: '2026-07-14',- interactionMode: 'pointer',- slotIndex: 20,- }),- ).toBe(currentActiveSlot);- });-- it('does not clear a keyboard slot on pointer leave', () => {- const currentActiveSlot = {- day: '2026-07-13',- interactionMode: 'keyboard' as const,- slotIndex: 18,- };-- expect(- updateRecordCalendarWeekActiveSlot({- currentActiveSlot,- day: '2026-07-13',- interactionMode: 'pointer',- slotIndex: null,- }),- ).toBe(currentActiveSlot);- });-});diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/computeRecordCalendarWeekEventLayouts.ts b/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/computeRecordCalendarWeekEventLayouts.tsdeleted file mode 100644index 2c89a2a4166..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/computeRecordCalendarWeekEventLayouts.ts+++ /dev/null@@ -1,81 +0,0 @@-export type RecordCalendarWeekEventLayoutInput = {- endInPixels: number;- recordId: string;- startInPixels: number;-};--export type RecordCalendarWeekEventLayout =- RecordCalendarWeekEventLayoutInput & {- columnCount: number;- columnIndex: number;- };--const layoutOverlappingEventGroup = (- events: RecordCalendarWeekEventLayoutInput[],-): RecordCalendarWeekEventLayout[] => {- const columnEndPositions: number[] = [];-- const layouts = events.map((event) => {- const availableColumnIndex = columnEndPositions.findIndex(- (endInPixels) => endInPixels <= event.startInPixels,- );-- const columnIndex =- availableColumnIndex === -1- ? columnEndPositions.length- : availableColumnIndex;-- columnEndPositions[columnIndex] = event.endInPixels;-- return {- ...event,- columnCount: 0,- columnIndex,- };- });-- const columnCount = columnEndPositions.length;-- return layouts.map((layout) => ({- ...layout,- columnCount,- }));-};--export const computeRecordCalendarWeekEventLayouts = (- events: RecordCalendarWeekEventLayoutInput[],-): RecordCalendarWeekEventLayout[] => {- const sortedEvents = [...events].sort(- (eventA, eventB) =>- eventA.startInPixels - eventB.startInPixels ||- eventB.endInPixels - eventA.endInPixels ||- eventA.recordId.localeCompare(eventB.recordId),- );-- const overlappingEventGroups: RecordCalendarWeekEventLayoutInput[][] = [];- let currentGroup: RecordCalendarWeekEventLayoutInput[] = [];- let currentGroupEndInPixels = Number.NEGATIVE_INFINITY;-- for (const event of sortedEvents) {- if (- currentGroup.length > 0 &&- event.startInPixels >= currentGroupEndInPixels- ) {- overlappingEventGroups.push(currentGroup);- currentGroup = [];- currentGroupEndInPixels = Number.NEGATIVE_INFINITY;- }-- currentGroup.push(event);- currentGroupEndInPixels = Math.max(- currentGroupEndInPixels,- event.endInPixels,- );- }-- if (currentGroup.length > 0) {- overlappingEventGroups.push(currentGroup);- }-- return overlappingEventGroups.flatMap(layoutOverlappingEventGroup);-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/formatRecordCalendarWeekEventTimes.ts b/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/formatRecordCalendarWeekEventTimes.tsdeleted file mode 100644index 54d94bb91dd..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/formatRecordCalendarWeekEventTimes.ts+++ /dev/null@@ -1,49 +0,0 @@-import { getRecordCalendarDateTimeRange } from '@/object-record/record-calendar/utils/getRecordCalendarDateTimeRange';-import { formatInTimeZone } from 'date-fns-tz';--type FormatRecordCalendarWeekEventTimesArgs = {- endDateTime?: unknown;- startDateTime: unknown;- timeFormat: string;- timeZone: string;-};--export type RecordCalendarWeekEventTimes = {- startTime: string;- timeRange: string;-};--export const formatRecordCalendarWeekEventTimes = ({- endDateTime,- startDateTime,- timeFormat,- timeZone,-}: FormatRecordCalendarWeekEventTimesArgs): RecordCalendarWeekEventTimes | null => {- const range = getRecordCalendarDateTimeRange({- endDateTime,- startDateTime,- timeZone,- });-- if (range === null) {- return null;- }-- const startTime = formatInTimeZone(- range.start.epochMilliseconds,- timeZone,- timeFormat,- );-- if (range.isEndDateTimeFallback) {- return { startTime, timeRange: startTime };- }-- const endTime = formatInTimeZone(- range.end.epochMilliseconds,- timeZone,- timeFormat,- );-- return { startTime, timeRange: `${startTime} - ${endTime}` };-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/getRecordCalendarWeekEventDropDateTime.ts b/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/getRecordCalendarWeekEventDropDateTime.tsdeleted file mode 100644index 52c73a4ee28..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/getRecordCalendarWeekEventDropDateTime.ts+++ /dev/null@@ -1,48 +0,0 @@-import { getShiftedRecordCalendarEndDateTime } from '@/object-record/record-drag/utils/getShiftedRecordCalendarEndDateTime';-import { Temporal } from 'temporal-polyfill';--type GetRecordCalendarWeekEventDropDateTimeArgs = {- destinationDay: Temporal.PlainDate;- destinationMinutes: number;- endDateTime?: unknown;- startDateTime?: unknown;- timeZone: string;-};--export const getRecordCalendarWeekEventDropDateTime = ({- destinationDay,- destinationMinutes,- endDateTime,- startDateTime,- timeZone,-}: GetRecordCalendarWeekEventDropDateTimeArgs) => {- if (typeof startDateTime !== 'string') {- return null;- }-- try {- const currentStartInstant = Temporal.Instant.from(startDateTime);- const shiftedStartInstant = destinationDay- .toZonedDateTime({- timeZone,- plainTime: Temporal.PlainTime.from('00:00').add({- nanoseconds: Math.round(destinationMinutes * 60 * 1_000_000_000),- }),- })- .toInstant();- const shiftedEndDateTime = getShiftedRecordCalendarEndDateTime({- endDateTime,- originalStartInstant: currentStartInstant,- shiftedStartInstant,- });-- return {- startDateTime: shiftedStartInstant.toString(),- ...(shiftedEndDateTime !== undefined && {- endDateTime: shiftedEndDateTime,- }),- };- } catch {- return null;- }-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/getRecordCalendarWeekEventDropShift.ts b/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/getRecordCalendarWeekEventDropShift.tsdeleted file mode 100644index 51d9806f3b4..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/getRecordCalendarWeekEventDropShift.ts+++ /dev/null@@ -1,57 +0,0 @@-// Time of day must be read from the wall clock (what a clock on the wall-// shows), not from elapsed time since midnight. These two normally match,-// but disagree on Daylight Saving Time transition days:-//-// - Spring forward: at 02:00 the clock jumps to 03:00, so that day has-// only 23 hours. When the wall clock reads 10:00, only 9 real hours-// have elapsed since midnight.-// - Fall back: at 02:00 the clock jumps to 01:00, so that day has 25-// hours. When the wall clock reads 10:00, 11 real hours have elapsed.-//-// The delta is applied to wall-clock plain times downstream, so measuring-// it in elapsed time would shift the other selected records by an extra-// hour on those days. Using toPlainTime() keeps this on the wall clock.--import { Temporal } from 'temporal-polyfill';--type GetRecordCalendarWeekEventDropShiftArgs = {- destinationDay: Temporal.PlainDate;- destinationMinutes: number;- startDateTime: unknown;- timeZone: string;-};--export const getRecordCalendarWeekEventDropShift = ({- destinationDay,- destinationMinutes,- startDateTime,- timeZone,-}: GetRecordCalendarWeekEventDropShiftArgs) => {- if (typeof startDateTime !== 'string') {- return null;- }-- try {- const startZoned =- Temporal.Instant.from(startDateTime).toZonedDateTimeISO(timeZone);-- const dayOffset = startZoned.toPlainDate().until(destinationDay).days;-- const destinationTimeOfDayNanoseconds = BigInt(- Math.round(destinationMinutes * 60 * 1_000_000_000),- );- const originalTimeOfDayNanoseconds = BigInt(- Temporal.PlainTime.from('00:00')- .until(startZoned.toPlainTime())- .total({ unit: 'nanoseconds' }),- );-- return {- dayOffset,- timeOfDayDeltaNanoseconds:- destinationTimeOfDayNanoseconds - originalTimeOfDayNanoseconds,- };- } catch {- return null;- }-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/getRecordCalendarWeekEventHorizontalPosition.ts b/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/getRecordCalendarWeekEventHorizontalPosition.tsdeleted file mode 100644index fc24cde2974..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/getRecordCalendarWeekEventHorizontalPosition.ts+++ /dev/null@@ -1,57 +0,0 @@-const RECORD_CALENDAR_WEEK_EVENT_HORIZONTAL_INSET = 4;-const RECORD_CALENDAR_WEEK_EVENT_COLUMN_GAP = 2;-const RECORD_CALENDAR_WEEK_EVENT_POSITION_ROUNDING_FACTOR = 10_000;--type GetRecordCalendarWeekEventHorizontalPositionArgs = {- columnCount: number;- columnIndex: number;-};--export type RecordCalendarWeekEventHorizontalPosition = {- hoverStackingOrder: number;- left: string;- stackingOrder: number;- width: string;-};--const roundPositionValue = (value: number) =>- Math.round(value * RECORD_CALENDAR_WEEK_EVENT_POSITION_ROUNDING_FACTOR) /- RECORD_CALENDAR_WEEK_EVENT_POSITION_ROUNDING_FACTOR;--const formatPercentageWithPixelOffset = (- percentage: number,- pixelOffset: number,-) =>- pixelOffset < 0- ? `calc(${percentage}% - ${Math.abs(pixelOffset)}px)`- : `calc(${percentage}% + ${pixelOffset}px)`;--export const getRecordCalendarWeekEventHorizontalPosition = ({- columnCount,- columnIndex,-}: GetRecordCalendarWeekEventHorizontalPositionArgs): RecordCalendarWeekEventHorizontalPosition => {- const columnSpan = columnCount - columnIndex;- const leftPercentage = roundPositionValue((columnIndex * 100) / columnCount);- const leftPixelOffset = roundPositionValue(- RECORD_CALENDAR_WEEK_EVENT_HORIZONTAL_INSET -- ((RECORD_CALENDAR_WEEK_EVENT_HORIZONTAL_INSET * 2 -- RECORD_CALENDAR_WEEK_EVENT_COLUMN_GAP) *- columnIndex) /- columnCount,- );- const widthPercentage = roundPositionValue((columnSpan * 100) / columnCount);- const widthPixelReduction = roundPositionValue(- RECORD_CALENDAR_WEEK_EVENT_COLUMN_GAP +- ((RECORD_CALENDAR_WEEK_EVENT_HORIZONTAL_INSET * 2 -- RECORD_CALENDAR_WEEK_EVENT_COLUMN_GAP) *- columnSpan) /- columnCount,- );-- return {- hoverStackingOrder: columnCount + 1,- left: formatPercentageWithPixelOffset(leftPercentage, leftPixelOffset),- stackingOrder: columnIndex + 1,- width: `calc(${widthPercentage}% - ${widthPixelReduction}px)`,- };-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/getRecordCalendarWeekSlotIndex.ts b/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/getRecordCalendarWeekSlotIndex.tsdeleted file mode 100644index d7ad4f3c15a..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/getRecordCalendarWeekSlotIndex.ts+++ /dev/null@@ -1,28 +0,0 @@-import { RECORD_CALENDAR_WEEK_DIMENSIONS } from '@/object-record/record-calendar/week/constants/RecordCalendarWeekDimensions';--type GetRecordCalendarWeekSlotIndexArgs = {- columnHeight: number;- columnTop: number;- pointerY: number;-};--export const getRecordCalendarWeekSlotIndex = ({- columnHeight,- columnTop,- pointerY,-}: GetRecordCalendarWeekSlotIndexArgs): number | null => {- if (pointerY < columnTop || pointerY >= columnTop + columnHeight) {- return null;- }-- const slotCount =- (RECORD_CALENDAR_WEEK_DIMENSIONS.hoursInDay * 60) /- RECORD_CALENDAR_WEEK_DIMENSIONS.snapIntervalInMinutes;-- return Math.min(- slotCount - 1,- Math.floor(- (pointerY - columnTop) / RECORD_CALENDAR_WEEK_DIMENSIONS.slotHeight,- ),- );-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/getRecordCalendarWeekTimedEventMetrics.ts b/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/getRecordCalendarWeekTimedEventMetrics.tsdeleted file mode 100644index a539b930dd4..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/getRecordCalendarWeekTimedEventMetrics.ts+++ /dev/null@@ -1,83 +0,0 @@-import { RECORD_CALENDAR_WEEK_DIMENSIONS } from '@/object-record/record-calendar/week/constants/RecordCalendarWeekDimensions';-import { getRecordCalendarDateTimeRange } from '@/object-record/record-calendar/utils/getRecordCalendarDateTimeRange';-import { Temporal } from 'temporal-polyfill';--type GetRecordCalendarWeekTimedEventMetricsArgs = {- day: Temporal.PlainDate;- endDateTime?: unknown;- startDateTime: unknown;- timeZone: string;-};--export type RecordCalendarWeekTimedEventMetrics = {- endInPixels: number;- startInPixels: number;-};--export const getRecordCalendarWeekTimedEventHeight = ({- endInPixels,- startInPixels,-}: RecordCalendarWeekTimedEventMetrics) =>- Math.max(- RECORD_CALENDAR_WEEK_DIMENSIONS.minimumEventSlotHeight,- endInPixels -- startInPixels -- RECORD_CALENDAR_WEEK_DIMENSIONS.eventVerticalGap,- );--const getTimeOfDayInPixels = (dateTime: Temporal.ZonedDateTime) =>- (dateTime.hour + dateTime.minute / 60 + dateTime.second / 3600) *- RECORD_CALENDAR_WEEK_DIMENSIONS.hourHeight;--export const getRecordCalendarWeekTimedEventMetrics = ({- day,- endDateTime,- startDateTime,- timeZone,-}: GetRecordCalendarWeekTimedEventMetricsArgs): RecordCalendarWeekTimedEventMetrics | null => {- const range = getRecordCalendarDateTimeRange({- endDateTime,- startDateTime,- timeZone,- });-- if (range === null) {- return null;- }-- const dayStart = day.toZonedDateTime({ timeZone });- const nextDayStart = day.add({ days: 1 }).toZonedDateTime({ timeZone });-- if (- Temporal.Instant.compare(- range.start.toInstant(),- nextDayStart.toInstant(),- ) >= 0 ||- Temporal.Instant.compare(range.end.toInstant(), dayStart.toInstant()) <= 0- ) {- return null;- }-- const startInPixels =- Temporal.Instant.compare(range.start.toInstant(), dayStart.toInstant()) <= 0- ? 0- : getTimeOfDayInPixels(range.start);- let endInPixels =- Temporal.Instant.compare(range.end.toInstant(), nextDayStart.toInstant()) >=- 0- ? RECORD_CALENDAR_WEEK_DIMENSIONS.gridHeight- : getTimeOfDayInPixels(range.end);-- endInPixels = Math.min(- RECORD_CALENDAR_WEEK_DIMENSIONS.gridHeight,- Math.max(- endInPixels,- startInPixels + RECORD_CALENDAR_WEEK_DIMENSIONS.minimumEventSlotHeight,- ),- );-- return {- endInPixels,- startInPixels,- };-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/getShiftedRecordCalendarWeekEventUpdateInput.ts b/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/getShiftedRecordCalendarWeekEventUpdateInput.tsdeleted file mode 100644index 553d4e4d0a8..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/getShiftedRecordCalendarWeekEventUpdateInput.ts+++ /dev/null@@ -1,58 +0,0 @@-import { getShiftedRecordCalendarEndDateTime } from '@/object-record/record-drag/utils/getShiftedRecordCalendarEndDateTime';-import { type ObjectRecord } from '@/object-record/types/ObjectRecord';-import { Temporal } from 'temporal-polyfill';-import { isDefined } from 'twenty-shared/utils';--type GetShiftedRecordCalendarWeekEventUpdateInputArgs = {- record: ObjectRecord;- calendarFieldName: string;- calendarEndFieldName?: string;- dayOffset: number;- timeOfDayDeltaNanoseconds: bigint;- timeZone: string;-};--export const getShiftedRecordCalendarWeekEventUpdateInput = ({- record,- calendarFieldName,- calendarEndFieldName,- dayOffset,- timeOfDayDeltaNanoseconds,- timeZone,-}: GetShiftedRecordCalendarWeekEventUpdateInputArgs): Partial<ObjectRecord> | null => {- const startDateTime = record[calendarFieldName];-- try {- const originalStartInstant = Temporal.Instant.from(startDateTime);-- const shiftedStartInstant = originalStartInstant- .toZonedDateTimeISO(timeZone)- .toPlainDateTime()- .add({- days: dayOffset,- nanoseconds: Number(timeOfDayDeltaNanoseconds),- })- .toZonedDateTime(timeZone)- .toInstant();-- const endDateTime = isDefined(calendarEndFieldName)- ? record[calendarEndFieldName]- : undefined;-- const shiftedEndDateTime = getShiftedRecordCalendarEndDateTime({- endDateTime,- originalStartInstant,- shiftedStartInstant,- });-- return {- [calendarFieldName]: shiftedStartInstant.toString(),- ...(isDefined(calendarEndFieldName) &&- isDefined(shiftedEndDateTime) && {- [calendarEndFieldName]: shiftedEndDateTime,- }),- };- } catch {- return null;- }-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/resolveRecordCalendarWeekEventDrop.ts b/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/resolveRecordCalendarWeekEventDrop.tsdeleted file mode 100644index 57668e88779..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/resolveRecordCalendarWeekEventDrop.ts+++ /dev/null@@ -1,65 +0,0 @@-import { RECORD_CALENDAR_WEEK_DIMENSIONS } from '@/object-record/record-calendar/week/constants/RecordCalendarWeekDimensions';--type CalendarGridRect = {- height: number;- left: number;- top: number;- width: number;-};--type ResolveRecordCalendarWeekEventDropArgs = {- dayCount: number;- grabOffsetY: number;- gridRect: CalendarGridRect;- pointerX: number;- pointerY: number;-};--export type RecordCalendarWeekEventDrop = {- dayIndex: number;- destinationMinutes: number;-};--export const resolveRecordCalendarWeekEventDrop = ({- dayCount,- grabOffsetY,- gridRect,- pointerX,- pointerY,-}: ResolveRecordCalendarWeekEventDropArgs): RecordCalendarWeekEventDrop | null => {- const daysLeft =- gridRect.left + RECORD_CALENDAR_WEEK_DIMENSIONS.timeGutterWidth;- const daysWidth =- gridRect.width - RECORD_CALENDAR_WEEK_DIMENSIONS.timeGutterWidth;-- if (- dayCount <= 0 ||- pointerX < daysLeft ||- pointerX >= daysLeft + daysWidth ||- pointerY < gridRect.top ||- pointerY >= gridRect.top + gridRect.height- ) {- return null;- }-- const dayIndex = Math.floor((pointerX - daysLeft) / (daysWidth / dayCount));- const eventTopInPixels =- pointerY -- gridRect.top -- grabOffsetY -- RECORD_CALENDAR_WEEK_DIMENSIONS.eventVerticalGap / 2;- const unsnappedMinutes =- (eventTopInPixels / RECORD_CALENDAR_WEEK_DIMENSIONS.hourHeight) * 60;- const destinationMinutes = Math.min(- 24 * 60 - RECORD_CALENDAR_WEEK_DIMENSIONS.snapIntervalInMinutes,- Math.max(- 0,- Math.round(- unsnappedMinutes /- RECORD_CALENDAR_WEEK_DIMENSIONS.snapIntervalInMinutes,- ) * RECORD_CALENDAR_WEEK_DIMENSIONS.snapIntervalInMinutes,- ),- );-- return { dayIndex, destinationMinutes };-};diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/updateRecordCalendarWeekActiveSlot.ts b/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/updateRecordCalendarWeekActiveSlot.tsdeleted file mode 100644index 0135e172d9a..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/week/utils/updateRecordCalendarWeekActiveSlot.ts+++ /dev/null@@ -1,45 +0,0 @@-export type RecordCalendarWeekActiveSlot = {- day: string;- interactionMode: RecordCalendarWeekSlotInteractionMode;- slotIndex: number;-};--export type RecordCalendarWeekSlotInteractionMode = 'keyboard' | 'pointer';--type UpdateRecordCalendarWeekActiveSlotArgs = {- currentActiveSlot: RecordCalendarWeekActiveSlot | null;- day: string;- interactionMode: RecordCalendarWeekSlotInteractionMode;- slotIndex: number | null;-};--export const updateRecordCalendarWeekActiveSlot = ({- currentActiveSlot,- day,- interactionMode,- slotIndex,-}: UpdateRecordCalendarWeekActiveSlotArgs): RecordCalendarWeekActiveSlot | null => {- if (slotIndex === null) {- return currentActiveSlot?.day === day &&- currentActiveSlot.interactionMode === interactionMode- ? null- : currentActiveSlot;- }-- if (- currentActiveSlot?.interactionMode === 'keyboard' &&- interactionMode === 'pointer'- ) {- return currentActiveSlot;- }-- if (- currentActiveSlot?.day === day &&- currentActiveSlot.interactionMode === interactionMode &&- currentActiveSlot.slotIndex === slotIndex- ) {- return currentActiveSlot;- }-- return { day, interactionMode, slotIndex };-};diff --git a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessCalendarCardDrop.ts b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessCalendarCardDrop.tsindex 96c71d874c7..f4812f37598 100644--- a/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessCalendarCardDrop.ts+++ b/packages/twenty-front/src/modules/object-record/record-drag/hooks/useProcessCalendarCardDrop.ts@@ -9,12 +9,11 @@ import { calendarDayRecordIdsComponentFamilySelector } from '@/object-record/recimport { extractRecordPositions } from '@/object-record/record-drag/utils/extractRecordPositions';import { getShiftedRecordCalendarDateTimeUpdateInput } from '@/object-record/record-drag/utils/getShiftedRecordCalendarDateTimeUpdateInput';import { getShiftedRecordCalendarDateUpdateInput } from '@/object-record/record-drag/utils/getShiftedRecordCalendarDateUpdateInput';-import { recordIndexCalendarEndFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarEndFieldMetadataIdComponentState';import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';import { computeNewPositionOfDraggedRecord } from '@/object-record/utils/computeNewPositionOfDraggedRecord';import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUserTimezone';import { useAtomComponentFamilySelectorCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorCallbackState';-import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';+import { recordIndexCalendarFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarFieldMetadataIdComponentState';import { Temporal } from 'temporal-polyfill';import { FieldMetadataType } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';@@ -23,11 +22,10 @@ import { getDragOperationType } from '@/object-record/record-drag/utils/getDragOexport const useProcessCalendarCardDrop = () => {const store = useStore();const { objectMetadataItem } = useRecordCalendarContextOrThrow();- const { currentView } = useGetCurrentViewOnly();- const { updateOneRecord } = useUpdateOneRecord();- const recordIndexCalendarEndFieldMetadataId = useAtomComponentStateValue(- recordIndexCalendarEndFieldMetadataIdComponentState,+ const recordIndexCalendarFieldMetadataId = useAtomComponentStateValue(+ recordIndexCalendarFieldMetadataIdComponentState,);+ const { updateOneRecord } = useUpdateOneRecord();const { userTimezone } = useUserTimezone();@@ -50,7 +48,7 @@ export const useProcessCalendarCardDrop = () => {destinationIndex: number;selectedRecordIds: string[];}) => {- if (!currentView?.calendarFieldMetadataId) return;+ if (!recordIndexCalendarFieldMetadataId) return;const dragOperationType = getDragOperationType({draggedRecordId: recordId,@@ -61,10 +59,7 @@ export const useProcessCalendarCardDrop = () => {const sourcePlainDate = Temporal.PlainDate.from(sourceDate);const calendarFieldMetadata = objectMetadataItem.fields.find(- (field) => field.id === currentView.calendarFieldMetadataId,- );- const calendarEndFieldMetadata = objectMetadataItem.fields.find(- (field) => field.id === recordIndexCalendarEndFieldMetadataId,+ (field) => field.id === recordIndexCalendarFieldMetadataId,);if (!calendarFieldMetadata) return;@@ -143,75 +138,43 @@ export const useProcessCalendarCardDrop = () => {if (!isDefined(recordToShift)) {continue;}- if (calendarFieldMetadata.type === FieldMetadataType.DATE) {- const calendarEndFieldName =- calendarEndFieldMetadata?.type === FieldMetadataType.DATE- ? calendarEndFieldMetadata.name- : undefined;-- const updateOneRecordInput = getShiftedRecordCalendarDateUpdateInput({- record: recordToShift,- calendarFieldName: calendarFieldMetadata.name,- calendarEndFieldName,- dayOffset,- fallbackStartDate: destinationPlainDate.toString(),- });- if (!isDefined(updateOneRecordInput)) {- continue;- }-- await updateOneRecord({- objectNameSingular: objectMetadataItem.nameSingular,- idToUpdate,- updateOneRecordInput: {- ...updateOneRecordInput,- ...(idToUpdate === recordId && { position: newPosition }),- },- });- } else {- const calendarEndFieldName =- calendarEndFieldMetadata?.type === FieldMetadataType.DATE_TIME- ? calendarEndFieldMetadata.name- : undefined;-- const fallbackStartDateTime = destinationPlainDate- .toZonedDateTime({ timeZone: userTimezone })- .toInstant()- .toString();-- const updateOneRecordInput =- getShiftedRecordCalendarDateTimeUpdateInput({- record: recordToShift,- calendarFieldName: calendarFieldMetadata.name,- calendarEndFieldName,- dayOffset,- timeZone: userTimezone,- fallbackStartDateTime,- });- if (!isDefined(updateOneRecordInput)) {- continue;- }-- await updateOneRecord({- objectNameSingular: objectMetadataItem.nameSingular,- idToUpdate,- updateOneRecordInput: {- ...updateOneRecordInput,- ...(idToUpdate === recordId && { position: newPosition }),- },- });- }+ const updateOneRecordInput =+ calendarFieldMetadata.type === FieldMetadataType.DATE+ ? getShiftedRecordCalendarDateUpdateInput({+ record: recordToShift,+ calendarFieldName: calendarFieldMetadata.name,+ dayOffset,+ fallbackStartDate: destinationPlainDate.toString(),+ })+ : getShiftedRecordCalendarDateTimeUpdateInput({+ record: recordToShift,+ calendarFieldName: calendarFieldMetadata.name,+ dayOffset,+ timeZone: userTimezone,+ fallbackStartDateTime: destinationPlainDate+ .toZonedDateTime({ timeZone: userTimezone })+ .toInstant()+ .toString(),+ });++ await updateOneRecord({+ objectNameSingular: objectMetadataItem.nameSingular,+ idToUpdate,+ updateOneRecordInput: {+ ...updateOneRecordInput,+ ...(idToUpdate === recordId && { position: newPosition }),+ },+ });}},[store,- currentView,+ recordIndexCalendarFieldMetadataId,objectMetadataItem.nameSingular,objectMetadataItem.fields,calendarDayRecordIdsSelector,userTimezone,updateOneRecord,- recordIndexCalendarEndFieldMetadataId,],);diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDate.test.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDate.test.tsindex 45cda8819d2..e4e72f5286d 100644--- a/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDate.test.ts+++ b/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDate.test.ts@@ -1,16 +1,14 @@import { getShiftedRecordCalendarDate } from '@/object-record/record-drag/utils/getShiftedRecordCalendarDate';describe('getShiftedRecordCalendarDate', () => {- it('moves a dated event by the day offset and preserves duration', () => {+ it('moves a date by the day offset', () => {expect(getShiftedRecordCalendarDate({dayOffset: 3,startDate: '2026-07-08',- endDate: '2026-07-10',}),).toEqual({startDate: '2026-07-11',- endDate: '2026-07-13',});});@@ -19,48 +17,9 @@ describe('getShiftedRecordCalendarDate', () => {getShiftedRecordCalendarDate({dayOffset: -2,startDate: '2026-07-08',- endDate: '2026-07-10',}),).toEqual({startDate: '2026-07-06',- endDate: '2026-07-08',- });- });-- it('shifts an end that is equal to the start', () => {- expect(- getShiftedRecordCalendarDate({- dayOffset: 1,- startDate: '2026-07-08',- endDate: '2026-07-08',- }),- ).toEqual({- startDate: '2026-07-09',- endDate: '2026-07-09',- });- });-- it('does not synthesize an end when it is malformed', () => {- expect(- getShiftedRecordCalendarDate({- dayOffset: 1,- startDate: '2026-07-08',- endDate: 'not-a-date',- }),- ).toEqual({- startDate: '2026-07-09',- });- });-- it('drops an end that precedes the start', () => {- expect(- getShiftedRecordCalendarDate({- dayOffset: 1,- startDate: '2026-07-08',- endDate: '2026-07-05',- }),- ).toEqual({- startDate: '2026-07-09',});});@@ -78,7 +37,6 @@ describe('getShiftedRecordCalendarDate', () => {getShiftedRecordCalendarDate({dayOffset: 1,startDate: 'not-a-date',- endDate: '2026-07-10',}),).toBeNull();});diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDateTime.test.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDateTime.test.tsindex 7f4cdd7be26..d7773c944f2 100644--- a/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDateTime.test.ts+++ b/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDateTime.test.ts@@ -3,45 +3,27 @@ import { getShiftedRecordCalendarDateTime } from '@/object-record/record-drag/utconst timeZone = 'Europe/Paris';describe('getShiftedRecordCalendarDateTime', () => {- it('moves a timed event by the rendered day offset and preserves duration', () => {+ it('moves a date-time by the day offset without changing the time', () => {expect(getShiftedRecordCalendarDateTime({dayOffset: 3,startDateTime: '2026-07-08T15:59:00Z',- endDateTime: '2026-07-10T18:59:00Z',timeZone,}),).toEqual({startDateTime: '2026-07-11T15:59:00Z',- endDateTime: '2026-07-13T18:59:00Z',});});- it('moves a continuation fragment by its visual anchor', () => {- expect(- getShiftedRecordCalendarDateTime({- dayOffset: 1,- startDateTime: '2026-07-08T15:59:00Z',- endDateTime: '2026-07-10T18:59:00Z',- timeZone,- }),- ).toEqual({- startDateTime: '2026-07-09T15:59:00Z',- endDateTime: '2026-07-11T18:59:00Z',- });- });-- it('lands on the requested local time and preserves duration across DST', () => {+ it('preserves the local time across DST', () => {expect(getShiftedRecordCalendarDateTime({dayOffset: 1,startDateTime: '2026-03-28T09:00:00Z',- endDateTime: '2026-03-28T11:00:00Z',timeZone,}),).toEqual({startDateTime: '2026-03-29T08:00:00Z',- endDateTime: '2026-03-29T10:00:00Z',});});@@ -50,53 +32,10 @@ describe('getShiftedRecordCalendarDateTime', () => {getShiftedRecordCalendarDateTime({dayOffset: 1,startDateTime: '2026-10-25T01:30:00Z',- endDateTime: '2026-10-25T02:30:00Z',timeZone,}),).toEqual({startDateTime: '2026-10-26T01:30:00Z',- endDateTime: '2026-10-26T02:30:00Z',- });- });-- it('keeps the local start time when a continuation moves across DST', () => {- expect(- getShiftedRecordCalendarDateTime({- dayOffset: 1,- startDateTime: '2026-03-28T09:00:00Z',- endDateTime: '2026-03-30T10:00:00Z',- timeZone,- }),- ).toEqual({- startDateTime: '2026-03-29T08:00:00Z',- endDateTime: '2026-03-31T09:00:00Z',- });- });-- it('does not synthesize an end when it is unusable', () => {- expect(- getShiftedRecordCalendarDateTime({- dayOffset: 1,- startDateTime: '2026-07-08T15:59:00Z',- endDateTime: 'not-a-date',- timeZone,- }),- ).toEqual({- startDateTime: '2026-07-09T15:59:00Z',- });- });-- it('shifts an end that is equal to the start', () => {- expect(- getShiftedRecordCalendarDateTime({- dayOffset: 1,- startDateTime: '2026-07-08T15:59:00Z',- endDateTime: '2026-07-08T15:59:00Z',- timeZone,- }),- ).toEqual({- startDateTime: '2026-07-09T15:59:00Z',- endDateTime: '2026-07-09T15:59:00Z',});});diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDateTimeUpdateInput.test.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDateTimeUpdateInput.test.tsindex ee355d97ae9..ac7eb37d724 100644--- a/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDateTimeUpdateInput.test.ts+++ b/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDateTimeUpdateInput.test.ts@@ -24,7 +24,7 @@ describe('getShiftedRecordCalendarDateTimeUpdateInput', () => {).toEqual({ startAt: '2026-07-11T15:59:00Z' });});- it('shifts both the start and end date-times when an end field is given', () => {+ it('updates only the selected date-time field, leaving other dates untouched', () => {expect(getShiftedRecordCalendarDateTimeUpdateInput({record: buildRecord({@@ -32,14 +32,12 @@ describe('getShiftedRecordCalendarDateTimeUpdateInput', () => {endAt: '2026-07-10T18:59:00Z',}),calendarFieldName: 'startAt',- calendarEndFieldName: 'endAt',dayOffset: 1,timeZone,fallbackStartDateTime,}),).toEqual({startAt: '2026-07-09T15:59:00Z',- endAt: '2026-07-11T18:59:00Z',});});@@ -63,27 +61,10 @@ describe('getShiftedRecordCalendarDateTimeUpdateInput', () => {endAt: '2026-07-10T18:59:00Z',}),calendarFieldName: 'startAt',- calendarEndFieldName: 'endAt',dayOffset: 1,timeZone,fallbackStartDateTime,}),).toEqual({ startAt: fallbackStartDateTime });});-- it('omits the end when it precedes the start', () => {- expect(- getShiftedRecordCalendarDateTimeUpdateInput({- record: buildRecord({- startAt: '2026-07-08T15:59:00Z',- endAt: '2026-07-07T18:59:00Z',- }),- calendarFieldName: 'startAt',- calendarEndFieldName: 'endAt',- dayOffset: 1,- timeZone,- fallbackStartDateTime,- }),- ).toEqual({ startAt: '2026-07-09T15:59:00Z' });- });});diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDateUpdateInput.test.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDateUpdateInput.test.tsindex 691a75f7029..6d734968c5d 100644--- a/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDateUpdateInput.test.ts+++ b/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarDateUpdateInput.test.ts@@ -20,16 +20,15 @@ describe('getShiftedRecordCalendarDateUpdateInput', () => {).toEqual({ startDate: '2026-07-11' });});- it('shifts both the start and end dates when an end field is given', () => {+ it('updates only the selected date field, leaving other dates untouched', () => {expect(getShiftedRecordCalendarDateUpdateInput({record: buildRecord({ startDate: '2026-07-08', endDate: '2026-07-10' }),calendarFieldName: 'startDate',- calendarEndFieldName: 'endDate',dayOffset: 1,fallbackStartDate: '2026-07-20',}),- ).toEqual({ startDate: '2026-07-09', endDate: '2026-07-11' });+ ).toEqual({ startDate: '2026-07-09' });});it('falls back to the destination date when the start is missing', () => {@@ -48,22 +47,9 @@ describe('getShiftedRecordCalendarDateUpdateInput', () => {getShiftedRecordCalendarDateUpdateInput({record: buildRecord({ startDate: 'not-a-date', endDate: '2026-07-10' }),calendarFieldName: 'startDate',- calendarEndFieldName: 'endDate',dayOffset: 1,fallbackStartDate: '2026-07-20',}),).toEqual({ startDate: '2026-07-20' });});-- it('omits the end when it precedes the start', () => {- expect(- getShiftedRecordCalendarDateUpdateInput({- record: buildRecord({ startDate: '2026-07-08', endDate: '2026-07-05' }),- calendarFieldName: 'startDate',- calendarEndFieldName: 'endDate',- dayOffset: 1,- fallbackStartDate: '2026-07-20',- }),- ).toEqual({ startDate: '2026-07-09' });- });});diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarEndDate.test.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarEndDate.test.tsdeleted file mode 100644index a97ca5cd816..00000000000--- a/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarEndDate.test.ts+++ /dev/null@@ -1,66 +0,0 @@-import { getShiftedRecordCalendarEndDate } from '@/object-record/record-drag/utils/getShiftedRecordCalendarEndDate';-import { Temporal } from 'temporal-polyfill';--const originalStartDate = Temporal.PlainDate.from('2026-07-08');--describe('getShiftedRecordCalendarEndDate', () => {- it('shifts an end that is after the start by the day offset', () => {- expect(- getShiftedRecordCalendarEndDate({- dayOffset: 1,- endDate: '2026-07-10',- originalStartDate,- }),- ).toBe('2026-07-11');- });-- it('shifts an end that is equal to the start', () => {- expect(- getShiftedRecordCalendarEndDate({- dayOffset: 1,- endDate: '2026-07-08',- originalStartDate,- }),- ).toBe('2026-07-09');- });-- it('moves the end backwards for a negative offset', () => {- expect(- getShiftedRecordCalendarEndDate({- dayOffset: -2,- endDate: '2026-07-10',- originalStartDate,- }),- ).toBe('2026-07-08');- });-- it('returns undefined when the end precedes the start', () => {- expect(- getShiftedRecordCalendarEndDate({- dayOffset: 1,- endDate: '2026-07-05',- originalStartDate,- }),- ).toBeUndefined();- });-- it('returns undefined for a malformed end', () => {- expect(- getShiftedRecordCalendarEndDate({- dayOffset: 1,- endDate: 'not-a-date',- originalStartDate,- }),- ).toBeUndefined();- });-- it('returns undefined for a missing end', () => {- expect(- getShiftedRecordCalendarEndDate({- dayOffset: 1,- endDate: undefined,- originalStartDate,- }),- ).toBeUndefined();- });-});diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarEndDateTime.test.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarEndDateTime.test.tsdeleted file mode 100644index f35d251ffcc..00000000000--- a/packages/twenty-front/src/modules/object-record/record-drag/utils/__tests__/getShiftedRecordCalendarEndDateTime.test.ts+++ /dev/null@@ -1,43 +0,0 @@-import { getShiftedRecordCalendarEndDateTime } from '@/object-record/record-drag/utils/getShiftedRecordCalendarEndDateTime';-import { Temporal } from 'temporal-polyfill';--const originalStartInstant = Temporal.Instant.from('2026-07-07T07:00:00Z');-const shiftedStartInstant = Temporal.Instant.from('2026-07-10T08:00:00Z');--describe('getShiftedRecordCalendarEndDateTime', () => {- it('preserves the original elapsed duration from the shifted start', () => {- expect(- getShiftedRecordCalendarEndDateTime({- endDateTime: '2026-07-09T10:00:00Z',- originalStartInstant,- shiftedStartInstant,- }),- ).toBe('2026-07-12T11:00:00Z');- });-- it('preserves a zero-duration end', () => {- expect(- getShiftedRecordCalendarEndDateTime({- endDateTime: originalStartInstant.toString(),- originalStartInstant,- shiftedStartInstant,- }),- ).toBe(shiftedStartInstant.toString());- });-- it.each([- ['missing', undefined],- ['null', null],- ['non-string', 42],- ['malformed', 'not-a-date'],- ['before the start', '2026-07-07T06:59:00Z'],- ])('returns undefined when the end is %s', (_label, endDateTime) => {- expect(- getShiftedRecordCalendarEndDateTime({- endDateTime,- originalStartInstant,- shiftedStartInstant,- }),- ).toBeUndefined();- });-});diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDate.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDate.tsindex 82e633f72a1..b7a43442ae6 100644--- a/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDate.ts+++ b/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDate.ts@@ -1,20 +1,16 @@-import { getShiftedRecordCalendarEndDate } from '@/object-record/record-drag/utils/getShiftedRecordCalendarEndDate';import { Temporal } from 'temporal-polyfill';type GetShiftedRecordCalendarDateArgs = {dayOffset: number;- endDate?: unknown;startDate?: unknown;};export type ShiftedRecordCalendarDate = {- endDate?: string;startDate: string;};export const getShiftedRecordCalendarDate = ({dayOffset,- endDate,startDate,}: GetShiftedRecordCalendarDateArgs): ShiftedRecordCalendarDate | null => {if (typeof startDate !== 'string') {@@ -25,17 +21,8 @@ export const getShiftedRecordCalendarDate = ({const currentStartDate = Temporal.PlainDate.from(startDate);const shiftedStartDate = currentStartDate.add({ days: dayOffset });- const shiftedEndDate = getShiftedRecordCalendarEndDate({- dayOffset,- endDate,- originalStartDate: currentStartDate,- });-return {startDate: shiftedStartDate.toString(),- ...(shiftedEndDate !== undefined && {- endDate: shiftedEndDate,- }),};} catch {return null;diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDateTime.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDateTime.tsindex 7c05467c96f..4f798421f3d 100644--- a/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDateTime.ts+++ b/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDateTime.ts@@ -1,21 +1,17 @@-import { getShiftedRecordCalendarEndDateTime } from '@/object-record/record-drag/utils/getShiftedRecordCalendarEndDateTime';import { Temporal } from 'temporal-polyfill';type GetShiftedRecordCalendarDateTimeArgs = {dayOffset: number;- endDateTime?: unknown;startDateTime?: unknown;timeZone: string;};export type ShiftedRecordCalendarDateTime = {- endDateTime?: string;startDateTime: string;};export const getShiftedRecordCalendarDateTime = ({dayOffset,- endDateTime,startDateTime,timeZone,}: GetShiftedRecordCalendarDateTimeArgs): ShiftedRecordCalendarDateTime | null => {@@ -30,17 +26,8 @@ export const getShiftedRecordCalendarDateTime = ({.add({ days: dayOffset }).toInstant();- const shiftedEndDateTime = getShiftedRecordCalendarEndDateTime({- endDateTime,- originalStartInstant: currentStartInstant,- shiftedStartInstant,- });-return {startDateTime: shiftedStartInstant.toString(),- ...(shiftedEndDateTime !== undefined && {- endDateTime: shiftedEndDateTime,- }),};} catch {return null;diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDateTimeUpdateInput.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDateTimeUpdateInput.tsindex 131b76f09ab..4db5005f0c1 100644--- a/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDateTimeUpdateInput.ts+++ b/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDateTimeUpdateInput.ts@@ -1,11 +1,9 @@import { type ObjectRecord } from '@/object-record/types/ObjectRecord';import { getShiftedRecordCalendarDateTime } from '@/object-record/record-drag/utils/getShiftedRecordCalendarDateTime';-import { isDefined } from 'twenty-shared/utils';type GetShiftedRecordCalendarDateTimeUpdateInputArgs = {record: ObjectRecord;calendarFieldName: string;- calendarEndFieldName?: string;dayOffset: number;timeZone: string;fallbackStartDateTime: string;@@ -14,32 +12,18 @@ type GetShiftedRecordCalendarDateTimeUpdateInputArgs = {export const getShiftedRecordCalendarDateTimeUpdateInput = ({record,calendarFieldName,- calendarEndFieldName,dayOffset,timeZone,fallbackStartDateTime,-}: GetShiftedRecordCalendarDateTimeUpdateInputArgs): Partial<ObjectRecord> | null => {- const startDateTime = record[calendarFieldName] as string | undefined;-- if (!isDefined(startDateTime)) {- return { [calendarFieldName]: fallbackStartDateTime };- }-+}: GetShiftedRecordCalendarDateTimeUpdateInputArgs): Partial<ObjectRecord> => {const shiftedDateTime = getShiftedRecordCalendarDateTime({dayOffset,- startDateTime,- endDateTime: isDefined(calendarEndFieldName)- ? record[calendarEndFieldName]- : undefined,+ startDateTime: record[calendarFieldName],timeZone,});return {[calendarFieldName]:shiftedDateTime?.startDateTime ?? fallbackStartDateTime,- ...(isDefined(calendarEndFieldName) &&- isDefined(shiftedDateTime?.endDateTime) && {- [calendarEndFieldName]: shiftedDateTime.endDateTime,- }),};};diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDateUpdateInput.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDateUpdateInput.tsindex b9bfe58ba0d..81082ab8a83 100644--- a/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDateUpdateInput.ts+++ b/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarDateUpdateInput.ts@@ -1,11 +1,9 @@import { type ObjectRecord } from '@/object-record/types/ObjectRecord';import { getShiftedRecordCalendarDate } from '@/object-record/record-drag/utils/getShiftedRecordCalendarDate';-import { isDefined } from 'twenty-shared/utils';type GetShiftedRecordCalendarDateUpdateInputArgs = {record: ObjectRecord;calendarFieldName: string;- calendarEndFieldName?: string;dayOffset: number;fallbackStartDate: string;};@@ -13,29 +11,15 @@ type GetShiftedRecordCalendarDateUpdateInputArgs = {export const getShiftedRecordCalendarDateUpdateInput = ({record,calendarFieldName,- calendarEndFieldName,dayOffset,fallbackStartDate,-}: GetShiftedRecordCalendarDateUpdateInputArgs): Partial<ObjectRecord> | null => {- const startDate = record[calendarFieldName] as string | undefined;-- if (!isDefined(startDate)) {- return { [calendarFieldName]: fallbackStartDate };- }-+}: GetShiftedRecordCalendarDateUpdateInputArgs): Partial<ObjectRecord> => {const shiftedDate = getShiftedRecordCalendarDate({dayOffset,- startDate,- endDate: isDefined(calendarEndFieldName)- ? record[calendarEndFieldName]- : undefined,+ startDate: record[calendarFieldName],});return {[calendarFieldName]: shiftedDate?.startDate ?? fallbackStartDate,- ...(isDefined(calendarEndFieldName) &&- isDefined(shiftedDate?.endDate) && {- [calendarEndFieldName]: shiftedDate.endDate,- }),};};diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarEndDate.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarEndDate.tsdeleted file mode 100644index 60f7b3c4963..00000000000--- a/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarEndDate.ts+++ /dev/null@@ -1,29 +0,0 @@-import { Temporal } from 'temporal-polyfill';--type GetShiftedRecordCalendarEndDateArgs = {- dayOffset: number;- endDate?: unknown;- originalStartDate: Temporal.PlainDate;-};--export const getShiftedRecordCalendarEndDate = ({- dayOffset,- endDate,- originalStartDate,-}: GetShiftedRecordCalendarEndDateArgs): string | undefined => {- if (typeof endDate !== 'string') {- return undefined;- }-- try {- const originalEndDate = Temporal.PlainDate.from(endDate);-- if (Temporal.PlainDate.compare(originalEndDate, originalStartDate) < 0) {- return undefined;- }-- return originalEndDate.add({ days: dayOffset }).toString();- } catch {- return undefined;- }-};diff --git a/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarEndDateTime.ts b/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarEndDateTime.tsdeleted file mode 100644index 18ce1f51fd5..00000000000--- a/packages/twenty-front/src/modules/object-record/record-drag/utils/getShiftedRecordCalendarEndDateTime.ts+++ /dev/null@@ -1,35 +0,0 @@-import { Temporal } from 'temporal-polyfill';--type GetShiftedRecordCalendarEndDateTimeArgs = {- endDateTime?: unknown;- originalStartInstant: Temporal.Instant;- shiftedStartInstant: Temporal.Instant;-};--export const getShiftedRecordCalendarEndDateTime = ({- endDateTime,- originalStartInstant,- shiftedStartInstant,-}: GetShiftedRecordCalendarEndDateTimeArgs): string | undefined => {- if (typeof endDateTime !== 'string') {- return undefined;- }-- try {- const originalEndInstant = Temporal.Instant.from(endDateTime);-- if (- Temporal.Instant.compare(originalEndInstant, originalStartInstant) < 0- ) {- return undefined;- }-- return Temporal.Instant.fromEpochNanoseconds(- shiftedStartInstant.epochNanoseconds +- (originalEndInstant.epochNanoseconds -- originalStartInstant.epochNanoseconds),- ).toString();- } catch {- return undefined;- }-};diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexStates.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexStates.tsindex d561dc7311b..5914b6cdd05 100644--- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexStates.ts+++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexStates.ts@@ -12,8 +12,6 @@ import { currentRecordFilterGroupsComponentState } from '@/object-record/record-import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';import { useSetRecordGroups } from '@/object-record/record-group/hooks/useSetRecordGroups';import { getSupportedRecordCalendarLayout } from '@/object-record/record-calendar/utils/getSupportedRecordCalendarLayout';-import { getEffectiveRecordCalendarEndFieldMetadataId } from '@/object-record/record-calendar/utils/getEffectiveRecordCalendarEndFieldMetadataId';-import { recordIndexCalendarEndFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarEndFieldMetadataIdComponentState';import { recordIndexGroupFieldMetadataItemComponentState } from '@/object-record/record-index/states/recordIndexGroupFieldMetadataComponentState';import { currentRecordSortsComponentState } from '@/object-record/record-sort/states/currentRecordSortsComponentState';@@ -343,15 +341,6 @@ export const useLoadRecordIndexStates = () => {}),view.calendarFieldMetadataId ?? null,);- batchSet(- recordIndexCalendarEndFieldMetadataIdComponentState.atomFamily({- instanceId: recordCalendarInstanceId,- }),- getEffectiveRecordCalendarEndFieldMetadataId({- calendarEndFieldMetadataId: view.calendarEndFieldMetadataId,- isCalendarWeekViewEnabled,- }),- );batchSet(recordIndexCalendarLayoutComponentState.atomFamily({instanceId: recordCalendarInstanceId,diff --git a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexCalendarEndFieldMetadataIdComponentState.ts b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexCalendarEndFieldMetadataIdComponentState.tsdeleted file mode 100644index e133b54ca83..00000000000--- a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexCalendarEndFieldMetadataIdComponentState.ts+++ /dev/null@@ -1,9 +0,0 @@-import { RecordCalendarComponentInstanceContext } from '@/object-record/record-calendar/states/contexts/RecordCalendarComponentInstanceContext';-import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';--export const recordIndexCalendarEndFieldMetadataIdComponentState =- createAtomComponentState<string | null>({- key: 'recordIndexCalendarEndFieldMetadataIdComponentState',- defaultValue: null,- componentInstanceContext: RecordCalendarComponentInstanceContext,- });diff --git a/packages/twenty-front/src/modules/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutCallbacks.ts b/packages/twenty-front/src/modules/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutCallbacks.tsindex 84866b17ce0..94823b90bae 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutCallbacks.ts+++ b/packages/twenty-front/src/modules/page-layout/widgets/record-table/hooks/useRecordTableWidgetLayoutCallbacks.ts@@ -169,6 +169,7 @@ export const useRecordTableWidgetLayoutCallbacks = ({view: {...widgetViewDraft.view,calendarFieldMetadataId: fieldMetadataItem.id,+ calendarEndFieldMetadataId: null,calendarLayout: resolveCalendarLayout(widgetViewDraft.view.calendarLayout,),diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentCreateMode.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentCreateMode.tsxindex 9dfbd10835a..34e909a5b9a 100644--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentCreateMode.tsx+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentCreateMode.tsx@@ -20,7 +20,6 @@ import { ViewPickerCreateButton } from '@/views/view-picker/components/ViewPickeimport { ViewPickerIconAndNameContainer } from '@/views/view-picker/components/ViewPickerIconAndNameContainer';import { ViewPickerSaveButtonContainer } from '@/views/view-picker/components/ViewPickerSaveButtonContainer';import { ViewPickerSelectContainer } from '@/views/view-picker/components/ViewPickerSelectContainer';-import { VIEW_PICKER_CALENDAR_END_FIELD_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerCalendarEndFieldDropdownId';import { VIEW_PICKER_CALENDAR_FIELD_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerCalendarFieldDropdownId';import { VIEW_PICKER_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerDropdownId';import { VIEW_PICKER_KANBAN_FIELD_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerKanbanFieldDropdownId';@@ -30,7 +29,6 @@ import { useCreateViewFromCurrentState } from '@/views/view-picker/hooks/useCreaimport { useGetAvailableFieldsForCalendar } from '@/views/view-picker/hooks/useGetAvailableFieldsForCalendar';import { useGetAvailableFieldsToGroupRecordsBy } from '@/views/view-picker/hooks/useGetAvailableFieldsToGroupRecordsBy';import { useViewPickerMode } from '@/views/view-picker/hooks/useViewPickerMode';-import { viewPickerCalendarEndFieldMetadataIdComponentState } from '@/views/view-picker/states/viewPickerCalendarEndFieldMetadataIdComponentState';import { viewPickerCalendarFieldMetadataIdComponentState } from '@/views/view-picker/states/viewPickerCalendarFieldMetadataIdComponentState';import { viewPickerInputNameComponentState } from '@/views/view-picker/states/viewPickerInputNameComponentState';import { viewPickerIsDirtyComponentState } from '@/views/view-picker/states/viewPickerIsDirtyComponentState';@@ -38,7 +36,6 @@ import { viewPickerIsPersistingComponentState } from '@/views/view-picker/statesimport { viewPickerMainGroupByFieldMetadataIdComponentState } from '@/views/view-picker/states/viewPickerMainGroupByFieldMetadataIdComponentState';import { viewPickerSelectedIconComponentState } from '@/views/view-picker/states/viewPickerSelectedIconComponentState';import { viewPickerTypeComponentState } from '@/views/view-picker/states/viewPickerTypeComponentState';-import { getAvailableCalendarEndFieldMetadataItems } from '@/views/view-picker/utils/getAvailableCalendarEndFieldMetadataItems';import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';import { Trans, useLingui } from '@lingui/react/macro';import { useMemo, useState } from 'react';@@ -58,9 +55,6 @@ export const ViewPickerContentCreateMode = () => {const { t } = useLingui();const { viewPickerMode, setViewPickerMode } = useViewPickerMode();const [hasManuallySelectedIcon, setHasManuallySelectedIcon] = useState(false);- const isCalendarWeekViewEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED,- );const isListViewEnabled = useIsFeatureEnabled(FeatureFlagKey.IS_LIST_VIEW_ENABLED,);@@ -96,11 +90,6 @@ export const ViewPickerContentCreateMode = () => {setViewPickerCalendarFieldMetadataId,] = useAtomComponentState(viewPickerCalendarFieldMetadataIdComponentState);- const [- viewPickerCalendarEndFieldMetadataId,- setViewPickerCalendarEndFieldMetadataId,- ] = useAtomComponentState(viewPickerCalendarEndFieldMetadataIdComponentState);-const [viewPickerType, setViewPickerType] = useAtomComponentState(viewPickerTypeComponentState,);@@ -112,12 +101,6 @@ export const ViewPickerContentCreateMode = () => {const { availableFieldsForCalendar } = useGetAvailableFieldsForCalendar();- const availableCalendarEndFieldMetadataItems =- getAvailableCalendarEndFieldMetadataItems({- availableFieldsForCalendar,- calendarFieldMetadataId: viewPickerCalendarFieldMetadataId,- });-useHotkeysOnFocusedElement({keys: [Key.Enter],callback: async () => {@@ -251,27 +234,6 @@ export const ViewPickerContentCreateMode = () => {fullWidthvalue={viewPickerCalendarFieldMetadataId}onChange={(value) => {- const nextCalendarFieldMetadataItem =- availableFieldsForCalendar.find(- (fieldMetadataItem) => fieldMetadataItem.id === value,- );- const currentCalendarEndFieldMetadataItem =- availableFieldsForCalendar.find(- (fieldMetadataItem) =>- fieldMetadataItem.id ===- viewPickerCalendarEndFieldMetadataId,- );-- if (- viewPickerCalendarEndFieldMetadataId !== '' &&- (currentCalendarEndFieldMetadataItem === undefined ||- currentCalendarEndFieldMetadataItem.id === value ||- currentCalendarEndFieldMetadataItem.type !==- nextCalendarFieldMetadataItem?.type)- ) {- setViewPickerCalendarEndFieldMetadataId('');- }-setViewPickerIsDirty(true);setViewPickerCalendarFieldMetadataId(value);}}@@ -286,27 +248,6 @@ export const ViewPickerContentCreateMode = () => {dropdownId={VIEW_PICKER_CALENDAR_FIELD_DROPDOWN_ID}/></ViewPickerSelectContainer>- {isCalendarWeekViewEnabled && (- <ViewPickerSelectContainer>- <Select- label={t`End date field`}- fullWidth- value={viewPickerCalendarEndFieldMetadataId}- onChange={(value) => {- setViewPickerIsDirty(true);- setViewPickerCalendarEndFieldMetadataId(value);- }}- options={[- { value: '', label: t`None` },- ...availableCalendarEndFieldMetadataItems.map((field) => ({- value: field.id,- label: field.label,- })),- ]}- dropdownId={VIEW_PICKER_CALENDAR_END_FIELD_DROPDOWN_ID}- />- </ViewPickerSelectContainer>- )}{availableFieldsForCalendar.length === 0 && (<StyledFieldAvailableContainer><Trans>diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentEffect.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentEffect.tsxindex 5e84e2b748c..2dad0a4dc0e 100644--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentEffect.tsx+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerContentEffect.tsx@@ -11,7 +11,6 @@ import { viewTypeIconMapping } from '@/views/types/ViewType';import { useGetAvailableFieldsForCalendar } from '@/views/view-picker/hooks/useGetAvailableFieldsForCalendar';import { useGetAvailableFieldsToGroupRecordsBy } from '@/views/view-picker/hooks/useGetAvailableFieldsToGroupRecordsBy';import { useViewPickerMode } from '@/views/view-picker/hooks/useViewPickerMode';-import { viewPickerCalendarEndFieldMetadataIdComponentState } from '@/views/view-picker/states/viewPickerCalendarEndFieldMetadataIdComponentState';import { viewPickerCalendarFieldMetadataIdComponentState } from '@/views/view-picker/states/viewPickerCalendarFieldMetadataIdComponentState';import { viewPickerInputNameComponentState } from '@/views/view-picker/states/viewPickerInputNameComponentState';import { viewPickerIsDirtyComponentState } from '@/views/view-picker/states/viewPickerIsDirtyComponentState';@@ -21,7 +20,6 @@ import { viewPickerReferenceViewIdComponentState } from '@/views/view-picker/staimport { viewPickerSelectedIconComponentState } from '@/views/view-picker/states/viewPickerSelectedIconComponentState';import { viewPickerTypeComponentState } from '@/views/view-picker/states/viewPickerTypeComponentState';import { viewPickerVisibilityComponentState } from '@/views/view-picker/states/viewPickerVisibilityComponentState';-import { getAvailableCalendarEndFieldMetadataItems } from '@/views/view-picker/utils/getAvailableCalendarEndFieldMetadataItems';import { isDefined } from 'twenty-shared/utils';import {ViewVisibility,@@ -49,10 +47,6 @@ export const ViewPickerContentEffect = () => {viewPickerCalendarFieldMetadataIdComponentState,);- const setViewPickerCalendarEndFieldMetadataId = useSetAtomComponentState(- viewPickerCalendarEndFieldMetadataIdComponentState,- );-const [viewPickerType, setViewPickerType] = useAtomComponentState(viewPickerTypeComponentState,);@@ -113,21 +107,7 @@ export const ViewPickerContentEffect = () => {? referenceView.calendarFieldMetadataId: (availableFieldsForCalendar[0]?.id ?? '');- const availableCalendarEndFieldMetadataItems =- getAvailableCalendarEndFieldMetadataItems({- availableFieldsForCalendar,- calendarFieldMetadataId,- });-setViewPickerCalendarFieldMetadataId(calendarFieldMetadataId);- setViewPickerCalendarEndFieldMetadataId(- availableCalendarEndFieldMetadataItems.some(- (fieldMetadataItem) =>- fieldMetadataItem.id === referenceView.calendarEndFieldMetadataId,- )- ? (referenceView.calendarEndFieldMetadataId ?? '')- : '',- );}}, [referenceView,@@ -135,7 +115,6 @@ export const ViewPickerContentEffect = () => {setViewPickerSelectedIcon,setViewPickerType,setViewPickerCalendarFieldMetadataId,- setViewPickerCalendarEndFieldMetadataId,setViewPickerVisibility,viewPickerIsPersisting,viewPickerIsDirty,diff --git a/packages/twenty-front/src/modules/views/view-picker/constants/ViewPickerCalendarEndFieldDropdownId.ts b/packages/twenty-front/src/modules/views/view-picker/constants/ViewPickerCalendarEndFieldDropdownId.tsdeleted file mode 100644index 7825cac1dec..00000000000--- a/packages/twenty-front/src/modules/views/view-picker/constants/ViewPickerCalendarEndFieldDropdownId.ts+++ /dev/null@@ -1,2 +0,0 @@-export const VIEW_PICKER_CALENDAR_END_FIELD_DROPDOWN_ID =- 'view-picker-calendar-end-field-dropdown-id';diff --git a/packages/twenty-front/src/modules/views/view-picker/hooks/useCloseAndResetViewPicker.ts b/packages/twenty-front/src/modules/views/view-picker/hooks/useCloseAndResetViewPicker.tsindex 59103ff466b..213217370db 100644--- a/packages/twenty-front/src/modules/views/view-picker/hooks/useCloseAndResetViewPicker.ts+++ b/packages/twenty-front/src/modules/views/view-picker/hooks/useCloseAndResetViewPicker.ts@@ -2,7 +2,6 @@ import { useCallback } from 'react';import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';-import { VIEW_PICKER_CALENDAR_END_FIELD_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerCalendarEndFieldDropdownId';import { VIEW_PICKER_CALENDAR_FIELD_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerCalendarFieldDropdownId';import { VIEW_PICKER_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerDropdownId';import { VIEW_PICKER_KANBAN_FIELD_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerKanbanFieldDropdownId';@@ -24,7 +23,6 @@ export const useCloseAndResetViewPicker = () => {const closeAndResetViewPicker = useCallback(() => {setViewPickerIsPersisting(false);setViewPickerMode('list');- closeDropdown(VIEW_PICKER_CALENDAR_END_FIELD_DROPDOWN_ID);closeDropdown(VIEW_PICKER_CALENDAR_FIELD_DROPDOWN_ID);closeDropdown(VIEW_PICKER_KANBAN_FIELD_DROPDOWN_ID);closeDropdown(VIEW_PICKER_VIEW_TYPE_DROPDOWN_ID);diff --git a/packages/twenty-front/src/modules/views/view-picker/hooks/useCreateViewFromCurrentState.ts b/packages/twenty-front/src/modules/views/view-picker/hooks/useCreateViewFromCurrentState.tsindex 42e1a2748bd..dabefc34db5 100644--- a/packages/twenty-front/src/modules/views/view-picker/hooks/useCreateViewFromCurrentState.ts+++ b/packages/twenty-front/src/modules/views/view-picker/hooks/useCreateViewFromCurrentState.ts@@ -3,7 +3,6 @@ import { useChangeView } from '@/views/hooks/useChangeView';import { useCreateViewFromCurrentView } from '@/views/hooks/useCreateViewFromCurrentView';import { ViewType } from '@/views/types/ViewType';import { useCloseAndResetViewPicker } from '@/views/view-picker/hooks/useCloseAndResetViewPicker';-import { viewPickerCalendarEndFieldMetadataIdComponentState } from '@/views/view-picker/states/viewPickerCalendarEndFieldMetadataIdComponentState';import { viewPickerCalendarFieldMetadataIdComponentState } from '@/views/view-picker/states/viewPickerCalendarFieldMetadataIdComponentState';import { viewPickerInputNameComponentState } from '@/views/view-picker/states/viewPickerInputNameComponentState';import { viewPickerIsDirtyComponentState } from '@/views/view-picker/states/viewPickerIsDirtyComponentState';@@ -13,17 +12,12 @@ import { viewPickerModeComponentState } from '@/views/view-picker/states/viewPicimport { viewPickerSelectedIconComponentState } from '@/views/view-picker/states/viewPickerSelectedIconComponentState';import { viewPickerTypeComponentState } from '@/views/view-picker/states/viewPickerTypeComponentState';import { viewPickerVisibilityComponentState } from '@/views/view-picker/states/viewPickerVisibilityComponentState';-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';import { useStore } from 'jotai';import { useCallback } from 'react';import { isDefined } from 'twenty-shared/utils';-import { FeatureFlagKey } from '~/generated-metadata/graphql';export const useCreateViewFromCurrentState = () => {const { closeAndResetViewPicker } = useCloseAndResetViewPicker();- const isCalendarWeekViewEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED,- );const viewPickerInputNameCallbackState = useAtomComponentStateCallbackState(viewPickerInputNameComponentState,@@ -46,11 +40,6 @@ export const useCreateViewFromCurrentState = () => {viewPickerCalendarFieldMetadataIdComponentState,);- const viewPickerCalendarEndFieldMetadataIdCallbackState =- useAtomComponentStateCallbackState(- viewPickerCalendarEndFieldMetadataIdComponentState,- );-const viewPickerIsPersistingCallbackState =useAtomComponentStateCallbackState(viewPickerIsPersistingComponentState);@@ -81,9 +70,6 @@ export const useCreateViewFromCurrentState = () => {const calendarFieldMetadataId = store.get(viewPickerCalendarFieldMetadataIdCallbackState,);- const calendarEndFieldMetadataId = store.get(- viewPickerCalendarEndFieldMetadataIdCallbackState,- );const viewPickerMode = store.get(viewPickerModeCallbackState);const visibility = store.get(viewPickerVisibilityCallbackState);@@ -102,10 +88,7 @@ export const useCreateViewFromCurrentState = () => {mainGroupByFieldMetadataId:type === ViewType.KANBAN ? mainGroupByFieldMetadataId : null,calendarFieldMetadataId,- calendarEndFieldMetadataId:- isCalendarWeekViewEnabled && calendarEndFieldMetadataId !== ''- ? calendarEndFieldMetadataId- : null,+ calendarEndFieldMetadataId: null,visibility,},shouldCopyFiltersAndSortsAndAggregate,@@ -125,12 +108,10 @@ export const useCreateViewFromCurrentState = () => {viewPickerIsPersistingCallbackState,viewPickerMainGroupByFieldMetadataIdCallbackState,viewPickerCalendarFieldMetadataIdCallbackState,- viewPickerCalendarEndFieldMetadataIdCallbackState,viewPickerSelectedIconCallbackState,viewPickerTypeCallbackState,viewPickerModeCallbackState,viewPickerVisibilityCallbackState,- isCalendarWeekViewEnabled,]);return { createViewFromCurrentState };diff --git a/packages/twenty-front/src/modules/views/view-picker/states/viewPickerCalendarEndFieldMetadataIdComponentState.ts b/packages/twenty-front/src/modules/views/view-picker/states/viewPickerCalendarEndFieldMetadataIdComponentState.tsdeleted file mode 100644index a6d904a97c3..00000000000--- a/packages/twenty-front/src/modules/views/view-picker/states/viewPickerCalendarEndFieldMetadataIdComponentState.ts+++ /dev/null@@ -1,9 +0,0 @@-import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';-import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext';--export const viewPickerCalendarEndFieldMetadataIdComponentState =- createAtomComponentState<string>({- key: 'viewPickerCalendarEndFieldMetadataIdComponentState',- defaultValue: '',- componentInstanceContext: ViewComponentInstanceContext,- });diff --git a/packages/twenty-front/src/modules/views/view-picker/utils/__tests__/getAvailableCalendarEndFieldMetadataItems.test.ts b/packages/twenty-front/src/modules/views/view-picker/utils/__tests__/getAvailableCalendarEndFieldMetadataItems.test.tsdeleted file mode 100644index 1baec7f44eb..00000000000--- a/packages/twenty-front/src/modules/views/view-picker/utils/__tests__/getAvailableCalendarEndFieldMetadataItems.test.ts+++ /dev/null@@ -1,29 +0,0 @@-import { getAvailableCalendarEndFieldMetadataItems } from '@/views/view-picker/utils/getAvailableCalendarEndFieldMetadataItems';-import { FieldMetadataType } from '~/generated-metadata/graphql';--const availableFieldsForCalendar = [- { id: 'date-start', type: FieldMetadataType.DATE },- { id: 'date-end', type: FieldMetadataType.DATE },- { id: 'date-time-start', type: FieldMetadataType.DATE_TIME },- { id: 'date-time-end', type: FieldMetadataType.DATE_TIME },-];--describe('getAvailableCalendarEndFieldMetadataItems', () => {- it('returns fields matching the start field type and excludes the start field', () => {- expect(- getAvailableCalendarEndFieldMetadataItems({- availableFieldsForCalendar,- calendarFieldMetadataId: 'date-time-start',- }),- ).toEqual([{ id: 'date-time-end', type: FieldMetadataType.DATE_TIME }]);- });-- it('returns no fields when the start field cannot be found', () => {- expect(- getAvailableCalendarEndFieldMetadataItems({- availableFieldsForCalendar,- calendarFieldMetadataId: 'missing',- }),- ).toEqual([]);- });-});diff --git a/packages/twenty-front/src/modules/views/view-picker/utils/getAvailableCalendarEndFieldMetadataItems.ts b/packages/twenty-front/src/modules/views/view-picker/utils/getAvailableCalendarEndFieldMetadataItems.tsdeleted file mode 100644index fb2def2511f..00000000000--- a/packages/twenty-front/src/modules/views/view-picker/utils/getAvailableCalendarEndFieldMetadataItems.ts+++ /dev/null@@ -1,27 +0,0 @@-import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';--type CalendarFieldMetadataItem = Pick<FieldMetadataItem, 'id' | 'type'>;--export const getAvailableCalendarEndFieldMetadataItems = <- T extends CalendarFieldMetadataItem,->({- availableFieldsForCalendar,- calendarFieldMetadataId,-}: {- availableFieldsForCalendar: T[];- calendarFieldMetadataId: string | null | undefined;-}): T[] => {- const calendarFieldMetadataItem = availableFieldsForCalendar.find(- (fieldMetadataItem) => fieldMetadataItem.id === calendarFieldMetadataId,- );-- if (calendarFieldMetadataItem === undefined) {- return [];- }-- return availableFieldsForCalendar.filter(- (fieldMetadataItem) =>- fieldMetadataItem.id !== calendarFieldMetadataItem.id &&- fieldMetadataItem.type === calendarFieldMetadataItem.type,- );-};