The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Remove the calendar week-day feature flag (#24873)
Weikoeb6caee06de3
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphqlindex 587e01b3753..0e31869f4e6 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql@@ -1742,7 +1742,6 @@ enum FeatureFlagKey {IS_APP_CLAIMING_ENABLEDIS_UNIQUE_INDEXES_ENABLEDIS_JSON_FILTER_ENABLED- IS_CALENDAR_WEEK_VIEW_ENABLEDIS_EMAIL_GROUP_ENABLEDIS_JUNCTION_RELATIONS_ENABLEDIS_LIST_VIEW_ENABLEDdiff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.tsindex 919b5f00b5d..bd6e2a5c50a 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts@@ -1408,7 +1408,7 @@ export interface FeatureFlag {__typename: 'FeatureFlag'}-export type FeatureFlagKey = 'IS_APP_CLAIMING_ENABLED' | 'IS_UNIQUE_INDEXES_ENABLED' | 'IS_JSON_FILTER_ENABLED' | 'IS_CALENDAR_WEEK_VIEW_ENABLED' | 'IS_EMAIL_GROUP_ENABLED' | 'IS_JUNCTION_RELATIONS_ENABLED' | 'IS_LIST_VIEW_ENABLED' | 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT' | 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED' | 'IS_WORKFLOW_VERSION_IN_CORE_ENABLED' | 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED' | 'IS_WORKFLOW_DISPATCH_FROM_CORE_ENABLED'+export type FeatureFlagKey = 'IS_APP_CLAIMING_ENABLED' | 'IS_UNIQUE_INDEXES_ENABLED' | 'IS_JSON_FILTER_ENABLED' | 'IS_EMAIL_GROUP_ENABLED' | 'IS_JUNCTION_RELATIONS_ENABLED' | 'IS_LIST_VIEW_ENABLED' | 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT' | 'IS_LOGIC_FUNCTION_PREBUILT_MODE_ENABLED' | 'IS_WORKFLOW_VERSION_IN_CORE_ENABLED' | 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED' | 'IS_WORKFLOW_DISPATCH_FROM_CORE_ENABLED'export interface WorkspaceUrls {customUrl?: Scalars['String']@@ -9978,7 +9978,6 @@ export const enumFeatureFlagKey = {IS_APP_CLAIMING_ENABLED: 'IS_APP_CLAIMING_ENABLED' as const,IS_UNIQUE_INDEXES_ENABLED: 'IS_UNIQUE_INDEXES_ENABLED' as const,IS_JSON_FILTER_ENABLED: 'IS_JSON_FILTER_ENABLED' as const,- IS_CALENDAR_WEEK_VIEW_ENABLED: 'IS_CALENDAR_WEEK_VIEW_ENABLED' as const,IS_EMAIL_GROUP_ENABLED: 'IS_EMAIL_GROUP_ENABLED' as const,IS_JUNCTION_RELATIONS_ENABLED: 'IS_JUNCTION_RELATIONS_ENABLED' as const,IS_LIST_VIEW_ENABLED: 'IS_LIST_VIEW_ENABLED' as const,diff --git a/packages/twenty-front/src/generated-admin/graphql.ts b/packages/twenty-front/src/generated-admin/graphql.tsindex 144126f2fb7..923e9cf0f7e 100644--- a/packages/twenty-front/src/generated-admin/graphql.ts+++ b/packages/twenty-front/src/generated-admin/graphql.ts@@ -393,7 +393,6 @@ export type FeatureFlag = {export enum FeatureFlagKey {IS_APP_CLAIMING_ENABLED = 'IS_APP_CLAIMING_ENABLED',- IS_CALENDAR_WEEK_VIEW_ENABLED = 'IS_CALENDAR_WEEK_VIEW_ENABLED',IS_EMAIL_GROUP_ENABLED = 'IS_EMAIL_GROUP_ENABLED',IS_JSON_FILTER_ENABLED = 'IS_JSON_FILTER_ENABLED',IS_JUNCTION_RELATIONS_ENABLED = 'IS_JUNCTION_RELATIONS_ENABLED',diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.tsindex b62fd87d7cf..df23ed4f799 100644--- a/packages/twenty-front/src/generated-metadata/graphql.ts+++ b/packages/twenty-front/src/generated-metadata/graphql.ts@@ -1858,7 +1858,6 @@ export type FeatureFlag = {export enum FeatureFlagKey {IS_APP_CLAIMING_ENABLED = 'IS_APP_CLAIMING_ENABLED',- IS_CALENDAR_WEEK_VIEW_ENABLED = 'IS_CALENDAR_WEEK_VIEW_ENABLED',IS_EMAIL_GROUP_ENABLED = 'IS_EMAIL_GROUP_ENABLED',IS_JSON_FILTER_ENABLED = 'IS_JSON_FILTER_ENABLED',IS_JUNCTION_RELATIONS_ENABLED = 'IS_JUNCTION_RELATIONS_ENABLED',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 0bb3d609b07..dc081377cdf 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@@ -1,7 +1,6 @@import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';import { OBJECT_OPTIONS_DROPDOWN_ID } from '@/object-record/object-options-dropdown/constants/ObjectOptionsDropdownId';import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';-import { getSupportedRecordCalendarLayout } from '@/object-record/record-calendar/utils/getSupportedRecordCalendarLayout';import { recordIndexCalendarLayoutComponentState } from '@/object-record/record-index/states/recordIndexCalendarLayoutComponentState';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';@@ -12,7 +11,6 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useUpdateCurrentView } from '@/views/hooks/useUpdateCurrentView';-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';import { t } from '@lingui/core/macro';import { Pill } from 'twenty-ui/data-display';import {@@ -23,10 +21,7 @@ import {IconTimelineEvent,} from 'twenty-ui/icon';import { MenuItemSelect } from 'twenty-ui/navigation';-import {- FeatureFlagKey,- ViewCalendarLayout,-} from '~/generated-metadata/graphql';+import { ViewCalendarLayout } from '~/generated-metadata/graphql';const RECORD_CALENDAR_TIMELINE_VIEW_ID = 'record-calendar-timeline-view';@@ -35,13 +30,6 @@ export const ObjectOptionsDropdownCalendarViewContent = () => {const recordIndexCalendarLayout = useAtomComponentStateValue(recordIndexCalendarLayoutComponentState,);- const isCalendarWeekViewEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED,- );- const supportedCalendarLayout = getSupportedRecordCalendarLayout({- calendarLayout: recordIndexCalendarLayout,- isCalendarWeekViewEnabled,- });const setRecordIndexCalendarLayout = useSetAtomComponentState(recordIndexCalendarLayoutComponentState,);@@ -62,15 +50,7 @@ export const ObjectOptionsDropdownCalendarViewContent = () => {];const handleCalendarViewChange = async (calendarView: ViewCalendarLayout) => {- const isWeekOrDayLayout =- calendarView === ViewCalendarLayout.DAY ||- calendarView === ViewCalendarLayout.WEEK;-- if (isWeekOrDayLayout && !isCalendarWeekViewEnabled) {- return;- }-- if (calendarView === supportedCalendarLayout) {+ if (calendarView === recordIndexCalendarLayout) {closeDropdown();return;}@@ -102,52 +82,26 @@ export const ObjectOptionsDropdownCalendarViewContent = () => {><SelectableListItemitemId={ViewCalendarLayout.DAY}- onEnter={() => {- if (isCalendarWeekViewEnabled) {- handleCalendarViewChange(ViewCalendarLayout.DAY);- }- }}+ onEnter={() => handleCalendarViewChange(ViewCalendarLayout.DAY)}><MenuItemSelectLeftIcon={IconCalendarEvent}text={t`Day`}- selected={supportedCalendarLayout === ViewCalendarLayout.DAY}- onClick={- isCalendarWeekViewEnabled- ? () => handleCalendarViewChange(ViewCalendarLayout.DAY)- : undefined- }+ selected={recordIndexCalendarLayout === ViewCalendarLayout.DAY}+ onClick={() => handleCalendarViewChange(ViewCalendarLayout.DAY)}focused={selectedItemId === ViewCalendarLayout.DAY}- contextualText={- isCalendarWeekViewEnabled ? undefined : <Pill label={t`Soon`} />- }- contextualTextPosition="right"- disabled={!isCalendarWeekViewEnabled}/></SelectableListItem><SelectableListItemitemId={ViewCalendarLayout.WEEK}- onEnter={() => {- if (isCalendarWeekViewEnabled) {- handleCalendarViewChange(ViewCalendarLayout.WEEK);- }- }}+ onEnter={() => handleCalendarViewChange(ViewCalendarLayout.WEEK)}><MenuItemSelectLeftIcon={IconCalendarWeek}text={t`Week`}- selected={supportedCalendarLayout === ViewCalendarLayout.WEEK}- onClick={- isCalendarWeekViewEnabled- ? () => handleCalendarViewChange(ViewCalendarLayout.WEEK)- : undefined- }+ selected={recordIndexCalendarLayout === ViewCalendarLayout.WEEK}+ onClick={() => handleCalendarViewChange(ViewCalendarLayout.WEEK)}focused={selectedItemId === ViewCalendarLayout.WEEK}- contextualText={- isCalendarWeekViewEnabled ? undefined : <Pill label={t`Soon`} />- }- contextualTextPosition="right"- disabled={!isCalendarWeekViewEnabled}/></SelectableListItem><SelectableListItem@@ -157,7 +111,7 @@ export const ObjectOptionsDropdownCalendarViewContent = () => {<MenuItemSelectLeftIcon={IconCalendarMonth}text={t`Month`}- selected={supportedCalendarLayout === ViewCalendarLayout.MONTH}+ selected={recordIndexCalendarLayout === ViewCalendarLayout.MONTH}onClick={() => handleCalendarViewChange(ViewCalendarLayout.MONTH)}focused={selectedItemId === ViewCalendarLayout.MONTH}/>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 4df2bb9442a..03135f33801 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@@ -2,7 +2,6 @@ import { ObjectOptionsDropdownMenuViewName } from '@/object-record/object-optionimport { OBJECT_OPTIONS_DROPDOWN_ID } from '@/object-record/object-options-dropdown/constants/ObjectOptionsDropdownId';import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';import { useObjectOptionsForBoard } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsForBoard';-import { getSupportedRecordCalendarLayout } from '@/object-record/record-calendar/utils/getSupportedRecordCalendarLayout';import { recordIndexCalendarLayoutComponentState } from '@/object-record/record-index/states/recordIndexCalendarLayoutComponentState';import { recordIndexCalendarFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarFieldMetadataIdComponentState';import { recordIndexGroupFieldMetadataItemComponentState } from '@/object-record/record-index/states/recordIndexGroupFieldMetadataComponentState';@@ -24,7 +23,6 @@ import {viewTypeIconMapping,} from '@/views/types/ViewType';import { useDestroyViewFromCurrentState } from '@/views/view-picker/hooks/useDestroyViewFromCurrentState';-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';import { viewPickerReferenceViewIdComponentState } from '@/views/view-picker/states/viewPickerReferenceViewIdComponentState';import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';import { useLingui } from '@lingui/react/macro';@@ -39,10 +37,7 @@ import {} from 'twenty-ui/icon';import { AppTooltip } from 'twenty-ui/surfaces';import { MenuItem } from 'twenty-ui/navigation';-import {- FeatureFlagKey,- ViewCalendarLayout,-} from '~/generated-metadata/graphql';+import { ViewCalendarLayout } from '~/generated-metadata/graphql';interface ObjectOptionsDropdownCustomViewProps {onBackToDefault?: () => void;@@ -89,13 +84,6 @@ export const ObjectOptionsDropdownCustomView = ({const recordIndexCalendarLayout = useAtomComponentStateValue(recordIndexCalendarLayoutComponentState,);- const isCalendarWeekViewEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED,- );- const supportedCalendarLayout = getSupportedRecordCalendarLayout({- calendarLayout: recordIndexCalendarLayout,- isCalendarWeekViewEnabled,- });const { visibleBoardFields } = useObjectOptionsForBoard({objectNameSingular: objectMetadataItem.nameSingular,@@ -221,9 +209,9 @@ export const ObjectOptionsDropdownCustomView = ({LeftIcon={IconCalendarWeek}text={t`Calendar view`}contextualText={- supportedCalendarLayout === ViewCalendarLayout.MONTH+ recordIndexCalendarLayout === ViewCalendarLayout.MONTH? t`Month`- : supportedCalendarLayout === ViewCalendarLayout.WEEK+ : recordIndexCalendarLayout === ViewCalendarLayout.WEEK? t`Week`: t`Day`}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 6d5ccd3ce4c..867720e8e45 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@@ -1,7 +1,6 @@import { OBJECT_OPTIONS_DROPDOWN_ID } from '@/object-record/object-options-dropdown/constants/ObjectOptionsDropdownId';import { useObjectOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsDropdown';import { useSetViewTypeFromLayoutOptionsMenu } from '@/object-record/object-options-dropdown/hooks/useSetViewTypeFromLayoutOptionsMenu';-import { getSupportedRecordCalendarLayout } from '@/object-record/record-calendar/utils/getSupportedRecordCalendarLayout';import { recordIndexCalendarLayoutComponentState } from '@/object-record/record-index/states/recordIndexCalendarLayoutComponentState';import { recordIndexGroupFieldMetadataItemComponentState } from '@/object-record/record-index/states/recordIndexGroupFieldMetadataComponentState';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';@@ -70,13 +69,6 @@ export const ObjectOptionsDropdownLayoutContent = () => {const isListViewEnabled = useIsFeatureEnabled(FeatureFlagKey.IS_LIST_VIEW_ENABLED,);- const isCalendarWeekViewEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED,- );- const supportedCalendarLayout = getSupportedRecordCalendarLayout({- calendarLayout: recordIndexCalendarLayout,- isCalendarWeekViewEnabled,- });const recordIndexGroupFieldMetadataItem = useAtomComponentStateValue(recordIndexGroupFieldMetadataItemComponentState,);@@ -274,9 +266,9 @@ export const ObjectOptionsDropdownLayoutContent = () => {LeftIcon={IconCalendarWeek}text={t`Calendar view`}contextualText={- supportedCalendarLayout === ViewCalendarLayout.MONTH+ recordIndexCalendarLayout === ViewCalendarLayout.MONTH? t`Month`- : supportedCalendarLayout === ViewCalendarLayout.WEEK+ : recordIndexCalendarLayout === ViewCalendarLayout.WEEK? t`Week`: t`Day`}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 4af2d311d52..cbf3a44c703 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,4 +1,4 @@-import { fireEvent, render, screen, waitFor } from '@testing-library/react';+import { render, screen, waitFor } from '@testing-library/react';import userEvent from '@testing-library/user-event';import { I18nProvider } from '@lingui/react';import { i18n } from '@lingui/core';@@ -31,7 +31,6 @@ const mockCloseDropdown = jest.fn();const mockResetContent = jest.fn();const mockSetRecordIndexCalendarLayout = jest.fn();const mockUpdateCurrentView = jest.fn();-const mockUseIsFeatureEnabled = jest.fn();const mockUseCalendarLayoutValue = jest.fn();jest.mock(@@ -90,9 +89,6 @@ jest.mock('@/views/hooks/useUpdateCurrentView', () => ({updateCurrentView: mockUpdateCurrentView,})),}));-jest.mock('@/workspace/hooks/useIsFeatureEnabled', () => ({- useIsFeatureEnabled: (...args: unknown[]) => mockUseIsFeatureEnabled(...args),-}));jest.mock('twenty-ui/data-display', () => ({Pill: ({ label }: { label: string }) => <span>{label}</span>,}));@@ -122,7 +118,6 @@ describe('ObjectOptionsDropdownCalendarViewContent', () => {beforeEach(() => {jest.clearAllMocks();mockUseCalendarLayoutValue.mockReturnValue(ViewCalendarLayout.MONTH);- mockUseIsFeatureEnabled.mockReturnValue(true);mockUpdateCurrentView.mockResolvedValue(undefined);});@@ -138,44 +133,26 @@ describe('ObjectOptionsDropdownCalendarViewContent', () => {expect(screen.getByText('Timeline').closest('button')).toBeDisabled();});- it('persists Day without treating it as Timeline', async () => {+ it.each([+ ['Day', ViewCalendarLayout.DAY],+ ['Week', ViewCalendarLayout.WEEK],+ ])('persists %s without a feature flag', async (label, calendarLayout) => {+ const user = userEvent.setup();render(<ObjectOptionsDropdownCalendarViewContent />);- fireEvent.click(screen.getByRole('button', { name: 'Day' }));+ await user.click(screen.getByRole('button', { name: label }));expect(mockSetRecordIndexCalendarLayout).toHaveBeenCalledWith(- ViewCalendarLayout.DAY,+ calendarLayout,);- expect(mockUpdateCurrentView).toHaveBeenCalledWith({- calendarLayout: ViewCalendarLayout.DAY,- });+ expect(mockUpdateCurrentView).toHaveBeenCalledWith({ calendarLayout });await waitFor(() => expect(mockCloseDropdown).toHaveBeenCalled());});-- it('keeps Day and Week unavailable when the feature flag is disabled', () => {- mockUseIsFeatureEnabled.mockReturnValue(false);-- render(<ObjectOptionsDropdownCalendarViewContent />);-- const dayButton = screen.getByText('Day').closest('button');- const weekButton = screen.getByText('Week').closest('button');-- expect(dayButton).toBeDisabled();- expect(weekButton).toBeDisabled();-- if (dayButton !== null) {- fireEvent.click(dayButton);- }-- expect(mockSetRecordIndexCalendarLayout).not.toHaveBeenCalled();- expect(mockUpdateCurrentView).not.toHaveBeenCalled();- });});describe('ObjectOptionsDropdownCalendarFieldsContent', () => {beforeEach(() => {jest.clearAllMocks();- mockUseIsFeatureEnabled.mockReturnValue(true);mockUpdateCurrentView.mockResolvedValue(undefined);});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 f3054e50cbb..1258cff5717 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@@ -11,17 +11,14 @@ import { RECORD_CALENDAR_CARD_CLICK_OUTSIDE_ID } from '@/object-record/record-caimport { recordIndexCalendarLayoutComponentState } from '@/object-record/record-index/states/recordIndexCalendarLayoutComponentState';import { RecordCalendarComponentInstanceContext } from '@/object-record/record-calendar/states/contexts/RecordCalendarComponentInstanceContext';import { useRecordCalendarSelection } from '@/object-record/record-calendar/states/selectors/useRecordCalendarSelection';-import { getSupportedRecordCalendarLayout } from '@/object-record/record-calendar/utils/getSupportedRecordCalendarLayout';import { MODAL_BACKDROP_CLICK_OUTSIDE_ID } from '@/ui/layout/modal/constants/ModalBackdropClickOutsideId';import { PAGE_ACTION_CONTAINER_CLICK_OUTSIDE_ID } from '@/ui/layout/page/constants/PageActionContainerClickOutsideId';import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';-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 } from '~/generated-metadata/graphql';const StyledContainerContainer = styled.div`box-sizing: border-box;@@ -44,17 +41,10 @@ export const RecordCalendar = () => {const recordIndexCalendarLayout = useAtomComponentStateValue(recordIndexCalendarLayoutComponentState,);- const isCalendarWeekViewEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED,- );- const supportedCalendarLayout = getSupportedRecordCalendarLayout({- calendarLayout: recordIndexCalendarLayout,- isCalendarWeekViewEnabled,- });useEffect(() => {resetRecordCalendarSelection();- }, [resetRecordCalendarSelection, supportedCalendarLayout]);+ }, [resetRecordCalendarSelection, recordIndexCalendarLayout]);useListenClickOutside({excludedClickOutsideIds: [@@ -79,7 +69,7 @@ export const RecordCalendar = () => {<ScrollWrappercomponentInstanceId={`scroll-wrapper-record-calendar-${recordCalendarId}`}>- <RecordCalendarGrid calendarLayout={supportedCalendarLayout} />+ <RecordCalendarGrid calendarLayout={recordIndexCalendarLayout} /></ScrollWrapper></StyledContainerContainer>);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 6510ddcc33a..0d8ce155629 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@@ -2,7 +2,6 @@ import { useDateTimeFormat } from '@/localization/hooks/useDateTimeFormat';import { RecordCalendarComponentInstanceContext } from '@/object-record/record-calendar/states/contexts/RecordCalendarComponentInstanceContext';import { 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 { 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';@@ -21,7 +20,6 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useimport { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useUpdateCurrentView } from '@/views/hooks/useUpdateCurrentView';-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';import { format } from 'date-fns';@@ -34,10 +32,7 @@ import {import { IconChevronLeft, IconChevronRight } from 'twenty-ui/icon';import { Button } from 'twenty-ui/input';import { themeCssVariables } from 'twenty-ui/theme-constants';-import {- FeatureFlagKey,- ViewCalendarLayout,-} from '~/generated-metadata/graphql';+import { ViewCalendarLayout } from '~/generated-metadata/graphql';import { dateLocaleState } from '~/localization/states/dateLocaleState';const StyledContainer = styled.div`@@ -87,20 +82,13 @@ export const RecordCalendarTopBar = () => {const [recordIndexCalendarLayout, setRecordIndexCalendarLayout] =useAtomComponentState(recordIndexCalendarLayoutComponentState);- const isCalendarWeekViewEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED,- );- const supportedCalendarLayout = getSupportedRecordCalendarLayout({- calendarLayout: recordIndexCalendarLayout,- isCalendarWeekViewEnabled,- });const dateLocale = useAtomStateValue(dateLocaleState);const { timeZone } = useDateTimeFormat();const { firstDay: firstDayOfWeek, lastDay: lastDayOfWeek } =useRecordCalendarDaysRange(recordCalendarSelectedDate,- supportedCalendarLayout,+ recordIndexCalendarLayout,);const { updateCurrentView } = useUpdateCurrentView();@@ -117,9 +105,9 @@ export const RecordCalendarTopBar = () => {const handlePreviousPeriod = () => {const previousDate =- supportedCalendarLayout === ViewCalendarLayout.DAY+ recordIndexCalendarLayout === ViewCalendarLayout.DAY? recordCalendarSelectedDate.subtract({ days: 1 })- : supportedCalendarLayout === ViewCalendarLayout.WEEK+ : recordIndexCalendarLayout === ViewCalendarLayout.WEEK? recordCalendarSelectedDate.subtract({ weeks: 1 }): recordCalendarSelectedDate.subtract({ months: 1 });@@ -128,9 +116,9 @@ export const RecordCalendarTopBar = () => {const handleNextPeriod = () => {const nextDate =- supportedCalendarLayout === ViewCalendarLayout.DAY+ recordIndexCalendarLayout === ViewCalendarLayout.DAY? recordCalendarSelectedDate.add({ days: 1 })- : supportedCalendarLayout === ViewCalendarLayout.WEEK+ : recordIndexCalendarLayout === ViewCalendarLayout.WEEK? recordCalendarSelectedDate.add({ weeks: 1 }): recordCalendarSelectedDate.add({ months: 1 });@@ -138,14 +126,6 @@ export const RecordCalendarTopBar = () => {};const handleCalendarLayoutChange = (calendarLayout: ViewCalendarLayout) => {- const isWeekOrDayLayout =- calendarLayout === ViewCalendarLayout.DAY ||- calendarLayout === ViewCalendarLayout.WEEK;-- if (isWeekOrDayLayout && !isCalendarWeekViewEnabled) {- return;- }-setRecordIndexCalendarLayout(calendarLayout);void updateCurrentView({ calendarLayout });};@@ -155,11 +135,11 @@ export const RecordCalendarTopBar = () => {};const formattedDate =- supportedCalendarLayout === ViewCalendarLayout.DAY+ recordIndexCalendarLayout === ViewCalendarLayout.DAY? recordCalendarSelectedDate.toLocaleString(dateLocale.locale, {dateStyle: 'full',})- : supportedCalendarLayout === ViewCalendarLayout.WEEK+ : recordIndexCalendarLayout === ViewCalendarLayout.WEEK? formatRecordCalendarWeekRange({firstDayOfWeek,lastDayOfWeek,@@ -178,22 +158,20 @@ export const RecordCalendarTopBar = () => {return (<StyledContainer><StyledLeftSection>- {isCalendarWeekViewEnabled &&- !isRecordCalendarReadOnly &&- !isInWidget && (- <Select- dropdownId={`record-calendar-layout-${recordCalendarId}`}- value={supportedCalendarLayout}- options={[- { label: t`Day`, value: ViewCalendarLayout.DAY },- { label: t`Week`, value: ViewCalendarLayout.WEEK },- { label: t`Month`, value: ViewCalendarLayout.MONTH },- ]}- selectSizeVariant="small"- dropdownWidth={120}- onChange={handleCalendarLayoutChange}- />- )}+ {!isRecordCalendarReadOnly && !isInWidget && (+ <Select+ dropdownId={`record-calendar-layout-${recordCalendarId}`}+ value={recordIndexCalendarLayout}+ options={[+ { label: t`Day`, value: ViewCalendarLayout.DAY },+ { label: t`Week`, value: ViewCalendarLayout.WEEK },+ { label: t`Month`, value: ViewCalendarLayout.MONTH },+ ]}+ selectSizeVariant="small"+ dropdownWidth={120}+ onChange={handleCalendarLayoutChange}+ />+ )}<DropdowndropdownId={datePickerDropdownId}clickableComponent={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 ad3f1437a18..afa9f03e62b 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@@ -3,10 +3,7 @@ import { Temporal } from 'temporal-polyfill';import { recordCalendarSelectedDateComponentState } from '@/object-record/record-calendar/states/recordCalendarSelectedDateComponentState';import { RecordCalendar } from '@/object-record/record-calendar/components/RecordCalendar';-import {- FeatureFlagKey,- ViewCalendarLayout,-} from '~/generated-metadata/graphql';+import { ViewCalendarLayout } from '~/generated-metadata/graphql';jest.mock('@/object-record/record-calendar/components/RecordCalendarTopBar',@@ -108,28 +105,18 @@ jest.mock(useAtomComponentStateValue: jest.fn(),}),);-jest.mock('@/workspace/hooks/useIsFeatureEnabled', () => ({- useIsFeatureEnabled: jest.fn(),-}));const useAtomComponentStateValueMock = jest.requireMock('@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue',).useAtomComponentStateValue;-const useIsFeatureEnabledMock = jest.requireMock(- '@/workspace/hooks/useIsFeatureEnabled',-).useIsFeatureEnabled;describe('RecordCalendar', () => {- const renderCalendar = (- calendarLayout: ViewCalendarLayout,- isEnabled = true,- ) => {+ const renderCalendar = (calendarLayout: ViewCalendarLayout) => {useAtomComponentStateValueMock.mockImplementation((state: unknown) =>state === recordCalendarSelectedDateComponentState? Temporal.PlainDate.from('2026-07-15'): calendarLayout,);- useIsFeatureEnabledMock.mockReturnValue(isEnabled);return render(<RecordCalendar />);};@@ -153,16 +140,4 @@ describe('RecordCalendar', () => {expect(screen.queryByText(/\d{1,2}:00/)).not.toBeInTheDocument();},);-- it.each([ViewCalendarLayout.DAY, ViewCalendarLayout.WEEK])(- 'renders the month grid when a persisted %s layout is disabled',- (layout) => {- renderCalendar(layout, false);-- expect(screen.getAllByRole('article')).toHaveLength(35);- expect(useIsFeatureEnabledMock).toHaveBeenCalledWith(- FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED,- );- },- );});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 6748938573e..7186844627f 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@@ -1,4 +1,5 @@import { fireEvent, render, screen } from '@testing-library/react';+import userEvent from '@testing-library/user-event';import { enUS } from 'date-fns/locale';import { Temporal } from 'temporal-polyfill';@@ -35,8 +36,20 @@ jest.mock(}),);jest.mock('@/ui/input/components/Select', () => ({- Select: ({ options }: { options: { label: string; value: string }[] }) => (- <select data-testid="layout-select">+ Select: ({+ options,+ value,+ onChange,+ }: {+ options: { label: string; value: ViewCalendarLayout }[];+ value: ViewCalendarLayout;+ onChange: (value: ViewCalendarLayout) => void;+ }) => (+ <select+ data-testid="layout-select"+ value={value}+ onChange={(event) => onChange(event.target.value as ViewCalendarLayout)}+ >{options.map(({ label, value }) => (<option key={value} value={value}>{label}@@ -77,9 +90,6 @@ jest.mock('@/views/hooks/useUpdateCurrentView', () => ({updateCurrentView: mockUpdateCurrentView,})),}));-jest.mock('@/workspace/hooks/useIsFeatureEnabled', () => ({- useIsFeatureEnabled: jest.fn(() => true),-}));jest.mock('twenty-ui/input', () => ({Button: ({ariaLabel,@@ -152,4 +162,18 @@ describe('RecordCalendarTopBar', () => {Temporal.PlainDate.from('2026-07-16'),);});++ it('persists a week selection from the top bar', async () => {+ const user = userEvent.setup();+ render(<RecordCalendarTopBar />);++ await user.selectOptions(screen.getByRole('combobox'), 'WEEK');++ expect(mockSetRecordIndexCalendarLayout).toHaveBeenCalledWith(+ ViewCalendarLayout.WEEK,+ );+ expect(mockUpdateCurrentView).toHaveBeenCalledWith({+ calendarLayout: ViewCalendarLayout.WEEK,+ });+ });});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.tsxindex 7427efde117..06aef72692a 100644--- 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.tsx@@ -14,7 +14,6 @@ const mockCalendarField = {type: FieldMetadataType.DATE_TIME,};let mockLayout = ViewCalendarLayout.DAY;-let mockFeatureEnabled = true;jest.mock('@/object-record/record-calendar/contexts/RecordCalendarContext',@@ -28,9 +27,6 @@ jest.mock(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',() => ({@@ -80,7 +76,6 @@ const withViewFilters = (gte: string, lt: string) => ({describe('useRecordCalendarQueryDateRangeFilter', () => {beforeEach(() => {- mockFeatureEnabled = true;mockCalendarField.type = FieldMetadataType.DATE_TIME;mockLayout = ViewCalendarLayout.DAY;});@@ -101,11 +96,4 @@ describe('useRecordCalendarQueryDateRangeFilter', () => {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/hooks/useRecordCalendarQueryDateRangeFilter.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarQueryDateRangeFilter.tsxindex 2d975edf9ad..78fb7e5acf2 100644--- 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.tsx@@ -1,7 +1,6 @@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';@@ -11,7 +10,6 @@ import { currentRecordFiltersComponentState } from '@/object-record/record-filteimport { 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,@@ -20,10 +18,7 @@ import {turnAnyFieldFilterIntoRecordGqlFilter,turnPlainDateIntoUserTimeZoneInstantString,} from 'twenty-shared/utils';-import {- FeatureFlagKey,- FieldMetadataType,-} from '~/generated-metadata/graphql';+import { FieldMetadataType } from '~/generated-metadata/graphql';export const useRecordCalendarQueryDateRangeFilter = (selectedDate: Temporal.PlainDate,@@ -33,16 +28,9 @@ export const useRecordCalendarQueryDateRangeFilter = (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,+ recordIndexCalendarLayout,);const { userTimezone } = useUserTimezone();const currentRecordFilterGroups = useAtomComponentStateValue(diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/utils/__tests__/getSupportedRecordCalendarLayout.test.ts b/packages/twenty-front/src/modules/object-record/record-calendar/utils/__tests__/getSupportedRecordCalendarLayout.test.tsdeleted file mode 100644index b6fcd051430..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/utils/__tests__/getSupportedRecordCalendarLayout.test.ts+++ /dev/null@@ -1,40 +0,0 @@-import { getSupportedRecordCalendarLayout } from '@/object-record/record-calendar/utils/getSupportedRecordCalendarLayout';-import { ViewCalendarLayout } from '~/generated-metadata/graphql';--describe('getSupportedRecordCalendarLayout', () => {- it.each([- [ViewCalendarLayout.WEEK, ViewCalendarLayout.WEEK],- [ViewCalendarLayout.MONTH, ViewCalendarLayout.MONTH],- [ViewCalendarLayout.DAY, ViewCalendarLayout.DAY],- [null, ViewCalendarLayout.MONTH],- [undefined, ViewCalendarLayout.MONTH],- ])(- 'normalizes %s to %s when the week view is enabled',- (calendarLayout, expectedLayout) => {- expect(- getSupportedRecordCalendarLayout({- calendarLayout,- isCalendarWeekViewEnabled: true,- }),- ).toBe(expectedLayout);- },- );-- it.each([- ViewCalendarLayout.WEEK,- ViewCalendarLayout.MONTH,- ViewCalendarLayout.DAY,- null,- undefined,- ])(- 'normalizes %s to month when the week view is disabled',- (calendarLayout) => {- expect(- getSupportedRecordCalendarLayout({- calendarLayout,- isCalendarWeekViewEnabled: false,- }),- ).toBe(ViewCalendarLayout.MONTH);- },- );-});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.tsdeleted file mode 100644index 3f6e79f7209..00000000000--- a/packages/twenty-front/src/modules/object-record/record-calendar/utils/getSupportedRecordCalendarLayout.ts+++ /dev/null@@ -1,19 +0,0 @@-import { ViewCalendarLayout } from '~/generated-metadata/graphql';--type GetSupportedRecordCalendarLayoutArgs = {- calendarLayout: ViewCalendarLayout | null | undefined;- isCalendarWeekViewEnabled: boolean;-};--export const getSupportedRecordCalendarLayout = ({- calendarLayout,- isCalendarWeekViewEnabled,-}: GetSupportedRecordCalendarLayoutArgs) => {- const isWeekOrDayLayout =- calendarLayout === ViewCalendarLayout.DAY ||- calendarLayout === ViewCalendarLayout.WEEK;-- return isCalendarWeekViewEnabled && isWeekOrDayLayout- ? calendarLayout- : ViewCalendarLayout.MONTH;-};diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexLoadBaseOnContextStoreEffect.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexLoadBaseOnContextStoreEffect.tsxindex 10370b59e11..d1bed6ddedb 100644--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexLoadBaseOnContextStoreEffect.tsx+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexLoadBaseOnContextStoreEffect.tsx@@ -4,19 +4,14 @@ import { useLoadRecordIndexStates } from '@/object-record/record-index/hooks/useimport { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';import { viewFromViewIdFamilySelector } from '@/views/states/selectors/viewFromViewIdFamilySelector';-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';import { useEffect, useState } from 'react';import { isDefined } from 'twenty-shared/utils';-import { FeatureFlagKey } from '~/generated-metadata/graphql';export const RecordIndexLoadBaseOnContextStoreEffect = () => {const { loadRecordIndexStates } = useLoadRecordIndexStates();const contextStoreCurrentViewId = useAtomComponentStateValue(contextStoreCurrentViewIdComponentState,);- const isCalendarWeekViewEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED,- );const [loadedViewKey, setLoadedViewKey] = useState<string | undefined>();@@ -30,7 +25,7 @@ export const RecordIndexLoadBaseOnContextStoreEffect = () => {.join(',');const currentViewLoadKey = isDefined(contextStoreCurrentViewId)- ? `${contextStoreCurrentViewId}-${isCalendarWeekViewEnabled}-${viewGroupsSignature}`+ ? `${contextStoreCurrentViewId}-${viewGroupsSignature}`: undefined;const { objectMetadataItem } = useContextStoreObjectMetadataItemOrThrow();diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/__tests__/RecordIndexLoadBaseOnContextStoreEffect.test.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/__tests__/RecordIndexLoadBaseOnContextStoreEffect.test.tsxindex 05126a1b587..438e5afe209 100644--- a/packages/twenty-front/src/modules/object-record/record-index/components/__tests__/RecordIndexLoadBaseOnContextStoreEffect.test.tsx+++ b/packages/twenty-front/src/modules/object-record/record-index/components/__tests__/RecordIndexLoadBaseOnContextStoreEffect.test.tsx@@ -1,7 +1,6 @@import { render } from '@testing-library/react';import { RecordIndexLoadBaseOnContextStoreEffect } from '@/object-record/record-index/components/RecordIndexLoadBaseOnContextStoreEffect';-import { FeatureFlagKey } from '~/generated-metadata/graphql';jest.mock('@/object-record/record-index/hooks/useLoadRecordIndexStates',@@ -27,9 +26,6 @@ jest.mock(useContextStoreObjectMetadataItemOrThrow: jest.fn(),}),);-jest.mock('@/workspace/hooks/useIsFeatureEnabled', () => ({- useIsFeatureEnabled: jest.fn(),-}));const useLoadRecordIndexStatesMock = jest.requireMock('@/object-record/record-index/hooks/useLoadRecordIndexStates',@@ -43,9 +39,6 @@ const useAtomFamilySelectorValueMock = jest.requireMock(const useContextStoreObjectMetadataItemOrThrowMock = jest.requireMock('@/context-store/hooks/useContextStoreObjectMetadataItemOrThrow',).useContextStoreObjectMetadataItemOrThrow;-const useIsFeatureEnabledMock = jest.requireMock(- '@/workspace/hooks/useIsFeatureEnabled',-).useIsFeatureEnabled;describe('RecordIndexLoadBaseOnContextStoreEffect', () => {const loadRecordIndexStates = jest.fn();@@ -60,10 +53,9 @@ describe('RecordIndexLoadBaseOnContextStoreEffect', () => {useContextStoreObjectMetadataItemOrThrowMock.mockReturnValue({objectMetadataItem,});- useIsFeatureEnabledMock.mockReturnValue(false);});- it('reloads the persisted view state when the week-view flag changes', () => {+ it('does not reload an unchanged view', () => {const { rerender } = render(<RecordIndexLoadBaseOnContextStoreEffect />);expect(loadRecordIndexStates).toHaveBeenCalledTimes(1);@@ -75,14 +67,6 @@ describe('RecordIndexLoadBaseOnContextStoreEffect', () => {rerender(<RecordIndexLoadBaseOnContextStoreEffect />);expect(loadRecordIndexStates).toHaveBeenCalledTimes(1);-- useIsFeatureEnabledMock.mockReturnValue(true);- rerender(<RecordIndexLoadBaseOnContextStoreEffect />);-- expect(loadRecordIndexStates).toHaveBeenCalledTimes(2);- expect(useIsFeatureEnabledMock).toHaveBeenCalledWith(- FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED,- );});it('reloads the persisted view state when the view groups change', () => {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 5914b6cdd05..dc854c89bbf 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@@ -11,7 +11,6 @@ import { type FieldMetadata } from '@/object-record/record-field/ui/types/FieldMimport { currentRecordFilterGroupsComponentState } from '@/object-record/record-filter-group/states/currentRecordFilterGroupsComponentState';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 { recordIndexGroupFieldMetadataItemComponentState } from '@/object-record/record-index/states/recordIndexGroupFieldMetadataComponentState';import { currentRecordSortsComponentState } from '@/object-record/record-sort/states/currentRecordSortsComponentState';@@ -41,18 +40,14 @@ import { mapViewFieldToRecordField } from '@/views/utils/mapViewFieldToRecordFieimport { mapViewFieldsToColumnDefinitions } from '@/views/utils/mapViewFieldsToColumnDefinitions';import { mapViewFilterGroupsToRecordFilterGroups } from '@/views/utils/mapViewFilterGroupsToRecordFilterGroups';import { mapViewFiltersToFilters } from '@/views/utils/mapViewFiltersToFilters';-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';import { atom, useStore } from 'jotai';import { useCallback } from 'react';import { isDefined } from 'twenty-shared/utils';-import { FeatureFlagKey } from '~/generated-metadata/graphql';+import { ViewCalendarLayout } from '~/generated-metadata/graphql';import { isDeeplyEqual } from '~/utils/isDeeplyEqual';export const useLoadRecordIndexStates = () => {const store = useStore();- const isCalendarWeekViewEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED,- );const contextStoreTargetedRecordsRuleAtom =useAtomComponentStateCallbackState(@@ -345,10 +340,7 @@ export const useLoadRecordIndexStates = () => {recordIndexCalendarLayoutComponentState.atomFamily({instanceId: recordCalendarInstanceId,}),- getSupportedRecordCalendarLayout({- calendarLayout: view.calendarLayout,- isCalendarWeekViewEnabled,- }),+ view.calendarLayout ?? ViewCalendarLayout.MONTH,);}@@ -407,7 +399,6 @@ export const useLoadRecordIndexStates = () => {getFieldMetadataItemByIdOrThrow,setRecordGroupsFromViewGroups,syncRecordIndexViewFields,- isCalendarWeekViewEnabled,],);diff --git a/packages/twenty-front/src/modules/page-layout/widgets/record-table/components/RecordTableWidgetRendererContent.tsx b/packages/twenty-front/src/modules/page-layout/widgets/record-table/components/RecordTableWidgetRendererContent.tsxindex 6ece3ab6b5b..83e3b731e92 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/record-table/components/RecordTableWidgetRendererContent.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/record-table/components/RecordTableWidgetRendererContent.tsx@@ -15,14 +15,9 @@ import {import { constructViewFromRecordTableWidgetViewSnapshot } from '@/page-layout/widgets/record-table/utils/constructViewFromRecordTableWidgetViewSnapshot';import { useAtomComponentFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorValue';import { useViewById } from '@/views/hooks/useViewById';-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';import { type ReactNode } from 'react';import { isDefined } from 'twenty-shared/utils';-import {- FeatureFlagKey,- ViewCalendarLayout,- ViewType,-} from '~/generated-metadata/graphql';+import { ViewCalendarLayout, ViewType } from '~/generated-metadata/graphql';type RecordTableWidgetRendererContentProps = {objectMetadataId: string;@@ -67,10 +62,6 @@ export const RecordTableWidgetRendererContent = ({const isCalendarLayout = widgetViewLayout === ViewType.CALENDAR;- const isCalendarWeekViewEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED,- );-// Widget calendars are read-only month projections, except live (non// edit-mode) day/week calendars, which allow drag-to-reschedule and// record creation under the usual object permissions.@@ -78,12 +69,9 @@ export const RecordTableWidgetRendererContent = ({widgetView?.calendarLayout === ViewCalendarLayout.DAY ||widgetView?.calendarLayout === ViewCalendarLayout.WEEK;const canEditCalendar =- isCalendarLayout &&- !isPageLayoutInEditMode &&- isCalendarWeekViewEnabled &&- isCalendarDayOrWeek;+ isCalendarLayout && !isPageLayoutInEditMode && isCalendarDayOrWeek;// Read-only unless this is the explicitly allowed live day/week calendar;- // a caller passing isReadOnly={false} must not make month (or flag-off)+ // a caller passing isReadOnly={false} must not make month// widget calendars editable. Object permissions still gate the drag.const calendarIsReadOnly = !canEditCalendar;diff --git a/packages/twenty-front/src/modules/page-layout/widgets/record-table/components/__tests__/RecordTableWidgetRendererContent.test.tsx b/packages/twenty-front/src/modules/page-layout/widgets/record-table/components/__tests__/RecordTableWidgetRendererContent.test.tsxindex 65ce507852d..4375fa21a0b 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/record-table/components/__tests__/RecordTableWidgetRendererContent.test.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/record-table/components/__tests__/RecordTableWidgetRendererContent.test.tsx@@ -1,9 +1,10 @@import { render, screen } from '@testing-library/react';import { RecordTableWidgetRendererContent } from '@/page-layout/widgets/record-table/components/RecordTableWidgetRendererContent';-import { ViewType } from '~/generated-metadata/graphql';+import { ViewCalendarLayout, ViewType } from '~/generated-metadata/graphql';const mockUseViewById = jest.fn();+const mockIsPageLayoutInEditMode = jest.fn();jest.mock('@/object-metadata/hooks/useObjectMetadataItemById', () => ({useObjectMetadataItemById: jest.fn(() => ({@@ -11,7 +12,7 @@ jest.mock('@/object-metadata/hooks/useObjectMetadataItemById', () => ({})),}));jest.mock('@/page-layout/hooks/useIsPageLayoutInEditMode', () => ({- useIsPageLayoutInEditMode: jest.fn(() => false),+ useIsPageLayoutInEditMode: () => mockIsPageLayoutInEditMode(),}));jest.mock('@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorValue',@@ -20,9 +21,6 @@ jest.mock(jest.mock('@/views/hooks/useViewById', () => ({useViewById: () => mockUseViewById(),}));-jest.mock('@/workspace/hooks/useIsFeatureEnabled', () => ({- useIsFeatureEnabled: jest.fn(() => false),-}));jest.mock('@/object-record/record-table-widget/components/RecordTableWidgetProvider',() => ({@@ -46,7 +44,14 @@ jest.mock();jest.mock('@/object-record/record-calendar-widget/components/RecordCalendarWidget',- () => ({ RecordCalendarWidget: () => <div>record calendar widget</div> }),+ () => ({+ RecordCalendarWidget: ({ isReadOnly }: { isReadOnly: boolean }) => (+ <div>+ record calendar widget+ <button disabled={isReadOnly}>Create calendar record</button>+ </div>+ ),+ }),);const renderWidgetForViewType = (viewType: ViewType | undefined) => {@@ -65,7 +70,44 @@ const renderWidgetForViewType = (viewType: ViewType | undefined) => {};describe('RecordTableWidgetRendererContent', () => {- beforeEach(() => jest.clearAllMocks());+ beforeEach(() => {+ jest.clearAllMocks();+ mockIsPageLayoutInEditMode.mockReturnValue(false);+ });++ it.each([+ [ViewCalendarLayout.DAY, false, false],+ [ViewCalendarLayout.WEEK, false, false],+ [ViewCalendarLayout.MONTH, false, true],+ [ViewCalendarLayout.DAY, true, true],+ [ViewCalendarLayout.WEEK, true, true],+ ])(+ 'renders %s with edit mode %s as read-only %s',+ (calendarLayout, isEditMode, isReadOnly) => {+ mockIsPageLayoutInEditMode.mockReturnValue(isEditMode);+ mockUseViewById.mockReturnValue({+ view: { id: 'view-id', type: ViewType.CALENDAR_WIDGET, calendarLayout },+ });++ render(+ <RecordTableWidgetRendererContent+ objectMetadataId="object-metadata-id"+ viewId="view-id"+ widgetId="widget-id"+ />,+ );++ const createButton = screen.getByRole('button', {+ name: 'Create calendar record',+ });++ if (isReadOnly) {+ expect(createButton).toBeDisabled();+ } else {+ expect(createButton).toBeEnabled();+ }+ },+ );// A layout that fell through to the table renderer was the bug this widget// type set out to fix, so every layout has to claim its own renderer.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 94823b90bae..b7a2236d5c3 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@@ -1,18 +1,12 @@import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';-import { getSupportedRecordCalendarLayout } from '@/object-record/record-calendar/utils/getSupportedRecordCalendarLayout';import { recordTableWidgetViewDraftComponentState } from '@/page-layout/states/recordTableWidgetViewDraftComponentState';import { type RecordTableWidgetLayoutViewType } from '@/page-layout/widgets/record-table/types/RecordTableWidgetLayoutViewType';import { type RecordTableWidgetViewSnapshot } from '@/page-layout/widgets/record-table/types/RecordTableWidgetViewSnapshot';import { buildDraftViewGroupsForFieldMetadataItem } from '@/page-layout/widgets/record-table/utils/buildDraftViewGroupsForFieldMetadataItem';import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';import { useStore } from 'jotai';import { isDefined } from 'twenty-shared/utils';-import {- FeatureFlagKey,- type ViewCalendarLayout,- ViewType,-} from '~/generated-metadata/graphql';+import { ViewCalendarLayout, ViewType } from '~/generated-metadata/graphql';type UseRecordTableWidgetLayoutCallbacksParams = {pageLayoutId: string;@@ -30,22 +24,6 @@ export const useRecordTableWidgetLayoutCallbacks = ({const store = useStore();- const isCalendarWeekViewEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED,- );-- // Clamp a widget calendar's layout to what the workspace supports (MONTH- // while the day/week feature is off), reusing the shared resolver so widget- // and index calendars can't diverge and no stale day/week value is sent back- // to — and rejected by — the server.- const resolveCalendarLayout = (- calendarLayout: ViewCalendarLayout | null | undefined,- ) =>- getSupportedRecordCalendarLayout({- calendarLayout,- isCalendarWeekViewEnabled,- });-// Returning the received snapshot unchanged from the updater leaves the// whole draft map untouched (no state update is published).const setWidgetViewDraft = (@@ -143,9 +121,8 @@ export const useRecordTableWidgetLayoutCallbacks = ({view: {...widgetViewDraft.view,type: targetViewType,- calendarLayout: resolveCalendarLayout(- widgetViewDraft.view.calendarLayout,- ),+ calendarLayout:+ widgetViewDraft.view.calendarLayout ?? ViewCalendarLayout.MONTH,calendarFieldMetadataId: hasCalendarField? widgetViewDraft.view.calendarFieldMetadataId: defaultCalendarFieldMetadataItem?.id,@@ -170,9 +147,8 @@ export const useRecordTableWidgetLayoutCallbacks = ({...widgetViewDraft.view,calendarFieldMetadataId: fieldMetadataItem.id,calendarEndFieldMetadataId: null,- calendarLayout: resolveCalendarLayout(- widgetViewDraft.view.calendarLayout,- ),+ calendarLayout:+ widgetViewDraft.view.calendarLayout ?? ViewCalendarLayout.MONTH,},}));};@@ -182,7 +158,7 @@ export const useRecordTableWidgetLayoutCallbacks = ({...widgetViewDraft,view: {...widgetViewDraft.view,- calendarLayout: resolveCalendarLayout(calendarLayout),+ calendarLayout,},}));};diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardRecordTableSettings.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardRecordTableSettings.tsxindex beecce8456a..a34ab347bd1 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardRecordTableSettings.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dashboard/SidePanelDashboardRecordTableSettings.tsx@@ -28,7 +28,6 @@ import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidimport { SidePanelSubPages } from '@/side-panel/types/SidePanelSubPages';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';import { isDefined } from 'twenty-shared/utils';@@ -44,7 +43,6 @@ import {IconListDetails,} from 'twenty-ui/icon';import {- FeatureFlagKey,ViewCalendarLayout,ViewType,WidgetConfigurationType,@@ -146,10 +144,6 @@ export const SidePanelDashboardRecordTableSettings = () => {const calendarFieldMetadataId = widgetView?.calendarFieldMetadataId ?? null;- const isCalendarWeekViewEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED,- );-const currentCalendarLayout =widgetView?.calendarLayout ?? ViewCalendarLayout.MONTH;@@ -194,12 +188,7 @@ export const SidePanelDashboardRecordTableSettings = () => {'record-table-filter','record-table-sort',...(isCalendarLayout- ? [- 'record-table-calendar-field',- ...(isCalendarWeekViewEnabled- ? ['record-table-calendar-layout']- : []),- ]+ ? ['record-table-calendar-field', 'record-table-calendar-layout']: ['record-table-group-by']),...(!isCalendarLayout && hasGroupBy? ['record-table-hide-empty-groups']@@ -347,7 +336,7 @@ export const SidePanelDashboardRecordTableSettings = () => {/></SelectableListItem>)}- {isCalendarLayout && isCalendarWeekViewEnabled && (+ {isCalendarLayout && (<SelectableListItem itemId="record-table-calendar-layout"><CommandMenuItemDropdownIcon={IconCalendar}diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldSettings.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldSettings.tsxindex 810ccead666..dc95aa49055 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldSettings.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-page/SidePanelRecordPageFieldSettings.tsx@@ -28,7 +28,6 @@ import { getWidgetViewLayoutSettingsItemIds } from '@/side-panel/pages/page-layoimport { SidePanelSubPages } from '@/side-panel/types/SidePanelSubPages';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';import { isDefined } from 'twenty-shared/utils';@@ -37,11 +36,7 @@ import {IconList,IconListDetails,} from 'twenty-ui/icon';-import {- FeatureFlagKey,- FieldDisplayMode,- ViewType,-} from '~/generated-metadata/graphql';+import { FieldDisplayMode, ViewType } from '~/generated-metadata/graphql';const StyledContainer = styled.div`display: flex;@@ -116,10 +111,6 @@ export const SidePanelRecordPageFieldSettings = () => {pageLayoutId,});- const isCalendarWeekViewEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED,- );-if (!isDefined(widgetInEditMode)) {return null;}@@ -181,7 +172,6 @@ export const SidePanelRecordPageFieldSettings = () => {...(showViewLayoutRows? getWidgetViewLayoutSettingsItemIds({isCalendarLayout: isEmbeddedViewCalendarLayout,- isCalendarWeekViewEnabled,hasGroupBy: embeddedViewHasGroupBy,isLayoutRowHidden: true,})diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/WidgetViewLayoutSettingsRows.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/WidgetViewLayoutSettingsRows.tsxindex df966243c1a..602b77edd5c 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/WidgetViewLayoutSettingsRows.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/WidgetViewLayoutSettingsRows.tsx@@ -13,7 +13,6 @@ import { RecordTableGroupByDropdownContent } from '@/side-panel/pages/page-layouimport { RecordTableLayoutDropdownContent } from '@/side-panel/pages/page-layout/components/record-table-settings/RecordTableLayoutDropdownContent';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';import { useLingui } from '@lingui/react/macro';import { isDefined } from 'twenty-shared/utils';import {@@ -22,11 +21,7 @@ import {IconEyeOff,IconLayoutList,} from 'twenty-ui/icon';-import {- FeatureFlagKey,- ViewCalendarLayout,- ViewType,-} from '~/generated-metadata/graphql';+import { ViewCalendarLayout, ViewType } from '~/generated-metadata/graphql';type WidgetViewLayoutSettingsRowsProps = {pageLayoutId: string;@@ -52,10 +47,6 @@ export const WidgetViewLayoutSettingsRows = ({}: WidgetViewLayoutSettingsRowsProps) => {const { t } = useLingui();- const isCalendarWeekViewEnabled = useIsFeatureEnabled(- FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED,- );-const { handleShouldHideEmptyGroupsChange } =useRecordTableWidgetLayoutCallbacks({pageLayoutId,@@ -164,7 +155,7 @@ export const WidgetViewLayoutSettingsRows = ({/></SelectableListItem>)}- {isCalendarLayout && isCalendarWeekViewEnabled && (+ {isCalendarLayout && (<SelectableListItem itemId="record-table-calendar-layout"><CommandMenuItemDropdownIcon={IconCalendar}diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/__tests__/WidgetViewLayoutSettingsRows.test.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/__tests__/WidgetViewLayoutSettingsRows.test.tsxindex ac5afe1064e..0c0859f79a1 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/__tests__/WidgetViewLayoutSettingsRows.test.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/__tests__/WidgetViewLayoutSettingsRows.test.tsx@@ -47,9 +47,6 @@ jest.mock('@/ui/layout/dropdown/components/DropdownContent', () => ({jest.mock('@/ui/layout/selectable-list/components/SelectableListItem', () => ({SelectableListItem: ({ children }: { children: React.ReactNode }) => children,}));-jest.mock('@/workspace/hooks/useIsFeatureEnabled', () => ({- useIsFeatureEnabled: jest.fn(() => false),-}));jest.mock('@/command-menu/components/CommandMenuItemToggle', () => ({CommandMenuItemToggle: () => null,}));@@ -92,6 +89,12 @@ const renderLayoutRows = (widgetViewType: ViewType) => {describe('WidgetViewLayoutSettingsRows', () => {beforeEach(() => jest.clearAllMocks());+ it('includes calendar layout settings without a feature flag', () => {+ renderLayoutRows(ViewType.CALENDAR_WIDGET);++ expect(screen.getByTestId('row-Calendar view')).toHaveTextContent('Month');+ });+// The layout row used to fall through to Table for anything that was not// kanban or calendar, so a list widget described itself as a table.it.each([diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/__tests__/getWidgetViewLayoutSettingsItemIds.test.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/__tests__/getWidgetViewLayoutSettingsItemIds.test.tsindex acc6c7b33e5..cc2a672fce3 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/__tests__/getWidgetViewLayoutSettingsItemIds.test.ts+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/__tests__/getWidgetViewLayoutSettingsItemIds.test.ts@@ -5,7 +5,6 @@ describe('getWidgetViewLayoutSettingsItemIds', () => {expect(getWidgetViewLayoutSettingsItemIds({isCalendarLayout: false,- isCalendarWeekViewEnabled: false,hasGroupBy: false,}),).toEqual(['object-view-layout', 'record-table-group-by']);@@ -15,7 +14,6 @@ describe('getWidgetViewLayoutSettingsItemIds', () => {expect(getWidgetViewLayoutSettingsItemIds({isCalendarLayout: false,- isCalendarWeekViewEnabled: false,hasGroupBy: true,}),).toEqual([@@ -25,23 +23,12 @@ describe('getWidgetViewLayoutSettingsItemIds', () => {]);});- it('swaps group-by rows for the calendar field row on a calendar layout', () => {+ it('swaps group-by rows for calendar field and layout rows', () => {expect(getWidgetViewLayoutSettingsItemIds({isCalendarLayout: true,- isCalendarWeekViewEnabled: false,hasGroupBy: true,}),- ).toEqual(['object-view-layout', 'record-table-calendar-field']);- });-- it('includes the calendar view row when the week/day flag is enabled', () => {- expect(- getWidgetViewLayoutSettingsItemIds({- isCalendarLayout: true,- isCalendarWeekViewEnabled: true,- hasGroupBy: false,- }),).toEqual(['object-view-layout','record-table-calendar-field',@@ -53,7 +40,6 @@ describe('getWidgetViewLayoutSettingsItemIds', () => {expect(getWidgetViewLayoutSettingsItemIds({isCalendarLayout: false,- isCalendarWeekViewEnabled: false,hasGroupBy: false,isLayoutRowHidden: true,}),diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getWidgetViewLayoutSettingsItemIds.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getWidgetViewLayoutSettingsItemIds.tsindex eb5e2182a7d..25ef14b7e93 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getWidgetViewLayoutSettingsItemIds.ts+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/utils/getWidgetViewLayoutSettingsItemIds.ts@@ -1,20 +1,15 @@export const getWidgetViewLayoutSettingsItemIds = ({isCalendarLayout,- isCalendarWeekViewEnabled,hasGroupBy,isLayoutRowHidden = false,}: {isCalendarLayout: boolean;- isCalendarWeekViewEnabled: boolean;hasGroupBy: boolean;isLayoutRowHidden?: boolean;}) => [...(isLayoutRowHidden ? [] : ['object-view-layout']),...(isCalendarLayout- ? [- 'record-table-calendar-field',- ...(isCalendarWeekViewEnabled ? ['record-table-calendar-layout'] : []),- ]+ ? ['record-table-calendar-field', 'record-table-calendar-layout']: ['record-table-group-by']),...(!isCalendarLayout && hasGroupBy? ['record-table-hide-empty-groups']diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/constants/public-feature-flag.const.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/constants/public-feature-flag.const.tsindex 2aea4336bee..08c93ec7f33 100644--- a/packages/twenty-server/src/engine/core-modules/feature-flag/constants/public-feature-flag.const.ts+++ b/packages/twenty-server/src/engine/core-modules/feature-flag/constants/public-feature-flag.const.ts@@ -13,15 +13,6 @@ export type PublicFeatureFlag = {};export const PUBLIC_FEATURE_FLAGS: PublicFeatureFlag[] = [- {- key: FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED,- metadata: {- label: 'Calendar Day and Week Views',- description:- 'Display calendar records in daily or weekly layouts with optional end dates',- icon: 'IconCalendarWeek',- },- },{key: FeatureFlagKey.IS_JUNCTION_RELATIONS_ENABLED,metadata: {diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.tsindex 0d47cd7d96a..13a94c88b71 100644--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts@@ -6,7 +6,6 @@ const tableName = 'featureFlag';const DEFAULT_SEEDED_FEATURE_FLAGS: Partial<Record<FeatureFlagKey, boolean>> = {[FeatureFlagKey.IS_APP_CLAIMING_ENABLED]: false,[FeatureFlagKey.IS_UNIQUE_INDEXES_ENABLED]: false,- [FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED]: true,[FeatureFlagKey.IS_EMAIL_GROUP_ENABLED]: true,[FeatureFlagKey.IS_JUNCTION_RELATIONS_ENABLED]: true,};diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/__tests__/validate-flat-view-calendar-fields.util.spec.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/__tests__/validate-flat-view-calendar-fields.util.spec.tsnew file mode 100644index 00000000000..5b60f0b059d--- /dev/null+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/__tests__/validate-flat-view-calendar-fields.util.spec.ts@@ -0,0 +1,42 @@+import {+ FieldMetadataType,+ ViewCalendarLayout,+ ViewType,+} from 'twenty-shared/types';++import { type UniversalFlatFieldMetadata } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-field-metadata.type';+import { type UniversalFlatView } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-view.type';+import { validateFlatViewCalendarFields } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-view-calendar-fields.util';++describe('validateFlatViewCalendarFields', () => {+ it.each([+ [ViewCalendarLayout.DAY, FieldMetadataType.DATE],+ [ViewCalendarLayout.DAY, FieldMetadataType.DATE_TIME],+ [ViewCalendarLayout.WEEK, FieldMetadataType.DATE],+ [ViewCalendarLayout.WEEK, FieldMetadataType.DATE_TIME],+ [ViewCalendarLayout.MONTH, FieldMetadataType.DATE],+ [ViewCalendarLayout.MONTH, FieldMetadataType.DATE_TIME],+ ])('accepts a %s calendar widget with a %s field', (calendarLayout, type) => {+ const calendarField = {+ universalIdentifier: 'calendar-field',+ objectMetadataUniversalIdentifier: 'object',+ type,+ } as UniversalFlatFieldMetadata;+ const flatView = {+ type: ViewType.CALENDAR_WIDGET,+ objectMetadataUniversalIdentifier: 'object',+ calendarLayout,+ calendarFieldMetadataUniversalIdentifier: 'calendar-field',+ calendarEndFieldMetadataUniversalIdentifier: null,+ } as UniversalFlatView;++ expect(+ validateFlatViewCalendarFields({+ flatView,+ flatFieldMetadataMaps: {+ byUniversalIdentifier: { 'calendar-field': calendarField },+ },+ }),+ ).toEqual([]);+ });+});diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-view-calendar-fields.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-view-calendar-fields.util.tsindex aba7743fe42..fe032b9fe3c 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-view-calendar-fields.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-view-calendar-fields.util.ts@@ -1,9 +1,5 @@import { msg, t } from '@lingui/core/macro';-import {- FieldMetadataType,- ViewCalendarLayout,- ViewType,-} from 'twenty-shared/types';+import { FieldMetadataType, ViewType } from 'twenty-shared/types';import { getViewLayoutFromViewType, isDefined } from 'twenty-shared/utils';import { findFlatEntityByUniversalIdentifier } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier.util';@@ -15,11 +11,9 @@ import { type FlatEntityValidationError } from 'src/engine/workspace-manager/worexport const validateFlatViewCalendarFields = ({flatView,flatFieldMetadataMaps,- isCalendarWeekViewEnabled,}: {flatView: UniversalFlatView;flatFieldMetadataMaps: AllUniversalFlatEntityMaps['flatFieldMetadataMaps'];- isCalendarWeekViewEnabled: boolean;}): FlatEntityValidationError[] => {if (getViewLayoutFromViewType(flatView.type) !== ViewType.CALENDAR) {return [];@@ -35,19 +29,6 @@ export const validateFlatViewCalendarFields = ({});}- if (- flatView.type === ViewType.CALENDAR_WIDGET &&- !isCalendarWeekViewEnabled &&- isDefined(flatView.calendarLayout) &&- flatView.calendarLayout !== ViewCalendarLayout.MONTH- ) {- errors.push({- code: ViewExceptionCode.INVALID_VIEW_DATA,- message: t`Calendar widget views only support the month layout`,- userFriendlyMessage: msg`Calendar widget views only support the month layout`,- });- }-if (!isDefined(flatView.calendarFieldMetadataUniversalIdentifier)) {errors.push({code: ViewExceptionCode.INVALID_VIEW_DATA,diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-view-creation.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-view-creation.util.tsindex 32d23b9fdf4..64485990846 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-view-creation.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-view-creation.util.ts@@ -1,6 +1,6 @@import { msg, t } from '@lingui/core/macro';import { type ALL_METADATA_NAME } from 'twenty-shared/metadata';-import { FeatureFlagKey, ViewType } from 'twenty-shared/types';+import { ViewType } from 'twenty-shared/types';import { getViewLayoutFromViewType, isDefined } from 'twenty-shared/utils';import { findFlatEntityByUniversalIdentifier } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier.util';@@ -18,7 +18,6 @@ export const validateFlatViewCreation = ({flatFieldMetadataMaps,flatObjectMetadataMaps,},- additionalCacheDataMaps: { featureFlagsMap },}: UniversalFlatEntityValidationArgs<typeof ALL_METADATA_NAME.view>): FailedFlatEntityValidation<'view', 'create'> => {@@ -159,8 +158,6 @@ export const validateFlatViewCreation = ({...validateFlatViewCalendarFields({flatView: flatViewToValidate,flatFieldMetadataMaps,- isCalendarWeekViewEnabled:- featureFlagsMap[FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED],}),);diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-view-update.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-view-update.util.tsindex 326b2770d7b..334b120e0c0 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-view-update.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-flat-view-update.util.ts@@ -1,6 +1,6 @@import { msg, t } from '@lingui/core/macro';import { type ALL_METADATA_NAME } from 'twenty-shared/metadata';-import { FeatureFlagKey, ViewType } from 'twenty-shared/types';+import { ViewType } from 'twenty-shared/types';import { getViewLayoutFromViewType, isDefined } from 'twenty-shared/utils';import { findFlatEntityByUniversalIdentifier } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier.util';@@ -19,7 +19,6 @@ export const validateFlatViewUpdate = ({flatViewMaps: optimisticFlatViewMaps,flatFieldMetadataMaps,},- additionalCacheDataMaps: { featureFlagsMap },}: FlatEntityUpdateValidationArgs<typeof ALL_METADATA_NAME.view>): FailedFlatEntityValidation<'view', 'update'> => {@@ -151,8 +150,6 @@ export const validateFlatViewUpdate = ({...validateFlatViewCalendarFields({flatView: updatedFlatView,flatFieldMetadataMaps,- isCalendarWeekViewEnabled:- featureFlagsMap[FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED],}),);diff --git a/packages/twenty-server/test/integration/metadata/suites/view/upsert-view-widget-view-settings.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/view/upsert-view-widget-view-settings.integration-spec.tsindex 36058d4d026..8cd9b726eae 100644--- a/packages/twenty-server/test/integration/metadata/suites/view/upsert-view-widget-view-settings.integration-spec.ts+++ b/packages/twenty-server/test/integration/metadata/suites/view/upsert-view-widget-view-settings.integration-spec.ts@@ -12,9 +12,7 @@ import { findViewGroups } from 'test/integration/metadata/suites/view-group/utilimport { createOneView } from 'test/integration/metadata/suites/view/utils/create-one-view.util';import { destroyOneView } from 'test/integration/metadata/suites/view/utils/destroy-one-view.util';import { upsertViewWidget } from 'test/integration/metadata/suites/view/utils/upsert-view-widget.util';-import { updateFeatureFlag } from 'test/integration/metadata/suites/utils/update-feature-flag.util';import {- FeatureFlagKey,FieldMetadataType,ViewCalendarLayout,ViewType,@@ -276,50 +274,16 @@ describe('upsertViewWidget view settings', () => {);});- it('should reject a non-month calendar layout on a CALENDAR_WIDGET view', async () => {- // This suite shares its workspace with the rest of the shard, and the- // "allow non-month" test below flips IS_CALENDAR_WEEK_VIEW_ENABLED on. Pin- // it off here so the rejection path is exercised deterministically, whatever- // the test/retry ordering leaves behind in the workspace.- await updateFeatureFlag({- featureFlag: FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED,- value: false,- expectToFail: false,- });-- const { errors } = await upsertViewWidget({- expectToFail: true,- input: {- widgetId,- view: {- type: ViewType.CALENDAR_WIDGET,- calendarLayout: ViewCalendarLayout.DAY,- calendarFieldMetadataId: dateFieldMetadataId,- mainGroupByFieldMetadataId: null,- },- },- });-- expect(JSON.stringify(errors)).toContain(- 'Calendar widget views only support the month layout',- );- });-- it('should allow a non-month calendar layout on a CALENDAR_WIDGET view when the week/day calendar feature is enabled', async () => {- await updateFeatureFlag({- featureFlag: FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED,- value: true,- expectToFail: false,- });-- try {+ it.each([ViewCalendarLayout.DAY, ViewCalendarLayout.WEEK])(+ 'should allow the %s layout on a CALENDAR_WIDGET view',+ async (calendarLayout) => {const { data } = await upsertViewWidget({expectToFail: false,input: {widgetId,view: {type: ViewType.CALENDAR_WIDGET,- calendarLayout: ViewCalendarLayout.WEEK,+ calendarLayout,calendarFieldMetadataId: dateFieldMetadataId,mainGroupByFieldMetadataId: null,},@@ -328,17 +292,9 @@ describe('upsertViewWidget view settings', () => {});expect(data.upsertViewWidget.type).toBe(ViewType.CALENDAR_WIDGET);- expect(data.upsertViewWidget.calendarLayout).toBe(- ViewCalendarLayout.WEEK,- );- } finally {- await updateFeatureFlag({- featureFlag: FeatureFlagKey.IS_CALENDAR_WEEK_VIEW_ENABLED,- value: false,- expectToFail: false,- });- }- });+ expect(data.upsertViewWidget.calendarLayout).toBe(calendarLayout);+ },+ );it('should switch the widget view to CALENDAR_WIDGET with a date field and layout', async () => {const { data } = await upsertViewWidget({diff --git a/packages/twenty-shared/src/types/FeatureFlagKey.ts b/packages/twenty-shared/src/types/FeatureFlagKey.tsindex 69c32998f85..cc916b21c4b 100644--- a/packages/twenty-shared/src/types/FeatureFlagKey.ts+++ b/packages/twenty-shared/src/types/FeatureFlagKey.ts@@ -2,7 +2,6 @@ export enum FeatureFlagKey {IS_APP_CLAIMING_ENABLED = 'IS_APP_CLAIMING_ENABLED',IS_UNIQUE_INDEXES_ENABLED = 'IS_UNIQUE_INDEXES_ENABLED',IS_JSON_FILTER_ENABLED = 'IS_JSON_FILTER_ENABLED',- IS_CALENDAR_WEEK_VIEW_ENABLED = 'IS_CALENDAR_WEEK_VIEW_ENABLED',IS_EMAIL_GROUP_ENABLED = 'IS_EMAIL_GROUP_ENABLED',IS_JUNCTION_RELATIONS_ENABLED = 'IS_JUNCTION_RELATIONS_ENABLED',IS_LIST_VIEW_ENABLED = 'IS_LIST_VIEW_ENABLED',