mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Fix column visibility toggles

Browse source
This commit is contained in:
Bill Thornton 2024-08-29 11:20:44 -04:00
parent bfc37b4171
commit ff18bedca7
1 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/apps/dashboard/routes/activity.tsx
View file

@ -82,6 +82,19 @@ const Activity = () => {
const isLoading = isUsersLoading || isLogEntriesLoading; const isLoading = isUsersLoading || isLogEntriesLoading;
const userColumn: MRT_ColumnDef<ActivityLogEntry>[] = useMemo(() =>
(activityView === ActivityView.System) ? [] : [{
id: 'User',
accessorFn: row => row.UserId && users[row.UserId]?.Name,
header: globalize.translate('LabelUser'),
size: 75,
Cell: UserCell,
enableResizing: false,
muiTableBodyCellProps: {
align: 'center'
}
}], [ activityView, users, UserCell ]);
const columns = useMemo<MRT_ColumnDef<ActivityLogEntry>[]>(() => [ const columns = useMemo<MRT_ColumnDef<ActivityLogEntry>[]>(() => [
{ {
id: 'Date', id: 'Date',
@ -100,18 +113,7 @@ const Activity = () => {
align: 'center' align: 'center'
} }
}, },
{ ...userColumn,
id: 'User',
accessorFn: row => row.UserId && users[row.UserId]?.Name,
header: globalize.translate('LabelUser'),
size: 75,
Cell: UserCell,
enableResizing: false,
visibleInShowHideMenu: activityView !== ActivityView.System,
muiTableBodyCellProps: {
align: 'center'
}
},
{ {
accessorKey: 'Name', accessorKey: 'Name',
header: globalize.translate('LabelName'), header: globalize.translate('LabelName'),
@ -140,7 +142,7 @@ const Activity = () => {
enableResizing: false, enableResizing: false,
enableSorting: false enableSorting: false
} }
], [ UserCell, activityView, users ]); ], [ userColumn ]);
const onViewChange = useCallback((_e: React.MouseEvent<HTMLElement, MouseEvent>, newView: ActivityView | null) => { const onViewChange = useCallback((_e: React.MouseEvent<HTMLElement, MouseEvent>, newView: ActivityView | null) => {
if (newView !== null) { if (newView !== null) {
@ -183,10 +185,7 @@ const Activity = () => {
}, },
state: { state: {
isLoading, isLoading,
pagination, pagination
columnVisibility: {
User: activityView !== ActivityView.System
}
}, },
// Server pagination // Server pagination