From 3e47e2e90079f783bcc4b602867ab14f07116326 Mon Sep 17 00:00:00 2001
From: Evert Prants <evert@lunasqu.ee>
Date: Wed, 12 Jun 2024 19:06:44 +0300
Subject: [PATCH] Audit changes

---
 src/lib/components/Button.svelte           |  9 +++-
 src/lib/components/form/FormControl.svelte |  4 ++
 src/lib/i18n/en/common.json                |  1 +
 src/lib/server/audit/audit.ts              |  2 +-
 src/lib/server/changesets.ts               |  2 +-
 src/routes/ssoadmin/audit/+page.server.ts  | 62 ++++++++++------------
 src/routes/ssoadmin/audit/+page.svelte     | 48 ++++++++++-------
 7 files changed, 70 insertions(+), 58 deletions(-)

diff --git a/src/lib/components/Button.svelte b/src/lib/components/Button.svelte
index 9eb66ae..80a2d10 100644
--- a/src/lib/components/Button.svelte
+++ b/src/lib/components/Button.svelte
@@ -3,12 +3,17 @@
 
 	export let type: 'button' | 'submit' = 'button';
 	export let variant: 'default' | 'primary' | 'link' = 'default';
+	export let formaction: string | undefined = undefined;
 	export let disabled = false;
 	const dispath = createEventDispatcher();
 </script>
 
-<button {type} class="btn btn-{variant}" on:click={(e) => dispath('click', e)} {disabled}
-	><slot /></button
+<button
+	{type}
+	{formaction}
+	class="btn btn-{variant}"
+	on:click={(e) => dispath('click', e)}
+	{disabled}><slot /></button
 >
 
 <style>
diff --git a/src/lib/components/form/FormControl.svelte b/src/lib/components/form/FormControl.svelte
index cc7bfcb..8b62a25 100644
--- a/src/lib/components/form/FormControl.svelte
+++ b/src/lib/components/form/FormControl.svelte
@@ -45,6 +45,10 @@
 		}
 	}
 
