mirror of
https://github.com/ansible/awx.git
synced 2026-05-08 09:57:35 -02:30
resolves some poor styling on some lists
This commit is contained in:
@@ -5,11 +5,11 @@ import { t } from '@lingui/macro';
|
|||||||
import useRequest from '../../util/useRequest';
|
import useRequest from '../../util/useRequest';
|
||||||
|
|
||||||
import { SearchColumns, SortColumns } from '../../types';
|
import { SearchColumns, SortColumns } from '../../types';
|
||||||
import PaginatedDataList from '../PaginatedDataList';
|
|
||||||
import DataListToolbar from '../DataListToolbar';
|
import DataListToolbar from '../DataListToolbar';
|
||||||
import CheckboxListItem from '../CheckboxListItem';
|
import CheckboxListItem from '../CheckboxListItem';
|
||||||
import SelectedList from '../SelectedList';
|
import SelectedList from '../SelectedList';
|
||||||
import { getQSConfig, parseQueryString } from '../../util/qs';
|
import { getQSConfig, parseQueryString } from '../../util/qs';
|
||||||
|
import PaginatedTable, { HeaderCell, HeaderRow } from '../PaginatedTable';
|
||||||
|
|
||||||
const QS_Config = sortColumns => {
|
const QS_Config = sortColumns => {
|
||||||
return getQSConfig('resource', {
|
return getQSConfig('resource', {
|
||||||
@@ -86,7 +86,8 @@ function SelectResourceStep({
|
|||||||
selected={selectedResourceRows}
|
selected={selectedResourceRows}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
<PaginatedDataList
|
|
||||||
|
<PaginatedTable
|
||||||
hasContentLoading={isLoading}
|
hasContentLoading={isLoading}
|
||||||
contentError={error}
|
contentError={error}
|
||||||
items={resources}
|
items={resources}
|
||||||
@@ -97,11 +98,21 @@ function SelectResourceStep({
|
|||||||
toolbarSortColumns={sortColumns}
|
toolbarSortColumns={sortColumns}
|
||||||
toolbarSearchableKeys={searchableKeys}
|
toolbarSearchableKeys={searchableKeys}
|
||||||
toolbarRelatedSearchableKeys={relatedSearchableKeys}
|
toolbarRelatedSearchableKeys={relatedSearchableKeys}
|
||||||
renderItem={item => (
|
headerRow={
|
||||||
|
<HeaderRow qsConfig={QS_Config(sortColumns)}>
|
||||||
|
{sortColumns.map(({ name, key }) => (
|
||||||
|
<HeaderCell sortKey={key}>{name}</HeaderCell>
|
||||||
|
))}
|
||||||
|
</HeaderRow>
|
||||||
|
}
|
||||||
|
renderRow={(item, index) => (
|
||||||
<CheckboxListItem
|
<CheckboxListItem
|
||||||
isSelected={selectedResourceRows.some(i => i.id === item.id)}
|
isSelected={selectedResourceRows.some(i => i.id === item.id)}
|
||||||
itemId={item.id}
|
itemId={item.id}
|
||||||
|
item={item}
|
||||||
|
rowIndex={index}
|
||||||
key={item.id}
|
key={item.id}
|
||||||
|
columns={sortColumns}
|
||||||
name={item[displayKey]}
|
name={item[displayKey]}
|
||||||
label={item[displayKey]}
|
label={item[displayKey]}
|
||||||
onSelect={() => onRowClick(item)}
|
onSelect={() => onRowClick(item)}
|
||||||
|
|||||||
@@ -13,6 +13,8 @@ const CheckboxListItem = ({
|
|||||||
onDeselect,
|
onDeselect,
|
||||||
rowIndex,
|
rowIndex,
|
||||||
onSelect,
|
onSelect,
|
||||||
|
columns,
|
||||||
|
item,
|
||||||
}) => {
|
}) => {
|
||||||
return (
|
return (
|
||||||
<Tr ouiaId={`list-item-${itemId}`} id={`list-item-${itemId}`}>
|
<Tr ouiaId={`list-item-${itemId}`} id={`list-item-${itemId}`}>
|
||||||
@@ -28,9 +30,18 @@ const CheckboxListItem = ({
|
|||||||
name={name}
|
name={name}
|
||||||
dataLabel={t`Selected`}
|
dataLabel={t`Selected`}
|
||||||
/>
|
/>
|
||||||
<Td aria-labelledby={itemId} dataLabel={t`Name`}>
|
|
||||||
<b>{label}</b>
|
{columns?.length > 0 ? (
|
||||||
</Td>
|
columns.map(col => (
|
||||||
|
<Td aria-label={col.name} dataLabel={col.key}>
|
||||||
|
{item[col.key]}
|
||||||
|
</Td>
|
||||||
|
))
|
||||||
|
) : (
|
||||||
|
<Td aria-labelledby={itemId} dataLabel={label}>
|
||||||
|
<b>{label}</b>
|
||||||
|
</Td>
|
||||||
|
)}
|
||||||
</Tr>
|
</Tr>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user