Fix/object record and metadata naming (#2763)

* Fixed object-record and object-metadata naming

* Fix post merge

---------

Co-authored-by: Charles Bochet <charles@twenty.com>

front/src/pages/auth/CreateProfile.tsx

@@ -12,7 +12,7 @@ import { Title } from '@/auth/components/Title';
 import { useOnboardingStatus } from '@/auth/hooks/useOnboardingStatus';
 import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
 import { OnboardingStatus } from '@/auth/utils/getOnboardingStatus';
-import { useUpdateOneObjectRecord } from '@/object-record/hooks/useUpdateOneObjectRecord';
+import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
 import { ProfilePictureUploader } from '@/settings/profile/components/ProfilePictureUploader';
 import { PageHotkeyScope } from '@/types/PageHotkeyScope';
 import { H2Title } from '@/ui/display/typography/components/H2Title';
@@ -62,8 +62,8 @@ export const CreateProfile = () => {
     currentWorkspaceMemberState,
   );
 
-  const { updateOneObject, objectNotFoundInMetadata } =
-    useUpdateOneObjectRecord<WorkspaceMember>({
+  const { updateOneRecord, objectMetadataItemNotFound } =
+    useUpdateOneRecord<WorkspaceMember>({
       objectNameSingular: 'workspaceMember',
     });
 
@@ -91,11 +91,11 @@ export const CreateProfile = () => {
         if (!data.firstName || !data.lastName) {
           throw new Error('First name or last name is missing');
         }
-        if (!updateOneObject || objectNotFoundInMetadata) {
+        if (!updateOneRecord || objectMetadataItemNotFound) {
           throw new Error('Object not found in metadata');
         }
 
-        await updateOneObject({
+        await updateOneRecord({
           idToUpdate: currentWorkspaceMember?.id,
           input: {
             name: {
@@ -127,9 +127,9 @@ export const CreateProfile = () => {
       currentWorkspaceMember?.id,
       enqueueSnackBar,
       navigate,
-      objectNotFoundInMetadata,
+      objectMetadataItemNotFound,
       setCurrentWorkspaceMember,
-      updateOneObject,
+      updateOneRecord,
     ],
   );
 

front/src/pages/opportunities/Opportunities.tsx

@@ -2,7 +2,7 @@ import styled from '@emotion/styled';
 
 import { CompanyBoard } from '@/companies/board/components/CompanyBoard';
 import { CompanyBoardRecoilScopeContext } from '@/companies/states/recoil-scope-contexts/CompanyBoardRecoilScopeContext';
-import { useUpdateOneObjectRecord } from '@/object-record/hooks/useUpdateOneObjectRecord';
+import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
 import { PipelineAddButton } from '@/pipeline/components/PipelineAddButton';
 import { usePipelineSteps } from '@/pipeline/hooks/usePipelineSteps';
 import { PipelineStep } from '@/pipeline/types/PipelineStep';
@@ -24,8 +24,8 @@ export const Opportunities = () => {
   const { handlePipelineStepAdd, handlePipelineStepDelete } =
     usePipelineSteps();
 
-  const { updateOneObject: updateOnePipelineStep } =
-    useUpdateOneObjectRecord<PipelineStep>({
+  const { updateOneRecord: updateOnePipelineStep } =
+    useUpdateOneRecord<PipelineStep>({
       objectNameSingular: 'pipelineStep',
     });
 

front/src/pages/settings/SettingsWorkspaceMembers.tsx

@@ -3,8 +3,8 @@ import styled from '@emotion/styled';
 import { useRecoilValue } from 'recoil';
 
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
-import { useDeleteOneObjectRecord } from '@/object-record/hooks/useDeleteOneObjectRecord';
-import { useFindManyObjectRecords } from '@/object-record/hooks/useFindManyObjectRecords';
+import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';
+import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { IconSettings, IconTrash } from '@/ui/display/icon';
 import { H1Title } from '@/ui/display/typography/components/H1Title';
@@ -34,12 +34,11 @@ export const SettingsWorkspaceMembers = () => {
     string | undefined
   >();
 
-  const { objects: workspaceMembers } =
-    useFindManyObjectRecords<WorkspaceMember>({
-      objectNamePlural: 'workspaceMembers',
-    });
-  const { deleteOneObject: deleteOneWorkspaceMember } =
-    useDeleteOneObjectRecord<WorkspaceMember>({
+  const { records: workspaceMembers } = useFindManyRecords<WorkspaceMember>({
+    objectNamePlural: 'workspaceMembers',
+  });
+  const { deleteOneRecord: deleteOneWorkspaceMember } =
+    useDeleteOneRecord<WorkspaceMember>({
       objectNameSingular: 'workspaceMember',
     });
   const currentWorkspace = useRecoilValue(currentWorkspaceState);

front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx

@@ -1,12 +1,12 @@
 import { useEffect, useState } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 
-import { useCreateOneRelationMetadata } from '@/object-metadata/hooks/useCreateOneRelationMetadata';
+import { useCreateOneRelationMetadataItem } from '@/object-metadata/hooks/useCreateOneRelationMetadataItem';
 import { useFieldMetadataItem } from '@/object-metadata/hooks/useFieldMetadataItem';
 import { useObjectMetadataItemForSettings } from '@/object-metadata/hooks/useObjectMetadataItemForSettings';
-import { useCreateOneObjectRecord } from '@/object-record/hooks/useCreateOneObjectRecord';
-import { useFindManyObjectRecords } from '@/object-record/hooks/useFindManyObjectRecords';
-import { PaginatedObjectTypeResults } from '@/object-record/types/PaginatedObjectTypeResults';
+import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
+import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
+import { PaginatedRecordTypeResults } from '@/object-record/types/PaginatedRecordTypeResults';
 import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
 import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
@@ -69,17 +69,17 @@ export const SettingsObjectNewFieldStep2 = () => {
   const [objectViews, setObjectViews] = useState<View[]>([]);
   const [relationObjectViews, setRelationObjectViews] = useState<View[]>([]);
 
-  const { createOneObject: createOneViewField } = useCreateOneObjectRecord({
+  const { createOneRecord: createOneViewField } = useCreateOneRecord({
     objectNameSingular: 'viewField',
   });
 
-  useFindManyObjectRecords({
+  useFindManyRecords({
     objectNamePlural: 'views',
     filter: {
       type: { eq: ViewType.Table },
       objectMetadataId: { eq: activeObjectMetadataItem?.id },
     },
-    onCompleted: async (data: PaginatedObjectTypeResults<View>) => {
+    onCompleted: async (data: PaginatedRecordTypeResults<View>) => {
       const views = data.edges;
 
       if (!views) return;
@@ -88,14 +88,14 @@ export const SettingsObjectNewFieldStep2 = () => {
     },
   });
 
-  useFindManyObjectRecords({
+  useFindManyRecords({
     objectNamePlural: 'views',
     skip: !formValues.relation?.objectMetadataId,
     filter: {
       type: { eq: ViewType.Table },
       objectMetadataId: { eq: formValues.relation?.objectMetadataId },
     },
-    onCompleted: async (data: PaginatedObjectTypeResults<View>) => {
+    onCompleted: async (data: PaginatedRecordTypeResults<View>) => {
       const views = data.edges;
 
       if (!views) return;
@@ -104,7 +104,8 @@ export const SettingsObjectNewFieldStep2 = () => {
     },
   });
 
-  const { createOneRelationMetadata } = useCreateOneRelationMetadata();
+  const { createOneRelationMetadataItem: createOneRelationMetadata } =
+    useCreateOneRelationMetadataItem();
 
   if (!activeObjectMetadataItem) return null;
 

front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx

@@ -5,9 +5,9 @@ import { DateTime } from 'luxon';
 import { useRecoilState } from 'recoil';
 
 import { useOptimisticEvict } from '@/apollo/optimistic-effect/hooks/useOptimisticEvict';
-import { useCreateOneObjectRecord } from '@/object-record/hooks/useCreateOneObjectRecord';
-import { useFindOneObjectRecord } from '@/object-record/hooks/useFindOneObjectRecord';
-import { useUpdateOneObjectRecord } from '@/object-record/hooks/useUpdateOneObjectRecord';
+import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
+import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
+import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
 import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { ApiKeyInput } from '@/settings/developers/components/ApiKeyInput';
@@ -50,16 +50,14 @@ export const SettingsDevelopersApiKeyDetail = () => {
   const { performOptimisticEvict } = useOptimisticEvict();
 
   const [generateOneApiKeyToken] = useGenerateApiKeyTokenMutation();
-  const { createOneObject: createOneApiKey } = useCreateOneObjectRecord<ApiKey>(
-    {
-      objectNameSingular: 'apiKey',
-    },
-  );
-  const { updateOneObject: updateApiKey } = useUpdateOneObjectRecord<ApiKey>({
+  const { createOneRecord: createOneApiKey } = useCreateOneRecord<ApiKey>({
+    objectNameSingular: 'apiKey',
+  });
+  const { updateOneRecord: updateApiKey } = useUpdateOneRecord<ApiKey>({
     objectNameSingular: 'apiKey',
   });
 
-  const { object: apiKeyData } = useFindOneObjectRecord({
+  const { record: apiKeyData } = useFindOneRecord({
     objectNameSingular: 'apiKey',
     objectRecordId: apiKeyId,
   });

front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeys.tsx

@@ -2,7 +2,7 @@ import { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import styled from '@emotion/styled';
 
-import { useFindManyObjectRecords } from '@/object-record/hooks/useFindManyObjectRecords';
+import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
 import { objectSettingsWidth } from '@/settings/data-model/constants/objectSettings';
 import { SettingsApiKeysFieldItemTableRow } from '@/settings/developers/components/SettingsApiKeysFieldItemTableRow';
 import { ApiFieldItem } from '@/settings/developers/types/ApiFieldItem';
@@ -43,7 +43,7 @@ export const SettingsDevelopersApiKeys = () => {
   const [apiKeys, setApiKeys] = useState<Array<ApiFieldItem>>([]);
 
   const filter = { revokedAt: { is: 'NULL' } };
-  useFindManyObjectRecords({
+  useFindManyRecords({
     objectNamePlural: 'apiKeys',
     filter,
     orderBy: {},

front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx

@@ -2,7 +2,7 @@ import { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { DateTime } from 'luxon';
 
-import { useCreateOneObjectRecord } from '@/object-record/hooks/useCreateOneObjectRecord';
+import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
 import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
 import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
@@ -30,9 +30,9 @@ export const SettingsDevelopersApiKeysNew = () => {
     name: '',
   });
 
-  const { createOneObject: createOneApiKey } = useCreateOneObjectRecord<ApiKey>(
-    { objectNameSingular: 'apiKey' },
-  );
+  const { createOneRecord: createOneApiKey } = useCreateOneRecord<ApiKey>({
+    objectNameSingular: 'apiKey',
+  });
   const onSave = async () => {
     const expiresAt = DateTime.now()
       .plus({ days: formValues.expirationDate ?? 30 })