+	:global(select[multiple]) {
+		flex-grow: 1;
+	}
+
 	.form-control > :global(label) {
 		margin-bottom: 4px;
 		font-size: 1.1rem;
diff --git a/src/lib/i18n/en/common.json b/src/lib/i18n/en/common.json
index de54319..5e2306a 100644
--- a/src/lib/i18n/en/common.json
+++ b/src/lib/i18n/en/common.json
@@ -18,6 +18,7 @@
   "current": "Current",
   "remove": "Remove",
   "filter": "Filter",
+  "clear": "Clear",
   "theme": {
     "light": "Light mode",
     "dark": "Dark mode"
diff --git a/src/lib/server/audit/audit.ts b/src/lib/server/audit/audit.ts
index adf8da2..e515bbe 100644
--- a/src/lib/server/audit/audit.ts
+++ b/src/lib/server/audit/audit.ts
@@ -98,7 +98,7 @@ export class Audit {
 
 	private static getAuditWhere(search: AuditSearchClause) {
 		const selectList: SQL<unknown>[] = [];
-		if (search.actions) {
+		if (search.actions?.length) {
 			const actions = Array.isArray(search.actions)
 				? search.actions
 				: (search.actions as string).split(',');
diff --git a/src/lib/server/changesets.ts b/src/lib/server/changesets.ts
index 154fbbc..2cf0682 100644
--- a/src/lib/server/changesets.ts
+++ b/src/lib/server/changesets.ts
@@ -1,7 +1,7 @@
 export class Changesets {
 	static take<TRes>(
 		fields: (keyof TRes)[],
-		body: FormData,
+		body: FormData | URLSearchParams,
 		challenge?: Partial<TRes>
 	): Partial<TRes> {
 		return fields.reduce<Partial<TRes>>((accum, field) => {
diff --git a/src/routes/ssoadmin/audit/+page.server.ts b/src/routes/ssoadmin/audit/+page.server.ts
index 5fc125e..70c6940 100644
--- a/src/routes/ssoadmin/audit/+page.server.ts
+++ b/src/routes/ssoadmin/audit/+page.server.ts
@@ -1,51 +1,43 @@
 import { AdminUtils } from '$lib/server/admin-utils';
 import { Audit } from '$lib/server/audit/audit.js';
 import { AuditAction } from '$lib/server/audit/types.js';
+import { Changesets } from '$lib/server/changesets.js';
 
 const PAGE_SIZE = 50;
 
+interface AuditSearchParams {
+	page: string;
+	pageSize: string;
+	actions: string;
+	user: string;
+	content: string;
+	ip: string;
+	flagged: string;
+}
+
 export const load = async ({ url, parent }) => {
 	const { user: userInfo } = await parent();
 	AdminUtils.checkPrivileges(userInfo, ['admin:audit']);
 
-	let limit = PAGE_SIZE;
-	let page = 1;
-	let actions: AuditAction[] | undefined = undefined;
-	let user: string | undefined = undefined;
-	let content: string | undefined = undefined;
-	let ip: string | undefined = undefined;
-	let flagged: boolean | undefined = undefined;
-	if (url.searchParams.has('page')) {
-		page = Number(url.searchParams.get('page')) || 1;
-	}
+	const actions = url.searchParams.getAll('actions') as AuditAction[];
+	const { page, pageSize, user, content, ip, flagged } = Changesets.take<AuditSearchParams>(
+		['page', 'pageSize', 'user', 'content', 'ip', 'flagged'],
+		url.searchParams
+	);
 
-	if (url.searchParams.has('pageSize')) {
-		limit = Number(url.searchParams.get('pageSize')) || PAGE_SIZE;
-	}
+	const limit = Number(pageSize) || PAGE_SIZE;
+	const offset = ((Number(page) || 1) - 1) * limit;
 
-	if (url.searchParams.has('actions')) {
-		actions = url.searchParams.getAll('actions') as AuditAction[];
-	}
+	const data = await Audit.searchAudit({
+		limit,
+		offset,
+		actions,
+		user,
+		content,
+		ip,
+		flagged: !!flagged
+	});
 
-	if (url.searchParams.has('user')) {
-		user = url.searchParams.get('user') as string;
-	}
-
-	if (url.searchParams.has('content')) {
-		content = url.searchParams.get('content') as string;
-	}
-
-	if (url.searchParams.has('ip')) {
-		ip = url.searchParams.get('ip') as string;
-	}
-
-	if (url.searchParams.has('flagged')) {
-		flagged = !!url.searchParams.get('flagged');
-	}
-
-	const offset = (page - 1) * limit;
-
-	const data = await Audit.searchAudit({ limit, offset, actions, user, content, ip, flagged });
 	return {
 		...data,
 		actions: Object.values(AuditAction)
diff --git a/src/routes/ssoadmin/audit/+page.svelte b/src/routes/ssoadmin/audit/+page.svelte
index d6502c1..fb36078 100644
--- a/src/routes/ssoadmin/audit/+page.svelte
+++ b/src/routes/ssoadmin/audit/+page.svelte
@@ -1,14 +1,14 @@
 <script lang="ts">
-	import Paginator from '$lib/components/Paginator.svelte';
-	import { t } from '$lib/i18n';
 	import type { PageData } from './$types';
+	import { t } from '$lib/i18n';
 	import { env } from '$env/dynamic/public';
+	import { page } from '$app/stores';
+	import Paginator from '$lib/components/Paginator.svelte';
 	import FormControl from '$lib/components/form/FormControl.svelte';
 	import ColumnView from '$lib/components/container/ColumnView.svelte';
-	import { page } from '$app/stores';
 	import SplitView from '$lib/components/container/SplitView.svelte';
 	import Button from '$lib/components/Button.svelte';
-	import AdminAuditCard from '../../../lib/components/admin/AdminAuditCard.svelte';
+	import AdminAuditCard from '$lib/components/admin/AdminAuditCard.svelte';
 
 	export let data: PageData;
 </script>
@@ -36,26 +36,36 @@
 						{/each}
 					</select>
 				</FormControl>
-				<FormControl>
-					<label for="content">{$t('admin.audit.comment')}</label>
-					<input name="content" id="content" value={$page.url.searchParams.get('content')} />
-				</FormControl>
+
+				<ColumnView>
+					<FormControl>
+						<label for="content">{$t('admin.audit.comment')}</label>
+						<input name="content" id="content" value={$page.url.searchParams.get('content')} />
+					</FormControl>
+					<FormControl>
+						<label for="ip">{$t('admin.audit.ip')}</label>
+						<input name="ip" id="ip" value={$page.url.searchParams.get('ip')} />
+					</FormControl>
+				</ColumnView>
 			</SplitView>
+
 			<SplitView>
 				<FormControl>
-					<label for="flagged">{$t('admin.audit.flagged')}</label>
-					<input
-						name="flagged"
-						id="flagged"
-						type="checkbox"
-						checked={!!$page.url.searchParams.get('flagged')}
-					/>
-				</FormControl>
-				<FormControl>
-					<label for="ip">{$t('admin.audit.ip')}</label>
-					<input name="ip" id="ip" value={$page.url.searchParams.get('ip')} />
+					<label for="user">{$t('admin.audit.user')}</label>
+					<input name="user" id="user" value={$page.url.searchParams.get('user')} />
 				</FormControl>
 			</SplitView>
+
+			<FormControl>
+				<label for="flagged">{$t('admin.audit.flagged')}</label>
+				<input
+					name="flagged"
+					id="flagged"
+					type="checkbox"
+					checked={!!$page.url.searchParams.get('flagged')}
+				/>
+			</FormControl>
+
 			<div>
 				<Button type="submit">{$t('common.filter')}</Button>
 			</div>