2282 Rename components to use the new naming convention part 1 (#2293)

renaming in progress

front/src/App.tsx

@@ -1,6 +1,6 @@
 import { Navigate, Route, Routes, useLocation } from 'react-router-dom';
 
-import { ObjectShowPage } from '@/metadata/components/ObjectShowPage';
+import { ObjectShowPage } from '@/metadata/components/RecordShowPage';
 import { AppPath } from '@/types/AppPath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { DefaultLayout } from '@/ui/layout/page/DefaultLayout';
@@ -32,7 +32,7 @@ import { SettingsWorkspaceMembers } from '~/pages/settings/SettingsWorkspaceMemb
 import { Tasks } from '~/pages/tasks/Tasks';
 import { getPageTitleFromPath } from '~/utils/title-utils';
 
-import { ObjectTablePage } from './modules/metadata/components/ObjectTablePage';
+import { RecordTablePage } from './modules/metadata/components/RecordTablePage';
 import { SettingsObjectFieldEdit } from './pages/settings/data-model/SettingsObjectFieldEdit';
 import { SettingsObjectNewFieldStep1 } from './pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep1';
 import { SettingsObjectNewFieldStep2 } from './pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2';
@@ -63,7 +63,7 @@ export const App = () => {
           <Route path={AppPath.Impersonate} element={<ImpersonateEffect />} />
 
           <Route path={AppPath.OpportunitiesPage} element={<Opportunities />} />
-          <Route path={AppPath.ObjectTablePage} element={<ObjectTablePage />} />
+          <Route path={AppPath.RecordTablePage} element={<RecordTablePage />} />
           <Route path={AppPath.ObjectShowPage} element={<ObjectShowPage />} />
 
           <Route

front/src/effect-components/PageChangeEffect.tsx

@@ -12,9 +12,9 @@ import { AppBasePath } from '@/types/AppBasePath';
 import { AppPath } from '@/types/AppPath';
 import { PageHotkeyScope } from '@/types/PageHotkeyScope';
 import { SettingsPath } from '@/types/SettingsPath';
-import { TableHotkeyScope } from '@/ui/data/data-table/types/TableHotkeyScope';
 import { IconCheckbox, IconNotes } from '@/ui/display/icon';
 import { useSnackBar } from '@/ui/feedback/snack-bar/hooks/useSnackBar';
+import { TableHotkeyScope } from '@/ui/object/record-table/types/TableHotkeyScope';
 import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
 import {
   ActivityType,

front/src/modules/activities/components/ActivityEditor.tsx

@@ -7,7 +7,7 @@ import { ActivityBodyEditor } from '@/activities/components/ActivityBodyEditor';
 import { ActivityComments } from '@/activities/components/ActivityComments';
 import { ActivityTypeDropdown } from '@/activities/components/ActivityTypeDropdown';
 import { GET_ACTIVITIES } from '@/activities/graphql/queries/getActivities';
-import { PropertyBox } from '@/ui/data/inline-cell/property-box/components/PropertyBox';
+import { PropertyBox } from '@/ui/object/record-inline-cell/property-box/components/PropertyBox';
 import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
 import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
 import {

front/src/modules/activities/editable-fields/components/ActivityAssigneeEditableField.tsx

@@ -1,12 +1,12 @@
 import React, { useMemo } from 'react';
 
-import { FieldContext } from '@/ui/data/field/contexts/FieldContext';
-import { FieldDefinition } from '@/ui/data/field/types/FieldDefinition';
-import { FieldRelationMetadata } from '@/ui/data/field/types/FieldMetadata';
-import { InlineCell } from '@/ui/data/inline-cell/components/InlineCell';
-import { InlineCellHotkeyScope } from '@/ui/data/inline-cell/types/InlineCellHotkeyScope';
 import { IconUserCircle } from '@/ui/display/icon';
 import { Entity } from '@/ui/input/relation-picker/types/EntityTypeForSelect';
+import { FieldContext } from '@/ui/object/field/contexts/FieldContext';
+import { FieldDefinition } from '@/ui/object/field/types/FieldDefinition';
+import { FieldRelationMetadata } from '@/ui/object/field/types/FieldMetadata';
+import { InlineCell } from '@/ui/object/record-inline-cell/components/InlineCell';
+import { InlineCellHotkeyScope } from '@/ui/object/record-inline-cell/types/InlineCellHotkeyScope';
 import { Company, User, useUpdateActivityMutation } from '~/generated/graphql';
 
 type ActivityAssigneeEditableFieldProps = {

front/src/modules/activities/editable-fields/components/ActivityAssigneeEditableFieldEditMode.tsx

@@ -1,7 +1,7 @@
 import styled from '@emotion/styled';
 
 import { ActivityAssigneePicker } from '@/activities/components/ActivityAssigneePicker';
-import { useInlineCell } from '@/ui/data/inline-cell/hooks/useInlineCell';
+import { useInlineCell } from '@/ui/object/record-inline-cell/hooks/useInlineCell';
 import { Activity, User } from '~/generated/graphql';
 
 const StyledContainer = styled.div`

front/src/modules/activities/editable-fields/components/ActivityEditorDateField.tsx

@@ -1,9 +1,9 @@
-import { FieldContext } from '@/ui/data/field/contexts/FieldContext';
-import { FieldDefinition } from '@/ui/data/field/types/FieldDefinition';
-import { FieldDateMetadata } from '@/ui/data/field/types/FieldMetadata';
-import { InlineCell } from '@/ui/data/inline-cell/components/InlineCell';
-import { InlineCellHotkeyScope } from '@/ui/data/inline-cell/types/InlineCellHotkeyScope';
 import { IconCalendar } from '@/ui/display/icon/index';
+import { FieldContext } from '@/ui/object/field/contexts/FieldContext';
+import { FieldDefinition } from '@/ui/object/field/types/FieldDefinition';
+import { FieldDateMetadata } from '@/ui/object/field/types/FieldMetadata';
+import { InlineCell } from '@/ui/object/record-inline-cell/components/InlineCell';
+import { InlineCellHotkeyScope } from '@/ui/object/record-inline-cell/types/InlineCellHotkeyScope';
 import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
 import { useUpdateActivityMutation } from '~/generated/graphql';
 

front/src/modules/activities/editable-fields/components/ActivityRelationEditableField.tsx

@@ -1,8 +1,8 @@
 import { ActivityTargetChips } from '@/activities/components/ActivityTargetChips';
-import { InlineCellContainer } from '@/ui/data/inline-cell/components/InlineCellContainer';
-import { FieldRecoilScopeContext } from '@/ui/data/inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext';
 import { IconArrowUpRight, IconPencil } from '@/ui/display/icon';
 import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope';
+import { InlineCellContainer } from '@/ui/object/record-inline-cell/components/InlineCellContainer';
+import { FieldRecoilScopeContext } from '@/ui/object/record-inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext';
 import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
 import { Activity, ActivityTarget, Company, Person } from '~/generated/graphql';
 

front/src/modules/activities/editable-fields/components/ActivityRelationEditableFieldEditMode.tsx

@@ -5,8 +5,8 @@ import { useHandleCheckableActivityTargetChange } from '@/activities/hooks/useHa
 import { flatMapAndSortEntityForSelectArrayOfArrayByName } from '@/activities/utils/flatMapAndSortEntityForSelectArrayByName';
 import { useFilteredSearchCompanyQuery } from '@/companies/hooks/useFilteredSearchCompanyQuery';
 import { useFilteredSearchPeopleQuery } from '@/people/hooks/useFilteredSearchPeopleQuery';
-import { useInlineCell } from '@/ui/data/inline-cell/hooks/useInlineCell';
 import { MultipleEntitySelect } from '@/ui/input/relation-picker/components/MultipleEntitySelect';
+import { useInlineCell } from '@/ui/object/record-inline-cell/hooks/useInlineCell';
 import { Activity, ActivityTarget } from '~/generated/graphql';
 import { assertNotNull } from '~/utils/assert';
 

front/src/modules/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds.ts

@@ -1,6 +1,6 @@
 import { useRecoilCallback } from 'recoil';
 
-import { selectedRowIdsSelector } from '@/ui/data/data-table/states/selectors/selectedRowIdsSelector';
+import { selectedRowIdsSelector } from '@/ui/object/record-table/states/selectors/selectedRowIdsSelector';
 import { ActivityType } from '~/generated/graphql';
 
 import {

front/src/modules/activities/notes/components/NoteCard.tsx

@@ -4,11 +4,11 @@ import styled from '@emotion/styled';
 
 import { ActivityRelationEditableField } from '@/activities/editable-fields/components/ActivityRelationEditableField';
 import { useOpenActivityRightDrawer } from '@/activities/hooks/useOpenActivityRightDrawer';
+import { IconComment } from '@/ui/display/icon';
 import {
   FieldContext,
   GenericFieldContextType,
-} from '@/ui/data/field/contexts/FieldContext';
-import { IconComment } from '@/ui/display/icon';
+} from '@/ui/object/field/contexts/FieldContext';
 import { Activity, ActivityTarget, Comment } from '~/generated/graphql';
 
 const StyledCard = styled.div`

front/src/modules/activities/right-drawer/components/RightDrawerActivity.tsx

@@ -3,7 +3,7 @@ import styled from '@emotion/styled';
 import { useRecoilState } from 'recoil';
 
 import { ActivityEditor } from '@/activities/components/ActivityEditor';
-import { entityFieldsFamilyState } from '@/ui/data/field/states/entityFieldsFamilyState';
+import { entityFieldsFamilyState } from '@/ui/object/field/states/entityFieldsFamilyState';
 import { useGetActivityQuery } from '~/generated/graphql';
 
 import '@blocknote/core/style.css';

front/src/modules/activities/tasks/components/PageAddTaskButton.tsx

@@ -1,6 +1,6 @@
 import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateActivityDrawer';
-import { useFilter } from '@/ui/data/filter/hooks/useFilter';
 import { PageAddButton } from '@/ui/layout/page/PageAddButton';
+import { useFilter } from '@/ui/object/filter/hooks/useFilter';
 import { ActivityType } from '~/generated/graphql';
 
 export const PageAddTaskButton = () => {

front/src/modules/activities/tasks/hooks/useCurrentUserDueTaskCount.ts

@@ -2,7 +2,7 @@ import { DateTime } from 'luxon';
 import { useRecoilState } from 'recoil';
 
 import { currentUserState } from '@/auth/states/currentUserState';
-import { turnFilterIntoWhereClause } from '@/ui/data/filter/utils/turnFilterIntoWhereClause';
+import { turnFilterIntoWhereClause } from '@/ui/object/filter/utils/turnFilterIntoWhereClause';
 import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
 import { ActivityType, useGetActivitiesQuery } from '~/generated/graphql';
 import { parseDate } from '~/utils/date-utils';

front/src/modules/activities/tasks/hooks/useTasks.ts

@@ -1,8 +1,8 @@
 import { DateTime } from 'luxon';
 
 import { ActivityTargetableEntity } from '@/activities/types/ActivityTargetableEntity';
-import { useFilter } from '@/ui/data/filter/hooks/useFilter';
-import { turnFilterIntoWhereClause } from '@/ui/data/filter/utils/turnFilterIntoWhereClause';
+import { useFilter } from '@/ui/object/filter/hooks/useFilter';
+import { turnFilterIntoWhereClause } from '@/ui/object/filter/utils/turnFilterIntoWhereClause';
 import { ActivityType, useGetActivitiesQuery } from '~/generated/graphql';
 import { parseDate } from '~/utils/date-utils';
 

front/src/modules/companies/components/AddPersonToCompany.tsx

@@ -9,11 +9,11 @@ import {
   PersonForSelect,
 } from '@/people/components/PeoplePicker';
 import { GET_PEOPLE } from '@/people/graphql/queries/getPeople';
-import { DoubleTextInput } from '@/ui/data/field/meta-types/input/components/internal/DoubleTextInput';
-import { FieldDoubleText } from '@/ui/data/field/types/FieldDoubleText';
 import { IconPlus } from '@/ui/display/icon';
 import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
 import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope';
+import { DoubleTextInput } from '@/ui/object/field/meta-types/input/components/internal/DoubleTextInput';
+import { FieldDoubleText } from '@/ui/object/field/types/FieldDoubleText';
 import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
 import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
 import {

front/src/modules/companies/components/CompanyBoardCard.tsx

@@ -2,9 +2,6 @@ import { ReactNode, useContext } from 'react';
 import styled from '@emotion/styled';
 import { useRecoilState } from 'recoil';
 
-import { FieldContext } from '@/ui/data/field/contexts/FieldContext';
-import { InlineCell } from '@/ui/data/inline-cell/components/InlineCell';
-import { InlineCellHotkeyScope } from '@/ui/data/inline-cell/types/InlineCellHotkeyScope';
 import { EntityChipVariant } from '@/ui/display/chip/components/EntityChip';
 import { IconEye } from '@/ui/display/icon/index';
 import { Checkbox, CheckboxVariant } from '@/ui/input/components/Checkbox';
@@ -14,6 +11,9 @@ import { useCurrentCardSelected } from '@/ui/layout/board/hooks/useCurrentCardSe
 import { isCardInCompactViewState } from '@/ui/layout/board/states/isCardInCompactViewState';
 import { isCompactViewEnabledState } from '@/ui/layout/board/states/isCompactViewEnabledState';
 import { visibleBoardCardFieldsScopedSelector } from '@/ui/layout/board/states/selectors/visibleBoardCardFieldsScopedSelector';
+import { FieldContext } from '@/ui/object/field/contexts/FieldContext';
+import { InlineCell } from '@/ui/object/record-inline-cell/components/InlineCell';
+import { InlineCellHotkeyScope } from '@/ui/object/record-inline-cell/types/InlineCellHotkeyScope';
 import { AnimatedEaseInOut } from '@/ui/utilities/animation/components/AnimatedEaseInOut';
 import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue';
 import { useUpdateOnePipelineProgressMutation } from '~/generated/graphql';

front/src/modules/companies/components/FilterDropdownCompanySearchSelect.tsx

@@ -1,5 +1,5 @@
-import { FilterDropdownEntitySearchSelect } from '@/ui/data/filter/components/FilterDropdownEntitySearchSelect';
-import { useFilter } from '@/ui/data/filter/hooks/useFilter';
+import { FilterDropdownEntitySearchSelect } from '@/ui/object/filter/components/FilterDropdownEntitySearchSelect';
+import { useFilter } from '@/ui/object/filter/hooks/useFilter';
 
 import { useFilteredSearchCompanyQuery } from '../hooks/useFilteredSearchCompanyQuery';
 

front/src/modules/companies/components/HooksCompanyBoardEffect.tsx

@@ -3,13 +3,13 @@ import { useSearchParams } from 'react-router-dom';
 import { useRecoilState } from 'recoil';
 
 import { pipelineAvailableFieldDefinitions } from '@/pipeline/constants/pipelineAvailableFieldDefinitions';
-import { turnFilterIntoWhereClause } from '@/ui/data/filter/utils/turnFilterIntoWhereClause';
 import { useBoardActionBarEntries } from '@/ui/layout/board/hooks/useBoardActionBarEntries';
 import { useBoardContext } from '@/ui/layout/board/hooks/useBoardContext';
 import { useBoardContextMenuEntries } from '@/ui/layout/board/hooks/useBoardContextMenuEntries';
 import { availableBoardCardFieldsScopedState } from '@/ui/layout/board/states/availableBoardCardFieldsScopedState';
 import { boardCardFieldsScopedState } from '@/ui/layout/board/states/boardCardFieldsScopedState';
 import { isBoardLoadedState } from '@/ui/layout/board/states/isBoardLoadedState';
+import { turnFilterIntoWhereClause } from '@/ui/object/filter/utils/turnFilterIntoWhereClause';
 import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState';
 import { useView } from '@/views/hooks/useView';
 import { useViewGetStates } from '@/views/hooks/useViewGetStates';

front/src/modules/companies/constants/companiesAvailableFieldDefinitions.tsx

@@ -1,15 +1,3 @@
-import { ColumnDefinition } from '@/ui/data/data-table/types/ColumnDefinition';
-import {
-  FieldBooleanMetadata,
-  FieldChipMetadata,
-  FieldDateMetadata,
-  FieldMetadata,
-  FieldMoneyMetadata,
-  FieldNumberMetadata,
-  FieldRelationMetadata,
-  FieldTextMetadata,
-  FieldURLMetadata,
-} from '@/ui/data/field/types/FieldMetadata';
 import {
   IconBrandLinkedin,
   IconBrandX,
@@ -23,6 +11,18 @@ import {
   IconUsers,
 } from '@/ui/display/icon/index';
 import { Entity } from '@/ui/input/relation-picker/types/EntityTypeForSelect';
+import {
+  FieldBooleanMetadata,
+  FieldChipMetadata,
+  FieldDateMetadata,
+  FieldMetadata,
+  FieldMoneyMetadata,
+  FieldNumberMetadata,
+  FieldRelationMetadata,
+  FieldTextMetadata,
+  FieldURLMetadata,
+} from '@/ui/object/field/types/FieldMetadata';
+import { ColumnDefinition } from '@/ui/object/record-table/types/ColumnDefinition';
 import { User } from '~/generated/graphql';
 
 export const companiesAvailableFieldDefinitions: ColumnDefinition<FieldMetadata>[] =

front/src/modules/companies/editable-field/components/CompanyNameEditableField.tsx

@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react';
 import styled from '@emotion/styled';
 
-import { FieldRecoilScopeContext } from '@/ui/data/inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext';
+import { FieldRecoilScopeContext } from '@/ui/object/record-inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext';
 import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
 import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
 import { Company, useUpdateOneCompanyMutation } from '~/generated/graphql';

front/src/modules/companies/hooks/useCompanyQuery.ts

@@ -1,6 +1,6 @@
 import { useSetRecoilState } from 'recoil';
 
-import { entityFieldsFamilyState } from '@/ui/data/field/states/entityFieldsFamilyState';
+import { entityFieldsFamilyState } from '@/ui/object/field/states/entityFieldsFamilyState';
 import { useGetCompanyQuery } from '~/generated/graphql';
 
 export const useCompanyQuery = (id: string) => {

front/src/modules/companies/hooks/useCompanyTableContextMenuEntries.tsx

@@ -2,9 +2,6 @@ import { getOperationName } from '@apollo/client/utilities';
 import { useRecoilCallback, useSetRecoilState } from 'recoil';
 
 import { useFavorites } from '@/favorites/hooks/useFavorites';
-import { useResetTableRowSelection } from '@/ui/data/data-table/hooks/useResetTableRowSelection';
-import { selectedRowIdsSelector } from '@/ui/data/data-table/states/selectors/selectedRowIdsSelector';
-import { tableRowIdsState } from '@/ui/data/data-table/states/tableRowIdsState';
 import {
   IconCheckbox,
   IconHeart,
@@ -14,6 +11,9 @@ import {
 } from '@/ui/display/icon';
 import { actionBarEntriesState } from '@/ui/navigation/action-bar/states/actionBarEntriesState';
 import { contextMenuEntriesState } from '@/ui/navigation/context-menu/states/contextMenuEntriesState';
+import { useResetTableRowSelection } from '@/ui/object/record-table/hooks/useResetTableRowSelection';
+import { selectedRowIdsSelector } from '@/ui/object/record-table/states/selectors/selectedRowIdsSelector';
+import { tableRowIdsState } from '@/ui/object/record-table/states/tableRowIdsState';
 import {
   ActivityType,
   useDeleteManyCompaniesMutation,

front/src/modules/companies/hooks/useDeleteCompanies.ts

@@ -3,9 +3,9 @@ import { useRecoilState, useRecoilValue } from 'recoil';
 
 import { useOptimisticEvict } from '@/apollo/optimistic-effect/hooks/useOptimisticEvict';
 import { GET_PIPELINES } from '@/pipeline/graphql/queries/getPipelines';
-import { useResetTableRowSelection } from '@/ui/data/data-table/hooks/useResetTableRowSelection';
-import { selectedRowIdsSelector } from '@/ui/data/data-table/states/selectors/selectedRowIdsSelector';
-import { tableRowIdsState } from '@/ui/data/data-table/states/tableRowIdsState';
+import { useResetTableRowSelection } from '@/ui/object/record-table/hooks/useResetTableRowSelection';
+import { selectedRowIdsSelector } from '@/ui/object/record-table/states/selectors/selectedRowIdsSelector';
+import { tableRowIdsState } from '@/ui/object/record-table/states/tableRowIdsState';
 import { useDeleteManyCompaniesMutation } from '~/generated/graphql';
 
 export const useDeleteSelectedComapnies = () => {

front/src/modules/companies/hooks/useUpdateCompanyBoardColumns.ts

@@ -1,11 +1,11 @@
 import { useRecoilCallback } from 'recoil';
 
 import { currentPipelineState } from '@/pipeline/states/currentPipelineState';
-import { entityFieldsFamilyState } from '@/ui/data/field/states/entityFieldsFamilyState';
 import { boardCardIdsByColumnIdFamilyState } from '@/ui/layout/board/states/boardCardIdsByColumnIdFamilyState';
 import { boardColumnsState } from '@/ui/layout/board/states/boardColumnsState';
 import { savedBoardColumnsState } from '@/ui/layout/board/states/savedBoardColumnsState';
 import { BoardColumnDefinition } from '@/ui/layout/board/types/BoardColumnDefinition';
+import { entityFieldsFamilyState } from '@/ui/object/field/states/entityFieldsFamilyState';
 import { isThemeColor } from '@/ui/theme/utils/castStringAsThemeColor';
 import { Pipeline } from '~/generated/graphql';
 import { isDeeplyEqual } from '~/utils/isDeeplyEqual';

front/src/modules/companies/table/components/CompanyTable.tsx

@@ -5,15 +5,15 @@ import { companiesAvailableFieldDefinitions } from '@/companies/constants/compan
 import { getCompaniesOptimisticEffectDefinition } from '@/companies/graphql/optimistic-effect-definitions/getCompaniesOptimisticEffectDefinition';
 import { useCompanyTableContextMenuEntries } from '@/companies/hooks/useCompanyTableContextMenuEntries';
 import { useSpreadsheetCompanyImport } from '@/companies/hooks/useSpreadsheetCompanyImport';
-import { DataTable } from '@/ui/data/data-table/components/DataTable';
-import { DataTableEffect } from '@/ui/data/data-table/components/DataTableEffect';
-import { TableOptionsDropdownId } from '@/ui/data/data-table/constants/TableOptionsDropdownId';
-import { TableContext } from '@/ui/data/data-table/contexts/TableContext';
-import { useUpsertDataTableItem } from '@/ui/data/data-table/hooks/useUpsertDataTableItem';
-import { TableOptionsDropdown } from '@/ui/data/data-table/options/components/TableOptionsDropdown';
-import { tableColumnsScopedState } from '@/ui/data/data-table/states/tableColumnsScopedState';
-import { tableFiltersScopedState } from '@/ui/data/data-table/states/tableFiltersScopedState';
-import { tableSortsScopedState } from '@/ui/data/data-table/states/tableSortsScopedState';
+import { RecordTable } from '@/ui/object/record-table/components/RecordTable';
+import { RecordTableEffect } from '@/ui/object/record-table/components/RecordTableEffect';
+import { TableOptionsDropdownId } from '@/ui/object/record-table/constants/TableOptionsDropdownId';
+import { TableContext } from '@/ui/object/record-table/contexts/TableContext';
+import { useUpsertRecordTableItem } from '@/ui/object/record-table/hooks/useUpsertRecordTableItem';
+import { TableOptionsDropdown } from '@/ui/object/record-table/options/components/TableOptionsDropdown';
+import { tableColumnsScopedState } from '@/ui/object/record-table/states/tableColumnsScopedState';
+import { tableFiltersScopedState } from '@/ui/object/record-table/states/tableFiltersScopedState';
+import { tableSortsScopedState } from '@/ui/object/record-table/states/tableSortsScopedState';
 import { ViewBar } from '@/views/components/ViewBar';
 import { useViewFields } from '@/views/hooks/internal/useViewFields';
 import { useView } from '@/views/hooks/useView';
@@ -54,7 +54,7 @@ export const CompanyTable = () => {
   const setTableSorts = useSetRecoilState(tableSortsScopedState(tableScopeId));
 
   const [updateEntityMutation] = useUpdateOneCompanyMutation();
-  const upsertDataTableItem = useUpsertDataTableItem();
+  const upsertRecordTableItem = useUpsertRecordTableItem();
 
   const [getWorkspaceMember] = useGetWorkspaceMembersLazyQuery();
   const { persistViewFields } = useViewFields(viewScopeId);
@@ -89,7 +89,7 @@ export const CompanyTable = () => {
         if (!data.updateOneCompany) {
           return;
         }
-        upsertDataTableItem(data.updateOneCompany);
+        upsertRecordTableItem(data.updateOneCompany);
       },
     });
   };
@@ -129,7 +129,7 @@ export const CompanyTable = () => {
             optionsDropdownScopeId={TableOptionsDropdownId}
           />
           <CompanyTableEffect />
-          <DataTableEffect
+          <RecordTableEffect
             getRequestResultKey="companies"
             useGetRequest={useGetCompaniesQuery}
             getRequestOptimisticEffectDefinition={
@@ -140,7 +140,7 @@ export const CompanyTable = () => {
             setContextMenuEntries={setContextMenuEntries}
             setActionBarEntries={setActionBarEntries}
           />
-          <DataTable
+          <RecordTable
             updateEntityMutation={({
               variables,
             }: {

front/src/modules/companies/table/components/CompanyTableEffect.tsx

@@ -1,8 +1,8 @@
 import { useEffect } from 'react';
 
 import { companiesAvailableFieldDefinitions } from '@/companies/constants/companiesAvailableFieldDefinitions';
-import { availableTableColumnsScopedState } from '@/ui/data/data-table/states/availableTableColumnsScopedState';
-import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext';
+import { availableTableColumnsScopedState } from '@/ui/object/record-table/states/availableTableColumnsScopedState';
+import { TableRecoilScopeContext } from '@/ui/object/record-table/states/recoil-scope-contexts/TableRecoilScopeContext';
 import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState';
 import { useView } from '@/views/hooks/useView';
 import { ViewType } from '@/views/types/ViewType';

front/src/modules/companies/table/components/CompanyTableMockDataEffect.tsx

@@ -1,9 +1,9 @@
 import { useEffect } from 'react';
 
 import { companiesAvailableFieldDefinitions } from '@/companies/constants/companiesAvailableFieldDefinitions';
-import { useSetDataTableData } from '@/ui/data/data-table/hooks/useSetDataTableData';
-import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext';
-import { tableColumnsScopedState } from '@/ui/data/data-table/states/tableColumnsScopedState';
+import { useSetRecordTableData } from '@/ui/object/record-table/hooks/useSetRecordTableData';
+import { TableRecoilScopeContext } from '@/ui/object/record-table/states/recoil-scope-contexts/TableRecoilScopeContext';
+import { tableColumnsScopedState } from '@/ui/object/record-table/states/tableColumnsScopedState';
 import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState';
 
 import { mockedCompaniesData } from './companies-mock-data';
@@ -13,12 +13,12 @@ export const CompanyTableMockDataEffect = () => {
     tableColumnsScopedState,
     TableRecoilScopeContext,
   );
-  const setDataTableData = useSetDataTableData();
+  const setRecordTableData = useSetRecordTableData();
 
   useEffect(() => {
-    setDataTableData(mockedCompaniesData);
+    setRecordTableData(mockedCompaniesData);
     setTableColumns(companiesAvailableFieldDefinitions);
-  }, [setDataTableData, setTableColumns]);
+  }, [setRecordTableData, setTableColumns]);
 
   return <></>;
 };

front/src/modules/companies/table/components/CompanyTableMockMode.tsx

@@ -1,8 +1,8 @@
 import styled from '@emotion/styled';
 
-import { DataTable } from '@/ui/data/data-table/components/DataTable';
-import { TableOptionsDropdownId } from '@/ui/data/data-table/constants/TableOptionsDropdownId';
-import { TableOptionsDropdown } from '@/ui/data/data-table/options/components/TableOptionsDropdown';
+import { RecordTable } from '@/ui/object/record-table/components/RecordTable';
+import { TableOptionsDropdownId } from '@/ui/object/record-table/constants/TableOptionsDropdownId';
+import { TableOptionsDropdown } from '@/ui/object/record-table/options/components/TableOptionsDropdown';
 import { ViewBar } from '@/views/components/ViewBar';
 import { ViewScope } from '@/views/scopes/ViewScope';
 import { useUpdateOneCompanyMutation } from '~/generated/graphql';
@@ -28,7 +28,7 @@ export const CompanyTableMockMode = () => {
           optionsDropdownScopeId={TableOptionsDropdownId}
         />
 
-        <DataTable updateEntityMutation={useUpdateOneCompanyMutation} />
+        <RecordTable updateEntityMutation={useUpdateOneCompanyMutation} />
       </ViewScope>
     </StyledContainer>
   );

front/src/modules/metadata/components/ObjectTableEffect.tsx

@@ -1,7 +1,7 @@
 import { useEffect } from 'react';
 import { useSetRecoilState } from 'recoil';
 
-import { availableTableColumnsScopedState } from '@/ui/data/data-table/states/availableTableColumnsScopedState';
+import { availableTableColumnsScopedState } from '@/ui/object/record-table/states/availableTableColumnsScopedState';
 import { useView } from '@/views/hooks/useView';
 import { ViewType } from '@/views/types/ViewType';
 

front/src/modules/metadata/components/RecordShowPage.tsx

@@ -3,11 +3,6 @@ import { DateTime } from 'luxon';
 import { useRecoilState } from 'recoil';
 
 import { ActivityTargetableEntityType } from '@/activities/types/ActivityTargetableEntity';
-import { FieldContext } from '@/ui/data/field/contexts/FieldContext';
-import { entityFieldsFamilyState } from '@/ui/data/field/states/entityFieldsFamilyState';
-import { InlineCell } from '@/ui/data/inline-cell/components/InlineCell';
-import { PropertyBox } from '@/ui/data/inline-cell/property-box/components/PropertyBox';
-import { InlineCellHotkeyScope } from '@/ui/data/inline-cell/types/InlineCellHotkeyScope';
 import { IconBuildingSkyscraper } from '@/ui/display/icon';
 import { useLazyLoadIcons } from '@/ui/input/hooks/useLazyLoadIcons';
 import { PageBody } from '@/ui/layout/page/PageBody';
@@ -20,6 +15,11 @@ import { ShowPageLeftContainer } from '@/ui/layout/show-page/components/ShowPage
 import { ShowPageRightContainer } from '@/ui/layout/show-page/components/ShowPageRightContainer';
 import { ShowPageSummaryCard } from '@/ui/layout/show-page/components/ShowPageSummaryCard';
 import { ShowPageRecoilScopeContext } from '@/ui/layout/states/ShowPageRecoilScopeContext';
+import { FieldContext } from '@/ui/object/field/contexts/FieldContext';
+import { entityFieldsFamilyState } from '@/ui/object/field/states/entityFieldsFamilyState';
+import { InlineCell } from '@/ui/object/record-inline-cell/components/InlineCell';
+import { PropertyBox } from '@/ui/object/record-inline-cell/property-box/components/PropertyBox';
+import { InlineCellHotkeyScope } from '@/ui/object/record-inline-cell/types/InlineCellHotkeyScope';
 import { PageTitle } from '@/ui/utilities/page-title/PageTitle';
 import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
 

front/src/modules/metadata/components/RecordTable.tsx

@@ -1,13 +1,13 @@
 import styled from '@emotion/styled';
 import { useRecoilCallback, useSetRecoilState } from 'recoil';
 
-import { DataTable } from '@/ui/data/data-table/components/DataTable';
-import { TableOptionsDropdownId } from '@/ui/data/data-table/constants/TableOptionsDropdownId';
-import { TableContext } from '@/ui/data/data-table/contexts/TableContext';
-import { TableOptionsDropdown } from '@/ui/data/data-table/options/components/TableOptionsDropdown';
-import { tableColumnsScopedState } from '@/ui/data/data-table/states/tableColumnsScopedState';
-import { tableFiltersScopedState } from '@/ui/data/data-table/states/tableFiltersScopedState';
-import { tableSortsScopedState } from '@/ui/data/data-table/states/tableSortsScopedState';
+import { RecordTable } from '@/ui/object/record-table/components/RecordTable';
+import { TableOptionsDropdownId } from '@/ui/object/record-table/constants/TableOptionsDropdownId';
+import { TableContext } from '@/ui/object/record-table/contexts/TableContext';
+import { TableOptionsDropdown } from '@/ui/object/record-table/options/components/TableOptionsDropdown';
+import { tableColumnsScopedState } from '@/ui/object/record-table/states/tableColumnsScopedState';
+import { tableFiltersScopedState } from '@/ui/object/record-table/states/tableFiltersScopedState';
+import { tableSortsScopedState } from '@/ui/object/record-table/states/tableSortsScopedState';
 import { ViewBar } from '@/views/components/ViewBar';
 import { useViewFields } from '@/views/hooks/internal/useViewFields';
 import { useView } from '@/views/hooks/useView';
@@ -21,8 +21,8 @@ import { useMetadataObjectInContext } from '../hooks/useMetadataObjectInContext'
 import { useUpdateOneObject } from '../hooks/useUpdateOneObject';
 import { MetadataObjectIdentifier } from '../types/MetadataObjectIdentifier';
 
-import { ObjectDataTableEffect } from './ObjectDataTableEffect';
 import { ObjectTableEffect } from './ObjectTableEffect';
+import { ObjectRecordTableEffect } from './RecordTableEffect';
 
 const StyledContainer = styled.div`
   display: flex;
@@ -105,8 +105,8 @@ export const ObjectTable = ({ objectNamePlural }: ObjectTableProps) => {
             optionsDropdownScopeId={TableOptionsDropdownId}
           />
           <ObjectTableEffect />
-          <ObjectDataTableEffect objectNamePlural={objectNamePlural} />
-          <DataTable updateEntityMutation={updateEntity} />
+          <ObjectRecordTableEffect objectNamePlural={objectNamePlural} />
+          <RecordTable updateEntityMutation={updateEntity} />
         </TableContext.Provider>
       </StyledContainer>
     </ViewScope>

front/src/modules/metadata/components/RecordTableEffect.tsx

@@ -1,27 +1,27 @@
 import { useEffect } from 'react';
 
-import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext';
-import { tableFiltersScopedState } from '@/ui/data/data-table/states/tableFiltersScopedState';
-import { tableSortsScopedState } from '@/ui/data/data-table/states/tableSortsScopedState';
-import { turnFiltersIntoWhereClauseV2 } from '@/ui/data/filter/utils/turnFiltersIntoWhereClauseV2';
-import { turnSortsIntoOrderByV2 } from '@/ui/data/sort/utils/turnSortsIntoOrderByV2';
+import { turnFiltersIntoWhereClauseV2 } from '@/ui/object/filter/utils/turnFiltersIntoWhereClauseV2';
+import { useSetRecordTableData } from '@/ui/object/record-table/hooks/useSetRecordTableData';
+import { TableRecoilScopeContext } from '@/ui/object/record-table/states/recoil-scope-contexts/TableRecoilScopeContext';
+import { tableFiltersScopedState } from '@/ui/object/record-table/states/tableFiltersScopedState';
+import { tableSortsScopedState } from '@/ui/object/record-table/states/tableSortsScopedState';
+import { turnSortsIntoOrderByV2 } from '@/ui/object/sort/utils/turnSortsIntoOrderByV2';
 import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue';
 
 import { useFindManyObjects } from '../hooks/useFindManyObjects';
 import { useMetadataObjectInContext } from '../hooks/useMetadataObjectInContext';
-import { useSetObjectDataTableData } from '../hooks/useSetDataTableData';
 import { MetadataObjectIdentifier } from '../types/MetadataObjectIdentifier';
 
-export type ObjectDataTableEffectProps = Pick<
+export type ObjectRecordTableEffectProps = Pick<
   MetadataObjectIdentifier,
   'objectNamePlural'
 >;
 
-// This should be migrated to DataTable at some point
-export const ObjectDataTableEffect = ({
+// This should be migrated to RecordTable at some point
+export const ObjectRecordTableEffect = ({
   objectNamePlural,
-}: ObjectDataTableEffectProps) => {
-  const setDataTableData = useSetObjectDataTableData();
+}: ObjectRecordTableEffectProps) => {
+  const setRecordTableData = useSetRecordTableData();
   const { foundMetadataObject } = useMetadataObjectInContext();
 
   const tableFilters = useRecoilScopedValue(
@@ -50,9 +50,9 @@ export const ObjectDataTableEffect = ({
     if (!loading) {
       const entities = objects ?? [];
 
-      setDataTableData(entities);
+      setRecordTableData(entities);
     }
-  }, [objects, setDataTableData, loading]);
+  }, [objects, setRecordTableData, loading]);
 
   return <></>;
 };

front/src/modules/metadata/components/RecordTablePage.tsx

@@ -2,17 +2,17 @@ import { useEffect } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import styled from '@emotion/styled';
 
-import { ObjectTable } from '@/metadata/components/ObjectTable';
+import { ObjectTable } from '@/metadata/components/RecordTable';
 import { MetadataObjectIdentifier } from '@/metadata/types/MetadataObjectIdentifier';
-import { DataTableActionBar } from '@/ui/data/data-table/action-bar/components/DataTableActionBar';
-import { DataTableContextMenu } from '@/ui/data/data-table/context-menu/components/DataTableContextMenu';
-import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext';
 import { IconBuildingSkyscraper } from '@/ui/display/icon';
 import { PageAddButton } from '@/ui/layout/page/PageAddButton';
 import { PageBody } from '@/ui/layout/page/PageBody';
 import { PageContainer } from '@/ui/layout/page/PageContainer';
 import { PageHeader } from '@/ui/layout/page/PageHeader';
 import { PageHotkeysEffect } from '@/ui/layout/page/PageHotkeysEffect';
+import { RecordTableActionBar } from '@/ui/object/record-table/action-bar/components/RecordTableActionBar';
+import { RecordTableContextMenu } from '@/ui/object/record-table/context-menu/components/RecordTableContextMenu';
+import { TableRecoilScopeContext } from '@/ui/object/record-table/states/recoil-scope-contexts/TableRecoilScopeContext';
 import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
 
 import { useCreateOneObject } from '../hooks/useCreateOneObject';
@@ -24,12 +24,12 @@ const StyledTableContainer = styled.div`
   width: 100%;
 `;
 
-export type ObjectTablePageProps = Pick<
+export type RecordTablePageProps = Pick<
   MetadataObjectIdentifier,
   'objectNamePlural'
 >;
 
-export const ObjectTablePage = () => {
+export const RecordTablePage = () => {
   const objectNamePlural = useParams().objectNamePlural ?? '';
 
   const { objectNotFoundInMetadata, loading } = useFindOneMetadataObject({
@@ -68,8 +68,8 @@ export const ObjectTablePage = () => {
               <ObjectTable objectNamePlural={objectNamePlural} />
             </MetadataObjectScope>
           </StyledTableContainer>
-          <DataTableActionBar />
-          <DataTableContextMenu />
+          <RecordTableActionBar />
+          <RecordTableContextMenu />
         </RecoilScope>
       </PageBody>
     </PageContainer>

front/src/modules/metadata/hooks/useCreateOneMetadataField.ts

@@ -1,7 +1,7 @@
 import { ApolloClient, useMutation } from '@apollo/client';
 import { getOperationName } from '@apollo/client/utilities';
 
-import { FieldType } from '@/ui/data/field/types/FieldType';
+import { FieldType } from '@/ui/object/field/types/FieldType';
 import {
   CreateOneMetadataFieldMutation,
   CreateOneMetadataFieldMutationVariables,

front/src/modules/metadata/hooks/useFindOneMetadataObject.ts

@@ -1,10 +1,10 @@
 import { gql } from '@apollo/client';
 
-import { ColumnDefinition } from '@/ui/data/data-table/types/ColumnDefinition';
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
-import { FilterDefinition } from '@/ui/data/filter/types/FilterDefinition';
-import { SortDefinition } from '@/ui/data/sort/types/SortDefinition';
 import { useLazyLoadIcons } from '@/ui/input/hooks/useLazyLoadIcons';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
+import { FilterDefinition } from '@/ui/object/filter/types/FilterDefinition';
+import { ColumnDefinition } from '@/ui/object/record-table/types/ColumnDefinition';
+import { SortDefinition } from '@/ui/object/sort/types/SortDefinition';
 
 import { MetadataObjectIdentifier } from '../types/MetadataObjectIdentifier';
 import { formatMetadataFieldAsColumnDefinition } from '../utils/formatMetadataFieldAsColumnDefinition';

front/src/modules/metadata/hooks/useSetDataTableData.ts

@@ -1,13 +1,13 @@
 import { useRecoilCallback } from 'recoil';
 
-import { useResetTableRowSelection } from '@/ui/data/data-table/hooks/useResetTableRowSelection';
-import { isFetchingDataTableDataState } from '@/ui/data/data-table/states/isFetchingDataTableDataState';
-import { numberOfTableRowsState } from '@/ui/data/data-table/states/numberOfTableRowsState';
-import { tableRowIdsState } from '@/ui/data/data-table/states/tableRowIdsState';
-import { entityFieldsFamilyState } from '@/ui/data/field/states/entityFieldsFamilyState';
+import { entityFieldsFamilyState } from '@/ui/object/field/states/entityFieldsFamilyState';
+import { useResetTableRowSelection } from '@/ui/object/record-table/hooks/useResetTableRowSelection';
+import { isFetchingRecordTableDataState } from '@/ui/object/record-table/states/isFetchingRecordTableDataState';
+import { numberOfTableRowsState } from '@/ui/object/record-table/states/numberOfTableRowsState';
+import { tableRowIdsState } from '@/ui/object/record-table/states/tableRowIdsState';
 import { useView } from '@/views/hooks/useView';
 
-export const useSetObjectDataTableData = () => {
+export const useSetObjectRecordTableData = () => {
   const resetTableRowSelection = useResetTableRowSelection();
   const { setEntityCountInCurrentView } = useView();
 
@@ -39,7 +39,7 @@ export const useSetObjectDataTableData = () => {
         set(numberOfTableRowsState, entityIds.length);
         setEntityCountInCurrentView(entityIds.length);
 
-        set(isFetchingDataTableDataState, false);
+        set(isFetchingRecordTableDataState, false);
       },
     [resetTableRowSelection, setEntityCountInCurrentView],
   );

front/src/modules/metadata/utils/formatMetadataFieldAsColumnDefinition.ts

@@ -1,5 +1,5 @@
-import { ColumnDefinition } from '@/ui/data/data-table/types/ColumnDefinition';
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
+import { ColumnDefinition } from '@/ui/object/record-table/types/ColumnDefinition';
 
 import { MetadataObject } from '../types/MetadataObject';
 

front/src/modules/metadata/utils/formatMetadataFieldAsFilterDefinition.ts

@@ -1,4 +1,4 @@
-import { FilterDefinition } from '@/ui/data/filter/types/FilterDefinition';
+import { FilterDefinition } from '@/ui/object/filter/types/FilterDefinition';
 
 import { MetadataObject } from '../types/MetadataObject';
 

front/src/modules/metadata/utils/formatMetadataFieldAsSortDefinition.ts

@@ -1,4 +1,4 @@
-import { SortDefinition } from '@/ui/data/sort/types/SortDefinition';
+import { SortDefinition } from '@/ui/object/sort/types/SortDefinition';
 
 import { MetadataObject } from '../types/MetadataObject';
 

front/src/modules/metadata/utils/mapFieldMetadataToGraphQLQuery.ts

@@ -1,4 +1,4 @@
-import { FieldType } from '@/ui/data/field/types/FieldType';
+import { FieldType } from '@/ui/object/field/types/FieldType';
 import { Field } from '~/generated/graphql';
 
 export const mapFieldMetadataToGraphQLQuery = (field: Field) => {

front/src/modules/metadata/utils/parseFieldType.ts

@@ -1,4 +1,4 @@
-import { FieldType } from '@/ui/data/field/types/FieldType';
+import { FieldType } from '@/ui/object/field/types/FieldType';
 
 export const parseFieldType = (fieldType: string): FieldType => {
   if (fieldType === 'url') {

front/src/modules/people/components/FilterDropdownPeopleSearchSelect.tsx

@@ -1,6 +1,6 @@
 import { useFilteredSearchPeopleQuery } from '@/people/hooks/useFilteredSearchPeopleQuery';
-import { FilterDropdownEntitySearchSelect } from '@/ui/data/filter/components/FilterDropdownEntitySearchSelect';
-import { useFilter } from '@/ui/data/filter/hooks/useFilter';
+import { FilterDropdownEntitySearchSelect } from '@/ui/object/filter/components/FilterDropdownEntitySearchSelect';
+import { useFilter } from '@/ui/object/filter/hooks/useFilter';
 
 export const FilterDropdownPeopleSearchSelect = () => {
   const { filterDropdownSearchInput, filterDropdownSelectedEntityId } =

front/src/modules/people/components/PeopleRecordTableDataEffect.tsx

@@ -4,9 +4,9 @@ import {
   useGetPeopleQuery,
 } from '~/generated/graphql';
 
-import { useSetPeopleDataTable } from '../hooks/useSetPeopleDataTable';
+import { useSetPeopleRecordTable } from '../hooks/useSetPeopleRecordTable';
 
-export const PeopleDataTableDataEffect = ({
+export const PeopleRecordTableDataEffect = ({
   orderBy = [
     {
       createdAt: SortOrder.Desc,
@@ -17,14 +17,14 @@ export const PeopleDataTableDataEffect = ({
   orderBy?: PersonOrderByWithRelationInput[];
   whereFilters?: any;
 }) => {
-  const setPeopleDataTable = useSetPeopleDataTable();
+  const setPeopleRecordTable = useSetPeopleRecordTable();
 
   useGetPeopleQuery({
     variables: { orderBy, where: whereFilters },
     onCompleted: (data) => {
       const people = data.people ?? [];
 
-      setPeopleDataTable(people);
+      setPeopleRecordTable(people);
     },
   });
 

front/src/modules/people/constants/peopleAvailableFieldDefinitions.tsx

@@ -1,14 +1,3 @@
-import { ColumnDefinition } from '@/ui/data/data-table/types/ColumnDefinition';
-import {
-  FieldDateMetadata,
-  FieldDoubleTextChipMetadata,
-  FieldEmailMetadata,
-  FieldMetadata,
-  FieldPhoneMetadata,
-  FieldRelationMetadata,
-  FieldTextMetadata,
-  FieldURLMetadata,
-} from '@/ui/data/field/types/FieldMetadata';
 import {
   IconBrandLinkedin,
   IconBrandX,
@@ -21,6 +10,17 @@ import {
   IconUser,
 } from '@/ui/display/icon/index';
 import { Entity } from '@/ui/input/relation-picker/types/EntityTypeForSelect';
+import {
+  FieldDateMetadata,
+  FieldDoubleTextChipMetadata,
+  FieldEmailMetadata,
+  FieldMetadata,
+  FieldPhoneMetadata,
+  FieldRelationMetadata,
+  FieldTextMetadata,
+  FieldURLMetadata,
+} from '@/ui/object/field/types/FieldMetadata';
+import { ColumnDefinition } from '@/ui/object/record-table/types/ColumnDefinition';
 import { Company } from '~/generated/graphql';
 import { getLogoUrlFromDomainName } from '~/utils';
 

front/src/modules/people/editable-field/components/PeopleFullNameEditableField.tsx

@@ -1,7 +1,7 @@
 import { useState } from 'react';
 
-import { FieldRecoilScopeContext } from '@/ui/data/inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext';
 import { EntityTitleDoubleTextInput } from '@/ui/input/components/EntityTitleDoubleTextInput';
+import { FieldRecoilScopeContext } from '@/ui/object/record-inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext';
 import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
 import { Person, useUpdateOnePersonMutation } from '~/generated/graphql';
 

front/src/modules/people/hooks/useCreateActivityForPeople.ts

@@ -5,8 +5,8 @@ import {
   ActivityTargetableEntity,
   ActivityTargetableEntityType,
 } from '@/activities/types/ActivityTargetableEntity';
-import { selectedRowIdsSelector } from '@/ui/data/data-table/states/selectors/selectedRowIdsSelector';
-import { entityFieldsFamilyState } from '@/ui/data/field/states/entityFieldsFamilyState';
+import { entityFieldsFamilyState } from '@/ui/object/field/states/entityFieldsFamilyState';
+import { selectedRowIdsSelector } from '@/ui/object/record-table/states/selectors/selectedRowIdsSelector';
 import { ActivityType, Person } from '~/generated/graphql';
 
 export const useCreateActivityForPeople = () => {

front/src/modules/people/hooks/usePersonQuery.ts

@@ -1,6 +1,6 @@
 import { useSetRecoilState } from 'recoil';
 
-import { entityFieldsFamilyState } from '@/ui/data/field/states/entityFieldsFamilyState';
+import { entityFieldsFamilyState } from '@/ui/object/field/states/entityFieldsFamilyState';
 import { useGetPersonQuery } from '~/generated/graphql';
 
 export const usePersonQuery = (id: string) => {

front/src/modules/people/hooks/usePersonTableContextMenuEntries.tsx

@@ -2,9 +2,6 @@ import { getOperationName } from '@apollo/client/utilities';
 import { useRecoilCallback, useSetRecoilState } from 'recoil';
 
 import { useFavorites } from '@/favorites/hooks/useFavorites';
-import { useResetTableRowSelection } from '@/ui/data/data-table/hooks/useResetTableRowSelection';
-import { selectedRowIdsSelector } from '@/ui/data/data-table/states/selectors/selectedRowIdsSelector';
-import { tableRowIdsState } from '@/ui/data/data-table/states/tableRowIdsState';
 import {
   IconCheckbox,
   IconHeart,
@@ -14,6 +11,9 @@ import {
 } from '@/ui/display/icon';
 import { actionBarEntriesState } from '@/ui/navigation/action-bar/states/actionBarEntriesState';
 import { contextMenuEntriesState } from '@/ui/navigation/context-menu/states/contextMenuEntriesState';
+import { useResetTableRowSelection } from '@/ui/object/record-table/hooks/useResetTableRowSelection';
+import { selectedRowIdsSelector } from '@/ui/object/record-table/states/selectors/selectedRowIdsSelector';
+import { tableRowIdsState } from '@/ui/object/record-table/states/tableRowIdsState';
 import {
   ActivityType,
   useDeleteManyPersonMutation,

front/src/modules/people/hooks/useSetPeopleRecordTable.ts

@@ -1,10 +1,10 @@
 import { useLocation } from 'react-router-dom';
 import { useRecoilCallback } from 'recoil';
 
-import { useResetTableRowSelection } from '@/ui/data/data-table/hooks/useResetTableRowSelection';
-import { isFetchingDataTableDataState } from '@/ui/data/data-table/states/isFetchingDataTableDataState';
-import { numberOfTableRowsState } from '@/ui/data/data-table/states/numberOfTableRowsState';
-import { tableRowIdsState } from '@/ui/data/data-table/states/tableRowIdsState';
+import { useResetTableRowSelection } from '@/ui/object/record-table/hooks/useResetTableRowSelection';
+import { isFetchingRecordTableDataState } from '@/ui/object/record-table/states/isFetchingRecordTableDataState';
+import { numberOfTableRowsState } from '@/ui/object/record-table/states/numberOfTableRowsState';
+import { tableRowIdsState } from '@/ui/object/record-table/states/tableRowIdsState';
 import { currentPageLocationState } from '@/ui/utilities/loading-state/states/currentPageLocationState';
 import { GetPeopleQuery } from '~/generated/graphql';
 
@@ -17,7 +17,7 @@ import { peopleLinkedinUrlFamilyState } from '../states/peopleLinkedinUrlFamilyS
 import { peopleNameCellFamilyState } from '../states/peopleNamesFamilyState';
 import { peoplePhoneFamilyState } from '../states/peoplePhoneFamilyState';
 
-export const useSetPeopleDataTable = () => {
+export const useSetPeopleRecordTable = () => {
   const resetTableRowSelection = useResetTableRowSelection();
 
   const currentLocation = useLocation().pathname;
@@ -122,7 +122,7 @@ export const useSetPeopleDataTable = () => {
 
         set(currentPageLocationState, currentLocation);
 
-        set(isFetchingDataTableDataState, false);
+        set(isFetchingRecordTableDataState, false);
       },
     [currentLocation, resetTableRowSelection],
   );

front/src/modules/people/table/components/PersonTable.tsx

@@ -5,14 +5,14 @@ import { peopleAvailableFieldDefinitions } from '@/people/constants/peopleAvaila
 import { getPeopleOptimisticEffectDefinition } from '@/people/graphql/optimistic-effect-definitions/getPeopleOptimisticEffectDefinition';
 import { usePersonTableContextMenuEntries } from '@/people/hooks/usePersonTableContextMenuEntries';
 import { useSpreadsheetPersonImport } from '@/people/hooks/useSpreadsheetPersonImport';
-import { DataTable } from '@/ui/data/data-table/components/DataTable';
-import { DataTableEffect } from '@/ui/data/data-table/components/DataTableEffect';
-import { TableContext } from '@/ui/data/data-table/contexts/TableContext';
-import { useUpsertDataTableItem } from '@/ui/data/data-table/hooks/useUpsertDataTableItem';
-import { TableOptionsDropdown } from '@/ui/data/data-table/options/components/TableOptionsDropdown';
-import { tableColumnsScopedState } from '@/ui/data/data-table/states/tableColumnsScopedState';
-import { tableFiltersScopedState } from '@/ui/data/data-table/states/tableFiltersScopedState';
-import { tableSortsScopedState } from '@/ui/data/data-table/states/tableSortsScopedState';
+import { RecordTable } from '@/ui/object/record-table/components/RecordTable';
+import { RecordTableEffect } from '@/ui/object/record-table/components/RecordTableEffect';
+import { TableContext } from '@/ui/object/record-table/contexts/TableContext';
+import { useUpsertRecordTableItem } from '@/ui/object/record-table/hooks/useUpsertRecordTableItem';
+import { TableOptionsDropdown } from '@/ui/object/record-table/options/components/TableOptionsDropdown';
+import { tableColumnsScopedState } from '@/ui/object/record-table/states/tableColumnsScopedState';
+import { tableFiltersScopedState } from '@/ui/object/record-table/states/tableFiltersScopedState';
+import { tableSortsScopedState } from '@/ui/object/record-table/states/tableSortsScopedState';
 import { ViewBar } from '@/views/components/ViewBar';
 import { useViewFields } from '@/views/hooks/internal/useViewFields';
 import { useView } from '@/views/hooks/useView';
@@ -45,7 +45,7 @@ export const PersonTable = () => {
   const setTableSorts = useSetRecoilState(tableSortsScopedState(tableScopeId));
 
   const [updateEntityMutation] = useUpdateOnePersonMutation();
-  const upsertDataTableItem = useUpsertDataTableItem();
+  const upsertRecordTableItem = useUpsertRecordTableItem();
 
   const { persistViewFields } = useViewFields(viewScopeId);
   const { setCurrentViewFields } = useView({
@@ -62,7 +62,7 @@ export const PersonTable = () => {
         if (!data.updateOnePerson) {
           return;
         }
-        upsertDataTableItem(data.updateOnePerson);
+        upsertRecordTableItem(data.updateOnePerson);
       },
     });
   };
@@ -108,7 +108,7 @@ export const PersonTable = () => {
             optionsDropdownScopeId="table-dropdown-option"
           />
           <PersonTableEffect />
-          <DataTableEffect
+          <RecordTableEffect
             getRequestResultKey="people"
             useGetRequest={useGetPeopleQuery}
             getRequestOptimisticEffectDefinition={
@@ -119,7 +119,7 @@ export const PersonTable = () => {
             setContextMenuEntries={setContextMenuEntries}
             setActionBarEntries={setActionBarEntries}
           />
-          <DataTable
+          <RecordTable
             updateEntityMutation={({
               variables,
             }: {

front/src/modules/people/table/components/PersonTableEffect.tsx

@@ -1,9 +1,9 @@
 import { useEffect } from 'react';
 
 import { peopleAvailableFieldDefinitions } from '@/people/constants/peopleAvailableFieldDefinitions';
-import { availableTableColumnsScopedState } from '@/ui/data/data-table/states/availableTableColumnsScopedState';
-import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext';
-import { tableColumnsScopedState } from '@/ui/data/data-table/states/tableColumnsScopedState';
+import { availableTableColumnsScopedState } from '@/ui/object/record-table/states/availableTableColumnsScopedState';
+import { TableRecoilScopeContext } from '@/ui/object/record-table/states/recoil-scope-contexts/TableRecoilScopeContext';
+import { tableColumnsScopedState } from '@/ui/object/record-table/states/tableColumnsScopedState';
 import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState';
 import { useView } from '@/views/hooks/useView';
 import { ViewType } from '@/views/types/ViewType';

front/src/modules/pipeline/constants/pipelineAvailableFieldDefinitions.tsx

@@ -1,11 +1,3 @@
-import { ColumnDefinition } from '@/ui/data/data-table/types/ColumnDefinition';
-import {
-  FieldDateMetadata,
-  FieldMetadata,
-  FieldNumberMetadata,
-  FieldProbabilityMetadata,
-  FieldRelationMetadata,
-} from '@/ui/data/field/types/FieldMetadata';
 import {
   IconCalendarEvent,
   IconCurrencyDollar,
@@ -13,6 +5,14 @@ import {
   IconUser,
 } from '@/ui/display/icon';
 import { Entity } from '@/ui/input/relation-picker/types/EntityTypeForSelect';
+import {
+  FieldDateMetadata,
+  FieldMetadata,
+  FieldNumberMetadata,
+  FieldProbabilityMetadata,
+  FieldRelationMetadata,
+} from '@/ui/object/field/types/FieldMetadata';
+import { ColumnDefinition } from '@/ui/object/record-table/types/ColumnDefinition';
 import { Person } from '~/generated/graphql';
 
 export const pipelineAvailableFieldDefinitions: ColumnDefinition<FieldMetadata>[] =

front/src/modules/types/AppPath.ts

@@ -17,7 +17,7 @@ export enum AppPath {
   PersonShowPage = '/person/:personId',
   TasksPage = '/tasks',
   OpportunitiesPage = '/opportunities',
-  ObjectTablePage = '/objects/:objectNamePlural',
+  RecordTablePage = '/objects/:objectNamePlural',
 
   ObjectShowPage = '/object/:objectNameSingular/:objectId',
 

front/src/modules/ui/data/data-table/components/DataTableRow.tsx

@@ -1,54 +0,0 @@
-import { forwardRef } from 'react';
-import styled from '@emotion/styled';
-
-import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue';
-
-import { ColumnContext } from '../contexts/ColumnContext';
-import { useCurrentRowSelected } from '../hooks/useCurrentRowSelected';
-import { TableRecoilScopeContext } from '../states/recoil-scope-contexts/TableRecoilScopeContext';
-import { visibleTableColumnsScopedSelector } from '../states/selectors/visibleTableColumnsScopedSelector';
-
-import { CheckboxCell } from './CheckboxCell';
-import { DataTableCell } from './DataTableCell';
-
-const StyledRow = styled.tr<{ selected: boolean }>`
-  background: ${(props) =>
-    props.selected ? props.theme.accent.quaternary : 'none'};
-`;
-
-type DataTableRowProps = {
-  rowId: string;
-};
-
-export const DataTableRow = forwardRef<HTMLTableRowElement, DataTableRowProps>(
-  ({ rowId }, ref) => {
-    const visibleTableColumns = useRecoilScopedValue(
-      visibleTableColumnsScopedSelector,
-      TableRecoilScopeContext,
-    );
-    const { currentRowSelected } = useCurrentRowSelected();
-
-    return (
-      <StyledRow
-        ref={ref}
-        data-testid={`row-id-${rowId}`}
-        selected={currentRowSelected}
-        data-selectable-id={rowId}
-      >
-        <td>
-          <CheckboxCell />
-        </td>
-        {[...visibleTableColumns]
-          .sort((columnA, columnB) => columnA.position - columnB.position)
-          .map((column, columnIndex) => {
-            return (
-              <ColumnContext.Provider value={column} key={column.fieldId}>
-                <DataTableCell cellIndex={columnIndex} />
-              </ColumnContext.Provider>
-            );
-          })}
-        <td></td>
-      </StyledRow>
-    );
-  },
-);

front/src/modules/ui/data/data-table/states/isFetchingDataTableDataState.ts

@@ -1,6 +0,0 @@
-import { atom } from 'recoil';
-
-export const isFetchingDataTableDataState = atom<boolean>({
-  key: 'isFetchingDataTableDataState',
-  default: true,
-});

front/src/modules/ui/input/components/EntityTitleDoubleTextInput.tsx

@@ -1,7 +1,7 @@
 import { ChangeEvent } from 'react';
 import styled from '@emotion/styled';
 
-import { StyledInput } from '@/ui/data/field/meta-types/input/components/internal/TextInput';
+import { StyledInput } from '@/ui/object/field/meta-types/input/components/internal/TextInput';
 import { ComputeNodeDimensions } from '@/ui/utilities/dimensions/components/ComputeNodeDimensions';
 import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
 

front/src/modules/ui/layout/board/hooks/useBoardCardFields.ts

@@ -1,5 +1,5 @@
-import { ColumnDefinition } from '@/ui/data/data-table/types/ColumnDefinition';
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
+import { ColumnDefinition } from '@/ui/object/record-table/types/ColumnDefinition';
 import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState';
 
 import { boardCardFieldsScopedState } from '../states/boardCardFieldsScopedState';

front/src/modules/ui/layout/board/hooks/useBoardColumns.ts

@@ -1,6 +1,6 @@
 import { useRecoilState } from 'recoil';
 
-import { useMoveViewColumns } from '@/ui/data/data-table/hooks/useMoveViewColumns';
+import { useMoveViewColumns } from '@/ui/object/record-table/hooks/useMoveViewColumns';
 import { useUpdatePipelineStageMutation } from '~/generated/graphql';
 
 import { boardColumnsState } from '../states/boardColumnsState';

front/src/modules/ui/layout/board/states/availableBoardCardFieldsScopedState.ts

@@ -1,6 +1,6 @@
 import { atomFamily } from 'recoil';
 
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
 
 import { BoardFieldDefinition } from '../types/BoardFieldDefinition';
 

front/src/modules/ui/layout/board/states/boardCardFieldsScopedState.ts

@@ -1,6 +1,6 @@
 import { atomFamily } from 'recoil';
 
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
 
 import { BoardFieldDefinition } from '../types/BoardFieldDefinition';
 

front/src/modules/ui/layout/board/states/savedBoardCardFieldsFamilyState.ts

@@ -1,6 +1,6 @@
 import { atomFamily } from 'recoil';
 
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
 
 import { BoardFieldDefinition } from '../types/BoardFieldDefinition';
 

front/src/modules/ui/layout/board/states/selectors/boardCardFieldsByKeyScopedSelector.ts

@@ -1,6 +1,6 @@
 import { selectorFamily } from 'recoil';
 
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
 
 import { BoardFieldDefinition } from '../../types/BoardFieldDefinition';
 import { boardCardFieldsScopedState } from '../boardCardFieldsScopedState';

front/src/modules/ui/layout/board/states/selectors/savedBoardCardFieldsByKeyFamilySelector.ts

@@ -1,6 +1,6 @@
 import { selectorFamily } from 'recoil';
 
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
 
 import { BoardFieldDefinition } from '../../types/BoardFieldDefinition';
 import { savedBoardCardFieldsFamilyState } from '../savedBoardCardFieldsFamilyState';

front/src/modules/ui/layout/board/types/BoardFieldDefinition.ts

@@ -1,5 +1,5 @@
-import { FieldDefinition } from '@/ui/data/field/types/FieldDefinition';
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldDefinition } from '@/ui/object/field/types/FieldDefinition';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
 
 export type BoardFieldDefinition<T extends FieldMetadata> =
   FieldDefinition<T> & {

front/src/modules/ui/layout/board/types/BoardOptions.ts

@@ -1,7 +1,7 @@
 import { ComponentType } from 'react';
 
-import { FilterDefinitionByEntity } from '@/ui/data/filter/types/FilterDefinitionByEntity';
-import { SortDefinition } from '@/ui/data/sort/types/SortDefinition';
+import { FilterDefinitionByEntity } from '@/ui/object/filter/types/FilterDefinitionByEntity';
+import { SortDefinition } from '@/ui/object/sort/types/SortDefinition';
 import { PipelineProgress } from '~/generated/graphql';
 
 export type BoardOptions = {

front/src/modules/ui/layout/page/PageHotkeysEffect.tsx

@@ -1,4 +1,4 @@
-import { TableHotkeyScope } from '@/ui/data/data-table/types/TableHotkeyScope';
+import { TableHotkeyScope } from '@/ui/object/record-table/types/TableHotkeyScope';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
 
 type PageHotkeysEffectProps = {

front/src/modules/ui/navigation/action-bar/components/__stories__/ActionBar.stories.tsx

@@ -4,7 +4,7 @@ import { useSetRecoilState } from 'recoil';
 
 import { useCompanyTableContextMenuEntries } from '@/companies/hooks/useCompanyTableContextMenuEntries';
 import { CompanyTableMockMode } from '@/companies/table/components/CompanyTableMockMode';
-import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext';
+import { TableRecoilScopeContext } from '@/ui/object/record-table/states/recoil-scope-contexts/TableRecoilScopeContext';
 import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 

front/src/modules/ui/navigation/context-menu/components/__stories__/ContextMenu.stories.tsx

@@ -4,7 +4,7 @@ import { useSetRecoilState } from 'recoil';
 
 import { useCompanyTableContextMenuEntries } from '@/companies/hooks/useCompanyTableContextMenuEntries';
 import { CompanyTableMockMode } from '@/companies/table/components/CompanyTableMockMode';
-import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext';
+import { TableRecoilScopeContext } from '@/ui/object/record-table/states/recoil-scope-contexts/TableRecoilScopeContext';
 import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 

front/src/modules/ui/object/field/meta-types/__stories__/FieldContextProvider.tsx

@@ -1,7 +1,7 @@
 import {
   FieldContext,
   GenericFieldContextType,
-} from '@/ui/data/field/contexts/FieldContext';
+} from '@/ui/object/field/contexts/FieldContext';
 
 type FieldContextProviderProps = {
   children: React.ReactNode;

front/src/modules/ui/object/field/meta-types/display/components/DateFieldDisplay.tsx

@@ -1,4 +1,4 @@
-import { DateDisplay } from '@/ui/data/field/meta-types/display/content-display/components/DateDisplay';
+import { DateDisplay } from '@/ui/object/field/meta-types/display/content-display/components/DateDisplay';
 
 import { useDateField } from '../../hooks/useDateField';
 

front/src/modules/ui/object/field/meta-types/display/components/NumberFieldDisplay.tsx

@@ -1,4 +1,4 @@
-import { NumberDisplay } from '@/ui/data/field/meta-types/display/content-display/components/NumberDisplay';
+import { NumberDisplay } from '@/ui/object/field/meta-types/display/content-display/components/NumberDisplay';
 
 import { useNumberField } from '../../hooks/useNumberField';
 

front/src/modules/ui/object/field/meta-types/display/components/PhoneFieldDisplay.tsx

@@ -1,4 +1,4 @@
-import { PhoneDisplay } from '@/ui/data/field/meta-types/display/content-display/components/PhoneDisplay';
+import { PhoneDisplay } from '@/ui/object/field/meta-types/display/content-display/components/PhoneDisplay';
 
 import { usePhoneField } from '../../hooks/usePhoneField';
 

front/src/modules/ui/object/field/meta-types/display/components/TextFieldDisplay.tsx

@@ -1,4 +1,4 @@
-import { TextDisplay } from '@/ui/data/field/meta-types/display/content-display/components/TextDisplay';
+import { TextDisplay } from '@/ui/object/field/meta-types/display/content-display/components/TextDisplay';
 
 import { useTextField } from '../../hooks/useTextField';
 

front/src/modules/ui/object/field/meta-types/display/components/URLFieldDisplay.tsx

@@ -1,4 +1,4 @@
-import { URLDisplay } from '@/ui/data/field/meta-types/display/content-display/components/URLDisplay';
+import { URLDisplay } from '@/ui/object/field/meta-types/display/content-display/components/URLDisplay';
 
 import { useURLField } from '../../hooks/useURLField';