Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions apps/meteor/client/views/admin/import/ImportHistoryPage.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Button, ButtonGroup, Table, TableHead, TableCell, TableRow, TableBody } from '@rocket.chat/fuselage';
import { Button, ButtonGroup, Table, TableHead, TableCell, TableRow, TableBody, Box } from '@rocket.chat/fuselage';
import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
import { Page, PageHeader, PageScrollableContentWithShadow } from '@rocket.chat/ui-client';
import { useToastMessageDispatch, useEndpoint, useTranslation, useRouter } from '@rocket.chat/ui-contexts';
Expand Down Expand Up @@ -130,8 +130,9 @@ function ImportHistoryPage() {
)}
</ButtonGroup>
</PageHeader>
<PageScrollableContentWithShadow>
<Table fixed data-qa-id='ImportTable'>
<PageScrollableContentWithShadow >
<Box overflow="auto">
<Table data-qa-id='ImportTable' fixed={false}>
<TableHead>
<TableRow>
<TableCell is='th' rowSpan={2} width='x140'>
Expand All @@ -148,7 +149,7 @@ function ImportHistoryPage() {
<TableCell is='th' rowSpan={2}>
{t('File')}
</TableCell>
<TableCell is='th' align='center' colSpan={4} width='x320'>
<TableCell is='th' align='center' colSpan={5} width='x320'>
{t('Counters')}
</TableCell>
</>
Expand Down Expand Up @@ -196,6 +197,7 @@ function ImportHistoryPage() {
)}
</TableBody>
</Table>
</Box>
</PageScrollableContentWithShadow>
</Page>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,21 @@ function ImportOperationSummary({
}
: {};

const truncateCellStyle = {
whiteSpace: 'nowrap',
overflow: 'hidden',
textOverflow: 'ellipsis',
maxWidth: '180px',
};

return (
<TableRow {...props}>
<TableCell>{type}</TableCell>
<TableCell>{formatDateAndTime(_updatedAt)}</TableCell>
<TableCell style={truncateCellStyle}>{type}</TableCell>
<TableCell style={truncateCellStyle}>{formatDateAndTime(_updatedAt)}</TableCell>
{!small && (
<>
<TableCell>{status && t(status.replace('importer_', 'importer_status_') as TranslationKey)}</TableCell>
<TableCell>{fileName}</TableCell>
<TableCell style={truncateCellStyle}>{status && t(status.replace('importer_', 'importer_status_') as TranslationKey)}</TableCell>
<TableCell style={truncateCellStyle}>{fileName}</TableCell>
<TableCell align='center'>{users}</TableCell>
<TableCell align='center'>{contacts}</TableCell>
<TableCell align='center'>{channels}</TableCell>
Expand Down