Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to filters and table #2512

Merged
merged 4 commits into from
Oct 21, 2024
Merged

Update to filters and table #2512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1fc5fb
Adjust filters with new design
kattylucy Oct 21, 2024
314ea69
Add formatted date
kattylucy Oct 21, 2024
af7353a
Add changes to data reports table
kattylucy Oct 21, 2024
79caac4
Make column sticky
kattylucy Oct 21, 2024
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
27 changes: 25 additions & 2 deletions centrifuge-app/src/components/DataTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ export const DataTable = <T extends Record<string, any>>({
{showHeader && (
<HeaderRow styles={headerStyles} scrollable={scrollable}>
{columns.map((col, i) => (
<HeaderCol key={i} align={col?.align}>
<HeaderCol key={i} align={col?.align} isLabel={col.isLabel}>
<Text variant="body3">
{col?.header && typeof col.header !== 'string' && col?.sortKey && React.isValidElement(col.header)
? React.cloneElement(col.header as React.ReactElement<any>, {
Expand All @@ -142,6 +142,7 @@ export const DataTable = <T extends Record<string, any>>({
))}
</HeaderRow>
)}

{pinnedData?.map((row, i) => (
<DataRow
hoverable={hoverable}
Expand Down Expand Up @@ -241,6 +242,12 @@ export const DataRow = styled(Row)<any>`
borderBottomStyle: 'solid',
borderBottomWidth: '1px',
borderBottomColor: 'borderPrimary',
borderLeftStyle: 'solid',
borderLeftWidth: '1px',
borderLeftColor: 'borderPrimary',
borderRightStyle: 'solid',
borderRightWidth: '1px',
borderRightColor: 'borderPrimary',
backgroundColor: 'transparent',
// using a&:hover caused the background sometimes not to update when switching themes
'&:hover':
Expand Down Expand Up @@ -275,6 +282,13 @@ export const DataCol = styled(Text)<{ align: Column['align']; isLabel?: boolean
min-width: 0;
overflow: hidden;
white-space: nowrap;
${({ isLabel }) =>
isLabel &&
css({
position: 'sticky',
left: 0,
zIndex: 1,
})}

${({ align }) => {
switch (align) {
Expand All @@ -296,10 +310,19 @@ export const DataCol = styled(Text)<{ align: Column['align']; isLabel?: boolean
}}
`

const HeaderCol = styled(DataCol)`
const HeaderCol = styled(DataCol)<{ isLabel?: boolean }>`
height: 32px;
align-items: center;

${({ isLabel }) =>
isLabel &&
css({
position: 'sticky',
left: 0,
zIndex: 2,
backgroundColor: 'backgroundSecondary',
})}

&:has(:focus-visible) {
box-shadow: inset 0 0 0 3px var(--fabric-focus);
}
Expand Down
25 changes: 13 additions & 12 deletions centrifuge-app/src/components/Report/AssetList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,42 +27,42 @@ function getColumnConfig(isPrivate: boolean, symbol: string) {
{ header: 'Name', align: 'left', csvOnly: false, formatter: noop },
{
header: 'Value',
align: 'right',
align: 'left',
csvOnly: false,
sortable: true,
formatter: (v: any) => (v ? formatBalance(v, symbol, 2) : '-'),
},
{
header: 'Principal outstanding',
align: 'right',
align: 'left',
csvOnly: false,
sortable: true,
formatter: (v: any) => (v ? formatBalance(v, symbol, 2) : '-'),
},
{
header: 'Interest outstanding',
align: 'right',
align: 'left',
csvOnly: false,
sortable: true,
formatter: (v: any) => (v ? formatBalance(v, symbol, 2) : '-'),
},
{
header: 'Principal repaid',
align: 'right',
align: 'left',
csvOnly: false,
sortable: true,
formatter: (v: any) => (v ? formatBalance(v, symbol, 2) : '-'),
},
{
header: 'Interest repaid',
align: 'right',
align: 'left',
csvOnly: false,
sortable: true,
formatter: (v: any) => (v ? formatBalance(v, symbol, 2) : '-'),
},
{
header: 'Additional repaid',
align: 'right',
align: 'left',
csvOnly: false,
sortable: true,
formatter: (v: any) => (v ? formatBalance(v, symbol, 2) : '-'),
Expand Down Expand Up @@ -124,28 +124,28 @@ function getColumnConfig(isPrivate: boolean, symbol: string) {
{ header: 'Name', align: 'left', csvOnly: false, formatter: noop },
{
header: 'Market value',
align: 'right',
align: 'left',
csvOnly: false,
sortable: true,
formatter: (v: any) => (v ? formatBalance(v, symbol, 2) : '-'),
},
{
header: 'Face value',
align: 'right',
align: 'left',
csvOnly: false,
sortable: true,
formatter: (v: any) => (v ? formatBalance(v, symbol, 2) : '-'),
},
{
header: 'Quantity',
align: 'right',
align: 'left',
csvOnly: false,
sortable: true,
formatter: (v: any) => (v ? formatBalance(v, undefined, 2) : '-'),
},
{
header: 'Market price',
align: 'right',
align: 'left',
csvOnly: false,
sortable: true,
formatter: (v: any) => (v ? formatBalance(v, symbol, 2) : '-'),
Expand All @@ -159,14 +159,14 @@ function getColumnConfig(isPrivate: boolean, symbol: string) {
},
{
header: 'Unrealized profit',
align: 'right',
align: 'left',
csvOnly: false,
sortable: true,
formatter: (v: any) => (v ? formatBalance(v, symbol, 2) : '-'),
},
{
header: 'Realized profit',
align: 'right',
align: 'left',
csvOnly: false,
sortable: true,
formatter: (v: any) => (v ? formatBalance(v, symbol, 2) : '-'),
Expand All @@ -192,6 +192,7 @@ export function AssetList({ pool }: { pool: Pool }) {
align: col.align,
header: col.sortable ? <SortableTableHeader label={col.header} /> : col.header,
sortKey: col.sortable ? `value[${index}]` : undefined,
width: '177px',
cell: (row: TableDataRow & { id: string }) => {
const assetId = row?.id?.split('-')[1]
return col.header === 'Name' ? (
Expand Down
13 changes: 8 additions & 5 deletions centrifuge-app/src/components/Report/AssetTransactions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ export function AssetTransactions({ pool }: { pool: Pool }) {
const columnConfig = [
{
header: 'Asset ID',
align: 'left',
align: 'center',
csvOnly: false,
formatter: noop,
width: '80px',
},
{
header: 'Asset name',
Expand All @@ -34,7 +35,7 @@ export function AssetTransactions({ pool }: { pool: Pool }) {
},
{
header: 'Epoch',
align: 'right',
align: 'center',
csvOnly: false,
formatter: noop,
},
Expand All @@ -46,7 +47,7 @@ export function AssetTransactions({ pool }: { pool: Pool }) {
},
{
header: 'Transaction type',
align: 'right',
align: 'left',
csvOnly: false,
formatter: noop,
},
Expand All @@ -58,14 +59,15 @@ export function AssetTransactions({ pool }: { pool: Pool }) {
},
{
header: 'Currency',
align: 'right',
align: 'left',
csvOnly: true,
formatter: noop,
},
{
header: 'Transaction',
align: 'right',
align: 'center',
csvOnly: false,
width: '80px',
formatter: (v: any) => (
<IconAnchor
href={explorer.tx(v)}
Expand Down Expand Up @@ -113,6 +115,7 @@ export function AssetTransactions({ pool }: { pool: Pool }) {
header: col.header,
cell: (row: TableDataRow) => <Text variant="body3">{col.formatter((row.value as any)[index])}</Text>,
csvOnly: col.csvOnly,
width: col.width ?? '252px',
}))
.filter((col) => !col.csvOnly)

Expand Down
Loading
Loading