Skip to content

The open alternative to Salesforce, designed for AI.

Allow non-compact all-day calendar cards to show full content (#22953)

Weikoa7de3ce3a5be
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/__tests__/RecordCalendarCard.test.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/__tests__/RecordCalendarCard.test.tsx
new file mode 100644
index 00000000000..24263e6a72d
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/__tests__/RecordCalendarCard.test.tsx
@@ -0,0 +1,126 @@
+import { fireEvent, render, screen } from '@testing-library/react';
+
+import { RecordCalendarCard } from '@/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard';
+
+const mockOpenRecordFromIndexView = jest.fn();
+const mockUseGetCurrentViewOnly = jest.fn();
+
+jest.mock('@/views/hooks/useGetCurrentViewOnly', () => ({
+ useGetCurrentViewOnly: () => mockUseGetCurrentViewOnly(),
+}));
+jest.mock(
+ '@/object-record/record-index/hooks/useOpenRecordFromIndexView',
+ () => ({
+ useOpenRecordFromIndexView: () => ({
+ openRecordFromIndexView: mockOpenRecordFromIndexView,
+ }),
+ }),
+);
+jest.mock(
+ '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyState',
+ () => ({ useAtomComponentFamilyState: () => [false, jest.fn()] }),
+);
+jest.mock(
+ '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue',
+ () => ({ useAtomComponentStateValue: () => false }),
+);
+jest.mock(
+ '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow',
+ () => ({ useAvailableComponentInstanceIdOrThrow: () => 'calendar-id' }),
+);
+jest.mock('@/ui/utilities/state/jotai/hooks/useSetAtomComponentState', () => ({
+ useSetAtomComponentState: () => jest.fn(),
+}));
+jest.mock('@/ui/layout/dropdown/hooks/useOpenDropdown', () => ({
+ useOpenDropdown: () => ({ openDropdown: jest.fn() }),
+}));
+jest.mock(
+ '@/object-record/record-field-list/contexts/RecordFieldsScopeContext',
+ () => ({
+ RecordFieldsScopeContextProvider: ({
+ children,
+ }: {
+ children: React.ReactNode;
+ }) => children,
+ }),
+);
+jest.mock(
+ '@/object-record/record-calendar/record-calendar-card/anchored-portal/components/RecordCalendarCardCellHoveredPortal',
+ () => ({ RecordCalendarCardCellHoveredPortal: () => null }),
+);
+jest.mock(
+ '@/object-record/record-calendar/record-calendar-card/anchored-portal/components/RecordCalendarCardCellEditModePortal',
+ () => ({ RecordCalendarCardCellEditModePortal: () => null }),
+);
+jest.mock(
+ '@/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardHeader',
+ () => ({
+ RecordCalendarCardHeader: () => <div data-testid="card-header" />,
+ }),
+);
+jest.mock(
+ '@/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardBody',
+ () => ({
+ RecordCalendarCardBody: () => <div data-testid="card-body" />,
+ }),
+);
+jest.mock('@/object-record/record-card/components/RecordCard', () => ({
+ RecordCard: ({
+ children,
+ onClick,
+ }: {
+ children: React.ReactNode;
+ onClick?: () => void;
+ }) => (
+ <button data-testid="record-card" onClick={onClick}>
+ {children}
+ </button>
+ ),
+}));
+jest.mock('twenty-ui/layout', () => ({
+ AnimatedEaseInOut: ({
+ children,
+ isOpen,
+ }: {
+ children: React.ReactNode;
+ isOpen: boolean;
+ }) => (isOpen ? children : null),
+}));
+
+describe('RecordCalendarCard', () => {
+ beforeEach(() => {
+ jest.clearAllMocks();
+ });
+
+ it('shows the full card body without making the whole card clickable', () => {
+ mockUseGetCurrentViewOnly.mockReturnValue({
+ currentView: { isCompact: false },
+ });
+
+ render(<RecordCalendarCard recordId="record-id" />);
+
+ expect(screen.getByTestId('card-header')).toBeInTheDocument();
+ expect(screen.getByTestId('card-body')).toBeInTheDocument();
+
+ fireEvent.click(screen.getByTestId('record-card'));
+
+ expect(mockOpenRecordFromIndexView).not.toHaveBeenCalled();
+ });
+
+ it('hides the body and makes the whole compact card clickable', () => {
+ mockUseGetCurrentViewOnly.mockReturnValue({
+ currentView: { isCompact: true },
+ });
+
+ render(<RecordCalendarCard recordId="record-id" />);
+
+ expect(screen.getByTestId('card-header')).toBeInTheDocument();
+ expect(screen.queryByTestId('card-body')).not.toBeInTheDocument();
+
+ fireEvent.click(screen.getByTestId('record-card'));
+
+ expect(mockOpenRecordFromIndexView).toHaveBeenCalledWith({
+ recordId: 'record-id',
+ });
+ });
+});
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.tsx
index f1fc0ffb649..b5743a5dc6f 100644
--- 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.tsx
@@ -111,8 +111,17 @@ const StyledDayNumber = styled.span<{ isToday: boolean }>`
`;
const StyledAllDayLabel = styled(StyledHeaderGutter)`
- border-top: 1px solid ${themeCssVariables.border.color.light};
- height: 28px;
+ 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 }>`
@@ -568,22 +577,20 @@ export const RecordCalendarTimeGrid = ({
</StyledDayHeader>
);
})}
- {isAllDayView && (
- <>
- <StyledAllDayLabel>{t`All day`}</StyledAllDayLabel>
- {days.map(({ date }) => (
- <RecordCalendarTimeGridAllDayCell
- key={`all-day-${date.toString()}`}
- calendarFieldName={calendarFieldMetadataItem.name}
- calendarFieldType={calendarFieldMetadataItem.type}
- day={date}
- timeFormat={timeFormat}
- timeZone={timeZone}
- />
- ))}
- </>
- )}
</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}
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.tsx
index 7728c12d430..11f608208c2 100644
--- 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.tsx
@@ -1,5 +1,5 @@
+import { RecordCalendarCard } from '@/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard';
import { calendarDayRecordIdsComponentFamilySelector } from '@/object-record/record-calendar/states/selectors/calendarDayRecordsComponentFamilySelector';
-import { RecordCalendarWeekEvent } from '@/object-record/record-calendar/week/components/RecordCalendarWeekEvent';
import { useAtomComponentFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorValue';
import { styled } from '@linaria/react';
import { type Temporal } from 'temporal-polyfill';
@@ -8,7 +8,6 @@ import { FieldMetadataType } from '~/generated-metadata/graphql';
const StyledAllDayCell = styled.div`
border-left: 1px solid ${themeCssVariables.border.color.light};
- border-top: 1px solid ${themeCssVariables.border.color.light};
display: flex;
flex-direction: column;
gap: ${themeCssVariables.spacing['0.5']};
@@ -17,19 +16,20 @@ const StyledAllDayCell = styled.div`
padding: ${themeCssVariables.spacing['0.5']};
`;
+const StyledCardContainer = styled.div`
+ min-width: 0;
+ position: relative;
+`;
+
type RecordCalendarTimeGridAllDayCellProps = {
- calendarFieldName: string;
calendarFieldType: FieldMetadataType;
day: Temporal.PlainDate;
- timeFormat: string;
timeZone: string;
};
export const RecordCalendarTimeGridAllDayCell = ({
- calendarFieldName,
calendarFieldType,
day,
- timeFormat,
timeZone,
}: RecordCalendarTimeGridAllDayCellProps) => {
const recordIds = useAtomComponentFamilySelectorValue(
@@ -43,16 +43,9 @@ export const RecordCalendarTimeGridAllDayCell = ({
return (
<StyledAllDayCell>
{allDayRecordIds.map((recordId) => (
- <RecordCalendarWeekEvent
- key={recordId}
- calendarDay={day}
- calendarFieldName={calendarFieldName}
- calendarFieldType={calendarFieldType}
- isAllDay
- recordId={recordId}
- timeFormat={timeFormat}
- timeZone={timeZone}
- />
+ <StyledCardContainer key={recordId} data-selectable-id={recordId}>
+ <RecordCalendarCard recordId={recordId} />
+ </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.tsx
index 82376c2e180..255d3f677d3 100644
--- 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.tsx
@@ -14,20 +14,10 @@ jest.mock(
}),
);
jest.mock(
- '@/object-record/record-calendar/week/components/RecordCalendarWeekEvent',
+ '@/object-record/record-calendar/record-calendar-card/components/RecordCalendarCard',
() => ({
- RecordCalendarWeekEvent: ({
- isAllDay,
- recordId,
- }: {
- isAllDay: boolean;
- recordId: string;
- }) => (
- <div
- data-testid="all-day-event"
- data-is-all-day={isAllDay}
- data-record-id={recordId}
- />
+ RecordCalendarCard: ({ recordId }: { recordId: string }) => (
+ <div data-testid="all-day-card" data-record-id={recordId} />
),
}),
);
@@ -44,41 +34,31 @@ describe('RecordCalendarTimeGridAllDayCell', () => {
render(
<RecordCalendarTimeGridAllDayCell
- calendarFieldName="date"
calendarFieldType={FieldMetadataType.DATE}
day={Temporal.PlainDate.from('2026-07-15')}
- timeFormat="HH:mm"
timeZone="UTC"
/>,
);
expect(
- screen.getAllByTestId('all-day-event').map((element) => ({
- isAllDay: element.dataset.isAllDay,
- recordId: element.dataset.recordId,
- })),
- ).toEqual([
- {
- isAllDay: 'true',
- recordId: 'first',
- },
- {
- isAllDay: 'true',
- recordId: 'second',
- },
- {
- isAllDay: 'true',
- recordId: 'third',
- },
- {
- isAllDay: 'true',
- recordId: 'fourth',
- },
- {
- isAllDay: 'true',
- recordId: 'fifth',
- },
- ]);
+ 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();
+ });
});