feat: add new ACTOR field type and createdBy standard fields (#6324)

This pull request introduces a new `FieldMetadataType` called `ACTOR`. The primary objective of this new type is to add an extra column to the following objects: `person`, `company`, `opportunity`, `note`, `task`, and all custom objects. This composite type contains three properties: - `source` ```typescript export enum FieldActorSource { EMAIL = 'EMAIL', CALENDAR = 'CALENDAR', API = 'API', IMPORT = 'IMPORT', MANUAL = 'MANUAL', } ``` - `workspaceMemberId` - This property can be `undefined` in some cases and refers to the member who created the record. - `name` - Serves as a fallback if the `workspaceMember` is deleted and is used for other source types like `API`. ### Functionality The pre-hook system has been updated to allow real-time argument updates. When a record is created, a pre-hook can now compute and update the arguments accordingly. This enhancement enables the `createdBy` field to be populated with the correct values based on the `authContext`. The `authContext` now includes: - An optional User entity - An optional ApiKey entity - The workspace entity This provides access to the necessary data for the `createdBy` field. In the GraphQL API, only the `source` can be specified in the `createdBy` input. This allows the front-end to specify the source when creating records from a CSV file. ### Front-End Handling On the front-end, `orderBy` and `filter` are only applied to the name property of the `ACTOR` composite type. Currently, we are unable to apply these operations to the workspace member relation. This means that if a workspace member changes their first name or last name, there may be a mismatch because the name will differ from the new one. The name displayed on the screen is based on the workspace member entity when available. ### Missing Components Currently, this PR does not include a `createdBy` value for the `MAIL` and `CALENDAR` sources. These records are created in a job, and at present, we only have access to the workspaceId within the job. To address this, we should use a function similar to `loadServiceWithContext`, which was recently removed from `TwentyORM`. This function would allow us to pass the `authContext` to the jobs without disrupting existing jobs. Another PR will be created to handle these cases. ### Related Issues Fixes issue #5155. ### Additional Notes This PR doesn't include the migrations of the current records and views. Everything works properly when the database is reset but this part is still missing for now. We'll add that in another PR. - There is a minor issue: front-end tests are broken since this commit: [80c0fc7ff1). --------- Co-authored-by: Lucas Bordeau <bordeau.lucas@gmail.com> Co-authored-by: Charles Bochet <charles@twenty.com>
2025-11-02 05:37:56 +00:00 · 2024-08-03 15:43:31 +02:00
parent 9cf08d912a
commit 6432ad39b9
152 changed files with 24425 additions and 14968 deletions
--- a/.vscode/twenty.code-workspace
+++ b/.vscode/twenty.code-workspace
@@ -16,6 +16,10 @@
      "name": "packages/twenty-front",
      "path": "../packages/twenty-front"
    },
+    {
+      "name": "packages/twenty-ui",
+      "path": "../packages/twenty-ui"
+    },
    {
      "name": "packages/twenty-postgres",
      "path": "../packages/twenty-postgres"
--- a/packages/twenty-front/src/App.tsx
+++ b/packages/twenty-front/src/App.tsx
@@ -12,6 +12,7 @@ import {
 import { useRecoilValue } from 'recoil';

 import { ApolloProvider } from '@/apollo/components/ApolloProvider';
+import { AuthProvider } from '@/auth/components/AuthProvider';
 import { VerifyEffect } from '@/auth/components/VerifyEffect';
 import { ChromeExtensionSidecarEffect } from '@/chrome-extension-sidecar/components/ChromeExtensionSidecarEffect';
 import { ChromeExtensionSidecarProvider } from '@/chrome-extension-sidecar/components/ChromeExtensionSidecarProvider';
@@ -99,28 +100,30 @@ const ProvidersThatNeedRouterContext = () => {
          <ChromeExtensionSidecarProvider>
            <UserProviderEffect />
            <UserProvider>
-              <ApolloMetadataClientProvider>
-                <ObjectMetadataItemsProvider>
-                  <PrefetchDataProvider>
-                    <AppThemeProvider>
-                      <SnackBarProvider>
-                        <DialogManagerScope dialogManagerScopeId="dialog-manager">
-                          <DialogManager>
-                            <StrictMode>
-                              <PromiseRejectionEffect />
-                              <CommandMenuEffect />
-                              <GotoHotkeysEffect />
-                              <PageTitle title={pageTitle} />
-                              <Outlet />
-                            </StrictMode>
-                          </DialogManager>
-                        </DialogManagerScope>
-                      </SnackBarProvider>
-                    </AppThemeProvider>
-                  </PrefetchDataProvider>
-                  <PageChangeEffect />
-                </ObjectMetadataItemsProvider>
-              </ApolloMetadataClientProvider>
+              <AuthProvider>
+                <ApolloMetadataClientProvider>
+                  <ObjectMetadataItemsProvider>
+                    <PrefetchDataProvider>
+                      <AppThemeProvider>
+                        <SnackBarProvider>
+                          <DialogManagerScope dialogManagerScopeId="dialog-manager">
+                            <DialogManager>
+                              <StrictMode>
+                                <PromiseRejectionEffect />
+                                <CommandMenuEffect />
+                                <GotoHotkeysEffect />
+                                <PageTitle title={pageTitle} />
+                                <Outlet />
+                              </StrictMode>
+                            </DialogManager>
+                          </DialogManagerScope>
+                        </SnackBarProvider>
+                      </AppThemeProvider>
+                    </PrefetchDataProvider>
+                    <PageChangeEffect />
+                  </ObjectMetadataItemsProvider>
+                </ApolloMetadataClientProvider>
+              </AuthProvider>
            </UserProvider>
          </ChromeExtensionSidecarProvider>
        </ClientConfigProvider>
--- a/packages/twenty-front/src/generated-metadata/graphql.ts
+++ b/packages/twenty-front/src/generated-metadata/graphql.ts
@@ -346,6 +346,7 @@ export type FieldConnection = {
 export enum FieldMetadataType {
  Address = 'ADDRESS',
  Boolean = 'BOOLEAN',
+  Actor = 'ACTOR',
  Currency = 'CURRENCY',
  Date = 'DATE',
  DateTime = 'DATE_TIME',
@@ -1303,6 +1304,7 @@ export type User = {
  updatedAt: Scalars['DateTime']['output'];
  userVars: Scalars['JSONObject']['output'];
  workspaceMember?: Maybe<WorkspaceMember>;
+  workspaceMembers?: Maybe<Array<WorkspaceMember>>;
  workspaces: Array<UserWorkspace>;
 };

--- a/packages/twenty-front/src/generated/graphql.tsx
+++ b/packages/twenty-front/src/generated/graphql.tsx
@@ -1,5 +1,5 @@
-import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
+import { gql } from '@apollo/client';
 export type Maybe<T> = T | null;
 export type InputMaybe<T> = Maybe<T>;
 export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
@@ -251,6 +251,7 @@ export type FieldConnection = {
 export enum FieldMetadataType {
  Address = 'ADDRESS',
  Boolean = 'BOOLEAN',
+  Actor = 'ACTOR',
  Currency = 'CURRENCY',
  Date = 'DATE',
  DateTime = 'DATE_TIME',
@@ -1000,6 +1001,7 @@ export type User = {
  updatedAt: Scalars['DateTime'];
  userVars: Scalars['JSONObject'];
  workspaceMember?: Maybe<WorkspaceMember>;
+  workspaceMembers?: Maybe<Array<WorkspaceMember>>;
  workspaces: Array<UserWorkspace>;
 };

@@ -1350,7 +1352,7 @@ export type ImpersonateMutationVariables = Exact<{
 }>;


-export type ImpersonateMutation = { __typename?: 'Mutation', impersonate: { __typename?: 'Verify', user: { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, userVars: any, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, defaultWorkspace: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: WorkspaceActivationStatus, currentCacheVersion?: string | null, workspaceMembersCount?: number | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: string, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus, interval?: SubscriptionInterval | null } | null }, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null } | null }> }, tokens: { __typename?: 'AuthTokenPair', accessToken: { __typename?: 'AuthToken', token: string, expiresAt: string }, refreshToken: { __typename?: 'AuthToken', token: string, expiresAt: string } } } };
+export type ImpersonateMutation = { __typename?: 'Mutation', impersonate: { __typename?: 'Verify', user: { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, userVars: any, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, workspaceMembers?: Array<{ __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } }> | null, defaultWorkspace: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: WorkspaceActivationStatus, currentCacheVersion?: string | null, workspaceMembersCount?: number | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: string, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus, interval?: SubscriptionInterval | null } | null }, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null } | null }> }, tokens: { __typename?: 'AuthTokenPair', accessToken: { __typename?: 'AuthToken', token: string, expiresAt: string }, refreshToken: { __typename?: 'AuthToken', token: string, expiresAt: string } } } };

 export type RenewTokenMutationVariables = Exact<{
  appToken: Scalars['String'];
@@ -1382,7 +1384,7 @@ export type VerifyMutationVariables = Exact<{
 }>;


-export type VerifyMutation = { __typename?: 'Mutation', verify: { __typename?: 'Verify', user: { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, userVars: any, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, defaultWorkspace: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: WorkspaceActivationStatus, currentCacheVersion?: string | null, workspaceMembersCount?: number | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: string, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus, interval?: SubscriptionInterval | null } | null }, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null } | null }> }, tokens: { __typename?: 'AuthTokenPair', accessToken: { __typename?: 'AuthToken', token: string, expiresAt: string }, refreshToken: { __typename?: 'AuthToken', token: string, expiresAt: string } } } };
+export type VerifyMutation = { __typename?: 'Mutation', verify: { __typename?: 'Verify', user: { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, userVars: any, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, workspaceMembers?: Array<{ __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } }> | null, defaultWorkspace: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: WorkspaceActivationStatus, currentCacheVersion?: string | null, workspaceMembersCount?: number | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: string, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus, interval?: SubscriptionInterval | null } | null }, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null } | null }> }, tokens: { __typename?: 'AuthTokenPair', accessToken: { __typename?: 'AuthToken', token: string, expiresAt: string }, refreshToken: { __typename?: 'AuthToken', token: string, expiresAt: string } } } };

 export type CheckUserExistsQueryVariables = Exact<{
  email: Scalars['String'];
@@ -1443,7 +1445,7 @@ export type GetAisqlQueryQueryVariables = Exact<{

 export type GetAisqlQueryQuery = { __typename?: 'Query', getAISQLQuery: { __typename?: 'AISQLQueryResult', sqlQuery: string, sqlQueryResult?: string | null, queryFailedErrorMessage?: string | null } };

-export type UserQueryFragmentFragment = { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, userVars: any, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, defaultWorkspace: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: WorkspaceActivationStatus, currentCacheVersion?: string | null, workspaceMembersCount?: number | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: string, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus, interval?: SubscriptionInterval | null } | null }, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null } | null }> };
+export type UserQueryFragmentFragment = { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, userVars: any, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, workspaceMembers?: Array<{ __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } }> | null, defaultWorkspace: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: WorkspaceActivationStatus, currentCacheVersion?: string | null, workspaceMembersCount?: number | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: string, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus, interval?: SubscriptionInterval | null } | null }, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null } | null }> };

 export type DeleteUserAccountMutationVariables = Exact<{ [key: string]: never; }>;

