Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-02-09 00:18:00 +01:00
Code Issues Projects Releases Wiki Activity

fix: allow horizontal scroll in tokens table (#1080)

Browse Source 
* fix: allow horizontal scroll in tokens table

* refactor: fix username column width

* refactor: always show username column since we now may scroll
This commit is contained in:
olav 2022-06-09 14:04:19 +02:00 committed by GitHub
parent 608171ce93
commit 97206760be
1 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/src/component/admin/apiToken/ApiTokenTable/ApiTokenTable.tsx
View File

@ -80,9 +80,12 @@ export const ApiTokenTable = () => {
<Box sx={{ mb: 4 }}> <Box sx={{ mb: 4 }}>
<ApiTokenDocs /> <ApiTokenDocs />
</Box> </Box>
<Box sx={{ overflowX: 'auto' }}>
<SearchHighlightProvider value={globalFilter}> <SearchHighlightProvider value={globalFilter}>
<Table {...getTableProps()}> <Table {...getTableProps()}>
<SortableTableHeader headerGroups={headerGroups as any} /> <SortableTableHeader
headerGroups={headerGroups as any}
/>
<TableBody {...getTableBodyProps()}> <TableBody {...getTableBodyProps()}>
{rows.map(row => { {rows.map(row => {
prepareRow(row); prepareRow(row);
@ -99,6 +102,7 @@ export const ApiTokenTable = () => {
</TableBody> </TableBody>
</Table> </Table>
</SearchHighlightProvider> </SearchHighlightProvider>
</Box>
<ConditionallyRender <ConditionallyRender
condition={rows.length === 0 && !loading} condition={rows.length === 0 && !loading}
show={ show={
@ -125,7 +129,6 @@ export const ApiTokenTable = () => {
const useHiddenColumns = (): string[] => { const useHiddenColumns = (): string[] => {
const { uiConfig } = useUiConfig(); const { uiConfig } = useUiConfig();
const isSmallScreen = useMediaQuery(theme.breakpoints.down('sm'));
const isMediumScreen = useMediaQuery(theme.breakpoints.down('md')); const isMediumScreen = useMediaQuery(theme.breakpoints.down('md'));
return useMemo(() => { return useMemo(() => {
@ -141,12 +144,8 @@ const useHiddenColumns = (): string[] => {
hidden.push('createdAt'); hidden.push('createdAt');
} }
if (isSmallScreen) {
hidden.push('username');
}
return hidden; return hidden;
}, [uiConfig, isSmallScreen, isMediumScreen]); }, [uiConfig, isMediumScreen]);
}; };
const COLUMNS = [ const COLUMNS = [
@ -161,7 +160,6 @@ const COLUMNS = [
Header: 'Username', Header: 'Username',
accessor: 'username', accessor: 'username',
Cell: HighlightCell, Cell: HighlightCell,
width: '60%',
}, },
{ {
Header: 'Type', Header: 'Type',