From c3c800b0971c1e79d091538f54243a4b474d82ee Mon Sep 17 00:00:00 2001 From: Paul Rastoin <45004772+prastoin@users.noreply.github.com> Date: Wed, 5 Feb 2025 14:28:17 +0100 Subject: [PATCH] Post #10014 merged nitpicks followup (#10021) ## Only nitpicks Method signature mutation from several to one record arg Renamed a variable in map to fit related business logic #10014 Followup --- .../record-index/hooks/useHandleRecordGroupField.ts | 2 +- .../utils/computeOptimisticRecordFromInput.ts | 6 +++--- .../views/hooks/internal/usePersistViewGroupRecords.ts | 9 ++++++--- .../modules/views/hooks/useCreateViewFromCurrentView.ts | 5 ++++- .../src/modules/views/hooks/useSaveCurrentViewGroups.ts | 2 +- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleRecordGroupField.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleRecordGroupField.ts index 51d8d0179..2666578bc 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleRecordGroupField.ts +++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleRecordGroupField.ts @@ -94,7 +94,7 @@ export const useHandleRecordGroupField = ({ ); if (viewGroupsToCreate.length > 0) { - await createViewGroupRecords(viewGroupsToCreate, view); + await createViewGroupRecords({ viewGroupsToCreate, viewId: view.id }); } if (viewGroupsToDelete.length > 0) { diff --git a/packages/twenty-front/src/modules/object-record/utils/computeOptimisticRecordFromInput.ts b/packages/twenty-front/src/modules/object-record/utils/computeOptimisticRecordFromInput.ts index d05b73eb7..7f6e50465 100644 --- a/packages/twenty-front/src/modules/object-record/utils/computeOptimisticRecordFromInput.ts +++ b/packages/twenty-front/src/modules/object-record/utils/computeOptimisticRecordFromInput.ts @@ -25,11 +25,11 @@ export const computeOptimisticRecordFromInput = ({ objectMetadataItems, }: ComputeOptimisticCacheRecordInputArgs) => { const unknownRecordInputFields = Object.keys(recordInput).filter( - (fieldName) => { + (recordKey) => { const isUnknownMetadataItemField = - objectMetadataItem.fields.find(({ name }) => name === fieldName) === + objectMetadataItem.fields.find((field) => field.name === recordKey) === undefined; - const isTypenameField = fieldName === OBJECT_RECORD_TYPENAME_KEY; + const isTypenameField = recordKey === OBJECT_RECORD_TYPENAME_KEY; return isUnknownMetadataItemField && !isTypenameField; }, ); diff --git a/packages/twenty-front/src/modules/views/hooks/internal/usePersistViewGroupRecords.ts b/packages/twenty-front/src/modules/views/hooks/internal/usePersistViewGroupRecords.ts index 803e6cc64..eb155ff69 100644 --- a/packages/twenty-front/src/modules/views/hooks/internal/usePersistViewGroupRecords.ts +++ b/packages/twenty-front/src/modules/views/hooks/internal/usePersistViewGroupRecords.ts @@ -4,10 +4,13 @@ import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSi import { useCreateManyRecords } from '@/object-record/hooks/useCreateManyRecords'; import { useDestroyManyRecords } from '@/object-record/hooks/useDestroyManyRecords'; import { useUpdateOneRecordMutation } from '@/object-record/hooks/useUpdateOneRecordMutation'; -import { GraphQLView } from '@/views/types/GraphQLView'; import { ViewGroup } from '@/views/types/ViewGroup'; import { useApolloClient } from '@apollo/client'; +type CreateViewGroupRecordsArgs = { + viewGroupsToCreate: ViewGroup[]; + viewId: string; +}; export const usePersistViewGroupRecords = () => { const apolloClient = useApolloClient(); @@ -25,13 +28,13 @@ export const usePersistViewGroupRecords = () => { }); const createViewGroupRecords = useCallback( - (viewGroupsToCreate: ViewGroup[], view: GraphQLView) => { + ({ viewGroupsToCreate, viewId }: CreateViewGroupRecordsArgs) => { if (viewGroupsToCreate.length === 0) return; return createManyRecords( viewGroupsToCreate.map((viewGroup) => ({ ...viewGroup, - viewId: view.id, + viewId, })), ); }, diff --git a/packages/twenty-front/src/modules/views/hooks/useCreateViewFromCurrentView.ts b/packages/twenty-front/src/modules/views/hooks/useCreateViewFromCurrentView.ts index 440fb8e6c..b246becd5 100644 --- a/packages/twenty-front/src/modules/views/hooks/useCreateViewFromCurrentView.ts +++ b/packages/twenty-front/src/modules/views/hooks/useCreateViewFromCurrentView.ts @@ -146,7 +146,10 @@ export const useCreateViewFromCurrentView = (viewBarComponentId?: string) => { fieldMetadataId: kanbanFieldMetadataId, } satisfies ViewGroup); - await createViewGroupRecords(viewGroupsToCreate, newView); + await createViewGroupRecords({ + viewGroupsToCreate, + viewId: newView.id, + }); } if (shouldCopyFiltersAndSortsAndAggregate === true) { diff --git a/packages/twenty-front/src/modules/views/hooks/useSaveCurrentViewGroups.ts b/packages/twenty-front/src/modules/views/hooks/useSaveCurrentViewGroups.ts index 317527d48..83c92ebdf 100644 --- a/packages/twenty-front/src/modules/views/hooks/useSaveCurrentViewGroups.ts +++ b/packages/twenty-front/src/modules/views/hooks/useSaveCurrentViewGroups.ts @@ -128,7 +128,7 @@ export const useSaveCurrentViewGroups = (viewBarComponentId?: string) => { ); await Promise.all([ - createViewGroupRecords(viewGroupsToCreate, view), + createViewGroupRecords({ viewGroupsToCreate, viewId: view.id }), updateViewGroupRecords(viewGroupsToUpdate), ]); },