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

Fixes https://github.com/twentyhq/core-team-issues/issues/235
This commit is contained in:
Weiko
2025-02-21 12:09:52 +01:00
committed by GitHub
parent ec9587414b
commit 29d079babc
4 changed files with 46 additions and 19 deletions

View File

@ -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>

View File

@ -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>
/>
);
};