The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix: exclude non-groupBy date fields (deletedAt) from calendar field selection (#21764)
nitin9bc0db5666e5
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarFieldsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarFieldsContent.tsxindex e1bb6b9aea7..7715e47b18e 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarFieldsContent.tsx+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarFieldsContent.tsx@@ -13,7 +13,6 @@ import { useGetAvailableFieldsForCalendar } from '@/views/view-picker/hooks/useGimport { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import { useLingui } from '@lingui/react/macro';import { useState } from 'react';-import { isFieldMetadataDateKind } from 'twenty-shared/utils';import { IconChevronLeft, IconSettings, useIcons } from 'twenty-ui/icon';import { MenuItem, MenuItemSelect } from 'twenty-ui/navigation';@@ -27,14 +26,12 @@ export const ObjectOptionsDropdownCalendarFieldsContent = () => {const { currentView } = useGetCurrentViewOnly();const { updateCurrentView } = useUpdateCurrentView();- const { navigateToDateFieldSettings } = useGetAvailableFieldsForCalendar();+ const { availableFieldsForCalendar, navigateToDateFieldSettings } =+ useGetAvailableFieldsForCalendar();const setRecordIndexCalendarFieldMetadataId = useSetAtomState(recordIndexCalendarFieldMetadataIdState,);- const availableFieldsForCalendar = objectMetadataItem.fields.filter((field) =>- isFieldMetadataDateKind(field.type),- );const calendarFieldMetadata = currentView?.calendarFieldMetadataId? objectMetadataItem.fields.find(diff --git a/packages/twenty-front/src/modules/views/view-picker/hooks/__tests__/useGetAvailableFieldsForCalendar.test.tsx b/packages/twenty-front/src/modules/views/view-picker/hooks/__tests__/useGetAvailableFieldsForCalendar.test.tsxindex 3b585a90f0e..18f13955cbd 100644--- a/packages/twenty-front/src/modules/views/view-picker/hooks/__tests__/useGetAvailableFieldsForCalendar.test.tsx+++ b/packages/twenty-front/src/modules/views/view-picker/hooks/__tests__/useGetAvailableFieldsForCalendar.test.tsx@@ -96,6 +96,54 @@ describe('useGetAvailableFieldsForCalendar', () => {]);});+ it('should exclude date fields not supported in groupBy while keeping createdAt and updatedAt', () => {+ const fields = [+ {+ id: '1',+ name: 'dueAt',+ type: FieldMetadataType.DATE_TIME,+ label: 'Due Date',+ isActive: true,+ isSystem: false,+ },+ {+ id: '2',+ name: 'createdAt',+ type: FieldMetadataType.DATE_TIME,+ label: 'Created At',+ isActive: true,+ isSystem: true,+ },+ {+ id: '3',+ name: 'updatedAt',+ type: FieldMetadataType.DATE_TIME,+ label: 'Updated At',+ isActive: true,+ isSystem: true,+ },+ {+ id: '4',+ name: 'deletedAt',+ type: FieldMetadataType.DATE_TIME,+ label: 'Deleted At',+ isActive: true,+ isSystem: true,+ },+ ];++ const objectMetadataItems = [createMockObjectMetadataItem(fields)];+ const wrapper = createWrapper(objectMetadataItems);++ const { result } = renderHook(() => useGetAvailableFieldsForCalendar(), {+ wrapper,+ });++ expect(+ result.current.availableFieldsForCalendar.map((field) => field.name),+ ).toEqual(['dueAt', 'createdAt', 'updatedAt']);+ });+it('should return the navigateToDateFieldSettings function', () => {const fields = [{diff --git a/packages/twenty-front/src/modules/views/view-picker/hooks/useGetAvailableFieldsForCalendar.ts b/packages/twenty-front/src/modules/views/view-picker/hooks/useGetAvailableFieldsForCalendar.tsindex 2de29252379..9faf22e5591 100644--- a/packages/twenty-front/src/modules/views/view-picker/hooks/useGetAvailableFieldsForCalendar.ts+++ b/packages/twenty-front/src/modules/views/view-picker/hooks/useGetAvailableFieldsForCalendar.ts@@ -8,7 +8,11 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useimport { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { viewObjectMetadataIdComponentState } from '@/views/states/viewObjectMetadataIdComponentState';import { FieldMetadataType, SettingsPath } from 'twenty-shared/types';-import { isDefined, isFieldMetadataDateKind } from 'twenty-shared/utils';+import {+ isDefined,+ isFieldMetadataDateKind,+ isFieldMetadataSupportedInGroupBy,+} from 'twenty-shared/utils';import { useNavigateSettings } from '~/hooks/useNavigateSettings';export const useGetAvailableFieldsForCalendar = () => {@@ -26,8 +30,14 @@ export const useGetAvailableFieldsForCalendar = () => {);const availableFieldsForCalendar =- objectMetadataItem?.readableFields.filter((field) =>- isFieldMetadataDateKind(field.type),+ objectMetadataItem?.readableFields.filter(+ (field) =>+ isFieldMetadataDateKind(field.type) &&+ isFieldMetadataSupportedInGroupBy({+ type: field.type,+ name: field.name,+ isSystem: field.isSystem ?? false,+ }),) ?? [];const navigate = useNavigateSettings();