Skip to content
Draft
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
42 changes: 22 additions & 20 deletions src/PresentationalComponents/TableView/TableView.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import PropTypes from 'prop-types';
import React, { useMemo } from 'react';
import { TableVariant } from '@patternfly/react-table';
import { InnerScrollContainer, TableVariant } from '@patternfly/react-table';
import { Table, TableBody, TableHeader } from '@patternfly/react-table/deprecated';
import { PrimaryToolbar } from '@redhat-cloud-services/frontend-components/PrimaryToolbar';
import { SkeletonTable } from '@redhat-cloud-services/frontend-components/SkeletonTable';
Expand Down Expand Up @@ -117,25 +117,27 @@ const TableView = ({
variant={compact && TableVariant.compact}
/>
) : (
<Table
aria-label='Patch table view'
cells={columns}
onSelect={metadata.total_items && onSelect}
rows={rows}
onCollapse={metadata.total_items && onCollapse}
canSelectAll={false}
onSort={metadata.total_items && onSort}
ouiaId={tableOUIA}
sortBy={metadata.total_items && sortBy}
isStickyHeader
variant={compact && TableVariant.compact}
actions={actionsConfig}
actionsToggle={actionsToggle}
canCollapseAll
>
<TableHeader />
<TableBody />
</Table>
<InnerScrollContainer>
<Table
aria-label='Patch table view'
cells={columns}
onSelect={metadata.total_items && onSelect}
rows={rows}
onCollapse={metadata.total_items && onCollapse}
canSelectAll={false}
onSort={metadata.total_items && onSort}
ouiaId={tableOUIA}
sortBy={metadata.total_items && sortBy}
isStickyHeader
variant={compact && TableVariant.compact}
actions={actionsConfig}
actionsToggle={actionsToggle}
canCollapseAll
>
<TableHeader />
<TableBody />
</Table>
</InnerScrollContainer>
)}
<TableFooter
isLoading={isLoading}
Expand Down
54 changes: 27 additions & 27 deletions src/PresentationalComponents/TableView/TableViewAssets.js
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
import { cellWidth, expandable, sortable } from '@patternfly/react-table';
import { cellWidth, expandable, sortable, wrappable, nowrap } from '@patternfly/react-table';
import messages from '../../Messages';
import { intl } from '../../Utilities/IntlProvider';

