Split components into object-metadata and object-record (#2425)

* Split components into object-metadata and object-record

* Fix seed

front/codegen-metadata.js

@@ -1,6 +1,6 @@
 module.exports = {
   schema: process.env.REACT_APP_SERVER_BASE_URL + "/metadata",
-  documents: ['./src/modules/metadata/graphql/*.tsx', './src/modules/metadata/graphql/*.ts'],
+  documents: ['./src/modules/object-metadata/graphql/*.ts', './src/modules/object-record/graphql/*.tsx', './src/modules/metadata/graphql/*.ts'],
   overwrite: true,
   generates: {
     './src/generated-metadata/': {

front/codegen.js

@@ -1,6 +1,6 @@
 module.exports = {
   schema: process.env.REACT_APP_SERVER_BASE_URL + "/graphql",
-  documents: ['!./src/modules/metadata/**', './src/modules/**/*.tsx', './src/modules/**/*.ts'],
+  documents: ['!./src/modules/object-metadata/**', '!./src/modules/object-record/**', './src/modules/**/*.tsx', './src/modules/**/*.ts'],
   overwrite: true,
   generates: {
     './src/generated/graphql.tsx': {

front/src/App.tsx

@@ -1,6 +1,7 @@
 import { Navigate, Route, Routes, useLocation } from 'react-router-dom';
 
-import { RecordShowPage } from '@/metadata/components/RecordShowPage';
+import { RecordShowPage } from '@/object-record/components/RecordShowPage';
+import { RecordTablePage } from '@/object-record/components/RecordTablePage';
 import { AppPath } from '@/types/AppPath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { DefaultLayout } from '@/ui/layout/page/DefaultLayout';
@@ -32,7 +33,6 @@ import { SettingsWorkspaceMembers } from '~/pages/settings/SettingsWorkspaceMemb
 import { Tasks } from '~/pages/tasks/Tasks';
 import { getPageTitleFromPath } from '~/utils/title-utils';
 
-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';

front/src/AppNavbar.tsx

@@ -3,7 +3,7 @@ import { useLocation, useNavigate } from 'react-router-dom';
 import { useCurrentUserTaskCount } from '@/activities/tasks/hooks/useCurrentUserDueTaskCount';
 import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
 import { Favorites } from '@/favorites/components/Favorites';
-import { ObjectMetadataNavItems } from '@/metadata/components/ObjectMetadataNavItems';
+import { ObjectMetadataNavItems } from '@/object-metadata/components/ObjectMetadataNavItems';
 import { SettingsNavbar } from '@/settings/components/SettingsNavbar';
 import {
   IconBell,

front/src/generated-metadata/gql.ts

@@ -14,11 +14,11 @@ import { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/
  */
 const documents = {
     "\n  mutation CreateOneObjectMetadataItem($input: CreateOneObjectInput!) {\n    createOneObject(input: $input) {\n      id\n      dataSourceId\n      nameSingular\n      namePlural\n      labelSingular\n      labelPlural\n      description\n      icon\n      isCustom\n      isActive\n      createdAt\n      updatedAt\n    }\n  }\n": types.CreateOneObjectMetadataItemDocument,
-    "\n  mutation CreateOneMetadataField($input: CreateOneFieldInput!) {\n    createOneField(input: $input) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      placeholder\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n": types.CreateOneMetadataFieldDocument,
+    "\n  mutation CreateOneFieldMetadataItem($input: CreateOneFieldInput!) {\n    createOneField(input: $input) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      placeholder\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n": types.CreateOneFieldMetadataItemDocument,
-    "\n  mutation UpdateOneMetadataField(\n    $idToUpdate: ID!\n    $updatePayload: UpdateFieldInput!\n  ) {\n    updateOneField(input: { id: $idToUpdate, update: $updatePayload }) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      placeholder\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n": types.UpdateOneMetadataFieldDocument,
+    "\n  mutation UpdateOneFieldMetadataItem(\n    $idToUpdate: ID!\n    $updatePayload: UpdateFieldInput!\n  ) {\n    updateOneField(input: { id: $idToUpdate, update: $updatePayload }) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      placeholder\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n": types.UpdateOneFieldMetadataItemDocument,
     "\n  mutation UpdateOneObjectMetadataItem(\n    $idToUpdate: ID!\n    $updatePayload: UpdateObjectInput!\n  ) {\n    updateOneObject(input: { id: $idToUpdate, update: $updatePayload }) {\n      id\n      dataSourceId\n      nameSingular\n      namePlural\n      labelSingular\n      labelPlural\n      description\n      icon\n      isCustom\n      isActive\n      createdAt\n      updatedAt\n    }\n  }\n": types.UpdateOneObjectMetadataItemDocument,
     "\n  mutation DeleteOneObjectMetadataItem($idToDelete: ID!) {\n    deleteOneObject(input: { id: $idToDelete }) {\n      id\n      dataSourceId\n      nameSingular\n      namePlural\n      labelSingular\n      labelPlural\n      description\n      icon\n      isCustom\n      isActive\n      createdAt\n      updatedAt\n    }\n  }\n": types.DeleteOneObjectMetadataItemDocument,
-    "\n  mutation DeleteOneMetadataField($idToDelete: ID!) {\n    deleteOneField(input: { id: $idToDelete }) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      placeholder\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n": types.DeleteOneMetadataFieldDocument,
+    "\n  mutation DeleteOneFieldMetadataItem($idToDelete: ID!) {\n    deleteOneField(input: { id: $idToDelete }) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      placeholder\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n": types.DeleteOneFieldMetadataItemDocument,
     "\n  query ObjectMetadataItems {\n    objects(paging: { first: 1000 }) {\n      edges {\n        node {\n          id\n          dataSourceId\n          nameSingular\n          namePlural\n          labelSingular\n          labelPlural\n          description\n          icon\n          isCustom\n          isActive\n          createdAt\n          updatedAt\n          fields(paging: { first: 1000 }) {\n            edges {\n              node {\n                id\n                type\n                name\n                label\n                description\n                icon\n                placeholder\n                isCustom\n                isActive\n                isNullable\n                createdAt\n                updatedAt\n              }\n            }\n            pageInfo {\n              hasNextPage\n              hasPreviousPage\n              startCursor\n              endCursor\n            }\n            totalCount\n          }\n        }\n      }\n      pageInfo {\n        hasNextPage\n        hasPreviousPage\n        startCursor\n        endCursor\n      }\n      totalCount\n    }\n  }\n": types.ObjectMetadataItemsDocument,
 };
 
@@ -43,11 +43,11 @@ export function graphql(source: "\n  mutation CreateOneObjectMetadataItem($input
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  mutation CreateOneMetadataField($input: CreateOneFieldInput!) {\n    createOneField(input: $input) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      placeholder\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n"): (typeof documents)["\n  mutation CreateOneMetadataField($input: CreateOneFieldInput!) {\n    createOneField(input: $input) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      placeholder\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n"];
+export function graphql(source: "\n  mutation CreateOneFieldMetadataItem($input: CreateOneFieldInput!) {\n    createOneField(input: $input) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      placeholder\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n"): (typeof documents)["\n  mutation CreateOneFieldMetadataItem($input: CreateOneFieldInput!) {\n    createOneField(input: $input) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      placeholder\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  mutation UpdateOneMetadataField(\n    $idToUpdate: ID!\n    $updatePayload: UpdateFieldInput!\n  ) {\n    updateOneField(input: { id: $idToUpdate, update: $updatePayload }) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      placeholder\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n"): (typeof documents)["\n  mutation UpdateOneMetadataField(\n    $idToUpdate: ID!\n    $updatePayload: UpdateFieldInput!\n  ) {\n    updateOneField(input: { id: $idToUpdate, update: $updatePayload }) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      placeholder\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n"];
+export function graphql(source: "\n  mutation UpdateOneFieldMetadataItem(\n    $idToUpdate: ID!\n    $updatePayload: UpdateFieldInput!\n  ) {\n    updateOneField(input: { id: $idToUpdate, update: $updatePayload }) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      placeholder\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n"): (typeof documents)["\n  mutation UpdateOneFieldMetadataItem(\n    $idToUpdate: ID!\n    $updatePayload: UpdateFieldInput!\n  ) {\n    updateOneField(input: { id: $idToUpdate, update: $updatePayload }) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      placeholder\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
@@ -59,7 +59,7 @@ export function graphql(source: "\n  mutation DeleteOneObjectMetadataItem($idToD
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  mutation DeleteOneMetadataField($idToDelete: ID!) {\n    deleteOneField(input: { id: $idToDelete }) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      placeholder\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n"): (typeof documents)["\n  mutation DeleteOneMetadataField($idToDelete: ID!) {\n    deleteOneField(input: { id: $idToDelete }) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      placeholder\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n"];
+export function graphql(source: "\n  mutation DeleteOneFieldMetadataItem($idToDelete: ID!) {\n    deleteOneField(input: { id: $idToDelete }) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      placeholder\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n"): (typeof documents)["\n  mutation DeleteOneFieldMetadataItem($idToDelete: ID!) {\n    deleteOneField(input: { id: $idToDelete }) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      placeholder\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */

front/src/generated-metadata/graphql.ts

@@ -879,20 +879,20 @@ export type CreateOneObjectMetadataItemMutationVariables = Exact<{
 
 export type CreateOneObjectMetadataItemMutation = { __typename?: 'Mutation', createOneObject: { __typename?: 'object', id: string, dataSourceId: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, isCustom: boolean, isActive: boolean, createdAt: any, updatedAt: any } };
 
-export type CreateOneMetadataFieldMutationVariables = Exact<{
+export type CreateOneFieldMetadataItemMutationVariables = Exact<{
   input: CreateOneFieldInput;
 }>;
 
 
-export type CreateOneMetadataFieldMutation = { __typename?: 'Mutation', createOneField: { __typename?: 'field', id: string, type: FieldMetadataType, name: string, label: string, description?: string | null, icon?: string | null, placeholder?: string | null, isCustom: boolean, isActive: boolean, isNullable: boolean, createdAt: any, updatedAt: any } };
+export type CreateOneFieldMetadataItemMutation = { __typename?: 'Mutation', createOneField: { __typename?: 'field', id: string, type: FieldMetadataType, name: string, label: string, description?: string | null, icon?: string | null, placeholder?: string | null, isCustom: boolean, isActive: boolean, isNullable: boolean, createdAt: any, updatedAt: any } };
 
-export type UpdateOneMetadataFieldMutationVariables = Exact<{
+export type UpdateOneFieldMetadataItemMutationVariables = Exact<{
   idToUpdate: Scalars['ID']['input'];
   updatePayload: UpdateFieldInput;
 }>;
 
 
-export type UpdateOneMetadataFieldMutation = { __typename?: 'Mutation', updateOneField: { __typename?: 'field', id: string, type: FieldMetadataType, name: string, label: string, description?: string | null, icon?: string | null, placeholder?: string | null, isCustom: boolean, isActive: boolean, isNullable: boolean, createdAt: any, updatedAt: any } };
+export type UpdateOneFieldMetadataItemMutation = { __typename?: 'Mutation', updateOneField: { __typename?: 'field', id: string, type: FieldMetadataType, name: string, label: string, description?: string | null, icon?: string | null, placeholder?: string | null, isCustom: boolean, isActive: boolean, isNullable: boolean, createdAt: any, updatedAt: any } };
 
 export type UpdateOneObjectMetadataItemMutationVariables = Exact<{
   idToUpdate: Scalars['ID']['input'];
@@ -909,12 +909,12 @@ export type DeleteOneObjectMetadataItemMutationVariables = Exact<{
 
 export type DeleteOneObjectMetadataItemMutation = { __typename?: 'Mutation', deleteOneObject: { __typename?: 'ObjectDeleteResponse', id?: string | null, dataSourceId?: string | null, nameSingular?: string | null, namePlural?: string | null, labelSingular?: string | null, labelPlural?: string | null, description?: string | null, icon?: string | null, isCustom?: boolean | null, isActive?: boolean | null, createdAt?: any | null, updatedAt?: any | null } };
 
-export type DeleteOneMetadataFieldMutationVariables = Exact<{
+export type DeleteOneFieldMetadataItemMutationVariables = Exact<{
   idToDelete: Scalars['ID']['input'];
 }>;
 
 
-export type DeleteOneMetadataFieldMutation = { __typename?: 'Mutation', deleteOneField: { __typename?: 'FieldDeleteResponse', id?: string | null, type?: FieldMetadataType | null, name?: string | null, label?: string | null, description?: string | null, icon?: string | null, placeholder?: string | null, isCustom?: boolean | null, isActive?: boolean | null, isNullable?: boolean | null, createdAt?: any | null, updatedAt?: any | null } };
+export type DeleteOneFieldMetadataItemMutation = { __typename?: 'Mutation', deleteOneField: { __typename?: 'FieldDeleteResponse', id?: string | null, type?: FieldMetadataType | null, name?: string | null, label?: string | null, description?: string | null, icon?: string | null, placeholder?: string | null, isCustom?: boolean | null, isActive?: boolean | null, isNullable?: boolean | null, createdAt?: any | null, updatedAt?: any | null } };
 
 export type ObjectMetadataItemsQueryVariables = Exact<{ [key: string]: never; }>;
 
@@ -923,9 +923,9 @@ export type ObjectMetadataItemsQuery = { __typename?: 'Query', objects: { __type
 
 
 export const CreateOneObjectMetadataItemDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateOneObjectMetadataItem"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateOneObjectInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createOneObject"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"dataSourceId"}},{"kind":"Field","name":{"kind":"Name","value":"nameSingular"}},{"kind":"Field","name":{"kind":"Name","value":"namePlural"}},{"kind":"Field","name":{"kind":"Name","value":"labelSingular"}},{"kind":"Field","name":{"kind":"Name","value":"labelPlural"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<CreateOneObjectMetadataItemMutation, CreateOneObjectMetadataItemMutationVariables>;
-export const CreateOneMetadataFieldDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateOneMetadataField"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateOneFieldInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createOneField"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"placeholder"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"isNullable"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<CreateOneMetadataFieldMutation, CreateOneMetadataFieldMutationVariables>;
+export const CreateOneFieldMetadataItemDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateOneFieldMetadataItem"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateOneFieldInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createOneField"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"placeholder"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"isNullable"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<CreateOneFieldMetadataItemMutation, CreateOneFieldMetadataItemMutationVariables>;
-export const UpdateOneMetadataFieldDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateOneMetadataField"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"idToUpdate"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"updatePayload"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateFieldInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateOneField"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"idToUpdate"}}},{"kind":"ObjectField","name":{"kind":"Name","value":"update"},"value":{"kind":"Variable","name":{"kind":"Name","value":"updatePayload"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"placeholder"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"isNullable"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<UpdateOneMetadataFieldMutation, UpdateOneMetadataFieldMutationVariables>;
+export const UpdateOneFieldMetadataItemDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateOneFieldMetadataItem"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"idToUpdate"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"updatePayload"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateFieldInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateOneField"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"idToUpdate"}}},{"kind":"ObjectField","name":{"kind":"Name","value":"update"},"value":{"kind":"Variable","name":{"kind":"Name","value":"updatePayload"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"placeholder"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"isNullable"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<UpdateOneFieldMetadataItemMutation, UpdateOneFieldMetadataItemMutationVariables>;
 export const UpdateOneObjectMetadataItemDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateOneObjectMetadataItem"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"idToUpdate"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"updatePayload"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateObjectInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateOneObject"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"idToUpdate"}}},{"kind":"ObjectField","name":{"kind":"Name","value":"update"},"value":{"kind":"Variable","name":{"kind":"Name","value":"updatePayload"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"dataSourceId"}},{"kind":"Field","name":{"kind":"Name","value":"nameSingular"}},{"kind":"Field","name":{"kind":"Name","value":"namePlural"}},{"kind":"Field","name":{"kind":"Name","value":"labelSingular"}},{"kind":"Field","name":{"kind":"Name","value":"labelPlural"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<UpdateOneObjectMetadataItemMutation, UpdateOneObjectMetadataItemMutationVariables>;
 export const DeleteOneObjectMetadataItemDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteOneObjectMetadataItem"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"idToDelete"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteOneObject"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"idToDelete"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"dataSourceId"}},{"kind":"Field","name":{"kind":"Name","value":"nameSingular"}},{"kind":"Field","name":{"kind":"Name","value":"namePlural"}},{"kind":"Field","name":{"kind":"Name","value":"labelSingular"}},{"kind":"Field","name":{"kind":"Name","value":"labelPlural"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<DeleteOneObjectMetadataItemMutation, DeleteOneObjectMetadataItemMutationVariables>;
-export const DeleteOneMetadataFieldDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteOneMetadataField"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"idToDelete"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteOneField"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"idToDelete"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"placeholder"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"isNullable"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<DeleteOneMetadataFieldMutation, DeleteOneMetadataFieldMutationVariables>;
+export const DeleteOneFieldMetadataItemDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteOneFieldMetadataItem"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"idToDelete"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteOneField"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"idToDelete"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"placeholder"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"isNullable"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<DeleteOneFieldMetadataItemMutation, DeleteOneFieldMetadataItemMutationVariables>;
 export const ObjectMetadataItemsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ObjectMetadataItems"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"objects"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"paging"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"1000"}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"edges"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"node"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"dataSourceId"}},{"kind":"Field","name":{"kind":"Name","value":"nameSingular"}},{"kind":"Field","name":{"kind":"Name","value":"namePlural"}},{"kind":"Field","name":{"kind":"Name","value":"labelSingular"}},{"kind":"Field","name":{"kind":"Name","value":"labelPlural"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"fields"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"paging"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"1000"}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"edges"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"node"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"placeholder"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"isNullable"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"pageInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"hasNextPage"}},{"kind":"Field","name":{"kind":"Name","value":"hasPreviousPage"}},{"kind":"Field","name":{"kind":"Name","value":"startCursor"}},{"kind":"Field","name":{"kind":"Name","value":"endCursor"}}]}},{"kind":"Field","name":{"kind":"Name","value":"totalCount"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"pageInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"hasNextPage"}},{"kind":"Field","name":{"kind":"Name","value":"hasPreviousPage"}},{"kind":"Field","name":{"kind":"Name","value":"startCursor"}},{"kind":"Field","name":{"kind":"Name","value":"endCursor"}}]}},{"kind":"Field","name":{"kind":"Name","value":"totalCount"}}]}}]}}]} as unknown as DocumentNode<ObjectMetadataItemsQuery, ObjectMetadataItemsQueryVariables>;

front/src/index.tsx

@@ -7,6 +7,7 @@ import { RecoilRoot } from 'recoil';
 import { ApolloProvider } from '@/apollo/components/ApolloProvider';
 import { ClientConfigProvider } from '@/client-config/components/ClientConfigProvider';
 import { RecoilDebugObserverEffect } from '@/debug/components/RecoilDebugObserver';
+import { ApolloMetadataClientProvider } from '@/object-metadata/components/ApolloMetadataClientProvider';
 import { DialogManager } from '@/ui/feedback/dialog-manager/components/DialogManager';
 import { DialogManagerScope } from '@/ui/feedback/dialog-manager/scopes/DialogManagerScope';
 import { SnackBarProvider } from '@/ui/feedback/snack-bar/components/SnackBarProvider';
@@ -17,7 +18,6 @@ import { UserProvider } from '@/users/components/UserProvider';
 import '@emotion/react';
 
 import { PageChangeEffect } from './effect-components/PageChangeEffect';
-import { ApolloMetadataClientProvider } from './modules/metadata/components/ApolloMetadataClientProvider';
 import { App } from './App';
 
 import './index.css';

front/src/modules/apollo/optimistic-effect/hooks/useOptimisticEffect.ts

@@ -8,8 +8,8 @@ import { isNonEmptyArray } from '@sniptt/guards';
 import { useRecoilCallback } from 'recoil';
 
 import { GET_COMPANIES } from '@/companies/graphql/queries/getCompanies';
-import { ObjectMetadataItem } from '@/metadata/types/ObjectMetadataItem';
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { generateFindManyCustomObjectsQuery } from '@/metadata/utils/generateFindManyCustomObjectsQuery';
+import { generateFindManyCustomObjectsQuery } from '@/object-record/utils/generateFindManyCustomObjectsQuery';
 import { GET_PEOPLE } from '@/people/graphql/queries/getPeople';
 import { GET_API_KEYS } from '@/settings/developers/graphql/queries/getApiKeys';
 import {

front/src/modules/apollo/optimistic-effect/types/OptimisticEffectDefinition.ts

@@ -1,6 +1,6 @@
 import { DocumentNode } from 'graphql';
 
-import { ObjectMetadataItem } from '@/metadata/types/ObjectMetadataItem';
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 
 import { OptimisticEffectResolver } from './OptimisticEffectResolver';
 

front/src/modules/apollo/optimistic-effect/types/internal/OptimisticEffect.ts

@@ -1,6 +1,6 @@
 import { ApolloCache, DocumentNode, OperationVariables } from '@apollo/client';
 
-import { ObjectMetadataItem } from '@/metadata/types/ObjectMetadataItem';
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 
 type OptimisticEffectWriter<T> = ({
   cache,

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

@@ -1,46 +0,0 @@
-import { useMemo } from 'react';
-import { useQuery } from '@apollo/client';
-
-import {
-  ObjectMetadataItemsQuery,
-  ObjectMetadataItemsQueryVariables,
-} from '~/generated-metadata/graphql';
-
-import { FIND_MANY_METADATA_OBJECTS } from '../graphql/queries';
-import { formatPagedObjectMetadataItemsToObjectMetadataItems } from '../utils/formatPagedObjectMetadataItemsToObjectMetadataItems';
-
-import { useApolloMetadataClient } from './useApolloMetadataClient';
-
-// TODO: test fetchMore
-export const useFindAllMetadata = () => {
-  const apolloMetadataClient = useApolloMetadataClient();
-
-  const { data, fetchMore: fetchMoreInternal } = useQuery<
-    ObjectMetadataItemsQuery,
-    ObjectMetadataItemsQueryVariables
-  >(FIND_MANY_METADATA_OBJECTS, {
-    client: apolloMetadataClient ?? ({} as any),
-    skip: !apolloMetadataClient,
-  });
-
-  const hasMore = data?.objects?.pageInfo?.hasNextPage;
-
-  const fetchMore = () =>
-    fetchMoreInternal({
-      variables: {
-        afterCursor: data?.objects?.pageInfo?.endCursor,
-      },
-    });
-
-  const objectMetadataItems = useMemo(() => {
-    return formatPagedObjectMetadataItemsToObjectMetadataItems({
-      pagedObjectMetadataItems: data,
-    });
-  }, [data]);
-
-  return {
-    objectMetadataItems,
-    hasMore,
-    fetchMore,
-  };
-};

front/src/modules/metadata/states/fetchMoreObjectsFamilyState.ts

@@ -1,8 +0,0 @@
-import { atomFamily } from 'recoil';
-
-export const fetchMoreObjectsFamilyState = atomFamily<
-  { fetchMore: () => void },
-  string
->({
-  key: 'fetchMoreObjectsFamilyState',
-});

front/src/modules/object-metadata/graphql/mutations.ts

@@ -20,7 +20,7 @@ export const CREATE_ONE_METADATA_OBJECT = gql`
 `;
 
 export const CREATE_ONE_METADATA_FIELD = gql`
-  mutation CreateOneMetadataField($input: CreateOneFieldInput!) {
+  mutation CreateOneFieldMetadataItem($input: CreateOneFieldInput!) {
     createOneField(input: $input) {
       id
       type
@@ -39,7 +39,7 @@ export const CREATE_ONE_METADATA_FIELD = gql`
 `;
 
 export const UPDATE_ONE_METADATA_FIELD = gql`
-  mutation UpdateOneMetadataField(
+  mutation UpdateOneFieldMetadataItem(
     $idToUpdate: ID!
     $updatePayload: UpdateFieldInput!
   ) {
@@ -102,7 +102,7 @@ export const DELETE_ONE_METADATA_OBJECT = gql`
 `;
 
 export const DELETE_ONE_METADATA_FIELD = gql`
-  mutation DeleteOneMetadataField($idToDelete: ID!) {
+  mutation DeleteOneFieldMetadataItem($idToDelete: ID!) {
     deleteOneField(input: { id: $idToDelete }) {
       id
       type

front/src/modules/object-metadata/hooks/useCreateOneFieldMetadataItem.ts

@@ -4,8 +4,8 @@ import { getOperationName } from '@apollo/client/utilities';
 import { FieldType } from '@/ui/object/field/types/FieldType';
 import { FieldMetadataType } from '~/generated/graphql';
 import {
-  CreateOneMetadataFieldMutation,
+  CreateOneFieldMetadataItemMutation,
-  CreateOneMetadataFieldMutationVariables,
+  CreateOneFieldMetadataItemMutationVariables,
 } from '~/generated-metadata/graphql';
 
 import { CREATE_ONE_METADATA_FIELD } from '../graphql/mutations';
@@ -13,24 +13,26 @@ import { FIND_MANY_METADATA_OBJECTS } from '../graphql/queries';
 
 import { useApolloMetadataClient } from './useApolloMetadataClient';
 
-type CreateOneMetadataFieldArgs = Omit<
+type CreateOneFieldMetadataItemArgs = Omit<
-  CreateOneMetadataFieldMutationVariables['input']['field'],
+  CreateOneFieldMetadataItemMutationVariables['input']['field'],
   'type'
 > & {
   type: FieldType;
 };
 
-export const useCreateOneMetadataField = () => {
+export const useCreateOneFieldMetadataItem = () => {
   const apolloMetadataClient = useApolloMetadataClient();
 
   const [mutate] = useMutation<
-    CreateOneMetadataFieldMutation,
+    CreateOneFieldMetadataItemMutation,
-    CreateOneMetadataFieldMutationVariables
+    CreateOneFieldMetadataItemMutationVariables
   >(CREATE_ONE_METADATA_FIELD, {
     client: apolloMetadataClient ?? ({} as ApolloClient<any>),
   });
 
-  const createOneMetadataField = async (input: CreateOneMetadataFieldArgs) => {
+  const createOneFieldMetadataItem = async (
+    input: CreateOneFieldMetadataItemArgs,
+  ) => {
     return await mutate({
       variables: {
         input: {
@@ -46,6 +48,6 @@ export const useCreateOneMetadataField = () => {
   };
 
   return {
-    createOneMetadataField,
+    createOneFieldMetadataItem,
   };
 };

front/src/modules/object-metadata/hooks/useCreateOneObjectMetadataItem.ts

@@ -11,7 +11,7 @@ import { FIND_MANY_METADATA_OBJECTS } from '../graphql/queries';
 
 import { useApolloMetadataClient } from './useApolloMetadataClient';
 
-export const useCreateOneObjectMetadataItem = () => {
+export const useCreateOneObjectRecordMetadataItem = () => {
   const apolloMetadataClient = useApolloMetadataClient();
 
   const [mutate] = useMutation<

front/src/modules/object-metadata/hooks/useDeleteOneFieldMetadataItem.ts

@@ -2,8 +2,8 @@ import { ApolloClient, useMutation } from '@apollo/client';
 import { getOperationName } from '@apollo/client/utilities';
 
 import {
-  DeleteOneMetadataFieldMutation,
+  DeleteOneFieldMetadataItemMutation,
-  DeleteOneMetadataFieldMutationVariables,
+  DeleteOneFieldMetadataItemMutationVariables,
 } from '~/generated-metadata/graphql';
 
 import { DELETE_ONE_METADATA_FIELD } from '../graphql/mutations';
@@ -11,18 +11,18 @@ import { FIND_MANY_METADATA_OBJECTS } from '../graphql/queries';
 
 import { useApolloMetadataClient } from './useApolloMetadataClient';
 
-export const useDeleteOneMetadataField = () => {
+export const useDeleteOneFieldMetadataItem = () => {
   const apolloMetadataClient = useApolloMetadataClient();
 
   const [mutate] = useMutation<
-    DeleteOneMetadataFieldMutation,
+    DeleteOneFieldMetadataItemMutation,
-    DeleteOneMetadataFieldMutationVariables
+    DeleteOneFieldMetadataItemMutationVariables
   >(DELETE_ONE_METADATA_FIELD, {
     client: apolloMetadataClient ?? ({} as ApolloClient<any>),
   });
 
-  const deleteOneMetadataField = async (
+  const deleteOneFieldMetadataItem = async (
-    idToDelete: DeleteOneMetadataFieldMutationVariables['idToDelete'],
+    idToDelete: DeleteOneFieldMetadataItemMutationVariables['idToDelete'],
   ) => {
     return await mutate({
       variables: {
@@ -34,6 +34,6 @@ export const useDeleteOneMetadataField = () => {
   };
 
   return {
-    deleteOneMetadataField,
+    deleteOneFieldMetadataItem,
   };
 };

front/src/modules/object-metadata/hooks/useFieldMetadataItem.ts

@@ -1,16 +1,16 @@
 import { MetadataFieldDataType } from '@/settings/data-model/types/ObjectFieldDataType';
 import { Field } from '~/generated/graphql';
 
-import { formatMetadataFieldInput } from '../utils/formatMetadataFieldInput';
+import { formatFieldMetadataItemInput } from '../utils/formatFieldMetadataItemInput';
 
-import { useCreateOneMetadataField } from './useCreateOneMetadataField';
+import { useCreateOneFieldMetadataItem } from './useCreateOneFieldMetadataItem';
-import { useDeleteOneMetadataField } from './useDeleteOneMetadataField';
+import { useDeleteOneFieldMetadataItem } from './useDeleteOneFieldMetadataItem';
-import { useUpdateOneMetadataField } from './useUpdateOneMetadataField';
+import { useUpdateOneFieldMetadataItem } from './useUpdateOneFieldMetadataItem';
 
-export const useMetadataField = () => {
+export const useFieldMetadataItem = () => {
-  const { createOneMetadataField } = useCreateOneMetadataField();
+  const { createOneFieldMetadataItem } = useCreateOneFieldMetadataItem();
-  const { updateOneMetadataField } = useUpdateOneMetadataField();
+  const { updateOneFieldMetadataItem } = useUpdateOneFieldMetadataItem();
-  const { deleteOneMetadataField } = useDeleteOneMetadataField();
+  const { deleteOneFieldMetadataItem } = useDeleteOneFieldMetadataItem();
 
   const createMetadataField = (
     input: Pick<Field, 'label' | 'icon' | 'description'> & {
@@ -18,8 +18,8 @@ export const useMetadataField = () => {
       type: MetadataFieldDataType;
     },
   ) =>
-    createOneMetadataField({
+    createOneFieldMetadataItem({
-      ...formatMetadataFieldInput(input),
+      ...formatFieldMetadataItemInput(input),
       objectMetadataId: input.objectMetadataId,
       type: input.type,
     });
@@ -27,25 +27,25 @@ export const useMetadataField = () => {
   const editMetadataField = (
     input: Pick<Field, 'id' | 'label' | 'icon' | 'description'>,
   ) =>
-    updateOneMetadataField({
+    updateOneFieldMetadataItem({
       fieldMetadataIdToUpdate: input.id,
-      updatePayload: formatMetadataFieldInput(input),
+      updatePayload: formatFieldMetadataItemInput(input),
     });
 
   const activateMetadataField = (metadataField: Field) =>
-    updateOneMetadataField({
+    updateOneFieldMetadataItem({
       fieldMetadataIdToUpdate: metadataField.id,
       updatePayload: { isActive: true },
     });
 
   const disableMetadataField = (metadataField: Field) =>
-    updateOneMetadataField({
+    updateOneFieldMetadataItem({
       fieldMetadataIdToUpdate: metadataField.id,
       updatePayload: { isActive: false },
     });
 
   const eraseMetadataField = (metadataField: Field) =>
-    deleteOneMetadataField(metadataField.id);
+    deleteOneFieldMetadataItem(metadataField.id);
 
   return {
     activateMetadataField,

front/src/modules/object-metadata/hooks/useFindOneObjectMetadataItem.ts

@@ -1,5 +1,10 @@
 import { gql } from '@apollo/client';
 
+import { generateCreateOneObjectMutation } from '@/object-record/utils/generateCreateOneObjectMutation';
+import { generateDeleteOneObjectMutation } from '@/object-record/utils/generateDeleteOneObjectMutation';
+import { generateFindManyCustomObjectsQuery } from '@/object-record/utils/generateFindManyCustomObjectsQuery';
+import { generateFindOneCustomObjectQuery } from '@/object-record/utils/generateFindOneCustomObjectQuery';
+import { generateUpdateOneObjectMutation } from '@/object-record/utils/generateUpdateOneObjectMutation';
 import { useLazyLoadIcons } from '@/ui/input/hooks/useLazyLoadIcons';
 import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
 import { FilterDefinition } from '@/ui/object/object-filter-dropdown/types/FilterDefinition';
@@ -7,14 +12,9 @@ import { SortDefinition } from '@/ui/object/object-sort-dropdown/types/SortDefin
 import { ColumnDefinition } from '@/ui/object/record-table/types/ColumnDefinition';
 
 import { ObjectMetadataItemIdentifier } from '../types/ObjectMetadataItemIdentifier';
-import { formatMetadataFieldAsColumnDefinition } from '../utils/formatMetadataFieldAsColumnDefinition';
+import { formatFieldMetadataItemAsColumnDefinition } from '../utils/formatFieldMetadataItemAsColumnDefinition';
-import { formatMetadataFieldAsFilterDefinition } from '../utils/formatMetadataFieldAsFilterDefinition';
+import { formatFieldMetadataItemAsFilterDefinition } from '../utils/formatFieldMetadataItemAsFilterDefinition';
-import { formatMetadataFieldAsSortDefinition } from '../utils/formatMetadataFieldAsSortDefinition';
+import { formatFieldMetadataItemAsSortDefinition } from '../utils/formatFieldMetadataItemAsSortDefinition';
-import { generateCreateOneObjectMutation } from '../utils/generateCreateOneObjectMutation';
-import { generateDeleteOneObjectMutation } from '../utils/generateDeleteOneObjectMutation';
-import { generateFindManyCustomObjectsQuery } from '../utils/generateFindManyCustomObjectsQuery';
-import { generateFindOneCustomObjectQuery } from '../utils/generateFindOneCustomObjectQuery';
-import { generateUpdateOneObjectMutation } from '../utils/generateUpdateOneObjectMutation';
 
 import { useFindManyObjectMetadataItems } from './useFindManyObjectMetadataItems';
 
@@ -57,7 +57,7 @@ export const useFindOneObjectMetadataItem = ({
   const columnDefinitions: ColumnDefinition<FieldMetadata>[] =
     foundObjectMetadataItem
       ? activeFields.map((field, index) =>
-          formatMetadataFieldAsColumnDefinition({
+          formatFieldMetadataItemAsColumnDefinition({
             position: index,
             field,
             objectMetadataItem: foundObjectMetadataItem,
@@ -67,14 +67,14 @@ export const useFindOneObjectMetadataItem = ({
       : [];
 
   const filterDefinitions: FilterDefinition[] = activeFields.map((field) =>
-    formatMetadataFieldAsFilterDefinition({
+    formatFieldMetadataItemAsFilterDefinition({
       field,
       icons,
     }),
   );
 
   const sortDefinitions: SortDefinition[] = activeFields.map((field) =>
-    formatMetadataFieldAsSortDefinition({
+    formatFieldMetadataItemAsSortDefinition({
       field,
       icons,
     }),

front/src/modules/object-metadata/hooks/useObjectMetadataItemForSettings.ts

@@ -2,7 +2,7 @@ import { ObjectMetadataItem } from '../types/ObjectMetadataItem';
 import { formatObjectMetadataItemInput } from '../utils/formatObjectMetadataItemInput';
 import { getObjectSlug } from '../utils/getObjectSlug';
 
-import { useCreateOneObjectMetadataItem } from './useCreateOneObjectMetadataItem';
+import { useCreateOneObjectRecordMetadataItem } from './useCreateOneObjectMetadataItem';
 import { useDeleteOneObjectMetadataItem } from './useDeleteOneObjectMetadataItem';
 import { useFindManyObjectMetadataItems } from './useFindManyObjectMetadataItems';
 import { useUpdateOneObjectMetadataItem } from './useUpdateOneObjectMetadataItem';
@@ -23,7 +23,8 @@ export const useObjectMetadataItemForSettings = () => {
         getObjectSlug(activeObjectMetadataItem) === slug,
     );
 
-  const { createOneObjectMetadataItem } = useCreateOneObjectMetadataItem();
+  const { createOneObjectMetadataItem } =
+    useCreateOneObjectRecordMetadataItem();
   const { updateOneObjectMetadataItem } = useUpdateOneObjectMetadataItem();
   const { deleteOneObjectMetadataItem } = useDeleteOneObjectMetadataItem();
 

front/src/modules/object-metadata/hooks/useUpdateOneFieldMetadataItem.ts

@@ -2,8 +2,8 @@ import { useMutation } from '@apollo/client';
 import { getOperationName } from '@apollo/client/utilities';
 
 import {
-  UpdateOneMetadataFieldMutation,
+  UpdateOneFieldMetadataItemMutation,
-  UpdateOneMetadataFieldMutationVariables,
+  UpdateOneFieldMetadataItemMutationVariables,
 } from '~/generated-metadata/graphql';
 
 import { UPDATE_ONE_METADATA_FIELD } from '../graphql/mutations';
@@ -11,23 +11,23 @@ import { FIND_MANY_METADATA_OBJECTS } from '../graphql/queries';
 
 import { useApolloMetadataClient } from './useApolloMetadataClient';
 
-export const useUpdateOneMetadataField = () => {
+export const useUpdateOneFieldMetadataItem = () => {
   const apolloMetadataClient = useApolloMetadataClient();
 
   const [mutate] = useMutation<
-    UpdateOneMetadataFieldMutation,
+    UpdateOneFieldMetadataItemMutation,
-    UpdateOneMetadataFieldMutationVariables
+    UpdateOneFieldMetadataItemMutationVariables
   >(UPDATE_ONE_METADATA_FIELD, {
     client: apolloMetadataClient ?? undefined,
   });
 
-  const updateOneMetadataField = async ({
+  const updateOneFieldMetadataItem = async ({
     fieldMetadataIdToUpdate,
     updatePayload,
   }: {
-    fieldMetadataIdToUpdate: UpdateOneMetadataFieldMutationVariables['idToUpdate'];
+    fieldMetadataIdToUpdate: UpdateOneFieldMetadataItemMutationVariables['idToUpdate'];
     updatePayload: Pick<
-      UpdateOneMetadataFieldMutationVariables['updatePayload'],
+      UpdateOneFieldMetadataItemMutationVariables['updatePayload'],
       'description' | 'icon' | 'isActive' | 'label' | 'name'
     >;
   }) => {
@@ -45,6 +45,6 @@ export const useUpdateOneMetadataField = () => {
   };
 
   return {
-    updateOneMetadataField,
+    updateOneFieldMetadataItem,
   };
 };

front/src/modules/object-metadata/utils/formatFieldMetadataItemAsColumnDefinition.ts

@@ -7,7 +7,7 @@ import { ObjectMetadataItem } from '../types/ObjectMetadataItem';
 
 import { parseFieldType } from './parseFieldType';
 
-export const formatMetadataFieldAsColumnDefinition = ({
+export const formatFieldMetadataItemAsColumnDefinition = ({
   position,
   field,
   objectMetadataItem,

front/src/modules/object-metadata/utils/formatFieldMetadataItemAsFilterDefinition.ts

@@ -2,7 +2,7 @@ import { FilterDefinition } from '@/ui/object/object-filter-dropdown/types/Filte
 
 import { ObjectMetadataItem } from '../types/ObjectMetadataItem';
 
-export const formatMetadataFieldAsFilterDefinition = ({
+export const formatFieldMetadataItemAsFilterDefinition = ({
   field,
   icons,
 }: {

front/src/modules/object-metadata/utils/formatFieldMetadataItemAsSortDefinition.ts

@@ -2,7 +2,7 @@ import { SortDefinition } from '@/ui/object/object-sort-dropdown/types/SortDefin
 
 import { ObjectMetadataItem } from '../types/ObjectMetadataItem';
 
-export const formatMetadataFieldAsSortDefinition = ({
+export const formatFieldMetadataItemAsSortDefinition = ({
   field,
   icons,
 }: {

front/src/modules/object-metadata/utils/formatFieldMetadataItemInput.ts

@@ -2,7 +2,7 @@ import toCamelCase from 'lodash.camelcase';
 
 import { Field } from '~/generated-metadata/graphql';
 
-export const formatMetadataFieldInput = (
+export const formatFieldMetadataItemInput = (
   input: Pick<Field, 'label' | 'icon' | 'description'>,
 ) => ({
   description: input.description?.trim() ?? null,

front/src/modules/object-record/components/RecordShowPage.tsx

@@ -3,6 +3,8 @@ import { DateTime } from 'luxon';
 import { useRecoilState } from 'recoil';
 
 import { ActivityTargetableEntityType } from '@/activities/types/ActivityTargetableEntity';
+import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
+import { formatFieldMetadataItemAsColumnDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsColumnDefinition';
 import { IconBuildingSkyscraper } from '@/ui/display/icon';
 import { useLazyLoadIcons } from '@/ui/input/hooks/useLazyLoadIcons';
 import { PageBody } from '@/ui/layout/page/PageBody';
@@ -23,10 +25,8 @@ import { InlineCellHotkeyScope } from '@/ui/object/record-inline-cell/types/Inli
 import { PageTitle } from '@/ui/utilities/page-title/PageTitle';
 import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
 
-import { useFindOneObject } from '../hooks/useFindOneObject';
+import { useFindOneObjectRecord } from '../hooks/useFindOneObjectRecord';
-import { useFindOneObjectMetadataItem } from '../hooks/useFindOneObjectMetadataItem';
+import { useUpdateOneObjectRecord } from '../hooks/useUpdateOneObjectRecord';
-import { useUpdateOneObject } from '../hooks/useUpdateOneObject';
-import { formatMetadataFieldAsColumnDefinition } from '../utils/formatMetadataFieldAsColumnDefinition';
 
 export const RecordShowPage = () => {
   const { objectNameSingular, objectMetadataId } = useParams<{
@@ -44,7 +44,7 @@ export const RecordShowPage = () => {
     entityFieldsFamilyState(objectMetadataId ?? ''),
   );
 
-  const { object } = useFindOneObject({
+  const { object } = useFindOneObjectRecord({
     objectMetadataId: objectMetadataId,
     objectNameSingular,
     onCompleted: (data) => {
@@ -53,7 +53,7 @@ export const RecordShowPage = () => {
   });
 
   const useUpdateOneObjectMutation: () => [(params: any) => any, any] = () => {
-    const { updateOneObject } = useUpdateOneObject({
+    const { updateOneObject } = useUpdateOneObjectRecord({
       objectNameSingular,
     });
 
@@ -130,7 +130,7 @@ export const RecordShowPage = () => {
                             entityId: object.id,
                             recoilScopeId: object.id + metadataField.id,
                             fieldDefinition:
-                              formatMetadataFieldAsColumnDefinition({
+                              formatFieldMetadataItemAsColumnDefinition({
                                 field: metadataField,
                                 position: index,
                                 objectMetadataItem: foundObjectMetadataItem,

front/src/modules/object-record/components/RecordTableContainer.tsx

@@ -1,6 +1,7 @@
 import styled from '@emotion/styled';
 import { useRecoilCallback } from 'recoil';
 
+import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
 import { RecordTable } from '@/ui/object/record-table/components/RecordTable';
 import { TableOptionsDropdownId } from '@/ui/object/record-table/constants/TableOptionsDropdownId';
 import { useRecordTable } from '@/ui/object/record-table/hooks/useRecordTable';
@@ -15,8 +16,7 @@ import { mapViewFieldsToColumnDefinitions } from '@/views/utils/mapViewFieldsToC
 import { mapViewFiltersToFilters } from '@/views/utils/mapViewFiltersToFilters';
 import { mapViewSortsToSorts } from '@/views/utils/mapViewSortsToSorts';
 
-import { useFindOneObjectMetadataItem } from '../hooks/useFindOneObjectMetadataItem';
+import { useUpdateOneObjectRecord } from '../hooks/useUpdateOneObjectRecord';
-import { useUpdateOneObject } from '../hooks/useUpdateOneObject';
 
 import { RecordTableEffect } from './RecordTableEffect';
 
@@ -37,7 +37,7 @@ export const RecordTableContainer = ({
       objectNamePlural,
     });
 
-  const { updateOneObject } = useUpdateOneObject({
+  const { updateOneObject } = useUpdateOneObjectRecord({
     objectNamePlural,
     objectNameSingular: foundObjectMetadataItem?.nameSingular,
   });

front/src/modules/object-record/components/RecordTableEffect.tsx

@@ -1,12 +1,10 @@
 import { useEffect } from 'react';
 
+import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
 import { useRecordTable } from '@/ui/object/record-table/hooks/useRecordTable';
 import { useView } from '@/views/hooks/useView';
 import { ViewType } from '@/views/types/ViewType';
 
-import { useFindOneObjectMetadataItem } from '../hooks/useFindOneObjectMetadataItem';
-import { useTableObjects } from '../hooks/useTableObjects';
-
 export const RecordTableEffect = () => {
   const { scopeId: objectNamePlural, setAvailableTableColumns } =
     useRecordTable();
@@ -28,7 +26,7 @@ export const RecordTableEffect = () => {
     setViewObjectMetadataId,
   } = useView();
 
-  useTableObjects();
+  useRecordTable();
 
   useEffect(() => {
     if (!foundObjectMetadataItem) {

front/src/modules/object-record/components/RecordTablePage.tsx

@@ -2,8 +2,8 @@ import { useEffect } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import styled from '@emotion/styled';
 
-import { RecordTableContainer } from '@/metadata/components/RecordTableContainer';
+import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
-import { ObjectMetadataItemIdentifier } from '@/metadata/types/ObjectMetadataItemIdentifier';
+import { ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
 import { IconBuildingSkyscraper } from '@/ui/display/icon';
 import { PageAddButton } from '@/ui/layout/page/PageAddButton';
 import { PageBody } from '@/ui/layout/page/PageBody';
@@ -13,8 +13,9 @@ 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 { useCreateOneObject } from '../hooks/useCreateOneObject';
+import { useCreateOneObjectRecord } from '../hooks/useCreateOneObjectRecord';
-import { useFindOneObjectMetadataItem } from '../hooks/useFindOneObjectMetadataItem';
+
+import { RecordTableContainer } from './RecordTableContainer';
 
 const StyledTableContainer = styled.div`
   display: flex;
@@ -41,7 +42,7 @@ export const RecordTablePage = () => {
     }
   }, [objectNotFoundInMetadata, loading, navigate]);
 
-  const { createOneObject } = useCreateOneObject({
+  const { createOneObject } = useCreateOneObjectRecord({
     objectNamePlural,
   });
 

front/src/modules/object-record/graphql/optimistic-effect-definition/getRecordOptimisticEffectDefinition.ts

@@ -1,8 +1,8 @@
 import { produce } from 'immer';
 
 import { OptimisticEffectDefinition } from '@/apollo/optimistic-effect/types/OptimisticEffectDefinition';
-import { ObjectMetadataItem } from '@/metadata/types/ObjectMetadataItem';
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { PaginatedObjectTypeResults } from '@/metadata/types/PaginatedObjectTypeResults';
+import { PaginatedObjectTypeResults } from '@/object-record/types/PaginatedObjectTypeResults';
 import { capitalize } from '~/utils/string/capitalize';
 
 export const getRecordOptimisticEffectDefinition = ({

front/src/modules/object-record/hooks/useCreateOneObjectRecord.ts

@@ -1,13 +1,11 @@
 import { useMutation } from '@apollo/client';
 
 import { useOptimisticEffect } from '@/apollo/optimistic-effect/hooks/useOptimisticEffect';
+import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
+import { ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
 import { Currency, FieldMetadataType } from '~/generated-metadata/graphql';
 import { capitalize } from '~/utils/string/capitalize';
 
-import { ObjectMetadataItemIdentifier } from '../types/ObjectMetadataItemIdentifier';
-
-import { useFindOneObjectMetadataItem } from './useFindOneObjectMetadataItem';
-
 const defaultFieldValues: Record<FieldMetadataType, unknown> = {
   [FieldMetadataType.Money]: { amount: null, currency: Currency.Usd },
   [FieldMetadataType.Boolean]: false,
@@ -22,7 +20,7 @@ const defaultFieldValues: Record<FieldMetadataType, unknown> = {
   [FieldMetadataType.Uuid]: '',
 };
 
-export const useCreateOneObject = ({
+export const useCreateOneObjectRecord = ({
   objectNamePlural,
 }: Pick<ObjectMetadataItemIdentifier, 'objectNamePlural'>) => {
   const { triggerOptimisticEffects } = useOptimisticEffect();

front/src/modules/object-record/hooks/useDeleteOneObjectRecord.ts

@@ -1,11 +1,10 @@
 import { useMutation } from '@apollo/client';
 import { getOperationName } from '@apollo/client/utilities';
 
-import { ObjectMetadataItemIdentifier } from '../types/ObjectMetadataItemIdentifier';
+import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
+import { ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
 
-import { useFindOneObjectMetadataItem } from './useFindOneObjectMetadataItem';
+export const useDeleteOneObjectRecord = ({
-
-export const useDeleteOneObject = ({
   objectNamePlural,
 }: Pick<ObjectMetadataItemIdentifier, 'objectNamePlural'>) => {
   const {

front/src/modules/object-record/hooks/useFindManyObjectRecords.ts

@@ -4,6 +4,8 @@ import { isNonEmptyArray } from '@apollo/client/utilities';
 import { isNonEmptyString } from '@sniptt/guards';
 import { useRecoilState } from 'recoil';
 
+import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
+import { ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
 import { useSnackBar } from '@/ui/feedback/snack-bar/hooks/useSnackBar';
 import { logError } from '~/utils/logError';
 import { capitalize } from '~/utils/string/capitalize';
@@ -11,7 +13,6 @@ import { capitalize } from '~/utils/string/capitalize';
 import { cursorFamilyState } from '../states/cursorFamilyState';
 import { hasNextPageFamilyState } from '../states/hasNextPageFamilyState';
 import { isFetchingMoreObjectsFamilyState } from '../states/isFetchingMoreObjectsFamilyState';
-import { ObjectMetadataItemIdentifier } from '../types/ObjectMetadataItemIdentifier';
 import { PaginatedObjectType } from '../types/PaginatedObjectType';
 import {
   PaginatedObjectTypeEdge,
@@ -19,11 +20,9 @@ import {
 } from '../types/PaginatedObjectTypeResults';
 import { formatPagedObjectsToObjects } from '../utils/formatPagedObjectsToObjects';
 
-import { useFindOneObjectMetadataItem } from './useFindOneObjectMetadataItem';
-
 // TODO: test with a wrong name
 // TODO: add zod to validate that we have at least id on each object
-export const useFindManyObjects = <
+export const useFindManyObjectRecords = <
   ObjectType extends { id: string } & Record<string, any>,
 >({
   objectNamePlural,
@@ -76,9 +75,11 @@ export const useFindManyObjects = <
       }
     },
     onError: (error) => {
-      logError(`useFindManyObjects for "${objectNamePlural}" error : ` + error);
+      logError(
+        `useFindManyObjectRecords for "${objectNamePlural}" error : ` + error,
+      );
       enqueueSnackBar(
-        `Error during useFindManyObjects for "${objectNamePlural}", ${error.message}`,
+        `Error during useFindManyObjectRecords for "${objectNamePlural}", ${error.message}`,
         {
           variant: 'error',
         },

front/src/modules/object-record/hooks/useFindOneObjectRecord.ts

@@ -1,10 +1,9 @@
 import { useQuery } from '@apollo/client';
 
-import { ObjectMetadataItemIdentifier } from '../types/ObjectMetadataItemIdentifier';
+import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
+import { ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
 
-import { useFindOneObjectMetadataItem } from './useFindOneObjectMetadataItem';
+export const useFindOneObjectRecord = <
-
-export const useFindOneObject = <
   ObjectType extends { id: string } & Record<string, any>,
 >({
   objectNameSingular,

front/src/modules/object-record/hooks/useObjectRecordTable.ts

@@ -1,6 +1,7 @@
 import { useRecoilValue } from 'recoil';
 
 import { useOptimisticEffect } from '@/apollo/optimistic-effect/hooks/useOptimisticEffect';
+import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
 import { turnFiltersIntoWhereClauseV2 } from '@/ui/object/object-filter-dropdown/utils/turnFiltersIntoWhereClauseV2';
 import { turnSortsIntoOrderByV2 } from '@/ui/object/object-sort-dropdown/utils/turnSortsIntoOrderByV2';
 import { useRecordTableScopedStates } from '@/ui/object/record-table/hooks/internal/useRecordTableScopedStates';
@@ -8,10 +9,9 @@ import { useRecordTable } from '@/ui/object/record-table/hooks/useRecordTable';
 
 import { getRecordOptimisticEffectDefinition } from '../graphql/optimistic-effect-definition/getRecordOptimisticEffectDefinition';
 
-import { useFindManyObjects } from './useFindManyObjects';
+import { useFindManyObjectRecords } from './useFindManyObjectRecords';
-import { useFindOneObjectMetadataItem } from './useFindOneObjectMetadataItem';
 
-export const useTableObjects = () => {
+export const useObjectRecordTable = () => {
   const { scopeId: objectNamePlural } = useRecordTable();
 
   const { registerOptimisticEffect } = useOptimisticEffect();
@@ -37,7 +37,7 @@ export const useTableObjects = () => {
     foundObjectMetadataItem?.fields ?? [],
   );
 
-  const { objects, loading, fetchMoreObjects } = useFindManyObjects({
+  const { objects, loading, fetchMoreObjects } = useFindManyObjectRecords({
     objectNamePlural,
     filter,
     orderBy,

front/src/modules/object-record/hooks/useUpdateOneObjectRecord.ts

@@ -1,10 +1,9 @@
 import { useMutation } from '@apollo/client';
 
-import { ObjectMetadataItemIdentifier } from '../types/ObjectMetadataItemIdentifier';
+import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
+import { ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
 
-import { useFindOneObjectMetadataItem } from './useFindOneObjectMetadataItem';
+export const useUpdateOneObjectRecord = ({
-
-export const useUpdateOneObject = ({
   objectNamePlural,
   objectNameSingular,
 }: ObjectMetadataItemIdentifier) => {

front/src/modules/object-record/utils/generateCreateOneObjectMutation.ts

@@ -1,11 +1,9 @@
 import { gql } from '@apollo/client';
 
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { mapFieldMetadataToGraphQLQuery } from '@/object-metadata/utils/mapFieldMetadataToGraphQLQuery';
 import { capitalize } from '~/utils/string/capitalize';
 
-import { ObjectMetadataItem } from '../types/ObjectMetadataItem';
-
-import { mapFieldMetadataToGraphQLQuery } from './mapFieldMetadataToGraphQLQuery';
-
 export const generateCreateOneObjectMutation = ({
   objectMetadataItem,
 }: {

front/src/modules/object-record/utils/generateDeleteOneObjectMutation.ts

@@ -1,9 +1,8 @@
 import { gql } from '@apollo/client';
 
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { capitalize } from '~/utils/string/capitalize';
 
-import { ObjectMetadataItem } from '../types/ObjectMetadataItem';
-
 export const generateDeleteOneObjectMutation = ({
   objectMetadataItem,
 }: {

front/src/modules/object-record/utils/generateFindManyCustomObjectsQuery.ts

@@ -1,11 +1,9 @@
 import { gql } from '@apollo/client';
 
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { mapFieldMetadataToGraphQLQuery } from '@/object-metadata/utils/mapFieldMetadataToGraphQLQuery';
 import { capitalize } from '~/utils/string/capitalize';
 
-import { ObjectMetadataItem } from '../types/ObjectMetadataItem';
-
-import { mapFieldMetadataToGraphQLQuery } from './mapFieldMetadataToGraphQLQuery';
-
 export const generateFindManyCustomObjectsQuery = ({
   objectMetadataItem,
 }: {

front/src/modules/object-record/utils/generateFindOneCustomObjectQuery.ts

@@ -1,8 +1,7 @@
 import { gql } from '@apollo/client';
 
-import { ObjectMetadataItem } from '../types/ObjectMetadataItem';
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-
+import { mapFieldMetadataToGraphQLQuery } from '@/object-metadata/utils/mapFieldMetadataToGraphQLQuery';
-import { mapFieldMetadataToGraphQLQuery } from './mapFieldMetadataToGraphQLQuery';
 
 export const generateFindOneCustomObjectQuery = ({
   objectMetadataItem,

front/src/modules/object-record/utils/generateUpdateOneObjectMutation.ts

@@ -1,11 +1,9 @@
 import { gql } from '@apollo/client';
 
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { mapFieldMetadataToGraphQLQuery } from '@/object-metadata/utils/mapFieldMetadataToGraphQLQuery';
 import { capitalize } from '~/utils/string/capitalize';
 
-import { ObjectMetadataItem } from '../types/ObjectMetadataItem';
-
-import { mapFieldMetadataToGraphQLQuery } from './mapFieldMetadataToGraphQLQuery';
-
 export const getUpdateOneObjectMutationGraphQLField = ({
   objectNameSingular,
 }: {

front/src/modules/settings/data-model/components/SettingsObjectFieldFormSection.tsx

@@ -1,6 +1,6 @@
 import styled from '@emotion/styled';
 
-import { validateMetadataLabel } from '@/metadata/utils/validateMetadataLabel';
+import { validateMetadataLabel } from '@/object-metadata/utils/validateMetadataLabel';
 import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { IconPicker } from '@/ui/input/components/IconPicker';
 import { TextArea } from '@/ui/input/components/TextArea';

front/src/modules/settings/data-model/components/SettingsObjectFieldPreview.tsx

@@ -3,8 +3,8 @@ import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { useRecoilState } from 'recoil';
 
-import { useFindManyObjects } from '@/metadata/hooks/useFindManyObjects';
+import { parseFieldType } from '@/object-metadata/utils/parseFieldType';
-import { parseFieldType } from '@/metadata/utils/parseFieldType';
+import { useFindManyObjectRecords } from '@/object-record/hooks/useFindManyObjectRecords';
 import { Tag } from '@/ui/display/tag/components/Tag';
 import { useLazyLoadIcon } from '@/ui/input/hooks/useLazyLoadIcon';
 import { FieldDisplay } from '@/ui/object/field/components/FieldDisplay';
@@ -87,7 +87,7 @@ export const SettingsObjectFieldPreview = ({
   const { Icon: ObjectIcon } = useLazyLoadIcon(objectIconKey ?? '');
   const { Icon: FieldIcon } = useLazyLoadIcon(fieldIconKey ?? '');
 
-  const { objects } = useFindManyObjects({
+  const { objects } = useFindManyObjectRecords({
     objectNamePlural,
     skip: !fieldName,
   });

front/src/modules/settings/data-model/components/SettingsObjectFormSection.tsx

@@ -1,6 +1,6 @@
 import styled from '@emotion/styled';
 
-import { validateMetadataLabel } from '@/metadata/utils/validateMetadataLabel';
+import { validateMetadataLabel } from '@/object-metadata/utils/validateMetadataLabel';
 import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { TextArea } from '@/ui/input/components/TextArea';
 import { TextInput } from '@/ui/input/components/TextInput';

front/src/modules/settings/data-model/new-object/components/SettingsAvailableStandardObjectItemTableRow.tsx

@@ -1,7 +1,7 @@
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 
-import { ObjectMetadataItem } from '@/metadata/types/ObjectMetadataItem';
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { Checkbox } from '@/ui/input/components/Checkbox';
 import { useLazyLoadIcon } from '@/ui/input/hooks/useLazyLoadIcon';
 import { TableCell } from '@/ui/layout/table/components/TableCell';

front/src/modules/settings/data-model/new-object/components/SettingsAvailableStandardObjectsSection.tsx

@@ -1,4 +1,4 @@
-import { ObjectMetadataItem } from '@/metadata/types/ObjectMetadataItem';
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { Section } from '@/ui/layout/section/components/Section';
 import { Table } from '@/ui/layout/table/components/Table';

front/src/modules/settings/data-model/object-details/components/SettingsObjectItemTableRow.tsx

@@ -2,8 +2,8 @@ import { ReactNode } from 'react';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 
-import { useFindManyObjects } from '@/metadata/hooks/useFindManyObjects';
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { ObjectMetadataItem } from '@/metadata/types/ObjectMetadataItem';
+import { useFindManyObjectRecords } from '@/object-record/hooks/useFindManyObjectRecords';
 import { Tag } from '@/ui/display/tag/components/Tag';
 import { useLazyLoadIcon } from '@/ui/input/hooks/useLazyLoadIcon';
 import { TableCell } from '@/ui/layout/table/components/TableCell';
@@ -36,7 +36,7 @@ export const SettingsObjectItemTableRow = ({
 }: SettingsObjectItemTableRowProps) => {
   const theme = useTheme();
 
-  const { objects } = useFindManyObjects({
+  const { objects } = useFindManyObjectRecords({
     objectNamePlural: objectItem.namePlural,
   });
 

front/src/modules/ui/object/record-table/components/RecordTableBody.tsx

@@ -2,9 +2,9 @@ import { useEffect } from 'react';
 import { useInView } from 'react-intersection-observer';
 import { useRecoilState, useRecoilValue } from 'recoil';
 
-import { useFindOneObjectMetadataItem } from '@/metadata/hooks/useFindOneObjectMetadataItem';
+import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
-import { useTableObjects } from '@/metadata/hooks/useTableObjects';
+import { useObjectRecordTable } from '@/object-record/hooks/useObjectRecordTable';
-import { isFetchingMoreObjectsFamilyState } from '@/metadata/states/isFetchingMoreObjectsFamilyState';
+import { isFetchingMoreObjectsFamilyState } from '@/object-record/states/isFetchingMoreObjectsFamilyState';
 import { isDefined } from '~/utils/isDefined';
 
 import { RowIdContext } from '../contexts/RowIdContext';
@@ -34,7 +34,7 @@ export const RecordTableBody = () => {
     isFetchingRecordTableDataState,
   );
 
-  const { fetchMoreObjects } = useTableObjects();
+  const { fetchMoreObjects } = useObjectRecordTable();
 
   useEffect(() => {
     if (lastTableRowIsVisible && isDefined(fetchMoreObjects)) {

front/src/modules/views/components/ViewBarEffect.tsx

@@ -2,8 +2,8 @@ import { useEffect } from 'react';
 import { useSearchParams } from 'react-router-dom';
 import { useRecoilCallback, useRecoilValue } from 'recoil';
 
-import { useFindManyObjects } from '@/metadata/hooks/useFindManyObjects';
+import { useFindManyObjectRecords } from '@/object-record/hooks/useFindManyObjectRecords';
-import { PaginatedObjectTypeResults } from '@/metadata/types/PaginatedObjectTypeResults';
+import { PaginatedObjectTypeResults } from '@/object-record/types/PaginatedObjectTypeResults';
 import { getSnapshotValue } from '@/ui/utilities/recoil-scope/utils/getSnapshotValue';
 import { assertNotNull } from '~/utils/assert';
 import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
@@ -33,7 +33,7 @@ export const ViewBarEffect = () => {
   const viewType = useRecoilValue(viewTypeState);
   const viewObjectMetadataId = useRecoilValue(viewObjectMetadataIdState);
 
-  useFindManyObjects({
+  useFindManyObjectRecords({
     objectNamePlural: 'viewsV2',
     filter: {
       type: { eq: viewType },
@@ -64,7 +64,7 @@ export const ViewBarEffect = () => {
     ),
   });
 
-  useFindManyObjects({
+  useFindManyObjectRecords({
     skip: !currentViewId,
     objectNamePlural: 'viewFieldsV2',
     filter: { viewId: { eq: currentViewId } },
@@ -105,7 +105,7 @@ export const ViewBarEffect = () => {
     ),
   });
 
-  useFindManyObjects({
+  useFindManyObjectRecords({
     skip: !currentViewId,
     objectNamePlural: 'viewFiltersV2',
     filter: { viewId: { eq: currentViewId } },
@@ -159,7 +159,7 @@ export const ViewBarEffect = () => {
     ),
   });
 
-  useFindManyObjects({
+  useFindManyObjectRecords({
     skip: !currentViewId,
     objectNamePlural: 'viewSortsV2',
     filter: { viewId: { eq: currentViewId } },

front/src/modules/views/hooks/internal/useViewFields.ts

@@ -1,7 +1,7 @@
 import { useApolloClient } from '@apollo/client';
 import { useRecoilCallback } from 'recoil';
 
-import { useFindOneObjectMetadataItem } from '@/metadata/hooks/useFindOneObjectMetadataItem';
+import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
 import { ViewField } from '@/views/types/ViewField';
 import { getViewScopedStateValuesFromSnapshot } from '@/views/utils/getViewScopedStateValuesFromSnapshot';
 

front/src/modules/views/hooks/internal/useViewFilters.ts

@@ -2,7 +2,7 @@ import { useApolloClient } from '@apollo/client';
 import { produce } from 'immer';
 import { useRecoilCallback } from 'recoil';
 
-import { useFindOneObjectMetadataItem } from '@/metadata/hooks/useFindOneObjectMetadataItem';
+import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
 import { Filter } from '@/ui/object/object-filter-dropdown/types/Filter';
 import { savedViewFiltersScopedFamilyState } from '@/views/states/savedViewFiltersScopedFamilyState';
 import { ViewFilter } from '@/views/types/ViewFilter';

front/src/modules/views/hooks/internal/useViewSorts.ts

@@ -2,7 +2,7 @@ import { useApolloClient } from '@apollo/client';
 import { produce } from 'immer';
 import { useRecoilCallback } from 'recoil';
 
-import { useFindOneObjectMetadataItem } from '@/metadata/hooks/useFindOneObjectMetadataItem';
+import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
 import { Sort } from '@/ui/object/object-sort-dropdown/types/Sort';
 import { savedViewSortsScopedFamilyState } from '@/views/states/savedViewSortsScopedFamilyState';
 import { ViewSort } from '@/views/types/ViewSort';

front/src/modules/views/hooks/internal/useViews.ts

@@ -1,7 +1,7 @@
 import { useApolloClient } from '@apollo/client';
 import { useRecoilCallback } from 'recoil';
 
-import { useFindOneObjectMetadataItem } from '@/metadata/hooks/useFindOneObjectMetadataItem';
+import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
 import { View } from '@/views/types/View';
 import { getViewScopedStateValuesFromSnapshot } from '@/views/utils/getViewScopedStateValuesFromSnapshot';
 

front/src/pages/settings/data-model/SettingsNewObject.tsx

@@ -1,9 +1,9 @@
 import { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 
-import { useCreateOneObject } from '@/metadata/hooks/useCreateOneObject';
+import { useObjectMetadataItemForSettings } from '@/object-metadata/hooks/useObjectMetadataItemForSettings';
-import { useObjectMetadataItemForSettings } from '@/metadata/hooks/useObjectMetadataItemForSettings';
+import { getObjectSlug } from '@/object-metadata/utils/getObjectSlug';
-import { getObjectSlug } from '@/metadata/utils/getObjectSlug';
+import { useCreateOneObjectRecord } from '@/object-record/hooks/useCreateOneObjectRecord';
 import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
 import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
@@ -32,7 +32,7 @@ export const SettingsNewObject = () => {
     disabledObjectMetadataItems: disabledObjects,
   } = useObjectMetadataItemForSettings();
 
-  const { createOneObject: createOneView } = useCreateOneObject({
+  const { createOneObject: createOneView } = useCreateOneObjectRecord({
     objectNamePlural: 'viewsV2',
   });
 

front/src/pages/settings/data-model/SettingsObjectDetail.tsx

@@ -2,9 +2,9 @@ import { useEffect } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import styled from '@emotion/styled';
 
-import { useMetadataField } from '@/metadata/hooks/useMetadataField';
+import { useFieldMetadataItem } from '@/object-metadata/hooks/useFieldMetadataItem';
-import { useObjectMetadataItemForSettings } from '@/metadata/hooks/useObjectMetadataItemForSettings';
+import { useObjectMetadataItemForSettings } from '@/object-metadata/hooks/useObjectMetadataItemForSettings';
-import { getFieldSlug } from '@/metadata/utils/getFieldSlug';
+import { getFieldSlug } from '@/object-metadata/utils/getFieldSlug';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { SettingsAboutSection } from '@/settings/data-model/object-details/components/SettingsObjectAboutSection';
 import { SettingsObjectFieldActiveActionDropdown } from '@/settings/data-model/object-details/components/SettingsObjectFieldActiveActionDropdown';
@@ -49,7 +49,7 @@ export const SettingsObjectDetail = () => {
   }, [activeObjectMetadataItem, loading, navigate]);
 
   const { activateMetadataField, disableMetadataField, eraseMetadataField } =
-    useMetadataField();
+    useFieldMetadataItem();
 
   if (!activeObjectMetadataItem) return null;
 

front/src/pages/settings/data-model/SettingsObjectEdit.tsx

@@ -1,8 +1,8 @@
 import { useEffect, useState } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 
-import { useObjectMetadataItemForSettings } from '@/metadata/hooks/useObjectMetadataItemForSettings';
+import { useObjectMetadataItemForSettings } from '@/object-metadata/hooks/useObjectMetadataItemForSettings';
-import { getObjectSlug } from '@/metadata/utils/getObjectSlug';
+import { getObjectSlug } from '@/object-metadata/utils/getObjectSlug';
 import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
 import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';

front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx

@@ -1,9 +1,9 @@
 import { useEffect, useState } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 
-import { useMetadataField } from '@/metadata/hooks/useMetadataField';
+import { useFieldMetadataItem } from '@/object-metadata/hooks/useFieldMetadataItem';
-import { useObjectMetadataItemForSettings } from '@/metadata/hooks/useObjectMetadataItemForSettings';
+import { useObjectMetadataItemForSettings } from '@/object-metadata/hooks/useObjectMetadataItemForSettings';
-import { getFieldSlug } from '@/metadata/utils/getFieldSlug';
+import { getFieldSlug } from '@/object-metadata/utils/getFieldSlug';
 import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
 import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
@@ -28,7 +28,7 @@ export const SettingsObjectFieldEdit = () => {
   const activeObjectMetadataItem =
     findActiveObjectMetadataItemBySlug(objectSlug);
 
-  const { disableMetadataField, editMetadataField } = useMetadataField();
+  const { disableMetadataField, editMetadataField } = useFieldMetadataItem();
   const activeMetadataField = activeObjectMetadataItem?.fields.find(
     (metadataField) =>
       metadataField.isActive && getFieldSlug(metadataField) === fieldSlug,

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

@@ -2,8 +2,8 @@ import { useEffect, useState } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import styled from '@emotion/styled';
 
-import { useMetadataField } from '@/metadata/hooks/useMetadataField';
+import { useFieldMetadataItem } from '@/object-metadata/hooks/useFieldMetadataItem';
-import { useObjectMetadataItemForSettings } from '@/metadata/hooks/useObjectMetadataItemForSettings';
+import { useObjectMetadataItemForSettings } from '@/object-metadata/hooks/useObjectMetadataItemForSettings';
 import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
 import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
@@ -43,7 +43,8 @@ export const SettingsObjectNewFieldStep1 = () => {
   const activeObjectMetadataItem =
     findActiveObjectMetadataItemBySlug(objectSlug);
 
-  const { activateMetadataField, disableMetadataField } = useMetadataField();
+  const { activateMetadataField, disableMetadataField } =
+    useFieldMetadataItem();
   const [metadataFields, setMetadataFields] = useState(
     activeObjectMetadataItem?.fields ?? [],
   );

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

@@ -1,11 +1,11 @@
 import { useEffect, useState } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 
-import { useCreateOneObject } from '@/metadata/hooks/useCreateOneObject';
+import { useFieldMetadataItem } from '@/object-metadata/hooks/useFieldMetadataItem';
-import { useFindManyObjects } from '@/metadata/hooks/useFindManyObjects';
+import { useObjectMetadataItemForSettings } from '@/object-metadata/hooks/useObjectMetadataItemForSettings';
-import { useMetadataField } from '@/metadata/hooks/useMetadataField';
+import { useCreateOneObjectRecord } from '@/object-record/hooks/useCreateOneObjectRecord';
-import { useObjectMetadataItemForSettings } from '@/metadata/hooks/useObjectMetadataItemForSettings';
+import { useFindManyObjectRecords } from '@/object-record/hooks/useFindManyObjectRecords';
-import { PaginatedObjectTypeResults } from '@/metadata/types/PaginatedObjectTypeResults';
+import { PaginatedObjectTypeResults } from '@/object-record/types/PaginatedObjectTypeResults';
 import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
 import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
@@ -28,7 +28,7 @@ export const SettingsObjectNewFieldStep2 = () => {
 
   const activeObjectMetadataItem =
     findActiveObjectMetadataItemBySlug(objectSlug);
-  const { createMetadataField } = useMetadataField();
+  const { createMetadataField } = useFieldMetadataItem();
 
   useEffect(() => {
     if (loading) return;
@@ -44,11 +44,11 @@ export const SettingsObjectNewFieldStep2 = () => {
 
   const [objectViews, setObjectViews] = useState<View[]>([]);
 
-  const { createOneObject: createOneViewField } = useCreateOneObject({
+  const { createOneObject: createOneViewField } = useCreateOneObjectRecord({
     objectNamePlural: 'viewFieldsV2',
   });
 
-  useFindManyObjects({
+  useFindManyObjectRecords({
     objectNamePlural: 'viewsV2',
     filter: {
       type: { eq: ViewType.Table },

front/src/pages/settings/data-model/SettingsObjects.tsx

@@ -2,8 +2,8 @@ import { useNavigate } from 'react-router-dom';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 
-import { useObjectMetadataItemForSettings } from '@/metadata/hooks/useObjectMetadataItemForSettings';
+import { useObjectMetadataItemForSettings } from '@/object-metadata/hooks/useObjectMetadataItemForSettings';
-import { getObjectSlug } from '@/metadata/utils/getObjectSlug';
+import { getObjectSlug } from '@/object-metadata/utils/getObjectSlug';
 import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import {

front/src/testing/decorators/RootDecorator.tsx

@@ -2,7 +2,7 @@ import { ApolloProvider } from '@apollo/client';
 import { Decorator } from '@storybook/react';
 import { RecoilRoot } from 'recoil';
 
-import { ApolloMetadataClientProvider } from '@/metadata/components/ApolloMetadataClientProvider';
+import { ApolloMetadataClientProvider } from '@/object-metadata/components/ApolloMetadataClientProvider';
 
 import { InitializeHotkeyStorybookHookEffect } from '../InitializeHotkeyStorybookHook';
 import { mockedClient } from '../mockedClient';

front/src/testing/graphqlMocks.ts

@@ -7,7 +7,7 @@ import { CREATE_EVENT } from '@/analytics/graphql/queries/createEvent';
 import { GET_CLIENT_CONFIG } from '@/client-config/graphql/queries/getClientConfig';
 import { INSERT_ONE_COMPANY } from '@/companies/graphql/mutations/insertOneCompany';
 import { GET_COMPANIES } from '@/companies/graphql/queries/getCompanies';
-import { FIND_MANY_METADATA_OBJECTS } from '@/metadata/graphql/queries';
+import { FIND_MANY_METADATA_OBJECTS } from '@/object-metadata/graphql/queries';
 import { INSERT_ONE_PERSON } from '@/people/graphql/mutations/insertOnePerson';
 import { UPDATE_ONE_PERSON } from '@/people/graphql/mutations/updateOnePerson';
 import { GET_PEOPLE } from '@/people/graphql/queries/getPeople';

front/src/testing/mock-data/metadata.ts

@@ -21,7 +21,7 @@ export const mockedObjectMetadataItems = {
                 id: '5db475e7-8208-402d-97a1-62c9ce344dd4',
                 type: 'TEXT',
                 name: 'objectMetadataId',
-                label: 'Object Id',
+                label: 'Object Metadata Id',
                 description: 'View target object',
                 icon: null,
                 placeholder: null,
@@ -128,7 +128,7 @@ export const mockedObjectMetadataItems = {
                 id: '4d77c2dd-2b04-4989-b11e-cb0e386d1b4d',
                 type: 'TEXT',
                 name: 'fieldMetadataId',
-                label: 'Field Id',
+                label: 'Field Metadata Id',
                 description: 'View Field target field',
                 icon: null,
                 placeholder: null,

server/src/database/typeorm-seeds/metadata/field-metadata.ts

@@ -291,7 +291,7 @@ export const seedFieldMetadata = async (
         isActive: true,
         type: 'TEXT',
         name: 'fieldMetadataId',
-        label: 'Field Id',
+        label: 'Field Metadata Id',
         targetColumnMap: {
           value: 'fieldMetadataId',
         },

server/src/database/typeorm-seeds/metadata/object-metadata.ts

@@ -20,6 +20,7 @@ export const seedObjectMetadata = async (
       'icon',
       'dataSourceId',
       'workspaceId',
+      'isActive',
     ])
     .orIgnore()
     .values([
@@ -35,6 +36,7 @@ export const seedObjectMetadata = async (
         icon: 'IconBuildingSkyscraper',
         dataSourceId: 'b37b2163-7f63-47a9-b1b3-6c7290ca9fb1',
         workspaceId: 'twenty-7ed9d212-1c25-4d02-bf25-6aeccf7ea419',
+        isActive: true,
       },
       // Views
       {
@@ -48,6 +50,7 @@ export const seedObjectMetadata = async (
         icon: 'IconLayoutCollage',
         dataSourceId: 'b37b2163-7f63-47a9-b1b3-6c7290ca9fb1',
         workspaceId: 'twenty-7ed9d212-1c25-4d02-bf25-6aeccf7ea419',
+        isActive: true,
       },
       // ViewFields
       {
@@ -61,6 +64,7 @@ export const seedObjectMetadata = async (
         icon: 'IconColumns3',
         dataSourceId: 'b37b2163-7f63-47a9-b1b3-6c7290ca9fb1',
         workspaceId: 'twenty-7ed9d212-1c25-4d02-bf25-6aeccf7ea419',
+        isActive: true,
       },
       // ViewFilters
       {
@@ -74,6 +78,7 @@ export const seedObjectMetadata = async (
         icon: 'IconFilterBolt',
         dataSourceId: 'b37b2163-7f63-47a9-b1b3-6c7290ca9fb1',
         workspaceId: 'twenty-7ed9d212-1c25-4d02-bf25-6aeccf7ea419',
+        isActive: true,
       },
       // ViewSorts
       {
@@ -87,6 +92,7 @@ export const seedObjectMetadata = async (
         icon: 'IconArrowsSort',
         dataSourceId: 'b37b2163-7f63-47a9-b1b3-6c7290ca9fb1',
         workspaceId: 'twenty-7ed9d212-1c25-4d02-bf25-6aeccf7ea419',
+        isActive: true,
       },
     ])
     .execute();

server/src/tenant-manager/standard-objects/view-fields/view-fields.metadata.ts

@@ -10,7 +10,7 @@ const viewFieldsMetadata = {
     {
       type: 'TEXT',
       name: 'fieldMetadataId',
-      label: 'Field Id',
+      label: 'Field Metadata Id',
       targetColumnMap: {
         value: 'fieldMetadataId',
       },

server/src/tenant/utils/__tests__/deduce-relation-direction.spec.ts

@@ -7,7 +7,7 @@ import {
 } from 'src/tenant/utils/deduce-relation-direction.util';
 
 describe('deduceRelationDirection', () => {
-  it('should return FROM when the current object ID matches fromObjectMetadataId', () => {
+  it('should return FROM when the current object Metadata ID matches fromObjectMetadataId', () => {
     const currentObjectId = 'from_object_id';
     const relationMetadata = {
       id: 'relation_id',
@@ -26,7 +26,7 @@ describe('deduceRelationDirection', () => {
     expect(result).toBe(RelationDirection.FROM);
   });
 
-  it('should return TO when the current object ID matches toObjectMetadataId', () => {
+  it('should return TO when the current object Metadata ID matches toObjectMetadataId', () => {
     // Arrange
     const currentObjectId = 'to_object_id';
     const relationMetadata = {
@@ -46,7 +46,7 @@ describe('deduceRelationDirection', () => {
     expect(result).toBe(RelationDirection.TO);
   });
 
-  it('should throw an error when the current object ID does not match any object metadata ID', () => {
+  it('should throw an error when the current object Metadata ID does not match any object metadata ID', () => {
     const currentObjectId = 'unrelated_object_id';
     const relationMetadata = {
       id: 'relation_id',