fix: soft deleted records are read only

twentyhq · Oct 30, 2024 · a2d53b3 · a2d53b3
1 parent 8ef4efa
commit a2d53b3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/packages/twenty-front/src/modules/object-record/record-show/components/FieldsCard.tsx b/packages/twenty-front/src/modules/object-record/record-show/components/FieldsCard.tsx
@@ -82,7 +82,8 @@ export const FieldsCard = ({
       objectNameSingular !== CoreObjectNameSingular.Task &&
       fieldMetadataItem.name !== 'taskTargets',
   );
-  const isReadOnly = objectMetadataItem.isRemote;
+  const isReadOnly =
+    objectMetadataItem.isRemote || !!recordFromStore?.deletedAt;
 
   return (
     <>

diff --git a/packages/twenty-front/src/modules/object-record/record-show/components/SummaryCard.tsx b/packages/twenty-front/src/modules/object-record/record-show/components/SummaryCard.tsx
@@ -45,7 +45,8 @@ export const SummaryCard = ({
 
   const { Icon, IconColor } = useGetStandardObjectIcon(objectNameSingular);
   const isMobile = useIsMobile() || isInRightDrawer;
-  const isReadOnly = objectMetadataItem.isRemote;
+  const isReadOnly =
+    objectMetadataItem.isRemote || !!recordFromStore?.deletedAt;
 
   if (isNewRightDrawerItemLoading || !isDefined(recordFromStore)) {
     return <ShowPageSummaryCardSkeletonLoader />;

diff --git a/.../modules/object-record/record-table/record-table-row/components/RecordTableRowWrapper.tsx b/.../modules/object-record/record-table/record-table-row/components/RecordTableRowWrapper.tsx
@@ -2,10 +2,11 @@ import { useTheme } from '@emotion/react';
 import { Draggable } from '@hello-pangea/dnd';
 import { ReactNode, useContext, useEffect } from 'react';
 import { useInView } from 'react-intersection-observer';
-import { useRecoilValue } from 'recoil';
+import { useRecoilState, useRecoilValue } from 'recoil';
 
 import { getBasePathToShowPage } from '@/object-metadata/utils/getBasePathToShowPage';
 import { RecordIndexRootPropsContext } from '@/object-record/record-index/contexts/RecordIndexRootPropsContext';
+import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
 import { RecordTableContext } from '@/object-record/record-table/contexts/RecordTableContext';
 import { RecordTableRowContext } from '@/object-record/record-table/contexts/RecordTableRowContext';
 import { useRecordTableStates } from '@/object-record/record-table/hooks/internal/useRecordTableStates';
@@ -35,6 +36,10 @@ export const RecordTableRowWrapper = ({
     RecordTableWithWrappersScrollWrapperContext,
   );
 
+  const [recordFromStore] = useRecoilState<any>(
+    recordStoreFamilyState(recordId)
+  );
+
   const { ref: elementRef, inView } = useInView({
     root: scrollWrapperRef.ref.current?.querySelector(
       '[data-overlayscrollbars-viewport]',
@@ -82,7 +87,8 @@ export const RecordTableRowWrapper = ({
                 }) + recordId,
               objectNameSingular: objectMetadataItem.nameSingular,
               isSelected: currentRowSelected,
-              isReadOnly: objectMetadataItem.isRemote ?? false,
+              isReadOnly:
+                objectMetadataItem.isRemote || !!recordFromStore?.deletedAt,
               isPendingRow,
               isDragging: draggableSnapshot.isDragging,
               dragHandleProps: draggableProvided.dragHandleProps,