feat: add sorting for tables

This commit is contained in:
Elias Schneider
2025-01-11 20:14:12 +01:00
parent 61d18a9d1b
commit fd69830c26
27 changed files with 294 additions and 138 deletions

View File

@@ -5,7 +5,7 @@
import * as Table from '$lib/components/ui/table';
import OIDCService from '$lib/services/oidc-service';
import type { OidcClient } from '$lib/types/oidc.type';
import type { Paginated, PaginationRequest } from '$lib/types/pagination.type';
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/pagination.type';
import { axiosErrorToast } from '$lib/utils/error-util';
import { LucidePencil, LucideTrash } from 'lucide-svelte';
import { toast } from 'svelte-sonner';
@@ -14,6 +14,7 @@
let { clients: initialClients }: { clients: Paginated<OidcClient> } = $props();
let clients = $state<Paginated<OidcClient>>(initialClients);
let oneTimeLink = $state<string | null>(null);
let requestOptions: SearchPaginationSortRequest | undefined = $state();
$effect(() => {
clients = initialClients;
@@ -21,12 +22,6 @@
const oidcService = new OIDCService();
let pagination = $state<PaginationRequest>({
page: 1,
limit: 10
});
let search = $state('');
async function deleteClient(client: OidcClient) {
openConfirmDialog({
title: `Delete ${client.name}`,
@@ -37,7 +32,7 @@
action: async () => {
try {
await oidcService.removeClient(client.id);
clients = await oidcService.listClients(search, pagination);
clients = await oidcService.listClients(requestOptions!);
toast.success('OIDC client deleted successfully');
} catch (e) {
axiosErrorToast(e);
@@ -46,16 +41,17 @@
}
});
}
async function fetchItems(search: string, page: number, limit: number) {
return oidcService.listClients(search, { page, limit });
}
</script>
<AdvancedTable
items={clients}
{fetchItems}
columns={['Logo', 'Name', { label: 'Actions', hidden: true }]}
{requestOptions}
onRefresh={async(o) => clients = await oidcService.listClients(o)}
columns={[
{ label: 'Logo' },
{ label: 'Name', sortColumn: 'name' },
{ label: 'Actions', hidden: true }
]}
>
{#snippet rows({ item })}
<Table.Cell class="w-8 font-medium">

View File

@@ -5,7 +5,7 @@
import * as DropdownMenu from '$lib/components/ui/dropdown-menu';
import * as Table from '$lib/components/ui/table';
import UserGroupService from '$lib/services/user-group-service';
import type { Paginated } from '$lib/types/pagination.type';
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/pagination.type';
import type { UserGroup, UserGroupWithUserCount } from '$lib/types/user-group.type';
import { axiosErrorToast } from '$lib/utils/error-util';
import { LucidePencil, LucideTrash } from 'lucide-svelte';
@@ -16,6 +16,7 @@
$props();
let userGroups = $state<Paginated<UserGroupWithUserCount>>(initialUserGroups);
let requestOptions: SearchPaginationSortRequest | undefined = $state();
const userGroupService = new UserGroupService();
@@ -29,7 +30,7 @@
action: async () => {
try {
await userGroupService.remove(userGroup.id);
userGroups = await userGroupService.list();
userGroups = await userGroupService.list(requestOptions!);
} catch (e) {
axiosErrorToast(e);
}
@@ -38,13 +39,19 @@
}
});
}
async function fetchItems(search: string, page: number, limit: number) {
return userGroupService.list(search, { page, limit });
}
</script>
<AdvancedTable items={userGroups} {fetchItems} columns={['Friendly Name', 'Name', 'User Count', {label: "Actions", hidden: true}]}>
<AdvancedTable
items={userGroups}
onRefresh={async (o) => (userGroups = await userGroupService.list(o))}
{requestOptions}
columns={[
{ label: 'Friendly Name', sortColumn: 'friendlyName' },
{ label: 'Name', sortColumn: 'name' },
{ label: 'User Count', sortColumn: 'userCount' },
{ label: 'Actions', hidden: true }
]}
>
{#snippet rows({ item })}
<Table.Cell>{item.friendlyName}</Table.Cell>
<Table.Cell>{item.name}</Table.Cell>

View File

@@ -13,16 +13,15 @@
const userService = new UserService();
let users = $state(initialUsers);
function fetchItems(search: string, page: number, limit: number) {
return userService.list(search, { page, limit });
}
</script>
<AdvancedTable
items={users}
{fetchItems}
columns={['Name', 'Email']}
onRefresh={async (o) => (users = await userService.list(o))}
columns={[
{ label: 'Name', sortColumn: 'name' },
{ label: 'Email', sortColumn: 'email' }
]}
bind:selectedIds={selectedUserIds}
>
{#snippet rows({ item })}

View File

@@ -7,7 +7,7 @@
import * as DropdownMenu from '$lib/components/ui/dropdown-menu';
import * as Table from '$lib/components/ui/table';
import UserService from '$lib/services/user-service';
import type { Paginated } from '$lib/types/pagination.type';
import type { Paginated, SearchPaginationSortRequest } from '$lib/types/pagination.type';
import type { User } from '$lib/types/user.type';
import { axiosErrorToast } from '$lib/utils/error-util';
import { LucideLink, LucidePencil, LucideTrash } from 'lucide-svelte';
@@ -15,20 +15,13 @@
import { toast } from 'svelte-sonner';
import OneTimeLinkModal from './one-time-link-modal.svelte';
let { users: initialUsers }: { users: Paginated<User> } = $props();
let users = $state<Paginated<User>>(initialUsers);
$effect(() => {
users = initialUsers;
});
let { users = $bindable() }: { users: Paginated<User> } = $props();
let requestOptions: SearchPaginationSortRequest | undefined = $state();
let userIdToCreateOneTimeLink: string | null = $state(null);;
let userIdToCreateOneTimeLink: string | null = $state(null);
const userService = new UserService();
function fetchItems(search: string, page: number, limit: number) {
return userService.list(search, { page, limit });
}
async function deleteUser(user: User) {
openConfirmDialog({
title: `Delete ${user.firstName} ${user.lastName}`,
@@ -39,7 +32,7 @@
action: async () => {
try {
await userService.remove(user.id);
users = await userService.list();
users = await userService.list(requestOptions!);
} catch (e) {
axiosErrorToast(e);
}
@@ -52,16 +45,34 @@
<AdvancedTable
items={users}
{fetchItems}
{requestOptions}
onRefresh={async (options) => (users = await userService.list(options))}
columns={[
'First name',
'Last name',
'Email',
'Username',
'Role',
{ label: 'Actions', hidden: true }
{
label: 'First name',
sortColumn: 'firstName'
},
{
label: 'Last name',
sortColumn: 'lastName'
},
{
label: 'Email',
sortColumn: 'email'
},
{
label: 'Username',
sortColumn: 'username'
},
{
label: 'Role',
sortColumn: 'isAdmin'
},
{
label: 'Actions',
hidden: true
}
]}
withoutSearch
>
{#snippet rows({ item })}
<Table.Cell>{item.firstName}</Table.Cell>

View File

@@ -4,8 +4,10 @@ import type { PageServerLoad } from './$types';
export const load: PageServerLoad = async ({ cookies }) => {
const auditLogService = new AuditLogService(cookies.get('access_token'));
const auditLogs = await auditLogService.list({
limit: 15,
page: 1,
sort: {
column: 'createdAt',
direction: 'desc'
}
});
return {
auditLogs

View File

@@ -11,13 +11,6 @@
const auditLogService = new AuditLogService();
async function fetchItems(search: string, page: number, limit: number) {
return await auditLogService.list({
page,
limit
});
}
function toFriendlyEventString(event: string) {
const words = event.split('_');
const capitalizedWords = words.map((word) => {
@@ -29,8 +22,16 @@
<AdvancedTable
items={auditLogs}
{fetchItems}
columns={['Time', 'Event', 'Approximate Location', 'IP Address', 'Device', 'Client']}
onRefresh={async (options) => (auditLogs = await auditLogService.list(options))}
defaultSort={{ column: 'createdAt', direction: 'desc' }}
columns={[
{ label: 'Time', sortColumn: 'createdAt' },
{ label: 'Event', sortColumn: 'event' },
{ label: 'Approximate Location', sortColumn: 'city' },
{ label: 'IP Address', sortColumn: 'ipAddress' },
{ label: 'Device', sortColumn: 'device' },
{ label: 'Client' }
]}
withoutSearch
>
{#snippet rows({ item })}