From 6b7d07c9269aa7e98947828b67ac4c3cafcc5f40 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 24 Feb 2023 09:41:48 +0000
Subject: [PATCH] fix app sorting

---
 .../builder/portal/account/auditLogs/index.svelte    | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
index 63852a6923..e767412e5c 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
@@ -86,15 +86,12 @@
   $: userPage = $userPageInfo.page
   $: logsPage = $logsPageInfo.page
 
-  $: enrichedList = enrich($users.data || [], selectedUsers, "_id")
-  $: sortedList = sort(enrichedList, "email")
-
+  $: sortedUsers = sort(enrich($users.data, selectedUsers, "_id"), "email")
   $: sortedEvents = sort(
     enrich(parseEventObject($auditLogs.events), selectedEvents, "id"),
     "id"
   )
-  // below is not sorting yet
-  $: sortedApps = enrich($apps, selectedApps, "appId")
+  $: sortedApps = sort(enrich($apps, selectedApps, "appId"), "name")
 
   const debounce = value => {
     clearTimeout(timer)
@@ -164,7 +161,8 @@
     return list.map(item => {
       return {
         ...item,
-        selected: selected.find(x => x === item[key]) != null,
+        selected:
+          selected.find(x => x === item[key] || x.includes(item[key])) != null,
       }
     })
   }
@@ -264,7 +262,7 @@
         bind:value={selectedUsers}
         getOptionValue={user => user._id}
         getOptionLabel={user => user.email}
-        options={sortedList}
+        options={sortedUsers}
       />
     </div>
     <div class="select">