Skip to content

feat: Freezes permissions table first column #31626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 4 commits into from
Feb 5, 2024
Merged

feat: Freezes permissions table first column #31626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
83f5c1a
feat: freeze permission table first column
dougfabris Feb 2, 2024
0b55593
chore: changeset
dougfabris Feb 2, 2024
01f3bf7
Merge branch 'develop' into fix/permissionTableColumn
kodiakhq[bot] Feb 5, 2024
40c1fb8
Merge branch 'develop' into fix/permissionTableColumn
kodiakhq[bot] Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/five-dragons-joke.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': minor
---

Freezes the permission table's first column allowing the user to visualize the permission name when scrolling horizontally
5 changes: 3 additions & 2 deletions apps/meteor/client/components/GenericTable/GenericTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { Box, Table } from '@rocket.chat/fuselage';
import React, { type ForwardedRef, type ReactNode, type TableHTMLAttributes, forwardRef } from 'react';
import type { ComponentProps } from 'react';
import React, { type ForwardedRef, type ReactNode, forwardRef } from 'react';

import ScrollableContentWrapper from '../ScrollableContentWrapper';

type GenericTableProps = {
fixed?: boolean;
children: ReactNode;
} & Omit<TableHTMLAttributes<HTMLTableElement>, 'is'>;
} & ComponentProps<typeof Table>;

export const GenericTable = forwardRef(function GenericTable(
{ fixed = true, children, ...props }: GenericTableProps,
Expand Down
25 changes: 23 additions & 2 deletions apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Margins, Tabs, Button, Pagination } from '@rocket.chat/fuselage';
import { css } from '@rocket.chat/css-in-js';
import { Margins, Tabs, Button, Pagination, Palette } from '@rocket.chat/fuselage';
import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
import { useRoute, usePermission, useMethod, useTranslation, useSetModal } from '@rocket.chat/ui-contexts';
import type { ReactElement } from 'react';
Expand Down Expand Up @@ -55,6 +56,26 @@ const PermissionsTable = ({ isEnterprise }: { isEnterprise: boolean }): ReactEle
});
});

const fixedColumnStyle = css`
tr > th {
&:first-child {
position: sticky;
left: 0;
background-color: ${Palette.surface['surface-light']};
z-index: 12;
}
}
tr > td {
&:first-child {
position: sticky;
left: 0;
box-shadow: -1px 0 0 ${Palette.stroke['stroke-light']} inset;
background-color: ${Palette.surface['surface-light']};
z-index: 11;
}
}
`;

return (
<Page flexDirection='row'>
<Page>
Expand Down Expand Up @@ -89,7 +110,7 @@ const PermissionsTable = ({ isEnterprise }: { isEnterprise: boolean }): ReactEle
{permissions?.length === 0 && <GenericNoResults />}
{permissions?.length > 0 && (
<>
<GenericTable fixed={false}>
<GenericTable className={[fixedColumnStyle]} fixed={false}>
<GenericTableHeader>
<GenericTableHeaderCell width='x120'>{t('Name')}</GenericTableHeaderCell>
{roleList?.map(({ _id, name, description }) => (
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/admin/permissions/PermissionsTable/RoleHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const RoleHeader = ({ _id, name, description }: RoleHeaderProps): ReactElement =

return (
<GenericTableHeaderCell pi={4} p={8}>
<Button icon='edit' secondary onClick={handleEditRole}>
<Button small icon='edit' secondary onClick={handleEditRole}>
{description || name}
</Button>
</GenericTableHeaderCell>
Expand Down