Skip to content

Commit f1b6ec5

Browse files
twill-hq[bot]TwillclaudecharlesBochet
authored
Align all field-level permissions (#15023)
# Review Issue #14695 on TwentyHQ GitHub **Twill Task:** https://twill.ai/twentyhq/ENG/tasks/5 ## Summary This PR addresses issue #14695 from the TwentyHQ GitHub repository. The changes review and implement solutions related to the reported issue. ## Changes Made - Reviewed issue #14695 and analyzed the problem context - Implemented necessary fixes or improvements based on issue requirements - Updated relevant files and components affected by the issue ## Context For detailed task context and preview, please refer to the [Twill task](https://twill.ai/twentyhq/ENG/tasks/5). --- *Note: Please review the file changes for specific implementation details.* <details> <summary>📸 Screenshots</summary> Playwright test screenshots captured during development: ### field-permissions-after-fix.png ![field-permissions-after-fix.png](https://storage.googleapis.com/twill-screenshots-twill-469020/screenshots/1760092866977-field-permissions-after-fix.png) ### field-permissions-table-with-fix.png ![field-permissions-table-with-fix.png](https://storage.googleapis.com/twill-screenshots-twill-469020/screenshots/1760092867665-field-permissions-table-with-fix.png) </details> --------- Co-authored-by: Twill <[email protected]> Co-authored-by: Claude <[email protected]> Co-authored-by: Charles Bochet <[email protected]>
1 parent 682bbe7 commit f1b6ec5

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/components/SettingsRolePermissionsObjectLevelObjectFieldPermissionTable.tsx

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
22
import { filterUserFacingFieldMetadataItems } from '@/object-metadata/utils/filterUserFacingFieldMetadataItems';
33
import { SettingsRolePermissionsObjectLevelObjectFieldPermissionTableAllHeaderRow } from '@/settings/roles/role-permissions/object-level-permissions/field-permissions/components/SettingsRolePermissionsObjectLevelObjectFieldPermissionTableAllHeaderRow';
4-
import { SettingsRolePermissionsObjectLevelObjectFieldPermissionTableRow } from '@/settings/roles/role-permissions/object-level-permissions/field-permissions/components/SettingsRolePermissionsObjectLevelObjectFieldPermissionTableRow';
5-
import { FIELD_LEVEL_PERMISSION_TABLE_GRID_TEMPLATE_COLUMNS } from '@/settings/roles/role-permissions/object-level-permissions/field-permissions/constants/FieldLevelPermissionTableGridTemplateColumns';
4+
import {
5+
SettingsRolePermissionsObjectLevelObjectFieldPermissionTableRow,
6+
StyledObjectFieldTableRow,
7+
} from '@/settings/roles/role-permissions/object-level-permissions/field-permissions/components/SettingsRolePermissionsObjectLevelObjectFieldPermissionTableRow';
68
import { useObjectPermissionDerivedStates } from '@/settings/roles/role-permissions/object-level-permissions/field-permissions/hooks/useObjectPermissionDerivedStates';
79
import { settingsDraftRoleFamilyState } from '@/settings/roles/states/settingsDraftRoleFamilyState';
810
import { type OrderBy } from '@/types/OrderBy';
@@ -11,7 +13,6 @@ import { SortableTableHeader } from '@/ui/layout/table/components/SortableTableH
1113
import { Table } from '@/ui/layout/table/components/Table';
1214
import { TableHeader } from '@/ui/layout/table/components/TableHeader';
1315
import { TableHeaderText } from '@/ui/layout/table/components/TableHeaderText';
14-
import { TableRow } from '@/ui/layout/table/components/TableRow';
1516
import { sortedFieldByTableFamilyState } from '@/ui/layout/table/states/sortedFieldByTableFamilyState';
1617
import styled from '@emotion/styled';
1718
import { useLingui } from '@lingui/react/macro';
@@ -31,10 +32,6 @@ const StyledSearchInput = styled(SettingsTextInput)`
3132
width: 100%;
3233
`;
3334

34-
const StyledObjectFieldTableRow = styled(TableRow)`
35-
grid-auto-columns: ${FIELD_LEVEL_PERMISSION_TABLE_GRID_TEMPLATE_COLUMNS};
36-
`;
37-
3835
export type SettingsRolePermissionsObjectLevelObjectFieldPermissionTableProps =
3936
{
4037
objectMetadataItem: ObjectMetadataItem;

packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/object-form/components/OverridableCheckbox.tsx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { RECORD_TABLE_COLUMN_CHECKBOX_WIDTH } from '@/object-record/record-table/constants/RecordTableColumnCheckboxWidth';
2-
import { RECORD_TABLE_COLUMN_DRAG_AND_DROP_WIDTH } from '@/object-record/record-table/constants/RecordTableColumnDragAndDropWidth';
31
import { useTheme } from '@emotion/react';
42
import styled from '@emotion/styled';
53
import { IconReload, IconX } from 'twenty-ui/display';
@@ -12,16 +10,15 @@ const StyledOverridableCheckboxContainer = styled.div`
1210
align-items: center;
1311
display: inline-flex;
1412
justify-content: flex-start;
15-
width: ${RECORD_TABLE_COLUMN_DRAG_AND_DROP_WIDTH +
16-
RECORD_TABLE_COLUMN_CHECKBOX_WIDTH}px;
13+
width: ${({ theme }) => theme.icon.size.xl * 2}px;
1714
`;
1815

1916
const StyledOverridableCheckboxContainerItem = styled.div`
2017
align-items: center;
2118
display: flex;
22-
height: 24px;
19+
height: ${({ theme }) => theme.icon.size.xl}px;
2320
justify-content: center;
24-
width: 24px;
21+
width: ${({ theme }) => theme.icon.size.xl}px;
2522
`;
2623

2724
const StyledIconWrapper = styled.div<{

0 commit comments

Comments
 (0)