4087 refactor object metadata item hooks and utils (#4861)

- Extracted each exported element from useObjectMetadataItem into its
own hook.

packages/twenty-front/src/modules/object-record/hooks/useCreateManyRecords.ts

@@ -6,11 +6,9 @@ import { CachedObjectRecord } from '@/apollo/types/CachedObjectRecord';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
 import { useCreateOneRecordInCache } from '@/object-record/cache/hooks/useCreateOneRecordInCache';
-import {
-  getCreateManyRecordsMutationResponseField,
-  useGenerateCreateManyRecordMutation,
-} from '@/object-record/hooks/useGenerateCreateManyRecordMutation';
+import { useCreateManyRecordsMutation } from '@/object-record/hooks/useCreateManyRecordsMutation';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { getCreateManyRecordsMutationResponseField } from '@/object-record/utils/getCreateManyRecordsMutationResponseField';
 import { sanitizeRecordInput } from '@/object-record/utils/sanitizeRecordInput';
 import { isDefined } from '~/utils/isDefined';
 
@@ -35,8 +33,8 @@ export const useCreateManyRecords = <
     objectNameSingular,
   });
 
-  const createManyRecordsMutation = useGenerateCreateManyRecordMutation({
-    objectMetadataItem,
+  const { createManyRecordsMutation } = useCreateManyRecordsMutation({
+    objectNameSingular,
     queryFields,
     depth,
   });

packages/twenty-front/src/modules/object-record/hooks/useCreateManyRecordsMutation.ts

@@ -1,37 +1,38 @@
-import { gql } from '@apollo/client';
+import gql from 'graphql-tag';
 import { useRecoilValue } from 'recoil';
 
-import { EMPTY_MUTATION } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObjectMetadataToGraphQLQuery';
+import { EMPTY_MUTATION } from '@/object-record/constants/EmptyMutation';
+import { getCreateManyRecordsMutationResponseField } from '@/object-record/utils/getCreateManyRecordsMutationResponseField';
 import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 import { capitalize } from '~/utils/string/capitalize';
 
-export const getCreateManyRecordsMutationResponseField = (
-  objectNamePlural: string,
-) => `create${capitalize(objectNamePlural)}`;
-
-export const useGenerateCreateManyRecordMutation = ({
-  objectMetadataItem,
+export const useCreateManyRecordsMutation = ({
+  objectNameSingular,
   queryFields,
-  depth = 1,
+  depth,
 }: {
-  objectMetadataItem: ObjectMetadataItem;
+  objectNameSingular: string;
   queryFields?: Record<string, any>;
   depth?: number;
 }) => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
   const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
 
   if (isUndefinedOrNull(objectMetadataItem)) {
-    return EMPTY_MUTATION;
+    return { createManyRecordsMutation: EMPTY_MUTATION };
   }
 
   const mutationResponseField = getCreateManyRecordsMutationResponseField(
     objectMetadataItem.namePlural,
   );
 
-  return gql`
+  const createManyRecordsMutation = gql`
     mutation Create${capitalize(
       objectMetadataItem.namePlural,
     )}($data: [${capitalize(objectMetadataItem.nameSingular)}CreateInput!]!)  {
@@ -42,4 +43,8 @@ export const useGenerateCreateManyRecordMutation = ({
         depth,
       })}
   }`;
+
+  return {
+    createManyRecordsMutation,
+  };
 };

packages/twenty-front/src/modules/object-record/hooks/useCreateOneRecord.ts

@@ -6,11 +6,9 @@ import { CachedObjectRecord } from '@/apollo/types/CachedObjectRecord';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
 import { useCreateOneRecordInCache } from '@/object-record/cache/hooks/useCreateOneRecordInCache';
-import {
-  getCreateOneRecordMutationResponseField,
-  useGenerateCreateOneRecordMutation,
-} from '@/object-record/hooks/useGenerateCreateOneRecordMutation';
+import { useCreateOneRecordMutation } from '@/object-record/hooks/useCreateOneRecordMutation';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { getCreateOneRecordMutationResponseField } from '@/object-record/utils/getCreateOneRecordMutationResponseField';
 import { sanitizeRecordInput } from '@/object-record/utils/sanitizeRecordInput';
 import { isDefined } from '~/utils/isDefined';
 
@@ -26,17 +24,17 @@ export const useCreateOneRecord = <
 >({
   objectNameSingular,
   queryFields,
-  depth = 1,
   skipPostOptmisticEffect = false,
 }: useCreateOneRecordProps) => {
   const apolloClient = useApolloClient();
 
-  const { objectMetadataItem } = useObjectMetadataItem({ objectNameSingular });
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
 
-  const createOneRecordMutation = useGenerateCreateOneRecordMutation({
-    objectMetadataItem,
+  const { createOneRecordMutation } = useCreateOneRecordMutation({
+    objectNameSingular,
     queryFields,
-    depth,
   });
 
   const createOneRecordInCache = useCreateOneRecordInCache<CachedObjectRecord>({

packages/twenty-front/src/modules/object-record/hooks/useCreateOneRecordMutation.ts

@@ -1,30 +1,31 @@
-import { gql } from '@apollo/client';
+import gql from 'graphql-tag';
 import { useRecoilValue } from 'recoil';
 
-import { EMPTY_MUTATION } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObjectMetadataToGraphQLQuery';
+import { EMPTY_MUTATION } from '@/object-record/constants/EmptyMutation';
+import { getCreateOneRecordMutationResponseField } from '@/object-record/utils/getCreateOneRecordMutationResponseField';
 import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 import { capitalize } from '~/utils/string/capitalize';
 
-export const getCreateOneRecordMutationResponseField = (
-  objectNameSingular: string,
-) => `create${capitalize(objectNameSingular)}`;
-
-export const useGenerateCreateOneRecordMutation = ({
-  objectMetadataItem,
+export const useCreateOneRecordMutation = ({
+  objectNameSingular,
   queryFields,
-  depth = 1,
+  depth,
 }: {
-  objectMetadataItem: ObjectMetadataItem;
+  objectNameSingular: string;
   queryFields?: Record<string, any>;
   depth?: number;
 }) => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
   const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
 
   if (isUndefinedOrNull(objectMetadataItem)) {
-    return EMPTY_MUTATION;
+    return { createOneRecordMutation: EMPTY_MUTATION };
   }
 
   const capitalizedObjectName = capitalize(objectMetadataItem.nameSingular);
@@ -33,7 +34,7 @@ export const useGenerateCreateOneRecordMutation = ({
     objectMetadataItem.nameSingular,
   );
 
-  return gql`
+  const createOneRecordMutation = gql`
     mutation CreateOne${capitalizedObjectName}($input: ${capitalizedObjectName}CreateInput!)  {
       ${mutationResponseField}(data: $input) ${mapObjectMetadataToGraphQLQuery({
         objectMetadataItems,
@@ -43,4 +44,8 @@ export const useGenerateCreateOneRecordMutation = ({
       })}
     }
   `;
+
+  return {
+    createOneRecordMutation,
+  };
 };

packages/twenty-front/src/modules/object-record/hooks/useDeleteManyRecords.ts

@@ -3,7 +3,9 @@ import { useApolloClient } from '@apollo/client';
 import { triggerDeleteRecordsOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerDeleteRecordsOptimisticEffect';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
-import { getDeleteManyRecordsMutationResponseField } from '@/object-record/hooks/useGenerateDeleteManyRecordMutation';
+import { useGetRecordFromCache } from '@/object-record/cache/hooks/useGetRecordFromCache';
+import { useDeleteManyRecordsMutation } from '@/object-record/hooks/useDeleteManyRecordsMutation';
+import { getDeleteManyRecordsMutationResponseField } from '@/object-record/utils/getDeleteManyRecordsMutationResponseField';
 import { isDefined } from '~/utils/isDefined';
 import { capitalize } from '~/utils/string/capitalize';
 
@@ -21,8 +23,17 @@ export const useDeleteManyRecords = ({
 }: useDeleteOneRecordProps) => {
   const apolloClient = useApolloClient();
 
-  const { objectMetadataItem, deleteManyRecordsMutation, getRecordFromCache } =
-    useObjectMetadataItem({ objectNameSingular });
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const getRecordFromCache = useGetRecordFromCache({
+    objectNameSingular,
+  });
+
+  const { deleteManyRecordsMutation } = useDeleteManyRecordsMutation({
+    objectNameSingular,
+  });
 
   const { objectMetadataItems } = useObjectMetadataItems();
 

packages/twenty-front/src/modules/object-record/hooks/useDeleteManyRecordsMutation.ts

@@ -0,0 +1,41 @@
+import gql from 'graphql-tag';
+
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { EMPTY_MUTATION } from '@/object-record/constants/EmptyMutation';
+import { getDeleteManyRecordsMutationResponseField } from '@/object-record/utils/getDeleteManyRecordsMutationResponseField';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
+import { capitalize } from '~/utils/string/capitalize';
+
+export const useDeleteManyRecordsMutation = ({
+  objectNameSingular,
+}: {
+  objectNameSingular: string;
+}) => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  if (isUndefinedOrNull(objectMetadataItem)) {
+    return { deleteManyRecordsMutation: EMPTY_MUTATION };
+  }
+
+  const capitalizedObjectName = capitalize(objectMetadataItem.namePlural);
+
+  const mutationResponseField = getDeleteManyRecordsMutationResponseField(
+    objectMetadataItem.namePlural,
+  );
+
+  const deleteManyRecordsMutation = gql`
+    mutation DeleteMany${capitalizedObjectName}($filter: ${capitalize(
+      objectMetadataItem.nameSingular,
+    )}FilterInput!)  {
+      ${mutationResponseField}(filter: $filter) {
+        id
+      }
+    }
+  `;
+
+  return {
+    deleteManyRecordsMutation,
+  };
+};

packages/twenty-front/src/modules/object-record/hooks/useDeleteOneRecord.ts

@@ -4,7 +4,9 @@ import { useApolloClient } from '@apollo/client';
 import { triggerDeleteRecordsOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerDeleteRecordsOptimisticEffect';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
-import { getDeleteOneRecordMutationResponseField } from '@/object-record/utils/generateDeleteOneRecordMutation';
+import { useGetRecordFromCache } from '@/object-record/cache/hooks/useGetRecordFromCache';
+import { useDeleteOneRecordMutation } from '@/object-record/hooks/useDeleteOneRecordMutation';
+import { getDeleteOneRecordMutationResponseField } from '@/object-record/utils/getDeleteOneRecordMutationResponseField';
 import { capitalize } from '~/utils/string/capitalize';
 
 type useDeleteOneRecordProps = {
@@ -17,8 +19,17 @@ export const useDeleteOneRecord = ({
 }: useDeleteOneRecordProps) => {
   const apolloClient = useApolloClient();
 
-  const { objectMetadataItem, deleteOneRecordMutation, getRecordFromCache } =
-    useObjectMetadataItem({ objectNameSingular });
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const getRecordFromCache = useGetRecordFromCache({
+    objectNameSingular,
+  });
+
+  const { deleteOneRecordMutation } = useDeleteOneRecordMutation({
+    objectNameSingular,
+  });
 
   const { objectMetadataItems } = useObjectMetadataItems();
 

packages/twenty-front/src/modules/object-record/hooks/useDeleteOneRecordMutation.ts

@@ -0,0 +1,39 @@
+import gql from 'graphql-tag';
+
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { EMPTY_MUTATION } from '@/object-record/constants/EmptyMutation';
+import { getDeleteOneRecordMutationResponseField } from '@/object-record/utils/getDeleteOneRecordMutationResponseField';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
+import { capitalize } from '~/utils/string/capitalize';
+
+export const useDeleteOneRecordMutation = ({
+  objectNameSingular,
+}: {
+  objectNameSingular: string;
+}) => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  if (isUndefinedOrNull(objectMetadataItem)) {
+    return { deleteOneRecordMutation: EMPTY_MUTATION };
+  }
+
+  const capitalizedObjectName = capitalize(objectMetadataItem.nameSingular);
+
+  const mutationResponseField = getDeleteOneRecordMutationResponseField(
+    objectMetadataItem.nameSingular,
+  );
+
+  const deleteOneRecordMutation = gql`
+    mutation DeleteOne${capitalizedObjectName}($idToDelete: ID!)  {
+      ${mutationResponseField}(id: $idToDelete) {
+        id
+      }
+    }
+  `;
+
+  return {
+    deleteOneRecordMutation,
+  };
+};

packages/twenty-front/src/modules/object-record/hooks/useExecuteQuickActionOnOneRecord.ts

@@ -3,6 +3,8 @@ import { useApolloClient } from '@apollo/client';
 import { getOperationName } from '@apollo/client/utilities';
 
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { useExecuteQuickActionOnOneRecordMutation } from '@/object-record/hooks/useExecuteQuickActionOnOneRecordMutation';
+import { useFindManyRecordsQuery } from '@/object-record/hooks/useFindManyRecordsQuery';
 import { capitalize } from '~/utils/string/capitalize';
 
 type useExecuteQuickActionOnOneRecordProps = {
@@ -12,11 +14,16 @@ type useExecuteQuickActionOnOneRecordProps = {
 export const useExecuteQuickActionOnOneRecord = <T>({
   objectNameSingular,
 }: useExecuteQuickActionOnOneRecordProps) => {
-  const {
-    objectMetadataItem,
-    executeQuickActionOnOneRecordMutation,
-    findManyRecordsQuery,
-  } = useObjectMetadataItem({
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const { executeQuickActionOnOneRecordMutation } =
+    useExecuteQuickActionOnOneRecordMutation({
+      objectNameSingular,
+    });
+
+  const { findManyRecordsQuery } = useFindManyRecordsQuery({
     objectNameSingular,
   });
 

packages/twenty-front/src/modules/object-record/hooks/useExecuteQuickActionOnOneRecordMutation.ts

@@ -1,10 +1,10 @@
 import { gql } from '@apollo/client';
 import { useRecoilValue } from 'recoil';
 
-import { EMPTY_MUTATION } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObjectMetadataToGraphQLQuery';
+import { EMPTY_MUTATION } from '@/object-record/constants/EmptyMutation';
 import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 import { capitalize } from '~/utils/string/capitalize';
 
@@ -16,15 +16,19 @@ export const getExecuteQuickActionOnOneRecordMutationGraphQLField = ({
   return `executeQuickActionOn${capitalize(objectNameSingular)}`;
 };
 
-export const useGenerateExecuteQuickActionOnOneRecordMutation = ({
-  objectMetadataItem,
+export const useExecuteQuickActionOnOneRecordMutation = ({
+  objectNameSingular,
 }: {
-  objectMetadataItem: ObjectMetadataItem;
+  objectNameSingular: string;
 }) => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
   const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
 
   if (isUndefinedOrNull(objectMetadataItem)) {
-    return EMPTY_MUTATION;
+    return { executeQuickActionOnOneRecordMutation: EMPTY_MUTATION };
   }
 
   const capitalizedObjectName = capitalize(objectMetadataItem.nameSingular);
@@ -34,7 +38,7 @@ export const useGenerateExecuteQuickActionOnOneRecordMutation = ({
       objectNameSingular: objectMetadataItem.nameSingular,
     });
 
-  return gql`
+  const executeQuickActionOnOneRecordMutation = gql`
     mutation ExecuteQuickActionOnOne${capitalizedObjectName}($idToExecuteQuickActionOn: ID!)  {
        ${graphQLFieldForExecuteQuickActionOnOneRecordMutation}(id: $idToExecuteQuickActionOn) ${mapObjectMetadataToGraphQLQuery(
          {
@@ -44,4 +48,6 @@ export const useGenerateExecuteQuickActionOnOneRecordMutation = ({
        )}
     }
   `;
+
+  return { executeQuickActionOnOneRecordMutation };
 };

packages/twenty-front/src/modules/object-record/hooks/useFieldContext.tsx

@@ -2,6 +2,7 @@ import { ReactNode } from 'react';
 
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { formatFieldMetadataItemAsColumnDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsColumnDefinition';
+import { getBasePathToShowPage } from '@/object-metadata/utils/getBasePathToShowPage';
 import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
 import {
   FieldContext,
@@ -27,7 +28,11 @@ export const useFieldContext = ({
   objectRecordId: string;
   customUseUpdateOneObjectHook?: RecordUpdateHook;
 }) => {
-  const { basePathToShowPage, objectMetadataItem } = useObjectMetadataItem({
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const basePathToShowPage = getBasePathToShowPage({
     objectNameSingular,
   });
 

packages/twenty-front/src/modules/object-record/hooks/useFindDuplicateRecords.ts

@@ -4,9 +4,10 @@ import { useQuery } from '@apollo/client';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
 import { getRecordsFromRecordConnection } from '@/object-record/cache/utils/getRecordsFromRecordConnection';
-import { getFindDuplicateRecordsQueryResponseField } from '@/object-record/hooks/useGenerateFindDuplicateRecordsQuery';
+import { useFindDuplicateRecordsQuery } from '@/object-record/hooks/useFindDuplicatesRecordsQuery';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
 import { ObjectRecordConnection } from '@/object-record/types/ObjectRecordConnection';
+import { getFindDuplicateRecordsQueryResponseField } from '@/object-record/utils/getFindDuplicateRecordsQueryResponseField';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { logError } from '~/utils/logError';
 
@@ -25,8 +26,14 @@ export const useFindDuplicateRecords = <T extends ObjectRecord = ObjectRecord>({
 }) => {
   const findDuplicateQueryStateIdentifier = objectNameSingular;
 
-  const { objectMetadataItem, findDuplicateRecordsQuery } =
-    useObjectMetadataItem({ objectNameSingular }, depth);
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const { findDuplicateRecordsQuery } = useFindDuplicateRecordsQuery({
+    objectNameSingular,
+    depth,
+  });
 
   const { enqueueSnackBar } = useSnackBar();
 

packages/twenty-front/src/modules/object-record/hooks/useFindDuplicatesRecordsQuery.ts

@@ -1,25 +1,26 @@
-import { gql } from '@apollo/client';
+import gql from 'graphql-tag';
 import { useRecoilValue } from 'recoil';
 
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObjectMetadataToGraphQLQuery';
+import { getFindDuplicateRecordsQueryResponseField } from '@/object-record/utils/getFindDuplicateRecordsQueryResponseField';
 import { capitalize } from '~/utils/string/capitalize';
 
-export const getFindDuplicateRecordsQueryResponseField = (
-  objectNameSingular: string,
-) => `${objectNameSingular}Duplicates`;
+export const useFindDuplicateRecordsQuery = ({
+  objectNameSingular,
+  depth,
+}: {
+  objectNameSingular: string;
+  depth?: number;
+}) => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
 
-export const useGenerateFindDuplicateRecordsQuery = () => {
   const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
 
-  return ({
-    objectMetadataItem,
-    depth,
-  }: {
-    objectMetadataItem: Pick<ObjectMetadataItem, 'fields' | 'nameSingular'>;
-    depth?: number;
-  }) => gql`
+  const findDuplicateRecordsQuery = gql`
     query FindDuplicate${capitalize(objectMetadataItem.nameSingular)}($id: ID) {
       ${getFindDuplicateRecordsQueryResponseField(
         objectMetadataItem.nameSingular,
@@ -41,4 +42,8 @@ export const useGenerateFindDuplicateRecordsQuery = () => {
       }
     }
   `;
+
+  return {
+    findDuplicateRecordsQuery,
+  };
 };

packages/twenty-front/src/modules/object-record/hooks/useFindManyRecords.ts

@@ -8,6 +8,7 @@ import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMembe
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
 import { getRecordsFromRecordConnection } from '@/object-record/cache/utils/getRecordsFromRecordConnection';
+import { useFindManyRecordsQuery } from '@/object-record/hooks/useFindManyRecordsQuery';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
 import { ObjectRecordConnection } from '@/object-record/types/ObjectRecordConnection';
 import { ObjectRecordEdge } from '@/object-record/types/ObjectRecordEdge';
@@ -30,7 +31,6 @@ export const useFindManyRecords = <T extends ObjectRecord = ObjectRecord>({
   limit,
   onCompleted,
   skip,
-  depth = 1,
   queryFields,
 }: ObjectMetadataItemIdentifier &
   ObjectRecordQueryVariables & {
@@ -63,13 +63,14 @@ export const useFindManyRecords = <T extends ObjectRecord = ObjectRecord>({
     isFetchingMoreRecordsFamilyState(findManyQueryStateIdentifier),
   );
 
-  const { objectMetadataItem, findManyRecordsQuery } = useObjectMetadataItem(
-    {
-      objectNameSingular,
-    },
-    depth,
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const { findManyRecordsQuery } = useFindManyRecordsQuery({
+    objectNameSingular,
     queryFields,
-  );
+  });
 
   const { enqueueSnackBar } = useSnackBar();
   const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState);

packages/twenty-front/src/modules/object-record/hooks/useFindManyRecordsQuery.ts

@@ -0,0 +1,36 @@
+import { useRecoilValue } from 'recoil';
+
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
+import { QueryFields } from '@/object-record/query-keys/types/QueryFields';
+import { generateFindManyRecordsQuery } from '@/object-record/utils/generateFindManyRecordsQuery';
+
+export const useFindManyRecordsQuery = ({
+  objectNameSingular,
+  queryFields,
+  depth,
+  computeReferences,
+}: {
+  objectNameSingular: string;
+  queryFields?: QueryFields;
+  depth?: number;
+  computeReferences?: boolean;
+}) => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
+
+  const findManyRecordsQuery = generateFindManyRecordsQuery({
+    objectMetadataItem,
+    objectMetadataItems,
+    queryFields,
+    depth,
+    computeReferences,
+  });
+
+  return {
+    findManyRecordsQuery,
+  };
+};

packages/twenty-front/src/modules/object-record/hooks/useFindOneRecord.ts

@@ -4,26 +4,30 @@ import { useQuery } from '@apollo/client';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
 import { getRecordFromRecordNode } from '@/object-record/cache/utils/getRecordFromRecordNode';
+import { useFindOneRecordQuery } from '@/object-record/hooks/useFindOneRecordQuery';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
 import { isDefined } from '~/utils/isDefined';
 
-// TODO: fix connection in relation => automatically change to an array
 export const useFindOneRecord = <T extends ObjectRecord = ObjectRecord>({
   objectNameSingular,
   objectRecordId = '',
   onCompleted,
-  depth,
   skip,
+  depth,
 }: ObjectMetadataItemIdentifier & {
   objectRecordId: string | undefined;
   onCompleted?: (data: T) => void;
   skip?: boolean;
   depth?: number;
 }) => {
-  const { objectMetadataItem, findOneRecordQuery } = useObjectMetadataItem(
-    { objectNameSingular },
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const { findOneRecordQuery } = useFindOneRecordQuery({
+    objectNameSingular,
     depth,
-  );
+  });
 
   const { data, loading, error } = useQuery<
     { [nameSingular: string]: T },
@@ -42,6 +46,7 @@ export const useFindOneRecord = <T extends ObjectRecord = ObjectRecord>({
     },
   });
 
+  // TODO: Remove connection from record
   const recordWithoutConnection = useMemo(
     () =>
       data?.[objectNameSingular]

packages/twenty-front/src/modules/object-record/hooks/useFindOneRecordQuery.ts

@@ -1,22 +1,25 @@
-import { gql } from '@apollo/client';
+import gql from 'graphql-tag';
 import { useRecoilValue } from 'recoil';
 
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObjectMetadataToGraphQLQuery';
 import { capitalize } from '~/utils/string/capitalize';
 
-export const useGenerateFindOneRecordQuery = () => {
+export const useFindOneRecordQuery = ({
+  objectNameSingular,
+  depth,
+}: {
+  objectNameSingular: string;
+  depth?: number;
+}) => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
   const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
 
-  return ({
-    objectMetadataItem,
-    depth,
-  }: {
-    objectMetadataItem: Pick<ObjectMetadataItem, 'fields' | 'nameSingular'>;
-    depth?: number;
-  }) => {
-    return gql`
+  const findOneRecordQuery = gql`
       query FindOne${capitalize(
         objectMetadataItem.nameSingular,
       )}($objectRecordId: UUID!) {
@@ -31,5 +34,8 @@ export const useGenerateFindOneRecordQuery = () => {
         })}
       }
   `;
+
+  return {
+    findOneRecordQuery,
   };
 };

packages/twenty-front/src/modules/object-record/hooks/useGenerateDeleteManyRecordMutation.ts

@@ -1,36 +0,0 @@
-import { gql } from '@apollo/client';
-
-import { EMPTY_MUTATION } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
-import { capitalize } from '~/utils/string/capitalize';
-
-export const getDeleteManyRecordsMutationResponseField = (
-  objectNamePlural: string,
-) => `delete${capitalize(objectNamePlural)}`;
-
-export const useGenerateDeleteManyRecordMutation = ({
-  objectMetadataItem,
-}: {
-  objectMetadataItem: ObjectMetadataItem;
-}) => {
-  if (isUndefinedOrNull(objectMetadataItem)) {
-    return EMPTY_MUTATION;
-  }
-
-  const capitalizedObjectName = capitalize(objectMetadataItem.namePlural);
-
-  const mutationResponseField = getDeleteManyRecordsMutationResponseField(
-    objectMetadataItem.namePlural,
-  );
-
-  return gql`
-    mutation DeleteMany${capitalizedObjectName}($filter: ${capitalize(
-      objectMetadataItem.nameSingular,
-    )}FilterInput!)  {
-      ${mutationResponseField}(filter: $filter) {
-        id
-      }
-    }
-  `;
-};

packages/twenty-front/src/modules/object-record/hooks/useGenerateFindManyRecordsQuery.ts

@@ -1,55 +0,0 @@
-import { gql } from '@apollo/client';
-import { useRecoilValue } from 'recoil';
-
-import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObjectMetadataToGraphQLQuery';
-import { capitalize } from '~/utils/string/capitalize';
-
-export const useGenerateFindManyRecordsQuery = () => {
-  const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
-
-  return ({
-    objectMetadataItem,
-    depth,
-    queryFields,
-    computeReferences = false,
-  }: {
-    objectMetadataItem: Pick<
-      ObjectMetadataItem,
-      'fields' | 'nameSingular' | 'namePlural'
-    >;
-    depth?: number;
-    queryFields?: Record<string, any>;
-    computeReferences?: boolean;
-  }) => gql`
-    query FindMany${capitalize(
-      objectMetadataItem.namePlural,
-    )}($filter: ${capitalize(
-      objectMetadataItem.nameSingular,
-    )}FilterInput, $orderBy: ${capitalize(
-      objectMetadataItem.nameSingular,
-    )}OrderByInput, $lastCursor: String, $limit: Float) {
-      ${
-        objectMetadataItem.namePlural
-      }(filter: $filter, orderBy: $orderBy, first: $limit, after: $lastCursor){
-        edges {
-          node ${mapObjectMetadataToGraphQLQuery({
-            objectMetadataItems,
-            objectMetadataItem,
-            depth,
-            queryFields,
-            computeReferences,
-          })}
-          cursor
-        }
-        pageInfo {
-          hasNextPage
-          startCursor
-          endCursor
-        }
-        totalCount
-      }
-    }
-  `;
-};

packages/twenty-front/src/modules/object-record/hooks/useLazyFindOneRecord.ts

@@ -1,9 +1,8 @@
 import { useLazyQuery } from '@apollo/client';
 
-import { useObjectMetadataItemOnly } from '@/object-metadata/hooks/useObjectMetadataItemOnly';
 import { ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
 import { getRecordFromRecordNode } from '@/object-record/cache/utils/getRecordFromRecordNode';
-import { useGenerateFindOneRecordQuery } from '@/object-record/hooks/useGenerateFindOneRecordQuery';
+import { useFindOneRecordQuery } from '@/object-record/hooks/useFindOneRecordQuery';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
 
 type UseLazyFindOneRecordParams = ObjectMetadataItemIdentifier & {
@@ -19,14 +18,13 @@ export const useLazyFindOneRecord = <T extends ObjectRecord = ObjectRecord>({
   objectNameSingular,
   depth,
 }: UseLazyFindOneRecordParams) => {
-  const { objectMetadataItem } = useObjectMetadataItemOnly({
+  const { findOneRecordQuery } = useFindOneRecordQuery({
     objectNameSingular,
+    depth,
   });
-  const findOneRecordQuery = useGenerateFindOneRecordQuery();
 
-  const [findOneRecord, { loading, error, data, called }] = useLazyQuery(
-    findOneRecordQuery({ objectMetadataItem, depth }),
-  );
+  const [findOneRecord, { loading, error, data, called }] =
+    useLazyQuery(findOneRecordQuery);
 
   return {
     findOneRecord: ({ objectRecordId, onCompleted }: FindOneRecordParams<T>) =>

packages/twenty-front/src/modules/object-record/hooks/useUpdateOneRecord.ts

@@ -3,10 +3,12 @@ import { useApolloClient } from '@apollo/client';
 import { triggerUpdateRecordOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerUpdateRecordOptimisticEffect';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
+import { useGetRecordFromCache } from '@/object-record/cache/hooks/useGetRecordFromCache';
 import { getRecordNodeFromRecord } from '@/object-record/cache/utils/getRecordNodeFromRecord';
 import { updateRecordFromCache } from '@/object-record/cache/utils/updateRecordFromCache';
-import { getUpdateOneRecordMutationResponseField } from '@/object-record/hooks/useGenerateUpdateOneRecordMutation';
+import { useUpdateOneRecordMutation } from '@/object-record/hooks/useUpdateOneRecordMutation';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { getUpdateOneRecordMutationResponseField } from '@/object-record/utils/getUpdateOneRecordMutationResponseField';
 import { sanitizeRecordInput } from '@/object-record/utils/sanitizeRecordInput';
 
 type useUpdateOneRecordProps = {
@@ -24,8 +26,17 @@ export const useUpdateOneRecord = <
 }: useUpdateOneRecordProps) => {
   const apolloClient = useApolloClient();
 
-  const { objectMetadataItem, updateOneRecordMutation, getRecordFromCache } =
-    useObjectMetadataItem({ objectNameSingular }, depth, queryFields);
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const getRecordFromCache = useGetRecordFromCache({
+    objectNameSingular,
+  });
+
+  const { updateOneRecordMutation } = useUpdateOneRecordMutation({
+    objectNameSingular,
+  });
 
   const { objectMetadataItems } = useObjectMetadataItems();
 

packages/twenty-front/src/modules/object-record/hooks/useUpdateOneRecordMutation.ts

@@ -1,30 +1,31 @@
-import { gql } from '@apollo/client';
+import gql from 'graphql-tag';
 import { useRecoilValue } from 'recoil';
 
-import { EMPTY_MUTATION } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { mapObjectMetadataToGraphQLQuery } from '@/object-metadata/utils/mapObjectMetadataToGraphQLQuery';
+import { EMPTY_MUTATION } from '@/object-record/constants/EmptyMutation';
+import { getUpdateOneRecordMutationResponseField } from '@/object-record/utils/getUpdateOneRecordMutationResponseField';
 import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 import { capitalize } from '~/utils/string/capitalize';
 
-export const getUpdateOneRecordMutationResponseField = (
-  objectNameSingular: string,
-) => `update${capitalize(objectNameSingular)}`;
-
-export const useGenerateUpdateOneRecordMutation = ({
-  objectMetadataItem,
-  depth = 1,
+export const useUpdateOneRecordMutation = ({
+  objectNameSingular,
   computeReferences = false,
+  depth,
 }: {
-  objectMetadataItem: ObjectMetadataItem;
-  depth?: number;
+  objectNameSingular: string;
   computeReferences?: boolean;
+  depth?: number;
 }) => {
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
   const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
 
   if (isUndefinedOrNull(objectMetadataItem)) {
-    return EMPTY_MUTATION;
+    return { updateOneRecordMutation: EMPTY_MUTATION };
   }
 
   const capitalizedObjectName = capitalize(objectMetadataItem.nameSingular);
@@ -33,7 +34,7 @@ export const useGenerateUpdateOneRecordMutation = ({
     objectMetadataItem.nameSingular,
   );
 
-  return gql`
+  const updateOneRecordMutation = gql`
     mutation UpdateOne${capitalizedObjectName}($idToUpdate: ID!, $input: ${capitalizedObjectName}UpdateInput!)  {
        ${mutationResponseField}(id: $idToUpdate, data: $input) ${mapObjectMetadataToGraphQLQuery(
          {
@@ -45,4 +46,8 @@ export const useGenerateUpdateOneRecordMutation = ({
        )}
     }
   `;
+
+  return {
+    updateOneRecordMutation,
+  };
 };