Merge branch 'main' into chore/upgrade-aws-sdk-v2-to-v3

nx.json

@@ -32,7 +32,7 @@
     },
     "start": {
       "cache": true,
-      "dependsOn": ["^build"]
+      "dependsOn": ["^typecheck","^build"]
     },
     "lint": {
       "executor": "@nx/eslint:lint",

packages/twenty-chrome-extension/src/generated/graphql.tsx

@@ -7455,7 +7455,7 @@ export type Workspace = {
   billingSubscriptions?: Maybe<Array<BillingSubscription>>;
   createdAt: Scalars['DateTime'];
   currentBillingSubscription?: Maybe<BillingSubscription>;
-  currentCacheVersion?: Maybe<Scalars['String']>;
+  metadataVersion?: Maybe<Scalars['String']>;
   deletedAt?: Maybe<Scalars['DateTime']>;
   displayName?: Maybe<Scalars['String']>;
   domainName?: Maybe<Scalars['String']>;

packages/twenty-emails/package.json

@@ -1,6 +1,6 @@
 {
   "name": "twenty-emails",
-  "version": "0.23.1",
+  "version": "0.23.2",
   "description": "",
   "author": "",
   "private": true,

packages/twenty-front/package.json

@@ -1,6 +1,6 @@
 {
   "name": "twenty-front",
-  "version": "0.23.1",
+  "version": "0.23.2",
   "private": true,
   "type": "module",
   "scripts": {

packages/twenty-front/project.json

@@ -10,6 +10,12 @@
         "outputPath": "{projectRoot}/build"
       }
     },
+    "serve": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "npx serve -s {projectRoot}/build"
+      }
+    },
     "start": {
       "executor": "@nx/vite:dev-server",
       "options": {

packages/twenty-front/src/effect-components/PageChangeEffect.tsx

@@ -16,10 +16,10 @@ import { AppPath } from '@/types/AppPath';
 import { PageHotkeyScope } from '@/types/PageHotkeyScope';
 import { SettingsPath } from '@/types/SettingsPath';
 import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
+import { useCleanRecoilState } from '~/hooks/useCleanRecoilState';
 import { useIsMatchingLocation } from '~/hooks/useIsMatchingLocation';
 import { usePageChangeEffectNavigateLocation } from '~/hooks/usePageChangeEffectNavigateLocation';
 import { isDefined } from '~/utils/isDefined';
-import { useCleanRecoilState } from '~/hooks/useCleanRecoilState';
 
 // TODO: break down into smaller functions and / or hooks
 //  - moved usePageChangeEffectNavigateLocation into dedicated hook
@@ -153,7 +153,10 @@ export const PageChangeEffect = () => {
         label: 'Create Task',
         type: CommandType.Create,
         Icon: IconCheckbox,
-        onCommandClick: () => openCreateActivity({ targetableObjects: [] }),
+        onCommandClick: () =>
+          openCreateActivity({
+            targetableObjects: [],
+          }),
       },
     ]);
   }, [addToCommandMenu, setToInitialCommandMenu, openCreateActivity]);

packages/twenty-front/src/generated-metadata/graphql.ts

@@ -1380,14 +1380,17 @@ export type Workspace = {
   billingSubscriptions?: Maybe<Array<BillingSubscription>>;
   createdAt: Scalars['DateTime']['output'];
   currentBillingSubscription?: Maybe<BillingSubscription>;
-  currentCacheVersion?: Maybe<Scalars['String']['output']>;
+  currentMetadataVersion: Scalars['Float']['output'];
+  databaseSchema: Scalars['String']['output'];
+  databaseUrl: Scalars['String']['output'];
   deletedAt?: Maybe<Scalars['DateTime']['output']>;
   displayName?: Maybe<Scalars['String']['output']>;
   domainName?: Maybe<Scalars['String']['output']>;
   featureFlags?: Maybe<Array<FeatureFlag>>;
   id: Scalars['UUID']['output'];
   inviteHash?: Maybe<Scalars['String']['output']>;
   logo?: Maybe<Scalars['String']['output']>;
+  metadataVersion: Scalars['Float']['output'];
   updatedAt: Scalars['DateTime']['output'];
   workspaceMembersCount?: Maybe<Scalars['Float']['output']>;
 };

packages/twenty-front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts

@@ -68,24 +68,40 @@ export const useOpenCreateActivityDrawer = ({
       assigneeId: customAssignee?.id,
     });
 
-    const targetableObjectRelationIdName = `${targetableObjects[0].targetObjectNameSingular}Id`;
-
-    await createOneActivityTarget({
-      taskId:
-        activityObjectNameSingular === CoreObjectNameSingular.Task
-          ? activity.id
-          : undefined,
-      noteId:
-        activityObjectNameSingular === CoreObjectNameSingular.Note
-          ? activity.id
-          : undefined,
-      [targetableObjectRelationIdName]: targetableObjects[0].id,
-    });
+    if (targetableObjects.length > 0) {
+      const targetableObjectRelationIdName = `${targetableObjects[0].targetObjectNameSingular}Id`;
+
+      await createOneActivityTarget({
+        taskId:
+          activityObjectNameSingular === CoreObjectNameSingular.Task
+            ? activity.id
+            : undefined,
+        noteId:
+          activityObjectNameSingular === CoreObjectNameSingular.Note
+            ? activity.id
+            : undefined,
+        [targetableObjectRelationIdName]: targetableObjects[0].id,
+      });
+
+      setActivityTargetableEntityArray(targetableObjects);
+    } else {
+      await createOneActivityTarget({
+        taskId:
+          activityObjectNameSingular === CoreObjectNameSingular.Task
+            ? activity.id
+            : undefined,
+        noteId:
+          activityObjectNameSingular === CoreObjectNameSingular.Note
+            ? activity.id
+            : undefined,
+      });
+
+      setActivityTargetableEntityArray([]);
+    }
 
     setHotkeyScope(RightDrawerHotkeyScope.RightDrawer, { goto: false });
     setViewableRecordId(activity.id);
     setViewableRecordNameSingular(activityObjectNameSingular);
