[FE] Improve Read-only field behavior (#10382)

Fixes twentyhq/core-team-issues#235
twentyhq · Feb 21, 2025 · 29d079b · 29d079b
1 parent ec95874
commit 29d079b
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 19 deletions.
diff --git a/packages/twenty-front/src/modules/activities/notes/components/Notes.tsx b/packages/twenty-front/src/modules/activities/notes/components/Notes.tsx
@@ -81,17 +81,19 @@ export const Notes = ({
         title="All"
         notes={notes}
         button={
-          <Button
-            Icon={IconPlus}
-            size="small"
-            variant="secondary"
-            title="Add note"
-            onClick={() =>
-              openCreateActivity({
-                targetableObjects: [targetableObject],
-              })
-            }
-          ></Button>
+          !hasObjectReadOnlyPermission && (
+            <Button
+              Icon={IconPlus}
+              size="small"
+              variant="secondary"
+              title="Add note"
+              onClick={() =>
+                openCreateActivity({
+                  targetableObjects: [targetableObject],
+                })
+              }
+            />
+          )
         }
       />
     </StyledNotesContainer>

diff --git a/packages/twenty-front/src/modules/activities/tasks/components/AddTaskButton.tsx b/packages/twenty-front/src/modules/activities/tasks/components/AddTaskButton.tsx
@@ -4,6 +4,7 @@ import { Button, IconPlus } from 'twenty-ui';
 import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateActivityDrawer';
 import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { useHasObjectReadOnlyPermission } from '@/settings/roles/hooks/useHasObjectReadOnlyPermission';
 
 export const AddTaskButton = ({
   activityTargetableObjects,
@@ -14,8 +15,13 @@ export const AddTaskButton = ({
     activityObjectNameSingular: CoreObjectNameSingular.Task,
   });
 
-  if (!isNonEmptyArray(activityTargetableObjects)) {
-    return <></>;
+  const hasObjectReadOnlyPermission = useHasObjectReadOnlyPermission();
+
+  if (
+    !isNonEmptyArray(activityTargetableObjects) ||
+    hasObjectReadOnlyPermission
+  ) {
+    return null;
   }
 
   return (
@@ -29,6 +35,6 @@ export const AddTaskButton = ({
           targetableObjects: activityTargetableObjects,
         })
       }
-    ></Button>
+    />
   );
 };
diff --git a/.../object-record/record-table/record-table-cell/components/RecordTableCellBaseContainer.tsx b/.../object-record/record-table/record-table-cell/components/RecordTableCellBaseContainer.tsx
@@ -4,6 +4,7 @@ import { BORDER_COMMON, ThemeContext } from 'twenty-ui';
 
 import { FieldContext } from '@/object-record/record-field/contexts/FieldContext';
 import { useFieldFocus } from '@/object-record/record-field/hooks/useFieldFocus';
+import { useIsFieldValueReadOnly } from '@/object-record/record-field/hooks/useIsFieldValueReadOnly';
 import { CellHotkeyScopeContext } from '@/object-record/record-table/contexts/CellHotkeyScopeContext';
 import { useRecordTableBodyContextOrThrow } from '@/object-record/record-table/contexts/RecordTableBodyContext';
 import { RecordTableCellContext } from '@/object-record/record-table/contexts/RecordTableCellContext';
@@ -15,11 +16,13 @@ import {
 const StyledBaseContainer = styled.div<{
   hasSoftFocus: boolean;
   fontColorExtraLight: string;
+  fontColorMedium: string;
   backgroundColorTransparentSecondary: string;
+  isReadOnly: boolean;
 }>`
   align-items: center;
   box-sizing: border-box;
-  cursor: pointer;
+  cursor: ${({ isReadOnly }) => (isReadOnly ? 'default' : 'pointer')};
   display: flex;
   height: 32px;
   position: relative;
@@ -28,11 +31,20 @@ const StyledBaseContainer = styled.div<{
   background: ${({ hasSoftFocus, backgroundColorTransparentSecondary }) =>
     hasSoftFocus ? backgroundColorTransparentSecondary : 'none'};
 
-  border-radius: ${({ hasSoftFocus }) =>
-    hasSoftFocus ? BORDER_COMMON.radius.sm : 'none'};
+  border-radius: ${({ hasSoftFocus, isReadOnly }) =>
+    hasSoftFocus && !isReadOnly ? BORDER_COMMON.radius.sm : 'none'};
 
-  outline: ${({ hasSoftFocus, fontColorExtraLight }) =>
-    hasSoftFocus ? `1px solid ${fontColorExtraLight}` : 'none'};
+  outline: ${({
+    hasSoftFocus,
+    fontColorExtraLight,
+    fontColorMedium,
+    isReadOnly,
+  }) =>
+    hasSoftFocus
+      ? isReadOnly
+        ? `1px solid ${fontColorMedium}`
+        : `1px solid ${fontColorExtraLight}`
+      : 'none'};
 `;
 
 export const RecordTableCellBaseContainer = ({
@@ -44,6 +56,7 @@ export const RecordTableCellBaseContainer = ({
   const { openTableCell } = useOpenRecordTableCellFromCell();
   const { theme } = useContext(ThemeContext);
 
+  const isReadOnly = useIsFieldValueReadOnly();
   const { hasSoftFocus, cellPosition } = useContext(RecordTableCellContext);
 
   const { onMoveSoftFocusToCell, onCellMouseEnter } =
@@ -83,7 +96,9 @@ export const RecordTableCellBaseContainer = ({
           theme.background.transparent.secondary
         }
         fontColorExtraLight={theme.font.color.extraLight}
+        fontColorMedium={theme.border.color.medium}
         hasSoftFocus={hasSoftFocus}
+        isReadOnly={isReadOnly}
       >
         {children}
       </StyledBaseContainer>

diff --git a/packages/twenty-front/src/modules/settings/roles/hooks/useHasObjectReadOnlyPermission.ts b/packages/twenty-front/src/modules/settings/roles/hooks/useHasObjectReadOnlyPermission.ts
@@ -15,6 +15,10 @@ export const useHasObjectReadOnlyPermission = () => {
   }
 
   if (!isDefined(currentUserWorkspace?.objectRecordsPermissions)) {
+    return false;
+  }
+
+  if (currentUserWorkspace?.objectRecordsPermissions.length === 0) {
     return true;
   }