Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import React, { useContext, useEffect, useState } from 'react'
import { Column } from '../table/ArtemisTable';
import { artemisService } from '../artemis-service';
import { Toolbar, ToolbarContent, ToolbarItem, Text, SearchInput, Button, PaginationVariant, Pagination, DataList, DataListCell, DataListCheck, DataListItem, DataListItemCells, DataListItemRow, Modal, TextContent, Icon, ModalVariant } from '@patternfly/react-core';
import { Thead, Tr, Th, Tbody, Td, ActionsColumn, IAction, Table } from '@patternfly/react-table';
import { Thead, Tr, Th, Tbody, Td, ActionsColumn, IAction, Table, InnerScrollContainer } from '@patternfly/react-table';
import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
import { createQueueObjectName } from '../util/jmx';
import { Link } from 'react-router-dom';
Expand Down Expand Up @@ -341,6 +341,7 @@ export const MessagesTable: React.FunctionComponent<MessageProps> = props => {
</ToolbarItem>
</ToolbarContent>
</Toolbar>
<InnerScrollContainer>
<Table id='message-table' variant="compact" aria-label="Column Management Table">
<Thead>
<Tr >
Expand Down Expand Up @@ -383,13 +384,15 @@ export const MessagesTable: React.FunctionComponent<MessageProps> = props => {
<td>
<ActionsColumn
items={getRowActions(row, rowIndex)}
popperProps={{ position: 'right', appendTo: () => (document.getElementById('root') as HTMLElement) }}
/>
</td>
</>
</Tr>
))}
</Tbody>
</Table>
</InnerScrollContainer>
<Pagination
itemCount={resultsSize}
page={page}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import {
SelectList
} from '@patternfly/react-core';
import SortAmountDownIcon from '@patternfly/react-icons/dist/esm/icons/sort-amount-down-icon';
import { Thead, Tr, Th, Tbody, Td, IAction, ActionsColumn, Table } from '@patternfly/react-table';
import { Thead, Tr, Th, Tbody, Td, IAction, ActionsColumn, Table, InnerScrollContainer } from '@patternfly/react-table';
import { artemisPreferencesService } from '../artemis-preferences-service';
import {
OptionsMenu,
Expand Down Expand Up @@ -435,6 +435,7 @@ const operationOptions = [
return (
<React.Fragment>
{toolbarItems}
<InnerScrollContainer>
<Table variant="compact" aria-label="Data Table" id='data-table'>
<Thead>
<Tr >
Expand Down Expand Up @@ -467,13 +468,15 @@ const operationOptions = [
<td>
<ActionsColumn
items={getRowActions(row, rowIndex)}
popperProps={{ position: 'right', appendTo: () => (document.getElementById('root') as HTMLElement) }}
/>
</td>
</>
</Tr>
))}
</Tbody>
</Table>
</InnerScrollContainer>
{renderPagination(PaginationVariant.bottom)}
{renderModal()}
</React.Fragment>
Expand Down
Loading