Replace entityId by recordId in the front end.

ehconitin · Jul 21, 2024 · 0b207d2 · 0b207d2
1 parent d8cadad
commit 0b207d2
Show file tree

Hide file tree

Showing 104 changed files with 329 additions and 329 deletions.
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventDetails.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventDetails.tsx
@@ -100,7 +100,7 @@ export const CalendarEventDetails = ({
     <StyledPropertyBox key={fieldName}>
       <FieldContext.Provider
         value={{
-          entityId: calendarEvent.id,
+          recordId: calendarEvent.id,
           hotkeyScope: 'calendar-event-details',
           recoilScopeId: `${calendarEvent.id}-${fieldName}`,
           isLabelIdentifier: false,

diff --git a/...modules/activities/timelineActivities/rows/main-object/components/EventFieldDiffValue.tsx b/...modules/activities/timelineActivities/rows/main-object/components/EventFieldDiffValue.tsx
@@ -29,7 +29,7 @@ export const EventFieldDiffValue = ({
     <StyledEventFieldDiffValue>
       <FieldContext.Provider
         value={{
-          entityId: diffArtificialRecordStoreId,
+          recordId: diffArtificialRecordStoreId,
           isLabelIdentifier: isLabelIdentifierField({
             fieldMetadataItem,
             objectMetadataItem: mainObjectMetadataItem,

diff --git a/packages/twenty-front/src/modules/object-record/hooks/useFieldContext.tsx b/packages/twenty-front/src/modules/object-record/hooks/useFieldContext.tsx
@@ -66,7 +66,7 @@ export const useFieldContext = ({
               basePathToShowPage: isLabelIdentifier
                 ? basePathToShowPage
                 : undefined,
-              entityId: objectRecordId,
+              recordId: objectRecordId,
               recoilScopeId: objectRecordId + fieldMetadataItem.id,
               isLabelIdentifier,
               fieldDefinition: formatFieldMetadataItemAsColumnDefinition({

diff --git a/...c/modules/object-record/object-filter-dropdown/hooks/__tests__/useFilterDropdown.test.tsx b/...c/modules/object-record/object-filter-dropdown/hooks/__tests__/useFilterDropdown.test.tsx
@@ -178,35 +178,35 @@ describe('useFilterDropdown', () => {
     });
   });
 
-  it('should set objectFilterDropdownSelectedEntityId', async () => {
-    const mockResult = 'value';
-    const { result } = renderHook(() => {
-      useFilterDropdown({ filterDropdownId });
-      const { objectFilterDropdownSelectedEntityIdState } =
-        useFilterDropdownStates(filterDropdownId);
-
-      const [
-        objectFilterDropdownSelectedEntityId,
-        setObjectFilterDropdownSelectedEntityId,
-      ] = useRecoilState(objectFilterDropdownSelectedEntityIdState);
-      return {
-        objectFilterDropdownSelectedEntityId,
-        setObjectFilterDropdownSelectedEntityId,
-      };
-    }, renderHookConfig);
-
-    expect(result.current.objectFilterDropdownSelectedEntityId).toBeNull();
-
-    act(() => {
-      result.current.setObjectFilterDropdownSelectedEntityId(mockResult);
-    });
-
-    await waitFor(() => {
-      expect(result.current.objectFilterDropdownSelectedEntityId).toBe(
-        mockResult,
-      );
-    });
-  });
+  // it('should set objectFilterDropdownSelectedEntityId', async () => {
+  //   const mockResult = 'value';
+  //   const { result } = renderHook(() => {
+  //     useFilterDropdown({ filterDropdownId });
+  //     const { objectFilterDropdownSelectedEntityIdState } =
+  //       useFilterDropdownStates(filterDropdownId);
+
+  //     const [
+  //       objectFilterDropdownSelectedEntityId,
+  //       setObjectFilterDropdownSelectedEntityId,
+  //     ] = useRecoilState(objectFilterDropdownSelectedEntityIdState);
+  //     return {
+  //       objectFilterDropdownSelectedEntityId,
+  //       setObjectFilterDropdownSelectedEntityId,
+  //     };
+  //   }, renderHookConfig);
+
+  //   expect(result.current.objectFilterDropdownSelectedEntityId).toBeNull();
+
+  //   act(() => {
+  //     result.current.setObjectFilterDropdownSelectedEntityId(mockResult);
+  //   });
+
+  //   await waitFor(() => {
+  //     expect(result.current.objectFilterDropdownSelectedEntityId).toBe(
+  //       mockResult,
+  //     );
+  //   });
+  // });
 
   it('should set objectFilterDropdownSelectedRecordIds', async () => {
     const mockResult = ['id-0', 'id-1', 'id-2'];

diff --git a/.../twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useFilterDropdown.ts b/.../twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useFilterDropdown.ts
@@ -21,7 +21,7 @@ export const useFilterDropdown = (props?: UseFilterDropdownProps) => {
     availableFilterDefinitionsState,
     filterDefinitionUsedInDropdownState,
     objectFilterDropdownSearchInputState,
-    objectFilterDropdownSelectedEntityIdState,
+    // objectFilterDropdownSelectedEntityIdState,
     objectFilterDropdownSelectedRecordIdsState,
     objectFilterDropdownSelectedOptionValuesState,
     isObjectFilterDropdownOperandSelectUnfoldedState,
@@ -46,13 +46,13 @@ export const useFilterDropdown = (props?: UseFilterDropdownProps) => {
     ({ set }) =>
       () => {
         set(objectFilterDropdownSearchInputState, '');
-        set(objectFilterDropdownSelectedEntityIdState, null);
+        // set(objectFilterDropdownSelectedEntityIdState, null);
         set(objectFilterDropdownSelectedRecordIdsState, []);
         set(selectedFilterState, undefined);
       },
     [
       objectFilterDropdownSearchInputState,
-      objectFilterDropdownSelectedEntityIdState,
+      // objectFilterDropdownSelectedEntityIdState,
       objectFilterDropdownSelectedRecordIdsState,
       selectedFilterState,
     ],
@@ -62,7 +62,7 @@ export const useFilterDropdown = (props?: UseFilterDropdownProps) => {
     ({ set }) =>
       () => {
         set(objectFilterDropdownSearchInputState, '');
-        set(objectFilterDropdownSelectedEntityIdState, null);
+        // set(objectFilterDropdownSelectedEntityIdState, null);
         set(objectFilterDropdownSelectedRecordIdsState, []);
         set(selectedFilterState, undefined);
         set(filterDefinitionUsedInDropdownState, null);
@@ -71,7 +71,7 @@ export const useFilterDropdown = (props?: UseFilterDropdownProps) => {
     [
       filterDefinitionUsedInDropdownState,
       objectFilterDropdownSearchInputState,
-      objectFilterDropdownSelectedEntityIdState,
+      // objectFilterDropdownSelectedEntityIdState,
       objectFilterDropdownSelectedRecordIdsState,
       selectedFilterState,
       selectedOperandInDropdownState,
@@ -91,9 +91,9 @@ export const useFilterDropdown = (props?: UseFilterDropdownProps) => {
   const setObjectFilterDropdownSearchInput = useSetRecoilState(
     objectFilterDropdownSearchInputState,
   );
-  const setObjectFilterDropdownSelectedEntityId = useSetRecoilState(
-    objectFilterDropdownSelectedEntityIdState,
-  );
+  // const setObjectFilterDropdownSelectedEntityId = useSetRecoilState(
+  //   objectFilterDropdownSelectedEntityIdState,
+  // );
   const setObjectFilterDropdownSelectedRecordIds = useSetRecoilState(
     objectFilterDropdownSelectedRecordIdsState,
   );
@@ -117,7 +117,7 @@ export const useFilterDropdown = (props?: UseFilterDropdownProps) => {
     setAvailableFilterDefinitions,
     setFilterDefinitionUsedInDropdown,
     setObjectFilterDropdownSearchInput,
-    setObjectFilterDropdownSelectedEntityId,
+    // setObjectFilterDropdownSelectedEntityId,
     setObjectFilterDropdownSelectedRecordIds,
     setObjectFilterDropdownSelectedOptionValues,
     setIsObjectFilterDropdownOperandSelectUnfolded,
@@ -127,7 +127,7 @@ export const useFilterDropdown = (props?: UseFilterDropdownProps) => {
     availableFilterDefinitionsState,
     filterDefinitionUsedInDropdownState,
     objectFilterDropdownSearchInputState,
-    objectFilterDropdownSelectedEntityIdState,
+    // objectFilterDropdownSelectedEntityIdState,
     objectFilterDropdownSelectedRecordIdsState,
     objectFilterDropdownSelectedOptionValuesState,
     isObjectFilterDropdownOperandSelectUnfoldedState,

diff --git a/...y-front/src/modules/object-record/object-filter-dropdown/hooks/useFilterDropdownStates.ts b/...y-front/src/modules/object-record/object-filter-dropdown/hooks/useFilterDropdownStates.ts
@@ -2,7 +2,7 @@ import { filterDefinitionUsedInDropdownComponentState } from '@/object-record/ob
 import { isObjectFilterDropdownOperandSelectUnfoldedComponentState } from '@/object-record/object-filter-dropdown/states/isObjectFilterDropdownOperandSelectUnfoldedComponentState';
 import { isObjectFilterDropdownUnfoldedComponentState } from '@/object-record/object-filter-dropdown/states/isObjectFilterDropdownUnfoldedComponentState';
 import { objectFilterDropdownSearchInputComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState';
-import { objectFilterDropdownSelectedEntityIdComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedEntityIdComponentState';
+//import { objectFilterDropdownSelectedEntityIdComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedEntityIdComponentState';
 import { objectFilterDropdownSelectedOptionValuesComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedOptionValuesComponentState';
 import { objectFilterDropdownSelectedRecordIdsComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedRecordIdsComponentState';
 import { onFilterSelectComponentState } from '@/object-record/object-filter-dropdown/states/onFilterSelectComponentState';
@@ -27,10 +27,10 @@ export const useFilterDropdownStates = (scopeId: string) => {
     scopeId,
   );
 
-  const objectFilterDropdownSelectedEntityIdState = extractComponentState(
-    objectFilterDropdownSelectedEntityIdComponentState,
-    scopeId,
-  );
+  // const objectFilterDropdownSelectedEntityIdState = extractComponentState(
+  //   objectFilterDropdownSelectedEntityIdComponentState,
+  //   scopeId,
+  // );
 
   const objectFilterDropdownSelectedRecordIdsState = extractComponentState(
     objectFilterDropdownSelectedRecordIdsComponentState,
@@ -72,7 +72,7 @@ export const useFilterDropdownStates = (scopeId: string) => {
     availableFilterDefinitionsState,
     filterDefinitionUsedInDropdownState,
     objectFilterDropdownSearchInputState,
-    objectFilterDropdownSelectedEntityIdState,
+    // objectFilterDropdownSelectedEntityIdState,
     objectFilterDropdownSelectedRecordIdsState,
     objectFilterDropdownSelectedOptionValuesState,
     isObjectFilterDropdownOperandSelectUnfoldedState,

diff --git a/...ecord/object-filter-dropdown/states/objectFilterDropdownSelectedEntityIdComponentState.ts b/...ecord/object-filter-dropdown/states/objectFilterDropdownSelectedEntityIdComponentState.ts
@@ -1,7 +1,7 @@
-import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+// import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
 
-export const objectFilterDropdownSelectedEntityIdComponentState =
-  createComponentState<string | null>({
-    key: 'objectFilterDropdownSelectedEntityIdComponentState',
-    defaultValue: null,
-  });
+// export const objectFilterDropdownSelectedEntityIdComponentState =
+//   createComponentState<string | null>({
+//     key: 'objectFilterDropdownSelectedEntityIdComponentState',
+//     defaultValue: null,
+//   });
diff --git a/...t/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx b/...t/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx
@@ -258,7 +258,7 @@ export const RecordBoardCard = () => {
               >
                 <FieldContext.Provider
                   value={{
-                    entityId: recordId,
+                    recordId: recordId,
                     maxWidth: 156,
                     recoilScopeId: recordId + fieldDefinition.fieldMetadataId,
                     isLabelIdentifier: false,

diff --git a/packages/twenty-front/src/modules/object-record/record-field/contexts/FieldContext.ts b/packages/twenty-front/src/modules/object-record/record-field/contexts/FieldContext.ts
@@ -22,7 +22,7 @@ export type RecordUpdateHook = () => [
 export type GenericFieldContextType = {
   fieldDefinition: FieldDefinition<FieldMetadata>;
   useUpdateRecord?: RecordUpdateHook;
-  entityId: string;
+  recordId: string;
   recoilScopeId?: string;
   hotkeyScope: string;
   isLabelIdentifier: boolean;

diff --git a/...ty-front/src/modules/object-record/record-field/hooks/__tests__/useGetButtonIcon.test.tsx b/...ty-front/src/modules/object-record/record-field/hooks/__tests__/useGetButtonIcon.test.tsx
@@ -12,15 +12,15 @@ import { useGetButtonIcon } from '@/object-record/record-field/hooks/useGetButto
 import { FieldDefinition } from '@/object-record/record-field/types/FieldDefinition';
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
 
-const entityId = 'entityId';
+const recordId = 'recordId';
 
 const getWrapper =
   (fieldDefinition: FieldDefinition<FieldMetadata>) =>
   ({ children }: { children: ReactNode }) => (
     <FieldContext.Provider
       value={{
         fieldDefinition,
-        entityId,
+        recordId,
         hotkeyScope: 'hotkeyScope',
         isLabelIdentifier: false,
       }}

diff --git a/...nty-front/src/modules/object-record/record-field/hooks/__tests__/useIsFieldEmpty.test.tsx b/...nty-front/src/modules/object-record/record-field/hooks/__tests__/useIsFieldEmpty.test.tsx
@@ -7,13 +7,13 @@ import { FieldContext } from '@/object-record/record-field/contexts/FieldContext
 import { useIsFieldEmpty } from '@/object-record/record-field/hooks/useIsFieldEmpty';
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
 
-const entityId = 'entityId';
+const recordId = 'recordId';
 
 const Wrapper = ({ children }: { children: ReactNode }) => (
   <FieldContext.Provider
     value={{
       fieldDefinition: phoneFieldDefinition,
-      entityId,
+      recordId,
       hotkeyScope: 'hotkeyScope',
       isLabelIdentifier: false,
     }}
@@ -27,7 +27,7 @@ describe('useIsFieldEmpty', () => {
     const { result } = renderHook(
       () => {
         const setFieldState = useSetRecoilState(
-          recordStoreFamilyState(entityId),
+          recordStoreFamilyState(recordId),
         );
         return {
           setFieldState,

diff --git a/...front/src/modules/object-record/record-field/hooks/__tests__/useIsFieldInputOnly.test.tsx b/...front/src/modules/object-record/record-field/hooks/__tests__/useIsFieldInputOnly.test.tsx
@@ -11,15 +11,15 @@ import { useIsFieldInputOnly } from '@/object-record/record-field/hooks/useIsFie
 import { FieldDefinition } from '@/object-record/record-field/types/FieldDefinition';
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
 
-const entityId = 'entityId';
+const recordId = 'recordId';
 
 const getWrapper =
   (fieldDefinition: FieldDefinition<FieldMetadata>) =>
   ({ children }: { children: ReactNode }) => (
     <FieldContext.Provider
       value={{
         fieldDefinition,
-        entityId,
+        recordId,
         hotkeyScope: 'hotkeyScope',
         isLabelIdentifier: false,
       }}

diff --git a/...nty-front/src/modules/object-record/record-field/hooks/__tests__/usePersistField.test.tsx b/...nty-front/src/modules/object-record/record-field/hooks/__tests__/usePersistField.test.tsx
@@ -53,12 +53,12 @@ const mocks: MockedResponse[] = [
   {
     request: {
       query,
-      variables: { idToUpdate: 'entityId', input: { phone: '+1 123 456' } },
+      variables: { idToUpdate: 'recordId', input: { phone: '+1 123 456' } },
     },
     result: jest.fn(() => ({
       data: {
         updatePerson: {
-          id: 'entityId',
+          id: 'recordId',
         },
       },
     })),
@@ -67,21 +67,21 @@ const mocks: MockedResponse[] = [
     request: {
       query,
       variables: {
-        idToUpdate: 'entityId',
+        idToUpdate: 'recordId',
         input: { companyId: 'companyId' },
       },
     },
     result: jest.fn(() => ({
       data: {
         updatePerson: {
-          id: 'entityId',
+          id: 'recordId',
         },
       },
     })),
   },
 ];
 
-const entityId = 'entityId';
+const recordId = 'recordId';
 
 const getWrapper =
   (fieldDefinition: FieldDefinition<FieldMetadata>) =>
@@ -106,7 +106,7 @@ const getWrapper =
         <FieldContext.Provider
           value={{
             fieldDefinition,
-            entityId,
+            recordId,
             hotkeyScope: 'hotkeyScope',
             isLabelIdentifier: false,
             useUpdateRecord: useUpdateOneRecordMutation,
@@ -126,7 +126,7 @@ describe('usePersistField', () => {
     const { result } = renderHook(
       () => {
         const entityFields = useRecoilValue(
-          recordStoreFamilySelector({ recordId: entityId, fieldName: 'phone' }),
+          recordStoreFamilySelector({ recordId: recordId, fieldName: 'phone' }),
         );
 
         return {
@@ -151,7 +151,7 @@ describe('usePersistField', () => {
       () => {
         const entityFields = useRecoilValue(
           recordStoreFamilySelector({
-            recordId: entityId,
+            recordId: recordId,
             fieldName: 'company',
           }),
         );

diff --git a/...nt/src/modules/object-record/record-field/hooks/__tests__/useToggleEditOnlyInput.test.tsx b/...nt/src/modules/object-record/record-field/hooks/__tests__/useToggleEditOnlyInput.test.tsx
@@ -14,7 +14,7 @@ import {
 } from '@/object-record/record-field/contexts/FieldContext';
 import { useToggleEditOnlyInput } from '@/object-record/record-field/hooks/useToggleEditOnlyInput';
 
-const entityId = 'entityId';
+const recordId = 'recordId';
 
 const mocks: MockedResponse[] = [
   {
@@ -60,14 +60,14 @@ const mocks: MockedResponse[] = [
         }
       `,
       variables: {
-        idToUpdate: 'entityId',
+        idToUpdate: 'recordId',
         input: { idealCustomerProfile: true },
       },
     },
     result: jest.fn(() => ({
       data: {
         updateWorkspaceMember: {
-          id: 'entityId',
+          id: 'recordId',
         },
       },
     })),
@@ -95,7 +95,7 @@ const Wrapper = ({ children }: { children: ReactNode }) => {
       <FieldContext.Provider
         value={{
           fieldDefinition: booleanFieldDefinition,
-          entityId,
+          recordId,
           hotkeyScope: 'hotkeyScope',
           isLabelIdentifier: false,
           useUpdateRecord: useUpdateOneRecordMutation,