Skip to content

Commit 4dca281

Browse files
committed
fix(unit-user-usage): remove percentage, fix spacing and disable column filtering for project columns
project column filtering doesn't work right now so disabling filtering is to prevent filtering bugs
1 parent 3739b15 commit 4dca281

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

components/usage/UserUsageTable.tsx

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,15 @@ export const UserUsageTable = ({ users, toolbarContent, onChange }: UserUsageTab
6868
columnHelper.accessor("first_seen", {
6969
header: "First Seen",
7070
cell: ({ getValue, row }) =>
71-
dayjs.utc(getValue()).format(`${DATE_FORMAT} ${TIME_FORMAT}`) +
72-
`(${row.original.activity.total_days_since_first_seen} days ago)`,
71+
`${dayjs.utc(getValue()).format(`${DATE_FORMAT} ${TIME_FORMAT}`)} (${
72+
row.original.activity.total_days_since_first_seen
73+
} days ago)`,
7374
sortingFn: (a, b) =>
7475
dayjs.utc(a.original.first_seen).diff(dayjs.utc(b.original.first_seen)),
7576
}),
76-
7777
columnHelper.accessor("activity.total_days_active", {
7878
header: "Total",
79-
cell: ({ getValue, row }) =>
80-
`${getValue()} days (${row.original.activity.total_activity})`,
79+
cell: ({ getValue }) => `${getValue()} days`,
8180
}),
8281
columnHelper.accessor((user) => user.activity.period_b?.active_days, {
8382
id: "activity_b",
@@ -106,7 +105,6 @@ export const UserUsageTable = ({ users, toolbarContent, onChange }: UserUsageTab
106105
}),
107106
],
108107
}),
109-
110108
columnHelper.group({
111109
header: "Datasets",
112110
columns: [
@@ -119,6 +117,8 @@ export const UserUsageTable = ({ users, toolbarContent, onChange }: UserUsageTab
119117
columns: [
120118
columnHelper.accessor((user) => user.projects.observer, {
121119
header: "Observer",
120+
enableColumnFilter: false,
121+
enableSorting: false,
122122
cell: ({ getValue, row }) => (
123123
<ChipsInput
124124
group="observer"
@@ -131,6 +131,8 @@ export const UserUsageTable = ({ users, toolbarContent, onChange }: UserUsageTab
131131
}),
132132
columnHelper.accessor((user) => user.projects.editor, {
133133
id: "project-editor",
134+
enableColumnFilter: false,
135+
enableSorting: false,
134136
header: "Editor",
135137
cell: ({ getValue, row }) => (
136138
<ChipsInput
@@ -144,6 +146,8 @@ export const UserUsageTable = ({ users, toolbarContent, onChange }: UserUsageTab
144146
}),
145147
columnHelper.accessor((user) => user.projects.administrator, {
146148
header: "Administrator",
149+
enableColumnFilter: false,
150+
enableSorting: false,
147151
cell: ({ getValue, row }) => (
148152
<ChipsInput
149153
group="administrator"

0 commit comments

Comments
 (0)