Merge branch 'main' into 9018-fix-batch-delete

.github/workflows/ci-demo-check.yml

@@ -1,7 +1,8 @@
-name: CI demo check
+name: CI Demo check
 on:
   schedule:
     - cron: '30 7,19 * * *'
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -11,6 +12,9 @@ jobs:
   test:
     timeout-minutes: 15
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./packages/twenty-e2e-testing
     steps:
       - uses: actions/checkout@v4
         with:
@@ -27,7 +31,7 @@ jobs:
 
       - name: Run Playwright tests
         id: test
-        run: yarn playwright test --grep @demo-only
+        run: yarn playwright test --grep "@demo-only"
 
       - name: Upload report after tests
         uses: actions/upload-artifact@v4

packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/hooks/useDeleteMultipleRecordsAction.tsx

@@ -9,16 +9,16 @@ import { contextStoreNumberOfSelectedRecordsComponentState } from '@/context-sto
 import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';
 import { computeContextStoreFilters } from '@/context-store/utils/computeContextStoreFilters';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { DEFAULT_QUERY_PAGE_SIZE } from '@/object-record/constants/DefaultQueryPageSize';
 import { DELETE_MAX_COUNT } from '@/object-record/constants/DeleteMaxCount';
 import { useDeleteManyRecords } from '@/object-record/hooks/useDeleteManyRecords';
+import { useLazyFetchAllRecords } from '@/object-record/hooks/useLazyFetchAllRecords';
 import { useRecordTable } from '@/object-record/record-table/hooks/useRecordTable';
 import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';
 import { useRightDrawer } from '@/ui/layout/right-drawer/hooks/useRightDrawer';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { useCallback, useContext, useState } from 'react';
 import { IconTrash, isDefined } from 'twenty-ui';
