diff --git a/packages/bbui/src/Form/Core/Multiselect.svelte b/packages/bbui/src/Form/Core/Multiselect.svelte index 9b795bc7e5..8d72dd0652 100644 --- a/packages/bbui/src/Form/Core/Multiselect.svelte +++ b/packages/bbui/src/Form/Core/Multiselect.svelte @@ -15,7 +15,6 @@ export let sort = false export let autoWidth = false export let searchTerm = null - export let useFetch = false export let customPopoverHeight export let customPopoverOffsetBelow export let customPopoverMaxHeight @@ -94,7 +93,6 @@ {autocomplete} bind:searchTerm bind:open - {useFetch} {isOptionSelected} {getOptionLabel} {getOptionValue} diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte index d2ee81f8fe..25538d5ac3 100644 --- a/packages/bbui/src/Form/Core/Picker.svelte +++ b/packages/bbui/src/Form/Core/Picker.svelte @@ -37,7 +37,6 @@ export let autocomplete = false export let sort = false export let searchTerm = null - export let useFetch = false export let customPopoverHeight export let customPopoverOffsetBelow export let customPopoverMaxHeight @@ -85,7 +84,7 @@ } const getFilteredOptions = (options, term, getLabel) => { - if (autocomplete && term && !useFetch) { + if (autocomplete && term) { const lowerCaseTerm = term.toLowerCase() return options.filter(option => { return `${getLabel(option)}`.toLowerCase().includes(lowerCaseTerm) diff --git a/packages/bbui/src/Form/Multiselect.svelte b/packages/bbui/src/Form/Multiselect.svelte index ffbf227ff5..3ae56693c7 100644 --- a/packages/bbui/src/Form/Multiselect.svelte +++ b/packages/bbui/src/Form/Multiselect.svelte @@ -17,7 +17,6 @@ export let autoWidth = false export let autocomplete = false export let searchTerm = null - export let useFetch = false export let customPopoverHeight const dispatch = createEventDispatcher() @@ -42,7 +41,6 @@ {autocomplete} {customPopoverHeight} bind:searchTerm - {useFetch} on:change={onChange} on:click /> 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 973e9a35a3..e5865a456a 100644 --- a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte +++ b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte @@ -86,8 +86,15 @@ $: userPage = $userPageInfo.page $: logsPage = $logsPageInfo.page + $: userList = { + ...(userList || {}), + ...$users.data?.reduce((p, c) => { + p[c._id] = c + return p + }, {}), + } $: sortedUsers = sort( - enrich($users.data || [], selectedUsers, "_id"), + enrich(Object.values(userList), selectedUsers, "_id"), "email" ) $: sortedEvents = sort( @@ -257,7 +264,6 @@
option._id} {placeholder} sort - useFetch={false} bind:searchTerm loading={$fetch.loading} />