export const advisoriesColumns = [
{
title: intl.formatMessage(messages.labelsColumnsName),
cellFormatters: [expandable],
transforms: [sortable, cellWidth(15)],
transforms: [sortable, wrappable],
key: 'id',
isShown: true,
isShownByDefault: true,
isUntoggleable: true,
},
{
title: intl.formatMessage(messages.labelsColumnsSynopsis),
transforms: [sortable],
transforms: [sortable, nowrap],
key: 'synopsis',
isShown: true,
isShownByDefault: true,
},
{
title: intl.formatMessage(messages.labelsColumnsType),
transforms: [sortable, cellWidth(10)],
transforms: [sortable, wrappable],
key: 'advisory_type_name',
isShown: true,
isShownByDefault: true,
},
{
title: intl.formatMessage(messages.labelsColumnsSeverity),
transforms: [sortable, cellWidth(10)],
transforms: [sortable, wrappable],
key: 'severity',
isShown: true,
isShownByDefault: true,
},
{
title: intl.formatMessage(messages.labelsColumnsAffectedSystems),
transforms: [sortable, cellWidth(15)],
transforms: [sortable, wrappable],
key: 'applicable_systems',
isShown: true,
isShownByDefault: true,
},
{
title: intl.formatMessage(messages.labelsColumnsReboot),
transforms: [sortable],
transforms: [sortable, wrappable],
key: 'reboot_required',
isShown: true,
isShownByDefault: true,
},
{
title: intl.formatMessage(messages.labelsColumnsPublishDate),
transforms: [sortable, cellWidth(15)],
transforms: [sortable, wrappable],
key: 'public_date',
isShown: true,
isShownByDefault: true,
Expand All @@ -60,50 +60,50 @@ export const systemAdvisoriesColumns = [
{
title: intl.formatMessage(messages.labelsColumnsName),
cellFormatters: [expandable],
transforms: [sortable, cellWidth(15)],
transforms: [sortable, wrappable],
key: 'id',
isShown: true,
isShownByDefault: true,
isUntoggleable: true,
},
{
title: 'Synopsis',
transforms: [sortable, cellWidth(35)],
title: intl.formatMessage(messages.labelsColumnsSynopsis),
transforms: [sortable, cellWidth(30)],
key: 'synopsis',
isShown: true,
isShownByDefault: true,
},
{
title: intl.formatMessage(messages.labelsColumnsStatus),
transforms: [sortable, cellWidth(10)],
transforms: [sortable, wrappable],
key: 'status',
isShown: true,
isShownByDefault: true,
},
{
title: intl.formatMessage(messages.labelsColumnsType),
transforms: [sortable, cellWidth(10)],
transforms: [sortable, wrappable],
key: 'advisory_type_name',
isShown: true,
isShownByDefault: true,
},
{
title: intl.formatMessage(messages.labelsColumnsSeverity),
transforms: [sortable, cellWidth(10)],
transforms: [sortable, wrappable],
key: 'severity',
isShown: true,
isShownByDefault: true,
},
{
title: intl.formatMessage(messages.labelsColumnsReboot),
transforms: [sortable, cellWidth(10)],
transforms: [sortable, wrappable],
key: 'reboot_required',
isShown: true,
isShownByDefault: true,
},
{
title: intl.formatMessage(messages.labelsColumnsPublishDate),
transforms: [sortable, cellWidth(10)],
transforms: [sortable, wrappable],
key: 'public_date',
isShown: true,
isShownByDefault: true,
Expand All @@ -113,43 +113,43 @@ export const systemAdvisoriesColumns = [
export const systemPackagesColumns = [
{
title: intl.formatMessage(messages.labelsColumnsName),
transforms: [sortable, cellWidth(20)],
transforms: [sortable, wrappable],
key: 'name',
isShown: true,
isShownByDefault: true,
isUntoggleable: true,
},
{
title: intl.formatMessage(messages.labelsColumnsInstalledVersion),
transforms: [sortable, cellWidth(15)],
transforms: [sortable, wrappable],
key: 'evra',
isShown: true,
isShownByDefault: true,
},
{
title: intl.formatMessage(messages.labelsColumnsLatestInstallableVersion),
transforms: [cellWidth(15)],
transforms: [wrappable],
key: 'latest_installable_version',
isShown: true,
isShownByDefault: true,
},
{
title: intl.formatMessage(messages.labelsColumnsLatestApplicableVersion),
transforms: [cellWidth(15)],
transforms: [wrappable],
key: 'latest_applicable_version',
isShown: true,
isShownByDefault: true,
},
{
title: intl.formatMessage(messages.labelsColumnsStatus),
transforms: [sortable, cellWidth(10)],
transforms: [sortable, wrappable],
key: 'update_status',
isShown: true,
isShownByDefault: true,
},
{
title: intl.formatMessage(messages.labelsColumnsSummary),
transforms: [sortable, cellWidth(40)],
transforms: [sortable, wrappable],
key: 'summary',
isShown: true,
isShownByDefault: true,
Expand All @@ -160,15 +160,15 @@ export const packagesColumns = [
{
key: 'name',
title: intl.formatMessage(messages.labelsColumnsName),
transforms: [sortable, cellWidth(25)],
transforms: [sortable, wrappable],
isShown: true,
isShownByDefault: true,
isUntoggleable: true,
},
{
key: 'systems_installed',
title: intl.formatMessage(messages.labelsColumnsInstalledSystems),
transforms: [sortable, cellWidth(10)],
transforms: [sortable, wrappable],
props: {
width: 10,
},
Expand All @@ -178,7 +178,7 @@ export const packagesColumns = [
{
key: 'systems_applicable',
title: intl.formatMessage(messages.labelsColumnsApplicableSystems),
transforms: [sortable, cellWidth(10)],
transforms: [sortable, wrappable],
props: {
width: 10,
},
Expand All @@ -188,7 +188,7 @@ export const packagesColumns = [
{
key: 'systems_installable',
title: intl.formatMessage(messages.labelsColumnsInstallableSystems),
transforms: [sortable, cellWidth(10)],
transforms: [sortable, wrappable],
props: {
width: 10,
},
Expand All @@ -198,7 +198,7 @@ export const packagesColumns = [
{
key: 'summary',
title: intl.formatMessage(messages.labelsColumnsSummary),
transforms: [sortable, cellWidth(40)],
transforms: [sortable, wrappable],
props: {
width: 30,
},
Expand Down
Loading
Loading