-    setActivityTargetableEntityArray(targetableObjects ?? []);
 
     openRightDrawer(RightDrawerPages.ViewRecord);
     setIsUpsertingActivityInDB(false);

packages/twenty-front/src/modules/activities/timelineActivities/components/EventList.tsx

@@ -46,7 +46,7 @@ export const EventList = ({ events, targetableObject }: EventListProps) => {
   const groupedEvents = groupEventsByMonth(filteredEvents);
 
   return (
-    <ScrollWrapper>
+    <ScrollWrapper contextProviderName="eventList">
       <StyledTimelineContainer>
         {groupedEvents.map((group, index) => (
           <EventsGroup

packages/twenty-front/src/modules/apollo/hooks/useApolloFactory.ts

@@ -1,6 +1,6 @@
+import { InMemoryCache, NormalizedCacheObject } from '@apollo/client';
 import { useMemo, useRef } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
-import { InMemoryCache, NormalizedCacheObject } from '@apollo/client';
 import { useRecoilState, useSetRecoilState } from 'recoil';
 
 import { currentUserState } from '@/auth/states/currentUserState';
@@ -49,8 +49,8 @@ export const useApolloFactory = (options: Partial<Options<any>> = {}) => {
         },
       }),
       headers: {
-        ...(currentWorkspace?.currentCacheVersion && {
-          'X-Schema-Version': currentWorkspace.currentCacheVersion,
+        ...(currentWorkspace?.metadataVersion && {
+          'X-Schema-Version': `${currentWorkspace.metadataVersion}`,
         }),
       },
       defaultOptions: {
@@ -95,7 +95,7 @@ export const useApolloFactory = (options: Partial<Options<any>> = {}) => {
     setCurrentWorkspace,
     setWorkspaces,
     isDebugMode,
-    currentWorkspace?.currentCacheVersion,
+    currentWorkspace?.metadataVersion,
     setPreviousUrl,
   ]);
 

packages/twenty-front/src/modules/auth/states/currentWorkspaceState.ts

@@ -13,7 +13,7 @@ export type CurrentWorkspace = Pick<
   | 'activationStatus'
   | 'currentBillingSubscription'
   | 'workspaceMembersCount'
-  | 'currentCacheVersion'
+  | 'metadataVersion'
 >;
 
 export const currentWorkspaceState = createState<CurrentWorkspace | null>({

packages/twenty-front/src/modules/command-menu/components/CommandMenu.tsx

@@ -349,7 +349,7 @@ export const CommandMenu = () => {
             )}
           </StyledInputContainer>
           <StyledList>
-            <ScrollWrapper>
+            <ScrollWrapper contextProviderName="commandMenu">
               <StyledInnerList isMobile={isMobile}>
                 <SelectableList
                   selectableListId="command-menu-list"

packages/twenty-front/src/modules/object-record/record-board/components/RecordBoard.tsx

@@ -148,7 +148,7 @@ export const RecordBoard = ({ recordBoardId }: RecordBoardProps) => {
     >
       <StyledWrapper>
         <StyledBoardHeader />
-        <ScrollWrapper>
+        <ScrollWrapper contextProviderName="recordBoard">
           <StyledContainer ref={boardRef}>
             <DragDropContext onDragEnd={onDragEnd}>
               {columnIds.map((columnId) => (

packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx

@@ -23,7 +23,7 @@ import { Checkbox, CheckboxVariant } from '@/ui/input/components/Checkbox';
 import { contextMenuIsOpenState } from '@/ui/navigation/context-menu/states/contextMenuIsOpenState';
 import { contextMenuPositionState } from '@/ui/navigation/context-menu/states/contextMenuPositionState';
 import { AnimatedEaseInOut } from '@/ui/utilities/animation/components/AnimatedEaseInOut';
-import { ScrollWrapperContext } from '@/ui/utilities/scroll/components/ScrollWrapper';
+import { RecordBoardScrollWrapperContext } from '@/ui/utilities/scroll/contexts/ScrollWrapperContexts';
 
 const StyledBoardCard = styled.div<{ selected: boolean }>`
   background-color: ${({ theme, selected }) =>
@@ -199,10 +199,10 @@ export const RecordBoardCard = () => {
     return [updateEntity, { loading: false }];
   };
 
-  const scrollWrapperRef = useContext(ScrollWrapperContext);
+  const scrollWrapperRef = useContext(RecordBoardScrollWrapperContext);
 
   const { ref: cardRef, inView } = useInView({
-    root: scrollWrapperRef.current,
+    root: scrollWrapperRef?.ref.current,
     rootMargin: '1000px',
   });