-import { useLazyFetchAllRecords } from '@/object-record/hooks/useLazyFetchAllRecords';
-import { DEFAULT_QUERY_PAGE_SIZE } from '@/object-record/constants/DefaultQueryPageSize';
 
 export const useDeleteMultipleRecordsAction = ({
   objectMetadataItem,
@@ -95,7 +95,8 @@ export const useDeleteMultipleRecordsAction = ({
         type: ActionMenuEntryType.Standard,
         scope: ActionMenuEntryScope.RecordSelection,
         key: 'delete-multiple-records',
-        label: 'Delete',
+        label: 'Delete records',
+        shortLabel: 'Delete',
         position,
         Icon: IconTrash,
         accent: 'danger',

packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/hooks/useExportMultipleRecordsAction.tsx

@@ -36,6 +36,7 @@ export const useExportMultipleRecordsAction = ({
       key: 'export-multiple-records',
       position,
       label: displayedExportProgress(progress),
+      shortLabel: 'Export',
       Icon: IconDatabaseExport,
       accent: 'default',
       onClick: () => download(),

packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/constants/DefaultSingleRecordActionsConfigV2.ts

@@ -1,5 +1,6 @@
 import { useAddToFavoritesSingleRecordAction } from '@/action-menu/actions/record-actions/single-record/hooks/useAddToFavoritesSingleRecordAction';
 import { useDeleteSingleRecordAction } from '@/action-menu/actions/record-actions/single-record/hooks/useDeleteSingleRecordAction';
+import { useDestroySingleRecordAction } from '@/action-menu/actions/record-actions/single-record/hooks/useDestroySingleRecordAction';
 import { useNavigateToNextRecordSingleRecordAction } from '@/action-menu/actions/record-actions/single-record/hooks/useNavigateToNextRecordSingleRecordAction';
 import { useNavigateToPreviousRecordSingleRecordAction } from '@/action-menu/actions/record-actions/single-record/hooks/useNavigateToPreviousRecordSingleRecordAction';
 import { useRemoveFromFavoritesSingleRecordAction } from '@/action-menu/actions/record-actions/single-record/hooks/useRemoveFromFavoritesSingleRecordAction';
@@ -16,6 +17,7 @@ import {
   IconHeart,
   IconHeartOff,
   IconTrash,
+  IconTrashX,
 } from 'twenty-ui';
 
 export const DEFAULT_SINGLE_RECORD_ACTIONS_CONFIG_V2: Record<
@@ -70,13 +72,29 @@ export const DEFAULT_SINGLE_RECORD_ACTIONS_CONFIG_V2: Record<
     ],
     actionHook: useDeleteSingleRecordAction,
   },
+  destroySingleRecord: {
+    type: ActionMenuEntryType.Standard,
+    scope: ActionMenuEntryScope.RecordSelection,
+    key: 'destroy-single-record',
+    label: 'Permanently destroy record',
+    shortLabel: 'Destroy',
+    position: 3,
+    Icon: IconTrashX,
+    accent: 'danger',
+    isPinned: true,
+    availableOn: [
+      ActionAvailableOn.INDEX_PAGE_SINGLE_RECORD_SELECTION,
+      ActionAvailableOn.SHOW_PAGE,
+    ],
+    actionHook: useDestroySingleRecordAction,
+  },
   navigateToPreviousRecord: {
     type: ActionMenuEntryType.Standard,
     scope: ActionMenuEntryScope.RecordSelection,
     key: 'navigate-to-previous-record',
     label: 'Navigate to previous record',
     shortLabel: '',
-    position: 3,
+    position: 4,
     isPinned: true,
     Icon: IconChevronUp,
     availableOn: [ActionAvailableOn.SHOW_PAGE],
@@ -88,7 +106,7 @@ export const DEFAULT_SINGLE_RECORD_ACTIONS_CONFIG_V2: Record<
     key: 'navigate-to-next-record',
     label: 'Navigate to next record',
     shortLabel: '',
-    position: 4,
+    position: 5,
     isPinned: true,
     Icon: IconChevronDown,
     availableOn: [ActionAvailableOn.SHOW_PAGE],

packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/hooks/useAddToFavoritesSingleRecordAction.ts

@@ -2,6 +2,7 @@ import { SingleRecordActionHookWithObjectMetadataItem } from '@/action-menu/acti
 import { useCreateFavorite } from '@/favorites/hooks/useCreateFavorite';
 import { useFavorites } from '@/favorites/hooks/useFavorites';
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
+import { isNull } from '@sniptt/guards';
 import { useRecoilValue } from 'recoil';
 import { isDefined } from 'twenty-ui';
 
@@ -23,7 +24,8 @@ export const useAddToFavoritesSingleRecordAction: SingleRecordActionHookWithObje
       isDefined(objectMetadataItem) &&
       isDefined(selectedRecord) &&
       !objectMetadataItem.isRemote &&
-      !isFavorite;
+      !isFavorite &&
+      isNull(selectedRecord.deletedAt);
 
     const onClick = () => {
       if (!shouldBeRegistered) {

packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/hooks/useDeleteSingleRecordAction.tsx

@@ -3,10 +3,13 @@ import { ActionMenuContext } from '@/action-menu/contexts/ActionMenuContext';
 import { useDeleteFavorite } from '@/favorites/hooks/useDeleteFavorite';
 import { useFavorites } from '@/favorites/hooks/useFavorites';
 import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';
+import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
 import { useRecordTable } from '@/object-record/record-table/hooks/useRecordTable';
 import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';
 import { useRightDrawer } from '@/ui/layout/right-drawer/hooks/useRightDrawer';
+import { isNull } from '@sniptt/guards';
 import { useCallback, useContext, useState } from 'react';
+import { useRecoilValue } from 'recoil';
 import { isDefined } from 'twenty-ui';
 
 export const useDeleteSingleRecordAction: SingleRecordActionHookWithObjectMetadataItem =
@@ -22,6 +25,8 @@ export const useDeleteSingleRecordAction: SingleRecordActionHookWithObjectMetada
       objectNameSingular: objectMetadataItem.nameSingular,
     });
 
+    const selectedRecord = useRecoilValue(recordStoreFamilyState(recordId));
+
     const { sortedFavorites: favorites } = useFavorites();
     const { deleteFavorite } = useDeleteFavorite();
 
@@ -51,7 +56,8 @@ export const useDeleteSingleRecordAction: SingleRecordActionHookWithObjectMetada
 
     const { isInRightDrawer } = useContext(ActionMenuContext);
 
-    const shouldBeRegistered = !isRemoteObject;
+    const shouldBeRegistered =
+      !isRemoteObject && isNull(selectedRecord?.deletedAt);
 
     const onClick = () => {
       if (!shouldBeRegistered) {

packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/hooks/useDestroySingleRecordAction.tsx

@@ -0,0 +1,73 @@
+import { SingleRecordActionHookWithObjectMetadataItem } from '@/action-menu/actions/types/singleRecordActionHook';
+import { ActionMenuContext } from '@/action-menu/contexts/ActionMenuContext';
+import { useDestroyOneRecord } from '@/object-record/hooks/useDestroyOneRecord';
+import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
+import { useRecordTable } from '@/object-record/record-table/hooks/useRecordTable';
+import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';
+import { useRightDrawer } from '@/ui/layout/right-drawer/hooks/useRightDrawer';
+import { useCallback, useContext, useState } from 'react';
+import { useRecoilValue } from 'recoil';
+import { isDefined } from 'twenty-ui';
+
+export const useDestroySingleRecordAction: SingleRecordActionHookWithObjectMetadataItem =
+  ({ recordId, objectMetadataItem }) => {
+    const [isDestroyRecordsModalOpen, setIsDestroyRecordsModalOpen] =
+      useState(false);
+
+    const { resetTableRowSelection } = useRecordTable({
+      recordTableId: objectMetadataItem.namePlural,
+    });
+
+    const { destroyOneRecord } = useDestroyOneRecord({
+      objectNameSingular: objectMetadataItem.nameSingular,
+    });
+
+    const selectedRecord = useRecoilValue(recordStoreFamilyState(recordId));
+
+    const { closeRightDrawer } = useRightDrawer();
+
+    const handleDeleteClick = useCallback(async () => {
+      resetTableRowSelection();
+
+      await destroyOneRecord(recordId);
+    }, [resetTableRowSelection, destroyOneRecord, recordId]);
+
+    const isRemoteObject = objectMetadataItem.isRemote;
+
+    const { isInRightDrawer, onActionExecutedCallback } =
+      useContext(ActionMenuContext);
+
+    const shouldBeRegistered =
+      !isRemoteObject && isDefined(selectedRecord?.deletedAt);
+
+    const onClick = () => {
+      if (!shouldBeRegistered) {
+        return;
+      }
+
+      setIsDestroyRecordsModalOpen(true);
+    };
+
+    return {
+      shouldBeRegistered,
+      onClick,
+      ConfirmationModal: (
+        <ConfirmationModal
+          isOpen={isDestroyRecordsModalOpen}
+          setIsOpen={setIsDestroyRecordsModalOpen}
+          title={'Permanently Destroy Record'}
+          subtitle={
+            'Are you sure you want to destroy this record? It cannot be recovered anymore.'
+          }
+          onConfirmClick={async () => {
+            await handleDeleteClick();
+            onActionExecutedCallback?.();
+            if (isInRightDrawer) {
+              closeRightDrawer();
+            }
+          }}
+          deleteButtonText={'Permanently Destroy Record'}
+        />
+      ),
+    };
+  };

packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenuButtons.tsx

@@ -27,7 +27,7 @@ export const RecordIndexActionMenuButtons = () => {
           size="small"
           variant="secondary"
           accent="default"
-          title={entry.label}
+          title={entry.shortLabel}
           onClick={entry.onClick}
           ariaLabel={entry.label}
         />

packages/twenty-front/src/modules/activities/emails/right-drawer/hooks/__tests__/useRightDrawerEmailThread.test.tsx

@@ -88,13 +88,15 @@ const mocks = [
                         phones {
                           primaryPhoneNumber
                           primaryPhoneCountryCode
+                          primaryPhoneCallingCode
                           additionalPhones
                         }
                         position
                         updatedAt
                         whatsapp {
                           primaryPhoneNumber
                           primaryPhoneCountryCode
+                          primaryPhoneCallingCode
                           additionalPhones
                         }
                         workPreference
@@ -246,13 +248,15 @@ const mocks = [
                   phones {
                     primaryPhoneNumber
                     primaryPhoneCountryCode
+                    primaryPhoneCallingCode
                     additionalPhones
                   }
                   position
                   updatedAt
                   whatsapp {
                     primaryPhoneNumber
                     primaryPhoneCountryCode
+                    primaryPhoneCallingCode
                     additionalPhones
                   }
                   workPreference

packages/twenty-front/src/modules/context-store/hooks/useFindManyRecordsSelectedInContextStore.ts

@@ -39,6 +39,7 @@ export const useFindManyRecordsSelectedInContextStore = ({
   const { records, loading, totalCount } = useFindManyRecords({
     objectNameSingular: objectMetadataItem.nameSingular,
     filter: queryFilter,
+    withSoftDeleted: true,
     orderBy: [
       {
         position: 'AscNullsFirst',

packages/twenty-front/src/modules/favorites/hooks/__mocks__/useFavorites.ts

@@ -246,13 +246,15 @@ mutation UpdateOneFavorite(
       phones {
         primaryPhoneNumber
         primaryPhoneCountryCode
+        primaryPhoneCallingCode
         additionalPhones
       }
       position
       updatedAt
       whatsapp {
         primaryPhoneNumber
         primaryPhoneCountryCode
+        primaryPhoneCallingCode
         additionalPhones
       }
       workPreference
@@ -532,13 +534,15 @@ export const mocks = [
               phones {
                 primaryPhoneNumber
                 primaryPhoneCountryCode
+                primaryPhoneCallingCode
                 additionalPhones
               }
               position
               updatedAt
               whatsapp {
                 primaryPhoneNumber
                 primaryPhoneCountryCode
+                primaryPhoneCallingCode
                 additionalPhones
               }
               workPreference

packages/twenty-front/src/modules/object-metadata/utils/__tests__/mapFieldMetadataToGraphQLQuery.test.ts

@@ -198,6 +198,7 @@ phone
 {
   primaryPhoneNumber
   primaryPhoneCountryCode
+  primaryPhoneCallingCode
 }
 linkedinLink
 {

packages/twenty-front/src/modules/object-metadata/utils/__tests__/mapObjectMetadataToGraphQLQuery.test.ts

@@ -48,6 +48,7 @@ describe('mapObjectMetadataToGraphQLQuery', () => {
     {
       primaryPhoneNumber
       primaryPhoneCountryCode
+      primaryPhoneCallingCode
     }
     createdAt
     avatarUrl

packages/twenty-front/src/modules/object-metadata/utils/mapFieldMetadataToGraphQLQuery.ts

@@ -157,6 +157,7 @@ ${mapObjectMetadataToGraphQLQuery({
     {
       primaryPhoneNumber
       primaryPhoneCountryCode
+      primaryPhoneCallingCode
       additionalPhones
     }`;
   }

packages/twenty-front/src/modules/object-record/hooks/__mocks__/personFragments.ts

@@ -30,13 +30,15 @@ export const PERSON_FRAGMENT_WITH_DEPTH_ZERO_RELATIONS = `
       phones {
         primaryPhoneNumber
         primaryPhoneCountryCode
+        primaryPhoneCallingCode
         additionalPhones
       }
       position
       updatedAt
       whatsapp {
         primaryPhoneNumber
         primaryPhoneCountryCode
+        primaryPhoneCallingCode
         additionalPhones
       }
       workPreference
@@ -229,6 +231,7 @@ export const PERSON_FRAGMENT_WITH_DEPTH_ONE_RELATIONS = `
       phones {
         primaryPhoneNumber
         primaryPhoneCountryCode
+        primaryPhoneCallingCode
         additionalPhones
       }
       pointOfContactForOpportunities {
@@ -305,6 +308,7 @@ export const PERSON_FRAGMENT_WITH_DEPTH_ONE_RELATIONS = `
       whatsapp {
         primaryPhoneNumber
         primaryPhoneCountryCode
+        primaryPhoneCallingCode
         additionalPhones
       }
       workPreference

packages/twenty-front/src/modules/object-record/hooks/__mocks__/useCreateManyRecords.ts

@@ -38,6 +38,7 @@ export const responseData = {
   },
   phones: {
     primaryPhoneCountryCode: '',
+    primaryPhoneCallingCode: '',
     primaryPhoneNumber: '',
   },
   linkedinLink: {

packages/twenty-front/src/modules/object-record/hooks/__mocks__/useCreateOneRecord.ts

@@ -43,6 +43,7 @@ export const responseData = {
   },
   phones: {
     primaryPhoneCountryCode: '',
+    primaryPhoneCallingCode: '',
     primaryPhoneNumber: '',
   },
   linkedinLink: {