@@ -1460,7 +1462,9 @@ export type UploadProfilePictureMutation = { __typename?: 'Mutation', uploadProf
 export type GetCurrentUserQueryVariables = Exact<{ [key: string]: never; }>;


-export type GetCurrentUserQuery = { __typename?: 'Query', currentUser: { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, userVars: any, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, defaultWorkspace: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: WorkspaceActivationStatus, currentCacheVersion?: string | null, workspaceMembersCount?: number | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: string, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus, interval?: SubscriptionInterval | null } | null }, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null } | null }> } };
+export type GetCurrentUserQuery = { __typename?: 'Query', currentUser: { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, userVars: any, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, workspaceMembers?: Array<{ __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } }> | null, defaultWorkspace: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: WorkspaceActivationStatus, currentCacheVersion?: string | null, workspaceMembersCount?: number | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: string, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus, interval?: SubscriptionInterval | null } | null }, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null } | null }> } };
+
+export type WorkspaceMemberQueryFragmentFragment = { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } };

 export type AddUserToWorkspaceMutationVariables = Exact<{
  inviteHash: Scalars['String'];
@@ -1596,6 +1600,21 @@ export const AuthTokensFragmentFragmentDoc = gql`
  }
 }
    ${AuthTokenFragmentFragmentDoc}`;
+export const WorkspaceMemberQueryFragmentFragmentDoc = gql`
+    fragment WorkspaceMemberQueryFragment on WorkspaceMember {
+  id
+  name {
+    firstName
+    lastName
+  }
+  colorScheme
+  avatarUrl
+  locale
+  timeZone
+  dateFormat
+  timeFormat
+}
+    `;
 export const UserQueryFragmentFragmentDoc = gql`
    fragment UserQueryFragment on User {
  id
@@ -1606,17 +1625,10 @@ export const UserQueryFragmentFragmentDoc = gql`
  supportUserHash
  onboardingStatus
  workspaceMember {
-    id
-    name {
-      firstName
-      lastName
-    }
-    colorScheme
-    avatarUrl
-    locale
-    timeZone
-    dateFormat
-    timeFormat
+    ...WorkspaceMemberQueryFragment
+  }
+  workspaceMembers {
+    ...WorkspaceMemberQueryFragment
  }
  defaultWorkspace {
    id
@@ -1650,7 +1662,7 @@ export const UserQueryFragmentFragmentDoc = gql`
  }
  userVars
 }
-    `;
+    ${WorkspaceMemberQueryFragmentFragmentDoc}`;
 export const GetTimelineCalendarEventsFromCompanyIdDocument = gql`
    query GetTimelineCalendarEventsFromCompanyId($companyId: UUID!, $page: Int!, $pageSize: Int!) {
  getTimelineCalendarEventsFromCompanyId(
--- a/packages/twenty-front/src/modules/activities/timelineActivities/components/EventList.tsx
+++ b/packages/twenty-front/src/modules/activities/timelineActivities/components/EventList.tsx
@@ -7,6 +7,7 @@ import { filterOutInvalidTimelineActivities } from '@/activities/timelineActivit
 import { groupEventsByMonth } from '@/activities/timelineActivities/utils/groupEventsByMonth';
 import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
 import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';

 type EventListProps = {
@@ -34,9 +35,12 @@ export const EventList = ({ events, targetableObject }: EventListProps) => {
    objectNameSingular: targetableObject.targetObjectNameSingular,
  }).objectMetadataItem;

+  const { objectMetadataItems } = useObjectMetadataItems();
+
  const filteredEvents = filterOutInvalidTimelineActivities(
    events,
-    mainObjectMetadataItem,
+    targetableObject.targetObjectNameSingular,
+    objectMetadataItems,
  );

  const groupedEvents = groupEventsByMonth(filteredEvents);
--- a/packages/twenty-front/src/modules/activities/timelineActivities/rows/activity/components/EventRowActivity.tsx
+++ b/packages/twenty-front/src/modules/activities/timelineActivities/rows/activity/components/EventRowActivity.tsx
@@ -22,7 +22,9 @@ export const EventRowActivity = ({
  authorFullName,
  objectNameSingular,
 }: EventRowActivityProps & { objectNameSingular: CoreObjectNameSingular }) => {
-  const [, eventAction] = event.name.split('.');
+  const [eventLinkedObject, eventAction] = event.name.split('.');
+
+  const eventObject = eventLinkedObject.replace('linked-', '');

  if (!event.linkedRecordId) {
    throw new Error('Could not find linked record id for event');
@@ -39,7 +41,9 @@ export const EventRowActivity = ({
  return (
    <>
      <StyledEventRowItemColumn>{authorFullName}</StyledEventRowItemColumn>
-      <StyledEventRowItemAction>{eventAction}</StyledEventRowItemAction>
+      <StyledEventRowItemAction>
+        {`${eventAction} a related ${eventObject}`}
+      </StyledEventRowItemAction>
      {activityInStore ? (
        <StyledLinkedActivity
          onClick={() => openActivityRightDrawer(event.linkedRecordId)}
--- a/packages/twenty-front/src/modules/activities/timelineActivities/utils/filterOutInvalidTimelineActivities.ts
+++ b/packages/twenty-front/src/modules/activities/timelineActivities/utils/filterOutInvalidTimelineActivities.ts
@@ -1,14 +1,34 @@
 import { TimelineActivity } from '@/activities/timelineActivities/types/TimelineActivity';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';

 export const filterOutInvalidTimelineActivities = (
  timelineActivities: TimelineActivity[],
-  mainObjectMetadataItem: ObjectMetadataItem,
+  mainObjectSingularName: string,
+  objectMetadataItems: ObjectMetadataItem[],
 ): TimelineActivity[] => {
+  const mainObjectMetadataItem = objectMetadataItems.find(
+    (objectMetadataItem) =>
+      objectMetadataItem.nameSingular === mainObjectSingularName,
+  );
+
+  const noteObjectMetadataItem = objectMetadataItems.find(
+    (objectMetadataItem) =>
+      objectMetadataItem.nameSingular === CoreObjectNameSingular.Note,
+  );
+
+  if (!mainObjectMetadataItem || !noteObjectMetadataItem) {
+    throw new Error('Object metadata items not found');
+  }
+
  const fieldMetadataItemMap = new Map(
    mainObjectMetadataItem.fields.map((field) => [field.name, field]),
  );

+  const noteFieldMetadataItemMap = new Map(
+    noteObjectMetadataItem.fields.map((field) => [field.name, field]),
+  );
+
  return timelineActivities.filter((timelineActivity) => {
    const diff = timelineActivity.properties?.diff;
    const canSkipValidation = !diff;
@@ -17,8 +37,14 @@ export const filterOutInvalidTimelineActivities = (
      return true;
    }

+    const isNoteOrTask =
+      timelineActivity.name.startsWith('linked-note') ||
+      timelineActivity.name.startsWith('linked-task');
+
    const validDiffEntries = Object.entries(diff).filter(([diffKey]) =>
-      fieldMetadataItemMap.has(diffKey),
+      isNoteOrTask
+        ? noteFieldMetadataItemMap.has(diffKey)
+        : fieldMetadataItemMap.has(diffKey),
    );

    if (validDiffEntries.length === 0) {
--- a/packages/twenty-front/src/modules/auth/components/AuthProvider.tsx
+++ b/packages/twenty-front/src/modules/auth/components/AuthProvider.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import { useRecoilValue } from 'recoil';
+
+import { AuthContext } from '@/auth/contexts/AuthContext';
+import { currentWorkspaceMembersState } from '@/auth/states/currentWorkspaceMembersStates';
+
+export const AuthProvider = ({ children }: React.PropsWithChildren) => {
+  const currentWorkspaceMembers = useRecoilValue(currentWorkspaceMembersState);
+
+  return (
+    <AuthContext.Provider
+      value={{
+        currentWorkspaceMembers,
+      }}
+    >
+      {children}
+    </AuthContext.Provider>
+  );
+};
--- a/packages/twenty-front/src/modules/auth/contexts/AuthContext.ts
+++ b/packages/twenty-front/src/modules/auth/contexts/AuthContext.ts
@@ -0,0 +1,10 @@
+import { CurrentWorkspaceMember } from '@/auth/states/currentWorkspaceMemberState';
+import { createContext } from 'react';
+
+export type AuthContextType = {
+  currentWorkspaceMembers: CurrentWorkspaceMember[];
+};
+
+export const AuthContext = createContext<AuthContextType>(
+  {} as AuthContextType,
+);
--- a/packages/twenty-front/src/modules/auth/hooks/useAuth.ts
+++ b/packages/twenty-front/src/modules/auth/hooks/useAuth.ts
@@ -32,6 +32,7 @@ import {
 } from '~/generated/graphql';
 import { isDefined } from '~/utils/isDefined';

+import { currentWorkspaceMembersState } from '@/auth/states/currentWorkspaceMembersStates';
 import { dateTimeFormatState } from '@/localization/states/dateTimeFormatState';
 import { detectDateFormat } from '@/localization/utils/detectDateFormat';
 import { detectTimeFormat } from '@/localization/utils/detectTimeFormat';
@@ -47,6 +48,9 @@ export const useAuth = () => {
  const setCurrentWorkspaceMember = useSetRecoilState(
    currentWorkspaceMemberState,
  );
+  const setCurrentWorkspaceMembers = useSetRecoilState(
+    currentWorkspaceMembersState,
+  );

  const setCurrentWorkspace = useSetRecoilState(currentWorkspaceState);
  const setIsVerifyPendingState = useSetRecoilState(isVerifyPendingState);
@@ -109,6 +113,18 @@ export const useAuth = () => {

      setCurrentUser(user);

+      if (isDefined(user.workspaceMembers)) {
+        const workspaceMembers = user.workspaceMembers.map(
+          (workspaceMember) => ({
+            ...workspaceMember,
+            colorScheme: workspaceMember.colorScheme as ColorScheme,
+            locale: workspaceMember.locale ?? 'en',
+          }),
+        );
+
+        setCurrentWorkspaceMembers(workspaceMembers);
+      }
+
      if (isDefined(user.workspaceMember)) {
        workspaceMember = {
          ...user.workspaceMember,
@@ -163,10 +179,11 @@ export const useAuth = () => {
      verify,
      setTokenPair,
      setCurrentUser,
-      setCurrentWorkspaceMember,
      setCurrentWorkspace,
-      setWorkspaces,
+      setCurrentWorkspaceMembers,
+      setCurrentWorkspaceMember,
      setDateTimeFormat,
+      setWorkspaces,
    ],
  );

--- a/packages/twenty-front/src/modules/auth/states/currentWorkspaceMembersStates.ts
+++ b/packages/twenty-front/src/modules/auth/states/currentWorkspaceMembersStates.ts
@@ -0,0 +1,9 @@
+import { CurrentWorkspaceMember } from '@/auth/states/currentWorkspaceMemberState';
+import { createState } from 'twenty-ui';
+
+export const currentWorkspaceMembersState = createState<
+  CurrentWorkspaceMember[]
+>({
+  key: 'currentWorkspaceMembersState',
+  defaultValue: [],
+});
--- a/packages/twenty-front/src/modules/debug/components/RecoilDebugObserver.tsx
+++ b/packages/twenty-front/src/modules/debug/components/RecoilDebugObserver.tsx
@@ -1,6 +1,6 @@
+import { isDebugModeState } from '@/client-config/states/isDebugModeState';
 import { useRecoilTransactionObserver_UNSTABLE, useRecoilValue } from 'recoil';

-import { isDebugModeState } from '@/client-config/states/isDebugModeState';
 import { logDebug } from '~/utils/logDebug';

 const formatTitle = (stateName: string) => {
--- a/packages/twenty-front/src/modules/object-metadata/constants/SortableFieldMetadataTypes.ts
+++ b/packages/twenty-front/src/modules/object-metadata/constants/SortableFieldMetadataTypes.ts
@@ -12,5 +12,6 @@ export const SORTABLE_FIELD_METADATA_TYPES = [
  FieldMetadataType.FullName,
  FieldMetadataType.Rating,
  FieldMetadataType.Currency,
+  FieldMetadataType.Actor,
  FieldMetadataType.Links,
 ];
--- a/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions.ts
@@ -35,6 +35,7 @@ export const formatFieldMetadataItemsAsFilterDefinitions = ({
        FieldMetadataType.Select,
        FieldMetadataType.Currency,
        FieldMetadataType.Rating,
+        FieldMetadataType.Actor,
      ].includes(field.type)
    ) {
      return acc;
@@ -88,6 +89,8 @@ export const getFilterTypeFromFieldType = (fieldType: FieldMetadataType) => {
      return 'ADDRESS';
    case FieldMetadataType.Rating:
      return 'RATING';
+    case FieldMetadataType.Actor:
+      return 'ACTOR';
    default:
      return 'TEXT';
  }
--- a/packages/twenty-front/src/modules/object-metadata/utils/getOrderByForFieldMetadataType.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/getOrderByForFieldMetadataType.ts
@@ -26,6 +26,14 @@ export const getOrderByForFieldMetadataType = (
          },
        },
      ];
+    case FieldMetadataType.Actor:
+      return [
+        {
+          [field.name]: {
+            name: direction ?? 'AscNullsLast',
+          },
+        },
+      ];
    case FieldMetadataType.Links:
      return [
        {
--- a/packages/twenty-front/src/modules/object-metadata/utils/mapFieldMetadataToGraphQLQuery.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/mapFieldMetadataToGraphQLQuery.ts
@@ -147,5 +147,14 @@ ${mapObjectMetadataToGraphQLQuery({
 }`;
  }

+  if (fieldType === FieldMetadataType.Actor) {
+    return `${field.name}
+{
+    source
+    workspaceMemberId
+    name
+}`;
+  }
+
  return '';
 };
--- a/packages/twenty-front/src/modules/object-record/graphql/types/RecordGqlOperationFilter.ts
+++ b/packages/twenty-front/src/modules/object-record/graphql/types/RecordGqlOperationFilter.ts
@@ -90,6 +90,10 @@ export type LinksFilter = {
  primaryLinkLabel?: StringFilter;
 };

+export type ActorFilter = {
+  name?: StringFilter;
+};
+
 export type LeafFilter =
  | UUIDFilter
  | StringFilter
@@ -101,6 +105,7 @@ export type LeafFilter =
  | BooleanFilter
  | AddressFilter
  | LinksFilter
+  | ActorFilter
  | undefined;

 export type AndObjectRecordFilter = {
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersDropdownContent.tsx
@@ -65,6 +65,7 @@ export const MultipleFiltersDropdownContent = ({
              'LINK',
              'LINKS',
              'ADDRESS',
+              'ACTOR',
            ].includes(filterDefinitionUsedInDropdown.type) && (
              <ObjectFilterDropdownTextSearchInput />
            )}
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/FilterType.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/FilterType.ts
@@ -13,4 +13,5 @@ export type FilterType =
  | 'ADDRESS'
  | 'SELECT'
  | 'RATING'
-  | 'MULTI_SELECT';
+  | 'MULTI_SELECT'
+  | 'ACTOR';
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/tests/getOperandsForFilterType.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/tests/getOperandsForFilterType.test.tsx
@@ -28,6 +28,7 @@ describe('getOperandsForFilterType', () => {
    ['ADDRESS', [...containsOperands, ...emptyOperands]],
    ['LINK', [...containsOperands, ...emptyOperands]],
    ['LINKS', [...containsOperands, ...emptyOperands]],
+    ['ACTOR', [...containsOperands, ...emptyOperands]],
    ['CURRENCY', [...numberOperands, ...emptyOperands]],
    ['NUMBER', [...numberOperands, ...emptyOperands]],
    ['DATE_TIME', [...numberOperands, ...emptyOperands]],
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getOperandsForFilterType.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getOperandsForFilterType.ts
@@ -20,6 +20,7 @@ export const getOperandsForFilterType = (
    case 'PHONE':
    case 'LINK':
    case 'LINKS':
+    case 'ACTOR':
      return [
        ViewFilterOperand.Contains,
        ViewFilterOperand.DoesNotContain,
--- a/packages/twenty-front/src/modules/object-record/record-field/mocks/fieldDefinitions.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/mocks/fieldDefinitions.ts
@@ -1,11 +1,12 @@
 import { formatFieldMetadataItemAsFieldDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition';
 import { FieldDefinition } from '@/object-record/record-field/types/FieldDefinition';
 import {
+  FieldActorMetadata,
  FieldFullNameMetadata,
  FieldLinkMetadata,
  FieldRatingMetadata,
  FieldSelectMetadata,
-  FieldTextMetadata,
+  FieldTextMetadata
 } from '@/object-record/record-field/types/FieldMetadata';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 import {
@@ -79,7 +80,7 @@ export const phoneFieldDefinition = formatFieldMetadataItemAsFieldDefinition({
  objectMetadataItem: mockedPersonObjectMetadataItem,
 });

-export const ratingfieldDefinition: FieldDefinition<FieldRatingMetadata> = {
+export const ratingFieldDefinition: FieldDefinition<FieldRatingMetadata> = {
  fieldMetadataId,
  label: 'Rating',
  iconName: 'iconName',
@@ -97,3 +98,14 @@ export const booleanFieldDefinition = formatFieldMetadataItemAsFieldDefinition({
  field: booleanFieldMetadataItem!,
  objectMetadataItem: mockedCompanyObjectMetadataItem,
 });
+
+export const actorFieldDefinition: FieldDefinition<FieldActorMetadata> = {
+  fieldMetadataId,
+  label: 'Created By',
+  iconName: 'restart',
+  type: FieldMetadataType.Actor,
+  defaultValue: { source: 'MANUAL', name: '' },
+  metadata: {
+    fieldName: 'actor',
+  },
+};
--- a/packages/twenty-front/src/modules/object-record/record-field/components/FieldDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/components/FieldDisplay.tsx
@@ -1,11 +1,13 @@
 import { useContext } from 'react';

+import { ActorFieldDisplay } from '@/object-record/record-field/meta-types/display/components/ActorFieldDisplay';
 import { BooleanFieldDisplay } from '@/object-record/record-field/meta-types/display/components/BooleanFieldDisplay';
 import { LinksFieldDisplay } from '@/object-record/record-field/meta-types/display/components/LinksFieldDisplay';
 import { RatingFieldDisplay } from '@/object-record/record-field/meta-types/display/components/RatingFieldDisplay';
 import { RelationFromManyFieldDisplay } from '@/object-record/record-field/meta-types/display/components/RelationFromManyFieldDisplay';
 import { RichTextFieldDisplay } from '@/object-record/record-field/meta-types/display/components/RichTextFieldDisplay';
 import { isFieldIdentifierDisplay } from '@/object-record/record-field/meta-types/display/utils/isFieldIdentifierDisplay';
+import { isFieldActor } from '@/object-record/record-field/types/guards/isFieldActor';
 import { isFieldBoolean } from '@/object-record/record-field/types/guards/isFieldBoolean';
 import { isFieldDisplayedAsPhone } from '@/object-record/record-field/types/guards/isFieldDisplayedAsPhone';
 import { isFieldLinks } from '@/object-record/record-field/types/guards/isFieldLinks';
@@ -96,5 +98,7 @@ export const FieldDisplay = () => {
    <RatingFieldDisplay />
  ) : isFieldRichText(fieldDefinition) ? (
    <RichTextFieldDisplay />
+  ) : isFieldActor(fieldDefinition) ? (
+    <ActorFieldDisplay />
  ) : null;
 };
--- a/packages/twenty-front/src/modules/object-record/record-field/hooks/tests/useIsFieldReadOnly.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/hooks/tests/useIsFieldReadOnly.test.tsx
@@ -0,0 +1,50 @@
+import { renderHook } from '@testing-library/react';
+import { ReactNode } from 'react';
+import { RecoilRoot } from 'recoil';
+
+import {
+  actorFieldDefinition,
+  phoneFieldDefinition,
+} from '@/object-record/record-field/__mocks__/fieldDefinitions';
+import { FieldContext } from '@/object-record/record-field/contexts/FieldContext';
+import { useIsFieldReadOnly } from '@/object-record/record-field/hooks/useIsFieldReadOnly';
+import { FieldDefinition } from '@/object-record/record-field/types/FieldDefinition';
+import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
+
+const entityId = 'entityId';
+
+const getWrapper =
+  (fieldDefinition: FieldDefinition<FieldMetadata>) =>
+  ({ children }: { children: ReactNode }) => (
+    <FieldContext.Provider
+      value={{
+        fieldDefinition,
+        entityId,
+        hotkeyScope: 'hotkeyScope',
+        isLabelIdentifier: false,
+      }}
+    >
+      <RecoilRoot>{children}</RecoilRoot>
+    </FieldContext.Provider>
+  );
+
+const ActorWrapper = getWrapper(actorFieldDefinition);
+const PhoneWrapper = getWrapper(phoneFieldDefinition);
+
+describe('useIsFieldReadOnly', () => {
+  it('should return true', () => {
+    const { result } = renderHook(() => useIsFieldReadOnly(), {
+      wrapper: ActorWrapper,
+    });
+
+    expect(result.current).toBe(true);
+  });
+
+  it('should return false', () => {
+    const { result } = renderHook(() => useIsFieldReadOnly(), {
+      wrapper: PhoneWrapper,
+    });
+
+    expect(result.current).toBe(false);
+  });
+});
--- a/packages/twenty-front/src/modules/object-record/record-field/hooks/useIsFieldReadOnly.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/hooks/useIsFieldReadOnly.ts
@@ -1,14 +1,16 @@
 import { useContext } from 'react';

-import { FieldMetadataType } from '~/generated-metadata/graphql';
+import { isFieldActor } from '@/object-record/record-field/types/guards/isFieldActor';
+import { isFieldRichText } from '@/object-record/record-field/types/guards/isFieldRichText';
 import { FieldContext } from '../contexts/FieldContext';

 export const useIsFieldReadOnly = () => {
  const { fieldDefinition } = useContext(FieldContext);

  return (
-    fieldDefinition.type === FieldMetadataType.RichText ||
    fieldDefinition.metadata.fieldName === 'noteTargets' ||
-    fieldDefinition.metadata.fieldName === 'taskTargets' // TODO: do something cleaner
+    fieldDefinition.metadata.fieldName === 'taskTargets' ||
+    isFieldActor(fieldDefinition) ||
+    isFieldRichText(fieldDefinition)
  );
 };
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/ActorFieldDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/ActorFieldDisplay.tsx
@@ -0,0 +1,25 @@
+import { useActorFieldDisplay } from '@/object-record/record-field/meta-types/hooks/useActorFieldDisplay';
+import { ActorDisplay } from '@/ui/field/display/components/ActorDisplay';
+import { isNonEmptyString } from '@sniptt/guards';
+
+export const ActorFieldDisplay = () => {
+  const { fieldValue } = useActorFieldDisplay();
+
+  const name = !fieldValue.workspaceMemberId
+    ? fieldValue.name
+    : [
+        fieldValue.workspaceMember?.name.firstName,
+        fieldValue.workspaceMember?.name.lastName,
+      ]
+        .filter(isNonEmptyString)
+        .join(' ');
+
+  return (
+    <ActorDisplay
+      name={name}
+      source={fieldValue.source}
+      avatarUrl={fieldValue.workspaceMember?.avatarUrl}
+      workspaceMemberId={fieldValue.workspaceMemberId}
+    />
+  );
+};
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/stories/perf/ActorFieldDisplay.perf.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/stories/perf/ActorFieldDisplay.perf.stories.tsx
@@ -0,0 +1,41 @@
+import { ActorFieldDisplay } from '@/object-record/record-field/meta-types/display/components/ActorFieldDisplay';
+import { FieldActorValue } from '@/object-record/record-field/types/FieldMetadata';
+import { Meta, StoryObj } from '@storybook/react';
+import { ComponentDecorator } from 'twenty-ui';
+
+import { ChipGeneratorsDecorator } from '~/testing/decorators/ChipGeneratorsDecorator';
+import { getFieldDecorator } from '~/testing/decorators/getFieldDecorator';
+import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
+import { getProfilingStory } from '~/testing/profiling/utils/getProfilingStory';
+
+const meta: Meta = {
+  title: 'UI/Data/Field/Display/ActorFieldDisplay',
+  decorators: [
+    MemoryRouterDecorator,
+    ChipGeneratorsDecorator,
+    getFieldDecorator('person', 'actor', {
+      name: 'John Doe',
+      source: 'API',
+      workspaceMemberId: undefined,
+    } satisfies FieldActorValue),
+    ComponentDecorator,
+  ],
+  component: ActorFieldDisplay,
+  args: {},
+  parameters: {
+    chromatic: { disableSnapshot: true },
+  },
+};
+
+export default meta;
+
+type Story = StoryObj<typeof ActorFieldDisplay>;
+
+export const Default: Story = {};
+
+export const Performance = getProfilingStory({
+  componentName: 'ActorFieldDisplay',
+  averageThresholdInMs: 0.2,
+  numberOfRuns: 20,
+  numberOfTestsPerRun: 100,
+});
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useActorFieldDisplay.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useActorFieldDisplay.ts
@@ -0,0 +1,30 @@
+import { useContext } from 'react';
+
+import { FieldActorValue } from '@/object-record/record-field/types/FieldMetadata';
+import { useRecordFieldValue } from '@/object-record/record-store/contexts/RecordFieldValueSelectorContext';
+
+import { AuthContext } from '@/auth/contexts/AuthContext';
+import { FieldContext } from '../../contexts/FieldContext';
+
+export const useActorFieldDisplay = () => {
+  const { entityId, fieldDefinition } = useContext(FieldContext);
+
+  const { currentWorkspaceMembers } = useContext(AuthContext);
+
+  const fieldName = fieldDefinition.metadata.fieldName;
+
+  const fieldValue = useRecordFieldValue<FieldActorValue | undefined>(
+    entityId,
+    fieldName,
+  );
+
+  return {
+    fieldDefinition,
+    fieldValue: {
+      ...fieldValue,
+      workspaceMember: currentWorkspaceMembers?.find(
+        (member) => member.id === fieldValue?.workspaceMemberId,
+      ),
+    },
+  };
+};
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useChipFieldDisplay.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useChipFieldDisplay.ts
@@ -8,6 +8,7 @@ import { isFieldText } from '@/object-record/record-field/types/guards/isFieldTe
 import { useRecordValue } from '@/object-record/record-store/contexts/RecordFieldValueSelectorContext';
 import { isDefined } from '~/utils/isDefined';

+import { isFieldActor } from '@/object-record/record-field/types/guards/isFieldActor';
 import { FieldContext } from '../../contexts/FieldContext';

 export const useChipFieldDisplay = () => {
@@ -25,7 +26,8 @@ export const useChipFieldDisplay = () => {
  const objectNameSingular =
    isFieldText(fieldDefinition) ||
    isFieldFullName(fieldDefinition) ||
-    isFieldNumber(fieldDefinition)
+    isFieldNumber(fieldDefinition) ||
+    isFieldActor(fieldDefinition)
      ? fieldDefinition.metadata.objectMetadataNameSingular
      : undefined;

--- a/packages/twenty-front/src/modules/object-record/record-field/types/FieldInputDraftValue.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/FieldInputDraftValue.ts
@@ -1,5 +1,6 @@
 import { CurrencyCode } from '@/object-record/record-field/types/CurrencyCode';
 import {
+  FieldActorValue,
  FieldAddressValue,
  FieldBooleanValue,
  FieldCurrencyValue,
@@ -51,6 +52,11 @@ export type FieldAddressDraftValue = {
  addressLng: number | null;
 };
 export type FieldJsonDraftValue = string;
+export type FieldActorDraftValue = {
+  source: string;
+  workspaceMemberId?: string;
+  name: string;
+};

 export type FieldInputDraftValue<FieldValue> = FieldValue extends FieldTextValue
  ? FieldTextDraftValue
@@ -88,4 +94,6 @@ export type FieldInputDraftValue<FieldValue> = FieldValue extends FieldTextValue
                                  ? FieldAddressDraftValue
                                  : FieldValue extends FieldJsonValue
                                    ? FieldJsonDraftValue
-                                    : never;
+                                    : FieldValue extends FieldActorValue
+                                      ? FieldActorDraftValue
+                                      : never;
--- a/packages/twenty-front/src/modules/object-record/record-field/types/FieldMetadata.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/FieldMetadata.ts
@@ -142,6 +142,11 @@ export type FieldMultiSelectMetadata = {
  options: { label: string; color: ThemeColor; value: string }[];
 };

+export type FieldActorMetadata = {
+  objectMetadataNameSingular?: string;
+  fieldName: string;
+};
+
 export type FieldMetadata =
  | FieldBooleanMetadata
  | FieldCurrencyMetadata
@@ -158,7 +163,8 @@ export type FieldMetadata =
  | FieldMultiSelectMetadata
  | FieldTextMetadata
  | FieldUuidMetadata
-  | FieldAddressMetadata;
+  | FieldAddressMetadata
+  | FieldActorMetadata;

 export type FieldTextValue = string;
 export type FieldUUidValue = string;
@@ -204,3 +210,9 @@ export type FieldRelationValue<

 export type Json = ZodHelperLiteral | { [key: string]: Json } | Json[];
 export type FieldJsonValue = Record<string, Json> | Json[] | null;
+
+export type FieldActorValue = {
+  source: string;
+  workspaceMemberId?: string;
+  name: string;
+};
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/assertFieldMetadata.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/assertFieldMetadata.ts
@@ -2,6 +2,7 @@ import { FieldMetadataType } from '~/generated-metadata/graphql';

 import { FieldDefinition } from '../FieldDefinition';
 import {
+  FieldActorMetadata,
  FieldAddressMetadata,
  FieldBooleanMetadata,
  FieldCurrencyMetadata,
@@ -63,7 +64,9 @@ type AssertFieldMetadataFunction = <
                                      ? FieldRawJsonMetadata
                                      : E extends 'RICH_TEXT'
                                        ? FieldTextMetadata
-                                        : never,
+                                        : E extends 'ACTOR'
+                                          ? FieldActorMetadata
+                                          : never,
 >(
  fieldType: E,
  fieldTypeGuard: (
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldActor.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldActor.ts
@@ -0,0 +1,9 @@
+import { FieldMetadataType } from '~/generated-metadata/graphql';
+
+import { FieldDefinition } from '../FieldDefinition';
+import { FieldActorMetadata, FieldMetadata } from '../FieldMetadata';
+
+export const isFieldActor = (
+  field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
+): field is FieldDefinition<FieldActorMetadata> =>
+  field.type === FieldMetadataType.Actor;
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldActorValue.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldActorValue.ts
@@ -0,0 +1,13 @@
+import { z } from 'zod';
+
+import { FieldActorValue } from '../FieldMetadata';
+
+const actorSchema = z.object({
+  source: z.string(),
+  workspaceMemberId: z.optional(z.string().nullable()),
+  name: z.string(),
+});
+
+export const isFieldActorValue = (
+  fieldValue: unknown,
+): fieldValue is FieldActorValue => actorSchema.safeParse(fieldValue).success;
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldFullNameValue.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldFullNameValue.ts
@@ -2,7 +2,7 @@ import { z } from 'zod';

 import { FieldFullNameValue } from '../FieldMetadata';

-const currencySchema = z.object({
+const fullnameSchema = z.object({
  firstName: z.string(),
  lastName: z.string(),
 });
@@ -10,4 +10,4 @@ const currencySchema = z.object({
 export const isFieldFullNameValue = (
  fieldValue: unknown,
 ): fieldValue is FieldFullNameValue =>
-  currencySchema.safeParse(fieldValue).success;
+  fullnameSchema.safeParse(fieldValue).success;
--- a/packages/twenty-front/src/modules/object-record/record-field/utils/isFieldValueEmpty.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/utils/isFieldValueEmpty.ts
@@ -2,6 +2,8 @@ import { isString } from '@sniptt/guards';

 import { FieldDefinition } from '@/object-record/record-field/types/FieldDefinition';
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
+import { isFieldActor } from '@/object-record/record-field/types/guards/isFieldActor';
+import { isFieldActorValue } from '@/object-record/record-field/types/guards/isFieldActorValue';
 import { isFieldAddress } from '@/object-record/record-field/types/guards/isFieldAddress';
 import { isFieldAddressValue } from '@/object-record/record-field/types/guards/isFieldAddressValue';
 import { isFieldBoolean } from '@/object-record/record-field/types/guards/isFieldBoolean';
@@ -13,9 +15,9 @@ import { isFieldEmail } from '@/object-record/record-field/types/guards/isFieldE
 import { isFieldFullName } from '@/object-record/record-field/types/guards/isFieldFullName';
 import { isFieldFullNameValue } from '@/object-record/record-field/types/guards/isFieldFullNameValue';
 import { isFieldLink } from '@/object-record/record-field/types/guards/isFieldLink';
+import { isFieldLinkValue } from '@/object-record/record-field/types/guards/isFieldLinkValue';
 import { isFieldLinks } from '@/object-record/record-field/types/guards/isFieldLinks';
 import { isFieldLinksValue } from '@/object-record/record-field/types/guards/isFieldLinksValue';
-import { isFieldLinkValue } from '@/object-record/record-field/types/guards/isFieldLinkValue';
 import { isFieldMultiSelect } from '@/object-record/record-field/types/guards/isFieldMultiSelect';
 import { isFieldMultiSelectValue } from '@/object-record/record-field/types/guards/isFieldMultiSelectValue';
 import { isFieldNumber } from '@/object-record/record-field/types/guards/isFieldNumber';
@@ -112,6 +114,10 @@ export const isFieldValueEmpty = ({
    );
  }

+  if (isFieldActor(fieldDefinition)) {
+    return !isFieldActorValue(fieldValue) || isValueEmpty(fieldValue.name);
+  }
+
  throw new Error(
    `Entity field type not supported in isFieldValueEmpty : ${fieldDefinition.type}}`,
  );
--- a/packages/twenty-front/src/modules/object-record/record-filter/utils/isRecordMatchingFilter.ts
+++ b/packages/twenty-front/src/modules/object-record/record-filter/utils/isRecordMatchingFilter.ts
@@ -2,6 +2,7 @@ import { isObject } from '@sniptt/guards';

 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import {
+  ActorFilter,
  AddressFilter,
  AndObjectRecordFilter,
  BooleanFilter,
@@ -256,6 +257,17 @@ export const isRecordMatchingFilter = ({
          value: record[filterKey].amountMicros,
        });
      }
+      case FieldMetadataType.Actor: {
+        const actorFilter = filterValue as ActorFilter;
+
+        return (
+          actorFilter.name === undefined ||
+          isMatchingStringFilter({
+            stringFilter: actorFilter.name,
+            value: record[filterKey].name,
+          })
+        );
+      }
      case FieldMetadataType.Relation: {
        throw new Error(
          `Not implemented yet, use UUID filter instead on the corredponding "${filterKey}Id" field`,
--- a/packages/twenty-front/src/modules/object-record/record-filter/utils/turnObjectDropdownFilterIntoQueryFilter.ts
+++ b/packages/twenty-front/src/modules/object-record/record-filter/utils/turnObjectDropdownFilterIntoQueryFilter.ts
@@ -1,6 +1,7 @@
 import { isNonEmptyString } from '@sniptt/guards';

 import {
+  ActorFilter,
  AddressFilter,
  CurrencyFilter,
  DateFilter,
@@ -212,6 +213,22 @@ const applyEmptyFilters = (
        [correspondingField.name + 'Id']: { is: 'NULL' } as RelationFilter,
      };
      break;
+    case 'ACTOR':
+      emptyRecordFilter = {
+        or: [
+          {
+            [correspondingField.name]: {
+              name: { ilike: '' },
+            } as ActorFilter,
+          },
+          {
+            [correspondingField.name]: {
+              name: { is: 'NULL' },
+            } as ActorFilter,
+          },
+        ],
+      };
+      break;
    default:
      throw new Error(`Unsupported empty filter type ${filterType}`);
  }
@@ -744,6 +761,51 @@ export const turnObjectDropdownFilterIntoQueryFilter = (
        }
        break;
      }
+      case 'ACTOR':
+        switch (rawUIFilter.operand) {
+          case ViewFilterOperand.Contains:
+            objectRecordFilters.push({
+              or: [
+                {
+                  [correspondingField.name]: {
+                    name: {
+                      ilike: `%${rawUIFilter.value}%`,
+                    },
+                  } as ActorFilter,
+                },
+              ],
+            });
+            break;
+          case ViewFilterOperand.DoesNotContain:
+            objectRecordFilters.push({
+              and: [
+                {
+                  not: {
+                    [correspondingField.name]: {
+                      name: {
+                        ilike: `%${rawUIFilter.value}%`,
+                      },
+                    } as ActorFilter,
+                  },
+                },
+              ],
+            });
+            break;
+          case ViewFilterOperand.IsEmpty:
+          case ViewFilterOperand.IsNotEmpty:
+            applyEmptyFilters(
+              rawUIFilter.operand,
+              correspondingField,
+              objectRecordFilters,
+              rawUIFilter.definition.type,
+            );
+            break;
+          default:
+            throw new Error(
+              `Unknown operand ${rawUIFilter.operand} for ${rawUIFilter.definition.type} filter`,
+            );
+        }
+        break;
      default:
        throw new Error('Unknown filter type');
    }
--- a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCell.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCell.tsx
@@ -14,6 +14,7 @@ import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types
 import { useInlineCell } from '../hooks/useInlineCell';

 import { RecordInlineCellContainer } from './RecordInlineCellContainer';
+import { useIsFieldReadOnly } from '@/object-record/record-field/hooks/useIsFieldReadOnly';

 type RecordInlineCellProps = {
  readonly?: boolean;
@@ -32,8 +33,12 @@ export const RecordInlineCell = ({

  const isFieldInputOnly = useIsFieldInputOnly();

+  const isFieldReadOnly = useIsFieldReadOnly();
+
  const { closeInlineCell } = useInlineCell();

+  const cellIsReadOnly = readonly || isFieldReadOnly;
+
  const handleEnter: FieldInputEvent = (persistField) => {
    persistField();
    closeInlineCell();
@@ -72,7 +77,7 @@ export const RecordInlineCell = ({
  return (
    <FieldFocusContextProvider>
      <RecordInlineCellContainer
-        readonly={readonly}
+        readonly={cellIsReadOnly}
        buttonIcon={buttonIcon}
        customEditHotkeyScope={
          isFieldRelation(fieldDefinition)
@@ -100,7 +105,7 @@ export const RecordInlineCell = ({
            onTab={handleTab}
            onShiftTab={handleShiftTab}
            onClickOutside={handleClickOutside}
-            isReadOnly={readonly}
+            isReadOnly={cellIsReadOnly}
          />
        }
        displayModeContent={<FieldDisplay />}
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellSoftFocusMode.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellSoftFocusMode.tsx
@@ -78,7 +78,11 @@ export const RecordTableCellSoftFocusMode = ({
  useScopedHotkeys(
    Key.Enter,
    () => {
-      if (!isFieldInputOnly && !isCellReadOnly) {
+      if (isCellReadOnly) {
+        return;
+      }
+
+      if (!isFieldInputOnly) {
        openTableCell();
      } else {
        toggleEditOnlyInput();
@@ -91,6 +95,10 @@ export const RecordTableCellSoftFocusMode = ({
  useScopedHotkeys(
    '*',
    (keyboardEvent) => {
+      if (isCellReadOnly) {
+        return;
+      }
+
      if (!isFieldInputOnly) {
        const isWritingText =
          !isNonTextWritingKey(keyboardEvent.key) &&
@@ -150,6 +158,8 @@ export const RecordTableCellSoftFocusMode = ({
    (!isFirstColumn || !isEmpty) &&
    !isCellReadOnly;

+  const dontShowContent = isEmpty && isCellReadOnly;
+
  return (
    <>
      <RecordTableCellDisplayContainer
@@ -157,7 +167,13 @@ export const RecordTableCellSoftFocusMode = ({
        scrollRef={scrollRef}
        softFocus
      >
-        {editModeContentOnly ? editModeContent : nonEditModeContent}
+        {dontShowContent ? (
+          <></>
+        ) : editModeContentOnly ? (
+          editModeContent
+        ) : (
+          nonEditModeContent
+        )}
      </RecordTableCellDisplayContainer>
      {showButton && (
        <RecordTableCellButton onClick={handleButtonClick} Icon={buttonIcon} />
--- a/packages/twenty-front/src/modules/object-record/spreadsheet-import/constants/CompositeFieldImportLabels.ts
+++ b/packages/twenty-front/src/modules/object-record/spreadsheet-import/constants/CompositeFieldImportLabels.ts
@@ -30,4 +30,7 @@ export const COMPOSITE_FIELD_IMPORT_LABELS = {
    primaryLinkUrlLabel: 'Link URL',
    primaryLinkLabelLabel: 'Link Label',
  } satisfies Partial<CompositeFieldLabels<FieldLinksValue>>,
+  [FieldMetadataType.Actor]: {
+    sourceLabel: 'Source',
+  },
 };
--- a/packages/twenty-front/src/modules/object-record/spreadsheet-import/util/buildRecordFromImportedStructuredRow.ts
+++ b/packages/twenty-front/src/modules/object-record/spreadsheet-import/util/buildRecordFromImportedStructuredRow.ts
@@ -160,6 +160,11 @@ export const buildRecordFromImportedStructuredRow = (
          };
        }
        break;
+      case FieldMetadataType.Actor:
+        recordToBuild[field.name] = {
+          source: 'IMPORT',
+        };
+        break;
      default:
        recordToBuild[field.name] = importedFieldValue;
        break;
--- a/packages/twenty-front/src/modules/object-record/utils/generateEmptyFieldValue.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/generateEmptyFieldValue.ts
@@ -87,6 +87,12 @@ export const generateEmptyFieldValue = (
    case FieldMetadataType.RichText: {
      return null;
    }
+    case FieldMetadataType.Actor: {
+      return {
+        source: 'MANUAL',
+        name: '',
+      };
+    }
    default: {
      throw new Error('Unhandled FieldMetadataType');
    }
--- a/packages/twenty-front/src/modules/settings/data-model/constants/SettingsFieldTypeConfigs.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/constants/SettingsFieldTypeConfigs.ts
@@ -4,6 +4,7 @@ import {
  IconCheck,
  IconCoins,
  IconComponent,
+  IconCreativeCommonsSa,
  IconFilePencil,
  IconJson,
  IconKey,
@@ -137,6 +138,10 @@ export const SETTINGS_FIELD_TYPE_CONFIGS = {
    Icon: IconFilePencil,
    defaultValue: { key: 'value' },
  },
+  [FieldMetadataType.Actor]: {
+    label: 'Actor',
+    Icon: IconCreativeCommonsSa,
+  },
 } as const satisfies Record<
  SettingsSupportedFieldType,
  SettingsFieldTypeConfig
--- a/packages/twenty-front/src/modules/ui/field/display/components/ActorDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/ActorDisplay.tsx
@@ -0,0 +1,50 @@
+import { FieldActorValue } from '@/object-record/record-field/types/FieldMetadata';
+import { useMemo } from 'react';
+import {
+  AvatarChip,
+  AvatarChipVariant,
+  IconApi,
+  IconCalendar,
+  IconCsv,
+  IconGmail,
+} from 'twenty-ui';
+
+type ActorDisplayProps = Partial<FieldActorValue> & {
+  avatarUrl?: string | null;
+};
+
+export const ActorDisplay = ({
+  name,
+  source,
+  workspaceMemberId,
+  avatarUrl,
+}: ActorDisplayProps) => {
+  const LeftIcon = useMemo(() => {
+    switch (source) {
+      case 'API':
+        return IconApi;
+      case 'IMPORT':
+        return IconCsv;
+      case 'EMAIL':
+        return IconGmail;
+      case 'CALENDAR':
+        return IconCalendar;
+      default:
+        return undefined;
+    }
+  }, [source]);
+
+  const isIconInverted = source === 'API' || source === 'IMPORT';
+
+  return (
+    <AvatarChip
+      placeholderColorSeed={workspaceMemberId ?? undefined}
+      name={name ?? ''}
+      avatarType={workspaceMemberId ? 'rounded' : 'squared'}
+      LeftIcon={LeftIcon}
+      avatarUrl={avatarUrl ?? undefined}
+      isIconInverted={isIconInverted}
+      variant={AvatarChipVariant.Transparent}
+    />
+  );
+};
--- a/packages/twenty-front/src/modules/ui/field/display/components/stories/ActorDisplay.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/stories/ActorDisplay.stories.tsx
@@ -0,0 +1,46 @@
+import { Meta, StoryObj } from '@storybook/react';
+
+import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';
+
+import { ActorDisplay } from '@/ui/field/display/components/ActorDisplay';
+import { CatalogDecorator } from 'twenty-ui';
+
+const meta: Meta = {
+  title: 'UI/Display/ActorDisplay',
+  component: ActorDisplay,
+  args: {
+    name: 'John Doe',
+  },
+  decorators: [ComponentWithRouterDecorator],
+};
+
+export default meta;
+
+type Story = StoryObj<typeof ActorDisplay>;
+
+export const Default: Story = {};
+
+export const Catalog: Story = {
+  decorators: [CatalogDecorator],
+  parameters: {
+    catalog: {
+      dimensions: [
+        {
+          name: 'source',
+          values: ['API', 'IMPORT', 'EMAIL', 'CALENDAR', 'MANUAL'],
+          props: (source: string) => ({ source }),
+        },
+        {
+          name: 'workspaceMemberId',
+          values: [null, '123'],
+          props: (workspaceMemberId: string) => ({ workspaceMemberId }),
+        },
+        {
+          name: 'avatarUrl',
+          values: [null, 'https://picsum.photos/16'],
+          props: (avatarUrl: string) => ({ avatarUrl }),
+        },
+      ],
+    },
+  },
+};
--- a/packages/twenty-front/src/modules/users/components/UserProviderEffect.tsx
+++ b/packages/twenty-front/src/modules/users/components/UserProviderEffect.tsx
@@ -2,6 +2,7 @@ import { useEffect, useState } from 'react';
 import { useRecoilState, useSetRecoilState } from 'recoil';

 import { currentUserState } from '@/auth/states/currentUserState';
+import { currentWorkspaceMembersState } from '@/auth/states/currentWorkspaceMembersStates';
 import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
 import { isCurrentUserLoadedState } from '@/auth/states/isCurrentUserLoadingState';
@@ -13,6 +14,7 @@ import { detectTimeZone } from '@/localization/utils/detectTimeZone';
 import { getDateFormatFromWorkspaceDateFormat } from '@/localization/utils/getDateFormatFromWorkspaceDateFormat';
 import { getTimeFormatFromWorkspaceTimeFormat } from '@/localization/utils/getTimeFormatFromWorkspaceTimeFormat';
 import { ColorScheme } from '@/workspace-member/types/WorkspaceMember';
+import { WorkspaceMember } from '~/generated-metadata/graphql';
 import { useGetCurrentUserQuery } from '~/generated/graphql';
 import { isDefined } from '~/utils/isDefined';

@@ -31,6 +33,9 @@ export const UserProviderEffect = () => {
  const setCurrentWorkspaceMember = useSetRecoilState(
    currentWorkspaceMemberState,
  );
+  const setCurrentWorkspaceMembers = useSetRecoilState(
+    currentWorkspaceMembersState,
+  );

  const { loading: queryLoading, data: queryData } = useGetCurrentUserQuery({
    skip: isCurrentUserLoaded,
@@ -47,15 +52,26 @@ export const UserProviderEffect = () => {
    setCurrentUser(queryData.currentUser);
    setCurrentWorkspace(queryData.currentUser.defaultWorkspace);

-    const { workspaceMember, workspaces: userWorkspaces } =
-      queryData.currentUser;
+    const {
+      workspaceMember,
+      workspaceMembers,
+      workspaces: userWorkspaces,
+    } = queryData.currentUser;

-    if (isDefined(workspaceMember)) {
-      setCurrentWorkspaceMember({
+    const affectDefaultValuesOnEmptyWorkspaceMemberFields = (
+      workspaceMember: WorkspaceMember,
+    ) => {
+      return {
        ...workspaceMember,
        colorScheme: (workspaceMember.colorScheme as ColorScheme) ?? 'Light',
        locale: workspaceMember.locale ?? 'en',
-      });
+      };
+    };
+
+    if (isDefined(workspaceMember)) {
+      setCurrentWorkspaceMember(
+        affectDefaultValuesOnEmptyWorkspaceMemberFields(workspaceMember),
+      );

      // TODO: factorize
      setDateTimeFormat({
@@ -72,6 +88,13 @@ export const UserProviderEffect = () => {
      });
    }

+    if (isDefined(workspaceMembers)) {
+      setCurrentWorkspaceMembers(
+        workspaceMembers.map(affectDefaultValuesOnEmptyWorkspaceMemberFields) ??
+          [],
+      );
+    }
+
    if (isDefined(userWorkspaces)) {
      const workspaces = userWorkspaces
        .map(({ workspace }) => workspace)
@@ -81,6 +104,7 @@ export const UserProviderEffect = () => {
    }
  }, [
    setCurrentUser,
+    setCurrentWorkspaceMembers,
    isLoading,
    queryLoading,
    setCurrentWorkspace,
--- a/packages/twenty-front/src/modules/users/graphql/fragments/userQueryFragment.ts
+++ b/packages/twenty-front/src/modules/users/graphql/fragments/userQueryFragment.ts
@@ -10,17 +10,10 @@ export const USER_QUERY_FRAGMENT = gql`
    supportUserHash
    onboardingStatus
    workspaceMember {
-      id
-      name {
-        firstName
-        lastName
-      }
-      colorScheme
-      avatarUrl
-      locale
-      timeZone
-      dateFormat
-      timeFormat
+      ...WorkspaceMemberQueryFragment
+    }
+    workspaceMembers {
+      ...WorkspaceMemberQueryFragment
    }
    defaultWorkspace {
      id
--- a/packages/twenty-front/src/modules/workspace-member/grapqhql/fragments/workspaceMemberQueryFragment.ts
+++ b/packages/twenty-front/src/modules/workspace-member/grapqhql/fragments/workspaceMemberQueryFragment.ts
@@ -0,0 +1,17 @@
+import { gql } from '@apollo/client';
+
+export const USER_QUERY_FRAGMENT = gql`
+  fragment WorkspaceMemberQueryFragment on WorkspaceMember {
+    id
+    name {
+      firstName
+      lastName
+    }
+    colorScheme
+    avatarUrl
+    locale
+    timeZone
+    dateFormat
+    timeFormat
+  }
+`;
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx
@@ -164,6 +164,7 @@ export const SettingsObjectNewFieldStep2 = () => {
      FieldMetadataType.Link,
      FieldMetadataType.Numeric,
      FieldMetadataType.RichText,
+      FieldMetadataType.Actor,
    ] as const
  ).filter(isDefined);

--- a/packages/twenty-front/src/testing/decorators/getFieldDecorator.tsx
+++ b/packages/twenty-front/src/testing/decorators/getFieldDecorator.tsx
@@ -1,5 +1,5 @@
-import { useEffect } from 'react';
 import { Decorator } from '@storybook/react';
+import { useEffect } from 'react';
 import { useRecoilCallback } from 'recoil';

 import { formatFieldMetadataItemAsColumnDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsColumnDefinition';
--- a/packages/twenty-front/src/testing/mock-data/generated/standard-metadata-query-result.ts
+++ b/packages/twenty-front/src/testing/mock-data/generated/standard-metadata-query-result.ts
--- a/packages/twenty-front/src/testing/mock-data/people.ts
+++ b/packages/twenty-front/src/testing/mock-data/people.ts
--- a/packages/twenty-front/vite.config.ts
+++ b/packages/twenty-front/vite.config.ts
@@ -72,6 +72,8 @@ export default defineConfig(({ command, mode }) => {
          '**/RecordTableCellTd.tsx',
          '**/RecordTableTd.tsx',
          '**/RecordTableHeaderDragDropColumn.tsx',
+          '**/ActorDisplay.tsx',
+          '**/AvatarChip.tsx',
        ],
        babelOptions: {
          presets: ['@babel/preset-typescript', '@babel/preset-react'],
--- a/packages/twenty-server/@types/express.d.ts
+++ b/packages/twenty-server/@types/express.d.ts
@@ -1,9 +1,11 @@
 import { User } from 'src/engine/core-modules/user/user.entity';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { ApiKeyWorkspaceEntity } from 'src/modules/api-key/standard-objects/api-key.workspace-entity';

 declare module 'express-serve-static-core' {
  interface Request {
-    user?: User;
+    user?: User | null;
+    apiKey?: ApiKeyWorkspaceEntity | null;
    workspace?: Workspace;
    workspaceId?: string;
    cacheVersion?: string | null;
--- a/packages/twenty-server/package.json
+++ b/packages/twenty-server/package.json
@@ -32,6 +32,7 @@
    "langchain": "^0.2.6",
    "langfuse-langchain": "^3.11.2",
    "lodash.differencewith": "^4.5.0",
+    "lodash.merge": "^4.6.2",
    "lodash.omitby": "^4.6.0",
    "lodash.uniq": "^4.5.0",
    "lodash.uniqby": "^4.7.0",
@@ -48,6 +49,7 @@
    "@types/lodash.isempty": "^4.4.7",
    "@types/lodash.isequal": "^4.5.8",
    "@types/lodash.isobject": "^3.0.7",
+    "@types/lodash.merge": "^4.6.9",
    "@types/lodash.omit": "^4.5.9",
    "@types/lodash.omitby": "^4.6.9",
    "@types/lodash.snakecase": "^4.1.7",
--- a/packages/twenty-server/src/database/typeorm-seeds/workspace/companies.ts
+++ b/packages/twenty-server/src/database/typeorm-seeds/workspace/companies.ts
@@ -1,5 +1,7 @@
 import { EntityManager } from 'typeorm';

+import { DEV_SEED_WORKSPACE_MEMBER_IDS } from 'src/database/typeorm-seeds/workspace/workspace-members';
+
 const tableName = 'company';

 export const DEV_SEED_COMPANY_IDS = {
@@ -36,6 +38,9 @@ export const seedCompanies = async (
      'addressAddressPostcode',
      'addressAddressCountry',
      'position',
+      'createdBySource',
+      'createdByWorkspaceMemberId',
+      'createdByName',
    ])
    .orIgnore()
    .values([
@@ -50,6 +55,9 @@ export const seedCompanies = async (
        addressAddressPostcode: null,
        addressAddressCountry: 'Ireland',
        position: 1,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        createdByName: 'Tim Apple',
      },
      {
        id: DEV_SEED_COMPANY_IDS.FACEBOOK,
@@ -62,6 +70,9 @@ export const seedCompanies = async (
        addressAddressPostcode: null,
        addressAddressCountry: null,
        position: 2,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        createdByName: 'Tim Apple',
      },
      {
        id: DEV_SEED_COMPANY_IDS.QONTO,
@@ -74,6 +85,9 @@ export const seedCompanies = async (
        addressAddressPostcode: '75009',
        addressAddressCountry: 'France',
        position: 3,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        createdByName: 'Tim Apple',
      },
      {
        id: DEV_SEED_COMPANY_IDS.MICROSOFT,
@@ -86,6 +100,9 @@ export const seedCompanies = async (
        addressAddressPostcode: null,
        addressAddressCountry: null,
        position: 4,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        createdByName: 'Tim Apple',
      },
      {
        id: DEV_SEED_COMPANY_IDS.AIRBNB,
@@ -98,6 +115,9 @@ export const seedCompanies = async (
        addressAddressPostcode: '94103',
        addressAddressCountry: 'United States',
        position: 5,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        createdByName: 'Tim Apple',
      },
      {
        id: DEV_SEED_COMPANY_IDS.GOOGLE,
@@ -110,6 +130,9 @@ export const seedCompanies = async (
        addressAddressPostcode: '94102',
        addressAddressCountry: 'United States',
        position: 6,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        createdByName: 'Tim Apple',
      },
      {
        id: DEV_SEED_COMPANY_IDS.NETFLIX,
@@ -122,6 +145,9 @@ export const seedCompanies = async (
        addressAddressPostcode: '94110',
        addressAddressCountry: 'United States',
        position: 7,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        createdByName: 'Tim Apple',
      },
      {
        id: DEV_SEED_COMPANY_IDS.LIBEO,
@@ -134,6 +160,9 @@ export const seedCompanies = async (
        addressAddressPostcode: null,
        addressAddressCountry: null,
        position: 8,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        createdByName: 'Tim Apple',
      },
      {
        id: DEV_SEED_COMPANY_IDS.CLAAP,
@@ -146,6 +175,9 @@ export const seedCompanies = async (
        addressAddressPostcode: null,
        addressAddressCountry: null,
        position: 9,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        createdByName: 'Tim Apple',
      },
      {
        id: DEV_SEED_COMPANY_IDS.HASURA,
@@ -158,6 +190,9 @@ export const seedCompanies = async (
        addressAddressPostcode: null,
        addressAddressCountry: null,
        position: 10,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        createdByName: 'Tim Apple',
      },
      {
        id: DEV_SEED_COMPANY_IDS.WEWORK,
@@ -170,6 +205,9 @@ export const seedCompanies = async (
        addressAddressPostcode: null,
        addressAddressCountry: null,
        position: 11,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        createdByName: 'Tim Apple',
      },
      {
        id: DEV_SEED_COMPANY_IDS.SAMSUNG,
@@ -182,6 +220,9 @@ export const seedCompanies = async (
        addressAddressPostcode: null,
        addressAddressCountry: null,
        position: 12,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        createdByName: 'Tim Apple',
      },
      {
        id: DEV_SEED_COMPANY_IDS.ALGOLIA,
@@ -194,6 +235,9 @@ export const seedCompanies = async (
        addressAddressPostcode: null,
        addressAddressCountry: null,
        position: 13,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: null,
+        createdByName: '',
      },
    ])
    .execute();
--- a/packages/twenty-server/src/database/typeorm-seeds/workspace/opportunities.ts
+++ b/packages/twenty-server/src/database/typeorm-seeds/workspace/opportunities.ts
@@ -2,6 +2,7 @@ import { EntityManager } from 'typeorm';

 import { DEV_SEED_COMPANY_IDS } from 'src/database/typeorm-seeds/workspace/companies';
 import { DEV_SEED_PERSON_IDS } from 'src/database/typeorm-seeds/workspace/people';
+import { DEV_SEED_WORKSPACE_MEMBER_IDS } from 'src/database/typeorm-seeds/workspace/workspace-members';

 const tableName = 'opportunity';

@@ -29,6 +30,9 @@ export const seedOpportunity = async (
      'position',
      'pointOfContactId',
      'companyId',
+      'createdBySource',
+      'createdByWorkspaceMemberId',
+      'createdByName',
    ])
    .orIgnore()
    .values([
@@ -42,6 +46,9 @@ export const seedOpportunity = async (
        position: 1,
        pointOfContactId: DEV_SEED_PERSON_IDS.CHRISTOPH,
        companyId: DEV_SEED_COMPANY_IDS.LINKEDIN,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.JONY,
+        createdByName: 'Jony Ive',
      },
      {
        id: DEV_SEED_OPPORTUNITY_IDS.OPPORTUNITY_2,
@@ -53,6 +60,9 @@ export const seedOpportunity = async (
        position: 2,
        pointOfContactId: DEV_SEED_PERSON_IDS.CHRISTOPHER_G,
        companyId: DEV_SEED_COMPANY_IDS.FACEBOOK,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.JONY,
+        createdByName: 'Jony Ive',
      },
      {
        id: DEV_SEED_OPPORTUNITY_IDS.OPPORTUNITY_3,
@@ -64,6 +74,9 @@ export const seedOpportunity = async (
        position: 3,
        pointOfContactId: DEV_SEED_PERSON_IDS.NICHOLAS,
        companyId: DEV_SEED_COMPANY_IDS.MICROSOFT,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.JONY,
+        createdByName: 'Jony Ive',
      },
      {
        id: DEV_SEED_OPPORTUNITY_IDS.OPPORTUNITY_4,
@@ -75,6 +88,9 @@ export const seedOpportunity = async (
        position: 4,
        pointOfContactId: DEV_SEED_PERSON_IDS.MATTHEW,
        companyId: DEV_SEED_COMPANY_IDS.MICROSOFT,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: null,
+        createdByName: '',
      },
    ])
    .execute();
--- a/packages/twenty-server/src/database/typeorm-seeds/workspace/people.ts
+++ b/packages/twenty-server/src/database/typeorm-seeds/workspace/people.ts
@@ -1,6 +1,7 @@
 import { EntityManager } from 'typeorm';

 import { DEV_SEED_COMPANY_IDS } from 'src/database/typeorm-seeds/workspace/companies';
+import { DEV_SEED_WORKSPACE_MEMBER_IDS } from 'src/database/typeorm-seeds/workspace/workspace-members';

 const tableName = 'person';

@@ -38,6 +39,9 @@ export const seedPeople = async (
      'companyId',
      'email',
      'position',
+      'createdBySource',
+      'createdByWorkspaceMemberId',
+      'createdByName',
    ])
    .orIgnore()
    .values([
@@ -50,6 +54,9 @@ export const seedPeople = async (
        companyId: DEV_SEED_COMPANY_IDS.LINKEDIN,
        email: 'christoph.calisto@linkedin.com',
        position: 1,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        createdByName: 'Tim Apple',
      },
      {
        id: DEV_SEED_PERSON_IDS.SYLVIE,
@@ -60,6 +67,9 @@ export const seedPeople = async (
        companyId: DEV_SEED_COMPANY_IDS.LINKEDIN,
        email: 'sylvie.palmer@linkedin.com',
        position: 2,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        createdByName: 'Tim Apple',
      },
      {
        id: DEV_SEED_PERSON_IDS.CHRISTOPHER_G,
@@ -70,6 +80,9 @@ export const seedPeople = async (
        companyId: DEV_SEED_COMPANY_IDS.QONTO,
        email: 'christopher.gonzalez@qonto.com',
        position: 3,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        createdByName: 'Tim Apple',
      },
      {
        id: DEV_SEED_PERSON_IDS.ASHLEY,
@@ -80,6 +93,9 @@ export const seedPeople = async (
        companyId: DEV_SEED_COMPANY_IDS.QONTO,
        email: 'ashley.parker@qonto.com',
        position: 4,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        createdByName: 'Tim Apple',
      },
      {
        id: DEV_SEED_PERSON_IDS.NICHOLAS,
@@ -90,6 +106,9 @@ export const seedPeople = async (
        companyId: DEV_SEED_COMPANY_IDS.MICROSOFT,
        email: 'nicholas.wright@microsoft.com',
        position: 5,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        createdByName: 'Tim Apple',
      },
      {
        id: DEV_SEED_PERSON_IDS.ISABELLA,
@@ -100,6 +119,9 @@ export const seedPeople = async (
        companyId: DEV_SEED_COMPANY_IDS.MICROSOFT,
        email: 'isabella.scott@microsoft.com',
        position: 6,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        createdByName: 'Tim Apple',
      },
      {
        id: DEV_SEED_PERSON_IDS.MATTHEW,
@@ -110,6 +132,9 @@ export const seedPeople = async (
        companyId: DEV_SEED_COMPANY_IDS.MICROSOFT,
        email: 'matthew.green@microsoft.com',
        position: 7,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        createdByName: 'Tim Apple',
      },
      {
        id: DEV_SEED_PERSON_IDS.ELIZABETH,
@@ -120,6 +145,9 @@ export const seedPeople = async (
        companyId: DEV_SEED_COMPANY_IDS.AIRBNB,
        email: 'elizabeth.baker@airbnb.com',
        position: 8,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        createdByName: 'Tim Apple',
      },
      {
        id: DEV_SEED_PERSON_IDS.CHRISTOPHER_N,
@@ -130,6 +158,9 @@ export const seedPeople = async (
        companyId: DEV_SEED_COMPANY_IDS.AIRBNB,
        email: 'christopher.nelson@airbnb.com',
        position: 9,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        createdByName: 'Tim Apple',
      },
      {
        id: DEV_SEED_PERSON_IDS.AVERY,
@@ -140,6 +171,9 @@ export const seedPeople = async (
        companyId: DEV_SEED_COMPANY_IDS.AIRBNB,
        email: 'avery.carter@airbnb.com',
        position: 10,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        createdByName: 'Tim Apple',
      },
      {
        id: DEV_SEED_PERSON_IDS.ETHAN,
@@ -150,6 +184,9 @@ export const seedPeople = async (
        companyId: DEV_SEED_COMPANY_IDS.GOOGLE,
        email: 'ethan.mitchell@google.com',
        position: 11,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        createdByName: 'Tim Apple',
      },
      {
        id: DEV_SEED_PERSON_IDS.MADISON,
@@ -160,6 +197,9 @@ export const seedPeople = async (
        companyId: DEV_SEED_COMPANY_IDS.GOOGLE,
        email: 'madison.perez@google.com',
        position: 12,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        createdByName: 'Tim Apple',
      },
      {
        id: DEV_SEED_PERSON_IDS.BERTRAND,
@@ -170,6 +210,9 @@ export const seedPeople = async (
        companyId: DEV_SEED_COMPANY_IDS.GOOGLE,
        email: 'bertrand.voulzy@google.com',
        position: 13,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        createdByName: 'Tim Apple',
      },
      {
        id: DEV_SEED_PERSON_IDS.LOUIS,
@@ -180,6 +223,9 @@ export const seedPeople = async (
        companyId: DEV_SEED_COMPANY_IDS.GOOGLE,
        email: 'louis.duss@google.com',
        position: 14,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: DEV_SEED_WORKSPACE_MEMBER_IDS.TIM,
+        createdByName: 'Tim Apple',
      },
      {
        id: DEV_SEED_PERSON_IDS.LORIE,
@@ -190,6 +236,9 @@ export const seedPeople = async (
        companyId: DEV_SEED_COMPANY_IDS.GOOGLE,
        email: 'lorie.vladim@google.com',
        position: 15,
+        createdBySource: 'MANUAL',
+        createdByWorkspaceMemberId: null,
+        createdByName: '',
      },
    ])
    .execute();
--- a/packages/twenty-server/src/engine/api/mocks/object-metadata-item.mock.ts
+++ b/packages/twenty-server/src/engine/api/mocks/object-metadata-item.mock.ts
@@ -1,3 +1,4 @@
+import { FieldActorSource } from 'src/engine/metadata-modules/field-metadata/composite-types/actor.composite-type';
 import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';

@@ -196,6 +197,16 @@ const fieldRichTextMock = {
  defaultValue: null,
 };

+const fieldActorMock = {
+  name: 'fieldActor',
+  type: FieldMetadataType.ACTOR,
+  isNullable: true,
+  defaultValue: {
+    source: FieldActorSource.MANUAL,
+    name: '',
+  },
+};
+
 export const fields = [
  fieldUuidMock,
  fieldTextMock,
@@ -218,6 +229,7 @@ export const fields = [
  fieldAddressMock,
  fieldRawJsonMock,
  fieldRichTextMock,
+  fieldActorMock,
 ];

 export const objectMetadataItemMock = {
--- a/packages/twenty-server/src/engine/api/graphql/graphql-config/graphql-config.service.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-config/graphql-config.service.ts
@@ -15,7 +15,7 @@ import { JsonWebTokenError, TokenExpiredError } from 'jsonwebtoken';
 import { useThrottler } from 'src/engine/api/graphql/graphql-config/hooks/use-throttler';
 import { WorkspaceSchemaFactory } from 'src/engine/api/graphql/workspace-schema.factory';
 import { TokenService } from 'src/engine/core-modules/auth/services/token.service';
-import { JwtData } from 'src/engine/core-modules/auth/types/jwt-data.type';
+import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
 import { CoreEngineModule } from 'src/engine/core-modules/core-engine.module';
 import { useGraphQLErrorHandlerHook } from 'src/engine/core-modules/graphql/hooks/use-graphql-error-handler.hook';
 import { User } from 'src/engine/core-modules/user/user.entity';
@@ -65,7 +65,7 @@ export class GraphQLConfigService
      autoSchemaFile: true,
      include: [CoreEngineModule],
      conditionalSchema: async (context) => {
-        let user: User | undefined;
+        let user: User | null | undefined;
        let workspace: Workspace | undefined;

        try {
@@ -136,7 +136,7 @@ export class GraphQLConfigService

  async createSchema(
    context: YogaDriverServerContext<'express'> & YogaInitialContext,
-    data: JwtData,
+    data: AuthContext,
  ): Promise<GraphQLSchemaWithContext<YogaDriverServerContext<'express'>>> {
    // Create a new contextId for each request
    const contextId = ContextIdFactory.create();
@@ -155,9 +155,6 @@ export class GraphQLConfigService
      },
    );

-    return await workspaceFactory.createGraphQLSchema(
-      data.workspace.id,
-      data.user?.id,
-    );
+    return await workspaceFactory.createGraphQLSchema(data);
  }
 }
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/tests/query-runner-args.factory.spec.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/tests/query-runner-args.factory.spec.ts
@@ -19,7 +19,7 @@ describe('QueryRunnerArgsFactory', () => {
      { name: 'testNumber', type: FieldMetadataType.NUMBER },
    ] as FieldMetadataInterface[],
    objectMetadataItem: { isCustom: true, nameSingular: 'test' },
-    workspaceId,
+    authContext: { workspace: { id: workspaceId } },
  } as WorkspaceQueryRunnerOptions;

  let factory: QueryRunnerArgsFactory;
@@ -149,6 +149,7 @@ describe('QueryRunnerArgsFactory', () => {
          { name: 'testNumber', type: FieldMetadataType.NUMBER },
        ] as FieldMetadataInterface[],
        objectMetadataItem: { isCustom: true, nameSingular: 'test' },
+        authContext: { workspace: { id: workspaceId } },
      } as WorkspaceQueryRunnerOptions;

      const args = {
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/query-runner-args.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/query-runner-args.factory.ts
@@ -129,7 +129,7 @@ export class QueryRunnerArgsFactory {
                  isCustom: options.objectMetadataItem.isCustom,
                  nameSingular: options.objectMetadataItem.nameSingular,
                },
-                options.workspaceId,
+                options.authContext.workspace.id,
                argPositionBackfillInput.argIndex,
              ),
            ];
@@ -157,7 +157,7 @@ export class QueryRunnerArgsFactory {
              isCustom: options.objectMetadataItem.isCustom,
              nameSingular: options.objectMetadataItem.nameSingular,
            },
-            options.workspaceId,
+            options.authContext.workspace.id,
            argPositionBackfillInput.argIndex,
          ),
        ],
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface.ts
@@ -3,9 +3,10 @@ import { GraphQLResolveInfo } from 'graphql';
 import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
 import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';

+import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
+
 export interface WorkspaceQueryRunnerOptions {
-  workspaceId: string;
-  userId: string | undefined;
+  authContext: AuthContext;
  info: GraphQLResolveInfo;
  objectMetadataItem: ObjectMetadataInterface;
  fieldMetadataCollection: FieldMetadataInterface[];
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface.ts
@@ -1,9 +1,11 @@
 import { ResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';

+import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
+
 export interface WorkspaceQueryHookInstance {
  execute(
-    userId: string | undefined,
-    workspaceId: string,
+    authContext: AuthContext,
+    objectName: string,
    payload: ResolverArgs,
-  ): Promise<void>;
+  ): Promise<ResolverArgs>;
 }
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-hook/storage/workspace-query-hook.storage.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-hook/storage/workspace-query-hook.storage.ts
@@ -3,6 +3,7 @@ import { Injectable } from '@nestjs/common';
 import { Module } from '@nestjs/core/injector/module';

 import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { WorkspaceResolverBuilderMethodNames } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';

 import { WorkspaceQueryHookKey } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';

@@ -36,8 +37,23 @@ export class WorkspaceQueryHookStorage {

  getWorkspaceQueryPreHookInstances(
    key: WorkspaceQueryHookKey,
-  ): WorkspaceQueryHookData<WorkspaceQueryHookInstance>[] | undefined {
-    return this.preHookInstances.get(key);
+  ): WorkspaceQueryHookData<WorkspaceQueryHookInstance>[] {
+    const methodName = key.split('.')?.[1] as
+      | WorkspaceResolverBuilderMethodNames
+      | undefined;
+    let wildcardInstances: WorkspaceQueryHookData<WorkspaceQueryHookInstance>[] =
+      [];
+
+    if (!methodName) {
+      throw new Error(`Can't split workspace query hook key: ${key}`);
+    }
+
+    // Retrive wildcard pre-hook instances
+    if (this.preHookInstances.has(`*.${methodName}`)) {
+      wildcardInstances = this.preHookInstances.get(`*.${methodName}`)!;
+    }
+
+    return [...wildcardInstances, ...(this.preHookInstances.get(key) ?? [])];
  }

  registerWorkspaceQueryPostHookInstance(
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-hook/workspace-query-hook.explorer.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-hook/workspace-query-hook.explorer.ts
@@ -1,14 +1,14 @@
 import { Injectable, Logger, OnModuleInit } from '@nestjs/common';
 import { DiscoveryService, ModuleRef, createContextId } from '@nestjs/core';
-import { Module } from '@nestjs/core/injector/module';
 import { Injector } from '@nestjs/core/injector/injector';
+import { Module } from '@nestjs/core/injector/module';

 import { WorkspaceQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';

-import { WorkspaceQueryHookMetadataAccessor } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/workspace-query-hook-metadata.accessor';
-import { WorkspaceQueryHookStorage } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/storage/workspace-query-hook.storage';
 import { WorkspaceQueryHookKey } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
+import { WorkspaceQueryHookStorage } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/storage/workspace-query-hook.storage';
 import { WorkspaceQueryHookType } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/types/workspace-query-hook.type';
+import { WorkspaceQueryHookMetadataAccessor } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/workspace-query-hook-metadata.accessor';

@Injectable()
 export class WorkspaceQueryHookExplorer implements OnModuleInit {
@@ -73,7 +73,7 @@ export class WorkspaceQueryHookExplorer implements OnModuleInit {
    instance: object,
    host: Module,
    isRequestScoped: boolean,
-  ) {
+  ): Promise<ReturnType<WorkspaceQueryHookInstance['execute']>> {
    const methodName = 'execute';

    if (isRequestScoped) {
@@ -83,7 +83,7 @@ export class WorkspaceQueryHookExplorer implements OnModuleInit {
        this.moduleRef.registerRequestByContextId(
          {
            req: {
-              workspaceId: payload?.[1],
+              workspaceId: payload?.[0].workspace.id,
            },
          },
          contextId,
@@ -97,9 +97,9 @@ export class WorkspaceQueryHookExplorer implements OnModuleInit {
        contextId,
      );

-      await contextInstance[methodName].call(contextInstance, ...payload);
+      return contextInstance[methodName].call(contextInstance, ...payload);
    } else {
-      await instance[methodName].call(instance, ...payload);
+      return instance[methodName].call(instance, ...payload);
    }
  }

--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-hook/workspace-query-hook.service.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-hook/workspace-query-hook.service.ts
@@ -1,11 +1,14 @@
 import { Injectable } from '@nestjs/common';

+import merge from 'lodash.merge';
+
 import { WorkspaceResolverBuilderMethodNames } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';

 import { WorkspaceQueryHookStorage } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/storage/workspace-query-hook.storage';
 import { WorkspaceQueryHookKey } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
 import { WorkspaceQueryHookExplorer } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/workspace-query-hook.explorer';
 import { WorkspacePreQueryHookPayload } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/types/workspace-query-hook.type';
+import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';

@Injectable()
 export class WorkspaceQueryHookService {
@@ -17,27 +20,33 @@ export class WorkspaceQueryHookService {
  public async executePreQueryHooks<
    T extends WorkspaceResolverBuilderMethodNames,
  >(
-    userId: string | undefined,
-    workspaceId: string,
+    authContext: AuthContext,
+    // TODO: We should allow wildcard for object name
    objectName: string,
    methodName: T,
    payload: WorkspacePreQueryHookPayload<T>,
-  ): Promise<void> {
+  ): Promise<WorkspacePreQueryHookPayload<T>> {
    const key: WorkspaceQueryHookKey = `${objectName}.${methodName}`;
    const preHookInstances =
      this.workspaceQueryHookStorage.getWorkspaceQueryPreHookInstances(key);

    if (!preHookInstances) {
-      return;
+      return payload;
    }

    for (const preHookInstance of preHookInstances) {
-      await this.workspaceQueryHookExplorer.handleHook(
-        [userId, workspaceId, payload],
+      // Deep merge all return of handleHook into payload before returning it
+      const hookPayload = await this.workspaceQueryHookExplorer.handleHook(
+        [authContext, objectName, payload],
        preHookInstance.instance,
        preHookInstance.host,
        preHookInstance.isRequestScoped,
      );
+
+      // TODO: Is it really a good idea ?
+      payload = merge(payload, hookPayload);
    }
+
+    return payload;
  }
 }
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service.ts
@@ -52,7 +52,6 @@ import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.
 import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
 import { isQueryTimeoutError } from 'src/engine/utils/query-timeout.util';
 import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
-import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';

 import {
  PGGraphQLMutation,
@@ -90,11 +89,19 @@ export class WorkspaceQueryRunnerService {
    args: FindManyResolverArgs<Filter, OrderBy>,
    options: WorkspaceQueryRunnerOptions,
  ): Promise<IConnection<Record> | undefined> {
-    const { workspaceId, userId, objectMetadataItem } = options;
+    const { authContext, objectMetadataItem } = options;
    const start = performance.now();

+    const hookedArgs =
+      await this.workspaceQueryHookService.executePreQueryHooks(
+        authContext,
+        objectMetadataItem.nameSingular,
+        'findMany',
+        args,
+      );
+
    const computedArgs = (await this.queryRunnerArgsFactory.create(
-      args,
+      hookedArgs,
      options,
      ResolverArgsType.FindMany,
    )) as FindManyResolverArgs<Filter, OrderBy>;
@@ -104,15 +111,7 @@ export class WorkspaceQueryRunnerService {
      options,
    );

-    await this.workspaceQueryHookService.executePreQueryHooks(
-      userId,
-      workspaceId,
-      objectMetadataItem.nameSingular,
-      'findMany',
-      args,
-    );
-
-    const result = await this.execute(query, workspaceId);
+    const result = await this.execute(query, authContext.workspace.id);
    const end = performance.now();

    this.logger.log(
@@ -125,7 +124,7 @@ export class WorkspaceQueryRunnerService {
      result,
      objectMetadataItem,
      '',
-      workspaceId,
+      authContext.workspace.id,
    );
  }

@@ -142,10 +141,18 @@ export class WorkspaceQueryRunnerService {
        WorkspaceQueryRunnerExceptionCode.INVALID_QUERY_INPUT,
      );
    }
-    const { workspaceId, userId, objectMetadataItem } = options;
+    const { authContext, objectMetadataItem } = options;
+
+    const hookedArgs =
+      await this.workspaceQueryHookService.executePreQueryHooks(
+        authContext,
+        objectMetadataItem.nameSingular,
+        'findOne',
+        args,
+      );

    const computedArgs = (await this.queryRunnerArgsFactory.create(
-      args,
+      hookedArgs,
      options,
      ResolverArgsType.FindOne,
    )) as FindOneResolverArgs<Filter>;
@@ -155,20 +162,12 @@ export class WorkspaceQueryRunnerService {
      options,
    );

-    await this.workspaceQueryHookService.executePreQueryHooks(
-      userId,
-      workspaceId,
-      objectMetadataItem.nameSingular,
-      'findOne',
-      args,
-    );
-
-    const result = await this.execute(query, workspaceId);
+    const result = await this.execute(query, authContext.workspace.id);
    const parsedResult = await this.parseResult<IConnection<Record>>(
      result,
      objectMetadataItem,
      '',
-      workspaceId,
+      authContext.workspace.id,
    );

    return parsedResult?.edges?.[0]?.node;
@@ -192,10 +191,18 @@ export class WorkspaceQueryRunnerService {
      );
    }

-    const { workspaceId, userId, objectMetadataItem } = options;
+    const { authContext, objectMetadataItem } = options;
+
+    const hookedArgs =
+      await this.workspaceQueryHookService.executePreQueryHooks(
+        authContext,
+        objectMetadataItem.nameSingular,
+        'findDuplicates',
+        args,
+      );

    const computedArgs = (await this.queryRunnerArgsFactory.create(
-      args,
+      hookedArgs,
      options,
      ResolverArgsType.FindDuplicates,
    )) as FindDuplicatesResolverArgs<TRecord>;
@@ -206,7 +213,7 @@ export class WorkspaceQueryRunnerService {
      existingRecords = await this.duplicateService.findExistingRecords(
        computedArgs.ids,
        objectMetadataItem,
-        workspaceId,
+        authContext.workspace.id,
      );

      if (!existingRecords || existingRecords.length === 0) {
@@ -223,21 +230,13 @@ export class WorkspaceQueryRunnerService {
      existingRecords,
    );

-    await this.workspaceQueryHookService.executePreQueryHooks(
-      userId,
-      workspaceId,
-      objectMetadataItem.nameSingular,
-      'findDuplicates',
-      computedArgs,
-    );
-
-    const result = await this.execute(query, workspaceId);
+    const result = await this.execute(query, authContext.workspace.id);

    return this.parseResult<IConnection<TRecord>>(
      result,
      objectMetadataItem,
      '',
-      workspaceId,
+      authContext.workspace.id,
      true,
    );
  }
@@ -246,7 +245,7 @@ export class WorkspaceQueryRunnerService {
    args: CreateManyResolverArgs<Partial<Record>>,
    options: WorkspaceQueryRunnerOptions,
  ): Promise<Record[] | undefined> {
-    const { workspaceId, userId, objectMetadataItem } = options;
+    const { authContext, objectMetadataItem } = options;

    assertMutationNotOnRemoteObject(objectMetadataItem);

@@ -260,33 +259,33 @@ export class WorkspaceQueryRunnerService {
      }
    });

+    const hookedArgs =
+      await this.workspaceQueryHookService.executePreQueryHooks(
+        authContext,
+        objectMetadataItem.nameSingular,
+        'createMany',
+        args,
+      );
+
    const computedArgs = (await this.queryRunnerArgsFactory.create(
-      args,
+      hookedArgs,
      options,
      ResolverArgsType.CreateMany,
    )) as CreateManyResolverArgs<Record>;

-    await this.workspaceQueryHookService.executePreQueryHooks(
-      userId,
-      workspaceId,
-      objectMetadataItem.nameSingular,
-      'createMany',
-      args,
-    );
-
    const query = await this.workspaceQueryBuilderFactory.createMany(
      computedArgs,
      options,
    );

-    const result = await this.execute(query, workspaceId);
+    const result = await this.execute(query, authContext.workspace.id);

    const parsedResults = (
      await this.parseResult<PGGraphQLMutation<Record>>(
        result,
        objectMetadataItem,
        'insertInto',
-        workspaceId,
+        authContext.workspace.id,
      )
    )?.records;

@@ -299,8 +298,8 @@ export class WorkspaceQueryRunnerService {
    parsedResults.forEach((record) => {
      this.eventEmitter.emit(`${objectMetadataItem.nameSingular}.created`, {
        name: `${objectMetadataItem.nameSingular}.created`,
-        workspaceId,
-        userId,
+        workspaceId: authContext.workspace.id,
+        userId: authContext.user?.id,
        recordId: record.id,
        objectMetadata: objectMetadataItem,
        properties: {
@@ -325,7 +324,7 @@ export class WorkspaceQueryRunnerService {
        ? await this.duplicateService.findExistingRecords(
            ids as string[],
            options.objectMetadataItem,
-            options.workspaceId,
+            options.authContext.workspace.id,
          )
        : [];

@@ -381,10 +380,10 @@ export class WorkspaceQueryRunnerService {
    args: UpdateOneResolverArgs<Partial<Record>>,
    options: WorkspaceQueryRunnerOptions,
  ): Promise<Record | undefined> {
-    const { workspaceId, userId, objectMetadataItem } = options;
+    const { authContext, objectMetadataItem } = options;
    const repository =
      await this.twentyORMGlobalManager.getRepositoryForWorkspace(
-        workspaceId,
+        authContext.workspace.id,
        objectMetadataItem.nameSingular,
      );

@@ -402,27 +401,27 @@ export class WorkspaceQueryRunnerService {
      );
    }

+    const hookedArgs =
+      await this.workspaceQueryHookService.executePreQueryHooks(
+        authContext,
+        objectMetadataItem.nameSingular,
+        'updateOne',
+        args,
+      );
+
    const query = await this.workspaceQueryBuilderFactory.updateOne(
-      args,
+      hookedArgs,
      options,
    );

-    await this.workspaceQueryHookService.executePreQueryHooks(
-      userId,
-      workspaceId,
-      objectMetadataItem.nameSingular,
-      'updateOne',
-      args,
-    );
-
-    const result = await this.execute(query, workspaceId);
+    const result = await this.execute(query, authContext.workspace.id);

    const parsedResults = (
      await this.parseResult<PGGraphQLMutation<Record>>(
        result,
        objectMetadataItem,
        'update',
-        workspaceId,
+        authContext.workspace.id,
      )
    )?.records;

@@ -434,8 +433,8 @@ export class WorkspaceQueryRunnerService {

    this.eventEmitter.emit(`${objectMetadataItem.nameSingular}.updated`, {
      name: `${objectMetadataItem.nameSingular}.updated`,
-      workspaceId,
-      userId,
+      workspaceId: authContext.workspace.id,
+      userId: authContext.user?.id,
      recordId: existingRecord.id,
      objectMetadata: objectMetadataItem,
      properties: {
@@ -452,10 +451,10 @@ export class WorkspaceQueryRunnerService {
    args: UpdateManyResolverArgs<Partial<Record>>,
    options: WorkspaceQueryRunnerOptions,
  ): Promise<Record[] | undefined> {
-    const { userId, workspaceId, objectMetadataItem } = options;
+    const { authContext, objectMetadataItem } = options;
    const repository =
      await this.twentyORMGlobalManager.getRepositoryForWorkspace(
-        workspaceId,
+        authContext.workspace.id,
        objectMetadataItem.nameSingular,
      );

@@ -471,27 +470,31 @@ export class WorkspaceQueryRunnerService {
    const maximumRecordAffected = this.environmentService.get(
      'MUTATION_MAXIMUM_AFFECTED_RECORDS',
    );
-    const query = await this.workspaceQueryBuilderFactory.updateMany(args, {
-      ...options,
-      atMost: maximumRecordAffected,
-    });

-    await this.workspaceQueryHookService.executePreQueryHooks(
-      userId,
-      workspaceId,
-      objectMetadataItem.nameSingular,
-      'updateMany',
-      args,
+    const hookedArgs =
+      await this.workspaceQueryHookService.executePreQueryHooks(
+        authContext,
+        objectMetadataItem.nameSingular,
+        'updateMany',
+        args,
+      );
+
+    const query = await this.workspaceQueryBuilderFactory.updateMany(
+      hookedArgs,
+      {
+        ...options,
+        atMost: maximumRecordAffected,
+      },
    );

-    const result = await this.execute(query, workspaceId);
+    const result = await this.execute(query, authContext.workspace.id);

    const parsedResults = (
      await this.parseResult<PGGraphQLMutation<Record>>(
        result,
        objectMetadataItem,
        'update',
-        workspaceId,
+        authContext.workspace.id,
      )
    )?.records;

@@ -514,8 +517,8 @@ export class WorkspaceQueryRunnerService {

      this.eventEmitter.emit(`${objectMetadataItem.nameSingular}.updated`, {
        name: `${objectMetadataItem.nameSingular}.updated`,
-        workspaceId,
-        userId,
+        workspaceId: authContext.workspace.id,
+        userId: authContext.user?.id,
        recordId: existingRecord.id,
        objectMetadata: objectMetadataItem,
        properties: {
@@ -536,34 +539,38 @@ export class WorkspaceQueryRunnerService {
    args: DeleteManyResolverArgs<Filter>,
    options: WorkspaceQueryRunnerOptions,
  ): Promise<Record[] | undefined> {
-    const { workspaceId, userId, objectMetadataItem } = options;
+    const { authContext, objectMetadataItem } = options;

    assertMutationNotOnRemoteObject(objectMetadataItem);

    const maximumRecordAffected = this.environmentService.get(
      'MUTATION_MAXIMUM_AFFECTED_RECORDS',
    );
-    const query = await this.workspaceQueryBuilderFactory.deleteMany(args, {
-      ...options,
-      atMost: maximumRecordAffected,
-    });

-    await this.workspaceQueryHookService.executePreQueryHooks(
-      userId,
-      workspaceId,
-      objectMetadataItem.nameSingular,
-      'deleteMany',
-      args,
+    const hookedArgs =
+      await this.workspaceQueryHookService.executePreQueryHooks(
+        authContext,
+        objectMetadataItem.nameSingular,
+        'deleteMany',
+        args,
+      );
+
+    const query = await this.workspaceQueryBuilderFactory.deleteMany(
+      hookedArgs,
+      {
+        ...options,
+        atMost: maximumRecordAffected,
+      },
    );

-    const result = await this.execute(query, workspaceId);
+    const result = await this.execute(query, authContext.workspace.id);

    const parsedResults = (
      await this.parseResult<PGGraphQLMutation<Record>>(
        result,
        objectMetadataItem,
        'deleteFrom',
-        workspaceId,
+        authContext.workspace.id,
      )
    )?.records;

@@ -576,8 +583,8 @@ export class WorkspaceQueryRunnerService {
    parsedResults.forEach((record) => {
      this.eventEmitter.emit(`${objectMetadataItem.nameSingular}.deleted`, {
        name: `${objectMetadataItem.nameSingular}.deleted`,
-        workspaceId,
-        userId,
+        workspaceId: authContext.workspace.id,
+        userId: authContext.user?.id,
        recordId: record.id,
        objectMetadata: objectMetadataItem,
        properties: {
@@ -593,18 +600,26 @@ export class WorkspaceQueryRunnerService {
    args: DeleteOneResolverArgs,
    options: WorkspaceQueryRunnerOptions,
  ): Promise<Record | undefined> {
-    const { workspaceId, userId, objectMetadataItem } = options;
+    const { authContext, objectMetadataItem } = options;
    const repository =
      await this.twentyORMGlobalManager.getRepositoryForWorkspace(
-        workspaceId,
+        authContext.workspace.id,
        objectMetadataItem.nameSingular,
      );

    assertMutationNotOnRemoteObject(objectMetadataItem);
    assertIsValidUuid(args.id);

+    const hookedArgs =
+      await this.workspaceQueryHookService.executePreQueryHooks(
+        authContext,
+        objectMetadataItem.nameSingular,
+        'deleteOne',
+        args,
+      );
+
    const query = await this.workspaceQueryBuilderFactory.deleteOne(
-      args,
+      hookedArgs,
      options,
    );

@@ -612,22 +627,14 @@ export class WorkspaceQueryRunnerService {
      where: { id: args.id },
    });

-    await this.workspaceQueryHookService.executePreQueryHooks(
-      userId,
-      workspaceId,
-      objectMetadataItem.nameSingular,
-      'deleteOne',
-      args,
-    );
-
-    const result = await this.execute(query, workspaceId);
+    const result = await this.execute(query, authContext.workspace.id);

    const parsedResults = (
      await this.parseResult<PGGraphQLMutation<Record>>(
        result,
        objectMetadataItem,
        'deleteFrom',
-        workspaceId,
+        authContext.workspace.id,
      )
    )?.records;

@@ -639,8 +646,8 @@ export class WorkspaceQueryRunnerService {

    this.eventEmitter.emit(`${objectMetadataItem.nameSingular}.deleted`, {
      name: `${objectMetadataItem.nameSingular}.deleted`,
-      workspaceId,
-      userId,
+      workspaceId: authContext.workspace.id,
+      userId: authContext.user?.id,
      recordId: args.id,
      objectMetadata: objectMetadataItem,
      properties: {
@@ -808,7 +815,7 @@ export class WorkspaceQueryRunnerService {
        CallWebhookJobsJob.name,
        {
          record: jobData,
-          workspaceId: options.workspaceId,
+          workspaceId: options.authContext.workspace.id,
          operation,
          objectMetadataItem: options.objectMetadataItem,
        },
@@ -816,65 +823,4 @@ export class WorkspaceQueryRunnerService {
      );
    });
  }
-
-  async handleDeleteWorkspaceMember(
-    id: string,
-    workspaceId: string,
-    objectMetadataItem: ObjectMetadataInterface,
-  ) {
-    if (objectMetadataItem.nameSingular !== 'workspaceMember') {
-      return;
-    }
-
-    const workspaceMemberResult = await this.executeAndParse<IRecord>(
-      `
-      query {
-        workspaceMemberCollection(filter: {id: {eq: "${id}"}}) {
-          edges {
-            node {
-              userId: userId
-            }
-          }
-        }
-      }
-      `,
-      objectMetadataItem,
-      '',
-      workspaceId,
-    );
-
-    return workspaceMemberResult.edges?.[0]?.node;
-  }
-
-  async handleDeleteBlocklistItem(
-    id: string,
-    workspaceId: string,
-    objectMetadataItem: ObjectMetadataInterface,
-  ) {
-    if (objectMetadataItem.standardId !== STANDARD_OBJECT_IDS.blocklist) {
-      return;
-    }
-
-    const blocklistItemResult = await this.executeAndParse<IRecord>(
-      `
-      query {
-        blocklistCollection(filter: {id: {eq: "${id}"}}) {
-          edges {
-            node {
-              handle
-              workspaceMember {
-                id
-              }
-            }
-          }
-        }
-      }
-      `,
-      objectMetadataItem,
-      '',
-      workspaceId,
-    );
-
-    return blocklistItemResult.edges?.[0]?.node;
-  }
 }
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/create-many-resolver.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/create-many-resolver.factory.ts
@@ -25,12 +25,11 @@ export class CreateManyResolverFactory
  ): Resolver<CreateManyResolverArgs> {
    const internalContext = context;

-    return async (_source, args, context, info) => {
+    return (_source, args, context, info) => {
      try {
-        return await this.workspaceQueryRunnerService.createMany(args, {
+        return this.workspaceQueryRunnerService.createMany(args, {
+          authContext: internalContext.authContext,
          objectMetadataItem: internalContext.objectMetadataItem,
-          workspaceId: internalContext.workspaceId,
-          userId: internalContext.userId,
          info,
          fieldMetadataCollection: internalContext.fieldMetadataCollection,
          objectMetadataCollection: internalContext.objectMetadataCollection,
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/create-one-resolver.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/create-one-resolver.factory.ts
@@ -25,12 +25,11 @@ export class CreateOneResolverFactory
  ): Resolver<CreateOneResolverArgs> {
    const internalContext = context;

-    return async (_source, args, context, info) => {
+    return (_source, args, context, info) => {
      try {
-        return await this.workspaceQueryRunnerService.createOne(args, {
+        return this.workspaceQueryRunnerService.createOne(args, {
+          authContext: internalContext.authContext,
          objectMetadataItem: internalContext.objectMetadataItem,
-          workspaceId: internalContext.workspaceId,
-          userId: internalContext.userId,
          info,
          fieldMetadataCollection: internalContext.fieldMetadataCollection,
          objectMetadataCollection: internalContext.objectMetadataCollection,
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/delete-many-resolver.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/delete-many-resolver.factory.ts
@@ -25,12 +25,11 @@ export class DeleteManyResolverFactory
  ): Resolver<DeleteManyResolverArgs> {
    const internalContext = context;

-    return async (_source, args, context, info) => {
+    return (_source, args, context, info) => {
      try {
-        return await this.workspaceQueryRunnerService.deleteMany(args, {
+        return this.workspaceQueryRunnerService.deleteMany(args, {
+          authContext: internalContext.authContext,
          objectMetadataItem: internalContext.objectMetadataItem,
-          workspaceId: internalContext.workspaceId,
-          userId: internalContext.userId,
          info,
          fieldMetadataCollection: internalContext.fieldMetadataCollection,
          objectMetadataCollection: internalContext.objectMetadataCollection,
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/delete-one-resolver.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/delete-one-resolver.factory.ts
@@ -25,12 +25,11 @@ export class DeleteOneResolverFactory
  ): Resolver<DeleteOneResolverArgs> {
    const internalContext = context;

-    return async (_source, args, context, info) => {
+    return (_source, args, context, info) => {
      try {
-        return await this.workspaceQueryRunnerService.deleteOne(args, {
+        return this.workspaceQueryRunnerService.deleteOne(args, {
+          authContext: internalContext.authContext,
          objectMetadataItem: internalContext.objectMetadataItem,
-          workspaceId: internalContext.workspaceId,
-          userId: internalContext.userId,
          info,
          fieldMetadataCollection: internalContext.fieldMetadataCollection,
          objectMetadataCollection: internalContext.objectMetadataCollection,
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/execute-quick-action-on-one-resolver.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/execute-quick-action-on-one-resolver.factory.ts
@@ -31,12 +31,11 @@ export class ExecuteQuickActionOnOneResolverFactory
  ): Resolver<ExecuteQuickActionOnOneResolverArgs> {
    const internalContext = context;

-    return async (_source, args, context, info) => {
+    return (_source, args, context, info) => {
      try {
-        return await this.executeQuickActionOnOne(args, {
+        return this.executeQuickActionOnOne(args, {
+          authContext: internalContext.authContext,
          objectMetadataItem: internalContext.objectMetadataItem,
-          userId: internalContext.userId,
-          workspaceId: internalContext.workspaceId,
          info,
          fieldMetadataCollection: internalContext.fieldMetadataCollection,
          objectMetadataCollection: internalContext.objectMetadataCollection,
@@ -55,7 +54,7 @@ export class ExecuteQuickActionOnOneResolverFactory
      case 'company': {
        await this.quickActionsService.executeQuickActionOnCompany(
          args.id,
-          options.workspaceId,
+          options.authContext.workspace.id,
          options.objectMetadataItem,
        );
        break;
@@ -63,7 +62,7 @@ export class ExecuteQuickActionOnOneResolverFactory
      case 'person': {
        await this.quickActionsService.createCompanyFromPerson(
          args.id,
-          options.workspaceId,
+          options.authContext.workspace.id,
          options.objectMetadataCollection,
        );
        break;
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/find-duplicates-resolver.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/find-duplicates-resolver.factory.ts
@@ -25,12 +25,11 @@ export class FindDuplicatesResolverFactory
  ): Resolver<FindDuplicatesResolverArgs> {
    const internalContext = context;

-    return async (_source, args, context, info) => {
+    return (_source, args, context, info) => {
      try {
-        return await this.workspaceQueryRunnerService.findDuplicates(args, {
+        return this.workspaceQueryRunnerService.findDuplicates(args, {
+          authContext: internalContext.authContext,
          objectMetadataItem: internalContext.objectMetadataItem,
-          workspaceId: internalContext.workspaceId,
-          userId: internalContext.userId,
          info,
          fieldMetadataCollection: internalContext.fieldMetadataCollection,
          objectMetadataCollection: internalContext.objectMetadataCollection,
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/find-many-resolver.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/find-many-resolver.factory.ts
@@ -25,12 +25,11 @@ export class FindManyResolverFactory
  ): Resolver<FindManyResolverArgs> {
    const internalContext = context;

-    return async (_source, args, context, info) => {
+    return (_source, args, context, info) => {
      try {
-        return await this.workspaceQueryRunnerService.findMany(args, {
+        return this.workspaceQueryRunnerService.findMany(args, {
+          authContext: internalContext.authContext,
          objectMetadataItem: internalContext.objectMetadataItem,
-          workspaceId: internalContext.workspaceId,
-          userId: internalContext.userId,
          info,
          fieldMetadataCollection: internalContext.fieldMetadataCollection,
          objectMetadataCollection: internalContext.objectMetadataCollection,
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/find-one-resolver.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/find-one-resolver.factory.ts
@@ -25,12 +25,11 @@ export class FindOneResolverFactory
  ): Resolver<FindOneResolverArgs> {
    const internalContext = context;

-    return async (_source, args, context, info) => {
+    return (_source, args, context, info) => {
      try {
-        return await this.workspaceQueryRunnerService.findOne(args, {
+        return this.workspaceQueryRunnerService.findOne(args, {
+          authContext: internalContext.authContext,
          objectMetadataItem: internalContext.objectMetadataItem,
-          workspaceId: internalContext.workspaceId,
-          userId: internalContext.userId,
          info,
          fieldMetadataCollection: internalContext.fieldMetadataCollection,
          objectMetadataCollection: internalContext.objectMetadataCollection,
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/update-many-resolver.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/update-many-resolver.factory.ts
@@ -25,12 +25,11 @@ export class UpdateManyResolverFactory
  ): Resolver<UpdateManyResolverArgs> {
    const internalContext = context;

-    return async (_source, args, context, info) => {
+    return (_source, args, context, info) => {
      try {
-        return await this.workspaceQueryRunnerService.updateMany(args, {
+        return this.workspaceQueryRunnerService.updateMany(args, {
+          authContext: internalContext.authContext,
          objectMetadataItem: internalContext.objectMetadataItem,
-          workspaceId: internalContext.workspaceId,
-          userId: internalContext.userId,
          info,
          fieldMetadataCollection: internalContext.fieldMetadataCollection,
          objectMetadataCollection: internalContext.objectMetadataCollection,
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/update-one-resolver.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/factories/update-one-resolver.factory.ts
@@ -25,12 +25,11 @@ export class UpdateOneResolverFactory
  ): Resolver<UpdateOneResolverArgs> {
    const internalContext = context;

-    return async (_source, args, context, info) => {
+    return (_source, args, context, info) => {
      try {
-        return await this.workspaceQueryRunnerService.updateOne(args, {
+        return this.workspaceQueryRunnerService.updateOne(args, {
+          authContext: internalContext.authContext,
          objectMetadataItem: internalContext.objectMetadataItem,
-          workspaceId: internalContext.workspaceId,
-          userId: internalContext.userId,
          info,
          fieldMetadataCollection: internalContext.fieldMetadataCollection,
          objectMetadataCollection: internalContext.objectMetadataCollection,
--- a/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/workspace-resolver.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-resolver-builder/workspace-resolver.factory.ts
@@ -8,6 +8,7 @@ import { getResolverName } from 'src/engine/utils/get-resolver-name.util';
 import { UpdateManyResolverFactory } from 'src/engine/api/graphql/workspace-resolver-builder/factories/update-many-resolver.factory';
 import { DeleteManyResolverFactory } from 'src/engine/api/graphql/workspace-resolver-builder/factories/delete-many-resolver.factory';
 import { ExecuteQuickActionOnOneResolverFactory } from 'src/engine/api/graphql/workspace-resolver-builder/factories/execute-quick-action-on-one-resolver.factory';
+import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';

 import { FindDuplicatesResolverFactory } from './factories/find-duplicates-resolver.factory';
 import { FindManyResolverFactory } from './factories/find-many-resolver.factory';
@@ -40,8 +41,7 @@ export class WorkspaceResolverFactory {
  ) {}

  async create(
-    workspaceId: string,
-    userId: string | undefined,
+    authContext: AuthContext,
    objectMetadataCollection: ObjectMetadataInterface[],
    workspaceResolverBuilderMethods: WorkspaceResolverBuilderMethods,
  ): Promise<IResolvers> {
@@ -82,8 +82,7 @@ export class WorkspaceResolverFactory {
        }

        resolvers.Query[resolverName] = resolverFactory.create({
-          workspaceId,
-          userId,
+          authContext,
          objectMetadataItem: objectMetadata,
          fieldMetadataCollection: objectMetadata.fields,
          objectMetadataCollection: objectMetadataCollection,
@@ -106,8 +105,7 @@ export class WorkspaceResolverFactory {
        }

        resolvers.Mutation[resolverName] = resolverFactory.create({
-          workspaceId,
-          userId,
+          authContext,
          objectMetadataItem: objectMetadata,
          fieldMetadataCollection: objectMetadata.fields,
          objectMetadataCollection: objectMetadataCollection,
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/composite-enum-type-definition.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/composite-enum-type-definition.factory.ts
@@ -0,0 +1,99 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { GraphQLEnumType } from 'graphql';
+
+import { WorkspaceBuildSchemaOptions } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
+import {
+  CompositeProperty,
+  CompositeType,
+} from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
+
+import { pascalCase } from 'src/utils/pascal-case';
+import {
+  FieldMetadataComplexOption,
+  FieldMetadataDefaultOption,
+} from 'src/engine/metadata-modules/field-metadata/dtos/options.input';
+import { isEnumFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-enum-field-metadata-type.util';
+import { EnumTypeDefinitionFactory } from 'src/engine/api/graphql/workspace-schema-builder/factories/enum-type-definition.factory';
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { computeCompositePropertyTarget } from 'src/engine/api/graphql/workspace-schema-builder/utils/compute-composite-property-target.util';
+
+export interface EnumTypeDefinition {
+  target: string;
+  type: GraphQLEnumType;
+}
+
+@Injectable()
+export class CompositeEnumTypeDefinitionFactory {
+  private readonly logger = new Logger(EnumTypeDefinitionFactory.name);
+
+  public create(
+    compositeType: CompositeType,
+    options: WorkspaceBuildSchemaOptions,
+  ): EnumTypeDefinition[] {
+    const enumTypeDefinitions: EnumTypeDefinition[] = [];
+
+    for (const compositeProperty of compositeType.properties) {
+      if (!isEnumFieldMetadataType(compositeProperty.type)) {
+        continue;
+      }
+
+      const target = computeCompositePropertyTarget(
+        compositeType.type,
+        compositeProperty,
+      );
+
+      enumTypeDefinitions.push({
+        target,
+        type: this.generateEnum(compositeType.type, compositeProperty, options),
+      });
+    }
+
+    return enumTypeDefinitions;
+  }
+
+  private generateEnum(
+    compositeType: FieldMetadataType,
+    compositeProperty: CompositeProperty,
+    options: WorkspaceBuildSchemaOptions,
+  ): GraphQLEnumType {
+    // FixMe: It's a hack until Typescript get fixed on union types for reduce function
+    // https://github.com/microsoft/TypeScript/issues/36390
+    const enumOptions = compositeProperty.options as Array<
+      FieldMetadataDefaultOption | FieldMetadataComplexOption
+    >;
+
+    if (!enumOptions) {
+      this.logger.error(
+        `Enum options are not defined for ${compositeProperty.name}`,
+        {
+          compositeProperty,
+          options,
+        },
+      );
+
+      throw new Error(
+        `Enum options are not defined for ${compositeProperty.name}`,
+      );
+    }
+
+    return new GraphQLEnumType({
+      name: `${pascalCase(compositeType.toString())}${pascalCase(
+        compositeProperty.name,
+      )}Enum`,
+      description: compositeProperty.description,
+      values: enumOptions.reduce(
+        (acc, enumOption) => {
+          // Key must match this regex: /^[_A-Za-z][_0-9A-Za-z]+$/
+          acc[enumOption.value] = {
+            value: enumOption.value,
+            description: enumOption.label,
+          };
+
+          return acc;
+        },
+        {} as { [key: string]: { value: string; description: string } },
+      ),
+    });
+  }
+}
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/composite-input-type-definition.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/composite-input-type-definition.factory.ts
@@ -12,9 +12,15 @@ import {
  InputTypeDefinition,
  InputTypeDefinitionKind,
 } from 'src/engine/api/graphql/workspace-schema-builder/factories/input-type-definition.factory';
+import { computeCompositePropertyTarget } from 'src/engine/api/graphql/workspace-schema-builder/utils/compute-composite-property-target.util';

 import { InputTypeFactory } from './input-type.factory';

+const hiddenAllowListKind = [
+  InputTypeDefinitionKind.Create,
+  InputTypeDefinitionKind.Update,
+];
+
@Injectable()
 export class CompositeInputTypeDefinitionFactory {
  private readonly logger = new Logger(
@@ -58,12 +64,19 @@ export class CompositeInputTypeDefinitionFactory {
      }

      // Skip hidden fields
-      if (property.hidden === true || property.hidden === 'input') {
+      if (
+        property.hidden === true ||
+        (property.hidden === 'input' && hiddenAllowListKind.includes(kind))
+      ) {
        continue;
      }

+      const target = computeCompositePropertyTarget(
+        compositeType.type,
+        property,
+      );
      const type = this.inputTypeFactory.create(
-        property.name,
+        target,
        property.type,
        kind,
        options,
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/composite-object-type-definition.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/composite-object-type-definition.factory.ts
@@ -13,6 +13,7 @@ import {
  ObjectTypeDefinitionKind,
 } from 'src/engine/api/graphql/workspace-schema-builder/factories/object-type-definition.factory';
 import { isRelationFieldMetadataType } from 'src/engine/utils/is-relation-field-metadata-type.util';
+import { computeCompositePropertyTarget } from 'src/engine/api/graphql/workspace-schema-builder/utils/compute-composite-property-target.util';

@Injectable()
 export class CompositeObjectTypeDefinitionFactory {
@@ -62,8 +63,12 @@ export class CompositeObjectTypeDefinitionFactory {
        continue;
      }

+      const target = computeCompositePropertyTarget(
+        compositeType.type,
+        property,
+      );
      const type = this.outputTypeFactory.create(
-        property.name,
+        target,
        property.type,
        kind,
        options,
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/factories.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/factories.ts
@@ -1,6 +1,7 @@
 import { EnumTypeDefinitionFactory } from 'src/engine/api/graphql/workspace-schema-builder/factories/enum-type-definition.factory';
 import { CompositeObjectTypeDefinitionFactory } from 'src/engine/api/graphql/workspace-schema-builder/factories/composite-object-type-definition.factory';
 import { CompositeInputTypeDefinitionFactory } from 'src/engine/api/graphql/workspace-schema-builder/factories/composite-input-type-definition.factory';
+import { CompositeEnumTypeDefinitionFactory } from 'src/engine/api/graphql/workspace-schema-builder/factories/composite-enum-type-definition.factory';

 import { ArgsFactory } from './args.factory';
 import { InputTypeFactory } from './input-type.factory';
@@ -27,6 +28,7 @@ export const workspaceSchemaBuilderFactories = [
  ObjectTypeDefinitionFactory,
  CompositeObjectTypeDefinitionFactory,
  EnumTypeDefinitionFactory,
+  CompositeEnumTypeDefinitionFactory,
  RelationTypeFactory,
  ExtendObjectTypeDefinitionFactory,
  ConnectionTypeFactory,
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-schema-builder-context.interface.ts
@@ -1,9 +1,10 @@
 import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
 import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';

+import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
+
 export interface WorkspaceSchemaBuilderContext {
-  workspaceId: string;
-  userId: string | undefined;
+  authContext: AuthContext;
  objectMetadataItem: ObjectMetadataInterface;
  fieldMetadataCollection: FieldMetadataInterface[];
  objectMetadataCollection: ObjectMetadataInterface[];
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/type-definitions.generator.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/type-definitions.generator.ts
@@ -7,6 +7,7 @@ import { EnumTypeDefinitionFactory } from 'src/engine/api/graphql/workspace-sche
 import { compositeTypeDefintions } from 'src/engine/metadata-modules/field-metadata/composite-types';
 import { CompositeObjectTypeDefinitionFactory } from 'src/engine/api/graphql/workspace-schema-builder/factories/composite-object-type-definition.factory';
 import { CompositeInputTypeDefinitionFactory } from 'src/engine/api/graphql/workspace-schema-builder/factories/composite-input-type-definition.factory';
+import { CompositeEnumTypeDefinitionFactory } from 'src/engine/api/graphql/workspace-schema-builder/factories/composite-enum-type-definition.factory';

 import { TypeDefinitionsStorage } from './storages/type-definitions.storage';
 import {
@@ -32,6 +33,7 @@ export class TypeDefinitionsGenerator {
    private readonly objectTypeDefinitionFactory: ObjectTypeDefinitionFactory,
    private readonly compositeObjectTypeDefinitionFactory: CompositeObjectTypeDefinitionFactory,
    private readonly enumTypeDefinitionFactory: EnumTypeDefinitionFactory,
+    private readonly compositeEnumTypeDefinitionFactory: CompositeEnumTypeDefinitionFactory,
    private readonly inputTypeDefinitionFactory: InputTypeDefinitionFactory,
    private readonly compositeInputTypeDefinitionFactory: CompositeInputTypeDefinitionFactory,
    private readonly edgeTypeDefinitionFactory: EdgeTypeDefinitionFactory,
@@ -62,10 +64,24 @@ export class TypeDefinitionsGenerator {
    );

    // Generate composite types first because they can be used in metadata objects
+    this.generateCompositeEnumTypeDefs(compositeTypeCollection, options);
    this.generateCompositeObjectTypeDefs(compositeTypeCollection, options);
    this.generateCompositeInputTypeDefs(compositeTypeCollection, options);
  }

+  private generateCompositeEnumTypeDefs(
+    compositeTypes: CompositeType[],
+    options: WorkspaceBuildSchemaOptions,
+  ) {
+    const enumTypeDefs = compositeTypes
+      .map((compositeType) =>
+        this.compositeEnumTypeDefinitionFactory.create(compositeType, options),
+      )
+      .flat();
+
+    this.typeDefinitionsStorage.addEnumTypes(enumTypeDefs);
+  }
+
  private generateCompositeObjectTypeDefs(
    compositeTypes: CompositeType[],
    options: WorkspaceBuildSchemaOptions,
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/compute-composite-property-target.util.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/compute-composite-property-target.util.ts
@@ -0,0 +1,10 @@
+import { CompositeProperty } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
+
+import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+
+export const computeCompositePropertyTarget = (
+  type: FieldMetadataType,
+  compositeProperty: CompositeProperty,
+): string => {
+  return `${type.toString()}->${compositeProperty.name}`;
+};
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema.factory.ts
@@ -11,6 +11,7 @@ import { ScalarsExplorerService } from 'src/engine/api/graphql/services/scalars-
 import { WorkspaceGraphQLSchemaFactory } from 'src/engine/api/graphql/workspace-schema-builder/workspace-graphql-schema.factory';
 import { workspaceResolverBuilderMethodNames } from 'src/engine/api/graphql/workspace-resolver-builder/factories/factories';
 import { WorkspaceResolverFactory } from 'src/engine/api/graphql/workspace-resolver-builder/workspace-resolver.factory';
+import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';

@Injectable()
 export class WorkspaceSchemaFactory {
@@ -23,17 +24,14 @@ export class WorkspaceSchemaFactory {
    private readonly workspaceCacheStorageService: WorkspaceCacheStorageService,
  ) {}

-  async createGraphQLSchema(
-    workspaceId: string | undefined,
-    userId: string | undefined,
-  ): Promise<GraphQLSchema> {
-    if (!workspaceId) {
+  async createGraphQLSchema(authContext: AuthContext): Promise<GraphQLSchema> {
+    if (!authContext.workspace?.id) {
      return new GraphQLSchema({});
    }

    const dataSourcesMetadata =
      await this.dataSourceService.getDataSourcesMetadataFromWorkspaceId(
-        workspaceId,
+        authContext.workspace.id,
      );

    // Can'f find any data sources for this workspace
@@ -42,30 +40,37 @@ export class WorkspaceSchemaFactory {
    }

    // Validate cache version
-    await this.workspaceCacheStorageService.validateCacheVersion(workspaceId);
+    await this.workspaceCacheStorageService.validateCacheVersion(
+      authContext.workspace.id,
+    );

    // Get object metadata from cache
    let objectMetadataCollection =
      await this.workspaceCacheStorageService.getObjectMetadataCollection(
-        workspaceId,
+        authContext.workspace.id,
      );

    // If object metadata is not cached, get it from the database
    if (!objectMetadataCollection) {
      objectMetadataCollection =
-        await this.objectMetadataService.findManyWithinWorkspace(workspaceId);
+        await this.objectMetadataService.findManyWithinWorkspace(
+          authContext.workspace.id,
+        );

      await this.workspaceCacheStorageService.setObjectMetadataCollection(
-        workspaceId,
+        authContext.workspace.id,
        objectMetadataCollection,
      );
    }

    // Get typeDefs from cache
-    let typeDefs =
-      await this.workspaceCacheStorageService.getTypeDefs(workspaceId);
+    let typeDefs = await this.workspaceCacheStorageService.getTypeDefs(
+      authContext.workspace.id,
+    );
    let usedScalarNames =
-      await this.workspaceCacheStorageService.getUsedScalarNames(workspaceId);
+      await this.workspaceCacheStorageService.getUsedScalarNames(
+        authContext.workspace.id,
+      );

    // If typeDefs are not cached, generate them
    if (!typeDefs || !usedScalarNames) {
@@ -80,18 +85,17 @@ export class WorkspaceSchemaFactory {
      typeDefs = printSchema(autoGeneratedSchema);

      await this.workspaceCacheStorageService.setTypeDefs(
-        workspaceId,
+        authContext.workspace.id,
        typeDefs,
      );
      await this.workspaceCacheStorageService.setUsedScalarNames(
-        workspaceId,
+        authContext.workspace.id,
        usedScalarNames,
      );
    }

    const autoGeneratedResolvers = await this.workspaceResolverFactory.create(
-      workspaceId,
-      userId,
+      authContext,
      objectMetadataCollection,
      workspaceResolverBuilderMethodNames,
    );
--- a/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/map-field-metadata-to-graphql-query.utils.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/map-field-metadata-to-graphql-query.utils.ts
@@ -135,5 +135,14 @@ export const mapFieldMetadataToGraphqlQuery = (
        addressLng
      }
    `;
+  } else if (fieldType === FieldMetadataType.ACTOR) {
+    return `
+      ${field.name}
+      {
+        source
+        workspaceMemberId
+        name
+      }
+    `;
  }
 };
--- a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts
@@ -39,6 +39,7 @@ import {
  AppToken,
  AppTokenType,
 } from 'src/engine/core-modules/app-token/app-token.entity';
+import { WorkspaceMember } from 'src/engine/core-modules/user/dtos/workspace-member.dto';

 import { TokenService } from './token.service';

@@ -131,7 +132,7 @@ export class AuthService {
    const workspaceMember = await this.userService.loadWorkspaceMember(user);

    if (workspaceMember) {
-      user.workspaceMember = workspaceMember;
+      user.workspaceMember = workspaceMember as WorkspaceMember;
    }

    const accessToken = await this.tokenService.generateAccessToken(user.id);
--- a/packages/twenty-server/src/engine/core-modules/auth/services/token.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/token.service.ts
@@ -42,7 +42,7 @@ import { ValidatePasswordResetToken } from 'src/engine/core-modules/auth/dto/val
 import { EmailService } from 'src/engine/integrations/email/email.service';
 import { InvalidatePassword } from 'src/engine/core-modules/auth/dto/invalidate-password.entity';
 import { EmailPasswordResetLink } from 'src/engine/core-modules/auth/dto/email-password-reset-link.entity';
-import { JwtData } from 'src/engine/core-modules/auth/types/jwt-data.type';
+import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { ExchangeAuthCodeInput } from 'src/engine/core-modules/auth/dto/exchange-auth-code.input';
 import { ExchangeAuthCode } from 'src/engine/core-modules/auth/dto/exchange-auth-code.entity';
@@ -208,7 +208,7 @@ export class TokenService {
    return !!token;
  }

-  async validateToken(request: Request): Promise<JwtData> {
+  async validateToken(request: Request): Promise<AuthContext> {
    const token = ExtractJwt.fromAuthHeaderAsBearerToken()(request);

    if (!token) {
@@ -219,11 +219,11 @@ export class TokenService {
      this.environmentService.get('ACCESS_TOKEN_SECRET'),
    );

-    const { user, workspace } = await this.jwtStrategy.validate(
+    const { user, apiKey, workspace } = await this.jwtStrategy.validate(
      decoded as JwtPayload,
    );

-    return { user, workspace };
+    return { user, apiKey, workspace };
  }

  async verifyLoginToken(loginToken: string): Promise<string> {
--- a/packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.ts
@@ -15,9 +15,10 @@ import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
 import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
 import { assert } from 'src/utils/assert';
+import { AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
+import { ApiKeyWorkspaceEntity } from 'src/modules/api-key/standard-objects/api-key.workspace-entity';

 export type JwtPayload = { sub: string; workspaceId: string; jti?: string };
-export type PassportUser = { user?: User; workspace: Workspace };

@Injectable()
 export class JwtAuthStrategy extends PassportStrategy(Strategy, 'jwt') {
@@ -37,15 +38,24 @@ export class JwtAuthStrategy extends PassportStrategy(Strategy, 'jwt') {
    });
  }

-  async validate(payload: JwtPayload): Promise<PassportUser> {
+  async validate(payload: JwtPayload): Promise<AuthContext> {
    const workspace = await this.workspaceRepository.findOneBy({
      id: payload.workspaceId ?? payload.sub,
    });
+    let user: User | null = null;
+    let apiKey: ApiKeyWorkspaceEntity | null = null;

    if (!workspace) {
      throw new UnauthorizedException();
    }
    if (payload.jti) {
+      // TODO: Check why it's not working
+      // const apiKeyRepository =
+      //   await this.twentyORMGlobalManager.getRepositoryForWorkspace<ApiKeyWorkspaceEntity>(
+      //     workspace.id,
+      //     'apiKey',
+      //   );
+
      const dataSourceMetadata =
        await this.dataSourceService.getLastDataSourceMetadataFromWorkspaceIdOrFail(
          workspace.id,
@@ -54,20 +64,20 @@ export class JwtAuthStrategy extends PassportStrategy(Strategy, 'jwt') {
      const workspaceDataSource =
        await this.typeORMService.connectToDataSource(dataSourceMetadata);

-      const apiKey = await workspaceDataSource?.query(
+      const res = await workspaceDataSource?.query(
        `SELECT * FROM ${dataSourceMetadata.schema}."apiKey" WHERE id = $1`,
        [payload.jti],
      );

+      apiKey = res?.[0];
+
      assert(
-        apiKey.length === 1 && !apiKey?.[0].revokedAt,
+        apiKey && !apiKey.revokedAt,
        'This API Key is revoked',
        ForbiddenException,
      );
    }

-    let user;
-
    if (payload.workspaceId) {
      user = await this.userRepository.findOne({
        where: { id: payload.sub },
@@ -78,6 +88,6 @@ export class JwtAuthStrategy extends PassportStrategy(Strategy, 'jwt') {
      }
    }

-    return { user, workspace };
+    return { user, apiKey, workspace };
  }
 }
--- a/packages/twenty-server/src/engine/core-modules/auth/types/auth-context.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/types/auth-context.type.ts
@@ -0,0 +1,9 @@
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { ApiKeyWorkspaceEntity } from 'src/modules/api-key/standard-objects/api-key.workspace-entity';
+
+export type AuthContext = {
+  user?: User | null | undefined;
+  apiKey?: ApiKeyWorkspaceEntity | null | undefined;
+  workspace: Workspace;
+};
--- a/packages/twenty-server/src/engine/core-modules/auth/types/jwt-data.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/types/jwt-data.type.ts
@@ -1,7 +0,0 @@
-import { User } from 'src/engine/core-modules/user/user.entity';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-
-export type JwtData = {
-  user?: User | undefined;
-  workspace: Workspace;
-};
--- a/packages/twenty-server/src/engine/core-modules/open-api/utils/tests/components.utils.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/open-api/utils/tests/components.utils.spec.ts
@@ -137,6 +137,21 @@ describe('computeSchemaComponents', () => {
          fieldRichText: {
            type: 'string',
          },
+          fieldActor: {
+            properties: {
+              source: {
+                type: 'string',
+              },
+              workspaceMemberId: {
+                type: 'string',
+                format: 'uuid',
+              },
+              name: {
+                type: 'string',
+              },
+            },
+            type: 'object',
+          },
        },
      },
      'ObjectName with Relations': {
--- a/packages/twenty-server/src/engine/core-modules/open-api/utils/components.utils.ts
+++ b/packages/twenty-server/src/engine/core-modules/open-api/utils/components.utils.ts
@@ -71,6 +71,7 @@ const getSchemaComponentsProperties = (
      case FieldMetadataType.CURRENCY:
      case FieldMetadataType.FULL_NAME:
      case FieldMetadataType.ADDRESS:
+      case FieldMetadataType.ACTOR:
        itemProperty = {
          type: 'object',
          properties: compositeTypeDefintions
--- a/packages/twenty-server/src/engine/core-modules/user/services/tests/user.service.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/services/tests/user.service.spec.ts
@@ -8,6 +8,7 @@ import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-
 import { TypeORMService } from 'src/database/typeorm/typeorm.service';
 import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
 import { WorkspaceService } from 'src/engine/core-modules/workspace/services/workspace.service';
+import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';

 describe('UserService', () => {
  let service: UserService;
@@ -40,6 +41,10 @@ describe('UserService', () => {
          provide: WorkspaceService,
          useValue: {},
        },
+        {
+          provide: TwentyORMGlobalManager,
+          useValue: {},
+        },
      ],
    }).compile();

--- a/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts
@@ -1,18 +1,22 @@
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectRepository } from '@nestjs/typeorm';

+import assert from 'assert';
+
 import { TypeOrmQueryService } from '@ptc-org/nestjs-query-typeorm';
 import { Repository } from 'typeorm';

 import { TypeORMService } from 'src/database/typeorm/typeorm.service';
-import { WorkspaceMember } from 'src/engine/core-modules/user/dtos/workspace-member.dto';
 import { User } from 'src/engine/core-modules/user/user.entity';
 import { WorkspaceService } from 'src/engine/core-modules/workspace/services/workspace.service';
+import {
+  Workspace,
+  WorkspaceActivationStatus,
+} from 'src/engine/core-modules/workspace/workspace.entity';
 import { ObjectRecordDeleteEvent } from 'src/engine/integrations/event-emitter/types/object-record-delete.event';
-import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
 import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
+import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
-import { assert } from 'src/utils/assert';

 export class UserService extends TypeOrmQueryService<User> {
  constructor(
@@ -22,73 +26,46 @@ export class UserService extends TypeOrmQueryService<User> {
    private readonly typeORMService: TypeORMService,
    private readonly eventEmitter: EventEmitter2,
    private readonly workspaceService: WorkspaceService,
+    private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
  ) {
    super(userRepository);
  }

  async loadWorkspaceMember(user: User) {
-    const dataSourcesMetadata =
-      await this.dataSourceService.getDataSourcesMetadataFromWorkspaceId(
-        user.defaultWorkspace.id,
+    if (
+      user.defaultWorkspace.activationStatus !==
+      WorkspaceActivationStatus.ACTIVE
+    ) {
+      return null;
+    }
+
+    const workspaceMemberRepository =
+      await this.twentyORMGlobalManager.getRepositoryForWorkspace<WorkspaceMemberWorkspaceEntity>(
+        user.defaultWorkspaceId,
+        'workspaceMember',
      );

-    if (!dataSourcesMetadata.length) {
-      return;
-    }
+    const workspaceMember = await workspaceMemberRepository.findOne({
+      where: {
+        userId: user.id,
+      },
+    });

-    if (dataSourcesMetadata.length > 1) {
-      throw new Error(
-        `user '${user.id}' default workspace '${user.defaultWorkspace.id}' has multiple data source metadata`,
-      );
-    }
-
-    const dataSourceMetadata = dataSourcesMetadata[0];
-
-    const workspaceDataSource =
-      await this.typeORMService.connectToDataSource(dataSourceMetadata);
-
-    const workspaceMembers = await workspaceDataSource?.query(
-      `SELECT * FROM ${dataSourceMetadata.schema}."workspaceMember" WHERE "userId" = '${user.id}'`,
-    );
-
-    if (!workspaceMembers.length) {
-      return;
-    }
-
-    assert(
-      workspaceMembers.length === 1,
-      'WorkspaceMember not found or too many found',
-    );
-
-    const userWorkspaceMember = new WorkspaceMember();
-
-    userWorkspaceMember.id = workspaceMembers[0].id;
-    userWorkspaceMember.colorScheme = workspaceMembers[0].colorScheme;
-    userWorkspaceMember.locale = workspaceMembers[0].locale;
-    userWorkspaceMember.avatarUrl = workspaceMembers[0].avatarUrl;
-    userWorkspaceMember.name = {
-      firstName: workspaceMembers[0].nameFirstName,
-      lastName: workspaceMembers[0].nameLastName,
-    };
-    userWorkspaceMember.timeZone = workspaceMembers[0].timeZone;
-    userWorkspaceMember.dateFormat = workspaceMembers[0].dateFormat;
-    userWorkspaceMember.timeFormat = workspaceMembers[0].timeFormat;
-
-    return userWorkspaceMember;
+    return workspaceMember;
  }

-  async loadWorkspaceMembers(dataSource: DataSourceEntity) {
-    const workspaceDataSource =
-      await this.typeORMService.connectToDataSource(dataSource);
+  async loadWorkspaceMembers(workspace: Workspace) {
+    if (workspace.activationStatus !== WorkspaceActivationStatus.ACTIVE) {
+      return [];
+    }

-    return await workspaceDataSource?.query(
-      `
-      SELECT * 
-      FROM ${dataSource.schema}."workspaceMember" AS s 
-      INNER JOIN core.user AS u 
-      ON s."userId" = u.id
-    `,
-    );
+    const workspaceMemberRepository =
+      await this.twentyORMGlobalManager.getRepositoryForWorkspace<WorkspaceMemberWorkspaceEntity>(
+        workspace.id,
+        'workspaceMember',
+      );
+
+    return workspaceMemberRepository.find();
  }

  async deleteUser(userId: string): Promise<User> {
@@ -136,6 +113,7 @@ export class UserService extends TypeOrmQueryService<User> {
    payload.properties = {
      before: workspaceMember,
    };
+    payload.name = 'workspaceMember.deleted';
    payload.recordId = workspaceMember.id;

    this.eventEmitter.emit('workspaceMember.deleted', payload);
--- a/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
@@ -112,9 +112,7 @@ export class UserResolver {
  @ResolveField(() => WorkspaceMember, {
    nullable: true,
  })
-  async workspaceMember(
-    @Parent() user: User,
-  ): Promise<WorkspaceMember | undefined> {
+  async workspaceMember(@Parent() user: User): Promise<WorkspaceMember | null> {
    const workspaceMember = await this.userService.loadWorkspaceMember(user);

    if (workspaceMember && workspaceMember.avatarUrl) {
@@ -126,7 +124,31 @@ export class UserResolver {
      workspaceMember.avatarUrl = `${workspaceMember.avatarUrl}?token=${avatarUrlToken}`;
    }

-    return workspaceMember;
+    // TODO: Fix typing disrepency between Entity and DTO
+    return workspaceMember as WorkspaceMember | null;
+  }
+
+  @ResolveField(() => [WorkspaceMember], {
+    nullable: true,
+  })
+  async workspaceMembers(@Parent() user: User): Promise<WorkspaceMember[]> {
+    const workspaceMembers = await this.userService.loadWorkspaceMembers(
+      user.defaultWorkspace,
+    );
+
+    for (const workspaceMember of workspaceMembers) {
+      if (workspaceMember.avatarUrl) {
+        const avatarUrlToken = await this.fileService.encodeFileToken({
+          workspace_member_id: workspaceMember.id,
+          workspace_id: user.defaultWorkspaceId,
+        });
+
+        workspaceMember.avatarUrl = `${workspaceMember.avatarUrl}?token=${avatarUrlToken}`;
+      }
+    }
+
+    // TODO: Fix typing disrepency between Entity and DTO
+    return workspaceMembers as WorkspaceMember[];
  }

  @ResolveField(() => String, {
--- a/packages/twenty-server/src/engine/integrations/exception-handler/interfaces/exception-handler-options.interface.ts
+++ b/packages/twenty-server/src/engine/integrations/exception-handler/interfaces/exception-handler-options.interface.ts
@@ -8,5 +8,5 @@ export interface ExceptionHandlerOptions {
    name: string;
  };
  document?: string;
-  user?: ExceptionHandlerUser;
+  user?: ExceptionHandlerUser | null;
 }
--- a/Show More
+++ b/Show More