From ccf281c87adc52ba74649dd074e8de4de63c06f0 Mon Sep 17 00:00:00 2001
From: HugoCasa <hugo@casademont.ch>
Date: Tue, 23 Jul 2024 16:23:33 +0200
Subject: [PATCH] fix: filter audit logs end user by username + complete
 resource filter (#4105)

* fix: filter audit logs end user by username + complete resource filter

* update ee ref

---------

Co-authored-by: Ruben Fiszel <ruben@windmill.dev>
---
 backend/ee-repo-ref.txt                       |  2 +-
 .../auditLogs/AuditLogsFilters.svelte         | 25 ++++++++++++++++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt
index 57d4069a3b..2e39e0e094 100644
--- a/backend/ee-repo-ref.txt
+++ b/backend/ee-repo-ref.txt
@@ -1 +1 @@
-ba9196530fafbfe017d2592af2830a60b6fa62a0
\ No newline at end of file
+7641d36277ffa75d816ed79d9b23eeae4f17f3a5
\ No newline at end of file
diff --git a/frontend/src/lib/components/auditLogs/AuditLogsFilters.svelte b/frontend/src/lib/components/auditLogs/AuditLogsFilters.svelte
index 28ea04b8eb..107d80b0c0 100644
--- a/frontend/src/lib/components/auditLogs/AuditLogsFilters.svelte
+++ b/frontend/src/lib/components/auditLogs/AuditLogsFilters.svelte
@@ -9,7 +9,9 @@
 		AuditService,
 		ResourceService,
 		UserService,
-		type ListableResource
+		ScriptService,
+		FlowService,
+		AppService
 	} from '$lib/gen'
 
 	import { userStore, workspaceStore } from '$lib/stores'
@@ -18,7 +20,7 @@
 	import AutoComplete from 'simple-svelte-autocomplete'
 
 	let usernames: string[]
-	let resources: ListableResource[]
+	let resources: string[]
 	let loading: boolean = false
 
 	export let logs: AuditLog[] = []
@@ -82,9 +84,24 @@
 	}
 
 	async function loadResources() {
-		resources = await ResourceService.listResource({
+		const r = await ResourceService.listResource({
 			workspace: $workspaceStore!
 		})
+		const sPaths = await ScriptService.listScriptPaths({
+			workspace: $workspaceStore!
+		})
+		const fPaths = await FlowService.listFlowPaths({
+			workspace: $workspaceStore!
+		})
+		const a = await AppService.listApps({
+			workspace: $workspaceStore!
+		})
+		resources = r
+			.map((r) => r.path)
+			.concat(sPaths)
+			.concat(fPaths)
+			.concat(a.map((a) => a.path))
+			.sort()
 	}
 
 	$: {
@@ -324,7 +341,7 @@
 
 		<AutoComplete
 			noInputStyles
-			items={resources?.map((r) => r.path) ?? []}
+			items={resources}
 			value={resource}
 			bind:selectedItem={resource}
 			inputClassName="!h-[34px] py-1 !text-xs !w-48"